hostsharing/hs.hsadmin.ng
6
0
Fork 0
Code Pull Requests 2 Activity

scenario test for multiple debitors+memberships + validation for subsequent memberships #160

Merged
hsh-michaelhoennig merged 3 commits from bugfix/multiple-debitors-and-memberships into master 2025-02-25 09:46:39 +01:00
Conversation 0 Commits 3 Files Changed 9 +56 -41
2 changed files with 56 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d2881884a1 - Show all commits

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

@ -38,6 +38,8 @@ create table if not exists hs_office.membership
CREATE OR REPLACE FUNCTION hs_office.validate_membership_validity() CREATE OR REPLACE FUNCTION hs_office.validate_membership_validity()
RETURNS trigger AS $$ RETURNS trigger AS $$
DECLARE
partnerNumber int;
BEGIN BEGIN
IF EXISTS ( IF EXISTS (
SELECT 1 SELECT 1
@ -46,7 +48,10 @@ BEGIN
AND uuid <> NEW.uuid AND uuid <> NEW.uuid
AND NEW.validity && validity AND NEW.validity && validity
) THEN ) 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; END IF;
RETURN NEW; RETURN NEW;

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

@ -4,10 +4,10 @@ import io.hypersistence.utils.hibernate.type.range.Range;
import net.hostsharing.hsadminng.context.Context; import net.hostsharing.hsadminng.context.Context;
import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorRepository; import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorRepository;
import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerRealRepository; 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.grant.RawRbacGrantRepository;
import net.hostsharing.hsadminng.rbac.role.RawRbacRoleRepository; 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 net.hostsharing.hsadminng.rbac.test.JpaAttempt;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tag;
@ -15,9 +15,9 @@ import org.junit.jupiter.api.Test;
import org.postgresql.util.PSQLException; import org.postgresql.util.PSQLException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; 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.context.annotation.Import;
import org.springframework.orm.jpa.JpaSystemException; import org.springframework.orm.jpa.JpaSystemException;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext; import jakarta.persistence.PersistenceContext;
@ -32,7 +32,7 @@ import static net.hostsharing.hsadminng.rbac.test.JpaAttempt.attempt;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@DataJpaTest @DataJpaTest
@Import( { Context.class, JpaAttempt.class }) @Import({ Context.class, JpaAttempt.class })
@Tag("officeIntegrationTest") @Tag("officeIntegrationTest")
class HsOfficeMembershipRepositoryIntegrationTest extends ContextBasedTestWithCleanup { class HsOfficeMembershipRepositoryIntegrationTest extends ContextBasedTestWithCleanup {
@ -71,15 +71,16 @@ class HsOfficeMembershipRepositoryIntegrationTest extends ContextBasedTestWithCl
final var givenPartner = partnerRepo.findPartnerByOptionalNameLike("First").get(0); final var givenPartner = partnerRepo.findPartnerByOptionalNameLike("First").get(0);
// when // when
final var result = attempt(em, () -> { final var result = attempt(
final var newMembership = HsOfficeMembershipEntity.builder() em, () -> {
.memberNumberSuffix("11") final var newMembership = HsOfficeMembershipEntity.builder()
.partner(givenPartner) .memberNumberSuffix("11")
.validity(Range.closedInfinite(LocalDate.parse("2025-01-01"))) .partner(givenPartner)
.membershipFeeBillable(true) .validity(Range.closedInfinite(LocalDate.parse("2025-01-01")))
.build(); .membershipFeeBillable(true)
return toCleanup(membershipRepo.save(newMembership).load()); .build();
}); return toCleanup(membershipRepo.save(newMembership).load());
});
// then // then
result.assertSuccessful(); result.assertSuccessful();
@ -92,22 +93,25 @@ class HsOfficeMembershipRepositoryIntegrationTest extends ContextBasedTestWithCl
public void creatingMembershipForSamePartnerIsDisallowedIfAnotherOneIsStillActive() { public void creatingMembershipForSamePartnerIsDisallowedIfAnotherOneIsStillActive() {
// given // given
context("superuser-alex@hostsharing.net"); context("superuser-alex@hostsharing.net");
final var count = membershipRepo.count();
final var givenPartner = partnerRepo.findPartnerByOptionalNameLike("First").getFirst(); final var givenPartner = partnerRepo.findPartnerByOptionalNameLike("First").getFirst();
// when // when
final var result = attempt(em, () -> { final var result = attempt(
final var newMembership = HsOfficeMembershipEntity.builder() em, () -> {
.memberNumberSuffix("11") final var newMembership = HsOfficeMembershipEntity.builder()
.partner(givenPartner) .memberNumberSuffix("11")
.validity(Range.closedInfinite(LocalDate.parse("2024-01-01"))) .partner(givenPartner)
.membershipFeeBillable(true) .validity(Range.closedInfinite(LocalDate.parse("2024-01-01")))
.build(); .membershipFeeBillable(true)
return toCleanup(membershipRepo.save(newMembership).load()); .build();
}); return toCleanup(membershipRepo.save(newMembership).load());
});
// then // 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 @Test
@ -120,16 +124,17 @@ class HsOfficeMembershipRepositoryIntegrationTest extends ContextBasedTestWithCl
.toList(); .toList();
// when // when
attempt(em, () -> { attempt(
final var givenPartner = partnerRepo.findPartnerByOptionalNameLike("First").get(0); em, () -> {
final var newMembership = HsOfficeMembershipEntity.builder() final var givenPartner = partnerRepo.findPartnerByOptionalNameLike("First").get(0);
.memberNumberSuffix("17") final var newMembership = HsOfficeMembershipEntity.builder()
.partner(givenPartner) .memberNumberSuffix("17")
.validity(Range.closedInfinite(LocalDate.parse("2025-01-01"))) .partner(givenPartner)
.membershipFeeBillable(true) .validity(Range.closedInfinite(LocalDate.parse("2025-01-01")))
.build(); .membershipFeeBillable(true)
return toCleanup(membershipRepo.save(newMembership)); .build();
}).assertSuccessful(); return toCleanup(membershipRepo.save(newMembership));
}).assertSuccessful();
// then // then
final var all = rawRoleRepo.findAll(); final var all = rawRoleRepo.findAll();
@ -168,7 +173,7 @@ class HsOfficeMembershipRepositoryIntegrationTest extends ContextBasedTestWithCl
private void assertThatMembershipIsPersisted(final HsOfficeMembershipEntity saved) { private void assertThatMembershipIsPersisted(final HsOfficeMembershipEntity saved) {
final var found = membershipRepo.findByUuid(saved.getUuid()); final var found = membershipRepo.findByUuid(saved.getUuid());
assertThat(found).isNotEmpty().get().extracting(Object::toString).isEqualTo(saved.toString()) ; assertThat(found).isNotEmpty().get().extracting(Object::toString).isEqualTo(saved.toString());
} }
} }
@ -201,7 +206,8 @@ class HsOfficeMembershipRepositoryIntegrationTest extends ContextBasedTestWithCl
final var result = membershipRepo.findMembershipsByPartnerUuid(givenPartner.getUuid()); final var result = membershipRepo.findMembershipsByPartnerUuid(givenPartner.getUuid());
// then // then
exactlyTheseMembershipsAreReturned(result, exactlyTheseMembershipsAreReturned(
result,
"Membership(M-1000101, P-10001, [2022-10-01,2024-12-31), ACTIVE)"); "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); final var result = membershipRepo.findMembershipsByPartnerNumber(10002);
// then // then
exactlyTheseMembershipsAreReturned(result, exactlyTheseMembershipsAreReturned(
result,
"Membership(M-1000202, P-10002, [2022-10-01,2026-01-01), ACTIVE)"); "Membership(M-1000202, P-10002, [2022-10-01,2026-01-01), ACTIVE)");
} }
} }
@ -256,7 +263,7 @@ class HsOfficeMembershipRepositoryIntegrationTest extends ContextBasedTestWithCl
public void globalAdmin_canUpdateValidityOfArbitraryMembership() { public void globalAdmin_canUpdateValidityOfArbitraryMembership() {
// given // given
context("superuser-alex@hostsharing.net"); context("superuser-alex@hostsharing.net");
final var givenMembership = givenSomeTemporaryMembership("First", "11"); final var givenMembership = givenSomeTemporaryMembership("First", "11");
assertThatMembershipExistsAndIsAccessibleToCurrentContext(givenMembership); assertThatMembershipExistsAndIsAccessibleToCurrentContext(givenMembership);
final var newValidityEnd = LocalDate.now(); final var newValidityEnd = LocalDate.now();
@ -296,7 +303,8 @@ class HsOfficeMembershipRepositoryIntegrationTest extends ContextBasedTestWithCl
}); });
// then // then
result.assertExceptionWithRootCauseMessage(JpaSystemException.class, result.assertExceptionWithRootCauseMessage(
JpaSystemException.class,
"[403] Subject ", " is not allowed to update hs_office.membership uuid"); "[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]"); "[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(() -> { return jpaAttempt.transacted(() -> {
context("superuser-alex@hostsharing.net"); context("superuser-alex@hostsharing.net");
final var givenPartner = partnerRepo.findPartnerByOptionalNameLike(partnerTradeName).get(0); final var givenPartner = partnerRepo.findPartnerByOptionalNameLike(partnerTradeName).get(0);