Merge pull request #10 from Sudwest-Fryslan/second-corrections-batch

Second corrections batch
Sudwest-Fryslan · Oct 12, 2023 · 65737d6 · 65737d6
2 parents 268c9c9 + 1401be8
commit 65737d6
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 6 deletions.
diff --git a/src/main/configurations/LopendeZaken/Configuration_LopendeZaken.xml b/src/main/configurations/LopendeZaken/Configuration_LopendeZaken.xml
@@ -15,6 +15,10 @@
                 <Exit name="Rejected" state="SUCCESS" code="202" />
             </Exits>
 
+            <!-- Preventing null values -->
+            <PutInSessionPipe name="storeResultaat" value="/" />
+            <PutInSessionPipe name="endpointVerwijzing" value="/" />
+
             <PutSystemDateInSessionPipe name="GetDateTime" dateFormat="yyyyMMdd-HHmmss"/>
 
             <!-- check input format -->

diff --git a/src/main/configurations/LopendeZaken/xsl/anonymize.xsl b/src/main/configurations/LopendeZaken/xsl/anonymize.xsl
@@ -29,7 +29,7 @@
   </xsl:template>
 
   <xsl:template match="//BG:geslachtsaanduiding">
-    <BG:geslachtsaanduiding>XXX</BG:geslachtsaanduiding>
+    <BG:geslachtsaanduiding>M</BG:geslachtsaanduiding>
   </xsl:template>
 
 </xsl:stylesheet>
diff --git a/src/main/configurations/LopendeZaken/xsl/result.xsl b/src/main/configurations/LopendeZaken/xsl/result.xsl
@@ -153,10 +153,20 @@
             <code xsi:nil="true" StUF:noValue="waardeOnbekend" />
             <xsl:if
               test="exists($storeResultaat/root/toelichting) and $storeResultaat/root/toelichting!=''">
-              <omschrijving>
-                <xsl:value-of
-                  select="concat($storeResultaat/root/toelichting,'(', $storeStatusResponse/root/statustoelichting,')')" />
-              </omschrijving>
+              <xsl:choose>
+                <xsl:when test="string-length($storeStatusResponse/root/statustoelichting) &gt; 0">
+                  <omschrijving>
+                    <xsl:value-of
+                      select="concat($storeResultaat/root/toelichting,'(', $storeStatusResponse/root/statustoelichting,')')" />
+                  </omschrijving>
+                </xsl:when>
+                <xsl:otherwise>
+                  <omschrijving>
+                    <xsl:value-of
+                      select="$storeResultaat/root/toelichting" />
+                  </omschrijving>
+                </xsl:otherwise>
+              </xsl:choose>
             </xsl:if>
             <ingangsdatumObject xsi:nil="true" StUF:noValue="waardeOnbekend" />
           </gerelateerde>

diff --git a/src/main/resources/DeploymentSpecifics.properties b/src/main/resources/DeploymentSpecifics.properties
@@ -3,4 +3,5 @@ manageDatabase.active=false
 manageFileSystem.active=False
 warnings.suppress.sqlInjections.ManageDatabase=true
 configurations.names=LopendeZaken
-configurations.LopendeZaken.classLoaderType=DirectoryClassLoader
+configurations.LopendeZaken.classLoaderType=DirectoryClassLoader
+ibistesttool.custom=Custom
diff --git a/src/main/resources/springIbisTestToolCustom.xml b/src/main/resources/springIbisTestToolCustom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans
+    xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
+>
+
+    <import resource="springIbisTestTool.xml" />
+
+    <bean name="metadataExtractor" class="nl.nn.testtool.MetadataExtractor">
+        <property name="extraMetadataFieldExtractors">
+            <list>
+                <bean class="nl.nn.testtool.metadata.StatusMetadataFieldExtractor" />
+                <bean class="nl.nn.testtool.metadata.SessionKeyMetadataFieldExtractor">
+                    <property name="name" value="Zaaktype" />
+                    <property name="sessionKey" value="storeZaakTypeResponse" />
+                    <property name="regex" value="&lt;identificatie>(.*)&lt;\/identificatie>" />
+                </bean>
+                <bean class="nl.nn.testtool.metadata.SessionKeyMetadataFieldExtractor">
+                    <property name="name" value="Identificatie" />
+                    <property name="sessionKey" value="getZaakXml" />
+                    <property name="regex" value="&lt;identificatie>(.*)&lt;\/identificatie>" />
+                </bean>
+                <bean class="nl.nn.testtool.metadata.SessionKeyMetadataFieldExtractor">
+                    <property name="name" value="Toelichting" />
+                    <property name="sessionKey" value="storeStatusResponse" />
+                    <property name="regex" value="&lt;toelichting>(.*)&lt;\/toelichting>" />
+                </bean>
+            </list>
+        </property>
+    </bean>
+
+    <bean name="metadataNames" class="java.util.ArrayList">
+        <constructor-arg>
+            <list>
+                <value>storageId</value>
+                <value>endTime</value>
+                <value>status</value>
+                <value>Zaaktype</value>
+                <value>Identificatie</value>
+                <value>Toelichting</value>
+                <value>correlationId</value>
+                <value>duration</value>
+                <value>numberOfCheckpoints</value>
+                <value>estimatedMemoryUsage</value>
+                <value>storageSize</value>
+            </list>
+        </constructor-arg>
+    </bean>
+</beans>