Merge pull request CoderDojo#170 from CoderDojo/staging

Release from staging

Author: DanielBrierton

config/perm/events.js

@@ -133,6 +133,11 @@ module.exports = function () {
     }],
     'loadTicket': [{
       role: 'basic-user'
-    }]
+    }],
+    'applications': {
+      'list': {
+        role: 'basic-user'
+      }
+    }
   };
 };

lib/bulk-apply-applications.js

@@ -105,20 +105,22 @@ function bulkApplyApplications (args, callback) {
 
   function saveApplications (done) {
     async.map(applications, function (application, cb) {
-      if (!updateAction) {
-        ensureApplicationIsUnique(cb);
-      } else {
-        saveApplication(cb);
-      }
+      // You cannot have multiple applications in the same ticket
+      // NOTE : faulty on bulk apply as front-end allows it (async creation, ticket doesn't exists yet)
+      ensureApplicationIsUnique(cb);
 
+      // Ensure the id of the application is prefilled when the same ticket is booked
+      // Shoudln't be necessary if enforced by API
       function ensureApplicationIsUnique (cb) {
-        seneca.act({role: plugin, cmd: 'searchApplications', query: {sessionId: application.sessionId, userId: application.userId}}, function (err, applications) {
+        seneca.act({role: plugin, cmd: 'searchApplications',
+          query: {sessionId: application.sessionId, userId: application.userId, deleted: false, status: {ne$: 'cancelled'}}},
+        function (err, applications) {
           if (err) return cb(err);
           if (applications.length > 0) {
             var ticketFound = _.find(applications, function (applicationFound) {
-              return applicationFound.ticketId === application.ticketId && !applicationFound.deleted;
+              return applicationFound.ticketId === application.ticketId;
             });
-            if (ticketFound) return cb();
+            if (ticketFound) application.id = ticketFound.id;
           }
           return saveApplication(cb);
         });

lib/cd-events.js

@@ -58,6 +58,9 @@ module.exports = function () {
   // CRUD
   seneca.add({role: plugin, entity: 'invite', cmd: 'list'}, require('./entity/invite/list'));
 
+  // Controllers
+  seneca.add({role: plugin, ctrl: 'applications', cmd: 'list'}, require('./controllers/application/list'));
+
   // PERMS
   seneca.add({role: plugin, cmd: 'is_ticketing_admin'}, isTicketingAdmin.bind(seneca));
   // TODO : those 2 perms are very alike, need for a factory ?

lib/controllers/application/list.js

@@ -0,0 +1,24 @@
+/**
+ * Load user's (and its children) applications for an event
+ * @param  {Object}   args    {user, eventId}
+ * @return {[Applications]}    List of applications
+ */
+module.exports = function (args, done) {
+  var seneca = this;
+  var role = args.role;
+  var eventId = args.eventId;
+  var user = args.user;
+  // TODO : extend to allow selection of profile
+  // TODO : extend to allow selection of status/deletion ?
+  seneca.act({role: 'cd-profiles', cmd: 'load_user_profile', userId: user.id},
+  function (err, profile) {
+    if (err) return done(err);
+    var children = profile.children || [];
+    var userIds = children.concat(user.id);
+    seneca.act({role: role, cmd: 'searchApplications', query: {userId: { in$: userIds }, eventId: eventId, deleted: 0, status: {ne$: 'cancelled'}}},
+    function (err, applications) {
+      if (err) return done(err);
+      done(null, applications);
+    });
+  });
+};

scripts/database/pg/migrations/020.do.add-constraint-unique-eventbrite-event-id.sql

@@ -0,0 +1,9 @@
+DO $$
+  BEGIN
+    BEGIN
+        ALTER TABLE cd_events ADD UNIQUE (eventbrite_id);
+    EXCEPTION
+        WHEN OTHERS THEN RAISE NOTICE 'constraint eventbrite_id already exists in cd_events.';
+    END;
+  END;
+$$