src/main/resources/db/changelog/5-hs-office/510-membership/5100-hs-office-membership.sql

@@ -38,6 +38,8 @@ create table if not exists hs_office.membership
 
 CREATE OR REPLACE FUNCTION hs_office.validate_membership_validity()
     RETURNS trigger AS $$
+DECLARE
+    partnerNumber int;
 BEGIN
     IF EXISTS (
         SELECT 1
@@ -46,7 +48,10 @@ BEGIN
               AND uuid <> NEW.uuid
               AND NEW.validity && validity
     ) THEN
-        RAISE EXCEPTION 'Membership validity ranges overlap for partnerUuid %', NEW.partnerUuid;
+        SELECT p.partnerNumber INTO partnerNumber
+            FROM hs_office.partner AS p
+            WHERE p.uuid = NEW.partnerUuid;
+        RAISE EXCEPTION 'Membership validity ranges overlap for partnerUuid %, partnerNumber %', NEW.partnerUuid, partnerNumber;
     END IF;
 
     RETURN NEW;

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

@@ -4,10 +4,10 @@ import io.hypersistence.utils.hibernate.type.range.Range;
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorRepository;
 import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerRealRepository;
-import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
+import net.hostsharing.hsadminng.mapper.Array;
 import net.hostsharing.hsadminng.rbac.grant.RawRbacGrantRepository;
 import net.hostsharing.hsadminng.rbac.role.RawRbacRoleRepository;
-import net.hostsharing.hsadminng.mapper.Array;
+import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
 import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Tag;
@@ -15,9 +15,9 @@ import org.junit.jupiter.api.Test;
 import org.postgresql.util.PSQLException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.context.annotation.Import;
 import org.springframework.orm.jpa.JpaSystemException;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
@@ -71,7 +71,8 @@ class HsOfficeMembershipRepositoryIntegrationTest extends ContextBasedTestWithCl
             final var givenPartner = partnerRepo.findPartnerByOptionalNameLike("First").get(0);
 
             // when
-            final var result = attempt(em, () -> {
+            final var result = attempt(
+                    em, () -> {
                         final var newMembership = HsOfficeMembershipEntity.builder()
                                 .memberNumberSuffix("11")
                                 .partner(givenPartner)
@@ -92,11 +93,11 @@ class HsOfficeMembershipRepositoryIntegrationTest extends ContextBasedTestWithCl
         public void creatingMembershipForSamePartnerIsDisallowedIfAnotherOneIsStillActive() {
             // given
             context("superuser-alex@hostsharing.net");
-            final var count = membershipRepo.count();
             final var givenPartner = partnerRepo.findPartnerByOptionalNameLike("First").getFirst();
 
             // when
-            final var result = attempt(em, () -> {
+            final var result = attempt(
+                    em, () -> {
                         final var newMembership = HsOfficeMembershipEntity.builder()
                                 .memberNumberSuffix("11")
                                 .partner(givenPartner)
@@ -107,7 +108,10 @@ class HsOfficeMembershipRepositoryIntegrationTest extends ContextBasedTestWithCl
                     });
 
             // then
-            result.assertExceptionWithRootCauseMessage(PSQLException.class, "Membership validity ranges overlap for partnerUuid " + givenPartner.getUuid());
+            result.assertExceptionWithRootCauseMessage(
+                    PSQLException.class,
+                    "Membership validity ranges overlap for partnerUuid " + givenPartner.getUuid() +
+                            ", partnerNumber " + givenPartner.getPartnerNumber());
         }
 
         @Test
@@ -120,7 +124,8 @@ class HsOfficeMembershipRepositoryIntegrationTest extends ContextBasedTestWithCl
                     .toList();
 
             // when
-            attempt(em, () -> {
+            attempt(
+                    em, () -> {
                         final var givenPartner = partnerRepo.findPartnerByOptionalNameLike("First").get(0);
                         final var newMembership = HsOfficeMembershipEntity.builder()
                                 .memberNumberSuffix("17")
@@ -201,7 +206,8 @@ class HsOfficeMembershipRepositoryIntegrationTest extends ContextBasedTestWithCl
             final var result = membershipRepo.findMembershipsByPartnerUuid(givenPartner.getUuid());
 
             // then
-            exactlyTheseMembershipsAreReturned(result,
+            exactlyTheseMembershipsAreReturned(
+                    result,
                     "Membership(M-1000101, P-10001, [2022-10-01,2024-12-31), ACTIVE)");
         }
 
@@ -244,7 +250,8 @@ class HsOfficeMembershipRepositoryIntegrationTest extends ContextBasedTestWithCl
             final var result = membershipRepo.findMembershipsByPartnerNumber(10002);
 
             // then
-            exactlyTheseMembershipsAreReturned(result,
+            exactlyTheseMembershipsAreReturned(
+                    result,
                     "Membership(M-1000202, P-10002, [2022-10-01,2026-01-01), ACTIVE)");
         }
     }
@@ -296,7 +303,8 @@ class HsOfficeMembershipRepositoryIntegrationTest extends ContextBasedTestWithCl
             });
 
             // then
-            result.assertExceptionWithRootCauseMessage(JpaSystemException.class,
+            result.assertExceptionWithRootCauseMessage(
+                    JpaSystemException.class,
                     "[403] Subject ", " is not allowed to update hs_office.membership uuid");
         }
 
@@ -404,7 +412,9 @@ class HsOfficeMembershipRepositoryIntegrationTest extends ContextBasedTestWithCl
                 "[creating Membership test-data, hs_office.membership, INSERT, 03]");
     }
 
-    private HsOfficeMembershipEntity givenSomeTemporaryMembership(final String partnerTradeName, final String memberNumberSuffix) {
+    private HsOfficeMembershipEntity givenSomeTemporaryMembership(
+            final String partnerTradeName,
+            final String memberNumberSuffix) {
         return jpaAttempt.transacted(() -> {
             context("superuser-alex@hostsharing.net");
             final var givenPartner = partnerRepo.findPartnerByOptionalNameLike(partnerTradeName).get(0);