Skip to content

Commit

Permalink
Fix gh-31 undesired repeated role instantiation
Browse files Browse the repository at this point in the history
Fixes instances of the following 10 epo:AgentInRole subtypes to not
repeat for the connected Lots:

- Reviewer
- EmploymentInformationProvider + fix duplicate and wrong mappings [1]
- EnvironmentalProtectionInformationProvider + remove duplicate mappings
- Mediator
- OfflineAccessProvider
- ProcurementProcedureInformationProvider
- ReviewProcedureInformationProvider
- TaxInformationProvider
- TenderProcessor
- TenderReceiver

[1] Not only was there a duplicate `announcesRole` in the same
TriplesMap, but there was an entirely duplicate TriplesMap for
`contextualisedBy` somewhere it shouldn't belong, and with an
incorrectly linked parent with the wrong iterator. This wouldn't have
been caught as results look almost the same as in this fix, except with
a hidden bug (missing basic link to the Lot ending up creating a
connection to all Lots).
  • Loading branch information
schivmeister committed Aug 19, 2024
1 parent 6c50708 commit 8421288
Show file tree
Hide file tree
Showing 77 changed files with 182 additions and 1,022 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ tedm:MG-EmploymentInformationProvider_ND-LotEmploymentLegislation a rr:TriplesMa
rr:subjectMap [
rdfs:label "ND-LotEmploymentLegislation" ;
rr:class epo:EmploymentInformationProvider ;
rml:reference "if(exists(cac:IssuerParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_EmploymentInformationProvider_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null";
rml:reference "if(exists(cac:IssuerParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_EmploymentInformationProvider_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(concat(cac:IssuerParty/cac:PartyIdentification/cbc:ID, cac:IssuerParty/cac:PartyIdentification/cbc:ID/@schemeName)) || '?response_type=raw') else null";
] ;
tedm:minSDKVersion "1.5.12" .


Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ tedm:MG-EnvironmentalProtectionInformationProvider_ND-LotEnvironmentalLegislatio
rr:subjectMap [
rdfs:label "ND-LotEnvironmentalLegislation" ;
rr:class epo:EnvironmentalProtectionInformationProvider ;
rml:reference "if(exists(cac:IssuerParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_EnvironmentalProtectionInformationProvider_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path(..)) || '?response_type=raw') else null";
rml:reference "if(exists(cac:IssuerParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_EnvironmentalProtectionInformationProvider_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(concat(cac:IssuerParty/cac:PartyIdentification/cbc:ID, cac:IssuerParty/cac:PartyIdentification/cbc:ID/@schemeName)) || '?response_type=raw') else null";
] ;
rr:predicateObjectMap [
rdfs:label "OPT-301-Lot-EnvironLegis" ;
Expand Down Expand Up @@ -62,7 +62,5 @@ tedm:MG-EnvironmentalProtectionInformationProvider_ND-LotEnvironmentalLegislatio
] ;
rr:predicate epo:contextualisedBy ;
] ;

tedm:minSDKVersion "1.5.12" .


tedm:minSDKVersion "1.5.12"
.
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ tedm:MG-Mediator_ND-LotReviewTerms a rr:TriplesMap ;
rr:subjectMap [
rdfs:label "ND-LotReviewTerms" ;
rr:class epo:Mediator ;
rml:reference "if(exists(cac:MediationParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_Mediator_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null";
] .


rml:reference "if(exists(cac:MediationParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_Mediator_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(concat(cac:MediationParty/cac:PartyIdentification/cbc:ID, cac:MediationParty/cac:PartyIdentification/cbc:ID/@schemeName)) || '?response_type=raw') else null";
]
.
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ tedm:MG-OfflineAccessProvider_ND-LotTenderingTerms a rr:TriplesMap ;
rr:subjectMap [
rdfs:label "ND-LotTenderingTerms" ;
rr:class epo:OfflineAccessProvider ;
rml:reference "if(exists(cac:DocumentProviderParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_OfflineAccessProvider_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null";
] .


