[backend] Romuald's comments

Author: damgouj

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

@@ -12,8 +12,6 @@
 public class V4_74__Create_default_tenant extends BaseJavaMigration {
 
   // Strings to replace in the SQL statement
-  private static String DEFAULT_TENANT_ID = "[DEFAULT_TENANT_ID]";
-  private static String TABLE_FK_TENANT = "[TABLE_FK_TENANT]";
   private static List<String> TABLES =
       List.of(
           "agents",
@@ -34,11 +32,12 @@ public class V4_74__Create_default_tenant extends BaseJavaMigration {
           "groups",
           "import_mappers",
           "injectors",
-          "injectors_contracts",
           "injects",
           "kill_chain_phases",
           "lessons_templates",
+          "mitigations",
           "organizations",
+          "notification_rules",
           "payloads",
           "roles",
           "scenarios",
@@ -49,31 +48,33 @@ public class V4_74__Create_default_tenant extends BaseJavaMigration {
 
   @Override
   public void migrate(Context context) throws Exception {
-
-    // SQL statements to execute with Strings to replace
-    String addDefaultTenant =
-        "INSERT INTO tenants(tenant_id, tenant_name, tenant_description) VALUES ('[DEFAULT_TENANT_ID]', 'First default tenant auto created to rename', 'First default tenant auto created to rename');";
-    String addForeignKeyTenant =
-        """
-                      ALTER TABLE [TABLE_FK_TENANT]
-                         ADD COLUMN tenant_id VARCHAR(255) NOT NULL DEFAULT '[DEFAULT_TENANT_ID]',
-                         ADD CONSTRAINT fk_tenant_id FOREIGN KEY (tenant_id) REFERENCES tenants(tenant_id) ON DELETE CASCADE;
-                      """;
-    String addIndexTenant =
-        "CREATE INDEX IF NOT EXISTS idx_tenant_id ON [TABLE_FK_TENANT](tenant_id);";
-
     try (Statement statement = context.getConnection().createStatement()) {
       // Add default tenant
-      statement.execute(addDefaultTenant.replace(DEFAULT_TENANT_ID, DEFAULT_TENANT_UUID));
+      statement.execute(
+          String.format(
+              """
+                INSERT INTO tenants(tenant_id, tenant_name, tenant_description)
+                VALUES ('%s', 'First default tenant auto created to rename', 'First default tenant auto created to rename');
+                """,
+              DEFAULT_TENANT_UUID));
       // Add deleted_at in tenants for soft delete
       statement.execute("ALTER TABLE tenants ADD tenant_deleted_at TIMESTAMP WITH TIME ZONE;");
       // Add foreign keys with index, auto set default tenant id with default value
       for (String table : TABLES) {
         statement.addBatch(
-            addForeignKeyTenant
-                .replace(DEFAULT_TENANT_ID, DEFAULT_TENANT_UUID)
-                .replace(TABLE_FK_TENANT, table));
-        statement.addBatch(addIndexTenant.replace(TABLE_FK_TENANT, table));
+            String.format(
+                """
+                  ALTER TABLE %s
+                     ADD COLUMN tenant_id VARCHAR(255) NOT NULL DEFAULT '%s',
+                     ADD CONSTRAINT fk_tenant_id FOREIGN KEY (tenant_id) REFERENCES tenants(tenant_id) ON DELETE CASCADE;
+                  """,
+                table, DEFAULT_TENANT_UUID));
+        statement.addBatch(
+            String.format(
+                """
+                  CREATE INDEX IF NOT EXISTS idx_tenant_id ON %s(tenant_id);
+                  """,
+                table));
       }
       statement.executeBatch();
       // Add linked table for users and tenants

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

@@ -1,6 +1,5 @@
 package io.openaev.database.model;
 
-import static io.openaev.database.model.Tenant.DEFAULT_TENANT_UUID;
 import static java.time.Instant.now;
 import static java.util.Optional.ofNullable;
 import static lombok.AccessLevel.NONE;
@@ -185,12 +184,6 @@ public void setVulnerabilities(Set<Vulnerability> vulnerabilities) {
   @Queryable(filterable = true)
   private boolean isImportAvailable;
 
-  @ManyToOne
-  @JoinColumn(name = "tenant_id")
-  @JsonIgnore
-  @NotNull
-  private Tenant tenant = new Tenant(DEFAULT_TENANT_UUID);
-
   @Getter(onMethod_ = @JsonIgnore)
   @Transient
   private final ResourceType resourceType = ResourceType.INJECTOR_CONTRACT;

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

@@ -1,7 +1,9 @@
 package io.openaev.database.model;
 
+import static io.openaev.database.model.Tenant.DEFAULT_TENANT_UUID;
 import static java.time.Instant.now;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.hypersistence.utils.hibernate.type.array.StringArrayType;
@@ -85,4 +87,10 @@ public class Mitigation implements Base {
   @JsonSerialize(using = MultiIdListSerializer.class)
   @JsonProperty("mitigation_attack_patterns")
   private List<AttackPattern> attackPatterns = new ArrayList<>();
+
+  @ManyToOne
+  @JoinColumn(name = "tenant_id")
+  @JsonIgnore
+  @NotNull
+  private Tenant tenant = new Tenant(DEFAULT_TENANT_UUID);
 }

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

@@ -1,5 +1,7 @@
 package io.openaev.database.model;
 
+import static io.openaev.database.model.Tenant.DEFAULT_TENANT_UUID;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.openaev.annotation.Queryable;
@@ -62,6 +64,12 @@ public class NotificationRule implements Base {
   @Queryable(searchable = true, filterable = true, path = "owner.id")
   private User owner;
 
+  @ManyToOne
+  @JoinColumn(name = "tenant_id")
+  @JsonIgnore
+  @NotNull
+  private Tenant tenant = new Tenant(DEFAULT_TENANT_UUID);
+
   @Getter(onMethod_ = @JsonIgnore)
   @Transient
   private final ResourceType resourceType = ResourceType.NOTIFICATION_RULE;

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

@@ -59,6 +59,10 @@ public class Tenant implements Base {
   @JsonProperty("tenant_updated_at")
   private Instant updatedAt = now();
 
+  @Column(name = "tenant_deleted_at")
+  @JsonProperty("tenant_deleted_at")
+  private Instant deletedAt;
+
   public Tenant() {}
 
   public Tenant(String id) {