PR feedback

Author: kirill-knize-sonarsource

backend/commons/src/main/java/org/sonarsource/sonarlint/core/commons/storage/SonarLintDatabase.java

@@ -32,6 +32,8 @@
 import org.jooq.impl.DSL;
 import org.sonarsource.sonarlint.core.commons.log.SonarLintLogger;
 
+import static org.sonarsource.sonarlint.core.commons.storage.generated.Tables.AI_CODEFIX_SETTINGS;
+
 public final class SonarLintDatabase {
   private static final SonarLintLogger LOG = SonarLintLogger.get();
 
@@ -103,10 +105,10 @@ public void shutdown() {
     }
   }
 
-  public void cleanupNonExistingConnections(Set<String> connectionIds) {
-    connectionIds.forEach(connectionId -> {
-      // TODO: remove connection and related records from the database
-    });
+  public void cleanupNonExistingConnections(Set<String> existingConnectionIds) {
+    dsl.deleteFrom(AI_CODEFIX_SETTINGS)
+      .where(AI_CODEFIX_SETTINGS.CONNECTION_ID.notIn(existingConnectionIds))
+      .execute();
   }
 }
 

backend/commons/src/main/java/org/sonarsource/sonarlint/core/commons/storage/generated/tables/AiCodeFixSettingsTable.java

@@ -25,7 +25,6 @@
  */
 package org.sonarsource.sonarlint.core.commons.storage.generated.tables;
 
-import java.sql.Timestamp;
 import org.jooq.Record;
 import org.jooq.TableField;
 import org.jooq.impl.DSL;
