From be5bf57c355848515ce11def65460753457d6ea7 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 4 Nov 2024 10:56:57 +0100
Subject: [PATCH] OZG-6957: Add Fachstellen to Docker-Compose
---
alfa-client/apps/alfa-e2e/docker-compose.yml | 25 +++++++++++++++++--
.../alfa-e2e/src/fixtures/fachstelle/r1.json | 10 ++++++++
.../alfa-e2e/src/fixtures/fachstelle/r2.json | 10 ++++++++
.../alfa-e2e/src/fixtures/fachstelle/r3.json | 10 ++++++++
4 files changed, 53 insertions(+), 2 deletions(-)
create mode 100644 alfa-client/apps/alfa-e2e/src/fixtures/fachstelle/r1.json
create mode 100644 alfa-client/apps/alfa-e2e/src/fixtures/fachstelle/r2.json
create mode 100644 alfa-client/apps/alfa-e2e/src/fixtures/fachstelle/r3.json
diff --git a/alfa-client/apps/alfa-e2e/docker-compose.yml b/alfa-client/apps/alfa-e2e/docker-compose.yml
index e541a7eef1..81abcc42cd 100644
--- a/alfa-client/apps/alfa-e2e/docker-compose.yml
+++ b/alfa-client/apps/alfa-e2e/docker-compose.yml
@@ -199,11 +199,17 @@ services:
- LOGGING_CONFIG=classpath:log4j2-local.xml
ports:
- 19090:9190
+ healthcheck:
+ test: "curl --fail --silent localhost:8081/actuator/health/readiness | grep UP || exit 1"
+ interval: 20s
+ timeout: 3s
+ retries: 3
+ start_period: 10s
depends_on:
mongodb:
condition: service_healthy
- zufi-manager-pvog:
- condition: service_completed_successfully
+# zufi-manager-pvog:
+# condition: service_completed_successfully
smocker:
image: thiht/smocker
@@ -226,3 +232,18 @@ services:
depends_on:
smocker:
condition: service_healthy
+
+ fachstellen-init:
+ image: fullstorydev/grpcurl
+ volumes:
+ - ./src/fixtures/fachstellen:/mocks:ro
+ command: >
+ sh -c "
+ alias pushFachstelleToZufi=\"grpcurl -d @ --plaintext zufi-manager-server:19090 de.ozgcloud.zufi.grpc.fachstelle.FachstelleRegistrationService.Register < $1\" &&
+ pushFachstelleToZufi /mocks/r1.json &&
+ pushFachstelleToZufi /mocks/r2.json &&
+ pushFachstelleToZufi /mocks/r3.json"
+ depends_on:
+ zufi-manager-server:
+ condition: service_healthy
+
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/fachstelle/r1.json b/alfa-client/apps/alfa-e2e/src/fixtures/fachstelle/r1.json
new file mode 100644
index 0000000000..8d7ecab837
--- /dev/null
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/fachstelle/r1.json
@@ -0,0 +1,10 @@
+{
+ "anschrift": "Westring 501, 24106 Kiel",
+ "emailAdresse": "support@holstein-kiel.de",
+ "firmenName": "Kieler Sportvereinigung Holstein",
+ "mukId": "1234500000999",
+ "rechtsform": "GmbH",
+ "rechtsformText": "voluptate sit commodo dolore",
+ "registerArt": "HRA",
+ "registerNummer": "1900"
+}
\ No newline at end of file
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/fachstelle/r2.json b/alfa-client/apps/alfa-e2e/src/fixtures/fachstelle/r2.json
new file mode 100644
index 0000000000..516c165e46
--- /dev/null
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/fachstelle/r2.json
@@ -0,0 +1,10 @@
+{
+ "anschrift": "Blumenstr. 1, 50354 Hürth",
+ "emailAdresse": "garten@huerth-freunde.de",
+ "firmenName": "Gartenfreunde Hürth",
+ "mukId": "1111122222333",
+ "rechtsform": "GbR",
+ "rechtsformText": " Amtsgericht Köln",
+ "registerArt": "HRB",
+ "registerNummer": "1706"
+}
\ No newline at end of file
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/fachstelle/r3.json b/alfa-client/apps/alfa-e2e/src/fixtures/fachstelle/r3.json
new file mode 100644
index 0000000000..71c72e27d0
--- /dev/null
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/fachstelle/r3.json
@@ -0,0 +1,10 @@
+{
+ "anschrift": "Cloudallee 695, ",
+ "emailAdresse": "noreply@ozg-bank.de",
+ "firmenName": "OZG Bank",
+ "mukId": "0011223344123",
+ "rechtsform": "KG",
+ "rechtsformText": "Amtsgericht Berlin",
+ "registerArt": "GnR",
+ "registerNummer": "2024"
+}
\ No newline at end of file
--
GitLab