Merge pull request #139 from OP-TED/feature/TEDSWS-303_empty-dps

schivmeister · web-flow · commit 63fc8b475e40 · 2025-07-14T16:27:35.000+06:00
[TEDSWS-303] Guard against empty DynamicPurchaseSystemTechnique
diff --git a/mappings/package_eforms_sdk1.10_epo4.0/transformation/mappings/Lot.rml.ttl b/mappings/package_eforms_sdk1.10_epo4.0/transformation/mappings/Lot.rml.ttl
@@ -1451,7 +1451,8 @@ tedm:MG-DynamicPurchaseSystemTechnique-usesTechnique-Lot_ND-LotTenderingProcess
     rr:subjectMap
         [
             rdfs:label "ND-LotTenderingProcess";
-            rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_DynamicPurchaseSystemTechnicalUsage_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
+            # INFO: forbidden in subtypes 1-6, 14-15, 19, 23-24, 28, 32, 35-40, CEI, E1-E2, E6, T01-T02
+            rml:reference "if (exists(cac:ContractingSystem/cbc:ContractingSystemTypeCode)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_DynamicPurchaseSystemTechnicalUsage_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
             rr:class epo:DynamicPurchaseSystemTechnique
         ] ;
     rr:predicateObjectMap
diff --git a/mappings/package_eforms_sdk1.11_epo4.0/transformation/mappings/Lot.rml.ttl b/mappings/package_eforms_sdk1.11_epo4.0/transformation/mappings/Lot.rml.ttl
@@ -1451,7 +1451,8 @@ tedm:MG-DynamicPurchaseSystemTechnique-usesTechnique-Lot_ND-LotTenderingProcess
     rr:subjectMap
         [
             rdfs:label "ND-LotTenderingProcess";
-            rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_DynamicPurchaseSystemTechnicalUsage_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
+            # INFO: forbidden in subtypes 1-6, 14-15, 19, 23-24, 28, 32, 35-40, CEI, E1-E2, E6, T01-T02
+            rml:reference "if (exists(cac:ContractingSystem/cbc:ContractingSystemTypeCode)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_DynamicPurchaseSystemTechnicalUsage_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
             rr:class epo:DynamicPurchaseSystemTechnique
         ] ;
     rr:predicateObjectMap
diff --git a/mappings/package_eforms_sdk1.12_epo4.0/transformation/mappings/Lot.rml.ttl b/mappings/package_eforms_sdk1.12_epo4.0/transformation/mappings/Lot.rml.ttl
@@ -1451,7 +1451,8 @@ tedm:MG-DynamicPurchaseSystemTechnique-usesTechnique-Lot_ND-LotTenderingProcess
     rr:subjectMap
         [
             rdfs:label "ND-LotTenderingProcess";
-            rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_DynamicPurchaseSystemTechnicalUsage_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
+            # INFO: forbidden in subtypes 1-6, 14-15, 19, 23-24, 28, 32, 35-40, CEI, E1-E2, E6, T01-T02
+            rml:reference "if (exists(cac:ContractingSystem/cbc:ContractingSystemTypeCode)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_DynamicPurchaseSystemTechnicalUsage_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
             rr:class epo:DynamicPurchaseSystemTechnique
         ] ;
     rr:predicateObjectMap
diff --git a/mappings/package_eforms_sdk1.13_epo4.0/transformation/mappings/Lot.rml.ttl b/mappings/package_eforms_sdk1.13_epo4.0/transformation/mappings/Lot.rml.ttl
@@ -1451,7 +1451,8 @@ tedm:MG-DynamicPurchaseSystemTechnique-usesTechnique-Lot_ND-LotTenderingProcess
     rr:subjectMap
         [
             rdfs:label "ND-LotTenderingProcess";
-            rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_DynamicPurchaseSystemTechnicalUsage_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
+            # INFO: forbidden in subtypes 1-6, 14-15, 19, 23-24, 28, 32, 35-40, CEI, E1-E2, E6, T01-T02
+            rml:reference "if (exists(cac:ContractingSystem/cbc:ContractingSystemTypeCode)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_DynamicPurchaseSystemTechnicalUsage_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
             rr:class epo:DynamicPurchaseSystemTechnique
         ] ;
     rr:predicateObjectMap
