[backend] (feat) fix datamodel catalog (#3528)

Author: camrrx

openaev-api/src/main/java/io/openaev/migration/V4_48__Update_catalog_connector_configuration.java

@@ -0,0 +1,33 @@
+package io.openaev.migration;
+
+import java.sql.Statement;
+import org.flywaydb.core.api.migration.BaseJavaMigration;
+import org.flywaydb.core.api.migration.Context;
+import org.springframework.stereotype.Component;
+
+@Component
+public class V4_48__Update_catalog_connector_configuration extends BaseJavaMigration {
+  @Override
+  public void migrate(Context context) throws Exception {
+    try (Statement select = context.getConnection().createStatement()) {
+      select.execute(
+          """
+                    ALTER TABLE catalog_connectors_configuration
+                    DROP COLUMN IF EXISTS connector_configuration_default,
+                    DROP COLUMN IF EXISTS connector_configuration_enum
+                    """);
+
+      select.execute(
+          """
+                    ALTER TABLE catalog_connectors_configuration
+                    ADD COLUMN connector_configuration_default jsonb,
+                    ADD COLUMN connector_configuration_enum text[]
+                    """);
+
+      select.execute(
+          """
+                        ALTER TABLE connector_instance_configurations ADD COLUMN connector_instance_configuration_is_encrypted BOOLEAN DEFAULT false;
+                        """);
+    }
+  }
+}

openaev-model/src/main/java/io/openaev/database/model/CatalogConnector.java

@@ -1,7 +1,7 @@
 package io.openaev.database.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.hypersistence.utils.hibernate.type.array.StringArrayType;
+import io.hypersistence.utils.hibernate.type.array.ListArrayType;
 import io.openaev.database.audit.ModelBaseListener;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.*;
@@ -61,11 +61,11 @@ public enum CONNECTOR_TYPE {
   @Schema(description = "Connector logo")
   private String logoUrl;
 
-  @Type(StringArrayType.class)
+  @Type(ListArrayType.class)
   @Column(name = "catalog_connector_use_cases")
   @JsonProperty("catalog_connector_use_cases")
   @Schema(description = "Connector use_cases")
-  private String[] useCases;
+  private Set<String> useCases = new HashSet<>();
 
   @Column(name = "catalog_connector_verified")
   @JsonProperty("catalog_connector_verified")
@@ -117,6 +117,7 @@ public enum CONNECTOR_TYPE {
   @Schema(description = "Connector container image")
   private String containerImage;
 
+  @Enumerated(EnumType.STRING)
   @Column(name = "catalog_connector_type")
   @JsonProperty("catalog_connector_type")
   @Schema(description = "Connector type")
@@ -148,5 +149,5 @@ public enum CONNECTOR_TYPE {
       orphanRemoval = true)
   @JsonProperty("catalog_connector_instances")
   @NotNull
-  private Set<ConnectorInstance> configurations = new HashSet<>();
+  private Set<ConnectorInstance> instances = new HashSet<>();
 }

openaev-model/src/main/java/io/openaev/database/model/CatalogConnectorConfiguration.java

@@ -4,13 +4,15 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import io.hypersistence.utils.hibernate.type.array.StringArrayType;
+import io.hypersistence.utils.hibernate.type.array.ListArrayType;
 import io.hypersistence.utils.hibernate.type.json.JsonType;
 import io.openaev.database.audit.ModelBaseListener;
 import io.openaev.helper.MonoIdDeserializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
+import java.util.HashSet;
+import java.util.Set;
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.annotations.Type;
@@ -65,11 +67,11 @@ public class CatalogConnectorConfiguration implements Base {
   @Schema(description = "Connector configuration format")
   private String connectorConfigurationFormat;
 
-  @Type(StringArrayType.class)
+  @Type(ListArrayType.class)
   @Column(name = "connector_configuration_enum")
   @JsonProperty("connector_configuration_enum")
   @Schema(description = "Connector configuration enum")
-  private String[] connectorConfigurationEnum;
+  private Set<String> connectorConfigurationEnum = new HashSet<>();
 
   @Column(name = "connector_configuration_writeonly")
   @JsonProperty("connector_configuration_writeonly")

openaev-model/src/main/java/io/openaev/database/model/ConnectorInstanceConfiguration.java

@@ -47,4 +47,8 @@ public class ConnectorInstanceConfiguration implements Base {
   @NotNull
   @JsonSerialize(using = MonoIdDeserializer.class)
   private ConnectorInstance connectorInstance;
+
+  @Column(name = "connector_instance_configuration_is_encrypted")
+  @JsonProperty("connector_instance_configuration_is_encrypted")
+  private boolean isEncrypted = false;
 }