add P- in dependent tests

build.gradle

@@ -118,8 +118,8 @@ openapiProcessor {
     springRoot {
         processorName 'spring'
         processor 'io.openapiprocessor:openapi-processor-spring:2022.5'
-        apiPath "$projectDir/src/main/resources/api-definition.yaml"
-        mapping "$projectDir/src/main/resources/api-mappings.yaml"
+        apiPath "$projectDir/src/main/resources/api-definition/api-definition.yaml"
+        mapping "$projectDir/src/main/resources/api-definition/api-mappings.yaml"
         targetDir "$buildDir/generated/sources/openapi-javax"
         showWarnings true
         openApiNullable true

doc/hs-office-data-structure.md

@@ -64,7 +64,7 @@ classDiagram
     }
 
     class partner-MeierGmbH {
-        +Numeric partnerNumber: 12345
+        +Numeric partnerNumber: P-12345
         +Relation partnerRel
     }
     partner-MeierGmbH *-- rel-MeierGmbH

src/main/java/net/hostsharing/hsadminng/hs/booking/debitor/HsBookingDebitorEntity.java

@@ -5,8 +5,8 @@ import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import net.hostsharing.hsadminng.errors.DisplayAs;
-import net.hostsharing.hsadminng.stringify.Stringify;
-import net.hostsharing.hsadminng.stringify.Stringifyable;
+import net.hostsharing.hsadminng.repr.Stringify;
+import net.hostsharing.hsadminng.repr.Stringifyable;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -14,7 +14,7 @@ import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import java.util.UUID;
 
-import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
+import static net.hostsharing.hsadminng.repr.Stringify.stringify;
 
 // a partial HsOfficeDebitorEntity to reduce the number of SQL queries to load the entity
 @Entity

src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItem.java

@@ -15,8 +15,8 @@ import net.hostsharing.hsadminng.hs.booking.project.HsBookingProjectRealEntity;
 import net.hostsharing.hsadminng.hs.validation.PropertiesProvider;
 import net.hostsharing.hsadminng.mapper.PatchableMapWrapper;
 import net.hostsharing.hsadminng.persistence.BaseEntity;
-import net.hostsharing.hsadminng.stringify.Stringify;
-import net.hostsharing.hsadminng.stringify.Stringifyable;
+import net.hostsharing.hsadminng.repr.Stringify;
+import net.hostsharing.hsadminng.repr.Stringifyable;
 import org.hibernate.annotations.Type;
 
 import jakarta.persistence.CascadeType;
@@ -45,7 +45,7 @@ import static java.util.Optional.ofNullable;
 import static net.hostsharing.hsadminng.mapper.PostgresDateRange.lowerInclusiveFromPostgresDateRange;
 import static net.hostsharing.hsadminng.mapper.PostgresDateRange.toPostgresDateRange;
 import static net.hostsharing.hsadminng.mapper.PostgresDateRange.upperInclusiveFromPostgresDateRange;
-import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
+import static net.hostsharing.hsadminng.repr.Stringify.stringify;
 
 @MappedSuperclass
 @Getter

src/main/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProject.java

@@ -4,14 +4,14 @@ import lombok.*;
 import lombok.experimental.SuperBuilder;
 import net.hostsharing.hsadminng.hs.booking.debitor.HsBookingDebitorEntity;
 import net.hostsharing.hsadminng.persistence.BaseEntity;
-import net.hostsharing.hsadminng.stringify.Stringify;
-import net.hostsharing.hsadminng.stringify.Stringifyable;
+import net.hostsharing.hsadminng.repr.Stringify;
+import net.hostsharing.hsadminng.repr.Stringifyable;
 
 import jakarta.persistence.*;
 import java.util.UUID;
 
 import static java.util.Optional.ofNullable;
-import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
+import static net.hostsharing.hsadminng.repr.Stringify.stringify;
 
 @MappedSuperclass
 @Getter

src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAsset.java

@@ -15,8 +15,8 @@ import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRealEntity;
 import net.hostsharing.hsadminng.hs.validation.PropertiesProvider;
 import net.hostsharing.hsadminng.mapper.PatchableMapWrapper;
 import net.hostsharing.hsadminng.persistence.BaseEntity;
-import net.hostsharing.hsadminng.stringify.Stringify;
-import net.hostsharing.hsadminng.stringify.Stringifyable;
+import net.hostsharing.hsadminng.repr.Stringify;
+import net.hostsharing.hsadminng.repr.Stringifyable;
 import org.hibernate.annotations.Type;
 
 import jakarta.persistence.CascadeType;
@@ -42,7 +42,7 @@ import java.util.Optional;
 import java.util.UUID;
 
 import static java.util.Collections.emptyMap;
-import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
+import static net.hostsharing.hsadminng.repr.Stringify.stringify;
 
 @MappedSuperclass
 @Getter

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

@@ -5,8 +5,8 @@ import lombok.experimental.FieldNameConstants;
 import net.hostsharing.hsadminng.errors.DisplayAs;
 import net.hostsharing.hsadminng.persistence.BaseEntity;
 import net.hostsharing.hsadminng.rbac.generator.RbacView;
-import net.hostsharing.hsadminng.stringify.Stringify;
-import net.hostsharing.hsadminng.stringify.Stringifyable;
+import net.hostsharing.hsadminng.repr.Stringify;
+import net.hostsharing.hsadminng.repr.Stringifyable;
 
 import jakarta.persistence.*;
 import java.io.IOException;
@@ -16,7 +16,7 @@ import static net.hostsharing.hsadminng.rbac.generator.RbacView.*;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.*;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.RbacSubjectReference.UserRole.CREATOR;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.*;
-import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
+import static net.hostsharing.hsadminng.repr.Stringify.stringify;
 
 @Entity
 @Table(schema = "hs_office", name = "bankaccount_rv")

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

@@ -12,8 +12,8 @@ import lombok.experimental.SuperBuilder;
 import net.hostsharing.hsadminng.errors.DisplayAs;
 import net.hostsharing.hsadminng.mapper.PatchableMapWrapper;
 import net.hostsharing.hsadminng.persistence.BaseEntity;
-import net.hostsharing.hsadminng.stringify.Stringify;
-import net.hostsharing.hsadminng.stringify.Stringifyable;
+import net.hostsharing.hsadminng.repr.Stringify;
+import net.hostsharing.hsadminng.repr.Stringifyable;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
@@ -27,7 +27,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
-import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
+import static net.hostsharing.hsadminng.repr.Stringify.stringify;
 
 @MappedSuperclass
 @Getter

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

@@ -10,8 +10,8 @@ import net.hostsharing.hsadminng.errors.DisplayAs;
 import net.hostsharing.hsadminng.hs.office.membership.HsOfficeMembershipEntity;
 import net.hostsharing.hsadminng.persistence.BaseEntity;
 import net.hostsharing.hsadminng.rbac.generator.RbacView;
-import net.hostsharing.hsadminng.stringify.Stringify;
-import net.hostsharing.hsadminng.stringify.Stringifyable;
+import net.hostsharing.hsadminng.repr.Stringify;
+import net.hostsharing.hsadminng.repr.Stringifyable;
 import org.hibernate.annotations.GenericGenerator;
 
 import jakarta.persistence.*;
@@ -31,7 +31,7 @@ import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.ADMIN;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.AGENT;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.SQL.directlyFetchedByDependsOnColumn;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
-import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
+import static net.hostsharing.hsadminng.repr.Stringify.stringify;
 
 @Entity
 @Table(schema = "hs_office", name = "coopassettx_rv")

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

@@ -10,8 +10,8 @@ import net.hostsharing.hsadminng.hs.office.membership.HsOfficeMembershipEntity;
 import net.hostsharing.hsadminng.rbac.generator.RbacView;
 import net.hostsharing.hsadminng.persistence.BaseEntity;
 import net.hostsharing.hsadminng.rbac.generator.RbacView.SQL;
-import net.hostsharing.hsadminng.stringify.Stringify;
-import net.hostsharing.hsadminng.stringify.Stringifyable;
+import net.hostsharing.hsadminng.repr.Stringify;
+import net.hostsharing.hsadminng.repr.Stringifyable;
 
 import jakarta.persistence.*;
 import java.io.IOException;
@@ -29,7 +29,7 @@ import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.ADMIN;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.AGENT;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.SQL.directlyFetchedByDependsOnColumn;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
-import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
+import static net.hostsharing.hsadminng.repr.Stringify.stringify;
 
 @Entity
 @Table(schema = "hs_office", name = "coopsharetx_rv")

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

@@ -14,8 +14,8 @@ import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRbacEntity;
 import net.hostsharing.hsadminng.persistence.BaseEntity;
 import net.hostsharing.hsadminng.rbac.generator.RbacView;
 import net.hostsharing.hsadminng.rbac.generator.RbacView.SQL;
-import net.hostsharing.hsadminng.stringify.Stringify;
-import net.hostsharing.hsadminng.stringify.Stringifyable;
+import net.hostsharing.hsadminng.repr.Stringify;
+import net.hostsharing.hsadminng.repr.Stringifyable;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.JoinFormula;
 import org.hibernate.annotations.NotFound;
@@ -51,7 +51,7 @@ import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.*;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.SQL.directlyFetchedByDependsOnColumn;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.SQL.fetchedBySql;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
-import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
+import static net.hostsharing.hsadminng.repr.Stringify.stringify;
 
 @Entity
 @Table(schema = "hs_office", name = "debitor_rv")

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

@@ -13,8 +13,8 @@ import net.hostsharing.hsadminng.persistence.BaseEntity;
 import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerEntity;
 import net.hostsharing.hsadminng.rbac.generator.RbacView;
 import net.hostsharing.hsadminng.rbac.generator.RbacView.SQL;
-import net.hostsharing.hsadminng.stringify.Stringify;
-import net.hostsharing.hsadminng.stringify.Stringifyable;
+import net.hostsharing.hsadminng.repr.Stringify;
+import net.hostsharing.hsadminng.repr.Stringifyable;
 import org.hibernate.annotations.Type;
 
 import jakarta.persistence.Column;
@@ -53,7 +53,7 @@ import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.OWNER;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.TENANT;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.SQL.fetchedBySql;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
-import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
+import static net.hostsharing.hsadminng.repr.Stringify.stringify;
 
 @Entity
 @Table(schema = "hs_office", name = "membership_rv")

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

@@ -27,6 +27,7 @@ import java.util.List;
 import java.util.UUID;
 
 import static net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationType.EX_PARTNER;
+import static net.hostsharing.hsadminng.repr.TaggedNumber.cropTag;
 
 @RestController
 
@@ -150,7 +151,7 @@ public class HsOfficePartnerController implements HsOfficePartnersApi {
 
     private HsOfficePartnerEntity createPartnerEntity(final HsOfficePartnerInsertResource body) {
         final var entityToSave = new HsOfficePartnerEntity();
-        entityToSave.setPartnerNumber(body.getPartnerNumber());
+        entityToSave.setPartnerNumber(cropTag(HsOfficePartnerEntity.PARTNER_NUMBER_TAG, body.getPartnerNumber()));
         entityToSave.setPartnerRel(persistPartnerRel(body.getPartnerRel()));
         entityToSave.setDetails(mapper.map(body.getDetails(), HsOfficePartnerDetailsEntity.class));
         return entityToSave;

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

@@ -5,8 +5,8 @@ import net.hostsharing.hsadminng.errors.DisplayAs;
 import net.hostsharing.hsadminng.persistence.BaseEntity;
 import net.hostsharing.hsadminng.rbac.generator.RbacView;
 import net.hostsharing.hsadminng.rbac.generator.RbacView.SQL;
-import net.hostsharing.hsadminng.stringify.Stringify;
-import net.hostsharing.hsadminng.stringify.Stringifyable;
+import net.hostsharing.hsadminng.repr.Stringify;
+import net.hostsharing.hsadminng.repr.Stringifyable;
 
 import jakarta.persistence.*;
 import java.io.IOException;
@@ -17,7 +17,7 @@ import static net.hostsharing.hsadminng.rbac.generator.RbacView.GLOBAL;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.*;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.*;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
-import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
+import static net.hostsharing.hsadminng.repr.Stringify.stringify;
 
 @Entity
 @Table(schema = "hs_office", name = "partner_details_rv")

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

@@ -14,8 +14,8 @@ import net.hostsharing.hsadminng.persistence.BaseEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelation;
 import net.hostsharing.hsadminng.rbac.generator.RbacView;
 import net.hostsharing.hsadminng.rbac.generator.RbacView.SQL;
-import net.hostsharing.hsadminng.stringify.Stringify;
-import net.hostsharing.hsadminng.stringify.Stringifyable;
+import net.hostsharing.hsadminng.repr.Stringify;
+import net.hostsharing.hsadminng.repr.Stringifyable;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
@@ -33,7 +33,7 @@ import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.*;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.SQL.directlyFetchedByDependsOnColumn;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
 import static java.util.Optional.ofNullable;
-import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
+import static net.hostsharing.hsadminng.repr.Stringify.stringify;
 
 @Entity
 @Table(schema = "hs_office", name = "partner_rv")

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

@@ -6,8 +6,8 @@ import net.hostsharing.hsadminng.errors.DisplayAs;
 import net.hostsharing.hsadminng.persistence.BaseEntity;
 import net.hostsharing.hsadminng.rbac.generator.RbacView;
 import net.hostsharing.hsadminng.rbac.generator.RbacView.SQL;
-import net.hostsharing.hsadminng.stringify.Stringify;
-import net.hostsharing.hsadminng.stringify.Stringifyable;
+import net.hostsharing.hsadminng.repr.Stringify;
+import net.hostsharing.hsadminng.repr.Stringifyable;
 import org.apache.commons.lang3.StringUtils;
 
 import jakarta.persistence.*;
@@ -19,7 +19,7 @@ import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.*;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.RbacSubjectReference.UserRole.CREATOR;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.*;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
-import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
+import static net.hostsharing.hsadminng.repr.Stringify.stringify;
 
 // TODO.refa: split HsOfficePersonEntity into Real+Rbac-Entity
 @Entity

src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelation.java

@@ -6,14 +6,14 @@ import lombok.experimental.SuperBuilder;
 import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRealEntity;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity;
 import net.hostsharing.hsadminng.persistence.BaseEntity;
-import net.hostsharing.hsadminng.stringify.Stringify;
-import net.hostsharing.hsadminng.stringify.Stringifyable;
+import net.hostsharing.hsadminng.repr.Stringify;
+import net.hostsharing.hsadminng.repr.Stringifyable;
 
 import jakarta.persistence.*;
 import jakarta.persistence.Column;
 import java.util.UUID;
 
-import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
+import static net.hostsharing.hsadminng.repr.Stringify.stringify;
 
 @MappedSuperclass
 @NoArgsConstructor(access = AccessLevel.PROTECTED)

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

@@ -9,8 +9,8 @@ import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRbacEntity;
 import net.hostsharing.hsadminng.persistence.BaseEntity;
 import net.hostsharing.hsadminng.rbac.generator.RbacView;
-import net.hostsharing.hsadminng.stringify.Stringify;
-import net.hostsharing.hsadminng.stringify.Stringifyable;
+import net.hostsharing.hsadminng.repr.Stringify;
+import net.hostsharing.hsadminng.repr.Stringifyable;
 import org.hibernate.annotations.Type;
 
 import jakarta.persistence.*;
@@ -30,7 +30,7 @@ import static net.hostsharing.hsadminng.rbac.generator.RbacView.RbacSubjectRefer
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.*;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.SQL.*;
 import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
-import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
+import static net.hostsharing.hsadminng.repr.Stringify.stringify;
 
 @Entity
 @Table(schema = "hs_office", name = "sepamandate_rv")

src/main/java/net/hostsharing/hsadminng/repr/Stringify.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.stringify;
+package net.hostsharing.hsadminng.repr;
 
 import net.hostsharing.hsadminng.errors.DisplayAs;
 

src/main/java/net/hostsharing/hsadminng/repr/Stringifyable.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.stringify;
+package net.hostsharing.hsadminng.repr;
 
 public interface Stringifyable {
 

src/main/java/net/hostsharing/hsadminng/repr/TaggedNumber.java

@@ -0,0 +1,15 @@
+package net.hostsharing.hsadminng.repr;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class TaggedNumber {
+
+    public static Integer cropTag(final String tag, final String taggedNumber) {
+        return taggedNumber.startsWith(tag) ? Integer.valueOf(taggedNumber.substring(tag.length())) : invalidTag(tag, taggedNumber);
+    }
+
+    private static Integer invalidTag(final String tag, final String taggedNumber) {
+        throw new IllegalArgumentException("Expected " + tag + "... but got: " + taggedNumber);
+    }
+}

src/main/resources/api-definition/hs-office/hs-office-partner-schemas.yaml

@@ -10,10 +10,10 @@ components:
                     type: string
                     format: uuid
                 partnerNumber:
-                    type: integer
-                    format: int8
-                    minimum: 10000
-                    maximum: 99999
+                    type: string
+                    minLength: 7
+                    maxLength: 7
+                    pattern: 'P-[0-9]{5}'
                 partnerRel:
                     $ref: 'hs-office-relation-schemas.yaml#/components/schemas/HsOfficeRelation'
                 details:
@@ -86,10 +86,10 @@ components:
             type: object
             properties:
                 partnerNumber:
-                    type: integer
-                    format: int8
-                    minimum: 10000
-                    maximum: 99999
+                    type: string
+                    minLength: 7
+                    maxLength: 7
+                    pattern: 'P-[0-9]{5}'
                 partnerRel:
                     $ref: '#/components/schemas/HsOfficePartnerRelInsert'
                 details:

src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorControllerAcceptanceTest.java

@@ -113,7 +113,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
                         "debitorNumber": 1000111,
                         "debitorNumberSuffix": "11",
                         "partner": {
-                          "partnerNumber": 10001,
+                          "partnerNumber": "P-10001",
                           "partnerRel": {
                             "anchor": {
                               "personType": "LEGAL_PERSON",
@@ -168,7 +168,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
                         "debitorNumber": 1000212,
                         "debitorNumberSuffix": "12",
                         "partner": {
-                          "partnerNumber": 10002,
+                          "partnerNumber": "P-10002",
                           "partnerRel": {
                             "anchor": {"tradeName": "Hostsharing eG"},
                             "holder": {"tradeName": "Second e.K."},
@@ -202,7 +202,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
                         "debitorNumber": 1000313,
                         "debitorNumberSuffix": "13",
                         "partner": {
-                          "partnerNumber": 10003,
+                          "partnerNumber": "P-10003",
                           "partnerRel": {
                             "anchor": {"tradeName": "Hostsharing eG"},
                             "holder": {"tradeName": "Third OHG"},
@@ -245,7 +245,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
                      [
                          {
                              "debitorNumber": 1000212,
-                             "partner": { "partnerNumber": 10002 },
+                             "partner": { "partnerNumber": "P-10002" },
                              "debitorRel": {
                                 "contact": { "caption": "second contact" }
                              },
@@ -535,7 +535,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
                     .body("", lenientlyEquals("""
                     {
                         "debitorNumber": 1000111,
-                        "partner": { "partnerNumber": 10001 },
+                        "partner": { "partnerNumber": "P-10001" },
                         "debitorRel": { "contact": { "caption": "first contact" } },
                         "refundBankAccount": null
                     }
@@ -584,7 +584,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
                                 "debitorNumber": 10004${debitorNumberSuffix},
                                 "debitorNumberSuffix": "${debitorNumberSuffix}",
                                 "partner": {
-                                    "partnerNumber": 10004,
+                                    "partnerNumber": "P-10004",
                                     "partnerRel": {
                                         "anchor": { "tradeName": "Hostsharing eG" },
                                         "holder": { "tradeName": "Fourth eG" },

src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipControllerAcceptanceTest.java

@@ -77,7 +77,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
                     .body("", lenientlyEquals("""
                       [
                           {
-                              "partner": { "partnerNumber": 10001 },
+                              "partner": { "partnerNumber": "P-10001" },
                               "memberNumber": 1000101,
                               "memberNumberSuffix": "01",
                               "validFrom": "2022-10-01",
@@ -85,7 +85,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
                               "status": "ACTIVE"
                           },
                           {
-                              "partner": { "partnerNumber": 10002 },
+                              "partner": { "partnerNumber": "P-10002" },
                               "memberNumber": 1000202,
                               "memberNumberSuffix": "02",
                               "validFrom": "2022-10-01",
@@ -93,7 +93,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
                               "status": "ACTIVE"
                           },
                           {
-                              "partner": { "partnerNumber": 10003 },
+                              "partner": { "partnerNumber": "P-10003" },
                               "memberNumber": 1000303,
                               "memberNumberSuffix": "03",
                               "validFrom": "2022-10-01",
@@ -124,7 +124,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
                     .body("", lenientlyEquals("""
                       [
                           {
-                              "partner": { "partnerNumber": 10001 },
+                              "partner": { "partnerNumber": "P-10001" },
                               "memberNumber": 1000101,
                               "memberNumberSuffix": "01",
                               "validFrom": "2022-10-01",
@@ -152,7 +152,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
                     .body("", lenientlyEquals("""
                       [
                           {
-                              "partner": { "partnerNumber": 10002 },
+                              "partner": { "partnerNumber": "P-10002" },
                               "memberNumber": 1000202,
                               "memberNumberSuffix": "02",
                               "validFrom": "2022-10-01",
@@ -195,7 +195,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
                         .statusCode(201)
                         .contentType(ContentType.JSON)
                         .body("uuid", isUuidValid())
-                        .body("partner.partnerNumber", is(10003))
+                        .body("partner.partnerNumber", is("P-10003"))
                         .body("memberNumber", is(expectedMemberNumber))
                         .body("memberNumberSuffix", is(givenMemberSuffix))
                         .body("validFrom", is("2022-10-13"))
@@ -230,7 +230,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
                     .contentType("application/json")
                     .body("", lenientlyEquals("""
                     {
-                         "partner": { "partnerNumber": 10001 },
+                         "partner": { "partnerNumber": "P-10001" },
                          "memberNumber": 1000101,
                          "memberNumberSuffix": "01",
                          "validFrom": "2022-10-01",
@@ -272,7 +272,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
                     .contentType("application/json")
                     .body("", lenientlyEquals("""
                     {
-                         "partner": { "partnerNumber": 10003 },
+                         "partner": { "partnerNumber": "P-10003" },
                          "memberNumber": 1000303,
                          "memberNumberSuffix": "03",
                          "validFrom": "2022-10-01",
@@ -309,7 +309,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
                     .statusCode(200)
                     .contentType(ContentType.JSON)
                     .body("uuid", isUuidValid())
-                    .body("partner.partnerNumber", is(givenMembership.getPartner().getPartnerNumber()))
+                    .body("partner.partnerNumber", is("P-" + givenMembership.getPartner().getPartnerNumber()))
                     .body("memberNumberSuffix", is(givenMembership.getMemberNumberSuffix()))
                     .body("validFrom", is("2022-11-01"))
                     .body("validTo", is("2023-12-31"))

src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerControllerAcceptanceTest.java

@@ -71,11 +71,11 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
                     .contentType("application/json")
                     .body("", lenientlyEquals("""
                         [
-                            { partnerNumber: 10001 },
-                            { partnerNumber: 10002 },
-                            { partnerNumber: 10003 },
-                            { partnerNumber: 10004 },
-                            { partnerNumber: 10010 }
+                            { partnerNumber: "P-10001" },
+                            { partnerNumber: "P-10002" },
+                            { partnerNumber: "P-10003" },
+                            { partnerNumber: "P-10004" },
+                            { partnerNumber: "P-10010" }
                         ]
                         """));
                 // @formatter:on
@@ -100,7 +100,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
                         .contentType(ContentType.JSON)
                         .body("""
                             {
-                                "partnerNumber": "20002",
+                                "partnerNumber": "P-20002",
                                 "partnerRel": {
                                      "anchor.uuid": "%s",
                                      "holder.uuid": "%s",
@@ -123,7 +123,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
                         .contentType(ContentType.JSON)
                         .body("", lenientlyEquals("""
                         {
-                            "partnerNumber": 20002,
+                            "partnerNumber": "P-20002",
                             "partnerRel": {
                                 "anchor": { "tradeName": "Hostsharing eG" },
                                 "holder": { "tradeName": "Third OHG" },
@@ -159,7 +159,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
                     .contentType(ContentType.JSON)
                     .body("""
                             {
-                                "partnerNumber": "20003",
+                                "partnerNumber": "P-20003",
                                 "partnerRel": {
                                      "anchor.uuid": "%s",
                                      "holder.uuid": "%s",
@@ -197,7 +197,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
                     .contentType(ContentType.JSON)
                     .body("""
                             {
-                                "partnerNumber": "20004",
+                                "partnerNumber": "P-20004",
                                 "partnerRel": {
                                     "anchor.uuid": "%s",
                                     "holder.uuid": "%s",
@@ -247,7 +247,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
                     .contentType("application/json")
                     .body("", lenientlyEquals("""
                     {
-                        "partnerNumber": 10001,
+                        "partnerNumber": "P-10001",
                              "partnerRel": {
                                  "anchor": { "tradeName": "Hostsharing eG" },
                                  "holder": { "tradeName": "First GmbH" },
@@ -320,7 +320,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
                     .contentType(ContentType.JSON)
                     .body("""
                            {
-                               "partnerNumber": "20011",
+                               "partnerNumber": "P-20011",
                                "partnerRel.uuid": "%s",
                                "details": {
                                    "registrationOffice": "Temp Registergericht Aurich",
@@ -339,7 +339,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
                     .contentType(ContentType.JSON)
                     .body("", lenientlyEquals("""
                     {
-                        "partnerNumber": 20011,
+                        "partnerNumber": "P-20011",
                         "partnerRel": {
                             "anchor": { "tradeName": "Hostsharing eG" },
                             "holder": { "tradeName": "Third OHG" },

src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerControllerRestTest.java

@@ -99,7 +99,7 @@ class HsOfficePartnerControllerRestTest {
                             .contentType(MediaType.APPLICATION_JSON)
                             .content("""
                                      {
-                                        "partnerNumber": "20002",
+                                        "partnerNumber": "P-20002",
                                         "partnerRel": {
                                              "anchor.uuid": "%s",
                                              "holder.uuid": "%s",
@@ -136,7 +136,7 @@ class HsOfficePartnerControllerRestTest {
                             .contentType(MediaType.APPLICATION_JSON)
                             .content("""
                                      {
-                                        "partnerNumber": "20002",
+                                        "partnerNumber": "P-20002",
                                         "partnerRel": {
                                              "anchor.uuid": "%s",
                                              "holder.uuid": "%s",

src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/HsOfficeScenarioTests.java

@@ -58,7 +58,7 @@ class HsOfficeScenarioTests extends ScenarioTest {
     @Produces(explicitly = "Partner: P-31010 - Test AG", implicitly = {"Person: Test AG", "Contact: Test AG - Hamburg"})
     void shouldCreateLegalPersonAsPartner() {
         new CreatePartner(this)
-                .given("partnerNumber", 31010)
+                .given("partnerNumber", "P-31010")
                 .given("personType", "LEGAL_PERSON")
                 .given("tradeName", "Test AG")
                 .given("contactCaption", "Test AG - Hamburg")
@@ -80,7 +80,7 @@ class HsOfficeScenarioTests extends ScenarioTest {
     @Produces(explicitly = "Partner: P-31011 - Michelle Matthieu", implicitly = {"Person: Michelle Matthieu", "Contact: Michelle Matthieu"})
     void shouldCreateNaturalPersonAsPartner() {
         new CreatePartner(this)
-                .given("partnerNumber", 31011)
+                .given("partnerNumber", "P-31011")
                 .given("personType", "NATURAL_PERSON")
                 .given("givenName", "Michelle")
                 .given("familyName", "Matthieu")
@@ -148,7 +148,7 @@ class HsOfficeScenarioTests extends ScenarioTest {
     @Order(1090)
     void shouldDeletePartner() {
         new DeletePartner(this)
-                .given("partnerNumber", 31020)
+                .given("partnerNumber", "P-31020")
                 .doRun();
     }
 

src/test/java/net/hostsharing/hsadminng/rbac/test/StringifyUnitTest.java

@@ -2,13 +2,13 @@ package net.hostsharing.hsadminng.rbac.test;
 
 import lombok.*;
 import lombok.experimental.FieldNameConstants;
-import net.hostsharing.hsadminng.stringify.Stringify;
-import net.hostsharing.hsadminng.stringify.Stringifyable;
+import net.hostsharing.hsadminng.repr.Stringify;
+import net.hostsharing.hsadminng.repr.Stringifyable;
 import org.junit.jupiter.api.Test;
 
 import java.util.UUID;
 
-import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
+import static net.hostsharing.hsadminng.repr.Stringify.stringify;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class StringifyUnitTest {

src/test/java/net/hostsharing/hsadminng/repr/TaggedNumberUnitTest.java

@@ -0,0 +1,22 @@
+package net.hostsharing.hsadminng.repr;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
+
+class TaggedNumberUnitTest {
+
+    @Test
+    void cropsProperTag() {
+        assertThat(TaggedNumber.cropTag("P-", "P-12345")).isEqualTo(12345);
+    }
+
+    @Test
+    void throwsExceptionForImproperTag() {
+        final var exception = catchThrowable(() -> TaggedNumber.cropTag("P-", "X-12345"));
+        assertThat(exception).isInstanceOf(IllegalArgumentException.class);
+        assertThat(exception.getMessage()).isEqualTo("Expected P-... but got: X-12345");
+    }
+
+}