From 754df475a718bc26a8fddcf7b73ab655b8c92b70 Mon Sep 17 00:00:00 2001 From: Michael Hoennig Date: Fri, 20 Sep 2024 12:42:52 +0200 Subject: [PATCH] rename coopassetstransactions->coopassettx --- .../HsOfficeCoopAssetsTransactionEntity.java | 2 +- .../hsadminng/rbac/generator/RbacView.java | 4 +- .../5120-hs-office-coopassets.sql | 12 ++-- .../5123-hs-office-coopassets-rbac.sql | 62 +++++++++---------- .../5126-hs-office-coopassets-migration.sql | 26 ++++---- .../5128-hs-office-coopassets-test-data.sql | 2 +- .../hs/migration/BaseOfficeDataImport.java | 2 +- .../hsadminng/hs/migration/CsvDataImport.java | 6 +- ...tsTransactionControllerAcceptanceTest.java | 4 +- ...sTransactionRepositoryIntegrationTest.java | 30 ++++----- ...ceMembershipRepositoryIntegrationTest.java | 2 +- ...acGrantsDiagramServiceIntegrationTest.java | 2 +- 12 files changed, 76 insertions(+), 78 deletions(-) diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionEntity.java b/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionEntity.java index 34ad2dae..0993b9e5 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionEntity.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionEntity.java @@ -34,7 +34,7 @@ import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor; import static net.hostsharing.hsadminng.stringify.Stringify.stringify; @Entity -@Table(schema = "hs_office", name = "coopassetstransaction_rv") +@Table(schema = "hs_office", name = "coopassettx_rv") @Getter @Setter @Builder diff --git a/src/main/java/net/hostsharing/hsadminng/rbac/generator/RbacView.java b/src/main/java/net/hostsharing/hsadminng/rbac/generator/RbacView.java index c2bc687d..ec95cc2b 100644 --- a/src/main/java/net/hostsharing/hsadminng/rbac/generator/RbacView.java +++ b/src/main/java/net/hostsharing/hsadminng/rbac/generator/RbacView.java @@ -992,9 +992,7 @@ public class RbacView { return getRawTableName() .replace("hs_office.", "hsof.") .replace("hs_booking.", "hsbk_") - .replace("hs_hosting.", "hsho_") - .replace("coopsharestransaction", "coopsharetx") - .replace("coopassetstransaction", "coopassettx"); + .replace("hs_hosting.", "hsho_"); } String dependsOnColumName() { diff --git a/src/main/resources/db/changelog/5-hs-office/512-coopassets/5120-hs-office-coopassets.sql b/src/main/resources/db/changelog/5-hs-office/512-coopassets/5120-hs-office-coopassets.sql index 0cefb464..4e5568ad 100644 --- a/src/main/resources/db/changelog/5-hs-office/512-coopassets/5120-hs-office-coopassets.sql +++ b/src/main/resources/db/changelog/5-hs-office/512-coopassets/5120-hs-office-coopassets.sql @@ -15,7 +15,7 @@ CREATE TYPE hs_office.CoopAssetsTransactionType AS ENUM ('ADJUSTMENT', CREATE CAST (character varying as hs_office.CoopAssetsTransactionType) WITH INOUT AS IMPLICIT; -create table if not exists hs_office.coopassetstransaction +create table if not exists hs_office.coopassettx ( uuid uuid unique references rbac.object (uuid) initially deferred, version int not null default 0, @@ -24,7 +24,7 @@ create table if not exists hs_office.coopassetstransaction valueDate date not null, assetValue money not null, reference varchar(48) not null, - adjustedAssetTxUuid uuid unique REFERENCES hs_office.coopassetstransaction(uuid) DEFERRABLE INITIALLY DEFERRED, + adjustedAssetTxUuid uuid unique REFERENCES hs_office.coopassettx(uuid) DEFERRABLE INITIALLY DEFERRED, comment varchar(512) ); --// @@ -34,7 +34,7 @@ create table if not exists hs_office.coopassetstransaction --changeset michael.hoennig:hs-office-coopassets-BUSINESS-RULES endDelimiter:--// -- ---------------------------------------------------------------------------- -alter table hs_office.coopassetstransaction +alter table hs_office.coopassettx add constraint reverse_entry_missing check ( transactionType = 'ADJUSTMENT' and adjustedAssetTxUuid is not null or transactionType <> 'ADJUSTMENT' and adjustedAssetTxUuid is null); @@ -52,7 +52,7 @@ declare totalAssetValue money; begin select sum(cat.assetValue) - from hs_office.coopassetstransaction cat + from hs_office.coopassettx cat where cat.membershipUuid = forMembershipUuid into currentAssetValue; totalAssetValue := currentAssetValue + newAssetValue; @@ -62,7 +62,7 @@ begin return true; end; $$; -alter table hs_office.coopassetstransaction +alter table hs_office.coopassettx add constraint check_positive_total check ( hs_office.coopassetstx_check_positive_total(membershipUuid, assetValue) ); --// @@ -72,5 +72,5 @@ alter table hs_office.coopassetstransaction --changeset michael.hoennig:hs-office-coopassets-MAIN-TABLE-JOURNAL endDelimiter:--// -- ---------------------------------------------------------------------------- -call base.create_journal('hs_office.coopassetstransaction'); +call base.create_journal('hs_office.coopassettx'); --// diff --git a/src/main/resources/db/changelog/5-hs-office/512-coopassets/5123-hs-office-coopassets-rbac.sql b/src/main/resources/db/changelog/5-hs-office/512-coopassets/5123-hs-office-coopassets-rbac.sql index 20530fb9..b6459abd 100644 --- a/src/main/resources/db/changelog/5-hs-office/512-coopassets/5123-hs-office-coopassets-rbac.sql +++ b/src/main/resources/db/changelog/5-hs-office/512-coopassets/5123-hs-office-coopassets-rbac.sql @@ -3,29 +3,29 @@ -- ============================================================================ ---changeset RbacObjectGenerator:hs-office-coopassetstransaction-rbac-OBJECT endDelimiter:--// +--changeset RbacObjectGenerator:hs-office-coopassettx-rbac-OBJECT endDelimiter:--// -- ---------------------------------------------------------------------------- -call rbac.generateRelatedRbacObject('hs_office.coopassetstransaction'); +call rbac.generateRelatedRbacObject('hs_office.coopassettx'); --// -- ============================================================================ ---changeset RbacRoleDescriptorsGenerator:hs-office-coopassetstransaction-rbac-ROLE-DESCRIPTORS endDelimiter:--// +--changeset RbacRoleDescriptorsGenerator:hs-office-coopassettx-rbac-ROLE-DESCRIPTORS endDelimiter:--// -- ---------------------------------------------------------------------------- -call rbac.generateRbacRoleDescriptors('hs_office.coopassetstransaction'); +call rbac.generateRbacRoleDescriptors('hs_office.coopassettx'); --// -- ============================================================================ ---changeset RolesGrantsAndPermissionsGenerator:hs-office-coopassetstransaction-rbac-insert-trigger endDelimiter:--// +--changeset RolesGrantsAndPermissionsGenerator:hs-office-coopassettx-rbac-insert-trigger endDelimiter:--// -- ---------------------------------------------------------------------------- /* Creates the roles, grants and permission for the AFTER INSERT TRIGGER. */ -create or replace procedure hs_office.coopassetstransaction_build_rbac_system( - NEW hs_office.coopassetstransaction +create or replace procedure hs_office.coopassettx_build_rbac_system( + NEW hs_office.coopassettx ) language plpgsql as $$ @@ -45,52 +45,52 @@ begin end; $$; /* - AFTER INSERT TRIGGER to create the role+grant structure for a new hs_office.coopassetstransaction row. + AFTER INSERT TRIGGER to create the role+grant structure for a new hs_office.coopassettx row. */ -create or replace function hs_office.coopassetstransaction_build_rbac_system_after_insert_tf() +create or replace function hs_office.coopassettx_build_rbac_system_after_insert_tf() returns trigger language plpgsql strict as $$ begin - call hs_office.coopassetstransaction_build_rbac_system(NEW); + call hs_office.coopassettx_build_rbac_system(NEW); return NEW; end; $$; create trigger build_rbac_system_after_insert_tg - after insert on hs_office.coopassetstransaction + after insert on hs_office.coopassettx for each row -execute procedure hs_office.coopassetstransaction_build_rbac_system_after_insert_tf(); +execute procedure hs_office.coopassettx_build_rbac_system_after_insert_tf(); --// -- ============================================================================ ---changeset InsertTriggerGenerator:hs-office-coopassetstransaction-rbac-GRANTING-INSERT-PERMISSION endDelimiter:--// +--changeset InsertTriggerGenerator:hs-office-coopassettx-rbac-GRANTING-INSERT-PERMISSION endDelimiter:--// -- ---------------------------------------------------------------------------- -- granting INSERT permission to hs_office.membership ---------------------------- /* - Grants INSERT INTO hs_office.coopassetstransaction permissions to specified role of pre-existing hs_office.membership rows. + Grants INSERT INTO hs_office.coopassettx permissions to specified role of pre-existing hs_office.membership rows. */ do language plpgsql $$ declare row hs_office.membership; begin - call base.defineContext('create INSERT INTO hs_office.coopassetstransaction permissions for pre-exising hs_office.membership rows'); + call base.defineContext('create INSERT INTO hs_office.coopassettx permissions for pre-exising hs_office.membership rows'); FOR row IN SELECT * FROM hs_office.membership -- unconditional for all rows in that table LOOP call rbac.grantPermissionToRole( - rbac.createPermission(row.uuid, 'INSERT', 'hs_office.coopassetstransaction'), + rbac.createPermission(row.uuid, 'INSERT', 'hs_office.coopassettx'), hs_office.membership_ADMIN(row)); END LOOP; end; $$; /** - Grants hs_office.coopassetstransaction INSERT permission to specified role of new membership rows. + Grants hs_office.coopassettx INSERT permission to specified role of new membership rows. */ create or replace function hs_office.new_coopassettx_grants_insert_to_membership_tf() returns trigger @@ -99,53 +99,53 @@ create or replace function hs_office.new_coopassettx_grants_insert_to_membership begin -- unconditional for all rows in that table call rbac.grantPermissionToRole( - rbac.createPermission(NEW.uuid, 'INSERT', 'hs_office.coopassetstransaction'), + rbac.createPermission(NEW.uuid, 'INSERT', 'hs_office.coopassettx'), hs_office.membership_ADMIN(NEW)); -- end. return NEW; end; $$; -- z_... is to put it at the end of after insert triggers, to make sure the roles exist -create trigger z_new_coopassetstransaction_grants_after_insert_tg +create trigger z_new_coopassettx_grants_after_insert_tg after insert on hs_office.membership for each row execute procedure hs_office.new_coopassettx_grants_insert_to_membership_tf(); -- ============================================================================ ---changeset InsertTriggerGenerator:hs-office-coopassetstransaction-rbac-CHECKING-INSERT-PERMISSION endDelimiter:--// +--changeset InsertTriggerGenerator:hs-office-coopassettx-rbac-CHECKING-INSERT-PERMISSION endDelimiter:--// -- ---------------------------------------------------------------------------- /** - Checks if the user respectively the assumed roles are allowed to insert a row to hs_office.coopassetstransaction. + Checks if the user respectively the assumed roles are allowed to insert a row to hs_office.coopassettx. */ -create or replace function hs_office.coopassetstransaction_insert_permission_check_tf() +create or replace function hs_office.coopassettx_insert_permission_check_tf() returns trigger language plpgsql as $$ declare superObjectUuid uuid; begin -- check INSERT permission via direct foreign key: NEW.membershipUuid - if rbac.hasInsertPermission(NEW.membershipUuid, 'hs_office.coopassetstransaction') then + if rbac.hasInsertPermission(NEW.membershipUuid, 'hs_office.coopassettx') then return NEW; end if; - raise exception '[403] insert into hs_office.coopassetstransaction values(%) not allowed for current subjects % (%)', + raise exception '[403] insert into hs_office.coopassettx values(%) not allowed for current subjects % (%)', NEW, base.currentSubjects(), rbac.currentSubjectOrAssumedRolesUuids(); end; $$; -create trigger coopassetstransaction_insert_permission_check_tg - before insert on hs_office.coopassetstransaction +create trigger coopassettx_insert_permission_check_tg + before insert on hs_office.coopassettx for each row - execute procedure hs_office.coopassetstransaction_insert_permission_check_tf(); + execute procedure hs_office.coopassettx_insert_permission_check_tf(); --// -- ============================================================================ ---changeset RbacIdentityViewGenerator:hs-office-coopassetstransaction-rbac-IDENTITY-VIEW endDelimiter:--// +--changeset RbacIdentityViewGenerator:hs-office-coopassettx-rbac-IDENTITY-VIEW endDelimiter:--// -- ---------------------------------------------------------------------------- -call rbac.generateRbacIdentityViewFromProjection('hs_office.coopassetstransaction', +call rbac.generateRbacIdentityViewFromProjection('hs_office.coopassettx', $idName$ reference $idName$); @@ -153,9 +153,9 @@ call rbac.generateRbacIdentityViewFromProjection('hs_office.coopassetstransactio -- ============================================================================ ---changeset RbacRestrictedViewGenerator:hs-office-coopassetstransaction-rbac-RESTRICTED-VIEW endDelimiter:--// +--changeset RbacRestrictedViewGenerator:hs-office-coopassettx-rbac-RESTRICTED-VIEW endDelimiter:--// -- ---------------------------------------------------------------------------- -call rbac.generateRbacRestrictedView('hs_office.coopassetstransaction', +call rbac.generateRbacRestrictedView('hs_office.coopassettx', $orderBy$ reference $orderBy$, diff --git a/src/main/resources/db/changelog/5-hs-office/512-coopassets/5126-hs-office-coopassets-migration.sql b/src/main/resources/db/changelog/5-hs-office/512-coopassets/5126-hs-office-coopassets-migration.sql index 841ca6e6..1bb0d500 100644 --- a/src/main/resources/db/changelog/5-hs-office/512-coopassets/5126-hs-office-coopassets-migration.sql +++ b/src/main/resources/db/changelog/5-hs-office/512-coopassets/5126-hs-office-coopassets-migration.sql @@ -7,9 +7,9 @@ --changeset michael.hoennig:hs-office-coopassets-MIGRATION-mapping endDelimiter:--// -- ---------------------------------------------------------------------------- -CREATE TABLE hs_office.coopassetstransaction_legacy_id +CREATE TABLE hs_office.coopassettx_legacy_id ( - uuid uuid NOT NULL REFERENCES hs_office.coopassetstransaction(uuid), + uuid uuid NOT NULL REFERENCES hs_office.coopassettx(uuid), member_asset_id integer NOT NULL ); --// @@ -19,10 +19,10 @@ CREATE TABLE hs_office.coopassetstransaction_legacy_id --changeset michael.hoennig:hs-office-coopassets-MIGRATION-sequence endDelimiter:--// -- ---------------------------------------------------------------------------- -CREATE SEQUENCE IF NOT EXISTS hs_office.coopassetstransaction_legacy_id_seq +CREATE SEQUENCE IF NOT EXISTS hs_office.coopassettx_legacy_id_seq AS integer START 1000000000 - OWNED BY hs_office.coopassetstransaction_legacy_id.member_asset_id; + OWNED BY hs_office.coopassettx_legacy_id.member_asset_id; --// @@ -30,9 +30,9 @@ CREATE SEQUENCE IF NOT EXISTS hs_office.coopassetstransaction_legacy_id_seq --changeset michael.hoennig:hs-office-coopassets-MIGRATION-default endDelimiter:--// -- ---------------------------------------------------------------------------- -ALTER TABLE hs_office.coopassetstransaction_legacy_id +ALTER TABLE hs_office.coopassettx_legacy_id ALTER COLUMN member_asset_id - SET DEFAULT nextVal('hs_office.coopassetstransaction_legacy_id_seq'); + SET DEFAULT nextVal('hs_office.coopassettx_legacy_id_seq'); --/ @@ -41,8 +41,8 @@ ALTER TABLE hs_office.coopassetstransaction_legacy_id -- ---------------------------------------------------------------------------- CALL base.defineContext('schema-migration'); -INSERT INTO hs_office.coopassetstransaction_legacy_id(uuid, member_asset_id) - SELECT uuid, nextVal('hs_office.coopassetstransaction_legacy_id_seq') FROM hs_office.coopassetstransaction; +INSERT INTO hs_office.coopassettx_legacy_id(uuid, member_asset_id) + SELECT uuid, nextVal('hs_office.coopassettx_legacy_id_seq') FROM hs_office.coopassettx; --/ @@ -58,14 +58,14 @@ begin raise exception 'invalid usage of trigger'; end if; - INSERT INTO hs_office.coopassetstransaction_legacy_id VALUES - (NEW.uuid, nextVal('hs_office.coopassetstransaction_legacy_id_seq')); + INSERT INTO hs_office.coopassettx_legacy_id VALUES + (NEW.uuid, nextVal('hs_office.coopassettx_legacy_id_seq')); return NEW; end; $$; create trigger insert_legacy_id_mapping_tg - after insert on hs_office.coopassetstransaction + after insert on hs_office.coopassettx for each row execute procedure hs_office.coopassettx_insert_legacy_id_mapping_tf(); --/ @@ -83,14 +83,14 @@ begin raise exception 'invalid usage of trigger'; end if; - DELETE FROM hs_office.coopassetstransaction_legacy_id + DELETE FROM hs_office.coopassettx_legacy_id WHERE uuid = OLD.uuid; return OLD; end; $$; create trigger delete_legacy_id_mapping_tg - before delete on hs_office.coopassetstransaction + before delete on hs_office.coopassettx for each row execute procedure hs_office.coopassettx_delete_legacy_id_mapping_tf(); --/ 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 3f2a35a6..ed824b12 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 @@ -27,7 +27,7 @@ begin raise notice 'creating test coopAssetsTransaction: %', givenPartnerNumber || givenMemberNumberSuffix; lossEntryUuid := uuid_generate_v4(); insert - into hs_office.coopassetstransaction(uuid, membershipuuid, transactiontype, valuedate, assetvalue, reference, comment, adjustedAssetTxUuid) + into hs_office.coopassettx(uuid, membershipuuid, transactiontype, valuedate, assetvalue, reference, comment, adjustedAssetTxUuid) values (uuid_generate_v4(), membership.uuid, 'DEPOSIT', '2010-03-15', 320.00, 'ref '||givenPartnerNumber || givenMemberNumberSuffix||'-1', 'initial deposit', null), (uuid_generate_v4(), membership.uuid, 'DISBURSAL', '2021-09-01', -128.00, 'ref '||givenPartnerNumber || givenMemberNumberSuffix||'-2', 'partial disbursal', null), diff --git a/src/test/java/net/hostsharing/hsadminng/hs/migration/BaseOfficeDataImport.java b/src/test/java/net/hostsharing/hsadminng/hs/migration/BaseOfficeDataImport.java index 3bdd17b3..511647aa 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/migration/BaseOfficeDataImport.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/migration/BaseOfficeDataImport.java @@ -677,7 +677,7 @@ public abstract class BaseOfficeDataImport extends CsvDataImport { jpaAttempt.transacted(() -> { context(rbacSuperuser); coopAssets.forEach(this::persist); - updateLegacyIds(coopAssets, "hs_office.coopassetstransaction_legacy_id", "member_asset_id"); + updateLegacyIds(coopAssets, "hs_office.coopassettx_legacy_id", "member_asset_id"); }).assertSuccessful(); } diff --git a/src/test/java/net/hostsharing/hsadminng/hs/migration/CsvDataImport.java b/src/test/java/net/hostsharing/hsadminng/hs/migration/CsvDataImport.java index 3dd9a11f..8a4500a1 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/migration/CsvDataImport.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/migration/CsvDataImport.java @@ -254,8 +254,8 @@ public class CsvDataImport extends ContextBasedTest { em.createNativeQuery("delete from hs_booking.item_ex where true").executeUpdate(); em.createNativeQuery("delete from hs_booking.project where true").executeUpdate(); em.createNativeQuery("delete from hs_booking.project_ex where true").executeUpdate(); - em.createNativeQuery("delete from hs_office.coopassetstransaction where true").executeUpdate(); - em.createNativeQuery("delete from hs_office.coopassetstransaction_legacy_id where true").executeUpdate(); + em.createNativeQuery("delete from hs_office.coopassettx where true").executeUpdate(); + em.createNativeQuery("delete from hs_office.coopassettx_legacy_id where true").executeUpdate(); em.createNativeQuery("delete from hs_office.coopsharestransaction where true").executeUpdate(); em.createNativeQuery("delete from hs_office.coopsharestransaction_legacy_id where true").executeUpdate(); em.createNativeQuery("delete from hs_office.membership where true").executeUpdate(); @@ -275,7 +275,7 @@ public class CsvDataImport extends ContextBasedTest { jpaAttempt.transacted(() -> { context(rbacSuperuser); em.createNativeQuery("alter sequence hs_office.contact_legacy_id_seq restart with 1000000000;").executeUpdate(); - em.createNativeQuery("alter sequence hs_office.coopassetstransaction_legacy_id_seq restart with 1000000000;") + em.createNativeQuery("alter sequence hs_office.coopassettx_legacy_id_seq restart with 1000000000;") .executeUpdate(); em.createNativeQuery("alter sequence public.hs_office.coopsharestransaction_legacy_id_seq restart with 1000000000;") .executeUpdate(); 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 1ca91c75..e8766490 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 @@ -391,9 +391,9 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased void cleanup() { jpaAttempt.transacted(() -> { context.define("superuser-alex@hostsharing.net", null); - // HsOfficeCoopAssetsTransactionEntity respectively hs_office.coopassetstransaction_rv + // HsOfficeCoopAssetsTransactionEntity respectively hs_office.coopassettx_rv // cannot be deleted at all, but the underlying table record can be deleted. - em.createNativeQuery("delete from hs_office.coopassetstransaction where reference like 'temp %'") + em.createNativeQuery("delete from hs_office.coopassettx where reference like 'temp %'") .executeUpdate(); }).assertSuccessful(); } diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionRepositoryIntegrationTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionRepositoryIntegrationTest.java index b13ff2f5..8f650fa9 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionRepositoryIntegrationTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionRepositoryIntegrationTest.java @@ -112,8 +112,8 @@ class HsOfficeCoopAssetsTransactionRepositoryIntegrationTest extends ContextBase .map(s -> s.replace("hs_office.", "")) .containsExactlyInAnyOrder(Array.fromFormatted( initialGrantNames, - "{ grant perm:coopassetstransaction#temprefB:SELECT to role:membership#M-1000101:AGENT by system and assume }", - "{ grant perm:coopassetstransaction#temprefB:UPDATE to role:membership#M-1000101:ADMIN by system and assume }", + "{ grant perm:coopassettx#temprefB:SELECT to role:membership#M-1000101:AGENT by system and assume }", + "{ grant perm:coopassettx#temprefB:UPDATE to role:membership#M-1000101:ADMIN by system and assume }", null)); } @@ -222,7 +222,7 @@ class HsOfficeCoopAssetsTransactionRepositoryIntegrationTest extends ContextBase final var query = em.createNativeQuery(""" select currentTask, targetTable, targetOp, targetdelta->>'reference' from base.tx_journal_v - where targettable = 'hs_office.coopassetstransaction'; + where targettable = 'hs_office.coopassettx'; """); // when @@ -230,18 +230,18 @@ class HsOfficeCoopAssetsTransactionRepositoryIntegrationTest extends ContextBase // then assertThat(customerLogEntries).map(Arrays::toString).contains( - "[creating coopAssetsTransaction test-data, hs_office.coopassetstransaction, INSERT, ref 1000101-1]", - "[creating coopAssetsTransaction test-data, hs_office.coopassetstransaction, INSERT, ref 1000101-2]", - "[creating coopAssetsTransaction test-data, hs_office.coopassetstransaction, INSERT, ref 1000101-3]", - "[creating coopAssetsTransaction test-data, hs_office.coopassetstransaction, INSERT, ref 1000101-3]", - "[creating coopAssetsTransaction test-data, hs_office.coopassetstransaction, INSERT, ref 1000202-1]", - "[creating coopAssetsTransaction test-data, hs_office.coopassetstransaction, INSERT, ref 1000202-2]", - "[creating coopAssetsTransaction test-data, hs_office.coopassetstransaction, INSERT, ref 1000202-3]", - "[creating coopAssetsTransaction test-data, hs_office.coopassetstransaction, INSERT, ref 1000202-3]", - "[creating coopAssetsTransaction test-data, hs_office.coopassetstransaction, INSERT, ref 1000303-1]", - "[creating coopAssetsTransaction test-data, hs_office.coopassetstransaction, INSERT, ref 1000303-2]", - "[creating coopAssetsTransaction test-data, hs_office.coopassetstransaction, INSERT, ref 1000303-3]", - "[creating coopAssetsTransaction test-data, hs_office.coopassetstransaction, INSERT, ref 1000303-3]"); + "[creating coopAssetsTransaction test-data, hs_office.coopassettx, INSERT, ref 1000101-1]", + "[creating coopAssetsTransaction test-data, hs_office.coopassettx, INSERT, ref 1000101-2]", + "[creating coopAssetsTransaction test-data, hs_office.coopassettx, INSERT, ref 1000101-3]", + "[creating coopAssetsTransaction test-data, hs_office.coopassettx, INSERT, ref 1000101-3]", + "[creating coopAssetsTransaction test-data, hs_office.coopassettx, INSERT, ref 1000202-1]", + "[creating coopAssetsTransaction test-data, hs_office.coopassettx, INSERT, ref 1000202-2]", + "[creating coopAssetsTransaction test-data, hs_office.coopassettx, INSERT, ref 1000202-3]", + "[creating coopAssetsTransaction test-data, hs_office.coopassettx, INSERT, ref 1000202-3]", + "[creating coopAssetsTransaction test-data, hs_office.coopassettx, INSERT, ref 1000303-1]", + "[creating coopAssetsTransaction test-data, hs_office.coopassettx, INSERT, ref 1000303-2]", + "[creating coopAssetsTransaction test-data, hs_office.coopassettx, INSERT, ref 1000303-3]", + "[creating coopAssetsTransaction test-data, hs_office.coopassettx, INSERT, ref 1000303-3]"); } @BeforeEach diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipRepositoryIntegrationTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipRepositoryIntegrationTest.java index 8192c705..ddceb536 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipRepositoryIntegrationTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipRepositoryIntegrationTest.java @@ -118,7 +118,7 @@ class HsOfficeMembershipRepositoryIntegrationTest extends ContextBasedTestWithCl .containsExactlyInAnyOrder(Array.fromFormatted( initialGrantNames, // insert - "{ grant perm:membership#M-1000117:INSERT>coopassetstransaction to role:membership#M-1000117:ADMIN by system and assume }", + "{ grant perm:membership#M-1000117:INSERT>coopassettx to role:membership#M-1000117:ADMIN by system and assume }", "{ grant perm:membership#M-1000117:INSERT>coopsharestransaction to role:membership#M-1000117:ADMIN by system and assume }", // owner diff --git a/src/test/java/net/hostsharing/hsadminng/rbac/grant/RbacGrantsDiagramServiceIntegrationTest.java b/src/test/java/net/hostsharing/hsadminng/rbac/grant/RbacGrantsDiagramServiceIntegrationTest.java index f3ebb87f..b234e07b 100644 --- a/src/test/java/net/hostsharing/hsadminng/rbac/grant/RbacGrantsDiagramServiceIntegrationTest.java +++ b/src/test/java/net/hostsharing/hsadminng/rbac/grant/RbacGrantsDiagramServiceIntegrationTest.java @@ -95,7 +95,7 @@ class RbacGrantsDiagramServiceIntegrationTest extends ContextBasedTestWithCleanu //final var graph = grantsMermaidService.allGrantsTocurrentSubject(EnumSet.of(Include.NON_TEST_ENTITIES, Include.PERMISSIONS)); - final var targetObject = (UUID) em.createNativeQuery("SELECT uuid FROM hs_office.coopassetstransaction WHERE reference='ref 1000101-1'").getSingleResult(); + final var targetObject = (UUID) em.createNativeQuery("SELECT uuid FROM hs_office.coopassettx WHERE reference='ref 1000101-1'").getSingleResult(); final var graph = grantsMermaidService.allGrantsFrom(targetObject, "view", EnumSet.of(Include.USERS)); RbacGrantsDiagramService.writeToFile(join(";", context.fetchAssumedRoles()), graph, "doc/all-grants.md");