avniproject/avni-product#1646 | Restore changes for #749 after merge

avniproject · Aug 20, 2024 · 0350404 · 0350404
1 parent 8f86adf
commit 0350404
Showing 1 changed file with 6 additions and 3 deletions.
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
@@ -940,8 +940,9 @@ private void createGender(String genderName, Organisation org) {
     }
 
     private Group addDefaultGroupIfNotPresent(Long organisationId, String groupType) {
-        if (Objects.nonNull(groupRepository.findByNameAndOrganisationId(groupType, organisationId))) {
-            return null;
+        Group existingGroup = groupRepository.findByNameAndOrganisationId(groupType, organisationId);
+        if (Objects.nonNull(existingGroup)) {
+            return existingGroup;
         }
         Group group = new Group();
         group.setName(groupType);
@@ -964,8 +965,10 @@ public void setupBaseOrganisationAdminConfig(Organisation organisation) {
 
     public void setupBaseOrganisationMetadata(Organisation organisation) {
         createDefaultGenders(organisation);
-        addDefaultGroupIfNotPresent(organisation.getId(), Group.Everyone);
+        Group everyoneGroup = addDefaultGroupIfNotPresent(organisation.getId(), Group.Everyone);
         addDefaultGroupIfNotPresent(organisation.getId(), Group.Administrators);
+        Dashboard defaultDashboard = dashboardService.createDefaultDashboard(organisation);
+        groupDashboardService.createDefaultGroupDashboardForOrg(organisation, everyoneGroup, defaultDashboard);
     }
 
     public Organisation getCurrentOrganisation() {