Merge branch 'master' into dependabot/npm_and_yarn/docusaurus/docusau…

…rus-ffe2a14739
wearefrank · Jul 8, 2024 · 8415d28 · 8415d28
2 parents 71c9c73 + 4909eb2
commit 8415d28
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 38 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,15 +15,15 @@ jobs:
       version-next: ${{ steps.reference.outputs.next-reference }}
       version-next-strict: ${{ steps.reference.outputs.next-reference }}
     steps:
-      - uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
+      - uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
         with:
           disable-sudo: true
           egress-policy: block
           allowed-endpoints: >
             github.com:443
 
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #4.1.7
 
       - name: Next Reference
         id: reference
@@ -48,15 +48,15 @@ jobs:
       - version-next
       - ci
     steps:
-      - uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
+      - uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
         with:
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #4.1.7
 
       - name: Download Docker tar
-        uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe #4.1.2
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e #4.1.7
         with:
           name: build-docker-image
 
@@ -104,7 +104,7 @@ jobs:
           fi
 
       - name: Upload SoapUI testreports as artifact
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 #4.3.1
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 #4.3.3
         if: always()
         with:
           name: reports-soapui-testreports

diff --git a/.github/workflows/create-base-image.yml b/.github/workflows/create-base-image.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Login to Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,15 +14,15 @@ jobs:
       version-next-tag: ${{ steps.next-version.outputs.release-tag }}
       version-next-type: ${{ steps.next-version.outputs.release-type }}
     steps:
-      - uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
+      - uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
         with:
           disable-sudo: true
           egress-policy: audit
           allowed-endpoints: >
             github.com:443
 
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #4.1.7
 
       - name: "Setup Node"
         uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 #4.0.2
@@ -58,15 +58,15 @@ jobs:
       - analyze-commits
       - ci
     steps:
-      - uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
+      - uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
         with:
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #4.1.7
 
       - name: Download Docker tar
-        uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe #4.1.2
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e #4.1.7
         with:
           name: build-docker-image
 
@@ -114,7 +114,7 @@ jobs:
           fi
 
       - name: Upload SoapUI testreports as artifact
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 #4.3.1
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 #4.3.3
         if: always()
         with:
           name: reports-soapui-testreports
@@ -127,23 +127,23 @@ jobs:
       - ci
       - run-soapui-tests
     steps:
-      - uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
+      - uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
         with:
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #4.1.7
         with:
           token: ${{ secrets.WEAREFRANK_BOT_PAT }}
 
       - name: Download Pre-build Artifacts
-        uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe #4.1.2
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e #4.1.7
         with:
           pattern: pre-build-*
           merge-multiple: true
 
       - name: Download Build Artifacts
-        uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe #4.1.2
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e #4.1.7
         with:
           pattern: build-*
           merge-multiple: true

