hostsharing/hs.hsadmin.ng
6
0
Fork 0
Code Pull Requests 2 Activity

memberNumber as partnerNumber+memberNumberSuffix #13

Merged
hsh-michaelhoennig merged 78 commits from memberNumberSuffix-and-partnerNumber into master 2024-01-24 15:57:16 +01:00
Conversation 0 Commits 78 Files Changed 47 +26 -21
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5d7a245d9d - Show all commits

8
build.gradle
View File

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

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

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