From 1a3fad80ee6e07db6bc8e504b314b5074cce6ad2 Mon Sep 17 00:00:00 2001
From: "Marc O. Sandlus" <marc.o.sandlus@hostsharing.net>
Date: Fri, 2 Feb 2024 09:02:28 +0100
Subject: [PATCH] wip initial commit

---
 .../hs/office/person/HsOfficePersonEntity.java     | 10 +++++++++-
 .../office/person/HsOfficePersonEntityPatcher.java |  2 ++
 .../hs-office/hs-office-person-schemas.yaml        | 14 ++++++++++++++
 .../db/changelog/210-hs-office-person.sql          |  2 ++
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonEntity.java b/src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonEntity.java
index fde3972b..f36ce946 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonEntity.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonEntity.java
@@ -27,6 +27,8 @@ public class HsOfficePersonEntity implements HasUuid, Stringifyable {
     private static Stringify<HsOfficePersonEntity> toString = stringify(HsOfficePersonEntity.class, "person")
             .withProp(Fields.personType, HsOfficePersonEntity::getPersonType)
             .withProp(Fields.tradeName, HsOfficePersonEntity::getTradeName)
+            .withProp(Fields.salutation, HsOfficePersonEntity::getSalutation)
+            .withProp(Fields.title, HsOfficePersonEntity::getTitle)
             .withProp(Fields.familyName, HsOfficePersonEntity::getFamilyName)
             .withProp(Fields.givenName, HsOfficePersonEntity::getGivenName);
 
@@ -40,6 +42,12 @@ public class HsOfficePersonEntity implements HasUuid, Stringifyable {
     @Column(name = "tradename")
     private String tradeName;
 
+    @Column(name = "salutation")
+    private String salutation;
+
+    @Column(name = "title")
+    private String title;
+
     @Column(name = "familyname")
     private String familyName;
 
@@ -54,6 +62,6 @@ public class HsOfficePersonEntity implements HasUuid, Stringifyable {
     @Override
     public String toShortString() {
         return personType + " " +
-                (!StringUtils.isEmpty(tradeName) ? tradeName : (familyName + ", " + givenName));
+                (!StringUtils.isEmpty(tradeName) ? tradeName : (StringUtils.isEmpty(salutation) ? "" : salutation + " ") + (familyName + ", " + givenName));
     }
 }
diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonEntityPatcher.java b/src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonEntityPatcher.java
index d1d3fa8c..ede3fc03 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonEntityPatcher.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonEntityPatcher.java
@@ -22,6 +22,8 @@ class HsOfficePersonEntityPatcher implements EntityPatcher<HsOfficePersonPatchRe
                 .map(HsOfficePersonType::valueOf)
                 .ifPresent(entity::setPersonType);
         OptionalFromJson.of(resource.getTradeName()).ifPresent(entity::setTradeName);
+        OptionalFromJson.of(resource.getSalutation()).ifPresent(entity::setSalutation);
+        OptionalFromJson.of(resource.getTitle()).ifPresent(entity::setTitle);
         OptionalFromJson.of(resource.getFamilyName()).ifPresent(entity::setFamilyName);
         OptionalFromJson.of(resource.getGivenName()).ifPresent(entity::setGivenName);
     }
diff --git a/src/main/resources/api-definition/hs-office/hs-office-person-schemas.yaml b/src/main/resources/api-definition/hs-office/hs-office-person-schemas.yaml
index 3e651feb..63fc3258 100644
--- a/src/main/resources/api-definition/hs-office/hs-office-person-schemas.yaml
+++ b/src/main/resources/api-definition/hs-office/hs-office-person-schemas.yaml
@@ -23,6 +23,10 @@ components:
                     $ref: '#/components/schemas/HsOfficePersonType'
                 tradeName:
                     type: string
+                salutation:
+                    type: string
+                title:
+                    type: string
                 givenName:
                     type: string
                 familyName:
@@ -35,6 +39,10 @@ components:
                     $ref: '#/components/schemas/HsOfficePersonType'
                 tradeName:
                     type: string
+                salutation:
+                    type: string
+                title:
+                    type: string
                 givenName:
                     type: string
                 familyName:
@@ -51,6 +59,12 @@ components:
                 tradeName:
                     type: string
                     nullable: true
+                salutation:
+                    type: string
+                    nullable: true
+                title:
+                    type: string
+                    nullable: true
                 givenName:
                     type: string
                     nullable: true
diff --git a/src/main/resources/db/changelog/210-hs-office-person.sql b/src/main/resources/db/changelog/210-hs-office-person.sql
index 6a331277..899192fd 100644
--- a/src/main/resources/db/changelog/210-hs-office-person.sql
+++ b/src/main/resources/db/changelog/210-hs-office-person.sql
@@ -19,6 +19,8 @@ create table if not exists hs_office_person
     uuid           uuid unique references RbacObject (uuid) initially deferred,
     personType     HsOfficePersonType not null,
     tradeName      varchar(96),
+    salutation     varchar(30),
+    title          varchar(20),
     givenName      varchar(48),
     familyName     varchar(48)
 );