diff --git a/.github/workflows/update-helm-chart.yml b/.github/workflows/update-helm-chart.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Dispatch an action and get the run ID
-        uses: Codex-/return-dispatch@v1.11.0
+        uses: Codex-/return-dispatch@v1.14.0
         id: return_dispatch
         with:
           token: ${{ secrets.token }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,21 @@
 [![conventional commits](https://img.shields.io/badge/conventional%20commits-1.0.0-yellow.svg)](https://conventionalcommits.org) [![semantic versioning](https://img.shields.io/badge/semantic%20versioning-2.0.0-green.svg)](https://semver.org)
 
+## [1.19.14](https://github.com/wearefrank/zaakbrug/compare/v1.19.13...v1.19.14) (2024-07-03)
+
+### 🐛 Bug Fixes
+
+* creeerZaak attempts to also delete the case when the post case call fails and there is nothing to delete ([#408](https://github.com/wearefrank/zaakbrug/issues/408)) ([7956c0b](https://github.com/wearefrank/zaakbrug/commit/7956c0b30b2d2da7a429f5cd4a2da654b62649c1))
+* zaaktype not found throwing incorrect generic error ([fba69b4](https://github.com/wearefrank/zaakbrug/commit/fba69b49fc00cd4c409f385142c275ab62d23e58))
+
+### 🔥 Performance Improvements
+
+* implement simple cache for authorization token generation so that tokens are reused until the tokens expires ([22be3a0](https://github.com/wearefrank/zaakbrug/commit/22be3a00040bff708afdf00effe8878b4df61ed1))
+
+### 🔁 Continuous Integration
+
+* configure dependabot to update github-actions on a weekly basis ([01688c0](https://github.com/wearefrank/zaakbrug/commit/01688c0093910eee9bf1474006728f7dbe952a52))
+* **dependencies:** lock ci-cd-template workflow versions to commit hash instead of main branch ([3cee5ca](https://github.com/wearefrank/zaakbrug/commit/3cee5ca6dcdd43c37f38f8f585a38498cdd0b437))
+
 ## [1.19.13](https://github.com/wearefrank/zaakbrug/compare/v1.19.12...v1.19.13) (2024-07-01)
 
 ### 🧑‍💻 Code Refactoring

diff --git a/src/main/configurations/Translate/Common/xsl/CreateZakLa01Response.xslt b/src/main/configurations/Translate/Common/xsl/CreateZakLa01Response.xslt
@@ -435,10 +435,10 @@
                     <ZKN:versie><xsl:value-of select="gerelateerde/versie"/></ZKN:versie>
                 </xsl:if>
                 <xsl:if test="gerelateerde/status">
-                    <ZKN:status><xsl:value-of select="$statusMap(gerelateerde/status)"/></ZKN:status>
+                    <ZKN:status><xsl:value-of select="gerelateerde/status"/></ZKN:status>
                 </xsl:if>
                 <xsl:if test="gerelateerde/verzenddatum">
-                    <ZKN:verzenddatum><xsl:value-of select="format-date(gerelateerde/verzenddatum, '[Y0001][M01][D01]')"/></ZKN:verzenddatum>
+                    <ZKN:verzenddatum><xsl:value-of select="gerelateerde/verzenddatum"/></ZKN:verzenddatum>
                 </xsl:if>
                 <xsl:if test="gerelateerde/vertrouwelijkAanduiding">
                     <ZKN:vertrouwelijkAanduiding><xsl:value-of select="upper-case(gerelateerde/vertrouwelijkAanduiding)"/></ZKN:vertrouwelijkAanduiding>
@@ -457,18 +457,9 @@
                 <ZKN:beschrijving><xsl:value-of select="beschrijving"/></ZKN:beschrijving>
             </xsl:if>
             <xsl:if test="registratiedatum">
-                <ZKN:registratiedatum><xsl:value-of select="format-dateTime(registratiedatum, '[Y0001][M01][D01]')"/></ZKN:registratiedatum>
+                <ZKN:registratiedatum><xsl:value-of select="registratiedatum"/></ZKN:registratiedatum>
             </xsl:if>
         </ZKN:heeftRelevant>
     </xsl:template>
 
-    <xsl:variable name="statusMap" as="map(*)">
-        <xsl:map>
-          <xsl:map-entry key="'in_bewerking'" select="'In bewerking'" />
-          <xsl:map-entry key="'ter_vaststelling'" select="'Ter vaststelling'" />
-          <xsl:map-entry key="'definitief'" select="'Definitief'" />
-          <xsl:map-entry key="'gearchiveerd'" select="'Gearchiveerd'" />
-        </xsl:map>
-      </xsl:variable>
-
 </xsl:stylesheet>
diff --git a/src/main/configurations/Translate/ZaakDocument/xsl/ZdsHeeftRelevant.xsl b/src/main/configurations/Translate/ZaakDocument/xsl/ZdsHeeftRelevant.xsl
@@ -15,15 +15,29 @@
                 <formaat><xsl:value-of select="ZgwEnkelvoudigInformatieObject/formaat"/></formaat>
                 <taal><xsl:value-of select="ZgwEnkelvoudigInformatieObject/taal"/></taal>
                 <versie><xsl:value-of select="ZgwEnkelvoudigInformatieObject/versie"/></versie>
-                <status><xsl:value-of select="ZgwEnkelvoudigInformatieObject/status"/></status>
-                <verzenddatum><xsl:value-of select="ZgwEnkelvoudigInformatieObject/verzenddatum"/></verzenddatum>
+                <status><xsl:value-of select="$statusMap(ZgwEnkelvoudigInformatieObject/status)"/></status>
+                <xsl:if test="ZgwEnkelvoudigInformatieObject/verzenddatum != ''">
+                    <verzenddatum><xsl:value-of select="format-date(ZgwEnkelvoudigInformatieObject/verzenddatum, '[Y0001][M01][D01]')"/></verzenddatum>
+                </xsl:if>
                 <vertrouwelijkAanduiding><xsl:value-of select="ZgwEnkelvoudigInformatieObject/vertrouwelijkheidaanduiding"/></vertrouwelijkAanduiding>
                 <auteur><xsl:value-of select="ZgwEnkelvoudigInformatieObject/auteur"/></auteur>
                 <link><xsl:value-of select="ZgwEnkelvoudigInformatieObject/link"/></link>
             </gerelateerde>
             <titel><xsl:value-of select="$ZgwZaakInformatieObject/ZgwZaakInformatieObject/titel"/></titel>
             <beschrijving><xsl:value-of select="$ZgwZaakInformatieObject/ZgwZaakInformatieObject/beschrijving"/></beschrijving>
-            <registratiedatum><xsl:value-of select="$ZgwZaakInformatieObject/ZgwZaakInformatieObject/registratiedatum"/></registratiedatum>
+            <xsl:if test="$ZgwZaakInformatieObject/ZgwZaakInformatieObject/registratiedatum != ''">
+                <registratiedatum><xsl:value-of select="format-dateTime($ZgwZaakInformatieObject/ZgwZaakInformatieObject/registratiedatum, '[Y0001][M01][D01]')"/></registratiedatum>
+            </xsl:if>
+
         </heeftRelevant>
     </xsl:template>
-</xsl:stylesheet>
+
+    <xsl:variable name="statusMap" as="map(*)">
+        <xsl:map>
+          <xsl:map-entry key="'in_bewerking'" select="'In bewerking'" />
+          <xsl:map-entry key="'ter_vaststelling'" select="'Ter vaststelling'" />
+          <xsl:map-entry key="'definitief'" select="'Definitief'" />
+          <xsl:map-entry key="'gearchiveerd'" select="'Gearchiveerd'" />
+        </xsl:map>
+      </xsl:variable>
+</xsl:stylesheet>
diff --git a/src/main/resources/BuildInfo.properties b/src/main/resources/BuildInfo.properties
@@ -1,2 +1,2 @@
-instance.version=1.19.13
-versionDate_ddmmyyyy=01/07/2024
+instance.version=1.19.14
+versionDate_ddmmyyyy=03/07/2024
diff --git a/src/test/testtool/GeefLijstZaakdocumenten_Lv01/03/adapter-out.xml b/src/test/testtool/GeefLijstZaakdocumenten_Lv01/03/adapter-out.xml
@@ -10,12 +10,12 @@
 		<formaat>pdf</formaat>
 		<taal>nld</taal>
 		<versie>2</versie>
-		<status>definitief</status>
+		<status>Definitief</status>
 		<vertrouwelijkAanduiding>vertrouwelijk</vertrouwelijkAanduiding>
 		<auteur>Be Handelaar</auteur>
 	</gerelateerde>
 	<titel>Brief bijdrageregeling minima - Verzoek om aanvullende gegevens</titel>
-	<registratiedatum>2023-04-04T13:26:09.269263Z</registratiedatum>
+	<registratiedatum>20230404</registratiedatum>
 </heeftRelevant>
 </result>
 </results>