Merge fixes that weren't merged during Labs

api/app.js

@@ -35,6 +35,7 @@ const gameRouter = require('./game/gameRouter');
 const resetRouter = require('./reset/resetRouter');
 const leadBoard = require('./leaderboard/leadboardRouter');
 const achievements = require('./Achievements/achieveRouter');
+const dev = require('./dev/devModeRouter');
 
 const app = express();
 
@@ -75,6 +76,7 @@ app.use('/game', gameRouter);
 app.use('/reset', resetRouter);
 app.use('/leaderboard', leadBoard);
 app.use('/achievements', achievements);
+app.use('/dev', dev);
 
 // catch 404 and forward to error handler
 app.use(function (req, res, next) {

api/dev/devModeModel.js

@@ -0,0 +1,52 @@
+const faker = require('faker');
+const db = require('../../data/db-config');
+
+/**
+ * This query marks the submission with the given ID as having HasRead, HasWritten, and HasDrawn set to false, and uploads/deletes submissions accordingly.
+ * @param {number} ID the ID of the submission to be marked as read
+ * @param {boolean} hasRead boolean to indicate whether db should set hasRead to true or false
+ * @param {boolean} hasDrawn boolean to indicate whether db should set hasDrawn to true or false
+ * @param {boolean} hasWritten boolean to indicate whether db should set hasWritten to true or false
+ * @returns {Promise} returns a promise that resolves to the count of fields updated
+ */
+ const updateAll = async (ID, hasRead, hasDrawn, hasWritten) => {
+    /**
+     * This monolithic function is a transaction
+     * uploads submissions depending on booleans (hasDrawn, hasWritten), either adding/removing/ignoring
+     * updates submission tasks depending on booleans
+     */
+    return db.transaction(async (trx) => {
+      try {
+
+        const preExistingUserDrawing = await db('Drawing').where({ SubmissionID: ID });
+        if(hasDrawn){
+          if(preExistingUserDrawing.length < 1){
+            await trx('Drawing').insert({  URL: faker.image.imageUrl(), SubmissionID: ID  });
+          }
+        } else {
+          if(preExistingUserDrawing.length > 0){
+            await trx('Drawing').where({ SubmissionID: ID }).del();
+          };
+        };
+
+        const preExistingUserWriting = await db('Writing').where({ SubmissionID: ID });
+        if(hasWritten){
+          if(preExistingUserWriting.length < 1){
+            await trx('Writing').insert({ URL:faker.image.imageUrl(), PageNum: 1, SubmissionID: ID });
+          }
+        } else {
+          if(preExistingUserWriting.length > 0) {
+            await trx('Writing').where({ SubmissionID: ID }).del();
+          }
+        }
+        await trx('Submissions').where({ ID }).update({ HasRead: hasRead, HasWritten: hasWritten, HasDrawn: hasDrawn });
+      } catch(err) {
+        throw new Error(err.message);
+      }
+    });
+
+  }
+
+  module.exports = {
+      updateAll,
+  }

api/dev/devModeRouter.js

@@ -0,0 +1,58 @@
+const router = require('express').Router();
+
+const { authRequired, validateUpdateAllTasksParams } = require('../middleware');
+const { crudOperationsManager } = require('../../lib');
+const DevModel = require('./devModeModel');
+
+
+/**
+ * @swagger
+ * /submit/update-all/{id}:
+ *  put:
+ *    summary: Attempts to mark the submission with the given ID as hasRead as 'false', hasWritten as 'false', hasDrawn as 'false'
+ *    security:
+ *      - okta: []
+ *    tags:
+ *      - Submissions
+ *    parameters:
+ *      - $ref: '#/components/parameters/submissionId'
+ *      - in: formData
+ *        name: hasRead
+ *        type: boolean
+ *        description: boolean to set users task hasRead to
+ *      - in: formData
+ *        name: hasDrawn
+ *        type: boolean
+ *        description: boolean to set users task hasDrawn to
+*      - in: formData
+ *        name: hasWritten
+ *        type: boolean
+ *        description: boolean to set users task hasWritten to
+ *    responses:
+ *      204:
+ *        $ref: '#/components/responses/EmptySuccess'
+ *      400:
+ *        description: Invalid request missing/invalid arguments
+ *        content:
+ *          application/json:
+ *            schema:
+ *              type: object
+ *              properties:
+ *                error:
+ *                  type: string
+ *                  description: Required inputs hasRead, hasDrawn, and hasWritten must be of boolean type
+ *      401:
+ *        $ref: '#/components/responses/UnauthorizedError'
+ *      404:
+ *        $ref: '#/components/responses/NotFound'
+ *      500:
+ *        $ref: '#/components/responses/DatabaseError'
+ */
+router.put('/update-all/:id', authRequired, validateUpdateAllTasksParams, async (req, res) => {
+    const { id } = req.params;
+    const { hasRead, hasDrawn, hasWritten } = req.body;
+
+    return crudOperationsManager.update(res, DevModel.updateAll, 'Submission', id, hasRead, hasDrawn, hasWritten);
+  })
+
+  module.exports = router;

api/mod/modHelpers/clusterGeneration.js

@@ -15,11 +15,14 @@ const clusterGeneration = () => {
       // Pull a list of all cohorts
       const cohorts = await trx('Cohorts');
       // Iterate over the cohorts
+
       for (let { ID } of cohorts) {
         // Get all submissions for every cohort
         const unformatted = await dbOps.getAllSubmissionsByCohort(trx, ID);
         // Store each cohorts' submissions in the dsReq hash table with the key being the cohort id
-        dsReq[ID] = formatCohortSubmissions(unformatted);
+        if (unformatted.length > 0){
+          dsReq[ID] = formatCohortSubmissions(unformatted);
+        }
       }
       // Send the submissions to data science for clustering
       const { data } = await dsApi.getClusters(dsReq);
@@ -32,15 +35,17 @@ const clusterGeneration = () => {
       // Iterate over cohorts again
       for (let { ID } of cohorts) {
         // For every squad returned in each cohort from data science, where squad is an array of 4 submission IDs
-        for (let squad of clusters[ID]) {
-          // Create a squad in the database for the current cohort
-          const [SquadID] = await addSquad(trx, ID);
-          // Create two teams for the newly created squad
-          const [t1, t2] = await addTeams(trx, SquadID);
-          // Create 4 new team member entries for the database
-          const newMembers = await addMembers(trx, t1, t2, squad);
-          // [[1], [2], [3], [4]] => [1, 2, 3, 4]
-          members.push([].concat.apply([], newMembers));
+        if(clusters[ID]) {
+          for (let squad of clusters[ID]) {
+            // Create a squad in the database for the current cohort
+            const [SquadID] = await addSquad(trx, ID);
+            // Create two teams for the newly created squad
+            const [t1, t2] = await addTeams(trx, SquadID);
+            // Create 4 new team member entries for the database
+            const newMembers = await addMembers(trx, t1, t2, squad);
+            // [[1], [2], [3], [4]] => [1, 2, 3, 4]
+            members.push([].concat.apply([], newMembers));
+          }
         }
       }
 

api/submission/submissionModel.js

@@ -59,18 +59,6 @@ const markAsRead = (ID, flag = true) => {
   return db('Submissions').where({ ID }).update({ HasRead: flag });
 };
 
-/**
- * This query marks the submission with the given ID as having HasRead, HasWritten, and HasDrawn set to false.
- * @param {number} ID the ID of the submission to be marked as read
- * @param {boolean} hasRead boolean to indicate whether db should set hasRead to true or false
- * @param {boolean} hasDrawn boolean to indicate whether db should set hasDrawn to true or false
- * @param {boolean} hasWritten boolean to indicate whether db should set hasWritten to true or false
- * @returns {Promise} returns a promise that resolves to the count of fields updated
- */
-const updateAll = (ID, hasRead, hasDrawn, hasWritten) => {
-  return db('Submissions').where({ ID }).update({ HasRead: hasRead, HasWritten: hasWritten, HasDrawn: hasDrawn });
-}
-
 /**
  * This query is transactional, and runs a series of requests:
  *  - Updates the HasDrawn field for the relevant submission to be true
@@ -169,7 +157,6 @@ module.exports = {
   getOrInitSubmission,
   getAllSubmissionsByChild,
   markAsRead,
-  updateAll,
   submitDrawingTransaction,
   submitWritingTransaction,
   deleteWritingSubmission,

api/submission/submissionRouter.js

@@ -358,56 +358,6 @@ router.post('/draw/:id', authRequired, fileUpload, async (req, res) => {
   );
 });
 
-/**
- * @swagger
- * /submit/update-all/{id}:
- *  put:
- *    summary: Attempts to mark the submission with the given ID as hasRead as 'false', hasWritten as 'false', hasDrawn as 'false'
- *    security:
- *      - okta: []
- *    tags:
- *      - Submissions
- *    parameters:
- *      - $ref: '#/components/parameters/submissionId'
- *      - in: formData
- *        name: hasRead
- *        type: boolean
- *        description: boolean to set users task hasRead to
- *      - in: formData
- *        name: hasDrawn
- *        type: boolean
- *        description: boolean to set users task hasDrawn to
-*      - in: formData
- *        name: hasWritten
- *        type: boolean
- *        description: boolean to set users task hasWritten to
- *    responses:
- *      204:
- *        $ref: '#/components/responses/EmptySuccess'
- *      400:
- *        description: Invalid request missing/invalid arguments
- *        content:
- *          application/json:
- *            schema:
- *              type: object
- *              properties:
- *                error:
- *                  type: string
- *                  description: Required inputs hasRead, hasDrawn, and hasWritten must be of boolean type
- *      401:
- *        $ref: '#/components/responses/UnauthorizedError'
- *      404:
- *        $ref: '#/components/responses/NotFound'
- *      500:
- *        $ref: '#/components/responses/DatabaseError'
- */
-router.put('/update-all/:id', authRequired, validateUpdateAllTasksParams, async (req, res) => {
-  const { id } = req.params;
-  const { hasRead, hasDrawn, hasWritten } = req.body;
-
-  return crudOperationsManager.update(res, Submissions.updateAll, 'Submission', id, hasRead, hasDrawn, hasWritten);
-})
-
 /**
  * @swagger
  * /submission/write/{id}: