feat: delete entrypoint linked to org

gravitee-io · Dec 20, 2024 · 408ccee · 408ccee
1 parent 7b388c6
commit 408ccee
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 3 deletions.
diff --git a/...ository-api/src/main/java/io/gravitee/repository/management/api/EntrypointRepository.java b/...ository-api/src/main/java/io/gravitee/repository/management/api/EntrypointRepository.java
@@ -18,7 +18,7 @@
 import io.gravitee.repository.exceptions.TechnicalException;
 import io.gravitee.repository.management.model.Entrypoint;
 import io.gravitee.repository.management.model.EntrypointReferenceType;
-import java.util.Collection;
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
@@ -31,4 +31,13 @@ Optional<Entrypoint> findByIdAndReference(String entrypointId, String referenceI
         throws TechnicalException;
 
     Set<Entrypoint> findByReference(String referenceId, EntrypointReferenceType referenceType) throws TechnicalException;
+
+    /**
+     * Delete entrypoints by reference
+     * @param referenceId
+     * @param referenceType
+     * @return List of IDs for deleted entrypoints
+     * @throws TechnicalException
+     */
+    List<String> deleteByReferenceIdAndReferenceType(String referenceId, EntrypointReferenceType referenceType) throws TechnicalException;
 }
diff --git a/...y-jdbc/src/main/java/io/gravitee/repository/jdbc/management/JdbcEntryPointRepository.java b/...y-jdbc/src/main/java/io/gravitee/repository/jdbc/management/JdbcEntryPointRepository.java
@@ -20,6 +20,7 @@
 import io.gravitee.repository.exceptions.TechnicalException;
 import io.gravitee.repository.jdbc.orm.JdbcObjectMapper;
 import io.gravitee.repository.management.api.EntrypointRepository;
+import io.gravitee.repository.management.model.AccessPointReferenceType;
 import io.gravitee.repository.management.model.Entrypoint;
 import io.gravitee.repository.management.model.EntrypointReferenceType;
 import io.gravitee.repository.management.model.Tag;
@@ -103,4 +104,28 @@ public Set<Entrypoint> findByReference(String referenceId, EntrypointReferenceTy
             throw new TechnicalException("Failed to find " + getOrm().getTableName() + " entrypoints by referenceId and referenceType", ex);
         }
     }
+
+    @Override
+    public List<String> deleteByReferenceIdAndReferenceType(final String referenceId, final EntrypointReferenceType referenceType)
+        throws TechnicalException {
+        try {
+            final var rows = jdbcTemplate.queryForList(
+                "select id from " + tableName + " where reference_id = ? and reference_type = ?",
+                String.class,
+                referenceId,
+                referenceType.name()
+            );
+
+            if (!rows.isEmpty()) {
+                jdbcTemplate.update(
+                    "delete from " + tableName + " where reference_id = ? and reference_type = ?",
+                    referenceId,
+                    referenceType.name()
+                );
+            }
+            return rows;
+        } catch (final Exception ex) {
+            throw new TechnicalException("Failed to delete entrypoints by reference", ex);
+        }
+    }
 }
diff --git a/...db/src/main/java/io/gravitee/repository/mongodb/management/MongoEntrypointRepository.java b/...db/src/main/java/io/gravitee/repository/mongodb/management/MongoEntrypointRepository.java
@@ -140,4 +140,20 @@ public Set<Entrypoint> findByReference(String referenceId, EntrypointReferenceTy
     public Set<Entrypoint> findAll() throws TechnicalException {
         return internalEntryPointRepo.findAll().stream().map(entrypointMongo -> mapper.map(entrypointMongo)).collect(Collectors.toSet());
     }
+
+    @Override
+    public List<String> deleteByReferenceIdAndReferenceType(final String referenceId, final EntrypointReferenceType referenceType)
+        throws TechnicalException {
+        LOGGER.debug("Delete entrypoint by reference [{}, {}]", referenceType, referenceId);
+        try {
+            List<EntrypointMongo> entrypointMongos = internalEntryPointRepo.deleteByReferenceIdAndReferenceType(
+                referenceId,
+                referenceType.name()
+            );
+            LOGGER.debug("Delete entrypoint by reference [{}, {}] - Done", referenceType, referenceId);
+            return entrypointMongos.stream().map(EntrypointMongo::getId).toList();
+        } catch (Exception e) {
+            throw new TechnicalException("An error occurred while deleting entrypoint", e);
+        }
+    }
 }
diff --git a/...ava/io/gravitee/repository/mongodb/management/internal/api/EntrypointMongoRepository.java b/...ava/io/gravitee/repository/mongodb/management/internal/api/EntrypointMongoRepository.java
@@ -20,6 +20,7 @@
 import java.util.List;
 import java.util.Optional;
 import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.data.mongodb.repository.Query;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -35,4 +36,7 @@ Optional<EntrypointMongo> findByIdAndReferenceIdAndReferenceType(
         String referenceId,
         EntrypointReferenceType referenceType
     );
+
+    @Query(value = "{ 'referenceId': ?0, 'referenceType': ?1 }", delete = true)
+    List<EntrypointMongo> deleteByReferenceIdAndReferenceType(String referenceId, String name);
 }
