Merge pull request #269 from CoderDojo/staging

DanielBrierton · web-flow · commit 43fa7cd9555f · 2017-08-04T15:17:26.000+01:00
Register a Dojo &amp; Find Dojo
diff --git a/agreements.js b/agreements.js
@@ -8,46 +8,53 @@ module.exports = function (options) {
   var ENTITY_NS = 'cd/agreements';
 
   seneca.add({role: plugin, cmd: 'save'}, cmd_save);
-  seneca.add({role: plugin, cmd: 'list'}, cmd_list);
   seneca.add({role: plugin, cmd: 'count'}, cmd_count);
-  seneca.add({role: plugin, cmd: 'load_user_agreement'}, cmd_load_user_agreement);
+  seneca.add({role: plugin, cmd: 'list'}, cmd_list);
+  seneca.add({role: plugin, cmd: 'load'}, cmd_load);
+  seneca.add({role: plugin, cmd: 'getVersion'}, cmd_get_version);
+  seneca.add({role: plugin, cmd: 'loadUserAgreement'}, cmd_load_user_agreement);
+
+  function cmd_get_version (args, done) {
+    var version = 2;
+    return done(null, {version: version});
+  }
 
   function cmd_save (args, done) {
     var agreementEntity = seneca.make$(ENTITY_NS);
     var agreement = args.agreement;
-
     agreement.timestamp = new Date();
-
-    agreementEntity.load$({userId: agreement.userId}, function (err, response) {
-      if (err) return done(err);
+    var user = args.user;
+    agreement.userId = user.id;
+    async.waterfall([
+      getCurrentVersion,
+      loadCurrentAgreementsForUser,
+      saveAgreement
+    ], done);
+    function getCurrentVersion (wCb) {
+      seneca.act({role: plugin, cmd: 'getVersion'}, function (err, response) {
+        if (err) return done(err);
+        agreement.agreementVersion = response.version;
+        wCb(null, response.version);
+      });
+    }
+    function loadCurrentAgreementsForUser (version, wCb) {
+      agreementEntity.load$({userId: agreement.userId, agreementVersion: version},
+      function (err, response) {
+        if (err) return done(err);
+        return wCb(null, response);
+      });
+    }
+    function saveAgreement (response, wCb) {
       if (!response || !response.id) {
-        agreementEntity.save$(agreement, done);
+        agreementEntity.save$(agreement, wCb);
       } else {
-        return done(null, {msg: 'Charter already signed.'});
+        if (response && response.id) {
+          return wCb(null, {msg: 'Charter already signed.'});
+        } else {
+          seneca.log.warn('Unexpected scenario when saving an agreement', response);
+        }
       }
-    });
-  }
-
-  function cmd_list (args, done) {
-    var seneca = this;
-
-    function get_user_agreements (userId, done) {
-      seneca.make(ENTITY_NS).list$({userId: userId}, done);
     }
-
-    async.mapSeries(args.userIds, function (userId, done) {
-      async.waterfall([
-        function (done) {
-          get_user_agreements(userId, done);
-        },
-        function (agreements, done) {
-          return done(null, {
-            userId: userId,
-            agreements: agreements
-          });
-        }
-      ], done);
-    }, done);
   }
 
   function cmd_count (args, done) {
@@ -67,10 +74,20 @@ module.exports = function (options) {
     });
   }
 
+  function cmd_list (args, done) {
+    var query = args.query;
+    seneca.make(ENTITY_NS).list$(query, done);
+  }
+
+  function cmd_load (args, done) {
+    var id = args.id;
+    seneca.make(ENTITY_NS).load$(id, done);
+  }
+
   function cmd_load_user_agreement (args, done) {
     var seneca = this;
 
-    seneca.make(ENTITY_NS).load$({userId: args.id}, done);
+    seneca.make(ENTITY_NS).load$({userId: args.userId, agreementVersion: args.version}, done);
   }
 
   return {
diff --git a/circle.yml b/circle.yml
@@ -25,3 +25,16 @@ deployment:
             key_pattern: applications/cp-users-service-ci-{BUILD_NUM}.zip
         deployment_group: prod-zen
         deployment_config: CodeDeployDefault.OneAtATime
+  staging:
+    branch: staging
+    codedeploy:
+      cp-users-service-staging:
+        application_root: /
+        region: eu-west-1
+        revision_location:
+          revision_type: S3
+          s3_location:
+            bucket: zen-deployments
+            key_pattern: staging/applications/cp-users-service-staging-{SHORT_COMMIT}-{BUILD_NUM}.zip
+        deployment_group: staging-zen
+        deployment_config: CodeDeployDefault.OneAtATime
diff --git a/lib/profiles/alias-generator.js b/lib/profiles/alias-generator.js
@@ -0,0 +1,48 @@
+var async = require('async');
+
+module.exports = function(user, profile, done) {
+    var seneca = this;
+    var lowerCaseFirstName = user.firstName.toLowerCase();
+    if (user.nick) return done(null);
+
+    seneca.make('cd_first_name_counter').list$({
+        firstName: lowerCaseFirstName
+    }, function (err, results) {
+        if (err) return done(err);
+        var firstNameCount = results[0] || {
+            firstName: lowerCaseFirstName,
+            userCount: 0
+        };
+        firstNameCount.userCount++;
+        var uniqNicknameFound = false;
+        var nickname = user.firstName + firstNameCount.userCount;
+        async.whilst(
+            function () {
+                return !uniqNicknameFound;
+            },
+            function (cb) {
+                seneca.make('sys/user').list$({
+                    nick: nickname
+                }, function (err, users) {
+                    if (err) return cb(err);
+                    if (users.length === 0) {
+                        uniqNicknameFound = true;
+                    } else {
+                        firstNameCount.userCount++;
+                        nickname = user.firstName + firstNameCount.userCount;
+                    }
+                    cb(null, nickname);
+                });
+            },
+            function (err) {
+                if (err) return done(err);
+                user.nick = nickname;
+                profile.alias = nickname;
+                seneca.make('cd_first_name_counter').save$(firstNameCount, function (err) {
+                    if (err) return done(err);
+                    done(null);
+                });
+            }
+        );
+    });
+};
diff --git a/package.json b/package.json
@@ -59,6 +59,8 @@
     "lab": "5.15.1",
     "lab-quieter-reporter": "1.0.1",
     "pre-commit": "1.1.2",
-    "semistandard": "7.0.3"
+    "semistandard": "7.0.3",
+    "sinon": "^2.3.4",
+    "sinon-chai": "^2.11.0"
   }
 }
