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 +14 -12
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a4c1614939 - Show all commits

8
src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportBusinessPartners.java
View File

@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import org.springframework.transaction.annotation.Transactional;
import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext; import jakarta.persistence.PersistenceContext;
@ -170,9 +171,9 @@ public class ImportBusinessPartners extends ContextBasedTest {
@Test @Test
@Order(10) @Order(10)
@Transactional
void persistEntities() { void persistEntities() {
jpaAttempt.transacted(() -> { context("superuser-alex@hostsharing.net"); // TODO: use real user for actual import
context("superuser-alex@hostsharing.net"); // TODO: use real user
contacts.forEach((id, contact) -> em.persist(contact)); contacts.forEach((id, contact) -> em.persist(contact));
persons.forEach((id, person) -> em.persist(person)); persons.forEach((id, person) -> em.persist(person));
@ -181,7 +182,8 @@ public class ImportBusinessPartners extends ContextBasedTest {
memberships.forEach((id, membership) -> em.persist(membership)); memberships.forEach((id, membership) -> em.persist(membership));
bankAccounts.forEach((id, account) -> em.persist(account)); bankAccounts.forEach((id, account) -> em.persist(account));
sepaMandates.forEach((id, mandate) -> em.persist(mandate)); sepaMandates.forEach((id, mandate) -> em.persist(mandate));
}).assertSuccessful();
em.flush();
} }
public List<String[]> readAllLines(Reader reader) throws Exception { public List<String[]> readAllLines(Reader reader) throws Exception {

4
src/test/resources/application.yml
View File

@ -4,8 +4,8 @@ spring:
platform: postgres platform: postgres
datasource: datasource:
url-tc: jdbc:tc:postgresql:13.7-bullseye:///spring_boot_testcontainers url: jdbc:tc:postgresql:13.7-bullseye:///spring_boot_testcontainers
url: jdbc:postgresql://localhost:5432/postgres url-local: jdbc:postgresql://localhost:5432/postgres
username: postgres username: postgres
password: password password: password