diff --git a/.gitignore b/.gitignore index 9500b657..10ebda13 100644 --- a/.gitignore +++ b/.gitignore @@ -137,3 +137,4 @@ Desktop.ini # ESLint ###################### .eslintcache +/.environment diff --git a/doc/hs-office-data-structure.md b/doc/hs-office-data-structure.md new file mode 100644 index 00000000..3f9b5462 --- /dev/null +++ b/doc/hs-office-data-structure.md @@ -0,0 +1,8 @@ +```mermaid + +flowchart TB + +direction TB + +Relationship-->Person +``` diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeTables.java b/src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeTables.java index c29a2c94..f5ea4489 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeTables.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeTables.java @@ -18,6 +18,7 @@ import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerDetailsEntity; import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerEntity; import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity; import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonType; +import net.hostsharing.hsadminng.hs.office.relationship.HsOfficeRelationshipEntity; import net.hostsharing.hsadminng.hs.office.sepamandate.HsOfficeSepaMandateEntity; import net.hostsharing.test.JpaAttempt; import org.junit.jupiter.api.*; @@ -89,7 +90,7 @@ import static org.assertj.core.api.Assertions.assertThat; * * import-office-tables # comes from .aliases file */ -@Disabled +//@Disabled @DataJpaTest(properties = { "spring.datasource.url=${HSADMINNG_POSTGRES_JDBC_URL:jdbc:tc:postgresql:15.5-bookworm:///spring_boot_testcontainers}", "spring.datasource.username=${HSADMINNG_POSTGRES_ADMIN_USERNAME:admin}", @@ -110,6 +111,8 @@ public class ImportOfficeTables extends ContextBasedTest { private static NavigableMap partners = new TreeMap<>(); private static NavigableMap debitors = new TreeMap<>(); private static NavigableMap memberships = new TreeMap<>(); + + private static NavigableMap relationships = new TreeMap<>(); private static NavigableMap sepaMandates = new TreeMap<>(); private static NavigableMap bankAccounts = new TreeMap<>(); private static NavigableMap coopShares = new TreeMap<>(); @@ -127,12 +130,6 @@ public class ImportOfficeTables extends ContextBasedTest { @MockBean HttpServletRequest request; - @Test - @Order(0) - void preconditions() { - assertThat(jdbcUrl).isEqualTo("jdbc:postgresql://localhost:5432/postgres"); - } - @Test @Order(1) void importBusinessPartners() { @@ -492,7 +489,7 @@ public class ImportOfficeTables extends ContextBasedTest { .debitorNumberSuffix((byte) 0) .defaultPrefix(rec.getString("member_code").replace("hsh00-", "")) .partner(partner) - .billingContact(partner.getContact()) // TODO falsch + //.billingContact(partner.getContact()) // TODO falsch .billable(rec.isEmpty("free")) .vatReverseCharge(rec.getBoolean("exempt_vat")) .vatBusiness("GROSS".equals(rec.getString("indicator_vat"))) // TODO: remove