introduce-partner-business-role #16

hsh-michaelhoennig · 2024-02-01T06:51:04+01:00

hsh-michaelhoennig commented

2024-02-01 06:51:04 +01:00

No description provided.

hsh-michaelhoennig added 25 commits 2024-02-01 06:51:04 +01:00

move partner behind relationship in Liquibase scripts 1eaef1e18c

add partnerRole to partner and amend ImportOfficeData (WIP) 90e626eac0

persist relationships before partners to avoid transient reference 2d81d3f6fd

WIP 10cd4bd0e8

add subscriber role and relTypeMark and import these roles 53c3b04ba1

fix relType, which was not mapped by OpenApi anymore of there is relTypeMark, by renaming relTypeMark to relMark - strange! 82573d1c9f

add test-data and include relMark in toString 17a73918f5

Merge branch 'add-subscriber-role' into introduce-partner-business-role 8f4ac8b2bf

# Conflicts:
#	src/main/resources/db/changelog/228-hs-office-relationship-test-data.sql
#	src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeData.java

aftermaths from merging branch add-subscriber-role 3c2f607f0b

introduce view tx_journal_v combining tx_journal with tx_context 2aeb8fef6f

added TODO on Contact.emailaddresses: check if we really want multiple, ... f626311273

amend relationship related tests 78b4fce761

amend person related tests to new test data 5b5e911030

add test cases for import 26bb14ebd7

add partner without contact data to import test data and improve error message 066e19185c

Merge remote-tracking branch 'origin/master' into introduce-partner-business-role 08752d862e

# Conflicts:
#	src/main/resources/db/changelog/228-hs-office-relationship-test-data.sql
#	src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeData.java
#	src/test/resources/migration/contacts.csv

aftermaths from merging master branch 5efae66512

improved error checking and error messages for ImportOfficeData 7f500d27b6

amend add-partner and delete partner according to new structure 4f5732df61

amend HsOfficePartnerController and test to new data structure 170aa5e462

amend partner related tests to new test data ebb94969e7

add rbacrole test in before+after to all Integration+Acceptance-tests df025503d9

cleanup via ContextBasedTestWithCleanup and some fixes 572061b3cf

fix billable and general boolean recognition in ImportOfficeData 901e9a4868

use distinct partnerNumbers in test cases 6ef34f08ed

hsh-michaelhoennig force-pushed introduce-partner-business-role from 1acfe43cbb to 745765022e

2024-02-01 08:21:57 +01:00

Compare

hsh-michaelhoennig added 1 commit 2024-02-01 09:05:21 +01:00

amendments according to self-review c1490e5901

hsh-timotheuspokorra approved these changes 2024-02-01 09:56:52 +01:00

hsh-timotheuspokorra left a comment

sieht gut aus

src/main/resources/db/changelog/230-hs-office-partner.sql Outdated

						
				@ -0,0 +33,4 @@

				(

				    uuid                uuid unique references RbacObject (uuid) initially deferred,

				    partnerNumber       numeric(5) unique not null,

				    partnerRoleUuid     uuid not null references hs_office_relationship(uuid) on delete cascade,

hsh-timotheuspokorra commented

2024-02-01 09:25:17 +01:00

on delete cascade: ist das gut?

hsh-michaelhoennig marked this conversation as resolved

src/main/resources/db/changelog/230-hs-office-partner.sql Outdated

						
				@ -0,0 +36,4 @@

				    partnerRoleUuid     uuid not null references hs_office_relationship(uuid) on delete cascade,

				    personUuid          uuid not null references hs_office_person(uuid), -- TODO: remove, replaced by partnerRoleUuid

				    contactUuid         uuid not null references hs_office_contact(uuid), -- TODO: remove, replaced by partnerRoleUuid

				    detailsUuid         uuid not null references hs_office_partner_details(uuid) on delete cascade

hsh-timotheuspokorra commented

2024-02-01 09:25:42 +01:00

wollen wir on delete cascade?

hsh-michaelhoennig marked this conversation as resolved

src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeData.java Outdated

						
				@ -585,2 +691,2 @@

				                    partners.put(rec.getInteger("bp_id"), partner);

				                    final Integer i1 = rec.getInteger("bp_id");

				                    assertThat(debitors.containsKey(i1)).describedAs("overwriting " + debitors.get(i1) + " index " + i1 + " with " + debitor).isFalse();