chore: Remove delete relationship from service [DHIS2-17713] (#18140)

dhis2 · Jul 19, 2024 · 2217b95 · 2217b95
1 parent 9986538
commit 2217b95
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 15 deletions.
diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/RelationshipService.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/RelationshipService.java
@@ -49,13 +49,6 @@ public interface RelationshipService {
    */
   long addRelationship(Relationship relationship);
 
-  /**
-   * Returns a {@link Relationship}.
-   *
-   * @param relationship the relationship.
-   */
-  void deleteRelationship(Relationship relationship);
-
   /**
    * Returns a {@link Relationship}.
    *

diff --git a/...his-service-core/src/main/java/org/hisp/dhis/relationship/DefaultRelationshipService.java b/...his-service-core/src/main/java/org/hisp/dhis/relationship/DefaultRelationshipService.java
@@ -52,12 +52,6 @@ public class DefaultRelationshipService implements RelationshipService {
   // Implementation methods
   // -------------------------------------------------------------------------
 
-  @Override
-  @Transactional
-  public void deleteRelationship(Relationship relationship) {
-    relationshipStore.delete(relationship);
-  }
-
   @Override
   @Transactional(readOnly = true)
   public Relationship getRelationship(long id) {

diff --git a/.../org/hisp/dhis/tracker/imports/bundle/persister/DefaultTrackerObjectsDeletionService.java b/.../org/hisp/dhis/tracker/imports/bundle/persister/DefaultTrackerObjectsDeletionService.java
@@ -220,7 +220,7 @@ public TrackerTypeReport deleteRelationships(List<String> relationships) {
       org.hisp.dhis.relationship.Relationship relationship =
           relationshipService.getRelationship(uid);
 
-      relationshipService.deleteRelationship(relationship);
+      manager.delete(relationship);
 
       typeReport.getStats().incDeleted();
       typeReport.addEntity(objectReport);

diff --git a/...dhis-test-integration/src/test/java/org/hisp/dhis/maintenance/MaintenanceServiceTest.java b/...dhis-test-integration/src/test/java/org/hisp/dhis/maintenance/MaintenanceServiceTest.java
@@ -461,7 +461,7 @@ void testDeleteSoftDeletedRelationship() {
     relationshipService.addRelationship(relationship);
     assertNotNull(relationshipService.getRelationship(relationship.getUid()));
 
-    relationshipService.deleteRelationship(relationship);
+    manager.delete(relationship);
     assertNull(relationshipService.getRelationship(relationship.getUid()));
     assertNotNull(relationshipService.getRelationshipIncludeDeleted(relationship.getUid()));