feat: Add raw data endpoint for assessments

server/controllers/assessmentsController/index.js

@@ -20,6 +20,25 @@ const assessmentsController = {
       return res.status(401).json({ error: error.message })
     }
   },
+  raw: async (req, res) => {
+    try {
+      const { appDb } = req.app.locals
+      const { assessment, variable } = req.params
+
+      console.log(req.params)
+      console.log('Assesment : ', assessment, 'Variable : ', variable)
+
+      const rawData = await AssessmentModel.allForAssessmentRaw(
+        appDb,
+        assessment,
+        variable
+      )
+
+      return res.status(200).json({ data: rawData })
+    } catch (error) {
+      return res.status(401).json({ error: error.message })
+    }
+  },
 }
 
 export default assessmentsController

server/models/AssessmentModel/index.js

@@ -1,8 +1,45 @@
+import { ALL_SUBJECTS_MONGO_PROJECTION, STUDIES_TO_OMIT } from '../../constants'
 import { collections } from '../../utils/mongoCollections'
 
 const AssessmentModel = {
   all: async (db, query) =>
     await db.collection(collections.assessments).find(query).toArray(),
+  allForAssessmentRaw: async (db, assessment, variable) => {
+    console.log('Assesment : ', assessment, 'Variable : ', variable)
+    // const data = this.allForAssessmentRaw(db, chart.assessment, chart.variable)
+    // console.log('Data : ', data)
+    const data = await db
+      .collection(collections.assessmentDayData)
+      .find(
+        {
+          assessment,
+          study: { $nin: STUDIES_TO_OMIT },
+        },
+        {
+          projection: ALL_SUBJECTS_MONGO_PROJECTION,
+        }
+      )
+      .toArray()
+
+    const rawData = {}
+
+    for (const document of data) {
+      const dayData = document.dayData
+      const subjectSite = document.study
+
+      if (!rawData[subjectSite]) {
+        rawData[subjectSite] = []
+      }
+
+      for (const day of dayData) {
+        const rawDayData = day[variable]
+        rawData[subjectSite].push(rawDayData)
+      }
+    }
+
+    console.log('rawData : ', rawData)
+    return rawData
+  },
   upsert: async (db, query, updatedAttributes) =>
     await db.collection(collections.assessments).findOneAndUpdate(
       query,

server/models/ParticipantsModel/index.js

@@ -20,11 +20,48 @@ const ParticipantsModel = {
       assessment: chart.assessment,
       study: { $in: filtersService.requestedSites, $nin: STUDIES_TO_OMIT },
     }
+
+    // console.log('Assesment : ', chart.assessment, 'Variable : ', chart.variable)
+    // // const data = this.allForAssessmentRaw(db, chart.assessment, chart.variable)
+    // // console.log('Data : ', data)
+    // const data = await db
+    //   .collection(collections.assessmentDayData)
+    //   .find(
+    //     {
+    //       assessment: chart.assessment,
+    //       study: { $nin: STUDIES_TO_OMIT },
+    //     },
+    //     {
+    //       projection: ALL_SUBJECTS_MONGO_PROJECTION,
+    //     }
+    //   )
+    //   .toArray()
+
+    // const rawData = {}
+
+    // for (const document of data) {
+    //   const dayData = document.dayData
+    //   const subjectSite = document.study
+
+    //   if (!rawData[subjectSite]) {
+    //     rawData[subjectSite] = []
+    //   }
+
+    //   for (const day of dayData) {
+    //     const rawDayData = day[chart.variable]
+    //     rawData[subjectSite].push(rawDayData)
+    //   }
+    // }
+
+    // console.log('rawData : ', rawData)
+
     if (filtersService.allFiltersInactive()) {
-      return await db
+      const data = await db
         .collection(collections.assessmentDayData)
         .find(query, { projection: ALL_SUBJECTS_MONGO_PROJECTION })
         .stream()
+
+      return data
     }
 
     const groupedParticipants = await Promise.all(

server/routes/assessments.js

@@ -20,4 +20,8 @@ router
     assessmentsController.index
   )
 
+router
+  .route(v1Routes.assessments.rawData)
+  .get(ensureAuthenticated, assessmentsController.raw)
+
 export default router

server/utils/routes.js

@@ -14,6 +14,7 @@ export const routes = {
 export const v1Routes = {
   assessments: {
     index: `${v1Root}/assessments`,
+    rawData: `${v1Root}/assessments/:assessment/data/:variable`,
   },
   assessmentData: {
     index: `${v1Root}/import/data/day`,

views/api/assessments/index.js

@@ -4,6 +4,8 @@ import http from '../http'
 const assessments = {
   loadAll: async (queryParams) =>
     http.get(apiRoutes.assessments.index, queryParams),
+  rawData: async (assessment, variable) =>
+    http.get(apiRoutes.assessments.rawData(assessment, variable)),
 }
 
 export default assessments

views/routes/routes.js

@@ -33,8 +33,8 @@ export const routes = {
   viewChart: (chartId, queryParams) =>
     queryParams
       ? `/charts/${chartId}${qs.stringify(queryParams, {
-          addQueryPrefix: true,
-        })}`
+        addQueryPrefix: true,
+      })}`
       : `/charts/${chartId}`,
   viewChartPage: '/charts/:chart_id',
   viewConfiguration: (configId) => `/u/configure?s=view&id=${configId}`,
@@ -51,6 +51,8 @@ export const apiRoutes = {
   },
   assessments: {
     index: `${apiPath}/assessments`,
+    rawData: (assessment, variable) =>
+      `${apiPath}/assessments/${assessment}/data/${variable}`,
   },
   auth: {
     login: `${apiPath}/login`,