initial data import for hs-office tables (db-migration #10)

Co-authored-by: Michael Hoennig <michael@hoennig.de>
Co-authored-by: Timotheus Pokorra <timotheus.pokorra@hostsharing.net>
Reviewed-on: https://dev.hostsharing.net/hostsharing/hs.hsadmin.ng/pulls/10
Reviewed-by: Timotheus Pokorra <timotheus.pokorra@hostsharing.net>

src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountEntity.java

@@ -3,6 +3,7 @@ package net.hostsharing.hsadminng.hs.office.bankaccount;
 import lombok.*;
 import lombok.experimental.FieldNameConstants;
 import net.hostsharing.hsadminng.errors.DisplayName;
+import net.hostsharing.hsadminng.hs.office.migration.HasUuid;
 import net.hostsharing.hsadminng.stringify.Stringify;
 import net.hostsharing.hsadminng.stringify.Stringifyable;
 
@@ -23,7 +24,7 @@ import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
 @AllArgsConstructor
 @FieldNameConstants
 @DisplayName("BankAccount")
-public class HsOfficeBankAccountEntity implements Stringifyable {
+public class HsOfficeBankAccountEntity implements HasUuid, Stringifyable {
 
     private static Stringify<HsOfficeBankAccountEntity> toString = stringify(HsOfficeBankAccountEntity.class, "bankAccount")
             .withProp(Fields.holder, HsOfficeBankAccountEntity::getHolder)

src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactEntity.java

@@ -3,6 +3,7 @@ package net.hostsharing.hsadminng.hs.office.contact;
 import lombok.*;
 import lombok.experimental.FieldNameConstants;
 import net.hostsharing.hsadminng.errors.DisplayName;
+import net.hostsharing.hsadminng.hs.office.migration.HasUuid;
 import net.hostsharing.hsadminng.stringify.Stringify;
 import net.hostsharing.hsadminng.stringify.Stringifyable;
 import org.hibernate.annotations.GenericGenerator;
@@ -21,7 +22,7 @@ import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
 @AllArgsConstructor
 @FieldNameConstants
 @DisplayName("Contact")
-public class HsOfficeContactEntity implements Stringifyable {
+public class HsOfficeContactEntity implements Stringifyable, HasUuid {
 
     private static Stringify<HsOfficeContactEntity> toString = stringify(HsOfficeContactEntity.class, "contact")
             .withProp(Fields.label, HsOfficeContactEntity::getLabel)
@@ -38,10 +39,10 @@ public class HsOfficeContactEntity implements Stringifyable {
     private String postalAddress;
 
     @Column(name = "emailaddresses", columnDefinition = "json")
-    private String emailAddresses;
+    private String emailAddresses; // TODO: check if we can really add multiple. format: ["eins@...", "zwei@..."]
 
     @Column(name = "phonenumbers", columnDefinition = "json")
-    private String phoneNumbers;
+    private String phoneNumbers; // TODO: check if we can really add multiple. format: { "office": "+49 40 12345-10", "fax": "+49 40 12345-05" }
 
     @Override
     public String toString() {

src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionEntity.java

@@ -1,8 +1,10 @@
+
 package net.hostsharing.hsadminng.hs.office.coopassets;
 
 import lombok.*;
 import net.hostsharing.hsadminng.errors.DisplayName;
 import net.hostsharing.hsadminng.hs.office.membership.HsOfficeMembershipEntity;
+import net.hostsharing.hsadminng.hs.office.migration.HasUuid;
 import net.hostsharing.hsadminng.stringify.Stringify;
 import net.hostsharing.hsadminng.stringify.Stringifyable;
 import org.hibernate.annotations.GenericGenerator;
@@ -13,6 +15,7 @@ import java.text.DecimalFormat;
 import java.time.LocalDate;
 import java.util.UUID;
 
+import static java.util.Optional.ofNullable;
 import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
 
 @Entity
@@ -23,14 +26,15 @@ import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
 @NoArgsConstructor
 @AllArgsConstructor
 @DisplayName("CoopAssetsTransaction")
-public class HsOfficeCoopAssetsTransactionEntity implements Stringifyable {
+public class HsOfficeCoopAssetsTransactionEntity implements Stringifyable, HasUuid {
 
     private static Stringify<HsOfficeCoopAssetsTransactionEntity> stringify = stringify(HsOfficeCoopAssetsTransactionEntity.class)
-            .withProp(e -> e.getMembership().getMemberNumber())
+            .withProp(HsOfficeCoopAssetsTransactionEntity::getMemberNumber)
             .withProp(HsOfficeCoopAssetsTransactionEntity::getValueDate)
             .withProp(HsOfficeCoopAssetsTransactionEntity::getTransactionType)
             .withProp(HsOfficeCoopAssetsTransactionEntity::getAssetValue)
             .withProp(HsOfficeCoopAssetsTransactionEntity::getReference)
+            .withProp(HsOfficeCoopAssetsTransactionEntity::getComment)
             .withSeparator(", ")
             .quotedValues(false);
 
@@ -54,11 +58,16 @@ public class HsOfficeCoopAssetsTransactionEntity implements Stringifyable {
     private BigDecimal assetValue;
 
     @Column(name = "reference")
-    private String reference;
+    private String reference; // TODO: what is this for?
 
     @Column(name = "comment")
     private String comment;
 
+
+    public Integer getMemberNumber() {
+        return ofNullable(membership).map(HsOfficeMembershipEntity::getMemberNumber).orElse(null);
+    }
+
     @Override
     public String toString() {
         return stringify.apply(this);
@@ -66,6 +75,6 @@ public class HsOfficeCoopAssetsTransactionEntity implements Stringifyable {
 
     @Override
     public String toShortString() {
-        return membership.getMemberNumber() + new DecimalFormat("+0.00").format(assetValue);
+        return "%s%+1.2f".formatted(getMemberNumber(), assetValue);
     }
 }

src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionType.java

@@ -1,5 +1,12 @@
 package net.hostsharing.hsadminng.hs.office.coopassets;
 
 public enum HsOfficeCoopAssetsTransactionType {
-    ADJUSTMENT, DEPOSIT, DISBURSAL, TRANSFER, ADOPTION, CLEARING, LOSS
+    ADJUSTMENT, // correction of wrong bookings
+    DEPOSIT,    // payment received from member after signing shares, >0
+    DISBURSAL,  // payment send to member after cancellation of shares, <0
+    TRANSFER,   // transferring shares to another member, <0
+    ADOPTION,   // receiving shares from another member, >0
+    CLEARING,   // settlement with members dept, <0
+    LOSS,       // assignment of balance sheet loss in case of cancellation of shares, <0
+    LIMITATION  // limitation period was reached after impossible disbursal, <0
 }

src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionEntity.java

@@ -3,6 +3,7 @@ package net.hostsharing.hsadminng.hs.office.coopshares;
 import lombok.*;
 import net.hostsharing.hsadminng.errors.DisplayName;
 import net.hostsharing.hsadminng.hs.office.membership.HsOfficeMembershipEntity;
+import net.hostsharing.hsadminng.hs.office.migration.HasUuid;
 import net.hostsharing.hsadminng.stringify.Stringify;
 import net.hostsharing.hsadminng.stringify.Stringifyable;
 
@@ -10,6 +11,7 @@ import jakarta.persistence.*;
 import java.time.LocalDate;
 import java.util.UUID;
 
+import static java.util.Optional.ofNullable;
 import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
 
 @Entity
@@ -20,14 +22,15 @@ import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
 @NoArgsConstructor
 @AllArgsConstructor
 @DisplayName("CoopShareTransaction")
-public class HsOfficeCoopSharesTransactionEntity implements Stringifyable {
+public class HsOfficeCoopSharesTransactionEntity implements Stringifyable, HasUuid {
 
     private static Stringify<HsOfficeCoopSharesTransactionEntity> stringify = stringify(HsOfficeCoopSharesTransactionEntity.class)
-            .withProp(e -> e.getMembership().getMemberNumber())
+            .withProp(HsOfficeCoopSharesTransactionEntity::getMemberNumber)
             .withProp(HsOfficeCoopSharesTransactionEntity::getValueDate)
             .withProp(HsOfficeCoopSharesTransactionEntity::getTransactionType)
             .withProp(HsOfficeCoopSharesTransactionEntity::getShareCount)
             .withProp(HsOfficeCoopSharesTransactionEntity::getReference)
+            .withProp(HsOfficeCoopSharesTransactionEntity::getComment)
             .withSeparator(", ")
             .quotedValues(false);
 
@@ -50,7 +53,7 @@ public class HsOfficeCoopSharesTransactionEntity implements Stringifyable {
     private int shareCount;
 
     @Column(name = "reference")
-    private String reference;
+    private String reference; // TODO: what is this for?
 
     @Column(name = "comment")
     private String comment;
@@ -60,8 +63,12 @@ public class HsOfficeCoopSharesTransactionEntity implements Stringifyable {
         return stringify.apply(this);
     }
 
+    public Integer getMemberNumber() {
+        return ofNullable(membership).map(HsOfficeMembershipEntity::getMemberNumber).orElse(null);
+    }
+
     @Override
     public String toShortString() {
-        return "%s%+d".formatted(membership.getMemberNumber(), shareCount);
+        return "%s%+d".formatted(getMemberNumber(), shareCount);
     }
 }

src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionType.java

@@ -1,5 +1,7 @@
 package net.hostsharing.hsadminng.hs.office.coopshares;
 
 public enum HsOfficeCoopSharesTransactionType {
-    ADJUSTMENT, SUBSCRIPTION, CANCELLATION;
+    ADJUSTMENT,     // correction of wrong bookings
+    SUBSCRIPTION,   // shares signed, e.g. with the declaration of accession, >0
+    CANCELLATION;   // shares terminated, e.g. when a membership is resigned, <0
 }

src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntity.java

@@ -4,12 +4,14 @@ import lombok.*;
 import net.hostsharing.hsadminng.errors.DisplayName;
 import net.hostsharing.hsadminng.hs.office.bankaccount.HsOfficeBankAccountEntity;
 import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactEntity;
+import net.hostsharing.hsadminng.hs.office.migration.HasUuid;
 import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerEntity;
 import net.hostsharing.hsadminng.stringify.Stringify;
 import net.hostsharing.hsadminng.stringify.Stringifyable;
 import org.hibernate.annotations.GenericGenerator;
 
 import jakarta.persistence.*;
+import java.util.Optional;
 import java.util.UUID;
 
 import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
@@ -22,12 +24,16 @@ import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
 @NoArgsConstructor
 @AllArgsConstructor
 @DisplayName("Debitor")
-public class HsOfficeDebitorEntity implements Stringifyable {
+public class HsOfficeDebitorEntity implements HasUuid, Stringifyable {
 
+    // TODO: I would rather like to generate something matching this example:
+    //  debitor(1234500: Test AG, tes)
+    // maybe remove withSepararator (always use ', ') and add withBusinessIdProp (with ': ' afterwards)?
     private static Stringify<HsOfficeDebitorEntity> stringify =
             stringify(HsOfficeDebitorEntity.class, "debitor")
                     .withProp(HsOfficeDebitorEntity::getDebitorNumber)
                     .withProp(HsOfficeDebitorEntity::getPartner)
+                    .withProp(HsOfficeDebitorEntity::getDefaultPrefix)
                     .withSeparator(": ")
                     .quotedValues(false);
 
@@ -40,12 +46,15 @@ public class HsOfficeDebitorEntity implements Stringifyable {
     @JoinColumn(name = "partneruuid")
     private HsOfficePartnerEntity partner;
 
-    @Column(name = "debitornumber")
-    private Integer debitorNumber;
+    @Column(name = "debitornumbersuffix", columnDefinition = "numeric(2)")
+    private Byte debitorNumberSuffix; // TODO maybe rather as a formatted String?
 
     @ManyToOne
     @JoinColumn(name = "billingcontactuuid")
-    private HsOfficeContactEntity billingContact;
+    private HsOfficeContactEntity billingContact; // TODO: migrate to billingPerson
+
+    @Column(name = "billable", nullable = false)
+    private Boolean billable; // not a primitive because otherwise the default would be false
 
     @Column(name = "vatid")
     private String vatId;
@@ -56,10 +65,34 @@ public class HsOfficeDebitorEntity implements Stringifyable {
     @Column(name = "vatbusiness")
     private boolean vatBusiness;
 
+    @Column(name = "vatreversecharge")
+    private boolean vatReverseCharge;
+
     @ManyToOne
     @JoinColumn(name = "refundbankaccountuuid")
     private HsOfficeBankAccountEntity refundBankAccount;
 
+    @Column(name = "defaultprefix", columnDefinition = "char(3) not null")
+    private String defaultPrefix;
+
+    public String getDebitorNumberString() {
+        // TODO: refactor
+        if (partner.getDebitorNumberPrefix() == null ) {
+            if (debitorNumberSuffix == null) {
+                return null;
+            }
+            return String.format("%02d", debitorNumberSuffix);
+        }
+        if (debitorNumberSuffix == null) {
+            return partner.getDebitorNumberPrefix() + "??";
+        }
+        return partner.getDebitorNumberPrefix() + String.format("%02d", debitorNumberSuffix);
+    }
+
+    public Integer getDebitorNumber() {
+        return Optional.ofNullable(getDebitorNumberString()).map(Integer::parseInt).orElse(null);
+    }
+
     @Override
     public String toString() {
         return stringify.apply(this);
@@ -67,6 +100,6 @@ public class HsOfficeDebitorEntity implements Stringifyable {
 
     @Override
     public String toShortString() {
-        return debitorNumber.toString();
+        return getDebitorNumberString();
     }
 }

src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntityPatcher.java

@@ -1,11 +1,13 @@
 package net.hostsharing.hsadminng.hs.office.debitor;
 
+import net.hostsharing.hsadminng.hs.office.bankaccount.HsOfficeBankAccountEntity;
 import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactEntity;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeDebitorPatchResource;
 import net.hostsharing.hsadminng.mapper.EntityPatcher;
 import net.hostsharing.hsadminng.mapper.OptionalFromJson;
 
 import jakarta.persistence.EntityManager;
+import java.util.Optional;
 
 class HsOfficeDebitorEntityPatcher implements EntityPatcher<HsOfficeDebitorPatchResource> {
 
@@ -25,11 +27,18 @@ class HsOfficeDebitorEntityPatcher implements EntityPatcher<HsOfficeDebitorPatch
             verifyNotNull(newValue, "billingContact");
             entity.setBillingContact(em.getReference(HsOfficeContactEntity.class, newValue));
         });
+        Optional.ofNullable(resource.getBillable()).ifPresent(entity::setBillable);
         OptionalFromJson.of(resource.getVatId()).ifPresent(entity::setVatId);
         OptionalFromJson.of(resource.getVatCountryCode()).ifPresent(entity::setVatCountryCode);
-        OptionalFromJson.of(resource.getVatBusiness()).ifPresent(newValue -> {
-            verifyNotNull(newValue, "vatBusiness");
-            entity.setVatBusiness(newValue);
+        Optional.ofNullable(resource.getVatBusiness()).ifPresent(entity::setVatBusiness);
+        Optional.ofNullable(resource.getVatReverseCharge()).ifPresent(entity::setVatReverseCharge);
+        OptionalFromJson.of(resource.getDefaultPrefix()).ifPresent(newValue -> {
+            verifyNotNull(newValue, "defaultPrefix");
+            entity.setDefaultPrefix(newValue);
+        });
+        OptionalFromJson.of(resource.getRefundBankAccountUuid()).ifPresent(newValue -> {
+            verifyNotNull(newValue, "refundBankAccount");
+            entity.setRefundBankAccount(em.getReference(HsOfficeBankAccountEntity.class, newValue));
         });
     }
 

src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorRepository.java

@@ -13,9 +13,14 @@ public interface HsOfficeDebitorRepository extends Repository<HsOfficeDebitorEnt
 
     @Query("""
             SELECT debitor FROM HsOfficeDebitorEntity debitor
-                WHERE debitor.debitorNumber = :debitorNumber
+                WHERE cast(debitor.partner.debitorNumberPrefix as integer) = :debitorNumberPrefix
+                  AND cast(debitor.debitorNumberSuffix as integer) = :debitorNumberSuffix
                """)
-    List<HsOfficeDebitorEntity> findDebitorByDebitorNumber(int debitorNumber);
+     List<HsOfficeDebitorEntity> findDebitorByDebitorNumber(int debitorNumberPrefix, byte debitorNumberSuffix);
+
+    default List<HsOfficeDebitorEntity> findDebitorByDebitorNumber(int debitorNumber) {
+        return  findDebitorByDebitorNumber( debitorNumber/100, (byte) (debitorNumber%100));
+    }
 
     @Query("""
             SELECT debitor FROM HsOfficeDebitorEntity debitor

src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntity.java

@@ -5,6 +5,7 @@ import com.vladmihalcea.hibernate.type.range.Range;
 import lombok.*;
 import net.hostsharing.hsadminng.errors.DisplayName;
 import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorEntity;
+import net.hostsharing.hsadminng.hs.office.migration.HasUuid;
 import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerEntity;
 import net.hostsharing.hsadminng.stringify.Stringify;
 import net.hostsharing.hsadminng.stringify.Stringifyable;
@@ -27,7 +28,7 @@ import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
 @NoArgsConstructor
 @AllArgsConstructor
 @DisplayName("Membership")
-public class HsOfficeMembershipEntity implements Stringifyable {
+public class HsOfficeMembershipEntity implements HasUuid, Stringifyable {
 
     private static Stringify<HsOfficeMembershipEntity> stringify = stringify(HsOfficeMembershipEntity.class)
             .withProp(HsOfficeMembershipEntity::getMemberNumber)
@@ -52,12 +53,15 @@ public class HsOfficeMembershipEntity implements Stringifyable {
     private HsOfficeDebitorEntity mainDebitor;
 
     @Column(name = "membernumber")
-    private int memberNumber;
+    private int memberNumber; // TODO: migrate to suffix, like debitorNumberSuffix
 
     @Column(name = "validity", columnDefinition = "daterange")
     @Type(PostgreSQLRangeType.class)
     private Range<LocalDate> validity;
 
+    @Column(name = "membershipfeebillable", nullable = false)
+    private Boolean membershipFeeBillable; // not primitive to force setting the value
+
     @Column(name = "reasonfortermination")
     @Enumerated(EnumType.STRING)
     private HsOfficeReasonForTermination reasonForTermination;

src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntityPatcher.java

@@ -37,6 +37,8 @@ public class HsOfficeMembershipEntityPatcher implements EntityPatcher<HsOfficeMe
         Optional.ofNullable(resource.getReasonForTermination())
                 .map(v -> mapper.map(v, HsOfficeReasonForTermination.class))
                 .ifPresent(entity::setReasonForTermination);
+        OptionalFromJson.of(resource.getMembershipFeeBillable()).ifPresent(
+                entity::setMembershipFeeBillable);
     }
 
     private void verifyNotNull(final UUID newValue, final String propertyName) {

src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeReasonForTermination.java

@@ -1,5 +1,5 @@
 package net.hostsharing.hsadminng.hs.office.membership;
 
 public enum HsOfficeReasonForTermination {
-    NONE, CANCELLATION, TRANSFER, DEATH, LIQUIDATION, EXPULSION;
+    NONE, CANCELLATION, TRANSFER, DEATH, LIQUIDATION, EXPULSION, UNKNOWN;
 }

src/main/java/net/hostsharing/hsadminng/hs/office/migration/HasUuid.java

@@ -0,0 +1,7 @@
+package net.hostsharing.hsadminng.hs.office.migration;
+
+import java.util.UUID;
+
+public interface HasUuid {
+    UUID getUuid();
+}

src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerDetailsEntity.java

@@ -2,6 +2,7 @@ package net.hostsharing.hsadminng.hs.office.partner;
 
 import lombok.*;
 import net.hostsharing.hsadminng.errors.DisplayName;
+import net.hostsharing.hsadminng.hs.office.migration.HasUuid;
 import net.hostsharing.hsadminng.stringify.Stringify;
 import net.hostsharing.hsadminng.stringify.Stringifyable;
 
@@ -19,15 +20,16 @@ import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
 @NoArgsConstructor
 @AllArgsConstructor
 @DisplayName("PartnerDetails")
-public class HsOfficePartnerDetailsEntity implements Stringifyable {
+public class HsOfficePartnerDetailsEntity implements HasUuid, Stringifyable {
 
     private static Stringify<HsOfficePartnerDetailsEntity> stringify = stringify(
             HsOfficePartnerDetailsEntity.class,
             "partnerDetails")
             .withProp(HsOfficePartnerDetailsEntity::getRegistrationOffice)
             .withProp(HsOfficePartnerDetailsEntity::getRegistrationNumber)
+            .withProp(HsOfficePartnerDetailsEntity::getBirthPlace)
             .withProp(HsOfficePartnerDetailsEntity::getBirthday)
-            .withProp(HsOfficePartnerDetailsEntity::getBirthday)
+            .withProp(HsOfficePartnerDetailsEntity::getBirthName)
             .withProp(HsOfficePartnerDetailsEntity::getDateOfDeath)
             .withSeparator(", ")
             .quotedValues(false);
@@ -39,6 +41,7 @@ public class HsOfficePartnerDetailsEntity implements Stringifyable {
     private @Column(name = "registrationoffice") String registrationOffice;
     private @Column(name = "registrationnumber") String registrationNumber;
     private @Column(name = "birthname") String birthName;
+    private @Column(name = "birthplace") String birthPlace;
     private @Column(name = "birthday") LocalDate birthday;
     private @Column(name = "dateofdeath") LocalDate dateOfDeath;
 

src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerDetailsEntityPatcher.java

@@ -22,6 +22,7 @@ class HsOfficePartnerDetailsEntityPatcher implements EntityPatcher<HsOfficePartn
             OptionalFromJson.of(resource.getRegistrationOffice()).ifPresent(entity::setRegistrationOffice);
             OptionalFromJson.of(resource.getRegistrationNumber()).ifPresent(entity::setRegistrationNumber);
             OptionalFromJson.of(resource.getBirthday()).ifPresent(entity::setBirthday);
+            OptionalFromJson.of(resource.getBirthPlace()).ifPresent(entity::setBirthPlace);
             OptionalFromJson.of(resource.getBirthName()).ifPresent(entity::setBirthName);
             OptionalFromJson.of(resource.getDateOfDeath()).ifPresent(entity::setDateOfDeath);
         }

src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerEntity.java

@@ -3,6 +3,7 @@ package net.hostsharing.hsadminng.hs.office.partner;
 import lombok.*;
 import net.hostsharing.hsadminng.errors.DisplayName;
 import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactEntity;
+import net.hostsharing.hsadminng.hs.office.migration.HasUuid;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity;
 import net.hostsharing.hsadminng.stringify.Stringify;
 import net.hostsharing.hsadminng.stringify.Stringifyable;
@@ -10,6 +11,7 @@ import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
 import jakarta.persistence.*;
+import java.util.Optional;
 import java.util.UUID;
 
 import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
@@ -22,7 +24,7 @@ import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
 @NoArgsConstructor
 @AllArgsConstructor
 @DisplayName("Partner")
-public class HsOfficePartnerEntity implements Stringifyable {
+public class HsOfficePartnerEntity implements Stringifyable, HasUuid {
 
     private static Stringify<HsOfficePartnerEntity> stringify = stringify(HsOfficePartnerEntity.class, "partner")
             .withProp(HsOfficePartnerEntity::getPerson)
@@ -34,6 +36,9 @@ public class HsOfficePartnerEntity implements Stringifyable {
     @GeneratedValue
     private UUID uuid;
 
+    @Column(name = "debitornumberprefix", columnDefinition = "numeric(5) not null")
+    private Integer debitorNumberPrefix;
+
     @ManyToOne
     @JoinColumn(name = "personuuid", nullable = false)
     private HsOfficePersonEntity person;
@@ -43,7 +48,7 @@ public class HsOfficePartnerEntity implements Stringifyable {
     private HsOfficeContactEntity contact;
 
     @ManyToOne(cascade = { CascadeType.PERSIST, CascadeType.MERGE, CascadeType.DETACH }, optional = true)
-    @JoinColumn(name = "detailsuuid", nullable = true)
+    @JoinColumn(name = "detailsuuid")
     @NotFound(action = NotFoundAction.IGNORE)
     private HsOfficePartnerDetailsEntity details;
 
@@ -54,6 +59,6 @@ public class HsOfficePartnerEntity implements Stringifyable {
 
     @Override
     public String toShortString() {
-        return person.toShortString();
+        return Optional.ofNullable(person).map(HsOfficePersonEntity::toShortString).orElse("<person=null>");
     }
 }

src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonEntity.java

@@ -3,6 +3,7 @@ package net.hostsharing.hsadminng.hs.office.person;
 import lombok.*;
 import lombok.experimental.FieldNameConstants;
 import net.hostsharing.hsadminng.errors.DisplayName;
+import net.hostsharing.hsadminng.hs.office.migration.HasUuid;
 import net.hostsharing.hsadminng.stringify.Stringify;
 import net.hostsharing.hsadminng.stringify.Stringifyable;
 import org.apache.commons.lang3.StringUtils;
@@ -21,7 +22,7 @@ import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
 @AllArgsConstructor
 @FieldNameConstants
 @DisplayName("Person")
-public class HsOfficePersonEntity implements Stringifyable {
+public class HsOfficePersonEntity implements HasUuid, Stringifyable {
 
     private static Stringify<HsOfficePersonEntity> toString = stringify(HsOfficePersonEntity.class, "person")
             .withProp(Fields.personType, HsOfficePersonEntity::getPersonType)
@@ -53,6 +54,7 @@ public class HsOfficePersonEntity implements Stringifyable {
 
     @Override
     public String toShortString() {
-        return !StringUtils.isEmpty(tradeName) ? tradeName : (familyName + ", " + givenName);
+        return personType + " " +
+                (!StringUtils.isEmpty(tradeName) ? tradeName : (familyName + ", " + givenName));
     }
 }

src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonType.java

@@ -1,6 +1,7 @@
 package net.hostsharing.hsadminng.hs.office.person;
 
 public enum HsOfficePersonType {
+    UNKNOWN,
     NATURAL,
     LEGAL,
     SOLE_REPRESENTATION,

src/main/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipEntity.java

@@ -3,8 +3,10 @@ package net.hostsharing.hsadminng.hs.office.relationship;
 import lombok.*;
 import lombok.experimental.FieldNameConstants;
 import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactEntity;
+import net.hostsharing.hsadminng.hs.office.migration.HasUuid;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity;
 import net.hostsharing.hsadminng.stringify.Stringify;
+import net.hostsharing.hsadminng.stringify.Stringifyable;
 
 import jakarta.persistence.*;
 import java.util.UUID;
@@ -19,7 +21,7 @@ import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
 @NoArgsConstructor
 @AllArgsConstructor
 @FieldNameConstants
-public class HsOfficeRelationshipEntity {
+public class HsOfficeRelationshipEntity implements HasUuid, Stringifyable {
 
     private static Stringify<HsOfficeRelationshipEntity> toString = stringify(HsOfficeRelationshipEntity.class, "rel")
             .withProp(Fields.relAnchor, HsOfficeRelationshipEntity::getRelAnchor)
@@ -27,6 +29,11 @@ public class HsOfficeRelationshipEntity {
             .withProp(Fields.relHolder, HsOfficeRelationshipEntity::getRelHolder)
             .withProp(Fields.contact, HsOfficeRelationshipEntity::getContact);
 
+    private static Stringify<HsOfficeRelationshipEntity> toShortString = stringify(HsOfficeRelationshipEntity.class, "rel")
+            .withProp(Fields.relAnchor, HsOfficeRelationshipEntity::getRelAnchor)
+            .withProp(Fields.relType, HsOfficeRelationshipEntity::getRelType)
+            .withProp(Fields.relHolder, HsOfficeRelationshipEntity::getRelHolder);
+
     @Id
     @GeneratedValue
     private UUID uuid;
@@ -51,4 +58,9 @@ public class HsOfficeRelationshipEntity {
     public String toString() {
         return toString.apply(this);
     }
+
+    @Override
+    public String toShortString() {
+        return toShortString.apply(this);
+    }
 }

src/main/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipType.java

@@ -1,8 +1,10 @@
 package net.hostsharing.hsadminng.hs.office.relationship;
 
 public enum HsOfficeRelationshipType {
-    SOLE_AGENT,
-    JOINT_AGENT,
-    ACCOUNTING_CONTACT,
-    TECHNICAL_CONTACT
+    UNKNOWN,
+    EX_PARTNER,
+    REPRESENTATIVE,
+    VIP_CONTACT,
+    ACCOUNTING,
+    OPERATIONS
 }

src/main/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateEntity.java

@@ -6,6 +6,7 @@ import lombok.*;
 import net.hostsharing.hsadminng.errors.DisplayName;
 import net.hostsharing.hsadminng.hs.office.bankaccount.HsOfficeBankAccountEntity;
 import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorEntity;
+import net.hostsharing.hsadminng.hs.office.migration.HasUuid;
 import net.hostsharing.hsadminng.stringify.Stringify;
 import net.hostsharing.hsadminng.stringify.Stringifyable;
 import org.hibernate.annotations.Type;
@@ -25,7 +26,7 @@ import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
 @NoArgsConstructor
 @AllArgsConstructor
 @DisplayName("SEPA-Mandate")
-public class HsOfficeSepaMandateEntity implements Stringifyable {
+public class HsOfficeSepaMandateEntity implements Stringifyable, HasUuid {
 
     private static Stringify<HsOfficeSepaMandateEntity> stringify = stringify(HsOfficeSepaMandateEntity.class)
             .withProp(e -> e.getBankAccount().getIban())