From 7a61b11a4e4e514f6c3440127e9566e8d26e8f47 Mon Sep 17 00:00:00 2001 From: chgl Date: Tue, 7 May 2024 19:21:57 +0200 Subject: [PATCH] chore: cleanup around dev setup --- deploy/{compose.dev.yaml => compose.yaml} | 0 deploy/down.sh | 2 +- deploy/reset-topics.sh | 5 +++++ deploy/resetTopics.sh | 5 ----- deploy/up.sh | 2 +- .../streams/ume/obdstofhir/mapper/ObdsToFhirMapper.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename deploy/{compose.dev.yaml => compose.yaml} (100%) create mode 100755 deploy/reset-topics.sh delete mode 100755 deploy/resetTopics.sh diff --git a/deploy/compose.dev.yaml b/deploy/compose.yaml similarity index 100% rename from deploy/compose.dev.yaml rename to deploy/compose.yaml diff --git a/deploy/down.sh b/deploy/down.sh index a6af020c..87a586e0 100755 --- a/deploy/down.sh +++ b/deploy/down.sh @@ -1,2 +1,2 @@ #!/bin/sh -docker compose -f compose.dev.yaml down -v +docker compose down -v diff --git a/deploy/reset-topics.sh b/deploy/reset-topics.sh new file mode 100755 index 00000000..0e3c98d6 --- /dev/null +++ b/deploy/reset-topics.sh @@ -0,0 +1,5 @@ +#!/bin/sh +docker compose exec kafka bash -c "kafka-consumer-groups.sh --bootstrap-server localhost:9092 --delete --all-groups" +docker compose exec kafka bash -c "kafka-topics.sh --bootstrap-server localhost:9092 --delete --topic 'fhir.obds'" +docker compose exec kafka bash -c "kafka-topics.sh --bootstrap-server localhost:9092 --delete --topic 'onkostar.*'" +docker compose exec kafka bash -c "kafka-topics.sh --bootstrap-server localhost:9092 --delete --topic 'onkostar-*'" diff --git a/deploy/resetTopics.sh b/deploy/resetTopics.sh deleted file mode 100755 index 3f7b46e5..00000000 --- a/deploy/resetTopics.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -docker compose -f compose.dev.yaml exec kafka bash -c "kafka-consumer-groups.sh --bootstrap-server localhost:9092 --delete --all-groups" -docker compose -f compose.dev.yaml exec kafka bash -c "kafka-topics.sh --bootstrap-server localhost:9092 --delete --topic 'fhir.obds'" -docker compose -f compose.dev.yaml exec kafka bash -c "kafka-topics.sh --bootstrap-server localhost:9092 --delete --topic 'onkostar.*'" -docker compose -f compose.dev.yaml exec kafka bash -c "kafka-topics.sh --bootstrap-server localhost:9092 --delete --topic 'onkostar-*'" diff --git a/deploy/up.sh b/deploy/up.sh index 866950b1..7deb30a1 100755 --- a/deploy/up.sh +++ b/deploy/up.sh @@ -1,2 +1,2 @@ #!/bin/sh -docker compose -f compose.dev.yaml up -d +docker compose up -d diff --git a/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/ObdsToFhirMapper.java b/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/ObdsToFhirMapper.java index 6da48cf5..54d98456 100644 --- a/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/ObdsToFhirMapper.java +++ b/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/ObdsToFhirMapper.java @@ -102,7 +102,7 @@ public List prioritiseLatestMeldungExports( return meldungExportList.stream().sorted(meldungComparator).collect(Collectors.toList()); } - public String getPatIdFromAdt(MeldungExport meldung) { + public String getPatIdFromMeldung(MeldungExport meldung) { return meldung .getXml_daten() .getMenge_Patient()