diff --git a/...o/gravitee/rest/api/service/cockpit/command/handler/DeleteOrganizationCommandHandler.java b/...o/gravitee/rest/api/service/cockpit/command/handler/DeleteOrganizationCommandHandler.java
@@ -52,6 +52,7 @@ public class DeleteOrganizationCommandHandler implements CommandHandler<DeleteOr
     private final AuditRepository auditRepository;
     private final CommandRepository commandRepository;
     private final CustomUserFieldsRepository customUserFieldsRepository;
+    private final EntrypointRepository entrypointRepository;
     private final EnvironmentService environmentService;
     private final FlowRepository flowRepository;
     private final IdentityProviderActivationRepository identityProviderActivationRepository;
@@ -77,6 +78,7 @@ public DeleteOrganizationCommandHandler(
         @Lazy AuditRepository auditRepository,
         @Lazy CommandRepository commandRepository,
         @Lazy CustomUserFieldsRepository customUserFieldsRepository,
+        @Lazy EntrypointRepository entrypointRepository,
         @Lazy FlowRepository flowRepository,
         @Lazy IdentityProviderActivationRepository identityProviderActivationRepository,
         @Lazy IdentityProviderRepository identityProviderRepository,
@@ -103,6 +105,7 @@ public DeleteOrganizationCommandHandler(
         this.auditRepository = auditRepository;
         this.commandRepository = commandRepository;
         this.customUserFieldsRepository = customUserFieldsRepository;
+        this.entrypointRepository = entrypointRepository;
         this.environmentService = environmentService;
         this.flowRepository = flowRepository;
         this.identityProviderActivationRepository = identityProviderActivationRepository;
@@ -217,5 +220,6 @@ private void deleteOrganization(ExecutionContext executionContext, OrganizationE
             organization.getId(),
             NotificationTemplateReferenceType.ORGANIZATION
         );
+        entrypointRepository.deleteByReferenceIdAndReferenceType(organization.getId(), EntrypointReferenceType.ORGANIZATION);
     }
 }
diff --git a/...t/java/io/gravitee/rest/api/service/cockpit/command/handler/DeleteCommandHandlerTest.java b/...t/java/io/gravitee/rest/api/service/cockpit/command/handler/DeleteCommandHandlerTest.java
@@ -59,8 +59,7 @@ public class DeleteCommandHandlerTest {
         InstallationRepository.class,
         // Forgot repositories
         TicketRepository.class,
-        QualityRuleRepository.class,
-        EntrypointRepository.class
+        QualityRuleRepository.class
     );
 
     /**

diff --git a/...avitee/rest/api/service/cockpit/command/handler/DeleteOrganizationCommandHandlerTest.java b/...avitee/rest/api/service/cockpit/command/handler/DeleteOrganizationCommandHandlerTest.java
@@ -32,6 +32,7 @@
 import io.gravitee.repository.management.api.AuditRepository;
 import io.gravitee.repository.management.api.CommandRepository;
 import io.gravitee.repository.management.api.CustomUserFieldsRepository;
+import io.gravitee.repository.management.api.EntrypointRepository;
 import io.gravitee.repository.management.api.FlowRepository;
 import io.gravitee.repository.management.api.IdentityProviderActivationRepository;
 import io.gravitee.repository.management.api.IdentityProviderRepository;
@@ -49,6 +50,7 @@
 import io.gravitee.repository.management.model.AccessPointReferenceType;
 import io.gravitee.repository.management.model.Audit;
 import io.gravitee.repository.management.model.CustomUserFieldReferenceType;
+import io.gravitee.repository.management.model.EntrypointReferenceType;
 import io.gravitee.repository.management.model.License;
 import io.gravitee.repository.management.model.MembershipReferenceType;
 import io.gravitee.repository.management.model.MetadataReferenceType;
@@ -159,6 +161,9 @@ public class DeleteOrganizationCommandHandlerTest {
     @Mock
     private NotificationTemplateRepository notificationTemplateRepository;
 
+    @Mock
+    private EntrypointRepository entrypointRepository;
+
     private DeleteOrganizationCommandHandler cut;
 
     @Before
@@ -179,6 +184,7 @@ public void setUp() throws Exception {
                 auditRepository,
                 commandRepository,
                 customUserFieldsRepository,
+                entrypointRepository,
                 flowRepository,
                 identityProviderActivationRepository,
                 identityProviderRepository,
@@ -292,6 +298,8 @@ private void verifyDeleteOrganization(ExecutionContext executionContext) throws
         verify(organizationService).delete(executionContext.getOrganizationId());
         verify(notificationTemplateRepository)
             .deleteByReferenceIdAndReferenceType(executionContext.getOrganizationId(), NotificationTemplateReferenceType.ORGANIZATION);
+        verify(entrypointRepository)
+            .deleteByReferenceIdAndReferenceType(executionContext.getOrganizationId(), EntrypointReferenceType.ORGANIZATION);
     }
 
     private void verifyDisableOrganization(ExecutionContext context) {