build.gradle

@@ -129,7 +129,7 @@ openapiProcessor {
         processor 'io.openapiprocessor:openapi-processor-spring:2022.5'
         apiPath "$projectDir/src/main/resources/api-definition.yaml"
         mapping "$projectDir/src/main/resources/api-mappings.yaml"
-        targetDir "$buildDir/generated/sources/openapi-javax"
+        targetDir "$projectDir/build/generated/sources/openapi-javax"
         showWarnings true
         openApiNullable true
     }
@@ -138,7 +138,7 @@ openapiProcessor {
         processor 'io.openapiprocessor:openapi-processor-spring:2022.5'
         apiPath "$projectDir/src/main/resources/api-definition/rbac/rbac.yaml"
         mapping "$projectDir/src/main/resources/api-definition/rbac/api-mappings.yaml"
-        targetDir "$buildDir/generated/sources/openapi-javax"
+        targetDir "$projectDir/build/generated/sources/openapi-javax"
         showWarnings true
         openApiNullable true
     }
@@ -147,7 +147,7 @@ openapiProcessor {
         processor 'io.openapiprocessor:openapi-processor-spring:2022.5'
         apiPath "$projectDir/src/main/resources/api-definition/test/test.yaml"
         mapping "$projectDir/src/main/resources/api-definition/test/api-mappings.yaml"
-        targetDir "$buildDir/generated/sources/openapi-javax"
+        targetDir "$projectDir/build/generated/sources/openapi-javax"
         showWarnings true
         openApiNullable true
     }
@@ -156,7 +156,7 @@ openapiProcessor {
         processor 'io.openapiprocessor:openapi-processor-spring:2022.5'
         apiPath "$projectDir/src/main/resources/api-definition/hs-office/hs-office.yaml"
         mapping "$projectDir/src/main/resources/api-definition/hs-office/api-mappings.yaml"
-        targetDir "$buildDir/generated/sources/openapi-javax"
+        targetDir "$projectDir/build/generated/sources/openapi-javax"
         showWarnings true
         openApiNullable true
     }

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

