Merge pull request #136 from OP-TED/feature/TEDSWS-325_access-term

schivmeister · web-flow · commit 558708386c42 · 2025-07-14T16:21:04.000+06:00
[TEDSWS-325] Guard against empty AccessTerm instance in PIN
diff --git a/mappings/package_eforms_sdk1.10_epo4.0/transformation/mappings/AccessTerm-pin.rml.ttl b/mappings/package_eforms_sdk1.10_epo4.0/transformation/mappings/AccessTerm-pin.rml.ttl
@@ -108,7 +108,7 @@ tedm:AccessTerm_ND-PartTenderingTerms a rr:TriplesMap ;
         [
             rdfs:label "ND-PartTenderingTerms" ;
             rr:class epo:AccessTerm ;
-            rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_AccessTerm_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
+            rml:reference "if(exists(cac:AdditionalInformationParty/cac:PartyIdentification/cbc:ID) or exists(cac:DocumentProviderParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_AccessTerm_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
         ] ;
     rr:predicateObjectMap
         [
@@ -117,8 +117,8 @@ tedm:AccessTerm_ND-PartTenderingTerms a rr:TriplesMap ;
                 [
                     rr:parentTriplesMap tedm:MG-PlannedProcurementPart-refersToPlannedPart-AccessTerm_ND-PartTenderingTerms ;
                     rr:joinCondition [
-                        rr:child "path(../..)" ;
-                        rr:parent "path(../..)" ;
+                        rr:child "path(.)" ;
+                        rr:parent "path(.)" ;
                     ] ;
                 ] ;
         ] ;
diff --git a/mappings/package_eforms_sdk1.11_epo4.0/transformation/mappings/AccessTerm-pin.rml.ttl b/mappings/package_eforms_sdk1.11_epo4.0/transformation/mappings/AccessTerm-pin.rml.ttl
@@ -108,7 +108,7 @@ tedm:AccessTerm_ND-PartTenderingTerms a rr:TriplesMap ;
         [
             rdfs:label "ND-PartTenderingTerms" ;
             rr:class epo:AccessTerm ;
-            rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_AccessTerm_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
+            rml:reference "if(exists(cac:AdditionalInformationParty/cac:PartyIdentification/cbc:ID) or exists(cac:DocumentProviderParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_AccessTerm_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
         ] ;
     rr:predicateObjectMap
         [
@@ -117,8 +117,8 @@ tedm:AccessTerm_ND-PartTenderingTerms a rr:TriplesMap ;
                 [
                     rr:parentTriplesMap tedm:MG-PlannedProcurementPart-refersToPlannedPart-AccessTerm_ND-PartTenderingTerms ;
                     rr:joinCondition [
-                        rr:child "path(../..)" ;
-                        rr:parent "path(../..)" ;
+                        rr:child "path(.)" ;
+                        rr:parent "path(.)" ;
                     ] ;
                 ] ;
         ] ;
diff --git a/mappings/package_eforms_sdk1.12_epo4.0/transformation/mappings/AccessTerm-pin.rml.ttl b/mappings/package_eforms_sdk1.12_epo4.0/transformation/mappings/AccessTerm-pin.rml.ttl
@@ -108,7 +108,7 @@ tedm:AccessTerm_ND-PartTenderingTerms a rr:TriplesMap ;
         [
             rdfs:label "ND-PartTenderingTerms" ;
             rr:class epo:AccessTerm ;
-            rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_AccessTerm_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
+            rml:reference "if(exists(cac:AdditionalInformationParty/cac:PartyIdentification/cbc:ID) or exists(cac:DocumentProviderParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_AccessTerm_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
         ] ;
     rr:predicateObjectMap
         [
@@ -117,8 +117,8 @@ tedm:AccessTerm_ND-PartTenderingTerms a rr:TriplesMap ;
                 [
                     rr:parentTriplesMap tedm:MG-PlannedProcurementPart-refersToPlannedPart-AccessTerm_ND-PartTenderingTerms ;
                     rr:joinCondition [
-                        rr:child "path(../..)" ;
-                        rr:parent "path(../..)" ;
+                        rr:child "path(.)" ;
+                        rr:parent "path(.)" ;
                     ] ;
                 ] ;
         ] ;
