Add boolean to the TopicOverview Object

coral/src/app/features/topics/details/TopicDetails.test.tsx

@@ -50,6 +50,7 @@ const testTopicOverview: TopicOverview = {
   schemaExists: false,
   prefixAclsExists: false,
   txnAclsExists: false,
+  createSchemaAllowed: false,
   topicInfo: {
     topicName: testTopicName,
     noOfPartitions: 1,
@@ -148,6 +149,7 @@ const testTopicSchemas: TopicSchemaOverview = {
   txnAclsExists: false,
   allSchemaVersions: [1],
   latestVersion: 1,
+  createSchemaAllowed: false,
   schemaPromotionDetails: {
     status: "SUCCESS",
     sourceEnv: "3",
@@ -166,7 +168,6 @@ const testTopicSchemas: TopicSchemaOverview = {
     showNext: false,
     showPrev: false,
     latest: true,
-    promoteOnly: false,
   },
 };
 

coral/src/app/features/topics/details/components/TopicDetailsResourceTabs.test.tsx

@@ -52,6 +52,7 @@ const testTopicOverview: TopicOverview = {
   schemaExists: false,
   prefixAclsExists: false,
   txnAclsExists: false,
+  createSchemaAllowed: false,
   topicInfo: {
     topicName: testTopicName,
     noOfPartitions: 1,

coral/src/app/features/topics/details/documentation/TopicDocumentation.test.tsx

@@ -34,6 +34,7 @@ const testTopicOverview: TopicOverview = {
   prefixAclsExists: false,
   schemaExists: false,
   txnAclsExists: false,
+  createSchemaAllowed: false,
   topicPromotionDetails: { status: "NO_PROMOTION" },
   topicIdForDocumentation: 99999,
   topicInfo: {

coral/src/app/features/topics/details/history/TopicHistory.test.tsx

@@ -30,6 +30,7 @@ const testTopicOverview: TopicOverview = {
   schemaExists: false,
   prefixAclsExists: false,
   txnAclsExists: false,
+  createSchemaAllowed: false,
   topicInfo: {
     noOfPartitions: 1,
     noOfReplicas: "1",
@@ -72,6 +73,7 @@ const testTopicSchemas: TopicSchemaOverview = {
   txnAclsExists: false,
   allSchemaVersions: [1],
   latestVersion: 1,
+  createSchemaAllowed: false,
   schemaPromotionDetails: {
     status: "SUCCESS",
     sourceEnv: "3",
@@ -90,7 +92,6 @@ const testTopicSchemas: TopicSchemaOverview = {
     showNext: false,
     showPrev: false,
     latest: true,
-    promoteOnly: false,
   },
 };
 

coral/src/app/features/topics/details/schema/TopicDetailsSchema.test.tsx

@@ -25,6 +25,7 @@ const testTopicSchemas: TopicSchemaOverview = {
   txnAclsExists: false,
   topicExists: true,
   schemaExists: true,
+  createSchemaAllowed: true,
   allSchemaVersions: [3, 2, 1],
   latestVersion: 3,
   schemaPromotionDetails: {
@@ -45,7 +46,6 @@ const testTopicSchemas: TopicSchemaOverview = {
     showNext: true,
     showPrev: false,
     latest: true,
-    promoteOnly: false,
   },
 };
 
@@ -54,6 +54,7 @@ const noPromotion_testTopicSchemas = {
   schemaExists: true,
   prefixAclsExists: false,
   txnAclsExists: false,
+  createSchemaAllowed: false,
   allSchemaVersions: [3, 2, 1],
   latestVersion: 3,
   schemaPromotionDetails: {
@@ -71,7 +72,6 @@ const noPromotion_testTopicSchemas = {
     showNext: true,
     showPrev: false,
     latest: true,
-    promoteOnly: false,
   },
 };
 

coral/src/app/features/topics/details/settings/TopicSettings.test.tsx

@@ -52,6 +52,7 @@ const testTopicOverview: TopicOverview = {
   prefixAclsExists: false,
   txnAclsExists: false,
   schemaExists: false,
+  createSchemaAllowed: false,
   topicInfo: testTopicInfo,
   aclInfoList: [],
   topicHistoryList: [],

coral/src/app/features/topics/details/subscriptions/TopicSubscriptions.test.tsx

@@ -70,6 +70,7 @@ const testTopicOverview: TopicOverview = {
   schemaExists: false,
   prefixAclsExists: false,
   txnAclsExists: false,
+  createSchemaAllowed: false,
   topicInfo: {
     noOfPartitions: 1,
     noOfReplicas: "1",

coral/src/app/features/topics/details/utils.test.ts

@@ -6,6 +6,7 @@ const mockUseTopicDetailsDataWithAcl: TopicOverview = {
   schemaExists: false,
   prefixAclsExists: false,
   txnAclsExists: false,
+  createSchemaAllowed: false,
   topicInfo: {
     topicName: "aivendemotopic",
     noOfPartitions: 1,
@@ -74,6 +75,7 @@ const mockUseTopicDetailsDataWithoutAcl: TopicOverview = {
   schemaExists: false,
   prefixAclsExists: false,
   txnAclsExists: false,
+  createSchemaAllowed: false,
   topicInfo: {
     topicName: "aivendemotopic",
     noOfPartitions: 1,

coral/src/domain/topic/topic-transformer.test.ts

@@ -198,6 +198,7 @@ describe("topic-transformer.ts", () => {
         schemaExists: false,
         prefixAclsExists: false,
         txnAclsExists: false,
+        createSchemaAllowed: false,
         topicInfoList: [
           {
             topicName: "test-topic",
@@ -238,6 +239,7 @@ describe("topic-transformer.ts", () => {
         prefixAclsExists: false,
         schemaExists: false,
         topicExists: false,
+        createSchemaAllowed: false,
         topicIdForDocumentation: 1,
         topicInfo: {
           envId: "4",
@@ -276,6 +278,7 @@ describe("topic-transformer.ts", () => {
         prefixAclsExists: false,
         txnAclsExists: false,
         schemaExists: false,
+        createSchemaAllowed: false,
         topicInfoList: [
           {
             topicName: "test-topic",
@@ -370,6 +373,7 @@ describe("topic-transformer.ts", () => {
         prefixAclsExists: false,
         schemaExists: false,
         topicExists: false,
+        createSchemaAllowed: false,
         topicIdForDocumentation: 1,
         topicInfo: {
           envId: "4",

coral/types/api.d.ts

@@ -1081,6 +1081,7 @@ export type components = {
       schemaExists: boolean;
       prefixAclsExists: boolean;
       txnAclsExists: boolean;
+      createSchemaAllowed: boolean;
       topicInfoList: (components["schemas"]["TopicOverviewInfo"])[];
       aclInfoList?: (components["schemas"]["AclOverviewInfo"])[];
       prefixedAclInfoList?: (components["schemas"]["AclOverviewInfo"])[];
@@ -1368,13 +1369,13 @@ export type components = {
       showNext: boolean;
       showPrev: boolean;
       latest: boolean;
-      promoteOnly: boolean;
     };
     SchemaOverview: {
       topicExists: boolean;
       schemaExists: boolean;
       prefixAclsExists: boolean;
       txnAclsExists: boolean;
+      createSchemaAllowed: boolean;
       allSchemaVersions?: (number)[];
       /** Format: int32 */
       latestVersion?: number;

core/src/main/java/io/aiven/klaw/model/response/ResourceOverviewAttributes.java

@@ -9,4 +9,6 @@ public class ResourceOverviewAttributes {
   @NotNull boolean schemaExists;
   @NotNull boolean prefixAclsExists;
   @NotNull boolean txnAclsExists;
+  // Indicates if this schema env is restricted to only allow new schemas through promotion.
+  @NotNull private boolean createSchemaAllowed;
 }

core/src/main/java/io/aiven/klaw/model/response/SchemaDetailsPerEnv.java

@@ -27,6 +27,4 @@ public class SchemaDetailsPerEnv {
   @NotNull private boolean showPrev;
   // simple boolean to identify if this is the latest schema on the topic for that environment.
   @NotNull private boolean latest;
-  // Indicates if this schema env is restricted to only allow new schemas through promotion.
-  @NotNull private boolean promoteOnly;
 }

core/src/main/java/io/aiven/klaw/service/CommonUtilsService.java

@@ -795,6 +795,14 @@ public boolean existsSchemaForTopic(String topicName, String topicEnvId, int ten
         .isPresent();
   }
 
+  public boolean isCreateNewSchemaAllowed(String schemaEnvId, int tenantId) {
+    KwTenantConfigModel tenantModel = manageDatabase.getTenantConfig().get(tenantId);
+    List<String> reqSchemaEnvs =
+        tenantModel == null ? new ArrayList<>() : tenantModel.getRequestSchemaEnvironmentsList();
+
+    return reqSchemaEnvs.contains(schemaEnvId);
+  }
+
   public Env getEnvDetails(String envId, int tenantId) {
     Optional<Env> envFound =
         manageDatabase.getKafkaEnvList(tenantId).stream()

core/src/main/java/io/aiven/klaw/service/SchemaOverviewService.java

@@ -7,7 +7,6 @@
 import io.aiven.klaw.dao.KwClusters;
 import io.aiven.klaw.dao.MessageSchema;
 import io.aiven.klaw.dao.Topic;
-import io.aiven.klaw.model.KwTenantConfigModel;
 import io.aiven.klaw.model.enums.KafkaClustersType;
 import io.aiven.klaw.model.enums.PromotionStatusType;
 import io.aiven.klaw.model.enums.RequestOperationType;
@@ -204,6 +203,8 @@ private void updateAvroSchema(
         log.debug("SchemaDetails {}", schemaDetailsPerEnv);
         schemaOverview.setSchemaDetailsPerEnv(schemaDetailsPerEnv);
       }
+      schemaOverview.setCreateSchemaAllowed(
+          commonUtilsService.isCreateNewSchemaAllowed(schemaEnv.getId(), tenantId));
     }
   }
 
@@ -215,12 +216,6 @@ private void setSchemaDetailsPerEnvVersionAndCompatibility(
       Env schemaEnv) {
     updateIdAndCompatibility(schemaDetailsPerEnv, hashMapSchemaObj);
     schemaDetailsPerEnv.setVersion(latestSchemaVersion);
-
-    KwTenantConfigModel tenantModel = manageDatabase.getTenantConfig().get(tenantId);
-    List<String> reqSchemaEnvs =
-        tenantModel == null ? new ArrayList<>() : tenantModel.getRequestSchemaEnvironmentsList();
-
-    schemaDetailsPerEnv.setPromoteOnly(!reqSchemaEnvs.contains(schemaEnv.getId()));
   }
 
   private static void updateIdAndCompatibility(

core/src/main/java/io/aiven/klaw/service/TopicOverviewService.java

@@ -335,6 +335,12 @@ private void updateTopicOverviewItems(
           topicOverview.setSchemaExists(
               commonUtilsService.existsSchemaForTopic(topicNameSearch, environmentId, tenantId));
         }
+        Env env = commonUtilsService.getEnvDetails(environmentId, tenantId);
+        if (env != null && env.getAssociatedEnv() != null) {
+          topicOverview.setCreateSchemaAllowed(
+              commonUtilsService.isCreateNewSchemaAllowed(
+                  env.getAssociatedEnv().getId(), tenantId));
+        }
       } else {
         PromotionStatus promotionStatus = new PromotionStatus();
         promotionStatus.setStatus(PromotionStatusType.NOT_AUTHORIZED);

core/src/test/java/io/aiven/klaw/service/SchemaOverviewServiceTest.java

@@ -128,7 +128,7 @@ public void getGivenASchemaWithManySchemaEnv_ReturnNextInPromotion() throws Exce
     assertThat(returnedValue.getSchemaPromotionDetails()).isNotNull();
     assertThat(returnedValue.getSchemaPromotionDetails().getStatus())
         .isEqualTo(PromotionStatusType.SUCCESS);
-    assertThat(returnedValue.getSchemaDetailsPerEnv().isPromoteOnly()).isFalse();
+    assertThat(returnedValue.isCreateSchemaAllowed()).isTrue();
     assertThat(returnedValue.getSchemaPromotionDetails().getSourceEnv()).isEqualTo("1");
     assertThat(returnedValue.getSchemaPromotionDetails().getTargetEnv()).isEqualTo("test-2");
   }
@@ -330,7 +330,7 @@ public void givenASchemaInHighestEnv_ReturnNoPromotion() throws Exception {
     assertThat(returnedValue.getSchemaPromotionDetails()).isNotNull();
     assertThat(returnedValue.getSchemaPromotionDetails().getStatus())
         .isEqualTo(PromotionStatusType.NO_PROMOTION);
-    assertThat(returnedValue.getSchemaDetailsPerEnv().isPromoteOnly()).isTrue();
+    assertThat(returnedValue.isCreateSchemaAllowed()).isFalse();
   }
 
   private TreeMap<Integer, Map<String, Object>> getAvroSchemas(int numOfEntries) {
@@ -487,13 +487,8 @@ private void stubEnvironments() {
     when(handleDbRequests.getEnvDetails("2", 101)).thenReturn(kafkaEnv2);
     when(handleDbRequests.getEnvDetails("3", 101)).thenReturn(schemaEnv1);
     when(handleDbRequests.getEnvDetails("4", 101)).thenReturn(schemaEnv2);
-    when(manageDatabase.getTenantConfig())
-        .thenReturn(
-            new HashMap<>() {
-              {
-                put(101, model);
-              }
-            });
+    when(commonUtilsService.isCreateNewSchemaAllowed(eq("3"), eq(101))).thenReturn(true);
+    when(commonUtilsService.isCreateNewSchemaAllowed(eq("4"), eq(101))).thenReturn(false);
   }
 
   private void stubKafkaPromotion(String testtopic, int numberOfEnvs) throws Exception {

core/src/test/java/io/aiven/klaw/service/TopicOverviewServiceTest.java

@@ -15,11 +15,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.aiven.klaw.UtilMethods;
 import io.aiven.klaw.config.ManageDatabase;
-import io.aiven.klaw.dao.Acl;
-import io.aiven.klaw.dao.Env;
-import io.aiven.klaw.dao.KwClusters;
-import io.aiven.klaw.dao.Topic;
-import io.aiven.klaw.dao.UserInfo;
+import io.aiven.klaw.dao.*;
 import io.aiven.klaw.error.KlawException;
 import io.aiven.klaw.helpers.db.rdbms.HandleDbRequestsJdbc;
 import io.aiven.klaw.model.KwTenantConfigModel;
@@ -215,6 +211,7 @@ public void givenATopicWithOnlyOneKafkaEnv_ReturnNoPromotion() throws Exception
   public void getGivenATopicWithManyKafkaEnv_ReturnNextInPromotion() throws Exception {
     stubUserInfo();
     stubKafkaPromotion(TESTTOPIC, 15);
+    stubEnvironment("1", "4");
     stubSchemaPromotionInfo(TESTTOPIC, KafkaClustersType.KAFKA, 15);
     when(commonUtilsService.getTopicsForTopicName(TESTTOPIC, 101))
         .thenReturn(List.of(createTopic(TESTTOPIC)));
@@ -335,6 +332,7 @@ public void givenARequestWithAnOrderEnsureItIsCorrectlyUsed(AclGroupBy groupBy)
   public void getTopicOverview() {
     mockTenantConfig();
     stubUserInfo();
+    stubEnvironment("1", "4");
     when(commonUtilsService.getTenantId(any())).thenReturn(101);
     when(commonUtilsService.getEnvsFromUserId(anyString()))
         .thenReturn(new HashSet<>(Arrays.asList("1", "2", "3")));
@@ -349,6 +347,7 @@ public void getTopicOverview() {
 
     when(manageDatabase.getAllEnvList(anyInt()))
         .thenReturn(createListOfEnvs(KafkaClustersType.SCHEMA_REGISTRY, 5));
+    when(commonUtilsService.isCreateNewSchemaAllowed(eq("4"), eq(101))).thenReturn(true);
 
     TopicOverview topicOverview =
         topicOverviewService.getTopicOverview(TESTTOPIC, "1", AclGroupBy.NONE);
@@ -358,13 +357,15 @@ public void getTopicOverview() {
         .isEqualTo(PromotionStatusType.NO_PROMOTION);
     assertThat(topicOverview.getTopicInfoList().get(0).isTopicDeletable())
         .isTrue(); // topic can be deleted
-
+    assertThat(topicOverview.isCreateSchemaAllowed()).isTrue();
     when(commonUtilsService.getTopicsForTopicName(anyString(), anyInt()))
         .thenReturn(utilMethods.getTopicInMultipleEnvs("testtopic", TEAMID, 2));
     when(commonUtilsService.getFilteredTopicsForTenant(any()))
         .thenReturn(utilMethods.getTopicInMultipleEnvs("testtopic", TEAMID, 2));
 
     topicOverview = topicOverviewService.getTopicOverview(TESTTOPIC, "2", AclGroupBy.NONE);
+    stubEnvironment("1", "5");
+    when(commonUtilsService.isCreateNewSchemaAllowed(eq("5"), eq(101))).thenReturn(false);
     assertThat(topicOverview.getAvailableEnvironments().size()).isEqualTo(2);
     assertThat(topicOverview.getTopicInfoList().size()).isEqualTo(1);
     assertThat(topicOverview.getTopicPromotionDetails().getStatus())
@@ -393,6 +394,7 @@ public void getTopicOverview() {
     assertThat(topicOverview.getTopicInfoList().get(0).isHasOpenRequest())
         .isFalse(); // topic hasAcl
     assertThat(topicOverview.getTopicInfoList().get(0).isHasSchema()).isFalse(); // topic hasAcl
+    assertThat(topicOverview.isCreateSchemaAllowed()).isFalse();
   }
 
   @Test
@@ -980,4 +982,15 @@ private void stubUserInfo() {
     when(mailService.getUserName(any())).thenReturn(TEAM_ID);
     when(commonUtilsService.getTeamId(eq(TEAM_ID))).thenReturn(TEAMID);
   }
+
+  private void stubEnvironment(String kafkaEnvId, String schemaEnvId) {
+    Env env = new Env();
+    EnvTag tag = new EnvTag();
+    tag.setId(schemaEnvId);
+    tag.setName("ENV");
+    env.setEnvExists("true");
+    env.setAssociatedEnv(tag);
+    env.setId(kafkaEnvId);
+    when(commonUtilsService.getEnvDetails(eq(kafkaEnvId), eq(101))).thenReturn(env);
+  }
 }