From 3a910468b403863cc0ceeae8eceff22de3bf13ee Mon Sep 17 00:00:00 2001 From: Michael Hoennig Date: Sat, 9 Nov 2024 14:55:31 +0100 Subject: [PATCH] amend AcceptanceTests according to .uuid --- ...HsBookingItemControllerAcceptanceTest.java | 14 ++++---- .../item/HsBookingItemControllerRestTest.java | 4 +-- ...ookingProjectControllerAcceptanceTest.java | 2 +- ...sHostingAssetControllerAcceptanceTest.java | 14 ++++---- ...omainSetupHostingAssetFactoryUnitTest.java | 8 ++--- ...tsTransactionControllerAcceptanceTest.java | 12 +++---- ...opAssetsTransactionControllerRestTest.java | 2 +- ...esTransactionControllerAcceptanceTest.java | 8 ++--- ...opSharesTransactionControllerRestTest.java | 4 +-- ...OfficeDebitorControllerAcceptanceTest.java | 18 +++++------ ...iceMembershipControllerAcceptanceTest.java | 2 +- .../HsOfficeMembershipControllerRestTest.java | 8 ++--- ...OfficePartnerControllerAcceptanceTest.java | 32 +++++++++---------- .../HsOfficePartnerControllerRestTest.java | 20 ++++++------ ...fficeRelationControllerAcceptanceTest.java | 28 ++++++++-------- ...ceSepaMandateControllerAcceptanceTest.java | 14 ++++---- 16 files changed, 95 insertions(+), 95 deletions(-) diff --git a/src/test/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemControllerAcceptanceTest.java index 6b4a4b29..3598c0ce 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemControllerAcceptanceTest.java @@ -150,7 +150,7 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup .contentType(ContentType.JSON) .body(""" { - "projectUuid": "{projectUuid}", + "project.uuid": "{projectUuid}", "type": "MANAGED_SERVER", "caption": "some new booking", "validTo": "{validTo}", @@ -200,8 +200,8 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup .contentType(ContentType.JSON) .body(""" { - "projectUuid": "{projectUuid}", - "parentItemUuid": "{managedServerUuid}", + "project.uuid": "{projectUuid}", + "parentItem.uuid": "{managedServerUuid}", "type": "MANAGED_WEBSPACE", "caption": "some managed webspace", "resources": { @@ -270,7 +270,7 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup .contentType(ContentType.JSON) .body(""" { - "projectUuid": "{projectUuid}", + "project.uuid": "{projectUuid}", "type": "DOMAIN_SETUP", "caption": "Domain-Setup for example.org", "resources": { @@ -285,7 +285,7 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup }, { "type": "DOMAIN_HTTP_SETUP", - "assignedToAssetUuid": "{unixUserUuid}" + "assignedToAsset.uuid": "{unixUserUuid}" }, { "type": "DOMAIN_MBOX_SETUP" @@ -360,7 +360,7 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup .contentType(ContentType.JSON) .body(""" { - "projectUuid": "{projectUuid}", + "project.uuid": "{projectUuid}", "type": "DOMAIN_SETUP", "caption": "some new domain-setup booking", "resources": { @@ -375,7 +375,7 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup }, { "type": "DOMAIN_HTTP_SETUP", - "assignedToAssetUuid": "{unixUserUuid}" + "assignedToAsset.uuid": "{unixUserUuid}" }, { "type": "DOMAIN_MBOX_SETUP" diff --git a/src/test/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemControllerRestTest.java b/src/test/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemControllerRestTest.java index 11ecf5bc..6b2bf5df 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemControllerRestTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemControllerRestTest.java @@ -105,7 +105,7 @@ class HsBookingItemControllerRestTest { .contentType(MediaType.APPLICATION_JSON) .content(""" { - "projectUuid": "{projectUuid}", + "project.uuid": "{projectUuid}", "type": "MANAGED_SERVER", "caption": "some new booking", "validTo": "{validTo}", @@ -155,7 +155,7 @@ class HsBookingItemControllerRestTest { .contentType(MediaType.APPLICATION_JSON) .content(""" { - "projectUuid": "{projectUuid}", + "project.uuid": "{projectUuid}", "type": "MANAGED_SERVER", "caption": "some new booking", "validFrom": "{validFrom}", diff --git a/src/test/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectControllerAcceptanceTest.java index 69c11d9f..2e281882 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectControllerAcceptanceTest.java @@ -92,7 +92,7 @@ class HsBookingProjectControllerAcceptanceTest extends ContextBasedTestWithClean .contentType(ContentType.JSON) .body(""" { - "debitorUuid": "%s", + "debitor.uuid": "%s", "caption": "some new project" } """.formatted(givenDebitor.getUuid())) diff --git a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerAcceptanceTest.java index 30b62a5a..2eff25de 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerAcceptanceTest.java @@ -165,10 +165,10 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup .contentType(ContentType.JSON) .body(""" { - "bookingItemUuid": "%s", + "bookingItem.uuid": "%s", "type": "MANAGED_WEBSPACE", "identifier": "fir10", - "parentAssetUuid": "%s", + "parentAsset.uuid": "%s", "caption": "some separate ManagedWebspace HA", "config": {} } @@ -227,7 +227,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup .contentType(ContentType.JSON) .body(""" { - "parentAssetUuid": "%s", + "parentAsset.uuid": "%s", "type": "UNIX_USER", "identifier": "fir01-temp", "caption": "some new UnixUser in client's ManagedWebspace", @@ -280,7 +280,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup .contentType(ContentType.JSON) .body(""" { - "bookingItemUuid": "%s", + "bookingItem.uuid": "%s", "type": "DOMAIN_SETUP", "identifier": "example.com", "caption": "some unrelated domain-setup", @@ -326,7 +326,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup .contentType(ContentType.JSON) .body(""" { - "bookingItemUuid": "%s", + "bookingItem.uuid": "%s", "type": "MANAGED_SERVER", "identifier": "vm1400", "caption": "some new ManagedServer", @@ -381,7 +381,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup .contentType(ContentType.JSON) .body(""" { - "parentAssetUuid": "%s", + "parentAsset.uuid": "%s", "type": "UNIX_USER", "identifier": "fir01-extra", "caption": "some extra UnixUser", @@ -508,7 +508,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup .contentType(ContentType.JSON) .body(""" { - "alarmContactUuid": "%s", + "alarmContact.uuid": "%s", "config": { "monit_max_ssd_usage": 85, "monit_max_hdd_usage": null, diff --git a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/factories/DomainSetupHostingAssetFactoryUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/factories/DomainSetupHostingAssetFactoryUnitTest.java index 14762bd0..cf2fc350 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/factories/DomainSetupHostingAssetFactoryUnitTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/factories/DomainSetupHostingAssetFactoryUnitTest.java @@ -83,7 +83,7 @@ class DomainSetupHostingAssetFactoryUnitTest { "subHostingAssets": [ { "type": "DOMAIN_HTTP_SETUP", - "assignedToAssetUuid": "{unixUserHostingAssetUuid}" + "assignedToAsset.uuid": "{unixUserHostingAssetUuid}" }, { "type": "DOMAIN_DNS_SETUP" @@ -124,7 +124,7 @@ class DomainSetupHostingAssetFactoryUnitTest { "subHostingAssets": [ { "type": "DOMAIN_HTTP_SETUP", - "assignedToAssetUuid": "{unixUserHostingAssetUuid}" + "assignedToAsset.uuid": "{unixUserHostingAssetUuid}" }, { "type": "DOMAIN_DNS_SETUP" @@ -164,7 +164,7 @@ class DomainSetupHostingAssetFactoryUnitTest { "subHostingAssets": [ { "type": "DOMAIN_HTTP_SETUP", - "assignedToAssetUuid": "{unixUserHostingAssetUuid}" + "assignedToAsset.uuid": "{unixUserHostingAssetUuid}" }, { "type": "DOMAIN_DNS_SETUP" @@ -206,7 +206,7 @@ class DomainSetupHostingAssetFactoryUnitTest { "subHostingAssets": [ { "type": "DOMAIN_HTTP_SETUP", - "assignedToAssetUuid": "{unixUserHostingAssetUuid}" + "assignedToAsset.uuid": "{unixUserHostingAssetUuid}" }, { "type": "DOMAIN_DNS_SETUP" diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionControllerAcceptanceTest.java index e8766490..6ac97292 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionControllerAcceptanceTest.java @@ -180,7 +180,7 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased .contentType(ContentType.JSON) .body(""" { - "membershipUuid": "%s", + "membership.uuid": "%s", "transactionType": "DEPOSIT", "assetValue": 1024.00, "valueDate": "2022-10-13", @@ -237,13 +237,13 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased .contentType(ContentType.JSON) .body(""" { - "membershipUuid": "%s", + "membership.uuid": "%s", "transactionType": "ADJUSTMENT", "assetValue": %s, "valueDate": "2022-10-30", "reference": "test ref adjustment", "comment": "some coop assets adjustment transaction", - "reverseEntryUuid": "%s" + "reverseEntry.uuid": "%s" } """.formatted( givenMembership.getUuid(), @@ -270,7 +270,7 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased "reference": "test ref" } } - """.formatted(givenTransaction.getUuid()))) + """)) .header("Location", startsWith("http://localhost")) .extract().header("Location"); // @formatter:on @@ -293,14 +293,14 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased .contentType(ContentType.JSON) .body(""" { - "membershipUuid": "%s", + "membership.uuid": "%s", "transactionType": "DISBURSAL", "assetValue": -10240.00, "valueDate": "2022-10-13", "reference": "temp ref X", "comment": "just some test coop assets transaction" } - """.formatted(givenMembership.getUuid())) + """.formatted(givenMembership.getUuid())) .port(port) .when() .post("http://localhost/api/hs/office/coopassetstransactions") diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionControllerRestTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionControllerRestTest.java index 03a1c71b..f00edff8 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionControllerRestTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionControllerRestTest.java @@ -37,7 +37,7 @@ class HsOfficeCoopAssetsTransactionControllerRestTest { static final String VALID_INSERT_REQUEST_BODY = """ { - "membershipUuid": "%s", + "membership.uuid": "%s", "transactionType": "DEPOSIT", "assetValue": 128.00, "valueDate": "2022-10-13", diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionControllerAcceptanceTest.java index 28a7723e..a1e8a675 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionControllerAcceptanceTest.java @@ -168,7 +168,7 @@ class HsOfficeCoopSharesTransactionControllerAcceptanceTest extends ContextBased final var location = RestAssured // @formatter:off .given().header("current-subject", "superuser-alex@hostsharing.net").contentType(ContentType.JSON).body(""" { - "membershipUuid": "%s", + "membership.uuid": "%s", "transactionType": "SUBSCRIPTION", "shareCount": 8, "valueDate": "2022-10-13", @@ -214,13 +214,13 @@ class HsOfficeCoopSharesTransactionControllerAcceptanceTest extends ContextBased .contentType(ContentType.JSON) .body(""" { - "membershipUuid": "%s", + "membership.uuid": "%s", "transactionType": "ADJUSTMENT", "shareCount": %s, "valueDate": "2022-10-30", "reference": "test ref adjustment", "comment": "some coop shares adjustment transaction", - "adjustedShareTxUuid": "%s" + "adjustedShareTx.uuid": "%s" } """.formatted( givenMembership.getUuid(), @@ -267,7 +267,7 @@ class HsOfficeCoopSharesTransactionControllerAcceptanceTest extends ContextBased RestAssured // @formatter:off .given().header("current-subject", "superuser-alex@hostsharing.net").contentType(ContentType.JSON).body(""" { - "membershipUuid": "%s", + "membership.uuid": "%s", "transactionType": "CANCELLATION", "shareCount": -80, "valueDate": "2022-10-13", diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionControllerRestTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionControllerRestTest.java index 1e33fde9..7024c668 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionControllerRestTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionControllerRestTest.java @@ -37,7 +37,7 @@ class HsOfficeCoopSharesTransactionControllerRestTest { static final String VALID_INSERT_REQUEST_BODY = """ { - "membershipUuid": "%s", + "membership.uuid": "%s", "transactionType": "SUBSCRIPTION", "shareCount": 8, "valueDate": "2022-10-13", @@ -48,7 +48,7 @@ class HsOfficeCoopSharesTransactionControllerRestTest { enum BadRequestTestCases { MEMBERSHIP_UUID_MISSING( - requestBody -> requestBody.without("membershipUuid"), + requestBody -> requestBody.without("membership.uuid"), "[membershipUuid must not be null but is \"null\"]"), TRANSACTION_TYPE_MISSING( diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorControllerAcceptanceTest.java index a15ffbce..f6623fe0 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorControllerAcceptanceTest.java @@ -287,14 +287,14 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu .contentType(ContentType.JSON) .body(""" { - "debitorRelUuid": "%s", + "debitorRel.uuid": "%s", "debitorNumberSuffix": "%s", "billable": "true", "vatId": "VAT123456", "vatCountryCode": "DE", "vatBusiness": true, "vatReverseCharge": "false", - "refundBankAccountUuid": "%s", + "refundBankAccount.uuid": "%s", "defaultPrefix": "for" } """.formatted( givenDebitorRelUUid, ++nextDebitorSuffix, givenBankAccount.getUuid())) @@ -333,9 +333,9 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu .body(""" { "debitorRel": { - "anchorUuid": "%s", - "holderUuid": "%s", - "contactUuid": "%s" + "anchor.uuid": "%s", + "holder.uuid": "%s", + "contact.uuid": "%s" }, "debitorNumberSuffix": "%s", "defaultPrefix": "for", @@ -384,9 +384,9 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu .body(""" { "debitorRel": { - "anchorUuid": "%s", - "holderUuid": "%s", - "contactUuid": "%s" + "anchor.uuid": "%s", + "holder.uuid": "%s", + "contact.uuid": "%s" }, "debitorNumberSuffix": "%s", "defaultPrefix": "for", @@ -418,7 +418,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu .contentType(ContentType.JSON) .body(""" { - "debitorRelUuid": "%s", + "debitorRel.uuid": "%s", "debitorNumberSuffix": "%s", "defaultPrefix": "for", "billable": "true", diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipControllerAcceptanceTest.java index 55f2fbd7..f3793da1 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipControllerAcceptanceTest.java @@ -182,7 +182,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle .contentType(ContentType.JSON) .body(""" { - "partnerUuid": "%s", + "partner.uuid": "%s", "memberNumberSuffix": "%s", "validFrom": "2022-10-13", "membershipFeeBillable": "true" diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipControllerRestTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipControllerRestTest.java index 1fcc9f11..455008a2 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipControllerRestTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipControllerRestTest.java @@ -56,12 +56,12 @@ public class HsOfficeMembershipControllerRestTest { .contentType(MediaType.APPLICATION_JSON) .content(""" { - "partnerUuid": null, + "partner.uuid": null, "memberNumberSuffix": "01", "validFrom": "2022-10-13", "membershipFeeBillable": "true" } - """.formatted(UUID.randomUUID())) + """) .accept(MediaType.APPLICATION_JSON)) // then @@ -86,7 +86,7 @@ public class HsOfficeMembershipControllerRestTest { .contentType(MediaType.APPLICATION_JSON) .content(""" { - "partnerUuid": "%s", + "partner.uuid": "%s", "memberNumberSuffix": "01", "validFrom": "2022-10-13", "membershipFeeBillable": "true" @@ -112,7 +112,7 @@ public class HsOfficeMembershipControllerRestTest { .contentType(MediaType.APPLICATION_JSON) .content(""" { - "partnerUuid": "%s", + "partner.uuid": "%s", %s "validFrom": "2022-10-13", "membershipFeeBillable": "true" diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerControllerAcceptanceTest.java index 8c75ed16..c2ec1271 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerControllerAcceptanceTest.java @@ -102,9 +102,9 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu { "partnerNumber": "20002", "partnerRel": { - "anchorUuid": "%s", - "holderUuid": "%s", - "contactUuid": "%s" + "anchor.uuid": "%s", + "holder.uuid": "%s", + "contact.uuid": "%s" }, "details": { "registrationOffice": "Temp Registergericht Aurich", @@ -161,12 +161,12 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu { "partnerNumber": "20003", "partnerRel": { - "anchorUuid": "%s", - "holderUuid": "%s", - "contactUuid": "%s" + "anchor.uuid": "%s", + "holder.uuid": "%s", + "contact.uuid": "%s" }, - "personUuid": "%s", - "contactUuid": "%s", + "person.uuid": "%s", + "contact.uuid": "%s", "details": {} } """.formatted( @@ -199,12 +199,12 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu { "partnerNumber": "20004", "partnerRel": { - "anchorUuid": "%s", - "holderUuid": "%s", - "contactUuid": "%s" + "anchor.uuid": "%s", + "holder.uuid": "%s", + "contact.uuid": "%s" }, - "personUuid": "%s", - "contactUuid": "%s", + "person.uuid": "%s", + "contact.uuid": "%s", "details": {} } """.formatted( @@ -321,7 +321,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu .body(""" { "partnerNumber": "20011", - "partnerRelUuid": "%s", + "partnerRel.uuid": "%s", "details": { "registrationOffice": "Temp Registergericht Aurich", "registrationNumber": "222222", @@ -330,7 +330,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu "dateOfDeath": "2022-01-12" } } - """.formatted(givenPartnerRel.getUuid())) + """.formatted(givenPartnerRel.getUuid())) .port(port) .when() .patch("http://localhost/api/hs/office/partners/" + givenPartner.getUuid()) @@ -387,7 +387,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu .contentType(ContentType.JSON) .body(""" { - "partnerRelUuid": "%s" + "partnerRel.uuid": "%s" } """.formatted(givenPartnerRel.getUuid())) .port(port) diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerControllerRestTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerControllerRestTest.java index 42d0566c..889e776f 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerControllerRestTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerControllerRestTest.java @@ -101,12 +101,12 @@ class HsOfficePartnerControllerRestTest { { "partnerNumber": "20002", "partnerRel": { - "anchorUuid": "%s", - "holderUuid": "%s", - "contactUuid": "%s" + "anchor.uuid": "%s", + "holder.uuid": "%s", + "contact.uuid": "%s" }, - "personUuid": "%s", - "contactUuid": "%s", + "person.uuid": "%s", + "contact.uuid": "%s", "details": { "registrationOffice": "Temp Registergericht Aurich", "registrationNumber": "111111" @@ -138,12 +138,12 @@ class HsOfficePartnerControllerRestTest { { "partnerNumber": "20002", "partnerRel": { - "anchorUuid": "%s", - "holderUuid": "%s", - "contactUuid": "%s" + "anchor.uuid": "%s", + "holder.uuid": "%s", + "contact.uuid": "%s" }, - "personUuid": "%s", - "contactUuid": "%s", + "person.uuid": "%s", + "contact.uuid": "%s", "details": { "registrationOffice": "Temp Registergericht Aurich", "registrationNumber": "111111" diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationControllerAcceptanceTest.java index 2dac741b..9bc4eafa 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationControllerAcceptanceTest.java @@ -235,9 +235,9 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean { "type": "%s", "mark": "%s", - "anchorUuid": "%s", - "holderUuid": "%s", - "contactUuid": "%s" + "anchor.uuid": "%s", + "holder.uuid": "%s", + "contact.uuid": "%s" } """.formatted( HsOfficeRelationTypeResource.SUBSCRIBER, @@ -281,9 +281,9 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean .body(""" { "type": "%s", - "anchorUuid": "%s", - "holderUuid": "%s", - "contactUuid": "%s" + "anchor.uuid": "%s", + "holder.uuid": "%s", + "contact.uuid": "%s" } """.formatted( HsOfficeRelationTypeResource.DEBITOR, @@ -313,9 +313,9 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean .body(""" { "type": "%s", - "anchorUuid": "%s", - "holderUuid": "%s", - "contactUuid": "%s" + "anchor.uuid": "%s", + "holder.uuid": "%s", + "contact.uuid": "%s" } """.formatted( HsOfficeRelationTypeResource.DEBITOR, @@ -346,9 +346,9 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean .body(""" { "type": "%s", - "anchorUuid": "%s", - "holderUuid": "%s", - "contactUuid": "%s" + "anchor.uuid": "%s", + "holder.uuid": "%s", + "contact.uuid": "%s" } """.formatted( HsOfficeRelationTypeResource.DEBITOR, @@ -461,9 +461,9 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean .contentType(ContentType.JSON) .body(""" { - "contactUuid": "%s" + "contact.uuid": "%s" } - """.formatted(givenContact.getUuid())) + """.formatted(givenContact.getUuid())) .port(port) .when() .patch("http://localhost/api/hs/office/relations/" + givenRelation.getUuid()) diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateControllerAcceptanceTest.java index 48ed0d9c..82a011dc 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateControllerAcceptanceTest.java @@ -144,8 +144,8 @@ class HsOfficeSepaMandateControllerAcceptanceTest extends ContextBasedTestWithCl .contentType(ContentType.JSON) .body(""" { - "debitorUuid": "%s", - "bankAccountUuid": "%s", + "debitor.uuid": "%s", + "bankAccount.uuid": "%s", "reference": "temp ref CAT A", "agreement": "2020-01-02", "validFrom": "2022-10-13" @@ -186,7 +186,7 @@ class HsOfficeSepaMandateControllerAcceptanceTest extends ContextBasedTestWithCl .contentType(ContentType.JSON) .body(""" { - "bankAccountUuid": "%s", + "bankAccount.uuid": "%s", "reference": "temp ref CAT B", "validFrom": "2022-10-13" } @@ -211,8 +211,8 @@ class HsOfficeSepaMandateControllerAcceptanceTest extends ContextBasedTestWithCl .contentType(ContentType.JSON) .body(""" { - "debitorUuid": "%s", - "bankAccountUuid": "%s", + "debitor.uuid": "%s", + "bankAccount.uuid": "%s", "reference": "temp ref CAT C", "agreement": "2022-10-12", "validFrom": "2022-10-13", @@ -241,8 +241,8 @@ class HsOfficeSepaMandateControllerAcceptanceTest extends ContextBasedTestWithCl .contentType(ContentType.JSON) .body(""" { - "debitorUuid": "%s", - "bankAccountUuid": "%s", + "debitor.uuid": "%s", + "bankAccount.uuid": "%s", "reference": "temp refCAT D", "agreement": "2022-10-12", "validFrom": "2022-10-13",