Add study page

.eslintrc

@@ -4,26 +4,26 @@
     "plugin:react/recommended",
     "prettier",
     "universe/web",
-    "universe/node"
+    "universe/node",
   ],
   "parser": "@babel/eslint-parser",
   "env": {
     "browser": true,
-    "node": true
+    "node": true,
   },
   "parserOptions": {
     "requireConfigFile": false,
     "babelOptions": {
-      "presets": ["@babel/preset-react"]
+      "presets": ["@babel/preset-react"],
     },
     "ecmaFeatures": {
-        "jsx": true
+      "jsx": true,
     },
     "ecmaVersion": 15,
     "sourceType": "module",
     "parserOptions": {
-      "project": "./tsconfig.json"
-    }
+      "project": "./tsconfig.json",
+    },
   },
   "plugins": [
     "react",
@@ -32,31 +32,34 @@
     "no-only-tests",
     "sort-keys-fix",
     "prettier",
-    "promise"
+    "promise",
   ],
   "rules": {
     "react/prop-types": "off",
-    "no-unused-vars": ["error", { "varsIgnorePattern": "^_", "argsIgnorePattern": "^_" }],
+    "no-unused-vars": [
+      "error",
+      { "varsIgnorePattern": "^_", "argsIgnorePattern": "^_" },
+    ],
     "import/order": [
       "error",
       {
         "alphabetize": {
           "caseInsensitive": true,
-          "order": "asc"
+          "order": "asc",
         },
         "groups": ["builtin", "external", "internal"],
         "newlines-between": "always",
         "pathGroups": [
           {
             "group": "external",
             "pattern": "react",
-            "position": "before"
-          }
+            "position": "before",
+          },
         ],
-        "pathGroupsExcludedImportTypes": ["react"]
-      }
+        "pathGroupsExcludedImportTypes": ["react"],
+      },
     ],
     "no-only-tests/no-only-tests": "error",
-    "react/react-in-jsx-scope": "off"
-  }
+    "react/react-in-jsx-scope": "off",
+  },
 }

server/app.js

@@ -28,6 +28,7 @@ import indexRouter from './routes/index'
 import participantsRouter from './routes/participants'
 import siteMetadata from './routes/siteMetadata'
 import usersRouter from './routes/users'
+import userStudiesRouter from './routes/userStudies'
 import { verifyHash } from './utils/crypto/hash'
 
 const localStrategy = Strategy
@@ -152,9 +153,9 @@ passport.deserializeUser(async function (user, done) {
   done(null, user)
 })
 
+app.use('/', adminRouter)
 app.use('/', assessmentsRouter)
 app.use('/', assessmentData)
-app.use('/', adminRouter)
 app.use('/', authRouter)
 app.use('/', chartsRouter)
 app.use('/', configurationsRouter)
@@ -163,6 +164,7 @@ app.use('/', indexRouter)
 app.use('/', participantsRouter)
 app.use('/', siteMetadata)
 app.use('/', usersRouter)