diff --git a/mappings/package_eforms_sdk1.13_epo4.0/transformation/mappings/AccessTerm-pin.rml.ttl b/mappings/package_eforms_sdk1.13_epo4.0/transformation/mappings/AccessTerm-pin.rml.ttl
@@ -108,7 +108,7 @@ tedm:AccessTerm_ND-PartTenderingTerms a rr:TriplesMap ;
         [
             rdfs:label "ND-PartTenderingTerms" ;
             rr:class epo:AccessTerm ;
-            rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_AccessTerm_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
+            rml:reference "if(exists(cac:AdditionalInformationParty/cac:PartyIdentification/cbc:ID) or exists(cac:DocumentProviderParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_AccessTerm_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
         ] ;
     rr:predicateObjectMap
         [
@@ -117,8 +117,8 @@ tedm:AccessTerm_ND-PartTenderingTerms a rr:TriplesMap ;
                 [
                     rr:parentTriplesMap tedm:MG-PlannedProcurementPart-refersToPlannedPart-AccessTerm_ND-PartTenderingTerms ;
                     rr:joinCondition [
-                        rr:child "path(../..)" ;
-                        rr:parent "path(../..)" ;
+                        rr:child "path(.)" ;
+                        rr:parent "path(.)" ;
                     ] ;
                 ] ;
         ] ;
diff --git a/mappings/package_eforms_sdk1.3_epo4.0/transformation/mappings/AccessTerm-pin.rml.ttl b/mappings/package_eforms_sdk1.3_epo4.0/transformation/mappings/AccessTerm-pin.rml.ttl
@@ -108,7 +108,7 @@ tedm:AccessTerm_ND-PartTenderingTerms a rr:TriplesMap ;
         [
             rdfs:label "ND-PartTenderingTerms" ;
             rr:class epo:AccessTerm ;
-            rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_AccessTerm_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
+            rml:reference "if(exists(cac:AdditionalInformationParty/cac:PartyIdentification/cbc:ID) or exists(cac:DocumentProviderParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_AccessTerm_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
         ] ;
     rr:predicateObjectMap
         [
@@ -117,8 +117,8 @@ tedm:AccessTerm_ND-PartTenderingTerms a rr:TriplesMap ;
                 [
                     rr:parentTriplesMap tedm:MG-PlannedProcurementPart-refersToPlannedPart-AccessTerm_ND-PartTenderingTerms ;
                     rr:joinCondition [
-                        rr:child "path(../..)" ;
-                        rr:parent "path(../..)" ;
+                        rr:child "path(.)" ;
+                        rr:parent "path(.)" ;
                     ] ;
                 ] ;
         ] ;
diff --git a/mappings/package_eforms_sdk1.5_epo4.0/transformation/mappings/AccessTerm-pin.rml.ttl b/mappings/package_eforms_sdk1.5_epo4.0/transformation/mappings/AccessTerm-pin.rml.ttl
@@ -108,7 +108,7 @@ tedm:AccessTerm_ND-PartTenderingTerms a rr:TriplesMap ;
         [
             rdfs:label "ND-PartTenderingTerms" ;
             rr:class epo:AccessTerm ;
-            rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_AccessTerm_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
+            rml:reference "if(exists(cac:AdditionalInformationParty/cac:PartyIdentification/cbc:ID) or exists(cac:DocumentProviderParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_AccessTerm_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
         ] ;
     rr:predicateObjectMap
         [
@@ -117,8 +117,8 @@ tedm:AccessTerm_ND-PartTenderingTerms a rr:TriplesMap ;
                 [
                     rr:parentTriplesMap tedm:MG-PlannedProcurementPart-refersToPlannedPart-AccessTerm_ND-PartTenderingTerms ;
                     rr:joinCondition [
-                        rr:child "path(../..)" ;
-                        rr:parent "path(../..)" ;
+                        rr:child "path(.)" ;
+                        rr:parent "path(.)" ;
                     ] ;
                 ] ;
         ] ;