@@ -10,7 +10,6 @@ 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;
@@ -29,7 +28,6 @@ public class HsOfficeDebitorEntity implements Stringifyable {
             stringify(HsOfficeDebitorEntity.class, "debitor")
                     .withProp(HsOfficeDebitorEntity::getDebitorNumber)
                     .withProp(HsOfficeDebitorEntity::getPartner)
-                    // TODO: add defaultPrefix?
                     .withSeparator(": ")
                     .quotedValues(false);
 
@@ -61,34 +59,21 @@ 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() {
+    public int getDebitorNumber() {
-        return Optional.ofNullable(getDebitorNumberString()).map(Integer::parseInt).orElse(null);
+        return Integer.parseInt(getDebitorNumberString());
     }
 
+    @Column(name = "defaultprefix", columnDefinition = "char(3) not null")
+    private String defaultPrefix;
+
     @Override
     public String toString() {
         return stringify.apply(this);

src/main/resources/db/changelog/270-hs-office-debitor.sql

@@ -13,8 +13,7 @@ create table hs_office_debitor
     billingContactUuid      uuid not null references hs_office_contact(uuid),
     vatId                   varchar(24), -- TODO.spec: here or in person?
     vatCountryCode          varchar(2),
-    vatBusiness             boolean not null,
+    vatBusiness             boolean not null, -- TODO.spec: more of such?
-    vatReverseCharge        boolean not null,
     refundBankAccountUuid   uuid references hs_office_bankaccount(uuid),
     defaultPrefix           char(3) not null
             constraint check_member_code check (

src/main/resources/db/changelog/273-hs-office-debitor-rbac.sql

@@ -193,7 +193,6 @@ call generateRbacRestrictedView('hs_office_debitor', 'target.debitorNumberSuffix
         vatId = new.vatId,
         vatCountryCode = new.vatCountryCode,
         vatBusiness = new.vatBusiness,
-        vatreversecharge = new.vatreversecharge,
         defaultPrefix = new.defaultPrefix
     $updates$);
 --//

src/main/resources/db/changelog/278-hs-office-debitor-test-data.sql

@@ -38,8 +38,8 @@ begin
     raise notice '- using partner (%): %', relatedPartner.uuid, relatedPartner;
     raise notice '- using billingContact (%): %', relatedContact.uuid, relatedContact;
     insert
-        into hs_office_debitor (uuid, partneruuid, debitornumbersuffix, billable, billingcontactuuid, vatbusiness, vatreversecharge, refundbankaccountuuid, defaultprefix)
+        into hs_office_debitor (uuid, partneruuid, debitornumbersuffix, billable, billingcontactuuid, vatbusiness, refundbankaccountuuid, defaultprefix)
-            values (uuid_generate_v4(), relatedPartner.uuid, debitorNumberSuffix, true, relatedContact.uuid, true, false, relatedBankAccountUuid, defaultPrefix);
+            values (uuid_generate_v4(), relatedPartner.uuid, debitorNumberSuffix, true, relatedContact.uuid, true, relatedBankAccountUuid, defaultPrefix);
 end; $$;
 --//
 

src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeTables.java

@@ -56,6 +56,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * which reads CSV files from the file system.
  */
 
+@Disabled
 @DataJpaTest
 @Import({ Context.class, JpaAttempt.class })
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@@ -105,15 +106,15 @@ public class ImportOfficeTables extends ContextBasedTest {
         assertThat(contacts.toString()).isEqualTo("{}");
         assertThat(debitors.toString()).isEqualToIgnoringWhitespace("""
             {
-                 7=debitor(1000700: null, null),
+                 7=debitor(10007: null, null),
-                10=debitor(1001000: null, null),
+                10=debitor(10010: null, null),
-                12=debitor(1101200: null, null)}
+                12=debitor(11012: null, null)}
             """);
         assertThat(memberships.toString()).isEqualToIgnoringWhitespace("""
             {
-                 7=Membership(10007, null, null, 1000700, [2000-12-06,), NONE),
+                 7=Membership(10007, null, null, 10007, [2000-12-06,), NONE),
-                10=Membership(10010, null, null, 1001000, [2000-12-06,2016-01-01), UNKNOWN), 
+                10=Membership(10010, null, null, 10010, [2000-12-06,2016-01-01), UNKNOWN), 
-                12=Membership(11012, null, null, 1101200, [2021-04-01,), NONE)
+                12=Membership(11012, null, null, 11012, [2021-04-01,), NONE)
             }
             """);
     }
@@ -153,16 +154,16 @@ public class ImportOfficeTables extends ContextBasedTest {
                 """);
         assertThat(debitors.toString()).isEqualToIgnoringWhitespace("""
                 {
-                     7=debitor(1000700: Mellies, Michael), 
+                     7=debitor(10007: Mellies, Michael), 
-                    10=debitor(1001000: JM e.K.), 
+                    10=debitor(10010: JM e.K.), 
-                    12=debitor(1101200: Test PS)
+                    12=debitor(11012: Test PS)
                 }
                 """);
         assertThat(memberships.toString()).isEqualToIgnoringWhitespace("""
                 {
-                     7=Membership(10007, Mellies, Michael, 1000700, [2000-12-06,), NONE),
+                     7=Membership(10007, Mellies, Michael, 10007, [2000-12-06,), NONE),
-                    10=Membership(10010, JM e.K., 1001000, [2000-12-06,2016-01-01), UNKNOWN),
+                    10=Membership(10010, JM e.K., 10010, [2000-12-06,2016-01-01), UNKNOWN),
-                    12=Membership(11012, Test PS, 1101200, [2021-04-01,), NONE)
+                    12=Membership(11012, Test PS, 11012, [2021-04-01,), NONE)
                 }
                 """);
     }
@@ -312,7 +313,6 @@ public class ImportOfficeTables extends ContextBasedTest {
                     persons.put(rec.getInteger("bp_id"), person);
 
                     final var partner = HsOfficePartnerEntity.builder()
-                            .debitorNumberPrefix(rec.getInteger("member_id"))
                             .details(HsOfficePartnerDetailsEntity.builder().build())
                             .contact(HsOfficeContactEntity.builder().build())
                             .person(person)
@@ -321,12 +321,12 @@ public class ImportOfficeTables extends ContextBasedTest {
 
                     final var debitor = HsOfficeDebitorEntity.builder()
                             .partner(partner)
-                            .debitorNumberSuffix((byte)0)
+//                            .debitorNumberSuffix(rec.getByte("member_id"))
-                            .defaultPrefix(rec.getString("member_code"))
+//                            .defaultPrefix(rec.getString("member_code"))
                             .partner(partner)
                             .billingContact(partner.getContact())
                             .billable(rec.isEmpty("free"))
-                            .vatReverseCharge(rec.getBoolean("exempt_vat"))
+                            // .vatExempt(toBool(rec.get("exempt_vat")) (reverse-charge) TODO: add as vat-reverse-charge to debitor
                             .vatBusiness("GROSS".equals(rec.getString("indicator_vat"))) // TODO: remove
                             .vatId(rec.getString("uid_vat"))
                             .build();
@@ -624,14 +624,9 @@ class Record {
         return isNotBlank(value) ? Byte.valueOf(value.trim()) : 0;
     }
 
-    boolean getBoolean(final String columnName) {
-        final String value = getString(columnName);
-        return isNotBlank(value) && Boolean.parseBoolean(value.trim());
-    }
-
     Integer getInteger(final String columnName) {
         final String value = getString(columnName);
-        return isNotBlank(value) ? Integer.parseInt(value.trim()) : 0;
+        return isNotBlank(value) ? Integer.valueOf(value.trim()) : 0;
     }
 
     BigDecimal getBigDecimal(final String columnName) {