From c831d52277c38855804e4f0e3708d66d1c603935 Mon Sep 17 00:00:00 2001 From: jhartmann Date: Mon, 24 Jun 2024 14:06:50 +0200 Subject: [PATCH 1/3] fix(ess): fix submodel validation and ess registration --- .../bpn/validation/BPNIncidentValidation.java | 6 +- .../irs/ess/service/EdcRegistration.java | 63 +++++++++++-------- .../tractusx/irs/ess/service/EssService.java | 4 +- .../validation/BPNIncidentValidationTest.java | 30 ++++++--- ...igationJobProcessingEventListenerTest.java | 4 +- .../PartSiteInformationAsPlanned.java | 2 +- .../partsiteinformationasplanned/Site.java | 2 +- 7 files changed, 68 insertions(+), 43 deletions(-) diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/bpn/validation/BPNIncidentValidation.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/bpn/validation/BPNIncidentValidation.java index fd760cd462..3c87a9e261 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/bpn/validation/BPNIncidentValidation.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/bpn/validation/BPNIncidentValidation.java @@ -77,13 +77,13 @@ public static SupplyChainImpacted jobContainsIncidentBPNs(final List incidentBPNs) throws InvalidAspectTypeFormatException { - if (partSiteInformationAsPlanned.sites().stream().anyMatch(site -> site.catenaXSiteId() == null)) { - throw new InvalidAspectTypeFormatException("'PartSiteInformationAsPlanned' exists, but catenaXSiteId could not be found."); + if (partSiteInformationAsPlanned.sites().stream().anyMatch(site -> site.catenaXsiteId() == null)) { + throw new InvalidAspectTypeFormatException("'PartSiteInformationAsPlanned' exists, but catenaXsiteId could not be found."); } final List siteIds = partSiteInformationAsPlanned.getCatenaXSiteId(); try { diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/EdcRegistration.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/EdcRegistration.java index bc2f3a1d8c..aa404f485b 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/EdcRegistration.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/EdcRegistration.java @@ -112,7 +112,9 @@ public void registerEdcAsset() { private void registerAsset(final String assetId, final String notificationType, final String path) { final var body = """ { - "@context": {}, + "@context": { + "@vocab": "https://w3id.org/edc/v0.0.1/ns/" + }, "@id": "%s", "properties": { "description": "ESS notification endpoint", @@ -142,33 +144,42 @@ private void registerAsset(final String assetId, final String notificationType, private void registerPolicy(final String policyId) { final var body = """ + { + "@context": { + "@vocab": "https://w3id.org/edc/v0.0.1/ns/", + "cx-policy": "https://w3id.org/catenax/policy/", + "odrl": "http://www.w3.org/ns/odrl/2/" + }, + "@id": "%s", + "policy": { + "@type": "odrl:Set", + "odrl:permission": [ { - "@context": { - "odrl": "http://www.w3.org/ns/odrl/2/" - }, - "@id": "%s", - "policy": { - "odrl:permission": [ - { - "odrl:action": "use", - "odrl:constraint": { - "@type": "AtomicConstraint", - "odrl:or": [ - { - "@type": "Constraint", - "odrl:leftOperand": "PURPOSE", - "odrl:operator": { - "@id": "odrl:eq" - }, - "odrl:rightOperand": "ID 3.1 Trace" - } - ] - } - } - ] - } + "odrl:action": "use", + "odrl:constraint": { + "@type": "AtomicConstraint", + "odrl:and": [ + { + "odrl:leftOperand": "cx-policy:FrameworkAgreement", + "odrl:operator": { + "@id": "odrl:eq" + }, + "odrl:rightOperand": "traceability:1.0" + }, + { + "odrl:leftOperand": "cx-policy:UsagePurpose", + "odrl:operator": { + "@id": "odrl:eq" + }, + "odrl:rightOperand": "cx.core.industrycore:1" + } + ] + } } - """.formatted(policyId); + ] + } + } + """.formatted(policyId); final var entity = restTemplate.exchange(edcProviderUrl + policydefinitionsPath, HttpMethod.POST, toEntity(body), String.class); diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/EssService.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/EssService.java index 9f0934e4f5..7422e95dd2 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/EssService.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/EssService.java @@ -56,8 +56,8 @@ @Slf4j public class EssService { - private static final String PART_AS_PLANNED = SemanticModelNames.PART_AS_PLANNED_2_0_0; - private static final String PART_SITE_INFORMATION_AS_PLANNED = SemanticModelNames.PART_SITE_INFORMATION_AS_PLANNED_1_0_0; + public static final String PART_AS_PLANNED = SemanticModelNames.PART_AS_PLANNED_2_0_0; + public static final String PART_SITE_INFORMATION_AS_PLANNED = SemanticModelNames.PART_SITE_INFORMATION_AS_PLANNED_1_0_0; private final IrsItemGraphQueryService irsItemGraphQueryService; private final BpnInvestigationJobCache bpnInvestigationJobCache; diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/ess/bpn/validation/BPNIncidentValidationTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/ess/bpn/validation/BPNIncidentValidationTest.java index 3b59380ce6..848e4f84a3 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/ess/bpn/validation/BPNIncidentValidationTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/ess/bpn/validation/BPNIncidentValidationTest.java @@ -24,7 +24,10 @@ package org.eclipse.tractusx.irs.ess.bpn.validation; import static org.assertj.core.api.Assertions.assertThat; +import static org.eclipse.tractusx.irs.ess.service.EssService.PART_AS_PLANNED; +import static org.eclipse.tractusx.irs.ess.service.EssService.PART_SITE_INFORMATION_AS_PLANNED; import static org.eclipse.tractusx.irs.util.TestMother.shell; +import static org.eclipse.tractusx.irs.util.TestMother.submodelDescriptor; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -37,6 +40,7 @@ import org.eclipse.tractusx.irs.component.Shell; import org.eclipse.tractusx.irs.component.assetadministrationshell.AssetAdministrationShellDescriptor; import org.eclipse.tractusx.irs.component.assetadministrationshell.IdentifierKeyValuePair; +import org.eclipse.tractusx.irs.component.assetadministrationshell.SubmodelDescriptor; import org.eclipse.tractusx.irs.component.partasplanned.PartAsPlanned; import org.eclipse.tractusx.irs.component.partasplanned.ValidityPeriod; import org.eclipse.tractusx.irs.component.partsiteinformationasplanned.PartSiteInformationAsPlanned; @@ -61,7 +65,8 @@ void shouldReturnNoWhenBPNsDoNotContainShellBPNs() { final Jobs jobs = jobResult(parentId, cxIdBPNMap); // Act - final SupplyChainImpacted actual = BPNIncidentValidation.jobContainsIncidentBPNs(jobs.getShells().stream().map(Shell::payload).toList(), bpns); + final SupplyChainImpacted actual = BPNIncidentValidation.jobContainsIncidentBPNs( + jobs.getShells().stream().map(Shell::payload).toList(), bpns); // Assert assertThat(actual).isEqualTo(SupplyChainImpacted.NO); @@ -82,7 +87,8 @@ void shouldReturnYesWhenBPNsContainShellBPNs() { final Jobs jobs = jobResult(parentId, cxIdBPNMap); // Act - final SupplyChainImpacted actual = BPNIncidentValidation.jobContainsIncidentBPNs(jobs.getShells().stream().map(Shell::payload).toList(), bpns); + final SupplyChainImpacted actual = BPNIncidentValidation.jobContainsIncidentBPNs( + jobs.getShells().stream().map(Shell::payload).toList(), bpns); // Assert assertThat(actual).isEqualTo(SupplyChainImpacted.YES); @@ -98,7 +104,8 @@ void shouldReturnYesWhenNoChildrenAndParentContainsBPN() { final Jobs jobs = jobResult(parentId, cxIdBPNMap); // Act - final SupplyChainImpacted actual = BPNIncidentValidation.jobContainsIncidentBPNs(jobs.getShells().stream().map(Shell::payload).toList(), bpns); + final SupplyChainImpacted actual = BPNIncidentValidation.jobContainsIncidentBPNs( + jobs.getShells().stream().map(Shell::payload).toList(), bpns); // Assert assertThat(actual).isEqualTo(SupplyChainImpacted.YES); @@ -114,7 +121,8 @@ void shouldReturnNoWhenNoChildrenAndParentDoesNotContainBPN() { final Jobs jobs = jobResult(parentId, cxIdBPNMap); // Act - final SupplyChainImpacted actual = BPNIncidentValidation.jobContainsIncidentBPNs(jobs.getShells().stream().map(Shell::payload).toList(), bpns); + final SupplyChainImpacted actual = BPNIncidentValidation.jobContainsIncidentBPNs( + jobs.getShells().stream().map(Shell::payload).toList(), bpns); // Assert assertThat(actual).isEqualTo(SupplyChainImpacted.NO); @@ -129,7 +137,8 @@ void shouldReturnUnknownWhenJobContainsNoShells() { final Jobs jobs = jobResult(parentId, cxIdBPNMap); // Act - final SupplyChainImpacted actual = BPNIncidentValidation.jobContainsIncidentBPNs(jobs.getShells().stream().map(Shell::payload).toList(), bpns); + final SupplyChainImpacted actual = BPNIncidentValidation.jobContainsIncidentBPNs( + jobs.getShells().stream().map(Shell::payload).toList(), bpns); // Assert assertThat(actual).isEqualTo(SupplyChainImpacted.UNKNOWN); @@ -151,7 +160,8 @@ void shouldReturnUnknownWhenJobContainsShellWithoutBPN() { .build(); // Act - final SupplyChainImpacted actual = BPNIncidentValidation.jobContainsIncidentBPNs(jobs.getShells().stream().map(Shell::payload).toList(), bpns); + final SupplyChainImpacted actual = BPNIncidentValidation.jobContainsIncidentBPNs( + jobs.getShells().stream().map(Shell::payload).toList(), bpns); // Assert assertThat(actual).isEqualTo(SupplyChainImpacted.UNKNOWN); @@ -164,7 +174,7 @@ void shouldReturnNoWhenPartSideInformationDoesNotContainBPNS() throws InvalidAsp final PartSiteInformationAsPlanned partSiteInformation = PartSiteInformationAsPlanned.builder() .sites(List.of( Site.builder() - .catenaXSiteId( + .catenaXsiteId( "BPNS123456") .build())) .build(); @@ -183,7 +193,7 @@ void shouldReturnYesWhenPartSideInformationContainBPNS() throws InvalidAspectTyp final PartSiteInformationAsPlanned partSiteInformation = PartSiteInformationAsPlanned.builder() .sites(List.of( Site.builder() - .catenaXSiteId( + .catenaXsiteId( "BPNS00000003B0Q0") .build())) .build(); @@ -278,12 +288,16 @@ private static Jobs jobResult(final String parentId, final Map c } private static AssetAdministrationShellDescriptor createShell(final String catenaXId, final String bpn) { + final List submodelDescriptors = List.of( + submodelDescriptor(PART_AS_PLANNED, "test", "test"), + submodelDescriptor(PART_SITE_INFORMATION_AS_PLANNED, "test", "test")); return AssetAdministrationShellDescriptor.builder() .globalAssetId(catenaXId) .specificAssetIds(List.of(IdentifierKeyValuePair.builder() .name("manufacturerId") .value(bpn) .build())) + .submodelDescriptors(submodelDescriptors) .build(); } } \ No newline at end of file diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/ess/service/InvestigationJobProcessingEventListenerTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/ess/service/InvestigationJobProcessingEventListenerTest.java index 53bf84b9bb..9f7ba8f624 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/ess/service/InvestigationJobProcessingEventListenerTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/ess/service/InvestigationJobProcessingEventListenerTest.java @@ -314,7 +314,7 @@ void shouldCreateTombstoneWhenSiteIdIsMissing() throws EdcClientException { final Optional job = bpnInvestigationJobCache.findByJobId(jobId); assertThat(job).isPresent(); assertThat(job.get().getJobSnapshot().getTombstones()).hasSize(1); - assertThat(job.get().getJobSnapshot().getTombstones().get(0).getProcessingError().getErrorDetail()).isEqualTo("'PartSiteInformationAsPlanned' exists, but catenaXSiteId could not be found."); + assertThat(job.get().getJobSnapshot().getTombstones().get(0).getProcessingError().getErrorDetail()).isEqualTo("'PartSiteInformationAsPlanned' exists, but catenaXsiteId could not be found."); } private void createMockForJobIdAndShell(final UUID mockedJobId, final String mockedShell, @@ -378,7 +378,7 @@ private static Submodel getPartSiteInformationAsPlanned() { "functionValidUntil": "2025-02-08T04:30:48.000Z", "function": "production", "functionValidFrom": "2019-08-21T02:10:36.000Z", - "catenaXSiteId": "BPNS000004711DMY" + "catenaXsiteId": "BPNS000004711DMY" } ] } diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/partsiteinformationasplanned/PartSiteInformationAsPlanned.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/partsiteinformationasplanned/PartSiteInformationAsPlanned.java index 7d1b12d858..b573c83388 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/partsiteinformationasplanned/PartSiteInformationAsPlanned.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/partsiteinformationasplanned/PartSiteInformationAsPlanned.java @@ -35,6 +35,6 @@ @Jacksonized public record PartSiteInformationAsPlanned(String catenaXId, List sites) { public List getCatenaXSiteId() { - return sites().stream().map(Site::catenaXSiteId).toList(); + return sites().stream().map(Site::catenaXsiteId).toList(); } } diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/partsiteinformationasplanned/Site.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/partsiteinformationasplanned/Site.java index e7dcd83fd2..16bcc2fe17 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/partsiteinformationasplanned/Site.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/partsiteinformationasplanned/Site.java @@ -34,5 +34,5 @@ @Builder @Jacksonized public record Site(ZonedDateTime functionValidUntil, String function, ZonedDateTime functionValidFrom, - String catenaXSiteId) { + String catenaXsiteId) { } From d1f0f20f2f893bfa596730dcba1fb43a238a4348 Mon Sep 17 00:00:00 2001 From: jhartmann Date: Mon, 24 Jun 2024 14:06:57 +0200 Subject: [PATCH 2/3] chore(testing): fix ess testdata --- .../ESS_Testdata_v2.0.0-AsPlanned.json | 238 +++++++++--------- 1 file changed, 119 insertions(+), 119 deletions(-) diff --git a/local/testing/testdata/ESS_Testdata_v2.0.0-AsPlanned.json b/local/testing/testdata/ESS_Testdata_v2.0.0-AsPlanned.json index 43b0d510de..7fa5039d91 100644 --- a/local/testing/testdata/ESS_Testdata_v2.0.0-AsPlanned.json +++ b/local/testing/testdata/ESS_Testdata_v2.0.0-AsPlanned.json @@ -42,7 +42,7 @@ { "catenaXId": "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4c79e", "bpnl": "BPNL00000003AYRE", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2019-04-04T03:19:03.000Z", @@ -56,7 +56,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4c79e", "sites": [ @@ -64,12 +64,12 @@ "functionValidUntil": "2025-02-08T04:30:48.000Z", "function": "production", "functionValidFrom": "2019-08-21T02:10:36.000Z", - "catenaXSiteId": "BPNS00000003AYRE" + "catenaXsiteId": "BPNS00000003AYRE" } ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4c79e", "childItems": [ @@ -94,7 +94,7 @@ { "catenaXId": "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef127c", "bpnl": "BPNL00ARBITRARY1", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2016-12-09T05:06:53.000Z", @@ -108,7 +108,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef127c", "sites": [ @@ -116,12 +116,12 @@ "functionValidUntil": "2029-03-01T06:04:34.000Z", "function": "production", "functionValidFrom": "2018-02-05T09:47:59.000Z", - "catenaXSiteId": "BPNS00ARBITRARY1" + "catenaXsiteId": "BPNS00ARBITRARY1" } ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef127c", "childItems": [ @@ -160,7 +160,7 @@ { "catenaXId": "urn:uuid:2c57b0e9-a653-411d-bdcd-64787e9fd3a7", "bpnl": "BPNL00000003B6LU", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2013-04-01T00:18:40.000Z", @@ -174,7 +174,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:2c57b0e9-a653-411d-bdcd-64787e9fd3a7", "sites": [ @@ -182,12 +182,12 @@ "functionValidUntil": "2031-11-21T01:59:04.000Z", "function": "production", "functionValidFrom": "2013-09-04T06:14:54.000Z", - "catenaXSiteId": "BPNS00000003B6LU" + "catenaXsiteId": "BPNS00000003B6LU" } ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:2c57b0e9-a653-411d-bdcd-64787e9fd3a7", "childItems": [ @@ -212,7 +212,7 @@ { "catenaXId": "urn:uuid:bee5614f-9e46-4c98-9209-61a6f2b2a7fc", "bpnl": "BPNL00ARBITRARY3", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2015-03-15T17:25:20.000Z", @@ -226,7 +226,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:bee5614f-9e46-4c98-9209-61a6f2b2a7fc", "sites": [ @@ -234,12 +234,12 @@ "functionValidUntil": "2026-01-07T15:36:31.000Z", "function": "production", "functionValidFrom": "2015-04-29T17:11:59.000Z", - "catenaXSiteId": "BPNS00ARBITRARY3" + "catenaXsiteId": "BPNS00ARBITRARY3" } ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:bee5614f-9e46-4c98-9209-61a6f2b2a7fc", "childItems": [] @@ -249,7 +249,7 @@ { "catenaXId": "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca97", "bpnl": "BPNL00000003B3NX", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2014-03-22T06:27:39.000Z", @@ -263,7 +263,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca97", "sites": [ @@ -271,12 +271,12 @@ "functionValidUntil": "2025-10-14T02:16:37.000Z", "function": "production", "functionValidFrom": "2014-07-09T06:57:44.000Z", - "catenaXSiteId": "BPNS00000003B3NX" + "catenaXsiteId": "BPNS00000003B3NX" } ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca97", "childItems": [ @@ -301,7 +301,7 @@ { "catenaXId": "urn:uuid:c7a2b803-f8fe-4b79-b6fc-967ce847c9a9", "bpnl": "BPNL00000003B3NX", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2015-06-20T09:16:05.000Z", @@ -315,7 +315,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:c7a2b803-f8fe-4b79-b6fc-967ce847c9a9", "sites": [ @@ -323,12 +323,12 @@ "functionValidUntil": "2032-06-15T14:18:34.000Z", "function": "production", "functionValidFrom": "2014-12-27T02:28:17.000Z", - "catenaXSiteId": "BPNS00000003B3NX" + "catenaXsiteId": "BPNS00000003B3NX" } ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:c7a2b803-f8fe-4b79-b6fc-967ce847c9a9", "childItems": [ @@ -353,7 +353,7 @@ { "catenaXId": "urn:uuid:86f69643-3b90-4e34-90bf-789edcf40e7e", "bpnl": "BPNL00000003B6LU", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2013-04-11T05:30:04.000Z", @@ -367,7 +367,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:86f69643-3b90-4e34-90bf-789edcf40e7e", "sites": [ @@ -375,12 +375,12 @@ "functionValidUntil": "2026-11-05T11:21:29.000Z", "function": "production", "functionValidFrom": "2016-07-05T20:28:02.000Z", - "catenaXSiteId": "BPNS00000003B6LU" + "catenaXsiteId": "BPNS00000003B6LU" } ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:86f69643-3b90-4e34-90bf-789edcf40e7e", "childItems": [] @@ -390,7 +390,7 @@ { "catenaXId": "urn:uuid:68904173-ad59-4a77-8412-3e73fcafbd8b", "bpnl": "BPNL00000003B6LU", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2013-09-21T23:24:07.000Z", @@ -404,7 +404,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:68904173-ad59-4a77-8412-3e73fcafbd8b", "sites": [ @@ -412,12 +412,12 @@ "functionValidUntil": "2025-03-23T05:10:13.000Z", "function": "production", "functionValidFrom": "2018-12-09T05:11:28.000Z", - "catenaXSiteId": "BPNS00000003B6LU" + "catenaXsiteId": "BPNS00000003B6LU" } ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:68904173-ad59-4a77-8412-3e73fcafbd8b", "childItems": [ @@ -442,7 +442,7 @@ { "catenaXId": "urn:uuid:e3e2a4d8-58bc-4ae9-afa2-e8946fda1f77", "bpnl": "BPNL00000004FAIL", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2015-01-16T14:23:33.000Z", @@ -456,7 +456,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:e3e2a4d8-58bc-4ae9-afa2-e8946fda1f77", "sites": [ @@ -464,12 +464,12 @@ "functionValidUntil": "2024-06-08T03:49:26.000Z", "function": "production", "functionValidFrom": "2015-08-29T08:43:40.000Z", - "catenaXSiteId": "BPNS00000004FAIL" + "catenaXsiteId": "BPNS00000004FAIL" } ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:e3e2a4d8-58bc-4ae9-afa2-e8946fda1f77", "childItems": [ @@ -494,7 +494,7 @@ { "catenaXId": "urn:uuid:b1d46d01-e308-4bd3-863a-331e64751d76", "bpnl": "BPNL00000003AXS3", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2014-07-30T07:17:16.000Z", @@ -508,7 +508,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:b1d46d01-e308-4bd3-863a-331e64751d76", "sites": [ @@ -516,12 +516,12 @@ "functionValidUntil": "2026-03-11T19:58:28.000Z", "function": "production", "functionValidFrom": "2020-03-04T21:09:12.000Z", - "catenaXSiteId": "BPNS00000003AXS3" + "catenaXsiteId": "BPNS00000003AXS3" } ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:b1d46d01-e308-4bd3-863a-331e64751d76", "childItems": [] @@ -531,7 +531,7 @@ { "catenaXId": "urn:uuid:1c7a25ea-0490-4944-b9c9-d8c666d47958", "bpnl": "BPNL00ARBITRARY4", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2019-04-04T03:19:03.000Z", @@ -545,7 +545,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:1c7a25ea-0490-4944-b9c9-d8c666d47958", "sites": [ @@ -553,12 +553,12 @@ "functionValidUntil": "2025-02-08T04:30:48.000Z", "function": "production", "functionValidFrom": "2019-08-21T02:10:36.000Z", - "catenaXSiteId": "BPNS00ARBITRARY4" + "catenaXsiteId": "BPNS00ARBITRARY4" } ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:1c7a25ea-0490-4944-b9c9-d8c666d47958", "childItems": [ @@ -583,7 +583,7 @@ { "catenaXId": "urn:uuid:2190e4b8-63ee-411d-bf57-6cdc495bc1df", "bpnl": "BPNL00ARBITRARY5", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2016-12-09T05:06:53.000Z", @@ -597,7 +597,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:2190e4b8-63ee-411d-bf57-6cdc495bc1df", "sites": [ @@ -605,12 +605,12 @@ "functionValidUntil": "2029-03-01T06:04:34.000Z", "function": "production", "functionValidFrom": "2018-02-05T09:47:59.000Z", - "catenaXSiteId": "BPNS00ARBITRARY5" + "catenaXsiteId": "BPNS00ARBITRARY5" } ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:2190e4b8-63ee-411d-bf57-6cdc495bc1df", "childItems": [ @@ -635,7 +635,7 @@ { "catenaXId": "urn:uuid:3d61ada2-1a50-42a0-b411-40a932dd56cc", "bpnl": "BPNL00ARBITRARY6", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2014-03-22T06:27:39.000Z", @@ -649,7 +649,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:3d61ada2-1a50-42a0-b411-40a932dd56cc", "sites": [ @@ -657,12 +657,12 @@ "functionValidUntil": "2025-10-14T02:16:37.000Z", "function": "production", "functionValidFrom": "2014-07-09T06:57:44.000Z", - "catenaXSiteId": "BPNS00ARBITRARY6" + "catenaXsiteId": "BPNS00ARBITRARY6" } ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:3d61ada2-1a50-42a0-b411-40a932dd56cc", "childItems": [ @@ -687,7 +687,7 @@ { "catenaXId": "urn:uuid:52207a60-e541-4bea-8ec4-3172f09e6dbb", "bpnl": "BPNL00ARBITRARY7", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2015-06-20T09:16:05.000Z", @@ -701,7 +701,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:52207a60-e541-4bea-8ec4-3172f09e6dbb", "sites": [ @@ -709,12 +709,12 @@ "functionValidUntil": "2032-06-15T14:18:34.000Z", "function": "production", "functionValidFrom": "2014-12-27T02:28:17.000Z", - "catenaXSiteId": "BPNS00ARBITRARY7" + "catenaXsiteId": "BPNS00ARBITRARY7" } ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:52207a60-e541-4bea-8ec4-3172f09e6dbb", "childItems": [ @@ -739,7 +739,7 @@ { "catenaXId": "urn:uuid:3a2a1ca9-c6c1-49c7-a7ae-1dfc5fb9881f", "bpnl": "BPNL00ARBITRARY8", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2013-09-21T23:24:07.000Z", @@ -753,7 +753,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:3a2a1ca9-c6c1-49c7-a7ae-1dfc5fb9881f", "sites": [ @@ -761,12 +761,12 @@ "functionValidUntil": "2025-03-23T05:10:13.000Z", "function": "production", "functionValidFrom": "2018-12-09T05:11:28.000Z", - "catenaXSiteId": "BPNS00ARBITRARY8" + "catenaXsiteId": "BPNS00ARBITRARY8" } ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:3a2a1ca9-c6c1-49c7-a7ae-1dfc5fb9881f", "childItems": [ @@ -795,7 +795,7 @@ }, "createdOn": "2022-02-03T14:48:54.709Z", "lastModifiedOn": "2022-02-03T14:48:54.709Z", - "businessPartner": "BPNL00ARBITRARY10", + "businessPartner": "BPNL0ARBITRARY10", "catenaXId": "urn:uuid:22847bfd-eb8d-41b7-b088-3a548b7541a8" } ] @@ -805,7 +805,7 @@ { "catenaXId": "urn:uuid:9846f1c6-0dd0-4d5a-9c7a-30af0b7e0247", "bpnl": "BPNL00000004FAIL", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2014-07-30T07:17:16.000Z", @@ -819,7 +819,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:9846f1c6-0dd0-4d5a-9c7a-30af0b7e0247", "sites": [ @@ -827,7 +827,7 @@ "functionValidUntil": "2026-03-11T19:58:28.000Z", "function": "production", "functionValidFrom": "2020-03-04T21:09:12.000Z", - "catenaXSiteId": "BPNS00000004FAIL" + "catenaXsiteId": "BPNS00000004FAIL" } ] } @@ -836,7 +836,7 @@ { "catenaXId": "urn:uuid:22847bfd-eb8d-41b7-b088-3a548b7541a8", "bpnl": "BPNL0ARBITRARY10", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2015-01-16T14:23:33.000Z", @@ -850,7 +850,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:22847bfd-eb8d-41b7-b088-3a548b7541a8", "sites": [ @@ -858,12 +858,12 @@ "functionValidUntil": "2024-06-08T03:49:26.000Z", "function": "production", "functionValidFrom": "2015-08-29T08:43:40.000Z", - "catenaXSiteId": "BPNS0ARBITRARY10" + "catenaXsiteId": "BPNS0ARBITRARY10" } ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:22847bfd-eb8d-41b7-b088-3a548b7541a8", "childItems": [ @@ -878,7 +878,7 @@ }, "createdOn": "2022-02-03T14:48:54.709Z", "lastModifiedOn": "2022-02-03T14:48:54.709Z", - "businessPartner": "BPNS00ARBITRARY11", + "businessPartner": "BPNL0ARBITRARY11", "catenaXId": "urn:uuid:01796f87-9677-43f0-9c62-61665be29d85" } ] @@ -888,7 +888,7 @@ { "catenaXId": "urn:uuid:01796f87-9677-43f0-9c62-61665be29d85", "bpnl": "BPNL0ARBITRARY11", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2014-07-30T07:17:16.000Z", @@ -902,7 +902,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:01796f87-9677-43f0-9c62-61665be29d85", "sites": [ @@ -910,7 +910,7 @@ "functionValidUntil": "2026-03-11T19:58:28.000Z", "function": "production", "functionValidFrom": "2020-03-04T21:09:12.000Z", - "catenaXSiteId": "BPNS0ARBITRARY11" + "catenaXsiteId": "BPNS0ARBITRARY11" } ] } @@ -919,7 +919,7 @@ { "catenaXId": "urn:uuid:b0faace3-d41f-45b8-9573-175a33efbaaf", "bpnl": "BPNL00ARBITRARY8", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2013-09-21T23:24:07.000Z", @@ -933,7 +933,7 @@ } } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:b0faace3-d41f-45b8-9573-175a33efbaaf", "childItems": [ @@ -972,7 +972,7 @@ { "catenaXId": "urn:uuid:ec759282-e8fb-4a94-aafe-71585a3f2948", "bpnl": "BPNL00ARBITRARY9", - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:ec759282-e8fb-4a94-aafe-71585a3f2948", "childItems": [] @@ -982,7 +982,7 @@ { "catenaXId": "urn:uuid:1d12d050-d388-4f3d-a880-c9ec4ac84786", "bpnl": "BPNL0ARBITRARY10", - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:1d12d050-d388-4f3d-a880-c9ec4ac84786", "childItems": [ @@ -1007,7 +1007,7 @@ { "catenaXId": "urn:uuid:b636c28a-6924-4498-88f9-5d073f16ed65", "bpnl": "BPNL0ARBITRARY11", - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:b636c28a-6924-4498-88f9-5d073f16ed65", "childItems": [] @@ -1017,7 +1017,7 @@ { "catenaXId": "urn:uuid:f5024c70-6c4f-4ec5-b23b-aa6a91110611", "bpnl": "BPNL00ARBITRARY8", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2013-09-21T23:24:07.000Z", @@ -1031,7 +1031,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:f5024c70-6c4f-4ec5-b23b-aa6a91110611", "sites": [ @@ -1043,7 +1043,7 @@ ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:f5024c70-6c4f-4ec5-b23b-aa6a91110611", "childItems": [ @@ -1082,7 +1082,7 @@ { "catenaXId": "urn:uuid:51eeafa1-a7a5-4f2d-8c7a-15036eb43553", "bpnl": "BPNL00ARBITRARY9", - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:51eeafa1-a7a5-4f2d-8c7a-15036eb43553", "childItems": [] @@ -1092,7 +1092,7 @@ { "catenaXId": "urn:uuid:5d827e81-ac88-4acb-8a0e-8565ddd729b1", "bpnl": "BPNL0ARBITRARY10", - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:5d827e81-ac88-4acb-8a0e-8565ddd729b1", "childItems": [ @@ -1117,7 +1117,7 @@ { "catenaXId": "urn:uuid:31557090-b504-41a2-8f13-e0e2c2c16932", "bpnl": "BPNL0ARBITRARY11", - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:31557090-b504-41a2-8f13-e0e2c2c16932", "childItems": [] @@ -1127,7 +1127,7 @@ { "catenaXId": "urn:uuid:e1bc2e62-165e-4f37-9d06-214476d5547f", "bpnl": "BPNL00ARBITRARY8", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2013-09-21T23:24:07.000Z", @@ -1141,7 +1141,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:e1bc2e62-165e-4f37-9d06-214476d5547f", "sites": [ @@ -1149,12 +1149,12 @@ "functionValidUntil": "2025-03-23T05:10:13.000Z", "function": "production", "functionValidFrom": "2018-12-09T05:11:28.000Z", - "catenaXSiteId": "BPNS00ARBITRARY8" + "catenaXsiteId": "BPNS00ARBITRARY8" } ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:e1bc2e62-165e-4f37-9d06-214476d5547f", "childItems": [ @@ -1183,7 +1183,7 @@ }, "createdOn": "2022-02-03T14:48:54.709Z", "lastModifiedOn": "2022-02-03T14:48:54.709Z", - "businessPartner": "BPNL00ARBITRARY10", + "businessPartner": "BPNL0ARBITRARY10", "catenaXId": "urn:uuid:22847bfd-eb8d-41b7-b088-3a548b7541a8" } ] @@ -1193,7 +1193,7 @@ { "catenaXId": "urn:uuid:642702fc-0987-4fd6-b29c-4b623a005c32", "bpnl": "BPNL00ARBITRARY8", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2013-09-21T23:24:07.000Z", @@ -1207,7 +1207,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:642702fc-0987-4fd6-b29c-4b623a005c32", "sites": [ @@ -1215,12 +1215,12 @@ "functionValidUntil": "2025-03-23T05:10:13.000Z", "function": "production", "functionValidFrom": "2018-12-09T05:11:28.000Z", - "catenaXSiteId": "BPNS00ARBITRARY8" + "catenaXsiteId": "BPNS00ARBITRARY8" } ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:642702fc-0987-4fd6-b29c-4b623a005c32", "childItems": [ @@ -1249,7 +1249,7 @@ }, "createdOn": "2022-02-03T14:48:54.709Z", "lastModifiedOn": "2022-02-03T14:48:54.709Z", - "businessPartner": "BPNL00ARBITRARY10", + "businessPartner": "BPNL0ARBITRARY10", "catenaXId": "urn:uuid:22847bfd-eb8d-41b7-b088-3a548b7541a8" } ] @@ -1259,7 +1259,7 @@ { "catenaXId": "urn:uuid:5f968e65-97fc-4156-a168-5dfbec8de76c", "bpnl": "BPNL00ARBITRARY8", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2013-09-21T23:24:07.000Z", @@ -1273,7 +1273,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:5f968e65-97fc-4156-a168-5dfbec8de76c", "sites": [ @@ -1281,12 +1281,12 @@ "functionValidUntil": "2025-03-23T05:10:13.000Z", "function": "production", "functionValidFrom": "2018-12-09T05:11:28.000Z", - "catenaXSiteId": "BPNS00ARBITRARY8" + "catenaXsiteId": "BPNS00ARBITRARY8" } ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:5f968e65-97fc-4156-a168-5dfbec8de76c", "childItems": [ @@ -1315,7 +1315,7 @@ }, "createdOn": "2022-02-03T14:48:54.709Z", "lastModifiedOn": "2022-02-03T14:48:54.709Z", - "businessPartner": "BPNL00ARBITRARY10", + "businessPartner": "BPNL0ARBITRARY10", "catenaXId": "urn:uuid:22847bfd-eb8d-41b7-b088-3a548b7541a8" } ] @@ -1325,7 +1325,7 @@ { "catenaXId": "urn:uuid:c8a7b53a-53f1-4c10-9a7f-864188ca1bdd", "bpnl": "BPNL00ARBITRARY8", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2013-09-21T23:24:07.000Z", @@ -1339,7 +1339,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:c8a7b53a-53f1-4c10-9a7f-864188ca1bdd", "sites": [ @@ -1347,12 +1347,12 @@ "functionValidUntil": "2025-03-23T05:10:13.000Z", "function": "production", "functionValidFrom": "2018-12-09T05:11:28.000Z", - "catenaXSiteId": "BPNS00ARBITRARY8" + "catenaXsiteId": "BPNS00ARBITRARY8" } ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:c8a7b53a-53f1-4c10-9a7f-864188ca1bdd", "childItems": [ @@ -1381,7 +1381,7 @@ }, "createdOn": "2022-02-03T14:48:54.709Z", "lastModifiedOn": "2022-02-03T14:48:54.709Z", - "businessPartner": "BPNL00ARBITRARY10", + "businessPartner": "BPNL0ARBITRARY10", "catenaXId": "urn:uuid:22847bfd-eb8d-41b7-b088-3a548b7541a8" } ] @@ -1391,7 +1391,7 @@ { "catenaXId": "urn:uuid:4af880f1-cf60-4f30-8338-e9901e1c3050", "bpnl": "BPNL00ARBITRARY4", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2019-04-04T03:19:03.000Z", @@ -1405,7 +1405,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:4af880f1-cf60-4f30-8338-e9901e1c3050", "sites": [ @@ -1413,12 +1413,12 @@ "functionValidUntil": "2025-02-08T04:30:48.000Z", "function": "production", "functionValidFrom": "2019-08-21T02:10:36.000Z", - "catenaXSiteId": "BPNS00ARBITRARY4" + "catenaXsiteId": "BPNS00ARBITRARY4" } ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:4af880f1-cf60-4f30-8338-e9901e1c3050", "childItems": [ @@ -1443,7 +1443,7 @@ { "catenaXId": "urn:uuid:c8c3e7af-c348-42ad-bc75-f83024d9c44c", "bpnl": "BPNL00ARBITRARY4", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2019-04-04T03:19:03.000Z", @@ -1457,7 +1457,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:c8c3e7af-c348-42ad-bc75-f83024d9c44c", "sites": [ @@ -1465,12 +1465,12 @@ "functionValidUntil": "2025-02-08T04:30:48.000Z", "function": "production", "functionValidFrom": "2019-08-21T02:10:36.000Z", - "catenaXSiteId": "BPNS00ARBITRARY4" + "catenaXsiteId": "BPNS00ARBITRARY4" } ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:c8c3e7af-c348-42ad-bc75-f83024d9c44c", "childItems": [ @@ -1495,7 +1495,7 @@ { "catenaXId": "urn:uuid:23565927-339d-48d0-be66-fb031fc21082", "bpnl": "BPNL00ARBITRARY4", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2019-04-04T03:19:03.000Z", @@ -1509,7 +1509,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:23565927-339d-48d0-be66-fb031fc21082", "sites": [ @@ -1517,12 +1517,12 @@ "functionValidUntil": "2025-02-08T04:30:48.000Z", "function": "production", "functionValidFrom": "2019-08-21T02:10:36.000Z", - "catenaXSiteId": "BPNS00ARBITRARY4" + "catenaXsiteId": "BPNS00ARBITRARY4" } ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:23565927-339d-48d0-be66-fb031fc21082", "childItems": [ @@ -1547,7 +1547,7 @@ { "catenaXId": "urn:uuid:8c325e8d-1340-427a-a622-5eddc017ae2b", "bpnl": "BPNL00ARBITRARY4", - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ + "urn:samm:io.catenax.part_as_planned:1.0.1#PartAsPlanned": [ { "validityPeriod": { "validFrom": "2019-04-04T03:19:03.000Z", @@ -1561,7 +1561,7 @@ } } ], - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned": [ { "catenaXId": "urn:uuid:8c325e8d-1340-427a-a622-5eddc017ae2b", "sites": [ @@ -1569,12 +1569,12 @@ "functionValidUntil": "2025-02-08T04:30:48.000Z", "function": "production", "functionValidFrom": "2019-08-21T02:10:36.000Z", - "catenaXSiteId": "BPNS00ARBITRARY4" + "catenaXsiteId": "BPNS00ARBITRARY4" } ] } ], - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ + "urn:samm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned": [ { "catenaXId": "urn:uuid:8c325e8d-1340-427a-a622-5eddc017ae2b", "childItems": [ From 95687574ab6ff8c77e0b75d24ce0e3d11166df47 Mon Sep 17 00:00:00 2001 From: jhartmann Date: Mon, 24 Jun 2024 15:12:41 +0200 Subject: [PATCH 3/3] fix(ess): fix submodel validation and ess registration --- .../java/org/eclipse/tractusx/irs/ess/service/EssService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/EssService.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/EssService.java index 7422e95dd2..f8e27e4842 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/EssService.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/EssService.java @@ -56,7 +56,7 @@ @Slf4j public class EssService { - public static final String PART_AS_PLANNED = SemanticModelNames.PART_AS_PLANNED_2_0_0; + public static final String PART_AS_PLANNED = SemanticModelNames.PART_AS_PLANNED_1_0_1; public static final String PART_SITE_INFORMATION_AS_PLANNED = SemanticModelNames.PART_SITE_INFORMATION_AS_PLANNED_1_0_0; private final IrsItemGraphQueryService irsItemGraphQueryService;