Skip to content

Commit 719c773

Browse files
committed
refactor: optimize test case resolution status cleanup
1 parent 7cd450f commit 719c773

4 files changed

Lines changed: 8 additions & 19 deletions

File tree

openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/TestCaseResourceIT.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4510,9 +4510,10 @@ void test_testCaseDeleteCleanup(TestNamespace ns) {
45104510
relationships.stream()
45114511
.filter(r -> r.getType().equals(Entity.TEST_CASE_RESOLUTION_STATUS))
45124512
.count();
4513-
assertTrue(
4514-
statusCount >= 3,
4515-
"There should be at least 3 relationships to resolution statuses before delete");
4513+
assertEquals(
4514+
3,
4515+
statusCount,
4516+
"There should be exactly 3 relationships to resolution statuses before delete");
45164517

45174518
// 4. Hard delete the test case
45184519
java.util.Map<String, String> params = new java.util.HashMap<>();

openmetadata-service/src/main/java/org/openmetadata/service/Entity.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -744,8 +744,10 @@ public static void deleteEntity(
744744
String updatedBy, String entityType, UUID entityId, boolean recursive, boolean hardDelete) {
745745
if (entityType.equalsIgnoreCase(Entity.TEST_CASE_RESOLUTION_STATUS)
746746
|| entityType.equalsIgnoreCase(Entity.TEST_CASE_RESULT)) {
747-
// TimeSeries entities are cleaned up via entitySpecificCleanup,
748-
// not through the standard repository delete flow.
747+
LOG.debug(
748+
"Skipping delete for time-series entity {} with id {} (handled via cleanup)",
749+
entityType,
750+
entityId);
749751
return;
750752
}
751753
EntityRepository<?> dao = getEntityRepository(entityType);

openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestCaseRepository.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -890,10 +890,6 @@ private void updateLogicalTestSuite(UUID testSuiteId) {
890890
@Override
891891
protected void entitySpecificCleanup(TestCase entityInterface) {
892892
deleteAllTestCaseResults(entityInterface.getFullyQualifiedName());
893-
TestCaseResolutionStatusRepository testCaseResolutionStatusRepository =
894-
(TestCaseResolutionStatusRepository)
895-
Entity.getEntityTimeSeriesRepository(Entity.TEST_CASE_RESOLUTION_STATUS);
896-
testCaseResolutionStatusRepository.deleteAllRelationshipsByTestCase(entityInterface.getId());
897893
}
898894

899895
private void deleteAllTestCaseResults(String fqn) {

openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestCaseResolutionStatusRepository.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -228,16 +228,6 @@ public void storeInternal(
228228
recordEntity.withTestCaseReference(testCaseReference);
229229
}
230230

231-
public void deleteAllRelationshipsByTestCase(UUID testCaseId) {
232-
daoCollection
233-
.relationshipDAO()
234-
.deleteFrom(
235-
testCaseId,
236-
Entity.TEST_CASE,
237-
Relationship.PARENT_OF.ordinal(),
238-
Entity.TEST_CASE_RESOLUTION_STATUS);
239-
}
240-
241231
@Override
242232
protected void storeRelationship(TestCaseResolutionStatus recordEntity) {
243233
addRelationship(

0 commit comments

Comments
 (0)