Merge branch 'develop'

Informatievlaanderen · Sep 16, 2024 · a68c79e · a68c79e
2 parents 4a6409c + 10c1e2e
commit a68c79e
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 14 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.46.0</version>
+        <version>2.47.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.46.0</version>
+    <version>2.47.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/interfaces/src/main/java/be/vlaanderen/vip/magda/client/diensten/GeefPersoonRequest.java b/interfaces/src/main/java/be/vlaanderen/vip/magda/client/diensten/GeefPersoonRequest.java
@@ -6,10 +6,7 @@
 import be.vlaanderen.vip.magda.client.domeinservice.MagdaRegistrationInfo;
 import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotNull;
-import lombok.AccessLevel;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.ToString;
+import lombok.*;
 
 import java.util.UUID;
 
@@ -74,6 +71,9 @@ public MagdaServiceIdentification magdaServiceIdentification() {
     protected void fillIn(MagdaDocument request, UUID requestId, MagdaRegistrationInfo magdaRegistrationInfo) {
         fillInCommonFields(request, requestId, magdaRegistrationInfo);
 
-        request.setValue("//Inhoud/Bron", (source != null ? source : RR).getValue());
+        var sourceValue = source != null ? source : RR;
+        request.setValue("//Inhoud/Bron", sourceValue.getValue());
+
+        if (sourceValue == RR) { request.removeNode("//Inhoud/Criteria/OpvragingenKSZ"); }
     }
 }
diff --git a/interfaces/src/main/resources/templates/GeefPersoon/02.02.0000/template.xml b/interfaces/src/main/resources/templates/GeefPersoon/02.02.0000/template.xml
@@ -25,6 +25,9 @@
                         <Inhoud>
                             <Criteria>
                                 <INSZ>INSZ</INSZ>
+                                <OpvragingenKSZ>
+                                    <BasisPersoonsgegevens>1</BasisPersoonsgegevens>
+                                </OpvragingenKSZ>
                             </Criteria>
                             <Bron>RR</Bron>
                             <Taal>nl</Taal>

diff --git a/interfaces/src/test/java/be/vlaanderen/vip/magda/client/diensten/GeefPersoonRequestTest.java b/interfaces/src/test/java/be/vlaanderen/vip/magda/client/diensten/GeefPersoonRequestTest.java
@@ -97,6 +97,8 @@ void setsFields() {
 
             assertThat(requestDocument.getValue("//Inhoud/Criteria/INSZ"), is(equalTo(TestBase.TEST_INSZ)));
             assertThat(requestDocument.getValue("//Inhoud/Bron"), is(equalTo("RR")));
+            assertNull(requestDocument.getValue("//Inhoud/Criteria/OpvragingenKSZ"));
+            assertNull(requestDocument.getValue("//Inhoud/Criteria/OpvragingenKSZ/BasisPersoonsgegevens"));
         }
 
         @Test
@@ -108,6 +110,7 @@ void setsFields_withCustomSource() {
 
             assertThat(requestDocument.getValue("//Inhoud/Criteria/INSZ"), is(equalTo(TestBase.TEST_INSZ)));
             assertThat(requestDocument.getValue("//Inhoud/Bron"), is(equalTo("KSZ")));
+            assertThat(requestDocument.getValue("//Inhoud/Criteria/OpvragingenKSZ/BasisPersoonsgegevens"), is(equalTo("1")));
         }
     }
 }
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.46.0</version>
+    <version>2.47.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.46.0</version>
+		<version>2.47.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.46.0</version>
+    <version>2.47.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

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.46.0</version>
+    <version>2.47.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.46.0</version>
+	<version>2.47.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.46.0</version>
+        <version>2.47.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.46.0</version>
+        <version>2.47.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>