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

OfficeScenarioTests CoopShares+Assets #121

Merged
hsh-michaelhoennig merged 39 commits from feature/use-case-acceptance-tests-4 into master 2024-11-15 11:54:19 +01:00
Conversation 0 Commits 39 Files Changed 56 +95 -95
16 changed files with 95 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3a910468b4 - Show all commits

14
src/test/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemControllerAcceptanceTest.java
View File

@ -150,7 +150,7 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(""" .body("""
{ {
"projectUuid": "{projectUuid}", "project.uuid": "{projectUuid}",
"type": "MANAGED_SERVER", "type": "MANAGED_SERVER",
"caption": "some new booking", "caption": "some new booking",
"validTo": "{validTo}", "validTo": "{validTo}",
@ -200,8 +200,8 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(""" .body("""
{ {
"projectUuid": "{projectUuid}", "project.uuid": "{projectUuid}",
"parentItemUuid": "{managedServerUuid}", "parentItem.uuid": "{managedServerUuid}",
"type": "MANAGED_WEBSPACE", "type": "MANAGED_WEBSPACE",
"caption": "some managed webspace", "caption": "some managed webspace",
"resources": { "resources": {
@ -270,7 +270,7 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(""" .body("""
{ {
"projectUuid": "{projectUuid}", "project.uuid": "{projectUuid}",
"type": "DOMAIN_SETUP", "type": "DOMAIN_SETUP",
"caption": "Domain-Setup for example.org", "caption": "Domain-Setup for example.org",
"resources": { "resources": {
@ -285,7 +285,7 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
}, },
{ {
"type": "DOMAIN_HTTP_SETUP", "type": "DOMAIN_HTTP_SETUP",
"assignedToAssetUuid": "{unixUserUuid}" "assignedToAsset.uuid": "{unixUserUuid}"
}, },
{ {
"type": "DOMAIN_MBOX_SETUP" "type": "DOMAIN_MBOX_SETUP"
@ -360,7 +360,7 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(""" .body("""
{ {
"projectUuid": "{projectUuid}", "project.uuid": "{projectUuid}",
"type": "DOMAIN_SETUP", "type": "DOMAIN_SETUP",
"caption": "some new domain-setup booking", "caption": "some new domain-setup booking",
"resources": { "resources": {
@ -375,7 +375,7 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
}, },
{ {
"type": "DOMAIN_HTTP_SETUP", "type": "DOMAIN_HTTP_SETUP",
"assignedToAssetUuid": "{unixUserUuid}" "assignedToAsset.uuid": "{unixUserUuid}"
}, },
{ {
"type": "DOMAIN_MBOX_SETUP" "type": "DOMAIN_MBOX_SETUP"

4
src/test/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemControllerRestTest.java
View File

@ -105,7 +105,7 @@ class HsBookingItemControllerRestTest {
.contentType(MediaType.APPLICATION_JSON) .contentType(MediaType.APPLICATION_JSON)
.content(""" .content("""
{ {
"projectUuid": "{projectUuid}", "project.uuid": "{projectUuid}",
"type": "MANAGED_SERVER", "type": "MANAGED_SERVER",
"caption": "some new booking", "caption": "some new booking",
"validTo": "{validTo}", "validTo": "{validTo}",
@ -155,7 +155,7 @@ class HsBookingItemControllerRestTest {
.contentType(MediaType.APPLICATION_JSON) .contentType(MediaType.APPLICATION_JSON)
.content(""" .content("""
{ {
"projectUuid": "{projectUuid}", "project.uuid": "{projectUuid}",
"type": "MANAGED_SERVER", "type": "MANAGED_SERVER",
"caption": "some new booking", "caption": "some new booking",
"validFrom": "{validFrom}", "validFrom": "{validFrom}",

2
src/test/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectControllerAcceptanceTest.java
View File

@ -92,7 +92,7 @@ class HsBookingProjectControllerAcceptanceTest extends ContextBasedTestWithClean
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(""" .body("""
{ {
"debitorUuid": "%s", "debitor.uuid": "%s",
"caption": "some new project" "caption": "some new project"
} }
""".formatted(givenDebitor.getUuid())) """.formatted(givenDebitor.getUuid()))

14
src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerAcceptanceTest.java
View File

@ -165,10 +165,10 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(""" .body("""
{ {
"bookingItemUuid": "%s", "bookingItem.uuid": "%s",
"type": "MANAGED_WEBSPACE", "type": "MANAGED_WEBSPACE",
"identifier": "fir10", "identifier": "fir10",
"parentAssetUuid": "%s", "parentAsset.uuid": "%s",
"caption": "some separate ManagedWebspace HA", "caption": "some separate ManagedWebspace HA",
"config": {} "config": {}
} }
@ -227,7 +227,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(""" .body("""
{ {
"parentAssetUuid": "%s", "parentAsset.uuid": "%s",
"type": "UNIX_USER", "type": "UNIX_USER",
"identifier": "fir01-temp", "identifier": "fir01-temp",
"caption": "some new UnixUser in client's ManagedWebspace", "caption": "some new UnixUser in client's ManagedWebspace",
@ -280,7 +280,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(""" .body("""
{ {
"bookingItemUuid": "%s", "bookingItem.uuid": "%s",
"type": "DOMAIN_SETUP", "type": "DOMAIN_SETUP",
"identifier": "example.com", "identifier": "example.com",
"caption": "some unrelated domain-setup", "caption": "some unrelated domain-setup",
@ -326,7 +326,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(""" .body("""
{ {
"bookingItemUuid": "%s", "bookingItem.uuid": "%s",
"type": "MANAGED_SERVER", "type": "MANAGED_SERVER",
"identifier": "vm1400", "identifier": "vm1400",
"caption": "some new ManagedServer", "caption": "some new ManagedServer",
@ -381,7 +381,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(""" .body("""
{ {
"parentAssetUuid": "%s", "parentAsset.uuid": "%s",
"type": "UNIX_USER", "type": "UNIX_USER",
"identifier": "fir01-extra", "identifier": "fir01-extra",
"caption": "some extra UnixUser", "caption": "some extra UnixUser",
@ -508,7 +508,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(""" .body("""
{ {
"alarmContactUuid": "%s", "alarmContact.uuid": "%s",
"config": { "config": {
"monit_max_ssd_usage": 85, "monit_max_ssd_usage": 85,
"monit_max_hdd_usage": null, "monit_max_hdd_usage": null,

8
src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/factories/DomainSetupHostingAssetFactoryUnitTest.java
View File

@ -83,7 +83,7 @@ class DomainSetupHostingAssetFactoryUnitTest {
"subHostingAssets": [ "subHostingAssets": [
{ {
"type": "DOMAIN_HTTP_SETUP", "type": "DOMAIN_HTTP_SETUP",
"assignedToAssetUuid": "{unixUserHostingAssetUuid}" "assignedToAsset.uuid": "{unixUserHostingAssetUuid}"
}, },
{ {
"type": "DOMAIN_DNS_SETUP" "type": "DOMAIN_DNS_SETUP"
@ -124,7 +124,7 @@ class DomainSetupHostingAssetFactoryUnitTest {
"subHostingAssets": [ "subHostingAssets": [
{ {
"type": "DOMAIN_HTTP_SETUP", "type": "DOMAIN_HTTP_SETUP",
"assignedToAssetUuid": "{unixUserHostingAssetUuid}" "assignedToAsset.uuid": "{unixUserHostingAssetUuid}"
}, },
{ {
"type": "DOMAIN_DNS_SETUP" "type": "DOMAIN_DNS_SETUP"
@ -164,7 +164,7 @@ class DomainSetupHostingAssetFactoryUnitTest {
"subHostingAssets": [ "subHostingAssets": [
{ {
"type": "DOMAIN_HTTP_SETUP", "type": "DOMAIN_HTTP_SETUP",
"assignedToAssetUuid": "{unixUserHostingAssetUuid}" "assignedToAsset.uuid": "{unixUserHostingAssetUuid}"
}, },
{ {
"type": "DOMAIN_DNS_SETUP" "type": "DOMAIN_DNS_SETUP"
@ -206,7 +206,7 @@ class DomainSetupHostingAssetFactoryUnitTest {
"subHostingAssets": [ "subHostingAssets": [
{ {
"type": "DOMAIN_HTTP_SETUP", "type": "DOMAIN_HTTP_SETUP",
"assignedToAssetUuid": "{unixUserHostingAssetUuid}" "assignedToAsset.uuid": "{unixUserHostingAssetUuid}"
}, },
{ {
"type": "DOMAIN_DNS_SETUP" "type": "DOMAIN_DNS_SETUP"

12
src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionControllerAcceptanceTest.java
View File

@ -180,7 +180,7 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(""" .body("""
{ {
"membershipUuid": "%s", "membership.uuid": "%s",
"transactionType": "DEPOSIT", "transactionType": "DEPOSIT",
"assetValue": 1024.00, "assetValue": 1024.00,
"valueDate": "2022-10-13", "valueDate": "2022-10-13",
@ -237,13 +237,13 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(""" .body("""
{ {
"membershipUuid": "%s", "membership.uuid": "%s",
"transactionType": "ADJUSTMENT", "transactionType": "ADJUSTMENT",
"assetValue": %s, "assetValue": %s,
"valueDate": "2022-10-30", "valueDate": "2022-10-30",
"reference": "test ref adjustment", "reference": "test ref adjustment",
"comment": "some coop assets adjustment transaction", "comment": "some coop assets adjustment transaction",
"reverseEntryUuid": "%s" "reverseEntry.uuid": "%s"
} }
""".formatted( """.formatted(
givenMembership.getUuid(), givenMembership.getUuid(),
@ -270,7 +270,7 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
"reference": "test ref" "reference": "test ref"
} }
} }
""".formatted(givenTransaction.getUuid()))) """))
.header("Location", startsWith("http://localhost")) .header("Location", startsWith("http://localhost"))
.extract().header("Location"); // @formatter:on .extract().header("Location"); // @formatter:on
@ -293,14 +293,14 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(""" .body("""
{ {
"membershipUuid": "%s", "membership.uuid": "%s",
"transactionType": "DISBURSAL", "transactionType": "DISBURSAL",
"assetValue": -10240.00, "assetValue": -10240.00,
"valueDate": "2022-10-13", "valueDate": "2022-10-13",
"reference": "temp ref X", "reference": "temp ref X",
"comment": "just some test coop assets transaction" "comment": "just some test coop assets transaction"
} }
""".formatted(givenMembership.getUuid())) """.formatted(givenMembership.getUuid()))
.port(port) .port(port)
.when() .when()
.post("http://localhost/api/hs/office/coopassetstransactions") .post("http://localhost/api/hs/office/coopassetstransactions")

2
src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionControllerRestTest.java
View File

@ -37,7 +37,7 @@ class HsOfficeCoopAssetsTransactionControllerRestTest {
static final String VALID_INSERT_REQUEST_BODY = """ static final String VALID_INSERT_REQUEST_BODY = """
{ {
"membershipUuid": "%s", "membership.uuid": "%s",
"transactionType": "DEPOSIT", "transactionType": "DEPOSIT",
"assetValue": 128.00, "assetValue": 128.00,
"valueDate": "2022-10-13", "valueDate": "2022-10-13",

8
src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionControllerAcceptanceTest.java
View File

@ -168,7 +168,7 @@ class HsOfficeCoopSharesTransactionControllerAcceptanceTest extends ContextBased
final var location = RestAssured // @formatter:off final var location = RestAssured // @formatter:off
.given().header("current-subject", "superuser-alex@hostsharing.net").contentType(ContentType.JSON).body(""" .given().header("current-subject", "superuser-alex@hostsharing.net").contentType(ContentType.JSON).body("""
{ {
"membershipUuid": "%s", "membership.uuid": "%s",
"transactionType": "SUBSCRIPTION", "transactionType": "SUBSCRIPTION",
"shareCount": 8, "shareCount": 8,
"valueDate": "2022-10-13", "valueDate": "2022-10-13",
@ -214,13 +214,13 @@ class HsOfficeCoopSharesTransactionControllerAcceptanceTest extends ContextBased
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(""" .body("""
{ {
"membershipUuid": "%s", "membership.uuid": "%s",
"transactionType": "ADJUSTMENT", "transactionType": "ADJUSTMENT",
"shareCount": %s, "shareCount": %s,
"valueDate": "2022-10-30", "valueDate": "2022-10-30",
"reference": "test ref adjustment", "reference": "test ref adjustment",
"comment": "some coop shares adjustment transaction", "comment": "some coop shares adjustment transaction",
"adjustedShareTxUuid": "%s" "adjustedShareTx.uuid": "%s"
} }
""".formatted( """.formatted(
givenMembership.getUuid(), givenMembership.getUuid(),
@ -267,7 +267,7 @@ class HsOfficeCoopSharesTransactionControllerAcceptanceTest extends ContextBased
RestAssured // @formatter:off RestAssured // @formatter:off
.given().header("current-subject", "superuser-alex@hostsharing.net").contentType(ContentType.JSON).body(""" .given().header("current-subject", "superuser-alex@hostsharing.net").contentType(ContentType.JSON).body("""
{ {
"membershipUuid": "%s", "membership.uuid": "%s",
"transactionType": "CANCELLATION", "transactionType": "CANCELLATION",
"shareCount": -80, "shareCount": -80,
"valueDate": "2022-10-13", "valueDate": "2022-10-13",

4
src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionControllerRestTest.java
View File

@ -37,7 +37,7 @@ class HsOfficeCoopSharesTransactionControllerRestTest {
static final String VALID_INSERT_REQUEST_BODY = """ static final String VALID_INSERT_REQUEST_BODY = """
{ {
"membershipUuid": "%s", "membership.uuid": "%s",
"transactionType": "SUBSCRIPTION", "transactionType": "SUBSCRIPTION",
"shareCount": 8, "shareCount": 8,
"valueDate": "2022-10-13", "valueDate": "2022-10-13",
@ -48,7 +48,7 @@ class HsOfficeCoopSharesTransactionControllerRestTest {
enum BadRequestTestCases { enum BadRequestTestCases {
MEMBERSHIP_UUID_MISSING( MEMBERSHIP_UUID_MISSING(
requestBody -> requestBody.without("membershipUuid"), requestBody -> requestBody.without("membership.uuid"),
"[membershipUuid must not be null but is \"null\"]"), "[membershipUuid must not be null but is \"null\"]"),
TRANSACTION_TYPE_MISSING( TRANSACTION_TYPE_MISSING(

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

@ -287,14 +287,14 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(""" .body("""
{ {
"debitorRelUuid": "%s", "debitorRel.uuid": "%s",
"debitorNumberSuffix": "%s", "debitorNumberSuffix": "%s",
"billable": "true", "billable": "true",
"vatId": "VAT123456", "vatId": "VAT123456",
"vatCountryCode": "DE", "vatCountryCode": "DE",
"vatBusiness": true, "vatBusiness": true,
"vatReverseCharge": "false", "vatReverseCharge": "false",
"refundBankAccountUuid": "%s", "refundBankAccount.uuid": "%s",
"defaultPrefix": "for" "defaultPrefix": "for"
} }
""".formatted( givenDebitorRelUUid, ++nextDebitorSuffix, givenBankAccount.getUuid())) """.formatted( givenDebitorRelUUid, ++nextDebitorSuffix, givenBankAccount.getUuid()))
@ -333,9 +333,9 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
.body(""" .body("""
{ {
"debitorRel": { "debitorRel": {
"anchorUuid": "%s", "anchor.uuid": "%s",
"holderUuid": "%s", "holder.uuid": "%s",
"contactUuid": "%s" "contact.uuid": "%s"
}, },
"debitorNumberSuffix": "%s", "debitorNumberSuffix": "%s",
"defaultPrefix": "for", "defaultPrefix": "for",
@ -384,9 +384,9 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
.body(""" .body("""
{ {
"debitorRel": { "debitorRel": {
"anchorUuid": "%s", "anchor.uuid": "%s",
"holderUuid": "%s", "holder.uuid": "%s",
"contactUuid": "%s" "contact.uuid": "%s"
}, },
"debitorNumberSuffix": "%s", "debitorNumberSuffix": "%s",
"defaultPrefix": "for", "defaultPrefix": "for",
@ -418,7 +418,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(""" .body("""
{ {
"debitorRelUuid": "%s", "debitorRel.uuid": "%s",
"debitorNumberSuffix": "%s", "debitorNumberSuffix": "%s",
"defaultPrefix": "for", "defaultPrefix": "for",
"billable": "true", "billable": "true",

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

@ -182,7 +182,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(""" .body("""
{ {
"partnerUuid": "%s", "partner.uuid": "%s",
"memberNumberSuffix": "%s", "memberNumberSuffix": "%s",
"validFrom": "2022-10-13", "validFrom": "2022-10-13",
"membershipFeeBillable": "true" "membershipFeeBillable": "true"

8
src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipControllerRestTest.java
View File

@ -56,12 +56,12 @@ public class HsOfficeMembershipControllerRestTest {
.contentType(MediaType.APPLICATION_JSON) .contentType(MediaType.APPLICATION_JSON)
.content(""" .content("""
{ {
"partnerUuid": null, "partner.uuid": null,
"memberNumberSuffix": "01", "memberNumberSuffix": "01",
"validFrom": "2022-10-13", "validFrom": "2022-10-13",
"membershipFeeBillable": "true" "membershipFeeBillable": "true"
} }
""".formatted(UUID.randomUUID())) """)
.accept(MediaType.APPLICATION_JSON)) .accept(MediaType.APPLICATION_JSON))
// then // then
@ -86,7 +86,7 @@ public class HsOfficeMembershipControllerRestTest {
.contentType(MediaType.APPLICATION_JSON) .contentType(MediaType.APPLICATION_JSON)
.content(""" .content("""
{ {
"partnerUuid": "%s", "partner.uuid": "%s",
"memberNumberSuffix": "01", "memberNumberSuffix": "01",
"validFrom": "2022-10-13", "validFrom": "2022-10-13",
"membershipFeeBillable": "true" "membershipFeeBillable": "true"
@ -112,7 +112,7 @@ public class HsOfficeMembershipControllerRestTest {
.contentType(MediaType.APPLICATION_JSON) .contentType(MediaType.APPLICATION_JSON)
.content(""" .content("""
{ {
"partnerUuid": "%s", "partner.uuid": "%s",
%s %s
"validFrom": "2022-10-13", "validFrom": "2022-10-13",
"membershipFeeBillable": "true" "membershipFeeBillable": "true"

32
src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerControllerAcceptanceTest.java
View File

@ -102,9 +102,9 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
{ {
"partnerNumber": "20002", "partnerNumber": "20002",
"partnerRel": { "partnerRel": {
"anchorUuid": "%s", "anchor.uuid": "%s",
"holderUuid": "%s", "holder.uuid": "%s",
"contactUuid": "%s" "contact.uuid": "%s"
}, },
"details": { "details": {
"registrationOffice": "Temp Registergericht Aurich", "registrationOffice": "Temp Registergericht Aurich",
@ -161,12 +161,12 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
{ {
"partnerNumber": "20003", "partnerNumber": "20003",
"partnerRel": { "partnerRel": {
"anchorUuid": "%s", "anchor.uuid": "%s",
"holderUuid": "%s", "holder.uuid": "%s",
"contactUuid": "%s" "contact.uuid": "%s"
}, },
"personUuid": "%s", "person.uuid": "%s",
"contactUuid": "%s", "contact.uuid": "%s",
"details": {} "details": {}
} }
""".formatted( """.formatted(
@ -199,12 +199,12 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
{ {
"partnerNumber": "20004", "partnerNumber": "20004",
"partnerRel": { "partnerRel": {
"anchorUuid": "%s", "anchor.uuid": "%s",
"holderUuid": "%s", "holder.uuid": "%s",
"contactUuid": "%s" "contact.uuid": "%s"
}, },
"personUuid": "%s", "person.uuid": "%s",
"contactUuid": "%s", "contact.uuid": "%s",
"details": {} "details": {}
} }
""".formatted( """.formatted(
@ -321,7 +321,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
.body(""" .body("""
{ {
"partnerNumber": "20011", "partnerNumber": "20011",
"partnerRelUuid": "%s", "partnerRel.uuid": "%s",
"details": { "details": {
"registrationOffice": "Temp Registergericht Aurich", "registrationOffice": "Temp Registergericht Aurich",
"registrationNumber": "222222", "registrationNumber": "222222",
@ -330,7 +330,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
"dateOfDeath": "2022-01-12" "dateOfDeath": "2022-01-12"
} }
} }
""".formatted(givenPartnerRel.getUuid())) """.formatted(givenPartnerRel.getUuid()))
.port(port) .port(port)
.when() .when()
.patch("http://localhost/api/hs/office/partners/" + givenPartner.getUuid()) .patch("http://localhost/api/hs/office/partners/" + givenPartner.getUuid())
@ -387,7 +387,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(""" .body("""
{ {
"partnerRelUuid": "%s" "partnerRel.uuid": "%s"
} }
""".formatted(givenPartnerRel.getUuid())) """.formatted(givenPartnerRel.getUuid()))
.port(port) .port(port)

20
src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerControllerRestTest.java
View File

@ -101,12 +101,12 @@ class HsOfficePartnerControllerRestTest {
{ {
"partnerNumber": "20002", "partnerNumber": "20002",
"partnerRel": { "partnerRel": {
"anchorUuid": "%s", "anchor.uuid": "%s",
"holderUuid": "%s", "holder.uuid": "%s",
"contactUuid": "%s" "contact.uuid": "%s"
}, },
"personUuid": "%s", "person.uuid": "%s",
"contactUuid": "%s", "contact.uuid": "%s",
"details": { "details": {
"registrationOffice": "Temp Registergericht Aurich", "registrationOffice": "Temp Registergericht Aurich",
"registrationNumber": "111111" "registrationNumber": "111111"
@ -138,12 +138,12 @@ class HsOfficePartnerControllerRestTest {
{ {
"partnerNumber": "20002", "partnerNumber": "20002",
"partnerRel": { "partnerRel": {
"anchorUuid": "%s", "anchor.uuid": "%s",
"holderUuid": "%s", "holder.uuid": "%s",
"contactUuid": "%s" "contact.uuid": "%s"
}, },
"personUuid": "%s", "person.uuid": "%s",
"contactUuid": "%s", "contact.uuid": "%s",
"details": { "details": {
"registrationOffice": "Temp Registergericht Aurich", "registrationOffice": "Temp Registergericht Aurich",
"registrationNumber": "111111" "registrationNumber": "111111"

28
src/test/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationControllerAcceptanceTest.java
View File

@ -235,9 +235,9 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
{ {
"type": "%s", "type": "%s",
"mark": "%s", "mark": "%s",
"anchorUuid": "%s", "anchor.uuid": "%s",
"holderUuid": "%s", "holder.uuid": "%s",
"contactUuid": "%s" "contact.uuid": "%s"
} }
""".formatted( """.formatted(
HsOfficeRelationTypeResource.SUBSCRIBER, HsOfficeRelationTypeResource.SUBSCRIBER,
@ -281,9 +281,9 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
.body(""" .body("""
{ {
"type": "%s", "type": "%s",
"anchorUuid": "%s", "anchor.uuid": "%s",
"holderUuid": "%s", "holder.uuid": "%s",
"contactUuid": "%s" "contact.uuid": "%s"
} }
""".formatted( """.formatted(
HsOfficeRelationTypeResource.DEBITOR, HsOfficeRelationTypeResource.DEBITOR,
@ -313,9 +313,9 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
.body(""" .body("""
{ {
"type": "%s", "type": "%s",
"anchorUuid": "%s", "anchor.uuid": "%s",
"holderUuid": "%s", "holder.uuid": "%s",
"contactUuid": "%s" "contact.uuid": "%s"
} }
""".formatted( """.formatted(
HsOfficeRelationTypeResource.DEBITOR, HsOfficeRelationTypeResource.DEBITOR,
@ -346,9 +346,9 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
.body(""" .body("""
{ {
"type": "%s", "type": "%s",
"anchorUuid": "%s", "anchor.uuid": "%s",
"holderUuid": "%s", "holder.uuid": "%s",
"contactUuid": "%s" "contact.uuid": "%s"
} }
""".formatted( """.formatted(
HsOfficeRelationTypeResource.DEBITOR, HsOfficeRelationTypeResource.DEBITOR,
@ -461,9 +461,9 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(""" .body("""
{ {
"contactUuid": "%s" "contact.uuid": "%s"
} }
""".formatted(givenContact.getUuid())) """.formatted(givenContact.getUuid()))
.port(port) .port(port)
.when() .when()
.patch("http://localhost/api/hs/office/relations/" + givenRelation.getUuid()) .patch("http://localhost/api/hs/office/relations/" + givenRelation.getUuid())

14
src/test/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateControllerAcceptanceTest.java
View File

@ -144,8 +144,8 @@ class HsOfficeSepaMandateControllerAcceptanceTest extends ContextBasedTestWithCl
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(""" .body("""
{ {
"debitorUuid": "%s", "debitor.uuid": "%s",
"bankAccountUuid": "%s", "bankAccount.uuid": "%s",
"reference": "temp ref CAT A", "reference": "temp ref CAT A",
"agreement": "2020-01-02", "agreement": "2020-01-02",
"validFrom": "2022-10-13" "validFrom": "2022-10-13"
@ -186,7 +186,7 @@ class HsOfficeSepaMandateControllerAcceptanceTest extends ContextBasedTestWithCl
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(""" .body("""
{ {
"bankAccountUuid": "%s", "bankAccount.uuid": "%s",
"reference": "temp ref CAT B", "reference": "temp ref CAT B",
"validFrom": "2022-10-13" "validFrom": "2022-10-13"
} }
@ -211,8 +211,8 @@ class HsOfficeSepaMandateControllerAcceptanceTest extends ContextBasedTestWithCl
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(""" .body("""
{ {
"debitorUuid": "%s", "debitor.uuid": "%s",
"bankAccountUuid": "%s", "bankAccount.uuid": "%s",
"reference": "temp ref CAT C", "reference": "temp ref CAT C",
"agreement": "2022-10-12", "agreement": "2022-10-12",
"validFrom": "2022-10-13", "validFrom": "2022-10-13",
@ -241,8 +241,8 @@ class HsOfficeSepaMandateControllerAcceptanceTest extends ContextBasedTestWithCl
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(""" .body("""
{ {
"debitorUuid": "%s", "debitor.uuid": "%s",
"bankAccountUuid": "%s", "bankAccount.uuid": "%s",
"reference": "temp refCAT D", "reference": "temp refCAT D",
"agreement": "2022-10-12", "agreement": "2022-10-12",
"validFrom": "2022-10-13", "validFrom": "2022-10-13",