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

@@ -33,8 +33,9 @@ create table hs_office_partner
 (
     uuid                uuid unique references RbacObject (uuid) initially deferred,
     partnerNumber       numeric(5),
-    personUuid          uuid not null references hs_office_person(uuid),
+    -- partnerRoleUuid     uuid not null references hs_office_relationship(uuid),
-    contactUuid         uuid not null references hs_office_contact(uuid),
+    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
 );
 --//

src/main/resources/db/changelog/233-hs-office-partner-rbac.sql

@@ -182,6 +182,7 @@ call generateRbacRestrictedView('hs_office_partner',
         personUuid = new.personUuid,
         contactUuid = new.contactUuid
     $updates$);
+-- partnerRoleUuid = new.partnerRoleUuid,
 --//
 
 

src/main/resources/db/changelog/db.changelog-master.yaml

@@ -66,21 +66,21 @@ databaseChangeLog:
     - include:
         file: db/changelog/218-hs-office-person-test-data.sql
     - include:
-        file: db/changelog/220-hs-office-partner.sql
+        file: db/changelog/220-hs-office-relationship.sql
     - include:
-        file: db/changelog/223-hs-office-partner-rbac.sql
+        file: db/changelog/223-hs-office-relationship-rbac.sql
     - include:
-        file: db/changelog/224-hs-office-partner-details-rbac.sql
+        file: db/changelog/228-hs-office-relationship-test-data.sql
     - include:
-        file: db/changelog/226-hs-office-partner-migration.sql
+        file: db/changelog/230-hs-office-partner.sql
     - include:
-        file: db/changelog/228-hs-office-partner-test-data.sql
+        file: db/changelog/233-hs-office-partner-rbac.sql
     - include:
-        file: db/changelog/230-hs-office-relationship.sql
+        file: db/changelog/234-hs-office-partner-details-rbac.sql
     - include:
-        file: db/changelog/233-hs-office-relationship-rbac.sql
+        file: db/changelog/236-hs-office-partner-migration.sql
     - include:
-        file: db/changelog/238-hs-office-relationship-test-data.sql
+        file: db/changelog/238-hs-office-partner-test-data.sql
     - include:
         file: db/changelog/240-hs-office-bankaccount.sql
     - include: