#1365 | Fetch Individuals of SubjectType.User as well during sync

avniproject · May 1, 2024 · e1af360 · e1af360
1 parent 055e3b7
commit e1af360
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/packages/openchs-android/package-lock.json b/packages/openchs-android/package-lock.json
diff --git a/packages/openchs-android/package.json b/packages/openchs-android/package.json
@@ -58,7 +58,7 @@
     "lodash": "4.17.21",
     "moment": "2.29.4",
     "native-base": "3.4.9",
-    "openchs-models": "1.31.62",
+    "openchs-models": "1.31.66",
     "prop-types": "15.8.1",
     "react": "18.2.0",
     "react-native": "0.72.3",

diff --git a/packages/openchs-android/src/service/BaseAddressLevelService.js b/packages/openchs-android/src/service/BaseAddressLevelService.js
@@ -83,7 +83,7 @@ class BaseAddressLevelService extends BaseService {
     }
 
     getChildrenParent(parentUUID) {
-        if (_.isNil(parentUUID)) return [];
+        if (_.isEmpty(parentUUID)) return [];
         return [...this.findAllByCriteria(`parentUuid = '${parentUUID}' AND voided = false`, this.getSchema())];
     }
 

diff --git a/packages/openchs-android/src/service/SyncService.js b/packages/openchs-android/src/service/SyncService.js
@@ -162,8 +162,9 @@ class SyncService extends BaseService {
 
     async getSyncDetails() {
         const url = this.getService(SettingsService).getSettings().serverURL;
+        const requestParams = "includeUserSubjectType=true"
         const entitySyncStatuses = this.entitySyncStatusService.findAll().map(_.identity);
-        return post(`${url}/v2/syncDetails`, entitySyncStatuses, true)
+        return post(`${url}/v2/syncDetails?${requestParams}`, entitySyncStatuses, true)
             .then(res => res.json())
             .then(({syncDetails, nowMinus10Seconds, now}) => ({
                 syncDetails,