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

Author: Dimfacion

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

@@ -448,7 +448,8 @@ private void deleteDummyInjectorIfItExists(
                     });
                 injectorContractRepository.saveAll(injectorContracts);
               }
-              injectorRepository.delete(dummyInjector);
+              injectorRepository.deleteByIdAndTenantId(
+                  dummyInjector.getId(), TenantContext.getCurrentTenant());
             });
   }
 

openaev-api/src/main/java/io/openaev/service/connector_instances/ConnectorInstanceService.java

@@ -326,10 +326,11 @@ public void deleteById(String id) throws ConnectorStatusException {
             .orElse(null);
 
     if (connectorId != null) {
+      String tenantId = connectorInstance.getTenant().getId();
       switch (connectorInstance.getCatalogConnector().getContainerType()) {
-        case EXECUTOR -> executorRepository.deleteById(connectorId);
-        case INJECTOR -> injectorRepository.deleteById(connectorId);
-        case COLLECTOR -> collectorRepository.deleteById(connectorId);
+        case EXECUTOR -> executorRepository.deleteByIdAndTenantId(connectorId, tenantId);
+        case INJECTOR -> injectorRepository.deleteByIdAndTenantId(connectorId, tenantId);
+        case COLLECTOR -> collectorRepository.deleteByIdAndTenantId(connectorId, tenantId);
       }
     }
 

openaev-api/src/test/java/io/openaev/api/chaining/InjectExecutionStepTest.java

@@ -458,14 +458,25 @@ public void run_shouldReturnNull_whenInjectorIsNotFoundInDatabase()
     assertNotNull(injectorIdsJson);
     String[] injectorIds = mapper.readValue(injectorIdsJson, String[].class);
     for (String id : injectorIds) {
-      injectorRepository.deleteById(id);
+      injectorRepository.deleteByIdAndTenantId(
+          id, io.openaev.context.TenantContext.getCurrentTenant());
     }
+    entityManager.flush();
+    entityManager.clear();
+
+    // Clear injectors from the mocked contract so the code cannot resolve them
+    injectorContractSaved.getInjectors().clear();
 
     // ACT
     ChainingException ex =
         Assertions.assertThrows(ChainingException.class, () -> injectExecutionStep.run(stepReady));
     // ASSERT
-    Assertions.assertEquals("Step (READY) : Error processing JSON to Inject ", ex.getMessage());
+    Assertions.assertEquals(
+        "Injector not found for injectorId "
+            + injectorIds[0]
+            + " and step (READY) ID "
+            + stepReady.getId(),
+        ex.getMessage());
   }
 
   @Test

openaev-model/src/main/java/io/openaev/aop/HibernateFilterTransactionAspect.java

@@ -27,6 +27,9 @@ public class HibernateFilterTransactionAspect {
       "@annotation(org.springframework.transaction.annotation.Transactional) || "
           + "@annotation(jakarta.transaction.Transactional)")
   public void enableFilters() {
+    if (TenantContext.isRlsBypassed()) {
+      return;
+    }
     String tenantId = TenantContext.getCurrentTenant();
     Session session = entityManager.unwrap(Session.class);
 

openaev-model/src/main/java/io/openaev/database/repository/CollectorRepository.java

@@ -5,6 +5,7 @@
 import java.util.List;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.query.Param;
@@ -40,4 +41,10 @@ WHERE c.collectorType IN (
               )
           """)
   List<Collector> findByInjectId(@Param("injectId") String injectId);
+
+  @Modifying
+  @Query(
+      nativeQuery = true,
+      value = "DELETE FROM collectors WHERE collector_id = :id AND tenant_id = :tenantId")
+  void deleteByIdAndTenantId(@Param("id") String id, @Param("tenantId") String tenantId);
 }

openaev-model/src/main/java/io/openaev/database/repository/ExecutorRepository.java

@@ -3,7 +3,10 @@
 import io.openaev.database.model.Executor;
 import jakarta.validation.constraints.NotNull;
 import java.util.Optional;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 @Repository
@@ -13,4 +16,10 @@ public interface ExecutorRepository extends CrudRepository<Executor, String> {
 
   @NotNull
   Optional<Executor> findByTypeAndTenantId(@NotNull String type, @NotNull String tenantId);
+
+  @Modifying
+  @Query(
+      nativeQuery = true,
+      value = "DELETE FROM executors WHERE executor_id = :id AND tenant_id = :tenantId")
+  void deleteByIdAndTenantId(@Param("id") String id, @Param("tenantId") String tenantId);
 }

openaev-model/src/main/java/io/openaev/database/repository/InjectorRepository.java

@@ -6,6 +6,9 @@
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 @Repository
@@ -18,4 +21,10 @@ public interface InjectorRepository
   Optional<Injector> findByTypeAndTenantId(@NotNull String type, @NotNull String tenantId);
 
   List<Injector> findAllByPayloadsAndTenantId(@NotNull Boolean payloads, @NotNull String tenantId);
+
+  @Modifying
+  @Query(
+      nativeQuery = true,
+      value = "DELETE FROM injectors WHERE injector_id = :id AND tenant_id = :tenantId")
+  void deleteByIdAndTenantId(@Param("id") String id, @Param("tenantId") String tenantId);
 }