diff --git a/mappings/package_eforms_sdk1.6_epo4.0/transformation/mappings/AccessTerm-pin.rml.ttl b/mappings/package_eforms_sdk1.6_epo4.0/transformation/mappings/AccessTerm-pin.rml.ttl
@@ -108,7 +108,7 @@ tedm:AccessTerm_ND-PartTenderingTerms a rr:TriplesMap ;
         [
             rdfs:label "ND-PartTenderingTerms" ;
             rr:class epo:AccessTerm ;
-            rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_AccessTerm_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
+            rml:reference "if(exists(cac:AdditionalInformationParty/cac:PartyIdentification/cbc:ID) or exists(cac:DocumentProviderParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_AccessTerm_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
         ] ;
     rr:predicateObjectMap
         [
@@ -117,8 +117,8 @@ tedm:AccessTerm_ND-PartTenderingTerms a rr:TriplesMap ;
                 [
                     rr:parentTriplesMap tedm:MG-PlannedProcurementPart-refersToPlannedPart-AccessTerm_ND-PartTenderingTerms ;
                     rr:joinCondition [
-                        rr:child "path(../..)" ;
-                        rr:parent "path(../..)" ;
+                        rr:child "path(.)" ;
+                        rr:parent "path(.)" ;
                     ] ;
                 ] ;
         ] ;
diff --git a/mappings/package_eforms_sdk1.7_epo4.0/transformation/mappings/AccessTerm-pin.rml.ttl b/mappings/package_eforms_sdk1.7_epo4.0/transformation/mappings/AccessTerm-pin.rml.ttl
@@ -108,7 +108,7 @@ tedm:AccessTerm_ND-PartTenderingTerms a rr:TriplesMap ;
         [
             rdfs:label "ND-PartTenderingTerms" ;
             rr:class epo:AccessTerm ;
-            rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_AccessTerm_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
+            rml:reference "if(exists(cac:AdditionalInformationParty/cac:PartyIdentification/cbc:ID) or exists(cac:DocumentProviderParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_AccessTerm_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
         ] ;
     rr:predicateObjectMap
         [
@@ -117,8 +117,8 @@ tedm:AccessTerm_ND-PartTenderingTerms a rr:TriplesMap ;
                 [
                     rr:parentTriplesMap tedm:MG-PlannedProcurementPart-refersToPlannedPart-AccessTerm_ND-PartTenderingTerms ;
                     rr:joinCondition [
-                        rr:child "path(../..)" ;
-                        rr:parent "path(../..)" ;
+                        rr:child "path(.)" ;
+                        rr:parent "path(.)" ;
                     ] ;
                 ] ;
         ] ;
diff --git a/mappings/package_eforms_sdk1.8_epo4.0/transformation/mappings/AccessTerm-pin.rml.ttl b/mappings/package_eforms_sdk1.8_epo4.0/transformation/mappings/AccessTerm-pin.rml.ttl
@@ -108,7 +108,7 @@ tedm:AccessTerm_ND-PartTenderingTerms a rr:TriplesMap ;
         [
             rdfs:label "ND-PartTenderingTerms" ;
             rr:class epo:AccessTerm ;
-            rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_AccessTerm_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
+            rml:reference "if(exists(cac:AdditionalInformationParty/cac:PartyIdentification/cbc:ID) or exists(cac:DocumentProviderParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_AccessTerm_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
         ] ;
     rr:predicateObjectMap
         [
@@ -117,8 +117,8 @@ tedm:AccessTerm_ND-PartTenderingTerms a rr:TriplesMap ;
                 [
                     rr:parentTriplesMap tedm:MG-PlannedProcurementPart-refersToPlannedPart-AccessTerm_ND-PartTenderingTerms ;
                     rr:joinCondition [
-                        rr:child "path(../..)" ;
-                        rr:parent "path(../..)" ;
+                        rr:child "path(.)" ;
+                        rr:parent "path(.)" ;
                     ] ;
                 ] ;
         ] ;
