Merge pull request #265 from RADAR-base/staging-app

Release 0.5.10.1-alpha
RADAR-base · Jan 25, 2019 · 044b2e0 · 044b2e0
2 parents c30922d + 52337a9
commit 044b2e0
Show file tree

Hide file tree

Showing 8 changed files with 92 additions and 78 deletions.
diff --git a/config.xml b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="515" id="org.phidatalab.radar_armt" version="0.5.10-alpha" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="516" id="org.phidatalab.radar_armt" version="0.5.10.1-alpha" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>RADAR Questionnaire</name>
     <description>An application that collects active data for research.</description>
     <author email="[email protected]" href="http://radar-cns.org/">RADAR-CNS</author>

diff --git a/src/app/core/containers/app.component.ts b/src/app/core/containers/app.component.ts
@@ -5,7 +5,6 @@ import { Platform } from 'ionic-angular'
 
 import { DefaultNotificationType } from '../../../assets/data/defaultConfig'
 import { SplashPageComponent } from '../../pages/splash/containers/splash-page.component'
-import { ConfigService } from '../services/config.service'
 import { NotificationService } from '../services/notification.service'
 
 @Component({
@@ -18,15 +17,11 @@ export class AppComponent {
     private platform: Platform,
     private statusBar: StatusBar,
     private splashScreen: SplashScreen,
-    private configService: ConfigService,
     private notificationService: NotificationService
   ) {
     this.platform.ready().then(() => {
       this.statusBar.hide()
       this.splashScreen.hide()
-      this.configService.fetchConfigState(false)
-      this.configService.migrateToLatestVersion()
-
       if (DefaultNotificationType === 'LOCAL')
         this.notificationService.permissionCheck()
     })

diff --git a/src/app/core/services/config.service.ts b/src/app/core/services/config.service.ts
@@ -2,6 +2,7 @@ import 'rxjs/add/operator/toPromise'
 
 import { HttpClient } from '@angular/common/http'
 import { Injectable } from '@angular/core'
+import { AppVersion } from '@ionic-native/app-version'
 
 import {
   ARMTDefBranchProd,
@@ -24,76 +25,83 @@ export class ConfigService {
     public http: HttpClient,
     public storage: StorageService,
     private schedule: SchedulingService,
-    private notificationService: NotificationService
+    private notificationService: NotificationService,
+    private appVersion: AppVersion
   ) {}
 
   fetchConfigState(force: boolean) {
     return Promise.all([
       this.storage.get(StorageKeys.CONFIG_VERSION),
-      this.storage.get(StorageKeys.SCHEDULE_VERSION)
-    ]).then(([configVersion, scheduleVersion]) => {
-      return this.pullProtocol()
-        .then(res => {
-          if (res) {
-            const response: any = JSON.parse(res)
-            if (
-              configVersion !== response.version ||
-              scheduleVersion !== response.version ||
-              force
-            ) {
-              this.storage.set(StorageKeys.HAS_CLINICAL_TASKS, false)
-              const protocolFormated = this.formatPulledProcotol(
-                response.protocols
-              )
-              const scheduledAssessments = []
-              const clinicalAssessments = []
-              for (let i = 0; i < protocolFormated.length; i++) {
-                const clinical =
-                  protocolFormated[i]['protocol']['clinicalProtocol']
-                if (clinical) {
-                  this.storage.set(StorageKeys.HAS_CLINICAL_TASKS, true)
-                  clinicalAssessments.push(protocolFormated[i])
-                } else {
-                  scheduledAssessments.push(protocolFormated[i])
+      this.storage.get(StorageKeys.SCHEDULE_VERSION),
+      this.storage.get(StorageKeys.APP_VERSION),
+      this.appVersion.getVersionNumber()
+    ]).then(
+      ([configVersion, scheduleVersion, storedAppVersion, appVersion]) => {
+        return this.pullProtocol()
+          .then(res => {
+            if (res) {
+              const response: any = JSON.parse(res)
+              if (
+                configVersion !== response.version ||
+                scheduleVersion !== response.version ||
+                storedAppVersion !== appVersion ||
+                force
+              ) {
+                this.storage.set(StorageKeys.APP_VERSION, appVersion)
+                this.storage.set(StorageKeys.HAS_CLINICAL_TASKS, false)
+                const protocolFormated = this.formatPulledProcotol(
+                  response.protocols
+                )
+                const scheduledAssessments = []
+                const clinicalAssessments = []
+                for (let i = 0; i < protocolFormated.length; i++) {
+                  const clinical =
+                    protocolFormated[i]['protocol']['clinicalProtocol']
+                  if (clinical) {
+                    this.storage.set(StorageKeys.HAS_CLINICAL_TASKS, true)
+                    clinicalAssessments.push(protocolFormated[i])
+                  } else {
+                    scheduledAssessments.push(protocolFormated[i])
+                  }
                 }
-              }
-              return this.storage
-                .set(StorageKeys.CONFIG_VERSION, response.version)
-                .then(() => {
-                  return this.storage
-                    .set(
-                      StorageKeys.CONFIG_CLINICAL_ASSESSMENTS,
-                      clinicalAssessments
-                    )
-                    .then(() => {
-                      console.log('Pulled clinical questionnaire')
-                      return this.pullQuestionnaires(
-                        StorageKeys.CONFIG_CLINICAL_ASSESSMENTS
-                      )
-                    })
-                })
-                .then(() => {
-                  return this.storage
-                    .set(StorageKeys.CONFIG_ASSESSMENTS, scheduledAssessments)
-                    .then(() => {
-                      console.log('Pulled questionnaire')
-                      return this.pullQuestionnaires(
-                        StorageKeys.CONFIG_ASSESSMENTS
+                return this.storage
+                  .set(StorageKeys.CONFIG_VERSION, response.version)
+                  .then(() => {
+                    return this.storage
+                      .set(
+                        StorageKeys.CONFIG_CLINICAL_ASSESSMENTS,
+                        clinicalAssessments
                       )
-                    })
-                })
-                .then(() => this.schedule.generateSchedule(true))
-                .then(() => this.rescheduleNotifications())
-            } else {
-              console.log(
-                'NO CONFIG UPDATE. Version of protocol.json has not changed.'
-              )
-              return this.schedule.generateSchedule(false)
+                      .then(() => {
+                        console.log('Pulled clinical questionnaire')
+                        return this.pullQuestionnaires(
+                          StorageKeys.CONFIG_CLINICAL_ASSESSMENTS
+                        )
+                      })
+                  })
+                  .then(() => {
+                    return this.storage
+                      .set(StorageKeys.CONFIG_ASSESSMENTS, scheduledAssessments)
+                      .then(() => {
+                        console.log('Pulled questionnaire')
+                        return this.pullQuestionnaires(
+                          StorageKeys.CONFIG_ASSESSMENTS
+                        )
+                      })
+                  })
+                  .then(() => this.schedule.generateSchedule(true))
+                  .then(() => this.rescheduleNotifications())
+              } else {
+                console.log(
+                  'NO CONFIG UPDATE. Version of protocol.json has not changed.'
+                )
+                return this.schedule.generateSchedule(false)
+              }
             }
-          }
-        })
-        .catch(e => console.log(e))
-    })
+          })
+          .catch(e => console.log(e))
+      }
+    )
   }
 
   rescheduleNotifications() {

diff --git a/src/app/core/services/kafka.service.ts b/src/app/core/services/kafka.service.ts
@@ -126,7 +126,7 @@ export class KafkaService {
       }
       const kafkaObject = { value: value, key: answerKey }
       return this.getSpecs(task, kafkaObject, type).then(specs =>
-        this.createPayloadAndSend(specs)
+        this.cacheAnswers(specs).then(() => this.createPayloadAndSend(specs))
       )
     })
   }
@@ -199,6 +199,7 @@ export class KafkaService {
           })
       },
       error => {
+        this.cacheAnswers(specs)
         console.error(
           'Could not initiate kafka connection ' + JSON.stringify(error)
         )
@@ -209,10 +210,10 @@ export class KafkaService {
 
   cacheAnswers(specs) {
     const kafkaObject = specs.kafkaObject
-    this.storage.get(StorageKeys.CACHE_ANSWERS).then(cache => {
+    return this.storage.get(StorageKeys.CACHE_ANSWERS).then(cache => {
       console.log('KAFKA-SERVICE: Caching answers.')
       cache[kafkaObject.value.time] = specs
-      this.storage.set(StorageKeys.CACHE_ANSWERS, cache)
+      return this.storage.set(StorageKeys.CACHE_ANSWERS, cache)
     })
   }
 

diff --git a/src/app/core/services/storage.service.ts b/src/app/core/services/storage.service.ts
@@ -2,6 +2,7 @@ import 'rxjs/add/operator/map'
 import 'rxjs/add/operator/catch'
 
 import { Injectable } from '@angular/core'
+import { AppVersion } from '@ionic-native/app-version'
 import { Storage } from '@ionic/storage'
 import { throwError as observableThrowError } from 'rxjs'
 
@@ -19,7 +20,7 @@ import { Task } from '../../shared/models/task'
 export class StorageService {
   global: any = {}
 
-  constructor(private storage: Storage) {
+  constructor(private storage: Storage, private appVersion: AppVersion) {
     const setStoragePromise = this.prepareStorage()
     Promise.resolve(setStoragePromise)
   }
@@ -33,9 +34,8 @@ export class StorageService {
     createdDate,
     createdDateMidnight
   ) {
-    const allKeys = this.getAllKeys()
-    return allKeys
-      .then(keys => {
+    return Promise.all([this.getAllKeys(), this.getAppVersion()])
+      .then(([keys, appV]) => {
         // TODO: Find out why this is hard-coded?
         if (keys.length <= 7) {
           const enrolmentDateTime = new Date(createdDate)
@@ -79,6 +79,7 @@ export class StorageService {
             new Date().getTimezoneOffset()
           )
           const cache = this.set(StorageKeys.CACHE_ANSWERS, {})
+          const appVersion = this.set(StorageKeys.APP_VERSION, appV)
 
           return Promise.all([
             pId,
@@ -93,7 +94,8 @@ export class StorageService {
             utc,
             cache,
             enrolmentDate,
-            referenceDate
+            referenceDate,
+            appVersion
           ])
         }
       })
@@ -148,6 +150,10 @@ export class StorageService {
     return this.storage.keys()
   }
 
+  getAppVersion() {
+    return this.appVersion.getVersionNumber()
+  }
+
   prepareStorage() {
     return this.getAllKeys()
       .then(keys => {

diff --git a/src/app/pages/settings/containers/settings-page.component.ts b/src/app/pages/settings/containers/settings-page.component.ts
@@ -71,7 +71,7 @@ export class SettingsPageComponent {
   }
 
   loadSettings() {
-    const appVersionPromise = this.appVersion.getVersionNumber()
+    const appVersionPromise = this.storage.get(StorageKeys.APP_VERSION)
     const configVersion = this.storage.get(StorageKeys.CONFIG_VERSION)
     const scheduleVersion = this.storage.get(StorageKeys.SCHEDULE_VERSION)
     const participantId = this.storage.get(StorageKeys.PARTICIPANTID)

diff --git a/src/app/pages/splash/containers/splash-page.component.ts b/src/app/pages/splash/containers/splash-page.component.ts
@@ -42,7 +42,10 @@ export class SplashPageComponent {
 
   onStart() {
     this.status = 'Updating notifications...'
-    return this.checkTimezoneChange()
+    this.configService.migrateToLatestVersion()
+    return this.configService
+      .fetchConfigState(false)
+      .then(() => this.checkTimezoneChange())
       .then(() => this.notificationsRefresh())
       .catch(error => {
         console.error(error)

diff --git a/src/app/shared/enums/storage.ts b/src/app/shared/enums/storage.ts
@@ -1,4 +1,5 @@
 export class StorageKeys {
+  static APP_VERSION = new StorageKeys('APP_VERSION')
   static REFERENCEDATE = new StorageKeys('REFERENCEDATE')
   static ENROLMENTDATE = new StorageKeys('ENROLMENTDATE')
   static OAUTH_TOKENS = new StorageKeys('OAUTH_TOKENS')