Revert "Revert "#1033 | Use baseservice method instead of convoluted …

…logic"" This reverts commit 717630a.
avniproject · Jul 24, 2023 · a00015e · a00015e
1 parent 2a2d134
commit a00015e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/packages/openchs-android/src/service/IndividualService.js b/packages/openchs-android/src/service/IndividualService.js
@@ -673,11 +673,6 @@ class IndividualService extends BaseService {
             .sorted('name');
     }
 
-    getSubjectByUUIDAndType(uuid, subjectTypeName) {
-        return this.getAllNonVoided()
-            .find('uuid = $0 and subjectType.name = $1', uuid, subjectTypeName);
-    }
-
     findAllWithMobileNumber(mobileNumber) {
         return this.getAllNonVoided()
             .filter(ind => _.toString(ind.getMobileNumber()).slice(-10) === _.toString(mobileNumber).slice(-10));

diff --git a/packages/openchs-android/src/service/facade/IndividualServiceFacade.js b/packages/openchs-android/src/service/facade/IndividualServiceFacade.js
@@ -10,9 +10,9 @@ class IndividualServiceFacade {
             .getSubjectsInLocation(addressLevel, subjectTypeName).map(_.identity);
     }
 
-    getSubjectByUUIDAndType(uuid, subjectTypeName) {
+    getSubjectByUUID(uuid) {
         return GlobalContext.getInstance().beanRegistry.getService(IndividualService)
-            .getSubjectByUUIDAndType(uuid, subjectTypeName).map(_.identity);
+            .findByUUID(uuid);
     }
 }