avniproject/avni-product#1446 | Handle parent org concept search by n…

…ame. Throw nullpointer if concept not found while saving observation.
avniproject · Dec 14, 2023 · c395d05 · c395d05
1 parent c1289d7
commit c395d05
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/avni-server-api/src/main/java/org/avni/server/dao/ConceptRepository.java b/avni-server-api/src/main/java/org/avni/server/dao/ConceptRepository.java
@@ -23,12 +23,22 @@
 @RepositoryRestResource(collectionResourceRel = "concept", path = "concept")
 public interface ConceptRepository extends ReferenceDataRepository<Concept>, FindByLastModifiedDateTime<Concept> {
     @QueryHints({@QueryHint(name = org.hibernate.jpa.QueryHints.HINT_CACHEABLE, value = "true")})
-    @Query("select c from Concept c where c.name = ?1 and c.organisationId = ?2")
-    Concept findByNameAndOrganisationId(String name, Long organisationId);
+    @Query("select c from Concept c where c.name = ?1 and c.organisationId IN ?2")
+    Concept findByNameAndOrganisationId(String name, List<Long> organisationIds);
+
+    default List<Long> buildOrganisationIdList() {
+        List<Long> organisationIds = new ArrayList<>();
+        UserContext userContext = UserContextHolder.getUserContext();
+        organisationIds.add(userContext.getOrganisationId());
+        if (userContext.getOrganisation().getParentOrganisationId() != null) {
+            organisationIds.add(userContext.getOrganisation().getParentOrganisationId());
+        }
+        return organisationIds;
+    }
 
     @Override
     default Concept findByName(String name) {
-        return this.findByNameAndOrganisationId(name, UserContextHolder.getUserContext().getOrganisationId());
+        return this.findByNameAndOrganisationId(name, buildOrganisationIdList());
     }
 
     Page<Concept> findByIsVoidedFalseAndNameIgnoreCaseContaining(String name, Pageable pageable);
@@ -45,13 +55,7 @@ default Concept findByName(String name) {
 
     @Override
     default Concept findByUuid(String uuid) {
-        List<Long> organisationIds = new ArrayList<>();
-        UserContext userContext = UserContextHolder.getUserContext();
-        organisationIds.add(userContext.getOrganisationId());
-        if (userContext.getOrganisation().getParentOrganisationId() != null) {
-            organisationIds.add(userContext.getOrganisation().getParentOrganisationId());
-        }
-        return this.findByUuidAndOrganisationId(uuid, organisationIds);
+        return this.findByUuidAndOrganisationId(uuid, buildOrganisationIdList());
     }
 
     @Query("select c from Concept c where c.isVoided = false")

diff --git a/avni-server-api/src/main/java/org/avni/server/service/ObservationService.java b/avni-server-api/src/main/java/org/avni/server/service/ObservationService.java
@@ -63,6 +63,9 @@ public ObservationCollection createObservations(List<ObservationRequest> observa
                     } else {
                         concept = conceptRepository.findByUuid(observationRequest.getConceptUUID());
                     }
+                    if (concept == null) {
+                        throw new NullPointerException(String.format("Concept with uuid=%s/name=%s not found", observationRequest.getConceptUUID(), observationRequest.getConceptName()));
+                    }
                     return new SimpleEntry<>(concept, observationRequest.getValue());
                 })
                 .filter(obsReqAsMap -> null != obsReqAsMap.getKey()