Add rolesJson to groups table

This will contain the roles ('role definition') of a group of
users. We will internally map these to our API scopes.

src/groupdb.js

@@ -6,6 +6,7 @@ exports = module.exports = {
     getAll: getAll,
     getAllWithMembers: getAllWithMembers,
     add: add,
+    update: update,
     del: del,
     count: count,
 
@@ -23,9 +24,18 @@ exports = module.exports = {
 
 var assert = require('assert'),
     database = require('./database.js'),
-    DatabaseError = require('./databaseerror');
+    DatabaseError = require('./databaseerror'),
+    safe = require('safetydance');
 
-var GROUPS_FIELDS = [ 'id', 'name' ].join(',');
+var GROUPS_FIELDS = [ 'id', 'name', 'rolesJson' ].join(',');
+
+function postProcess(result) {
+    assert.strictEqual(typeof result, 'object');
+
+    assert(result.rolesJson === null || typeof result.rolesJson === 'string');
+    result.roles = safe.JSON.parse(result.rolesJson) || [ ];
+    delete result.rolesJson;
+}
 
 function get(groupId, callback) {
     assert.strictEqual(typeof groupId, 'string');
@@ -35,6 +45,8 @@ function get(groupId, callback) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
         if (result.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
 
+        postProcess(result[0]);
+
         callback(null, result[0]);
     });
 }
@@ -53,6 +65,8 @@ function getWithMembers(groupId, callback) {
         var result = results[0];
         result.userIds = result.userIds ? result.userIds.split(',') : [ ];
 
+        postProcess(result);
+
         callback(null, result);
     });
 }
@@ -60,10 +74,12 @@ function getWithMembers(groupId, callback) {
 function getAll(callback) {
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('SELECT ' + GROUPS_FIELDS + ' FROM groups', function (error, result) {
+    database.query('SELECT ' + GROUPS_FIELDS + ' FROM groups', function (error, results) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
 
-        callback(null, result);
+        results.forEach(postProcess);
+
+        callback(null, results);
     });
 }
 
@@ -76,16 +92,19 @@ function getAllWithMembers(callback) {
 
         results.forEach(function (result) { result.userIds = result.userIds ? result.userIds.split(',') : [ ]; });
 
+        results.forEach(postProcess);
+
         callback(null, results);
     });
 }
 
-function add(id, name, callback) {
+function add(id, name, roles, callback) {
     assert.strictEqual(typeof id, 'string');
     assert.strictEqual(typeof name, 'string');
+    assert(Array.isArray(roles));
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('INSERT INTO groups (id, name) VALUES (?, ?)', [ id, name ], function (error, result) {
+    database.query('INSERT INTO groups (id, name, rolesJson) VALUES (?, ?, ?)', [ id, name, JSON.stringify(roles) ], function (error, result) {
         if (error && error.code === 'ER_DUP_ENTRY') return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS, error));
         if (error || result.affectedRows !== 1) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
 
@@ -93,6 +112,34 @@ function add(id, name, callback) {
     });
 }
 
+function update(id, data, callback) {
+    assert.strictEqual(typeof id, 'string');
+    assert(data && typeof data === 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    var args = [ ];
+    var fields = [ ];
+    for (var k in data) {
+        fields.push(k + ' = ?');
+
+        if (k === 'roles') {
+            assert(Array.isArray(data.roles));
+            args.push(data.roles.length === 0 ? null : JSON.stringify(data.roles));
+        } else if (k === 'name') {
+            assert.strictEqual(typeof data.name, 'string');
+            args.push(data.name);
+        }
+    }
+    args.push(id);
+
+    database.query('UPDATE groups SET ' + fields.join(', ') + ' WHERE id = ?', args, function (error) {
+        if (error && error.code === 'ER_DUP_ENTRY' && error.sqlMessage.indexOf('groups_name') !== -1) return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS, 'name already exists'));
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+
+        return callback(null);
+    });
+}
+
 function del(id, callback) {
     assert.strictEqual(typeof id, 'string');
     assert.strictEqual(typeof callback, 'function');