feat: use StructKeys with missing properties

bzkf · Aug 16, 2024 · ba3cdc3 · ba3cdc3
1 parent 7911bb5
commit ba3cdc3
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 6 deletions.
diff --git a/src/main/java/org/miracum/streams/ume/obdstofhir/serde/StructKeyStringSerde.java b/src/main/java/org/miracum/streams/ume/obdstofhir/serde/StructKeyStringSerde.java
@@ -1,6 +1,7 @@
 package org.miracum.streams.ume.obdstofhir.serde;
 
 import java.nio.charset.StandardCharsets;
+import java.util.StringJoiner;
 import java.util.regex.Pattern;
 import org.apache.kafka.common.serialization.Deserializer;
 import org.apache.kafka.common.serialization.Serde;
@@ -11,19 +12,26 @@ public class StructKeyStringSerde implements Serde<StructKey> {
 
   private static final Pattern structPattern =
       Pattern.compile(
-          "Struct\\{REFERENZ_NUMMER=\"(?<referenznummer>.*)\",\\s*TUMOR_ID=\"(?<tumorid>.*)\"\\}");
+          "Struct\\{(REFERENZ_NUMMER=\"(?<referenznummer>[^\"]*)\")?,?\\s*(TUMOR_ID=\"(?<tumorid>[^\"]*)\")?\\}");
 
   @Override
   public Serializer<StructKey> serializer() {
     return (s, structKey) -> {
       if (null == structKey) {
         return null;
       }
-      return String.format(
-              "Struct{REFERENZ_NUMMER=\"%s\",TUMOR_ID=\"%s\"}",
-              null == structKey.referenzNummer() ? "" : structKey.referenzNummer(),
-              null == structKey.tumorId() ? "" : structKey.tumorId())
-          .getBytes(StandardCharsets.UTF_8);
+
+      var values = new StringJoiner(",");
+
+      if (null != structKey.referenzNummer()) {
+        values.add(String.format("REFERENZ_NUMMER=\"%s\"", structKey.referenzNummer()));
+      }
+
+      if (null != structKey.tumorId()) {
+        values.add(String.format("TUMOR_ID=\"%s\"", structKey.tumorId()));
+      }
+
+      return String.format("Struct{%s}", values).getBytes(StandardCharsets.UTF_8);
     };
   }
 

diff --git a/src/test/java/org/miracum/streams/ume/obdstofhir/serde/StructKeyStringSerdeTest.java b/src/test/java/org/miracum/streams/ume/obdstofhir/serde/StructKeyStringSerdeTest.java
@@ -24,6 +24,19 @@ void shouldSerializeStructKey() {
             "Struct{REFERENZ_NUMMER=\"01234\",TUMOR_ID=\"1\"}".getBytes(StandardCharsets.UTF_8));
   }
 
+  @Test
+  void shouldSerializePartialStructKeyWithRefNumOnly() {
+    var actual = serde.serializer().serialize("any", new StructKey("01234", null));
+    assertThat(actual)
+        .isEqualTo("Struct{REFERENZ_NUMMER=\"01234\"}".getBytes(StandardCharsets.UTF_8));
+  }
+
+  @Test
+  void shouldSerializeStructKeyWithTumIdOnly() {
+    var actual = serde.serializer().serialize("any", new StructKey(null, "1"));
+    assertThat(actual).isEqualTo("Struct{TUMOR_ID=\"1\"}".getBytes(StandardCharsets.UTF_8));
+  }
+
   @Test
   void shouldDeserializeStructKey() {
     var actual =
@@ -36,6 +49,25 @@ void shouldDeserializeStructKey() {
     assertThat(actual).isEqualTo(new StructKey("01234", "1"));
   }
 
+  @Test
+  void shouldDeserializePartialStructKeyWithRefNumOnly() {
+    var actual =
+        serde
+            .deserializer()
+            .deserialize(
+                "any", "Struct{REFERENZ_NUMMER=\"01234\"}".getBytes(StandardCharsets.UTF_8));
+    assertThat(actual).isEqualTo(new StructKey("01234", null));
+  }
+
+  @Test
+  void shouldDeserializePartialStructKeyWithTumIdOnly() {
+    var actual =
+        serde
+            .deserializer()
+            .deserialize("any", "Struct{TUMOR_ID=\"1\"}".getBytes(StandardCharsets.UTF_8));
+    assertThat(actual).isEqualTo(new StructKey(null, "1"));
+  }
+
   @Test
   void shouldUseLombokBuilderForStructKeyRecord() {
     var expected = new StructKey("01234", "1");