diff --git a/mappings/package_eforms_sdk1.3_epo4.0/transformation/mappings/Lot.rml.ttl b/mappings/package_eforms_sdk1.3_epo4.0/transformation/mappings/Lot.rml.ttl
@@ -1451,7 +1451,8 @@ tedm:MG-DynamicPurchaseSystemTechnique-usesTechnique-Lot_ND-LotTenderingProcess
     rr:subjectMap
         [
             rdfs:label "ND-LotTenderingProcess";
-            rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_DynamicPurchaseSystemTechnicalUsage_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
+            # INFO: forbidden in subtypes 1-6, 14-15, 19, 23-24, 28, 32, 35-40, CEI, E1-E2, E6, T01-T02
+            rml:reference "if (exists(cac:ContractingSystem/cbc:ContractingSystemTypeCode)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_DynamicPurchaseSystemTechnicalUsage_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
             rr:class epo:DynamicPurchaseSystemTechnique
         ] ;
     rr:predicateObjectMap
diff --git a/mappings/package_eforms_sdk1.5_epo4.0/transformation/mappings/Lot.rml.ttl b/mappings/package_eforms_sdk1.5_epo4.0/transformation/mappings/Lot.rml.ttl
@@ -1451,7 +1451,8 @@ tedm:MG-DynamicPurchaseSystemTechnique-usesTechnique-Lot_ND-LotTenderingProcess
     rr:subjectMap
         [
             rdfs:label "ND-LotTenderingProcess";
-            rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_DynamicPurchaseSystemTechnicalUsage_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
+            # INFO: forbidden in subtypes 1-6, 14-15, 19, 23-24, 28, 32, 35-40, CEI, E1-E2, E6, T01-T02
+            rml:reference "if (exists(cac:ContractingSystem/cbc:ContractingSystemTypeCode)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_DynamicPurchaseSystemTechnicalUsage_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
             rr:class epo:DynamicPurchaseSystemTechnique
         ] ;
     rr:predicateObjectMap
diff --git a/mappings/package_eforms_sdk1.6_epo4.0/transformation/mappings/Lot.rml.ttl b/mappings/package_eforms_sdk1.6_epo4.0/transformation/mappings/Lot.rml.ttl
@@ -1451,7 +1451,8 @@ tedm:MG-DynamicPurchaseSystemTechnique-usesTechnique-Lot_ND-LotTenderingProcess
     rr:subjectMap
         [
             rdfs:label "ND-LotTenderingProcess";
-            rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_DynamicPurchaseSystemTechnicalUsage_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
+            # INFO: forbidden in subtypes 1-6, 14-15, 19, 23-24, 28, 32, 35-40, CEI, E1-E2, E6, T01-T02
+            rml:reference "if (exists(cac:ContractingSystem/cbc:ContractingSystemTypeCode)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_DynamicPurchaseSystemTechnicalUsage_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
             rr:class epo:DynamicPurchaseSystemTechnique
         ] ;
     rr:predicateObjectMap
diff --git a/mappings/package_eforms_sdk1.7_epo4.0/transformation/mappings/Lot.rml.ttl b/mappings/package_eforms_sdk1.7_epo4.0/transformation/mappings/Lot.rml.ttl
@@ -1451,7 +1451,8 @@ tedm:MG-DynamicPurchaseSystemTechnique-usesTechnique-Lot_ND-LotTenderingProcess
     rr:subjectMap
         [
             rdfs:label "ND-LotTenderingProcess";
-            rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_DynamicPurchaseSystemTechnicalUsage_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
+            # INFO: forbidden in subtypes 1-6, 14-15, 19, 23-24, 28, 32, 35-40, CEI, E1-E2, E6, T01-T02
+            rml:reference "if (exists(cac:ContractingSystem/cbc:ContractingSystemTypeCode)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_DynamicPurchaseSystemTechnicalUsage_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
             rr:class epo:DynamicPurchaseSystemTechnique
         ] ;
     rr:predicateObjectMap
