refactoring

src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationController.java

@@ -53,14 +53,11 @@ public class HsOfficeRelationController implements HsOfficeRelationsApi {
             String contactData) {
         context.define(currentSubject, assumedRoles);
 
-        final var entities =
+        final List<HsOfficeRelationRbacEntity> entities =
-            ( personData == null && contactData == null )
+                relationRbacRepo.findRelationRelatedToPersonUuidRelationTypePersonAndContactData(
-                    ? relationRbacRepo.findRelationRelatedToPersonUuidAndRelationType(personUuid,
-                        relationType == null ? null : HsOfficeRelationType.valueOf(relationType.name()))
-                    : relationRbacRepo.findRelationRelatedToPersonUuidRelationTypePersonAndContactData(
                         personUuid,
                         relationType == null ? null : HsOfficeRelationType.valueOf(relationType.name()),
-                            forLike(personData), forLike(contactData));
+                        personData, contactData);
 
         final var resources = mapper.mapList(entities, HsOfficeRelationResource.class,
                 RELATION_ENTITY_TO_RESOURCE_POSTMAPPER);
@@ -152,10 +149,6 @@ public class HsOfficeRelationController implements HsOfficeRelationsApi {
         return ResponseEntity.ok(mapped);
     }
 
-    private String forLike(final String text) {
-        return text == null ? null : ("%" + text.toLowerCase() + "%");
-    }
-
     final BiConsumer<HsOfficeRelationRbacEntity, HsOfficeRelationResource> RELATION_ENTITY_TO_RESOURCE_POSTMAPPER = (entity, resource) -> {
         resource.setAnchor(mapper.map(entity.getAnchor(), HsOfficePersonResource.class));
         resource.setHolder(mapper.map(entity.getHolder(), HsOfficePersonResource.class));

src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationRbacRepository.java

@@ -12,51 +12,49 @@ public interface HsOfficeRelationRbacRepository extends Repository<HsOfficeRelat
 
     Optional<HsOfficeRelationRbacEntity> findByUuid(UUID id);
 
-    default List<HsOfficeRelationRbacEntity> findRelationRelatedToPersonUuidAndRelationType(@NotNull UUID personUuid, HsOfficeRelationType relationType) {
-        return findRelationRelatedToPersonUuidAndRelationTypeString(personUuid, relationType == null ? null : relationType.toString());
-    }
-
     @Query(value = """
             SELECT p.* FROM hs_office.relation_rv AS p
                 WHERE p.anchorUuid = :personUuid OR p.holderUuid = :personUuid
             """, nativeQuery = true)
     List<HsOfficeRelationRbacEntity> findRelationRelatedToPersonUuid(@NotNull UUID personUuid);
 
-    @Query(value = """
-            SELECT p.* FROM hs_office.relation_rv AS p
-                WHERE (:relationType IS NULL OR p.type = cast(:relationType AS hs_office.RelationType))
-                    AND ( p.anchorUuid = :personUuid OR p.holderUuid = :personUuid)
-            """, nativeQuery = true)
-    List<HsOfficeRelationRbacEntity> findRelationRelatedToPersonUuidAndRelationTypeString(@NotNull UUID personUuid, String relationType);
-
     /**
      * Finds relations by a conjunction of optional criteria, including anchorPerson, holderPerson and contact data.
-     *
+     *      *
      * @param personUuid the optional UUID of the anchorPerson or holderPerson
      * @param relationType the type of the relation
-     * @param personData a lower-case string to match the persons tradeName, familyName or givenName (use '%' for wildcard)
+     * @param personData a string to match the persons tradeName, familyName or givenName (use '%' for wildcard), case ignored
-     * @param contactData a lower-case string to match the contacts caption, postalAddress, emailAddresses or phoneNumbers (use '%' for wildcard)
+     * @param contactData a string to match the contacts caption, postalAddress, emailAddresses or phoneNumbers (use '%' for wildcard), case ignored
      * @return a list of (accessible) relations which match all given criteria
      */
-    @Query(value = """
+    default List<HsOfficeRelationRbacEntity> findRelationRelatedToPersonUuidRelationTypePersonAndContactData(
-            SELECT rel FROM HsOfficeRelationRbacEntity AS rel
-                WHERE (:relationType IS NULL OR CAST(rel.type AS String) = CAST(:relationType AS String))
-                    AND ( :personUuid IS NULL OR
-                            rel.anchor.uuid = :personUuid OR rel.holder.uuid = :personUuid )
-                    AND ( :personData IS NULL OR
-                            lower(rel.anchor.tradeName) LIKE :personData OR lower(rel.holder.tradeName) LIKE :personData OR
-                            lower(rel.anchor.familyName) LIKE :personData OR lower(rel.holder.familyName) LIKE :personData OR
-                            lower(rel.anchor.givenName) LIKE :personData OR lower(rel.holder.givenName) LIKE :personData )
-                    AND ( :contactData IS NULL OR
-                            lower(rel.contact.caption) LIKE :contactData OR
-                            lower(rel.contact.postalAddress) LIKE :contactData OR
-                            lower(CAST(rel.contact.emailAddresses AS String)) LIKE :contactData OR
-                            lower(CAST(rel.contact.phoneNumbers AS String)) LIKE :contactData )
-            """)
-    List<HsOfficeRelationRbacEntity> findRelationRelatedToPersonUuidRelationTypePersonAndContactData(
             UUID personUuid,
             HsOfficeRelationType relationType,
             String personData,
+            String contactData) {
+        return findRelationRelatedToPersonUuidRelationTypePersonAndContactDataImpl(
+                personUuid, toStringOrNull(relationType), forLike(personData), forLike(contactData));
+    }
+
+    @Query(value = """
+            SELECT rel FROM HsOfficeRelationRbacEntity AS rel
+                WHERE (:relationType IS NULL OR CAST(rel.type AS String) = :relationType)
+                    AND ( :personUuid IS NULL
+                            OR rel.anchor.uuid = :personUuid OR rel.holder.uuid = :personUuid )
+                    AND ( :personData IS NULL
+                            OR lower(rel.anchor.tradeName) LIKE :personData OR lower(rel.holder.tradeName) LIKE :personData
+                            OR lower(rel.anchor.familyName) LIKE :personData OR lower(rel.holder.familyName) LIKE :personData
+                            OR lower(rel.anchor.givenName) LIKE :personData OR lower(rel.holder.givenName) LIKE :personData )
+                    AND ( :contactData IS NULL
+                            OR lower(rel.contact.caption) LIKE :contactData
+                            OR lower(rel.contact.postalAddress) LIKE :contactData
+                            OR lower(CAST(rel.contact.emailAddresses AS String)) LIKE :contactData
+                            OR lower(CAST(rel.contact.phoneNumbers AS String)) LIKE :contactData )
+            """)
+    List<HsOfficeRelationRbacEntity> findRelationRelatedToPersonUuidRelationTypePersonAndContactDataImpl(
+            UUID personUuid,
+            String relationType,
+            String personData,
             String contactData);
 
     HsOfficeRelationRbacEntity save(final HsOfficeRelationRbacEntity entity);
@@ -64,4 +62,12 @@ public interface HsOfficeRelationRbacRepository extends Repository<HsOfficeRelat
     long count();
 
     int deleteByUuid(UUID uuid);
+
+    private static String forLike(final String text) {
+        return text == null ? null : ("%" + text.toLowerCase() + "%");
+    }
+
+    private static String toStringOrNull(final HsOfficeRelationType relationType) {
+        return relationType == null ? null : relationType.name();
+    }
 }

src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntityUnitTest.java

@@ -6,7 +6,6 @@ import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonType;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRealEntity;
 import net.hostsharing.hsadminng.rbac.generator.RbacViewMermaidFlowchartGenerator;
-import net.hostsharing.hsadminng.rbac.test.cust.TestCustomerEntity;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;

src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntityUnitTest.java

@@ -1,7 +1,6 @@
 package net.hostsharing.hsadminng.hs.office.membership;
 
 import io.hypersistence.utils.hibernate.type.range.Range;
-import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorEntity;
 import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerEntity;
 import net.hostsharing.hsadminng.rbac.generator.RbacViewMermaidFlowchartGenerator;
 import org.junit.jupiter.api.Test;

src/test/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonEntityUnitTest.java

@@ -1,6 +1,5 @@
 package net.hostsharing.hsadminng.hs.office.person;
 
-import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerEntity;
 import net.hostsharing.hsadminng.rbac.generator.RbacViewMermaidFlowchartGenerator;
 import org.junit.jupiter.api.Test;
 

src/test/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationRepositoryIntegrationTest.java

@@ -193,7 +193,7 @@ class HsOfficeRelationRepositoryIntegrationTest extends ContextBasedTestWithClea
                     .findFirst().orElseThrow();
 
             // when:
-            final var result = relationRbacRepo.findRelationRelatedToPersonUuidAndRelationType(person.getUuid(), null);
+            final var result = relationRbacRepo.findRelationRelatedToPersonUuidRelationTypePersonAndContactData(person.getUuid(), null, null, null);
 
             // then:
             exactlyTheseRelationsAreReturned(

src/test/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateEntityUnitTest.java

@@ -1,7 +1,6 @@
 package net.hostsharing.hsadminng.hs.office.sepamandate;
 
 import net.hostsharing.hsadminng.hs.office.bankaccount.HsOfficeBankAccountEntity;
-import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRbacEntity;
 import net.hostsharing.hsadminng.rbac.generator.RbacViewMermaidFlowchartGenerator;
 import org.junit.jupiter.api.Test;