chore: Remove get relationship by type from RelationshipService [DHIS…

…2-17713] (#18164)

dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/RelationshipService.java

@@ -27,8 +27,6 @@
  */
 package org.hisp.dhis.relationship;
 
-import java.util.List;
-
 /**
  * @author Abyot Asalefew
  */
@@ -42,6 +40,4 @@ public interface RelationshipService {
    * @return id of the added relationship.
    */
   long addRelationship(Relationship relationship);
-
-  List<Relationship> getRelationshipsByRelationshipType(RelationshipType relationshipType);
 }

dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/RelationshipStore.java

@@ -36,8 +36,6 @@
 public interface RelationshipStore extends IdentifiableObjectStore<Relationship> {
   String ID = RelationshipStore.class.getName();
 
-  List<Relationship> getByRelationshipType(RelationshipType relationshipType);
-
   List<String> getUidsByRelationshipKeys(List<String> relationshipKeyList);
 
   List<Relationship> getByUidsIncludeDeleted(List<String> uids);

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/relationship/DefaultRelationshipService.java

@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.relationship;
 
-import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -52,10 +51,4 @@ public long addRelationship(Relationship relationship) {
 
     return relationship.getId();
   }
-
-  @Override
-  @Transactional(readOnly = true)
-  public List<Relationship> getRelationshipsByRelationshipType(RelationshipType relationshipType) {
-    return relationshipStore.getByRelationshipType(relationshipType);
-  }
 }

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/relationship/RelationshipDeletionHandler.java

@@ -27,33 +27,27 @@
  */
 package org.hisp.dhis.relationship;
 
-import static org.hisp.dhis.system.deletion.DeletionVeto.ACCEPT;
-
-import java.util.Collection;
+import java.util.Map;
 import lombok.RequiredArgsConstructor;
-import org.hisp.dhis.system.deletion.DeletionHandler;
 import org.hisp.dhis.system.deletion.DeletionVeto;
+import org.hisp.dhis.system.deletion.IdObjectDeletionHandler;
 import org.springframework.stereotype.Component;
 
 /**
  * @author Chau Thu Tran
  */
 @Component
 @RequiredArgsConstructor
-public class RelationshipDeletionHandler extends DeletionHandler {
-  private static final DeletionVeto VETO = new DeletionVeto(Relationship.class);
-
-  private final RelationshipService relationshipService;
-
+public class RelationshipDeletionHandler extends IdObjectDeletionHandler<Relationship> {
   @Override
-  protected void register() {
+  protected void registerHandler() {
     whenVetoing(RelationshipType.class, this::allowDeleteRelationshipType);
   }
 
   private DeletionVeto allowDeleteRelationshipType(RelationshipType relationshipType) {
-    Collection<Relationship> relationships =
-        relationshipService.getRelationshipsByRelationshipType(relationshipType);
-
-    return relationships.isEmpty() ? ACCEPT : VETO;
+    return vetoIfExists(
+        VETO,
+        "select 1 from relationship where relationshiptypeid = :id limit 1",
+        Map.of("id", relationshipType.getId()));
   }
 }

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/relationship/hibernate/HibernateRelationshipStore.java

@@ -62,16 +62,6 @@ public HibernateRelationshipStore(
     super(entityManager, jdbcTemplate, publisher, Relationship.class, aclService, true);
   }
 
-  @Override
-  public List<Relationship> getByRelationshipType(RelationshipType relationshipType) {
-    CriteriaBuilder builder = getCriteriaBuilder();
-
-    return getList(
-        builder,
-        newJpaParameters()
-            .addPredicate(root -> builder.equal(root.join("relationshipType"), relationshipType)));
-  }
-
   @Override
   @SuppressWarnings("unchecked")
   public List<String> getUidsByRelationshipKeys(List<String> relationshipKeyList) {

dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/relationship/RelationshipDeletionHandlerTest.java

@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2004-2022, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.relationship;
+
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.hisp.dhis.common.DeleteNotAllowedException;
+import org.hisp.dhis.common.IdentifiableObjectManager;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.test.integration.PostgresIntegrationTestBase;
+import org.hisp.dhis.trackedentity.TrackedEntity;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+@Transactional
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class RelationshipDeletionHandlerTest extends PostgresIntegrationTestBase {
+  private RelationshipType relationshipType;
+
+  private RelationshipType deletableRelationshipType;
+
+  private Relationship relationship;
+
+  @Autowired private IdentifiableObjectManager manager;
+
+  @BeforeAll
+  public void setUp() {
+    relationshipType = createRelationshipType('A');
+    manager.save(relationshipType);
+    deletableRelationshipType = createRelationshipType('B');
+    manager.save(deletableRelationshipType);
+    OrganisationUnit orgUnit = createOrganisationUnit('A');
+    manager.save(orgUnit);
+    TrackedEntity trackedEntityFrom = createTrackedEntity(orgUnit);
+    manager.save(trackedEntityFrom);
+    TrackedEntity trackedEntityTo = createTrackedEntity(orgUnit);
+    manager.save(trackedEntityTo);
+    relationship = createTeToTeRelationship(trackedEntityFrom, trackedEntityTo, relationshipType);
+    manager.save(relationship);
+  }
+
+  @Test
+  void shouldThrowExceptionWhenRelationshipTypeIsDeletedButARelationshipIsInTheDB() {
+    assertThrows(DeleteNotAllowedException.class, () -> manager.delete(relationshipType));
+  }
+
+  @Test
+  void shouldSuccessfullyDeleteRelationshipTypeWhenNoLinkedRelationshipIsInTheDB() {
+    manager.delete(deletableRelationshipType);
+
+    assertNull(manager.get(RelationshipType.class, deletableRelationshipType.getUid()));
+  }
+}