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

feature/prefixes-for-partner-member-debitor-in-api #122

Merged
hsh-michaelhoennig merged 10 commits from feature/prefixes-for-partner-member-debitor-in-api into master 2024-11-18 12:11:18 +01:00
Conversation 0 Commits 10 Files Changed 51 +15 -15
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 89f57f75be - Show all commits

12
src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorControllerAcceptanceTest.java
View File

@ -113,7 +113,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
"debitorNumber": 1000111, "debitorNumber": 1000111,
"debitorNumberSuffix": "11", "debitorNumberSuffix": "11",
"partner": { "partner": {
"partnerNumber": 10001, "partnerNumber": "P-10001",
"partnerRel": { "partnerRel": {
"anchor": { "anchor": {
"personType": "LEGAL_PERSON", "personType": "LEGAL_PERSON",
@ -168,7 +168,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
"debitorNumber": 1000212, "debitorNumber": 1000212,
"debitorNumberSuffix": "12", "debitorNumberSuffix": "12",
"partner": { "partner": {
"partnerNumber": 10002, "partnerNumber": "P-10002",
"partnerRel": { "partnerRel": {
"anchor": {"tradeName": "Hostsharing eG"}, "anchor": {"tradeName": "Hostsharing eG"},
"holder": {"tradeName": "Second e.K."}, "holder": {"tradeName": "Second e.K."},
@ -202,7 +202,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
"debitorNumber": 1000313, "debitorNumber": 1000313,
"debitorNumberSuffix": "13", "debitorNumberSuffix": "13",
"partner": { "partner": {
"partnerNumber": 10003, "partnerNumber": "P-10003",
"partnerRel": { "partnerRel": {
"anchor": {"tradeName": "Hostsharing eG"}, "anchor": {"tradeName": "Hostsharing eG"},
"holder": {"tradeName": "Third OHG"}, "holder": {"tradeName": "Third OHG"},
@ -245,7 +245,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
[ [
{ {
"debitorNumber": 1000212, "debitorNumber": 1000212,
"partner": { "partnerNumber": 10002 }, "partner": { "partnerNumber": "P-10002" },
"debitorRel": { "debitorRel": {
"contact": { "caption": "second contact" } "contact": { "caption": "second contact" }
}, },
@ -535,7 +535,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
.body("", lenientlyEquals(""" .body("", lenientlyEquals("""
{ {
"debitorNumber": 1000111, "debitorNumber": 1000111,
"partner": { "partnerNumber": 10001 }, "partner": { "partnerNumber": "P-10001" },
"debitorRel": { "contact": { "caption": "first contact" } }, "debitorRel": { "contact": { "caption": "first contact" } },
"refundBankAccount": null "refundBankAccount": null
} }
@ -584,7 +584,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
"debitorNumber": 10004${debitorNumberSuffix}, "debitorNumber": 10004${debitorNumberSuffix},
"debitorNumberSuffix": "${debitorNumberSuffix}", "debitorNumberSuffix": "${debitorNumberSuffix}",
"partner": { "partner": {
"partnerNumber": 10004, "partnerNumber": "P-10004",
"partnerRel": { "partnerRel": {
"anchor": { "tradeName": "Hostsharing eG" }, "anchor": { "tradeName": "Hostsharing eG" },
"holder": { "tradeName": "Fourth eG" }, "holder": { "tradeName": "Fourth eG" },

18
src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipControllerAcceptanceTest.java
View File

@ -77,7 +77,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
.body("", lenientlyEquals(""" .body("", lenientlyEquals("""
[ [
{ {
"partner": { "partnerNumber": 10001 }, "partner": { "partnerNumber": "P-10001" },
"memberNumber": 1000101, "memberNumber": 1000101,
"memberNumberSuffix": "01", "memberNumberSuffix": "01",
"validFrom": "2022-10-01", "validFrom": "2022-10-01",
@ -85,7 +85,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
"status": "ACTIVE" "status": "ACTIVE"
}, },
{ {
"partner": { "partnerNumber": 10002 }, "partner": { "partnerNumber": "P-10002" },
"memberNumber": 1000202, "memberNumber": 1000202,
"memberNumberSuffix": "02", "memberNumberSuffix": "02",
"validFrom": "2022-10-01", "validFrom": "2022-10-01",
@ -93,7 +93,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
"status": "ACTIVE" "status": "ACTIVE"
}, },
{ {
"partner": { "partnerNumber": 10003 }, "partner": { "partnerNumber": "P-10003" },
"memberNumber": 1000303, "memberNumber": 1000303,
"memberNumberSuffix": "03", "memberNumberSuffix": "03",
"validFrom": "2022-10-01", "validFrom": "2022-10-01",
@ -124,7 +124,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
.body("", lenientlyEquals(""" .body("", lenientlyEquals("""
[ [
{ {
"partner": { "partnerNumber": 10001 }, "partner": { "partnerNumber": "P-10001" },
"memberNumber": 1000101, "memberNumber": 1000101,
"memberNumberSuffix": "01", "memberNumberSuffix": "01",
"validFrom": "2022-10-01", "validFrom": "2022-10-01",
@ -152,7 +152,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
.body("", lenientlyEquals(""" .body("", lenientlyEquals("""
[ [
{ {
"partner": { "partnerNumber": 10002 }, "partner": { "partnerNumber": "P-10002" },
"memberNumber": 1000202, "memberNumber": 1000202,
"memberNumberSuffix": "02", "memberNumberSuffix": "02",
"validFrom": "2022-10-01", "validFrom": "2022-10-01",
@ -195,7 +195,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
.statusCode(201) .statusCode(201)
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body("uuid", isUuidValid()) .body("uuid", isUuidValid())
.body("partner.partnerNumber", is(10003)) .body("partner.partnerNumber", is("P-10003"))
.body("memberNumber", is(expectedMemberNumber)) .body("memberNumber", is(expectedMemberNumber))
.body("memberNumberSuffix", is(givenMemberSuffix)) .body("memberNumberSuffix", is(givenMemberSuffix))
.body("validFrom", is("2022-10-13")) .body("validFrom", is("2022-10-13"))
@ -230,7 +230,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
.contentType("application/json") .contentType("application/json")
.body("", lenientlyEquals(""" .body("", lenientlyEquals("""
{ {
"partner": { "partnerNumber": 10001 }, "partner": { "partnerNumber": "P-10001" },
"memberNumber": 1000101, "memberNumber": 1000101,
"memberNumberSuffix": "01", "memberNumberSuffix": "01",
"validFrom": "2022-10-01", "validFrom": "2022-10-01",
@ -272,7 +272,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
.contentType("application/json") .contentType("application/json")
.body("", lenientlyEquals(""" .body("", lenientlyEquals("""
{ {
"partner": { "partnerNumber": 10003 }, "partner": { "partnerNumber": "P-10003" },
"memberNumber": 1000303, "memberNumber": 1000303,
"memberNumberSuffix": "03", "memberNumberSuffix": "03",
"validFrom": "2022-10-01", "validFrom": "2022-10-01",
@ -309,7 +309,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
.statusCode(200) .statusCode(200)
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body("uuid", isUuidValid()) .body("uuid", isUuidValid())
.body("partner.partnerNumber", is(givenMembership.getPartner().getPartnerNumber())) .body("partner.partnerNumber", is("P-" + givenMembership.getPartner().getPartnerNumber()))
.body("memberNumberSuffix", is(givenMembership.getMemberNumberSuffix())) .body("memberNumberSuffix", is(givenMembership.getMemberNumberSuffix()))
.body("validFrom", is("2022-11-01")) .body("validFrom", is("2022-11-01"))
.body("validTo", is("2023-12-31")) .body("validTo", is("2023-12-31"))