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

1eaef1e18c move partner behind relationship in Liquibase scripts

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

2d81d3f6fd persist relationships before partners to avoid transient reference

10cd4bd0e8 WIP

53c3b04ba1 add subscriber role and relTypeMark and import these roles

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

17a73918f5 add test-data and include relMark in toString

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

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

3c2f607f0b aftermaths from merging branch add-subscriber-role

2aeb8fef6f introduce view tx_journal_v combining tx_journal with tx_context

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

78b4fce761 amend relationship related tests

5b5e911030 amend person related tests to new test data

26bb14ebd7 add test cases for import

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

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

# 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

5efae66512 aftermaths from merging master branch

7f500d27b6 improved error checking and error messages for ImportOfficeData

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

170aa5e462 amend HsOfficePartnerController and test to new data structure

ebb94969e7 amend partner related tests to new test data

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

572061b3cf cleanup via ContextBasedTestWithCleanup and some fixes

901e9a4868 fix billable and general boolean recognition in ImportOfficeData

6ef34f08ed use distinct partnerNumbers in test cases

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

c1490e5901 amendments according to self-review

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();