Merge pull request #119 from abought/fix/trell18-date-changing

[rfr] Don't modify the session record just to show "you already completed" page

Author: abought

app/controllers/participate/login.js

@@ -30,6 +30,7 @@ export default Ember.Controller.extend({
             var surveyController = Ember.getOwner(this).lookup('controller:participate');
             surveyController.set('studyId', attrs.password);
             surveyController.set('participantId', attrs.username);
+            this.set('authenticating', false);
             this.transitionToRoute('participate.survey.consent');
           })
           .catch((e) => {

app/routes/participate/survey.js

@@ -4,85 +4,85 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout
 import config from 'ember-get-config';
 
 export default Ember.Route.extend(AuthenticatedRouteMixin, {
-  _experiment: null,
-  _session: null,
-  store: Ember.inject.service(),
-  currentUser: Ember.inject.service(),
-  i18n: Ember.inject.service(),
+    _experiment: null,
+    _session: null,
+    store: Ember.inject.service(),
+    currentUser: Ember.inject.service(),
+    i18n: Ember.inject.service(),
 
-  _getExperiment() {
-    return this.store.find('experiment', config.studyId);
-  },
-  _getSession(params, experiment) { // jshint ignore: line
-    return this.get('currentUser').getCurrentUser().then(([account, profile]) => {
-      return account.pastSessionsFor(experiment, profile).then((pastSessions) => {
-        if (pastSessions.get('length') === 0) {
-          return this.store.createRecord(experiment.get('sessionCollectionId'), {
-            experimentId: experiment.id,
-            profileId: account.get('username') + '.' + account.get('username'),
-            completed: false,
-            feedback: '',
-            hasReadFeedback: '',
-            expData: {},
-            sequence: []
-          });
-        }
-        return pastSessions.objectAt(0);
-      });
-    });
-  },
-  model(params) {
-    return new Ember.RSVP.Promise((resolve, reject) => {
-      this._getExperiment(params).then((experiment) => {
-        this._getSession(params, experiment).then((session) => {
-          if (session.get('completed') && config.featureFlags.showStudyCompletedPage) {
-            this.transitionTo('participate.complete');
-          }
-          this.set('_experiment', experiment);
-          session.set('experimentVersion', '');
+    _getExperiment() {
+        return this.store.find('experiment', config.studyId);
+    },
+    _getSession(params, experiment) { // jshint ignore: line
+        let username;
+        return this.get('currentUser').getCurrentUser()
+            .then(([account, profile]) => {
+                username = account.get('username');
+                return account.pastSessionsFor(experiment, profile);
+            }).then((pastSessions) => {
+                if (pastSessions.get('length') !== 0) {
+                    return pastSessions.objectAt(0);
+                }
+                return this.store.createRecord(experiment.get('sessionCollectionId'), {
+                    experimentId: experiment.id,
+                    profileId: username + '.' + username,
+                    completed: false,
+                    feedback: '',
+                    hasReadFeedback: '',
+                    expData: {},
+                    sequence: []
+                });
+            });
+    },
+    beforeModel(transition) {
+        this._super(transition);
 
-          if (!session.get('extra')) {
-              session.set('extra', {});
-          }
+        let locale;
+        try {
+            locale = this.controllerFor('participate').get('locale');
+        } catch (e) {}
+        if (!locale) {
+            this.transitionTo('participate.login');
+        } else {
+            this.transitionTo('participate.survey.consent');
+        }
+    },
+    model(params) {
+        return this._getExperiment(params).then((experiment) => {
+            this.set('_experiment', experiment);
+            return this._getSession(params, experiment);
+        });
+    },
 
-          session.set('extra.locale', this.get('i18n.locale')); // The user's locale
-          session.set('extra.studyId', this.controllerFor('participate').get('studyId')); // The siteID for the location where the study was taken
-          session.save().then(() => {
-            this.set('_session', session);
-            resolve(session);
-          });
+    afterModel(session) {
+        if (session.get('completed') && config.featureFlags.showStudyCompletedPage) {
+            return this.transitionTo('participate.complete');
+        }
+        if (!session.get('extra')) {
+            session.set('extra', {});
+        }
+        session.setProperties({
+            experimentVersion: '',
+            'extra.locale' : this.get('i18n.locale'), // The user's locale
+            'extra.studyId': this.controllerFor('participate').get('studyId'), // The siteID for the location where the study was taken
+        });
+        return session.save().then(() => this.set('_session', session));
+    },
+    activate () {
+        let session = this.get('_session');
+        // Include session ID in any raven reports that occur during the experiment
+        this.get('raven').callRaven('setExtraContext', {
+            sessionID: session.id,
+            participantID: this.controllerFor('participate').get('participantId'),
+            locale: this.controllerFor('participate').get('locale')
         });
-      }).catch(reject);
-    });
-  },
-  beforeModel(transition) {
-    this._super(transition);
+        return this._super(...arguments);
+    },
+    setupController(controller, session) {
+        this._super(controller, session);
 
-    var locale;
-    try {
-      locale = this.controllerFor('participate').get('locale');
-    } catch (e) {}
-    if (!locale) {
-      this.transitionTo('participate.login');
-    } else {
-      this.transitionTo('participate.survey.consent');
+        controller.set('experiment', this.get('_experiment'));
+        controller.set('session', session);
+        controller.set('pastSessions', []);
     }
-  },
-  activate () {
-    let session = this.get('_session');
-    // Include session ID in any raven reports that occur during the experiment
-    this.get('raven').callRaven('setExtraContext', {
-      sessionID: session.id,
-      participantID:this.controllerFor('participate').get('participantId'),
-      locale: this.controllerFor('participate').get('locale')
-    });
-    return this._super(...arguments);
-  },
-  setupController(controller, session) {
-    this._super(controller, session);
-
-    controller.set('experiment', this.get('_experiment'));
-    controller.set('session', session);
-    controller.set('pastSessions', []);
-  }
 });