+app.use('/', userStudiesRouter)
 app.use('./img', express.static(path.join(__dirname, '../public/img')))
 
 app.get('/*', async (req, res) => {

server/controllers/api/assessmentDayDataController/assessmentDayDataController.test.js

@@ -225,6 +225,7 @@ describe('assessmentDayDataController', () => {
               projection: {
                 _id: 0,
                 'participants.synced': 0,
+                updatedAt: 0,
               },
             }
           )

server/controllers/api/assessmentDayDataController/index.js

@@ -81,7 +81,7 @@ const AssessmentDayDataController = {
           appDb,
           { study },
           {
-            $set: {
+            setAttributes: {
               study,
               participants: [
                 {
@@ -105,7 +105,7 @@ const AssessmentDayDataController = {
             appDb,
             { participants: { $elemMatch: { participant } } },
             {
-              $set: {
+              setAttributes: {
                 'participants.$.daysInStudy': maxDayInDayData,
                 'participants.$.synced': new Date(),
               },
@@ -116,7 +116,7 @@ const AssessmentDayDataController = {
             appDb,
             { study },
             {
-              $addToSet: {
+              addToSetAttributes: {
                 participants: {
                   Active,
                   Consent: parsedConsent,

server/controllers/api/siteMetadataController/index.js

@@ -10,16 +10,20 @@ const SiteMetadataController = {
 
       participants.forEach((participant, i) => {
         participants[i].Consent = new Date(participant.Consent)
-        if (participants[i]?.synced)
-          participants[i].synced = new Date(participant.synced)
       })
-
       const studyMetadata = await SiteMetadataModel.findOne(appDb, { study })
+
       if (!studyMetadata) {
         await SiteMetadataModel.upsert(
           appDb,
           { study },
-          { $set: { ...metadata, participants } }
+          {
+            setAttributes: {
+              ...metadata,
+              participants,
+              createdAt: new Date(),
+            },
+          }
         )
       } else {
         Promise.all(
@@ -36,7 +40,7 @@ const SiteMetadataController = {
               await SiteMetadataModel.upsert(
                 appDb,
                 { study },
-                { $addToSet: { participants: participant } }
+                { addToSetAttributes: { participants: participant } }
               )
             } else {
               const updatedAttributes = Object.keys(participant).reduce(
@@ -54,7 +58,7 @@ const SiteMetadataController = {
                     $elemMatch: { participant: participant.participant },
                   },
                 },
-                { $set: updatedAttributes }
+                { setAttributes: updatedAttributes }
               )
             }
           })

server/controllers/api/siteMetadataController/siteMetadataController.test.js

@@ -227,19 +227,22 @@ describe('siteMetadataController', () => {
             role: 'metadata',
             study: 'site',
             extension: '.csv',
+            updatedAt: new Date(),
           },
           participants: [
             {
               participant: 'YA1',
               Active: 1,
               Consent: '2022-06-02',
               study: 'YA',
+              daysInStudy: 55,
             },
             {
               participant: 'YA2',
               Active: 1,
               Consent: '2022-06-02',
               study: 'YA',
+              daysInStudy: 105,
             },
           ],
         })

server/controllers/studiesController/index.js

@@ -1,6 +1,6 @@
 import StudiesModel from '../../models/StudiesModel'
 
-const StudiesController = {
+const studiesController = {
   index: async (req, res) => {
     try {
       const { appDb } = req.app.locals
@@ -13,4 +13,4 @@ const StudiesController = {
   },
 }
 
-export default StudiesController
+export default studiesController

server/controllers/studiesController/studiesController.test.js

@@ -1,8 +1,8 @@
-import StudiesController from '.'
+import studiesController from '.'
 import { createRequest, createResponse } from '../../../test/fixtures'
 
-describe('StudiesController', () => {
-  describe(StudiesController.index, () => {
+describe('studiesController', () => {
+  describe(studiesController.index, () => {
     describe('When successful', () => {
       it('returns a status of 200 with a list of distinct studies', async () => {
         const request = createRequest()
@@ -11,7 +11,7 @@ describe('StudiesController', () => {
 
         request.app.locals.appDb.distinct.mockResolvedValueOnce(listOfStudies)
 
-        await StudiesController.index(request, response)
+        await studiesController.index(request, response)
 
         expect(response.status).toHaveBeenCalledWith(200)
         expect(response.json).toHaveBeenCalledWith({
@@ -28,7 +28,7 @@ describe('StudiesController', () => {
           new Error('some error')
         )
 
-        await StudiesController.index(request, response)
+        await studiesController.index(request, response)
 
         expect(response.status).toHaveBeenCalledWith(400)
         expect(response.json).toHaveBeenCalledWith({

server/controllers/userStudiesController/index.js

@@ -0,0 +1,31 @@
+import UserModel from '../../models/UserModel'
+import UserStudiesModel from '../../models/UserStudiesModel'
+
+const userStudiesController = {
+  index: async (req, res) => {
+    try {
+      const { appDb } = req.app.locals
+      const isSortRequested = Object.hasOwn(req.query, 'sort')
+      const parsedSortParams =
+        isSortRequested && Object.keys(req.query.sort).length
+          ? req.query.sort
+          : { sortBy: 'study', sortDirection: 'ASC' }
+      const userAccess = await UserModel.findOne(
+        appDb,
+        { uid: req.user.uid },
+        { access: 1 }
+      )
+      const userStudies = await UserStudiesModel.all(
+        appDb,
+        userAccess.access,
+        parsedSortParams
+      )
+
+      return res.status(200).json({ data: userStudies })
+    } catch (error) {
+      return res.status(400).json({ message: error.message })
+    }
+  },
+}
+
+export default userStudiesController