rml:reference "if(exists(cac:DocumentProviderParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_OfflineAccessProvider_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(concat(cac:DocumentProviderParty/cac:PartyIdentification/cbc:ID, cac:DocumentProviderParty/cac:PartyIdentification/cbc:ID/@schemeName)) || '?response_type=raw') else null";
]
.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ tedm:MG-ProcurementProcedureInformationProvider_ND-LotTenderingTerms a rr:Triple
[
rdfs:label "ND-LotTenderingTerms" ;
rr:class epo:ProcurementProcedureInformationProvider ;
rml:reference "if(exists(cac:AdditionalInformationParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_ProcurementProcedureInformationProvider_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null";
rml:reference "if(exists(cac:AdditionalInformationParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_ProcurementProcedureInformationProvider_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(concat(cac:AdditionalInformationParty/cac:PartyIdentification/cbc:ID, cac:AdditionalInformationParty/cac:PartyIdentification/cbc:ID/@schemeName)) || '?response_type=raw') else null";
] ;
rr:predicateObjectMap
[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ tedm:MG-ReviewProcedureInformationProvider_ND-LotReviewTerms a rr:TriplesMap ;
rr:subjectMap
[
rdfs:label "ND-LotReviewTerms" ;
rml:reference "if(exists(cac:AppealInformationParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_ReviewProcedureInformationProvider_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null";
rml:reference "if(exists(cac:AppealInformationParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_ReviewProcedureInformationProvider_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(concat(cac:AppealInformationParty/cac:PartyIdentification/cbc:ID, cac:AppealInformationParty/cac:PartyIdentification/cbc:ID)) || '?response_type=raw') else null";
rr:class epo:ReviewProcedureInformationProvider
] ;
rr:predicateObjectMap
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ tedm:MG-Reviewer_ND-LotReviewTerms a rr:TriplesMap ;
rr:subjectMap
[
rdfs:label "ND-LotReviewTerms" ;
rml:reference "if(exists(cac:AppealReceiverParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_Reviewer_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null";
rml:reference "if(exists(cac:AppealReceiverParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_Reviewer_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(concat(cac:AppealReceiverParty/cac:PartyIdentification/cbc:ID, cac:AppealReceiverParty/cac:PartyIdentification/cbc:ID/@schemeName)) || '?response_type=raw') else null";
rr:class epo:Reviewer
] ;
rr:predicateObjectMap
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ tedm:MG-TaxInformationProvider_ND-LotFiscalLegislation a rr:TriplesMap ;
rr:subjectMap
[
rdfs:label "ND-LotFiscalLegislation" ;
rml:reference "if(exists(cac:IssuerParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_TaxInformationProvider_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null";
rml:reference "if(exists(cac:IssuerParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_TaxInformationProvider_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(concat(cac:IssuerParty/cac:PartyIdentification/cbc:ID, cac:IssuerParty/cac:PartyIdentification/cbc:ID/@schemeName)) || '?response_type=raw') else null";
rr:class epo:TaxInformationProvider
] ;
rr:predicateObjectMap
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ tedm:MG-TenderProcessor_ND-LotTenderingTerms a rr:TriplesMap ;
rr:subjectMap
[
rdfs:label "ND-LotTenderingTerms" ;
rml:reference "if(exists(cac:TenderEvaluationParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_TenderProcessor_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null";
rml:reference "if(exists(cac:TenderEvaluationParty/cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_TenderProcessor_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(concat(cac:TenderEvaluationParty/cac:PartyIdentification/cbc:ID, cac:TenderEvaluationParty/cac:PartyIdentification/cbc:ID/@schemeName)) || '?response_type=raw') else null";
rr:class epo:TenderProcessor
] ;
rr:predicateObjectMap
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ tedm:MG-TenderReceiver_ND-TenderRecipient a rr:TriplesMap ;
rr:subjectMap
[
rdfs:label "ND-TenderRecipient" ;
rml:reference "if(exists(cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_TenderReceiver_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null";
rml:reference "if(exists(cac:PartyIdentification/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_TenderReceiver_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(concat(cac:PartyIdentification/cbc:ID, cac:PartyIdentification/cbc:ID/@schemeName)) || '?response_type=raw') else null";
rr:class epo:TenderReceiver
] ;
rr:predicateObjectMap
Expand Down
Loading

0 comments on commit 8421288

Please sign in to comment.