From 44ca8b8f065509b4c6316912b9ffdacc307e8efd Mon Sep 17 00:00:00 2001 From: Michael Hoennig Date: Tue, 4 Feb 2025 09:55:12 +0100 Subject: [PATCH] improved naming --- .../db/changelog/9-hs-global/9800-cleanup.sql | 10 ++++++++-- .../hsadminng/hs/migration/ImportHostingAssets.java | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/resources/db/changelog/9-hs-global/9800-cleanup.sql b/src/main/resources/db/changelog/9-hs-global/9800-cleanup.sql index 86fe33dd..022c430a 100644 --- a/src/main/resources/db/changelog/9-hs-global/9800-cleanup.sql +++ b/src/main/resources/db/changelog/9-hs-global/9800-cleanup.sql @@ -1,7 +1,7 @@ --liquibase formatted sql -- ============================================================================ ---changeset michael.hoennig:hs-global-ddl-cleanup context:hosting-asset-import endDelimiter:--// +--changeset michael.hoennig:hs-global-office-test-ddl-cleanup context:hosting-asset-import endDelimiter:--// -- ---------------------------------------------------------------------------- DROP PROCEDURE IF EXISTS hs_office.bankaccount_create_test_data(IN givenholder character varying, IN giveniban character varying, IN givenbic character varying); @@ -16,13 +16,19 @@ DROP PROCEDURE IF EXISTS hs_office.person_create_test_data(IN newpersontype hs_o DROP PROCEDURE IF EXISTS hs_office.relation_create_test_data(IN startcount integer, IN endcount integer); DROP PROCEDURE IF EXISTS hs_office.relation_create_test_data(IN holderpersonname character varying, IN relationtype hs_office.relationtype, IN anchorpersonname character varying, IN contactcaption character varying, IN mark character varying); DROP PROCEDURE IF EXISTS hs_office.sepamandate_create_test_data(IN forpartnernumber numeric, IN fordebitorsuffix character, IN foriban character varying, IN withreference character varying); +--// + + +-- ============================================================================ +--changeset michael.hoennig:hs-global-rbac-test-ddl-cleanup context:hosting-asset-import endDelimiter:--// +-- ---------------------------------------------------------------------------- DROP SCHEMA IF EXISTS rbactest CASCADE; --// -- ============================================================================ ---changeset michael.hoennig:hs-global-dml-cleanup context:hosting-asset-import endDelimiter:--// +--changeset michael.hoennig:hs-global-rbac-test-dml-cleanup context:hosting-asset-import endDelimiter:--// -- ---------------------------------------------------------------------------- call base.defineContext('9800-cleanup', null, '${HSADMINNG_SUPERUSER}', null); diff --git a/src/test/java/net/hostsharing/hsadminng/hs/migration/ImportHostingAssets.java b/src/test/java/net/hostsharing/hsadminng/hs/migration/ImportHostingAssets.java index 744688a4..dbadf08f 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/migration/ImportHostingAssets.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/migration/ImportHostingAssets.java @@ -149,7 +149,7 @@ public class ImportHostingAssets extends CsvDataImport { @Order(11010) void createBookingProjects() { - final var resultList = em.createNativeQuery( + final var partnerLegacyIdMappings = em.createNativeQuery( """ select debitor.uuid, pid.bp_id from hs_office.debitor debitor @@ -159,13 +159,13 @@ public class ImportHostingAssets extends CsvDataImport { join hs_office.partner_legacy_id pid on partner.uuid=pid.uuid """, PartnerLegacyIdMapping.class).getResultList(); //noinspection unchecked - final var debitorUuidTopLegacyBpId = ((List) resultList).stream() + final var debitorUuidToLegacyBpIdMap = ((List) partnerLegacyIdMappings).stream() .collect(toMap(row -> row.uuid, row -> row.bp_id)); final var debitors = em.createNativeQuery("SELECT debitor.uuid, debitor.version, debitor.defaultPrefix FROM hs_office.debitor debitor", DebitorRecord.class).getResultList(); //noinspection unchecked ((List)debitors).forEach(debitor -> { bookingProjects.put( - debitorUuidTopLegacyBpId.get(debitor.uuid), HsBookingProjectRealEntity.builder() + debitorUuidToLegacyBpIdMap.get(debitor.uuid), HsBookingProjectRealEntity.builder() .version(debitor.version) .caption(debitor.defaultPrefix + " default project") .debitor(em.find(HsBookingDebitorEntity.class, debitor.uuid))