From ed5376120a3776b9a3cb97666f7de41934b5775a Mon Sep 17 00:00:00 2001
From: Bertrand Lorentz <bertrand.lorentz@publications.europa.eu>
Date: Thu, 21 Sep 2023 11:58:25 +0200
Subject: [PATCH] fields: Add pattern constraint for BT-1501(s)-Contract
 (TEDEFO-1964)

Also add corresponding schematron rules.
---
 fields/fields.json                          | 8 ++++++--
 schematrons/dynamic/validation-stage-3b.sch | 3 +++
 schematrons/static/validation-stage-3b.sch  | 3 +++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/fields/fields.json b/fields/fields.json
index 81da21122..3e2df752f 100644
--- a/fields/fields.json
+++ b/fields/fields.json
@@ -2,8 +2,8 @@
   "ublVersion" : "2.3",
   "sdkVersion" : "eforms-sdk-1.10.0-SNAPSHOT",
   "metadataDatabase" : {
-    "version" : "1.9.58",
-    "createdOn" : "2023-09-19T16:34:47"
+    "version" : "1.9.60",
+    "createdOn" : "2023-09-21T11:22:09"
   },
   "xmlStructure" : [ {
     "id" : "ND-Root",
@@ -5888,6 +5888,10 @@
         "severity" : "ERROR"
       } ]
     },
+    "pattern" : {
+      "value" : "^(RESULT|((CON|RES|TEN|TPA|TPO|ORG)-\\d{4}))$",
+      "severity" : "ERROR"
+    },
     "assert" : {
       "value" : "{ND-Root} ${TRUE}",
       "severity" : "ERROR",
diff --git a/schematrons/dynamic/validation-stage-3b.sch b/schematrons/dynamic/validation-stage-3b.sch
index 86b2ac5f8..f15303ae0 100644
--- a/schematrons/dynamic/validation-stage-3b.sch
+++ b/schematrons/dynamic/validation-stage-3b.sch
@@ -2529,6 +2529,9 @@
 	<rule context="/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:ContractModification/efbc:ChangedNoticeIdentifier">
 		<assert id="BR-BT-01501-0102" role="ERROR" test="matches(normalize-space(.),'^([a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}-(0[1-9]|[1-9]\d)|(\d{1,8})-(19|20)\d\d)$')">rule|text|BR-BT-01501-0102</assert>
 	</rule>
+	<rule context="/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:ContractModification/efac:Change/efac:ChangedSection/efbc:ChangedSectionIdentifier">
+		<assert id="BR-BT-01501-0109" role="ERROR" test="matches(normalize-space(.),'^(RESULT|((CON|RES|TEN|TPA|TPO|ORG)-\d{4}))$')">rule|text|BR-BT-01501-0109</assert>
+	</rule>
 	<rule context="/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:LotTender/cbc:ID">
 		<assert id="BR-BT-03202-0051" role="ERROR" test="matches(normalize-space(.),'^TEN-\d{4}$')">rule|text|BR-BT-03202-0051</assert>
 	</rule>
diff --git a/schematrons/static/validation-stage-3b.sch b/schematrons/static/validation-stage-3b.sch
index 86b2ac5f8..f15303ae0 100644
--- a/schematrons/static/validation-stage-3b.sch
+++ b/schematrons/static/validation-stage-3b.sch
@@ -2529,6 +2529,9 @@
 	<rule context="/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:ContractModification/efbc:ChangedNoticeIdentifier">
 		<assert id="BR-BT-01501-0102" role="ERROR" test="matches(normalize-space(.),'^([a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}-(0[1-9]|[1-9]\d)|(\d{1,8})-(19|20)\d\d)$')">rule|text|BR-BT-01501-0102</assert>
 	</rule>
+	<rule context="/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:ContractModification/efac:Change/efac:ChangedSection/efbc:ChangedSectionIdentifier">
+		<assert id="BR-BT-01501-0109" role="ERROR" test="matches(normalize-space(.),'^(RESULT|((CON|RES|TEN|TPA|TPO|ORG)-\d{4}))$')">rule|text|BR-BT-01501-0109</assert>
+	</rule>
 	<rule context="/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:LotTender/cbc:ID">
 		<assert id="BR-BT-03202-0051" role="ERROR" test="matches(normalize-space(.),'^TEN-\d{4}$')">rule|text|BR-BT-03202-0051</assert>
 	</rule>