#579 | Create Admin group on new Org creation

avniproject · Jul 21, 2023 · 4e613b9 · 4e613b9
1 parent f33d018
commit 4e613b9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/avni-server-api/src/main/java/org/avni/server/web/OrganisationController.java b/avni-server-api/src/main/java/org/avni/server/web/OrganisationController.java
@@ -11,7 +11,6 @@
 import org.springframework.data.repository.query.Param;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.persistence.criteria.Predicate;
@@ -59,7 +58,8 @@ public ResponseEntity save(@RequestBody OrganisationContract request) {
 
         organisationRepository.save(org);
         createDefaultGenders(org);
-        addDefaultGroup(org.getId());
+        addDefaultGroup(org.getId(), Group.Everyone);
+        addDefaultGroup(org.getId(), Group.Administrators);
         createDefaultOrgConfig(org);
 
         return new ResponseEntity<>(org, HttpStatus.CREATED);
@@ -90,9 +90,9 @@ private void createGender(String genderName, Organisation org) {
         genderRepository.save(gender);
     }
 
-    private void addDefaultGroup(Long organisationId){
+    private void addDefaultGroup(Long organisationId, String groupType){
         Group group = new Group();
-        group.setName(Group.Everyone);
+        group.setName(groupType);
         group.setOrganisationId(organisationId);
         group.setUuid(UUID.randomUUID().toString());
         group.setHasAllPrivileges(true);