Merge branch 'feature/graph-pagination-response' into feature/db-utils

Author: mcapeta

server/cohort/cohort.controller.js

@@ -16,7 +16,7 @@ const processOutput = (profile, includeGraph) => {
   return output;
 };
 
-function listLearners({ cohortId, query, options }, res) {
+function listLearnerStats({ cohortId, query, options }, res) {
   const where = { cohortId };
   const opts = { where, ...options };
   if (query.userId) where.userId = { [Op.in]: query.userId };
@@ -26,7 +26,7 @@ function listLearners({ cohortId, query, options }, res) {
   });
 }
 
-function getGraph({ cohortId, learnerId }, res) {
+async function getLearnerStats({ cohortId, learnerId }, res) {
   const where = { cohortId, userId: learnerId };
   return LearnerProfile.findOrCreate({ where }).spread(profile => {
     const cohortProgress = graphService.getCohortProgress(cohortId);
@@ -50,8 +50,8 @@ async function registerLearners({ cohortId, body }, res) {
 }
 
 module.exports = {
-  getGraph,
-  listLearners,
+  getLearnerStats,
+  listLearnerStats,
   getCohortProgress,
   registerLearners
 };

server/cohort/index.js

@@ -4,30 +4,21 @@ const ctrl = require('./cohort.controller');
 const event = require('../event');
 const graph = require('../knowledge-graph');
 const { LearnerProfile } = require('../common/database');
+const { parseNumericParam } = require('../common/middleware');
 const router = require('express').Router();
 const { setParser } = require('../common/pagination');
 
 router
-  .use('/:cohortId*', parseCohortId)
+  .param('cohortId', parseNumericParam)
+  .param('learnerId', parseNumericParam)
   .use('/:cohortId/graph', graph.router)
   .use('/:cohortId/event', event.router)
   .get('/:cohortId/progress', ctrl.getCohortProgress)
   .post('/:cohortId/register', ctrl.registerLearners)
-  .use('/:cohortId/learner/:learnerId*', parseLearnerId)
-  .get('/:cohortId/learner/:learnerId', ctrl.getGraph)
-  .get('/:cohortId/learner/', setParser(LearnerProfile), ctrl.listLearners);
+  .get('/:cohortId/learner/:learnerId', ctrl.getLearnerStats)
+  .get('/:cohortId/learner/', setParser(LearnerProfile), ctrl.listLearnerStats);
 
 module.exports = {
   path: '/cohort',
   router
 };
-
-function parseCohortId(req, _, next) {
-  req.cohortId = parseInt(req.params.cohortId, 10);
-  next();
-}
-
-function parseLearnerId(req, _, next) {
-  req.learnerId = parseInt(req.params.learnerId, 10);
-  next();
-}

server/common/database/migrations/20180403080953-create-integration.js

@@ -20,11 +20,13 @@ module.exports = {
     createdAt: {
       type: Sequelize.DATE,
       field: 'created_at',
+      defaultValue: Sequelize.fn('NOW'),
       allowNull: false
     },
     updatedAt: {
       type: Sequelize.DATE,
       field: 'updated_at',
+      defaultValue: Sequelize.fn('NOW'),
       allowNull: false
     },
     deletedAt: {

server/common/database/migrations/20181006191154-ungraded-event.js

@@ -43,7 +43,7 @@ module.exports = {
     createdAt: {
       type: Sequelize.DATE,
       field: 'created_at',
-      defaultValue: Sequelize.NOW,
+      defaultValue: Sequelize.fn('NOW'),
       allowNull: false
     }
   }),

server/common/database/migrations/20181008063500-graded-event.js

@@ -52,7 +52,7 @@ module.exports = {
     createdAt: {
       type: Sequelize.DATE,
       field: 'created_at',
-      defaultValue: Sequelize.NOW,
+      defaultValue: Sequelize.fn('NOW'),
       allowNull: false
     }
   }),

server/common/database/migrations/20181008110637-repository-graph.js

@@ -22,11 +22,13 @@ module.exports = {
       createdAt: {
         type: Sequelize.DATE,
         field: 'created_at',
+        defaultValue: Sequelize.fn('NOW'),
         allowNull: false
       },
       updatedAt: {
         type: Sequelize.DATE,
         field: 'updated_at',
+        defaultValue: Sequelize.fn('NOW'),
         allowNull: false
       },
       deletedAt: {

server/common/database/migrations/20181012161152-learner-profile.js

@@ -27,17 +27,20 @@ module.exports = {
       },
       repoState: {
         type: Sequelize.JSONB,
+        field: 'repo_state',
         defaultValue: {},
         allowNull: false
       },
       createdAt: {
         type: Sequelize.DATE,
         field: 'created_at',
+        defaultValue: Sequelize.fn('NOW'),
         allowNull: false
       },
       updatedAt: {
         type: Sequelize.DATE,
         field: 'updated_at',
+        defaultValue: Sequelize.fn('NOW'),
         allowNull: false
       },
       deletedAt: {

server/common/middleware.js

@@ -0,0 +1,10 @@
+'use strict';
+
+function parseNumericParam(req, _, next, value, name) {
+  req[name] = parseInt(value, 10);
+  next();
+}
+
+module.exports = {
+  parseNumericParam
+};

server/event/graded-event.model.js

@@ -48,16 +48,16 @@ class GradedEvent extends Model {
       },
       createdAt: {
         type: DataTypes.DATE,
-        field: 'created_at',
-        defaultValue: DataTypes.NOW
+        field: 'created_at'
       }
     };
   }
 
   static options() {
     return {
       tableName: 'graded_event',
-      timestamps: false,
+      timestamps: true,
+      updatedAt: false,
       freezeTableName: true
     };
   }

server/event/ungraded-event.model.js

@@ -40,16 +40,16 @@ class UngradedEvent extends Model {
       },
       createdAt: {
         type: DataTypes.DATE,
-        field: 'created_at',
-        defaultValue: DataTypes.NOW
+        field: 'created_at'
       }
     };
   }
 
   static options() {
     return {
       tableName: 'ungraded_event',
-      timestamps: false,
+      timestamps: true,
+      updatedAt: false,
       freezeTableName: true
     };
   }