@@ -37,13 +36,11 @@ public final class AiCodeFixSettingsTable extends TableImpl<Record> {
 
   public static final AiCodeFixSettingsTable AI_CODEFIX_SETTINGS = new AiCodeFixSettingsTable();
 
-  public final TableField<Record, Integer> ID = createField(DSL.name("ID"), SQLDataType.INTEGER.nullable(false), this, "");
   public final TableField<Record, String> CONNECTION_ID = createField(DSL.name("CONNECTION_ID"), SQLDataType.VARCHAR.length(255), this, "");
   public final TableField<Record, String[]> SUPPORTED_RULES = createField(DSL.name("SUPPORTED_RULES"), SQLDataType.VARCHAR(64).getArrayDataType(), this, "");
   public final TableField<Record, Boolean> ORGANIZATION_ELIGIBLE = createField(DSL.name("ORGANIZATION_ELIGIBLE"), SQLDataType.BOOLEAN, this, "");
   public final TableField<Record, String> ENABLEMENT = createField(DSL.name("ENABLEMENT"), SQLDataType.VARCHAR.length(64), this, "");
   public final TableField<Record, String[]> ENABLED_PROJECT_KEYS = createField(DSL.name("ENABLED_PROJECT_KEYS"), SQLDataType.VARCHAR(400).getArrayDataType(), this, "");
-  public final TableField<Record, Timestamp> UPDATED_AT = createField(DSL.name("UPDATED_AT"), SQLDataType.TIMESTAMP, this, "");
 
   private AiCodeFixSettingsTable() {
     super(DSL.name("AI_CODEFIX_SETTINGS"));

backend/commons/src/main/java/org/sonarsource/sonarlint/core/commons/storage/repository/AiCodeFixRepository.java

@@ -19,8 +19,6 @@
  */
 package org.sonarsource.sonarlint.core.commons.storage.repository;
 
-import java.sql.Timestamp;
-import java.time.Instant;
 import java.util.Optional;
 import org.sonarsource.sonarlint.core.commons.log.SonarLintLogger;
 import org.sonarsource.sonarlint.core.commons.storage.SonarLintDatabase;
@@ -58,9 +56,6 @@ public Optional<AiCodeFix> get(String connectionId) {
   }
 
   public void upsert(AiCodeFix entity) {
-    var now = Timestamp.from(Instant.now());
-    // use connection ID from Connection Table when it will be created
-    int rowId = entity.connectionId().hashCode();
 
     var dsl = database.dsl();
     try {
@@ -69,25 +64,20 @@ public void upsert(AiCodeFix entity) {
         .set(AI_CODEFIX_SETTINGS.ORGANIZATION_ELIGIBLE, entity.organizationEligible())
         .set(AI_CODEFIX_SETTINGS.ENABLEMENT, entity.enablement().name())
         .set(AI_CODEFIX_SETTINGS.ENABLED_PROJECT_KEYS, entity.enabledProjectKeys())
-        .set(AI_CODEFIX_SETTINGS.UPDATED_AT, now)
         .where(AI_CODEFIX_SETTINGS.CONNECTION_ID.eq(entity.connectionId()))
         .execute();
       if (updated == 0) {
         dsl.insertInto(AI_CODEFIX_SETTINGS,
-            AI_CODEFIX_SETTINGS.ID,
             AI_CODEFIX_SETTINGS.CONNECTION_ID,
             AI_CODEFIX_SETTINGS.SUPPORTED_RULES,
             AI_CODEFIX_SETTINGS.ORGANIZATION_ELIGIBLE,
             AI_CODEFIX_SETTINGS.ENABLEMENT,
-            AI_CODEFIX_SETTINGS.ENABLED_PROJECT_KEYS,
-            AI_CODEFIX_SETTINGS.UPDATED_AT)
-          .values(rowId,
-            entity.connectionId(),
+            AI_CODEFIX_SETTINGS.ENABLED_PROJECT_KEYS)
+          .values(entity.connectionId(),
             entity.supportedRules(),
             entity.organizationEligible(),
             entity.enablement().name(),
-            entity.enabledProjectKeys(),
-            now)
+            entity.enabledProjectKeys())
           .execute();
       }
     } catch (RuntimeException ex) {

backend/commons/src/main/resources/db/migration/V1__create_ai_codefix_settings_table.sql

@@ -1,18 +1,12 @@
 -- Flyway migration: create AI_CODEFIX_SETTINGS table for H2
 -- Initial schema includes per-connection scoping via connection_id
 CREATE TABLE IF NOT EXISTS AI_CODEFIX_SETTINGS (
-  id INT NOT NULL,
-  connection_id VARCHAR(255),
+  connection_id VARCHAR(255) NOT NULL PRIMARY KEY,
   supported_rules VARCHAR(200) ARRAY,
   organization_eligible BOOLEAN,
   enablement VARCHAR(64),
   enabled_project_keys VARCHAR(400) ARRAY,
-  updated_at TIMESTAMP,
-  CONSTRAINT pk_ai_codefix_settings PRIMARY KEY (id)
+  CONSTRAINT pk_ai_codefix_settings PRIMARY KEY (connection_id)
 );
 
--- Index to speed up lookups by connection_id
-CREATE INDEX IF NOT EXISTS idx_ai_codefix_settings_connection_id
-  ON AI_CODEFIX_SETTINGS (connection_id);
-
 

backend/core/src/main/java/org/sonarsource/sonarlint/core/storage/SonarLintDatabaseService.java

@@ -23,7 +23,11 @@
 import jakarta.annotation.PreDestroy;
 import org.sonarsource.sonarlint.core.commons.storage.SonarLintDatabase;
 import org.sonarsource.sonarlint.core.repository.connection.ConnectionConfigurationRepository;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
 
+@Component
+@Lazy(false)
 public class SonarLintDatabaseService {
 
   private final SonarLintDatabase database;
@@ -40,8 +44,8 @@ public SonarLintDatabase getDatabase() {
 
   @PostConstruct
   public void postConstruct() {
-    var connectionIds = connectionConfigurationRepository.getConnectionsById().keySet();
-    database.cleanupNonExistingConnections(connectionIds);
+    var existingConnectionIds = connectionConfigurationRepository.getConnectionsById().keySet();
+    database.cleanupNonExistingConnections(existingConnectionIds);
   }
 
   @PreDestroy