Merge branch 'develop'

Informatievlaanderen · Aug 26, 2024 · 3df2986 · 3df2986
2 parents da42d4e + 1279669
commit 3df2986
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 10 deletions.
diff --git a/common/pom.xml b/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>magda</artifactId>
         <groupId>be.vlaanderen.vip.mock</groupId>
-        <version>2.40.0</version>
+        <version>2.41.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/interfaces/pom.xml b/interfaces/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>magda</artifactId>
     <groupId>be.vlaanderen.vip.mock</groupId>
-    <version>2.40.0</version>
+    <version>2.41.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/...s/src/main/java/be/vlaanderen/vip/magda/client/domain/giveperson/MagdaResponsePerson.java b/...s/src/main/java/be/vlaanderen/vip/magda/client/domain/giveperson/MagdaResponsePerson.java
@@ -141,12 +141,21 @@ public NodeDetailedRelatedPerson(Node node) {
         }
 
         @Override
+        @Deprecated(forRemoval = true)
         public Optional<LocalDate> deathDate() {
             return node.get("Overlijden/Datum")
                        .flatMap(Node::getValue)
                        .map(LocalDate::parse);
         }
 
+        @Override
+        public Optional<IncompleteDate> incompleteDateOfDeath() {
+            return node.get("Overlijden/Datum")
+                       .flatMap(Node::getValue)
+                       .map(IncompleteDate::fromString);
+        }
+
+
         @Override
         public Address mainResidence() {
             return node.get("Adressen/Hoofdverblijfplaats")

diff --git a/interfaces/src/main/java/be/vlaanderen/vip/magda/client/domain/giveperson/Person.java b/interfaces/src/main/java/be/vlaanderen/vip/magda/client/domain/giveperson/Person.java
@@ -104,6 +104,11 @@ interface DetailedRelatedPerson extends RelatedPerson {
          */
         Optional<LocalDate> deathDate();
 
+        /**
+         * The person's (potentially incomplete) date of death
+         */
+        Optional<IncompleteDate> incompleteDateOfDeath();
+
         /**
          * The address of the person's main residence.
          */

diff --git a/magdaconnector/pom.xml b/magdaconnector/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>magda</artifactId>
     <groupId>be.vlaanderen.vip.mock</groupId>
-    <version>2.40.0</version>
+    <version>2.41.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/magdamock-starter/pom.xml b/magdamock-starter/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>magda</artifactId>
 		<groupId>be.vlaanderen.vip.mock</groupId>
-		<version>2.40.0</version>
+		<version>2.41.0</version>
 	</parent>
 	<artifactId>magdamock-starter</artifactId>
 

diff --git a/magdamock/pom.xml b/magdamock/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>magda</artifactId>
     <groupId>be.vlaanderen.vip.mock</groupId>
-    <version>2.40.0</version>
+    <version>2.41.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/magdamock/src/main/resources/magda_simulator/Persoon/GeefPersoon/02.02.0000/84640438954.xml b/magdamock/src/main/resources/magda_simulator/Persoon/GeefPersoon/02.02.0000/84640438954.xml
@@ -199,7 +199,7 @@
 								</Woonvorm>
 							</Gezinslid>
 							<Gezinslid DatumBegin="2012-03-09">
-								<INSZ>05691199737</INSZ>
+								<INSZ>12630962125</INSZ>
 								<Naam>
 									<Achternamen>
 										<Achternaam>Vlietinck</Achternaam>

diff --git a/...laanderen/vip/mock/magda/client/domain/giveperson/MagdaResponsePersonIntegrationTest.java b/...laanderen/vip/mock/magda/client/domain/giveperson/MagdaResponsePersonIntegrationTest.java
@@ -62,6 +62,11 @@ void deathDateNull_whenMissing() {
             assertThat(self.deathDate().isEmpty(), is(true));
         }
 
+        @Test
+        void incompleteDeathDateNull_whenMissing() {
+            assertThat(self.incompleteDateOfDeath().isEmpty(), is(true));
+        }
+
         @Test
         void mapsNISCodeCountry() { assertThat(self.mainResidence().nisCodeCountry(), is(Optional.of("150"))); }
 
@@ -76,6 +81,11 @@ void mapsDeathDate() {
             MatcherAssert.assertThat(person("65712399877").self().deathDate().get(), is(equalTo(LocalDate.of(2002, 1, 1))));
         }
 
+        @Test
+        void mapsIncompleteDeathDate(){
+            MatcherAssert.assertThat(person("65712399877").self().incompleteDateOfDeath().get().toLocalDate(), is(equalTo(LocalDate.of(2002, 1, 1))));
+        }
+
         @Test
         void mapsMainResidence_caseA() {
             var address = person("78721626143").self().mainResidence();

diff --git a/magdaservice/pom.xml b/magdaservice/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>magda</artifactId>
     <groupId>be.vlaanderen.vip.mock</groupId>
-    <version>2.40.0</version>
+    <version>2.41.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>be.vlaanderen.vip.mock</groupId>
 	<artifactId>magda</artifactId>
-	<version>2.40.0</version>
+	<version>2.41.0</version>
 	<name>magdaservice</name>
 	<description>MAGDA diensten Mock voor afnemers</description>
 	<properties>

diff --git a/signing/pom.xml b/signing/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>magda</artifactId>
         <groupId>be.vlaanderen.vip.mock</groupId>
-        <version>2.40.0</version>
+        <version>2.41.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/tester/pom.xml b/tester/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>magda</artifactId>
         <groupId>be.vlaanderen.vip.mock</groupId>
-        <version>2.40.0</version>
+        <version>2.41.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>