fix: cauche custom forms in populate cache

hopetambala · Jan 28, 2021 · d79778c · d79778c
1 parent 4431281
commit d79778c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/modules/cached-resources/populate-cache.js b/modules/cached-resources/populate-cache.js
@@ -1,4 +1,4 @@
-import { cacheAutofillData, cacheResidentData } from './read';
+import { cacheAutofillData, cacheResidentData, customFormsQuery } from './read';
 import { retrieveCurrentUserAsyncFunction } from '../../services/parse/auth';
 import { storeData } from '../async-storage';
 
@@ -24,13 +24,17 @@ export default function populateCache(user) {
       }
     })
     .then(() => {
+      // store ID forms
       const queryParams = {
         skip: 0,
         offset: 0,
         limit: 100000,
         parseColumn: 'surveyingOrganization',
-        parseParam: user.get("organization"),
+        parseParam: user.get('organization'),
       };
       cacheResidentData(queryParams);
     })
+    .then(() => {
+      customFormsQuery(user.get('organization'));
+    })
 }
diff --git a/modules/cached-resources/read.js b/modules/cached-resources/read.js
@@ -42,8 +42,17 @@ function customFormsQuery(surveyingOrganization) {
     checkOnlineStatus().then((online) => {
       if (online) {
         customQueryService(0, 5000, 'FormSpecificationsV2', 'organizations', surveyingOrganization).then(async (forms) => {
-          await storeData(forms, 'customForms');
-          resolve(JSON.parse(JSON.stringify(forms)));
+          if (forms !== null && forms !== undefined && forms !== '') {
+            await storeData(forms, 'customForms');
+            resolve(JSON.parse(JSON.stringify(forms)));
+          }
+          else {
+            getData('customForms').then((forms) => {
+              resolve(forms);
+            }, (error) => {
+              reject(error);
+            });
+          }
         }, (error) => {
           reject(error);
         });