diff --git a/src/main/resources/db/changelog/2-test/203-test-domain/2038-test-domain-test-data.sql b/src/main/resources/db/changelog/2-test/203-test-domain/2038-test-domain-test-data.sql index 47326f49..e2aa870f 100644 --- a/src/main/resources/db/changelog/2-test/203-test-domain/2038-test-domain-test-data.sql +++ b/src/main/resources/db/changelog/2-test/203-test-domain/2038-test-domain-test-data.sql @@ -11,7 +11,6 @@ create or replace procedure createdomainTestData( packageName varchar, domainCou declare pac record; pacAdmin varchar; - currentTask varchar; begin select p.uuid, p.name, c.prefix as custPrefix from test_package p @@ -21,10 +20,8 @@ begin for t in 0..(domainCount-1) loop - currentTask = 'creating RBAC test domain #' || t || ' for package ' || pac.name || ' #' || pac.uuid; - raise notice 'task: %', currentTask; pacAdmin = 'pac-admin-' || pac.name || '@' || pac.custPrefix || '.example.com'; - call defineContext(currentTask, null, pacAdmin, null); + call defineContext('creating RBAC test domain', null, pacAdmin, null); insert into test_domain (name, packageUuid) diff --git a/src/main/resources/db/changelog/5-hs-office/501-contact/5018-hs-office-contact-test-data.sql b/src/main/resources/db/changelog/5-hs-office/501-contact/5018-hs-office-contact-test-data.sql index 3504eaaa..fbee80ad 100644 --- a/src/main/resources/db/changelog/5-hs-office/501-contact/5018-hs-office-contact-test-data.sql +++ b/src/main/resources/db/changelog/5-hs-office/501-contact/5018-hs-office-contact-test-data.sql @@ -11,17 +11,13 @@ create or replace procedure createHsOfficeContactTestData(contCaption varchar) language plpgsql as $$ declare - currentTask varchar; postalAddr varchar; emailAddr varchar; begin - currentTask = 'creating contact test-data ' || contCaption; - execute format('set local hsadminng.currentTask to %L', currentTask); - emailAddr = 'contact-admin@' || cleanIdentifier(contCaption) || '.example.com'; - call defineContext(currentTask); + call defineContext('creating contact test-data'); perform createRbacUser(emailAddr); - call defineContext(currentTask, null, emailAddr); + call defineContext('creating contact test-data', null, emailAddr); postalAddr := E'Vorname Nachname\nStraße Hnr\nPLZ Stadt'; diff --git a/src/main/resources/db/changelog/5-hs-office/502-person/5028-hs-office-person-test-data.sql b/src/main/resources/db/changelog/5-hs-office/502-person/5028-hs-office-person-test-data.sql index 775ecaa6..61f90006 100644 --- a/src/main/resources/db/changelog/5-hs-office/502-person/5028-hs-office-person-test-data.sql +++ b/src/main/resources/db/changelog/5-hs-office/502-person/5028-hs-office-person-test-data.sql @@ -17,15 +17,13 @@ create or replace procedure createHsOfficePersonTestData( language plpgsql as $$ declare fullName varchar; - currentTask varchar; emailAddr varchar; begin fullName := concat_ws(', ', newTradeName, newFamilyName, newGivenName); - currentTask = 'creating person test-data ' || fullName; emailAddr = 'person-' || left(cleanIdentifier(fullName), 32) || '@example.com'; - call defineContext(currentTask); + call defineContext('creating person test-data'); perform createRbacUser(emailAddr); - call defineContext(currentTask, null, emailAddr); + call defineContext('creating person test-data', null, emailAddr); execute format('set local hsadminng.currentTask to %L', currentTask); raise notice 'creating test person: % by %', fullName, emailAddr; diff --git a/src/main/resources/db/changelog/5-hs-office/503-relation/5038-hs-office-relation-test-data.sql b/src/main/resources/db/changelog/5-hs-office/503-relation/5038-hs-office-relation-test-data.sql index cff9f3f3..506d3fb9 100644 --- a/src/main/resources/db/changelog/5-hs-office/503-relation/5038-hs-office-relation-test-data.sql +++ b/src/main/resources/db/changelog/5-hs-office/503-relation/5038-hs-office-relation-test-data.sql @@ -12,11 +12,9 @@ create or replace procedure createHsOfficeRelationTestData( holderPersonName varchar, relationType HsOfficeRelationType, anchorPersonName varchar, - contactCaption varchar, - mark varchar default null) + contactCaption varchar) language plpgsql as $$ declare - currentTask varchar; idName varchar; anchorPerson hs_office_person; holderPerson hs_office_person; @@ -24,9 +22,6 @@ declare begin idName := cleanIdentifier( anchorPersonName || '-' || holderPersonName); - currentTask := 'creating relation test-data ' || idName; - call defineContext(currentTask, null, 'superuser-alex@hostsharing.net', 'global#global:ADMIN'); - execute format('set local hsadminng.currentTask to %L', currentTask); select p.* into anchorPerson @@ -89,6 +84,8 @@ end; $$; do language plpgsql $$ begin + call defineContext('creating relation test-data', null, 'superuser-alex@hostsharing.net', 'global#global:ADMIN'); + call createHsOfficeRelationTestData('First GmbH', 'PARTNER', 'Hostsharing eG', 'first contact'); call createHsOfficeRelationTestData('Firby', 'REPRESENTATIVE', 'First GmbH', 'first contact'); call createHsOfficeRelationTestData('First GmbH', 'DEBITOR', 'First GmbH', 'first contact'); diff --git a/src/main/resources/db/changelog/5-hs-office/504-partner/5048-hs-office-partner-test-data.sql b/src/main/resources/db/changelog/5-hs-office/504-partner/5048-hs-office-partner-test-data.sql index 4b63b8c2..4ac1dff9 100644 --- a/src/main/resources/db/changelog/5-hs-office/504-partner/5048-hs-office-partner-test-data.sql +++ b/src/main/resources/db/changelog/5-hs-office/504-partner/5048-hs-office-partner-test-data.sql @@ -15,7 +15,6 @@ create or replace procedure createHsOfficePartnerTestData( contactCaption varchar ) language plpgsql as $$ declare - currentTask varchar; idName varchar; mandantPerson hs_office_person; partnerRel hs_office_relation; @@ -23,9 +22,6 @@ declare relatedDetailsUuid uuid; begin idName := cleanIdentifier( partnerPersonName|| '-' || contactCaption); - currentTask := 'creating partner test-data ' || idName; - call defineContext(currentTask, null, 'superuser-alex@hostsharing.net', 'global#global:ADMIN'); - execute format('set local hsadminng.currentTask to %L', currentTask); select p.* from hs_office_person p where p.tradeName = mandantTradeName @@ -69,13 +65,14 @@ end; $$; --// - -- ============================================================================ --changeset hs-office-partner-TEST-DATA-GENERATION:1 –context=dev,tc endDelimiter:--// -- ---------------------------------------------------------------------------- do language plpgsql $$ begin + call defineContext('creating partner test-data ', null, 'superuser-alex@hostsharing.net', 'global#global:ADMIN'); + call createHsOfficePartnerTestData('Hostsharing eG', 10001, 'First GmbH', 'first contact'); call createHsOfficePartnerTestData('Hostsharing eG', 10002, 'Second e.K.', 'second contact'); call createHsOfficePartnerTestData('Hostsharing eG', 10003, 'Third OHG', 'third contact'); diff --git a/src/main/resources/db/changelog/5-hs-office/505-bankaccount/5058-hs-office-bankaccount-test-data.sql b/src/main/resources/db/changelog/5-hs-office/505-bankaccount/5058-hs-office-bankaccount-test-data.sql index 1fe73c71..338ab61c 100644 --- a/src/main/resources/db/changelog/5-hs-office/505-bankaccount/5058-hs-office-bankaccount-test-data.sql +++ b/src/main/resources/db/changelog/5-hs-office/505-bankaccount/5058-hs-office-bankaccount-test-data.sql @@ -11,16 +11,11 @@ create or replace procedure createHsOfficeBankAccountTestData(givenHolder varchar, givenIBAN varchar, givenBIC varchar) language plpgsql as $$ declare - currentTask varchar; emailAddr varchar; begin - currentTask = 'creating bankaccount test-data ' || givenHolder; - execute format('set local hsadminng.currentTask to %L', currentTask); - emailAddr = 'bankaccount-admin@' || cleanIdentifier(givenHolder) || '.example.com'; - call defineContext(currentTask); perform createRbacUser(emailAddr); - call defineContext(currentTask, null, emailAddr); + call defineContext('creating bankaccount test-data', null, emailAddr); raise notice 'creating test bankaccount: %', givenHolder; insert @@ -36,6 +31,8 @@ end; $$; do language plpgsql $$ begin + call defineContext('creating bankaccount test-data'); + -- IBANs+BICs taken from https://ibanvalidieren.de/beispiele.html call createHsOfficeBankAccountTestData('First GmbH', 'DE02120300000000202051', 'BYLADEM1001'); call createHsOfficeBankAccountTestData('Peter Smith', 'DE02500105170137075030', 'INGDDEFF'); diff --git a/src/main/resources/db/changelog/5-hs-office/506-debitor/5068-hs-office-debitor-test-data.sql b/src/main/resources/db/changelog/5-hs-office/506-debitor/5068-hs-office-debitor-test-data.sql index 2e888e29..da9a5f2e 100644 --- a/src/main/resources/db/changelog/5-hs-office/506-debitor/5068-hs-office-debitor-test-data.sql +++ b/src/main/resources/db/changelog/5-hs-office/506-debitor/5068-hs-office-debitor-test-data.sql @@ -16,15 +16,11 @@ create or replace procedure createHsOfficeDebitorTestData( ) language plpgsql as $$ declare - currentTask varchar; idName varchar; relatedDebitorRelUuid uuid; relatedBankAccountUuid uuid; begin idName := cleanIdentifier( forPartnerPersonName|| '-' || forBillingContactCaption); - currentTask := 'creating debitor test-data ' || idName; - call defineContext(currentTask, null, 'superuser-alex@hostsharing.net', 'global#global:ADMIN'); - execute format('set local hsadminng.currentTask to %L', currentTask); select debitorRel.uuid into relatedDebitorRelUuid @@ -54,6 +50,8 @@ end; $$; do language plpgsql $$ begin + call defineContext('creating debitor test-data', null, 'superuser-alex@hostsharing.net', 'global#global:ADMIN'); + call createHsOfficeDebitorTestData(11, 'First GmbH', 'first contact', 'fir'); call createHsOfficeDebitorTestData(12, 'Second e.K.', 'second contact', 'sec'); call createHsOfficeDebitorTestData(13, 'Third OHG', 'third contact', 'thi'); diff --git a/src/main/resources/db/changelog/5-hs-office/507-sepamandate/5078-hs-office-sepamandate-test-data.sql b/src/main/resources/db/changelog/5-hs-office/507-sepamandate/5078-hs-office-sepamandate-test-data.sql index e664d8c5..6c8aa15e 100644 --- a/src/main/resources/db/changelog/5-hs-office/507-sepamandate/5078-hs-office-sepamandate-test-data.sql +++ b/src/main/resources/db/changelog/5-hs-office/507-sepamandate/5078-hs-office-sepamandate-test-data.sql @@ -15,14 +15,9 @@ create or replace procedure createHsOfficeSepaMandateTestData( withReference varchar) language plpgsql as $$ declare - currentTask varchar; relatedDebitor hs_office_debitor; relatedBankAccount hs_office_bankAccount; begin - currentTask := 'creating SEPA-mandate test-data ' || forPartnerNumber::text || forDebitorSuffix::text; - call defineContext(currentTask, null, 'superuser-alex@hostsharing.net', 'global#global:ADMIN'); - execute format('set local hsadminng.currentTask to %L', currentTask); - select debitor.* into relatedDebitor from hs_office_debitor debitor join hs_office_relation debitorRel on debitorRel.uuid = debitor.debitorRelUuid @@ -48,6 +43,8 @@ end; $$; do language plpgsql $$ begin + call defineContext('creating SEPA-mandate test-data', null, 'superuser-alex@hostsharing.net', 'global#global:ADMIN'); + call createHsOfficeSepaMandateTestData(10001, '11', 'DE02120300000000202051', 'ref-10001-11'); call createHsOfficeSepaMandateTestData(10002, '12', 'DE02100500000054540402', 'ref-10002-12'); call createHsOfficeSepaMandateTestData(10003, '13', 'DE02300209000106531065', 'ref-10003-13'); diff --git a/src/main/resources/db/changelog/5-hs-office/510-membership/5108-hs-office-membership-test-data.sql b/src/main/resources/db/changelog/5-hs-office/510-membership/5108-hs-office-membership-test-data.sql index b8cbb45b..205efcc9 100644 --- a/src/main/resources/db/changelog/5-hs-office/510-membership/5108-hs-office-membership-test-data.sql +++ b/src/main/resources/db/changelog/5-hs-office/510-membership/5108-hs-office-membership-test-data.sql @@ -13,15 +13,8 @@ create or replace procedure createHsOfficeMembershipTestData( newMemberNumberSuffix char(2) ) language plpgsql as $$ declare - currentTask varchar; relatedPartner hs_office_partner; begin - currentTask := 'creating Membership test-data ' || - 'P-' || forPartnerNumber::text || - 'M-...' || newMemberNumberSuffix; - call defineContext(currentTask, null, 'superuser-alex@hostsharing.net', 'global#global:ADMIN'); - execute format('set local hsadminng.currentTask to %L', currentTask); - select partner.* from hs_office_partner partner where partner.partnerNumber = forPartnerNumber into relatedPartner; @@ -40,6 +33,8 @@ end; $$; do language plpgsql $$ begin + call defineContext('creating Membership test-data', null, 'superuser-alex@hostsharing.net', 'global#global:ADMIN'); + call createHsOfficeMembershipTestData(10001, '01'); call createHsOfficeMembershipTestData(10002, '02'); call createHsOfficeMembershipTestData(10003, '03'); diff --git a/src/main/resources/db/changelog/5-hs-office/511-coopshares/5118-hs-office-coopshares-test-data.sql b/src/main/resources/db/changelog/5-hs-office/511-coopshares/5118-hs-office-coopshares-test-data.sql index 21d266ac..4efb55db 100644 --- a/src/main/resources/db/changelog/5-hs-office/511-coopshares/5118-hs-office-coopshares-test-data.sql +++ b/src/main/resources/db/changelog/5-hs-office/511-coopshares/5118-hs-office-coopshares-test-data.sql @@ -14,15 +14,9 @@ create or replace procedure createHsOfficeCoopSharesTransactionTestData( ) language plpgsql as $$ declare - currentTask varchar; membership hs_office_membership; subscriptionEntryUuid uuid; begin - currentTask = 'creating coopSharesTransaction test-data ' || givenPartnerNumber::text || givenMemberNumberSuffix; - execute format('set local hsadminng.currentTask to %L', currentTask); - SET CONSTRAINTS ALL DEFERRED; - - call defineContext(currentTask); select m.uuid from hs_office_membership m join hs_office_partner p on p.uuid = m.partneruuid @@ -49,6 +43,9 @@ end; $$; do language plpgsql $$ begin + call defineContext('creating coopSharesTransaction test-data'); + SET CONSTRAINTS ALL DEFERRED; + call createHsOfficeCoopSharesTransactionTestData(10001, '01'); call createHsOfficeCoopSharesTransactionTestData(10002, '02'); call createHsOfficeCoopSharesTransactionTestData(10003, '03'); diff --git a/src/main/resources/db/changelog/5-hs-office/512-coopassets/5128-hs-office-coopassets-test-data.sql b/src/main/resources/db/changelog/5-hs-office/512-coopassets/5128-hs-office-coopassets-test-data.sql index 1eda1de6..b3cdab98 100644 --- a/src/main/resources/db/changelog/5-hs-office/512-coopassets/5128-hs-office-coopassets-test-data.sql +++ b/src/main/resources/db/changelog/5-hs-office/512-coopassets/5128-hs-office-coopassets-test-data.sql @@ -14,15 +14,9 @@ create or replace procedure createHsOfficeCoopAssetsTransactionTestData( ) language plpgsql as $$ declare - currentTask varchar; membership hs_office_membership; lossEntryUuid uuid; begin - currentTask = 'creating coopAssetsTransaction test-data ' || givenPartnerNumber || givenMemberNumberSuffix; - execute format('set local hsadminng.currentTask to %L', currentTask); - SET CONSTRAINTS ALL DEFERRED; - - call defineContext(currentTask); select m.uuid from hs_office_membership m join hs_office_partner p on p.uuid = m.partneruuid @@ -49,6 +43,9 @@ end; $$; do language plpgsql $$ begin + call defineContext('creating coopAssetsTransaction test-data'); + SET CONSTRAINTS ALL DEFERRED; + call createHsOfficeCoopAssetsTransactionTestData(10001, '01'); call createHsOfficeCoopAssetsTransactionTestData(10002, '02'); call createHsOfficeCoopAssetsTransactionTestData(10003, '03'); diff --git a/src/main/resources/db/changelog/6-hs-booking/620-booking-project/6208-hs-booking-project-test-data.sql b/src/main/resources/db/changelog/6-hs-booking/620-booking-project/6208-hs-booking-project-test-data.sql index 5ebae299..2113ae5e 100644 --- a/src/main/resources/db/changelog/6-hs-booking/620-booking-project/6208-hs-booking-project-test-data.sql +++ b/src/main/resources/db/changelog/6-hs-booking/620-booking-project/6208-hs-booking-project-test-data.sql @@ -14,12 +14,8 @@ create or replace procedure createHsBookingProjectTransactionTestData( ) language plpgsql as $$ declare - currentTask varchar; relatedDebitor hs_office_debitor; begin - currentTask := 'creating booking-project test-data ' || givenPartnerNumber::text || givenDebitorSuffix; - call defineContext(currentTask, null, 'superuser-alex@hostsharing.net', 'global#global:ADMIN'); - execute format('set local hsadminng.currentTask to %L', currentTask); select debitor.* into relatedDebitor from hs_office_debitor debitor @@ -43,6 +39,8 @@ end; $$; do language plpgsql $$ begin + call defineContext('creating booking-project test-data', null, 'superuser-alex@hostsharing.net', 'global#global:ADMIN'); + call createHsBookingProjectTransactionTestData(10001, '11'); call createHsBookingProjectTransactionTestData(10002, '12'); call createHsBookingProjectTransactionTestData(10003, '13'); diff --git a/src/main/resources/db/changelog/6-hs-booking/630-booking-item/6208-hs-booking-item-test-data.sql b/src/main/resources/db/changelog/6-hs-booking/630-booking-item/6208-hs-booking-item-test-data.sql index 94c2e665..4052b5c3 100644 --- a/src/main/resources/db/changelog/6-hs-booking/630-booking-item/6208-hs-booking-item-test-data.sql +++ b/src/main/resources/db/changelog/6-hs-booking/630-booking-item/6208-hs-booking-item-test-data.sql @@ -14,15 +14,10 @@ create or replace procedure createHsBookingItemTransactionTestData( ) language plpgsql as $$ declare - currentTask varchar; relatedProject hs_booking_project; privateCloudUuid uuid; managedServerUuid uuid; begin - currentTask := 'creating booking-item test-data ' || givenPartnerNumber::text || givenDebitorSuffix; - call defineContext(currentTask, null, 'superuser-alex@hostsharing.net', 'global#global:ADMIN'); - execute format('set local hsadminng.currentTask to %L', currentTask); - select project.* into relatedProject from hs_booking_project project where project.caption = 'D-' || givenPartnerNumber || givenDebitorSuffix || ' default project'; @@ -49,7 +44,11 @@ end; $$; -- ---------------------------------------------------------------------------- do language plpgsql $$ + declare + currentTask text; begin + call defineContext('creating booking-item test-data', null, 'superuser-alex@hostsharing.net', 'global#global:ADMIN'); + call createHsBookingItemTransactionTestData(10001, '11'); call createHsBookingItemTransactionTestData(10002, '12'); call createHsBookingItemTransactionTestData(10003, '13'); diff --git a/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7018-hs-hosting-asset-test-data.sql b/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7018-hs-hosting-asset-test-data.sql index a74b6126..0af7e38e 100644 --- a/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7018-hs-hosting-asset-test-data.sql +++ b/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7018-hs-hosting-asset-test-data.sql @@ -11,7 +11,6 @@ create or replace procedure createHsHostingAssetTestData(givenProjectCaption varchar) language plpgsql as $$ declare - currentTask varchar; relatedProject hs_booking_project; relatedDebitor hs_office_debitor; privateCloudBI hs_booking_item; @@ -31,9 +30,7 @@ declare pgSqlInstanceUuid uuid; PgSqlUserUuid uuid; begin - currentTask := 'creating hosting-asset test-data ' || givenProjectCaption; - call defineContext(currentTask, null, 'superuser-alex@hostsharing.net', 'global#global:ADMIN'); - execute format('set local hsadminng.currentTask to %L', currentTask); + call defineContext('creating hosting-asset test-data', null, 'superuser-alex@hostsharing.net', 'global#global:ADMIN'); select project.* into relatedProject from hs_booking_project project @@ -113,6 +110,8 @@ end; $$; do language plpgsql $$ begin + call defineContext('creating hosting-asset test-data', null, 'superuser-alex@hostsharing.net', 'global#global:ADMIN'); + call createHsHostingAssetTestData('D-1000111 default project'); call createHsHostingAssetTestData('D-1000212 default project'); call createHsHostingAssetTestData('D-1000313 default project'); diff --git a/src/test/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemRepositoryIntegrationTest.java b/src/test/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemRepositoryIntegrationTest.java index cef07860..ca931e44 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemRepositoryIntegrationTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemRepositoryIntegrationTest.java @@ -68,7 +68,7 @@ class HsBookingItemRepositoryIntegrationTest extends ContextBasedTestWithCleanup public void auditJournalLogIsAvailable() { // given final var query = em.createNativeQuery(""" - select currentTask, targetTable, targetOp + select currentTask, targetTable, targetOp, targetdelta->>'caption' from tx_journal_v where targettable = 'hs_booking_item'; """); @@ -78,9 +78,13 @@ class HsBookingItemRepositoryIntegrationTest extends ContextBasedTestWithCleanup // then assertThat(customerLogEntries).map(Arrays::toString).contains( - "[creating booking-item test-data 1000111, hs_booking_item, INSERT]", - "[creating booking-item test-data 1000212, hs_booking_item, INSERT]", - "[creating booking-item test-data 1000313, hs_booking_item, INSERT]"); + "[creating booking-item test-data, hs_booking_item, INSERT, prod CloudServer]", + "[creating booking-item test-data, hs_booking_item, INSERT, separate ManagedServer]", + "[creating booking-item test-data, hs_booking_item, INSERT, separate ManagedWebspace]", + "[creating booking-item test-data, hs_booking_item, INSERT, some ManagedServer]", + "[creating booking-item test-data, hs_booking_item, INSERT, some ManagedWebspace]", + "[creating booking-item test-data, hs_booking_item, INSERT, some PrivateCloud]", + "[creating booking-item test-data, hs_booking_item, INSERT, test CloudServer]"); } @Test