avniproject/avni-webapp#1147 - organisation category support

avniproject · Apr 10, 2024 · 8e384fa · 8e384fa
1 parent 6d85fb2
commit 8e384fa
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 4 deletions.
diff --git a/avni-server-api/src/main/java/org/avni/server/domain/Organisation.java b/avni-server-api/src/main/java/org/avni/server/domain/Organisation.java
@@ -1,11 +1,11 @@
 package org.avni.server.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.avni.server.domain.metadata.OrganisationCategory;
 import org.hibernate.annotations.BatchSize;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
-import java.util.UUID;
 
 @Entity
 @Table(name = "organisation")
@@ -24,6 +24,10 @@ public class Organisation extends ETLEntity {
     @JoinColumn(name = "account_id", nullable = false)
     private Account account;
 
+    @NotNull
+    @Enumerated(EnumType.STRING)
+    private OrganisationCategory category;
+
     public Organisation() {
     }
 
@@ -76,4 +80,12 @@ public boolean isNew() {
     public String getEffectiveUsernameSuffix() {
         return usernameSuffix == null ? getDbUser() : usernameSuffix;
     }
+
+    public OrganisationCategory getCategory() {
+        return category;
+    }
+
+    public void setCategory(OrganisationCategory organisationCategory) {
+        this.category = organisationCategory;
+    }
 }
diff --git a/avni-server-api/src/main/java/org/avni/server/domain/metadata/OrganisationCategory.java b/avni-server-api/src/main/java/org/avni/server/domain/metadata/OrganisationCategory.java
@@ -0,0 +1,5 @@
+package org.avni.server.domain.metadata;
+
+public enum OrganisationCategory {
+    Production, UAT, Prototype, Temporary
+}
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
@@ -54,6 +54,7 @@ public ResponseEntity save(@RequestBody OrganisationContract request) {
         org.setUuid(request.getUuid() == null ? UUID.randomUUID().toString() : request.getUuid());
         org.setDbUser(request.getDbUser());
         org.setSchemaName(request.getSchemaName());
+        org.setCategory(request.getCategory());
         setAttributesOnOrganisation(request, org);
         setOrgAccountByIdOrDefault(org, request.getAccountId());
 
@@ -161,6 +162,7 @@ private void setAttributesOnOrganisation(@RequestBody OrganisationContract reque
         }
         organisation.setMediaDirectory(request.getMediaDirectory());
         organisation.setVoided(request.isVoided());
+        organisation.setCategory(request.getCategory());
     }
 
     private void setOrgAccountByIdOrDefault(Organisation organisation, Long accountId) {

diff --git a/avni-server-api/src/main/java/org/avni/server/web/request/OrganisationContract.java b/avni-server-api/src/main/java/org/avni/server/web/request/OrganisationContract.java
@@ -1,12 +1,14 @@
 package org.avni.server.web.request;
 
 import org.avni.server.domain.Organisation;
+import org.avni.server.domain.metadata.OrganisationCategory;
 
 public class OrganisationContract extends ETLContract {
     private Long parentOrganisationId;
     private String mediaDirectory;
     private String usernameSuffix;
     private Long accountId;
+    private OrganisationCategory category;
 
     public static OrganisationContract fromEntity(Organisation organisation) {
         OrganisationContract organisationContract = new OrganisationContract();
@@ -16,6 +18,7 @@ public static OrganisationContract fromEntity(Organisation organisation) {
         organisationContract.setMediaDirectory(organisation.getMediaDirectory());
         organisationContract.setUsernameSuffix(organisation.getEffectiveUsernameSuffix());
         organisationContract.setAccountId(organisation.getAccount() == null ? null : organisation.getAccount().getId());
+        organisationContract.setCategory(organisation.getCategory());
         mapEntity(organisationContract, organisation);
         return organisationContract;
     }
@@ -52,4 +55,11 @@ public void setMediaDirectory(String mediaDirectory) {
         this.mediaDirectory = mediaDirectory;
     }
 
+    public OrganisationCategory getCategory() {
+        return category;
+    }
+
+    public void setCategory(OrganisationCategory category) {
+        this.category = category;
+    }
 }
diff --git a/avni-server-api/src/main/java/org/avni/server/web/request/UserInfoClientContract.java b/avni-server-api/src/main/java/org/avni/server/web/request/UserInfoClientContract.java
@@ -1,6 +1,7 @@
 package org.avni.server.web.request;
 
 import org.avni.server.domain.JsonObject;
+import org.avni.server.domain.metadata.OrganisationCategory;
 import org.springframework.hateoas.core.Relation;
 
 import java.util.List;
@@ -9,15 +10,13 @@
 public class UserInfoClientContract extends UserInfoContract {
     private long lastSessionTime;
     private List<GroupPrivilegeContract> privileges;
-    private String[] roles;
 
     public UserInfoClientContract() {
     }
 
     public UserInfoClientContract(String username, String orgName, Long orgId, String usernameSuffix, String[] roles, JsonObject settings, String name, String catchmentName, JsonObject syncSettings, List<GroupPrivilegeContract> privileges) {
         super(username, orgName, orgId, usernameSuffix, settings, name, catchmentName, syncSettings);
         this.privileges = privileges;
-        this.roles = roles;
     }
 
     public List<GroupPrivilegeContract> getPrivileges() {

diff --git a/avni-server-api/src/main/resources/db/migration/V1_337__OrganisationCategory.sql b/avni-server-api/src/main/resources/db/migration/V1_337__OrganisationCategory.sql
@@ -0,0 +1 @@
+alter table organisation add column category varchar(255) not null default 'Production';
diff --git a/avni-server-api/src/test/java/org/avni/server/domain/factory/TestOrganisationBuilder.java b/avni-server-api/src/test/java/org/avni/server/domain/factory/TestOrganisationBuilder.java
@@ -2,6 +2,7 @@
 
 import org.avni.server.domain.Account;
 import org.avni.server.domain.Organisation;
+import org.avni.server.domain.metadata.OrganisationCategory;
 
 import java.util.UUID;
 
@@ -10,7 +11,7 @@ public class TestOrganisationBuilder {
 
     public TestOrganisationBuilder withMandatoryFields() {
         String placeholder = UUID.randomUUID().toString();
-        return withUuid(placeholder).withDbUser("testDbUser").withName(placeholder).withSchemaName(placeholder);
+        return withUuid(placeholder).withDbUser("testDbUser").withName(placeholder).withSchemaName(placeholder).setCategory(OrganisationCategory.Production);
     }
 
     public TestOrganisationBuilder setId(long id) {
@@ -43,6 +44,11 @@ public TestOrganisationBuilder withAccount(Account account) {
     	return this;
     }
 
+    public TestOrganisationBuilder setCategory(OrganisationCategory organisationCategory) {
+        organisation.setCategory(organisationCategory);
+        return this;
+    }
+
     public Organisation build() {
         return organisation;
     }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		alter table organisation add column category varchar(255) not null default 'Production';