Issue 1712 add status information

coral/src/domain/environment/environment-test-helper.test.ts

@@ -13,6 +13,7 @@ describe("environment-test-helper.ts", () => {
         defaultPartitions: undefined,
         defaultReplicationFactor: undefined,
         envStatus: "ONLINE",
+        envStatusTime: "2023-09-08T12:34:10.615919098",
         id: "1",
         maxPartitions: undefined,
         maxReplicationFactor: undefined,

coral/src/domain/environment/environment-test-helper.ts

@@ -10,6 +10,7 @@ const defaultEnvironmentDTO: KlawApiModel<"EnvModelResponse"> = {
   tenantName: "default",
   clusterName: "DEV",
   envStatus: "ONLINE",
+  envStatusTime: "2023-09-08T12:34:10.615919098",
   otherParams:
     "default.partitions=2,max.partitions=2,default.replication.factor=1,max.replication.factor=1,topic.prefix=,topic.suffix=",
   showDeleteEnv: false,

coral/src/services/api.ts

@@ -205,6 +205,8 @@ const API_PATHS = {
     | "getKafkaEnv"
     | "getKafkaConnectEnv"
     | "getSchemaRegEnv"
+    | "addEnvToCache"
+    | "removeEnvFromCache"
   >]: keyof ApiPaths;
 };
 
@@ -219,6 +221,14 @@ type GetTopicRequest = (params: { topicReqId: string }) => keyof ApiPaths;
 type GetKafkaEnv = (params: { envId: string }) => keyof ApiPaths;
 type GetConnectEnv = (params: { envId: string }) => keyof ApiPaths;
 type GetSchemaRegEnv = (params: { envId: string }) => keyof ApiPaths;
+type AddEnvToCache = (params: {
+  tenantId: string;
+  id: string;
+}) => keyof ApiPaths;
+type RemoveEnvFromCache = (params: {
+  tenantId: string;
+  id: string;
+}) => keyof ApiPaths;
 
 const DYNAMIC_API_PATHS = {
   getSchemaOfTopicFromSource: ({
@@ -238,6 +248,10 @@ const DYNAMIC_API_PATHS = {
     `/environments/kafkaconnect/${envId}` as keyof ApiPaths,
   getSchemaRegEnv: ({ envId }: Parameters<GetSchemaRegEnv>[0]) =>
     `/environments/schemaRegistry/${envId}` as keyof ApiPaths,
+  addEnvToCache: ({ tenantId, id }: Parameters<AddEnvToCache>[0]) =>
+    `/environment/tenant/${tenantId}/id/${id}` as keyof ApiPaths,
+  removeEnvFromCache: ({ tenantId, id }: Parameters<RemoveEnvFromCache>[0]) =>
+    `/environment/tenant/${tenantId}/id/${id}` as keyof ApiPaths,
 } satisfies {
   [key in keyof Pick<
     ApiOperations,
@@ -247,13 +261,17 @@ const DYNAMIC_API_PATHS = {
     | "getKafkaEnv"
     | "getKafkaConnectEnv"
     | "getSchemaRegEnv"
+    | "addEnvToCache"
+    | "removeEnvFromCache"
   >]:
     | GetSchemaOfTopicFromSource
     | GetSwitchTeams
     | GetTopicRequest
     | GetKafkaEnv
     | GetConnectEnv
-    | GetSchemaRegEnv;
+    | GetSchemaRegEnv
+    | AddEnvToCache
+    | RemoveEnvFromCache;
 };
 
 type Params = URLSearchParams;

coral/types/api.d.ts

@@ -207,6 +207,10 @@ export type paths = {
   "/chPwd": {
     post: operations["changePwd"];
   };
+  "/cache/environment/tenant/{tenantId}/id/{id}": {
+    post: operations["addEnvToCache"];
+    delete: operations["removeEnvFromCache"];
+  };
   "/addTenantId": {
     post: operations["addTenantId"];
   };
@@ -872,6 +876,40 @@ export type components = {
       envId: string;
       includeOnlyFailedTasks: boolean;
     };
+    Env: {
+      id?: string;
+      /** Format: int32 */
+      tenantId?: number;
+      name?: string;
+      stretchCode?: string;
+      /** Format: int32 */
+      clusterId?: number;
+      type?: string;
+      otherParams?: string;
+      envExists?: string;
+      /** @enum {string} */
+      envStatus?: "OFFLINE" | "ONLINE" | "NOT_KNOWN";
+      /** Format: date-time */
+      envStatusTime?: string;
+      associatedEnv?: components["schemas"]["EnvTag"];
+      params?: components["schemas"]["EnvParams"];
+    };
+    EnvParams: {
+      defaultPartitions?: string;
+      maxPartitions?: string;
+      partitionsList?: (string)[];
+      defaultRepFactor?: string;
+      maxRepFactor?: string;
+      replicationFactorList?: (string)[];
+      topicPrefix?: (string)[];
+      topicSuffix?: (string)[];
+      topicRegex?: (string)[];
+      applyRegex?: boolean;
+    };
+    EnvTag: {
+      id?: string;
+      name?: string;
+    };
     KwTenantModel: {
       tenantName: string;
       tenantDesc: string;
@@ -899,22 +937,6 @@ export type components = {
       tenantId?: number;
       params?: components["schemas"]["EnvParams"];
     };
-    EnvParams: {
-      defaultPartitions?: string;
-      maxPartitions?: string;
-      partitionsList?: (string)[];
-      defaultRepFactor?: string;
-      maxRepFactor?: string;
-      replicationFactorList?: (string)[];
-      topicPrefix?: (string)[];
-      topicSuffix?: (string)[];
-      topicRegex?: (string)[];
-      applyRegex?: boolean;
-    };
-    EnvTag: {
-      id?: string;
-      name?: string;
-    };
     KwClustersModel: {
       /** Format: int32 */
       clusterId?: number;
@@ -1114,6 +1136,8 @@ export type components = {
       result: string;
       /** @enum {string} */
       envStatus: "OFFLINE" | "ONLINE" | "NOT_KNOWN";
+      /** Format: date-time */
+      envStatusTime: string;
     };
     TopicsCountPerEnv: {
       status?: string;
@@ -1207,8 +1231,8 @@ export type components = {
       hasSchema: boolean;
       /** Format: int32 */
       clusterId: number;
-      topicOwner?: boolean;
       highestEnv?: boolean;
+      topicOwner?: boolean;
     };
     TopicBaseConfig: {
       topicName: string;
@@ -1372,6 +1396,8 @@ export type components = {
       clusterName: string;
       /** @enum {string} */
       envStatus: "OFFLINE" | "ONLINE" | "NOT_KNOWN";
+      /** Format: date-time */
+      envStatusTime: string;
       otherParams: string;
       showDeleteEnv: boolean;
       totalNoPages: string;
@@ -2773,6 +2799,43 @@ export type operations = {
       };
     };
   };
+  addEnvToCache: {
+    parameters: {
+      path: {
+        tenantId: number;
+        id: number;
+      };
+    };
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["Env"];
+      };
+    };
+    responses: {
+      /** @description OK */
+      200: {
+        content: {
+          "application/json": components["schemas"]["ApiResponse"];
+        };
+      };
+    };
+  };
+  removeEnvFromCache: {
+    parameters: {
+      path: {
+        tenantId: number;
+        id: number;
+      };
+    };
+    responses: {
+      /** @description OK */
+      200: {
+        content: {
+          "application/json": components["schemas"]["ApiResponse"];
+        };
+      };
+    };
+  };
   addTenantId: {
     requestBody: {
       content: {
@@ -3668,7 +3731,7 @@ export type operations = {
   getEnvParams: {
     parameters: {
       query: {
-        envSelected: string;
+        envSelected: number;
       };
     };
     responses: {

core/src/main/java/io/aiven/klaw/config/CacheConfig.java

@@ -1,19 +1,30 @@
 package io.aiven.klaw.config;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
+import io.aiven.klaw.dao.Env;
+import io.aiven.klaw.service.CacheService;
+import io.aiven.klaw.service.HighAvailabilityUtilsService;
 import java.time.Duration;
 import java.util.Arrays;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.concurrent.ConcurrentMapCache;
 import org.springframework.cache.support.SimpleCacheManager;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 
 @Configuration
 @EnableCaching
 public class CacheConfig {
 
+  @Autowired private HighAvailabilityUtilsService highAvailabilityUtilsService;
+
+  @Value("${klaw.uiapi.servers:server1,server2}")
+  private String uiApiServers;
+
   @Primary
   public CacheManager cacheManager() {
     SimpleCacheManager cacheManager = new SimpleCacheManager();
@@ -36,4 +47,24 @@ public CacheManager cacheManager() {
     cacheManager.setCaches(Arrays.asList(userCache, teamsCache));
     return cacheManager;
   }
+
+  @Bean
+  public CacheService<Env> kafkaEnvListPerTenant() {
+    return new CacheService<Env>("environment", uiApiServers, highAvailabilityUtilsService);
+  }
+
+  @Bean
+  public CacheService<Env> schemaRegEnvListPerTenant() {
+    return new CacheService<Env>("environment", uiApiServers, highAvailabilityUtilsService);
+  }
+
+  @Bean
+  public CacheService<Env> kafkaConnectEnvListPerTenant() {
+    return new CacheService<Env>("environment", uiApiServers, highAvailabilityUtilsService);
+  }
+
+  @Bean
+  public CacheService<Env> allEnvListPerTenant() {
+    return new CacheService<Env>("environment", uiApiServers, highAvailabilityUtilsService);
+  }
 }