TP-202405-filtered_import #78
15
.aliases
15
.aliases
@ -1,9 +1,6 @@
|
|||||||
# For using the alias import-office-tables, # copy these exports to .environment (ignored by git)
|
# For using the alias import-office-tables,
|
||||||
# and amend them according to your external DB:
|
# copy the file .tc-environment to .environment (ignored by git)
|
||||||
export HSADMINNG_POSTGRES_JDBC_URL=jdbc:tc:postgresql:15.5-bookworm:///spring_boot_testcontainers
|
# and amend them according to your external DB.
|
||||||
export HSADMINNG_POSTGRES_ADMIN_USERNAME=admin
|
|
||||||
export HSADMINNG_POSTGRES_ADMIN_PASSWORD=
|
|
||||||
export HSADMINNG_POSTGRES_RESTRICTED_USERNAME=restricted
|
|
||||||
|
|
||||||
gradleWrapper () {
|
gradleWrapper () {
|
||||||
if [ ! -f gradlew ]; then
|
if [ ! -f gradlew ]; then
|
||||||
@ -46,11 +43,7 @@ postgresAutodoc () {
|
|||||||
alias postgres-autodoc=postgresAutodoc
|
alias postgres-autodoc=postgresAutodoc
|
||||||
|
|
||||||
function importOfficeData() {
|
function importOfficeData() {
|
||||||
export HSADMINNG_POSTGRES_JDBC_URL=jdbc:tc:postgresql:15.5-bookworm:///spring_boot_testcontainers
|
source .tc-environment
|
||||||
export HSADMINNG_POSTGRES_ADMIN_USERNAME=admin
|
|
||||||
export HSADMINNG_POSTGRES_ADMIN_PASSWORD=password
|
|
||||||
export HSADMINNG_POSTGRES_RESTRICTED_USERNAME=restricted
|
|
||||||
export HSADMINNG_SUPERUSER=superuser-alex@hostsharing.net
|
|
||||||
|
|
||||||
if [ -f .environment ]; then
|
if [ -f .environment ]; then
|
||||||
source .environment
|
source .environment
|
||||||
|
5
.tc-environment
Normal file
5
.tc-environment
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
export HSADMINNG_POSTGRES_JDBC_URL=jdbc:tc:postgresql:15.5-bookworm:///spring_boot_testcontainers
|
||||||
|
export HSADMINNG_POSTGRES_ADMIN_USERNAME=admin
|
||||||
|
export HSADMINNG_POSTGRES_ADMIN_PASSWORD=
|
||||||
|
export HSADMINNG_POSTGRES_RESTRICTED_USERNAME=restricted
|
||||||
|
export HSADMINNG_MIGRATION_DATA_PATH=migration
|
@ -92,13 +92,7 @@ import static org.assertj.core.api.Fail.fail;
|
|||||||
-- maybe something like that is needed for the 2nd user
|
-- maybe something like that is needed for the 2nd user
|
||||||
-- GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public to hsh99_restricted;
|
-- GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public to hsh99_restricted;
|
||||||
|
|
||||||
* Then copy this to a file named .environment (excluded from git) and fill in your specific values:
|
* Then copy the file .tc-environment to a file named .environment (excluded from git) and fill in your specific values.
|
||||||
|
|
||||||
export HSADMINNG_POSTGRES_JDBC_URL=jdbc:postgresql://localhost:6432/hsh99_hsadminng
|
|
||||||
export HSADMINNG_POSTGRES_ADMIN_USERNAME=hsh99_admin
|
|
||||||
export HSADMINNG_POSTGRES_ADMIN_PASSWORD=password
|
|
||||||
export HSADMINNG_POSTGRES_RESTRICTED_USERNAME=hsh99_restricted
|
|
||||||
export HSADMINNG_SUPERUSER=some-precreated-superuser@example.org
|
|
||||||
|
|
||||||
* To finally import the office data, run:
|
* To finally import the office data, run:
|
||||||
*
|
*
|
||||||
@ -253,16 +247,16 @@ public class ImportOfficeData extends ContextBasedTest {
|
|||||||
""");
|
""");
|
||||||
assertThat(toFormattedString(contacts)).isEqualToIgnoringWhitespace("""
|
assertThat(toFormattedString(contacts)).isEqualToIgnoringWhitespace("""
|
||||||
{
|
{
|
||||||
1101=contact(caption='Herr Michael Mellies ', emailAddresses='{ main: mih@example.org }'),
|
1101=contact(caption='Herr Michael Mellies ', emailAddresses='{ "main": "mih@example.org"}'),
|
||||||
1200=contact(caption='JM e.K.', emailAddresses='{ main: jm-ex-partner@example.org }'),
|
1200=contact(caption='JM e.K.', emailAddresses='{ "main": "jm-ex-partner@example.org"}'),
|
||||||
1201=contact(caption='Frau Dr. Jenny Meyer-Billing , JM GmbH', emailAddresses='{ main: jm-billing@example.org }'),
|
1201=contact(caption='Frau Dr. Jenny Meyer-Billing , JM GmbH', emailAddresses='{ "main": "jm-billing@example.org"}'),
|
||||||
1202=contact(caption='Herr Andrew Meyer-Operation , JM GmbH', emailAddresses='{ main: am-operation@example.org }'),
|
1202=contact(caption='Herr Andrew Meyer-Operation , JM GmbH', emailAddresses='{ "main": "am-operation@example.org"}'),
|
||||||
1203=contact(caption='Herr Philip Meyer-Contract , JM GmbH', emailAddresses='{ main: pm-partner@example.org }'),
|
1203=contact(caption='Herr Philip Meyer-Contract , JM GmbH', emailAddresses='{ "main": "pm-partner@example.org"}'),
|
||||||
1204=contact(caption='Frau Tammy Meyer-VIP , JM GmbH', emailAddresses='{ main: tm-vip@example.org }'),
|
1204=contact(caption='Frau Tammy Meyer-VIP , JM GmbH', emailAddresses='{ "main": "tm-vip@example.org"}'),
|
||||||
1301=contact(caption='Petra Schmidt , Test PS', emailAddresses='{ main: ps@example.com }'),
|
1301=contact(caption='Petra Schmidt , Test PS', emailAddresses='{ "main": "ps@example.com"}'),
|
||||||
1401=contact(caption='Frau Frauke Fanninga ', emailAddresses='{ main: ff@example.org }'),
|
1401=contact(caption='Frau Frauke Fanninga ', emailAddresses='{ "main": "ff@example.org"}'),
|
||||||
1501=contact(caption='Frau Cecilia Camus ', emailAddresses='{ main: cc@example.org }')
|
1501=contact(caption='Frau Cecilia Camus ', emailAddresses='{ "main": "cc@example.org"}')
|
||||||
}
|
}
|
||||||
""");
|
""");
|
||||||
assertThat(toFormattedString(persons)).isEqualToIgnoringWhitespace("""
|
assertThat(toFormattedString(persons)).isEqualToIgnoringWhitespace("""
|
||||||
{
|
{
|
||||||
@ -1141,6 +1135,7 @@ public class ImportOfficeData extends ContextBasedTest {
|
|||||||
return "{\n" +
|
return "{\n" +
|
||||||
map.keySet().stream()
|
map.keySet().stream()
|
||||||
.map(id -> " " + id + "=" + map.get(id).toString())
|
.map(id -> " " + id + "=" + map.get(id).toString())
|
||||||
|
.map(e -> e.replaceAll("\n ", " ").replace("\n", ""))
|
||||||
.collect(Collectors.joining(",\n")) +
|
.collect(Collectors.joining(",\n")) +
|
||||||
"\n}\n";
|
"\n}\n";
|
||||||
}
|
}
|
||||||
@ -1228,13 +1223,6 @@ public class ImportOfficeData extends ContextBasedTest {
|
|||||||
return new InputStreamReader(requireNonNull(getClass().getClassLoader().getResourceAsStream(resourcePath)));
|
return new InputStreamReader(requireNonNull(getClass().getClassLoader().getResourceAsStream(resourcePath)));
|
||||||
}
|
}
|
||||||
|
|
||||||
private Reader fileReader(@NotNull final Path filePath) throws IOException {
|
|
||||||
// Path path = Paths.get(
|
|
||||||
// ClassLoader.getSystemResource("csv/twoColumn.csv").toURI())
|
|
||||||
// );
|
|
||||||
return Files.newBufferedReader(filePath);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static String[] justHeader(final List<String[]> lines) {
|
private static String[] justHeader(final List<String[]> lines) {
|
||||||
return stream(lines.getFirst()).map(String::trim).toArray(String[]::new);
|
return stream(lines.getFirst()).map(String::trim).toArray(String[]::new);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user