From 63cc4dcdca312d1bdcadbd252f9505d1c42e4079 Mon Sep 17 00:00:00 2001 From: "Krzysztof Massalski (Extern)" Date: Fri, 10 May 2024 15:48:03 +0200 Subject: [PATCH 1/8] feat(impl):[#568] remove bpn summary --- ...#212-Update-SingleLevelBomAsBuilt-2-0-0.md | 3 +- .../#266-IRS-testing-with-dynamic-data.md | 3 -- docs/src/api/irs-api.yaml | 7 +-- .../irs/configuration/OpenApiExamples.java | 2 - .../irs/ess/service/BpnInvestigationJob.java | 1 - .../irs/ess/service/NotificationSummary.java | 12 ++--- .../services/IrsItemGraphQueryService.java | 2 - .../eclipse/tractusx/irs/WiremockSupport.java | 1 - .../irs/controllers/IrsControllerTest.java | 3 +- .../eclipse/tractusx/irs/util/TestMother.java | 10 ---- .../E2ETestStepDefinitionsForJobApi.java | 14 ----- .../tractusx/irs/component/FetchedItems.java | 52 ------------------- .../eclipse/tractusx/irs/component/Jobs.java | 2 +- .../tractusx/irs/component/Summary.java | 6 --- local/deployment/irs-local/README.md | 1 - .../api-tests/irs-api-tests.tavern.yaml | 6 --- local/testing/api-tests/tavern_helpers.py | 2 - 17 files changed, 9 insertions(+), 118 deletions(-) delete mode 100644 irs-models/src/main/java/org/eclipse/tractusx/irs/component/FetchedItems.java diff --git a/docs/concept/#212-Update-of-aspect-model-SingleLevelBomAsBuilt-2_0_0/#212-Update-SingleLevelBomAsBuilt-2-0-0.md b/docs/concept/#212-Update-of-aspect-model-SingleLevelBomAsBuilt-2_0_0/#212-Update-SingleLevelBomAsBuilt-2-0-0.md index b2f4a4389a..3d50a2600b 100644 --- a/docs/concept/#212-Update-of-aspect-model-SingleLevelBomAsBuilt-2_0_0/#212-Update-SingleLevelBomAsBuilt-2-0-0.md +++ b/docs/concept/#212-Update-of-aspect-model-SingleLevelBomAsBuilt-2_0_0/#212-Update-SingleLevelBomAsBuilt-2-0-0.md @@ -130,8 +130,7 @@ flowchart LR "direction": "downward", "key": { ... - }, - "lookupBPNs": true + } } ``` diff --git a/docs/concept/#266-IRS-testing-with-dynamicData/#266-IRS-testing-with-dynamic-data.md b/docs/concept/#266-IRS-testing-with-dynamicData/#266-IRS-testing-with-dynamic-data.md index 80f059c77b..9fea0ac3fa 100644 --- a/docs/concept/#266-IRS-testing-with-dynamicData/#266-IRS-testing-with-dynamic-data.md +++ b/docs/concept/#266-IRS-testing-with-dynamicData/#266-IRS-testing-with-dynamic-data.md @@ -76,7 +76,6 @@ When IRS job for globalAssetId "urn:uuid..." and BPN "BPN..." is registered And with "all available" aspects And with "valid" direction And depth 10 -And lookupBpns "true" And collectAspects "true" Then job-id is responsed @@ -192,8 +191,6 @@ Hints: ### What job parameter can be set and expected? * Jobs with requested submodels have to contain **Relationships**. -* If _lookupBPNs_ = _true_ → **bpns** have to contain at least one object. -* If _lookupBPNs_ = _false_ → **bpns** have to be empty. ### Which lifecycle does the globalAssetId belongs to? diff --git a/docs/src/api/irs-api.yaml b/docs/src/api/irs-api.yaml index 41e0d96965..87a2c8aef5 100644 --- a/docs/src/api/irs-api.yaml +++ b/docs/src/api/irs-api.yaml @@ -1121,9 +1121,6 @@ components: completed: 3 failed: 0 running: 0 - bpnLookups: - completed: 3 - failed: 0 relationships: - catenaXId: urn:uuid:d9bec1c6-e47c-4d18-ba41-0a5fe8b7f447 linkedItem: @@ -2154,7 +2151,7 @@ components: additionalProperties: false description: Container for a job with item graph. example: |- - {"bpns"=[{"manufacturerId"="BPNL00000003AAXX", "manufacturerName"="AB CD"}], "job"={"completedOn"="2022-02-03T14:48:54.709Z", "createdOn"="2022-02-03T14:48:54.709Z", "exception"={"errorDetail"="Timeout while requesting Digital Registry", "exception"="IrsTimeoutException", "exceptionDate"="2022-02-03T14:48:54.709Z"}, "globalAssetId"="urn:uuid:6c311d29-5753-46d4-b32c-19b918ea93b0", "id"="e5347c88-a921-11ec-b909-0242ac120002", "lastModifiedOn"="2022-02-03T14:48:54.709Z", "parameter"={"aspects"=["SerialPart", "AddressAspect"], "auditContractNegotiation"=false, "bomLifecycle"="asBuilt", "collectAspects"=false, "depth"=1, "direction"="downward", "lookupBPNs"=false}, "startedOn"="2022-02-03T14:48:54.709Z", "state"="COMPLETED", "summary"={"asyncFetchedItems"={"completed"=3, "failed"=0, "running"=0}, "bpnLookups"={"completed"=3, "failed"=0}}}, "relationships"=[{"catenaXId"="urn:uuid:d9bec1c6-e47c-4d18-ba41-0a5fe8b7f447", "linkedItem"={"assembledOn"="2022-02-03T14:48:54.709Z", "childCatenaXId"="urn:uuid:a45a2246-f6e1-42da-b47d-5c3b58ed62e9", "hasAlternatives"=false, "lastModifiedOn"="2022-02-03T14:48:54.709Z", "lifecycleContext"="asBuilt", "quantity"={"measurementUnit"={"datatypeURI"="urn:bamm:io.openmanufacturing:meta-model:1.0.0#piece", "lexicalValue"="piece"}, "quantityNumber"=1}}}], "shells"=[{"contractAgreementId"="f253718e-a270-4367-901b-9d50d9bd8462", "payload"={"description"=[{"language"="en", "text"="The shell for a vehicle"}], "globalAssetId"="urn:uuid:a45a2246-f6e1-42da-b47d-5c3b58ed62e9", "id"="urn:uuid:882fc530-b69b-4707-95f6-5dbc5e9baaa8", "idShort"="future concept x", "specificAssetIds"=[{"name"="engineserialid", "value"="12309481209312"}], "submodelDescriptors"=[{"description"=[{"language"="en", "text"="Provides base vehicle information"}], "endpoints"=[{"interface"="HTTP", "protocolInformation"={"endpointProtocol"="HTTPS", "endpointProtocolVersion"=["1.0"], "href"="https://catena-x.net/vehicle/basedetails/", "subprotocol"="DSP", "subprotocolBody"="id=urn:uuid:c8159379-4613-48b8-ad52-6baed7afe923;dspEndpoint=https://irs-provider-controlplane3.dev.demo.catena-x.net", "subprotocolBodyEncoding"="plain"}}], "id"="urn:uuid:5d25a897-6571-4800-b98c-a3352fbf996d", "idShort"="SingleLevelBomAsPlanned", "semanticId"={"keys"=[{"type"="ExternalReference", "value"="urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned"}], "type"="ModelReference"}}, + {"bpns"=[{"manufacturerId"="BPNL00000003AAXX", "manufacturerName"="AB CD"}], "job"={"completedOn"="2022-02-03T14:48:54.709Z", "createdOn"="2022-02-03T14:48:54.709Z", "exception"={"errorDetail"="Timeout while requesting Digital Registry", "exception"="IrsTimeoutException", "exceptionDate"="2022-02-03T14:48:54.709Z"}, "globalAssetId"="urn:uuid:6c311d29-5753-46d4-b32c-19b918ea93b0", "id"="e5347c88-a921-11ec-b909-0242ac120002", "lastModifiedOn"="2022-02-03T14:48:54.709Z", "parameter"={"aspects"=["SerialPart", "AddressAspect"], "auditContractNegotiation"=false, "bomLifecycle"="asBuilt", "collectAspects"=false, "depth"=1, "direction"="downward", "lookupBPNs"=false}, "startedOn"="2022-02-03T14:48:54.709Z", "state"="COMPLETED", "summary"={"asyncFetchedItems"={"completed"=3, "failed"=0, "running"=0}}}, "relationships"=[{"catenaXId"="urn:uuid:d9bec1c6-e47c-4d18-ba41-0a5fe8b7f447", "linkedItem"={"assembledOn"="2022-02-03T14:48:54.709Z", "childCatenaXId"="urn:uuid:a45a2246-f6e1-42da-b47d-5c3b58ed62e9", "hasAlternatives"=false, "lastModifiedOn"="2022-02-03T14:48:54.709Z", "lifecycleContext"="asBuilt", "quantity"={"measurementUnit"={"datatypeURI"="urn:bamm:io.openmanufacturing:meta-model:1.0.0#piece", "lexicalValue"="piece"}, "quantityNumber"=1}}}], "shells"=[{"contractAgreementId"="f253718e-a270-4367-901b-9d50d9bd8462", "payload"={"description"=[{"language"="en", "text"="The shell for a vehicle"}], "globalAssetId"="urn:uuid:a45a2246-f6e1-42da-b47d-5c3b58ed62e9", "id"="urn:uuid:882fc530-b69b-4707-95f6-5dbc5e9baaa8", "idShort"="future concept x", "specificAssetIds"=[{"name"="engineserialid", "value"="12309481209312"}], "submodelDescriptors"=[{"description"=[{"language"="en", "text"="Provides base vehicle information"}], "endpoints"=[{"interface"="HTTP", "protocolInformation"={"endpointProtocol"="HTTPS", "endpointProtocolVersion"=["1.0"], "href"="https://catena-x.net/vehicle/basedetails/", "subprotocol"="DSP", "subprotocolBody"="id=urn:uuid:c8159379-4613-48b8-ad52-6baed7afe923;dspEndpoint=https://irs-provider-controlplane3.dev.demo.catena-x.net", "subprotocolBodyEncoding"="plain"}}], "id"="urn:uuid:5d25a897-6571-4800-b98c-a3352fbf996d", "idShort"="SingleLevelBomAsPlanned", "semanticId"={"keys"=[{"type"="ExternalReference", "value"="urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned"}], "type"="ModelReference"}}, {"description"=[{"language"="en", "text"="Provides base vehicle information"}], "endpoints"=[{"interface"="HTTP", "protocolInformation"={"endpointProtocol"="HTTPS", "endpointProtocolVersion"=["1.0"], "href"="https://catena-x.net/vehicle/partdetails/", "subprotocol"="DSP", "subprotocolBody"="id=urn:uuid:c8159379-4613-48b8-ad52-6baed7afe923;dspEndpoint=https://irs-provider-controlplane3.dev.demo.catena-x.net", "subprotocolBodyEncoding"="plain"}}], "id"="urn:uuid:dae4d249-6d66-4818-b576-bf52f3b9ae90", "idShort"="vehicle part details", "semanticId"={"keys"=[{"type"="Submodel", "value"="urn:bamm:com.catenax.vehicle:0.1.1#PartDetails"}], "type"="ModelReference"}}]}}], "submodels"=[{"aspectType"="supply_chain_impacted", "contractAgreementId"="f253718e-a270-4367-901b-9d50d9bd8462", "identification"="urn:uuid:fc784d2a-5506-4e61-8e34-21600f8cdeff", "payload"={"supplyChainImpacted"="YES"}}], "tombstones"=[{"catenaXId"="urn:uuid:6c311d29-5753-46d4-b32c-19b918ea93b0", "endpointURL"="https://catena-x.net/vehicle/partdetails/", "processingError"={"errorDetail"="Details to reason of failure", "lastAttempt"="2022-02-03T14:48:54.709Z", "processStep"="SchemaValidation", "retryCounter"=0}}]} properties: bpns: @@ -2754,8 +2751,6 @@ components: properties: asyncFetchedItems: $ref: '#/components/schemas/AsyncFetchedItems' - bpnLookups: - $ref: '#/components/schemas/AsyncFetchedItems' Tombstone: type: object additionalProperties: false diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/OpenApiExamples.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/OpenApiExamples.java index 53d08190e1..ab7288c33b 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/OpenApiExamples.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/OpenApiExamples.java @@ -34,7 +34,6 @@ import org.eclipse.tractusx.irs.component.BatchOrderResponse; import org.eclipse.tractusx.irs.component.BatchResponse; import org.eclipse.tractusx.irs.component.Bpn; -import org.eclipse.tractusx.irs.component.FetchedItems; import org.eclipse.tractusx.irs.component.GlobalAssetIdentification; import org.eclipse.tractusx.irs.component.Job; import org.eclipse.tractusx.irs.component.JobErrorDetails; @@ -284,7 +283,6 @@ private Example createCompleteEssJobResult() { .completed(FETCHED_ITEMS_SIZE) .failed(NO_RUNNING_OR_FAILED_ITEMS) .build(), - FetchedItems.builder().completed(FETCHED_ITEMS_SIZE).failed(NO_RUNNING_OR_FAILED_ITEMS).build(), SENT_NOTIFICATIONS_SIZE, SENT_NOTIFICATIONS_SIZE); final Job job = essJobsJobs.getJob().toBuilder().summary(newSummary).build(); return toExample(essJobsJobs.toBuilder().job(job).build()); diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/BpnInvestigationJob.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/BpnInvestigationJob.java index bf2128a838..3ee55bda70 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/BpnInvestigationJob.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/BpnInvestigationJob.java @@ -167,7 +167,6 @@ private Jobs updateLastModified(final Jobs irsJob, final ZonedDateTime lastModif private Jobs extendSummary(final Jobs irsJob) { final Summary oldSummary = Optional.ofNullable(irsJob.getJob().getSummary()).orElse(Summary.builder().build()); final NotificationSummary newSummary = new NotificationSummary(oldSummary.getAsyncFetchedItems(), - oldSummary.getBpnLookups(), new NotificationItems(unansweredNotifications.size() + answeredNotifications.size(), answeredNotifications.size())); final Job job = irsJob.getJob().toBuilder().summary(newSummary).build(); diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/NotificationSummary.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/NotificationSummary.java index bf3445b62a..c74032c7c8 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/NotificationSummary.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/NotificationSummary.java @@ -30,7 +30,6 @@ import lombok.Value; import lombok.extern.jackson.Jacksonized; import org.eclipse.tractusx.irs.component.AsyncFetchedItems; -import org.eclipse.tractusx.irs.component.FetchedItems; import org.eclipse.tractusx.irs.component.Summary; /** @@ -42,15 +41,14 @@ public class NotificationSummary extends Summary { private final NotificationItems notifications; - public NotificationSummary(final AsyncFetchedItems asyncFetchedItems, final FetchedItems bpnLookups, - final NotificationItems notificationItems) { - super(asyncFetchedItems, bpnLookups); + public NotificationSummary(final AsyncFetchedItems asyncFetchedItems, final NotificationItems notificationItems) { + super(asyncFetchedItems); this.notifications = notificationItems; } - public NotificationSummary(final AsyncFetchedItems asyncFetchedItems, final FetchedItems bpnLookups, - final Integer sentNotification, final Integer receivedNotification) { - super(asyncFetchedItems, bpnLookups); + public NotificationSummary(final AsyncFetchedItems asyncFetchedItems, final Integer sentNotification, + final Integer receivedNotification) { + super(asyncFetchedItems); this.notifications = new NotificationItems(sentNotification, receivedNotification); } } diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/IrsItemGraphQueryService.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/IrsItemGraphQueryService.java index 6f27f65a40..e3e6a13e93 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/IrsItemGraphQueryService.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/IrsItemGraphQueryService.java @@ -47,7 +47,6 @@ import org.eclipse.tractusx.irs.common.persistence.BlobPersistenceException; import org.eclipse.tractusx.irs.component.AsyncFetchedItems; import org.eclipse.tractusx.irs.component.Bpn; -import org.eclipse.tractusx.irs.component.FetchedItems; import org.eclipse.tractusx.irs.component.Job; import org.eclipse.tractusx.irs.component.JobHandle; import org.eclipse.tractusx.irs.component.JobParameter; @@ -295,7 +294,6 @@ private Summary buildSummary(final int completedTransfersSize, final int running .running(runningSize) .failed(tombstonesSize) .build()) - .bpnLookups(FetchedItems.builder().completed(0).failed(0).build()) .build(); } diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/WiremockSupport.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/WiremockSupport.java index 58d4a1fe29..47ce8f4fa1 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/WiremockSupport.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/WiremockSupport.java @@ -87,7 +87,6 @@ static RegisterJob jobRequest(final String globalAssetId, final String bpn, fina .depth(depth) .aspects(List.of(batchAspectName, singleLevelBomAsBuiltAspectName)) .collectAspects(true) - .lookupBPNs(true) .direction(Direction.DOWNWARD) .build(); } diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/controllers/IrsControllerTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/controllers/IrsControllerTest.java index 4dea897404..f2d74a8169 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/controllers/IrsControllerTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/controllers/IrsControllerTest.java @@ -197,8 +197,7 @@ void shouldReturnBadRequestWhenRegisterJobWithInvalidDirection(String invalidDir "globalAssetId": "urn:uuid:c6d2d642-a055-4ddf-87e3-1a3b02c689e3", "bpn": "BPNL00000000BJTL" }, - "direction": "", - "lookupBPNs": true + "direction": "" } """.replace("", invalidDirection)) .post("/irs/jobs") diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/util/TestMother.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/util/TestMother.java index d289a8b01c..179e8b2d31 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/util/TestMother.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/util/TestMother.java @@ -187,16 +187,6 @@ public static JobParameter jobParameterFilter() { .build(); } - public static JobParameter jobParameterCollectBpns() { - return JobParameter.builder() - .depth(0) - .bomLifecycle(BomLifecycle.AS_BUILT) - .direction(Direction.DOWNWARD) - .aspects(List.of(serialPartAspectName, singleLevelBomAsBuiltAspectName)) - .lookupBPNs(true) - .build(); - } - public static JobParameter jobParameterAuditContractNegotiation() { return JobParameter.builder() .depth(5) diff --git a/irs-cucumber-tests/src/test/java/org/eclipse/tractusx/irs/cucumber/E2ETestStepDefinitionsForJobApi.java b/irs-cucumber-tests/src/test/java/org/eclipse/tractusx/irs/cucumber/E2ETestStepDefinitionsForJobApi.java index 421238f243..5449c4b208 100644 --- a/irs-cucumber-tests/src/test/java/org/eclipse/tractusx/irs/cucumber/E2ETestStepDefinitionsForJobApi.java +++ b/irs-cucumber-tests/src/test/java/org/eclipse/tractusx/irs/cucumber/E2ETestStepDefinitionsForJobApi.java @@ -160,12 +160,6 @@ public void collectAspects(String collectAspects) { registerBatchOrderBuilder.collectAspects(Boolean.parseBoolean(collectAspects)); } - @And("lookupBPNs {string}") - public void lookupBPNs(String lookupBPNs) { - registerJobBuilder.lookupBPNs(Boolean.parseBoolean(lookupBPNs)); - registerBatchOrderBuilder.lookupBPNs(Boolean.parseBoolean(lookupBPNs)); - } - @And("depth {int}") public void depth(int depth) { registerJobBuilder.depth(depth); @@ -368,9 +362,6 @@ public void iCheckIfSummaryContainsCompletedAndFailedItems(String summary, int c if ("summary".equals(summary)) { assertThat(completedJob.getJob().getSummary().getAsyncFetchedItems().getCompleted()).isEqualTo(completed); assertThat(completedJob.getJob().getSummary().getAsyncFetchedItems().getFailed()).isEqualTo(failed); - } else if ("bpn summary".equals(summary)) { - assertThat(completedJob.getJob().getSummary().getBpnLookups().getCompleted()).isEqualTo(completed); - assertThat(completedJob.getJob().getSummary().getBpnLookups().getFailed()).isEqualTo(failed); } } @@ -437,11 +428,6 @@ public void directionIs(String direction) { assertThat(completedJob.getJob().getParameter().getDirection()).isEqualTo(Direction.fromValue(direction)); } - @And("lookupBPNs is {string}") - public void lookupBPNsIs(String lookupBPNs) { - assertThat(completedJob.getJob().getParameter().isLookupBPNs()).isEqualTo(Boolean.valueOf(lookupBPNs)); - } - @And("bomLifecycle is {string}") public void bomLifecycleIs(String bomLifecycle) { assertThat(completedJob.getJob().getParameter().getBomLifecycle()).isEqualTo( diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/FetchedItems.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/FetchedItems.java deleted file mode 100644 index 8a9652e5c9..0000000000 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/FetchedItems.java +++ /dev/null @@ -1,52 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2022,2024 - * 2022: ZF Friedrichshafen AG - * 2022: ISTOS GmbH - * 2022,2024: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - * 2022,2023: BOSCH AG - * Copyright (c) 2021,2024 Contributors to the Eclipse Foundation - * - * See the NOTICE file(s) distributed with this work for additional - * information regarding copyright ownership. - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * SPDX-License-Identifier: Apache-2.0 - ********************************************************************************/ -package org.eclipse.tractusx.irs.component; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.Max; -import jakarta.validation.constraints.Min; -import lombok.Builder; -import lombok.Value; -import lombok.extern.jackson.Jacksonized; - -/** - * Describe the state of the fetched items - */ -@Schema(description = "Statistics of job execution.") -@Value -@Builder(toBuilder = true) -@Jacksonized -public class FetchedItems { - - @Schema(description = "Number of completed items.", implementation = Integer.class) - @Min(0) - @Max(Integer.MAX_VALUE) - private Integer completed; - - @Schema(description = "Number of failed items.", implementation = Integer.class) - @Min(0) - @Max(Integer.MAX_VALUE) - private Integer failed; - -} diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Jobs.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Jobs.java index e9ac4c3ffa..21788190b8 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Jobs.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Jobs.java @@ -67,7 +67,7 @@ public class Jobs { @Singular private Set bpns; - /* package */ static final String EXAMPLE = "{\"bpns\"=[{\"manufacturerId\"=\"BPNL00000003AAXX\", \"manufacturerName\"=\"AB CD\"}], \"job\"={\"completedOn\"=\"2022-02-03T14:48:54.709Z\", \"createdOn\"=\"2022-02-03T14:48:54.709Z\", \"exception\"={\"errorDetail\"=\"Timeout while requesting Digital Registry\", \"exception\"=\"IrsTimeoutException\", \"exceptionDate\"=\"2022-02-03T14:48:54.709Z\"}, \"globalAssetId\"=\"urn:uuid:6c311d29-5753-46d4-b32c-19b918ea93b0\", \"id\"=\"e5347c88-a921-11ec-b909-0242ac120002\", \"lastModifiedOn\"=\"2022-02-03T14:48:54.709Z\", \"parameter\"={\"aspects\"=[\"SerialPart\", \"AddressAspect\"], \"auditContractNegotiation\"=false, \"bomLifecycle\"=\"asBuilt\", \"collectAspects\"=false, \"depth\"=1, \"direction\"=\"downward\", \"lookupBPNs\"=false}, \"startedOn\"=\"2022-02-03T14:48:54.709Z\", \"state\"=\"COMPLETED\", \"summary\"={\"asyncFetchedItems\"={\"completed\"=3, \"failed\"=0, \"running\"=0}, \"bpnLookups\"={\"completed\"=3, \"failed\"=0}}}, \"relationships\"=[{\"catenaXId\"=\"urn:uuid:d9bec1c6-e47c-4d18-ba41-0a5fe8b7f447\", \"linkedItem\"={\"assembledOn\"=\"2022-02-03T14:48:54.709Z\", \"childCatenaXId\"=\"urn:uuid:a45a2246-f6e1-42da-b47d-5c3b58ed62e9\", \"hasAlternatives\"=false, \"lastModifiedOn\"=\"2022-02-03T14:48:54.709Z\", \"lifecycleContext\"=\"asBuilt\", \"quantity\"={\"measurementUnit\"={\"datatypeURI\"=\"urn:bamm:io.openmanufacturing:meta-model:1.0.0#piece\", \"lexicalValue\"=\"piece\"}, \"quantityNumber\"=1}}}], \"shells\"=[{\"contractAgreementId\"=\"f253718e-a270-4367-901b-9d50d9bd8462\", \"payload\"={\"description\"=[{\"language\"=\"en\", \"text\"=\"The shell for a vehicle\"}], \"globalAssetId\"=\"urn:uuid:a45a2246-f6e1-42da-b47d-5c3b58ed62e9\", \"id\"=\"urn:uuid:882fc530-b69b-4707-95f6-5dbc5e9baaa8\", \"idShort\"=\"future concept x\", \"specificAssetIds\"=[{\"name\"=\"engineserialid\", \"value\"=\"12309481209312\"}], \"submodelDescriptors\"=[{\"description\"=[{\"language\"=\"en\", \"text\"=\"Provides base vehicle information\"}], \"endpoints\"=[{\"interface\"=\"HTTP\", \"protocolInformation\"={\"endpointProtocol\"=\"HTTPS\", \"endpointProtocolVersion\"=[\"1.0\"], \"href\"=\"https://catena-x.net/vehicle/basedetails/\", \"subprotocol\"=\"DSP\", \"subprotocolBody\"=\"id=urn:uuid:c8159379-4613-48b8-ad52-6baed7afe923;dspEndpoint=https://irs-provider-controlplane3.dev.demo.catena-x.net\", \"subprotocolBodyEncoding\"=\"plain\"}}], \"id\"=\"urn:uuid:5d25a897-6571-4800-b98c-a3352fbf996d\", \"idShort\"=\"SingleLevelBomAsPlanned\", \"semanticId\"={\"keys\"=[{\"type\"=\"ExternalReference\", \"value\"=\"urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned\"}], \"type\"=\"ModelReference\"}},\n" + /* package */ static final String EXAMPLE = "{\"bpns\"=[{\"manufacturerId\"=\"BPNL00000003AAXX\", \"manufacturerName\"=\"AB CD\"}], \"job\"={\"completedOn\"=\"2022-02-03T14:48:54.709Z\", \"createdOn\"=\"2022-02-03T14:48:54.709Z\", \"exception\"={\"errorDetail\"=\"Timeout while requesting Digital Registry\", \"exception\"=\"IrsTimeoutException\", \"exceptionDate\"=\"2022-02-03T14:48:54.709Z\"}, \"globalAssetId\"=\"urn:uuid:6c311d29-5753-46d4-b32c-19b918ea93b0\", \"id\"=\"e5347c88-a921-11ec-b909-0242ac120002\", \"lastModifiedOn\"=\"2022-02-03T14:48:54.709Z\", \"parameter\"={\"aspects\"=[\"SerialPart\", \"AddressAspect\"], \"auditContractNegotiation\"=false, \"bomLifecycle\"=\"asBuilt\", \"collectAspects\"=false, \"depth\"=1, \"direction\"=\"downward\", \"lookupBPNs\"=false}, \"startedOn\"=\"2022-02-03T14:48:54.709Z\", \"state\"=\"COMPLETED\", \"summary\"={\"asyncFetchedItems\"={\"completed\"=3, \"failed\"=0, \"running\"=0}}}, \"relationships\"=[{\"catenaXId\"=\"urn:uuid:d9bec1c6-e47c-4d18-ba41-0a5fe8b7f447\", \"linkedItem\"={\"assembledOn\"=\"2022-02-03T14:48:54.709Z\", \"childCatenaXId\"=\"urn:uuid:a45a2246-f6e1-42da-b47d-5c3b58ed62e9\", \"hasAlternatives\"=false, \"lastModifiedOn\"=\"2022-02-03T14:48:54.709Z\", \"lifecycleContext\"=\"asBuilt\", \"quantity\"={\"measurementUnit\"={\"datatypeURI\"=\"urn:bamm:io.openmanufacturing:meta-model:1.0.0#piece\", \"lexicalValue\"=\"piece\"}, \"quantityNumber\"=1}}}], \"shells\"=[{\"contractAgreementId\"=\"f253718e-a270-4367-901b-9d50d9bd8462\", \"payload\"={\"description\"=[{\"language\"=\"en\", \"text\"=\"The shell for a vehicle\"}], \"globalAssetId\"=\"urn:uuid:a45a2246-f6e1-42da-b47d-5c3b58ed62e9\", \"id\"=\"urn:uuid:882fc530-b69b-4707-95f6-5dbc5e9baaa8\", \"idShort\"=\"future concept x\", \"specificAssetIds\"=[{\"name\"=\"engineserialid\", \"value\"=\"12309481209312\"}], \"submodelDescriptors\"=[{\"description\"=[{\"language\"=\"en\", \"text\"=\"Provides base vehicle information\"}], \"endpoints\"=[{\"interface\"=\"HTTP\", \"protocolInformation\"={\"endpointProtocol\"=\"HTTPS\", \"endpointProtocolVersion\"=[\"1.0\"], \"href\"=\"https://catena-x.net/vehicle/basedetails/\", \"subprotocol\"=\"DSP\", \"subprotocolBody\"=\"id=urn:uuid:c8159379-4613-48b8-ad52-6baed7afe923;dspEndpoint=https://irs-provider-controlplane3.dev.demo.catena-x.net\", \"subprotocolBodyEncoding\"=\"plain\"}}], \"id\"=\"urn:uuid:5d25a897-6571-4800-b98c-a3352fbf996d\", \"idShort\"=\"SingleLevelBomAsPlanned\", \"semanticId\"={\"keys\"=[{\"type\"=\"ExternalReference\", \"value\"=\"urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned\"}], \"type\"=\"ModelReference\"}},\n" + " {\"description\"=[{\"language\"=\"en\", \"text\"=\"Provides base vehicle information\"}], \"endpoints\"=[{\"interface\"=\"HTTP\", \"protocolInformation\"={\"endpointProtocol\"=\"HTTPS\", \"endpointProtocolVersion\"=[\"1.0\"], \"href\"=\"https://catena-x.net/vehicle/partdetails/\", \"subprotocol\"=\"DSP\", \"subprotocolBody\"=\"id=urn:uuid:c8159379-4613-48b8-ad52-6baed7afe923;dspEndpoint=https://irs-provider-controlplane3.dev.demo.catena-x.net\", \"subprotocolBodyEncoding\"=\"plain\"}}], \"id\"=\"urn:uuid:dae4d249-6d66-4818-b576-bf52f3b9ae90\", \"idShort\"=\"vehicle part details\", \"semanticId\"={\"keys\"=[{\"type\"=\"Submodel\", \"value\"=\"urn:bamm:com.catenax.vehicle:0.1.1#PartDetails\"}], \"type\"=\"ModelReference\"}}]}}], \"submodels\"=[{\"aspectType\"=\"supply_chain_impacted\", \"contractAgreementId\"=\"f253718e-a270-4367-901b-9d50d9bd8462\", \"identification\"=\"urn:uuid:fc784d2a-5506-4e61-8e34-21600f8cdeff\", \"payload\"={\"supplyChainImpacted\"=\"YES\"}}], \"tombstones\"=[{\"catenaXId\"=\"urn:uuid:6c311d29-5753-46d4-b32c-19b918ea93b0\", \"endpointURL\"=\"https://catena-x.net/vehicle/partdetails/\", \"processingError\"={\"errorDetail\"=\"Details to reason of failure\", \"lastAttempt\"=\"2022-02-03T14:48:54.709Z\", \"processStep\"=\"SchemaValidation\", \"retryCounter\"=0}}]}"; } diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Summary.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Summary.java index 166f7ead8d..5185bc9015 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Summary.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Summary.java @@ -52,10 +52,4 @@ public class Summary { @Schema(description = "Summary of the fetched jobs", implementation = AsyncFetchedItems.class) private AsyncFetchedItems asyncFetchedItems; - /** - * BPN lookup summary - */ - @Schema(description = "Summary of the BPN lookups", implementation = AsyncFetchedItems.class) - private FetchedItems bpnLookups; - } diff --git a/local/deployment/irs-local/README.md b/local/deployment/irs-local/README.md index 1c9740243c..660edb4084 100644 --- a/local/deployment/irs-local/README.md +++ b/local/deployment/irs-local/README.md @@ -88,7 +88,6 @@ You can use these snippets for testing purposes. ```json { "bomLifecycle": "asBuilt", - "lookupBPNs": false, "direction": "downward", "depth": 10, "auditContractNegotiation": false, diff --git a/local/testing/api-tests/irs-api-tests.tavern.yaml b/local/testing/api-tests/irs-api-tests.tavern.yaml index a93c4d230c..5ce9d5612d 100644 --- a/local/testing/api-tests/irs-api-tests.tavern.yaml +++ b/local/testing/api-tests/irs-api-tests.tavern.yaml @@ -2470,7 +2470,6 @@ stages: depth: 2 direction: "downward" bomLifecycle: "asPlanned" - lookupBPNs: false callbackUrl: "https://www.check123.com" aspects: #- urn:samm:io.catenax.serial_part:3.0.0#SerialPart @@ -2578,7 +2577,6 @@ stages: globalAssetId: "{tavern.env_vars.GLOBAL_ASSET_ID_AS_BUILT}" bpn: "{tavern.env_vars.BPN_AS_BUILT}" collectAspects: false - lookupBPNs: false depth: 1 direction: "downward" method: POST @@ -2632,7 +2630,6 @@ stages: globalAssetId: "{tavern.env_vars.GLOBAL_ASSET_ID_AS_BUILT}" bpn: "{tavern.env_vars.BPN_AS_BUILT}" collectAspects: false - lookupBPNs: false depth: 1 direction: "downward" method: POST @@ -2733,7 +2730,6 @@ stages: - urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingeLevelBomAsBuilt - urn:samm:io.catenax.serial_part:3.0.0#SerialPart collectAspects: true - lookupBPNs: false batchSize: 10 batchStrategy: "PRESERVE_BATCH_JOB_ORDER" depth: 1 @@ -2793,7 +2789,6 @@ stages: - urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingeLevelBomAsBuilt - urn:samm:io.catenax.serial_part:3.0.0#SerialPart collectAspects: true - lookupBPNs: false batchSize: 2 batchStrategy: "PRESERVE_BATCH_JOB_ORDER" depth: 1 @@ -2845,7 +2840,6 @@ stages: - urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingeLevelBomAsBuilt - urn:samm:io.catenax.serial_part:3.0.0#SerialPart collectAspects: true - lookupBPNs: false batchSize: 10 batchStrategy: "PRESERVE_BATCH_JOB_ORDER" depth: 1 diff --git a/local/testing/api-tests/tavern_helpers.py b/local/testing/api-tests/tavern_helpers.py index 60bf733b22..58fe1cb9d1 100644 --- a/local/testing/api-tests/tavern_helpers.py +++ b/local/testing/api-tests/tavern_helpers.py @@ -48,7 +48,6 @@ def ESS_job_parameter_are_as_requested(response): assert parameter.get('collectAspects') is True assert parameter.get('depth') == 1 assert parameter.get('direction') == 'downward' - assert parameter.get('lookupBPNs') is False aspects_list = parameter.get("aspects") assert 'PartSiteInformationAsPlanned' in aspects_list assert 'PartAsPlanned' in aspects_list @@ -336,7 +335,6 @@ def job_parameter_are_as_requested(response): assert parameter.get('collectAspects') is True assert parameter.get('depth') == 2 assert parameter.get('direction') == 'downward' - assert parameter.get('lookupBPNs') is False assert parameter.get('callbackUrl') == 'https://www.check123.com' aspects_list = parameter.get("aspects") assert 'urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned' in aspects_list From 3c07df8e77854c252544225468a619e385497604 Mon Sep 17 00:00:00 2001 From: "Krzysztof Massalski (Extern)" Date: Fri, 10 May 2024 16:02:55 +0200 Subject: [PATCH 2/8] feat(impl):[#510] dont filter submodel descriptors --- CHANGELOG.md | 5 ++++- .../job/delegate/DigitalTwinDelegate.java | 5 ----- .../job/delegate/SubmodelDelegate.java | 18 ++++++++---------- .../job/delegate/DigitalTwinDelegateTest.java | 4 ++-- .../job/delegate/SubmodelDelegateTest.java | 4 ++-- .../AssetAdministrationShellDescriptor.java | 9 --------- 6 files changed, 16 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7162b38fd0..7ed207acda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,10 @@ _**For better traceability add the corresponding GitHub issue number in each cha ### Added - Cucumber test step definitions for Policy Store API (Happy Path) including some test helper utilities. #518 - + +### Changed + +- Shells in Job response will contain all submodel descriptors returned by provider, instead filtered by aspect-type parameter. #510 ## [5.1.0] - 2024-05-06 diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/DigitalTwinDelegate.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/DigitalTwinDelegate.java index 5601a2f3ad..dbec718442 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/DigitalTwinDelegate.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/DigitalTwinDelegate.java @@ -74,11 +74,6 @@ public ItemContainer process(final ItemContainer.ItemContainerBuilder itemContai // DigitalTwinRegistryKey here .findFirst().orElseThrow(); - if (!expectedDepthOfTreeIsNotReached(jobData.getDepth(), aasTransferProcess.getDepth())) { - // filter submodel descriptors if next delegate will not be executed - shell.payload().withFilteredSubmodelDescriptors(jobData.getAspects()); - } - itemContainerBuilder.shell( jobData.isAuditContractNegotiation() ? shell : shell.withoutContractAgreementId()); } catch (final RegistryServiceException | RuntimeException e) { diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegate.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegate.java index c273f003c1..fad0fc436f 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegate.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegate.java @@ -55,7 +55,7 @@ /** * Builds submodels array for AAShell from previous steps. * All submodels are being retrieved from EDC's components. - * Additionally submodel descriptors from shell are being filtered to requested aspect types. + * Additionally, submodel descriptors from shell are being filtered to requested aspect types. */ @Slf4j public class SubmodelDelegate extends AbstractDelegate { @@ -86,21 +86,19 @@ public ItemContainer process(final ItemContainer.ItemContainerBuilder itemContai final List aasSubmodelDescriptors = shell.payload().getSubmodelDescriptors(); log.info("Retrieved {} SubmodelDescriptor for itemId {}", aasSubmodelDescriptors.size(), itemId); - final List filteredSubmodelDescriptorsByAspectType = shell.payload() - .filterDescriptorsByAspectTypes( - jobData.getAspects()); - if (jobData.isCollectAspects()) { log.info("Collecting Submodels."); + final List filteredSubmodelDescriptorsByAspectType = shell.payload() + .filterDescriptorsByAspectTypes( + jobData.getAspects()); + filteredSubmodelDescriptorsByAspectType.forEach(submodelDescriptor -> itemContainerBuilder.submodels( getSubmodels(submodelDescriptor, itemContainerBuilder, itemId.getGlobalAssetId(), itemId.getBpn(), jobData.isAuditContractNegotiation()))); - } - log.trace("Unfiltered SubmodelDescriptor: {}", aasSubmodelDescriptors); - log.trace("Filtered SubmodelDescriptor: {}", filteredSubmodelDescriptorsByAspectType); - - shell.payload().setSubmodelDescriptors(filteredSubmodelDescriptorsByAspectType); + log.trace("Unfiltered SubmodelDescriptor: {}", aasSubmodelDescriptors); + log.trace("Filtered SubmodelDescriptor: {}", filteredSubmodelDescriptorsByAspectType); + } }); return next(itemContainerBuilder, jobData, aasTransferProcess, itemId); diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/DigitalTwinDelegateTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/DigitalTwinDelegateTest.java index 7a33d5c224..25b9a78cc9 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/DigitalTwinDelegateTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/DigitalTwinDelegateTest.java @@ -86,7 +86,7 @@ void shouldFillItemContainerWithShellAndContractAgreementIdWhenAuditFlag() throw } @Test - void shouldFillItemContainerWithShellAndFilteredSubmodelDescriptorsWhenDepthReached() throws RegistryServiceException { + void shouldFillItemContainerWithShellAndSubmodelDescriptorsWhenDepthReached() throws RegistryServiceException { // given when(digitalTwinRegistryService.fetchShells(any())).thenReturn( List.of(shell("", shellDescriptor(List.of(submodelDescriptorWithoutHref("any")))))); @@ -99,7 +99,7 @@ void shouldFillItemContainerWithShellAndFilteredSubmodelDescriptorsWhenDepthReac // then assertThat(result).isNotNull(); assertThat(result.getShells()).isNotEmpty(); - assertThat(result.getShells().get(0).payload().getSubmodelDescriptors()).isEmpty(); + assertThat(result.getShells().get(0).payload().getSubmodelDescriptors()).isNotEmpty(); } @Test diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegateTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegateTest.java index f96b066866..b54b746d96 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegateTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegateTest.java @@ -68,7 +68,7 @@ class SubmodelDelegateTest { jsonValidatorService, new JsonUtil(), connectorEndpointsService); @Test - void shouldFilterSubmodelDescriptorsByAspectTypeFilter() { + void shouldNotFilterSubmodelDescriptorsByAspectTypeFilter() { // given final ItemContainer.ItemContainerBuilder itemContainerShellWithTwoSubmodels = ItemContainer.builder() .shell(shell("", shellDescriptor( @@ -85,7 +85,7 @@ void shouldFilterSubmodelDescriptorsByAspectTypeFilter() { // then assertThat(result).isNotNull(); - assertThat(result.getShells().get(0).payload().getSubmodelDescriptors()).isEmpty(); + assertThat(result.getShells().get(0).payload().getSubmodelDescriptors()).isNotEmpty(); } @Test diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/AssetAdministrationShellDescriptor.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/AssetAdministrationShellDescriptor.java index f9c29d5329..2c8d28110d 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/AssetAdministrationShellDescriptor.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/AssetAdministrationShellDescriptor.java @@ -96,15 +96,6 @@ public Optional findManufacturerId() { .findFirst(); } - /** - * @param aspectTypes the aspect types which should be filtered by - * @return AssetAdministrationShellDescriptor with filtered submodel descriptors - */ - public AssetAdministrationShellDescriptor withFilteredSubmodelDescriptors(final List aspectTypes) { - setSubmodelDescriptors(filterDescriptorsByAspectTypes(aspectTypes)); - return this; - } - /** * @param relationshipAspect filter for aspect type * @return The filtered list of submodel addresses From a6e6a7684a381019238715577b5e52365590e9b4 Mon Sep 17 00:00:00 2001 From: "Krzysztof Massalski (Extern)" Date: Fri, 10 May 2024 16:05:01 +0200 Subject: [PATCH 3/8] feat(impl):[#510] dont filter submodel descriptors --- CHANGELOG.md | 10 ++++------ .../irs/aaswrapper/job/delegate/SubmodelDelegate.java | 1 - 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ed207acda..e7bc735b46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ _**For better traceability add the corresponding GitHub issue number in each cha ## [Unreleased] +### Changed + +- Shells in Job response will contain all submodel descriptors returned by provider, instead filtered by aspect-type parameter. #510 + ## [5.1.1] - 2024-05-08 ### Fixed @@ -18,10 +22,6 @@ _**For better traceability add the corresponding GitHub issue number in each cha - Cucumber test step definitions for Policy Store API (Happy Path) including some test helper utilities. #518 -### Changed - -- Shells in Job response will contain all submodel descriptors returned by provider, instead filtered by aspect-type parameter. #510 - ## [5.1.0] - 2024-05-06 ### Changed @@ -37,8 +37,6 @@ _**For better traceability add the corresponding GitHub issue number in each cha - Update bouncycastle to 1.78 to fix CVE's. - Fixed validation of json-schemas - IRS is creating tombstone instead collecting Submodel payload, when it not passes validation of schema #522 - - ## [5.0.0] - 2024-04-16 ### Added diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegate.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegate.java index fad0fc436f..c7315cd7f1 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegate.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegate.java @@ -55,7 +55,6 @@ /** * Builds submodels array for AAShell from previous steps. * All submodels are being retrieved from EDC's components. - * Additionally, submodel descriptors from shell are being filtered to requested aspect types. */ @Slf4j public class SubmodelDelegate extends AbstractDelegate { From 002e44b129db395db6167ab020cd08f3a78f85a9 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Sat, 11 May 2024 03:27:40 +0200 Subject: [PATCH 4/8] fix(impl): [#533] cleanup empty BPNL --- .../persistence/PolicyPersistence.java | 7 +++++- .../persistence/PolicyPersistenceTest.java | 23 ++++++++++++++++--- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/irs-policy-store/src/main/java/org/eclipse/tractusx/irs/policystore/persistence/PolicyPersistence.java b/irs-policy-store/src/main/java/org/eclipse/tractusx/irs/policystore/persistence/PolicyPersistence.java index c240987eed..610fdc3d9f 100644 --- a/irs-policy-store/src/main/java/org/eclipse/tractusx/irs/policystore/persistence/PolicyPersistence.java +++ b/irs-policy-store/src/main/java/org/eclipse/tractusx/irs/policystore/persistence/PolicyPersistence.java @@ -28,6 +28,7 @@ import java.io.IOException; import java.util.AbstractMap; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -96,7 +97,11 @@ public void delete(final String bpn, final String policyId) { private void save(final String bpn, final List modifiedPolicies) { writeLock(() -> { try { - policyStorePersistence.putBlob(bpn, mapper.writeValueAsBytes(modifiedPolicies)); + if (modifiedPolicies.isEmpty()) { + policyStorePersistence.delete(bpn, Collections.emptyList()); + } else { + policyStorePersistence.putBlob(bpn, mapper.writeValueAsBytes(modifiedPolicies)); + } } catch (BlobPersistenceException | JsonProcessingException e) { throw new PolicyStoreException("Unable to store policy data", e); } diff --git a/irs-policy-store/src/test/java/org/eclipse/tractusx/irs/policystore/persistence/PolicyPersistenceTest.java b/irs-policy-store/src/test/java/org/eclipse/tractusx/irs/policystore/persistence/PolicyPersistenceTest.java index ee193a9ea2..f183ee3f52 100644 --- a/irs-policy-store/src/test/java/org/eclipse/tractusx/irs/policystore/persistence/PolicyPersistenceTest.java +++ b/irs-policy-store/src/test/java/org/eclipse/tractusx/irs/policystore/persistence/PolicyPersistenceTest.java @@ -135,10 +135,12 @@ class DeletePolicyTests { @Test void delete_success() throws BlobPersistenceException, JsonProcessingException { // ARRANGE - final String policyId = "test"; + final String policyId = "policy1"; + final String policyId2 = "policy2"; final var policy = new Policy(policyId, OffsetDateTime.now(), OffsetDateTime.now(), emptyList()); - final var policies = List.of(policy); - when(mockPersistence.getBlob(anyString())).thenReturn(Optional.of(mapper.writeValueAsBytes(policies))); + final var policy2 = new Policy(policyId2, OffsetDateTime.now(), OffsetDateTime.now(), emptyList()); + when(mockPersistence.getBlob(anyString())).thenReturn( + Optional.of(mapper.writeValueAsBytes(List.of(policy, policy2)))); // ACT testee.delete("testBpn", policyId); @@ -147,6 +149,21 @@ void delete_success() throws BlobPersistenceException, JsonProcessingException { verify(mockPersistence).putBlob(anyString(), any()); } + @Test + void delete_whenNoOtherPolicyLeftForBpn() throws BlobPersistenceException, JsonProcessingException { + // ARRANGE + final String policyId = "policy1"; + final var policy = new Policy(policyId, OffsetDateTime.now(), OffsetDateTime.now(), emptyList()); + when(mockPersistence.getBlob(anyString())).thenReturn( + Optional.of(mapper.writeValueAsBytes(List.of(policy)))); + + // ACT + testee.delete("testBpn", policyId); + + // ASSERT + verify(mockPersistence).delete(anyString(), any()); + } + @Test void delete_shouldThrowExceptionIfPolicyWithIdDoesntExists() throws BlobPersistenceException, JsonProcessingException { From bfe3842dbb7fe2e84b817d52be117176853aff01 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Sat, 11 May 2024 03:31:19 +0200 Subject: [PATCH 5/8] fix(impl): [#533] update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7162b38fd0..b44d13db69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,11 @@ _**For better traceability add the corresponding GitHub issue number in each cha ## [Unreleased] +### Fixed + +- Cleaning up BPNLs without policies. #533 + + ## [5.1.1] - 2024-05-08 ### Fixed From f9c26e760e9afdd508c1567961b255fe043b0e3a Mon Sep 17 00:00:00 2001 From: "Krzysztof Massalski (Extern)" Date: Mon, 13 May 2024 12:17:30 +0200 Subject: [PATCH 6/8] feat(impl):[#568] removed bpn summary --- CHANGELOG.md | 4 ++++ .../#212-Update-SingleLevelBomAsBuilt-2-0-0.md | 3 ++- .../#266-IRS-testing-with-dynamic-data.md | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7162b38fd0..3ab66699c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ _**For better traceability add the corresponding GitHub issue number in each cha ## [Unreleased] +### Changed + +- BPN summary was removed from Job response #568 + ## [5.1.1] - 2024-05-08 ### Fixed diff --git a/docs/concept/#212-Update-of-aspect-model-SingleLevelBomAsBuilt-2_0_0/#212-Update-SingleLevelBomAsBuilt-2-0-0.md b/docs/concept/#212-Update-of-aspect-model-SingleLevelBomAsBuilt-2_0_0/#212-Update-SingleLevelBomAsBuilt-2-0-0.md index 3d50a2600b..40caad008c 100644 --- a/docs/concept/#212-Update-of-aspect-model-SingleLevelBomAsBuilt-2_0_0/#212-Update-SingleLevelBomAsBuilt-2-0-0.md +++ b/docs/concept/#212-Update-of-aspect-model-SingleLevelBomAsBuilt-2_0_0/#212-Update-SingleLevelBomAsBuilt-2-0-0.md @@ -130,7 +130,8 @@ flowchart LR "direction": "downward", "key": { ... - } + }, + "lookupBPNs": true } ``` diff --git a/docs/concept/#266-IRS-testing-with-dynamicData/#266-IRS-testing-with-dynamic-data.md b/docs/concept/#266-IRS-testing-with-dynamicData/#266-IRS-testing-with-dynamic-data.md index 9fea0ac3fa..c9904a4f8f 100644 --- a/docs/concept/#266-IRS-testing-with-dynamicData/#266-IRS-testing-with-dynamic-data.md +++ b/docs/concept/#266-IRS-testing-with-dynamicData/#266-IRS-testing-with-dynamic-data.md @@ -76,6 +76,7 @@ When IRS job for globalAssetId "urn:uuid..." and BPN "BPN..." is registered And with "all available" aspects And with "valid" direction And depth 10 +And lookupBpns "true" And collectAspects "true" Then job-id is responsed @@ -191,7 +192,8 @@ Hints: ### What job parameter can be set and expected? * Jobs with requested submodels have to contain **Relationships**. - +* If _lookupBPNs_ = _true_ → **bpns** have to contain at least one object. +* If _lookupBPNs_ = _false_ → **bpns** have to be empty. ### Which lifecycle does the globalAssetId belongs to? Lifecycle is decided based on submodel-aspects: From 56cdbf2c7139e0d67a30e201ac21f46267ad4f38 Mon Sep 17 00:00:00 2001 From: "Krzysztof Massalski (Extern)" Date: Mon, 13 May 2024 12:18:55 +0200 Subject: [PATCH 7/8] feat(impl):[#568] removed bpn summary --- .../#212-Update-SingleLevelBomAsBuilt-2-0-0.md | 2 +- .../#266-IRS-testing-with-dynamic-data.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/concept/#212-Update-of-aspect-model-SingleLevelBomAsBuilt-2_0_0/#212-Update-SingleLevelBomAsBuilt-2-0-0.md b/docs/concept/#212-Update-of-aspect-model-SingleLevelBomAsBuilt-2_0_0/#212-Update-SingleLevelBomAsBuilt-2-0-0.md index 40caad008c..b2f4a4389a 100644 --- a/docs/concept/#212-Update-of-aspect-model-SingleLevelBomAsBuilt-2_0_0/#212-Update-SingleLevelBomAsBuilt-2-0-0.md +++ b/docs/concept/#212-Update-of-aspect-model-SingleLevelBomAsBuilt-2_0_0/#212-Update-SingleLevelBomAsBuilt-2-0-0.md @@ -130,7 +130,7 @@ flowchart LR "direction": "downward", "key": { ... - }, + }, "lookupBPNs": true } ``` diff --git a/docs/concept/#266-IRS-testing-with-dynamicData/#266-IRS-testing-with-dynamic-data.md b/docs/concept/#266-IRS-testing-with-dynamicData/#266-IRS-testing-with-dynamic-data.md index c9904a4f8f..80f059c77b 100644 --- a/docs/concept/#266-IRS-testing-with-dynamicData/#266-IRS-testing-with-dynamic-data.md +++ b/docs/concept/#266-IRS-testing-with-dynamicData/#266-IRS-testing-with-dynamic-data.md @@ -195,6 +195,7 @@ Hints: * If _lookupBPNs_ = _true_ → **bpns** have to contain at least one object. * If _lookupBPNs_ = _false_ → **bpns** have to be empty. + ### Which lifecycle does the globalAssetId belongs to? Lifecycle is decided based on submodel-aspects: From 69a1e1cc998af585c35b09fff47973d92602250d Mon Sep 17 00:00:00 2001 From: "Krzysztof Massalski (Extern)" Date: Mon, 13 May 2024 12:28:18 +0200 Subject: [PATCH 8/8] feat(impl):[#568] remove insomnia bpn loookup --- .../IRS_Request_Collection.json | 487 ++++++++---------- 1 file changed, 225 insertions(+), 262 deletions(-) diff --git a/local/testing/request-collection/IRS_Request_Collection.json b/local/testing/request-collection/IRS_Request_Collection.json index 6dd22a9dba..a1d2156f6d 100644 --- a/local/testing/request-collection/IRS_Request_Collection.json +++ b/local/testing/request-collection/IRS_Request_Collection.json @@ -1,12 +1,12 @@ { "_type": "export", "__export_format": 4, - "__export_date": "2024-05-01T08:32:43.870Z", + "__export_date": "2024-05-13T10:27:14.972Z", "__export_source": "insomnia.desktop.app:v2023.5.8", "resources": [ { - "_id": "req_55a9bf0869c14ef2921f4a91d4adba58", - "parentId": "fld_c148b56d56d4458c955b21de8e799a34", + "_id": "req_6b3e9893bdf1444cb401991ef7f0991c", + "parentId": "fld_ecbb2e2ea9f44d4ab823d346ed3c7d8e", "modified": 1705006817408, "created": 1705005887617, "url": "{{IRS_HOST}}/irs/policies", @@ -34,8 +34,8 @@ "_type": "request" }, { - "_id": "fld_c148b56d56d4458c955b21de8e799a34", - "parentId": "fld_318404a1cc4845de86ec9f7251ed86c3", + "_id": "fld_ecbb2e2ea9f44d4ab823d346ed3c7d8e", + "parentId": "fld_8a681c301af14b13a405bc82a1617505", "modified": 1687243055015, "created": 1687243055015, "name": "Policy Store", @@ -46,7 +46,7 @@ "_type": "request_group" }, { - "_id": "fld_318404a1cc4845de86ec9f7251ed86c3", + "_id": "fld_8a681c301af14b13a405bc82a1617505", "parentId": "wrk_565df8abe30f4da29d8bffcde97927d7", "modified": 1691572726194, "created": 1680682418636, @@ -68,8 +68,8 @@ "_type": "workspace" }, { - "_id": "req_e677c419c5f7467cb107548ece768291", - "parentId": "fld_c148b56d56d4458c955b21de8e799a34", + "_id": "req_8e611e76bdb448159d8aa74d5f3a3993", + "parentId": "fld_ecbb2e2ea9f44d4ab823d346ed3c7d8e", "modified": 1712736856772, "created": 1711449523700, "url": "{{IRS_HOST}}/irs/policies", @@ -112,8 +112,8 @@ "_type": "request" }, { - "_id": "req_a095d396f35045b28dde7de525b5b3d8", - "parentId": "fld_c148b56d56d4458c955b21de8e799a34", + "_id": "req_a5a2bf5bf8a54fd5809e020c810f6231", + "parentId": "fld_ecbb2e2ea9f44d4ab823d346ed3c7d8e", "modified": 1702990529632, "created": 1687243204155, "url": "{{IRS_HOST}}/irs/policies/{% prompt 'policyId', '', 'traceability-test', '', false, true %}", @@ -141,8 +141,8 @@ "_type": "request" }, { - "_id": "req_97025844437d4c76b714fa0991a95997", - "parentId": "fld_c148b56d56d4458c955b21de8e799a34", + "_id": "req_db1340f6922b4803b3b16654b00fc126", + "parentId": "fld_ecbb2e2ea9f44d4ab823d346ed3c7d8e", "modified": 1712736811711, "created": 1693576003390, "url": "{{IRS_HOST}}/irs/policies", @@ -178,8 +178,8 @@ "_type": "request" }, { - "_id": "req_1eb9f26e32e1415e892a3db686eec0c5", - "parentId": "fld_c148b56d56d4458c955b21de8e799a34", + "_id": "req_e48cc082ad3a437ebf0cc84afed8325a", + "parentId": "fld_ecbb2e2ea9f44d4ab823d346ed3c7d8e", "modified": 1712736780844, "created": 1687243182397, "url": "{{IRS_HOST}}/irs/policies", @@ -215,8 +215,8 @@ "_type": "request" }, { - "_id": "req_8ed46f6d1b4d4c9ebaf3bf13fa412d09", - "parentId": "fld_f4ec6d651fa74e90a0e9cdb1cb154710", + "_id": "req_0de45101e01847d6940fc4108afa43ea", + "parentId": "fld_968456e3508741a8b3efcb054423f7f1", "modified": 1706003275081, "created": 1680682418619, "url": "{{DIGITAL_TWIN_REGISTRY}}/api/v3.0/shell-descriptors/{% prompt 'aasIdentifier', '', _.GLOBAL_ASSET_ID, '', false, true %}", @@ -246,8 +246,8 @@ "_type": "request" }, { - "_id": "fld_f4ec6d651fa74e90a0e9cdb1cb154710", - "parentId": "fld_318404a1cc4845de86ec9f7251ed86c3", + "_id": "fld_968456e3508741a8b3efcb054423f7f1", + "parentId": "fld_8a681c301af14b13a405bc82a1617505", "modified": 1691504187689, "created": 1680682418630, "name": "Digital Twin Registry", @@ -258,8 +258,8 @@ "_type": "request_group" }, { - "_id": "req_a33a999f60274acbb02b0242d96a9b83", - "parentId": "fld_f4ec6d651fa74e90a0e9cdb1cb154710", + "_id": "req_85de0091e4cf4d8b846811a467220a43", + "parentId": "fld_968456e3508741a8b3efcb054423f7f1", "modified": 1706002920212, "created": 1690529035794, "url": "{{DIGITAL_TWIN_REGISTRY}}/api/v3.0/shell-descriptors", @@ -289,8 +289,8 @@ "_type": "request" }, { - "_id": "req_847b1d7ff3a240a0ad0c86bd7f7662fe", - "parentId": "fld_f4ec6d651fa74e90a0e9cdb1cb154710", + "_id": "req_45a8109602644db88899a81bbd144dd8", + "parentId": "fld_968456e3508741a8b3efcb054423f7f1", "modified": 1706003278149, "created": 1680682418609, "url": "{{DIGITAL_TWIN_REGISTRY}}/api/v3.0/lookup/shells", @@ -368,8 +368,8 @@ "_type": "request" }, { - "_id": "req_c572def0b5204ad99161d3a9f0ea669e", - "parentId": "fld_f4ec6d651fa74e90a0e9cdb1cb154710", + "_id": "req_b68b63ee167f4f249fbf45e6a93cf578", + "parentId": "fld_968456e3508741a8b3efcb054423f7f1", "modified": 1706003280850, "created": 1680682418595, "url": "{{DIGITAL_TWIN_REGISTRY}}/api/v3.0/lookup/shells", @@ -405,8 +405,8 @@ "_type": "request" }, { - "_id": "req_5dd45f6b36cc4b9fa04f28e5aa17c2f5", - "parentId": "fld_f4ec6d651fa74e90a0e9cdb1cb154710", + "_id": "req_155fe07ca0b2415e8ffbf6ebfe41cb49", + "parentId": "fld_968456e3508741a8b3efcb054423f7f1", "modified": 1706003354109, "created": 1680682418581, "url": "{{DIGITAL_TWIN_REGISTRY}}/api/v3.0/lookup/shells", @@ -442,8 +442,8 @@ "_type": "request" }, { - "_id": "req_45476ae3d18d40d9bef08c5b4cefeee7", - "parentId": "fld_f4ec6d651fa74e90a0e9cdb1cb154710", + "_id": "req_eb15f6317a6b464ca89976087dfdd890", + "parentId": "fld_968456e3508741a8b3efcb054423f7f1", "modified": 1706003284715, "created": 1680682418570, "url": "{{DIGITAL_TWIN_REGISTRY}}/api/v3.0/lookup/shells/query", @@ -480,8 +480,8 @@ "_type": "request" }, { - "_id": "req_a7aaa7bb05fa473680842b917b800969", - "parentId": "fld_f4ec6d651fa74e90a0e9cdb1cb154710", + "_id": "req_e17d520efc2c4ff592d9e89fe29eb46c", + "parentId": "fld_968456e3508741a8b3efcb054423f7f1", "modified": 1706003286642, "created": 1691408320970, "url": "{{DIGITAL_TWIN_REGISTRY}}/api/v3.0/lookup/shells/query", @@ -518,8 +518,8 @@ "_type": "request" }, { - "_id": "req_3559e78b76074dc2b6079d0804e05b6d", - "parentId": "fld_f4ec6d651fa74e90a0e9cdb1cb154710", + "_id": "req_d5d3e2c9e0274c4d8ab183af113c6e3a", + "parentId": "fld_968456e3508741a8b3efcb054423f7f1", "modified": 1706003289343, "created": 1689167429413, "url": "{{DIGITAL_TWIN_REGISTRY}}/api/v3.0/shell-descriptors/{% prompt 'id', '', '', '', false, true %}", @@ -557,8 +557,8 @@ "_type": "request" }, { - "_id": "req_81456f1b78904d61a221f1a63041fc4a", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_ec92de20ea814e37bd128a688da42081", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1702991054859, "created": 1680682418551, "url": "{{IRS_HOST}}/irs/jobs", @@ -594,8 +594,8 @@ "_type": "request" }, { - "_id": "fld_03cae1d8e0e14efdb5013ddafd456356", - "parentId": "fld_318404a1cc4845de86ec9f7251ed86c3", + "_id": "fld_e9d934b6697f442090890841eea72f43", + "parentId": "fld_8a681c301af14b13a405bc82a1617505", "modified": 1680682418562, "created": 1680682418562, "name": "IRS Test Collection", @@ -606,8 +606,8 @@ "_type": "request_group" }, { - "_id": "req_993135ddeb274512bac49dc677a050ef", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_c64ae3ea49e34289afe451867a3ff735", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1702991058493, "created": 1680682418539, "url": "{{IRS_HOST}}/irs/jobs", @@ -643,8 +643,8 @@ "_type": "request" }, { - "_id": "req_d703439130184e79b47f26cd68ab2474", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_13e3309fe28f4028bc065e6da0a25db0", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1702991063641, "created": 1680682418524, "url": "{{IRS_HOST}}/irs/jobs", @@ -680,8 +680,8 @@ "_type": "request" }, { - "_id": "req_f705ca9d4ac84574bbbcfb52d7237944", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_0dd5c61dd2db4bfeaecea32e5984ae54", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1702991067797, "created": 1680682418514, "url": "{{IRS_HOST}}/irs/jobs", @@ -717,8 +717,8 @@ "_type": "request" }, { - "_id": "req_0c1e35b82cf94e508df3d6b0e2e01d96", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_67469f38a9164969b965ead7c1bc7ff1", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1702991071709, "created": 1680682418504, "url": "{{IRS_HOST}}/irs/jobs", @@ -754,8 +754,8 @@ "_type": "request" }, { - "_id": "req_c5a8705e57b747b383827c84f8a1a807", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_2948e9d02863467596466a1386e0d057", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1702991076696, "created": 1695042901876, "url": "{{IRS_HOST}}/irs/jobs", @@ -791,8 +791,8 @@ "_type": "request" }, { - "_id": "req_120ff82ef51f4772be231bbcbd319eea", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_5ac948fd22564db8852c84e569b5c2d6", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1710076144872, "created": 1680682418488, "url": "{{IRS_HOST}}/irs/jobs", @@ -828,8 +828,8 @@ "_type": "request" }, { - "_id": "req_086b100e264d49adb860e2aa31bf24ef", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_04cdc373b1474bda96d7ae750d0573c0", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1710076455844, "created": 1680682418479, "url": "{{IRS_HOST}}/irs/jobs", @@ -865,8 +865,8 @@ "_type": "request" }, { - "_id": "req_f10aa414ec394e1bb559fa280051f1bf", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_8b55b1ba5de54643a0bbd3f9fb4a5dcf", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1712222178406, "created": 1680682418469, "url": "{{IRS_HOST}}/irs/jobs", @@ -902,8 +902,8 @@ "_type": "request" }, { - "_id": "req_619b2b7f65bb41f09567d74df254b035", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_1004cd65325040ee8b109beafacc72c5", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1710076741632, "created": 1680682418442, "url": "{{IRS_HOST}}/irs/jobs", @@ -939,8 +939,8 @@ "_type": "request" }, { - "_id": "req_fb49cca4e40f4a99be4e356dd0d77575", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_336a2514f3cf4fc7adbc877b57138cb8", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1710076751758, "created": 1680682418432, "url": "{{IRS_HOST}}/irs/jobs", @@ -976,8 +976,8 @@ "_type": "request" }, { - "_id": "req_388dc202518348e990b934f5a4fc66b4", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_5250b930cb7b47578fb8b00a73127ddd", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1712222124387, "created": 1695192937155, "url": "{{IRS_HOST}}/irs/jobs", @@ -1013,8 +1013,8 @@ "_type": "request" }, { - "_id": "req_a8e0cf21b1bf413ba607dd35d5dd91cc", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_17129c175a644d4f800be60311af3b76", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1712222106070, "created": 1695192971825, "url": "{{IRS_HOST}}/irs/jobs", @@ -1050,8 +1050,8 @@ "_type": "request" }, { - "_id": "req_2260e9d1376640d4a23ef51ebde18e05", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_b4dd2c9e371c4c5cb93c1b0a4452f861", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1710076214310, "created": 1680682418424, "url": "{{IRS_HOST}}/irs/jobs", @@ -1087,8 +1087,8 @@ "_type": "request" }, { - "_id": "req_dc5126390c35414cbb363154de847ae3", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_e346ccbd04bd4c748bb937208e5c2704", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1702991130711, "created": 1680682418414, "url": "{{IRS_HOST}}/irs/jobs", @@ -1124,8 +1124,8 @@ "_type": "request" }, { - "_id": "req_1dc0355604e34c9ead6633201ae3b53f", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_ef3389e99db54254bf74a39a30488ff1", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1713167745641, "created": 1680682418401, "url": "{{IRS_HOST}}/irs/jobs", @@ -1161,54 +1161,17 @@ "_type": "request" }, { - "_id": "req_e70627d142a84aab9f67be301064f099", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", - "modified": 1710076677384, - "created": 1680682418392, - "url": "{{IRS_HOST}}/irs/jobs", - "name": "1.6.0 [Register Job with BPN lookup]", - "description": "", - "method": "POST", - "body": { - "mimeType": "application/json", - "text": "{\n\t\"aspects\": [\n\t\t\"urn:samm:io.catenax.serial_part:3.0.0#SerialPart\",\n\t\t\"urn:samm:io.catenax.batch:3.0.0#Batch\"\n\t],\n\t\"key\": {\n\t\t\"globalAssetId\": \"{% prompt 'Global Asset ID', 'Please provide \\'Global-Asset-ID\\' or use default', _.GLOBAL_ASSET_ID, '', false, true %}\",\n\t\t\"bpn\": \"{% prompt 'bpn', '', _.BPN, '', false, true %}\"\n\t},\n\t\"lookupBPNs\": false\n}" - }, - "parameters": [], - "headers": [ - { - "name": "Content-Type", - "value": "application/json" - } - ], - "authentication": { - "type": "apikey", - "disabled": false, - "key": "X-API-KEY", - "value": "{{ _.REGULAR_API_KEY }}", - "addTo": "header" - }, - "metaSortKey": -1680682418392, - "isPrivate": false, - "settingStoreCookies": true, - "settingSendCookies": true, - "settingDisableRenderRequestBody": false, - "settingEncodeUrl": true, - "settingRebuildPath": true, - "settingFollowRedirects": "global", - "_type": "request" - }, - { - "_id": "req_11c22742144c45e7822f4756d8f2a668", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", - "modified": 1710076237949, + "_id": "req_8824aae245fe47afa9f3614c0e0a677b", + "parentId": "fld_e9d934b6697f442090890841eea72f43", + "modified": 1715595973541, "created": 1683184048412, "url": "{{IRS_HOST}}/irs/jobs", - "name": "1.7.0 [Register Job with invalid policy]", + "name": "1.6.0 [Register Job with invalid policy]", "description": "", "method": "POST", "body": { "mimeType": "application/json", - "text": "{\n\t\"aspects\": [\n\t\t\"urn:samm:io.catenax.serial_part:3.0.0#SerialPart\"\n\t],\n\t\"key\": {\n\t\t\"globalAssetId\": \"urn:uuid:da53d429-5770-410e-a13e-424e77952d8a\",\n\t\t\"bpn\": \"{% prompt 'bpn', '', _.BPN, '', false, true %}\"\n\t},\n\t\"collectAspects\": true,\n\t\"lookupBPNs\": false\n}" + "text": "{\n\t\"aspects\": [\n\t\t\"urn:samm:io.catenax.serial_part:3.0.0#SerialPart\"\n\t],\n\t\"key\": {\n\t\t\"globalAssetId\": \"urn:uuid:da53d429-5770-410e-a13e-424e77952d8a\",\n\t\t\"bpn\": \"{% prompt 'bpn', '', _.BPN, '', false, true %}\"\n\t},\n\t\"collectAspects\": true\n}" }, "parameters": [], "headers": [ @@ -1235,12 +1198,12 @@ "_type": "request" }, { - "_id": "req_641896a762a045c3922889a4d70a0510", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", - "modified": 1710076397373, + "_id": "req_b21dec3eb7064d37b7b28d537feefd35", + "parentId": "fld_e9d934b6697f442090890841eea72f43", + "modified": 1715595986121, "created": 1693493383337, "url": "{{IRS_HOST}}/irs/jobs", - "name": "1.8.0 [Register Job with data integrity success]", + "name": "1.7.0 [Register Job with data integrity success]", "description": "", "method": "POST", "body": { @@ -1272,12 +1235,12 @@ "_type": "request" }, { - "_id": "req_d06e3bea028c4a139015680baf3e4156", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", - "modified": 1710076245754, + "_id": "req_1f39b0bc6b7c4839ac22fc16fb9f45a7", + "parentId": "fld_e9d934b6697f442090890841eea72f43", + "modified": 1715595997255, "created": 1693493584873, "url": "{{IRS_HOST}}/irs/jobs", - "name": "1.8.1 [Register Job with data integrity wrong hash]", + "name": "1.7.1 [Register Job with data integrity wrong hash]", "description": "", "method": "POST", "body": { @@ -1309,12 +1272,12 @@ "_type": "request" }, { - "_id": "req_2c31c812b93b44478e597d26c96b31f3", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", - "modified": 1710076391502, + "_id": "req_eb8a1a428c284ac7bb0618f3df796937", + "parentId": "fld_e9d934b6697f442090890841eea72f43", + "modified": 1715596005695, "created": 1693493594373, "url": "{{IRS_HOST}}/irs/jobs", - "name": "1.8.2 [Register Job with data integrity wrong signature]", + "name": "1.7.2 [Register Job with data integrity wrong signature]", "description": "", "method": "POST", "body": { @@ -1346,12 +1309,12 @@ "_type": "request" }, { - "_id": "req_a6840706447b4bea9e5ef7aa13da8318", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", - "modified": 1710076385497, + "_id": "req_48b7d265db2c4824900f827d92311045", + "parentId": "fld_e9d934b6697f442090890841eea72f43", + "modified": 1715596013964, "created": 1693493604521, "url": "{{IRS_HOST}}/irs/jobs", - "name": "1.8.3 [Register Job with data integrity integrity aspect missing]", + "name": "1.7.3 [Register Job with data integrity integrity aspect missing]", "description": "", "method": "POST", "body": { @@ -1383,8 +1346,8 @@ "_type": "request" }, { - "_id": "req_7bc460f0ddc64952a724c129d7f05c48", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_9a70317307ba48e5b4aaa90988f2333f", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1702991173689, "created": 1680682418381, "url": "{{IRS_HOST}}/irs/jobs", @@ -1423,8 +1386,8 @@ "_type": "request" }, { - "_id": "req_218c983f40504928b18c62833de2a62b", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_9cc0d61a8f264d418176f62ba6e6917c", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1702991177973, "created": 1680682418372, "url": "{{IRS_HOST}}/irs/jobs", @@ -1463,8 +1426,8 @@ "_type": "request" }, { - "_id": "req_30f93b118ccb46aead4015138d39d091", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_4121816b769e455088ed633f56a9198a", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1702991182139, "created": 1680682418358, "url": "{{IRS_HOST}}/irs/jobs", @@ -1503,8 +1466,8 @@ "_type": "request" }, { - "_id": "req_ea4e2bdc3b24445d8ba7f9ab94df8275", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_6715e2bbf9784586bff275abf438c582", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1702991186114, "created": 1680682418348, "url": "{{IRS_HOST}}/irs/jobs", @@ -1537,8 +1500,8 @@ "_type": "request" }, { - "_id": "req_dd2974c3cfe14a89b11197b3d7c4b3b3", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_5044b4bb15654918bbb60317dc9e1539", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1702991190326, "created": 1680682418339, "url": "{{IRS_HOST}}/irs/jobs", @@ -1577,8 +1540,8 @@ "_type": "request" }, { - "_id": "req_5de4fa9a710f40a0b06a8eb8375dc879", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_f67e2c113f2e41a5a1da2011d27cb75e", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1702991196283, "created": 1680682418325, "url": "{{IRS_HOST}}/irs/jobs/{% prompt 'Job ID', '', '', '', false, true %}", @@ -1617,8 +1580,8 @@ "_type": "request" }, { - "_id": "req_76c70fae87804e35808b1bdb2b37b87a", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_919028940dbb4d7395636cc03eb8ffd7", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1702991200399, "created": 1680682418316, "url": "{{IRS_HOST}}/irs/jobs/{% prompt 'Job ID', '', '', '', false, true %}", @@ -1651,8 +1614,8 @@ "_type": "request" }, { - "_id": "req_ee442b959bee4e91a4a668dfd2aaecd0", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_3638873b83c74166ac8b28bc1bbe094f", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1702991205447, "created": 1680682418307, "url": "{{IRS_HOST}}/irs/jobs/test", @@ -1685,8 +1648,8 @@ "_type": "request" }, { - "_id": "req_fa01911c0ba9430ba8e2468ec8f2cf08", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_17f7a8eb2c55455a8b5e0c170266b3a9", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1702991214202, "created": 1680682418297, "url": "{{IRS_HOST}}/irs/jobs/00000000-0000-0000-0000-000000000000", @@ -1719,8 +1682,8 @@ "_type": "request" }, { - "_id": "req_eccfa48fb89f4f4e9810afd4296e0a9c", - "parentId": "fld_03cae1d8e0e14efdb5013ddafd456356", + "_id": "req_c5236c5835704e00b1faf92456b51fd7", + "parentId": "fld_e9d934b6697f442090890841eea72f43", "modified": 1702991218362, "created": 1680682418280, "url": "{{IRS_HOST}}/irs/jobs/{% prompt 'Job ID', '', '', '', false, true %}", @@ -1753,8 +1716,8 @@ "_type": "request" }, { - "_id": "req_8c4758824c1d4f3fa30f6a0c41998fe7", - "parentId": "fld_9380e17181b949e1b374ef0bbec301a4", + "_id": "req_d9d639901bfc4013815eadbe1de4f196", + "parentId": "fld_41b1725cb6054a47bfa309643954f694", "modified": 1705942015684, "created": 1682672699249, "url": "{{ _.BPN_DISCOVERY }}/api/administration/connectors/bpnDiscovery/search", @@ -1791,8 +1754,8 @@ "_type": "request" }, { - "_id": "fld_9380e17181b949e1b374ef0bbec301a4", - "parentId": "fld_318404a1cc4845de86ec9f7251ed86c3", + "_id": "fld_41b1725cb6054a47bfa309643954f694", + "parentId": "fld_8a681c301af14b13a405bc82a1617505", "modified": 1683630931664, "created": 1683630887514, "name": "Discovery", @@ -1803,8 +1766,8 @@ "_type": "request_group" }, { - "_id": "req_d4c1b2e69cb947f69f1addb5999dc1f4", - "parentId": "fld_9380e17181b949e1b374ef0bbec301a4", + "_id": "req_86573060d63949c88e56160abe37ede1", + "parentId": "fld_41b1725cb6054a47bfa309643954f694", "modified": 1705942027574, "created": 1683031718699, "url": "{{ _.DISCOVERY_FINDER }}/api/administration/connectors/discovery/search", @@ -1841,8 +1804,8 @@ "_type": "request" }, { - "_id": "req_ffdfe165884f40a6b3d6fb56abe11471", - "parentId": "fld_9380e17181b949e1b374ef0bbec301a4", + "_id": "req_39b016fc582b4f4eb7aa73443a6802eb", + "parentId": "fld_41b1725cb6054a47bfa309643954f694", "modified": 1705942036978, "created": 1683560906453, "url": "{{ _.EDC_DISCOVERY }}/api/administration/connectors/discovery", @@ -1879,9 +1842,9 @@ "_type": "request" }, { - "_id": "req_1ec222e3d6ab4d3db80ebafa4fb5488c", - "parentId": "fld_63222e2ddbee4d118d2b7047f762591f", - "modified": 1714552323135, + "_id": "req_1b127946a78b4656ac5121eeb9909716", + "parentId": "fld_1cb4de2495654ca0864ebbca4ac60776", + "modified": 1715595924415, "created": 1680682418265, "url": "{{IRS_HOST}}/irs/jobs", "name": "Register Job", @@ -1889,7 +1852,7 @@ "method": "POST", "body": { "mimeType": "application/json", - "text": "{\n\t\"aspects\": [\n\t\t\"urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt\",\n\t\t\"urn:samm:io.catenax.serial_part:3.0.0#SerialPart\",\n\t\t\"urn:samm:io.catenax.batch:3.0.0#Batch\"\n\t],\n\t\"bomLifecycle\": \"asBuilt\",\n\t\"collectAspects\": true,\n\t\"lookupBPNs\": false,\n\t\"direction\": \"downward\",\n\t\"depth\": 10,\n\t\"key\": {\n\t\t\"globalAssetId\": \"{% prompt 'Global Asset ID', 'Please provide \\'Global-Asset-ID\\' or use default', _.GLOBAL_ASSET_ID, '', false, true %}\",\n\t\t\"bpn\": \"{% prompt 'Business Partner Number', '', _.BPN, '', false, true %}\"\n\t}\n}" + "text": "{\n\t\"aspects\": [\n\t\t\"urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt\",\n\t\t\"urn:samm:io.catenax.serial_part:3.0.0#SerialPart\",\n\t\t\"urn:samm:io.catenax.batch:3.0.0#Batch\"\n\t],\n\t\"bomLifecycle\": \"asBuilt\",\n\t\"collectAspects\": true,\n\t\"direction\": \"downward\",\n\t\"depth\": 10,\n\t\"key\": {\n\t\t\"globalAssetId\": \"{% prompt 'Global Asset ID', 'Please provide \\'Global-Asset-ID\\' or use default', _.GLOBAL_ASSET_ID, '', false, true %}\",\n\t\t\"bpn\": \"{% prompt 'Business Partner Number', '', _.BPN, '', false, true %}\"\n\t}\n}" }, "parameters": [], "headers": [ @@ -1916,8 +1879,8 @@ "_type": "request" }, { - "_id": "fld_63222e2ddbee4d118d2b7047f762591f", - "parentId": "fld_318404a1cc4845de86ec9f7251ed86c3", + "_id": "fld_1cb4de2495654ca0864ebbca4ac60776", + "parentId": "fld_8a681c301af14b13a405bc82a1617505", "modified": 1680682418273, "created": 1680682418273, "name": "IRS Basic API Calls", @@ -1928,8 +1891,8 @@ "_type": "request_group" }, { - "_id": "req_fcfc3007abf7423e9a2722648318b3be", - "parentId": "fld_63222e2ddbee4d118d2b7047f762591f", + "_id": "req_d4ea1c6ba3094075aeb0b31365454fd1", + "parentId": "fld_1cb4de2495654ca0864ebbca4ac60776", "modified": 1705942154792, "created": 1680682418238, "url": "{{IRS_HOST}}/irs/jobs/{% response 'body', 'req_b02ac0bfc4704c83a5c5f8b24175d61a', 'b64::JC5pZA==::46b', 'never', 60 %} ", @@ -1968,8 +1931,8 @@ "_type": "request" }, { - "_id": "req_391d96a6d0614ac4877ba0d78a4573b3", - "parentId": "fld_63222e2ddbee4d118d2b7047f762591f", + "_id": "req_f125ee8a497f4f4e9dc71fb3403f4bca", + "parentId": "fld_1cb4de2495654ca0864ebbca4ac60776", "modified": 1702991288793, "created": 1680682418257, "url": "{{IRS_HOST}}/irs/jobs", @@ -2002,8 +1965,8 @@ "_type": "request" }, { - "_id": "req_ef2c57bbfc9744b98699b3832ed8232c", - "parentId": "fld_63222e2ddbee4d118d2b7047f762591f", + "_id": "req_6df8e3c83ab64fa8ba1e2095857e2d47", + "parentId": "fld_1cb4de2495654ca0864ebbca4ac60776", "modified": 1702991284435, "created": 1680682418247, "url": "{{IRS_HOST}}/irs/jobs", @@ -2056,8 +2019,8 @@ "_type": "request" }, { - "_id": "req_30e40bf2376b418eac900baf3d708d04", - "parentId": "fld_63222e2ddbee4d118d2b7047f762591f", + "_id": "req_6e874b8b313e49229f1c5b94af420786", + "parentId": "fld_1cb4de2495654ca0864ebbca4ac60776", "modified": 1703236659047, "created": 1690384427379, "url": "{{IRS_HOST}}/irs/jobs/{% prompt 'Job ID', '', '', '', false, true %}", @@ -2096,8 +2059,8 @@ "_type": "request" }, { - "_id": "req_32c45cd2f9d7474ea9f3b418aec15e45", - "parentId": "fld_63222e2ddbee4d118d2b7047f762591f", + "_id": "req_4e0775d4108a40bbb4431f5917d770c0", + "parentId": "fld_1cb4de2495654ca0864ebbca4ac60776", "modified": 1702991276045, "created": 1680682418229, "url": "{{IRS_HOST}}/irs/jobs/{% prompt 'Job ID', '', '', '', false, true %}", @@ -2130,8 +2093,8 @@ "_type": "request" }, { - "_id": "req_c479c6106c254a558c137736e7d93f30", - "parentId": "fld_63222e2ddbee4d118d2b7047f762591f", + "_id": "req_81c77077779b487b935599cb77f3d9a3", + "parentId": "fld_1cb4de2495654ca0864ebbca4ac60776", "modified": 1702991272198, "created": 1682498338739, "url": "{{IRS_HOST}}/irs/aspectmodels", @@ -2164,8 +2127,8 @@ "_type": "request" }, { - "_id": "req_e27d279245004008a39fb0fd80b163cb", - "parentId": "fld_6a04d4bfd0e442738db12c4f7b46cac2", + "_id": "req_1b5fbc7e710f4bf9afe5f767c9b0678b", + "parentId": "fld_a857c5738e3d4765a871e874816ca2d1", "modified": 1705942066941, "created": 1680682418213, "url": "{{ _.SEMANTIC_HUB_URL }}/hub/api/v1/models", @@ -2206,8 +2169,8 @@ "_type": "request" }, { - "_id": "fld_6a04d4bfd0e442738db12c4f7b46cac2", - "parentId": "fld_318404a1cc4845de86ec9f7251ed86c3", + "_id": "fld_a857c5738e3d4765a871e874816ca2d1", + "parentId": "fld_8a681c301af14b13a405bc82a1617505", "modified": 1680682418222, "created": 1680682418222, "name": "Semantics Hub", @@ -2218,8 +2181,8 @@ "_type": "request_group" }, { - "_id": "req_14e3596715d04adb8b0f356d6b7ae590", - "parentId": "fld_6a04d4bfd0e442738db12c4f7b46cac2", + "_id": "req_86203dac27ad48c98fcfea0d202d1250", + "parentId": "fld_a857c5738e3d4765a871e874816ca2d1", "modified": 1705942077015, "created": 1680682418204, "url": "{{ _.SEMANTIC_HUB_URL }}/hub/api/v1/models/urn%3Abamm%3Aio.catenax.serial_part_typization%3A1.0.0%23SerialPartTypization", @@ -2247,8 +2210,8 @@ "_type": "request" }, { - "_id": "req_bdbe10d7387848d68095b7f7421e7ee9", - "parentId": "fld_6a04d4bfd0e442738db12c4f7b46cac2", + "_id": "req_ef4c90ab973a40449428ff86d64dba42", + "parentId": "fld_a857c5738e3d4765a871e874816ca2d1", "modified": 1705942085733, "created": 1680682418192, "url": "{{ _.SEMANTIC_HUB_URL }}/hub/api/v1/models/urn%3Abamm%3Aio.catenax.serial_part_typization%3A1.0.0%23SerialPartTypization/json-schema", @@ -2276,8 +2239,8 @@ "_type": "request" }, { - "_id": "req_75aba519fb754445ad8d95b5c7fed729", - "parentId": "fld_bb9ec06af2e44280a418f4b6d0bfb38b", + "_id": "req_4a555c1d61384be5a3e5e68016f12635", + "parentId": "fld_fa9c2de89276499ca2cf3641eebc176e", "modified": 1705942100313, "created": 1680682418174, "url": "{{ _.BPDM_URL }}/v1/api/catena/business-partner/{% prompt 'BPN', '', '', '', false, true %}", @@ -2311,8 +2274,8 @@ "_type": "request" }, { - "_id": "fld_bb9ec06af2e44280a418f4b6d0bfb38b", - "parentId": "fld_318404a1cc4845de86ec9f7251ed86c3", + "_id": "fld_fa9c2de89276499ca2cf3641eebc176e", + "parentId": "fld_8a681c301af14b13a405bc82a1617505", "modified": 1680682418184, "created": 1680682418184, "name": "Business partner data management", @@ -2323,8 +2286,8 @@ "_type": "request_group" }, { - "_id": "req_75c154db1dfc4e1c9179bf0a330bf3b4", - "parentId": "fld_313859ca91cb4f7888422276cb8508c5", + "_id": "req_0cb55a434c8d4ebda2ab6cfa5908caab", + "parentId": "fld_d251bcec9a734418b4de5b8deae15f0b", "modified": 1702991347797, "created": 1680682418157, "url": "{{IRS_HOST}}/esr/esr-statistics/{% prompt 'globalAssetId', 'Provide global asset ID or use default', _.GLOBAL_ASSET_ID, '', false, true %}/{% prompt 'BOM Lifecycle', '', '', '', false, true %}/{% prompt 'Certificate', '', '', '', false, true %}/submodel", @@ -2357,8 +2320,8 @@ "_type": "request" }, { - "_id": "fld_313859ca91cb4f7888422276cb8508c5", - "parentId": "fld_318404a1cc4845de86ec9f7251ed86c3", + "_id": "fld_d251bcec9a734418b4de5b8deae15f0b", + "parentId": "fld_8a681c301af14b13a405bc82a1617505", "modified": 1680682418167, "created": 1680682418167, "name": "ESR Spike", @@ -2369,8 +2332,8 @@ "_type": "request_group" }, { - "_id": "req_38c3ce60347e47beaa58a0007d96ae0f", - "parentId": "fld_7d06efb16dab49b394fc29fb93fa22d0", + "_id": "req_3da428392c8c414fb5e70447d2ddf928", + "parentId": "fld_767058580f7a44c3ba7c4aea382a3487", "modified": 1702991361578, "created": 1680682418143, "url": "{{IRS_HOST}}/ess/bpn/investigations", @@ -2406,8 +2369,8 @@ "_type": "request" }, { - "_id": "fld_7d06efb16dab49b394fc29fb93fa22d0", - "parentId": "fld_318404a1cc4845de86ec9f7251ed86c3", + "_id": "fld_767058580f7a44c3ba7c4aea382a3487", + "parentId": "fld_8a681c301af14b13a405bc82a1617505", "modified": 1680682418151, "created": 1680682418151, "name": "ESS Spike", @@ -2418,8 +2381,8 @@ "_type": "request_group" }, { - "_id": "req_b99b111f47a74539a3a2a9a326cc1213", - "parentId": "fld_7d06efb16dab49b394fc29fb93fa22d0", + "_id": "req_eea37a786f3143cea96497f12b5d4220", + "parentId": "fld_767058580f7a44c3ba7c4aea382a3487", "modified": 1705942138125, "created": 1680682418134, "url": "{{IRS_HOST}}/ess/bpn/investigations/{% response 'body', 'req_ec674952c1114bce8fb71ea1ed6d9ef7', 'b64::JC5pZA==::46b', 'never', 60 %}", @@ -2452,8 +2415,8 @@ "_type": "request" }, { - "_id": "req_0798e0ce95f84a3b960552aed4b4bb12", - "parentId": "fld_7d06efb16dab49b394fc29fb93fa22d0", + "_id": "req_713be24f3db449aba0f181e41b5605b5", + "parentId": "fld_767058580f7a44c3ba7c4aea382a3487", "modified": 1702991370481, "created": 1680682418134, "url": "{{IRS_HOST}}/ess/bpn/investigations/{% prompt 'Job ID', '', '', '', false, true %}", @@ -2486,9 +2449,9 @@ "_type": "request" }, { - "_id": "req_ac535a178078415aac3b8d5bc9d2119c", - "parentId": "fld_3f72f2f9fb5f46d0a07b1d1bc9a9dcd7", - "modified": 1710076303275, + "_id": "req_32b2d10089754d0da57e6e6ab2d4bc4e", + "parentId": "fld_bfa274e08a434d23af13553de57d8c5b", + "modified": 1715595935640, "created": 1680682418118, "url": "{{IRS_HOST}}/irs/orders", "name": "Register Batch Order", @@ -2496,7 +2459,7 @@ "method": "POST", "body": { "mimeType": "application/json", - "text": "{\n\t\"aspects\": [\n\t\t\"urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt\"\n\t],\n\t\"collectAspects\": true,\n\t\"lookupBPNs\": true,\n\t\"direction\": \"downward\",\n\t\"batchSize\": 10,\n\t\"batchStrategy\": \"PRESERVE_BATCH_JOB_ORDER\",\n\t\"keys\": [\n\t\t{\n\t\t\t\"globalAssetId\": \"urn:uuid:ed333e9a-5afa-40b2-99da-bae2fd211122\",\n\t\t\t\"bpn\": \"BPNL00000003AAXX\"\n\t\t},\n\t\t{\n\t\t\t\"globalAssetId\": \"urn:uuid:771d2ccc-a081-4d3a-bcb2-46c6a0a32211\",\n\t\t\t\"bpn\": \"BPNL00000003AAXX\"\n\t\t}\n\t]\n}" + "text": "{\n\t\"aspects\": [\n\t\t\"urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt\"\n\t],\n\t\"collectAspects\": true,\n\t\"direction\": \"downward\",\n\t\"batchSize\": 10,\n\t\"batchStrategy\": \"PRESERVE_BATCH_JOB_ORDER\",\n\t\"keys\": [\n\t\t{\n\t\t\t\"globalAssetId\": \"urn:uuid:ed333e9a-5afa-40b2-99da-bae2fd211122\",\n\t\t\t\"bpn\": \"BPNL00000003AAXX\"\n\t\t},\n\t\t{\n\t\t\t\"globalAssetId\": \"urn:uuid:771d2ccc-a081-4d3a-bcb2-46c6a0a32211\",\n\t\t\t\"bpn\": \"BPNL00000003AAXX\"\n\t\t}\n\t]\n}" }, "parameters": [], "headers": [ @@ -2523,8 +2486,8 @@ "_type": "request" }, { - "_id": "fld_3f72f2f9fb5f46d0a07b1d1bc9a9dcd7", - "parentId": "fld_318404a1cc4845de86ec9f7251ed86c3", + "_id": "fld_bfa274e08a434d23af13553de57d8c5b", + "parentId": "fld_8a681c301af14b13a405bc82a1617505", "modified": 1680682418128, "created": 1680682418128, "name": "Batch Processing", @@ -2535,8 +2498,8 @@ "_type": "request_group" }, { - "_id": "req_dcad5fddbb9b465db73e44963b7be875", - "parentId": "fld_3f72f2f9fb5f46d0a07b1d1bc9a9dcd7", + "_id": "req_55b1052ec769471682158a685d3d3f35", + "parentId": "fld_bfa274e08a434d23af13553de57d8c5b", "modified": 1702991390349, "created": 1696342619602, "url": "{{IRS_HOST}}/irs/ess/orders", @@ -2572,8 +2535,8 @@ "_type": "request" }, { - "_id": "req_8b3d633a7d004d17b0d2be6ff02b836c", - "parentId": "fld_3f72f2f9fb5f46d0a07b1d1bc9a9dcd7", + "_id": "req_5a670bbb60d54318b6c9fcc5b941463a", + "parentId": "fld_bfa274e08a434d23af13553de57d8c5b", "modified": 1705006936944, "created": 1705006139836, "url": "{{IRS_HOST}}/irs/orders/{% prompt 'Order ID', '', '', '', false, true %}", @@ -2610,8 +2573,8 @@ "_type": "request" }, { - "_id": "req_29ea158605894aa4a2dfdea7822c1d29", - "parentId": "fld_3f72f2f9fb5f46d0a07b1d1bc9a9dcd7", + "_id": "req_50ed74c46ab44248bf71d37644239f08", + "parentId": "fld_bfa274e08a434d23af13553de57d8c5b", "modified": 1702991398473, "created": 1680682418109, "url": "{{IRS_HOST}}/irs/orders/{% prompt 'Order ID', '', '', '', false, true %}", @@ -2644,8 +2607,8 @@ "_type": "request" }, { - "_id": "req_adfc6ff112774311af439b89df297ebe", - "parentId": "fld_3f72f2f9fb5f46d0a07b1d1bc9a9dcd7", + "_id": "req_ae20a806e8f840029d7ff986dcacb270", + "parentId": "fld_bfa274e08a434d23af13553de57d8c5b", "modified": 1702991409664, "created": 1680682418099, "url": "{{IRS_HOST}}/irs/orders/{% prompt 'Order ID', '', '', '', false, true %}/batches/{% prompt 'Batch ID', '', '', '', false, true %}", @@ -2678,8 +2641,8 @@ "_type": "request" }, { - "_id": "req_3fe67d0926e74f7a9b05b7a46b773b1f", - "parentId": "fld_abf344d79fbe417dbbe937a4f468f64a", + "_id": "req_0d188d1dd5074a2d82fe57128ff3f470", + "parentId": "fld_1ccf9bcde7c448b093a5849d87a6cdd3", "modified": 1690472186478, "created": 1678358655308, "url": "{{ _.CONSUMER_CONTROLPLANE }}/management/v2/catalog/request", @@ -2715,8 +2678,8 @@ "_type": "request" }, { - "_id": "fld_abf344d79fbe417dbbe937a4f468f64a", - "parentId": "fld_77addaff9203411083a11a5c1d2feb18", + "_id": "fld_1ccf9bcde7c448b093a5849d87a6cdd3", + "parentId": "fld_e98ad1a03da747699da1548ca479e361", "modified": 1690362660167, "created": 1690362660167, "name": "Catalog", @@ -2727,8 +2690,8 @@ "_type": "request_group" }, { - "_id": "fld_77addaff9203411083a11a5c1d2feb18", - "parentId": "fld_318404a1cc4845de86ec9f7251ed86c3", + "_id": "fld_e98ad1a03da747699da1548ca479e361", + "parentId": "fld_8a681c301af14b13a405bc82a1617505", "modified": 1690363778601, "created": 1675675609576, "name": "EDC-Requests", @@ -2739,8 +2702,8 @@ "_type": "request_group" }, { - "_id": "req_dec6378f5f6b45a6a95cab20bd9deb63", - "parentId": "fld_abf344d79fbe417dbbe937a4f468f64a", + "_id": "req_a98773eba13e405e8ccb3e86845bd003", + "parentId": "fld_1ccf9bcde7c448b093a5849d87a6cdd3", "modified": 1691500654267, "created": 1685521485278, "url": "{{ _.CONSUMER_CONTROLPLANE }}/management/v2/catalog/request", @@ -2776,8 +2739,8 @@ "_type": "request" }, { - "_id": "req_9fda526011874695a9915b034fd37a5a", - "parentId": "fld_abf344d79fbe417dbbe937a4f468f64a", + "_id": "req_14a58d13cbbc472cb6ea1b560941b7e3", + "parentId": "fld_1ccf9bcde7c448b093a5849d87a6cdd3", "modified": 1705940987109, "created": 1691654388376, "url": "{{ _.CONSUMER_CONTROLPLANE }}/management/v2/catalog/request", @@ -2813,8 +2776,8 @@ "_type": "request" }, { - "_id": "req_06847c4a096d4c479539fef0ac309053", - "parentId": "fld_2546a2bc93c546e38979839919cc8f52", + "_id": "req_c2e88a4e2ffa42158c34ef93300a88df", + "parentId": "fld_3e507398a81c4997b84386ec4b696cc2", "modified": 1691578280640, "created": 1675675609557, "url": "{{ _.CONSUMER_CONTROLPLANE }}/management/v2/contractnegotiations", @@ -2850,8 +2813,8 @@ "_type": "request" }, { - "_id": "fld_2546a2bc93c546e38979839919cc8f52", - "parentId": "fld_77addaff9203411083a11a5c1d2feb18", + "_id": "fld_3e507398a81c4997b84386ec4b696cc2", + "parentId": "fld_e98ad1a03da747699da1548ca479e361", "modified": 1684146626847, "created": 1684146519491, "name": "Negotiation", @@ -2862,8 +2825,8 @@ "_type": "request_group" }, { - "_id": "req_fe500408708a482a83a9b0160cb8c168", - "parentId": "fld_2546a2bc93c546e38979839919cc8f52", + "_id": "req_ec24a3ba0df044c38d09a1a8c7c36a96", + "parentId": "fld_3e507398a81c4997b84386ec4b696cc2", "modified": 1690362123962, "created": 1675675609549, "url": "{{ _.CONSUMER_CONTROLPLANE }}/management/v2/contractnegotiations/{% prompt 'id', '', '', '', false, true %}", @@ -2896,8 +2859,8 @@ "_type": "request" }, { - "_id": "req_7da56223b229417f919ade011c7123f9", - "parentId": "fld_2546a2bc93c546e38979839919cc8f52", + "_id": "req_f988baaa079b4b19a7eb8c182775d7bf", + "parentId": "fld_3e507398a81c4997b84386ec4b696cc2", "modified": 1690362117725, "created": 1685444139708, "url": "{{ _.CONSUMER_CONTROLPLANE }}/management/v2/contractnegotiations/{% prompt 'id', '', '', '', false, true %}/cancel", @@ -2925,8 +2888,8 @@ "_type": "request" }, { - "_id": "req_7610693f814948be8dbc38fa4986270d", - "parentId": "fld_2546a2bc93c546e38979839919cc8f52", + "_id": "req_b2657bfa32eb4874b4ac0682f67564e7", + "parentId": "fld_3e507398a81c4997b84386ec4b696cc2", "modified": 1690361721223, "created": 1681911985730, "url": "{{ _.CONSUMER_CONTROLPLANE }}/management/v2/contractnegotiations/request", @@ -2962,8 +2925,8 @@ "_type": "request" }, { - "_id": "req_50600f6e8a154b19b981d4787bd8d75b", - "parentId": "fld_2546a2bc93c546e38979839919cc8f52", + "_id": "req_ecb5382b9b084d84b24f821f560e233b", + "parentId": "fld_3e507398a81c4997b84386ec4b696cc2", "modified": 1691578311420, "created": 1675675609541, "url": "{{ _.CONSUMER_CONTROLPLANE }}/management/v2/transferprocesses", @@ -2999,8 +2962,8 @@ "_type": "request" }, { - "_id": "req_7b7fcaa136d74d63bcab938b127795b5", - "parentId": "fld_2546a2bc93c546e38979839919cc8f52", + "_id": "req_4e436dfc957f4fa0beea5b15c9ef9436", + "parentId": "fld_3e507398a81c4997b84386ec4b696cc2", "modified": 1691503370103, "created": 1679993996270, "url": "{{ _.CONSUMER_CONTROLPLANE }}/management/v2/transferprocesses/{% prompt 'id', '', '', '', false, true %}", @@ -3033,8 +2996,8 @@ "_type": "request" }, { - "_id": "req_4753d82e329d4e729b815ac5e183def9", - "parentId": "fld_2546a2bc93c546e38979839919cc8f52", + "_id": "req_70097ad191434f98bf7ef352d0309c2a", + "parentId": "fld_3e507398a81c4997b84386ec4b696cc2", "modified": 1690361795179, "created": 1675675609525, "url": "{{ _.CONSUMER_CONTROLPLANE }}/management/v2/transferprocesses/request", @@ -3070,8 +3033,8 @@ "_type": "request" }, { - "_id": "req_48c48484c31846b7968b5ab136d521bc", - "parentId": "fld_2546a2bc93c546e38979839919cc8f52", + "_id": "req_1a1a611e34b149838b4af2a613b8b001", + "parentId": "fld_3e507398a81c4997b84386ec4b696cc2", "modified": 1690361763512, "created": 1681910653593, "url": "{{CONSUMER_CONTROLPLANE}}/management/v2/contractagreements/request", @@ -3107,8 +3070,8 @@ "_type": "request" }, { - "_id": "req_21468d73b6c9458d9aee834216139c0a", - "parentId": "fld_e3f5c18df152470e83abcb1aadcad047", + "_id": "req_d4008a1df6e84b7382501d4b8193e18d", + "parentId": "fld_94bed93ad8644c5bbb56e8d055a16004", "modified": 1690362947546, "created": 1681907482278, "url": "{{ _.PROVIDER_CONTROLPLANE_1 }}/management/v2/assets", @@ -3144,8 +3107,8 @@ "_type": "request" }, { - "_id": "fld_e3f5c18df152470e83abcb1aadcad047", - "parentId": "fld_77addaff9203411083a11a5c1d2feb18", + "_id": "fld_94bed93ad8644c5bbb56e8d055a16004", + "parentId": "fld_e98ad1a03da747699da1548ca479e361", "modified": 1705940929752, "created": 1684146457388, "name": "Provider", @@ -3156,8 +3119,8 @@ "_type": "request_group" }, { - "_id": "req_f496ffd7c650456a9b2f28544eb7cd62", - "parentId": "fld_e3f5c18df152470e83abcb1aadcad047", + "_id": "req_3aa2ca6041e64eeb9c2d411181d6a85f", + "parentId": "fld_94bed93ad8644c5bbb56e8d055a16004", "modified": 1690362407763, "created": 1685444139630, "url": "{{ _.PROVIDER_CONTROLPLANE_1 }}/management/v2/assets/{% prompt 'id', '', '', '', false, true %}", @@ -3185,8 +3148,8 @@ "_type": "request" }, { - "_id": "req_e192ac69c20a4396b6e89689018f184a", - "parentId": "fld_e3f5c18df152470e83abcb1aadcad047", + "_id": "req_f54584c5998144dc8e12aa0a0c9d4789", + "parentId": "fld_94bed93ad8644c5bbb56e8d055a16004", "modified": 1690362438115, "created": 1685444139625, "url": "{{ _.PROVIDER_CONTROLPLANE_1 }}/management/v2/assets/request", @@ -3222,8 +3185,8 @@ "_type": "request" }, { - "_id": "req_9846e1568ec745d09c9079ab8805a803", - "parentId": "fld_e3f5c18df152470e83abcb1aadcad047", + "_id": "req_6be03fdaeda44667bf8e58f30f638350", + "parentId": "fld_94bed93ad8644c5bbb56e8d055a16004", "modified": 1690362400081, "created": 1685444139636, "url": "{{ _.PROVIDER_CONTROLPLANE_1 }}/management/v2/assets/{% prompt 'id', '', '', '', false, true %}", @@ -3251,8 +3214,8 @@ "_type": "request" }, { - "_id": "req_05f114e52f4f4cf9ab5dc9e335ec9a6f", - "parentId": "fld_e3f5c18df152470e83abcb1aadcad047", + "_id": "req_01bd4307c77c43deafc31983ffa5be66", + "parentId": "fld_94bed93ad8644c5bbb56e8d055a16004", "modified": 1690362581978, "created": 1685444139641, "url": "{{ _.PROVIDER_CONTROLPLANE_1 }}/management/v2/policydefinitions", @@ -3288,8 +3251,8 @@ "_type": "request" }, { - "_id": "req_c324cae835dc45c2bd7e604c2adebd0f", - "parentId": "fld_e3f5c18df152470e83abcb1aadcad047", + "_id": "req_e24ab9892b9f4dcd9fe7f430588a0ff9", + "parentId": "fld_94bed93ad8644c5bbb56e8d055a16004", "modified": 1690362549290, "created": 1685444139647, "url": "{{ _.PROVIDER_CONTROLPLANE_1 }}/management/v2/policydefinitions/{% prompt 'id', '', '', '', false, true %}", @@ -3317,8 +3280,8 @@ "_type": "request" }, { - "_id": "req_e1960ae7b6794ba0b7554091c0173a5b", - "parentId": "fld_e3f5c18df152470e83abcb1aadcad047", + "_id": "req_2644d68b18e843108b289ec10a99f32b", + "parentId": "fld_94bed93ad8644c5bbb56e8d055a16004", "modified": 1690362591799, "created": 1685444139653, "url": "{{ _.PROVIDER_CONTROLPLANE_1 }}/management/v2/policydefinitions/request", @@ -3354,8 +3317,8 @@ "_type": "request" }, { - "_id": "req_22d237016eb64648a32a9b006002d980", - "parentId": "fld_e3f5c18df152470e83abcb1aadcad047", + "_id": "req_dc39e46b5b724c1f8af9be4429283026", + "parentId": "fld_94bed93ad8644c5bbb56e8d055a16004", "modified": 1690362559324, "created": 1685444139659, "url": "{{ _.PROVIDER_CONTROLPLANE_1 }}/management/v2/policydefinitions/{% prompt 'id', '', '', '', false, true %}", @@ -3383,8 +3346,8 @@ "_type": "request" }, { - "_id": "req_cd36ce447ab64a4e8bb04679db083694", - "parentId": "fld_e3f5c18df152470e83abcb1aadcad047", + "_id": "req_640f7eb1b49b4c49a39264a880736375", + "parentId": "fld_94bed93ad8644c5bbb56e8d055a16004", "modified": 1690363080444, "created": 1685444139665, "url": "{{ _.PROVIDER_CONTROLPLANE_1 }}/management/v2/contractdefinitions", @@ -3420,8 +3383,8 @@ "_type": "request" }, { - "_id": "req_667b2f34e2ad4fb08eea629419fef0ea", - "parentId": "fld_e3f5c18df152470e83abcb1aadcad047", + "_id": "req_6aa4307d89514e53ae8303d8ff7a7a09", + "parentId": "fld_94bed93ad8644c5bbb56e8d055a16004", "modified": 1690362691392, "created": 1685444139672, "url": "{{ _.PROVIDER_CONTROLPLANE_1 }}/management/v2/contractdefinitions/{% prompt 'id', '', '', '', false, true %}", @@ -3449,8 +3412,8 @@ "_type": "request" }, { - "_id": "req_ce2035d3954b44858f87897bd12095c6", - "parentId": "fld_e3f5c18df152470e83abcb1aadcad047", + "_id": "req_2372fc78fe7b4992b81159f0e5b2a495", + "parentId": "fld_94bed93ad8644c5bbb56e8d055a16004", "modified": 1690363126919, "created": 1685444139678, "url": "{{ _.PROVIDER_CONTROLPLANE_1 }}/management/v2/contractdefinitions/request", @@ -3486,8 +3449,8 @@ "_type": "request" }, { - "_id": "req_9a564507ca4c481bb585f2284c32eb0b", - "parentId": "fld_e3f5c18df152470e83abcb1aadcad047", + "_id": "req_691d62115c584dae980b6c1be3d671d7", + "parentId": "fld_94bed93ad8644c5bbb56e8d055a16004", "modified": 1690363136216, "created": 1685444139684, "url": "{{ _.PROVIDER_CONTROLPLANE_1 }}/management/v2/contractdefinitions/{% prompt 'id', '', '', '', false, true %}",