Merge branch 'master' into tiny-style-fixes-and-google-namepace-to-we…

…arefrank
wearefrank · Jan 9, 2025 · ae6adcd · ae6adcd
2 parents c8fe952 + d98747b
commit ae6adcd
Show file tree

Hide file tree

Showing 10 changed files with 1,139 additions and 1,152 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -55,7 +55,7 @@ jobs:
   run-larva-scenarios:
     uses: ./.github/workflows/run-larva-scenarios.yml
     needs:
-      - version-next
+      - analyze-commits
       - ci
     with:
       image-id: ${{ needs.ci.outputs.image-id }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,32 @@
 [![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.22.8](https://github.com/wearefrank/zaakbrug/compare/v1.22.7...v1.22.8) (2025-01-08)
+
+### 🐛 Bug Fixes
+
+* zaak 'heeft.indicatieLaatsteStatus' incorrectly uses zgw 'statustype.isEindstatus' instead of 'status.indicatieLaatstGezetteStatus' ([e443421](https://github.com/wearefrank/zaakbrug/commit/e44342160faf53f88d443eb5d7f3ff5a925209ee))
+
+### 🧑‍💻 Code Refactoring
+
+* missing descriptive error message when resultaattype not found during updateZaak when resultaat is present in input message ([#486](https://github.com/wearefrank/zaakbrug/issues/486)) ([b0104d9](https://github.com/wearefrank/zaakbrug/commit/b0104d9d49be339fda9e2b10597bb1aef1d90c64))
+* use current zds time instead of 000000 when creating status from einddatum or from sta.datumStatusGezet in voegZaakdocumentToe ([243eb31](https://github.com/wearefrank/zaakbrug/commit/243eb31f2d09b4bdfe44b54547ce6488c5bdbf5b))
+
+### ✅ Tests
+
+* update test cases according to the update of heeft.indicatieLaatsteStatus field ([54c3cec](https://github.com/wearefrank/zaakbrug/commit/54c3cec575dd548f193c2ab8c36acad1d7380c59))
+* **unit:** validate/fix disabled Larva testcases after obsolete broken testcases cleanup ([#489](https://github.com/wearefrank/zaakbrug/issues/489)) ([be19513](https://github.com/wearefrank/zaakbrug/commit/be195130da1f657d0d84e8ccb10d613585ff49f6))
+
+### 🤖 Build System
+
+* **dependencies:** bump the docusaurus group ([#495](https://github.com/wearefrank/zaakbrug/issues/495)) ([6679001](https://github.com/wearefrank/zaakbrug/commit/6679001a765ee1b032832425667d2feef79031c8))
+* **dependencies:** bump the docusaurus group across 1 directory with 7 updates ([#488](https://github.com/wearefrank/zaakbrug/issues/488)) ([748456f](https://github.com/wearefrank/zaakbrug/commit/748456f274154bdba5310f54d90c79438d0925f3))
+* **dependencies:** bump the github-actions group across 1 directory with 2 updates ([#475](https://github.com/wearefrank/zaakbrug/issues/475)) ([930013a](https://github.com/wearefrank/zaakbrug/commit/930013a083ac7810e6f9dc81a6ca63fa9a8d4efa))
+
+### 🔁 Continuous Integration
+
+* automatically run Larva tests as part of CI workflows ([#479](https://github.com/wearefrank/zaakbrug/issues/479)) ([2f18e2d](https://github.com/wearefrank/zaakbrug/commit/2f18e2d78734ce6030fad8e61613b623a51feac4))
+* fix incorrect job dependency version-next to analyze-commits ([55b4ef0](https://github.com/wearefrank/zaakbrug/commit/55b4ef07e040aefd998ccc004b74885ce5c5abdb))
+
 ## [1.22.7](https://github.com/wearefrank/zaakbrug/compare/v1.22.6...v1.22.7) (2024-12-17)
 
 ### 🐛 Bug Fixes

diff --git a/docusaurus/package-lock.json b/docusaurus/package-lock.json
diff --git a/docusaurus/package.json b/docusaurus/package.json
@@ -15,17 +15,17 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@docusaurus/core": "^3.6.3",
-    "@docusaurus/preset-classic": "^3.6.3",
+    "@docusaurus/core": "^3.7.0",
+    "@docusaurus/preset-classic": "^3.7.0",
     "@mdx-js/react": "^3.1.0",
     "clsx": "^2.0.0",
     "prism-react-renderer": "^2.4.1",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
   },
   "devDependencies": {
     "@docusaurus/module-type-aliases": "^3.4.0",
-    "@docusaurus/tsconfig": "^3.6.3",
+    "@docusaurus/tsconfig": "^3.7.0",
     "@docusaurus/types": "^3.4.0",
     "typescript": "~5.7.2"
   },

diff --git a/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml b/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml
diff --git a/src/main/configurations/Translate/Configuration_VoegZaakdocumentToe_Lk01.xml b/src/main/configurations/Translate/Configuration_VoegZaakdocumentToe_Lk01.xml
@@ -313,7 +313,7 @@
                 >
                 <Param name="ZgwZaak" sessionKey="ZgwZaak" type="DOMDOC"/>
                 <Param name="ZgwStatusType" sessionKey="ZgwStatusType" type="DOMDOC"/>
-                <Param name="ZdsStatusDatum" xpathExpression="concat(object/isRelevantVoor/sta.datumStatusGezet,'000000')"/>
+                <Param name="ZdsStatusDatum" xpathExpression="object/isRelevantVoor/sta.datumStatusGezet"/>
                 <Forward name="success" path="PostZgwStatusSender"/>
             </XsltPipe>
 

diff --git a/src/main/configurations/Translate/CreeerZaak_LK01/xsl/CreateZdsHeeft.xslt b/src/main/configurations/Translate/CreeerZaak_LK01/xsl/CreateZdsHeeft.xslt
@@ -50,7 +50,7 @@
                 </xsl:choose>
                 <xsl:choose>
                     <xsl:when test="$ZgwStatusType">
-                        <indicatieLaatsteStatus><xsl:value-of select="zgw:convertZgwBooleanToZdsBoolean($ZgwStatusType/root/ZgwStatusType/isEindstatus)"/></indicatieLaatsteStatus>
+                        <indicatieLaatsteStatus><xsl:value-of select="zgw:convertZgwBooleanToZdsBoolean($ZgwStatus/ZgwStatus/indicatieLaatstGezetteStatus)"/></indicatieLaatsteStatus>
                     </xsl:when>
                     <xsl:otherwise>
                         <indicatieLaatsteStatus><xsl:value-of select="$IndicatieLaatsteStatus"/></indicatieLaatsteStatus>

diff --git a/src/main/configurations/Translate/Zgw/Zaken/Model/ZgwStatus.xslt b/src/main/configurations/Translate/Zgw/Zaken/Model/ZgwStatus.xslt
@@ -25,10 +25,12 @@
             and (string-length($ZdsEinddatum) > 0) 
             and (string-length($ZdsStatusDatum) = 0) 
             and not($ZdsEinddatum = 'Undefined')">
-                <xsl:value-of select="zgw:toZgwDatetime(concat($ZdsEinddatum,'000000'))"/>
+                <!-- No guarantee that current time is later than statusDatumGezet of last set status if einddatum is in the past -->
+                <xsl:value-of select="zgw:toZgwDatetime(concat($ZdsEinddatum, zgw:currentZdsTime()))" />
             </xsl:when>
             <xsl:otherwise>
-                <xsl:value-of select="zgw:toZgwDatetime($ZdsStatusDatum)"/>
+                <!-- No guarantee that current time is later than statusDatumGezet of last set status if einddatum is in the past -->
+                <xsl:value-of select="zgw:toZgwDatetime(concat($ZdsStatusDatum, zgw:currentZdsTime()))" />
             </xsl:otherwise>
         </xsl:choose>
     </xsl:variable>

diff --git a/src/main/configurations/Translate/Zgw/ZgwFunctionsBase.xslt b/src/main/configurations/Translate/Zgw/ZgwFunctionsBase.xslt
@@ -260,4 +260,32 @@
         </xsl:choose>
     </xsl:function>
 
+    <xsl:function name="zgw:currentZdsDateTime" as="xs:string">
+        <xsl:variable name="currentUtcDateTime" select="adjust-dateTime-to-timezone(current-dateTime(), xs:dayTimeDuration('PT0H'))" />
+        <xsl:variable name="timezoneOffset" select="format-dateTime($currentUtcDateTime, '[Z]', (), (), environment-variable('zaakbrug.zds.timezone'))" />
+        <xsl:variable name="dayTimeDuration" as="xs:dayTimeDuration">
+            <xsl:choose>
+                <xsl:when test="starts-with($timezoneOffset, '+')">
+                    <xsl:value-of select="concat('PT', substring-before(substring-after($timezoneOffset, '+'), ':'), 'H')" />
+                </xsl:when>
+                <xsl:when test="starts-with($timezoneOffset, '-')">
+                    <xsl:value-of select="concat('PT-', substring-before(substring-after($timezoneOffset, '-'), ':'), 'H')" />
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="'PT0H'"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        <xsl:variable name="adjustedDateTime" select="adjust-dateTime-to-timezone($currentUtcDateTime, $dayTimeDuration)" />
+        <xsl:value-of select="format-dateTime($adjustedDateTime, '[Y0001][M01][D01][H01][m01][s01]')" />
+    </xsl:function>
+
+    <xsl:function name="zgw:currentZdsDate" as="xs:string">
+        <xsl:value-of select="substring(zgw:currentZdsDateTime(), 1, 8)" />
+    </xsl:function>
+
+    <xsl:function name="zgw:currentZdsTime" as="xs:string">
+        <xsl:value-of select="substring(zgw:currentZdsDateTime(), 9, 6)" />
+    </xsl:function>
+
 </xsl:stylesheet>
diff --git a/src/main/resources/BuildInfo.properties b/src/main/resources/BuildInfo.properties
@@ -1,2 +1,2 @@
-instance.version=1.22.7
-versionDate_ddmmyyyy=17/12/2024
+instance.version=1.22.8
+versionDate_ddmmyyyy=08/01/2025