[backend] feat(multitenancy): adding builtin connectors for new tenants (#3505)

Author: Dimfacion

openaev-api/src/main/java/io/openaev/collectors/expectations_expiration_manager/ExpectationsExpirationManagerJob.java

@@ -26,18 +26,6 @@ public ExpectationsExpirationManagerJob(
     this.collectorService = collectorService;
     this.config = config;
     this.fakeDetectorService = fakeDetectorService;
-    try {
-      collectorService.register(
-          config.getId(),
-          FAKE_DETECTOR_COLLECTOR_TYPE,
-          FAKE_DETECTOR_COLLECTOR_NAME,
-          false,
-          0,
-          null,
-          getClass().getResourceAsStream("/img/icon-fake-detector.png"));
-    } catch (Exception e) {
-      log.error("Error creating expectations expiration manager ", e);
-    }
   }
 
   @Override

openaev-api/src/main/java/io/openaev/executors/ExecutorService.java

@@ -20,7 +20,6 @@
 import io.openaev.utils.mapper.CatalogConnectorMapper;
 import io.openaev.utils.mapper.ExecutorMapper;
 import jakarta.annotation.Resource;
-import jakarta.persistence.EntityManager;
 import jakarta.transaction.Transactional;
 import java.io.InputStream;
 import java.util.List;
@@ -41,8 +40,6 @@ public class ExecutorService extends AbstractConnectorService<Executor, Executor
 
   private final ExecutorMapper executorMapper;
 
-  private final EntityManager entityManager;
-
   @Autowired
   public ExecutorService(
       ExecutorRepository executorRepository,
@@ -52,8 +49,7 @@ public ExecutorService(
       CatalogConnectorService catalogConnectorService,
       ConnectorInstanceService connectorInstanceService,
       ExecutorMapper executorMapper,
-      CatalogConnectorMapper catalogConnectorMapper,
-      EntityManager entityManager) {
+      CatalogConnectorMapper catalogConnectorMapper) {
     super(
         ConnectorType.EXECUTOR,
         connectorInstanceConfigurationRepository,
@@ -64,7 +60,6 @@ public ExecutorService(
     this.executorRepository = executorRepository;
     this.executionTraceRepository = executionTraceRepository;
     this.executorMapper = executorMapper;
-    this.entityManager = entityManager;
   }
 
   @Override
@@ -171,8 +166,7 @@ public Executor register(
 
     Executor executor =
         executorRepository.findByIdAndTenantId(id, TenantContext.getCurrentTenant()).orElse(null);
-    boolean isNew = (executor == null);
-    if (isNew) {
+    if (executor == null) {
       executor = new Executor();
       executor.setId(id);
       executor.setTenant(new Tenant(TenantContext.getCurrentTenant()));
@@ -184,12 +178,6 @@ public Executor register(
     executor.setBackgroundColor(backgroundColor);
     executor.setPlatforms(platforms);
 
-    // For new entities, use persist() to force INSERT — merge() would find the existing
-    // Executor from another tenant (same static ID, JPA @Id is only executor_id).
-    if (isNew) {
-      entityManager.persist(executor);
-      return executor;
-    }
     return executorRepository.save(executor);
   }
 

openaev-api/src/main/java/io/openaev/rest/collector/service/CollectorService.java

@@ -22,7 +22,6 @@
 import io.openaev.utils.mapper.CatalogConnectorMapper;
 import io.openaev.utils.mapper.CollectorMapper;
 import jakarta.annotation.Resource;
-import jakarta.persistence.EntityManager;
 import jakarta.transaction.Transactional;
 import jakarta.validation.constraints.NotNull;
 import java.io.InputStream;
@@ -48,8 +47,6 @@ public class CollectorService extends AbstractConnectorService<Collector, Collec
 
   private final CollectorMapper collectorMapper;
 
-  private final EntityManager entityManager;
-
   @Autowired
   public CollectorService(
       CollectorRepository collectorRepository,
@@ -60,8 +57,7 @@ public CollectorService(
       ConnectorInstanceService connectorInstanceService,
       CatalogConnectorService catalogConnectorService,
       CollectorMapper collectorMapper,
-      CatalogConnectorMapper catalogConnectorMapper,
-      EntityManager entityManager) {
+      CatalogConnectorMapper catalogConnectorMapper) {
     super(
         ConnectorType.COLLECTOR,
         connectorInstanceConfigurationRepository,
@@ -73,7 +69,6 @@ public CollectorService(
     this.fileService = fileService;
     this.collectorMapper = collectorMapper;
     this.securityPlatformRepository = securityPlatformRepository;
-    this.entityManager = entityManager;
   }
 
   @Override
@@ -236,11 +231,9 @@ public Collector register(
     if (securityPlatform != null) {
       newCollector.setSecurityPlatform(securityPlatform);
     }
-    // For new entities, use persist() to force INSERT — merge() would find the existing
-    // Collector from another tenant (same static ID, JPA @Id is only collector_id).
+    // For new entities, isNew()=true triggers persist() via Spring Data save().
     newCollector.setTenant(new Tenant(TenantContext.getCurrentTenant()));
-    entityManager.persist(newCollector);
-    return newCollector;
+    return collectorRepository.save(newCollector);
   }
 
   public List<Collector> collectorsForPayload(String payloadId) {

openaev-api/src/main/java/io/openaev/service/InjectorService.java

@@ -561,29 +561,25 @@ private Injector createNewBuiltinInjector(
         isPayloads,
         dependencies);
 
-    // Persistable.isNew()=false → Spring Data uses merge(), which would find the existing
-    // Injector from another tenant (same static ID, JPA @Id is only injector_id).
-    // We must use persist() to force an INSERT for the new tenant.
     newInjector.setTenant(new Tenant(TenantContext.getCurrentTenant()));
-    // DB composite PK (id, tenant_id) allows the same static ID per tenant.
-    entityManager.persist(newInjector);
+    Injector savedInjector = injectorRepository.save(newInjector);
 
     List<InjectorContract> injectorContracts =
         staticContracts.stream()
             .map(
                 contract ->
                     this.injectorContractService.createBuiltinInjectorContract(
-                        contract, newInjector, isPayloads))
+                        contract, savedInjector, isPayloads))
             .toList();
     injectorContracts = fromIterable(injectorContractRepository.saveAll(injectorContracts));
     // Link managed contracts on the owning side so Hibernate populates the join table.
     // We MUST use the instances returned by saveAll() — the originals are detached after merge().
-    newInjector.getContracts().addAll(injectorContracts);
+    savedInjector.getContracts().addAll(injectorContracts);
     // Flush now so that all inserts are visible before any subsequent query triggers auto-flush
     // (e.g. deleteDummyInjectorIfItExists), which would otherwise fail with
     // TransientObjectException.
     entityManager.flush();
-    return newInjector;
+    return savedInjector;
   }
 
   private void applyBuiltinInjectorProperties(

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

@@ -1,6 +1,8 @@
 package io.openaev.database.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import jakarta.persistence.PostLoad;
+import jakarta.persistence.PostPersist;
 import jakarta.persistence.Transient;
 import lombok.Data;
 import org.springframework.data.domain.Persistable;
@@ -13,8 +15,8 @@
  * maps only {@code id} as {@code @Id}. The Hibernate tenant filter scopes all queries to the
  * current tenant, and services use {@code findByIdAndTenantId()} for explicit lookups.
  *
- * <p>Implements {@link Persistable} so that Spring Data JPA knows these entities always have
- * assigned IDs and should use {@code merge()} instead of {@code persist()}.
+ * <p>Implements {@link Persistable} with a transient {@code newEntity} flag so that Spring Data JPA
+ * correctly uses {@code persist()} for new entities and {@code merge()} for existing ones.
  */
 @Data
 public abstract class BaseConnectorEntity implements Base, Persistable<String> {
@@ -23,14 +25,23 @@ public abstract class BaseConnectorEntity implements Base, Persistable<String> {
   private String type;
   private boolean external;
 
+  @Transient @JsonIgnore private boolean newEntity = true;
+
   /**
-   * Connector entities always have an assigned (static) ID, so they are never "new" from JPA's
-   * perspective. This ensures Spring Data uses {@code merge()} rather than {@code persist()}.
+   * Returns {@code true} if this entity has not yet been persisted. Spring Data uses this to decide
+   * between {@code persist()} (INSERT) and {@code merge()} (SELECT + UPDATE).
    */
   @Override
   @Transient
   @JsonIgnore
   public boolean isNew() {
-    return false;
+    return newEntity;
+  }
+
+  /** Mark as persisted after being loaded from the database. */
+  @PostLoad
+  @PostPersist
+  void markNotNew() {
+    this.newEntity = false;
   }
 }