diff --git a/profiles.js b/profiles.js
@@ -153,7 +153,7 @@ module.exports = function (options) {
     var initUserType = profile.userTypes[0];
     var password = profile.password;
 
-    var nick = profile.alias || profile.name;
+    var nick = profile.alias;
     profile.name = profile.firstName && profile.lastName ? profile.firstName + ' ' + profile.lastName : profile.name;
 
     var user = {
@@ -168,6 +168,9 @@ module.exports = function (options) {
       roles: ['basic-user']
     };
 
+    // mutates user.nick & profile.alias
+    var aliasGenerator = require('./lib/profiles/alias-generator').bind(seneca);
+
     function registerUser (youth, done) {
       if (youth) {
         delete user.email;
@@ -221,6 +224,7 @@ module.exports = function (options) {
 
     if (initUserType === 'attendee-o13') {
       async.waterfall([
+        async.apply(aliasGenerator, user, profile),
         async.apply(registerUser, false),
         addUserToParentsDojos
       ], function (err, res) {
@@ -229,6 +233,7 @@ module.exports = function (options) {
       });
     } else if (initUserType === 'attendee-u13') {
       async.waterfall([
+        async.apply(aliasGenerator, user, profile),
         async.apply(registerUser, true),
         addUserToParentsDojos
       ], function (err, res) {
diff --git a/scripts/database/pg/migrations/024.do.add-nick-names-table.sql b/scripts/database/pg/migrations/024.do.add-nick-names-table.sql
@@ -0,0 +1,10 @@
+CREATE TABLE IF NOT EXISTS cd_first_name_counter
+(
+  id character varying NOT NULL,
+  first_name character varying UNIQUE NOT NULL,
+  user_count int NOT NULL,
+  CONSTRAINT pk_cd_nick_names_id PRIMARY KEY (id)
+)
+WITH (
+  OIDS=FALSE
+);
diff --git a/test/alias-generator.spec.js b/test/alias-generator.spec.js
diff --git a/test/lib/insert-test-users.js b/test/lib/insert-test-users.js
diff --git a/test/users-spec.js b/test/users-spec.js

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,8 @@`
`59`	`59`	`"lab": "5.15.1",`
`60`	`60`	`"lab-quieter-reporter": "1.0.1",`
`61`	`61`	`"pre-commit": "1.1.2",`
`62`		`- "semistandard": "7.0.3"`
	`62`	`+ "semistandard": "7.0.3",`
	`63`	`+ "sinon": "^2.3.4",`
	`64`	`+ "sinon-chai": "^2.11.0"`
`63`	`65`	`}`
`64`	`66`	`}`