#648 - applied to location query

(cherry picked from commit f378e3a)
avniproject · Nov 27, 2023 · d0fff59 · d0fff59
1 parent 4201614
commit d0fff59
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/avni-server-api/src/main/java/org/avni/server/dao/LocationRepository.java b/avni-server-api/src/main/java/org/avni/server/dao/LocationRepository.java
@@ -5,6 +5,7 @@
 import org.avni.server.domain.AddressLevel;
 import org.avni.server.domain.AddressLevelType;
 import org.avni.server.domain.Catchment;
+import org.avni.server.framework.security.UserContextHolder;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.Query;
@@ -131,9 +132,13 @@ default AddressLevel findChildLocation(AddressLevel parent, String title) {
         return this.findByParentAndTitleIgnoreCaseAndIsVoidedFalse(parent, title);
     }
 
-    @Query("select a from AddressLevel a where a.uuid =:id or a.legacyId = :id")
+    @Query("select a from AddressLevel a where (a.uuid =?1 or a.legacyId = ?1) and a.organisationId = ?2")
     @QueryHints({@QueryHint(name = org.hibernate.jpa.QueryHints.HINT_CACHEABLE, value = "true")})
-    AddressLevel findByLegacyIdOrUuid(String id);
+    AddressLevel findByLegacyIdOrUuidAndOrgId(String id, Long organisationId);
+
+    default AddressLevel findByLegacyIdOrUuid(String id) {
+        return this.findByLegacyIdOrUuidAndOrgId(id, UserContextHolder.getUserContext().getOrganisationId());
+    }
 
     @Query(value = "select al.*\n" +
             "from address_level al\n" +

diff --git a/avni-server-api/src/main/java/org/avni/server/web/request/webapp/SubjectTypeContractWeb.java b/avni-server-api/src/main/java/org/avni/server/web/request/webapp/SubjectTypeContractWeb.java
@@ -91,7 +91,8 @@ public static SubjectTypeContractWeb fromOperationalSubjectType(OperationalSubje
         contract.setSyncRegistrationConcept2Usable(subjectType.isSyncRegistrationConcept2Usable());
         contract.setNameHelpText(subjectType.getNameHelpText());
         contract.setSubjectTypeId(subjectType.getId());
-        contract.setEnableRegistrationApproval(formMapping.isEnableApproval());
+        if (formMapping != null)
+            contract.setEnableRegistrationApproval(formMapping.isEnableApproval());
 
         return contract;
     }