#776 | Perform Genders existence check specific to org

avniproject · Aug 21, 2024 · 2ec78cf · 2ec78cf
1 parent e8848d5
commit 2ec78cf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/avni-server-api/src/main/java/org/avni/server/dao/GenderRepository.java b/avni-server-api/src/main/java/org/avni/server/dao/GenderRepository.java
@@ -9,6 +9,7 @@
 @RepositoryRestResource(collectionResourceRel = "gender", path = "gender")
 public interface GenderRepository extends CHSRepository<Gender>, CustomCHSJpaRepository<Gender, Long>, FindByLastModifiedDateTime<Gender> {
     Gender findByName(String name);
+    Gender findByNameAndOrganisationId(String name, Long organisationId);
     Gender findByNameIgnoreCase(String name);
 
     @RestResource(exported = false)

diff --git a/avni-server-api/src/main/java/org/avni/server/service/OrganisationService.java b/avni-server-api/src/main/java/org/avni/server/service/OrganisationService.java
@@ -915,7 +915,7 @@ public void addGroupDashboardJson(ZipOutputStream zos) throws IOException {
     }
 
     private void createGender(String genderName, Organisation org) {
-        if (Objects.nonNull(genderRepository.findByName(genderName))) {
+        if (Objects.nonNull(genderRepository.findByNameAndOrganisationId(genderName, org.getId()))) {
             return;
         }
         Gender gender = new Gender();