diff --git a/mappings/package_eforms_sdk1.8_epo4.0/transformation/mappings/Lot.rml.ttl b/mappings/package_eforms_sdk1.8_epo4.0/transformation/mappings/Lot.rml.ttl
@@ -1451,7 +1451,8 @@ tedm:MG-DynamicPurchaseSystemTechnique-usesTechnique-Lot_ND-LotTenderingProcess
     rr:subjectMap
         [
             rdfs:label "ND-LotTenderingProcess";
-            rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_DynamicPurchaseSystemTechnicalUsage_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
+            # INFO: forbidden in subtypes 1-6, 14-15, 19, 23-24, 28, 32, 35-40, CEI, E1-E2, E6, T01-T02
+            rml:reference "if (exists(cac:ContractingSystem/cbc:ContractingSystemTypeCode)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_DynamicPurchaseSystemTechnicalUsage_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
             rr:class epo:DynamicPurchaseSystemTechnique
         ] ;
     rr:predicateObjectMap
diff --git a/mappings/package_eforms_sdk1.9_epo4.0/transformation/mappings/Lot.rml.ttl b/mappings/package_eforms_sdk1.9_epo4.0/transformation/mappings/Lot.rml.ttl
@@ -1451,7 +1451,8 @@ tedm:MG-DynamicPurchaseSystemTechnique-usesTechnique-Lot_ND-LotTenderingProcess
     rr:subjectMap
         [
             rdfs:label "ND-LotTenderingProcess";
-            rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_DynamicPurchaseSystemTechnicalUsage_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
+            # INFO: forbidden in subtypes 1-6, 14-15, 19, 23-24, 28, 32, 35-40, CEI, E1-E2, E6, T01-T02
+            rml:reference "if (exists(cac:ContractingSystem/cbc:ContractingSystemTypeCode)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_DynamicPurchaseSystemTechnicalUsage_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
             rr:class epo:DynamicPurchaseSystemTechnique
         ] ;
     rr:predicateObjectMap
diff --git a/src/mappings/Lot.rml.ttl b/src/mappings/Lot.rml.ttl
@@ -1451,7 +1451,8 @@ tedm:MG-DynamicPurchaseSystemTechnique-usesTechnique-Lot_ND-LotTenderingProcess
     rr:subjectMap
         [
             rdfs:label "ND-LotTenderingProcess";
-            rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_DynamicPurchaseSystemTechnicalUsage_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
+            # INFO: forbidden in subtypes 1-6, 14-15, 19, 23-24, 28, 32, 35-40, CEI, E1-E2, E6, T01-T02
+            rml:reference "if (exists(cac:ContractingSystem/cbc:ContractingSystemTypeCode)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_DynamicPurchaseSystemTechnicalUsage_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
             rr:class epo:DynamicPurchaseSystemTechnique
         ] ;
     rr:predicateObjectMap
diff --git a/src/output-pmc.ttl b/src/output-pmc.ttl
@@ -37,9 +37,6 @@ epd:id_52fe3748-f475-4381-9dbf-31ebb08889e8_ContractTerm_adyhtKZkzxr6SEjy3tRyua
   epo:hasBroadPlaceOfPerformance <http://publications.europa.eu/resource/authority/other-place-service/anyw-eea>;
   epo:hasContractNatureType <http://publications.europa.eu/resource/authority/contract-nature/services> .
 