diff --git a/mappings/package_eforms_sdk1.9_epo4.0/transformation/mappings/AccessTerm-pin.rml.ttl b/mappings/package_eforms_sdk1.9_epo4.0/transformation/mappings/AccessTerm-pin.rml.ttl
@@ -108,7 +108,7 @@ tedm:AccessTerm_ND-PartTenderingTerms a rr:TriplesMap ;
         [
             rdfs:label "ND-PartTenderingTerms" ;
             rr:class epo:AccessTerm ;
-            rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_AccessTerm_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
+            rml:reference "if(exists(cac:AdditionalInformationParty/cac:PartyIdentification/cbc:ID) or exists(cac:DocumentProviderParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_AccessTerm_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
         ] ;
     rr:predicateObjectMap
         [
@@ -117,8 +117,8 @@ tedm:AccessTerm_ND-PartTenderingTerms a rr:TriplesMap ;
                 [
                     rr:parentTriplesMap tedm:MG-PlannedProcurementPart-refersToPlannedPart-AccessTerm_ND-PartTenderingTerms ;
                     rr:joinCondition [
-                        rr:child "path(../..)" ;
-                        rr:parent "path(../..)" ;
+                        rr:child "path(.)" ;
+                        rr:parent "path(.)" ;
                     ] ;
                 ] ;
         ] ;
diff --git a/src/mappings-pin/AccessTerm-pin.rml.ttl b/src/mappings-pin/AccessTerm-pin.rml.ttl
@@ -108,7 +108,7 @@ tedm:AccessTerm_ND-PartTenderingTerms a rr:TriplesMap ;
         [
             rdfs:label "ND-PartTenderingTerms" ;
             rr:class epo:AccessTerm ;
-            rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_AccessTerm_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
+            rml:reference "if(exists(cac:AdditionalInformationParty/cac:PartyIdentification/cbc:ID) or exists(cac:DocumentProviderParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_AccessTerm_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
         ] ;
     rr:predicateObjectMap
         [
@@ -117,8 +117,8 @@ tedm:AccessTerm_ND-PartTenderingTerms a rr:TriplesMap ;
                 [
                     rr:parentTriplesMap tedm:MG-PlannedProcurementPart-refersToPlannedPart-AccessTerm_ND-PartTenderingTerms ;
                     rr:joinCondition [
-                        rr:child "path(../..)" ;
-                        rr:parent "path(../..)" ;
+                        rr:child "path(.)" ;
+                        rr:parent "path(.)" ;
                     ] ;
                 ] ;
         ] ;
diff --git a/test_data/sampling_eforms_all_can/eforms-sdk-1.12/op-test-eforms2/6291-2025.xml b/test_data/sampling_eforms_all_can/eforms-sdk-1.12/op-test-eforms2/6291-2025.xml

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ tedm:AccessTerm_ND-PartTenderingTerms a rr:TriplesMap ;`
`108`	`108`	`[`
`109`	`109`	`rdfs:label "ND-PartTenderingTerms" ;`
`110`	`110`	`rr:class epo:AccessTerm ;`
`111`		`- rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_AccessTerm_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' \|\| encode-for-uri(path()) \|\| '?response_type=raw')}" ;`
	`111`	`+ rml:reference "if(exists(cac:AdditionalInformationParty/cac:PartyIdentification/cbc:ID) or exists(cac:DocumentProviderParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' \|\| replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') \|\| '_AccessTerm_' \|\| unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' \|\| encode-for-uri(path()) \|\| '?response_type=raw') else null" ;`
`112`	`112`	`] ;`
`113`	`113`	`rr:predicateObjectMap`
`114`	`114`	`[`
`@@ -117,8 +117,8 @@ tedm:AccessTerm_ND-PartTenderingTerms a rr:TriplesMap ;`
`117`	`117`	`[`
`118`	`118`	`rr:parentTriplesMap tedm:MG-PlannedProcurementPart-refersToPlannedPart-AccessTerm_ND-PartTenderingTerms ;`
`119`	`119`	`rr:joinCondition [`
`120`		`- rr:child "path(../..)" ;`
`121`		`- rr:parent "path(../..)" ;`
	`120`	`+ rr:child "path(.)" ;`
	`121`	`+ rr:parent "path(.)" ;`
`122`	`122`	`] ;`
`123`	`123`	`] ;`
`124`	`124`	`] ;`