From 4b112add4ba53edba096dafb03ce09deb0458c44 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <code@pcvolkmer.de>
Date: Tue, 8 Jul 2025 20:24:41 +0200
Subject: [PATCH] feat: correct date format and no null or empty

---
 src/main/java/dev/pcvolkmer/mv64e/mtb/Converter.java  | 2 ++
 src/main/java/dev/pcvolkmer/mv64e/mtb/Patient.java    | 4 ++--
 src/main/java/dev/pcvolkmer/mv64e/mtb/PeriodDate.java | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/Converter.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/Converter.java
index ee58b24..9dd3d85 100644
--- a/src/main/java/dev/pcvolkmer/mv64e/mtb/Converter.java
+++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/Converter.java
@@ -1,5 +1,6 @@
 package dev.pcvolkmer.mv64e.mtb;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.*;
@@ -68,6 +69,7 @@ public class Converter {
         mapper.findAndRegisterModules();
         mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true);
         mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
         SimpleModule module = new SimpleModule();
         module.addDeserializer(Date.class, new JsonDeserializer<>() {
             @Override
diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/Patient.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/Patient.java
index d8e96e6..a4b1f92 100644
--- a/src/main/java/dev/pcvolkmer/mv64e/mtb/Patient.java
+++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/Patient.java
@@ -20,8 +20,8 @@ public class Patient {
     @Getter(onMethod_ = {@JsonProperty("birthDate"), @JsonFormat(pattern = "yyyy-MM-dd")})
     @Setter(onMethod_ = {@JsonProperty("birthDate"), @JsonFormat(pattern = "yyyy-MM-dd")})
     private Date birthDate;
-    @Getter(onMethod_ = {@JsonProperty("dateOfDeath")})
-    @Setter(onMethod_ = {@JsonProperty("dateOfDeath")})
+    @Getter(onMethod_ = {@JsonProperty("dateOfDeath"), @JsonFormat(pattern = "yyyy-MM-dd")})
+    @Setter(onMethod_ = {@JsonProperty("dateOfDeath"), @JsonFormat(pattern = "yyyy-MM-dd")})
     private Date dateOfDeath;
     @Getter(onMethod_ = {@JsonProperty("gender")})
     @Setter(onMethod_ = {@JsonProperty("gender")})
diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/PeriodDate.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/PeriodDate.java
index 2940df5..6facee8 100644
--- a/src/main/java/dev/pcvolkmer/mv64e/mtb/PeriodDate.java
+++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/PeriodDate.java
@@ -11,8 +11,8 @@ import java.util.Date;
 @NoArgsConstructor
 @Builder
 public class PeriodDate {
-    @Getter(onMethod_ = {@JsonProperty("end")})
-    @Setter(onMethod_ = {@JsonProperty("end")})
+    @Getter(onMethod_ = {@JsonProperty("end"), @JsonFormat(pattern = "yyyy-MM-dd")})
+    @Setter(onMethod_ = {@JsonProperty("end"), @JsonFormat(pattern = "yyyy-MM-dd")})
     private Date end;
     @Getter(onMethod_ = {@JsonProperty("start"), @JsonFormat(pattern = "yyyy-MM-dd")})
     @Setter(onMethod_ = {@JsonProperty("start"), @JsonFormat(pattern = "yyyy-MM-dd")})