Merge pull request #82 from EFA-FHB/feature/D603345-4795-release-1.0.6

Feature/D603345-4795 Release 1.0.6
EFA-FHB · Sep 22, 2023 · b60b358 · b60b358
2 parents 22b939c + 8d955cb
commit b60b358
Show file tree

Hide file tree

Showing 12 changed files with 462 additions and 88 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -26,8 +26,9 @@ org.gradle.caching=true
 
 #Scripts needs adoption if this name is being removed
 name=eforms-validator-core
-version=1.0.5
+version=1.0.6
 group=com.nortal.efafhb.eforms.validator
+
 # Spotless (Java 17)
 org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
   --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \

diff --git a/src/main/resources/openapi/public.yml b/src/main/resources/openapi/public.yml
@@ -6,8 +6,8 @@ info:
     Über diesen Endpunkt können Bekanntmachungen im eForms Format validiert werden. 
     Für die eForms-DE Validierung in Version 1.0. wird aktuell eine Kombination aus folgenden Schema und Schematron Regeln genutzt:
       * eForms-EU 1.5.1 [https://github.com/OP-TED/eForms-SDK/tree/1.5.1](https://github.com/OP-TED/eForms-SDK/tree/1.5.1)
-      * eForms-DE 1.0.1 (eforms-de-schematron v0.5.2) [https://projekte.kosit.org/eforms/eforms-de-schematron/-/tags/v0.5.2](https://projekte.kosit.org/eforms/eforms-de-schematron/-/tags/v0.5.2) und eForms-EU 1.5.1 [https://github.com/OP-TED/eForms-SDK/tree/1.5.1](https://github.com/OP-TED/eForms-SDK/tree/1.5.1)
-      * eForms-DE 1.1.0 (eforms-de-schematron v0.6.0) [https://projekte.kosit.org/eforms/eforms-de-schematron/-/tags/v0.6.0](https://projekte.kosit.org/eforms/eforms-de-schematron/-/tags/v0.6.0) und eForms-EU 1.7.0 [https://github.com/OP-TED/eForms-SDK/tree/1.7.0](https://github.com/OP-TED/eForms-SDK/tree/1.7.0)
+      * eForms-DE 1.0.1 (eforms-de-schematron v0.5.3) [https://projekte.kosit.org/eforms/eforms-de-schematron/-/tags/v0.5.3](https://projekte.kosit.org/eforms/eforms-de-schematron/-/tags/v0.5.3) und eForms-EU 1.5.1 [https://github.com/OP-TED/eForms-SDK/tree/1.5.1](https://github.com/OP-TED/eForms-SDK/tree/1.5.1)
+      * eForms-DE 1.1.0 (eforms-de-schematron v0.6.1) [https://projekte.kosit.org/eforms/eforms-de-schematron/-/tags/v0.6.1](https://projekte.kosit.org/eforms/eforms-de-schematron/-/tags/v0.6.1) und eForms-EU 1.7.0 [https://github.com/OP-TED/eForms-SDK/tree/1.7.0](https://github.com/OP-TED/eForms-SDK/tree/1.7.0)
 
   contact:
     name: oeffentliche-vergabe-support@nortal.com

diff --git a/src/main/resources/schema/de/1.1.0/common/EFORMS-ExtensionAggregateComponents-2.3.xsd b/src/main/resources/schema/de/1.1.0/common/EFORMS-ExtensionAggregateComponents-2.3.xsd
@@ -33,6 +33,7 @@
 	<xsd:element name="Change" type="ChangeType"/>
 	<xsd:element name="Changes" type="ChangesType"/>
 	<xsd:element name="ChangeReason" type="ReasonType"/>
+	<xsd:element name="ChangedSection" type="ChangedSectionType"/>
 	<xsd:element name="Company" type="CompanyType"/>
 	<xsd:element name="ConcessionRevenue" type="ConcessionRevenueType"/>
 	<xsd:element name="ContractAggregatedAmounts" type="ContractAggregatedAmountsType"/>
@@ -188,10 +189,10 @@
 	</xsd:complexType>
 	<xsd:complexType name="ChangeType">
 		<xsd:sequence>
-			<xsd:element ref="efbc:ChangedSectionIdentifier" minOccurs="0" maxOccurs="unbounded"/>
 			<xsd:element ref="efbc:ChangeDescription" minOccurs="0" maxOccurs="unbounded"/>
 			<xsd:element ref="efbc:ProcurementDocumentsChangeDate" minOccurs="0" maxOccurs="1"/>
 			<xsd:element ref="efbc:ProcurementDocumentsChangeIndicator" minOccurs="0" maxOccurs="1"/>
+			<xsd:element ref="efac:ChangedSection" minOccurs="0" maxOccurs="unbounded"/>
 		</xsd:sequence>
 	</xsd:complexType>
 	<xsd:complexType name="ChangesType">
@@ -201,6 +202,11 @@
 			<xsd:element ref="efac:ChangeReason" minOccurs="0" maxOccurs="1"/>
 		</xsd:sequence>
 	</xsd:complexType>
+	<xsd:complexType name="ChangedSectionType">
+		<xsd:sequence>
+			<xsd:element ref="efbc:ChangedSectionIdentifier" minOccurs="0" maxOccurs="1"/>
+		</xsd:sequence>
+	</xsd:complexType>
 	<xsd:complexType name="CompanyType">
 		<xsd:sequence>
 			<xsd:element ref="cbc:WebsiteURI" minOccurs="0" maxOccurs="1"/>

diff --git a/src/main/resources/schematron/de/excluded_rules.txt b/src/main/resources/schematron/de/excluded_rules.txt
@@ -7,4 +7,6 @@ BR-BT-00805-0051
 BR-BT-00165-0052
 BR-BT-00067-0104
 BR-BT-00011-0052
-BR-BT-00740-0052
+BR-BT-00740-0052
+BR-BT-00738-0053
+BR-BT-00005-0150
diff --git a/src/main/resources/schematron/de/native-validation/1.0.1/eforms-de-validation.sch b/src/main/resources/schematron/de/native-validation/1.0.1/eforms-de-validation.sch
@@ -128,6 +128,22 @@
       <assert id="CR-BT-01-Germany" test="exists(cac:TenderingTerms/cac:ProcurementLegislationDocumentReference/cbc:ID)" role="error">[CR-BT-01-Germany] cac:TenderingTerms/cac:ProcurementLegislationDocumentReference/cbc:ID must exist in <name />.</assert>
     </rule>
 
+
+    <rule context="$ROOT-NODE/cbc:RequestedPublicationDate">
+
+      <let name="DISPATCH-DATE-NODE" value="../cbc:IssueDate" />
+
+      <assert test="$DISPATCH-DATE-NODE castable as xs:date" id="SR-BT-738-2">[SR-BT-738-2] ../cbc:IssueDate=<value-of select="../cbc:IssueDate"/> is not a valid calendar date.</assert>
+
+      <assert id="SR-BT-738-1" test=" xs:date(.) ge xs:date($DISPATCH-DATE-NODE)" role="error">[SR-DE-26] Calendar date of <name />=<value-of select="." /> must be greater or equals that of cbc:IssueDate=<value-of select="$DISPATCH-DATE-NODE" /></assert>
+
+    <!-- This rule is replacement of BR-BT-00738-0053 to keep compatibility with TED -->
+    <assert id="SR-BT-738-P60D" test="xs:date(.) - xs:date($DISPATCH-DATE-NODE) le xs:dayTimeDuration('P92D')">[SR-BT-738-P60D](<name/>) must not be more than 92 days after IssueDate due to TED requirements. <value-of select="concat('Current IssueDate=',xs:date($DISPATCH-DATE-NODE),' and RequestedPublicationDate=', xs:date(.), ' have a difference of ' , days-from-duration( xs:date(.) - xs:date($DISPATCH-DATE-NODE)), ' days.')"/></assert>
+
+    </rule>
+
+
+
 <!-- Be aware that it is about UBO as child of  efac:Organizations https://github.com/OP-TED/eForms-SDK/discussions/440 -->
     <rule
       context="$EXTENSION-NODE/efac:Organizations/efac:UltimateBeneficialOwner">
@@ -334,18 +350,6 @@
 
     </rule>
 
-    <rule
-      context="$ROOT-NODE/cac:ProcurementProjectLot[cbc:ID/@schemeName = 'Part']/cac:TenderingTerms">
-      <!-- sanityrule for bt-15 part -->
-      <assert id="SR-DE-24" test="
-          if ($SUBTYPE = $SUBTYPES-BT-15) then
-            (count(cac:CallForTendersDocumentReference) >= 1)
-          else
-            true()" role="error">[SR-DE-24] cac:CallForTendersDocumentReference must exist at least once in <name />. </assert>
-
-    </rule>
-
-
     <!-- following  rules CR-DE-BT-708-Part and CR-DE-BT-708-Lot may be combined into single one -->
     <rule
       context="$ROOT-NODE/cac:ProcurementProjectLot[cbc:ID/@schemeName = 'Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference">