Merge to Prod

README.md

@@ -1,8 +1,8 @@
 # Brain Exercise Initative 🧠
 
 ## About
-Brain Exercise Initative is a nonprofit focused on preventing memory loss through brain exercise. Through innovative research in Japan, it was found that doing simple math and reading exercises aloud caused improvements in cognitive function. Brain Exercise Initiative builds off of this research, holding brain exercise programs at retirement homes. 
 
+Brain Exercise Initative is a nonprofit focused on preventing memory loss through brain exercise. Through innovative research in Japan, it was found that doing simple math and reading exercises aloud caused improvements in cognitive function. Brain Exercise Initiative builds off of this research, holding brain exercise programs at retirement homes.
 
 ## Getting Started
 
@@ -20,7 +20,6 @@ yarn install
 
 Install [MongoDB Community Server](https://www.mongodb.com/docs/manual/administration/install-community/) to host a local instance of MongoDB. It may also be helpful to download [MongoDB Compass](https://www.mongodb.com/try/download/compass#compass) to view the state of your database.
 
-
 ### Environment Variables
 
 In the root directory, run one of these commands based on your OS:

common_utils/types.ts

@@ -117,38 +117,36 @@ export interface IAnalytics {
   totalSessionsCompleted: number;
   active: boolean;
   streak: Days[];
-  lastSessionsMetrics: [
-    {
-      date: Date;
-      math: {
-        attempted: boolean;
-        questionsAttempted: number;
-        questionsCorrect: number;
-        finalDifficultyScore: number;
-        timePerQuestion: number;
-      };
-      trivia: {
-        attempted: boolean;
-        questionsAttempted: number;
-        questionsCorrect: number;
-        timePerQuestion: number;
-      };
-      reading: {
-        attempted: boolean;
-        passagesRead: number;
-        timePerPassage: number;
-        wordsPerMinute: number;
-        questionsAnswered: number;
-        skipped: boolean;
-      };
-      writing: {
-        attempted: boolean;
-        questionsAnswered: number;
-        timePerQuestion: number;
-        skipped: boolean;
-      };
-    },
-  ];
+  lastSessionMetrics: {
+    date: Date;
+    math: {
+      attempted: boolean;
+      questionsAttempted: number;
+      questionsCorrect: number;
+      finalDifficultyScore: number;
+      timePerQuestion: number;
+    };
+    trivia: {
+      attempted: boolean;
+      questionsAttempted: number;
+      questionsCorrect: number;
+      timePerQuestion: number;
+    };
+    reading: {
+      attempted: boolean;
+      passagesRead: number;
+      timePerPassage: number;
+      wordsPerMinute: number;
+      questionsAnswered: number;
+      skipped: boolean;
+    };
+    writing: {
+      attempted: boolean;
+      questionsAnswered: number;
+      timePerQuestion: number;
+      skipped: boolean;
+    };
+  };
   weeklyMetrics: [
     {
       date: Date;
@@ -351,6 +349,7 @@ export interface IAggregatedAnalyticsAll
     IAggregatedAnalyticsMath,
     IAggregatedAnalyticsTrivia,
     IAggregatedAnalyticsReading,
+    PatientStats,
     IAggregatedAnalyticsWriting {}
 
 export interface IAggregatedAnalyticsOverall {
@@ -436,6 +435,7 @@ export interface IAggregatedGroupAnalyticsAll
     IAggregatedGroupAnalyticsMath,
     IAggregatedGroupAnalyticsReading,
     IAggregatedGroupAnalyticsWriting,
+    PatientStats,
     IAggregatedGroupAnalyticsTrivia {}
 
 export type IAggregatedGroupAnalyticsOverall = {
@@ -466,6 +466,11 @@ export type IAggregatedGroupAnalyticsWriting = {
   };
 };
 
+export interface PatientStats {
+  totalPatients: number;
+  activePatients: number;
+}
+
 export interface IGeneralReducer {
   pendingApprovals: number;
 }