From 82573d1c9fcf87f2058b347e8823a2a2eada1e26 Mon Sep 17 00:00:00 2001
From: Michael Hoennig <michael@hoennig.de>
Date: Thu, 25 Jan 2024 15:30:06 +0100
Subject: [PATCH] fix relType, which was not mapped by OpenApi anymore of there
 is relTypeMark, by renaming relTypeMark to relMark - strange!

---
 .../hs/office/relationship/HsOfficeRelationshipEntity.java  | 4 ++--
 .../hs-office/hs-office-relationship-schemas.yaml           | 6 +++---
 .../resources/db/changelog/230-hs-office-relationship.sql   | 2 +-
 .../hsadminng/hs/office/migration/ImportOfficeData.java     | 3 ++-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipEntity.java b/src/main/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipEntity.java
index 6d5dbe11..9e2c9452 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipEntity.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipEntity.java
@@ -54,8 +54,8 @@ public class HsOfficeRelationshipEntity implements HasUuid, Stringifyable {
     @Enumerated(EnumType.STRING)
     private HsOfficeRelationshipType relType;
 
-    @Column(name = "reltypemark")
-    private String relTypeMark;
+    @Column(name = "relmark")
+    private String relMark;
 
     @Override
     public String toString() {
diff --git a/src/main/resources/api-definition/hs-office/hs-office-relationship-schemas.yaml b/src/main/resources/api-definition/hs-office/hs-office-relationship-schemas.yaml
index 7de3248a..8fb5abb2 100644
--- a/src/main/resources/api-definition/hs-office/hs-office-relationship-schemas.yaml
+++ b/src/main/resources/api-definition/hs-office/hs-office-relationship-schemas.yaml
@@ -26,7 +26,7 @@ components:
                     $ref: './hs-office-person-schemas.yaml#/components/schemas/HsOfficePerson'
                 relType:
                     type: string
-                relTypeMark:
+                relMark:
                     type: string
                     nullable: true
                 contact:
@@ -51,9 +51,9 @@ components:
                     format: uuid
                 relType:
                     type: string
-                relTypeMark:
-                    type: string
                     nullable: true
+                relMark:
+                    type: string
                 contactUuid:
                     type: string
                     format: uuid
diff --git a/src/main/resources/db/changelog/230-hs-office-relationship.sql b/src/main/resources/db/changelog/230-hs-office-relationship.sql
index 01e5b7e2..18d21da2 100644
--- a/src/main/resources/db/changelog/230-hs-office-relationship.sql
+++ b/src/main/resources/db/changelog/230-hs-office-relationship.sql
@@ -22,7 +22,7 @@ create table if not exists hs_office_relationship
     relHolderUuid       uuid not null references hs_office_person(uuid),
     contactUuid         uuid references hs_office_contact(uuid),
     relType             HsOfficeRelationshipType not null,
-    relTypeMark         varchar(24)
+    relMark             varchar(24)
 );
 --//
 
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeData.java b/src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeData.java
index 0b2fd5ab..1340701f 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeData.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeData.java
@@ -761,7 +761,8 @@ public class ImportOfficeData extends ContextBasedTest {
                     for (String subscriberRole: SUBSCRIBER_ROLES) {
                         if (containsRole(rec, subscriberRole)) {
                             addRelationship(partnerPerson, contactPerson, contact, HsOfficeRelationshipType.SUBSCRIBER)
-                                    .setRelTypeMark(subscriberRole.split(":")[1]);
+                                    .setRelMark(subscriberRole.split(":")[1])
+                            ;
                         }
                     }
                     verifyContainsOnlyKnownRoles(rec.getString("roles"));