From d66e9b2d542cbfe4d4e3f38f1aaaace9b72b149e Mon Sep 17 00:00:00 2001
From: Michael Hoennig <michael@hoennig.de>
Date: Sun, 29 Dec 2024 09:43:17 +0100
Subject: [PATCH] use ILIKE in Relation-queries

---
 .../relation/HsOfficeRelationRbacRepository.java | 16 ++++++++--------
 .../relation/HsOfficeRelationRealRepository.java | 16 ++++++++--------
 ...sOfficeRelationRepositoryIntegrationTest.java |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationRbacRepository.java b/src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationRbacRepository.java
index e687bdcb..f45fce1a 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationRbacRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationRbacRepository.java
@@ -48,16 +48,16 @@ public interface HsOfficeRelationRbacRepository extends Repository<HsOfficeRelat
                 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 ( :mark IS NULL OR lower(rel.mark) LIKE :mark )
+                    AND ( :mark IS NULL OR rel.mark ILIKE :mark )
                     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 )
+                            OR rel.anchor.tradeName ILIKE :personData OR rel.holder.tradeName ILIKE :personData
+                            OR rel.anchor.familyName ILIKE :personData OR rel.holder.familyName ILIKE :personData
+                            OR rel.anchor.givenName ILIKE :personData OR rel.holder.givenName ILIKE :personData )
                     AND ( :contactData IS NULL
-                            OR lower(rel.contact.caption) LIKE :contactData
-                            OR lower(CAST(rel.contact.postalAddress AS String)) LIKE :contactData
-                            OR lower(CAST(rel.contact.emailAddresses AS String)) LIKE :contactData
-                            OR lower(CAST(rel.contact.phoneNumbers AS String)) LIKE :contactData )
+                            OR rel.contact.caption ILIKE :contactData
+                            OR CAST(rel.contact.postalAddress AS String) ILIKE :contactData
+                            OR CAST(rel.contact.emailAddresses AS String) ILIKE :contactData
+                            OR CAST(rel.contact.phoneNumbers AS String) ILIKE :contactData )
             """)
     @Timed("app.office.relations.repo.findRelationRelatedToPersonUuidRelationByTypeMarkPersonAndContactDataImpl.rbac")
     List<HsOfficeRelationRbacEntity> findRelationRelatedToPersonUuidRelationByTypeMarkPersonAndContactDataImpl(
diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationRealRepository.java b/src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationRealRepository.java
index 5a2249d7..8d2e7e90 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationRealRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationRealRepository.java
@@ -48,16 +48,16 @@ public interface HsOfficeRelationRealRepository extends Repository<HsOfficeRelat
                 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 ( :mark IS NULL OR lower(rel.mark) LIKE :mark )
+                    AND ( :mark IS NULL OR rel.mark ILIKE :mark )
                     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 )
+                            OR rel.anchor.tradeName ILIKE :personData OR rel.holder.tradeName ILIKE :personData
+                            OR rel.anchor.familyName ILIKE :personData OR rel.holder.familyName ILIKE :personData
+                            OR rel.anchor.givenName ILIKE :personData OR rel.holder.givenName ILIKE :personData )
                     AND ( :contactData IS NULL
-                            OR lower(rel.contact.caption) LIKE :contactData
-                            OR lower(CAST(rel.contact.postalAddress AS String)) LIKE :contactData
-                            OR lower(CAST(rel.contact.emailAddresses AS String)) LIKE :contactData
-                            OR lower(CAST(rel.contact.phoneNumbers AS String)) LIKE :contactData )
+                            OR rel.contact.caption ILIKE :contactData
+                            OR CAST(rel.contact.postalAddress AS String) ILIKE :contactData
+                            OR CAST(rel.contact.emailAddresses AS String) ILIKE :contactData
+                            OR CAST(rel.contact.phoneNumbers AS String) ILIKE :contactData )
             """)
     @Timed("app.office.relations.repo.findRelationRelatedToPersonUuidRelationByTypeMarkPersonAndContactDataImpl.real")
     List<HsOfficeRelationRealEntity> findRelationRelatedToPersonUuidRelationByTypeMarkPersonAndContactDataImpl(
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationRepositoryIntegrationTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationRepositoryIntegrationTest.java
index 580bd1a8..aec09e1d 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationRepositoryIntegrationTest.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationRepositoryIntegrationTest.java
@@ -78,7 +78,7 @@ class HsOfficeRelationRepositoryIntegrationTest extends ContextBasedTestWithClea
         @Test
         public void testHostsharingAdminCanAssumeRelationRoleWithUuid() {
             final var relationUuid = relationRealRepo.findRelationRelatedToPersonUuidRelationTypeMarkPersonAndContactData(
-                    null, HsOfficeRelationType.PARTNER, null, "Peter Smith - The Second Hand and Thrift Stores-n-Shipping e.K.", null)
+                    null, HsOfficeRelationType.PARTNER, null, "%Second%", null)
                     .stream().reduce(Reducer::toSingleElement).orElseThrow().getUuid();
 
             context("superuser-alex@hostsharing.net", "hs_office.relation#" + relationUuid + ":AGENT");