fix end of study

Author: mbastian93

src/services/user/mock.ts

@@ -14,8 +14,8 @@ export default class MockUser implements IUserService {
       recipient_certificate_pem_string: 'false',
       start_date: '2099-01-01T04:00:00.000Z',
       subjectId: id,
-      personal_study_end_date: new Date(),
-      general_study_end_date: new Date(),
+      personal_study_end_date: '9999-12-31',
+      general_study_end_date: '9999-12-31',
       status: 'on-study' as 'on-study',
     };
   }

src/services/user/types.ts

@@ -12,8 +12,8 @@ export interface UserResponse {
   recipient_certificate_pem_string: string;
   start_date: UserDateTime;
   subjectId: string;
-  personal_study_end_date: Date;
-  general_study_end_date: Date;
+  personal_study_end_date: string;
+  general_study_end_date: string;
   status: 'on-study' | 'off-study';
 }
 

src/stores/user.ts

@@ -29,8 +29,8 @@ const storeBuilder = () => {
       store.set('questionnaireStartDate', response.start_date ? new Date(response.start_date) : null);
       store.set('questionnaireDueDate', response.due_date ? new Date(response.due_date) : null);
       store.set('instanceId', response.current_instance_id);
-      store.set('personalEndDate', response.personal_study_end_date);
-      store.set('generalEndDate', response.general_study_end_date);
+      store.set('personalEndDate', new Date(response.personal_study_end_date));
+      store.set('generalEndDate', new Date(response.general_study_end_date));
       store.set('isPopulated', true);
       store.set('status', response.status);
     }
@@ -48,7 +48,7 @@ const storeBuilder = () => {
     get isOnStudy() {
       const now = new Date();
       const { personalEndDate, generalEndDate, status } = this;
-      return now >= personalEndDate || now >= generalEndDate || status === 'off-study';
+      return (now <= personalEndDate || now <= generalEndDate) && status === 'on-study';
     }
 
     get isFirstTimeUser() {