-epd:id_52fe3748-f475-4381-9dbf-31ebb08889e8_DynamicPurchaseSystemTechnicalUsage_Hu7wzHDygWmeSqTPnwY9wa
-  a epo:DynamicPurchaseSystemTechnique .
-
 epd:id_52fe3748-f475-4381-9dbf-31ebb08889e8_Identifier_ORG-0001 a adms:Identifier;
   epo:hasScheme "organization";
   skos:notation "ORG-0001" .
@@ -57,7 +54,6 @@ epd:id_52fe3748-f475-4381-9dbf-31ebb08889e8_Lot_LOT-0001 a epo:Lot;
   epo:hasPurpose epd:id_52fe3748-f475-4381-9dbf-31ebb08889e8_LotPurpose_hq9SUTbfgyszaBVWP2RTwv;
   epo:isSubjectToLotSpecificTerm epd:id_52fe3748-f475-4381-9dbf-31ebb08889e8_SubmissionTerm_ACUWmqLfdo5YEi9wsUS9mJ,
     epd:id_52fe3748-f475-4381-9dbf-31ebb08889e8_SubmissionTerm_adyhtKZkzxr6SEjy3tRyua;
-  epo:usesTechnique epd:id_52fe3748-f475-4381-9dbf-31ebb08889e8_DynamicPurchaseSystemTechnicalUsage_Hu7wzHDygWmeSqTPnwY9wa;
   dct:description "Lot description"@en;
   dct:title "Lot Name"@en;
   adms:identifier epd:id_52fe3748-f475-4381-9dbf-31ebb08889e8_LotIdentifier_adyhtKZkzxr6SEjy3tRyua .
diff --git a/src/output-versioned/E1_minimal-1.13.ttl b/src/output-versioned/E1_minimal-1.13.ttl
@@ -37,9 +37,6 @@ epd:id_52fe3748-f475-4381-9dbf-31ebb08889e8_ContractTerm_adyhtKZkzxr6SEjy3tRyua
   epo:hasBroadPlaceOfPerformance <http://publications.europa.eu/resource/authority/other-place-service/anyw-eea>;
   epo:hasContractNatureType <http://publications.europa.eu/resource/authority/contract-nature/services> .
 
-epd:id_52fe3748-f475-4381-9dbf-31ebb08889e8_DynamicPurchaseSystemTechnicalUsage_Hu7wzHDygWmeSqTPnwY9wa
-  a epo:DynamicPurchaseSystemTechnique .
-
 epd:id_52fe3748-f475-4381-9dbf-31ebb08889e8_Identifier_ORG-0001 a adms:Identifier;
   epo:hasScheme "organization";
   skos:notation "ORG-0001" .
@@ -57,7 +54,6 @@ epd:id_52fe3748-f475-4381-9dbf-31ebb08889e8_Lot_LOT-0001 a epo:Lot;
   epo:hasPurpose epd:id_52fe3748-f475-4381-9dbf-31ebb08889e8_LotPurpose_hq9SUTbfgyszaBVWP2RTwv;
   epo:isSubjectToLotSpecificTerm epd:id_52fe3748-f475-4381-9dbf-31ebb08889e8_SubmissionTerm_ACUWmqLfdo5YEi9wsUS9mJ,
     epd:id_52fe3748-f475-4381-9dbf-31ebb08889e8_SubmissionTerm_adyhtKZkzxr6SEjy3tRyua;
-  epo:usesTechnique epd:id_52fe3748-f475-4381-9dbf-31ebb08889e8_DynamicPurchaseSystemTechnicalUsage_Hu7wzHDygWmeSqTPnwY9wa;
   dct:description "Lot description"@en;
   dct:title "Lot Name"@en;
   adms:identifier epd:id_52fe3748-f475-4381-9dbf-31ebb08889e8_LotIdentifier_adyhtKZkzxr6SEjy3tRyua .
diff --git a/test_data/sampling_eforms_all_can/eforms-sdk-1.8/op-test-eforms2/2025-OJS002-00001899.xml b/test_data/sampling_eforms_all_can/eforms-sdk-1.8/op-test-eforms2/2025-OJS002-00001899.xml
