diff --git a/.github/argo/argo_config.sh b/.github/argo/argo_config.sh index 879a18f048..f7eb3d1f0c 100644 --- a/.github/argo/argo_config.sh +++ b/.github/argo/argo_config.sh @@ -29,7 +29,7 @@ DELETE_DEV_TEST_RESOURCES=( "$ARGO_TEST_EDC_PROVIDER/resource?group=apps&force=false&orphan=false&resourceName=tracex-test-edc-provider-tractusx-connector-dataplane&version=v1&kind=Deployment&namespace=product-traceability-foss" "$ARGO_TEST_REGISTRY/resource?force=false&orphan=false&resourceName=data-tracex-dt-registry-test-postgresql-0&version=v1&kind=PersistentVolumeClaim&namespace=product-traceability-foss" "$ARGO_TEST_REGISTRY/resource?group=apps&force=true&orphan=false&resourceName=tracex-dt-registry-test-postgresql&version=v1&kind=StatefulSet&namespace=product-traceability-foss" - "$ARGO_TEST_REGISTRY/resource?group=apps&force=false&orphan=false&resourceName=cx-tracex-dt-registry-test-registry&version=v1&kind=Deployment&namespace=product-traceability-foss" + "$ARGO_TEST_REGISTRY/resource?group=apps&force=false&orphan=false&resourceName=tracex-registry-test&version=v1&kind=Deployment&namespace=product-traceability-foss" "$ARGO_DEV_TRACE_X_INSTANCE/resource?force=false&orphan=false&resourceName=data-tx-backend-postgresql-dev-0&version=v1&kind=PersistentVolumeClaim&namespace=product-traceability-foss" "$ARGO_DEV_TRACE_X_INSTANCE/resource?group=apps&force=true&orphan=false&resourceName=tx-backend-postgresql-dev&version=v1&kind=StatefulSet&namespace=product-traceability-foss" @@ -44,7 +44,7 @@ DELETE_DEV_TEST_RESOURCES=( "$ARGO_DEV_EDC_PROVIDER/resource?group=apps&force=false&orphan=false&resourceName=tracex-edc-provider-tractusx-connector-dataplane&version=v1&kind=Deployment&namespace=product-traceability-foss" "$ARGO_DEV_REGISTRY/resource?force=false&orphan=false&resourceName=data-tracex-dt-registry-dev-postgresql-0&version=v1&kind=PersistentVolumeClaim&namespace=product-traceability-foss" "$ARGO_DEV_REGISTRY/resource?group=apps&force=true&orphan=false&resourceName=tracex-dt-registry-dev-postgresql&version=v1&kind=StatefulSet&namespace=product-traceability-foss" - "$ARGO_DEV_REGISTRY/resource?group=apps&force=false&orphan=false&resourceName=cx-tracex-dt-registry-dev-registry&version=v1&kind=Deployment&namespace=product-traceability-foss" + "$ARGO_DEV_REGISTRY/resource?group=apps&force=false&orphan=false&resourceName=tracex-registry-dev&version=v1&kind=Deployment&namespace=product-traceability-foss" ) DELETE_E2E_RESOURCES=( @@ -61,7 +61,7 @@ DELETE_E2E_RESOURCES=( "$ARGO_E2E_A_EDC_PROVIDER/resource?group=apps&force=false&orphan=false&resourceName=tracex-edc-provider-e2e-a-tractusx-connector-dataplane&version=v1&kind=Deployment&namespace=product-traceability-foss" "$ARGO_E2E_A_REGISTRY/resource?force=false&orphan=false&resourceName=data-tracex-dt-registry-e2e-a-postgresql-0&version=v1&kind=PersistentVolumeClaim&namespace=product-traceability-foss" "$ARGO_E2E_A_REGISTRY/resource?group=apps&force=true&orphan=false&resourceName=tracex-dt-registry-e2e-a-postgresql&version=v1&kind=StatefulSet&namespace=product-traceability-foss" - "$ARGO_E2E_A_REGISTRY/resource?group=apps&force=false&orphan=false&resourceName=cx-tracex-dt-registry-e2e-a-registry&version=v1&kind=Deployment&namespace=product-traceability-foss" + "$ARGO_E2E_A_REGISTRY/resource?group=apps&force=false&orphan=false&resourceName=tracex-registry-e2e-a&version=v1&kind=Deployment&namespace=product-traceability-foss" "$ARGO_E2E_B_TRACE_X_INSTANCE/resource?force=false&orphan=false&resourceName=data-tx-backend-postgresql-e2e-b-0&version=v1&kind=PersistentVolumeClaim&namespace=product-traceability-foss" "$ARGO_E2E_B_TRACE_X_INSTANCE/resource?group=apps&force=true&orphan=false&resourceName=tx-backend-postgresql-e2e-b&version=v1&kind=StatefulSet&namespace=product-traceability-foss" @@ -76,7 +76,7 @@ DELETE_E2E_RESOURCES=( "$ARGO_E2E_B_EDC_PROVIDER/resource?group=apps&force=false&orphan=false&resourceName=tracex-edc-provider-e2e-b-tractusx-connector-dataplane&version=v1&kind=Deployment&namespace=product-traceability-foss" "$ARGO_E2E_B_REGISTRY/resource?force=false&orphan=false&resourceName=data-tracex-dt-registry-e2e-b-postgresql-0&version=v1&kind=PersistentVolumeClaim&namespace=product-traceability-foss" "$ARGO_E2E_B_REGISTRY/resource?group=apps&force=true&orphan=false&resourceName=tracex-dt-registry-e2e-b-postgresql&version=v1&kind=StatefulSet&namespace=product-traceability-foss" - "$ARGO_E2E_B_REGISTRY/resource?group=apps&force=false&orphan=false&resourceName=cx-tracex-dt-registry-e2e-b-registry&version=v1&kind=Deployment&namespace=product-traceability-foss" + "$ARGO_E2E_B_REGISTRY/resource?group=apps&force=false&orphan=false&resourceName=tracex-registry-e2e-b&version=v1&kind=Deployment&namespace=product-traceability-foss" ) DELETE_INT_RESOURCES=( "$ARGO_INT_A_TRACE_X_INSTANCE/resource?force=false&orphan=false&resourceName=data-tx-backend-postgresql-int-a-0&version=v1&kind=PersistentVolumeClaim&namespace=product-traceability-foss" @@ -92,7 +92,7 @@ DELETE_INT_RESOURCES=( "$ARGO_INT_A_EDC_PROVIDER/resource?group=apps&force=false&orphan=false&resourceName=tx-edc-provider-int-a-dataplane&version=v1&kind=Deployment&namespace=product-traceability-foss" "$ARGO_INT_A_REGISTRY/resource?force=false&orphan=false&resourceName=data-tx-registry-int-a-postgresql-0&version=v1&kind=PersistentVolumeClaim&namespace=product-traceability-foss" "$ARGO_INT_A_REGISTRY/resource?group=apps&force=true&orphan=false&resourceName=tx-registry-int-a-postgresql&version=v1&kind=StatefulSet&namespace=product-traceability-foss" - "$ARGO_INT_A_REGISTRY/resource?group=apps&force=false&orphan=false&resourceName=cx-tx-registry-int-a-registry&version=v1&kind=Deployment&namespace=product-traceability-foss" + "$ARGO_INT_A_REGISTRY/resource?group=apps&force=false&orphan=false&resourceName=tracex-registry-int-a&version=v1&kind=Deployment&namespace=product-traceability-foss" "$ARGO_INT_B_TRACE_X_INSTANCE/resource?force=false&orphan=false&resourceName=data-tx-backend-postgresql-int-b-0&version=v1&kind=PersistentVolumeClaim&namespace=product-traceability-foss" "$ARGO_INT_B_TRACE_X_INSTANCE/resource?group=apps&force=true&orphan=false&resourceName=tx-backend-postgresql-int-b&version=v1&kind=StatefulSet&namespace=product-traceability-foss" @@ -107,8 +107,8 @@ DELETE_INT_RESOURCES=( "$ARGO_INT_B_EDC_PROVIDER/resource?group=apps&force=false&orphan=false&resourceName=tx-edc-provider-int-b-tractusx-connector-dataplane&version=v1&kind=Deployment&namespace=product-traceability-foss" "$ARGO_INT_B_REGISTRY/resource?force=false&orphan=false&resourceName=data-tx-registry-int-b-postgresql-0&version=v1&kind=PersistentVolumeClaim&namespace=product-traceability-foss" "$ARGO_INT_B_REGISTRY/resource?group=apps&force=true&orphan=false&resourceName=tx-registry-int-b-postgresql&version=v1&kind=StatefulSet&namespace=product-traceability-foss" - "$ARGO_INT_B_REGISTRY/resource?group=apps&force=false&orphan=false&resourceName=cx-tx-registry-int-b-registry&version=v1&kind=Deployment&namespace=product-traceability-foss" - ) + "$ARGO_INT_B_REGISTRY/resource?group=apps&force=false&orphan=false&resourceName=tracex-registry-int-b&version=v1&kind=Deployment&namespace=product-traceability-foss" + ) SYNC_DEV_TEST_RESOURCES=( "$ARGO_TEST_REGISTRY/sync" "$ARGO_TEST_EDC_PROVIDER/sync" @@ -163,5 +163,5 @@ INT_RESOURCES=( "$ARGO_INT_B_EDC_PROVIDER" "$ARGO_INT_B_TRACE_X_INSTANCE" ) - - + + diff --git a/.github/workflows/argo.yml b/.github/workflows/argo.yml index 30e073e949..54434eb686 100644 --- a/.github/workflows/argo.yml +++ b/.github/workflows/argo.yml @@ -35,7 +35,7 @@ on: - E2E-A/E2E-B - int-a/int-b testdata_version: - description: Which Testdata Version CX_Testdata_MessagingTest_v.json e.g., 0.0.12" + description: Which Testdata Version CX_Testdata_MessagingTest_v.json e.g., 0.0.13" required: true argo_token: description: Argo Token @@ -375,22 +375,22 @@ jobs: - name: Upload testdata run: | python -m pip install requests - curl -o transform-and-upload.py https://raw.githubusercontent.com/catenax-ng/tx-item-relationship-service/main/local/testing/testdata/transform-and-upload.py + curl -o transform-and-upload.py https://raw.githubusercontent.com/eclipse-tractusx/item-relationship-service/main/local/testing/testdata/transform-and-upload.py if [ "${{ github.event.inputs.testdata_upload }}" == "true" ]; then if [ "${{ github.event.inputs.environment }}" == "Dev/Test" ]; then - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-test.dev.demo.catena-x.net/api/submodel -edc https://trace-x-test-edc.dev.demo.catena-x.net -a https://trace-x-registry-test.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-test-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-test.dev.demo.catena-x.net/api/submodel/data -edc https://trace-x-test-edc.dev.demo.catena-x.net -a https://trace-x-registry-test.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-test-edc-dataplane.dev.demo.catena-x.net -p traceability-core -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC sleep 10 - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc.dev.demo.catena-x.net -a https://trace-x-registry.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability.dev.demo.catena-x.net/api/submodel/data -edc https://trace-x-edc.dev.demo.catena-x.net -a https://trace-x-registry-dev.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-dataplane.dev.demo.catena-x.net -p traceability-core -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CML1 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC sleep 10 elif [ "${{ github.event.inputs.environment }}" == "E2E-A/E2E-B" ]; then - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-e2e-a.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc-e2e-a.dev.demo.catena-x.net -a https://trace-x-registry-e2e-a.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-e2e-a-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-e2e-a.dev.demo.catena-x.net/api/submodel/data -edc https://trace-x-edc-e2e-a.dev.demo.catena-x.net -a https://trace-x-registry-e2e-a.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-e2e-a-dataplane.dev.demo.catena-x.net -p traceability-core -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CML1 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC sleep 10 - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-e2e-b.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc-e2e-b.dev.demo.catena-x.net -a https://trace-x-registry-e2e-b.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-e2e-b-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-e2e-b.dev.demo.catena-x.net/api/submodel/data -edc https://trace-x-edc-e2e-b.dev.demo.catena-x.net -a https://trace-x-registry-e2e-b.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-e2e-b-dataplane.dev.demo.catena-x.net -p traceability-core -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC sleep 10 elif [ "${{ github.event.inputs.environment }}" == "int-a/int-b" ]; then - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-int-a.int.demo.catena-x.net/api/submodel -edc https://trace-x-edc-int-a.int.demo.catena-x.net -a https://trace-x-registry-int-a.int.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-a-dataplane.int.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_INT_A }} --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-int-a.int.demo.catena-x.net/api/submodel/data -edc https://trace-x-edc-int-a.int.demo.catena-x.net -a https://trace-x-registry-int-a.int.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-int-a-dataplane.int.demo.catena-x.net -p traceability-core -k ${{ secrets.TRACE_X_API_KEY_INT_A }} --aas3 --edcBPN BPNL00000003CML1 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV sleep 10 - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-int-b.int.demo.catena-x.net/api/submodel -edc https://trace-x-edc-int-b.int.demo.catena-x.net -a https://trace-x-registry-int-b.int.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-b-dataplane.int.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_INT_B }} --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-int-b.int.demo.catena-x.net/api/submodel/data -edc https://trace-x-edc-int-b.int.demo.catena-x.net -a https://trace-x-registry-int-b.int.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-int-b-dataplane.int.demo.catena-x.net -p traceability-core -k ${{ secrets.TRACE_X_API_KEY_INT_B }} --aas3 --edcBPN BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV sleep 10 fi elif [ "${{ github.event.inputs.testdata_upload }}" == "false" ]; then diff --git a/.github/workflows/publish-documentation.yaml b/.github/workflows/publish-documentation.yaml index 23cda5c496..1416e3302b 100644 --- a/.github/workflows/publish-documentation.yaml +++ b/.github/workflows/publish-documentation.yaml @@ -127,7 +127,7 @@ jobs: mv docs/src/diagram-replacer/assets/ docs/target/generated-docs/assets/ - name: GitHub Pages action - uses: peaceiris/actions-gh-pages@v3.9.3 + uses: peaceiris/actions-gh-pages@v4.0.0 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: "./docs/target/generated-docs" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a7726390f9..ab39626416 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -58,8 +58,8 @@ jobs: - name: Update the frontend package.json appVersion run: | - npm install -g json - json -I -f frontend/package.json -e "this.version='${{ github.ref_name }}'" + sudo npm install -g json + sudo json -I -f frontend/package.json -e "this.version='${{ github.ref_name }}'" - name: Prepare Helm release uses: peter-evans/create-pull-request@v6 diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index c937b2de37..eceb6f7786 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -74,7 +74,7 @@ jobs: run: docker build -t localhost:5000/traceability-foss:fe_${{ github.sha }} -f ./frontend/Dockerfile . - name: Run Trivy vulnerability scanner - uses: aquasecurity/trivy-action@0.18.0 + uses: aquasecurity/trivy-action@0.19.0 with: trivyignores: "./.github/workflows/.trivyignore" image-ref: 'localhost:5000/traceability-foss:fe_${{ github.sha }}' @@ -134,7 +134,7 @@ jobs: ref: ${{needs.prepare-env.outputs.check_sha}} - name: Run Trivy vulnerability scanner in repo mode - uses: aquasecurity/trivy-action@0.18.0 + uses: aquasecurity/trivy-action@0.19.0 with: trivyignores: "./.github/workflows/.trivyignore" scan-type: "config" @@ -180,7 +180,7 @@ jobs: tags: localhost:5000/traceability-foss:trivy - name: Run Trivy vulnerability scanner - uses: aquasecurity/trivy-action@0.18.0 + uses: aquasecurity/trivy-action@0.19.0 with: image-ref: localhost:5000/traceability-foss:trivy trivyignores: "./.github/workflows/.trivyignore" diff --git a/.github/workflows/unit-test_frontend.yml b/.github/workflows/unit-test_frontend.yml index 4ab7cfef71..fd6e14df52 100644 --- a/.github/workflows/unit-test_frontend.yml +++ b/.github/workflows/unit-test_frontend.yml @@ -25,6 +25,7 @@ on: paths: - 'frontend/**' pull_request: + workflow_dispatch: jobs: build: diff --git a/CHANGELOG.md b/CHANGELOG.md index ef6e276a16..f342303f59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,9 +6,99 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). _**For better traceability add the corresponding GitHub issue number in each changelog entry, please.**_ - ## [UNRELEASED - DD.MM.YYYY] +## [11.0.1 - 22.05.2024] + +### Added +- #859 added autocomplete on subset of assets in notification creation/edit view +- #997 added publish assets state check to parts table +- #XXX added border to dashboard notifications table and view all count + +### Changed +- #778 return empty PageResult when no contract agreement Ids are found instead of http 404 in /contacts API +- #XXX Fixed some sonar issues in frontend application +- #958 Fixed bug where available parts filter was reset when list of affected parts are zero in notification creation +- XXX Removed EdcNotifiactionMockServiceImpl class and replaced with mocks +- #XXX Switched eclipse-temurin:21-jre-alpine@sha256:fb4150a30569aadae9d693d949684a00653411528e62498b9900940c9b5b8a66 to 23467b3e42617ca197f43f58bc5fb03ca4cb059d68acd49c67128bfded132d67 +- #837 Moved data import and IrsResponseMappers under same interface and shared methods +- #947 Updating irs-helm from 7.1.1 to 7.1.2 to use latest catena-x policy +- #963 update irs-client-lib.version from 2.0.3 to 2.0.4-SNAPSHOT to fix /contracts api +- #989 changed german word "Eigen" to "Eigene" +- #992 improved uux in selection of columns in table settings +- #994 moved search bar above new and existing configurations +- #994 disable inputs of newly added bpn configurations +- #995 disable creation and editof notifications for admin role +- #991 make menu table headers unvisible to not block column and filters of tables +- #915 Updated user manual documentation (chapters and screenshots) +- #998 fixed bug where global search bar could search for BPN and adjusted placeholder label to reflect column names +- #913 Changed severity icons +- #978 Fixed edc policy creation with edc version 0.7.0 + +## [11.0.0 - 08.05.2024] +### Added +- #844 Validation for BPN to Notification API (Create / Edit), Fixed pagination +- #726 Added @Preauthorize annotation to dashboard controller +- #849 Added concept: Notifications to multiple BPNs +- #837 Added digital twin type to data provisioning workflow to be able to lookup shells created by trace-x +- #783 Validation that receiver of a notification must not be same as sender. +- #831 Added concept: Notification data model revision +- #859 Enable autocomplete API to filter for given assets +- #778 Added counterPartyId to getCatalogRequest + +### Changed +- #837 migrate to irs-helm 7.1.1 +- #837 migrate to irs-decentral-client-library to 2.0.2-SNAPSHOT +- #844 Prefilled bpn on investigation creation +- #843 Refactored e2e tests, added edit notification e2e test case +- #828 fix duplicates in traction_battery_code_subcomponent table +- #617 redesigned inbox table +- #603 Upgraded SingleLevelBomAsBuilt, SingleLevelBomAsPlanned & SingleLevelBomAsBuilt to 3.0.0 +- #603 Upgraded Batch, SerialPart and JustInSequencePart to 3.0.0 +- #603 Upgraded PartAsPlanned to 2.0.0 +- #918 Merged parts and other parts into one table +- #918 Fixed translations and normal case for autocomplete values +- #778 update EDC from 0.5.3 to 0.7.0 +- #XXX update of lombok from 1.18.30 to 1.18.32 +- #XXX update of findsecbugs plugin from 1.12.0 to 1.13.0 +- #XXX update of commons-compress from 1.26.0 to 1.26.1 +- #XXX update of logback from 1.5.5 to 1.5.6 +- #XXX update of cucumber-bom from 7.16.1 to 7.17.0 +- #XXX Updated spring boot from 3.2.4 to 3.2.5 +- #XXX Bumped logback-core & logback-classic from 1.5.4 to 1.5.5 + +### Removed +- #602 digitalTwinType instead of semanticId. DigitalTwinType causes problems in release 24.05 + +## [10.8.4 - 17.04.2024] + +### Added +- #780 store api documenation in docs/api to conform with TRG 1.08 +- #622 Notification Update API +- #774 Added initial concept for handling multiple BPNs +- #834 Added possiblity to exclude elements from the results of the asset api filter +- #586 BPDM lookup feature + +## Changed +- XXX Updated insomnia collection +- #834 Behaviour of parts selection in edit / create notification view +- #823 migrate to irs-helm 6.18.0 +- #636 migrate to digital-twin-registry version 0.4.9 from 0.3.22 +- #622 Added functionallity to edit existing notifications within CREATED state +- #602 use digitalTwinType instead of semanticId to determine asBuilt or asPlanned assets +- Spell check arc42 documentation and administration guide and make it consistent +- bump ch.qos.logback:logback-core from 1.4.14 to 1.5.4 +- bump peaceiris/actions-gh-pages from 3.9.3 to 4.0.0 +- bump aquasecurity/trivy-action from 0.18.0 to 0.19.0 +- bump org.springframework.cloud:spring-cloud-dependencies from 2023.0.0 to 2023.0.1 +- bump org.awaitility:awaitility from 3.0.0 to 4.2.1 +- bump org.asciidoctor:asciidoctorj-diagram from 2.2.13 to 2.3.0 +- bump io.cucumber:cucumber-bom from 7.15.0 to 7.16.1 + +## [10.8.2 - 05.04.2024] +### Removed +- #547 Removed classification check on alert / investigation update callback methods + ## [10.8.1 - 04.04.2024] ### Added diff --git a/COMPATIBILITY_MATRIX.md b/COMPATIBILITY_MATRIX.md index cfb82efdcc..578ea769c9 100644 --- a/COMPATIBILITY_MATRIX.md +++ b/COMPATIBILITY_MATRIX.md @@ -1,5 +1,60 @@ # Compatibility matrix Trace-X +## Trace-X version [[11.0.1](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/11.0.1] - 2024-05-22 + +### Catena-X Release? + +- [x] yes +- [ ] no + +### Helm Version [1.3.38](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/helm-charts-1.3.38) + +| Dependency | Name of Service | Version | Helm | Comments | +|------------------|------------------------------|----------------------|----------|-----------------------------------------------------| +| EDC | edc-postgresql | 15.4.0-debian-11-r45 | 12.12.10 | Enterprise Data Connector for PostgreSQL | +| IRS | item-relationship-service | 5.1.3 | 7.1.3 | Helm charts for Item Relationship Service | +| EDC | tractusx-connector | 0.7.0 | 0.7.0 | Connector for Data Transfer and Registration | +| Discovery Finder | discovery service | 0.2.5 | - | Service for discovering and registering artifacts | +| Portal | portal | 1.8.0 | - | Web portal for interacting with Trace-X | +| SD-Factory | SD-Factory | 2.1.7 | - | Service Discovery Factory for managing dependencies | +| Aspect Model | SerialPart | 3.0.0 | - | | +| Aspect Model | Batch | 3.0.0 | - | | +| Aspect Model | PartAsPlanned | 2.0.0 | - | | +| Aspect Model | PartSiteInformationAsPlanned | 1.0.0 | - | | +| Aspect Model | JustInSequencePart | 3.0.0 | - | | +| Aspect Model | TractionBatteryCode | 1.0.0 | - | | +| Aspect Model | SingleLevelUsageAsBuilt | 3.0.0 | - | | +| Aspect Model | SingleLevelBomAsBuilt | 3.0.0 | - | | +| Aspect Model | SingleLevelBomAsPlanned | 3.0.0 | - | + +## Trace-X version [[11.0.0](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/11.0.0] - 2024-05-08 + +### Catena-X Release? + +- [x] yes +- [ ] no + +### Helm Version [1.3.37](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/helm-charts-1.3.37) + +| Dependency | Name of Service | Version | Helm | Comments | +|------------------|------------------------------|---------------------|----------|-----------------------------------------------------------------------------------| +| EDC | edc-postgresql | 15.4.0-debian-11-r45 | 12.12.10 | Enterprise Data Connector for PostgreSQL | +| IRS | item-relationship-service | 5.1.1 | 7.1.1 | Helm charts for Item Relationship Service | +| EDC | tractusx-connector | 0.7.0 | 0.7.0 | Connector for Data Transfer and Registration | +| Discovery Finder | discovery service | 0.2.5 | - | Service for discovering and registering artifacts | +| Portal | portal | 1.8.0 | - | Web portal for interacting with Trace-X | +| SD-Factory | SD-Factory | 2.1.7 | - | Service Discovery Factory for managing dependencies | +| Aspect Model | SerialPart | 3.0.0 | - | | +| Aspect Model | Batch | 3.0.0 | - | | +| Aspect Model | PartAsPlanned | 2.0.0 | - | | +| Aspect Model | PartSiteInformationAsPlanned | 1.0.0 | - | | +| Aspect Model | JustInSequencePart | 3.0.0 | - | | +| Aspect Model | TractionBatteryCode | 1.0.0 | - | | +| Aspect Model | SingleLevelUsageAsBuilt | 3.0.0 | - | | +| Aspect Model | SingleLevelBomAsBuilt | 3.0.0 | - | | +| Aspect Model | SingleLevelBomAsPlanned | 3.0.0 | - | +## Trace-X version [[10.8.4](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/10.8.4)] - 2024-04-17 +- No changes to 10.8.1 ## Trace-X version [[10.8.1](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/10.8.1)] - 2024-04-03 ### Catena-X Release? diff --git a/DEPENDENCIES_BACKEND b/DEPENDENCIES_BACKEND index 6b5ca2b1cf..24d6604ab5 100644 --- a/DEPENDENCIES_BACKEND +++ b/DEPENDENCIES_BACKEND @@ -1,10 +1,11 @@ maven/mavencentral/ch.qos.logback/logback-classic/1.4.14, EPL-1.0 OR LGPL-2.1-only, approved, #3435 +maven/mavencentral/ch.qos.logback/logback-classic/1.5.6, EPL-1.0 AND LGPL-2.1-only, approved, #13282 maven/mavencentral/ch.qos.logback/logback-core/1.4.14, EPL-1.0 OR LGPL-2.1-only, approved, #3373 -maven/mavencentral/com.apicatalog/titanium-json-ld/1.3.2, Apache-2.0, approved, #8912 +maven/mavencentral/ch.qos.logback/logback-core/1.5.6, EPL-1.0 AND LGPL-2.1-only, approved, #13283 +maven/mavencentral/com.apicatalog/titanium-json-ld/1.4.0, Apache-2.0, approved, #13683 maven/mavencentral/com.auth0/java-jwt/4.4.0, MIT, approved, #8459 maven/mavencentral/com.carrotsearch.thirdparty/simple-xml-safe/2.7.1, Apache-2.0, approved, clearlydefined maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.15.4, Apache-2.0, approved, #7947 -maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.14.2, Apache-2.0 AND MIT, approved, #4303 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.15.4, MIT AND Apache-2.0, approved, #7932 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.14.2, Apache-2.0, approved, #4105 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.15.4, Apache-2.0, approved, #7934 @@ -12,12 +13,10 @@ maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-toml/2.15 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-toml/2.15.4, Apache-2.0, approved, #9160 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.14.2, Apache-2.0, approved, #5933 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.15.4, Apache-2.0, approved, #8802 -maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jakarta-jsonp/2.15.2, Apache-2.0, approved, #9179 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jakarta-jsonp/2.15.4, Apache-2.0, approved, #9179 +maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jakarta-jsonp/2.16.2, Apache-2.0, approved, #11854 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.15.4, Apache-2.0, approved, #8808 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.15.4, Apache-2.0, approved, #7930 -maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.14.1, Apache-2.0, approved, #5308 -maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.15.4, Apache-2.0, approved, #9241 maven/mavencentral/com.fasterxml.jackson.module/jackson-module-parameter-names/2.15.4, Apache-2.0, approved, #8803 maven/mavencentral/com.fasterxml/classmate/1.5.1, Apache-2.0, approved, clearlydefined maven/mavencentral/com.fasterxml/classmate/1.6.0, Apache-2.0, approved, clearlydefined @@ -36,23 +35,22 @@ maven/mavencentral/com.google.code.findbugs/annotations/1.3.9, LGPL-2.1-or-later maven/mavencentral/com.google.code.findbugs/jsr305/3.0.2, Apache-2.0, approved, #20 maven/mavencentral/com.google.code.gson/gson/2.10.1, Apache-2.0, approved, #6159 maven/mavencentral/com.google.code.javaparser/javaparser/1.0.11, LGPL-3.0-or-later, approved, #13474 +maven/mavencentral/com.google.crypto.tink/tink/1.12.0, Apache-2.0, approved, #12041 maven/mavencentral/com.google.errorprone/error_prone_annotations/2.18.0, Apache-2.0, approved, clearlydefined maven/mavencentral/com.google.guava/failureaccess/1.0.1, Apache-2.0, approved, CQ22654 maven/mavencentral/com.google.guava/guava/32.0.1-jre, Apache-2.0 AND CC0-1.0 AND CC-PDDC, approved, #8772 maven/mavencentral/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava, Apache-2.0, approved, CQ22657 maven/mavencentral/com.google.j2objc/j2objc-annotations/2.8, Apache-2.0, approved, clearlydefined +maven/mavencentral/com.google.protobuf/protobuf-java/3.24.3, BSD-3-Clause, approved, clearlydefined maven/mavencentral/com.googlecode.libphonenumber/libphonenumber/8.11.1, Apache-2.0, approved, clearlydefined maven/mavencentral/com.jayway.jsonpath/json-path/2.9.0, Apache-2.0, approved, clearlydefined maven/mavencentral/com.nimbusds/content-type/2.2, Apache-2.0, approved, clearlydefined maven/mavencentral/com.nimbusds/lang-tag/1.7, Apache-2.0, approved, clearlydefined maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.37.3, Apache-2.0, approved, #11701 maven/mavencentral/com.nimbusds/oauth2-oidc-sdk/9.43.3, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.squareup.okhttp3/okhttp-dnsoverhttps/4.11.0, Apache-2.0, approved, clearlydefined maven/mavencentral/com.squareup.okhttp3/okhttp-dnsoverhttps/4.12.0, Apache-2.0, approved, #11159 -maven/mavencentral/com.squareup.okhttp3/okhttp/4.11.0, Apache-2.0, approved, #9240 maven/mavencentral/com.squareup.okhttp3/okhttp/4.12.0, Apache-2.0, approved, #11156 maven/mavencentral/com.squareup.okio/okio-jvm/3.5.0, Apache-2.0, approved, #9851 -maven/mavencentral/com.squareup.okio/okio/3.2.0, Apache-2.0, approved, clearlydefined maven/mavencentral/com.squareup.okio/okio/3.6.0, Apache-2.0, approved, #11155 maven/mavencentral/com.sun.codemodel/codemodel/2.6, CDDL-1.1 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, clearlydefined maven/mavencentral/com.sun.istack/istack-commons-runtime/4.1.1, BSD-3-Clause, approved, #2590 @@ -71,24 +69,26 @@ maven/mavencentral/commons-io/commons-io/2.11.0, Apache-2.0, approved, CQ23745 maven/mavencentral/commons-lang/commons-lang/2.6, Apache-2.0, approved, CQ6183 maven/mavencentral/commons-logging/commons-logging/1.2, Apache-2.0, approved, CQ10162 maven/mavencentral/commons-logging/commons-logging/1.3.0, Apache-2.0, approved, #11783 -maven/mavencentral/commons-validator/commons-validator/1.7, Apache-2.0, approved, clearlydefined +maven/mavencentral/commons-validator/commons-validator/1.8.0, Apache-2.0, approved, #11891 maven/mavencentral/dev.failsafe/failsafe-okhttp/3.3.2, Apache-2.0, approved, #9178 maven/mavencentral/dev.failsafe/failsafe/3.3.2, Apache-2.0, approved, #9268 -maven/mavencentral/io.cucumber/ci-environment/10.0.0, MIT, approved, #13863 -maven/mavencentral/io.cucumber/cucumber-core/7.15.0, MIT AND (Apache-2.0 AND MIT), approved, #13859 -maven/mavencentral/io.cucumber/cucumber-expressions/17.0.1, MIT, approved, #13858 -maven/mavencentral/io.cucumber/cucumber-gherkin-messages/7.15.0, MIT, approved, clearlydefined -maven/mavencentral/io.cucumber/cucumber-gherkin/7.15.0, MIT, approved, clearlydefined -maven/mavencentral/io.cucumber/cucumber-java/7.15.0, MIT, approved, clearlydefined -maven/mavencentral/io.cucumber/cucumber-junit-platform-engine/7.15.0, MIT, approved, clearlydefined -maven/mavencentral/io.cucumber/cucumber-plugin/7.15.0, MIT, approved, clearlydefined -maven/mavencentral/io.cucumber/datatable/7.15.0, MIT, approved, #13862 -maven/mavencentral/io.cucumber/docstring/7.15.0, MIT, approved, clearlydefined -maven/mavencentral/io.cucumber/gherkin/26.2.0, MIT, approved, clearlydefined -maven/mavencentral/io.cucumber/html-formatter/20.4.0, Apache-2.0 AND CC-BY-4.0 AND MIT AND OFL-1.1, approved, #13864 -maven/mavencentral/io.cucumber/junit-xml-formatter/0.2.0, MIT, approved, #11043 -maven/mavencentral/io.cucumber/messages/22.0.0, MIT, approved, clearlydefined -maven/mavencentral/io.cucumber/tag-expressions/6.0.0, MIT, approved, #13860 +maven/mavencentral/io.cucumber/ci-environment/10.0.1, MIT, approved, #13863 +maven/mavencentral/io.cucumber/cucumber-core/7.17.0, MIT AND (Apache-2.0 AND MIT), approved, #14646 +maven/mavencentral/io.cucumber/cucumber-expressions/17.1.0, MIT, approved, #14271 +maven/mavencentral/io.cucumber/cucumber-gherkin-messages/7.17.0, MIT, approved, #14649 +maven/mavencentral/io.cucumber/cucumber-gherkin/7.17.0, MIT, approved, #14648 +maven/mavencentral/io.cucumber/cucumber-java/7.17.0, MIT, approved, #14640 +maven/mavencentral/io.cucumber/cucumber-junit-platform-engine/7.17.0, MIT, approved, #14642 +maven/mavencentral/io.cucumber/cucumber-plugin/7.17.0, MIT, approved, #14643 +maven/mavencentral/io.cucumber/datatable/7.17.0, MIT, approved, #14647 +maven/mavencentral/io.cucumber/docstring/7.17.0, MIT, approved, #14645 +maven/mavencentral/io.cucumber/gherkin/28.0.0, MIT, approved, #14276 +maven/mavencentral/io.cucumber/html-formatter/21.3.1, Apache-2.0 AND MIT, approved, #14275 +maven/mavencentral/io.cucumber/junit-xml-formatter/0.4.0, MIT, approved, #14644 +maven/mavencentral/io.cucumber/messages/24.1.0, MIT, approved, #14274 +maven/mavencentral/io.cucumber/query/12.1.2, MIT, approved, #14641 +maven/mavencentral/io.cucumber/tag-expressions/6.1.0, MIT AND (BSD-3-Clause AND MIT) AND BSD-3-Clause, approved, #14277 +maven/mavencentral/io.cucumber/testng-xml-formatter/0.1.0, MIT, approved, #14650 maven/mavencentral/io.github.classgraph/classgraph/4.8.149, MIT, approved, CQ22530 maven/mavencentral/io.github.resilience4j/resilience4j-annotations/2.1.0, Apache-2.0, approved, #10171 maven/mavencentral/io.github.resilience4j/resilience4j-bulkhead/2.1.0, Apache-2.0, approved, #10172 @@ -103,17 +103,17 @@ maven/mavencentral/io.github.resilience4j/resilience4j-retry/2.1.0, Apache-2.0, maven/mavencentral/io.github.resilience4j/resilience4j-spring-boot3/2.1.0, Apache-2.0, approved, #10913 maven/mavencentral/io.github.resilience4j/resilience4j-spring6/2.1.0, Apache-2.0, approved, #10915 maven/mavencentral/io.github.resilience4j/resilience4j-timelimiter/2.1.0, Apache-2.0, approved, #10166 -maven/mavencentral/io.micrometer/micrometer-commons/1.12.4, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #11679 -maven/mavencentral/io.micrometer/micrometer-core/1.12.4, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #11678 -maven/mavencentral/io.micrometer/micrometer-jakarta9/1.12.4, Apache-2.0, approved, #12923 -maven/mavencentral/io.micrometer/micrometer-observation/1.12.4, Apache-2.0, approved, #11680 +maven/mavencentral/io.micrometer/micrometer-commons/1.12.5, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #11679 +maven/mavencentral/io.micrometer/micrometer-core/1.12.5, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #11678 +maven/mavencentral/io.micrometer/micrometer-jakarta9/1.12.5, Apache-2.0, approved, #12923 +maven/mavencentral/io.micrometer/micrometer-observation/1.12.5, Apache-2.0, approved, #11680 maven/mavencentral/io.micrometer/micrometer-registry-prometheus/1.11.4, Apache-2.0, approved, #9805 -maven/mavencentral/io.micrometer/micrometer-registry-prometheus/1.12.4, Apache-2.0, approved, #14187 -maven/mavencentral/io.minio/minio/8.5.6, Apache-2.0, approved, #9097 -maven/mavencentral/io.opentelemetry/opentelemetry-api/1.29.0, Apache-2.0, approved, #10088 +maven/mavencentral/io.micrometer/micrometer-registry-prometheus/1.12.5, Apache-2.0, approved, #14187 +maven/mavencentral/io.minio/minio/8.5.9, Apache-2.0, approved, #9097 maven/mavencentral/io.opentelemetry/opentelemetry-api/1.31.0, Apache-2.0, approved, #11087 -maven/mavencentral/io.opentelemetry/opentelemetry-context/1.29.0, Apache-2.0, approved, #10090 +maven/mavencentral/io.opentelemetry/opentelemetry-api/1.32.0, Apache-2.0, approved, #11682 maven/mavencentral/io.opentelemetry/opentelemetry-context/1.31.0, Apache-2.0, approved, #11088 +maven/mavencentral/io.opentelemetry/opentelemetry-context/1.32.0, Apache-2.0, approved, #11683 maven/mavencentral/io.prometheus/simpleclient/0.16.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.prometheus/simpleclient_common/0.16.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.prometheus/simpleclient_tracer_common/0.16.0, Apache-2.0, approved, clearlydefined @@ -128,8 +128,9 @@ maven/mavencentral/io.rest-assured/rest-assured/5.4.0, Apache-2.0, approved, #12 maven/mavencentral/io.rest-assured/xml-path/5.3.2, Apache-2.0, approved, #9267 maven/mavencentral/io.rest-assured/xml-path/5.4.0, Apache-2.0, approved, #12038 maven/mavencentral/io.smallrye/jandex/3.1.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.20, Apache-2.0, approved, #5947 maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.8, Apache-2.0, approved, #5947 -maven/mavencentral/io.swagger.core.v3/swagger-annotations/2.2.16, Apache-2.0, approved, #11362 +maven/mavencentral/io.swagger.core.v3/swagger-annotations/2.2.18, Apache-2.0, approved, #11362 maven/mavencentral/io.swagger.core.v3/swagger-core-jakarta/2.2.8, Apache-2.0, approved, #5929 maven/mavencentral/io.swagger.core.v3/swagger-models-jakarta/2.2.8, Apache-2.0, approved, #5919 maven/mavencentral/io.swagger/swagger-annotations/1.6.12, Apache-2.0, approved, #3792 @@ -138,7 +139,7 @@ maven/mavencentral/jakarta.activation/jakarta.activation-api/2.1.3, EPL-2.0 OR B maven/mavencentral/jakarta.annotation/jakarta.annotation-api/2.1.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca maven/mavencentral/jakarta.inject/jakarta.inject-api/2.0.1, Apache-2.0, approved, ee4j.cdi maven/mavencentral/jakarta.json.bind/jakarta.json.bind-api/2.0.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jsonb -maven/mavencentral/jakarta.json.bind/jakarta.json.bind-api/3.0.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jsonb +maven/mavencentral/jakarta.json.bind/jakarta.json.bind-api/3.0.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jsonb maven/mavencentral/jakarta.json/jakarta.json-api/2.1.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jsonp maven/mavencentral/jakarta.json/jakarta.json-api/2.1.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jsonp maven/mavencentral/jakarta.persistence/jakarta.persistence-api/3.1.0, EPL-2.0 OR BSD-3-Clause, approved, ee4j.jpa @@ -151,30 +152,30 @@ maven/mavencentral/javax.json.bind/javax.json.bind-api/1.0, CDDL-1.0, approved, maven/mavencentral/javax.validation/validation-api/2.0.1.Final, Apache-2.0, approved, CQ15302 maven/mavencentral/joda-time/joda-time/2.12.2, Apache-2.0, approved, #12739 maven/mavencentral/junit/junit/4.13.2, EPL-2.0, approved, CQ23636 -maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.14.12, Apache-2.0, approved, #7164 +maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.14.13, Apache-2.0, approved, #7164 maven/mavencentral/net.bytebuddy/byte-buddy/1.12.21, Apache-2.0 AND BSD-3-Clause, approved, #1811 -maven/mavencentral/net.bytebuddy/byte-buddy/1.14.12, Apache-2.0 AND BSD-3-Clause, approved, #7163 +maven/mavencentral/net.bytebuddy/byte-buddy/1.14.13, Apache-2.0 AND BSD-3-Clause, approved, #7163 maven/mavencentral/net.java.dev.jna/jna/5.13.0, Apache-2.0 AND LGPL-2.1-or-later, approved, #6709 maven/mavencentral/net.javacrumbs.json-unit/json-unit-assertj/3.2.2, Apache-2.0, approved, clearlydefined maven/mavencentral/net.javacrumbs.json-unit/json-unit-core/3.2.2, Apache-2.0, approved, clearlydefined maven/mavencentral/net.javacrumbs.json-unit/json-unit-json-path/3.2.2, Apache-2.0, approved, clearlydefined maven/mavencentral/net.minidev/accessors-smart/2.4.9, Apache-2.0, approved, #7515 -maven/mavencentral/net.minidev/accessors-smart/2.5.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/net.minidev/accessors-smart/2.5.1, Apache-2.0, approved, clearlydefined maven/mavencentral/net.minidev/json-smart/2.4.10, Apache-2.0, approved, #3288 -maven/mavencentral/net.minidev/json-smart/2.5.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/net.minidev/json-smart/2.5.1, Apache-2.0, approved, clearlydefined maven/mavencentral/net.sf.jopt-simple/jopt-simple/5.0.4, MIT, approved, CQ13174 maven/mavencentral/org.antlr/antlr4-runtime/4.13.0, BSD-3-Clause, approved, #10767 maven/mavencentral/org.apache.commons/commons-collections4/4.4, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.apache.commons/commons-compress/1.26.0, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause), approved, #13288 +maven/mavencentral/org.apache.commons/commons-compress/1.26.1, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause), approved, #13288 maven/mavencentral/org.apache.commons/commons-lang3/3.11, Apache-2.0, approved, CQ22642 maven/mavencentral/org.apache.commons/commons-lang3/3.12.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.apache.commons/commons-lang3/3.13.0, Apache-2.0, approved, #9820 maven/mavencentral/org.apache.groovy/groovy-json/4.0.16, Apache-2.0, approved, #7411 -maven/mavencentral/org.apache.groovy/groovy-json/4.0.20, Apache-2.0, approved, #7411 +maven/mavencentral/org.apache.groovy/groovy-json/4.0.21, Apache-2.0, approved, #7411 maven/mavencentral/org.apache.groovy/groovy-xml/4.0.16, Apache-2.0, approved, #10179 -maven/mavencentral/org.apache.groovy/groovy-xml/4.0.20, Apache-2.0, approved, #10179 +maven/mavencentral/org.apache.groovy/groovy-xml/4.0.21, Apache-2.0, approved, #10179 maven/mavencentral/org.apache.groovy/groovy/4.0.16, Apache-2.0 AND BSD-3-Clause AND MIT, approved, #1742 -maven/mavencentral/org.apache.groovy/groovy/4.0.20, Apache-2.0 AND BSD-3-Clause AND MIT, approved, #1742 +maven/mavencentral/org.apache.groovy/groovy/4.0.21, Apache-2.0 AND BSD-3-Clause AND MIT, approved, #1742 maven/mavencentral/org.apache.httpcomponents/httpclient/4.5.13, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ23527 maven/mavencentral/org.apache.httpcomponents/httpcore/4.4.13, Apache-2.0, approved, CQ23528 maven/mavencentral/org.apache.httpcomponents/httpcore/4.4.16, Apache-2.0, approved, CQ23528 @@ -182,161 +183,117 @@ maven/mavencentral/org.apache.httpcomponents/httpmime/4.5.13, Apache-2.0, approv maven/mavencentral/org.apache.logging.log4j/log4j-api/2.21.1, Apache-2.0 AND (Apache-2.0 AND LGPL-2.0-or-later), approved, #11079 maven/mavencentral/org.apache.logging.log4j/log4j-to-slf4j/2.21.1, Apache-2.0, approved, #11919 maven/mavencentral/org.apache.mina/mina-core/2.1.6, Apache-2.0, approved, #3289 -maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/10.1.19, Apache-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND (CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND W3C AND CC0-1.0, approved, #5949 -maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/10.1.19, Apache-2.0, approved, #6997 -maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/10.1.19, Apache-2.0, approved, #7920 +maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/10.1.20, Apache-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND (CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND W3C AND CC0-1.0, approved, #5949 +maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/10.1.20, Apache-2.0, approved, #6997 +maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/10.1.20, Apache-2.0, approved, #7920 maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.aspectj/aspectjweaver/1.9.21, Apache-2.0 AND BSD-3-Clause AND EPL-1.0 AND BSD-3-Clause AND Apache-1.1, approved, #7695 +maven/mavencentral/org.aspectj/aspectjweaver/1.9.22, Apache-2.0 AND BSD-3-Clause AND EPL-1.0 AND BSD-3-Clause AND Apache-1.1, approved, #7695 maven/mavencentral/org.assertj/assertj-core/3.24.2, Apache-2.0, approved, #6161 maven/mavencentral/org.attoparser/attoparser/2.0.7.RELEASE, Apache-2.0, approved, CQ18900 -maven/mavencentral/org.awaitility/awaitility/3.0.0, Apache-2.0, approved, #11042 +maven/mavencentral/org.awaitility/awaitility/4.2.1, Apache-2.0, approved, #14178 maven/mavencentral/org.bitbucket.b_c/jose4j/0.9.4, Apache-2.0, approved, #4707 -maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.76, MIT, approved, #9825 -maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.76, MIT AND CC0-1.0, approved, #9827 -maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.76, MIT, approved, #9828 +maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.78, MIT AND CC0-1.0, approved, #14433 maven/mavencentral/org.ccil.cowan.tagsoup/tagsoup/1.2.1, Apache-2.0, approved, clearlydefined maven/mavencentral/org.checkerframework/checker-qual/3.31.0, MIT, approved, clearlydefined maven/mavencentral/org.eclipse.angus/angus-activation/2.0.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.angus maven/mavencentral/org.eclipse.angus/angus-activation/2.0.2, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.angus -maven/mavencentral/org.eclipse.edc/aggregate-service-spi/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/asset-spi/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/catalog-spi/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/connector-core/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/contract-spi/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/control-plane-spi/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/core-spi/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-api-configuration/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-catalog-api/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-catalog-http-dispatcher/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-catalog-transform/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-catalog/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-http-core/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-http-spi/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-negotiation-api/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-negotiation-http-dispatcher/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-negotiation-transform/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-negotiation/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-spi/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-transfer-process-api/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-transfer-process-http-dispatcher/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-transfer-process-transform/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp-transfer-process/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/dsp/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/http-spi/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/http/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/jersey-core/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/jersey-providers/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/jetty-core/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/json-ld-spi/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/json-ld/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-engine-spi/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-engine/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-evaluator/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-model/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-spi/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transaction-datasource-spi/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transaction-spi/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transfer-data-plane-spi/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transfer-spi/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transform-core/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/transform-spi/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/util/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/validator-core/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/validator-spi/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/web-spi/0.2.1, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.jetty.toolchain/jetty-jakarta-servlet-api/5.0.2, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.toolchain/jetty-jakarta-websocket-api/2.0.0, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-client/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-common/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-server/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.websocket/websocket-jakarta-client/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.websocket/websocket-jakarta-common/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.websocket/websocket-jakarta-server/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.websocket/websocket-servlet/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-alpn-client/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-alpn-client/12.0.7, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-annotations/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-client/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-client/12.0.7, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-http/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-http/12.0.7, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-io/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-io/12.0.7, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-jndi/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-plus/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-plus/12.0.7, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-security/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-security/12.0.7, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-server/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-server/12.0.7, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-servlet/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-util/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-util/12.0.7, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-webapp/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-xml/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-xml/12.0.7, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.tractusx.irs/irs-common/1.6.0, Apache-2.0, approved, automotive.tractusx -maven/mavencentral/org.eclipse.tractusx.irs/irs-edc-client/1.6.0, Apache-2.0, approved, automotive.tractusx -maven/mavencentral/org.eclipse.tractusx.irs/irs-models/1.6.0, Apache-2.0, approved, automotive.tractusx -maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/1.6.0, Apache-2.0, approved, automotive.tractusx +maven/mavencentral/org.eclipse.edc/api-core/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/asset-api/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/auth-spi/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/boot-lib/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/catalog-api/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/catalog-spi/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/connector-core/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/contract-agreement-api/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/contract-definition-api/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/contract-negotiation-api/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/contract-spi/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/control-plane-spi/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/core-spi/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-api-configuration/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-catalog-api/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-catalog-http-dispatcher/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-catalog-transform/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-catalog/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-http-core/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-http-spi/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-negotiation-api/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-negotiation-http-dispatcher/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-negotiation-transform/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-negotiation/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-spi/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-transfer-process-api/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-transfer-process-http-dispatcher/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-transfer-process-transform/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-transfer-process/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp-version-api/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/dsp/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/http-lib/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/http-spi/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/jersey-providers-lib/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/json-ld-lib/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/json-ld-spi/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/json-ld/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/keys-lib/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/keys-spi/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/management-api-configuration/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/management-api/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-definition-api/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-engine-lib/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-engine-spi/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-evaluator-lib/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-model/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-spi/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/query-lib/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/state-machine-lib/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/token-spi/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transaction-datasource-spi/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transaction-spi/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transfer-process-api/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transfer-spi/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transform-core/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transform-spi/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/util/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/validator-core/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/validator-spi/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/web-spi/0.6.0, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.tractusx.edc/callback-spi/0.6.0, Apache-2.0, approved, automotive.tractusx +maven/mavencentral/org.eclipse.tractusx.edc/core-spi/0.6.0, Apache-2.0, approved, automotive.tractusx +maven/mavencentral/org.eclipse.tractusx.edc/edr-api/0.6.0, Apache-2.0, approved, automotive.tractusx +maven/mavencentral/org.eclipse.tractusx.edc/edr-spi/0.6.0, Apache-2.0, approved, automotive.tractusx +maven/mavencentral/org.eclipse.tractusx.irs/irs-common/2.0.4-20240515.103302-1, Apache-2.0, approved, automotive.tractusx +maven/mavencentral/org.eclipse.tractusx.irs/irs-edc-client/2.0.4-20240515.103302-1, Apache-2.0, approved, automotive.tractusx +maven/mavencentral/org.eclipse.tractusx.irs/irs-models/2.0.4-20240515.103302-1, Apache-2.0, approved, automotive.tractusx +maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/2.0.4-20240515.103302-1, Apache-2.0, approved, automotive.tractusx maven/mavencentral/org.eclipse.tractusx.traceability/tx-backend/0.0.1-SNAPSHOT, Apache-2.0, approved, automotive.tractusx maven/mavencentral/org.eclipse.tractusx.traceability/tx-models/0.0.1-SNAPSHOT, Apache-2.0, approved, automotive.tractusx maven/mavencentral/org.flywaydb/flyway-core/9.22.3, Apache-2.0, approved, #10349 maven/mavencentral/org.glassfish.grizzly/grizzly-framework/2.3.25, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.grizzly maven/mavencentral/org.glassfish.grizzly/grizzly-http-server/2.3.25, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.grizzly maven/mavencentral/org.glassfish.grizzly/grizzly-http/2.3.25, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.grizzly -maven/mavencentral/org.glassfish.hk2.external/aopalliance-repackaged/3.0.4, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish -maven/mavencentral/org.glassfish.hk2.external/aopalliance-repackaged/3.0.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish -maven/mavencentral/org.glassfish.hk2/hk2-api/3.0.4, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish -maven/mavencentral/org.glassfish.hk2/hk2-api/3.0.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish -maven/mavencentral/org.glassfish.hk2/hk2-locator/3.0.4, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish -maven/mavencentral/org.glassfish.hk2/hk2-locator/3.0.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish -maven/mavencentral/org.glassfish.hk2/hk2-utils/3.0.4, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish -maven/mavencentral/org.glassfish.hk2/hk2-utils/3.0.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish -maven/mavencentral/org.glassfish.hk2/osgi-resource-locator/1.0.3, CDDL-1.0, approved, CQ10889 -maven/mavencentral/org.glassfish.jaxb/jaxb-core/4.0.2, BSD-3-Clause, approved, ee4j.jaxb -maven/mavencentral/org.glassfish.jaxb/jaxb-core/4.0.5, BSD-3-Clause, approved, ee4j.jaxb -maven/mavencentral/org.glassfish.jaxb/jaxb-runtime/4.0.2, BSD-3-Clause, approved, ee4j.jaxb -maven/mavencentral/org.glassfish.jaxb/jaxb-runtime/4.0.5, BSD-3-Clause, approved, ee4j.jaxb -maven/mavencentral/org.glassfish.jaxb/txw2/4.0.2, BSD-3-Clause, approved, ee4j.jaxb -maven/mavencentral/org.glassfish.jaxb/txw2/4.0.5, BSD-3-Clause, approved, ee4j.jaxb -maven/mavencentral/org.glassfish.jersey.containers/jersey-container-servlet-core/3.1.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.containers/jersey-container-servlet-core/3.1.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.containers/jersey-container-servlet/3.1.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.containers/jersey-container-servlet/3.1.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.core/jersey-client/3.1.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.core/jersey-client/3.1.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.core/jersey-common/3.1.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.core/jersey-common/3.1.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.core/jersey-server/3.1.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.core/jersey-server/3.1.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.ext/jersey-entity-filtering/3.1.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.ext/jersey-entity-filtering/3.1.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.inject/jersey-hk2/3.1.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.inject/jersey-hk2/3.1.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.media/jersey-media-json-jackson/3.1.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.media/jersey-media-json-jackson/3.1.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.media/jersey-media-multipart/3.1.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish.jersey.media/jersey-media-multipart/3.1.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey +maven/mavencentral/org.glassfish.jaxb/jaxb-core/4.0.2, BSD-3-Clause, approved, ee4j.jaxb-impl +maven/mavencentral/org.glassfish.jaxb/jaxb-core/4.0.5, BSD-3-Clause, approved, ee4j.jaxb-impl +maven/mavencentral/org.glassfish.jaxb/jaxb-runtime/4.0.2, BSD-3-Clause, approved, ee4j.jaxb-impl +maven/mavencentral/org.glassfish.jaxb/jaxb-runtime/4.0.5, BSD-3-Clause, approved, ee4j.jaxb-impl +maven/mavencentral/org.glassfish.jaxb/txw2/4.0.2, BSD-3-Clause, approved, ee4j.jaxb-impl +maven/mavencentral/org.glassfish.jaxb/txw2/4.0.5, BSD-3-Clause, approved, ee4j.jaxb-impl maven/mavencentral/org.glassfish/jakarta.json/2.0.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jsonp maven/mavencentral/org.hamcrest/hamcrest-core/2.2, BSD-3-Clause, approved, clearlydefined -maven/mavencentral/org.hamcrest/hamcrest-library/2.2, BSD-3-Clause, approved, CQ22925 maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, clearlydefined maven/mavencentral/org.hdrhistogram/HdrHistogram/2.1.12, BSD-2-Clause OR LicenseRef-Public-Domain, approved, CQ13192 maven/mavencentral/org.hibernate.common/hibernate-commons-annotations/6.0.6.Final, LGPL-2.1-only, approved, #6962 maven/mavencentral/org.hibernate.orm/hibernate-core/6.4.4.Final, LGPL-2.1-or-later AND (EPL-2.0 OR BSD-3-Clause) AND MIT, approved, #12490 maven/mavencentral/org.hibernate.validator/hibernate-validator/8.0.1.Final, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.javassist/javassist/3.29.2-GA, Apache-2.0 AND LGPL-2.1-or-later AND MPL-1.1, approved, #6023 maven/mavencentral/org.jboss.logging/jboss-logging/3.5.0.Final, Apache-2.0, approved, #9471 maven/mavencentral/org.jboss.logging/jboss-logging/3.5.3.Final, Apache-2.0, approved, #9471 maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.9.0, Apache-2.0, approved, #14186 maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.9.23, Apache-2.0, approved, #14186 -maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.6.10, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.9.0, Apache-2.0, approved, #14193 maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.9.23, Apache-2.0, approved, #14188 -maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.6.10, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.9.0, Apache-2.0, approved, #14191 maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.9.23, Apache-2.0, approved, #14185 -maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.6.20, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.9.0, Apache-2.0, approved, #11827 maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.9.23, Apache-2.0, approved, #11827 maven/mavencentral/org.jetbrains/annotations/24.1.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.jsonschema2pojo/jsonschema2pojo-core/1.2.1, Apache-2.0, approved, clearlydefined @@ -351,74 +308,69 @@ maven/mavencentral/org.junit.platform/junit-platform-suite-api/1.10.2, EPL-2.0, maven/mavencentral/org.junit.platform/junit-platform-suite-commons/1.10.2, EPL-2.0, approved, #9716 maven/mavencentral/org.junit.platform/junit-platform-suite-engine/1.10.2, EPL-2.0, approved, #9710 maven/mavencentral/org.junit.platform/junit-platform-suite/1.10.2, EPL-2.0, approved, #14183 -maven/mavencentral/org.jvnet.mimepull/mimepull/1.9.15, CDDL-1.1 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, CQ21484 maven/mavencentral/org.latencyutils/LatencyUtils/2.0.3, BSD-2-Clause, approved, CQ17408 maven/mavencentral/org.mockito/mockito-core/5.7.0, MIT AND (Apache-2.0 AND MIT) AND Apache-2.0, approved, #11424 maven/mavencentral/org.mockito/mockito-junit-jupiter/5.7.0, MIT, approved, #11423 maven/mavencentral/org.mozilla/rhino/1.7.7.2, MPL-2.0 AND BSD-3-Clause AND ISC, approved, CQ16320 -maven/mavencentral/org.objenesis/objenesis/2.5.1, Apache-2.0, approved, clearlydefined maven/mavencentral/org.objenesis/objenesis/3.3, Apache-2.0, approved, clearlydefined maven/mavencentral/org.openapitools/jackson-databind-nullable/0.2.6, Apache-2.0, approved, #3294 maven/mavencentral/org.opentest4j/opentest4j/1.3.0, Apache-2.0, approved, #9713 -maven/mavencentral/org.ow2.asm/asm-commons/9.6, BSD-3-Clause, approved, #10775 -maven/mavencentral/org.ow2.asm/asm-tree/9.6, BSD-3-Clause, approved, #10773 maven/mavencentral/org.ow2.asm/asm/9.3, BSD-3-Clause, approved, clearlydefined maven/mavencentral/org.ow2.asm/asm/9.6, BSD-3-Clause, approved, #10776 maven/mavencentral/org.postgresql/postgresql/42.6.1, BSD-2-Clause AND Apache-2.0, approved, #9159 -maven/mavencentral/org.projectlombok/lombok/1.18.30, MIT AND LicenseRef-Public-Domain, approved, CQ23907 +maven/mavencentral/org.projectlombok/lombok/1.18.32, MIT AND LicenseRef-Public-Domain, approved, CQ23907 maven/mavencentral/org.rnorth.duct-tape/duct-tape/1.0.8, MIT, approved, clearlydefined maven/mavencentral/org.skyscreamer/jsonassert/1.5.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.slf4j/jul-to-slf4j/2.0.12, MIT, approved, #7698 -maven/mavencentral/org.slf4j/slf4j-api/2.0.12, MIT, approved, #5915 -maven/mavencentral/org.slf4j/slf4j-api/2.0.7, MIT, approved, #5915 +maven/mavencentral/org.slf4j/jul-to-slf4j/2.0.13, MIT, approved, #7698 +maven/mavencentral/org.slf4j/slf4j-api/2.0.13, MIT, approved, #5915 maven/mavencentral/org.springdoc/springdoc-openapi-starter-common/2.0.4, Apache-2.0, approved, #5920 maven/mavencentral/org.springdoc/springdoc-openapi-starter-webmvc-api/2.0.4, Apache-2.0, approved, #5950 maven/mavencentral/org.springdoc/springdoc-openapi-starter-webmvc-ui/2.0.4, Apache-2.0, approved, #5923 -maven/mavencentral/org.springframework.boot/spring-boot-actuator-autoconfigure/3.2.4, Apache-2.0, approved, #11921 -maven/mavencentral/org.springframework.boot/spring-boot-actuator/3.2.4, Apache-2.0, approved, #11918 -maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/3.2.4, Apache-2.0, approved, #11751 -maven/mavencentral/org.springframework.boot/spring-boot-starter-actuator/3.2.4, Apache-2.0, approved, #12918 -maven/mavencentral/org.springframework.boot/spring-boot-starter-aop/3.2.4, Apache-2.0, approved, #11928 -maven/mavencentral/org.springframework.boot/spring-boot-starter-data-jpa/3.2.4, Apache-2.0, approved, #11926 -maven/mavencentral/org.springframework.boot/spring-boot-starter-jdbc/3.2.4, Apache-2.0, approved, #11878 -maven/mavencentral/org.springframework.boot/spring-boot-starter-json/3.2.4, Apache-2.0, approved, #11894 -maven/mavencentral/org.springframework.boot/spring-boot-starter-logging/3.2.4, Apache-2.0, approved, #11890 -maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-client/3.2.4, Apache-2.0, approved, #12587 -maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-resource-server/3.2.4, Apache-2.0, approved, #11931 -maven/mavencentral/org.springframework.boot/spring-boot-starter-security/3.2.4, Apache-2.0, approved, #12069 -maven/mavencentral/org.springframework.boot/spring-boot-starter-test/3.2.4, Apache-2.0, approved, #12917 -maven/mavencentral/org.springframework.boot/spring-boot-starter-thymeleaf/3.2.4, Apache-2.0, approved, #14184 -maven/mavencentral/org.springframework.boot/spring-boot-starter-tomcat/3.2.4, Apache-2.0, approved, #11923 -maven/mavencentral/org.springframework.boot/spring-boot-starter-validation/3.2.4, Apache-2.0, approved, #12921 -maven/mavencentral/org.springframework.boot/spring-boot-starter-web/3.2.4, Apache-2.0, approved, #11916 -maven/mavencentral/org.springframework.boot/spring-boot-starter/3.2.4, Apache-2.0, approved, #11935 -maven/mavencentral/org.springframework.boot/spring-boot-test-autoconfigure/3.2.4, Apache-2.0, approved, #12920 -maven/mavencentral/org.springframework.boot/spring-boot-test/3.2.4, Apache-2.0, approved, #12916 -maven/mavencentral/org.springframework.boot/spring-boot/3.2.4, Apache-2.0, approved, #11752 -maven/mavencentral/org.springframework.data/spring-data-commons/3.2.4, Apache-2.0, approved, #11917 -maven/mavencentral/org.springframework.data/spring-data-jpa/3.2.4, Apache-2.0, approved, #11882 -maven/mavencentral/org.springframework.security/spring-security-config/6.2.3, Apache-2.0, approved, #11896 -maven/mavencentral/org.springframework.security/spring-security-core/6.2.3, Apache-2.0, approved, #11904 -maven/mavencentral/org.springframework.security/spring-security-crypto/6.2.3, Apache-2.0 AND ISC, approved, #11908 -maven/mavencentral/org.springframework.security/spring-security-oauth2-client/6.2.3, Apache-2.0, approved, #12586 -maven/mavencentral/org.springframework.security/spring-security-oauth2-core/6.2.3, Apache-2.0, approved, #11925 -maven/mavencentral/org.springframework.security/spring-security-oauth2-jose/6.2.3, Apache-2.0, approved, #11893 -maven/mavencentral/org.springframework.security/spring-security-oauth2-resource-server/6.2.3, Apache-2.0, approved, #11920 -maven/mavencentral/org.springframework.security/spring-security-test/6.2.3, Apache-2.0, approved, #12922 -maven/mavencentral/org.springframework.security/spring-security-web/6.2.3, Apache-2.0, approved, #11911 -maven/mavencentral/org.springframework/spring-aop/6.1.5, Apache-2.0, approved, #11755 -maven/mavencentral/org.springframework/spring-aspects/6.1.5, Apache-2.0, approved, #11905 -maven/mavencentral/org.springframework/spring-beans/6.1.5, Apache-2.0, approved, #11754 -maven/mavencentral/org.springframework/spring-context/6.1.5, Apache-2.0, approved, #11753 -maven/mavencentral/org.springframework/spring-core/6.1.5, Apache-2.0 AND BSD-3-Clause, approved, #11750 -maven/mavencentral/org.springframework/spring-expression/6.1.5, Apache-2.0, approved, #11747 -maven/mavencentral/org.springframework/spring-jcl/6.1.5, Apache-2.0, approved, #11749 -maven/mavencentral/org.springframework/spring-jdbc/6.1.5, Apache-2.0, approved, #11897 -maven/mavencentral/org.springframework/spring-orm/6.1.5, Apache-2.0, approved, #11924 -maven/mavencentral/org.springframework/spring-test/6.1.5, Apache-2.0, approved, #12919 -maven/mavencentral/org.springframework/spring-tx/6.1.5, Apache-2.0, approved, #11901 -maven/mavencentral/org.springframework/spring-web/6.1.5, Apache-2.0, approved, #11748 -maven/mavencentral/org.springframework/spring-webmvc/6.1.5, Apache-2.0, approved, #11879 +maven/mavencentral/org.springframework.boot/spring-boot-actuator-autoconfigure/3.2.5, Apache-2.0, approved, #11921 +maven/mavencentral/org.springframework.boot/spring-boot-actuator/3.2.5, Apache-2.0, approved, #11918 +maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/3.2.5, Apache-2.0, approved, #11751 +maven/mavencentral/org.springframework.boot/spring-boot-starter-actuator/3.2.5, Apache-2.0, approved, #12918 +maven/mavencentral/org.springframework.boot/spring-boot-starter-aop/3.2.5, Apache-2.0, approved, #11928 +maven/mavencentral/org.springframework.boot/spring-boot-starter-data-jpa/3.2.5, Apache-2.0, approved, #11926 +maven/mavencentral/org.springframework.boot/spring-boot-starter-jdbc/3.2.5, Apache-2.0, approved, #11878 +maven/mavencentral/org.springframework.boot/spring-boot-starter-json/3.2.5, Apache-2.0, approved, #11894 +maven/mavencentral/org.springframework.boot/spring-boot-starter-logging/3.2.5, Apache-2.0, approved, #11890 +maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-client/3.2.5, Apache-2.0, approved, #12587 +maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-resource-server/3.2.5, Apache-2.0, approved, #11931 +maven/mavencentral/org.springframework.boot/spring-boot-starter-security/3.2.5, Apache-2.0, approved, #12069 +maven/mavencentral/org.springframework.boot/spring-boot-starter-test/3.2.5, Apache-2.0, approved, #12917 +maven/mavencentral/org.springframework.boot/spring-boot-starter-thymeleaf/3.2.5, Apache-2.0, approved, #14184 +maven/mavencentral/org.springframework.boot/spring-boot-starter-tomcat/3.2.5, Apache-2.0, approved, #11923 +maven/mavencentral/org.springframework.boot/spring-boot-starter-validation/3.2.5, Apache-2.0, approved, #12921 +maven/mavencentral/org.springframework.boot/spring-boot-starter-web/3.2.5, Apache-2.0, approved, #11916 +maven/mavencentral/org.springframework.boot/spring-boot-starter/3.2.5, Apache-2.0, approved, #11935 +maven/mavencentral/org.springframework.boot/spring-boot-test-autoconfigure/3.2.5, Apache-2.0, approved, #12920 +maven/mavencentral/org.springframework.boot/spring-boot-test/3.2.5, Apache-2.0, approved, #12916 +maven/mavencentral/org.springframework.boot/spring-boot/3.2.5, Apache-2.0, approved, #11752 +maven/mavencentral/org.springframework.data/spring-data-commons/3.2.5, Apache-2.0, approved, #11917 +maven/mavencentral/org.springframework.data/spring-data-jpa/3.2.5, Apache-2.0, approved, #11882 +maven/mavencentral/org.springframework.security/spring-security-config/6.2.4, Apache-2.0, approved, #11896 +maven/mavencentral/org.springframework.security/spring-security-core/6.2.4, Apache-2.0, approved, #11904 +maven/mavencentral/org.springframework.security/spring-security-crypto/6.2.4, Apache-2.0 AND ISC, approved, #11908 +maven/mavencentral/org.springframework.security/spring-security-oauth2-client/6.2.4, Apache-2.0, approved, #12586 +maven/mavencentral/org.springframework.security/spring-security-oauth2-core/6.2.4, Apache-2.0, approved, #11925 +maven/mavencentral/org.springframework.security/spring-security-oauth2-jose/6.2.4, Apache-2.0, approved, #11893 +maven/mavencentral/org.springframework.security/spring-security-oauth2-resource-server/6.2.4, Apache-2.0, approved, #11920 +maven/mavencentral/org.springframework.security/spring-security-test/6.2.4, Apache-2.0, approved, #12922 +maven/mavencentral/org.springframework.security/spring-security-web/6.2.4, Apache-2.0, approved, #11911 +maven/mavencentral/org.springframework/spring-aop/6.1.6, Apache-2.0, approved, #11755 +maven/mavencentral/org.springframework/spring-aspects/6.1.6, Apache-2.0, approved, #11905 +maven/mavencentral/org.springframework/spring-beans/6.1.6, Apache-2.0, approved, #11754 +maven/mavencentral/org.springframework/spring-context/6.1.6, Apache-2.0, approved, #11753 +maven/mavencentral/org.springframework/spring-core/6.1.6, Apache-2.0 AND BSD-3-Clause, approved, #11750 +maven/mavencentral/org.springframework/spring-expression/6.1.6, Apache-2.0, approved, #11747 +maven/mavencentral/org.springframework/spring-jcl/6.1.6, Apache-2.0, approved, #11749 +maven/mavencentral/org.springframework/spring-jdbc/6.1.6, Apache-2.0, approved, #11897 +maven/mavencentral/org.springframework/spring-orm/6.1.6, Apache-2.0, approved, #11924 +maven/mavencentral/org.springframework/spring-test/6.1.6, Apache-2.0, approved, #12919 +maven/mavencentral/org.springframework/spring-tx/6.1.6, Apache-2.0, approved, #11901 +maven/mavencentral/org.springframework/spring-web/6.1.6, Apache-2.0, approved, #11748 +maven/mavencentral/org.springframework/spring-webmvc/6.1.6, Apache-2.0, approved, #11879 maven/mavencentral/org.testcontainers/database-commons/1.19.7, Apache-2.0, approved, #10345 maven/mavencentral/org.testcontainers/jdbc/1.19.7, Apache-2.0, approved, #10348 maven/mavencentral/org.testcontainers/junit-jupiter/1.19.7, MIT, approved, #10344 diff --git a/DEPENDENCIES_FRONTEND b/DEPENDENCIES_FRONTEND index 67f40fa669..b897639c08 100644 --- a/DEPENDENCIES_FRONTEND +++ b/DEPENDENCIES_FRONTEND @@ -231,7 +231,7 @@ npm/npmjs/-/d3-timer/3.0.1, ISC, approved, clearlydefined npm/npmjs/-/d3-transition/3.0.1, ISC, approved, clearlydefined npm/npmjs/-/d3-zoom/3.0.0, ISC, approved, clearlydefined npm/npmjs/-/d3/7.8.4, ISC, approved, clearlydefined -npm/npmjs/-/dashdash/1.14.1, MIT, approved, clearlydefined +npm/npmjs/-/dashdash/1.14.1, MIT AND CDDL-1.0, approved, #14596 npm/npmjs/-/data-urls/2.0.0, MIT, approved, clearlydefined npm/npmjs/-/date-format/4.0.14, MIT, approved, clearlydefined npm/npmjs/-/dayjs/1.11.7, MIT, approved, #9149 @@ -592,13 +592,13 @@ npm/npmjs/-/js-tokens/4.0.0, MIT, approved, #2401 npm/npmjs/-/js-yaml/3.14.1, MIT, approved, clearlydefined npm/npmjs/-/js-yaml/4.1.0, MIT, approved, clearlydefined npm/npmjs/-/js2xmlparser/4.0.2, Apache-2.0, approved, clearlydefined -npm/npmjs/-/jsbn/0.1.1, MIT, approved, clearlydefined +npm/npmjs/-/jsbn/0.1.1, LicenseRef-scancode-mit-addition, approved, #14597 npm/npmjs/-/jsdoc-type-pratt-parser/4.0.0, MIT, approved, clearlydefined npm/npmjs/-/jsdom/16.7.0, LGPL-2.0-or-later AND MIT, approved, #1370 npm/npmjs/-/jsesc/0.5.0, MIT, approved, clearlydefined npm/npmjs/-/jsesc/2.5.2, MIT, approved, clearlydefined npm/npmjs/-/json-parse-even-better-errors/2.3.1, MIT, approved, clearlydefined -npm/npmjs/-/json-parse-even-better-errors/3.0.0, MIT, approved, clearlydefined +npm/npmjs/-/json-parse-even-better-errors/3.0.0, MIT, approved, #14658 npm/npmjs/-/json-schema-traverse/0.4.1, MIT, approved, clearlydefined npm/npmjs/-/json-schema-traverse/1.0.0, MIT, approved, clearlydefined npm/npmjs/-/json-schema/0.4.0, AFL-2.1 OR BSD-3-Clause, approved, #2410 @@ -734,7 +734,7 @@ npm/npmjs/-/no-case/3.0.4, MIT, approved, clearlydefined npm/npmjs/-/node-addon-api/3.2.1, MIT, approved, clearlydefined npm/npmjs/-/node-fetch/2.6.7, MIT, approved, #6954 npm/npmjs/-/node-forge/1.3.1, (BSD-3-Clause OR GPL-2.0-only) AND MIT, approved, #3014 -npm/npmjs/-/node-gyp-build/4.8.0, MIT, approved, clearlydefined +npm/npmjs/-/node-gyp-build/4.8.0, MIT, approved, #14661 npm/npmjs/-/node-gyp/9.3.1, MIT AND BSD-3-Clause, approved, #3783 npm/npmjs/-/node-hook/1.0.0, MIT, approved, clearlydefined npm/npmjs/-/node-releases/2.0.10, MIT, approved, #1954 @@ -813,7 +813,7 @@ npm/npmjs/-/path-to-regexp/6.2.0, MIT, approved, clearlydefined npm/npmjs/-/path-type/4.0.0, MIT, approved, clearlydefined npm/npmjs/-/pend/1.2.0, MIT, approved, clearlydefined npm/npmjs/-/performance-now/2.1.0, MIT, approved, clearlydefined -npm/npmjs/-/picocolors/1.0.0, ISC, approved, clearlydefined +npm/npmjs/-/picocolors/1.0.0, ISC, approved, #14718 npm/npmjs/-/picomatch/2.3.1, MIT, approved, clearlydefined npm/npmjs/-/pidtree/0.6.0, MIT, approved, clearlydefined npm/npmjs/-/pify/2.3.0, MIT, approved, clearlydefined @@ -940,7 +940,7 @@ npm/npmjs/-/semver/6.3.1, ISC, approved, clearlydefined npm/npmjs/-/semver/7.3.8, ISC, approved, clearlydefined npm/npmjs/-/semver/7.5.3, ISC, approved, clearlydefined npm/npmjs/-/semver/7.5.4, ISC, approved, clearlydefined -npm/npmjs/-/semver/7.6.0, ISC, approved, clearlydefined +npm/npmjs/-/semver/7.6.0, ISC, approved, #14659 npm/npmjs/-/send/0.18.0, MIT, approved, clearlydefined npm/npmjs/-/serialize-javascript/6.0.1, BSD-3-Clause, approved, #12680 npm/npmjs/-/serialize-javascript/6.0.2, BSD-3-Clause, approved, #12680 @@ -1113,7 +1113,7 @@ npm/npmjs/-/uuid/9.0.0, MIT AND (BSD-3-Clause AND MIT), approved, #6869 npm/npmjs/-/v8-compile-cache-lib/3.0.1, MIT, approved, clearlydefined npm/npmjs/-/v8-compile-cache/2.3.0, MIT, approved, clearlydefined npm/npmjs/-/validate-npm-package-license/3.0.4, Apache-2.0 AND (Apache-2.0 AND BSD-2-Clause), approved, #2562 -npm/npmjs/-/validate-npm-package-name/5.0.0, ISC, approved, clearlydefined +npm/npmjs/-/validate-npm-package-name/5.0.0, ISC, approved, #14653 npm/npmjs/-/vary/1.1.2, MIT, approved, clearlydefined npm/npmjs/-/verror/1.10.0, MIT, approved, clearlydefined npm/npmjs/-/verror/1.10.1, MIT, approved, clearlydefined @@ -1525,7 +1525,7 @@ npm/npmjs/@nodelib/fs.scandir/2.1.5, MIT, approved, clearlydefined npm/npmjs/@nodelib/fs.stat/2.0.5, MIT, approved, clearlydefined npm/npmjs/@nodelib/fs.walk/1.2.8, MIT, approved, clearlydefined npm/npmjs/@npmcli/fs/2.1.0, ISC, approved, clearlydefined -npm/npmjs/@npmcli/fs/3.1.0, ISC, approved, clearlydefined +npm/npmjs/@npmcli/fs/3.1.0, ISC AND MIT, approved, #14656 npm/npmjs/@npmcli/git/4.0.3, ISC, approved, #7598 npm/npmjs/@npmcli/installed-package-contents/2.0.1, ISC, approved, clearlydefined npm/npmjs/@npmcli/move-file/2.0.0, MIT, approved, clearlydefined diff --git a/Dockerfile b/Dockerfile index 2dbee03339..ef68455762 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,7 @@ COPY tx-backend tx-backend RUN --mount=type=cache,target=/root/.m2 mvn -B clean package -pl :$BUILD_TARGET -am -DskipTests # Copy the jar and build image -FROM eclipse-temurin:21-jre-alpine@sha256:fb4150a30569aadae9d693d949684a00653411528e62498b9900940c9b5b8a66 AS traceability-app +FROM eclipse-temurin:21-jre-alpine@sha256:23467b3e42617ca197f43f58bc5fb03ca4cb059d68acd49c67128bfded132d67 AS traceability-app ARG UID=10000 ARG GID=1000 diff --git a/charts/traceability-foss/CHANGELOG.md b/charts/traceability-foss/CHANGELOG.md index f5496e08c9..acaec7f511 100644 --- a/charts/traceability-foss/CHANGELOG.md +++ b/charts/traceability-foss/CHANGELOG.md @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.3.38] - 2024-05-22 + +### No changes + +## [1.3.36] - 2024-04-17 +### No changes + +## [1.3.35] - 2024-04-17 +### No changes + ## [1.3.34] - 2024-04-04 ### No changes diff --git a/charts/traceability-foss/Chart.yaml b/charts/traceability-foss/Chart.yaml index eb79f87689..0befc32da2 100644 --- a/charts/traceability-foss/Chart.yaml +++ b/charts/traceability-foss/Chart.yaml @@ -23,15 +23,15 @@ home: https://eclipse-tractusx.github.io/ sources: - https://github.com/eclipse-tractusx/traceability-foss type: application -version: 1.3.33 -appVersion: "10.8.0" +version: 1.3.37 +appVersion: "11.0.0" dependencies: - name: frontend repository: "file://charts/frontend" - version: 1.3.33 + version: 1.3.37 - name: backend repository: "file://charts/backend" - version: 1.3.33 + version: 1.3.37 - name: postgresql repository: https://charts.bitnami.com/bitnami version: 12.12.10 @@ -40,13 +40,13 @@ dependencies: repository: https://helm.runix.net version: 1.23.1 condition: pgadmin4.enabled - - name: irs-helm + - name: item-relationship-service repository: https://eclipse-tractusx.github.io/item-relationship-service - version: 6.14.1 - condition: irs-helm.enabled + version: 7.1.3 + condition: item-relationship-service.enabled - name: tractusx-connector repository: https://eclipse-tractusx.github.io/tractusx-edc - version: 0.5.3 + version: 0.7.0 condition: tractusx-connector.enabled - name: postgresql alias: edc-postgresql diff --git a/charts/traceability-foss/charts/backend/Chart.yaml b/charts/traceability-foss/charts/backend/Chart.yaml index 9296e33f40..0768e1364d 100644 --- a/charts/traceability-foss/charts/backend/Chart.yaml +++ b/charts/traceability-foss/charts/backend/Chart.yaml @@ -20,8 +20,8 @@ apiVersion: v2 name: backend description: A Helm chart for Traceability backend application. type: application -version: 1.3.33 -appVersion: "10.8.0" +version: 1.3.37 +appVersion: "11.0.0" dependencies: - name: postgresql repository: https://charts.bitnami.com/bitnami @@ -33,7 +33,7 @@ dependencies: condition: pgadmin4.enabled - name: irs-helm repository: https://eclipse-tractusx.github.io/item-relationship-service - version: 5.3.0 + version: 7.1.3 condition: irs-helm.enabled - name: irs-edc-consumer repository: https://eclipse-tractusx.github.io/item-relationship-service diff --git a/charts/traceability-foss/charts/backend/templates/deployment.yaml b/charts/traceability-foss/charts/backend/templates/deployment.yaml index f1300835f2..94eea1aadd 100644 --- a/charts/traceability-foss/charts/backend/templates/deployment.yaml +++ b/charts/traceability-foss/charts/backend/templates/deployment.yaml @@ -84,6 +84,12 @@ spec: value: {{ .Values.traceability.operatorType | quote }} - name: TRACEABILITY_RIGHT_OPERAND value: {{ .Values.traceability.rightOperand | quote }} + - name: TRACEABILITY_LEFT_OPERAND_SECOND + value: {{ .Values.traceability.leftOperandSecond | quote }} + - name: TRACEABILITY_OPERATOR_TYPE_SECOND + value: {{ .Values.traceability.operatorTypeSecond | quote }} + - name: TRACEABILITY_RIGHT_OPERAND_SECOND + value: {{ .Values.traceability.rightOperandSecond | quote }} - name: TRACEABILITY_VALID_UNTIL value: {{ .Values.traceability.validUntil | quote }} - name: OAUTH2_CLIENT_ID @@ -138,6 +144,8 @@ spec: value: {{ .Values.irsRegularApiKey | quote }} - name: JAVA_TOOL_OPTIONS value: {{ .Values.javaToolOptions | default "" | quote }} + - name: BPDM_URL + value: {{ .Values.bpdm.url | quote }} {{- range $key, $val := .Values.env }} - name: {{ $key }} value: {{ $val | quote }} diff --git a/charts/traceability-foss/charts/backend/values.yaml b/charts/traceability-foss/charts/backend/values.yaml index 9de5e062a5..3ca0e37cbe 100644 --- a/charts/traceability-foss/charts/backend/values.yaml +++ b/charts/traceability-foss/charts/backend/values.yaml @@ -181,3 +181,6 @@ dependencies: enabled: false irs: CHANGEME # edc: CHANGEME #-controlplane + +bpdm: + url: "https://replace.me" diff --git a/charts/traceability-foss/charts/frontend/Chart.yaml b/charts/traceability-foss/charts/frontend/Chart.yaml index 90ebe39ec8..69b67d3e0f 100644 --- a/charts/traceability-foss/charts/frontend/Chart.yaml +++ b/charts/traceability-foss/charts/frontend/Chart.yaml @@ -20,5 +20,5 @@ apiVersion: v2 name: frontend description: A Helm chart for Traceability frontend application. type: application -version: 1.3.33 -appVersion: "10.8.0" +version: 1.3.37 +appVersion: "11.0.0" \ No newline at end of file diff --git a/charts/traceability-foss/charts/frontend/templates/deployment.yaml b/charts/traceability-foss/charts/frontend/templates/deployment.yaml index 777eb42414..a20f5eca56 100644 --- a/charts/traceability-foss/charts/frontend/templates/deployment.yaml +++ b/charts/traceability-foss/charts/frontend/templates/deployment.yaml @@ -78,6 +78,9 @@ spec: value: "{{ .Values.image.CATENAX_PORTAL_URL }}" - name: GIT_TAG value: "{{ .Values.image.tag }}" + - name: BPN + value: "{{ .Values.image.BPN }}" + ports: - name: http containerPort: {{ .Values.service.port }} diff --git a/charts/traceability-foss/values.yaml b/charts/traceability-foss/values.yaml index 9a63ca1e11..fba92af582 100644 --- a/charts/traceability-foss/values.yaml +++ b/charts/traceability-foss/values.yaml @@ -44,6 +44,7 @@ frontend: CATENAX_PORTAL_BACKEND_DOMAIN: "CHANGEME" # portal backend domain example: catena-x.net CATENAX_PORTAL_URL: "CHANGEME" # portal url example: https://portal.net/ CATENAX_PORTAL_CLIENT_ID: "CHANGEME" # application id created on portal + BPN: "CHANGEME" ## ## Image pull secret to create to obtain the container image @@ -274,6 +275,9 @@ backend: leftOperand: "PURPOSE" operatorType: "eq" rightOperand: "ID 3.0 Trace" + leftOperandSecond: "anything" + operatorTypeSecond: "eq" + rightOperandSecond: "anything" validUntil: "2024-09-30T23:59:59.99Z" datasource: url: jdbc:postgresql://tx-backend-postgresql:5432/trace @@ -317,6 +321,9 @@ backend: irs: "CHANGEME" # edc: "CHANGEME" # nameOverride: "tracex-irs" fullnameOverride: "tracex-irs" diff --git a/dev/README.md b/dev/README.md index 73e404bb93..939028b3a7 100644 --- a/dev/README.md +++ b/dev/README.md @@ -32,49 +32,49 @@ Keep in mind to always update DEV and TEST since they are dependend on each othe Sample invocation (DEV) ``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc.dev.demo.catena-x.net -a https://trace-x-registry.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC +python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc.dev.demo.catena-x.net -a https://trace-x-registry.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC ``` Sample invocation (TEST) ``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-test.dev.demo.catena-x.net/api/submodel -edc https://trace-x-test-edc.dev.demo.catena-x.net -a https://trace-x-registry-test.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-test-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC +python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-test.dev.demo.catena-x.net/api/submodel -edc https://trace-x-test-edc.dev.demo.catena-x.net -a https://trace-x-registry-test.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-test-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC ``` Sample invocation (E2E A) ``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-e2e-a.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc-e2e-a.dev.demo.catena-x.net -a https://trace-x-registry-e2e-a.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-e2e-a-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC +python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-e2e-a.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc-e2e-a.dev.demo.catena-x.net -a https://trace-x-registry-e2e-a.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-e2e-a-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC ``` Sample invocation (E2E B) ``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-e2e-b.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc-e2e-b.dev.demo.catena-x.net -a https://trace-x-registry-e2e-b.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-e2e-b-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC +python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-e2e-b.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc-e2e-b.dev.demo.catena-x.net -a https://trace-x-registry-e2e-b.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-e2e-b-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC ``` Sample invocation (INT A) ``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-int-a.int.demo.catena-x.net/api/submodel -edc https://trace-x-edc-int-a.int.demo.catena-x.net -a https://trace-x-registry-int-a.int.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-a-dataplane.int.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV +python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-int-a.int.demo.catena-x.net/api/submodel -edc https://trace-x-edc-int-a.int.demo.catena-x.net -a https://trace-x-registry-int-a.int.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-a-dataplane.int.demo.catena-x.net -p id-3.0-trace -k --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV ``` Sample invocation (INT B) ``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-int-b.int.demo.catena-x.net/api/submodel -edc https://trace-x-edc-int-b.int.demo.catena-x.net -a https://trace-x-registry-int-b.int.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-b-dataplane.int.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV +python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-int-b.int.demo.catena-x.net/api/submodel -edc https://trace-x-edc-int-b.int.demo.catena-x.net -a https://trace-x-registry-int-b.int.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-b-dataplane.int.demo.catena-x.net -p id-3.0-trace -k --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV ``` Sample invocation (STABLE A) ``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-stable-a.stable.demo.catena-x.net/api/submodel -edc https://trace-x-edc-stable-a.stable.demo.catena-x.net -a https://trace-x-registry-stable-a.stable.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-stable-a-dataplane.stable.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV +python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-stable-a.stable.demo.catena-x.net/api/submodel -edc https://trace-x-edc-stable-a.stable.demo.catena-x.net -a https://trace-x-registry-stable-a.stable.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-stable-a-dataplane.stable.demo.catena-x.net -p id-3.0-trace -k --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV ``` Sample invocation (STABLE B) ``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-stable-b.stable.demo.catena-x.net/api/submodel -edc https://trace-x-edc-stable-b.stable.demo.catena-x.net -a https://trace-x-registry-stable-b.stable.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-stable-b-dataplane.stable.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV +python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-stable-b.stable.demo.catena-x.net/api/submodel -edc https://trace-x-edc-stable-b.stable.demo.catena-x.net -a https://trace-x-registry-stable-b.stable.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-stable-b-dataplane.stable.demo.catena-x.net -p id-3.0-trace -k --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV ``` where: @@ -213,7 +213,7 @@ Is achieved by defining the order of the BPNLs of the desired manufacturers. See and adding an SingleLevelBomAsBuilt Aspect with the corresponding childCatenaXId: ```json { -"urn:bamm:io.catenax.single_level_bom_as_built:1.0.0#SingleLevelBomAsBuilt" : [ { +"urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt" : [ { "catenaXId" : "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd", "childParts" : [ { "quantity" : { @@ -237,34 +237,5 @@ and adding an SingleLevelBomAsBuilt Aspect with the corresponding childCatenaXId Is achieved through adding the SingleLevelusageBuilt - Codeblock and the corresponding parent catenaXId above, see example below (Only SingleLevelUsageBuilt expanded): -```json -[{ - "catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd", - "bpnl" : "BPNL00000003CNKC", - "urn:bamm:io.catenax.single_level_bom_as_built:1.0.0#SingleLevelBomAsBuilt": "[...]", - "urn:bamm:io.catenax.serial_part:1.0.0#SerialPart" : "[...]" - }, { - "catenaXId" : "urn:uuid:4e390dab-707f-446e-bfbe-653f6f5b1f37", - "bpnl" : "BPNL00000003AZQP", - "urn:bamm:io.catenax.serial_part:1.0.0#SerialPart" : "", - "urn:bamm:io.catenax.single_level_usage_as_built:1.0.1#SingleLevelUsageAsBuilt": [ - { - "parentParts": [ - { - "parentCatenaXId": "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a", - "quantity": { - "quantityNumber": 1, - "measurementUnit": "unit:piece" - }, - "createdOn": "2023-02-03T14:48:54.709Z", - "lastModifiedOn": "2023-02-03T14:48:54.709Z" - } - ], - "catenaXId": "urn:uuid:4e390dab-707f-446e-bfbe-653f6f5b1f37" - } - ] -} -] -``` ...AZQP -> CNKC -> ... diff --git a/docs/SECURITY.md b/docs/SECURITY.md index f4432a0e4a..5f7aab7ba2 100644 --- a/docs/SECURITY.md +++ b/docs/SECURITY.md @@ -74,6 +74,3 @@ Check the Angular changelog for security-related updates. It’s best practice to upgrade your application with the latest version. #### Source [SyncFusion](https://www.syncfusion.com/blogs/post/top-5-best-practices-angular-app-security.aspx). - -## Veracode scan -....TBD diff --git a/docs/api/traceability-foss-backend.json b/docs/api/traceability-foss-backend.json new file mode 100644 index 0000000000..bc56ac8afa --- /dev/null +++ b/docs/api/traceability-foss-backend.json @@ -0,0 +1,7509 @@ +{ + "openapi" : "3.0.1", + "info" : { + "title" : "Tractus-X Traceability Foss", + "description" : "Trace-FOSS is a system for tracking parts along the supply chain. A high level of transparency across the supplier network enables faster intervention based on a recorded event in the supply chain. This saves costs by seamlessly tracking parts and creates trust through clearly defined and secure data access by the companies and persons involved in the process.", + "license" : { + "name" : "License: Apache 2.0" + }, + "version" : "1.0.0" + }, + "servers" : [ + { + "url" : "http://localhost:9998/api", + "description" : "Generated server url" + } + ], + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ], + "paths" : { + "/notifications/{notificationId}/edit" : { + "put" : { + "tags" : [ + "Notifications" + ], + "summary" : "Update notification by id", + "description" : "The endpoint updates notification by their id.", + "operationId" : "updateNotification", + "parameters" : [ + { + "name" : "notificationId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "integer", + "format" : "int64" + } + } + ], + "requestBody" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/EditNotificationRequest" + } + } + }, + "required" : true + }, + "responses" : { + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "204" : { + "description" : "No content." + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/bpn-config" : { + "get" : { + "tags" : [ + "BpnEdcMapping" + ], + "summary" : "Get BPN EDC URL mappings", + "description" : "The endpoint returns a result of BPN EDC URL mappings.", + "operationId" : "getBpnEdcs", + "responses" : { + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "200" : { + "description" : "Returns the paged result found", + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 2147483647, + "minItems" : 0, + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/BpnEdcMappingResponse" + } + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + }, + "put" : { + "tags" : [ + "BpnEdcMapping" + ], + "summary" : "Updates BPN EDC URL mappings", + "description" : "The endpoint updates BPN EDC URL mappings", + "operationId" : "updateBpnEdcMappings", + "requestBody" : { + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 1000, + "minItems" : 0, + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/BpnMappingRequest" + } + } + } + }, + "required" : true + }, + "responses" : { + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "200" : { + "description" : "Returns the paged result found for BpnEdcMapping", + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 2147483647, + "minItems" : 0, + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/BpnEdcMappingResponse" + } + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + }, + "post" : { + "tags" : [ + "BpnEdcMapping" + ], + "summary" : "Creates BPN EDC URL mappings", + "description" : "The endpoint creates BPN EDC URL mappings", + "operationId" : "createBpnEdcUrlMappings", + "requestBody" : { + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 1000, + "minItems" : 0, + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/BpnMappingRequest" + } + } + } + }, + "required" : true + }, + "responses" : { + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "200" : { + "description" : "Returns the paged result found for BpnEdcMapping", + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 2147483647, + "minItems" : 0, + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/BpnEdcMappingResponse" + } + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/submodel/data/{submodelId}" : { + "get" : { + "tags" : [ + "Submodel" + ], + "summary" : "Gets Submodel by its id", + "description" : "The endpoint returns Submodel for given id. Used for data providing functionality", + "operationId" : "getSubmodelById", + "parameters" : [ + { + "name" : "submodelId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + } + ], + "responses" : { + "200" : { + "description" : "Returns submodel payload", + "content" : { + "application/json" : { + "schema" : { + "type" : "string" + } + } + } + }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + }, + "post" : { + "tags" : [ + "Submodel" + ], + "summary" : "Save Submodel", + "description" : "This endpoint allows you to save a Submodel identified by its ID.", + "operationId" : "saveSubmodel", + "parameters" : [ + { + "name" : "submodelId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + } + ], + "requestBody" : { + "content" : { + "application/json" : { + "schema" : { + "type" : "string" + } + } + }, + "required" : true + }, + "responses" : { + "200" : { + "description" : "Ok." + }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "204" : { + "description" : "No Content." + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/notifications" : { + "post" : { + "tags" : [ + "Notifications" + ], + "summary" : "Start notification by part ids", + "description" : "The endpoint starts notification based on part ids provided.", + "operationId" : "notifyAssets", + "requestBody" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/StartNotificationRequest" + } + } + }, + "required" : true + }, + "responses" : { + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "201" : { + "description" : "Created.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/NotificationIdResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/notifications/{notificationId}/update" : { + "post" : { + "tags" : [ + "Notifications" + ], + "summary" : "Update notification by id", + "description" : "The endpoint updates notification by their id.", + "operationId" : "updateNotification_1", + "parameters" : [ + { + "name" : "notificationId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "integer", + "format" : "int64" + } + } + ], + "requestBody" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/UpdateNotificationStatusTransitionRequest" + } + } + }, + "required" : true + }, + "responses" : { + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "204" : { + "description" : "No content." + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/notifications/{notificationId}/close" : { + "post" : { + "tags" : [ + "Notifications" + ], + "summary" : "Close notification by id", + "description" : "The endpoint closes Notification by id.", + "operationId" : "closeNotification", + "parameters" : [ + { + "name" : "notificationId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "integer", + "format" : "int64" + } + } + ], + "requestBody" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/CloseNotificationRequest" + } + } + }, + "required" : true + }, + "responses" : { + "200" : { + "description" : "Ok." + }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "204" : { + "description" : "No content." + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/notifications/{notificationId}/cancel" : { + "post" : { + "tags" : [ + "Notifications" + ], + "summary" : "Cancels notification by id", + "description" : "The endpoint cancels notification by id.", + "operationId" : "cancelNotification", + "parameters" : [ + { + "name" : "notificationId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "integer", + "format" : "int64" + } + } + ], + "responses" : { + "200" : { + "description" : "Ok." + }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "204" : { + "description" : "No content." + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/notifications/{notificationId}/approve" : { + "post" : { + "tags" : [ + "Notifications" + ], + "summary" : "Approves notification by id", + "description" : "The endpoint approves notification by id.", + "operationId" : "approveNotification", + "parameters" : [ + { + "name" : "notificationId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "integer", + "format" : "int64" + } + } + ], + "responses" : { + "200" : { + "description" : "Ok." + }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "204" : { + "description" : "No content." + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/notifications/filter" : { + "post" : { + "tags" : [ + "Notifications" + ], + "summary" : "Filter notifications defined by the request body", + "description" : "The endpoint returns notifications as paged result.", + "operationId" : "filterNotifications", + "requestBody" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/PageableFilterRequest" + } + } + }, + "required" : true + }, + "responses" : { + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "200" : { + "description" : "Returns the paged result found for Notifications", + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Notifications", + "items" : { + "type" : "object", + "properties" : { + "id" : { + "maximum" : 255, + "minimum" : 0, + "maxLength" : 255, + "type" : "integer", + "format" : "int64", + "example" : 66 + }, + "title" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Title" + }, + "status" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "CREATED", + "enum" : [ + "CREATED", + "SENT", + "RECEIVED", + "ACKNOWLEDGED", + "ACCEPTED", + "DECLINED", + "CANCELED", + "CLOSED" + ] + }, + "description" : { + "maxLength" : 1000, + "minLength" : 0, + "type" : "string", + "example" : "DescriptionText" + }, + "createdBy" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "BPNL00000003AYRE" + }, + "createdByName" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "createdDate" : { + "maxLength" : 50, + "minLength" : 0, + "type" : "string", + "example" : "2023-02-21T21:27:10.734950Z" + }, + "assetIds" : { + "maxItems" : 1000, + "minItems" : 0, + "type" : "array", + "example" : [ + "urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70528fcbd", + "urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70529fcbd", + "urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70530fcbd" + ], + "items" : { + "type" : "string", + "example" : "[\"urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70528fcbd\",\"urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70529fcbd\",\"urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70530fcbd\"]" + } + }, + "channel" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "SENDER", + "enum" : [ + "SENDER", + "RECEIVER" + ] + }, + "reason" : { + "$ref" : "#/components/schemas/NotificationReasonResponse" + }, + "sendTo" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "BPNL00000003AYRE" + }, + "sendToName" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "severity" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "MINOR", + "enum" : [ + "MINOR", + "MAJOR", + "CRITICAL", + "LIFE-THREATENING" + ] + }, + "type" : { + "maxLength" : 50, + "minLength" : 0, + "type" : "string", + "example" : "ALERT", + "enum" : [ + "ALERT", + "INVESTIGATION" + ] + }, + "targetDate" : { + "maxLength" : 50, + "minLength" : 0, + "type" : "string", + "example" : "2099-02-21T21:27:10.734950Z" + }, + "messages" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/NotificationMessageResponse" + } + } + } + } + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/edc/notification/contract" : { + "post" : { + "tags" : [ + "Notifications" + ], + "summary" : "Triggers EDC notification contract", + "description" : "The endpoint Triggers EDC notification contract based on notification type and method", + "operationId" : "createNotificationContract", + "requestBody" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/CreateNotificationContractRequest" + } + } + }, + "required" : true + }, + "responses" : { + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "201" : { + "description" : "Created.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/CreateNotificationContractResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/contracts" : { + "post" : { + "tags" : [ + "Contracts" + ], + "summary" : "All contract agreements for all assets", + "description" : "This endpoint returns all contract agreements for all assets in Trace-X", + "operationId" : "contracts", + "requestBody" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/PageableFilterRequest" + } + } + }, + "required" : true + }, + "responses" : { + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "type" : "string", + "example" : { + "message" : "Bad request." + } + } + } + } + }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "type" : "string", + "example" : { + "message" : "Authorization failed." + } + } + } + } + }, + "200" : { + "description" : "Ok.", + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 2147483647, + "minItems" : 0, + "type" : "array", + "description" : "PageResults", + "items" : { + "$ref" : "#/components/schemas/PageResultContractResponse" + } + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "type" : "string", + "example" : { + "message" : "Forbidden." + } + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "type" : "string", + "example" : { + "message" : "Too many requests." + } + } + } + } + }, + "415" : { + "description" : "Unsupported media type.", + "content" : { + "application/json" : { + "schema" : { + "type" : "string", + "example" : { + "message" : "Unsupported media type." + } + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "type" : "string", + "example" : { + "message" : "Internal server error." + } + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "type" : "string", + "example" : { + "message" : "Not found." + } + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/assets/publish" : { + "post" : { + "tags" : [ + "AssetsImport", + "AssetsPublish" + ], + "summary" : "asset publish", + "description" : "This endpoint publishes assets to the Catena-X network.", + "operationId" : "publishAssets", + "parameters" : [ + { + "name" : "triggerSynchronizeAssets", + "in" : "query", + "required" : false, + "schema" : { + "type" : "boolean", + "default" : true + } + } + ], + "requestBody" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/RegisterAssetRequest" + } + } + }, + "required" : true + }, + "responses" : { + "204" : { + "description" : "No Content." + }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "200" : { + "description" : "OK.", + "content" : { + "application/json" : {} + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/assets/import" : { + "post" : { + "tags" : [ + "AssetsImport" + ], + "summary" : "asset upload", + "description" : "This endpoint stores assets in the application. Those can be later published in the Catena-X network.", + "operationId" : "importJson", + "requestBody" : { + "content" : { + "multipart/form-data" : { + "schema" : { + "required" : [ + "file" + ], + "type" : "object", + "properties" : { + "file" : { + "type" : "string", + "format" : "binary" + } + } + } + } + } + }, + "responses" : { + "204" : { + "description" : "No Content." + }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "200" : { + "description" : "OK.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ImportResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/assets/as-planned/sync" : { + "post" : { + "tags" : [ + "AssetsAsPlanned" + ], + "summary" : "Synchronizes assets from IRS", + "description" : "The endpoint synchronizes the assets from irs.", + "operationId" : "sync", + "requestBody" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/SyncAssetsRequest" + } + } + }, + "required" : true + }, + "responses" : { + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "201" : { + "description" : "Created." + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/assets/as-planned/detail-information" : { + "post" : { + "tags" : [ + "AssetsAsPlanned" + ], + "summary" : "Searches for assets by ids.", + "description" : "The endpoint searchs for assets by id and returns a list of them.", + "operationId" : "getDetailInformation", + "requestBody" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/GetDetailInformationRequest" + } + } + }, + "required" : true + }, + "responses" : { + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "200" : { + "description" : "Returns the paged result found for Asset", + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 2147483647, + "minItems" : 0, + "type" : "array", + "items" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Assets", + "items" : { + "type" : "object", + "properties" : { + "id" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70528fcbd" + }, + "idShort" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "assembly-part-relationship" + }, + "semanticModelId" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "NO-246880451848384868750731" + }, + "businessPartner" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "BPNL00000003CSGV" + }, + "manufacturerName" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "nameAtManufacturer" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "manufacturerPartId" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "owner" : { + "type" : "string", + "example" : "CUSTOMER", + "enum" : [ + "SUPPLIER", + "CUSTOMER", + "OWN", + "UNKNOWN" + ] + }, + "childRelations" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Child relationships", + "items" : { + "$ref" : "#/components/schemas/DescriptionsResponse" + } + }, + "parentRelations" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Parent relationships", + "items" : { + "$ref" : "#/components/schemas/DescriptionsResponse" + } + }, + "qualityType" : { + "type" : "string", + "example" : "Ok", + "enum" : [ + "Ok", + "Minor", + "Major", + "Critical", + "LifeThreatening" + ] + }, + "van" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "OMAYSKEITUGNVHKKX" + }, + "semanticDataModel" : { + "type" : "string", + "example" : "BATCH", + "enum" : [ + "BATCH", + "SERIALPART", + "UNKNOWN", + "PARTASPLANNED", + "JUSTINSEQUENCE", + "TOMBSTONEASBUILT", + "TOMBSTONEASPLANNED" + ] + }, + "classification" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "component" + }, + "detailAspectModels" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/DetailAspectModelResponse" + } + }, + "sentQualityAlertIdsInStatusActive" : { + "type" : "array", + "example" : 1, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + } + }, + "receivedQualityAlertIdsInStatusActive" : { + "type" : "array", + "example" : 1, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + } + }, + "sentQualityInvestigationIdsInStatusActive" : { + "type" : "array", + "example" : 2, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + } + }, + "receivedQualityInvestigationIdsInStatusActive" : { + "type" : "array", + "example" : 2, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + } + }, + "importState" : { + "type" : "string", + "example" : "TRANSIENT", + "enum" : [ + "TRANSIENT", + "PERSISTENT", + "ERROR", + "IN_SYNCHRONIZATION", + "PUBLISHED_TO_CORE_SERVICES", + "UNSET" + ] + }, + "importNote" : { + "type" : "string", + "example" : "Asset created successfully in transient state" + }, + "tombstone" : { + "type" : "string", + "example" : " {\n \"catenaXId\": \"urn:uuid:7e4541ea-bb0f-464c-8cb3-021abccbfaf5\",\n \"endpointURL\": \"https://irs-provider-dataplane3.dev.demo.catena-x.net/api/public/data/urn:uuid:c7b3ea3d-97ea-41e4-960d-12fb166e1da1\",\n \"processingError\": {\n \"processStep\": \"SubmodelRequest\",\n \"errorDetail\": \"org.springframework.web.client.HttpServerErrorException$InternalServerError: 500 : \"{\"errors\":[]}\"\",\n \"lastAttempt\": \"2024-02-07T12:06:34.400493282Z\",\n \"retryCounter\": 0\n },\n \"policy\": null\n }\n" + }, + "contractAgreementId" : { + "type" : "string", + "example" : "TODO" + } + } + } + } + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/assets/as-built/sync" : { + "post" : { + "tags" : [ + "AssetsAsBuilt" + ], + "summary" : "Synchronizes assets from IRS", + "description" : "The endpoint synchronizes the assets from irs.", + "operationId" : "sync_1", + "requestBody" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/SyncAssetsRequest" + } + } + }, + "required" : true + }, + "responses" : { + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "201" : { + "description" : "Created." + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/assets/as-built/detail-information" : { + "post" : { + "tags" : [ + "AssetsAsBuilt" + ], + "summary" : "Searches for assets by ids.", + "description" : "The endpoint searchs for assets by id and returns a list of them.", + "operationId" : "getDetailInformation_1", + "requestBody" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/GetDetailInformationRequest" + } + } + }, + "required" : true + }, + "responses" : { + "200" : { + "description" : "Returns the paged result found for Asset", + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 2147483647, + "minItems" : 0, + "type" : "array", + "items" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Assets", + "items" : { + "type" : "object", + "properties" : { + "id" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70528fcbd" + }, + "idShort" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "assembly-part-relationship" + }, + "semanticModelId" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "NO-246880451848384868750731" + }, + "businessPartner" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "BPNL00000003CSGV" + }, + "manufacturerName" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "nameAtManufacturer" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "manufacturerPartId" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "owner" : { + "type" : "string", + "example" : "CUSTOMER", + "enum" : [ + "SUPPLIER", + "CUSTOMER", + "OWN", + "UNKNOWN" + ] + }, + "childRelations" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Child relationships", + "items" : { + "$ref" : "#/components/schemas/DescriptionsResponse" + } + }, + "parentRelations" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Parent relationships", + "items" : { + "$ref" : "#/components/schemas/DescriptionsResponse" + } + }, + "qualityType" : { + "type" : "string", + "example" : "Ok", + "enum" : [ + "Ok", + "Minor", + "Major", + "Critical", + "LifeThreatening" + ] + }, + "van" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "OMAYSKEITUGNVHKKX" + }, + "semanticDataModel" : { + "type" : "string", + "example" : "BATCH", + "enum" : [ + "BATCH", + "SERIALPART", + "UNKNOWN", + "PARTASPLANNED", + "JUSTINSEQUENCE", + "TOMBSTONEASBUILT", + "TOMBSTONEASPLANNED" + ] + }, + "classification" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "component" + }, + "detailAspectModels" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/DetailAspectModelResponse" + } + }, + "sentQualityAlertIdsInStatusActive" : { + "type" : "array", + "example" : 1, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + } + }, + "receivedQualityAlertIdsInStatusActive" : { + "type" : "array", + "example" : 1, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + } + }, + "sentQualityInvestigationIdsInStatusActive" : { + "type" : "array", + "example" : 2, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + } + }, + "receivedQualityInvestigationIdsInStatusActive" : { + "type" : "array", + "example" : 2, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + } + }, + "importState" : { + "type" : "string", + "example" : "TRANSIENT", + "enum" : [ + "TRANSIENT", + "PERSISTENT", + "ERROR", + "IN_SYNCHRONIZATION", + "PUBLISHED_TO_CORE_SERVICES", + "UNSET" + ] + }, + "importNote" : { + "type" : "string", + "example" : "Asset created successfully in transient state" + }, + "tombstone" : { + "type" : "string", + "example" : " {\n \"catenaXId\": \"urn:uuid:7e4541ea-bb0f-464c-8cb3-021abccbfaf5\",\n \"endpointURL\": \"https://irs-provider-dataplane3.dev.demo.catena-x.net/api/public/data/urn:uuid:c7b3ea3d-97ea-41e4-960d-12fb166e1da1\",\n \"processingError\": {\n \"processStep\": \"SubmodelRequest\",\n \"errorDetail\": \"org.springframework.web.client.HttpServerErrorException$InternalServerError: 500 : \"{\"errors\":[]}\"\",\n \"lastAttempt\": \"2024-02-07T12:06:34.400493282Z\",\n \"retryCounter\": 0\n },\n \"policy\": null\n }\n" + }, + "contractAgreementId" : { + "type" : "string", + "example" : "TODO" + } + } + } + } + } + } + } + }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/assets/as-planned/{assetId}" : { + "get" : { + "tags" : [ + "AssetsAsPlanned" + ], + "summary" : "Get asset by id", + "description" : "The endpoint returns an asset filtered by id .", + "operationId" : "assetById", + "parameters" : [ + { + "name" : "assetId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + } + ], + "responses" : { + "200" : { + "description" : "Returns the assets found", + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Assets", + "items" : { + "type" : "object", + "properties" : { + "id" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70528fcbd" + }, + "idShort" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "assembly-part-relationship" + }, + "semanticModelId" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "NO-246880451848384868750731" + }, + "businessPartner" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "BPNL00000003CSGV" + }, + "manufacturerName" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "nameAtManufacturer" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "manufacturerPartId" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "owner" : { + "type" : "string", + "example" : "CUSTOMER", + "enum" : [ + "SUPPLIER", + "CUSTOMER", + "OWN", + "UNKNOWN" + ] + }, + "childRelations" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Child relationships", + "items" : { + "$ref" : "#/components/schemas/DescriptionsResponse" + } + }, + "parentRelations" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Parent relationships", + "items" : { + "$ref" : "#/components/schemas/DescriptionsResponse" + } + }, + "qualityType" : { + "type" : "string", + "example" : "Ok", + "enum" : [ + "Ok", + "Minor", + "Major", + "Critical", + "LifeThreatening" + ] + }, + "van" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "OMAYSKEITUGNVHKKX" + }, + "semanticDataModel" : { + "type" : "string", + "example" : "BATCH", + "enum" : [ + "BATCH", + "SERIALPART", + "UNKNOWN", + "PARTASPLANNED", + "JUSTINSEQUENCE", + "TOMBSTONEASBUILT", + "TOMBSTONEASPLANNED" + ] + }, + "classification" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "component" + }, + "detailAspectModels" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/DetailAspectModelResponse" + } + }, + "sentQualityAlertIdsInStatusActive" : { + "type" : "array", + "example" : 1, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + } + }, + "receivedQualityAlertIdsInStatusActive" : { + "type" : "array", + "example" : 1, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + } + }, + "sentQualityInvestigationIdsInStatusActive" : { + "type" : "array", + "example" : 2, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + } + }, + "receivedQualityInvestigationIdsInStatusActive" : { + "type" : "array", + "example" : 2, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + } + }, + "importState" : { + "type" : "string", + "example" : "TRANSIENT", + "enum" : [ + "TRANSIENT", + "PERSISTENT", + "ERROR", + "IN_SYNCHRONIZATION", + "PUBLISHED_TO_CORE_SERVICES", + "UNSET" + ] + }, + "importNote" : { + "type" : "string", + "example" : "Asset created successfully in transient state" + }, + "tombstone" : { + "type" : "string", + "example" : " {\n \"catenaXId\": \"urn:uuid:7e4541ea-bb0f-464c-8cb3-021abccbfaf5\",\n \"endpointURL\": \"https://irs-provider-dataplane3.dev.demo.catena-x.net/api/public/data/urn:uuid:c7b3ea3d-97ea-41e4-960d-12fb166e1da1\",\n \"processingError\": {\n \"processStep\": \"SubmodelRequest\",\n \"errorDetail\": \"org.springframework.web.client.HttpServerErrorException$InternalServerError: 500 : \"{\"errors\":[]}\"\",\n \"lastAttempt\": \"2024-02-07T12:06:34.400493282Z\",\n \"retryCounter\": 0\n },\n \"policy\": null\n }\n" + }, + "contractAgreementId" : { + "type" : "string", + "example" : "TODO" + } + } + } + } + } + } + }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + }, + "patch" : { + "tags" : [ + "AssetsAsPlanned" + ], + "summary" : "Updates asset", + "description" : "The endpoint updates asset by provided quality type.", + "operationId" : "updateAsset", + "parameters" : [ + { + "name" : "assetId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + } + ], + "requestBody" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/UpdateAssetRequest" + } + } + }, + "required" : true + }, + "responses" : { + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "200" : { + "description" : "Returns the updated asset", + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Assets", + "items" : { + "type" : "object", + "properties" : { + "id" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70528fcbd" + }, + "idShort" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "assembly-part-relationship" + }, + "semanticModelId" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "NO-246880451848384868750731" + }, + "businessPartner" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "BPNL00000003CSGV" + }, + "manufacturerName" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "nameAtManufacturer" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "manufacturerPartId" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "owner" : { + "type" : "string", + "example" : "CUSTOMER", + "enum" : [ + "SUPPLIER", + "CUSTOMER", + "OWN", + "UNKNOWN" + ] + }, + "childRelations" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Child relationships", + "items" : { + "$ref" : "#/components/schemas/DescriptionsResponse" + } + }, + "parentRelations" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Parent relationships", + "items" : { + "$ref" : "#/components/schemas/DescriptionsResponse" + } + }, + "qualityType" : { + "type" : "string", + "example" : "Ok", + "enum" : [ + "Ok", + "Minor", + "Major", + "Critical", + "LifeThreatening" + ] + }, + "van" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "OMAYSKEITUGNVHKKX" + }, + "semanticDataModel" : { + "type" : "string", + "example" : "BATCH", + "enum" : [ + "BATCH", + "SERIALPART", + "UNKNOWN", + "PARTASPLANNED", + "JUSTINSEQUENCE", + "TOMBSTONEASBUILT", + "TOMBSTONEASPLANNED" + ] + }, + "classification" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "component" + }, + "detailAspectModels" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/DetailAspectModelResponse" + } + }, + "sentQualityAlertIdsInStatusActive" : { + "type" : "array", + "example" : 1, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + } + }, + "receivedQualityAlertIdsInStatusActive" : { + "type" : "array", + "example" : 1, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + } + }, + "sentQualityInvestigationIdsInStatusActive" : { + "type" : "array", + "example" : 2, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + } + }, + "receivedQualityInvestigationIdsInStatusActive" : { + "type" : "array", + "example" : 2, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + } + }, + "importState" : { + "type" : "string", + "example" : "TRANSIENT", + "enum" : [ + "TRANSIENT", + "PERSISTENT", + "ERROR", + "IN_SYNCHRONIZATION", + "PUBLISHED_TO_CORE_SERVICES", + "UNSET" + ] + }, + "importNote" : { + "type" : "string", + "example" : "Asset created successfully in transient state" + }, + "tombstone" : { + "type" : "string", + "example" : " {\n \"catenaXId\": \"urn:uuid:7e4541ea-bb0f-464c-8cb3-021abccbfaf5\",\n \"endpointURL\": \"https://irs-provider-dataplane3.dev.demo.catena-x.net/api/public/data/urn:uuid:c7b3ea3d-97ea-41e4-960d-12fb166e1da1\",\n \"processingError\": {\n \"processStep\": \"SubmodelRequest\",\n \"errorDetail\": \"org.springframework.web.client.HttpServerErrorException$InternalServerError: 500 : \"{\"errors\":[]}\"\",\n \"lastAttempt\": \"2024-02-07T12:06:34.400493282Z\",\n \"retryCounter\": 0\n },\n \"policy\": null\n }\n" + }, + "contractAgreementId" : { + "type" : "string", + "example" : "TODO" + } + } + } + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/assets/as-built/{assetId}" : { + "get" : { + "tags" : [ + "AssetsAsBuilt" + ], + "summary" : "Get asset by id", + "description" : "The endpoint returns an asset filtered by id .", + "operationId" : "assetById_1", + "parameters" : [ + { + "name" : "assetId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + } + ], + "responses" : { + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "200" : { + "description" : "Returns the assets found", + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Assets", + "items" : { + "type" : "object", + "properties" : { + "id" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70528fcbd" + }, + "idShort" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "assembly-part-relationship" + }, + "semanticModelId" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "NO-246880451848384868750731" + }, + "businessPartner" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "BPNL00000003CSGV" + }, + "manufacturerName" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "nameAtManufacturer" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "manufacturerPartId" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "owner" : { + "type" : "string", + "example" : "CUSTOMER", + "enum" : [ + "SUPPLIER", + "CUSTOMER", + "OWN", + "UNKNOWN" + ] + }, + "childRelations" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Child relationships", + "items" : { + "$ref" : "#/components/schemas/DescriptionsResponse" + } + }, + "parentRelations" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Parent relationships", + "items" : { + "$ref" : "#/components/schemas/DescriptionsResponse" + } + }, + "qualityType" : { + "type" : "string", + "example" : "Ok", + "enum" : [ + "Ok", + "Minor", + "Major", + "Critical", + "LifeThreatening" + ] + }, + "van" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "OMAYSKEITUGNVHKKX" + }, + "semanticDataModel" : { + "type" : "string", + "example" : "BATCH", + "enum" : [ + "BATCH", + "SERIALPART", + "UNKNOWN", + "PARTASPLANNED", + "JUSTINSEQUENCE", + "TOMBSTONEASBUILT", + "TOMBSTONEASPLANNED" + ] + }, + "classification" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "component" + }, + "detailAspectModels" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/DetailAspectModelResponse" + } + }, + "sentQualityAlertIdsInStatusActive" : { + "type" : "array", + "example" : 1, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + } + }, + "receivedQualityAlertIdsInStatusActive" : { + "type" : "array", + "example" : 1, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + } + }, + "sentQualityInvestigationIdsInStatusActive" : { + "type" : "array", + "example" : 2, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + } + }, + "receivedQualityInvestigationIdsInStatusActive" : { + "type" : "array", + "example" : 2, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + } + }, + "importState" : { + "type" : "string", + "example" : "TRANSIENT", + "enum" : [ + "TRANSIENT", + "PERSISTENT", + "ERROR", + "IN_SYNCHRONIZATION", + "PUBLISHED_TO_CORE_SERVICES", + "UNSET" + ] + }, + "importNote" : { + "type" : "string", + "example" : "Asset created successfully in transient state" + }, + "tombstone" : { + "type" : "string", + "example" : " {\n \"catenaXId\": \"urn:uuid:7e4541ea-bb0f-464c-8cb3-021abccbfaf5\",\n \"endpointURL\": \"https://irs-provider-dataplane3.dev.demo.catena-x.net/api/public/data/urn:uuid:c7b3ea3d-97ea-41e4-960d-12fb166e1da1\",\n \"processingError\": {\n \"processStep\": \"SubmodelRequest\",\n \"errorDetail\": \"org.springframework.web.client.HttpServerErrorException$InternalServerError: 500 : \"{\"errors\":[]}\"\",\n \"lastAttempt\": \"2024-02-07T12:06:34.400493282Z\",\n \"retryCounter\": 0\n },\n \"policy\": null\n }\n" + }, + "contractAgreementId" : { + "type" : "string", + "example" : "TODO" + } + } + } + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + }, + "patch" : { + "tags" : [ + "AssetsAsBuilt" + ], + "summary" : "Updates asset", + "description" : "The endpoint updates asset by provided quality type.", + "operationId" : "updateAsset_1", + "parameters" : [ + { + "name" : "assetId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + } + ], + "requestBody" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/UpdateAssetRequest" + } + } + }, + "required" : true + }, + "responses" : { + "200" : { + "description" : "Returns the updated asset", + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Assets", + "items" : { + "type" : "object", + "properties" : { + "id" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70528fcbd" + }, + "idShort" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "assembly-part-relationship" + }, + "semanticModelId" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "NO-246880451848384868750731" + }, + "businessPartner" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "BPNL00000003CSGV" + }, + "manufacturerName" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "nameAtManufacturer" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "manufacturerPartId" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "owner" : { + "type" : "string", + "example" : "CUSTOMER", + "enum" : [ + "SUPPLIER", + "CUSTOMER", + "OWN", + "UNKNOWN" + ] + }, + "childRelations" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Child relationships", + "items" : { + "$ref" : "#/components/schemas/DescriptionsResponse" + } + }, + "parentRelations" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Parent relationships", + "items" : { + "$ref" : "#/components/schemas/DescriptionsResponse" + } + }, + "qualityType" : { + "type" : "string", + "example" : "Ok", + "enum" : [ + "Ok", + "Minor", + "Major", + "Critical", + "LifeThreatening" + ] + }, + "van" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "OMAYSKEITUGNVHKKX" + }, + "semanticDataModel" : { + "type" : "string", + "example" : "BATCH", + "enum" : [ + "BATCH", + "SERIALPART", + "UNKNOWN", + "PARTASPLANNED", + "JUSTINSEQUENCE", + "TOMBSTONEASBUILT", + "TOMBSTONEASPLANNED" + ] + }, + "classification" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "component" + }, + "detailAspectModels" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/DetailAspectModelResponse" + } + }, + "sentQualityAlertIdsInStatusActive" : { + "type" : "array", + "example" : 1, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + } + }, + "receivedQualityAlertIdsInStatusActive" : { + "type" : "array", + "example" : 1, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + } + }, + "sentQualityInvestigationIdsInStatusActive" : { + "type" : "array", + "example" : 2, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + } + }, + "receivedQualityInvestigationIdsInStatusActive" : { + "type" : "array", + "example" : 2, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + } + }, + "importState" : { + "type" : "string", + "example" : "TRANSIENT", + "enum" : [ + "TRANSIENT", + "PERSISTENT", + "ERROR", + "IN_SYNCHRONIZATION", + "PUBLISHED_TO_CORE_SERVICES", + "UNSET" + ] + }, + "importNote" : { + "type" : "string", + "example" : "Asset created successfully in transient state" + }, + "tombstone" : { + "type" : "string", + "example" : " {\n \"catenaXId\": \"urn:uuid:7e4541ea-bb0f-464c-8cb3-021abccbfaf5\",\n \"endpointURL\": \"https://irs-provider-dataplane3.dev.demo.catena-x.net/api/public/data/urn:uuid:c7b3ea3d-97ea-41e4-960d-12fb166e1da1\",\n \"processingError\": {\n \"processStep\": \"SubmodelRequest\",\n \"errorDetail\": \"org.springframework.web.client.HttpServerErrorException$InternalServerError: 500 : \"{\"errors\":[]}\"\",\n \"lastAttempt\": \"2024-02-07T12:06:34.400493282Z\",\n \"retryCounter\": 0\n },\n \"policy\": null\n }\n" + }, + "contractAgreementId" : { + "type" : "string", + "example" : "TODO" + } + } + } + } + } + } + }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/registry/reload" : { + "get" : { + "tags" : [ + "Registry" + ], + "summary" : "Triggers reload of shell descriptors", + "description" : "The endpoint Triggers reload of shell descriptors.", + "operationId" : "reload", + "responses" : { + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "202" : { + "description" : "Created registry reload job." + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/policies" : { + "get" : { + "tags" : [ + "Policies" + ], + "summary" : "Get all policies ", + "description" : "The endpoint returns all policies .", + "operationId" : "policy", + "responses" : { + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "200" : { + "description" : "Returns the policies", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/PolicyResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/notifications/{notificationId}" : { + "get" : { + "tags" : [ + "Notifications" + ], + "summary" : "Gets notification by id", + "description" : "The endpoint returns notification by id.", + "operationId" : "getNotification", + "parameters" : [ + { + "name" : "notificationId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "integer", + "format" : "int64" + } + } + ], + "responses" : { + "200" : { + "description" : "OK.", + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Notifications", + "items" : { + "$ref" : "#/components/schemas/NotificationResponse" + } + } + } + } + }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/notifications/distinctFilterValues" : { + "get" : { + "tags" : [ + "Notifications" + ], + "summary" : "getDistinctFilterValues", + "description" : "The endpoint returns a distinct filter values for given fieldName of notification.", + "operationId" : "distinctFilterValues", + "parameters" : [ + { + "name" : "fieldName", + "in" : "query", + "required" : true, + "schema" : { + "type" : "string" + } + }, + { + "name" : "size", + "in" : "query", + "required" : true, + "schema" : { + "type" : "integer", + "format" : "int32" + } + }, + { + "name" : "startWith", + "in" : "query", + "required" : true, + "schema" : { + "type" : "string" + } + }, + { + "name" : "channel", + "in" : "query", + "required" : true, + "schema" : { + "type" : "string", + "enum" : [ + "SENDER", + "RECEIVER" + ] + } + } + ], + "responses" : { + "200" : { + "description" : "Returns a distinct filter values for given fieldName.", + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 2147483647, + "minItems" : 0, + "type" : "array", + "items" : { + "type" : "string" + } + } + } + } + }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/dashboard" : { + "get" : { + "tags" : [ + "Dashboard" + ], + "summary" : "Returns dashboard related data", + "description" : "The endpoint can return limited data based on the user role", + "operationId" : "dashboard", + "responses" : { + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "200" : { + "description" : "Returns dashboard data", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/DashboardResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/assets/import/report/{importJobId}" : { + "get" : { + "tags" : [ + "ImportReport", + "AssetsImport" + ], + "summary" : "report of the imported assets", + "description" : "This endpoint returns information about the imported assets to Trace-X.", + "operationId" : "importReport", + "parameters" : [ + { + "name" : "importJobId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + } + ], + "responses" : { + "204" : { + "description" : "No Content." + }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "200" : { + "description" : "OK.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ImportReportResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/assets/as-planned" : { + "get" : { + "tags" : [ + "AssetsAsPlanned" + ], + "summary" : "Get assets by pagination", + "description" : "The endpoint returns a paged result of assets.", + "operationId" : "AssetsAsPlanned", + "parameters" : [ + { + "name" : "pageable", + "in" : "query", + "required" : true, + "schema" : { + "$ref" : "#/components/schemas/OwnPageable" + } + }, + { + "name" : "filter", + "in" : "query", + "required" : true, + "schema" : { + "$ref" : "#/components/schemas/SearchCriteriaRequestParam" + } + } + ], + "responses" : { + "200" : { + "description" : "Returns the paged result found for Asset", + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 2147483647, + "minItems" : 0, + "type" : "array", + "items" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Assets", + "items" : { + "type" : "object", + "properties" : { + "id" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70528fcbd" + }, + "idShort" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "assembly-part-relationship" + }, + "semanticModelId" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "NO-246880451848384868750731" + }, + "businessPartner" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "BPNL00000003CSGV" + }, + "manufacturerName" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "nameAtManufacturer" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "manufacturerPartId" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "owner" : { + "type" : "string", + "example" : "CUSTOMER", + "enum" : [ + "SUPPLIER", + "CUSTOMER", + "OWN", + "UNKNOWN" + ] + }, + "childRelations" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Child relationships", + "items" : { + "$ref" : "#/components/schemas/DescriptionsResponse" + } + }, + "parentRelations" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Parent relationships", + "items" : { + "$ref" : "#/components/schemas/DescriptionsResponse" + } + }, + "qualityType" : { + "type" : "string", + "example" : "Ok", + "enum" : [ + "Ok", + "Minor", + "Major", + "Critical", + "LifeThreatening" + ] + }, + "van" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "OMAYSKEITUGNVHKKX" + }, + "semanticDataModel" : { + "type" : "string", + "example" : "BATCH", + "enum" : [ + "BATCH", + "SERIALPART", + "UNKNOWN", + "PARTASPLANNED", + "JUSTINSEQUENCE", + "TOMBSTONEASBUILT", + "TOMBSTONEASPLANNED" + ] + }, + "classification" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "component" + }, + "detailAspectModels" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/DetailAspectModelResponse" + } + }, + "sentQualityAlertIdsInStatusActive" : { + "type" : "array", + "example" : 1, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + } + }, + "receivedQualityAlertIdsInStatusActive" : { + "type" : "array", + "example" : 1, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + } + }, + "sentQualityInvestigationIdsInStatusActive" : { + "type" : "array", + "example" : 2, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + } + }, + "receivedQualityInvestigationIdsInStatusActive" : { + "type" : "array", + "example" : 2, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + } + }, + "importState" : { + "type" : "string", + "example" : "TRANSIENT", + "enum" : [ + "TRANSIENT", + "PERSISTENT", + "ERROR", + "IN_SYNCHRONIZATION", + "PUBLISHED_TO_CORE_SERVICES", + "UNSET" + ] + }, + "importNote" : { + "type" : "string", + "example" : "Asset created successfully in transient state" + }, + "tombstone" : { + "type" : "string", + "example" : " {\n \"catenaXId\": \"urn:uuid:7e4541ea-bb0f-464c-8cb3-021abccbfaf5\",\n \"endpointURL\": \"https://irs-provider-dataplane3.dev.demo.catena-x.net/api/public/data/urn:uuid:c7b3ea3d-97ea-41e4-960d-12fb166e1da1\",\n \"processingError\": {\n \"processStep\": \"SubmodelRequest\",\n \"errorDetail\": \"org.springframework.web.client.HttpServerErrorException$InternalServerError: 500 : \"{\"errors\":[]}\"\",\n \"lastAttempt\": \"2024-02-07T12:06:34.400493282Z\",\n \"retryCounter\": 0\n },\n \"policy\": null\n }\n" + }, + "contractAgreementId" : { + "type" : "string", + "example" : "TODO" + } + } + } + } + } + } + } + }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/assets/as-planned/distinctFilterValues" : { + "get" : { + "tags" : [ + "Assets", + "AssetsAsPlanned" + ], + "summary" : "getDistinctFilterValues", + "description" : "The endpoint returns a distinct filter values for given fieldName.", + "operationId" : "distinctFilterValues_1", + "parameters" : [ + { + "name" : "fieldName", + "in" : "query", + "required" : true, + "schema" : { + "type" : "string" + } + }, + { + "name" : "size", + "in" : "query", + "required" : false, + "schema" : { + "type" : "integer", + "format" : "int32" + } + }, + { + "name" : "startWith", + "in" : "query", + "required" : false, + "schema" : { + "type" : "string" + } + }, + { + "name" : "owner", + "in" : "query", + "required" : false, + "schema" : { + "type" : "string", + "enum" : [ + "SUPPLIER", + "CUSTOMER", + "OWN", + "UNKNOWN" + ] + } + }, + { + "name" : "inAssetIds", + "in" : "query", + "required" : false, + "schema" : { + "type" : "array", + "items" : { + "type" : "string" + } + } + } + ], + "responses" : { + "200" : { + "description" : "Returns a distinct filter values for given fieldName.", + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 2147483647, + "minItems" : 0, + "type" : "array", + "items" : { + "type" : "string" + } + } + } + } + }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/assets/as-planned/*/children/{childId}" : { + "get" : { + "tags" : [ + "AssetsAsPlanned" + ], + "summary" : "Get asset by child id", + "description" : "The endpoint returns an asset filtered by child id.", + "operationId" : "assetByChildIdAndAssetId", + "parameters" : [ + { + "name" : "childId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + } + ], + "responses" : { + "200" : { + "description" : "Returns the asset by childId", + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Assets", + "items" : { + "type" : "object", + "properties" : { + "id" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70528fcbd" + }, + "idShort" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "assembly-part-relationship" + }, + "semanticModelId" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "NO-246880451848384868750731" + }, + "businessPartner" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "BPNL00000003CSGV" + }, + "manufacturerName" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "nameAtManufacturer" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "manufacturerPartId" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "owner" : { + "type" : "string", + "example" : "CUSTOMER", + "enum" : [ + "SUPPLIER", + "CUSTOMER", + "OWN", + "UNKNOWN" + ] + }, + "childRelations" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Child relationships", + "items" : { + "$ref" : "#/components/schemas/DescriptionsResponse" + } + }, + "parentRelations" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Parent relationships", + "items" : { + "$ref" : "#/components/schemas/DescriptionsResponse" + } + }, + "qualityType" : { + "type" : "string", + "example" : "Ok", + "enum" : [ + "Ok", + "Minor", + "Major", + "Critical", + "LifeThreatening" + ] + }, + "van" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "OMAYSKEITUGNVHKKX" + }, + "semanticDataModel" : { + "type" : "string", + "example" : "BATCH", + "enum" : [ + "BATCH", + "SERIALPART", + "UNKNOWN", + "PARTASPLANNED", + "JUSTINSEQUENCE", + "TOMBSTONEASBUILT", + "TOMBSTONEASPLANNED" + ] + }, + "classification" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "component" + }, + "detailAspectModels" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/DetailAspectModelResponse" + } + }, + "sentQualityAlertIdsInStatusActive" : { + "type" : "array", + "example" : 1, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + } + }, + "receivedQualityAlertIdsInStatusActive" : { + "type" : "array", + "example" : 1, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + } + }, + "sentQualityInvestigationIdsInStatusActive" : { + "type" : "array", + "example" : 2, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + } + }, + "receivedQualityInvestigationIdsInStatusActive" : { + "type" : "array", + "example" : 2, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + } + }, + "importState" : { + "type" : "string", + "example" : "TRANSIENT", + "enum" : [ + "TRANSIENT", + "PERSISTENT", + "ERROR", + "IN_SYNCHRONIZATION", + "PUBLISHED_TO_CORE_SERVICES", + "UNSET" + ] + }, + "importNote" : { + "type" : "string", + "example" : "Asset created successfully in transient state" + }, + "tombstone" : { + "type" : "string", + "example" : " {\n \"catenaXId\": \"urn:uuid:7e4541ea-bb0f-464c-8cb3-021abccbfaf5\",\n \"endpointURL\": \"https://irs-provider-dataplane3.dev.demo.catena-x.net/api/public/data/urn:uuid:c7b3ea3d-97ea-41e4-960d-12fb166e1da1\",\n \"processingError\": {\n \"processStep\": \"SubmodelRequest\",\n \"errorDetail\": \"org.springframework.web.client.HttpServerErrorException$InternalServerError: 500 : \"{\"errors\":[]}\"\",\n \"lastAttempt\": \"2024-02-07T12:06:34.400493282Z\",\n \"retryCounter\": 0\n },\n \"policy\": null\n }\n" + }, + "contractAgreementId" : { + "type" : "string", + "example" : "TODO" + } + } + } + } + } + } + }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/assets/as-built" : { + "get" : { + "tags" : [ + "AssetsAsBuilt" + ], + "summary" : "Get assets by pagination", + "description" : "The endpoint returns a paged result of assets.", + "operationId" : "assets", + "parameters" : [ + { + "name" : "pageable", + "in" : "query", + "required" : true, + "schema" : { + "$ref" : "#/components/schemas/OwnPageable" + } + }, + { + "name" : "searchCriteriaRequestParam", + "in" : "query", + "required" : true, + "schema" : { + "$ref" : "#/components/schemas/SearchCriteriaRequestParam" + } + } + ], + "responses" : { + "200" : { + "description" : "Returns the paged result found for Asset", + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 2147483647, + "minItems" : 0, + "type" : "array", + "items" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Assets", + "items" : { + "type" : "object", + "properties" : { + "id" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70528fcbd" + }, + "idShort" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "assembly-part-relationship" + }, + "semanticModelId" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "NO-246880451848384868750731" + }, + "businessPartner" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "BPNL00000003CSGV" + }, + "manufacturerName" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "nameAtManufacturer" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "manufacturerPartId" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "owner" : { + "type" : "string", + "example" : "CUSTOMER", + "enum" : [ + "SUPPLIER", + "CUSTOMER", + "OWN", + "UNKNOWN" + ] + }, + "childRelations" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Child relationships", + "items" : { + "$ref" : "#/components/schemas/DescriptionsResponse" + } + }, + "parentRelations" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Parent relationships", + "items" : { + "$ref" : "#/components/schemas/DescriptionsResponse" + } + }, + "qualityType" : { + "type" : "string", + "example" : "Ok", + "enum" : [ + "Ok", + "Minor", + "Major", + "Critical", + "LifeThreatening" + ] + }, + "van" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "OMAYSKEITUGNVHKKX" + }, + "semanticDataModel" : { + "type" : "string", + "example" : "BATCH", + "enum" : [ + "BATCH", + "SERIALPART", + "UNKNOWN", + "PARTASPLANNED", + "JUSTINSEQUENCE", + "TOMBSTONEASBUILT", + "TOMBSTONEASPLANNED" + ] + }, + "classification" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "component" + }, + "detailAspectModels" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/DetailAspectModelResponse" + } + }, + "sentQualityAlertIdsInStatusActive" : { + "type" : "array", + "example" : 1, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + } + }, + "receivedQualityAlertIdsInStatusActive" : { + "type" : "array", + "example" : 1, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + } + }, + "sentQualityInvestigationIdsInStatusActive" : { + "type" : "array", + "example" : 2, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + } + }, + "receivedQualityInvestigationIdsInStatusActive" : { + "type" : "array", + "example" : 2, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + } + }, + "importState" : { + "type" : "string", + "example" : "TRANSIENT", + "enum" : [ + "TRANSIENT", + "PERSISTENT", + "ERROR", + "IN_SYNCHRONIZATION", + "PUBLISHED_TO_CORE_SERVICES", + "UNSET" + ] + }, + "importNote" : { + "type" : "string", + "example" : "Asset created successfully in transient state" + }, + "tombstone" : { + "type" : "string", + "example" : " {\n \"catenaXId\": \"urn:uuid:7e4541ea-bb0f-464c-8cb3-021abccbfaf5\",\n \"endpointURL\": \"https://irs-provider-dataplane3.dev.demo.catena-x.net/api/public/data/urn:uuid:c7b3ea3d-97ea-41e4-960d-12fb166e1da1\",\n \"processingError\": {\n \"processStep\": \"SubmodelRequest\",\n \"errorDetail\": \"org.springframework.web.client.HttpServerErrorException$InternalServerError: 500 : \"{\"errors\":[]}\"\",\n \"lastAttempt\": \"2024-02-07T12:06:34.400493282Z\",\n \"retryCounter\": 0\n },\n \"policy\": null\n }\n" + }, + "contractAgreementId" : { + "type" : "string", + "example" : "TODO" + } + } + } + } + } + } + } + }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/assets/as-built/distinctFilterValues" : { + "get" : { + "tags" : [ + "AssetsAsBuilt", + "Assets" + ], + "summary" : "getDistinctFilterValues", + "description" : "The endpoint returns a distinct filter values for given fieldName.", + "operationId" : "distinctFilterValues_2", + "parameters" : [ + { + "name" : "fieldName", + "in" : "query", + "required" : true, + "schema" : { + "type" : "string" + } + }, + { + "name" : "size", + "in" : "query", + "required" : false, + "schema" : { + "type" : "integer", + "format" : "int32" + } + }, + { + "name" : "startWith", + "in" : "query", + "required" : false, + "schema" : { + "type" : "string" + } + }, + { + "name" : "owner", + "in" : "query", + "required" : false, + "schema" : { + "type" : "string", + "enum" : [ + "SUPPLIER", + "CUSTOMER", + "OWN", + "UNKNOWN" + ] + } + }, + { + "name" : "inAssetIds", + "in" : "query", + "required" : false, + "schema" : { + "type" : "array", + "items" : { + "type" : "string" + } + } + } + ], + "responses" : { + "200" : { + "description" : "Returns a distinct filter values for given fieldName.", + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 2147483647, + "minItems" : 0, + "type" : "array", + "items" : { + "type" : "string" + } + } + } + } + }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/assets/as-built/countries" : { + "get" : { + "tags" : [ + "AssetsAsBuilt" + ], + "summary" : "Get map of assets", + "description" : "The endpoint returns a map for assets consumed by the map.", + "operationId" : "assetsCountryMap", + "responses" : { + "200" : { + "description" : "Returns the assets found", + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 2147483647, + "minItems" : 0, + "type" : "array", + "items" : { + "type" : "string" + } + } + } + } + }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/assets/as-built/*/children/{childId}" : { + "get" : { + "tags" : [ + "AssetsAsBuilt" + ], + "summary" : "Get asset by child id", + "description" : "The endpoint returns an asset filtered by child id.", + "operationId" : "assetByChildId", + "parameters" : [ + { + "name" : "childId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + } + ], + "responses" : { + "200" : { + "description" : "Returns the asset by childId", + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Assets", + "items" : { + "type" : "object", + "properties" : { + "id" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70528fcbd" + }, + "idShort" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "assembly-part-relationship" + }, + "semanticModelId" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "NO-246880451848384868750731" + }, + "businessPartner" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "BPNL00000003CSGV" + }, + "manufacturerName" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "nameAtManufacturer" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "manufacturerPartId" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "owner" : { + "type" : "string", + "example" : "CUSTOMER", + "enum" : [ + "SUPPLIER", + "CUSTOMER", + "OWN", + "UNKNOWN" + ] + }, + "childRelations" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Child relationships", + "items" : { + "$ref" : "#/components/schemas/DescriptionsResponse" + } + }, + "parentRelations" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Parent relationships", + "items" : { + "$ref" : "#/components/schemas/DescriptionsResponse" + } + }, + "qualityType" : { + "type" : "string", + "example" : "Ok", + "enum" : [ + "Ok", + "Minor", + "Major", + "Critical", + "LifeThreatening" + ] + }, + "van" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "OMAYSKEITUGNVHKKX" + }, + "semanticDataModel" : { + "type" : "string", + "example" : "BATCH", + "enum" : [ + "BATCH", + "SERIALPART", + "UNKNOWN", + "PARTASPLANNED", + "JUSTINSEQUENCE", + "TOMBSTONEASBUILT", + "TOMBSTONEASPLANNED" + ] + }, + "classification" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "component" + }, + "detailAspectModels" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/DetailAspectModelResponse" + } + }, + "sentQualityAlertIdsInStatusActive" : { + "type" : "array", + "example" : 1, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + } + }, + "receivedQualityAlertIdsInStatusActive" : { + "type" : "array", + "example" : 1, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + } + }, + "sentQualityInvestigationIdsInStatusActive" : { + "type" : "array", + "example" : 2, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + } + }, + "receivedQualityInvestigationIdsInStatusActive" : { + "type" : "array", + "example" : 2, + "items" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + } + }, + "importState" : { + "type" : "string", + "example" : "TRANSIENT", + "enum" : [ + "TRANSIENT", + "PERSISTENT", + "ERROR", + "IN_SYNCHRONIZATION", + "PUBLISHED_TO_CORE_SERVICES", + "UNSET" + ] + }, + "importNote" : { + "type" : "string", + "example" : "Asset created successfully in transient state" + }, + "tombstone" : { + "type" : "string", + "example" : " {\n \"catenaXId\": \"urn:uuid:7e4541ea-bb0f-464c-8cb3-021abccbfaf5\",\n \"endpointURL\": \"https://irs-provider-dataplane3.dev.demo.catena-x.net/api/public/data/urn:uuid:c7b3ea3d-97ea-41e4-960d-12fb166e1da1\",\n \"processingError\": {\n \"processStep\": \"SubmodelRequest\",\n \"errorDetail\": \"org.springframework.web.client.HttpServerErrorException$InternalServerError: 500 : \"{\"errors\":[]}\"\",\n \"lastAttempt\": \"2024-02-07T12:06:34.400493282Z\",\n \"retryCounter\": 0\n },\n \"policy\": null\n }\n" + }, + "contractAgreementId" : { + "type" : "string", + "example" : "TODO" + } + } + } + } + } + } + }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/submodel/data" : { + "delete" : { + "tags" : [ + "Submodel" + ], + "summary" : "Delete All Submodels", + "description" : "Deletes all submodels from the system.", + "operationId" : "deleteSubmodels", + "responses" : { + "200" : { + "description" : "Ok." + }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "204" : { + "description" : "No Content." + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/bpn-config/{bpn}" : { + "delete" : { + "tags" : [ + "BpnEdcMapping" + ], + "summary" : "Deletes BPN EDC URL mappings", + "description" : "The endpoint deletes BPN EDC URL mappings", + "operationId" : "deleteBpnEdcUrlMappings", + "parameters" : [ + { + "name" : "bpn", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + } + ], + "responses" : { + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "200" : { + "description" : "Okay" + }, + "204" : { + "description" : "Deleted." + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + } + }, + "components" : { + "schemas" : { + "EditNotificationRequest" : { + "required" : [ + "affectedPartIds", + "description", + "receiverBpn", + "severity" + ], + "type" : "object", + "properties" : { + "title" : { + "maxLength" : 255, + "minLength" : 1, + "type" : "string", + "example" : "title" + }, + "receiverBpn" : { + "type" : "string", + "example" : "BPNL00000003CNKC" + }, + "severity" : { + "type" : "string", + "enum" : [ + "MINOR", + "MAJOR", + "CRITICAL", + "LIFE-THREATENING" + ] + }, + "targetDate" : { + "type" : "string", + "format" : "date-time", + "example" : "2099-03-11T22:44:06.333826952Z" + }, + "description" : { + "maxLength" : 1000, + "minLength" : 15, + "type" : "string", + "example" : "The description" + }, + "affectedPartIds" : { + "maxLength" : 50, + "minLength" : 1, + "maxItems" : 50, + "minItems" : 1, + "type" : "array", + "example" : [ + "urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978" + ], + "items" : { + "maxLength" : 50, + "minLength" : 1, + "type" : "string", + "example" : "[\"urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978\"]" + } + } + } + }, + "ErrorResponse" : { + "type" : "object", + "properties" : { + "message" : { + "maxLength" : 1000, + "minLength" : 0, + "pattern" : "^.*$", + "type" : "string", + "example" : "Access Denied" + } + } + }, + "BpnMappingRequest" : { + "required" : [ + "bpn", + "url" + ], + "type" : "object", + "properties" : { + "bpn" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "BPNL00000003CSGV" + }, + "url" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string" + } + } + }, + "BpnEdcMappingResponse" : { + "type" : "object", + "properties" : { + "bpn" : { + "type" : "string", + "example" : "BPNL00000003CSGV" + }, + "url" : { + "type" : "string", + "example" : "https://trace-x-test-edc.dev.demo.catena-x.net/a1" + } + } + }, + "StartNotificationRequest" : { + "required" : [ + "receiverBpn", + "severity", + "type" + ], + "type" : "object", + "properties" : { + "title" : { + "maxLength" : 255, + "minLength" : 1, + "type" : "string", + "example" : "title" + }, + "affectedPartIds" : { + "maxLength" : 100, + "minLength" : 1, + "maxItems" : 50, + "minItems" : 1, + "type" : "array", + "example" : [ + "urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978" + ], + "items" : { + "maxLength" : 100, + "minLength" : 1, + "type" : "string", + "example" : "[\"urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978\"]" + } + }, + "description" : { + "maxLength" : 1000, + "minLength" : 15, + "type" : "string", + "example" : "The description" + }, + "targetDate" : { + "type" : "string", + "format" : "date-time", + "example" : "2099-03-11T22:44:06.333826952Z" + }, + "severity" : { + "type" : "string", + "enum" : [ + "MINOR", + "MAJOR", + "CRITICAL", + "LIFE-THREATENING" + ] + }, + "receiverBpn" : { + "type" : "string", + "example" : "BPNL00000003CNKC" + }, + "type" : { + "type" : "string", + "example" : "ALERT", + "enum" : [ + "ALERT", + "INVESTIGATION" + ] + } + } + }, + "NotificationIdResponse" : { + "type" : "object", + "properties" : { + "id" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + } + } + }, + "UpdateNotificationStatusTransitionRequest" : { + "required" : [ + "status" + ], + "type" : "object", + "properties" : { + "status" : { + "type" : "string", + "description" : "The UpdateInvestigationStatus", + "enum" : [ + "ACKNOWLEDGED", + "ACCEPTED", + "DECLINED" + ] + }, + "reason" : { + "type" : "string", + "example" : "The reason." + } + } + }, + "CloseNotificationRequest" : { + "type" : "object", + "properties" : { + "reason" : { + "maxLength" : 1000, + "minLength" : 15, + "type" : "string", + "example" : "The reason." + } + } + }, + "OwnPageable" : { + "type" : "object", + "properties" : { + "page" : { + "type" : "integer", + "format" : "int32" + }, + "size" : { + "type" : "integer", + "format" : "int32" + }, + "sort" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Content of Assets PageResults", + "example" : "manufacturerPartId,desc", + "items" : { + "type" : "string" + } + } + } + }, + "PageableFilterRequest" : { + "type" : "object", + "properties" : { + "pageAble" : { + "$ref" : "#/components/schemas/OwnPageable" + }, + "searchCriteria" : { + "$ref" : "#/components/schemas/SearchCriteriaRequestParam" + } + } + }, + "SearchCriteriaRequestParam" : { + "type" : "object", + "properties" : { + "filter" : { + "maxItems" : 2147483647, + "type" : "array", + "description" : "Filter Criteria", + "example" : "owner,EQUAL,OWN", + "items" : { + "type" : "string" + } + } + } + }, + "NotificationMessageResponse" : { + "type" : "object", + "properties" : { + "id" : { + "type" : "string" + }, + "createdBy" : { + "type" : "string" + }, + "createdByName" : { + "type" : "string" + }, + "sendTo" : { + "type" : "string" + }, + "sendToName" : { + "type" : "string" + }, + "contractAgreementId" : { + "type" : "string" + }, + "notificationReferenceId" : { + "type" : "string" + }, + "targetDate" : { + "type" : "string", + "format" : "date-time" + }, + "severity" : { + "type" : "string", + "enum" : [ + "MINOR", + "MAJOR", + "CRITICAL", + "LIFE-THREATENING" + ] + }, + "edcNotificationId" : { + "type" : "string" + }, + "created" : { + "type" : "string", + "format" : "date-time" + }, + "updated" : { + "type" : "string", + "format" : "date-time" + }, + "messageId" : { + "type" : "string" + }, + "status" : { + "type" : "string", + "enum" : [ + "CREATED", + "SENT", + "RECEIVED", + "ACKNOWLEDGED", + "ACCEPTED", + "DECLINED", + "CANCELED", + "CLOSED" + ] + }, + "errorMessage" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "EDC not reachable" + } + } + }, + "NotificationReasonResponse" : { + "type" : "object", + "properties" : { + "close" : { + "maxLength" : 1000, + "minLength" : 0, + "type" : "string", + "example" : "description of closing reason" + }, + "accept" : { + "maxLength" : 1000, + "minLength" : 0, + "type" : "string", + "example" : "description of accepting reason" + }, + "decline" : { + "maxLength" : 1000, + "minLength" : 0, + "type" : "string", + "example" : "description of declining reason" + } + } + }, + "NotificationResponse" : { + "type" : "object", + "properties" : { + "id" : { + "maximum" : 255, + "minimum" : 0, + "maxLength" : 255, + "type" : "integer", + "format" : "int64", + "example" : 66 + }, + "title" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Title" + }, + "status" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "CREATED", + "enum" : [ + "CREATED", + "SENT", + "RECEIVED", + "ACKNOWLEDGED", + "ACCEPTED", + "DECLINED", + "CANCELED", + "CLOSED" + ] + }, + "description" : { + "maxLength" : 1000, + "minLength" : 0, + "type" : "string", + "example" : "DescriptionText" + }, + "createdBy" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "BPNL00000003AYRE" + }, + "createdByName" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "createdDate" : { + "maxLength" : 50, + "minLength" : 0, + "type" : "string", + "example" : "2023-02-21T21:27:10.734950Z" + }, + "assetIds" : { + "maxItems" : 1000, + "minItems" : 0, + "type" : "array", + "example" : [ + "urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70528fcbd", + "urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70529fcbd", + "urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70530fcbd" + ], + "items" : { + "type" : "string", + "example" : "[\"urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70528fcbd\",\"urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70529fcbd\",\"urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70530fcbd\"]" + } + }, + "channel" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "SENDER", + "enum" : [ + "SENDER", + "RECEIVER" + ] + }, + "reason" : { + "$ref" : "#/components/schemas/NotificationReasonResponse" + }, + "sendTo" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "BPNL00000003AYRE" + }, + "sendToName" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Tier C" + }, + "severity" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "MINOR", + "enum" : [ + "MINOR", + "MAJOR", + "CRITICAL", + "LIFE-THREATENING" + ] + }, + "type" : { + "maxLength" : 50, + "minLength" : 0, + "type" : "string", + "example" : "ALERT", + "enum" : [ + "ALERT", + "INVESTIGATION" + ] + }, + "targetDate" : { + "maxLength" : 50, + "minLength" : 0, + "type" : "string", + "example" : "2099-02-21T21:27:10.734950Z" + }, + "messages" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/NotificationMessageResponse" + } + } + } + }, + "CreateNotificationContractRequest" : { + "required" : [ + "notificationMethod", + "notificationType" + ], + "type" : "object", + "properties" : { + "notificationType" : { + "type" : "string", + "enum" : [ + "QUALITY_INVESTIGATION", + "QUALITY_ALERT" + ] + }, + "notificationMethod" : { + "type" : "string", + "enum" : [ + "RECEIVE", + "UPDATE", + "RESOLVE" + ] + } + } + }, + "CreateNotificationContractResponse" : { + "type" : "object", + "properties" : { + "notificationAssetId" : { + "type" : "string", + "example" : "urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70528fcbd" + }, + "accessPolicyId" : { + "type" : "string", + "example" : "123" + }, + "contractDefinitionId" : { + "type" : "string", + "example" : "456" + } + } + }, + "ContractResponse" : { + "type" : "object", + "properties" : { + "contractId" : { + "maxLength" : 255, + "type" : "string", + "example" : "66" + }, + "counterpartyAddress" : { + "maxLength" : 255, + "type" : "string", + "example" : "https://trace-x-edc-e2e-a.dev.demo.catena-x.net/api/v1/dsp" + }, + "creationDate" : { + "maxLength" : 255, + "type" : "string", + "format" : "date-time", + "example" : "2023-02-21T21:27:10.73495Z" + }, + "endDate" : { + "maxLength" : 255, + "type" : "string", + "format" : "date-time", + "example" : "2023-02-21T21:27:10.73495Z" + }, + "state" : { + "maxLength" : 255, + "type" : "string", + "example" : "FINALIZED" + }, + "policy" : { + "maxLength" : 255, + "type" : "string", + "example" : "{\\\"@id\\\":\\\"eb0c8486-914a-4d36-84c0-b4971cbc52e4\\\",\\\"@type\\\":\\\"odrl:Set\\\",\\\"odrl:permission\\\":{\\\"odrl:target\\\":\\\"registry-asset\\\",\\\"odrl:action\\\":{\\\"odrl:type\\\":\\\"USE\\\"},\\\"odrl:constraint\\\":{\\\"odrl:or\\\":{\\\"odrl:leftOperand\\\":\\\"PURPOSE\\\",\\\"odrl:operator\\\":{\\\"@id\\\":\\\"odrl:eq\\\"},\\\"odrl:rightOperand\\\":\\\"ID 3.0 Trace\\\"}}},\\\"odrl:prohibition\\\":[],\\\"odrl:obligation\\\":[],\\\"odrl:target\\\":\\\"registry-asset\\\"}" + } + } + }, + "PageResultContractResponse" : { + "type" : "object", + "properties" : { + "content" : { + "maxItems" : 2147483647, + "minItems" : 0, + "type" : "array", + "description" : "Content of PageResults", + "items" : { + "$ref" : "#/components/schemas/ContractResponse" + } + }, + "page" : { + "type" : "integer", + "format" : "int32", + "example" : 1 + }, + "pageCount" : { + "type" : "integer", + "format" : "int32", + "example" : 15 + }, + "pageSize" : { + "type" : "integer", + "format" : "int32", + "example" : 10 + }, + "totalItems" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + } + } + }, + "RegisterAssetRequest" : { + "required" : [ + "assetIds", + "policyId" + ], + "type" : "object", + "properties" : { + "policyId" : { + "type" : "string", + "example" : "a644a7cb-3de5-493b-9259-f01db315a46e" + }, + "assetIds" : { + "type" : "array", + "items" : { + "type" : "string" + } + } + } + }, + "ImportResponse" : { + "type" : "object", + "properties" : { + "jobId" : { + "type" : "string" + }, + "importStateMessage" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/ImportStateMessage" + } + }, + "validationResult" : { + "$ref" : "#/components/schemas/ValidationResponse" + } + } + }, + "ImportStateMessage" : { + "type" : "object", + "properties" : { + "catenaXId" : { + "type" : "string" + }, + "persistedOrUpdated" : { + "type" : "boolean" + } + } + }, + "ValidationResponse" : { + "type" : "object", + "properties" : { + "validationErrors" : { + "type" : "array", + "items" : { + "type" : "string" + } + } + } + }, + "SyncAssetsRequest" : { + "type" : "object", + "properties" : { + "globalAssetIds" : { + "maxItems" : 100, + "minItems" : 1, + "type" : "array", + "example" : [ + "urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70528fcbd" + ], + "items" : { + "type" : "string", + "example" : "[\"urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70528fcbd\"]" + } + } + } + }, + "GetDetailInformationRequest" : { + "type" : "object", + "properties" : { + "assetIds" : { + "maxLength" : 50, + "minLength" : 1, + "maxItems" : 50, + "minItems" : 1, + "type" : "array", + "example" : [ + "urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70528fcbd" + ], + "items" : { + "maxLength" : 50, + "minLength" : 1, + "type" : "string", + "example" : "[\"urn:uuid:ceb6b964-5779-49c1-b5e9-0ee70528fcbd\"]" + } + } + } + }, + "DescriptionsResponse" : { + "type" : "object", + "properties" : { + "id" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "urn:uuid:a4a26b9c-9460-4cc5-8645-85916b86adb0" + }, + "idShort" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "assembly-part-relationship" + } + } + }, + "DetailAspectDataAsBuiltResponse" : { + "type" : "object", + "properties" : { + "partId" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "95657762-59" + }, + "customerPartId" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "01697F7-65" + }, + "nameAtCustomer" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "Door front-left" + }, + "manufacturingCountry" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "DEU" + }, + "manufacturingDate" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "2022-02-04T13:48:54Z" + } + } + }, + "DetailAspectDataAsPlannedResponse" : { + "type" : "object", + "properties" : { + "validityPeriodFrom" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "2022-09-26T12:43:51.079Z" + }, + "validityPeriodTo" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "20232-07-13T12:00:00.000Z" + } + } + }, + "DetailAspectDataResponse" : { + "type" : "object", + "oneOf" : [ + { + "$ref" : "#/components/schemas/DetailAspectDataAsBuiltResponse" + }, + { + "$ref" : "#/components/schemas/DetailAspectDataAsPlannedResponse" + }, + { + "$ref" : "#/components/schemas/PartSiteInformationAsPlannedResponse" + }, + { + "$ref" : "#/components/schemas/DetailAspectDataTractionBatteryCodeResponse" + } + ] + }, + "DetailAspectDataTractionBatteryCodeResponse" : { + "type" : "object", + "properties" : { + "productType" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "pack" + }, + "tractionBatteryCode" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "X12MCPM27KLPCLX2M2382320" + }, + "subcomponents" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/DetailAspectDataTractionBatteryCodeSubcomponentResponse" + } + } + } + }, + "DetailAspectDataTractionBatteryCodeSubcomponentResponse" : { + "type" : "object", + "properties" : { + "productType" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "pack" + }, + "tractionBatteryCode" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "X12MCPM27KLPCLX2M2382320" + } + } + }, + "DetailAspectModelResponse" : { + "type" : "object", + "properties" : { + "type" : { + "type" : "string", + "example" : "PART_SITE_INFORMATION_AS_PLANNED", + "enum" : [ + "AS_BUILT", + "AS_PLANNED", + "TRACTION_BATTERY_CODE", + "SINGLE_LEVEL_BOM_AS_BUILT", + "SINGLE_LEVEL_USAGE_AS_BUILT", + "SINGLE_LEVEL_BOM_AS_PLANNED", + "PART_SITE_INFORMATION_AS_PLANNED" + ] + }, + "data" : { + "$ref" : "#/components/schemas/DetailAspectDataResponse" + } + } + }, + "PartSiteInformationAsPlannedResponse" : { + "type" : "object", + "properties" : { + "functionValidUntil" : { + "type" : "string", + "example" : "2025-02-08T04:30:48.000Z" + }, + "function" : { + "type" : "string", + "example" : "production" + }, + "functionValidFrom" : { + "type" : "string", + "example" : "2023-10-13T14:30:45+01:00" + }, + "catenaXSiteId" : { + "type" : "string", + "example" : "urn:uuid:0fed587c-7ab4-4597-9841-1718e9693003" + } + } + }, + "UpdateAssetRequest" : { + "required" : [ + "qualityType" + ], + "type" : "object", + "properties" : { + "qualityType" : { + "type" : "string", + "example" : "Ok", + "enum" : [ + "Ok", + "Minor", + "Major", + "Critical", + "LifeThreatening" + ] + } + } + }, + "ConstraintResponse" : { + "type" : "object", + "properties" : { + "leftOperand" : { + "type" : "string", + "example" : "PURPOSE" + }, + "operatorTypeResponse" : { + "type" : "string", + "enum" : [ + "EQ", + "NEQ", + "LT", + "GT", + "IN", + "LTEQ", + "GTEQ", + "ISA", + "HASPART", + "ISPARTOF", + "ISONEOF", + "ISALLOF", + "ISNONEOF" + ] + }, + "rightOperand" : { + "type" : "string", + "example" : "ID Trace 3.1" + } + } + }, + "ConstraintsResponse" : { + "type" : "object", + "properties" : { + "and" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/ConstraintResponse" + } + }, + "or" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/ConstraintResponse" + } + } + } + }, + "PermissionResponse" : { + "type" : "object", + "properties" : { + "action" : { + "type" : "string", + "example" : "USE", + "enum" : [ + "ACCESS", + "USE" + ] + }, + "constraints" : { + "$ref" : "#/components/schemas/ConstraintsResponse" + } + } + }, + "PolicyResponse" : { + "type" : "object", + "properties" : { + "policyId" : { + "type" : "string", + "example" : "5a00bb50-0253-405f-b9f1-1a3150b9d51d" + }, + "createdOn" : { + "type" : "string", + "format" : "date-time" + }, + "validUntil" : { + "type" : "string", + "format" : "date-time" + }, + "permissions" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/PermissionResponse" + } + } + } + }, + "DashboardResponse" : { + "type" : "object", + "properties" : { + "asBuiltCustomerParts" : { + "type" : "integer", + "format" : "int64", + "example" : 5 + }, + "asPlannedCustomerParts" : { + "type" : "integer", + "format" : "int64", + "example" : 10 + }, + "asBuiltSupplierParts" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + }, + "asPlannedSupplierParts" : { + "type" : "integer", + "format" : "int64", + "example" : 3 + }, + "asBuiltOwnParts" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + }, + "asPlannedOwnParts" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + }, + "myPartsWithOpenAlerts" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + }, + "myPartsWithOpenInvestigations" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + }, + "supplierPartsWithOpenAlerts" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + }, + "customerPartsWithOpenAlerts" : { + "type" : "integer", + "format" : "int64", + "example" : 1 + }, + "supplierPartsWithOpenInvestigations" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + }, + "customerPartsWithOpenInvestigations" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + }, + "receivedActiveAlerts" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + }, + "receivedActiveInvestigations" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + }, + "sentActiveAlerts" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + }, + "sentActiveInvestigations" : { + "type" : "integer", + "format" : "int64", + "example" : 2 + } + } + }, + "ImportJobResponse" : { + "type" : "object", + "properties" : { + "importJobStatus" : { + "type" : "string", + "enum" : [ + "INITIALIZING", + "RUNNING", + "ERROR", + "COMPLETED" + ] + }, + "importId" : { + "type" : "string", + "example" : "456a952e-05eb-40dc-a6f2-9c2cb9c1387f" + }, + "startedOn" : { + "maxLength" : 50, + "type" : "string", + "example" : "2099-02-21T21:27:10.734950Z" + }, + "completedOn" : { + "maxLength" : 50, + "type" : "string", + "example" : "2099-02-21T21:27:10.734950Z" + } + } + }, + "ImportReportResponse" : { + "type" : "object", + "properties" : { + "importJob" : { + "$ref" : "#/components/schemas/ImportJobResponse" + }, + "importedAsset" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/ImportedAssetResponse" + } + } + } + }, + "ImportedAssetResponse" : { + "type" : "object", + "properties" : { + "importState" : { + "type" : "string", + "enum" : [ + "TRANSIENT", + "PERSISTENT", + "ERROR", + "IN_SYNCHRONIZATION", + "PUBLISHED_TO_CORE_SERVICES", + "UNSET" + ] + }, + "catenaxId" : { + "type" : "string", + "example" : "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd}" + }, + "importedOn" : { + "maxLength" : 50, + "type" : "string", + "example" : "2099-02-21T21:27:10.734950Z" + }, + "importMessage" : { + "type" : "string", + "example" : "Asset created successfully in transient state." + } + } + } + }, + "securitySchemes" : { + "oAuth2" : { + "type" : "oauth2", + "flows" : { + "clientCredentials" : { + "tokenUrl" : "https://example.com/api/oauth/token", + "scopes" : { + "profile email" : "" + } + } + } + } + } + } +} diff --git a/docs/concept/#774-messages-to-multiple-bpns/#774-messages-to-multiple-bpns.md b/docs/concept/#774-messages-to-multiple-bpns/#774-messages-to-multiple-bpns.md new file mode 100644 index 0000000000..06d087ad2a --- /dev/null +++ b/docs/concept/#774-messages-to-multiple-bpns/#774-messages-to-multiple-bpns.md @@ -0,0 +1,392 @@ +# OBSOLETE \[Concept\] \[#774\] Messages to multiple BPNs + +### Concept no longer needed, as it was decided to go with a different approach (->[#774](https://github.com/eclipse-tractusx/traceability-foss/issues/774)). If needed, parts of this concept can be reused. + +| Key | Value | +|---------------|--------------------------------------------------------------------------| +| Author | @ds-crehm | +| Creation date | 25.03.2024 | +| Ticket Id | [#774](https://github.com/eclipse-tractusx/traceability-foss/issues/774) | +| State | WIP | + +# Table of Contents +1. [Summary](#summary) +2. [Problem Statement](#problem-statement) +3. [Requirements](#requirements) +4. [Concept](#concept) +5. [References](#references) +6. [Additional Details](#additional-details) + + + +# Summary +A user must be able to send notifications to multiple BPNs. +He must be able to view each of those and change their status individually. + +# Problem Statement +Right now, a user can send a notification to only one BPN that he must manually type in. + +# Requirements +- [ ] Notification model changed +- [ ] Notification API changed +- [ ] Implement functionality for sending to multiple BPNLs in backend +- [ ] Frontend concept implemented + - [ ] Notification overview + - [ ] Notification detail view + - [ ] Create/Edit notification screens + +# Concept +### Backend +The notification model must be changed: + +```diff +{ + ... + +- "status": "", +- "reason": { +- "close": null, +- "accept": null, +- "decline": null +- }, +- "sendTo": "", +- "sendToName": "", + + ... + + "messages": [ + { + ... + +- "severity": "", + ++ "reason": { ++ "close": null, ++ "accept": null, ++ "decline": null ++ }, + + ... + } + ] +} +``` + +The close/accept/decline reasons must be handled for each message individually. Same for the status. +Since the messages can be sent to multiple BPNs the "sendTo" and "sendToName" attributes are obsolete. +Instead, the attributes within the individual message will be used to identify to which BPN the message was sent. + +The API call to create notifications must be adjusted to accommodate multiple receiver BPNs: + +POST /api/notifications + +Request body: +```diff +{ + ... +- "bpn": "EXAMPLEBPN123" ++ "receiverBpns": [ ++ "EXAMPLEBPN123", ++ "EXAMPLEBPN234", ++ "EXAMPLEBPN345" ++ ] +} +``` + +When sending a notification to multiple BPNs, the sender will always have all messages in his own database, +while the receiver only receives information about the high-level notification data and the specific message addressed to him. + +#### Example +BPNL0A creates and approves a notification addressed to BPNL1X and BPNL2Y. + +The API call request body looks like this: + +```json +{ + { + "partIds": ["urn:uuid:55555555-5555-5555-5555-555555555555"], + "description":"Notification description", + "title": "Notification title", + "severity": "MINOR", + "type": "ALERT", + "targetDate": "2024-05-01T00:00:00Z", + "receiverBpns": ["BPNL1X","BPNL2Y"] + } +} +``` + +The following data is created in the database of BPNL0A: + +```json +{ + "id": 1, + "title": "Notification title", + "description": "Notification description", + "createdBy": "BPNL0A", + "createdByName": "TEST_BPN_SENDER", + "createdDate": "2024-04-01T00:00:00.000000Z", + "assetIds": [ + "urn:uuid:55555555-5555-5555-5555-555555555555" + ], + "channel": "SENDER", + "severity": "MINOR", + "type": "ALERT", + "targetDate": "2024-05-01T00:00:00Z", + "messages": [ + { + "id": "11111111-1111-1111-1111-111111111111", + "createdBy": "BPNL0A", + "createdByName": "TEST_BPN_SENDER", + "sendTo": "BPNL1X", + "sendToName": "TEST_BPN_RECEIVER1", + "contractAgreementId": "88888888-8888-8888-8888-888888888888", + "notificationReferenceId": null, + "targetDate": 1714521600.000000000, + "severity": "MINOR", + "edcNotificationId": "49b450ce-6afd-4621-b76b-6e6f4d78425c", + "created": [ + 2024, + 4, + 1, + 0, + 0, + 0, + 000000000 + ], + "updated": [ + 2024, + 4, + 1, + 0, + 0, + 0, + 000000000 + ], + "messageId": "bbab03a1-8cba-436b-a481-50bad3ffbd08", + "status": "CREATED", + "reason": { + "close": null, + "accept": null, + "decline": null + }, + "errorMessage": null + }, + { + "id": "22222222-2222-2222-2222-222222222222", + "createdBy": "BPNL0A", + "createdByName": "TEST_BPN_SENDER", + "sendTo": "BPNL2Y", + "sendToName": "TEST_BPN_RECEIVER2", + "contractAgreementId": "88888888-8888-8888-8888-888888888888", + "notificationReferenceId": null, + "targetDate": 1714521600.000000000, + "severity": "MINOR", + "edcNotificationId": "49b450ce-6afd-4621-b76b-6e6f4d78425c", + "created": [ + 2024, + 4, + 1, + 0, + 0, + 0, + 000000000 + ], + "updated": [ + 2024, + 4, + 1, + 0, + 0, + 0, + 000000000 + ], + "messageId": "bbab03a1-8cba-436b-a481-50bad3ffbd08", + "status": "CREATED", + "reason": { + "close": null, + "accept": null, + "decline": null + }, + "errorMessage": null + } + ] +} +``` +The data sent to BPNL1X contains only the general information about the notification and the message addressed to itself. It does **NOT** contain the second message addressed to BPNL2Y. +The same happens for BPNL2Y respectively. + +After the notification was successfully sent to both BPNs the status of both messages is set to "SENT"(for the sender) / "RECEIVED"(for the receivers) synchronized between all three parties. +(In case of an error, the respective message remains in the status "CREATED" and contains the errorMessage. Once it is successfully resent, the error message will be deleted.) + +If BPNL1X acknowledges the notification and then accepts it, two new messages will be created for BPNL1X and synchronized with BPNL0A. +BPNL2Y will **NOT** receive any new data. + +The data will look like this for BPNL1X: +```json +{ + "id": 1, + "title": "Notification title", + "description": "Notification description", + "createdBy": "BPNL0A", + "createdByName": "TEST_BPN_SENDER", + "createdDate": "2024-04-01T00:00:00.000000Z", + "assetIds": [ + "urn:uuid:55555555-5555-5555-5555-555555555555" + ], + "channel": "RECEIVER", + "severity": "MINOR", + "type": "ALERT", + "targetDate": "2024-05-01T00:00:00Z", + "messages": [ + { + "id": "11111111-1111-1111-1111-111111111111", + "createdBy": "BPNL0A", + "createdByName": "TEST_BPN_SENDER", + "sendTo": "BPNL1X", + "sendToName": "TEST_BPN_RECEIVER1", + "contractAgreementId": "88888888-8888-8888-8888-888888888888", + "notificationReferenceId": null, + "edcNotificationId": "49b450ce-6afd-4621-b76b-6e6f4d78425c", + "created": [ + 2024, + 4, + 1, + 0, + 0, + 0, + 000000000 + ], + "updated": [ + 2024, + 4, + 1, + 0, + 0, + 0, + 000000000 + ], + "messageId": "bbab03a1-8cba-436b-a481-50bad3ffbd08", + "status": "RECEIVED", + "reason": { + "close": null, + "accept": null, + "decline": null + }, + "errorMessage": null + }, + { + "id": "11111111-1111-1111-1111-111111111112", + "createdBy": "BPNL1X", + "createdByName": "TEST_BPN_RECEIVER1", + "sendTo": "BPNL0A", + "sendToName": "TEST_BPN_SENDER", + "contractAgreementId": "88888888-8888-8888-8888-888888888888", + "notificationReferenceId": null, + "edcNotificationId": "49b450ce-6afd-4621-b76b-6e6f4d78425c", + "created": [ + 2024, + 4, + 2, + 0, + 0, + 0, + 000000000 + ], + "updated": [ + 2024, + 4, + 2, + 0, + 0, + 15, + 000000000 + ], + "messageId": "bbab03a1-8cba-436b-a481-50bad3ffbd09", + "status": "ACKNOWLEDGED", + "reason": { + "close": null, + "accept": null, + "decline": null + }, + "errorMessage": null + }, + { + "id": "11111111-1111-1111-1111-111111111113", + "createdBy": "BPNL1X", + "createdByName": "TEST_BPN_RECEIVER1", + "sendTo": "BPNL0A", + "sendToName": "TEST_BPN_SENDER", + "contractAgreementId": "88888888-8888-8888-8888-888888888888", + "notificationReferenceId": null, + "edcNotificationId": "49b450ce-6afd-4621-b76b-6e6f4d78425c", + "created": [ + 2024, + 4, + 3, + 0, + 0, + 0, + 000000000 + ], + "updated": [ + 2024, + 4, + 3, + 0, + 0, + 15, + 000000000 + ], + "messageId": "bbab03a1-8cba-436b-a481-50bad3ffbd09", + "status": "ACCEPTED", + "reason": { + "close": null, + "accept": "example acceptance message", + "decline": null + }, + "errorMessage": null + } + ] +} +``` + +BPNL0A will have those 3 messages and additionally the message sent to BPN2Y, while BPN2Y will only have its own message. + +### Frontend + +#### Notification detail view +In the notification detail view, the message history will be changed according to the frontend concept: + +**Creator/Sender:** +![frontend-notification-detail-view-sender.png](frontend-notification-detail-view-sender.png) + +The overview must be adapted to the backend changes. + +The creator must be able to select individual BPNs, then he can view the message history for messages that were sent to/from the selected BPN. +The state on the left will always show the latest status in the message history. +The user must be able to select individual BPNLs and then send/approve or cancel the notification for the selected BPNLs. +When closing the notification for multiple BPNLs, only one reason can be given, that will be the same for all BPNLs. Closing is possible from all states. + +Sending/approving multiple BPNLs will only send, where the last state was "CREATED". Other messages will not be affected. + +Additionally, the user is able to edit the notification, send it or close it. (Default actions) Those actions affect **all** BPNLs. +Clicking "send" will send messages to all BPNLs, where the last state was "CREATED" all messages that are in the state "CREATED". Other + +**Recipient:** +![frontend-notification-detail-view-recipient.png](frontend-notification-detail-view-recipient.png) + +For the recipient not much changes, since a notification can only be received by a single BPNL. The overview and the message history should be aligned with the view from the sender. +The actions remain the same. + +#### Create/Edit notifications +When creating or editing notifications, the user must be able to add/remove multiple BPNLs. +This should be made possible by having an autocomplete in the input text field. And showing selected BPNLs as removable chips: +![frontend-create-notification.png](frontend-create-notification.png) +(-> identical for Edit Notification) + +# References +Frontend concepts: +https://miro.com/app/board/uXjVO5JVoho=/ + +# Additional Details +Given the dynamic nature of ongoing development, there might be variations between the conceptualization and the current implementation. For the latest status, refer to the documentation. diff --git a/docs/concept/#774-messages-to-multiple-bpns/frontend-create-notification.png b/docs/concept/#774-messages-to-multiple-bpns/frontend-create-notification.png new file mode 100644 index 0000000000..157c19469d Binary files /dev/null and b/docs/concept/#774-messages-to-multiple-bpns/frontend-create-notification.png differ diff --git a/docs/concept/#774-messages-to-multiple-bpns/frontend-notification-detail-view-recipient.png b/docs/concept/#774-messages-to-multiple-bpns/frontend-notification-detail-view-recipient.png new file mode 100644 index 0000000000..28fb32e7e3 Binary files /dev/null and b/docs/concept/#774-messages-to-multiple-bpns/frontend-notification-detail-view-recipient.png differ diff --git a/docs/concept/#774-messages-to-multiple-bpns/frontend-notification-detail-view-sender.png b/docs/concept/#774-messages-to-multiple-bpns/frontend-notification-detail-view-sender.png new file mode 100644 index 0000000000..e42945a0fc Binary files /dev/null and b/docs/concept/#774-messages-to-multiple-bpns/frontend-notification-detail-view-sender.png differ diff --git a/docs/concept/#831-notification-data-model/#831-notification-data-model.md b/docs/concept/#831-notification-data-model/#831-notification-data-model.md new file mode 100644 index 0000000000..67e22cccfa --- /dev/null +++ b/docs/concept/#831-notification-data-model/#831-notification-data-model.md @@ -0,0 +1,286 @@ +# \[Concept\] \[#831\] Notification data model revision + +| Key | Value | +|---------------|--------------------------------------------------------------------------| +| Author | @ds-crehm | +| Creation date | 06.05.2024 | +| Ticket Id | [#831](https://github.com/eclipse-tractusx/traceability-foss/issues/831) | +| State | WIP | + + +# Table of Contents +1. [Summary](#summary) +2. [Requirements](#requirements) +3. [Out of scope](#out-of-scope) +4. [Concept](#concept) +5. [Additional Details](#additional-details) + + +# Summary +The current data model was created with the possibility to send messages to multiple BPNs. +Since this concept will be changed with the implementation of [#849](https://github.com/eclipse-tractusx/traceability-foss/issues/849), +changes to the data model are needed. Additionally, some parts of the data model are outdated, +which must be changed as well to make it easier to work with and avoid future problems. + +# Requirements +- Data model changed according to the suggestion in the concept. +- Message creation logic adjusted according to the process described in [Creating notifications and messages](#creating-notifications-and-messages) + - No message creation when notification is created + - Error messages always create a new message in the status during which the error occurred + - Messages created whenever there was a status change (status in the message will be the new status) + - Parent object "updatedDate" updated whenever a message is created (or when the notification was edited by the user) + +# Out of scope +- Frontend adjustments to the message history will be made in [#753](https://github.com/eclipse-tractusx/traceability-foss/issues/753) + +# Concept +## Data model +Notification data model must be changed as follows: + +```diff +{ + "id": 609, + "title": "Alert title", + "type": "ALERT", + "status": "CREATED", + "description": ":-:Testing without targetDate TRACEFOSS-1546:-:2024-05-06T00:41:02.739457851Z", + "createdBy": "BPNL00000003CML1", + "createdByName": "TEST_BPN_DFT_1", + "createdDate": "2024-05-06T00:41:03.356688Z", ++ "updatedDate": "2024-05-06T00:45:39.322734Z", + "assetIds": [ + "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02" + ], + "channel": "SENDER", +- "reason": { +- "close": null, +- "accept": null, +- "decline": null +- }, + "sendTo": "BPNL00000003CNKC", + "sendToName": "TEST_BPN_IRS_1", + "severity": "MINOR", + "targetDate": null, + "messages": [ + { + "id": "9a1c137f-172f-47ee-bfd3-a3dffd370349", +- "createdBy": "BPNL00000003CML1", +- "createdByName": "TEST_BPN_DFT_1", ++ "sentBy": "BPNL00000003CML1", ++ "sentByName": "TEST_BPN_DFT_1", + "sendTo": "BPNL00000003CNKC", + "sendToName": "TEST_BPN_IRS_1", + "contractAgreementId": null, + "notificationReferenceId": null, +- "targetDate": null, +- "severity": "MINOR", + "edcNotificationId": "9a1c137f-172f-47ee-bfd3-a3dffd370349", +- "created": [ +- 2024, +- 5, +- 6, +- 0, +- 41, +- 3, +- 820767000 +- ], +- "updated": [ +- 2024, +- 5, +- 6, +- 0, +- 45, +- 59, +- 322734000 +- ], ++ "messageDate": "2024-05-06T00:41:03.356688Z", + "messageId": "0deac300-e212-4c37-8d7d-83e18f01336e", ++ "message": null, + "status": "CREATED", + "errorMessage": "DiscoveryFinder could not determine result." + } + ] +} +``` + +Major changes: +- "updated" from messages removed and replaced with "updatedDate" in the parent object. This will be updated whenever there was any change to the notification. +- "reason" from parent object removed and replaced with "message" in the messages. For the three status changes where a user can input a message (close, accept, decline) this String will be used. For the other status messages, it will be null. +- "targetDate" removed from messages. +- "severity" removed from messages. + +Minor changes: +- "createdBy" and "createdByName" in messages renamed to "sentBy" and "sentByName". +- "created" in messages renamed to "messageDate" and format changed to match the other timestamps. + +## Creating notifications and messages +When successfully creating a notification, **no message must be created for the status "CREATED"**. After the notification was created it should look like this (with no messages): +```json +{ + "id": 1, + "title": "Notification title", + "type": "ALERT", + "status": "CREATED", + "description": "Notification creation - example", + "createdBy": "BPNL00000003CML1", + "createdByName": "TEST_BPN_DFT_1", + "createdDate": "2024-05-06T00:41:03.356688Z", + "updatedDate": "2024-05-06T00:41:03.356688Z", + "assetIds": [ + "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02" + ], + "channel": "SENDER", + "sendTo": "BPNL00000003CNKC", + "sendToName": "TEST_BPN_IRS_1", + "severity": "MINOR", + "targetDate": null, + "messages": [] +} +``` + +When the notification was successfully approved/acknowledged/accepted/declined/closed/cancelled, a message for that status will be created. +The "status" and the "updatedDate" in the parent object will be updated. +```json +{ + "id": 1, + "title": "Notification title", + "type": "ALERT", + "status": "APPROVED", + "description": "Notification creation - example", + "createdBy": "BPNL00000003CML1", + "createdByName": "TEST_BPN_DFT_1", + "createdDate": "2024-05-06T00:41:03.356688Z", + "updatedDate": "2024-05-07T00:42:03.336688Z", + "assetIds": [ + "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02" + ], + "channel": "SENDER", + "sendTo": "BPNL00000003CNKC", + "sendToName": "TEST_BPN_IRS_1", + "severity": "MINOR", + "targetDate": null, + "messages": [ + { + "id": "9a1c137f-172f-47ee-bfd3-a3dffd370349", + "sentBy": "BPNL00000003CML1", + "sentByName": "TEST_BPN_DFT_1", + "sendTo": "BPNL00000003CNKC", + "sendToName": "TEST_BPN_IRS_1", + "contractAgreementId": null, + "notificationReferenceId": null, + "edcNotificationId": "9a1c137f-172f-47ee-bfd3-a3dffd370349", + "messageDate": "2024-05-07T00:42:03.356688Z", + "messageId": "0deac300-e212-4c37-8d7d-83e18f01336e", + "message": null, + "status": "APPROVED", + "errorMessage": null + } + ] +} +``` + +Whenever an error occurs, a new message will be created containing the status in which the error occurred. +Error messages will not be overwritten. +Here is an example of a closed notification where a couple of errors occurred when trying to send the notification. +After the third try, the process was successful. The notification was closed before the receiver could accept or decline it: +```json +{ + "id": 2, + "title": "Notification title", + "type": "ALERT", + "status": "CLOSED", + "description": "Complete notification process - example", + "createdBy": "BPNL00000003CML1", + "createdByName": "TEST_BPN_DFT_1", + "createdDate": "2024-05-05T08:00:00.000000Z", + "updatedDate": "2024-05-10T00:00:00.000000Z", + "assetIds": [ + "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02" + ], + "channel": "SENDER", + "sendTo": "BPNL00000003CNKC", + "sendToName": "TEST_BPN_IRS_1", + "severity": "MINOR", + "targetDate": "2024-05-30T08:00:00.000000Z", + "messages": [ + { + "id": "9a1c137f-172f-47ee-bfd3-a3dffd370349", + "sentBy": "BPNL00000003CML1", + "sentByName": "TEST_BPN_DFT_1", + "sendTo": "BPNL00000003CNKC", + "sendToName": "TEST_BPN_IRS_1", + "contractAgreementId": null, + "notificationReferenceId": null, + "edcNotificationId": "9a1c137f-172f-47ee-bfd3-a3dffd370349", + "messageDate": "2024-05-05T08:30:00.000000Z", + "messageId": "0deac300-e212-4c37-8d7d-83e18f01336e", + "message": null, + "status": "CREATED", + "errorMessage": "DiscoveryFinder could not determine result." + }, + { + "id": "136e2dc5-5d2a-48b6-85a9-f9ae9d619217", + "sentBy": "BPNL00000003CML1", + "sentByName": "TEST_BPN_DFT_1", + "sendTo": "BPNL00000003CNKC", + "sendToName": "TEST_BPN_IRS_1", + "contractAgreementId": null, + "notificationReferenceId": null, + "edcNotificationId": "fb4186e3-5de3-4a6b-9205-3993583267e0", + "messageDate": "2024-05-05T09:00:00.000000Z", + "messageId": "1d7f363b-853a-4c7d-b930-4be187fa98ce", + "message": null, + "status": "CREATED", + "errorMessage": "No Catalog Item in catalog found." + }, + { + "id": "3befc791-326f-42f2-9301-49cb6e3795d0", + "sentBy": "BPNL00000003CML1", + "sentByName": "TEST_BPN_DFT_1", + "sendTo": "BPNL00000003CNKC", + "sendToName": "TEST_BPN_IRS_1", + "contractAgreementId": null, + "notificationReferenceId": null, + "edcNotificationId": "53fdd2e3-1f23-4e83-9c36-04a43ab5ffc7", + "messageDate": "2024-05-06T08:00:00.000000Z", + "messageId": "97cb3c74-3a43-4ba8-9043-c346cb1d90d2", + "message": null, + "status": "APPROVED", + "errorMessage": null + }, + { + "id": "62957c2e-0846-4394-830c-8d73f683a5d2", + "sentBy": "BPNL00000003CNKC", + "sentByName": "TEST_BPN_IRS_1", + "sendTo": "BPNL00000003CML1", + "sendToName": "TEST_BPN_DFT_1", + "contractAgreementId": null, + "notificationReferenceId": null, + "edcNotificationId": "e5ae361e-da0a-4c2c-85d4-d836a02c598d", + "messageDate": "2024-05-07T08:00:00.000000Z", + "messageId": "9520f434-a291-4a9a-a9cd-63f13efac952", + "message": null, + "status": "ACKNOWLEDGED", + "errorMessage": null + }, + { + "id": "43989ad5-e253-40e8-9bd0-7815f45c50bb", + "sentBy": "BPNL00000003CML1", + "sentByName": "TEST_BPN_DFT_1", + "sendTo": "BPNL00000003CNKC", + "sendToName": "TEST_BPN_IRS_1", + "contractAgreementId": null, + "notificationReferenceId": null, + "edcNotificationId": "49ebd64c-0b3c-41f8-b95c-7ac6e9a49d05", + "messageDate": "2024-05-10T00:00:00.000000Z", + "messageId": "50aef851-bf21-44b6-98d0-3361ede2c813", + "message": "We found the problem ourselves. Notification will be closed.", + "status": "CLOSED", + "errorMessage": null + } + ] +} +``` + +# Additional Details +Given the dynamic nature of ongoing development, there might be variations between the conceptualization and the current implementation. For the latest status, refer to the documentation. diff --git a/docs/concept/#849-notifications-to-multiple-bpns/#849-notifications-to-multiple-bpns.md b/docs/concept/#849-notifications-to-multiple-bpns/#849-notifications-to-multiple-bpns.md new file mode 100644 index 0000000000..3dd2060eac --- /dev/null +++ b/docs/concept/#849-notifications-to-multiple-bpns/#849-notifications-to-multiple-bpns.md @@ -0,0 +1,97 @@ +# \[Concept\] \[#849\] Quality notifications to multiple BPNs + +| Key | Value | +|---------------|--------------------------------------------------------------------------| +| Author | @ds-crehm | +| Creation date | 22.04.2024 | +| Ticket Id | [#849](https://github.com/eclipse-tractusx/traceability-foss/issues/849) | +| State | DRAFT | + +# Table of Contents +1. [Overview](#overview) +2. [Requirements](#requirements) +3. [Out of scope](#out-of-scope) +4. [Concept](#concept) +5. [Additional Details](#additional-details) + +# Overview +Instead of having "messages" that can be sent to multiple BPNs within one notification, multiple notifications must be created. +Those can be individually edited and sent to the specific BPN. + +# Requirements +- For alerts, when selecting multiple BPNs, a duplicated alert for each of the selected BPNs is created. +- For investigations, when selecting parts from different BPNs, a duplicated investigation for each of the BPNs is created. +- A case attribute is added to notifications, that can be set during creation and edit processes. +- The case attribute is shown in the inbox table and can be searched and filtered for. +- Notifications are tied to single BPNs and cannot be sent to multiple BPNs anymore. +- BPN selection is only possibly for alerts. + - Autocomplete filter -> Selection shows all matching BPNs (if there are more than 10, this selection is scrollable). + - Selected BPNs are shown as chips that can be removed. +- BPN selection is disabled for investigations, instead the BPNs are "pulled" from the selected parts. +- The frontend modals appear when a user is creating notifications and triggers a notification duplication. +- In the modal the user has the chance to cancel or approve the process. +- During the "Edit notification" process, the "Available parts" table is filtered to show only the parts from the currently selected BPNs. + +# Out of scope +- A duplication process for the user. In case the user wants to retroactively add BPNs to an existing notification or send a notification to a BPN that was not selected during the creation of this notification, +he must create a new notification and copy the data. In the future, there might be the possibility to add a "Duplicate notification" or "Copy notification" process to Trace-X, but that is out of scope for this concept. + +# Concept +## Backend +Messages within one notification can only be sent between **two** BPNs. To make it possible to send notifications to multiple BPNs, notifications are duplicated during the creation process. +An optional grouping label can be set for each notification created during the same process to identify notifications belonging to the same 'topic'. This label can be added/removed afterwards. + +```diff +{ + "id": 423, + "title": null, + "status": "CREATED", + "description": "2024-04-25T07:46:29.523Z-requested-by-chris", ++ "case": "CASE-ID123", + "createdBy": null, + "createdByName": null, + "createdDate": "2024-04-25T07:28:42.538791Z", + "assetIds": [ + "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a" + ], + "channel": "SENDER", + "reason": { + "close": null, + "accept": null, + "decline": null + }, + "sendTo": null, + "sendToName": null, + "severity": "MINOR", + "type": "ALERT", + "targetDate": null, + "messages": [] +} +``` + +#### Alert creation +When an alert is created, multiple BPNs can be selected. For each of the recipients the notification will be duplicated. +The data will be identical except for the "createdFor" and "createdForName" fields. +If the data must be changed, the user can do it afterward in the "edit notification" view. + +#### Investigation creation +When an investigation is created, multiple parts can be selected. Whenever a part from a different BPN is selected, the notification will be duplicated. +The data will be identical except for the "createdFor", "createdForName" and "assetIds" fields. Each notification will only contain parts from the same BPN. +If the data must be changed, the user can do it afterward in the "edit notification" view. + +#### Edit notifications +When editing notifications, only parts with the identical BPN as the "createdFor" BPN will be shown and the user may not add BPNs manually. +There is no possibility to create a new notification from the "Edit notifications" process. +If the user wants to send an existing notification to a different BPN, he must copy the data and use the "Create notification" process. + +## Frontend +![multiple-bpns-modals.png](multiple-bpns-modals.png) +![notification-creation-bpn-selection.png](notification-creation-bpn-selection.png) + +New case label: +![case-label.png](case-label.png) + +See https://miro.com/app/board/uXjVO5JVoho=/?moveToWidget=3458764586657591852&cot=10 + +# Additional Details +Given the dynamic nature of ongoing development, there might be variations between the conceptualization and the current implementation. For the latest status, refer to the documentation. diff --git a/docs/concept/#849-notifications-to-multiple-bpns/case-label.png b/docs/concept/#849-notifications-to-multiple-bpns/case-label.png new file mode 100644 index 0000000000..ce5ca13aa2 Binary files /dev/null and b/docs/concept/#849-notifications-to-multiple-bpns/case-label.png differ diff --git a/docs/concept/#849-notifications-to-multiple-bpns/multiple-bpns-modals.png b/docs/concept/#849-notifications-to-multiple-bpns/multiple-bpns-modals.png new file mode 100644 index 0000000000..543826fe53 Binary files /dev/null and b/docs/concept/#849-notifications-to-multiple-bpns/multiple-bpns-modals.png differ diff --git a/docs/concept/#849-notifications-to-multiple-bpns/notification-creation-bpn-selection.png b/docs/concept/#849-notifications-to-multiple-bpns/notification-creation-bpn-selection.png new file mode 100644 index 0000000000..f20121ec6d Binary files /dev/null and b/docs/concept/#849-notifications-to-multiple-bpns/notification-creation-bpn-selection.png differ diff --git a/docs/src/docs/administration/administration-guide.adoc b/docs/src/docs/administration/administration-guide.adoc index 03f064c10e..cac54da5c8 100644 --- a/docs/src/docs/administration/administration-guide.adoc +++ b/docs/src/docs/administration/administration-guide.adoc @@ -1,6 +1,6 @@ -= Administration Guide += Administration guide -## Notice +== Notice This work is licensed under the [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0). diff --git a/docs/src/docs/administration/backend-configuration.adoc b/docs/src/docs/administration/backend-configuration.adoc index a2ccba617e..a89f3d225c 100644 --- a/docs/src/docs/administration/backend-configuration.adoc +++ b/docs/src/docs/administration/backend-configuration.adoc @@ -1,5 +1,5 @@ [#_backend_configuration] -= Backend Configuration += Backend configuration :icons: font :icon-set: fas :hide-uri-scheme: @@ -9,7 +9,7 @@ You can define the URLs as well as most of the secrets yourself. The OAuth2, Vault configuration / secrets depend on your setup and might need to be provided externally. -== Helm configuration Trace-X Backend (values.yaml) +== Helm configuration Trace-X backend (values.yaml) [source,yaml] ---- diff --git a/docs/src/docs/administration/frontend-configuration.adoc b/docs/src/docs/administration/frontend-configuration.adoc index d4504e8fef..c0b3d93371 100644 --- a/docs/src/docs/administration/frontend-configuration.adoc +++ b/docs/src/docs/administration/frontend-configuration.adoc @@ -1,5 +1,5 @@ [#_frontend_configuration] -= Frontend Configuration += Frontend configuration //:allow-uri-read: :icons: font :icon-set: fas @@ -10,7 +10,7 @@ You can define the URLs as well as most of the secrets yourself. The OAuth2, Vault configuration / secrets depend on your setup and might need to be provided externally. -== Helm configuration Trace-X Frontend (values.yaml) +== Helm configuration Trace-X frontend (values.yaml) values.yaml https://github.com/eclipse-tractusx/traceability-foss/blob/main/charts/traceability-foss/values.yaml diff --git a/docs/src/docs/administration/portal-configuration.adoc b/docs/src/docs/administration/portal-configuration.adoc index d204926784..bd5ec2be35 100644 --- a/docs/src/docs/administration/portal-configuration.adoc +++ b/docs/src/docs/administration/portal-configuration.adoc @@ -1,46 +1,104 @@ [#_portal_configuration] -= Portal Configuration += Portal configuration //:allow-uri-read: :icons: font :icon-set: fas The following process is required to successfully connect to the portal: -== Company Registration -https://portal.int.demo.catena-x.net/documentation[How To] +- Company registration with BPN, Company Name + +- User Registration with E-Mail + +- Get e-mail to reset your password + +- Reset the password and log in + +- Make sure your user has the role App Management + +- Navigate to App Overview + +- Create app + +- Choose a selection of managed roles which is necessary (currently: BPDM, Dataspace Discovery, Semantic Model Management, Identity Wallet Management) + +- Wait for app approval by portal + +- Subscribe to the app + +- As app creator navigate to subscription management - click on configure + +- Add the frontend url of the application and click approve + +- Save technical user and secret + +- Navigate to Register Connector + +- Add managed connector + +- Select existing technical user (from app subscription) + +- Enter name "EDC Provider A" + +- Enter base url of controlplane (EDC) + +- Confirm + +- Go to other company which want to participate (subscribe) + +- Login and navigate to app overview + +- Search for the app created + +- Subscribe to the app + +- Go to the app creator company + +- Navigate to the inbox of the portal + +- Click on the nav link to give approval for the company which want to subscribe + +- Enter name "EDC Provider B" + +- Enter base url of controlplane (EDC) + +- Make sure to popuplate the new client id, secrets and app id within trace-x for each company to let it run properly with the new portal configuration. + +== Company registration +https://portal.int.demo.catena-x.net/documentation[How-to] === Additional info Each instance of trace-x reflects an own company, which is associated with one BPN. -== User Registration -https://portal.int.demo.catena-x.net/documentation/[How To] +== User registration +https://portal.int.demo.catena-x.net/documentation/[How-to] === Additional info -The user registration is a self service. Each user can have one or multiple trace-x roles assigned. +The user registration is a self-service. Each user can have one or multiple Trace-X roles assigned. -== Connector Registration -https://portal.int.demo.catena-x.net/documentation/[How To] +== Connector registration +https://portal.int.demo.catena-x.net/documentation/[How-to] === Additional info -A connector in the context of trace-x is a Eclipse-Dataspace-Connector. This connector needs to be configured by the public controlplane url. +A connector in the context of trace-x is a Eclipse-Dataspace-Connector. This connector needs to be configured by the public controlplane URL. -== App Registration -https://portal.int.demo.catena-x.net/documentation/[How To] +== App registration +https://portal.int.demo.catena-x.net/documentation/[How-to] === Additional info -A connector in the context of trace-x is a Eclipse-Dataspace-Connector. This connector needs to be configured by the public controlplane url. +A connector in the context of trace-x is a Eclipse-Dataspace-Connector. This connector needs to be configured by the public controlplane URL. -== Create App Subscription -https://portal.int.demo.catena-x.net/documentation/[How To] +== Create app subscription +https://portal.int.demo.catena-x.net/documentation/[How-to] === Additional info An app subscription is necessary to be able to setup a frontend url which will be authorized through keycloak and accessible with the portal. -== Activate App Subscription -https://portal.int.demo.catena-x.net/documentation/[How To] +== Activate App subscription +https://portal.int.demo.catena-x.net/documentation/[How-to] === Additional info -The app subscription needs to be activated from all instances which want to participate in the trace-x use case. +The app subscription needs to be activated from all instances which want to participate in the Trace-X use case. -== Retrieve Wallet Configuration -https://portal.int.demo.catena-x.net/documentation/[How To] +== Retrieve wallet configuration +https://portal.int.demo.catena-x.net/documentation/[How-to] diff --git a/docs/src/docs/administration/system-overview.adoc b/docs/src/docs/administration/system-overview.adoc index bb280d32f4..2677ec8c1e 100644 --- a/docs/src/docs/administration/system-overview.adoc +++ b/docs/src/docs/administration/system-overview.adoc @@ -1,17 +1,17 @@ -= System Overview += System overview The deployment contains the components required to connect Trace-X to an existing Catena-X network. This includes: -* Trace-X Frontend -* Trace-X Backend +* Trace-X frontend +* Trace-X backend Optionally these components can be installed using the Trace-X backend Helm chart as well: -* PostgreSQL for Trace-X Backend +* PostgreSQL for Trace-X backend * pgadmin4 * IRS -* EDC Consumer +* EDC consumer Everything else needs to be provided externally. @@ -20,7 +20,7 @@ Everything else needs to be provided externally. include::../../uml-diagrams/arc42/deployment-view/level-0-int.puml[] .... -== Rights and Role matrix of Trace-X +== Rights and role matrix of Trace-X Currently, Trace-X API handles three roles: **'User'** and **'Supervisor'** and **'Admin'**: @@ -29,30 +29,22 @@ Currently, Trace-X API handles three roles: **'User'** and **'Supervisor'** and | View | View Dashboard | x | x | x | | View Parts | x | x | x | | View Other parts | x | x | x -| | View Quality investigations | x | x | x -| | View Quality alerts | x | x | x +| | View Quality notifications | x | x | x | | View Administration | | | x - -| Investigation | Create | x | x | -| | Send (Approve) | | x | -| | Read | x | x | x -| | Cancel | x | x | -| | Acknowledge | x | x | -| | Accept | x | x | -| | Decline | x | x | -| | Close | | x | - -| Alert | Create | x | x | -| | Send (Approve) | | x | -| | Read | x | x | x -| | Cancel | x | x | -| | Acknowledge | x | x | -| | Accept | x | x | -| | Decline | x | x | -| | Close | | x | - -| Administration Panel | Access "BPN EDC config panel" | | | x +| Edit | Edit Quality notifications | | x | + +| Quality notification | Create | x | x | +| | Send (Approve) | | x | +| | Read | x | x | x +| | Cancel | x | x | +| | Acknowledge | x | x | +| | Accept | x | x | +| | Decline | x | x | +| | Close | | x | + +| Administration panel | Access "BPN EDC config panel" | | | x | | Access "Registry lookup Panel" | | | x +| | Access "Data Import Interface" | | | x |=== diff --git a/docs/src/docs/arc42/architecture-constraints/index.adoc b/docs/src/docs/arc42/architecture-constraints/index.adoc index 0ca50ffe22..d6add6e7b8 100644 --- a/docs/src/docs/arc42/architecture-constraints/index.adoc +++ b/docs/src/docs/arc42/architecture-constraints/index.adoc @@ -1,67 +1,67 @@ -= Architecture Constraints += Architecture constraints -== Technical Constraints +== Technical constraints |=== |Name |Description |Interoperability -|Trace-X must use EDC together with Catena-X approved data models to guarantee interoperability between participants. +|Trace-X must use the EDC together with Catena-X approved data models to guarantee interoperability between participants. -|Data Sovereignty +|Data sovereignty |Data owners and data consumers have to use usage policies for offering, consuming and therefore transferring data. -|Kubernetes for Container Orchestration -|Catena-X requires the application to run in a Kubernetes environment, deployed via Helm Charts. +|Kubernetes for container orchestration +|Catena-X requires the application to run in a Kubernetes environment, deployed via Helm charts. -|Catena-X UUX Guidance (CX Style Guide) -|Frontend follows Catena-X wide UUX consistency according to CX Style Guide +|Catena-X UUX guidance (CX style guide) +|The frontend of Trace-X follows Catena-X-wide UUX consistency according to the CX style guide. |=== -== Organizational Constraints +== Organizational constraints |=== |Name |Description |Schedule -|Start of development in July 2022. Further development in alignment with the Foundation of the Catena-X Automotive Network e.V. requirements and timeline. +|Start of development in July 2022. Further development in alignment with the foundation of the Catena-X Automotive Network e.V. requirements and timeline. |Process model -|Iterative and incremental. SAFe Framework is used to align with Catena-X services, prerequisites, components and requirements to be Catena-X compatible. +|Iterative and incremental. The SAFe framework is used to align with Catena-X services, prerequisites, components and requirements to be Catena-X compatible. |Catena-X services / requirements |Trace-X needs to be Catena-X compliant and the application has to follow the CX standards as well as interact with the core services and components. -|Release as Open Source -|The source code, at least parts of it, are made available as open source and can be found in Github Catena-X ng as well as in Eclipse Tractus-X. +|Release as open source +|The source code - at least partially - is made available as open source and can be found in Github Catena-X ng as well as in Eclipse Tractus-X. -|Technology Readiness Level (TRL) for Products developed within the CX Consortia +|Technology Readiness Level (TRL) for products developed within the CX consortia |As Trace-X is a reference implementation, the Technology Readiness Level (TRL) must not be above TRL 8. |=== -== Political Constraints +== Political constraints |=== |Name |Description -|Open Source -|FOSS licenses approved be the Eclipse foundation have to be used. +|Open source +|FOSS licenses approved by the Eclipse foundation have to be used. |=== -== Development Conventions +== Development conventions |=== |Name |Description |Architecture documentation -|Architectural documentation of Trace-X reference application in arc42-Template terminology and structure. +|Architectural documentation of Trace-X reference application in arc42-template terminology and structure. |Language |The project language is English to ensure the best possible accessibility for all participants. Therefore, classes, methods etc. are named in English and the documentation is written in English. -|Code Coverage -|More than 80% test coverage of the complete source code +|Test coverage +|More than 80% of the complete source code has to be test covered. |=== diff --git a/docs/src/docs/arc42/building-block-view/blackbox-overall.adoc b/docs/src/docs/arc42/building-block-view/blackbox-overall.adoc index f1206ab823..f16c3c7635 100644 --- a/docs/src/docs/arc42/building-block-view/blackbox-overall.adoc +++ b/docs/src/docs/arc42/building-block-view/blackbox-overall.adoc @@ -13,15 +13,15 @@ include::../../../uml-diagrams/arc42/building-block-view/whitebox_overall.puml[] |Components |Description |IRS -|The IRS consumes relationship information across the CX-Network and builds the graph view. Within this Documentation, the focus lies on the IRS +|The IRS consumes relationship information across the CX-network and builds the graph view. Within this documentation, the focus lies on the IRS. -|EDC Consumer -|The EDC Consumer Component is there to fulfill the GAIA-X and IDSA-data sovereignty principles. The EDC Consumer consists out of a control plane and a data plane. +|EDC consumer +|The EDC consumer component is there to fulfill the GAIA-X and IDSA-data sovereignty principles. The EDC consumer consists out of a control plane and a data plane. -|EDC Provider -|The EDC Provider Component connects with EDC Consumer component and forms the endpoint for the actual exchange of data. It handles automatic contract negotiation and the subsequent exchange of data assets for connected applications. +|EDC provider +|The EDC provider component connects with EDC consumer component and forms the endpoint for the actual exchange of data. It handles automatic contract negotiation and the subsequent exchange of data assets for connected applications. -|Submodel Server -|The Submodel Server offers endpoints for requesting the Submodel aspects. +|Submodel server +|The submodel server offers endpoints for requesting the submodel aspects. |=== diff --git a/docs/src/docs/arc42/building-block-view/level-1.adoc b/docs/src/docs/arc42/building-block-view/level-1.adoc index 4cba2f908a..f30aeee10f 100644 --- a/docs/src/docs/arc42/building-block-view/level-1.adoc +++ b/docs/src/docs/arc42/building-block-view/level-1.adoc @@ -13,22 +13,22 @@ include::../../../uml-diagrams/arc42/building-block-view/building-block-view.pum |Components |Description |*Trace-X* -|Trace-X is a system allowing the user to review the parts/assets catalogue, start a quality investigations and receive quality alerts +|*Trace-X* is a system allowing the user to review the parts/assets catalogue, start a quality investigations and receive quality alerts. |*Trace-X API* -|The *Trace-X API* is the Interface over which the Data Consumer is communicating. +|The *Trace-X API* is the interface over which the data consumer is communicating. |*AssetsController* -|The *AssetsController* provides a REST Interface for retrieving the parts/assets information. +|The *AssetsController* provides a REST interface for retrieving the parts/assets information. |*DashboardController* -|The *DashboardController* provides a REST Interface for retrieving overall statistics displayed on a dashboard screen. +|The *DashboardController* provides a REST interface for retrieving overall statistics displayed on a dashboard screen. |*RegistryController* -|The *RegistryController* provides a REST Interface for retrieving the data from parts registry. +|The *RegistryController* provides a REST interface for retrieving the data from parts registry. |*ImportController* -|The *ImportController* provides a REST Interface for importing assets and publishing them in the Catena-X network. +|The *ImportController* provides a REST interface for importing assets and publishing them in the Catena-X network. |*AssetRepository* |The *AssetRepository* is a component responsible for storing and getting assets from database. @@ -37,9 +37,9 @@ include::../../../uml-diagrams/arc42/building-block-view/building-block-view.pum |The *BPNRepository* is a component which stores BPN -> company name mappings. |*NotificationsRepository* -|The *NotificationsRepository* is a component responsible for storing and holding status of sent/received notifications +|The *NotificationsRepository* is a component responsible for storing and holding status of sent/received notifications. |*Database* -|Place for storing assets, relations as well as sent/received notifications +|The *database* is a place for storing assets, relations as well as sent/received notifications. |=== diff --git a/docs/src/docs/arc42/cross-cutting/architecture-design-patterns.adoc b/docs/src/docs/arc42/cross-cutting/architecture-design-patterns.adoc index 005076459d..1031159bd4 100644 --- a/docs/src/docs/arc42/cross-cutting/architecture-design-patterns.adoc +++ b/docs/src/docs/arc42/cross-cutting/architecture-design-patterns.adoc @@ -1,23 +1,23 @@ = Architecture and design patterns -== Module / Package structure +== Module / package structure * Main domain name -** application -*** optional: subdomain name (in case of inheritance) → following same structure as main domain -*** mapper: holds the mapper of transforming domain models to response models -*** service: holds the interface for implementation in the domain package -*** rest: holds the controller for providing the api for the domain -** domain -*** optional: subdomain name (in case of inheritance) -*** model: holds the domain model -*** service: Implementation of the interface provided in the application package -*** repository: holds the interface for accessing the infrastructure package -** infrastructure -*** optional: subdomain name (in case of inheritance) -*** model: holds the technical entities -*** repository: holds the data access layer -**** e.g. JPARepository / Impl -** All models (Request / Response) used in the API should be saved in the tx-model project. +** Application +*** Optional: subdomain name (in case of inheritance) → following same structure as main domain +*** Mapper: holds the mapper of transforming domain models to response models +*** Service: holds the interface for implementation in the domain package +*** REST: holds the controller for providing the api for the domain +** Domain +*** Optional: subdomain name (in case of inheritance) +*** Model: holds the domain model +*** Service: implementation of the interface provided in the application package +*** Repository: holds the interface for accessing the infrastructure package +** Infrastructure +*** Optional: subdomain name (in case of inheritance) +*** Model: holds the technical entities +*** Repository: holds the data access layer +**** E.g. JPARepository / Impl +** All models (request / response) used in the API should be saved in the tx-model project. To be reusable for cucumber testing. diff --git a/docs/src/docs/arc42/cross-cutting/development-concepts.adoc b/docs/src/docs/arc42/cross-cutting/development-concepts.adoc index aac92ff993..f5d5d55e65 100644 --- a/docs/src/docs/arc42/cross-cutting/development-concepts.adoc +++ b/docs/src/docs/arc42/cross-cutting/development-concepts.adoc @@ -2,27 +2,27 @@ == Build, test, deploy -TraceX is built using Maven and utilizes all the standard concepts of it. +Trace-X is built using Maven and utilizes all the standard concepts of it. Test execution is part of the build process and a minimum test coverage of 80% is enforced. The project setup contains a multi-module Maven build. -Commonly used classes (like the TraceX data model) should be extracted into a separate submodule and reused across the project. +Commonly used classes (like the Trace-X data model) should be extracted into a separate submodule and reused across the project. However, this is not a "one-size-fits-all" solution. New submodules should be created with care and require a review by the team. -The Maven build alone only leads up to the JAR artifact of TraceX. -Do create Docker images, the Docker build feature is used. +The Maven build alone only leads up to the JAR artifact of Trace-X. +To create Docker images, the Docker build feature is used. This copies all resources into a builder image, builds the software and creates a final Docker image at the end that can then be deployed. Although the Docker image can be deployed in various ways, the standard solution are the provided Helm charts, which describe the required components as well. == Code generation -There are two methods of code generation in TraceX: +There are two methods of code generation in Trace-X: === Lombok -The Lombok library is heavily used to generate boilerplate code (like Constructors, Getters, Setters, Builders...). +The Lombok library is heavily used to generate boilerplate code (like constructors, getters, setters, builders...). This way, code can be written faster and this boilerplate code is excluded from test coverage, which keeps the test base lean. === Swagger / OpenAPI @@ -38,24 +38,28 @@ Data migration is handled by flyway. == Configurability -TraceX utilizes the configuration mechanism provided by Spring Boot. +Trace-X utilizes the configuration mechanism provided by Spring Boot. Configuration properties can be defined in the file `+src/main/resources/application.yml+` Other profiles should be avoided. Instead, the configuration can be overwritten using Spring's external configuration mechanism (see https://docs.spring.io/spring-boot/docs/2.1.9.RELEASE/reference/html/boot-features-external-config.html). -The operator must have total control over the configuration of TraceX. +The operator must have total control over the configuration of Trace-X. -== Java Style Guide +== Java style guide We generally follow the link:https://google.github.io/styleguide/javaguide.html[Google Java Style Guide]. -== API Guide +== API guide -We generally follow the https://swagger.io/specification/ +We generally follow the link:https://swagger.io/specification/[OpenAPI Specification]. -== Unit and Functional Testing +== Docomentation style guide -=== General Unit testing +We generally follow the link:https://developers.google.com/style[Google developer documentation style guide]. + +== Unit and functional testing + +=== General unit testing * Code coverage >= 80% * Writing methods which provide a response to be better testable (avoid void if feasible). @@ -68,38 +72,38 @@ E.g: image::https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/given_when_then_pattern.png[] -=== Integration Testing +=== Integration testing -Each public api should have at least two integration tests (positive / negative). +Each public API should have at least two integration tests (positive / negative). For integration testing, the `+tx-backend/src/main/resources/application-integration.yml+` is used. Additionally, you need to have a local Docker environment running. For this, we recommend link:https://rancherdesktop.io/[Rancher Dektop]. -== Clean Code +== Clean code We follow the rules and behaviour of: https://clean-code-developer.com/. -== Secure Coding standards +== Secure coding standards -As there is no other guideline of C-X, we fix any Vulnerabilities, Exposures, Flaw detected by one of our SAST, DAST, Pentesting tools which is higher than "Very Low". +As there is no other guideline of C-X, we fix any vulnerabilities, exposures, flaw detected by one of our SAST, DAST, Pentesting tools which is higher than "Very Low". image::https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/vulnerability_level.png[] -== TRACE-X Technical class responsibilities +== Trace-X technical class responsibilities -=== Controllers +=== Controller -* Have only one dependency to a facade or a service or a validator annotation -* Have no own logic -* Including the swagger documentation annotations -* For each controller exists and Integration Test class +* Has only one dependency to a facade or a service or a validator annotation +* Has no own logic +* Includes the swagger documentation annotations +* Has an integration test class * Uses a static mapper to transform a domain model into the response model * Returns a ResponseEntity === Response object * Should be a public version of the domain object -* It is a result of the transformation which will be done in the facade +* Is a result of the transformation which will be done in the facade * Is not necessary if the domain object can be fully public * Is not allowed to be implemented in a repository or a DAO @@ -113,27 +117,27 @@ image::https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main * Responsible for retrieving data from storage * Performs business logic * Can be a http client -* Returns a jpaEntity → Domain Object +* Returns a jpaEntity → domain object * Should only be implemented in a controller through an interface === Repository -* Represents an interface to the underlying repository implementation which uses then the spring repository +* Represents an interface to the underlying repository implementation which then uses the spring repository -=== Domain Object +=== Domain object -* Mapped from an entity or external data received -* Will be used as working model until it will be finally transformed to a response object or another domain which will be later on persisted +* Mapped from an entity or from received external data +* Will be used as a working model until it will finally be transformed to a response object or another domain which will be persisted later on -=== Config Object +=== Config object -* Should have the suffix Config at the end of the class -* Including beans which are automatically created by app startup +* Should have the suffix .config at the end of the class +* Includes beans which are automatically created by app startup === Constructing objects * Using builder pattern -** Currently we are using the constructor to create objects in our application. -Main reason is probably to provide immutable objects. -** As the handling with big loaded constructors is not easy and error prune, I would recommend using the builder pattern to have a clear understanding about what we creating at the point of implementation. +** Currently, we are using the constructor to create objects in our application. +Main reason is to provide immutable objects. +** As the handling with big loaded constructors is not easy and error prone, it's recommended to use the builder pattern to have a clear understanding about what we are creating at the point of implementation. * Using lombok for annotation processing diff --git a/docs/src/docs/arc42/cross-cutting/domain-concepts.adoc b/docs/src/docs/arc42/cross-cutting/domain-concepts.adoc index 7fb3821fa6..e2e9685c61 100644 --- a/docs/src/docs/arc42/cross-cutting/domain-concepts.adoc +++ b/docs/src/docs/arc42/cross-cutting/domain-concepts.adoc @@ -1,10 +1,10 @@ = Domain concepts -== API Model +== API model For detailed information about the API model, please refer to the link:https://catenax-ng.github.io/tx-traceability-foss/docs/api-specification/api-specification.html[API specification]. -== Domain Models +== Domain models === Assets [plantuml, target=level-1, format=svg] @@ -12,7 +12,7 @@ For detailed information about the API model, please refer to the link:https://c include::../../../uml-diagrams/arc42/cross-cutting/domain-model/domain-model.puml[] .... -=== Quality Notifications +=== Quality notifications [plantuml, target=level-2, format=svg] .... include::../../../uml-diagrams/arc42/cross-cutting/domain-model/domain-model-quality-notifications.puml[] diff --git a/docs/src/docs/arc42/cross-cutting/entity-relationship-model.adoc b/docs/src/docs/arc42/cross-cutting/entity-relationship-model.adoc index bfa0ae5164..598f55935e 100644 --- a/docs/src/docs/arc42/cross-cutting/entity-relationship-model.adoc +++ b/docs/src/docs/arc42/cross-cutting/entity-relationship-model.adoc @@ -1,6 +1,6 @@ -= Entity Relationship Model += Entity-relationship model -Please be informed that the 'as-planned' version currently lacks the database relations. However, kindly maintain the Entity-Relationship Model (ERM) in its current state. +Please be informed that the 'as-planned' version currently lacks the database relations. However, kindly maintain the Entity-relationship model (ERM) in its current state. [plantuml, format=svg] .... diff --git a/docs/src/docs/arc42/cross-cutting/index.adoc b/docs/src/docs/arc42/cross-cutting/index.adoc index b99c8aaf7e..9efe86b982 100644 --- a/docs/src/docs/arc42/cross-cutting/index.adoc +++ b/docs/src/docs/arc42/cross-cutting/index.adoc @@ -1,6 +1,6 @@ = Cross-cutting concepts -- xref:entity-relationship-model.adoc[Entity Relationship Model] +- xref:entity-relationship-model.adoc[Entity-relationship model] - xref:domain-concepts.adoc[Domain concepts] - xref:safety-security.adoc[Safety and security concepts] - xref:architecture-design-patterns.adoc[Architecture and design patterns] diff --git a/docs/src/docs/arc42/cross-cutting/operational-concepts.adoc b/docs/src/docs/arc42/cross-cutting/operational-concepts.adoc index 8e026b9c91..4c541ecf70 100644 --- a/docs/src/docs/arc42/cross-cutting/operational-concepts.adoc +++ b/docs/src/docs/arc42/cross-cutting/operational-concepts.adoc @@ -4,27 +4,27 @@ === Configuration -TraceX can be configured using two mechanisms: +Trace-X can be configured using two mechanisms: ==== application.yml -If you build TraceX yourself, you can modify the application.yml config that is shipped with TraceX. +If you build Trace-X yourself, you can modify the application.yml config that is shipped with Trace-X. This file contains all possible config entries for the application. Once the Docker image has been built, these values can only be overwritten using the Spring external config mechanism (see https://docs.spring.io/spring-boot/docs/2.1.9.RELEASE/reference/html/boot-features-external-config.html), e.g. by mounting a config file in the right path or using environment variables. -==== Helm Chart +==== Helm chart -The most relevant config properties are exposed as environment variables and must be set in the Helm chart so the application can run at all. -Check the TraceX Helm chart in Git for all available variables. +The most relevant config properties are exposed as environment variables and must be set in the Helm chart for the application to be able to run. +Check the Trace-X Helm chart in Git for all available variables. == Scaling -If the number of consumers raises, TraceX can be scaled up by using more resources for the Deployment Pod. -Those resources can be used to utilize more parallel threads to handle Job execution. +If the number of consumers rises, Trace-X can be scaled up by using more resources for the deployment pod. +Those resources can be used to utilize more parallel threads to handle job execution. == Clustering -TraceX can run in clustered mode, as each running job is only present in one pod at a time. +Trace-X can run in clustered mode, as each running job is only present in one pod at a time. Note: as soon as a resume feature is implemented, this needs to be addressed here. == Logging @@ -33,4 +33,4 @@ Logs are being written directly to stdout and are picked up by the cluster manag == Monitoring -Currently, there is on monitoring supported in TraceX. +Currently, there is on monitoring supported in Trace-X. diff --git a/docs/src/docs/arc42/cross-cutting/safety-security.adoc b/docs/src/docs/arc42/cross-cutting/safety-security.adoc index afe3c3c281..0393613223 100644 --- a/docs/src/docs/arc42/cross-cutting/safety-security.adoc +++ b/docs/src/docs/arc42/cross-cutting/safety-security.adoc @@ -1,12 +1,12 @@ = Safety and security concepts -== Authentication / Authorization +== Authentication / authorization === Trace-X API -The Trace-X is secured using OAuth2.0 / Open ID Connect. +The Trace-X API is secured using OAuth2.0 / Open ID Connect. Every request to the Trace-X API requires a valid bearer token. -JWT token should also contain two claims: +The JWT token should also contain two claims: - 'bpn' which is equal to the configuration value from `API_ALLOWED_BPN` property - 'resource_access' with the specific key for C-X environments. @@ -18,7 +18,7 @@ You can have a look at the https://github.com/eclipse-tractusx/traceability-foss === Trace-X as EDC client The Trace-X accesses the Catena-X network via the EDC consumer connector. -This component requires authentication via a Verifiable Credential (VC), which is provided to the EDC via the Managed Identity Wallet. +This component requires authentication via a Verifiable Credential (VC), which is provided to the EDC via the managed identity wallet. The VC identifies and authenticates the EDC and is used to acquire access permissions for the data transferred via EDC. diff --git a/docs/src/docs/arc42/cross-cutting/under-the-hood.adoc b/docs/src/docs/arc42/cross-cutting/under-the-hood.adoc index e85bdac224..8ebcbe7445 100644 --- a/docs/src/docs/arc42/cross-cutting/under-the-hood.adoc +++ b/docs/src/docs/arc42/cross-cutting/under-the-hood.adoc @@ -2,14 +2,14 @@ == Exception and error handling -There are two types of potential errors in TraceX: +There are two types of potential errors in Trace-X: === Technical errors Technical errors occur when there is a problem with the application itself, its configuration or directly connected infrastructure, e.g. the Postgres database. Usually, the application cannot solve these problems by itself and requires some external support (manual work or automated recovery mechanisms, e.g. Kubernetes liveness probes). -These errors are printed mainly to the application log and are relevant for the healthchecks. +These errors are printed mainly to the application log and are relevant for the health-checks. === Functional errors @@ -32,7 +32,7 @@ Of course, when using only RuntimeExceptions, this is not necessary - but those ==== Central fallback exception handler -There will always be some exception that cannot be handled inside of the code correctly - or it may just have been unforeseen. +There will always be some exception that cannot be handled inside the code correctly - or it may just have been unforeseen. A central fallback exception handler is required so all problems are visible in the log and the API always returns meaningful responses. In some cases, this is as simple as a HTTP 500. diff --git a/docs/src/docs/arc42/full.adoc b/docs/src/docs/arc42/full.adoc index 127b083077..66848a6c3e 100644 --- a/docs/src/docs/arc42/full.adoc +++ b/docs/src/docs/arc42/full.adoc @@ -1,6 +1,6 @@ = Architecture documentation (arc42) -## Notice +== Notice This work is licensed under the [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0). diff --git a/docs/src/docs/arc42/glossary.adoc b/docs/src/docs/arc42/glossary.adoc index 4aa9d33f6c..ed607f07d6 100644 --- a/docs/src/docs/arc42/glossary.adoc +++ b/docs/src/docs/arc42/glossary.adoc @@ -4,10 +4,10 @@ |Term |Description |Aspect -|Collection of various aspects from the Digital Twin. An aspect can, for example, bundle all information about a specific part. +|Collection of various aspects from the digital twin. An aspect can, for example, bundle all information about a specific part. |AAS -|**A**sset **A**dministration **S**hell (Industry 4.0). Is the implementation of the digital twin for Industry 4.0 and enables interoperability between different companies. +|**A**sset **A**dministration **S**hell (Industry 4.0) is the implementation of the digital twin for Industry 4.0 and enables interoperability between different companies. |BoM |**B**ill **o**f **M**aterial. BoM is a list of parts and materials that a product contains. Without them, manufacturing would not be possible. @@ -19,7 +19,7 @@ |Bill of material lifecycle of the planned entity |BPN -|**B**usiness **P**artner **N**umber. A BPN is used to identify a partner in the Catena-X network +|**B**usiness **P**artner **N**umber. A BPN is used to identify a partner in the Catena-X network. |CX |Abbreviation for Catena-X @@ -43,7 +43,7 @@ |**S**mall / **M**edium **E**nterprise |Trace-X -|Proper name of open-source software application of Catena-X Use Case Traceability +|Proper name of open-source software application of Catena-X use case traceability |UI |**U**ser **I**nterface diff --git a/docs/src/docs/arc42/introduction-goals/quality-goals.adoc b/docs/src/docs/arc42/introduction-goals/quality-goals.adoc index 1d770974ad..77a856dd76 100644 --- a/docs/src/docs/arc42/introduction-goals/quality-goals.adoc +++ b/docs/src/docs/arc42/introduction-goals/quality-goals.adoc @@ -5,17 +5,17 @@ The following table entries define overall Trace-X quality goals. The order of t |=== |Quality goal |Motivation and description -|Running reference application for Catena-X Traceability +|Running reference application for Catena-X traceability |Consume traceability data, visualize it in a state-of-the-art frontend to the user and enable the exchange of notifications. |Accessible and easy to use |Enable SMEs to large enterprises. |Cloud agnostic solution -|Trace-X is built as reference architecture and able to be run on different cloud solutions. It uses Helm, i.e. Helm charts, so that it can easily be deployed on different systems. +|Trace-X is built as a reference architecture and able to be run on different cloud solutions. It uses Helm, i.e. Helm charts, so that it can easily be deployed on different systems. |Trustworthy application -|Use the Catena-X standards as a basis to fulfill the interoperability (with commercial as well as other solutions) and data sovereignty requirements. +|Trace-X uses the Catena-X standards as a basis to fulfill the interoperability (with commercial as well as other solutions) and data sovereignty requirements. |Application reliability |The Trace-X architecture is set up so that provided part tree structures are consumed, aggregated and utilized to enable quality related actions such as notifications along the supply chain on which the costumers can rely. diff --git a/docs/src/docs/arc42/introduction-goals/requirements.adoc b/docs/src/docs/arc42/introduction-goals/requirements.adoc index 2b9b7ec4df..3d57204589 100644 --- a/docs/src/docs/arc42/introduction-goals/requirements.adoc +++ b/docs/src/docs/arc42/introduction-goals/requirements.adoc @@ -1,7 +1,7 @@ = Requirements overview == What is the purpose of the Trace-X application -* Empower all companies from SMEs to large OEMs to participate in parts traceability with an Open-Source solution to easily take part in Catena-X Traceability Use Case. +* Empower all companies from SMEs to large OEMs to participate in parts traceability with an open-source solution to easily take part in the Catena-X traceability use case. * It is a standalone application which can be self-hosted. * Display the relations of the automotive value chain based on a standardized IT model. * Overview and transparency across the supplier network enable faster intervention based on recorded events in the supply chain. @@ -11,9 +11,9 @@ * List, view and publish manufactured parts based on BoM AsBuild * List, view and publish planned parts based on BoM AsPlanned * Filter and search functionality on part views -* Show detailed information on manufactured parts from AAS description assets and Aspects -* Uses Submodels SerialPart, AssemblyPartRelationship and Batch -* List and view Supplier parts (AssemblyPartRelationship) based on BoM AsBuild lifecycle +* Show detailed information on manufactured parts from AAS description assets and aspects +* Uses submodels SerialPart, AssemblyPartRelationship and Batch +* List and view supplier parts (AssemblyPartRelationship) based on BoM AsBuild lifecycle * View parts and parts relations in a visualized parts tree * Send and receive top-down notifications (quality investigations) along the supply chain -* Compliance with Catena-X Guidelines +* Compliance with Catena-X guidelines diff --git a/docs/src/docs/arc42/introduction-goals/stakeholder.adoc b/docs/src/docs/arc42/introduction-goals/stakeholder.adoc index 302544e00e..0c73f9bc79 100644 --- a/docs/src/docs/arc42/introduction-goals/stakeholder.adoc +++ b/docs/src/docs/arc42/introduction-goals/stakeholder.adoc @@ -5,18 +5,18 @@ The following table presents the stakeholders of Trace-X and their respective in |=== |Who |Matters and concern -a|Software Developer a|* Make an impact on Catena-X by participating in open-source software. +a|Software developer a|* Make an impact on Catena-X by participating in open-source software. * Example implementation for own use cases and applications. -a|Operating Environments a|* Use Trace-X as a basis for industrialization. +a|Operating environments a|* Use Trace-X as a basis for industrialization. * Example implementation for own business applications, further features and fast ramp up. -|Catena-X Partners -a|* Take part in Traceability Use Case. +|Catena-X partners +a|* Take part in traceability use case. * See relationships in the value chain. * React on quality issues with standardized actions and notifications. -|Larger OEMs / Tiers +|Larger OEMs / tiers a|* Want to use this implementation for further development and integration into their system landscape. |SMEs diff --git a/docs/src/docs/arc42/quality/quality-scenarios.adoc b/docs/src/docs/arc42/quality/quality-scenarios.adoc index 194807350f..88d47bf973 100644 --- a/docs/src/docs/arc42/quality/quality-scenarios.adoc +++ b/docs/src/docs/arc42/quality/quality-scenarios.adoc @@ -6,25 +6,25 @@ The initial letters of the scenario identifiers (IDs) in the following table eac |ID |Scenario |M01 -|A developer with basic knowledge of the Traceability Use Case looks for an introduction to the Traceability architecture. He or she gets the idea of essential design very fast. +|A developer with basic knowledge of the traceability use case looks for an introduction to the traceability architecture. He or she gets the idea of essential design very fast. |M02 -|A senior developer looks for a reference implementation of the Traceability Use case functionalities. He or she gets it within the source code. +|A senior developer looks for a reference implementation of the traceability use case functionalities. He or she gets it within the source code. |M03 |A developer wants to implement new features. He or she is able to add it to the source code easily. |M04 -|A developer wants to implement a new Frontend or change some components. The efforts can be reduced by using the standardized API endpoints to do so. +|A developer wants to implement a new frontend or change some components. The efforts can be reduced by using the standardized API endpoints to do so. |I01 -|An user wants to switch from FOSS application to a COTS application or the other way round. This is possible since the application is interoperable with other applications within the CX network. +|A user wants to switch from FOSS application to a COTS application or the other way round. This is possible since the application is interoperable with other applications within the CX network. |F01 |The application uses the Catena-X standards to ensure the correct interoperability and exchange with other participants. |F02 -|An OEM or Tier n supplier needs more information regarding specific parts. He can mark the parts in question and send a top-down notification (Quality Investigation) to the next entity / the partner. +|An OEM or tier n supplier needs more information regarding specific parts. He can mark the parts in question and send a top-down notification (quality investigation) to the next entity / the partner. |F03 |A company wants to have more transparency and a visualized status of the supply / value chain. By using the application they are enabled to work with the structures and enable new features / functionalities. diff --git a/docs/src/docs/arc42/runtime-view/assets/return-all-assets.adoc b/docs/src/docs/arc42/runtime-view/assets/return-all-assets.adoc index 9e71b73573..2344c1e540 100644 --- a/docs/src/docs/arc42/runtime-view/assets/return-all-assets.adoc +++ b/docs/src/docs/arc42/runtime-view/assets/return-all-assets.adoc @@ -1,4 +1,4 @@ -= Scenario 1: Return Assets += Scenario 1: Return assets This section describes what happens when user lists stored assets. In this example, the user requests as built assets. @@ -11,7 +11,7 @@ include::../../../../uml-diagrams/arc42/runtime-view/assets/return-all-assets.pu == Overview -When a user requests stored assets, TraceX-FOSS checks if the user has an adequate role ('ROLE_ADMIN', 'ROLE_SUPERVISOR', 'ROLE_USER'). +When a user requests stored assets, Trace-X checks if the user has an adequate role ('ROLE_ADMIN', 'ROLE_SUPERVISOR', 'ROLE_USER'). If yes, then the endpoint returns a pageable result of assets. The returned pageable result can be empty if no suitable asset has been found. diff --git a/docs/src/docs/arc42/runtime-view/assets/return-specific-assets.adoc b/docs/src/docs/arc42/runtime-view/assets/return-specific-assets.adoc index 10511620d6..272accc053 100644 --- a/docs/src/docs/arc42/runtime-view/assets/return-specific-assets.adoc +++ b/docs/src/docs/arc42/runtime-view/assets/return-specific-assets.adoc @@ -1,4 +1,4 @@ -= Scenario 2: Return specific Assets += Scenario 2: Return specific assets This section describes what happens when user searches for a specific asset. This example shows the request of one as built asset. @@ -11,6 +11,6 @@ include::../../../../uml-diagrams/arc42/runtime-view/assets/return-specific-asse == Overview -When a user requests a specific asset, TraceX-FOSS checks if the user has an adequate role ('ROLE_ADMIN', 'ROLE_SUPERVISOR', 'ROLE_USER'). If yes, then the endpoint returns a precise Asset for the given assetId, if it is found. +When a user requests a specific asset, Trace-X checks if the user has an adequate role ('ROLE_ADMIN', 'ROLE_SUPERVISOR', 'ROLE_USER'). If yes, then the endpoint returns a precise asset for the given assetId, if it is found. If no asset has been found for the given ID, an AssetNotFoundException is thrown. diff --git a/docs/src/docs/arc42/runtime-view/data-consumption.adoc b/docs/src/docs/arc42/runtime-view/data-consumption.adoc index 764923ec18..5fc7540f9b 100644 --- a/docs/src/docs/arc42/runtime-view/data-consumption.adoc +++ b/docs/src/docs/arc42/runtime-view/data-consumption.adoc @@ -9,5 +9,5 @@ include::../../../uml-diagrams/arc42/runtime-view/data-consumption-process.puml[ == Overview -Data is fetched by a Trace-X instance using Digital Twin Registry (DTR), Item Relationship Service (IRS) and Trace-X Consumer EDC. Data has to be provided to the Catena-X network using a EDC Provider, since Trace-X is not a data provider and therefore no possibility for data provisioning with Trace-X exists. +Data is fetched by a Trace-X instance using Digital Twin Registry (DTR), Item Relationship Service (IRS) and Trace-X consumer EDC. For digital twins the Asset Administration Shell (AAS) standard is used. For fetching data with Trace-X, a Digital Twin Registry and an IRS instance are required. Data should represent parts, supplier and customer parts, parts tree / parts relations. diff --git a/docs/src/docs/arc42/runtime-view/data-provisioning.adoc b/docs/src/docs/arc42/runtime-view/data-provisioning.adoc index 01198ad925..ef9321e8e1 100644 --- a/docs/src/docs/arc42/runtime-view/data-provisioning.adoc +++ b/docs/src/docs/arc42/runtime-view/data-provisioning.adoc @@ -1,10 +1,10 @@ = Data Provisioning -This sequence diagrams describes the process of importing data from a Trace-X Dataformat +This sequence diagrams describes the process of importing data from a Trace-X dataformat -== Modul 1 +== Module 1 -Data will be imported by the Trace-X Frontend into Trace-X backend and will be persisted as asset by a Trace-X instance in a transient state. +Data will be imported by the Trace-X frontend into the Trace-X backend and will be persisted as an asset in a transient state. The raw data which is needed for the shared services (DTR / EDC) will be persisted as well. [plantuml, target=business-context_data_provisioning_1, format=svg] @@ -13,9 +13,9 @@ The raw data which is needed for the shared services (DTR / EDC) will be persist include::../../../uml-diagrams/arc42/runtime-view/data-provisioning/trace-x-data-import-interface-modul1-sequence.puml[] .... -== Modul 2 +== Module 2 -The frontend is able to select assets and publish / syncronize them with the shared services. DTR / EDC / Submodel API. +The frontend is able to select assets and publish / synchronize them with the shared services. DTR / EDC / submodel API. [plantuml, target=business-context_data_provisioning_2, format=svg] .... @@ -23,7 +23,7 @@ The frontend is able to select assets and publish / syncronize them with the sha include::../../../uml-diagrams/arc42/runtime-view/data-provisioning/trace-x-data-import-interface-modul2-sequence.puml[] .... -== Modul 3 +== Module 3 The backend is able to persist the data in the DTR / EDC and allows to use IRS for resolving assets. diff --git a/docs/src/docs/arc42/runtime-view/data-provisioning/publish-assets-error.adoc b/docs/src/docs/arc42/runtime-view/data-provisioning/publish-assets-error.adoc index cbdca45d89..94393d2c85 100644 --- a/docs/src/docs/arc42/runtime-view/data-provisioning/publish-assets-error.adoc +++ b/docs/src/docs/arc42/runtime-view/data-provisioning/publish-assets-error.adoc @@ -1,6 +1,6 @@ -= Scenario 3: Publish assets Error on EDC or DTR += Scenario 3: Publish assets - error on EDC or DTR -This section describes user interaction when publishing assets fails due to EDC or DTR error ( for example services are unavailable ) +This section describes user interaction when publishing assets fails due to EDC or DTR error (for example when the services are unavailable). [plantuml,target=publish-assets-error,format=svg] .... @@ -9,6 +9,6 @@ include::../../../../uml-diagrams/arc42/runtime-view/data-provisioning/publish-a == Overview -When a user publishes assets, TraceX-FOSS checks if the user has an adequate role ('ROLE_ADMIN'). -If yes, then endpoint starts to publish assets to network. -If any of required Services are not available or returns Error response upon executing flow assets are set to ERROR state and user can retry publishing them at any time when services are available +When a user publishes assets, Trace-X checks if the user has an adequate role ('ROLE_ADMIN'). +If yes, then the endpoint starts to publish assets to network. +If any of required services are not available or return an error response upon executing, flow assets are set to ERROR state and the user can retry publishing them at any time when services are available again. diff --git a/docs/src/docs/arc42/runtime-view/data-provisioning/publish-assets.adoc b/docs/src/docs/arc42/runtime-view/data-provisioning/publish-assets.adoc index cbfe6e61bf..c7f9ba54bd 100644 --- a/docs/src/docs/arc42/runtime-view/data-provisioning/publish-assets.adoc +++ b/docs/src/docs/arc42/runtime-view/data-provisioning/publish-assets.adoc @@ -9,5 +9,5 @@ include::../../../../uml-diagrams/arc42/runtime-view/data-provisioning/publish-a == Overview -When a user publishes assets, TraceX-FOSS checks if the user has an adequate role ('ROLE_ADMIN'). -If yes, then endpoint starts to publish assets to network. +When a user publishes assets, Trace-X checks if the user has an adequate role ('ROLE_ADMIN'). +If yes, then the endpoint starts to publish assets to network. diff --git a/docs/src/docs/arc42/runtime-view/data-provisioning/return-import-report.adoc b/docs/src/docs/arc42/runtime-view/data-provisioning/return-import-report.adoc index 963167b393..ee9f75b6be 100644 --- a/docs/src/docs/arc42/runtime-view/data-provisioning/return-import-report.adoc +++ b/docs/src/docs/arc42/runtime-view/data-provisioning/return-import-report.adoc @@ -10,7 +10,7 @@ include::../../../../uml-diagrams/arc42/runtime-view/data-provisioning/import-re == Overview -When a user requests an import report, TraceX-FOSS checks if the user has an adequate role ('ROLE_ADMIN', 'ROLE_SUPERVISOR'). +When a user requests an import report, Trace-X checks if the user has an adequate role ('ROLE_ADMIN', 'ROLE_SUPERVISOR'). If yes, then the endpoint returns an import report to the given importJobId. If the importJobId is not known to Trace-X, an HTTP 404 error is returned. diff --git a/docs/src/docs/arc42/runtime-view/data-sovereignty.adoc b/docs/src/docs/arc42/runtime-view/data-sovereignty.adoc index 3b4322d696..761f08fe31 100644 --- a/docs/src/docs/arc42/runtime-view/data-sovereignty.adoc +++ b/docs/src/docs/arc42/runtime-view/data-sovereignty.adoc @@ -1,3 +1,3 @@ -= Data Souvereignty += Data sovereignty include::data-sovereignty/return_asset_contracts.adoc[leveloffset=+1] diff --git a/docs/src/docs/arc42/runtime-view/data-sovereignty/return_asset_contracts.adoc b/docs/src/docs/arc42/runtime-view/data-sovereignty/return_asset_contracts.adoc index 078651a62a..8eeeaaeeda 100644 --- a/docs/src/docs/arc42/runtime-view/data-sovereignty/return_asset_contracts.adoc +++ b/docs/src/docs/arc42/runtime-view/data-sovereignty/return_asset_contracts.adoc @@ -1,4 +1,4 @@ -= Scenario 1: Return Asset Contract Agreements += Scenario 1: Return asset contract agreements This section describes functionality and the behavior in case a user requests contract agreements from Trace-X via the Trace-X contracts API (/contracts). diff --git a/docs/src/docs/arc42/runtime-view/full.adoc b/docs/src/docs/arc42/runtime-view/full.adoc index 3eab259c87..e020d2eae4 100644 --- a/docs/src/docs/arc42/runtime-view/full.adoc +++ b/docs/src/docs/arc42/runtime-view/full.adoc @@ -1,6 +1,6 @@ = Runtime view -This section describes the different functionalities of TraceX-FOSS application +This section describes the different functionalities of Trace-X application. include::assets.adoc[leveloffset=+1] include::notifications.adoc[leveloffset=+1] diff --git a/docs/src/docs/arc42/runtime-view/notifications/quality-investigation-receive.adoc b/docs/src/docs/arc42/runtime-view/notifications/quality-investigation-receive.adoc index 5c0bb02a2c..58b9a4b3a1 100644 --- a/docs/src/docs/arc42/runtime-view/notifications/quality-investigation-receive.adoc +++ b/docs/src/docs/arc42/runtime-view/notifications/quality-investigation-receive.adoc @@ -1,6 +1,6 @@ -= Receive Quality Notification += Receive quality notification -This sequence diagram describes the process of receiving a quality notification from another Traceability partner. +This sequence diagram describes the process of receiving a quality notification from another traceability partner. [plantuml, target=business-context_quality-investigation, format=svg] .... @@ -18,4 +18,4 @@ To enable receiving a notification by a partner you need to Trace-X implements a functionality to create the assets and their corresponding policies in the admin panel. -With the notification asset is possible to enable EDC contract negotiation and EDC data transfer based on access policies defined. Only if the sender is able to browse the asset in the catalog offer and perform a successful contract negotiation there will be the possibility to push a notification to the specified http endpoint on the receiver side. +With the notification asset it is possible to enable EDC contract negotiation and EDC data transfer based on access policies defined. Only if the sender is able to find the asset in the catalog offer and perform a successful contract negotiation there will be the possibility to push a notification to the specified http endpoint on the receiver side. diff --git a/docs/src/docs/arc42/runtime-view/notifications/quality-investigation-send.adoc b/docs/src/docs/arc42/runtime-view/notifications/quality-investigation-send.adoc index fbeec29fb0..43cd666bd7 100644 --- a/docs/src/docs/arc42/runtime-view/notifications/quality-investigation-send.adoc +++ b/docs/src/docs/arc42/runtime-view/notifications/quality-investigation-send.adoc @@ -1,6 +1,6 @@ -= Send Quality Notification += Send quality notification -This sequence diagram describes the process of sending a quality notification between Traceability applications. +This sequence diagram describes the process of sending a quality notification between traceability applications. [plantuml, target=business-context_quality-investigation_send, format=svg] .... @@ -16,6 +16,6 @@ To enable sending respective more precisely receiving a notification by a partne * Create EDC usage policies * Create EDC contract definitions -Trace-X implements a functionality to create the assets and their corresponding policies in the admin panel. With the notification asset is possible to enable EDC contract negotiation and EDC data transfer process so that the quality investigation can be pushed by the sender. +Trace-X implements a functionality to create the assets and their corresponding policies in the admin panel. With the notification asset it is possible to enable EDC contract negotiation and EDC data transfer process so that the quality investigation can be pushed by the sender. -In the above UML sequence diagram the sending of quality notifications from Trace-X to a receiver (any other Traceability application) is described. +In the above UML sequence diagram the sending of quality notifications from Trace-X to a receiver (any other traceability application) is described. diff --git a/docs/src/docs/arc42/runtime-view/policies.adoc b/docs/src/docs/arc42/runtime-view/policies.adoc index d1fc5171b8..9bff992ca7 100644 --- a/docs/src/docs/arc42/runtime-view/policies.adoc +++ b/docs/src/docs/arc42/runtime-view/policies.adoc @@ -2,12 +2,12 @@ == Overview -=== Scenario 1: Startup interaction with IRS Policy Store +=== Scenario 1: Startup interaction with the IRS policy store The Trace-X instance defines a constraint which is required for data consumption and provisioning. Trace-X retrieves all policies by IRS and validates if one of the policies contains the required constraint given by Trace-X. If a policy with the constraint exists and is valid, the process ends. If the policy is not valid, it will create one with the given constraint. -This sequence diagram describes the process of retrieving or creating policies within the IRS Policy Store based on the constraint given by Trace-X. +This sequence diagram describes the process of retrieving or creating policies within the IRS policy store based on the constraint given by Trace-X. [plantuml, target=policy-startup-configuration, format=svg] .... @@ -18,7 +18,7 @@ include::../../../uml-diagrams/arc42/runtime-view/policies/policy-startup-config The Trace-X instance uses the policy which includes the defined constraint and transforms it into a valid EDC policy request. The EDC policy request will be used for creating a policy for the required notification contracts. -This sequence diagram describes the process of retrieving the correct policy by IRS Policy Store based on the constraint given by Trace-X and reuses it for creating an EDC policy. +This sequence diagram describes the process of retrieving the correct policy by IRS policy store based on the constraint given by Trace-X and reuses it for creating an EDC policy. [plantuml, target=policy-startup-notification-contract, format=svg] .... diff --git a/docs/src/docs/arc42/runtime-view/scheduler/scheduler.adoc b/docs/src/docs/arc42/runtime-view/scheduler/scheduler.adoc index c955419842..d05b60c6f1 100644 --- a/docs/src/docs/arc42/runtime-view/scheduler/scheduler.adoc +++ b/docs/src/docs/arc42/runtime-view/scheduler/scheduler.adoc @@ -2,7 +2,7 @@ An overview of the scheduler tasks configured in the system. [options="header"] |=== -|Scheduler Name | Execution Interval | Description +|Scheduler name | Execution interval | Description |PublishAssetsJob | Every hour at 30min | Publishes assets in IN_SYNCHRONIZATION state to core services. The process combines 'as-built' and 'as-planned' assets and initiates their publication for synchronization in the traceability system. |AssetsRefreshJob | Every 2 hours | Invokes the synchronization of asset shell descriptors with the decentralized registry. It ensures the latest asset information is fetched and updated in the system from external sources. |=== diff --git a/docs/src/docs/arc42/scope-context/business-context.adoc b/docs/src/docs/arc42/scope-context/business-context.adoc index e3b0f19094..92787c696b 100644 --- a/docs/src/docs/arc42/scope-context/business-context.adoc +++ b/docs/src/docs/arc42/scope-context/business-context.adoc @@ -1,6 +1,6 @@ = Business context -Trace-X exchanges data with any other Traceability applications within the CX ecosystem. This is implemented by integrating the service into the CX network and the usage of required central components and services provided by CX. +Trace-X exchanges data with any other traceability applications within the CX ecosystem. This is implemented by integrating the service into the CX network and the usage of required central components and services provided by CX. [plantuml, target=business-context, format=svg] .... @@ -8,13 +8,13 @@ include::../../../uml-diagrams/arc42/scope-context/business-context/business-con .... == User -Trace-X can be deployed, hosted and run by every party that is part of the Catena-X network. They need to be registered, have a BPN, technical user as well as provide valid credentials. An end-user in Trace-X can have roles provided by the CX Portal (User, Supervisor, Admin). As a prerequisite for Trace-X, valid data must already be provided to CX network since Trace-X only consumes data but has no import interface or data provisioning functionality. +Trace-X can be deployed, hosted and run by every party that is part of the Catena-X network. They need to be registered, have a BPN and a technical user as well as provide valid credentials. An end-user in Trace-X can have roles provided by the CX portal (user, supervisor, admin). == IRS -Item Relationship Service is the component that is used by Trace-X to fetch the data chains from Catena-X network. Data that is provided by IRS gets extracted, aggregated, transformed and is used for further actions in Trace-X. Further information can be found in the https://eclipse-tractusx.github.io/item-relationship-service/docs/arc42/[IRS architecture documentation (arc42)]. +The Item Relationship Service is the component that is used by Trace-X to fetch data chains from Catena-X network. Data that is provided by IRS gets extracted, aggregated, transformed and is used for further actions in Trace-X. Further information can be found in the https://eclipse-tractusx.github.io/item-relationship-service/docs/arc42/[IRS architecture documentation (arc42)]. == Catena-X network -Trace-X and IRS are retrieving necessary information and data from the Catena-X network (Users, digital twins, aspects, submodels, Business Partner information). If CX services are unavailable, Trace-X will not be able to perform most of its work. +Trace-X and IRS are retrieving necessary information and data from the Catena-X network (users, digital twins, aspects, submodels, business partner information). If CX services are unavailable, Trace-X will not be able to perform most of its work. -== Any other Traceability App -Trace-X interacts with any other Traceability app using the CX standards. This enables sovereign data exchange as well as receiving and sending notifications to interact between different parties. +== Any other traceability app +Trace-X interacts with any other traceability app using the CX standards. This enables sovereign data exchange as well as receiving and sending notifications to interact between different parties. diff --git a/docs/src/docs/arc42/scope-context/index.adoc b/docs/src/docs/arc42/scope-context/index.adoc index b6892add58..60735c7f5c 100644 --- a/docs/src/docs/arc42/scope-context/index.adoc +++ b/docs/src/docs/arc42/scope-context/index.adoc @@ -1,6 +1,6 @@ = System scope and context -Trace-X is an end user application to visualize and utilize data provided to the Catena-X network. This includes the traceability of manufactured parts and batches as well as the shipped and supplied components. To utilize the CX open ecosystem it is necessary to exchange information on serialized parts and batches with supply chain partners in a standardized, data sovereign and interoperable way. This section describes the environment of Trace-X, its intended users and which systems and components it interacts with. +Trace-X is an end-user application to visualize and utilize data provided to the Catena-X network. This includes the traceability of manufactured parts and batches as well as the shipped and supplied components. To utilize the CX open ecosystem it is necessary to exchange information on serialized parts and batches with supply chain partners in a standardized, data-sovereign and interoperable way. This section describes the environment of Trace-X, its intended users and which systems and components it interacts with. include::business-context.adoc[leveloffset=+1] diff --git a/docs/src/docs/arc42/scope-context/technical-context.adoc b/docs/src/docs/arc42/scope-context/technical-context.adoc index f109612a44..2ff117e9dc 100644 --- a/docs/src/docs/arc42/scope-context/technical-context.adoc +++ b/docs/src/docs/arc42/scope-context/technical-context.adoc @@ -3,15 +3,14 @@ == Component overview === Trace-X API -We provide a REST API that is consumed by Trace-X frontend in order to deliver Trace-X related features such as quality-investigations or assets chain visibility. -Since Trace-X component is a very last component in the Catena-X ecosystem we are mostly depend on the other services and theirs APIs in other to deliver desired functionalities. The development of the services is not a part of the Trace-X application and each of the system that we utilize exposes REST API that we consume and interact directly. +We provide a REST API that is consumed by Trace-X frontend in order to deliver Trace-X related features such as quality investigations or asset chain visibility. +Since the Trace-X component is the very last component in the Catena-X ecosystem we are mostly dependent on the other services and theirs APIs in other to deliver desired functionalities. The development of the services is not a part of the Trace-X application and each of the system that we utilize exposes a REST API that we consume and interact with directly. -Trace-X is a Spring Boot based application and is secured with the OpenID connector provider Keycloak and the OAuth2. This means for the company that utilize Trace-X component -it is required to obtain technical user in order to be authorized to get access to the external components within Catena-X ecosystem. +Trace-X is a Spring Boot based application and is secured with the OpenID connector provider Keycloak and the OAuth2. This means for the companies, that utilize Trace-X component, it is required to obtain a technical user in order to be authorized to get access to the external components within Catena-X ecosystem. -In order to use Trace-X frontend with Trace-X backend, users need to authenticate themselves in order to be authorized to get access to the Trace-X. -By the frontend UI users provide valid credentials and the system generates a bearer token that it gets from Keycloak and attaches it to the HTTP header parameter Authorization. -Then once a user is authorized and has proper role within Trace-X backend, the backend delegates HTTP calls to specific service in their behalf as technical user in order to fulfill specific functionality. +In order to use the Trace-X frontend with the Trace-X backend, users need to authenticate themselves in order to be authorized to get access to the Trace-X. +In the frontend UI users provide valid credentials and the system generates a bearer token that it gets from Keycloak and attaches it to the HTTP header parameter Authorization. +Once a user is authorized and has a proper role in the Trace-X backend, the backend delegates HTTP calls to specific services on their behalf as technical user in order to fulfill specific functionalities. === [Outdated] Registry API @@ -20,9 +19,9 @@ Then once a user is authorized and has proper role within Trace-X backend, the b include::../../../uml-diagrams/arc42/scope-context/technical-context/aas-api-view.puml[] .... - -The Trace-X acts as a consumer of the Asset Administration Shell Registry component. The Trace-X contains a Restful client (REST template) that build a REST call to the mentioned Digital Twin Registry API based on its known URL (the AAS registry URL is configurable in the Trace-X). -Requests contain "assetIds" provided by the component during assets synchronization. Like described in the above section, the security aspect is required in order to achieve a REST call against the AAS Registry. As a response, the Trace-X gets the corresponding shells and shell descriptors utilized then later for assets synchronization. The HTTP(s) transport protocol is used for the REST call communication. +The Trace-X acts as a consumer of the asset administration shell registry component. Trace-X contains a restful client (REST template) that builds a REST call to the mentioned digital twin registry API based on its known URL (the AAS registry URL is configurable in Trace-X). +Requests contain "assetIds" provided by the component during asset synchronization. Like described in the above section, the security aspect is required in order to achieve a REST call against the AAS Registry. As a response, Trace-X gets the corresponding shells and shell descriptors utilized later for asset synchronization. +The HTTP(s) transport protocol is used for the REST call communication. === IRS API @@ -31,8 +30,9 @@ Requests contain "assetIds" provided by the component during assets synchronizat include::../../../uml-diagrams/arc42/scope-context/technical-context/irs-api-view.puml[] .... -The Trace-X acts as a consumer of the IRS component. The Trace-X contains a Restful client (REST template) that build a REST call to the mentioned IRS API based on its known URL (the IRS URL is configurable in the Trace-X). -Request contains details required to start IRS fetch job provided by the component during assets synchronization. Like described in the above section, the security aspect is required in order to achieve a REST call against the IRS. As a response, the Trace-X gets the created job id and periodically pulls for the job details that contains assets that will be uploaded to the system. And as mentioned above, the transport protocol HTTP(S) is used for the REST call communication. +Trace-X acts as a consumer of the IRS component. Trace-X contains a restful client (REST template) that build a REST call to the mentioned IRS API based on its known URL (the IRS URL is configurable in Trace-X). +The request contains details required to start an IRS fetch job provided by the component during asset synchronization. Like described in the above section, the security aspect is required in order to achieve a REST call against the IRS. As a response, Trace-X gets the created job id and periodically pulls for the job details that contains assets that will be uploaded to the system. +As mentioned above, the transport protocol HTTP(S) is used for the REST call communication. === [Outdated] Portal API @@ -41,10 +41,10 @@ Request contains details required to start IRS fetch job provided by the compone include::../../../uml-diagrams/arc42/scope-context/technical-context/portal-api-view.puml[] .... -The Trace-X acts as a consumer of the Portal component. -The Trace-X contains a Restful client (REST template) that builds a REST call to the mentioned Portal API based on its known URL (the Portal URL is configurable in the Trace-X). -The Portal is used to authenticate users and requests against the backend. -And as mentioned above, the transport protocol HTTP(S) is used for the REST call communication. +Trace-X acts as a consumer of the portal component. +Trace-X contains a restful client (REST template) that builds a REST call to the mentioned Portal API based on its known URL (the Portal URL is configurable in Trace-X). +The portal is used to authenticate users and requests against the backend. +As mentioned above, the transport protocol HTTP(S) is used for the REST call communication. === [Outdated] EDC API @@ -54,7 +54,7 @@ include::../../../uml-diagrams/arc42/scope-context/technical-context/edc-api-vie .... The Trace-X acts as a consumer and provider of the EDC component. -In Trace-X we communicate with EDC directly only for the sake of fulfilling quality-investigation functionality. +In Trace-X we communicate with EDC directly only for the sake of fulfilling quality investigation functionality. Specific use cases can be viewed in xref:../runtime-view/index.adoc[Runtime view] section. -For these purposes the integrated EDC clients in the Trace-X are responsible for creating restful requests to the EDC component. -And as mentioned above, the transport protocol HTTP(S) is used for the REST call communication. +For these purposes the integrated EDC clients in Trace-X are responsible for creating restful requests to the EDC component. +As mentioned above, the transport protocol HTTP(S) is used for the REST call communication. diff --git a/docs/src/docs/arc42/solution-strategy/introduction.adoc b/docs/src/docs/arc42/solution-strategy/introduction.adoc index 32ca68c60d..d54a64bbda 100644 --- a/docs/src/docs/arc42/solution-strategy/introduction.adoc +++ b/docs/src/docs/arc42/solution-strategy/introduction.adoc @@ -5,20 +5,20 @@ Following table describes the quality goals of Trace-X (see chapter quality goal |=== |Quality goal |Matching approaches in the solution -|Running reference application for Catena-X Traceability -a|* Published open source, Trace-X application can be used as a reference by anyone. +|Running reference application for Catena-X traceability +a|* Published open-source, Trace-X application can be used as a reference by anyone. |Accessible and easy to use a|* Established programming languages are used. -* Backend written in Java +* Backend written in Java. * Frontend written in Typescript based on the Angular framework. |Cloud agnostic solution -a|* Helm charts to support the deployment of the application in a Kubernetes environment +a|* Helm charts to support the deployment of the application in a Kubernetes environment. |Application reliability -a|* Data source is the Catena-X notwork. Data is fetched with IRS directly from the data owner and the Digital Twin Registry of CX. -* Trace-X can be hosted decentralized since it is an open source reference implementation. +a|* Data source is the Catena-X network. Data is fetched with IRS directly from the data owner and the digital twin registry of CX. +* Trace-X can be hosted decentralized since it is an open-source reference implementation. |Security a|* Static Application Security Testing (SAST) and Dynamic Application Security Testing (DAST) are executed automatically and regularly with tools as part of the pipeline. diff --git a/docs/src/docs/arc42/solution-strategy/structure.adoc b/docs/src/docs/arc42/solution-strategy/structure.adoc index e9f81a699a..5b4f967231 100644 --- a/docs/src/docs/arc42/solution-strategy/structure.adoc +++ b/docs/src/docs/arc42/solution-strategy/structure.adoc @@ -1,11 +1,11 @@ = Structure -Trace-X is divided into two components: Frontend and Backend. +Trace-X is divided into two components: frontend and backend. It roughly can be broken down into the following parts: -* Asset controllers to get the asset information +* Asset controllers to get asset information * Dashboard controller to get dashboard related summed up information -* Registry controller to fetch assets from the Digital Twin Registry +* Registry controller to fetch assets from the digital twin registry * Notification controller to get notification information and create EDC notification offers * Submodel controller for providing asset data functionality * Import controller for importing Trace-X data for data provisioning @@ -15,5 +15,5 @@ It roughly can be broken down into the following parts: * Policy controller to retrieve information about policies * BPN controller to retrieve information about business partners -The backend does a request to the Digital Twin Registry utilizing the Registry controller. Extracted data from the response is made available through the Asset controller and the Dashboard controller to the Frontend. +The backend does a request to the digital twin registry utilizing the registry controller. Extracted data from the response is made available through the asset controller and the dashboard controller to the frontend. diff --git a/docs/src/docs/arc42/solution-strategy/technology.adoc b/docs/src/docs/arc42/solution-strategy/technology.adoc index df79c5b8ce..a394db0b2b 100644 --- a/docs/src/docs/arc42/solution-strategy/technology.adoc +++ b/docs/src/docs/arc42/solution-strategy/technology.adoc @@ -1,9 +1,9 @@ = Technology -Trace-X is developed using Java and the Spring Boot framework for the Backend and Typescript based on the Angular framework for the Frontend. This decision was taken due to the support of the frameworks as well as technical knowledge of the team members. +Trace-X is developed using Java and the Spring Boot framework for the backend and Typescript based on the Angular framework for the frontend. This decision was taken due to the support of the frameworks as well as technical knowledge of the team members. The application can be hosted using Docker and Kubernetes. This is commonly used and widespread. With this the application has no vendor lock in regarding the hosting provider. -The communication between Frontend and Backend is done using REST APIs. This is the standard method in the Catena-X landscape and makes the application components easy to use for any third party client. +The communication between frontend and backend is done using REST APIs. This is the standard method in the Catena-X landscape and makes the application components easy to use for any third party client. -As the database to store parts information etc. PostgreSQL Database is used. +For the database PostgreSQL is used. diff --git a/docs/src/docs/arc42/trace-x-data-import-interface/data-import-interface.adoc b/docs/src/docs/arc42/trace-x-data-import-interface/data-import-interface.adoc index bb42468080..1cd08d0ed0 100644 --- a/docs/src/docs/arc42/trace-x-data-import-interface/data-import-interface.adoc +++ b/docs/src/docs/arc42/trace-x-data-import-interface/data-import-interface.adoc @@ -1,12 +1,12 @@ -= Concept for Trace-X Data Import interface (Data Provider) += Concept for Trace-X data import interface (data provider) -Modul 1 +Module 1 [plantuml, target=modul1-sequence, format=svg] .... include::../../../uml-diagrams/arc42/trace-x-data-import-interface/trace-x-data-import-interface-modul1-sequence.puml[] .... -Modul 2 +Module 2 [plantuml, target=modul2-sequence, format=svg] .... include::../../../uml-diagrams/arc42/trace-x-data-import-interface/trace-x-data-import-interface-modul2-sequence.puml[] @@ -17,7 +17,7 @@ include::../../../uml-diagrams/arc42/trace-x-data-import-interface/trace-x-data- include::../../../uml-diagrams/arc42/trace-x-data-import-interface/trace-x-data-import-interface-modul2-swimlane.puml[] .... -Modul 3 +Module 3 [plantuml, target=modul3-sequence, format=svg] .... include::../../../uml-diagrams/arc42/trace-x-data-import-interface/trace-x-data-import-interface-modul3-sequence.puml[] diff --git a/docs/src/docs/index.adoc b/docs/src/docs/index.adoc index a28b38344a..9aa1735330 100644 --- a/docs/src/docs/index.adoc +++ b/docs/src/docs/index.adoc @@ -1,7 +1,7 @@ -# Trace-X Documentation += Trace-X documentation -## Notice +== Notice This work is licensed under the [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0). @@ -15,18 +15,18 @@ This work is licensed under the [Apache-2.0](https://www.apache.org/licenses/LIC * Source URL: https://github.com/eclipse-tractusx/traceability-foss -## Administration Guide -xref:administration/administration-guide.adoc[Administration Guide] +== Administration guide +xref:administration/administration-guide.adoc[Administration guide] -## Users Manual +== User manual -xref:user/user-manual.adoc[Users Manual] +xref:user/user-manual.adoc[User manual] -## API-Documentation +== API documentation xref:api-specification/api-specification.adoc[OpenApi specification] -## Architecture Documentation (arc42) +== Architecture documentation (arc42) - xref:arc42/index.adoc[Single chapters] - xref:arc42/full.adoc[Full document] diff --git a/docs/src/docs/user/user-manual.adoc b/docs/src/docs/user/user-manual.adoc index d5aa9ae38f..bbea356c33 100644 --- a/docs/src/docs/user/user-manual.adoc +++ b/docs/src/docs/user/user-manual.adoc @@ -66,23 +66,14 @@ image::https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main Provides a fast overview about the amount of manufactured and supplied / customer (other) parts and batches, as well as the amount of open investigations and alerts. Lists the five newest quality investigations and alerts to get an overview of the current state. -image::https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/dashboard.png[] - === Parts -Navigates to the own manufactured parts and batches list view. - -=== Other parts - -Navigates to the supplier and customer parts and batches list view. - -=== Quality investigation +Navigates to the parts and batches list view. -Navigates to the inbox and outgoing investigations. +=== Quality topics -=== Quality alert +Navigates to the inbox of (sent/received) quality notifications. -Navigates to the inbox and outgoing alerts. === About @@ -154,20 +145,21 @@ Supported languages: == Parts -List view of the own manufactured (asBuilt) or planned (asPlanned) parts and batches. -You can adjust the view of tables by activating/deactivating the tables. +List view of the own manufactured (asBuilt) or planned (asPlanned) parts and batches as well as supplier/customer parts. +You can adjust the view of tables by clicking on the fullscreen icon to maximize or minimize the view to the half of the full width. image::https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/parts-list-view.png[] === Parts table A table view split into the different BOM lifecycle phases (AsBuilt / AsPlanned) of a part. By default, both tables are displayed. -Adjustment of the view of tables can be done by activating/deactivating the tables via the buttons „AS BUILT“ and „AS PLANNED“. +Adjustment of the view of tables can be done by activating/deactivating the fullscreen width of the tables. Between the views, there is a slider to adjust the view to make either the left or the right table more visible. -Alternatively, you can use the view toggle to adjust the visibility of the tables. Both tables can be sorted, filtered, and searched. + +Pre-filtration buttons can be toggled to only show own/supplier/customer parts in the table. The global search bar at the top returns part results from both tables. Choosing the filter input field for any column and typing in any character will show filter suggestions. @@ -188,14 +180,17 @@ Gives detailed information on the assets registered in the Digital Twin Registry This includes data based on the aspect models of use case traceability: AsPlanned, SerialPart, Batch. Parts that have a quality alert are highlighted yellow. -=== Parts selection -> Create quality alert +=== Create quality notification from parts Select one or multiple child components/parts/batches that are built into your part. -Selection will enable you to create a quality alert (notification) to your customers. For this action, a button appears at the top right of the table as soon as an asset has been selected. -The quality alert will be added to a queue (queued & requested inbox) and not directly sent to the customers. +Selection will enable you to create a quality notification to customers (alert) or to suppliers (investigation) . For this action, click on the corresponding icon on the top left of a parts table. +The quality notification will be added to a queue (quality notifications) and not directly sent to the customer/supplier. +It is also possible to create a quality notification without the selection of parts. Once the quality alert is created you will get a pop-up and can directly navigate to the inbox for further action. +Parts which exist in a quality notification will be highlighted as a yellow colored row in the parts table. + === Parts selection -> Publish assets Select one or multiple parts that are in the AsBuilt lifecycle. A button will appear on the right of the lifecycle view selection: @@ -235,7 +230,7 @@ The following table explains the different import state an asset can have: On the right upper site of a table there is a settings icon in which you can set the table columns to a desired view. With a click on it a dialog opens where you can change the settings of the corresponding table: -image::https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/table-settings-dialog.png[] +image::https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/other-parts-table-settings-dialog.png[] Hide/show table columns by clicking on the checkbox or the column name. It is possible to hide/show all columns by clicking on the "All" - checkbox. @@ -250,7 +245,7 @@ If you want to discard your changes, press the "ESC" - button, click anywhere el The settings will be stored in the local storage of the browser and will be persisted until they get deleted. -=== Part details +=== Own Part details To open the detail view, click on the three dots icon of the desired item and select "View details". More detailed information on the asset is listed as well as a part tree that visually shows the parts relations. @@ -303,82 +298,9 @@ By clicking on the "publish" icon, you can publish the currently opened part fro a tooltip will provide information explaining the reason. You can trigger the tooltip by hovering above the button - -== Other parts - -List view of the supplied/delivered parts and batches (Supplier parts / Customer parts). -You can adjust the view of tables by activating/deactivating the tables. - -image::https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/other-parts-list-view.png[] - -=== Other parts table - -A table view split into the different BOM lifecycle phases (AsBuilt / AsPlanned) of a part. By default, both tables are displayed. -Adjustment of the view of tables can be done by activating/deactivating the tables via the buttons „AS BUILT“ and „AS PLANNED“. - -Between the views, there is a slider to adjust the view to make either the left or the right table more visible. -Alternatively, you can use the view toggle to adjust the visibility of the tables. - -Additionally, it's possible to switch between tabs above each of the table views to display either supplier or customer parts. - -Both tables can be sorted, filtered and searched. The global search bar at the top returns other part results from both tables. - -Choosing the filter input field for any column and typing in any character will show filter suggestions. - -image::https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/other-parts-autosuggestion-filtering.png[] - -=== AsBuilt lifecycle - -List view of other parts with AsBuilt lifecycle. -Gives detailed information on the assets registered in the Digital Twin Registry of Catena-X for all connected companies. -This includes data based on the aspect models of use case traceability: AsBuilt, -SerialPart, Batch. -Parts that have a quality notification are highlighted yellow. - -=== AsPlanned lifecycle - -List view of other parts with AsPlanned lifecycle. -Gives detailed information on the assets registered in the Digital Twin Registry of Catena-X for all connected companies. -This includes data based on the aspect models of use case traceability: AsPlanned, -SerialPart, Batch. -Parts that have a quality notification are highlighted yellow. - -=== Table column settings - -On the right upper site of a table there is a settings icon in which you can set the table columns to a desired view. -With a click on it a dialog opens where you can change the settings of the corresponding table: - -image::https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/table-settings-dialog.png[] - -Hide/show table columns by clicking on the checkbox or the column name. -It is possible to hide/show all columns by clicking on the "All" - checkbox. - -The reset icon resets the table columns to its default view. - -Reorder the table columns by selecting a list item (click on the right of the column name). -By selecting the column, you can reorder it with the up and down arrow icons to move it in the front or back of other columns. - -Apply your changes by clicking on the "Save" - button. -If you want to discard your changes, press the "ESC" - button, click anywhere else except in the dialog or close it explicitly with the close icon on the upper right of the dialog. - -The settings will be stored in the local storage of the browser and will be persisted until they get deleted. - -=== Supplier parts - -List view of supplied parts and batches. -Supplier parts that have a quality investigation are highlighted yellow. - -==== Supplier parts select / Quality investigation - -Select one or multiple supplier parts. -Selection will enable you to create a quality investigation (notification) to your supplier. -The quality investigation will be added to a queue (queued & requested inbox) and not directly be sent to the supplier. - -Once the quality investigation is created you will get a pop-up and can directly navigate to the inbox for further action. - === Supplier part details -To open the detail view, click on the three dots icon of the desired item and select "View details". +To open the detail view, click on the three dots icon of the desired item from the parts table and select "View details". More detailed information on the asset is listed. image::https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/supplier-parts-list-detailed-view.png[] @@ -411,34 +333,34 @@ image::https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main ==== Overview General production information. -Information on the quality status of the supplier part/batch. +Information on the quality status of the customer part/batch. ==== Manufacturer data -Detailed information on the IDs for the supplier part/batch. +Detailed information on the IDs for the customer part/batch. ==== Customer data Information about the identifiers at the customer for the respective part/batch. -== Quality investigation +== Quality notifications -Inbox for received quality investigations and "Queued & Requested" inbox for outgoing draft as well as already sent investigations. +Inbox for received/sent quality notifications. image:https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/investigations-list-view.png[] -The tables can be sorted, filtered and searched. The global search bar at the top returns other part results from both tables. +The tables can be sorted, filtered and searched. Choosing the filter input field for any column and typing in any character will show filter suggestions. image:https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/investigations-autosuggestion-filtering.png[] -image:https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/notification-drafts.png[] Received investigations. +image:https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/notification-drafts.png[] Received quality notifications. -Investigations received by a customer. +Quality notifications received by a customer. Those notifications specify a defect or request to investigate on a specific part / batch on your side and give feedback to the customer. -image:https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/notification-send.png[] Queued & Requested investigations. +image:https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/notification-send.png[] Sent quality notifications. Notifications in the context of quality investigations that are in queued/draft status or already requested/sent to the supplier. Those notifications specify a defect or request to investigate on a specific part / batch on your suppliers side and give feedback back to you. @@ -446,191 +368,121 @@ Those notifications specify a defect or request to investigate on a specific par * Queued status: Quality investigation is created but not yet released. * Requested status: Quality investigation is sent to the supplier. -=== Quality investigation context action - -Select the three dots icon on the right side of an investigation entry to open the context menu. -From there it is possible to open the investigation detailed view or change the status of an investigation. -Only the possible status transition will show up. - -image:https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/notification-context-action.png[] - -Changing the status of an investigation will open a modal in which the details to the status change can be provided and completed. - -image:https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/investigation-context-action-modal.png[] - -A pop-up will notify you if the status transition was successful. - -=== Quality investigation detail view - -The investigation detail view can be opened by selecting the corresponding option in the context menu. +=== Create a new quality notification -image:https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/investigation-detail-view.png[] - -==== Overview - -General information about the notification. - -==== Affected Parts - -Listed parts that are assigned to the selected alert. - -==== Supplier parts - -Detailed information for child parts assigned to a notification - -==== Message History - -Displays all state transitions including the reason/description of the transition that were done on the notification to get an overview of the correspondence between sender and receiver. - -==== Quality investigation action - -All possible state transitions are displayed in form of buttons (upper right corner). -There the desired action can be selected to open a modal in which the details to the status change can be provided and completed. - -=== Quality investigation status - -Following status for a quality investigation (notification) are possible: - -|=== -|Status |Description - -|Queued -|A quality investigation that was created by a user but not yet sent to the receiver. - -|Requested -|Created quality investigation that is already sent to the receiver. - -|Cancelled -|Created quality investigation that is not yet sent to the receiver and got cancelled on sender side before doing so. It is no longer valid / necessary. - -|Received -|Received notification from a sender which needs to be investigated. - -|Acknowledged -|The receiver acknowledged to work on the received inquiry. +By clicking the announcement icon in the upper left corner of the table, you will be navigated to the notification creation view, in where you can start a quality notification from blank. -|Accepted -|The receiver accepted the inquiry. Issue on part/batch detected. +=== Table Actions -|Declined -|The receiver declined the inquiry. No issue on part/batch detected. +Similar to the parts table, the inbox provide a variety on actions you can apply to the listed notifications. +Some actions are related to a single notification, while other can be executed on multiple notifications at a time. -|Closed -|The sender closed the quality investigation and no further handling with it is possible. -|=== +==== Actions on a single notification -=== Quality investigation status flow +Through a click on the three dots on the right of a notification list row you open the menu actions, which you can choose from. +Generally, there are the actions to edit the notification (if it's not sent yet) or view details about it. +Additionally, there are the options to apply action alongside the lifecycle of a quality notification. -Notifications always have a status. -The transition from one status to a subsequent status is described in the below state model. +==== Actions on multiple notifications -The Sender can change the status to closed from any status. -The receiver can never change the status to closed. +Notifications can be selected with the checkboxes on the left of the table. +With the selection, there is a context menu for actions on mulitple (selected) notifications. +The "more" menu is opened by clicking on the horizontally aligned three dots icon. -The legend in the below state diagram describes who can set the status. -One exception to this rule: the transition from status SENT to status RECEIVED is done automatically once the sender receives the Http status code 201. +image:https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/inbox-multiselect-actions.png[] -image::https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/notificationstatemodel.png[Notification state model] +=== Quality notification create/edit view -== Quality alert +A quality notification can be started by the following options: +- Part detail view if a part has child elements an quality notification with type INVESTIGATION can be created. +- Part table if parts are selected an quality notification with type ALERT can be created. +- Other parts table if parts are selected an quality notification with type INVESTIGATION can be created. -Inbox for received quality alerts and "Queued & Requested" inbox for outgoing draft as well as already sent alerts. +A quality notification can be edited by clicking on the context menu on an item within the inbox. -image:https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/alerts-list-view.png[] +image:https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/investigation-create-view.png[] -The tables can be sorted, filtered and searched. Choosing filter input field for column and typing in any character will show filter suggestions that can be used for search functionality that starts with given characters or phrase. -image:https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/alerts-autosuggestion-filtering.png[] +=== Quality notifications context action -image:https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/notification-drafts.png[] Received alerts. - -Alerts received by a supplier. -Those notifications specify a defect or request to informed on a specific part / batch on your side to be informed and give feedback to the supplier. - -image:https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/notification-send.png[] Queued & Requested alerts. - -Notifications in the context of quality alerts that are in queued/draft status or already requested/sent to the customer. -Those notifications specify a defect or request to inform on a specific part / batch on the customer side and give feedback back to you. - -* Queued status: Quality alert is created but not yet released. -* Requested status: Quality alert is sent to the customer. - -=== Quality alert context action - -Select the three dots icon on the right side of an alert entry to open the context menu. -From there it is possible to open the alert detailed view or change the status of an alert. -Only the possible status transitions will show up. +Select the three dots icon on the right side of an quality notification entry to open the context menu. +From there it is possible to open the quality notification detailed view or change the status of it. +Only the possible status transition will show up. image:https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/notification-context-action.png[] -Changing the status of an alert will open a modal in which the details to the status change can be provided and completed. +Changing the status of a quality notification will open a modal in which the details to the status change can be provided and completed. -image:https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/alert-context-action-modal.png[] +image:https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/investigation-context-action-modal.png[] A pop-up will notify you if the status transition was successful. -=== Quality alert detail view +=== Quality notification detail view -The alert detail view can be opened by selecting the corresponding option in the context menu. +The quality notification detail view can be opened by selecting the corresponding option in the context menu. -image:https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/alert-detail-view.png[] +image:https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/investigation-detail-view.png[] ==== Overview -General information about the notification. +General information about the quality notification. -==== Affected parts +==== Affected Parts Listed parts that are assigned to the selected alert. -==== Supplier parts +==== Supplier parts (If type is investigation) + +Detailed information for child parts assigned to a quality notification. + +==== Own parts (If type is alert) -Detailed information for child parts assigned to a notification +Detailed information for parent parts assigned to a quality notification. ==== Message History Displays all state transitions including the reason/description of the transition that were done on the notification to get an overview of the correspondence between sender and receiver. -==== Quality investigation action +==== Quality notification action All possible state transitions are displayed in form of buttons (upper right corner). There the desired action can be selected to open a modal in which the details to the status change can be provided and completed. -=== Quality alert status +=== Quality notification status -Following status for a quality alert (notification) are possible: +Following status for a quality notification are possible: |=== |Status |Description |Queued -|A quality alert that was created by a user but not yet sent to the receiver. +|A quality notification that was created by a user but not yet sent to the receiver. |Requested -|Created quality alert that is already sent to the receiver. +|Created quality notification that is already sent to the receiver. |Cancelled -|Created quality alert that is not yet sent to the receiver and got cancelled on sender side before doing so. It is no longer valid / necessary. +|Created quality notification that is not yet sent to the receiver and got cancelled on sender side before doing so. It is no longer valid / necessary. |Received -|Received notification from a sender which needs to be aware of. +|Received notification from a sender which needs to be investigated. |Acknowledged |The receiver acknowledged to work on the received inquiry. |Accepted -|The receiver accepted the inquiry. Issue on part/batch is known. +|The receiver accepted the inquiry. Issue on part/batch detected. |Declined -|The receiver declined the inquiry. No issue on part/batch is known. +|The receiver declined the inquiry. No issue on part/batch detected. |Closed -|The sender closed the quality alert and no further handling with it is possible. +|The sender closed the quality notification and no further handling with it is possible. |=== -=== Quality alert status flow +=== Quality notification status flow -Notifications always have a status. +Quality notifications always have a status. The transition from one status to a subsequent status is described in the below state model. The Sender can change the status to closed from any status. diff --git a/docs/src/images/arc42/user-guide/admin_contract_detailed_view.png b/docs/src/images/arc42/user-guide/admin_contract_detailed_view.png index a044d84fa1..972ecec676 100644 Binary files a/docs/src/images/arc42/user-guide/admin_contract_detailed_view.png and b/docs/src/images/arc42/user-guide/admin_contract_detailed_view.png differ diff --git a/docs/src/images/arc42/user-guide/admin_contract_view.png b/docs/src/images/arc42/user-guide/admin_contract_view.png index 5fa8ca3933..2a5b925bb1 100644 Binary files a/docs/src/images/arc42/user-guide/admin_contract_view.png and b/docs/src/images/arc42/user-guide/admin_contract_view.png differ diff --git a/docs/src/images/arc42/user-guide/admin_upload_file.png b/docs/src/images/arc42/user-guide/admin_upload_file.png index 54b1ee1c2f..c9cdcc3007 100644 Binary files a/docs/src/images/arc42/user-guide/admin_upload_file.png and b/docs/src/images/arc42/user-guide/admin_upload_file.png differ diff --git a/docs/src/images/arc42/user-guide/customer-parts-list-detailed-view.png b/docs/src/images/arc42/user-guide/customer-parts-list-detailed-view.png index 39468fb1d7..69db9983b2 100644 Binary files a/docs/src/images/arc42/user-guide/customer-parts-list-detailed-view.png and b/docs/src/images/arc42/user-guide/customer-parts-list-detailed-view.png differ diff --git a/docs/src/images/arc42/user-guide/inbox-multiselect-actions.png b/docs/src/images/arc42/user-guide/inbox-multiselect-actions.png new file mode 100644 index 0000000000..a51fed4b32 Binary files /dev/null and b/docs/src/images/arc42/user-guide/inbox-multiselect-actions.png differ diff --git a/docs/src/images/arc42/user-guide/investigation-create-view.png b/docs/src/images/arc42/user-guide/investigation-create-view.png new file mode 100644 index 0000000000..7532bfcb0d Binary files /dev/null and b/docs/src/images/arc42/user-guide/investigation-create-view.png differ diff --git a/docs/src/images/arc42/user-guide/investigation-detail-view.png b/docs/src/images/arc42/user-guide/investigation-detail-view.png index 3206dea8ee..c27193345d 100644 Binary files a/docs/src/images/arc42/user-guide/investigation-detail-view.png and b/docs/src/images/arc42/user-guide/investigation-detail-view.png differ diff --git a/docs/src/images/arc42/user-guide/investigations-autosuggestion-filtering.png b/docs/src/images/arc42/user-guide/investigations-autosuggestion-filtering.png index 4088b5026c..f64b39e86e 100644 Binary files a/docs/src/images/arc42/user-guide/investigations-autosuggestion-filtering.png and b/docs/src/images/arc42/user-guide/investigations-autosuggestion-filtering.png differ diff --git a/docs/src/images/arc42/user-guide/investigations-list-view.png b/docs/src/images/arc42/user-guide/investigations-list-view.png index 5b7b008f02..14eadac420 100644 Binary files a/docs/src/images/arc42/user-guide/investigations-list-view.png and b/docs/src/images/arc42/user-guide/investigations-list-view.png differ diff --git a/docs/src/images/arc42/user-guide/navigation-overview.png b/docs/src/images/arc42/user-guide/navigation-overview.png index 86af8d3bc1..a9403aba00 100644 Binary files a/docs/src/images/arc42/user-guide/navigation-overview.png and b/docs/src/images/arc42/user-guide/navigation-overview.png differ diff --git a/docs/src/images/arc42/user-guide/parts-list-detailed-view.png b/docs/src/images/arc42/user-guide/parts-list-detailed-view.png index 340d713d8a..313f4a788a 100644 Binary files a/docs/src/images/arc42/user-guide/parts-list-detailed-view.png and b/docs/src/images/arc42/user-guide/parts-list-detailed-view.png differ diff --git a/docs/src/images/arc42/user-guide/parts-list-view.png b/docs/src/images/arc42/user-guide/parts-list-view.png index a9e7f27ece..579f764aca 100644 Binary files a/docs/src/images/arc42/user-guide/parts-list-view.png and b/docs/src/images/arc42/user-guide/parts-list-view.png differ diff --git a/docs/src/images/arc42/user-guide/publish_assets_button.png b/docs/src/images/arc42/user-guide/publish_assets_button.png index 90a7c4b386..6c46cf1073 100644 Binary files a/docs/src/images/arc42/user-guide/publish_assets_button.png and b/docs/src/images/arc42/user-guide/publish_assets_button.png differ diff --git a/docs/src/images/arc42/user-guide/supplier-parts-list-detailed-view.png b/docs/src/images/arc42/user-guide/supplier-parts-list-detailed-view.png index 8ee3be52d7..6af1d92975 100644 Binary files a/docs/src/images/arc42/user-guide/supplier-parts-list-detailed-view.png and b/docs/src/images/arc42/user-guide/supplier-parts-list-detailed-view.png differ diff --git a/frontend/INSTALL.md b/frontend/INSTALL.md index 844c34d263..67c8cdc50e 100644 --- a/frontend/INSTALL.md +++ b/frontend/INSTALL.md @@ -11,6 +11,7 @@ const ENV_VARS_MAPPING = { CATENAX_PORTAL_BASE_URL: 'baseUrl', CATENAX_PORTAL_BACKEND_DOMAIN, CATENAX_PORTAL_URL: 'portalUrl', + BPN: 'bpn' }; ``` @@ -37,6 +38,9 @@ An example value could be: `catena-x.net` `CATENAX_PORTAL_URL` This variable is optional and points to the CX Portal instance +`BPN` +This variable is the bpn of the application owner + # Helm deployment ## Configuration of values.yaml diff --git a/frontend/cypress/integration/pages/AdminPage.ts b/frontend/cypress/integration/pages/AdminPage.ts index 7f381661dc..ef550f4a47 100644 --- a/frontend/cypress/integration/pages/AdminPage.ts +++ b/frontend/cypress/integration/pages/AdminPage.ts @@ -6,7 +6,6 @@ } export class AdminPage { - static visit() { cy.get('[data-testid="user-menu"]').click(); cy.get('[data-testid="user-menu-administration-button"]').click(); diff --git a/frontend/cypress/support/step_definitions/menu.ts b/frontend/cypress/support/step_definitions/menu.ts index d74591c5df..f6657a951f 100644 --- a/frontend/cypress/support/step_definitions/menu.ts +++ b/frontend/cypress/support/step_definitions/menu.ts @@ -25,10 +25,6 @@ import { AdminPage } from '../../integration/pages/AdminPage'; When("user navigate to {string}", function(desiredMenu) { switch (desiredMenu) { - case 'Other parts': { - cy.get('[href="/otherParts"]').click(); - break; - } case 'Parts': { cy.get('[href="/parts"]').click(); break; @@ -50,7 +46,7 @@ When("user navigate to {string}", function(desiredMenu) { break; } default: { - throw new Error("Set header menu '" + desiredMenu + "' is not one of valid status [Dashboard, Parts, Other parts, Quality investigations, Quality alerts, About, Administration]."); + throw new Error("Set header menu '" + desiredMenu + "' is not one of valid status [Dashboard, Parts, Quality investigations, Quality alerts, About, Administration]."); } } }); diff --git a/frontend/cypress/support/step_definitions/quality-investigations.ts b/frontend/cypress/support/step_definitions/quality-investigations.ts index acc548f427..442ca88467 100644 --- a/frontend/cypress/support/step_definitions/quality-investigations.ts +++ b/frontend/cypress/support/step_definitions/quality-investigations.ts @@ -18,272 +18,319 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { When, Then, Given } from '@badeball/cypress-cucumber-preprocessor'; -import { QualityInvestigationsPage } from '../../integration/pages/QualityInvestigationsPage'; +import { Then, When } from '@badeball/cypress-cucumber-preprocessor'; let notificationDescription = null; let desiredSemanticModelId = null; let desiredId = null; -Then("select other part with semantic-model-id {string}", function(semanticModelId) { +Then('select other part with semantic-model-id {string}', function(semanticModelId: string) { //since IDs of desired asset are not shown in FE the selection has to be done by other number. desiredSemanticModelId = semanticModelId; cy.get('span').contains(semanticModelId).closest('tr').find('.mdc-checkbox').click(); }); -Then("select part with id {string}", function(id) { +Then('select part with id {string}', function(id: string) { desiredId = id; cy.get('span').contains(id).closest('tr').find('.mdc-checkbox').click(); }); -Then("start {string} creation with description {string}", function(notificationType, description) { +Then('start notification creation with description {string}', function(notificationType: string, description: string) { const date = new Date().getTime(); - notificationDescription = description + "_" + date; - switch (notificationType) { - case 'investigation': { - cy.get('div').contains('Start investigation').click(); - break; - } - case 'alert': { - cy.get('div').contains('Create alert').click(); - break; - } - default: { - throw new Error("Set notification type '" + notificationType + "' is not one of valid types [investigation, alert]."); - break; - } - } + notificationDescription = description + '_' + date; + cy.get('[data-testid="create-notification-button"]').click(); cy.get('mat-label').contains(/^Description$/i).click().type(notificationDescription); }); -When("receiver BPN {string}", function(receiverBPN) { +When('receiver BPN {string}', function(receiverBPN: string) { cy.get('mat-label').contains(/^BPN$/i).click().type(receiverBPN); }); -When("severity {string}", function(severity) { +When('severity {string}', function(severity: string) { cy.get('div').contains('Severity').click(); // First the dropdown has to be opened. cy.get('p').contains(severity).click(); }); -When("{string} deadline", function(deadline) { - if (deadline == 'no') { - // do nothing - } else { - // ---TBD--- implement timepicker once it´s necessary. - } +When('{string} deadline', function(deadline: string) { + if (deadline == 'no') { + // do nothing + } else { + // ---TBD--- implement timepicker once it´s necessary. + } }); -When("request the {string}", function(notificationType) { - cy.get('span').contains('ADD TO QUEUE').click(); +When('request the {string}', function(notificationType: string) { + cy.get('[data-testid="save-button"]').click(); }); -Then("selected parts are marked as {string}", function(notificationType) { +Then('selected parts are marked as {string}', function(notificationType: string) { switch (notificationType) { case 'investigated': { - cy.get('span').contains(desiredSemanticModelId).closest('tr').should('have.class', "highlighted"); + cy.get('span').contains(desiredSemanticModelId).closest('tr').should('have.class', 'highlighted'); break; } case 'alerted': { - cy.get('span').contains(desiredId).closest('tr').should('have.class', "highlighted"); + cy.get('span').contains(desiredId).closest('tr').should('have.class', 'highlighted'); break; } default: { - throw new Error("Set notificationType change'" + notificationType + "' is not one of valid types [investigated, alerted]."); + throw new Error('Set notificationType change\'' + notificationType + '\' is not one of valid types [investigated, alerted].'); break; } } }); -When("popup with information about queued {string} is shown", function(notificationType) { - switch (notificationType) { - case 'investigation': { - cy.contains(/You queued an investigation for 1 part/i).should('be.visible'); +Then('user changes field {string} to be {string}', function(field: string, value: string) { + cy.wait(1000); + switch (field) { + case 'severity': + cy.get('div').contains('Severity').click(); // First the dropdown has to be opened. + cy.get('p').contains(value).click(); break; - } - case 'alert': { - cy.contains(/You queued an alert for 1 part/i).should('be.visible'); + case 'title': + cy.get('[data-testId="title-input"]').type(value); break; - } - default: { - throw new Error("Set notificationType '" + notificationType + "' is not one of valid types [investigation, alert]."); + case 'bpn': + cy.get('[data-testId="bpn-input"]').type('{selectall}'); + cy.get('[data-testId="bpn-input"]').type('{del}'); + cy.get('[data-testId="bpn-input"]').type(value); break; - } + case 'description': + cy.get('[data-testId="description-input"]').clear().type(value); + break; + default: + throw new Error('Set field ' + field + ' is not one of valid fields [severity, title, description, bpn]'); + } +}); + +Then('selected {string} field {string} value is {string}', function(notificationType: string, field: string, value: string) { + cy.wait(1000); + switch (field) { + case 'severity': + cy.get('[data-testid="severity-view"]').should('contain.text', value); + break; + case 'title': + cy.get('[data-testid="title-view"]').should('contain.text', value); + break; + case 'description': + cy.get('[data-testid="description-view"]').should('contain.text', value); + break; + case 'status': + cy.get('[data-testid="status-view"]').should('contain.text', value); + break; + case 'createdBy': + cy.get('[data-testid="createdBy-view"]').should('contain.text', value); + break; + case 'createdByName': + cy.get('[data-testid="createdByName-view"]').should('contain.text', value); + break; + case 'sendTo': + cy.get('[data-testid="sendTo-view"]').should('contain.text', value); + break; + case 'sendToName': + cy.get('[data-testid="sendToName-view"]').should('contain.text', value); + break; + default: + throw new Error('Set field ' + field + ' is not one of valid fields [severity, title, description, status, createdBy, createdByName, sendTo, sendToName]'); + } +}); + +When('user clicks save', function() { + cy.get('[data-testid="save-button"]').click(); +}); + +When('popup shows successful {string} notification', function(type: string) { + if (type === 'created') { + cy.contains(/Quality topic was created successfully./i).should('be.visible'); + } + if (type === 'edited') { + cy.contains(/Quality topic was updated successfully./i).should('be.visible'); } }); -When("user navigate to {string} with button in popup", function(popupClick) { +When('user navigate to {string} with button in popup', function(popupClick: string) { cy.get('a').contains('Go to Queue').click(); }); -When("open details of created {string}", () => { - cy.get('[data-testid="table-menu-button"]').first().click(); //the first investigation will be opened - if (!(cy.get('[data-testid="table-menu-button--actions.viewDetails"]').should('exist'))) { //this is necessary because sometimes the page reload and the first click disappear - cy.get('[data-testid="table-menu-button"]').first().click(); - cy.get('[data-testid="table-menu-button--actions.viewDetails"]').first().click(); - } else { - cy.get('[data-testid="table-menu-button--actions.viewDetails"]').first().click(); - } +When('open details of created {string}', () => { + cy.wait(2000); + cy.get('[data-testid="table-menu-button"]').first().click({ force: true }); //the first investigation will be opened + if (!(cy.get('[data-testid="table-menu-button--actions.viewDetails"]').should('exist'))) { //this is necessary because sometimes the page reload and the first click disappear + cy.get('[data-testid="table-menu-button"]').first().click(); + cy.get('[data-testid="table-menu-button--actions.viewDetails"]').first().click(); + } else { + cy.get('[data-testid="table-menu-button--actions.viewDetails"]').first().click(); + } }); -When("user confirm cancellation of selected {string}", function(notificationType) { +When('user confirm cancellation of selected {string}', function(notificationType: string) { cy.get('[class="mdc-dialog__container"]').find('.mdc-checkbox').click(); cy.get('span').contains('Confirm cancellation').click(); }); -When("user {string} selected {string}", function(action) { +When('user {string} selected {string}', function(action: string) { //within opened detail view of quality investigation switch (action) { - case 'approve': { - cy.get('div').contains('Approve').click(); - break; - } - case 'cancel': { - cy.get('div').contains('Cancel').click(); - break; - } - case 'close': { - cy.get('div').contains('Close').click(); - break; - } - case 'acknowledge': { - cy.get('div').contains('Acknowledge').click(); - break; - } - case 'accept': { - cy.get('div').contains('Accept').click(); - break; - } - case 'decline': { - cy.get('div').contains('Decline').click(); - break; - } - default: { - throw new Error("Set action '" + action + "' is not one of valid actions [approve, cancel, close, acknowledge, accept, decline]."); - break; - } + case 'edit': { + cy.get('[data-testid="edit-button-icon"]').click(); + break; + } + case 'approve': { + cy.get('[data-testid="approve-button-icon"]').click(); + break; + } + case 'cancel': { + cy.get('[data-testid="cancel-button-icon"]').click(); + break; + } + case 'close': { + cy.get('[data-testid="close-button-icon"]').click(); + break; + } + case 'acknowledge': { + cy.get('[data-testid="acknowledge-button-icon"]').click(); + break; + } + case 'accept': { + cy.get('[data-testid="accept-button-icon"]').click(); + break; + } + case 'decline': { + cy.get('[data-testid="decline-button-icon"]').click(); + break; + } + default: { + throw new Error('Set action \'' + action + '\' is not one of valid actions [approve, cancel, close, acknowledge, accept, decline].'); + break; + } } }); -When("user confirm approval of selected {string}", function(action) { +When('user confirm approval of selected {string}', function(action: string) { cy.get('app-confirm').find('span').contains('Approve').click(); }); -Then("informations for selected investigation are displayed as expected", () => { +Then('informations for selected investigation are displayed as expected', () => { // --- TBD --- include: overview, supplier parts, STATUS }); -Then("selected {string} has been {string} as expected", function(notificationType, expectedStatus) { - switch (expectedStatus) { - case 'canceled': { - cy.get('[title="Cancelled"]').should('be.visible'); - break; - } - case 'approved': { +Then('selected {string} has been {string} as expected', function(notificationType, expectedStatus) { + switch (expectedStatus) { + case 'canceled': { + cy.get('[title="Cancelled"]').should('be.visible'); + break; + } + case 'approved': { + cy.wait(20000); // same as "requested" - cy.get('[title="Requested"]', { timeout: 10000 }).should('be.visible'); - break; - } - case 'accepted': { - cy.get('[title="Accepted"]', { timeout: 10000 }).should('be.visible'); - break; - } - case 'declined': { - cy.get('[title="Declined"]', { timeout: 10000 }).should('be.visible'); - break; - } - case 'acknowledged': { - cy.get('[title="Acknowledged"]', { timeout: 10000 }).should('be.visible'); - break; - } - case 'closed': { - cy.get('[title="Closed"]', { timeout: 10000 }).should('be.visible'); - break; - } - default: { - throw new Error("Set expected status '" + expectedStatus + "' is not one of valid status [canceled, approved, accepted, declined, acknowledged, closed]."); - break; - } + cy.get('[title="Requested"]', { timeout: 30000 }).should('be.visible'); + break; + } + case 'accepted': { + cy.get('[title="Accepted"]', { timeout: 10000 }).should('be.visible'); + break; + } + case 'declined': { + cy.get('[title="Declined"]', { timeout: 10000 }).should('be.visible'); + break; + } + case 'acknowledged': { + cy.get('[title="Acknowledged"]', { timeout: 10000 }).should('be.visible'); + break; + } + case 'closed': { + cy.get('[title="Closed"]', { timeout: 10000 }).should('be.visible'); + break; } + default: { + throw new Error('Set expected status \'' + expectedStatus + '\' is not one of valid status [canceled, approved, accepted, declined, acknowledged, closed].'); + break; + } + } }); -Then("popup for successful {string} has been shown", function(status) { - switch (status) { - case 'cancellation': { - cy.contains(/.*was canceled successfully./i).should('be.visible'); - break; - } - case 'approval': { - cy.contains(/.*was approved successfully./i).should('be.visible'); - break; - } - case 'acceptance': { - cy.contains(/.*was accepted successfully./i).should('be.visible'); - break; - } - case 'declination': { - cy.contains(/.*was declined successfully./i).should('be.visible'); - break; - } - case 'acknowledge': { - cy.contains(/.*was acknowledged successfully./i).should('be.visible'); - break; - } - case 'closure': { - cy.contains(/.*was closed successfully./i).should('be.visible'); - break; - } - default: { - throw new Error("Set expected status '" + status + "' is not one of valid status [cancellation, approval, acceptance, declination, acknowledge, closure]."); - break; - } +Then('popup for successful {string} has been shown', function(status) { + switch (status) { + case 'cancellation': { + cy.contains(/.*was canceled successfully./i).should('be.visible'); + break; + } + case 'approval': { + cy.contains(/.*was approved successfully./i).should('be.visible'); + break; + } + case 'acceptance': { + cy.contains(/.*was accepted successfully./i).should('be.visible'); + break; } + case 'declination': { + cy.contains(/.*was declined successfully./i).should('be.visible'); + break; + } + case 'acknowledge': { + cy.contains(/.*was acknowledged successfully./i).should('be.visible'); + break; + } + case 'closure': { + cy.contains(/.*was closed successfully./i).should('be.visible'); + break; + } + case 'edit': { + cy.contains(/.*was updated successfully./i).should('be.visible'); + break; + } + default: { + throw new Error('Set expected status \'' + status + '\' is not one of valid status [cancellation, approval, acceptance, declination, acknowledge, closure].'); + break; + } + } }); -When("selected {string} is not allowed to be {string}", function(notificationType, status) { - switch (status) { - case 'canceled': { - cy.get('div').contains('/^Cancel$/', {matchCase: true}).should('not.exist'); - break; - } - case 'approved': { - cy.get('div').contains('/^Approve$/', {matchCase: true}).should('not.exist'); - break; - } - case 'accepted': { - cy.get('div').contains('/^Accept$/', {matchCase: true}).should('not.exist'); - break; - } - case 'declined': { - cy.get('div').contains('/^Decline$/', {matchCase: true}).should('not.exist'); - break; - } - case 'acknowledged': { - cy.get('div').contains('/^Acknowledge$/', {matchCase: true}).should('not.exist'); - break; - } - case 'closed': { - cy.get('div').contains('/^Close$/', {matchCase: true}).should('not.exist'); - break; - } - default: { - throw new Error("Set status '" + status + "' is not one of valid status [canceled, approved, accepted, declined, acknowledged, closed]."); - break; - } +When('selected {string} is not allowed to be {string}', function(notificationType, status) { + switch (status) { + case 'canceled': { + cy.get('div').contains('/^Cancel$/', { matchCase: true }).should('not.exist'); + break; + } + case 'approved': { + cy.get('div').contains('/^Approve$/', { matchCase: true }).should('not.exist'); + break; } + case 'accepted': { + cy.get('div').contains('/^Accept$/', { matchCase: true }).should('not.exist'); + break; + } + case 'declined': { + cy.get('div').contains('/^Decline$/', { matchCase: true }).should('not.exist'); + break; + } + case 'acknowledged': { + cy.get('div').contains('/^Acknowledge$/', { matchCase: true }).should('not.exist'); + break; + } + case 'closed': { + cy.get('div').contains('/^Close$/', { matchCase: true }).should('not.exist'); + break; + } + default: { + throw new Error('Set status \'' + status + '\' is not one of valid status [canceled, approved, accepted, declined, acknowledged, closed].'); + break; + } + } }); diff --git a/frontend/package.json b/frontend/package.json index 72ad3a225c..d7f47ffb7d 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "trace-x", - "version": "10.8.0", + "version": "11.0.0", "scripts": { "analyze": "ng build --configuration=production --stats-json && webpack-bundle-analyzer dist/stats.json", "build:prod": "ng build --output-hashing=all --configuration=debugProd --base-href /{baseHrefPlaceholder}/ --deploy-url /{baseHrefPlaceholder}/ ", diff --git a/frontend/scripts/inject-dynamic-env.js b/frontend/scripts/inject-dynamic-env.js index 7b0cbb76a5..e273e8a042 100755 --- a/frontend/scripts/inject-dynamic-env.js +++ b/frontend/scripts/inject-dynamic-env.js @@ -26,7 +26,8 @@ const ENV_VARS_MAPPING = { CATENAX_PORTAL_API_URL: 'apiUrl', CATENAX_PORTAL_BASE_URL: 'baseUrl', CATENAX_PORTAL_URL: 'portalUrl', - GIT_TAG: 'gitTag' + GIT_TAG: 'gitTag', + BPN: 'bpn' }; const ROOT_DIR = '/usr/share/nginx/html'; diff --git a/frontend/src/app/modules/core/api/api.service.ts b/frontend/src/app/modules/core/api/api.service.ts index 1d263e581f..22b2196943 100644 --- a/frontend/src/app/modules/core/api/api.service.ts +++ b/frontend/src/app/modules/core/api/api.service.ts @@ -17,7 +17,7 @@ * under the License. * * SPDX-License-Identifier: Apache-2.0 - ********************************************************************************/ + *********************************************************************************/ import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; import { Injectable } from '@angular/core'; diff --git a/frontend/src/app/modules/core/core.module.ts b/frontend/src/app/modules/core/core.module.ts index b65cb15163..d0971207d7 100644 --- a/frontend/src/app/modules/core/core.module.ts +++ b/frontend/src/app/modules/core/core.module.ts @@ -29,7 +29,6 @@ import { LayoutModule } from '@layout/layout.module'; import { AboutModule } from '@page/about/about.module'; import { AdminModule } from '@page/admin/admin.module'; import { DashboardModule } from '@page/dashboard/dashboard.module'; -import { OtherPartsModule } from '@page/other-parts/other-parts.module'; import { PartsModule } from '@page/parts/parts.module'; import { ToastService } from '@shared/components/toasts/toast.service'; import { I18NextModule } from 'angular-i18next'; @@ -64,7 +63,6 @@ registerLocaleData(localeDe, 'de', localeDeExtra); AboutModule, DashboardModule, PartsModule, - OtherPartsModule, AdminModule, I18NextModule.forRoot(), ], diff --git a/frontend/src/app/modules/core/known-route.ts b/frontend/src/app/modules/core/known-route.ts index 56f968600f..b2425dfa2d 100644 --- a/frontend/src/app/modules/core/known-route.ts +++ b/frontend/src/app/modules/core/known-route.ts @@ -23,7 +23,6 @@ import { NotificationStatusGroup } from '@shared/model/notification.model'; import { PageRoute } from '@shared/model/page-route.model'; export const PARTS_BASE_ROUTE = 'parts'; -export const OTHER_PARTS_BASE_ROUTE = 'otherParts'; export const DASHBOARD_BASE_ROUTE = 'dashboard'; export const ADMIN_BASE_ROUTE = 'admin'; export const ABOUT_BASE_ROUTE = 'about'; @@ -32,7 +31,6 @@ export const NO_PERMISSION_BASE_ROUTE = 'no-permissions'; export const NavigableUrls = [ PARTS_BASE_ROUTE, - OTHER_PARTS_BASE_ROUTE, DASHBOARD_BASE_ROUTE, ADMIN_BASE_ROUTE, ABOUT_BASE_ROUTE, @@ -56,7 +54,7 @@ const getNotificationInboxRoute = ( link: urlType, queryParams: notificationStatusGroup ? { - tabIndex: '0', + tabIndex: notificationStatusGroup === NotificationStatusGroup.RECEIVED ? '1' : '0', } : undefined, }); diff --git a/frontend/src/app/modules/core/layout/header/header.component.html b/frontend/src/app/modules/core/layout/header/header.component.html index f5c4660cb4..45680171b7 100644 --- a/frontend/src/app/modules/core/layout/header/header.component.html +++ b/frontend/src/app/modules/core/layout/header/header.component.html @@ -26,7 +26,6 @@
-
diff --git a/frontend/src/app/modules/core/layout/header/header.component.ts b/frontend/src/app/modules/core/layout/header/header.component.ts index 3b97fcc972..65fbbae6b4 100644 --- a/frontend/src/app/modules/core/layout/header/header.component.ts +++ b/frontend/src/app/modules/core/layout/header/header.component.ts @@ -36,7 +36,6 @@ export class HeaderComponent { dashboard: 'dashboard', about: 'info', parts: 'build', - otherParts: 'commute', inbox: 'inbox', admin: 'apps', }; diff --git a/frontend/src/app/modules/core/layout/layout.routing.ts b/frontend/src/app/modules/core/layout/layout.routing.ts index 1c9ee34a7f..61c03dc06a 100644 --- a/frontend/src/app/modules/core/layout/layout.routing.ts +++ b/frontend/src/app/modules/core/layout/layout.routing.ts @@ -27,7 +27,6 @@ import { NOTIFICATION_BASE_ROUTE, DASHBOARD_BASE_ROUTE, NO_PERMISSION_BASE_ROUTE, - OTHER_PARTS_BASE_ROUTE, PARTS_BASE_ROUTE, } from '@core/known-route'; import { RoleGuard } from '@core/user/role.guard'; @@ -71,15 +70,6 @@ const routes: Routes = [ }, canActivate: [ RoleGuard ], }, - { - path: OTHER_PARTS_BASE_ROUTE, - loadChildren: () => import('@page/other-parts/other-parts.module').then(m => m.OtherPartsModule), - data: { - breadcrumb: 'otherParts', - roles: [ 'user', 'admin' ], - }, - canActivate: [ RoleGuard ], - }, { path: NOTIFICATION_BASE_ROUTE, loadChildren: () => import('@page/notifications/notifications.module').then(m => m.NotificationsModule), diff --git a/frontend/src/app/modules/core/model/calendar-date.model.ts b/frontend/src/app/modules/core/model/calendar-date.model.ts index 1291dc4833..d269cdcd63 100644 --- a/frontend/src/app/modules/core/model/calendar-date.model.ts +++ b/frontend/src/app/modules/core/model/calendar-date.model.ts @@ -41,4 +41,8 @@ export class CalendarDateModel { valueOf() { return this.date; } + + isInitial(): boolean { + return this.date.getFullYear() === 1970; + } } diff --git a/frontend/src/app/modules/page/other-parts/presentation/other-parts.component.scss b/frontend/src/app/modules/core/pagination/pagination.model.ts similarity index 70% rename from frontend/src/app/modules/page/other-parts/presentation/other-parts.component.scss rename to frontend/src/app/modules/core/pagination/pagination.model.ts index 5eee61f5e0..cd8e9e2912 100644 --- a/frontend/src/app/modules/page/other-parts/presentation/other-parts.component.scss +++ b/frontend/src/app/modules/core/pagination/pagination.model.ts @@ -1,7 +1,5 @@ /******************************************************************************** - * Copyright (c) 2022, 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - * Copyright (c) 2022, 2023 ZF Friedrichshafen AG - * Copyright (c) 2022, 2023, 2024 Contributors to the Eclipse Foundation + * Copyright (c) 2024 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. @@ -19,9 +17,5 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -// mat-tab is disabled, need to explicitly reactivate tooltip event -#customer-parts--asPlanned--tab--tooltip--label { - pointer-events: auto; -} - - +export const DEFAULT_PAGE_SIZE = 50 +export const FIRST_PAGE = 0; diff --git a/frontend/src/app/modules/core/user/role.service.ts b/frontend/src/app/modules/core/user/role.service.ts index 2e46166f0f..d8a44e1dcd 100644 --- a/frontend/src/app/modules/core/user/role.service.ts +++ b/frontend/src/app/modules/core/user/role.service.ts @@ -58,11 +58,11 @@ export class RoleService { } - public isAtLeastSupervisor(): boolean { + public isSupervisor(): boolean { return this.hasAccess('supervisor'); } - public isAtLeastUser(): boolean { + public isUser(): boolean { return this.hasAccess('user'); } diff --git a/frontend/src/app/modules/core/user/table-settings.service.spec.ts b/frontend/src/app/modules/core/user/table-settings.service.spec.ts index d1f01ada7f..6e2aed7296 100644 --- a/frontend/src/app/modules/core/user/table-settings.service.spec.ts +++ b/frontend/src/app/modules/core/user/table-settings.service.spec.ts @@ -19,6 +19,8 @@ import { TestBed } from '@angular/core/testing'; import { TableSettingsService } from '@core/user/table-settings.service'; +import { TableType } from '@shared/components/multi-select-autocomplete/table-type.model'; +import { TableViewConfig } from '@shared/components/parts-table/table-view-config.model'; describe('TableSettingsService', () => { let service: TableSettingsService; @@ -35,4 +37,108 @@ describe('TableSettingsService', () => { it('should be created', () => { expect(service).toBeTruthy(); }); + + describe('should correctly initialize the table view settings', () => { + + it('should return PartsAsPlannedConfigurationModel for AS_PLANNED_OWN', () => { + const result: TableViewConfig = service.initializeTableViewSettings(TableType.AS_PLANNED_OWN); + expect(result.displayedColumns.length).toBe(20); + }); + + it('should return PartsAsBuiltConfigurationModel for AS_BUILT_OWN', () => { + const result: TableViewConfig = service.initializeTableViewSettings(TableType.AS_BUILT_OWN); + expect(result.displayedColumns.length).toBe(22); + }); + + it('should return NotificationsSentConfigurationModel for SENT_NOTIFICATION', () => { + const result: TableViewConfig = service.initializeTableViewSettings(TableType.SENT_NOTIFICATION); + expect(result.displayedColumns.length).toBe(10); + }); + + it('should return NotificationsReceivedConfigurationModel for RECEIVED_NOTIFICATION', () => { + const result: TableViewConfig = service.initializeTableViewSettings(TableType.RECEIVED_NOTIFICATION); + expect(result.displayedColumns.length).toBe(10); + }); + }); + + describe('YourService', () => { + + it('should return false if storage is empty', () => { + spyOn(service, 'getStoredTableSettings').and.returnValue(null); + const tableViewConfig: TableViewConfig = { + displayedColumns: [], + filterFormGroup: null, + sortableColumns: {}, + displayFilterColumnMappings: [], + filterColumns: [], + }; + const result = service.storedTableSettingsInvalid(tableViewConfig, TableType.AS_PLANNED_OWN); + expect(result).toBe(false); + }); + + it('should return false if stored columns match displayed columns', () => { + const storage = { + [TableType.AS_PLANNED_OWN]: { + columnsForDialog: [ 'col1', 'col2', 'menu' ], // Sample stored columns + }, + }; + spyOn(service, 'getStoredTableSettings').and.returnValue(storage); + const tableViewConfig: TableViewConfig = { + displayedColumns: [], + filterFormGroup: null, + sortableColumns: {}, + displayFilterColumnMappings: [], + filterColumns: [], + }; + tableViewConfig.displayedColumns = [ 'col1', 'col2', 'menu' ]; // Sample displayed columns + const result = service.storedTableSettingsInvalid(tableViewConfig, TableType.AS_PLANNED_OWN); + expect(result).toBe(false); + }); + + it('should return true if stored columns do not match displayed columns', () => { + const storage = { + [TableType.AS_PLANNED_OWN]: { + columnsForDialog: [ 'col1', 'col2', 'menu' ], // Sample stored columns + }, + }; + spyOn(service, 'getStoredTableSettings').and.returnValue(storage); + const tableViewConfig: TableViewConfig = { + displayedColumns: [], + filterFormGroup: null, + sortableColumns: {}, + displayFilterColumnMappings: [], + filterColumns: [], + }; + tableViewConfig.displayedColumns = [ 'col1', 'col3', 'menu' ]; // Different displayed columns + const result = service.storedTableSettingsInvalid(tableViewConfig, TableType.AS_PLANNED_OWN); + expect(result).toBe(true); + }); + + it('should show warning toast and remove storage if settings are invalid', () => { + const storage = { + [TableType.AS_PLANNED_OWN]: { + columnsForDialog: [ 'col1', 'col2', 'menu' ], // Sample stored columns + }, + }; + spyOn(service, 'getStoredTableSettings').and.returnValue(storage); + spyOn(service['toastService'], 'warning'); + spyOn(localStorage, 'removeItem'); + + const tableViewConfig: TableViewConfig = { + displayedColumns: [], + filterFormGroup: null, + sortableColumns: {}, + displayFilterColumnMappings: [], + filterColumns: [], + }; + tableViewConfig.displayedColumns = [ 'col1', 'col3', 'menu' ]; // Different displayed columns + service.storedTableSettingsInvalid(tableViewConfig, TableType.AS_PLANNED_OWN); + + expect(service['toastService'].warning).toHaveBeenCalledWith('table.tableSettings.invalid', 10000); + expect(localStorage.removeItem).toHaveBeenCalled(); + }); + }); + + + }); diff --git a/frontend/src/app/modules/core/user/table-settings.service.ts b/frontend/src/app/modules/core/user/table-settings.service.ts index 847646dd4d..ae3d6b893e 100644 --- a/frontend/src/app/modules/core/user/table-settings.service.ts +++ b/frontend/src/app/modules/core/user/table-settings.service.ts @@ -19,7 +19,12 @@ import { Injectable } from '@angular/core'; import { TableType } from '@shared/components/multi-select-autocomplete/table-type.model'; +import { NotificationsReceivedConfigurationModel } from '@shared/components/parts-table/notifications-received-configuration.model'; +import { NotificationsSentConfigurationModel } from '@shared/components/parts-table/notifications-sent-configuration.model'; +import { PartsAsBuiltConfigurationModel } from '@shared/components/parts-table/parts-as-built-configuration.model'; +import { PartsAsPlannedConfigurationModel } from '@shared/components/parts-table/parts-as-planned-configuration.model'; import { TableViewConfig } from '@shared/components/parts-table/table-view-config.model'; +import { ToastService } from '@shared/components/toasts/toast.service'; import { Subject } from 'rxjs'; @Injectable({ @@ -29,6 +34,9 @@ export class TableSettingsService { private settingsKey = 'TableViewSettings'; private changeEvent = new Subject(); + constructor(private readonly toastService: ToastService) { + } + storeTableSettings(tableSettingsList: any): void { // before setting anything, all maps in new tableSettingList should be stringified Object.keys(tableSettingsList).forEach(tableSetting => { @@ -80,6 +88,7 @@ export class TableSettingsService { } } if (isInvalid) { + this.toastService.warning('table.tableSettings.invalid', 10000); localStorage.removeItem(this.settingsKey); } return isInvalid; @@ -92,4 +101,18 @@ export class TableSettingsService { getEvent() { return this.changeEvent.asObservable(); } + + initializeTableViewSettings(tableType: TableType): TableViewConfig { + switch (tableType) { + case TableType.AS_PLANNED_OWN: + return new PartsAsPlannedConfigurationModel().filterConfiguration(); + case TableType.AS_BUILT_OWN: + return new PartsAsBuiltConfigurationModel().filterConfiguration(); + case TableType.SENT_NOTIFICATION: + return new NotificationsSentConfigurationModel().filterConfiguration(); + case TableType.RECEIVED_NOTIFICATION: + return new NotificationsReceivedConfigurationModel().filterConfiguration(); + } + } + } diff --git a/frontend/src/app/modules/page/about/presentation/about.component.html b/frontend/src/app/modules/page/about/presentation/about.component.html index 05275d54ed..5904568f8a 100644 --- a/frontend/src/app/modules/page/about/presentation/about.component.html +++ b/frontend/src/app/modules/page/about/presentation/about.component.html @@ -22,24 +22,24 @@
-

{{ name }} +

{{ name }} open_in_new

-
+
License {{ license }} open_in_new
-
+
Notice open_in_new
-
+
Source open_in_new diff --git a/frontend/src/app/modules/page/admin/presentation/admin.component.html b/frontend/src/app/modules/page/admin/presentation/admin.component.html index 48407d1dc7..aa3276fc37 100644 --- a/frontend/src/app/modules/page/admin/presentation/admin.component.html +++ b/frontend/src/app/modules/page/admin/presentation/admin.component.html @@ -36,13 +36,14 @@ -
+
diff --git a/frontend/src/app/modules/page/admin/presentation/bpn-configuration/bpn-configuration.component.html b/frontend/src/app/modules/page/admin/presentation/bpn-configuration/bpn-configuration.component.html index b036e791d3..62ce04611a 100644 --- a/frontend/src/app/modules/page/admin/presentation/bpn-configuration/bpn-configuration.component.html +++ b/frontend/src/app/modules/page/admin/presentation/bpn-configuration/bpn-configuration.component.html @@ -32,13 +32,6 @@
-
- {{ 'actions.add' | i18n }} + {{ 'actions.add' | i18n }}
@@ -76,10 +69,24 @@ variant="raised" color="primary" [isDisabled]="!(info.deleted.length + info.added.length + info.changed.length)" + onkeydown="saveData()" (click)="saveData()" > {{ 'actions.saveChanges' | i18n }} + +
+ +
+ +
@@ -93,11 +100,13 @@

{{ 'pageAdmin.bpnConfig.newEntries' | i18n }}

[label]="'pageAdmin.bpnConfig.bpn' | i18n" class="bpn-config--input" formControlName="bpn" + [isDisabled]="true" > {{ 'pageAdmin.bpnConfig.newEntries' | i18n }} color="accent" variant="raised" > - {{ 'actions.remove' | i18n }} @@ -124,7 +133,7 @@

{{ 'pageAdmin.bpnConfig.existingEntries' | i18n }}

{{ 'pageAdmin.bpnConfig.existingEntries' | i18n }} color="warn" variant="raised" > - {{ + {{ 'actions.delete' | i18n }} diff --git a/frontend/src/app/modules/page/admin/presentation/bpn-configuration/bpn-configuration.component.scss b/frontend/src/app/modules/page/admin/presentation/bpn-configuration/bpn-configuration.component.scss index 781cbfe83a..d52c53b390 100644 --- a/frontend/src/app/modules/page/admin/presentation/bpn-configuration/bpn-configuration.component.scss +++ b/frontend/src/app/modules/page/admin/presentation/bpn-configuration/bpn-configuration.component.scss @@ -39,7 +39,8 @@ } .bpn-config--search { - padding: 10px 20px; + margin-top: 20px; + padding: 10px 20px 0 20px; width: 90%; } @@ -48,7 +49,6 @@ } .bpn--container { - margin-top: 20px; width: 100%; } diff --git a/frontend/src/app/modules/page/admin/presentation/bpn-configuration/bpn-configuration.component.spec.ts b/frontend/src/app/modules/page/admin/presentation/bpn-configuration/bpn-configuration.component.spec.ts index ae566fec08..21b680407b 100644 --- a/frontend/src/app/modules/page/admin/presentation/bpn-configuration/bpn-configuration.component.spec.ts +++ b/frontend/src/app/modules/page/admin/presentation/bpn-configuration/bpn-configuration.component.spec.ts @@ -19,10 +19,10 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { renderComponent } from '@tests/test-render.utils'; import { AdminModule } from '@page/admin/admin.module'; -import { fireEvent, screen, waitFor } from '@testing-library/angular'; import { BpnConfigurationComponent } from '@page/admin/presentation/bpn-configuration/bpn-configuration.component'; +import { fireEvent, screen, waitFor } from '@testing-library/angular'; +import { renderComponent } from '@tests/test-render.utils'; import { sleepForTests } from '../../../../../../test'; describe('BpnConfigurationComponent', () => { @@ -43,7 +43,7 @@ describe('BpnConfigurationComponent', () => { it('should validate bpn', async () => { await renderBpnConfigurationComponent(); - const inputElement = (await waitFor(() => screen.getByTestId('BaseInputElement-1'))) as HTMLInputElement; + const inputElement = (await waitFor(() => screen.getByTestId('BaseInputElement-0'))) as HTMLInputElement; const buttonElement = (await waitFor(() => screen.getByText('actions.add'))) as HTMLButtonElement; fireEvent.click(buttonElement); @@ -62,7 +62,7 @@ describe('BpnConfigurationComponent', () => { it('should validate url', async () => { await renderBpnConfigurationComponent(); - const inputElement = (await waitFor(() => screen.getByTestId('BaseInputElement-2'))) as HTMLInputElement; + const inputElement = (await waitFor(() => screen.getByTestId('BaseInputElement-1'))) as HTMLInputElement; const buttonElement = (await waitFor(() => screen.getByText('actions.add'))) as HTMLButtonElement; fireEvent.click(buttonElement); @@ -87,8 +87,8 @@ describe('BpnConfigurationComponent', () => { it('should add valid data', async () => { await renderBpnConfigurationComponent(); - const bpnInputElement = (await waitFor(() => screen.getByTestId('BaseInputElement-1'))) as HTMLInputElement; - const urlInputElement = (await waitFor(() => screen.getByTestId('BaseInputElement-2'))) as HTMLInputElement; + const bpnInputElement = (await waitFor(() => screen.getByTestId('BaseInputElement-0'))) as HTMLInputElement; + const urlInputElement = (await waitFor(() => screen.getByTestId('BaseInputElement-1'))) as HTMLInputElement; const buttonElement = (await waitFor(() => screen.getByText('actions.add'))) as HTMLButtonElement; expect(await waitFor(() => screen.queryByTestId('BaseInputElement-27'))).not.toBeInTheDocument(); @@ -212,7 +212,7 @@ describe('BpnConfigurationComponent', () => { it('should search', async () => { await renderBpnConfigurationComponent(); - const searchInputElement = (await waitFor(() => screen.getByTestId('BaseInputElement-0'))) as HTMLInputElement; + const searchInputElement = (await waitFor(() => screen.getByTestId('BaseInputElement-2'))) as HTMLInputElement; const urlInputElement = (await waitFor(() => screen.getByTestId('BaseInputElement-3'))) as HTMLInputElement; const firstBpnInputElement = (await waitFor(() => screen.getByTestId('BaseInputElement-3'))) as HTMLInputElement; const originalBpnValue = firstBpnInputElement.value; diff --git a/frontend/src/app/modules/page/admin/presentation/contracts/contract-detail/contract-detail.component.html b/frontend/src/app/modules/page/admin/presentation/contracts/contract-detail/contract-detail.component.html index c416a8ba3c..7b108ca8dd 100644 --- a/frontend/src/app/modules/page/admin/presentation/contracts/contract-detail/contract-detail.component.html +++ b/frontend/src/app/modules/page/admin/presentation/contracts/contract-detail/contract-detail.component.html @@ -2,6 +2,7 @@
@@ -26,12 +27,14 @@
{{'pageAdmin.contracts.jsonViewer' | i18n }} {{'pageAdmin.contracts.jsonTreeViewer' | i18n}} @@ -39,6 +42,7 @@
diff --git a/frontend/src/app/modules/page/admin/presentation/contracts/contracts.component.html b/frontend/src/app/modules/page/admin/presentation/contracts/contracts.component.html index c9ef2218b8..07c88ef5e6 100644 --- a/frontend/src/app/modules/page/admin/presentation/contracts/contracts.component.html +++ b/frontend/src/app/modules/page/admin/presentation/contracts/contracts.component.html @@ -16,6 +16,7 @@ {{ 'pageAdmin.importJson.Drag_and_Drop' | i18n }} upload_file

{{file.name}}

{{ 'pageAdmin.importJson.clear_file' | i18n }} {{ 'pageAdmin.importJson.upload_file' | i18n }}
@@ -51,6 +53,7 @@

{{ 'pageAdmin.importJson.Drag_and_Drop' | i18n }}

{{'pageAdmin.importStatus.uploadMore' | i18n}}

{{ 'pageAdmin.importStatus.importStatus' | i18n }}:

diff --git a/frontend/src/app/modules/page/dashboard/presentation/dashboard.component.html b/frontend/src/app/modules/page/dashboard/presentation/dashboard.component.html index 522bc44916..4094e7ec23 100644 --- a/frontend/src/app/modules/page/dashboard/presentation/dashboard.component.html +++ b/frontend/src/app/modules/page/dashboard/presentation/dashboard.component.html @@ -78,7 +78,7 @@

find_in_page - {{ 'pageTitle.alerts' | i18n }} + Top 5 {{ 'pageTitle.alerts' | i18n }}

remove_red_eye - {{ 'commonAlert.viewAll' | i18n }} + {{ 'commonAlert.viewAll' | i18n }} {{ '(' + ((investigationsMetricData[1]?.value | async) + (alertsMetricData[1]?.value | async)) + ')' }}
@@ -116,10 +117,12 @@

@@ -139,13 +142,14 @@

remove_red_eye - {{ 'commonAlert.viewAll' | i18n }} + {{ 'commonAlert.viewAll' | i18n }} {{ '(' + ((investigationsMetricData[0]?.value | async) + (alertsMetricData[0]?.value | async)) + ')' }}

@@ -155,6 +159,7 @@

; - public readonly alertLink: string; - public readonly alertParams: Record; + public readonly notificationsLink: string; + public readonly queuedAndRequestedNotificationsTabParam: Record; + public readonly receivedNotificationsTabParam: Record; public partsMetricData: MetricData[]; public otherPartsMetricData: MetricData[]; @@ -67,8 +68,9 @@ export class DashboardComponent implements OnInit, OnDestroy { queryParams: alertQueryParams, } = getRoute(NOTIFICATION_BASE_ROUTE, NotificationStatusGroup.QUEUED_AND_REQUESTED); - this.alertLink = alertLink; - this.alertParams = alertQueryParams; + this.notificationsLink = alertLink; + this.queuedAndRequestedNotificationsTabParam = alertQueryParams; + this.receivedNotificationsTabParam = getRoute(NOTIFICATION_BASE_ROUTE, NotificationStatusGroup.RECEIVED).queryParams; this.partsMetricData = [ { @@ -90,12 +92,12 @@ export class DashboardComponent implements OnInit, OnDestroy { this.investigationsMetricData = [ { metricName: 'amountReceived', - value: this.dashboardStats$.pipe(map(dashboardStats => dashboardStats.data.receivedActiveInvestigations)), + value: this.dashboardStats$.pipe(map(dashboardStats => dashboardStats?.data?.receivedActiveInvestigations)), metricUnit: 'investigations', }, { metricName: 'amountCreated', - value: this.dashboardStats$.pipe(map(dashboardStats => dashboardStats.data.sentActiveInvestigations)), + value: this.dashboardStats$.pipe(map(dashboardStats => dashboardStats?.data?.sentActiveInvestigations)), metricUnit: 'investigations', }, ]; @@ -104,12 +106,12 @@ export class DashboardComponent implements OnInit, OnDestroy { this.alertsMetricData = [ { metricName: 'amountReceived', - value: this.dashboardStats$.pipe(map(dashboardStats => dashboardStats.data.receivedActiveAlerts)), + value: this.dashboardStats$.pipe(map(dashboardStats => dashboardStats?.data?.receivedActiveAlerts)), metricUnit: 'alerts', }, { metricName: 'amountCreated', - value: this.dashboardStats$.pipe(map(dashboardStats => dashboardStats.data.sentActiveAlerts)), + value: this.dashboardStats$.pipe(map(dashboardStats => dashboardStats?.data?.sentActiveAlerts)), metricUnit: 'alerts', }, ]; diff --git a/frontend/src/app/modules/page/error-page/presentation/error-page.component.ts b/frontend/src/app/modules/page/error-page/presentation/error-page.component.ts index 6c347edb7c..0b15ef8581 100644 --- a/frontend/src/app/modules/page/error-page/presentation/error-page.component.ts +++ b/frontend/src/app/modules/page/error-page/presentation/error-page.component.ts @@ -52,7 +52,7 @@ export class ErrorPageComponent { }); // if user has no sufficient permissions to use this app - if (!roleService.isAtLeastUser() && !roleService.isAdmin()) { + if (!roleService.isUser() && !roleService.isAdmin()) { this.actionUrl = ''; this.actionLabel = ''; this.showSignOutButton = true; diff --git a/frontend/src/app/modules/page/notifications/core/notifications.facade.ts b/frontend/src/app/modules/page/notifications/core/notifications.facade.ts index 79734f395b..a5dfed8d9f 100644 --- a/frontend/src/app/modules/page/notifications/core/notifications.facade.ts +++ b/frontend/src/app/modules/page/notifications/core/notifications.facade.ts @@ -17,20 +17,22 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { Injectable } from '@angular/core'; -import { NotificationsState } from '@page/notifications/core/notifications.state'; -import { provideDataObject } from '@page/parts/core/parts.helper'; -import { NotificationChannel } from '@shared/components/multi-select-autocomplete/table-type.model'; -import { TableHeaderSort } from '@shared/components/table/table.model'; +import {Injectable} from '@angular/core'; +import {NotificationsState} from '@page/notifications/core/notifications.state'; +import {provideDataObject} from '@page/parts/core/parts.helper'; +import {NotificationChannel} from '@shared/components/multi-select-autocomplete/table-type.model'; +import {TableHeaderSort} from '@shared/components/table/table.model'; import { Notification, NotificationDeeplinkFilter, Notifications, NotificationStatus, } from '@shared/model/notification.model'; -import { View } from '@shared/model/view.model'; -import { NotificationService } from '@shared/service/notification.service'; -import { Observable, Subscription } from 'rxjs'; +import {Severity} from '@shared/model/severity.model'; +import {View} from '@shared/model/view.model'; +import {NotificationService} from '@shared/service/notification.service'; +import {Observable, Subscription} from 'rxjs'; +import {DateTimeString} from "@shared/components/dateTime/dateTime.component"; @Injectable() export class NotificationsFacade { @@ -51,7 +53,7 @@ export class NotificationsFacade { return this.notificationsState.notificationsQueuedAndRequested$; } - public getNotification(id: string): Observable { + public getNotificationById(id: string): Observable { return this.notificationService.getNotificationById(id); } @@ -104,4 +106,13 @@ export class NotificationsFacade { public declineNotification(notificationId: string, reason: string): Observable { return this.notificationService.updateNotification(notificationId, NotificationStatus.DECLINED, reason); } + + public editNotification(notificationId: string, title: string, bpn: string, severity: string, targetDate: string, description: string, affectedPartIds: string[]): Observable { + return this.notificationService.editNotification(notificationId, title, bpn, severity, targetDate, description, affectedPartIds); + } + + public createNotification(partIds: string[], type: string, title: string, bpn: string, severity: Severity, targetDate: DateTimeString, description: string): Observable { + return this.notificationService.createNotification(partIds, description, severity, bpn, type, title, targetDate) + } + } diff --git a/frontend/src/app/modules/page/notifications/detail/edit/notification-edit.component.html b/frontend/src/app/modules/page/notifications/detail/edit/notification-edit.component.html new file mode 100644 index 0000000000..10c9e42ba6 --- /dev/null +++ b/frontend/src/app/modules/page/notifications/detail/edit/notification-edit.component.html @@ -0,0 +1,184 @@ + + +
+
+ +
+ arrow_back + {{ 'actions.goBack' | i18n }} +
+ +
+
+
+ +
+ save +
+ +
+
+
+ +
+ + + + + +
+ + + +

+ {{ 'requestNotification.affectedParts' | i18n }} +

+ + +
+ + + + +
+ + +
+ + + +
+ + + + + +

+ {{ 'requestNotification.unAffectedParts' | i18n }} +

+ + +
+ + + + +
+ + +
+ + +
+ + +
+
+ + +

{{ 'dataLoading.error' | i18n }}

+

{{ view.error | json }}

+ + + + + diff --git a/frontend/src/app/modules/page/notifications/detail/edit/notification-edit.component.scss b/frontend/src/app/modules/page/notifications/detail/edit/notification-edit.component.scss new file mode 100644 index 0000000000..7d10449ca0 --- /dev/null +++ b/frontend/src/app/modules/page/notifications/detail/edit/notification-edit.component.scss @@ -0,0 +1,73 @@ +/******************************************************************************** + * Copyright (c) 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 + ********************************************************************************/ + +app-notification-new-request{ + padding: 16px 16px 0; +} +.parts-card-wrapper{ + display:flex; + flex-direction: column; + gap: 2vh; + width:48%; +} +.parts-card{ + height: 50%; +} +.notification-request-card{ + height: 100%; + width:48%; +} +.detail--header { + display: flex; + justify-content: space-between; +} + +.detail--wrapper { + display: flex; + flex-wrap: wrap; + justify-content: space-around; +} + +.detail--action { + display: flex; +} + +.detail--action--button { + cursor: not-allowed; +} + +.detail--wrapper__supplier { + margin-top: 1.5rem; +} + +.detail--table_wrapper--notification { + margin-left: 1.5rem; + + @media (max-width: 1024px) { + margin-left: 0; + margin-top: 1.5rem; + } +} + +.alert--semantic-model-id__icon { + width: 14px; + height: 14px; + font-size: 14px; + margin-left: 0.5rem; +} diff --git a/frontend/src/app/modules/page/notifications/detail/edit/notification-edit.component.spec.ts b/frontend/src/app/modules/page/notifications/detail/edit/notification-edit.component.spec.ts new file mode 100644 index 0000000000..86b9387184 --- /dev/null +++ b/frontend/src/app/modules/page/notifications/detail/edit/notification-edit.component.spec.ts @@ -0,0 +1,329 @@ +/******************************************************************************** + * Copyright (c) 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 + ********************************************************************************/ + +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { ActivatedRoute } from '@angular/router'; +import { DEFAULT_PAGE_SIZE, FIRST_PAGE } from '@core/pagination/pagination.model'; +import { bpnRegex } from '@page/admin/presentation/bpn-configuration/bpn-configuration.component'; +import { NotificationsFacade } from '@page/notifications/core/notifications.facade'; +import { NotificationEditComponent } from '@page/notifications/detail/edit/notification-edit.component'; +import { NotificationsModule } from '@page/notifications/notifications.module'; +import { MainAspectType } from '@page/parts/model/mainAspectType.enum'; +import { Owner } from '@page/parts/model/owner.enum'; +import { BaseInputHelper } from '@shared/abstraction/baseInput/baseInput.helper'; +import { PartsAssembler } from '@shared/assembler/parts.assembler'; +import { toAssetFilter } from '@shared/helper/filter-helper'; +import { Notification, NotificationType } from '@shared/model/notification.model'; +import { Severity } from '@shared/model/severity.model'; +import { NotificationService } from '@shared/service/notification.service'; +import { screen } from '@testing-library/angular'; +import { renderComponent } from '@tests/test-render.utils'; +import { of } from 'rxjs'; +import { + MOCK_part_1, + MOCK_part_2, + MOCK_part_3, +} from '../../../../../mocks/services/parts-mock/partsAsBuilt/partsAsBuilt.test.model'; + +describe('NotificationEditComponent', () => { + + const renderNotificationEditComponent = async (useParamMap: boolean, mock: any, id?: string) => { + + const paramMapValue = useParamMap ? { get: () => id || 'id-2' } : { + get: () => { + }, + }; + + return await renderComponent(NotificationEditComponent, { + imports: [ NotificationsModule ], + providers: [ + NotificationService, + { + provide: ActivatedRoute, + useValue: { + snapshot: { + paramMap: paramMapValue, + queryParams: NotificationType.INVESTIGATION, + url: "https://test.net/inbox/97/edit" + }, + queryParams: of({ pageNumber: 0, tabIndex: 0 }), + }, + }, + { + provide: NotificationsFacade, + useValue: mock, + }, + + ], + }); + }; + + + it('should render component with form', async () => { + + const notification: Notification = { + assetIds: [], + createdBy: '', + type: NotificationType.INVESTIGATION, + createdByName: '', + createdDate: undefined, + description: '', + isFromSender: false, + reason: undefined, + sendTo: '', + sendToName: '', + severity: undefined, + status: undefined, + title: '', + id: 'id-1', + }; + + const notificationsFacadeMock = jasmine.createSpyObj('notificationsFacade', [ 'getNotification' ]); + notificationsFacadeMock.getNotification.and.returnValue(of({ notification })); + + await renderNotificationEditComponent(true, notificationsFacadeMock, 'id-1'); + const notificationRequestComponent = screen.queryByTestId('app-notification-new-request'); + const affectedParts = screen.queryByTestId('affectedParts'); + expect(notificationRequestComponent).toBeInTheDocument(); + expect(affectedParts).toBeInTheDocument(); + + }); + it('should remove affected parts to affectedPartIds and clear temporaryAffectedParts', async () => { + + const notification: Notification = { + assetIds: [], + createdBy: '', + type: NotificationType.INVESTIGATION, + createdByName: '', + createdDate: undefined, + description: '', + isFromSender: false, + reason: undefined, + sendTo: '', + sendToName: '', + severity: undefined, + status: undefined, + title: '', + id: 'id-1', + }; + + const notificationsFacadeMock = jasmine.createSpyObj('notificationsFacade', [ 'getNotification' ]); + notificationsFacadeMock.getNotification.and.returnValue(of({ notification })); + + const { fixture } = await renderNotificationEditComponent(true, notificationsFacadeMock, 'id-1'); + const { componentInstance } = fixture; + + let firstPart = PartsAssembler.assemblePart(MOCK_part_1, MainAspectType.AS_BUILT); + let secondPart = PartsAssembler.assemblePart(MOCK_part_2, MainAspectType.AS_BUILT); + + firstPart.id = 'part2'; + secondPart.id = 'part3'; + + // Arrange + componentInstance.temporaryAffectedPartsForRemoval = [ firstPart, secondPart ]; // Initialize temporaryAffectedPartsForRemoval + componentInstance.affectedPartIds = [ 'part1', 'part2', 'part3', 'part4' ]; // Initialize affectedPartIds + + + // Act + componentInstance.removeAffectedParts(); // Call the method to be tested + + // Assert + // Check if all parts from temporaryAffectedParts are added to affectedPartIds + expect(componentInstance.affectedPartIds).toEqual([ 'part1', 'part4' ]); + // Check if temporaryAffectedParts is cleared + expect(componentInstance.temporaryAffectedPartsForRemoval).toEqual([]); + }); + + it('should add affected parts to affectedPartIds and clear temporaryAffectedParts', async () => { + + const notification: Notification = { + assetIds: [], + createdBy: '', + type: NotificationType.INVESTIGATION, + createdByName: '', + createdDate: undefined, + description: '', + isFromSender: false, + reason: undefined, + sendTo: '', + sendToName: '', + severity: undefined, + status: undefined, + title: '', + id: 'id-1', + }; + + const notificationsFacadeMock = jasmine.createSpyObj('notificationsFacade', [ 'getNotification' ]); + notificationsFacadeMock.getNotification.and.returnValue(of({ notification })); + + const { fixture } = await renderNotificationEditComponent(true, notificationsFacadeMock, 'id-1'); + const { componentInstance } = fixture; + + + let firstPart = PartsAssembler.assemblePart(MOCK_part_1, MainAspectType.AS_BUILT); + let secondPart = PartsAssembler.assemblePart(MOCK_part_2, MainAspectType.AS_BUILT); + let thirdPart = PartsAssembler.assemblePart(MOCK_part_3, MainAspectType.AS_BUILT); + firstPart.id = 'part2'; + secondPart.id = 'part3'; + thirdPart.id = 'part1'; + + // Arrange + componentInstance.temporaryAffectedParts = [ thirdPart, firstPart, secondPart ]; // Initialize temporaryAffectedParts + componentInstance.affectedPartIds = [ 'part2' ]; // Initialize affectedPartIds + + // Act + componentInstance.addAffectedParts(); // Call the method to be tested + + // Assert + // Check if all parts from temporaryAffectedParts are added to affectedPartIds + expect(componentInstance.affectedPartIds).toEqual([ 'part2', 'part1', 'part3' ]); + // Check if temporaryAffectedParts is cleared + expect(componentInstance.temporaryAffectedParts).toEqual([]); + }); + + it('should set supplier parts for investigation', async () => { + + const notification: Notification = { + assetIds: [], + createdBy: '', + type: NotificationType.INVESTIGATION, + createdByName: '', + createdDate: undefined, + description: '', + isFromSender: false, + reason: undefined, + sendTo: '', + sendToName: '', + severity: undefined, + status: undefined, + title: '', + id: 'abc', + }; + const notificationsFacadeMock = jasmine.createSpyObj('notificationsFacade', [ 'getNotification' ]); + notificationsFacadeMock.getNotification.and.returnValue(of({ notification })); + const { fixture } = await renderNotificationEditComponent(true, notificationsFacadeMock, 'id-1'); + const { componentInstance } = fixture; + + const assetFilterAffected = {excludeIds: [], ids: ['1'], owner: Owner.SUPPLIER}; + const assetFilterAvailable = {excludeIds: ['1'], ids: [], owner: Owner.SUPPLIER}; + + componentInstance.affectedPartIds= ['1']; + + + spyOn(componentInstance['ownPartsFacade'], 'setPartsAsBuilt'); + spyOn(componentInstance['ownPartsFacade'], 'setPartsAsBuiltSecond'); + componentInstance['setAvailablePartsBasedOnNotificationType'](notification, assetFilterAvailable); + componentInstance['setAffectedPartsBasedOnNotificationType'](notification, assetFilterAffected); + + expect(componentInstance['ownPartsFacade'].setPartsAsBuilt).toHaveBeenCalledWith(FIRST_PAGE, DEFAULT_PAGE_SIZE, componentInstance.tableAsBuiltSortList, toAssetFilter(assetFilterAvailable, true)); + expect(componentInstance['ownPartsFacade'].setPartsAsBuiltSecond).toHaveBeenCalledWith(FIRST_PAGE, DEFAULT_PAGE_SIZE, componentInstance.tableAsBuiltSortList, toAssetFilter(assetFilterAffected, true)); + + }); + + + it('should set own parts as built for available part subscription with alerts', async () => { + + const notification: Notification = { + assetIds: [], + createdBy: '', + type: NotificationType.ALERT, + createdByName: '', + createdDate: undefined, + description: '', + isFromSender: false, + reason: undefined, + sendTo: '', + sendToName: '', + severity: undefined, + status: undefined, + title: '', + id: 'abc', + }; + + const notificationsFacadeMock = jasmine.createSpyObj('notificationsFacade', [ 'getNotification' ]); + notificationsFacadeMock.getNotification.and.returnValue(of({ notification })); + + const { fixture } = await renderNotificationEditComponent(true, notificationsFacadeMock, 'id-1'); + const { componentInstance } = fixture; + + const assetFilterAffected = {excludeIds: [], ids: ['1'], owner: Owner.OWN}; + const assetFilterAvailable = {excludeIds: ['1'], ids: [], owner: Owner.OWN}; + + componentInstance.affectedPartIds= ['1']; + + spyOn(componentInstance['ownPartsFacade'], 'setPartsAsBuilt'); + spyOn(componentInstance['ownPartsFacade'], 'setPartsAsBuiltSecond'); + componentInstance['setAvailablePartsBasedOnNotificationType'](notification, assetFilterAvailable); + componentInstance['setAffectedPartsBasedOnNotificationType'](notification, assetFilterAffected); + + expect(componentInstance['ownPartsFacade'].setPartsAsBuilt).toHaveBeenCalledWith(FIRST_PAGE, DEFAULT_PAGE_SIZE, componentInstance.tableAsBuiltSortList, toAssetFilter(assetFilterAvailable, true)); + expect(componentInstance['ownPartsFacade'].setPartsAsBuiltSecond).toHaveBeenCalledWith(FIRST_PAGE, DEFAULT_PAGE_SIZE, componentInstance.tableAsBuiltSortList, toAssetFilter(assetFilterAffected, true)); + + }); + + it('should correctly update form', async () => { + + const notification: Notification = { + assetIds: [], + createdBy: '', + type: NotificationType.ALERT, + createdByName: '', + createdDate: undefined, + description: '', + isFromSender: false, + reason: undefined, + sendTo: '', + sendToName: '', + severity: undefined, + status: undefined, + title: '', + id: 'abc', + }; + + const notificationsFacadeMock = jasmine.createSpyObj('notificationsFacade', [ 'getNotification' ]); + notificationsFacadeMock.getNotification.and.returnValue(of({ notification })); + + const { fixture } = await renderNotificationEditComponent(true, notificationsFacadeMock, 'id-1'); + const { componentInstance } = fixture; + + + const formGroup = new FormGroup({ + 'title': new FormControl('', [ Validators.maxLength(30), Validators.minLength(0) ]), + 'description': new FormControl('', [ Validators.required, Validators.maxLength(1000), Validators.minLength(15) ]), + 'severity': new FormControl(Severity.MINOR, [ Validators.required ]), + 'targetDate': new FormControl(null), + 'bpn': new FormControl(null, [ Validators.required, BaseInputHelper.getCustomPatternValidator(bpnRegex, 'bpn') ]), + 'type': new FormControl(NotificationType.INVESTIGATION, [ Validators.required ]), + }); + + + formGroup.patchValue({ + ...formGroup.value, + bpn: 'BPNL00000003CML1', + description: 'This is a test description with min 15 characters', + }); + formGroup.markAsDirty(); + componentInstance.affectedPartIds = [ MOCK_part_1.id ]; + componentInstance.notificationFormGroupChange(formGroup); + expect(componentInstance.isSaveButtonDisabled).toEqual(false); + expect(componentInstance.notificationFormGroup.value['bpn']).toEqual('BPNL00000003CML1'); + + }); + +}); diff --git a/frontend/src/app/modules/page/notifications/detail/edit/notification-edit.component.ts b/frontend/src/app/modules/page/notifications/detail/edit/notification-edit.component.ts new file mode 100644 index 0000000000..b7517551a5 --- /dev/null +++ b/frontend/src/app/modules/page/notifications/detail/edit/notification-edit.component.ts @@ -0,0 +1,368 @@ +/******************************************************************************** + * Copyright (c) 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 + ********************************************************************************/ + +import { Location } from '@angular/common'; +import { Component, OnDestroy, TemplateRef, ViewChild } from '@angular/core'; +import { FormGroup } from '@angular/forms'; +import { ActivatedRoute, Router } from '@angular/router'; +import { Pagination } from '@core/model/pagination.model'; +import { DEFAULT_PAGE_SIZE, FIRST_PAGE } from '@core/pagination/pagination.model'; +import { NotificationDetailFacade } from '@page/notifications/core/notification-detail.facade'; +import { NotificationsFacade } from '@page/notifications/core/notifications.facade'; +import { SharedPartService } from '@page/notifications/detail/edit/shared-part.service'; +import { PartsFacade } from '@page/parts/core/parts.facade'; +import { MainAspectType } from '@page/parts/model/mainAspectType.enum'; +import { Owner } from '@page/parts/model/owner.enum'; +import { AssetAsBuiltFilter, Part } from '@page/parts/model/parts.model'; +import { NotificationActionHelperService } from '@shared/assembler/notification-action-helper.service'; +import { TableType } from '@shared/components/multi-select-autocomplete/table-type.model'; +import { NotificationCommonModalComponent } from '@shared/components/notification-common-modal/notification-common-modal.component'; +import { TableHeaderSort } from '@shared/components/table/table.model'; +import { ToastService } from '@shared/components/toasts/toast.service'; +import { toAssetFilter } from '@shared/helper/filter-helper'; +import { Notification, NotificationType } from '@shared/model/notification.model'; +import { View } from '@shared/model/view.model'; +import { StaticIdService } from '@shared/service/staticId.service'; +import { BehaviorSubject, Observable, Subject, Subscription } from 'rxjs'; +import { distinctUntilChanged } from 'rxjs/operators'; + +@Component({ + selector: 'app-notification-edit', + templateUrl: './notification-edit.component.html', + styleUrls: [ './notification-edit.component.scss' ], +}) +export class NotificationEditComponent implements OnDestroy { + @ViewChild(NotificationCommonModalComponent) notificationCommonModalComponent: NotificationCommonModalComponent; + + @ViewChild('semanticModelIdTmp') semanticModelIdTmp: TemplateRef; + + public readonly affectedPartsTableLabelId = this.staticIdService.generateId('AffectedPartsTable'); + public readonly availablePartsTableLabelId = this.staticIdService.generateId('AvailablePartsTable'); + + public readonly deselectPartTrigger$ = new Subject(); + + public readonly editMode: boolean = true; + public notificationFormGroup: FormGroup; + + public affectedPartIds: string[] = this.sharedPartService?.affectedParts?.map(value => value.id) || []; + public availablePartIds: string[] = []; + public temporaryAffectedParts: Part[] = []; + public temporaryAffectedPartsForRemoval: Part[] = []; + public readonly currentSelectedAvailableParts$ = new BehaviorSubject([]); + public readonly currentSelectedAffectedParts$ = new BehaviorSubject([]); + public availablePartsAsBuilt$: Observable>>; + public affectedPartsAsBuilt$: Observable>>; + + public cachedAffectedPartsFilter: string; + public cachedAvailablePartsFilter: string; + + private originPageNumber: number; + private originTabIndex: number; + + public selectedNotification: Notification; + + public tableAsBuiltSortList: TableHeaderSort[]; + private paramSubscription: Subscription; + isSaveButtonDisabled: boolean; + + constructor( + private readonly ownPartsFacade: PartsFacade, + public readonly actionHelperService: NotificationActionHelperService, + public readonly notificationDetailFacade: NotificationDetailFacade, + private readonly staticIdService: StaticIdService, + private readonly notificationsFacade: NotificationsFacade, + private readonly router: Router, + private readonly route: ActivatedRoute, + private readonly toastService: ToastService, + private readonly sharedPartService: SharedPartService, + private location: Location, + ) { + this.editMode = this.determineEditModeOrCreateMode(); + + this.currentSelectedAvailableParts$.subscribe((parts: Part[]) => { + this.temporaryAffectedParts = parts; + }); + + this.currentSelectedAffectedParts$.subscribe((parts: Part[]) => { + this.temporaryAffectedPartsForRemoval = parts; + }); + + this.paramSubscription = this.route.queryParams.subscribe(params => { + this.originPageNumber = params.pageNumber; + this.originTabIndex = params?.tabIndex; + }); + + if (this.editMode) { + this.isSaveButtonDisabled = true; + this.handleEditNotification(); + } else { + this.isSaveButtonDisabled = false; + this.handleCreateNotification(); + } + + this.ownPartsFacade.partsAsBuilt$.pipe( + distinctUntilChanged((prev, curr) => prev?.data?.content?.length === curr?.data?.content?.length), + ).subscribe( + data => { + this.availablePartIds = data?.data?.content?.map(part => part.id).filter(element => !this.affectedPartIds.includes(element)); + }, + ); + + } + + private handleEditNotification() { + if (this.notificationDetailFacade.selected?.data) { + this.selectNotificationAndLoadPartsBasedOnNotification(this.notificationDetailFacade.selected.data); + } else { + this.getNotificationByIdAndSelectNotificationAndLoadPartsBasedOnNotification(); + + } + } + + private handleCreateNotification() { + + this.isSaveButtonDisabled = true; + const newNotification: Notification = { + assetIds: this.sharedPartService?.affectedParts?.map(value => value.id) || [], + createdBy: '', + type: this.route.snapshot.queryParams['initialType'] ?? null, + createdByName: '', + createdDate: undefined, + description: '', + isFromSender: true, + reason: undefined, + sendTo: '', + sendToName: '', + severity: undefined, + status: undefined, + title: '', + id: 'new', + }; + this.selectNotificationAndLoadPartsBasedOnNotification(newNotification); + } + + private determineEditModeOrCreateMode() { + const urlPartIndex = this.route.snapshot.url?.length !== null ? this.route.snapshot.url.length - 1 : null; + if (urlPartIndex) { + return this.route.snapshot.url[urlPartIndex].path === 'edit'; + } else { + return false; + } + } + + public notificationFormGroupChange(notificationFormGroup: FormGroup) { + // if user switches type of notification in creation mode, reset affected parts and reload new available parts + if (this.selectedNotification.type !== notificationFormGroup.getRawValue().type) { + this.selectedNotification.type = notificationFormGroup.getRawValue().type; + this.switchSelectedNotificationTypeAndResetParts(); + } + + this.notificationFormGroup = notificationFormGroup; + this.isSaveButtonDisabled = (notificationFormGroup.invalid || this.affectedPartIds.length < 1) || !this.notificationFormGroup.dirty; + if (this.notificationFormGroup && this.notificationFormGroup.getRawValue().type === NotificationType.INVESTIGATION.valueOf() && !this.notificationFormGroup.getRawValue().bpn && this.sharedPartService.affectedParts && this.sharedPartService.affectedParts.length > 0) { + this.notificationFormGroup.get('bpn').setValue(this.sharedPartService.affectedParts[0].businessPartner); + } + } + + filterAffectedParts(partsFilter: any): void { + if (this.cachedAffectedPartsFilter === JSON.stringify(partsFilter)) { + return; + } else { + this.cachedAffectedPartsFilter = JSON.stringify(partsFilter); + this.setAffectedPartsBasedOnNotificationType(this.selectedNotification, partsFilter); + } + } + + private enrichPartsFilterByAffectedAssetIdsAndOwner(partsFilter: any, notificationType: NotificationType, exclude?: boolean) { + + let filter: AssetAsBuiltFilter = { + excludeIds: [], + ids: [], + ...partsFilter, + }; + + if (notificationType === NotificationType.INVESTIGATION) { + filter.owner = Owner.SUPPLIER; + } + + if (notificationType === NotificationType.ALERT) { + filter.owner = Owner.OWN; + } + + if (exclude) { + filter.excludeIds = this.affectedPartIds; + } else { + filter.ids = this.affectedPartIds; + } + return filter; + + } + + paginationChangedAffectedParts(event: any) { + this.setAffectedPartsBasedOnNotificationType(this.selectedNotification, this.cachedAffectedPartsFilter, event); + } + + paginationChangedAvailableParts(event: any) { + this.setAvailablePartsBasedOnNotificationType(this.selectedNotification, this.cachedAvailablePartsFilter, event); + } + + filterAvailableParts(partsFilter: any): void { + if (this.cachedAvailablePartsFilter !== JSON.stringify(partsFilter)) { + this.setAvailablePartsBasedOnNotificationType(this.selectedNotification, partsFilter); + } + } + + public clickedSave(): void { + const { title, type, description, severity, targetDate, bpn } = this.notificationFormGroup.getRawValue(); + if (this.editMode) { + this.notificationsFacade.editNotification(this.selectedNotification.id, title, bpn, severity, targetDate, description, this.affectedPartIds).subscribe({ + next: () => { + this.navigateBack(); + this.toastService.success('requestNotification.saveEditSuccess'); + this.updateSelectedNotificationState(); + }, + error: () => this.toastService.error('requestNotification.saveEditError'), + }); + } else { + this.notificationsFacade.createNotification(this.affectedPartIds, type, title, bpn, severity, targetDate, description).subscribe({ + next: () => { + this.toastService.success('requestNotification.saveSuccess', 5000, [ { + text: 'actions.goToQueue', + link: '/inbox', + } ]); + this.navigateBack(); + this.updateSelectedNotificationState(); + }, + error: () => this.toastService.error('requestNotification.saveError'), + }); + } + } + + + private setAvailablePartsBasedOnNotificationType(notification: Notification, assetFilter?: any, pagination?: any) { + if (this.affectedPartIds) { + assetFilter = this.enrichPartsFilterByAffectedAssetIdsAndOwner(null, notification.type, true); + } + this.ownPartsFacade.setPartsAsBuilt(pagination?.page || FIRST_PAGE, pagination?.pageSize || DEFAULT_PAGE_SIZE, this.tableAsBuiltSortList, toAssetFilter(assetFilter, true)); + } + + private setAffectedPartsBasedOnNotificationType(notification: Notification, partsFilter?: any, pagination?: any) { + + if (this.affectedPartIds.length > 0) { + partsFilter = this.enrichPartsFilterByAffectedAssetIdsAndOwner(null, notification.type); + this.ownPartsFacade.setPartsAsBuiltSecond(pagination?.page || FIRST_PAGE, pagination?.pageSize || DEFAULT_PAGE_SIZE, this.tableAsBuiltSortList, toAssetFilter(partsFilter, true)); + } else { + this.ownPartsFacade.setPartsAsBuiltSecondEmpty(); + } + } + + public ngOnDestroy(): void { + this.notificationDetailFacade.selected = { data: null }; + this.notificationDetailFacade.unsubscribeSubscriptions(); + this.paramSubscription?.unsubscribe(); + } + + removeAffectedParts() { + this.affectedPartIds = this.affectedPartIds.filter(value => { + this.isSaveButtonDisabled = this.notificationFormGroup.invalid || this.affectedPartIds.length < 1; + return !this.temporaryAffectedPartsForRemoval.some(part => part.id === value); + }); + + if (!this.affectedPartIds || this.affectedPartIds.length === 0) { + this.ownPartsFacade.setPartsAsBuiltSecondEmpty(); + this.ownPartsFacade.setPartsAsBuilt(FIRST_PAGE, DEFAULT_PAGE_SIZE, this.tableAsBuiltSortList, { + excludeIds: [], + ids: [], + owner: this.selectedNotification.type === NotificationType.INVESTIGATION ? Owner.SUPPLIER : Owner.OWN, + }); + this.isSaveButtonDisabled = true; + } else { + this.isSaveButtonDisabled = this.notificationFormGroup.invalid || this.affectedPartIds.length < 1; + this.deselectPartTrigger$.next(this.temporaryAffectedPartsForRemoval); + this.currentSelectedAffectedParts$.next([]); + this.temporaryAffectedPartsForRemoval = []; + this.setAffectedPartsBasedOnNotificationType(this.selectedNotification); + this.setAvailablePartsBasedOnNotificationType(this.selectedNotification); + } + + } + + addAffectedParts() { + this.temporaryAffectedParts.forEach(value => { + if (!this.affectedPartIds.includes(value.id)) { + this.affectedPartIds.push(value.id); + } + }); + this.isSaveButtonDisabled = this.notificationFormGroup.invalid || this.affectedPartIds.length < 1; + this.deselectPartTrigger$.next(this.temporaryAffectedParts); + this.currentSelectedAvailableParts$.next([]); + this.temporaryAffectedParts = []; + this.setAffectedPartsBasedOnNotificationType(this.selectedNotification); + this.setAvailablePartsBasedOnNotificationType(this.selectedNotification); + } + + + public navigateBack(): void { + this.location.back(); + } + + private getNotificationByIdAndSelectNotificationAndLoadPartsBasedOnNotification(): void { + const notificationId = this.route.snapshot.paramMap.get('notificationId'); + + this.notificationsFacade + .getNotificationById(notificationId) + .subscribe({ + next: data => { + this.selectNotificationAndLoadPartsBasedOnNotification(data); + }, + error: () => { + }, + }); + + } + + private selectNotificationAndLoadPartsBasedOnNotification(notification: Notification) { + this.selectedNotification = notification; + this.affectedPartIds = notification.assetIds; + this.setAvailablePartsBasedOnNotificationType(this.selectedNotification); + this.setAffectedPartsBasedOnNotificationType(this.selectedNotification); + this.affectedPartsAsBuilt$ = this.ownPartsFacade.partsAsBuiltSecond$; + this.availablePartsAsBuilt$ = this.ownPartsFacade.partsAsBuilt$; + } + + private updateSelectedNotificationState() { + this.notificationDetailFacade.selected.data = { + ...this.notificationDetailFacade.selected.data, + ...this.notificationFormGroup.value, + assetIds: this.affectedPartIds, + }; + } + + private switchSelectedNotificationTypeAndResetParts() { + this.selectedNotification.assetIds = []; + this.affectedPartIds = []; + this.setAffectedPartsBasedOnNotificationType(this.selectedNotification); + this.setAvailablePartsBasedOnNotificationType(this.selectedNotification); + this.affectedPartsAsBuilt$ = this.ownPartsFacade.partsAsBuiltSecond$; + this.availablePartsAsBuilt$ = this.ownPartsFacade.partsAsBuilt$; + } + + protected readonly TableType = TableType; + protected readonly MainAspectType = MainAspectType; +} diff --git a/frontend/src/app/modules/page/notifications/detail/edit/shared-part.service.spec.ts b/frontend/src/app/modules/page/notifications/detail/edit/shared-part.service.spec.ts new file mode 100644 index 0000000000..31f4ddc107 --- /dev/null +++ b/frontend/src/app/modules/page/notifications/detail/edit/shared-part.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { SharedPartService } from './shared-part.service'; + +describe('SharedAssetIdService', () => { + let service: SharedPartService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(SharedPartService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/modules/page/notifications/detail/edit/shared-part.service.ts b/frontend/src/app/modules/page/notifications/detail/edit/shared-part.service.ts new file mode 100644 index 0000000000..dab9ac4ae7 --- /dev/null +++ b/frontend/src/app/modules/page/notifications/detail/edit/shared-part.service.ts @@ -0,0 +1,9 @@ +import { Injectable } from '@angular/core'; +import { Part } from '@page/parts/model/parts.model'; + +@Injectable({ + providedIn: 'root' +}) +export class SharedPartService { + affectedParts: Part[] +} diff --git a/frontend/src/app/modules/page/notifications/detail/notification-detail.component.html b/frontend/src/app/modules/page/notifications/detail/notification-detail.component.html index d86fcc533b..15ed5ab526 100644 --- a/frontend/src/app/modules/page/notifications/detail/notification-detail.component.html +++ b/frontend/src/app/modules/page/notifications/detail/notification-detail.component.html @@ -21,6 +21,7 @@
@@ -38,14 +39,28 @@ [matTooltipShowDelay]="1000" [matTooltipDisabled]="actionHelperService.isAuthorizedForButton(NotificationAction.APPROVE)" > + +
+ edit + {{ 'actions.edit' | i18n }} +
+ +
- share + share {{ 'actions.approve' | i18n }}
@@ -60,12 +75,13 @@ >
- cancel + cancel {{ 'actions.cancel' | i18n }}
@@ -80,12 +96,13 @@ >
- close + close {{ 'actions.close' | i18n }}
@@ -100,12 +117,13 @@ >
- assignment_turned_in + assignment_turned_in {{ 'actions.accept' | i18n }}
@@ -120,12 +138,13 @@ >
- work + work {{ 'actions.acknowledge' | i18n }}
@@ -140,12 +159,13 @@ >
- assignment_late + assignment_late {{ 'actions.decline' | i18n }}
@@ -228,7 +248,7 @@
- +
{{ row.semanticModelId }} filter_none @@ -259,7 +279,6 @@ [showHover]="false" [noShadow]="true" (multiSelect)="onMultiSelect($event)" - (clickSelectAction)="isNotificationOpen$.next(true)" (configChanged)="onSupplierPartsSort($event)" selectedPartsInfoLabel="pageAlert.selectedParts" selectedPartsActionLabel="pageAlert.selectPartsAction" @@ -282,15 +301,3 @@

{{ 'dataLoading.error' | i18n }}

- - - - diff --git a/frontend/src/app/modules/page/notifications/detail/notification-detail.component.ts b/frontend/src/app/modules/page/notifications/detail/notification-detail.component.ts index ff80d00e3f..53548623e9 100644 --- a/frontend/src/app/modules/page/notifications/detail/notification-detail.component.ts +++ b/frontend/src/app/modules/page/notifications/detail/notification-detail.component.ts @@ -19,7 +19,7 @@ import { AfterViewInit, Component, OnDestroy, TemplateRef, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { NOTIFICATION_BASE_ROUTE, getRoute } from '@core/known-route'; +import { getRoute, NOTIFICATION_BASE_ROUTE } from '@core/known-route'; import { NotificationDetailFacade } from '@page/notifications/core/notification-detail.facade'; import { NotificationHelperService } from '@page/notifications/core/notification-helper.service'; import { NotificationsFacade } from '@page/notifications/core/notifications.facade'; @@ -29,7 +29,6 @@ import { NotificationCommonModalComponent } from '@shared/components/notificatio import { CreateHeaderFromColumns, TableConfig, TableEventConfig } from '@shared/components/table/table.model'; import { ToastService } from '@shared/components/toasts/toast.service'; import { Notification, NotificationStatus, NotificationType } from '@shared/model/notification.model'; -import { TranslationContext } from '@shared/model/translation-context.model'; import { View } from '@shared/model/view.model'; import { NotificationAction } from '@shared/modules/notification/notification-action.enum'; import { StaticIdService } from '@shared/service/staticId.service'; @@ -46,11 +45,10 @@ export class NotificationDetailComponent implements AfterViewInit, OnDestroy { @ViewChild('semanticModelIdTmp') semanticModelIdTmp: TemplateRef; - public readonly notificationPartsInformation$: Observable>; - public readonly supplierPartsDetailInformation$: Observable>; + public notificationPartsInformation$: Observable>; + public supplierPartsDetailInformation$: Observable>; public readonly selected$: Observable>; - public readonly isNotificationOpen$ = new BehaviorSubject(false); public readonly selectedItems$ = new BehaviorSubject([]); public readonly deselectPartTrigger$ = new Subject(); public readonly addPartTrigger$ = new Subject(); @@ -109,11 +107,21 @@ export class NotificationDetailComponent implements AfterViewInit, OnDestroy { } public ngOnDestroy(): void { + this.notificationDetailFacade.selected = { data: null }; this.subscription?.unsubscribe(); this.notificationDetailFacade.unsubscribeSubscriptions(); this.paramSubscription?.unsubscribe(); } + public navigateToEditView() { + + this.router.navigate([ `/inbox/${ this.selectedNotification.id }/edit` ], { + queryParams: { + tabIndex: this.originTabIndex, + pageNumber: this.originPageNumber, + }, + }); + } public onNotificationPartsSort({ sorting }: TableEventConfig): void { const [ name, direction ] = sorting || [ '', '' ]; this.notificationDetailFacade.sortNotificationParts(name, direction); @@ -198,7 +206,7 @@ export class NotificationDetailComponent implements AfterViewInit, OnDestroy { private selectedNotificationBasedOnUrl(): void { const notificationId = this.route.snapshot.paramMap.get('notificationId'); this.notificationsFacade - .getNotification(notificationId) + .getNotificationById(notificationId) .pipe( first(), tap(notification => (this.notificationDetailFacade.selected = { data: notification })), diff --git a/frontend/src/app/modules/page/notifications/notifications.module.ts b/frontend/src/app/modules/page/notifications/notifications.module.ts index 85be01dd43..59e2c7bd19 100644 --- a/frontend/src/app/modules/page/notifications/notifications.module.ts +++ b/frontend/src/app/modules/page/notifications/notifications.module.ts @@ -20,17 +20,18 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { getI18nPageProvider } from '@core/i18n'; -import { NotificationsRoutingModule } from '@page/notifications/notifications.routing'; import { NotificationDetailFacade } from '@page/notifications/core/notification-detail.facade'; import { NotificationDetailState } from '@page/notifications/core/notification-detail.state'; import { NotificationHelperService } from '@page/notifications/core/notification-helper.service'; import { NotificationsFacade } from '@page/notifications/core/notifications.facade'; import { NotificationsState } from '@page/notifications/core/notifications.state'; +import { NotificationEditComponent } from '@page/notifications/detail/edit/notification-edit.component'; import { NotificationDetailComponent } from '@page/notifications/detail/notification-detail.component'; +import { NotificationsRoutingModule } from '@page/notifications/notifications.routing'; import { PartsModule } from '@page/parts/parts.module'; import { NotificationModule } from '@shared/modules/notification/notification.module'; -import { FormatPartSemanticDataModelToCamelCasePipe } from '@shared/pipes/format-part-semantic-data-model-to-camelcase.pipe'; import { FormatPaginationSemanticDataModelToCamelCasePipe } from '@shared/pipes/format-pagination-semantic-data-model-to-camelcase.pipe'; +import { FormatPartSemanticDataModelToCamelCasePipe } from '@shared/pipes/format-part-semantic-data-model-to-camelcase.pipe'; import { FormatPartlistSemanticDataModelToCamelCasePipe } from '@shared/pipes/format-partlist-semantic-data-model-to-camelcase.pipe'; import { SharedModule } from '@shared/shared.module'; import { TemplateModule } from '@shared/template.module'; @@ -39,7 +40,7 @@ import { NotificationsComponent } from './presentation/notifications.component'; @NgModule({ declarations: [ - NotificationsComponent, NotificationDetailComponent, + NotificationsComponent, NotificationDetailComponent, NotificationEditComponent, ], imports: [ CommonModule, diff --git a/frontend/src/app/modules/page/notifications/notifications.routing.ts b/frontend/src/app/modules/page/notifications/notifications.routing.ts index ecda44d696..b26207ce8c 100644 --- a/frontend/src/app/modules/page/notifications/notifications.routing.ts +++ b/frontend/src/app/modules/page/notifications/notifications.routing.ts @@ -19,6 +19,8 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { RoleGuard } from '@core/user/role.guard'; +import { NotificationEditComponent } from '@page/notifications/detail/edit/notification-edit.component'; import { NotificationDetailComponent } from '@page/notifications/detail/notification-detail.component'; import { NotificationsComponent } from '@page/notifications/presentation/notifications.component'; import { I18NEXT_NAMESPACE_RESOLVER } from 'angular-i18next'; @@ -32,6 +34,14 @@ const NOTIFICATIONS_ROUTING: Routes = [ data: { i18nextNamespaces: [ 'page.alert' ] }, resolve: { i18next: I18NEXT_NAMESPACE_RESOLVER }, }, + { + path: 'create', + pathMatch: 'full', + component: NotificationEditComponent, + data: { i18nextNamespaces: [ 'page.alert' ], roles: [ 'user' ] }, + canActivate: [ RoleGuard ], + resolve: { i18next: I18NEXT_NAMESPACE_RESOLVER }, + }, { path: ':notificationId', pathMatch: 'full', @@ -39,6 +49,14 @@ const NOTIFICATIONS_ROUTING: Routes = [ data: { i18nextNamespaces: [ 'page.alert' ] }, resolve: { i18next: I18NEXT_NAMESPACE_RESOLVER }, }, + { + path: ':notificationId/edit', + canActivate: [ RoleGuard ], + pathMatch: 'full', + component: NotificationEditComponent, + data: { i18nextNamespaces: [ 'page.alert' ], roles: [ 'user' ] }, + resolve: { i18next: I18NEXT_NAMESPACE_RESOLVER }, + }, ]; @NgModule({ diff --git a/frontend/src/app/modules/page/notifications/presentation/notifications.component.html b/frontend/src/app/modules/page/notifications/presentation/notifications.component.html index 19f3909881..6914093276 100644 --- a/frontend/src/app/modules/page/notifications/presentation/notifications.component.html +++ b/frontend/src/app/modules/page/notifications/presentation/notifications.component.html @@ -36,5 +36,6 @@ (onQueuedAndRequestedTableConfigChanged)="onQueuedAndRequestedTableConfigChange($event)" (notificationsFilterChanged)="filterNotifications($event)" (selected)="openDetailPage($event)" + (editNotificationClicked)="openEditPage($event)" [menuActionsConfig]="menuActionsConfig" > diff --git a/frontend/src/app/modules/page/notifications/presentation/notifications.component.ts b/frontend/src/app/modules/page/notifications/presentation/notifications.component.ts index c9d112c859..b6516c3c8f 100644 --- a/frontend/src/app/modules/page/notifications/presentation/notifications.component.ts +++ b/frontend/src/app/modules/page/notifications/presentation/notifications.component.ts @@ -19,8 +19,7 @@ import { ChangeDetectorRef, Component, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { NOTIFICATION_BASE_ROUTE, getRoute } from '@core/known-route'; -import { NotificationDetailFacade } from '@page/notifications/core/notification-detail.facade'; +import { getRoute, NOTIFICATION_BASE_ROUTE } from '@core/known-route'; import { NotificationHelperService } from '@page/notifications/core/notification-helper.service'; import { NotificationsFacade } from '@page/notifications/core/notifications.facade'; import { NotificationActionHelperService } from '@shared/assembler/notification-action-helper.service'; @@ -42,7 +41,7 @@ import { TranslationContext } from '@shared/model/translation-context.model'; import { Subscription } from 'rxjs'; @Component({ - selector: 'app-alerts', + selector: 'app-notification-component', templateUrl: './notifications.component.html', }) export class NotificationsComponent { @@ -69,7 +68,6 @@ export class NotificationsComponent { public readonly helperService: NotificationHelperService, private readonly actionHelperService: NotificationActionHelperService, private readonly notificationsFacade: NotificationsFacade, - private readonly notificationDetailFacade: NotificationDetailFacade, private readonly router: Router, private readonly route: ActivatedRoute, private readonly cd: ChangeDetectorRef, @@ -123,11 +121,20 @@ export class NotificationsComponent { } public openDetailPage(notification: Notification): void { - this.notificationDetailFacade.selected = { data: notification }; + const { link, tabInformation } = this.getTabInformation(); + this.router.navigate([ `/${ link }/${ notification.id }` ], { queryParams: tabInformation }); + } + + public openEditPage(notification: Notification): void { + const { link, tabInformation } = this.getTabInformation(); + this.router.navigate([ `/${ link }/${ notification.id }/edit` ], { queryParams: tabInformation }); + } + + private getTabInformation(): { link: string, tabInformation: any } { const { link } = getRoute(NOTIFICATION_BASE_ROUTE); const tabIndex = this.route.snapshot.queryParamMap.get('tabIndex'); const tabInformation: NotificationTabInformation = { tabIndex: tabIndex, pageNumber: this.pagination.page }; - this.router.navigate([ `/${ link }/${ notification.id }` ], { queryParams: tabInformation }); + return { link, tabInformation }; } public handleConfirmActionCompletedEvent() { @@ -144,13 +151,13 @@ export class NotificationsComponent { protected readonly NotificationType = NotificationType; filterNotifications(filterContext: any) { - if(filterContext.channel === NotificationChannel.RECEIVER) { + if (filterContext.channel === NotificationChannel.RECEIVER) { this.receivedFilter = filterContext.filter; } else { this.requestedFilter = filterContext.filter; } - if(filterContext.channel === NotificationChannel.RECEIVER) { - this.notificationsFacade.setReceivedNotifications(this.pagination.page, this.pagination.pageSize, this.notificationReceivedSortList,null, this.receivedFilter); + if (filterContext.channel === NotificationChannel.RECEIVER) { + this.notificationsFacade.setReceivedNotifications(this.pagination.page, this.pagination.pageSize, this.notificationReceivedSortList, null, this.receivedFilter); } else { this.notificationsFacade.setQueuedAndRequestedNotifications(this.pagination.page, this.pagination.pageSize, this.notificationQueuedAndRequestedSortList, null, this.requestedFilter); } diff --git a/frontend/src/app/modules/page/other-parts/core/other-parts.facade.spec.ts b/frontend/src/app/modules/page/other-parts/core/other-parts.facade.spec.ts deleted file mode 100644 index c6f3a29152..0000000000 --- a/frontend/src/app/modules/page/other-parts/core/other-parts.facade.spec.ts +++ /dev/null @@ -1,78 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2023 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 - ********************************************************************************/ - -import { OtherPartsFacade } from '@page/other-parts/core/other-parts.facade'; -import { OtherPartsService } from '@page/other-parts/core/other-parts.service'; -import { OtherPartsState } from '@page/other-parts/core/other-parts.state'; -import { MainAspectType } from '@page/parts/model/mainAspectType.enum'; -import { PartsAssembler } from '@shared/assembler/parts.assembler'; -import { PartsService } from '@shared/service/parts.service'; -import { waitFor } from '@testing-library/angular'; -import { firstValueFrom, of } from 'rxjs'; -import { map } from 'rxjs/operators'; -import { mockAssets } from '../../../../mocks/services/parts-mock/partsAsPlanned/partsAsPlanned.test.model'; - -describe('OtherPartsFacade', () => { - let otherPartsFacade: OtherPartsFacade, otherPartsState: OtherPartsState, partsServiceMok: PartsService, - otherPartsServiceMock: OtherPartsService; - - beforeEach(() => { - otherPartsServiceMock = { - getOtherPartsAsBuilt: (_page, _pageSize, _sorting, _owner) => - of(mockAssets).pipe(map(parts => PartsAssembler.assembleParts(parts, MainAspectType.AS_BUILT))), - getOtherPartsAsPlanned: (_page, _pageSize, _sorting, _owner) => - of(mockAssets).pipe(map(parts => PartsAssembler.assembleParts(parts, MainAspectType.AS_PLANNED))), - } as OtherPartsService; - - otherPartsState = new OtherPartsState(); - otherPartsFacade = new OtherPartsFacade(otherPartsServiceMock, otherPartsState); - }); - - describe('setActiveInvestigationForParts', () => { - it('should set parts if request is successful', async () => { - - const otherParts = PartsAssembler.assembleOtherParts(mockAssets, MainAspectType.AS_BUILT); - otherPartsState.supplierPartsAsBuilt = { data: otherParts }; - - otherParts.content = otherParts.content.map(part => { - const activeInvestigation = otherParts.content.some(currentPart => currentPart.id === part.id); - return { ...part, activeInvestigation }; - }); - - const parts = await firstValueFrom(otherPartsState.supplierPartsAsBuilt$); - await waitFor(() => - expect(parts).toEqual({ - error: undefined, - loader: undefined, - data: otherParts, - }), - ); - }); - - it('should not set parts if no data in state', async () => { - - const parts = await firstValueFrom(otherPartsState.supplierPartsAsBuilt$); - await waitFor(() => - expect(parts).toEqual({ - loader: true, - }), - ); - }); - }); -}); diff --git a/frontend/src/app/modules/page/other-parts/core/other-parts.facade.ts b/frontend/src/app/modules/page/other-parts/core/other-parts.facade.ts deleted file mode 100644 index ef7e87493c..0000000000 --- a/frontend/src/app/modules/page/other-parts/core/other-parts.facade.ts +++ /dev/null @@ -1,102 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2022, 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - * Copyright (c) 2022, 2023 ZF Friedrichshafen AG - * Copyright (c) 2022, 2023 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 - ********************************************************************************/ - -import { Injectable } from '@angular/core'; -import { Pagination } from '@core/model/pagination.model'; -import { OtherPartsService } from '@page/other-parts/core/other-parts.service'; -import { OtherPartsState } from '@page/other-parts/core/other-parts.state'; -import { provideDataObject } from '@page/parts/core/parts.helper'; -import { Owner } from '@page/parts/model/owner.enum'; -import { AssetAsBuiltFilter, AssetAsPlannedFilter, Part } from '@page/parts/model/parts.model'; -import { TableHeaderSort } from '@shared/components/table/table.model'; -import { View } from '@shared/model/view.model'; -import { Observable, Subscription } from 'rxjs'; - -@Injectable() -export class OtherPartsFacade { - private customerPartsAsBuiltSubscription: Subscription; - private customerPartsAsPlannedSubscription: Subscription; - - private supplierPartsAsBuiltSubscription: Subscription; - private supplierPartsAsPlannedSubscription: Subscription; - - constructor( - private readonly otherPartsService: OtherPartsService, - private readonly otherPartsState: OtherPartsState, - ) { - } - - public get customerPartsAsBuilt$(): Observable>> { - return this.otherPartsState.customerPartsAsBuilt$; - } - - public get customerPartsAsPlanned$(): Observable>> { - return this.otherPartsState.customerPartsAsPlanned$; - } - - public get supplierPartsAsBuilt$(): Observable>> { - return this.otherPartsState.supplierPartsAsBuilt$; - } - - public get supplierPartsAsPlanned$(): Observable>> { - return this.otherPartsState.supplierPartsAsPlanned$; - } - -// TODO: remove OtherPartsService and integrate in PartService - public setCustomerPartsAsBuilt(page = 0, pageSize = 50, sorting: TableHeaderSort[] = [], filter?: AssetAsBuiltFilter, isOrSearch?: boolean): void { - this.customerPartsAsBuiltSubscription?.unsubscribe(); - this.customerPartsAsBuiltSubscription = this.otherPartsService.getOtherPartsAsBuilt(page, pageSize, sorting, Owner.CUSTOMER, filter, isOrSearch).subscribe({ - next: data => (this.otherPartsState.customerPartsAsBuilt = { data: provideDataObject(data) }), - error: error => (this.otherPartsState.customerPartsAsBuilt = { error }), - }); - } - - public setCustomerPartsAsPlanned(page = 0, pageSize = 50, sorting: TableHeaderSort[] = [], filter?: AssetAsPlannedFilter, isOrSearch?: boolean): void { - this.customerPartsAsPlannedSubscription?.unsubscribe(); - this.customerPartsAsPlannedSubscription = this.otherPartsService.getOtherPartsAsPlanned(page, pageSize, sorting, Owner.CUSTOMER, filter, isOrSearch).subscribe({ - next: data => { this.otherPartsState.customerPartsAsPlanned = { data: provideDataObject(data) }}, - error: error => {this.otherPartsState.customerPartsAsPlanned = { error }}, - }); - } - - public setSupplierPartsAsBuilt(page = 0, pageSize = 50, sorting: TableHeaderSort[] = [], filter?: AssetAsBuiltFilter, isOrSearch?: boolean): void { - this.supplierPartsAsBuiltSubscription?.unsubscribe(); - this.supplierPartsAsBuiltSubscription = this.otherPartsService.getOtherPartsAsBuilt(page, pageSize, sorting, Owner.SUPPLIER, filter, isOrSearch).subscribe({ - next: data => (this.otherPartsState.supplierPartsAsBuilt = { data: provideDataObject(data) }), - error: error => (this.otherPartsState.supplierPartsAsBuilt = { error }), - }); - } - - public setSupplierPartsAsPlanned(page = 0, pageSize = 50, sorting: TableHeaderSort[] = [], filter?: AssetAsPlannedFilter, isOrSearch?: boolean): void { - this.supplierPartsAsPlannedSubscription?.unsubscribe(); - this.supplierPartsAsPlannedSubscription = this.otherPartsService.getOtherPartsAsPlanned(page, pageSize, sorting, Owner.SUPPLIER, filter, isOrSearch).subscribe({ - next: data => (this.otherPartsState.supplierPartsAsPlanned = { data: provideDataObject(data) }), - error: error => (this.otherPartsState.supplierPartsAsPlanned = { error }), - }); - } - - public unsubscribeParts(): void { - this.customerPartsAsBuiltSubscription?.unsubscribe(); - this.customerPartsAsPlannedSubscription?.unsubscribe(); - this.supplierPartsAsBuiltSubscription?.unsubscribe(); - this.supplierPartsAsPlannedSubscription?.unsubscribe(); - } -} diff --git a/frontend/src/app/modules/page/other-parts/core/other-parts.service.ts b/frontend/src/app/modules/page/other-parts/core/other-parts.service.ts deleted file mode 100644 index 893f40b1a1..0000000000 --- a/frontend/src/app/modules/page/other-parts/core/other-parts.service.ts +++ /dev/null @@ -1,89 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2022, 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - * Copyright (c) 2022, 2023 ZF Friedrichshafen AG - * Copyright (c) 2022, 2023 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 - ********************************************************************************/ - -import { HttpParams } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { ApiService } from '@core/api/api.service'; -import { Pagination } from '@core/model/pagination.model'; -import { environment } from '@env'; -import { MainAspectType } from '@page/parts/model/mainAspectType.enum'; -import { Owner } from '@page/parts/model/owner.enum'; -import { AssetAsBuiltFilter, AssetAsPlannedFilter, Part, PartsResponse } from '@page/parts/model/parts.model'; -import { PartsAssembler } from '@shared/assembler/parts.assembler'; -import { TableHeaderSort } from '@shared/components/table/table.model'; -import { enrichFilterAndGetUpdatedParams } from '@shared/helper/filter-helper'; -import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; - -// TODO: merge this service with parts-service. The difference here should only be the owner parameter. (Own Parts = OWNER=OWN, supplier = OWNER=SUPPLIER, customer = OWNER=CUSTOMER -@Injectable() -export class OtherPartsService { - private url = environment.apiUrl; - - constructor(private readonly apiService: ApiService) { - } - - - public getOtherPartsAsBuilt(page: number, pageSize: number, sorting: TableHeaderSort[], owner: Owner, filter?: AssetAsBuiltFilter, isOrSearch?: boolean): Observable> { - let sort = sorting.map(sortingItem => PartsAssembler.mapSortToApiSort(sortingItem)); - let params = this.buildHttpParams(page, pageSize, owner); - let filterOperator = isOrSearch ? 'OR' : 'AND'; - - sort.forEach(sortingItem => { - params = params.append('sort', sortingItem); - }); - - if (filter) { - params = enrichFilterAndGetUpdatedParams(filter, params, filterOperator); - } - return this.apiService - .getBy(`${ this.url }/assets/as-built`, params) - .pipe(map(parts => PartsAssembler.assembleOtherParts(parts, MainAspectType.AS_BUILT))); - } - - public getOtherPartsAsPlanned(page: number, pageSize: number, sorting: TableHeaderSort[], owner: Owner, filter?: AssetAsPlannedFilter, isOrSearch?: boolean): Observable> { - let sort = sorting.map(sortingItem => PartsAssembler.mapSortToApiSort(sortingItem)); - - - let params = this.buildHttpParams(page, pageSize, owner); - let filterOperator = isOrSearch ? 'OR' : 'AND'; - - - sort.forEach(sortingItem => { - params = params.append('sort', sortingItem); - }); - if (filter) { - params = enrichFilterAndGetUpdatedParams(filter, params, filterOperator); - } - - return this.apiService - .getBy(`${ this.url }/assets/as-planned`, params) - .pipe(map(parts => PartsAssembler.assembleOtherParts(parts, MainAspectType.AS_PLANNED))); - } - - private buildHttpParams(page: number, pageSize: number, owner: Owner): HttpParams { - return new HttpParams() - .set('page', page) - .set('size', pageSize) - .set('filter', 'owner,EQUAL,' + owner + ',AND'); - } - -} diff --git a/frontend/src/app/modules/page/other-parts/core/other-parts.state.ts b/frontend/src/app/modules/page/other-parts/core/other-parts.state.ts deleted file mode 100644 index adf22da018..0000000000 --- a/frontend/src/app/modules/page/other-parts/core/other-parts.state.ts +++ /dev/null @@ -1,82 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2022, 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - * Copyright (c) 2022, 2023 ZF Friedrichshafen AG - * Copyright (c) 2022, 2023 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 - ********************************************************************************/ - -import { Injectable } from '@angular/core'; -import { Pagination } from '@core/model/pagination.model'; -import { Part } from '@page/parts/model/parts.model'; -import { State } from '@shared/model/state'; -import { View } from '@shared/model/view.model'; -import { Observable } from 'rxjs'; - -@Injectable() -export class OtherPartsState { - private readonly _customerPartsAsBuilt$: State>> = new State>>({ loader: true }); - private readonly _customerPartsAsPlanned$: State>> = new State>>({ loader: true }); - - - private readonly _supplierPartsAsBuilt$: State>> = new State>>({ loader: true }); - private readonly _supplierPartsAsPlanned$: State>> = new State>>({ loader: true }); - - public get customerPartsAsBuilt$(): Observable>> { - return this._customerPartsAsBuilt$.observable; - } - - public get customerPartsAsPlanned$(): Observable>> { - return this._customerPartsAsPlanned$.observable; - } - - public get supplierPartsAsBuilt$(): Observable>> { - return this._supplierPartsAsBuilt$.observable; - } - - public get supplierPartsAsPlanned$(): Observable>> { - return this._supplierPartsAsPlanned$.observable; - } - - public set customerPartsAsBuilt({ data, loader, error }: View>) { - const partsView: View> = { data, loader, error }; - this._customerPartsAsBuilt$.update(partsView); - } - - public set customerPartsAsPlanned({ data, loader, error }: View>) { - const partsView: View> = { data, loader, error }; - this._customerPartsAsPlanned$.update(partsView); - } - - public set supplierPartsAsBuilt({ data, loader, error }: View>) { - const partsView: View> = { data, loader, error }; - this._supplierPartsAsBuilt$.update(partsView); - } - - public set supplierPartsAsPlanned({ data, loader, error }: View>) { - const partsView: View> = { data, loader, error }; - this._supplierPartsAsPlanned$.update(partsView); - } - - public get supplierPartsAsBuilt(): View> { - return this._supplierPartsAsBuilt$.snapshot; - } - - public get supplierPartsAsPlanned(): View> { - return this._supplierPartsAsPlanned$.snapshot; - } - -} diff --git a/frontend/src/app/modules/page/other-parts/other-parts.module.ts b/frontend/src/app/modules/page/other-parts/other-parts.module.ts deleted file mode 100644 index 9477a60801..0000000000 --- a/frontend/src/app/modules/page/other-parts/other-parts.module.ts +++ /dev/null @@ -1,53 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2022, 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - * Copyright (c) 2022, 2023 ZF Friedrichshafen AG - * Copyright (c) 2022, 2023 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 - ********************************************************************************/ - -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { getI18nPageProvider } from '@core/i18n'; -import { SupplierPartsComponent } from '@page/other-parts/presentation/supplier-parts/supplier-parts.component'; -import { PartsDetailModule } from '@page/parts/detail/parts-detail.module'; -import { FormatPartSemanticDataModelToCamelCasePipe } from '@shared/pipes/format-part-semantic-data-model-to-camelcase.pipe'; -import { BomLifecycleSettingsService } from '@shared/service/bom-lifecycle-settings.service'; -import { SharedModule } from '@shared/shared.module'; -import { TemplateModule } from '@shared/template.module'; -import { AngularSplitModule } from 'angular-split'; -import { OtherPartsFacade } from './core/other-parts.facade'; -import { OtherPartsService } from './core/other-parts.service'; -import { OtherPartsState } from './core/other-parts.state'; -import { OtherPartsRoutingModule } from './other-parts.routing'; -import { CustomerPartsComponent } from './presentation/customer-parts/customer-parts.component'; -import { OtherPartsComponent } from './presentation/other-parts.component'; - -@NgModule({ - declarations: [ OtherPartsComponent, SupplierPartsComponent, CustomerPartsComponent ], - imports: [ CommonModule, TemplateModule, SharedModule, OtherPartsRoutingModule, PartsDetailModule, AngularSplitModule ], - providers: [ - OtherPartsState, - OtherPartsFacade, - OtherPartsService, - BomLifecycleSettingsService, - FormatPartSemanticDataModelToCamelCasePipe, - ...getI18nPageProvider([ 'page.otherParts', 'partDetail' ]), - ], - exports: [ OtherPartsComponent ], -}) -export class OtherPartsModule { -} diff --git a/frontend/src/app/modules/page/other-parts/other-parts.routing.ts b/frontend/src/app/modules/page/other-parts/other-parts.routing.ts deleted file mode 100644 index 64d7e470f2..0000000000 --- a/frontend/src/app/modules/page/other-parts/other-parts.routing.ts +++ /dev/null @@ -1,51 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2022, 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - * Copyright (c) 2022, 2023 ZF Friedrichshafen AG - * Copyright (c) 2022, 2023 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 - ********************************************************************************/ - -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; -import { OtherPartsComponent } from '@page/other-parts/presentation/other-parts.component'; -import { PartsDetailComponent } from '@page/parts/detail/parts-detail.component'; -import { I18NEXT_NAMESPACE_RESOLVER } from 'angular-i18next'; - -export /** @type {*} */ -const PARTS_ROUTING: Routes = [ - { - path: '', - pathMatch: 'full', - component: OtherPartsComponent, - data: { i18nextNamespaces: [ 'page.otherParts', 'partDetail' ] }, - resolve: { i18next: I18NEXT_NAMESPACE_RESOLVER }, - }, - { - path: ':partId', - pathMatch: 'full', - component: PartsDetailComponent, - data: { i18nextNamespaces: [ 'page.otherParts', 'partDetail' ] }, - resolve: { i18next: I18NEXT_NAMESPACE_RESOLVER }, - }, -]; - -@NgModule({ - imports: [ RouterModule.forChild(PARTS_ROUTING) ], - exports: [ RouterModule ], -}) -export class OtherPartsRoutingModule { -} diff --git a/frontend/src/app/modules/page/other-parts/presentation/customer-parts/customer-parts.component.html b/frontend/src/app/modules/page/other-parts/presentation/customer-parts/customer-parts.component.html deleted file mode 100644 index ede9569d94..0000000000 --- a/frontend/src/app/modules/page/other-parts/presentation/customer-parts/customer-parts.component.html +++ /dev/null @@ -1,82 +0,0 @@ - -
- - - - - -
- -
- - - - - -
- - - - - - - - - diff --git a/frontend/src/app/modules/page/other-parts/presentation/customer-parts/customer-parts.component.spec.ts b/frontend/src/app/modules/page/other-parts/presentation/customer-parts/customer-parts.component.spec.ts deleted file mode 100644 index 847c7b25f7..0000000000 --- a/frontend/src/app/modules/page/other-parts/presentation/customer-parts/customer-parts.component.spec.ts +++ /dev/null @@ -1,205 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2023 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 - ********************************************************************************/ - -import { OtherPartsState } from '@page/other-parts/core/other-parts.state'; -import { OtherPartsModule } from '@page/other-parts/other-parts.module'; -import { PartsState } from '@page/parts/core/parts.state'; -import { MainAspectType } from '@page/parts/model/mainAspectType.enum'; -import { toAssetFilter, toGlobalSearchAssetFilter } from '@shared/helper/filter-helper'; -import { fireEvent, screen, waitFor } from '@testing-library/angular'; -import { renderComponent } from '@tests/test-render.utils'; - -import { CustomerPartsComponent } from './customer-parts.component'; - -describe('CustomerPartsComponent', () => { - let otherPartsState: OtherPartsState; - beforeEach(() => (otherPartsState = new OtherPartsState())); - - const renderCustomerPartsAsBuilt = () => - renderComponent(CustomerPartsComponent, { - imports: [ OtherPartsModule ], - providers: [ { provide: OtherPartsState, useFactory: () => otherPartsState }, { provide: PartsState } ], - roles: [ 'admin', 'wip' ], - componentInputs: { - bomLifecycle: MainAspectType.AS_BUILT, - }, - }); - - const renderCustomerPartsAsPlanned = () => - renderComponent(CustomerPartsComponent, { - imports: [ OtherPartsModule ], - providers: [ { provide: OtherPartsState, useFactory: () => otherPartsState }, { provide: PartsState } ], - roles: [ 'admin', 'wip' ], - componentInputs: { - bomLifecycle: MainAspectType.AS_PLANNED, - }, - }); - - it('should render part table', async () => { - await renderCustomerPartsAsBuilt(); - const tableElements = await waitFor(() => screen.getAllByTestId('table-component--test-id')); - expect(tableElements.length).toEqual(1); - }); - - it('should render table and display correct amount of rows', async () => { - await renderCustomerPartsAsBuilt(); - const tableElement = await waitFor(() => screen.getByTestId('table-component--test-id')); - expect(tableElement).toBeInTheDocument(); - expect(tableElement.children[1].childElementCount).toEqual(5); - }); - - it('sort customer parts after name column', async () => { - const { fixture } = await renderCustomerPartsAsBuilt(); - const customerPartsComponent = fixture.componentInstance; - - let nameHeader = await screen.findByText('table.column.nameAtManufacturer'); - fireEvent.click(nameHeader); - - expect(customerPartsComponent['tableCustomerAsBuiltSortList']).toEqual([ [ 'nameAtManufacturer', 'asc' ] ]); - - }); - - it('should multisort after column name and semanticModelId', async () => { - const { fixture } = await renderCustomerPartsAsBuilt(); - const customerPartsComponent = fixture.componentInstance; - - let nameHeader = await screen.findByText('table.column.nameAtManufacturer'); - fireEvent.click(nameHeader); - let semanticModelIdHeader = await screen.findByText('table.column.semanticModelId'); - - await waitFor(() => { - fireEvent.keyDown(semanticModelIdHeader, { - ctrlKey: true, - charCode: 17, - }); - }); - expect(customerPartsComponent['ctrlKeyState']).toBeTruthy(); - await waitFor(() => { - fireEvent.click(semanticModelIdHeader); - }); - - await waitFor(() => { - fireEvent.keyUp(semanticModelIdHeader, { - ctrlKey: true, - charCode: 17, - }); - }); - - await waitFor(() => { - fireEvent.click(semanticModelIdHeader); - }); - expect(customerPartsComponent['tableCustomerAsBuiltSortList']).toEqual([ [ 'semanticModelId', 'desc' ] ]); - }); - - it('should reset sorting on third click', async () => { - const { fixture } = await renderCustomerPartsAsBuilt(); - const customerPartsComponent = fixture.componentInstance; - customerPartsComponent.bomLifecycle = MainAspectType.AS_BUILT; - fixture.detectChanges(); - - let nameHeader = await screen.findByText('table.column.nameAtManufacturer'); - fireEvent.click(nameHeader); - let semanticModelIdHeader = await screen.findByText('table.column.semanticModelId'); - - await waitFor(() => { - fireEvent.keyDown(semanticModelIdHeader, { - ctrlKey: true, - charCode: 17, - }); - }); - expect(customerPartsComponent['ctrlKeyState']).toBeTruthy(); - await waitFor(() => { - fireEvent.click(semanticModelIdHeader); - }); - - await waitFor(() => { - fireEvent.keyUp(semanticModelIdHeader, { - ctrlKey: true, - charCode: 17, - }); - }); - - await waitFor(() => { - fireEvent.click(semanticModelIdHeader); - }); - await waitFor(() => { - fireEvent.click(semanticModelIdHeader); - }); - expect(customerPartsComponent['tableCustomerAsBuiltSortList']).toEqual([]); - }); - - - it('should handle updateCustomerParts null', async () => { - const { fixture } = await renderCustomerPartsAsBuilt(); - const customerPartsComponent = fixture.componentInstance; - - const otherPartsFacade = (customerPartsComponent as any)['otherPartsFacade']; - const updateCustomerPartAsBuiltSpy = spyOn(otherPartsFacade, 'setCustomerPartsAsBuilt'); - const updateCustomerPartAsPlannedSpy = spyOn(otherPartsFacade, 'setCustomerPartsAsPlanned'); - - customerPartsComponent.updateCustomerParts(); - - - expect(updateCustomerPartAsBuiltSpy).toHaveBeenCalledWith(); - expect(updateCustomerPartAsPlannedSpy).toHaveBeenCalledWith(); - - }); - - it('should handle updateCustomerParts including search', async () => { - const { fixture } = await renderCustomerPartsAsBuilt(); - const customerPartsComponent = fixture.componentInstance; - - const otherPartsFacade = (customerPartsComponent as any)['otherPartsFacade']; - const updateCustomerPartAsBuiltSpy = spyOn(otherPartsFacade, 'setCustomerPartsAsBuilt'); - const updateCustomerPartAsPlannedSpy = spyOn(otherPartsFacade, 'setCustomerPartsAsPlanned'); - - const search = 'test'; - customerPartsComponent.updateCustomerParts(search); - - - expect(updateCustomerPartAsBuiltSpy).toHaveBeenCalledWith(0, 50, [], toGlobalSearchAssetFilter(search, true), true); - expect(updateCustomerPartAsPlannedSpy).toHaveBeenCalledWith(0, 50, [], toGlobalSearchAssetFilter(search, false), true); - - }); - - it('should correctly react to table config change', async function() { - const { fixture } = await renderCustomerPartsAsPlanned(); - const customerPartsComponent = fixture.componentInstance; - const otherPartsFacade = (customerPartsComponent as any)['otherPartsFacade']; - const assetFilter = toAssetFilter({idShort: "test"}, false); - const tableSortingList = ["idShort","asc"]; - - customerPartsComponent.assetsAsPlannedFilter = assetFilter; - - let setCustomerPartsAsPlannedSpy = spyOn(otherPartsFacade,'setCustomerPartsAsPlanned'); - - customerPartsComponent.onAsPlannedTableConfigChange({page: 0, pageSize: 50, sorting: ["idShort","asc"]}); - - expect(setCustomerPartsAsPlannedSpy).toHaveBeenCalled(); - expect(setCustomerPartsAsPlannedSpy).toHaveBeenCalledWith(0,50, [tableSortingList], {idShort: 'test'}); - - customerPartsComponent.assetsAsPlannedFilter = null; - - customerPartsComponent.onAsPlannedTableConfigChange({page: 0, pageSize: 50, sorting: ["idShort", "asc"]}) - expect(setCustomerPartsAsPlannedSpy).toHaveBeenCalledWith(0,50,[tableSortingList]) - - - }) - -}); diff --git a/frontend/src/app/modules/page/other-parts/presentation/customer-parts/customer-parts.component.ts b/frontend/src/app/modules/page/other-parts/presentation/customer-parts/customer-parts.component.ts deleted file mode 100644 index fb0e29730f..0000000000 --- a/frontend/src/app/modules/page/other-parts/presentation/customer-parts/customer-parts.component.ts +++ /dev/null @@ -1,175 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2023 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 - ********************************************************************************/ - - -import {Component, Input, OnDestroy, OnInit, QueryList, ViewChildren} from '@angular/core'; -import {ActivatedRoute, Params, Router} from '@angular/router'; -import {Pagination} from '@core/model/pagination.model'; -import {OtherPartsFacade} from '@page/other-parts/core/other-parts.facade'; -import {MainAspectType} from '@page/parts/model/mainAspectType.enum'; -import {AssetAsBuiltFilter, AssetAsPlannedFilter, Part} from '@page/parts/model/parts.model'; -import {TableType} from '@shared/components/multi-select-autocomplete/table-type.model'; -import {PartsTableComponent} from '@shared/components/parts-table/parts-table.component'; -import {TableSortingUtil} from '@shared/components/table/table-sorting.util'; -import {TableEventConfig, TableHeaderSort} from '@shared/components/table/table.model'; -import {containsAtleastOneFilterEntry, toAssetFilter, toGlobalSearchAssetFilter} from '@shared/helper/filter-helper'; -import {setMultiSorting} from '@shared/helper/table-helper'; -import {View} from '@shared/model/view.model'; -import {PartDetailsFacade} from '@shared/modules/part-details/core/partDetails.facade'; -import {StaticIdService} from '@shared/service/staticId.service'; -import {Observable} from 'rxjs'; - - -@Component({ - selector: 'app-customer-parts', - templateUrl: './customer-parts.component.html', -}) -export class CustomerPartsComponent implements OnInit, OnDestroy { - @ViewChildren(PartsTableComponent) partsTableComponents: QueryList; - - public customerPartsAsBuilt$: Observable>>; - public customerPartsAsPlanned$: Observable>>; - - public readonly customerTabLabelId = this.staticIdService.generateId('OtherParts.customerTabLabel'); - - public tableCustomerAsBuiltSortList: TableHeaderSort[] = []; - public tableCustomerAsPlannedSortList: TableHeaderSort[] = []; - - private ctrlKeyState = false; - - @Input() - public bomLifecycle: MainAspectType; - - assetAsBuiltFilter: AssetAsBuiltFilter; - assetsAsPlannedFilter: AssetAsPlannedFilter; - - public currentPartTablePage = {AS_BUILT_CUSTOMER_PAGE: 0, AS_PLANNED_CUSTOMER_PAGE: 0} - - - constructor( - private readonly otherPartsFacade: OtherPartsFacade, - private readonly partDetailsFacade: PartDetailsFacade, - private readonly staticIdService: StaticIdService, - private readonly router: Router, - private readonly route: ActivatedRoute - ) { - - window.addEventListener('keydown', (event) => { - this.ctrlKeyState = setMultiSorting(event); - }); - window.addEventListener('keyup', (event) => { - this.ctrlKeyState = setMultiSorting(event); - }); - } - - public ngOnInit(): void { - this.route.queryParams.subscribe(params => this.setupPageByUrlParams(params)); - - if (this.bomLifecycle === MainAspectType.AS_BUILT) { - this.customerPartsAsBuilt$ = this.otherPartsFacade.customerPartsAsBuilt$; - this.tableCustomerAsBuiltSortList = []; - this.otherPartsFacade.setCustomerPartsAsBuilt(); - } else if (this.bomLifecycle === MainAspectType.AS_PLANNED) { - this.customerPartsAsPlanned$ = this.otherPartsFacade.customerPartsAsPlanned$; - this.tableCustomerAsPlannedSortList = []; - this.otherPartsFacade.setCustomerPartsAsPlanned(); - } - } - - updateCustomerParts(searchValue?: string): void { - if (searchValue) { - this.otherPartsFacade.setCustomerPartsAsBuilt(0, 50, [], toGlobalSearchAssetFilter(searchValue, true), true); - this.otherPartsFacade.setCustomerPartsAsPlanned(0, 50, [], toGlobalSearchAssetFilter(searchValue, false), true); - } else { - this.otherPartsFacade.setCustomerPartsAsBuilt(); - this.otherPartsFacade.setCustomerPartsAsPlanned(); - } - } - - filterActivated(isAsBuilt: boolean, assetFilter: any): void { - if (isAsBuilt) { - this.assetAsBuiltFilter = assetFilter; - this.otherPartsFacade.setCustomerPartsAsBuilt(this.currentPartTablePage['AS_BUILT_CUSTOMER_PAGE'] ?? 0, 50, [], toAssetFilter(this.assetAsBuiltFilter, true)); - } else { - this.assetsAsPlannedFilter = assetFilter; - this.otherPartsFacade.setCustomerPartsAsPlanned(this.currentPartTablePage['AS_PLANNED_CUSTOMER_PAGE'] ?? 0, 50, [], toAssetFilter(this.assetsAsPlannedFilter, false)); - } - } - - public ngOnDestroy(): void { - this.otherPartsFacade.unsubscribeParts(); - } - - public onSelectItem(event: Record): void { - this.partDetailsFacade.selectedPart = event as unknown as Part; - let tableData = {}; - for(let component of this.partsTableComponents) { - tableData[component.tableType+"_PAGE"] = component.pageIndex; - } - this.router.navigate([`otherParts/${event?.id}`], {queryParams: tableData}) - } - - public onAsBuiltTableConfigChange({ page, pageSize, sorting }: TableEventConfig): void { - this.setTableSortingList(sorting, MainAspectType.AS_BUILT); - this.currentPartTablePage['AS_BUILT_CUSTOMER_PAGE'] = page; - - let pageSizeValue = 50; - if (pageSize !== 0) { - pageSizeValue = pageSize; - } - - if (this.assetAsBuiltFilter && containsAtleastOneFilterEntry(this.assetAsBuiltFilter)) { - this.otherPartsFacade.setCustomerPartsAsBuilt(0, pageSizeValue, this.tableCustomerAsBuiltSortList, toAssetFilter(this.assetAsBuiltFilter, true)); - } else { - this.otherPartsFacade.setCustomerPartsAsBuilt(page, pageSizeValue, this.tableCustomerAsBuiltSortList); - } - } - - public onAsPlannedTableConfigChange({ page, pageSize, sorting }: TableEventConfig): void { - this.setTableSortingList(sorting, MainAspectType.AS_PLANNED); - this.currentPartTablePage['AS_PLANNED_CUSTOMER_PAGE'] = page; - - let pageSizeValue = 50; - if (pageSize !== 0) { - pageSizeValue = pageSize; - } - - if (this.assetsAsPlannedFilter && containsAtleastOneFilterEntry(this.assetsAsPlannedFilter)) { - this.otherPartsFacade.setCustomerPartsAsPlanned(0, pageSizeValue, this.tableCustomerAsPlannedSortList, toAssetFilter(this.assetsAsPlannedFilter, true)); - } else { - this.otherPartsFacade.setCustomerPartsAsPlanned(page, pageSizeValue, this.tableCustomerAsPlannedSortList); - } - } - - private setTableSortingList(sorting: TableHeaderSort, partTable: MainAspectType): void { - const tableSortList = partTable === MainAspectType.AS_BUILT ? this.tableCustomerAsBuiltSortList : this.tableCustomerAsPlannedSortList; - TableSortingUtil.setTableSortingList(sorting, tableSortList, this.ctrlKeyState); - } - - private setupPageByUrlParams(params: Params ) { - if(!params) { - return; - } - this.onAsBuiltTableConfigChange({page: params['AS_BUILT_CUSTOMER_PAGE'], pageSize: 50, sorting: null}); - this.onAsPlannedTableConfigChange({page: params['AS_PLANNED_CUSTOMER_PAGE'], pageSize: 50, sorting: null}); - } - - protected readonly MainAspectType = MainAspectType; - protected readonly TableType = TableType; -} diff --git a/frontend/src/app/modules/page/other-parts/presentation/other-parts.component.html b/frontend/src/app/modules/page/other-parts/presentation/other-parts.component.html deleted file mode 100644 index 138d17370d..0000000000 --- a/frontend/src/app/modules/page/other-parts/presentation/other-parts.component.html +++ /dev/null @@ -1,111 +0,0 @@ - -
-
-
- -
-
-
- -
- - - - - - - - {{ 'pageOtherParts.tab.supplier' | i18n }} - - - - - - - {{ 'pageOtherParts.tab.customer' | i18n }} - - - - - - - - - - {{ 'pageOtherParts.tab.supplier' | i18n }} - - - - - - -
- {{ 'pageOtherParts.tab.customer' | i18n }} -
- - - - - - -
diff --git a/frontend/src/app/modules/page/other-parts/presentation/other-parts.component.spec.ts b/frontend/src/app/modules/page/other-parts/presentation/other-parts.component.spec.ts deleted file mode 100644 index 935d9cc219..0000000000 --- a/frontend/src/app/modules/page/other-parts/presentation/other-parts.component.spec.ts +++ /dev/null @@ -1,231 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2022, 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - * Copyright (c) 2022, 2023 ZF Friedrichshafen AG - * Copyright (c) 2022, 2023 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 - ********************************************************************************/ - -import { OtherPartsState } from '@page/other-parts/core/other-parts.state'; -import { CustomerPartsComponent } from '@page/other-parts/presentation/customer-parts/customer-parts.component'; -import { SupplierPartsComponent } from '@page/other-parts/presentation/supplier-parts/supplier-parts.component'; -import { PartsState } from '@page/parts/core/parts.state'; -import { MainAspectType } from '@page/parts/model/mainAspectType.enum'; -import { PartsAssembler } from '@shared/assembler/parts.assembler'; -import { FormatPartSemanticDataModelToCamelCasePipe } from '@shared/pipes/format-part-semantic-data-model-to-camelcase.pipe'; -import { fireEvent, screen, waitFor } from '@testing-library/angular'; -import { renderComponent } from '@tests/test-render.utils'; -import { firstValueFrom } from 'rxjs'; -import { - OTHER_PARTS_MOCK_1, - OTHER_PARTS_MOCK_2, - OTHER_PARTS_MOCK_3, - OTHER_PARTS_MOCK_4, - OTHER_PARTS_MOCK_5, - OTHER_PARTS_MOCK_6, - OTHER_PARTS_MOCK_7, - OTHER_PARTS_MOCK_8, - OTHER_PARTS_MOCK_9, -} from '../../../../mocks/services/otherParts-mock/otherParts.test.model'; -import { OtherPartsModule } from '../other-parts.module'; -import { OtherPartsComponent } from './other-parts.component'; - -describe('Other Parts', () => { - let otherPartsState: OtherPartsState; - let formatPartSemanticToCamelCase: FormatPartSemanticDataModelToCamelCasePipe; - beforeEach(() => { - otherPartsState = new OtherPartsState(); - formatPartSemanticToCamelCase = new FormatPartSemanticDataModelToCamelCasePipe(); - }); - - - const renderOtherParts = ({ roles = [] } = {}) => - renderComponent(OtherPartsComponent, { - declarations: [ SupplierPartsComponent, CustomerPartsComponent ], - imports: [ OtherPartsModule ], - providers: [ { provide: OtherPartsState, useFactory: () => otherPartsState }, { provide: PartsState } ], - roles, - }); - - it('should render part table', async () => { - await renderOtherParts(); - - const tableElements = await waitFor(() => screen.getAllByTestId('table-component--test-id')); - expect(tableElements.length).toEqual(1); - }); - - it('should render table and display correct amount of rows', async () => { - await renderOtherParts(); - - const tableElement = await waitFor(() => screen.getByTestId('table-component--test-id')); - expect(tableElement).toBeInTheDocument(); - expect(tableElement.children[1].childElementCount).toEqual(4); - }); - - it('should render tabs', async () => { - await renderOtherParts(); - const tabElements = await screen.findAllByRole('tab'); - - expect(tabElements.length).toEqual(4); - }); - - it('should render selected parts information', async () => { - await renderOtherParts({ roles: [ 'user' ] }); - await screen.findByTestId('table-component--test-id'); - const selectedPartsInfo = await screen.getByText('page.selectedParts.info'); - - expect(selectedPartsInfo).toBeInTheDocument(); - }); - - - it('should set selectedTab correctly', async () => { - const { fixture } = await renderOtherParts(); - const { componentInstance } = fixture; - - expect(componentInstance.selectedTab).toEqual(0); - - componentInstance.onTabChange({ index: 1 } as any); - expect(componentInstance.selectedTab).toEqual(1); - - componentInstance.onTabChange({ index: 0 } as any); - expect(componentInstance.selectedTab).toEqual(0); - }); - - - describe('onAsBuiltTableConfigChange', () => { - let formatPartSemanticToCamelCase: FormatPartSemanticDataModelToCamelCasePipe; - beforeEach(() => { - formatPartSemanticToCamelCase = new FormatPartSemanticDataModelToCamelCasePipe(); - }); - it('should request supplier parts if first tab is selected', async () => { - await renderOtherParts({ roles: [ 'user' ] }); - fireEvent.click(screen.getAllByText('pageOtherParts.tab.supplier')[0]); - - await waitFor(() => expect(screen.getByText('table.column.manufacturerName')).toBeInTheDocument()); - fireEvent.click(screen.getByText('table.column.manufacturerName')); - - const supplierParts = await firstValueFrom(otherPartsState.supplierPartsAsBuilt$); - await waitFor(() => - expect(supplierParts).toEqual({ - data: { - content: [ - formatPartSemanticToCamelCase.transform(PartsAssembler.assembleOtherPart(OTHER_PARTS_MOCK_6, MainAspectType.AS_BUILT)), - formatPartSemanticToCamelCase.transform(PartsAssembler.assembleOtherPart(OTHER_PARTS_MOCK_7, MainAspectType.AS_BUILT)), - formatPartSemanticToCamelCase.transform(PartsAssembler.assembleOtherPart(OTHER_PARTS_MOCK_8, MainAspectType.AS_BUILT)), - formatPartSemanticToCamelCase.transform(PartsAssembler.assembleOtherPart(OTHER_PARTS_MOCK_9, MainAspectType.AS_BUILT)), - ], - page: 0, - pageCount: 1, - pageSize: 10, - totalItems: 5, - }, - error: undefined, - loader: undefined, - }), - ); - }); - - it('should request customer parts if second tab is selected', async () => { - const fixture = await renderOtherParts({ roles: [ 'user' ] }); - let tabs = screen.getAllByText('pageOtherParts.tab.customer'); - fireEvent.click(tabs[0]); - - await waitFor(() => expect(screen.getByText('table.column.manufacturerName')).toBeInTheDocument()); - fireEvent.click(screen.getByText('table.column.manufacturerName')); - - const customerParts = await firstValueFrom(otherPartsState.customerPartsAsBuilt$); - await waitFor(() => - expect(customerParts).toEqual({ - data: { - content: [ - formatPartSemanticToCamelCase.transform(PartsAssembler.assembleOtherPart(OTHER_PARTS_MOCK_1, MainAspectType.AS_BUILT)), - formatPartSemanticToCamelCase.transform(PartsAssembler.assembleOtherPart(OTHER_PARTS_MOCK_2, MainAspectType.AS_BUILT)), - formatPartSemanticToCamelCase.transform(PartsAssembler.assembleOtherPart(OTHER_PARTS_MOCK_3, MainAspectType.AS_BUILT)), - formatPartSemanticToCamelCase.transform(PartsAssembler.assembleOtherPart(OTHER_PARTS_MOCK_4, MainAspectType.AS_BUILT)), - formatPartSemanticToCamelCase.transform(PartsAssembler.assembleOtherPart(OTHER_PARTS_MOCK_5, MainAspectType.AS_BUILT)), - ], - page: 0, - pageCount: 1, - pageSize: 10, - totalItems: 5, - }, - error: undefined, - loader: undefined, - }), - ); - }); - - it('should clear filters and call partsFacade methods with search value', async () => { - - const { fixture } = await renderOtherParts(); - const { componentInstance } = fixture; - // Arrange - const searchValue = 'searchTerm'; - - const updateSupplierPartsSpy = spyOn( - SupplierPartsComponent.prototype, - 'updateSupplierParts', - ); - - const updateCustomerPartsSpy = spyOn( - CustomerPartsComponent.prototype, - 'updateCustomerParts', - ); - - componentInstance.searchControl.setValue(searchValue); - - - // Act - componentInstance.triggerPartSearch(); - - // Assert - expect(updateSupplierPartsSpy).toHaveBeenCalledWith(searchValue); - expect(updateCustomerPartsSpy).toHaveBeenCalledWith(searchValue); - }); - - it('should trigger part search and reset filter', async () => { - const { fixture } = await renderOtherParts(); - const { componentInstance } = fixture; - const searchValue = 'testSearchValue'; - - - const updateSupplierPartsSpy = spyOn( - SupplierPartsComponent.prototype, - 'updateSupplierParts', - ); - - const updateCustomerPartsSpy = spyOn( - CustomerPartsComponent.prototype, - 'updateCustomerParts', - ); - - componentInstance.searchControl.setValue(searchValue); - - // Spy on the private method without calling it directly - const resetFilterAndShowToastSpy = spyOn(componentInstance, 'resetFilterAndShowToast'); - - // Act - componentInstance.triggerPartSearch(); - - // Assert - expect(updateSupplierPartsSpy).toHaveBeenCalledWith('testSearchValue'); - expect(updateCustomerPartsSpy).toHaveBeenCalledWith('testSearchValue'); - expect(resetFilterAndShowToastSpy).toHaveBeenCalledOnceWith(); - - }); - }); -}); - diff --git a/frontend/src/app/modules/page/other-parts/presentation/other-parts.component.ts b/frontend/src/app/modules/page/other-parts/presentation/other-parts.component.ts deleted file mode 100644 index 9dc9b8b335..0000000000 --- a/frontend/src/app/modules/page/other-parts/presentation/other-parts.component.ts +++ /dev/null @@ -1,120 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2022, 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - * Copyright (c) 2022, 2023 ZF Friedrichshafen AG - * Copyright (c) 2022, 2023 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 - ********************************************************************************/ - -import { Component, OnDestroy, OnInit, QueryList, ViewChildren } from '@angular/core'; -import { FormControl, FormGroup } from '@angular/forms'; -import { MatTabChangeEvent } from '@angular/material/tabs'; -import { OtherPartsFacade } from '@page/other-parts/core/other-parts.facade'; -import { CustomerPartsComponent } from '@page/other-parts/presentation/customer-parts/customer-parts.component'; -import { SupplierPartsComponent } from '@page/other-parts/presentation/supplier-parts/supplier-parts.component'; -import { MainAspectType } from '@page/parts/model/mainAspectType.enum'; -import { BomLifecycleSize } from '@shared/components/bom-lifecycle-activator/bom-lifecycle-activator.model'; -import { ToastService } from '@shared/components/toasts/toast.service'; -import { PartDetailsFacade } from '@shared/modules/part-details/core/partDetails.facade'; -import { BomLifecycleSettingsService, UserSettingView } from '@shared/service/bom-lifecycle-settings.service'; -import { StaticIdService } from '@shared/service/staticId.service'; -import { resetMultiSelectionAutoCompleteComponent } from '@page/parts/core/parts.helper'; - -@Component({ - selector: 'app-other-parts', - templateUrl: './other-parts.component.html', - styleUrls: [ './other-parts.component.scss' ], -}) -export class OtherPartsComponent implements OnDestroy, OnInit { - - public selectedTab = 0; - public showStartInvestigationArray = [ true, false ]; - - public readonly supplierTabLabelId = this.staticIdService.generateId('OtherParts.supplierTabLabel'); - public readonly customerTabLabelId = this.staticIdService.generateId('OtherParts.customerTabLabel'); - - public searchFormGroup = new FormGroup({}); - public searchControl: FormControl; - @ViewChildren(SupplierPartsComponent) supplierPartsComponents: QueryList; - @ViewChildren(CustomerPartsComponent) customerPartsComponents: QueryList; - - constructor( - private readonly otherPartsFacade: OtherPartsFacade, - private readonly partDetailsFacade: PartDetailsFacade, - private readonly staticIdService: StaticIdService, - public userSettings: BomLifecycleSettingsService, - public toastService: ToastService, - ) { - } - - ngOnInit(): void { - this.searchFormGroup.addControl('partSearch', new FormControl([])); - this.searchControl = this.searchFormGroup.get('partSearch') as unknown as FormControl; - } - - - public bomLifecycleSize: BomLifecycleSize = this.userSettings.getSize(UserSettingView.OTHER_PARTS); - - public ngOnDestroy(): void { - this.otherPartsFacade.unsubscribeParts(); - } - - triggerPartSearch() { - - this.resetFilterAndShowToast(); - - const searchValue = this.searchFormGroup.get('partSearch').value; - - for (const supplierPartsComponent of this.supplierPartsComponents) { - supplierPartsComponent.updateSupplierParts(searchValue); - } - for (const customerPartsComponent of this.customerPartsComponents) { - customerPartsComponent.updateCustomerParts(searchValue); - } - } - - - private resetFilterAndShowToast() { - let oneFilterSet = false; - - const resetComponents = ( - components: QueryList | QueryList, - ) => { - for (const component of components) { - let filterIsSet = resetMultiSelectionAutoCompleteComponent(component.partsTableComponents, oneFilterSet); - if (filterIsSet) { - this.toastService.info('parts.input.global-search.toastInfo'); - } - } - }; - - resetComponents(this.supplierPartsComponents); - resetComponents(this.customerPartsComponents); - } - - - public onTabChange({ index }: MatTabChangeEvent): void { - this.selectedTab = index; - this.partDetailsFacade.selectedPart = null; - } - - public handleTableActivationEvent(bomLifecycleSize: BomLifecycleSize) { - this.bomLifecycleSize = bomLifecycleSize; - } - - protected readonly MainAspectType = MainAspectType; - protected readonly UserSettingView = UserSettingView; -} diff --git a/frontend/src/app/modules/page/other-parts/presentation/supplier-parts/supplier-parts.component.html b/frontend/src/app/modules/page/other-parts/presentation/supplier-parts/supplier-parts.component.html deleted file mode 100644 index 537ff09c0c..0000000000 --- a/frontend/src/app/modules/page/other-parts/presentation/supplier-parts/supplier-parts.component.html +++ /dev/null @@ -1,104 +0,0 @@ - - - -
- - - - -
-
- - - - - -
- - - - - - - - - - - - - - diff --git a/frontend/src/app/modules/page/other-parts/presentation/supplier-parts/supplier-parts.component.spec.ts b/frontend/src/app/modules/page/other-parts/presentation/supplier-parts/supplier-parts.component.spec.ts deleted file mode 100644 index 0e43d3d2d6..0000000000 --- a/frontend/src/app/modules/page/other-parts/presentation/supplier-parts/supplier-parts.component.spec.ts +++ /dev/null @@ -1,224 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2023 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 - ********************************************************************************/ - - -import { OtherPartsState } from '@page/other-parts/core/other-parts.state'; -import { OtherPartsModule } from '@page/other-parts/other-parts.module'; -import { PartsState } from '@page/parts/core/parts.state'; -import { MainAspectType } from '@page/parts/model/mainAspectType.enum'; -import { toAssetFilter, toGlobalSearchAssetFilter } from '@shared/helper/filter-helper'; -import { fireEvent, screen, waitFor } from '@testing-library/angular'; -import { getTableCheckbox, renderComponent } from '@tests/test-render.utils'; - -import { SupplierPartsComponent } from './supplier-parts.component'; - -describe('SupplierPartsComponent', () => { - let otherPartsState: OtherPartsState; - beforeEach(() => (otherPartsState = new OtherPartsState())); - - const renderSupplierPartsAsBuilt = ({ roles = [] } = {}) => - renderComponent(SupplierPartsComponent, { - imports: [ OtherPartsModule ], - providers: [ { provide: OtherPartsState, useFactory: () => otherPartsState }, { provide: PartsState } ], - roles, - componentInputs: { - bomLifecycle: MainAspectType.AS_BUILT, - }, - }); - - const renderSupplierPartsAsPlanned = ({ roles = [] } = {}) => - renderComponent(SupplierPartsComponent, { - imports: [ OtherPartsModule ], - providers: [ { provide: OtherPartsState, useFactory: () => otherPartsState }, { provide: PartsState } ], - roles, - componentInputs: { - bomLifecycle: MainAspectType.AS_PLANNED, - }, - }); - - it('should render part table', async () => { - await renderSupplierPartsAsBuilt(); - - const tableElements = await waitFor(() => screen.getAllByTestId('table-component--test-id')); - expect(tableElements.length).toEqual(1); - }); - - it('should render table and display correct amount of rows', async () => { - await renderSupplierPartsAsBuilt(); - - const tableElement = await waitFor(() => screen.getByTestId('table-component--test-id')); - expect(tableElement).toBeInTheDocument(); - expect(tableElement.children[1].childElementCount).toEqual(4); - }); - - it('should add item to current list and then remove', async () => { - const { fixture } = await renderSupplierPartsAsBuilt({ roles: [ 'user' ] }); - - // first click to check checkbox - fireEvent.click(await getTableCheckbox(screen, 0)); - - const selectedText_1 = await waitFor(() => screen.getByText('page.selectedParts.info')); - expect(selectedText_1).toBeInTheDocument(); - - // second click to uncheck checkbox - fireEvent.click(await getTableCheckbox(screen, 0)); - - const selectedText_2 = await waitFor(() => screen.getByText('page.selectedParts.info')); - expect(selectedText_2).toBeInTheDocument(); - }); - - it('sort supplier parts after name column', async () => { - const { fixture } = await renderSupplierPartsAsBuilt({ roles: [ 'admin' ] }); - const supplierPartsComponent = fixture.componentInstance; - - let nameHeader = await screen.findByText('table.column.nameAtManufacturer'); - fireEvent.click(nameHeader); - - expect(supplierPartsComponent['tableSupplierAsBuiltSortList']).toEqual([ [ 'nameAtManufacturer', 'asc' ] ]); - - }); - - it('should multisort after column name and semanticModelId', async () => { - const { fixture } = await renderSupplierPartsAsBuilt({ roles: [ 'admin' ] }); - const supplierPartsComponent = fixture.componentInstance; - - let nameHeader = await screen.findByText('table.column.nameAtManufacturer'); - fireEvent.click(nameHeader); - let semanticModelIdHeader = await screen.findByText('table.column.semanticModelId'); - - await waitFor(() => { - fireEvent.keyDown(semanticModelIdHeader, { - ctrlKey: true, - charCode: 17, - }); - }); - expect(supplierPartsComponent['ctrlKeyState']).toBeTruthy(); - await waitFor(() => { - fireEvent.click(semanticModelIdHeader); - }); - - await waitFor(() => { - fireEvent.keyUp(semanticModelIdHeader, { - ctrlKey: true, - charCode: 17, - }); - }); - - await waitFor(() => { - fireEvent.click(semanticModelIdHeader); - }); - expect(supplierPartsComponent['tableSupplierAsBuiltSortList']).toEqual([ [ 'semanticModelId', 'desc' ] ]); - }); - - it('should reset sorting on third click', async () => { - const { fixture } = await renderSupplierPartsAsBuilt({ roles: [ 'admin' ] }); - const supplierPartsComponent = fixture.componentInstance; - - let nameHeader = await screen.findByText('table.column.nameAtManufacturer'); - fireEvent.click(nameHeader); - let semanticModelIdHeader = await screen.findByText('table.column.semanticModelId'); - - await waitFor(() => { - fireEvent.keyDown(semanticModelIdHeader, { - ctrlKey: true, - charCode: 17, - }); - }); - expect(supplierPartsComponent['ctrlKeyState']).toBeTruthy(); - await waitFor(() => { - fireEvent.click(semanticModelIdHeader); - }); - - await waitFor(() => { - fireEvent.keyUp(semanticModelIdHeader, { - ctrlKey: true, - charCode: 17, - }); - }); - - await waitFor(() => { - fireEvent.click(semanticModelIdHeader); - }); - await waitFor(() => { - fireEvent.click(semanticModelIdHeader); - }); - expect(supplierPartsComponent['tableSupplierAsBuiltSortList']).toEqual([]); - }); - - - it('should handle updateSupplierParts null', async () => { - const { fixture } = await renderSupplierPartsAsBuilt(); - const supplierPartsComponent = fixture.componentInstance; - - const otherPartsFacade = (supplierPartsComponent as any)['otherPartsFacade']; - const updateSupplierPartAsBuiltSpy = spyOn(otherPartsFacade, 'setSupplierPartsAsBuilt'); - const updateSupplierPartAsPlannedSpy = spyOn(otherPartsFacade, 'setSupplierPartsAsPlanned'); - - supplierPartsComponent.updateSupplierParts(); - - - expect(updateSupplierPartAsBuiltSpy).toHaveBeenCalledWith(); - expect(updateSupplierPartAsPlannedSpy).toHaveBeenCalledWith(); - - }); - - it('should handle updateCustomerParts including search', async () => { - const { fixture } = await renderSupplierPartsAsBuilt(); - const supplierPartsComponent = fixture.componentInstance; - - const otherPartsFacade = (supplierPartsComponent as any)['otherPartsFacade']; - const updateSupplierPartAsBuiltSpy = spyOn(otherPartsFacade, 'setSupplierPartsAsBuilt'); - const updateSupplierPartAsPlannedSpy = spyOn(otherPartsFacade, 'setSupplierPartsAsPlanned'); - - - const search = 'test'; - supplierPartsComponent.updateSupplierParts(search); - - - expect(updateSupplierPartAsBuiltSpy).toHaveBeenCalledWith(0, 50, [], toGlobalSearchAssetFilter(search, true), true); - expect(updateSupplierPartAsPlannedSpy).toHaveBeenCalledWith(0, 50, [], toGlobalSearchAssetFilter(search, false), true); - - }); - - it('should correctly react to table config change', async function() { - const { fixture } = await renderSupplierPartsAsPlanned(); - const supplierPartsComponent = fixture.componentInstance; - const otherPartsFacade = (supplierPartsComponent as any)['otherPartsFacade']; - const assetFilter = toAssetFilter({idShort: "test"}, false); - const tableSortingList = ["idShort","asc"]; - - supplierPartsComponent.assetsAsPlannedFilter = assetFilter; - - let setSupplierPartsAsPlannedSpy = spyOn(otherPartsFacade,'setSupplierPartsAsPlanned'); - - supplierPartsComponent.onAsPlannedTableConfigChange({page: 0, pageSize: 50, sorting: ["idShort","asc"]}); - - expect(setSupplierPartsAsPlannedSpy).toHaveBeenCalled(); - expect(setSupplierPartsAsPlannedSpy).toHaveBeenCalledWith(0,50, [tableSortingList], {idShort: 'test'}); - - supplierPartsComponent.assetsAsPlannedFilter = null; - - supplierPartsComponent.onAsPlannedTableConfigChange({page: 0, pageSize: 50, sorting: ["idShort", "asc"]}) - expect(setSupplierPartsAsPlannedSpy).toHaveBeenCalledWith(0,50,[tableSortingList]) - - - }) - - -}); diff --git a/frontend/src/app/modules/page/other-parts/presentation/supplier-parts/supplier-parts.component.ts b/frontend/src/app/modules/page/other-parts/presentation/supplier-parts/supplier-parts.component.ts deleted file mode 100644 index 6e28ba314c..0000000000 --- a/frontend/src/app/modules/page/other-parts/presentation/supplier-parts/supplier-parts.component.ts +++ /dev/null @@ -1,186 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2023 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 - ********************************************************************************/ - - -import {Component, Input, OnDestroy, OnInit, QueryList, ViewChildren} from '@angular/core'; -import {ActivatedRoute, Params, Router} from '@angular/router'; -import {Pagination} from '@core/model/pagination.model'; -import {OtherPartsFacade} from '@page/other-parts/core/other-parts.facade'; -import {MainAspectType} from '@page/parts/model/mainAspectType.enum'; -import {AssetAsBuiltFilter, AssetAsPlannedFilter, Part} from '@page/parts/model/parts.model'; -import {TableType} from '@shared/components/multi-select-autocomplete/table-type.model'; -import {PartsTableComponent} from '@shared/components/parts-table/parts-table.component'; -import {TableSortingUtil} from '@shared/components/table/table-sorting.util'; -import {TableEventConfig, TableHeaderSort} from '@shared/components/table/table.model'; -import {containsAtleastOneFilterEntry, toAssetFilter, toGlobalSearchAssetFilter} from '@shared/helper/filter-helper'; -import {setMultiSorting} from '@shared/helper/table-helper'; -import {NotificationType} from '@shared/model/notification.model'; -import {View} from '@shared/model/view.model'; -import {PartDetailsFacade} from '@shared/modules/part-details/core/partDetails.facade'; -import {StaticIdService} from '@shared/service/staticId.service'; -import {BehaviorSubject, Observable, Subject} from 'rxjs'; - -@Component({ - selector: 'app-supplier-parts', - templateUrl: './supplier-parts.component.html', - styleUrls: [ '../other-parts.component.scss' ], -}) -export class SupplierPartsComponent implements OnInit, OnDestroy { - - public supplierPartsAsBuilt$: Observable>>; - public supplierPartsAsPlanned$: Observable>>; - - public readonly deselectPartTrigger$ = new Subject(); - public readonly addPartTrigger$ = new Subject(); - public readonly currentSelectedItems$ = new BehaviorSubject([]); - - public readonly isInvestigationOpen$ = new BehaviorSubject(false); - - public readonly supplierTabLabelId = this.staticIdService.generateId('OtherParts.supplierTabLabel'); - - public tableSupplierAsBuiltSortList: TableHeaderSort[] = []; - public tableSupplierAsPlannedSortList: TableHeaderSort[] = []; - - private ctrlKeyState = false; - - @Input() - public bomLifecycle: MainAspectType; - - @ViewChildren(PartsTableComponent) partsTableComponents: QueryList; - - assetAsBuiltFilter: AssetAsBuiltFilter; - assetsAsPlannedFilter: AssetAsPlannedFilter; - - public currentPartTablePage = {AS_BUILT_SUPPLIER_PAGE: 0, AS_PLANNED_SUPPLIER_PAGE: 0} - - constructor( - private readonly otherPartsFacade: OtherPartsFacade, - private readonly partDetailsFacade: PartDetailsFacade, - private readonly staticIdService: StaticIdService, - private readonly router: Router, - private readonly route: ActivatedRoute - ) { - - window.addEventListener('keydown', (event) => { - this.ctrlKeyState = setMultiSorting(event); - }); - window.addEventListener('keyup', (event) => { - this.ctrlKeyState = setMultiSorting(event); - }); - } - - public ngOnInit(): void { - this.route.queryParams.subscribe(params => this.setupPageByUrlParams(params)); - - if (this.bomLifecycle === MainAspectType.AS_BUILT) { - this.supplierPartsAsBuilt$ = this.otherPartsFacade.supplierPartsAsBuilt$; - this.tableSupplierAsBuiltSortList = []; - this.otherPartsFacade.setSupplierPartsAsBuilt(); - } else if (this.bomLifecycle === MainAspectType.AS_PLANNED) { - this.supplierPartsAsPlanned$ = this.otherPartsFacade.supplierPartsAsPlanned$; - this.tableSupplierAsPlannedSortList = []; - this.otherPartsFacade.setSupplierPartsAsPlanned(); - } - } - - filterActivated(isAsBuilt: boolean, assetFilter: any): void { - if (isAsBuilt) { - this.assetAsBuiltFilter = assetFilter; - this.otherPartsFacade.setSupplierPartsAsBuilt(this.currentPartTablePage?.['AS_BUILT_SUPPLIER_PAGE'] ?? 0, 50, [], toAssetFilter(this.assetAsBuiltFilter, true)); - } else { - this.assetsAsPlannedFilter = assetFilter; - this.otherPartsFacade.setSupplierPartsAsPlanned(this.currentPartTablePage?.['AS_PLANNED_SUPPLIER_PAGE'] ?? 0, 50, [], toAssetFilter(this.assetsAsPlannedFilter, false)); - } - } - - updateSupplierParts(searchValue?: string): void { - if (searchValue || searchValue === '') { - this.otherPartsFacade.setSupplierPartsAsBuilt(0, 50, [], toGlobalSearchAssetFilter(searchValue, true), true); - this.otherPartsFacade.setSupplierPartsAsPlanned(0, 50, [], toGlobalSearchAssetFilter(searchValue, false), true); - } else { - this.otherPartsFacade.setSupplierPartsAsBuilt(); - this.otherPartsFacade.setSupplierPartsAsPlanned(); - } - } - - public ngOnDestroy(): void { - this.otherPartsFacade.unsubscribeParts(); - } - - public onSelectItem(event: Record): void { - this.partDetailsFacade.selectedPart = event as unknown as Part; - let tableData = {}; - for(let component of this.partsTableComponents) { - tableData[component.tableType+"_PAGE"] = component.pageIndex; - } - this.router.navigate([`otherParts/${event?.id}`], {queryParams: tableData}) - } - - public onAsBuiltTableConfigChange({ page, pageSize, sorting }: TableEventConfig): void { - - this.setTableSortingList(sorting, MainAspectType.AS_BUILT); - this.currentPartTablePage['AS_BUILT_SUPPLIER_PAGE'] = page; - - let pageSizeValue = 50; - if (pageSize !== 0) { - pageSizeValue = pageSize; - } - if (this.assetAsBuiltFilter && containsAtleastOneFilterEntry(this.assetAsBuiltFilter)) { - this.otherPartsFacade.setSupplierPartsAsBuilt(0, pageSizeValue, this.tableSupplierAsBuiltSortList, toAssetFilter(this.assetAsBuiltFilter, true)); - } else { - this.otherPartsFacade.setSupplierPartsAsBuilt(page, pageSizeValue, this.tableSupplierAsBuiltSortList); - } - - } - - public onAsPlannedTableConfigChange({ page, pageSize, sorting }: TableEventConfig): void { - this.setTableSortingList(sorting, MainAspectType.AS_PLANNED); - this.currentPartTablePage['AS_PLANNED_SUPPLIER_PAGE'] = page; - - let pageSizeValue = 50; - if (pageSize !== 0) { - pageSizeValue = pageSize; - } - - if (this.assetsAsPlannedFilter && containsAtleastOneFilterEntry(this.assetsAsPlannedFilter)) { - this.otherPartsFacade.setSupplierPartsAsPlanned(0, pageSizeValue, this.tableSupplierAsPlannedSortList, toAssetFilter(this.assetsAsPlannedFilter, true)); - } else { - this.otherPartsFacade.setSupplierPartsAsPlanned(page, pageSizeValue, this.tableSupplierAsPlannedSortList); - } - - } - - - private setTableSortingList(sorting: TableHeaderSort, partTable: MainAspectType): void { - const tableSortList = partTable === MainAspectType.AS_BUILT ? this.tableSupplierAsBuiltSortList : this.tableSupplierAsPlannedSortList; - TableSortingUtil.setTableSortingList(sorting, tableSortList, this.ctrlKeyState); - } - - private setupPageByUrlParams(params: Params ) { - if(!params) { - return; - } - this.onAsBuiltTableConfigChange({page: params['AS_BUILT_SUPPLIER_PAGE'], pageSize: 50, sorting: null}); - this.onAsPlannedTableConfigChange({page: params['AS_PLANNED_SUPPLIER_PAGE'], pageSize: 50, sorting: null}); - } - - protected readonly MainAspectType = MainAspectType; - protected readonly TableType = TableType; - protected readonly NotificationType = NotificationType; -} diff --git a/frontend/src/app/modules/page/parts/core/parts.facade.spec.ts b/frontend/src/app/modules/page/parts/core/parts.facade.spec.ts index cd49da359d..32aa3cc79d 100644 --- a/frontend/src/app/modules/page/parts/core/parts.facade.spec.ts +++ b/frontend/src/app/modules/page/parts/core/parts.facade.spec.ts @@ -70,6 +70,25 @@ describe('Parts facade', () => { ); }); + it('should set second parts if request is successful', async () => { + const serviceSpy = spyOn(partsServiceMok, 'getPartsAsBuilt').and.returnValue( + of>(PartsAssembler.assembleParts(mockAssets, MainAspectType.AS_BUILT)), + ); + partsFacade.setPartsAsBuiltSecond(0, 10); + + await waitFor(() => expect(serviceSpy).toHaveBeenCalledTimes(1)); + await waitFor(() => expect(serviceSpy).toHaveBeenCalledWith(0, 10, [], undefined, undefined)); + + const parts = await firstValueFrom(partsState.partsAsBuiltSecond$); + await waitFor(() => + expect(parts).toEqual({ + error: undefined, + loader: undefined, + data: PartsAssembler.assembleParts(mockAssets, MainAspectType.AS_BUILT), + }), + ); + }); + it('should set parts including filter if request is successful', async () => { const serviceSpy = spyOn(partsServiceMok, 'getPartsAsBuilt').and.returnValue( of>(PartsAssembler.assembleParts(mockAssets, MainAspectType.AS_BUILT)), diff --git a/frontend/src/app/modules/page/parts/core/parts.facade.ts b/frontend/src/app/modules/page/parts/core/parts.facade.ts index 998649b04b..7033a8beb9 100644 --- a/frontend/src/app/modules/page/parts/core/parts.facade.ts +++ b/frontend/src/app/modules/page/parts/core/parts.facade.ts @@ -32,6 +32,7 @@ import { Observable, Subject, Subscription } from 'rxjs'; @Injectable() export class PartsFacade { private partsAsBuiltSubscription: Subscription; + private partsAsBuiltSubscriptionSecond: Subscription; private partsAsPlannedSubscription: Subscription; private readonly unsubscribeTrigger = new Subject(); @@ -42,6 +43,10 @@ export class PartsFacade { return this.partsState.partsAsBuilt$; } + public get partsAsBuiltSecond$(): Observable>> { + return this.partsState.partsAsBuiltSecond$; + } + public get partsAsPlanned$(): Observable>> { return this.partsState.partsAsPlanned$; } @@ -54,6 +59,22 @@ export class PartsFacade { }); } + public setPartsAsBuiltSecond(page = 0, pageSize = 50, sorting: TableHeaderSort[] = [], assetAsBuiltFilter?: AssetAsBuiltFilter, isOrSearch?: boolean): void { + this.partsAsBuiltSubscriptionSecond?.unsubscribe(); + this.partsAsBuiltSubscriptionSecond = this.partsService.getPartsAsBuilt(page, pageSize, sorting, assetAsBuiltFilter, isOrSearch).subscribe({ + next: data => (this.partsState.partsAsBuiltSecond = { data: provideDataObject(data) }), + error: error => (this.partsState.partsAsBuiltSecond = { error }), + }); + } + + public setPartsAsBuiltSecondEmpty(page = 0, pageSize = 50, sorting: TableHeaderSort[] = [], assetAsBuiltFilter?: AssetAsBuiltFilter, isOrSearch?: boolean): void { + this.partsAsBuiltSubscriptionSecond?.unsubscribe(); + this.partsAsBuiltSubscriptionSecond = this.partsService.getPartsAsBuilt(page, pageSize, sorting, assetAsBuiltFilter, isOrSearch).subscribe({ + next: data => (this.partsState.partsAsBuiltSecond = { data: provideDataObject(null) }), + error: error => (this.partsState.partsAsBuiltSecond = { error }), + }); + } + public setPartsAsPlanned(page = 0, pageSize = 50, sorting: TableHeaderSort[] = [], assetAsPlannedFilter?: AssetAsPlannedFilter, isOrSearch?: boolean): void { this.partsAsPlannedSubscription?.unsubscribe(); this.partsAsPlannedSubscription = this.partsService.getPartsAsPlanned(page, pageSize, sorting, assetAsPlannedFilter, isOrSearch).subscribe({ @@ -64,6 +85,7 @@ export class PartsFacade { public unsubscribeParts(): void { this.partsAsBuiltSubscription?.unsubscribe(); + this.partsAsBuiltSubscriptionSecond?.unsubscribe(); this.partsAsPlannedSubscription?.unsubscribe(); this.unsubscribeTrigger.next(); } diff --git a/frontend/src/app/modules/page/parts/core/parts.helper.ts b/frontend/src/app/modules/page/parts/core/parts.helper.ts index c951264a42..b3ebeb6a78 100644 --- a/frontend/src/app/modules/page/parts/core/parts.helper.ts +++ b/frontend/src/app/modules/page/parts/core/parts.helper.ts @@ -19,7 +19,6 @@ import { QueryList } from '@angular/core'; import { Pagination } from '@core/model/pagination.model'; -import { Part } from '@page/parts/model/parts.model'; import { PartsTableComponent } from '@shared/components/parts-table/parts-table.component'; export function resetMultiSelectionAutoCompleteComponent(partsTableComponents: QueryList, oneFilterSet: boolean): boolean { @@ -36,19 +35,20 @@ export function resetMultiSelectionAutoCompleteComponent(partsTableComponents: Q return oneFilterSet; } -export function provideDataObject(data: Pagination){ +export function provideDataObject(data: Pagination) { let usedData: Pagination; - if (!data.content?.length){ + if (!data || !data.content?.length) { usedData = { content: [], page: 0, pageCount: 0, pageSize: 0, - totalItems: 0 + totalItems: 0, }; } else { usedData = data; } - return usedData + return usedData; } + diff --git a/frontend/src/app/modules/page/parts/core/parts.state.ts b/frontend/src/app/modules/page/parts/core/parts.state.ts index e29e4d2b76..af8be13edd 100644 --- a/frontend/src/app/modules/page/parts/core/parts.state.ts +++ b/frontend/src/app/modules/page/parts/core/parts.state.ts @@ -29,17 +29,27 @@ import { Observable } from 'rxjs'; @Injectable() export class PartsState { private readonly _partsAsBuilt$ = new State>>({ loader: true }); + private readonly _partsAsBuiltSecond$ = new State>>({ loader: true }); private readonly _partsAsPlanned$ = new State>>({ loader: true }); public get partsAsBuilt$(): Observable>> { return this._partsAsBuilt$.observable; } + public get partsAsBuiltSecond$(): Observable>> { + return this._partsAsBuiltSecond$.observable; + } + public set partsAsBuilt({ data, loader, error }: View>) { const partsView: View> = { data, loader, error }; this._partsAsBuilt$.update(partsView); } + public set partsAsBuiltSecond({ data, loader, error }: View>) { + const partsView: View> = { data, loader, error }; + this._partsAsBuiltSecond$.update(partsView); + } + public get partsAsBuilt(): View> { return this._partsAsBuilt$.snapshot; } diff --git a/frontend/src/app/modules/page/parts/detail/parts-detail.component.html b/frontend/src/app/modules/page/parts/detail/parts-detail.component.html index 0a4219f3ec..55d085ed32 100644 --- a/frontend/src/app/modules/page/parts/detail/parts-detail.component.html +++ b/frontend/src/app/modules/page/parts/detail/parts-detail.component.html @@ -22,6 +22,7 @@
@@ -43,7 +44,8 @@ iconName="announcement" class="action-button-tile mr-2" [isDisabled]="incidentCreationTooltipMessage !== 'routing.createIncident'" - (click)="isNotificationRequestOpen.next(true)" + onkeydown="navigateToNotificationCreationView()" + (click)="navigateToNotificationCreationView()" >
@@ -58,6 +60,7 @@ iconName="published_with_changes" class="action-button-tile" [isDisabled]="publishAssetsTooltipMessage !== 'routing.publishAssets'" + onkeydown="isPublisherOpen$.next(true)" (click)="isPublisherOpen$.next(true)" >
@@ -168,7 +171,6 @@ > {{'partDetail.position' | i18n}} - 000{{i + 1}} @@ -200,7 +202,7 @@ - open_in_new @@ -314,13 +316,3 @@ (submitted)="isPublisherOpen$.next(false);" > - - - - - diff --git a/frontend/src/app/modules/page/parts/detail/parts-detail.component.spec.ts b/frontend/src/app/modules/page/parts/detail/parts-detail.component.spec.ts index 5b13842a69..1b7d278815 100644 --- a/frontend/src/app/modules/page/parts/detail/parts-detail.component.spec.ts +++ b/frontend/src/app/modules/page/parts/detail/parts-detail.component.spec.ts @@ -1,16 +1,16 @@ -import {LayoutModule} from '@layout/layout.module'; -import {PartsState} from '@page/parts/core/parts.state'; -import {PartsDetailModule} from '@page/parts/detail/parts-detail.module'; -import {MainAspectType} from '@page/parts/model/mainAspectType.enum'; -import {PartsAssembler} from '@shared/assembler/parts.assembler'; -import {PartDetailsFacade} from '@shared/modules/part-details/core/partDetails.facade'; -import {PartDetailsState} from '@shared/modules/part-details/core/partDetails.state'; -import {screen} from '@testing-library/angular'; -import {renderComponent} from '@tests/test-render.utils'; -import {MOCK_part_1} from '../../../../mocks/services/parts-mock/partsAsBuilt/partsAsBuilt.test.model'; - -import {PartsDetailComponent} from './parts-detail.component'; -import {Owner} from "@page/parts/model/owner.enum"; +import { LayoutModule } from '@layout/layout.module'; +import { PartsState } from '@page/parts/core/parts.state'; +import { PartsDetailModule } from '@page/parts/detail/parts-detail.module'; +import { MainAspectType } from '@page/parts/model/mainAspectType.enum'; +import { Owner } from '@page/parts/model/owner.enum'; +import { PartsAssembler } from '@shared/assembler/parts.assembler'; +import { PartDetailsFacade } from '@shared/modules/part-details/core/partDetails.facade'; +import { PartDetailsState } from '@shared/modules/part-details/core/partDetails.state'; +import { screen } from '@testing-library/angular'; +import { renderComponent } from '@tests/test-render.utils'; +import { MOCK_part_1 } from '../../../../mocks/services/parts-mock/partsAsBuilt/partsAsBuilt.test.model'; + +import { PartsDetailComponent } from './parts-detail.component'; let PartsStateMock: PartsState; let PartDetailsStateMock: PartDetailsState; @@ -54,7 +54,6 @@ describe('PartsDetailComponent', () => { const childTableHeadline = await screen.findByText('partDetail.investigation.headline'); expect(childTableHeadline).toBeInTheDocument(); - expect(await screen.findByText('partDetail.investigation.noSelection.header')).toBeInTheDocument(); }); diff --git a/frontend/src/app/modules/page/parts/detail/parts-detail.component.ts b/frontend/src/app/modules/page/parts/detail/parts-detail.component.ts index d077f4b92d..0291bd6fc5 100644 --- a/frontend/src/app/modules/page/parts/detail/parts-detail.component.ts +++ b/frontend/src/app/modules/page/parts/detail/parts-detail.component.ts @@ -1,22 +1,23 @@ -import {Location} from '@angular/common'; -import {Component, Input} from '@angular/core'; -import {FormControl} from '@angular/forms'; -import {ActivatedRoute, Router} from '@angular/router'; -import {RoleService} from '@core/user/role.service'; -import {TractionBatteryCode} from '@page/parts/model/aspectModels.model'; -import {Owner} from '@page/parts/model/owner.enum'; - -import {ImportState, Part, QualityType} from '@page/parts/model/parts.model'; -import {PartsAssembler} from '@shared/assembler/parts.assembler'; -import {SelectOption} from '@shared/components/select/select.component'; -import {NotificationType} from '@shared/model/notification.model'; -import {State} from '@shared/model/state'; -import {View} from '@shared/model/view.model'; -import {NotificationAction} from '@shared/modules/notification/notification-action.enum'; - -import {PartDetailsFacade} from '@shared/modules/part-details/core/partDetails.facade'; -import {BehaviorSubject, Observable, Subject, Subscription} from 'rxjs'; -import {filter, tap} from 'rxjs/operators'; +import { Location } from '@angular/common'; +import { Component, Input } from '@angular/core'; +import { FormControl } from '@angular/forms'; +import { ActivatedRoute, Router } from '@angular/router'; +import { RoleService } from '@core/user/role.service'; +import { SharedPartService } from '@page/notifications/detail/edit/shared-part.service'; +import { TractionBatteryCode } from '@page/parts/model/aspectModels.model'; +import { Owner } from '@page/parts/model/owner.enum'; + +import { ImportState, Part, QualityType } from '@page/parts/model/parts.model'; +import { PartsAssembler } from '@shared/assembler/parts.assembler'; +import { SelectOption } from '@shared/components/select/select.component'; +import { NotificationType } from '@shared/model/notification.model'; +import { State } from '@shared/model/state'; +import { View } from '@shared/model/view.model'; +import { NotificationAction } from '@shared/modules/notification/notification-action.enum'; + +import { PartDetailsFacade } from '@shared/modules/part-details/core/partDetails.facade'; +import { BehaviorSubject, Observable, Subject, Subscription } from 'rxjs'; +import { filter, tap } from 'rxjs/operators'; @Component({ selector: 'app-parts-detail', @@ -62,11 +63,17 @@ export class PartsDetailComponent { public currentPartId: string; public pageIndexHistory: {AS_BUILT_PAGE: string, AS_PLANNED_PAGE: string} + private isAsBuiltPart: boolean; - constructor(public readonly partDetailsFacade: PartDetailsFacade, private readonly router: Router, private readonly route: ActivatedRoute, public roleService: RoleService, private location: Location) { + constructor(public readonly partDetailsFacade: PartDetailsFacade, private readonly router: Router, private readonly route: ActivatedRoute, public roleService: RoleService, private location: Location, private sharedPartService: SharedPartService) { + + this.route.queryParams.subscribe((params: { AS_BUILT_PAGE: string, AS_PLANNED_PAGE: string }) => { + this.pageIndexHistory = params; + this.isAsBuiltPart = params['isAsBuilt'] === 'true'; + }); this.currentPartId = this.route.snapshot.params['partId']; - this.partDetailsFacade.setPartById(this.currentPartId); + this.partDetailsFacade.setPartById(this.currentPartId, this.isAsBuiltPart); this.selectedPartDetails$ = this.partDetailsFacade.selectedPart$; this.shortenPartDetails$ = this.partDetailsFacade.selectedPart$; @@ -123,12 +130,6 @@ export class PartsDetailComponent { this.displayedColumns = [ 'position', 'productType', 'tractionBatteryCode' ]; } - public ngOnInit(): void { - this.route.queryParams.subscribe((params: {AS_BUILT_PAGE: string, AS_PLANNED_PAGE: string}) => { - this.pageIndexHistory = params; - }) - } - public ngOnDestroy(): void { this.partDetailsFacade.selectedPart = null; } @@ -206,16 +207,20 @@ export class PartsDetailComponent { } - - protected readonly NotificationAction = NotificationAction; - protected readonly Owner = Owner; - navigateToParentPath() { const parentPath = this.router.routerState.snapshot.url.split('/')[1]; //otherParts const navigationExtras = this.pageIndexHistory ? {queryParams: this.pageIndexHistory} : null this.router.navigate([parentPath], navigationExtras); } + navigateToNotificationCreationView() { + this.router.navigate([ 'inbox/create' ], { queryParams: { initialType: this.partOwner === Owner.OWN ? 'Alert' : 'Investigation' } }); + this.sharedPartService.affectedParts = [this.partDetailsFacade.selectedPart]; + +} + + protected readonly NotificationAction = NotificationAction; + protected readonly Owner = Owner; protected readonly NotificationType = NotificationType; } diff --git a/frontend/src/app/modules/page/parts/model/mainAspectType.enum.ts b/frontend/src/app/modules/page/parts/model/mainAspectType.enum.ts index 47f6242110..31ae41e891 100644 --- a/frontend/src/app/modules/page/parts/model/mainAspectType.enum.ts +++ b/frontend/src/app/modules/page/parts/model/mainAspectType.enum.ts @@ -20,6 +20,3 @@ export enum MainAspectType { AS_BUILT = 'as_built', AS_PLANNED = 'as_planned' } - - - diff --git a/frontend/src/app/modules/page/parts/model/parts.model.ts b/frontend/src/app/modules/page/parts/model/parts.model.ts index 5ffd81fea6..4296355d39 100644 --- a/frontend/src/app/modules/page/parts/model/parts.model.ts +++ b/frontend/src/app/modules/page/parts/model/parts.model.ts @@ -120,6 +120,8 @@ export enum SemanticDataModel { PARTASPLANNED = 'PARTASPLANNED', JUSTINSEQUENCE = 'JUSTINSEQUENCE', TRACTIONBATTERYCODE = 'TRACTIONBATTERYCODE', + TOMBSTONEASBUILT = 'TOMBSTONEASBUILT', + TOMBSTONEASPLANNED = 'TOMBSTONEASPLANNED', UNKNOWN = 'UNKNOWN' } @@ -129,9 +131,12 @@ export enum SemanticDataModelInCamelCase { PARTASPLANNED = 'PartAsPlanned', JUSTINSEQUENCE = 'JustInSequence', TRACTIONBATTERYCODE = 'TractionBatteryCode', + TOMBSTONEASBUILT = 'TombstoneAsBuilt', + TOMBSTONEASPLANNED = 'TombstoneAsPlanned', UNKNOWN = 'Unknown' } + export interface Relation { id: string; idShort: string; @@ -139,9 +144,12 @@ export interface Relation { export interface AssetAsBuiltFilter { id?: string, + ids?: string[], + excludeIds?: string[], idShort?: string, name?: string, manufacturerName?: string, + businessPartner?: string, partId?: string, manufacturerPartId?: string, customerPartId?: string, @@ -150,7 +158,8 @@ export interface AssetAsBuiltFilter { semanticModelId?: string, semanticDataModel?: string[], manufacturingDate?: string, - manufacturingCountry?: string + manufacturingCountry?: string, + owner?: Owner } export interface AssetAsPlannedFilter { @@ -158,6 +167,7 @@ export interface AssetAsPlannedFilter { idShort?: string, name?: string, manufacturer?: string, + businessPartner?: string, manufacturerPartId?: string, classification?: string, semanticDataModel?: string[], @@ -168,6 +178,7 @@ export interface AssetAsPlannedFilter { catenaXSiteId?: string, functionValidFrom?: string, functionValidUntil?: string, + owner?: Owner } export enum ImportState { @@ -194,7 +205,8 @@ export enum FilterOperator { STARTS_WITH = 'STARTS_WITH', BEFORE_LOCAL_DATE = 'BEFORE_LOCAL_DATE', AFTER_LOCAL_DATE = 'AFTER_LOCAL_DATE', - NOTIFICATION_COUNT_EQUAL = 'NOTIFICATION_COUNT_EQUAL' + NOTIFICATION_COUNT_EQUAL = 'NOTIFICATION_COUNT_EQUAL', + EXCLUDE = 'EXCLUDE' } export function getFilterOperatorValue(operator: FilterOperator) { diff --git a/frontend/src/app/modules/page/parts/presentation/parts.component.html b/frontend/src/app/modules/page/parts/presentation/parts.component.html index 657e7da9ce..2379a9d9df 100644 --- a/frontend/src/app/modules/page/parts/presentation/parts.component.html +++ b/frontend/src/app/modules/page/parts/presentation/parts.component.html @@ -20,8 +20,11 @@ -->
-
-
+
+
+ +
+
-
- - -
- -
- published_with_changes - {{ 'actions.publishAssets' | i18n }} -
- -
-
+
- - + @@ -75,7 +53,9 @@ @@ -134,18 +117,6 @@ > - - - -

{{ 'dataLoading.error' | i18n }}

diff --git a/frontend/src/app/modules/page/parts/presentation/parts.component.scss b/frontend/src/app/modules/page/parts/presentation/parts.component.scss index 45bc1ba01c..a9872aac02 100644 --- a/frontend/src/app/modules/page/parts/presentation/parts.component.scss +++ b/frontend/src/app/modules/page/parts/presentation/parts.component.scss @@ -21,8 +21,20 @@ .parts-table-container { width: 100%; + + .search--and--quick--filter--wrapper { + display: flex; + align-items: center; + margin-bottom: 15px; + } + + .searchbar--container { + flex-grow: 1; + } } + + diff --git a/frontend/src/app/modules/page/parts/presentation/parts.component.spec.ts b/frontend/src/app/modules/page/parts/presentation/parts.component.spec.ts index 56b0dc8c0e..eb3b595ed4 100644 --- a/frontend/src/app/modules/page/parts/presentation/parts.component.spec.ts +++ b/frontend/src/app/modules/page/parts/presentation/parts.component.spec.ts @@ -19,12 +19,15 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +import { QueryList } from '@angular/core'; import {LayoutModule} from '@layout/layout.module'; import {SidenavComponent} from '@layout/sidenav/sidenav.component'; import {SidenavService} from '@layout/sidenav/sidenav.service'; -import {OtherPartsModule} from '@page/other-parts/other-parts.module'; +import { Owner } from '@page/parts/model/owner.enum'; import {AssetAsBuiltFilter, AssetAsPlannedFilter} from '@page/parts/model/parts.model'; import {PartsComponent} from '@page/parts/presentation/parts.component'; +import { TableType } from '@shared/components/multi-select-autocomplete/table-type.model'; +import { QuickFilterComponent } from '@shared/components/quick-filter/quick-filter.component'; import {TableHeaderSort} from '@shared/components/table/table.model'; import {toAssetFilter, toGlobalSearchAssetFilter} from '@shared/helper/filter-helper'; import {PartDetailsFacade} from '@shared/modules/part-details/core/partDetails.facade'; @@ -39,7 +42,7 @@ describe('Parts', () => { return renderComponent(PartsComponent, { declarations: [ SidenavComponent ], - imports: [ PartsModule, SharedModule, LayoutModule, OtherPartsModule ], + imports: [ PartsModule, SharedModule, LayoutModule], providers: [ { provide: SidenavService }, { provide: PartDetailsFacade } ], roles: [ 'admin', 'wip' ], }); @@ -119,7 +122,12 @@ describe('Parts', () => { const pageSize = 10; // Set the page size const sorting = [ 'id', 'asc' ] as TableHeaderSort; componentInstance.ctrlKeyState = true; - + // Set up QueryList of QuickFilterComponent + const quickFilterComponents = new QueryList(); + const quickFilterComponentMock = new QuickFilterComponent(); + quickFilterComponentMock.owner = Owner.UNKNOWN; + quickFilterComponents.reset([quickFilterComponentMock]); + componentInstance.quickFilterComponents = quickFilterComponents; // Access the private partsFacade property const partsFacade = (componentInstance as any)['partsFacade']; const partsFacadeSpy = spyOn(partsFacade, 'setPartsAsBuilt'); @@ -193,7 +201,13 @@ describe('Parts', () => { // Access the private partsFacade property const partsFacade = (componentInstance as any)['partsFacade']; const partsFacadeSpy = spyOn(partsFacade, 'setPartsAsBuilt'); - + // Set up QueryList of QuickFilterComponent + const quickFilterComponents = new QueryList(); + const quickFilterComponentMock = new QuickFilterComponent(); + quickFilterComponentMock.owner = Owner.UNKNOWN; + quickFilterComponents.reset([quickFilterComponentMock]); + componentInstance.quickFilterComponents = quickFilterComponents; // Act + componentInstance['onAsPlannedTableConfigChange']({ page, pageSize, sorting }); // Access private method // Act componentInstance['onAsBuiltTableConfigChange']({ page, pageSize, sorting }); // Access private method @@ -216,7 +230,12 @@ describe('Parts', () => { const partsFacade = (componentInstance as any)['partsFacade']; const partsFacadeSpy = spyOn(partsFacade, 'setPartsAsPlanned'); - // Act + // Set up QueryList of QuickFilterComponent + const quickFilterComponents = new QueryList(); + const quickFilterComponentMock = new QuickFilterComponent(); + quickFilterComponentMock.owner = Owner.UNKNOWN; + quickFilterComponents.reset([quickFilterComponentMock]); + componentInstance.quickFilterComponents = quickFilterComponents; // Act componentInstance['onAsPlannedTableConfigChange']({ page, pageSize, sorting }); // Access private method // Assert @@ -231,6 +250,12 @@ describe('Parts', () => { const pageSize = 10; // Set the page size const sorting = [ 'id', 'asc' ] as TableHeaderSort; componentInstance.ctrlKeyState = false; + // Set up QueryList of QuickFilterComponent + const quickFilterComponents = new QueryList(); + const quickFilterComponentMock = new QuickFilterComponent(); + quickFilterComponentMock.owner = Owner.UNKNOWN; + quickFilterComponents.reset([quickFilterComponentMock]); + componentInstance.quickFilterComponents = quickFilterComponents; // Access the private partsFacade property const partsFacade = (componentInstance as any)['partsFacade']; @@ -265,7 +290,12 @@ describe('Parts', () => { // Access the private partsFacade property const partsFacade = (componentInstance as any)['partsFacade']; const partsFacadeSpy = spyOn(partsFacade, 'setPartsAsBuilt'); - + // Set up QueryList of QuickFilterComponent + const quickFilterComponents = new QueryList(); + const quickFilterComponentMock = new QuickFilterComponent(); + quickFilterComponentMock.owner = Owner.UNKNOWN; + quickFilterComponents.reset([quickFilterComponentMock]); + componentInstance.quickFilterComponents = quickFilterComponents; // Act componentInstance['onAsBuiltTableConfigChange']({ page, pageSize, sorting }); // Access private method @@ -294,6 +324,98 @@ describe('Parts', () => { expect(partsFacadeSpy).toHaveBeenCalledWith(0, 50, [], toGlobalSearchAssetFilter(searchValue, true), true); }); + it('should updatePartsByOwner', async () => { + + const { fixture } = await renderParts(); + const { componentInstance } = fixture; + // Arrange + const searchValue = 'searchTerm'; + + const partsFacade = (componentInstance as any)['partsFacade']; + const partsFacadeSpy = spyOn(partsFacade, 'setPartsAsBuilt'); + const partsFacadeAsPlannedSpy = spyOn(partsFacade, 'setPartsAsPlanned'); + componentInstance.searchControl.setValue(searchValue); + + + // Act + componentInstance.updatePartsByOwner(Owner.OWN); + + let filter = {owner: Owner.OWN}; + + // Assert + expect(partsFacadeAsPlannedSpy).toHaveBeenCalledWith(0, 50, [], filter, true); + expect(partsFacadeSpy).toHaveBeenCalledWith(0, 50, [], filter, true); + }); + + it('should reset asBuilt to half size when already on full width and save user settings', async () => { + + // Arrange + const { fixture } = await renderParts(); + const { componentInstance } = fixture; + const userSettingsService = (componentInstance as any)['userSettingService']; + const setUserSettingsSpy = spyOn(userSettingsService, 'setUserSettings'); + + componentInstance.bomLifecycleSize.asBuiltSize = 100; + // Act + componentInstance.maximizeClicked(TableType.AS_BUILT_OWN); + + // Assert + + const expectedBomLifeCycle = {asBuiltSize: 50, asPlannedSize: 50} + expect(setUserSettingsSpy).toHaveBeenCalledWith(expectedBomLifeCycle); + }); + + it('should set asBuilt to full size when and save user settings', async () => { + + // Arrange + const { fixture } = await renderParts(); + const { componentInstance } = fixture; + const userSettingsService = (componentInstance as any)['userSettingService']; + const setUserSettingsSpy = spyOn(userSettingsService, 'setUserSettings'); + + componentInstance.bomLifecycleSize.asBuiltSize = 50; + // Act + componentInstance.maximizeClicked(TableType.AS_BUILT_OWN); + + // Assert + const expectedBomLifeCycle = {asBuiltSize: 100, asPlannedSize: 0} + expect(setUserSettingsSpy).toHaveBeenCalledWith(expectedBomLifeCycle); + }); + + it('should reset asPlanned to half size when already on full width and save user settings', async () => { + + // Arrange + const { fixture } = await renderParts(); + const { componentInstance } = fixture; + const userSettingsService = (componentInstance as any)['userSettingService']; + const setUserSettingsSpy = spyOn(userSettingsService, 'setUserSettings'); + + componentInstance.bomLifecycleSize.asPlannedSize = 100; + // Act + componentInstance.maximizeClicked(TableType.AS_PLANNED_OWN); + + // Assert + const expectedBomLifeCycle = {asBuiltSize: 50, asPlannedSize: 50} + expect(setUserSettingsSpy).toHaveBeenCalledWith(expectedBomLifeCycle); + }); + + it('should set asPlanned to full size when and save user settings', async () => { + + // Arrange + const { fixture } = await renderParts(); + const { componentInstance } = fixture; + const userSettingsService = (componentInstance as any)['userSettingService']; + const setUserSettingsSpy = spyOn(userSettingsService, 'setUserSettings'); + + componentInstance.bomLifecycleSize.asPlannedSize = 50; + // Act + componentInstance.maximizeClicked(TableType.AS_PLANNED_OWN); + + // Assert + const expectedBomLifeCycle = {asBuiltSize: 0, asPlannedSize: 100} + expect(setUserSettingsSpy).toHaveBeenCalledWith(expectedBomLifeCycle); + }); + it('should not filter if filter search is unset', async () => { const { fixture } = await renderParts(); diff --git a/frontend/src/app/modules/page/parts/presentation/parts.component.ts b/frontend/src/app/modules/page/parts/presentation/parts.component.ts index 59fd36680d..989b7db612 100644 --- a/frontend/src/app/modules/page/parts/presentation/parts.component.ts +++ b/frontend/src/app/modules/page/parts/presentation/parts.component.ts @@ -19,257 +19,345 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import {AfterViewInit, Component, OnDestroy, OnInit, QueryList, ViewChildren} from '@angular/core'; -import {FormControl, FormGroup} from '@angular/forms'; -import {ActivatedRoute, Params, Router} from '@angular/router'; -import {Pagination} from '@core/model/pagination.model'; -import {RoleService} from '@core/user/role.service'; -import {PartsFacade} from '@page/parts/core/parts.facade'; -import {resetMultiSelectionAutoCompleteComponent} from '@page/parts/core/parts.helper'; -import {MainAspectType} from '@page/parts/model/mainAspectType.enum'; -import {AssetAsBuiltFilter, AssetAsPlannedFilter, Part} from '@page/parts/model/parts.model'; -import {BomLifecycleSize} from '@shared/components/bom-lifecycle-activator/bom-lifecycle-activator.model'; -import {TableType} from '@shared/components/multi-select-autocomplete/table-type.model'; -import {PartsTableComponent} from '@shared/components/parts-table/parts-table.component'; -import {TableEventConfig, TableHeaderSort} from '@shared/components/table/table.model'; -import {ToastService} from '@shared/components/toasts/toast.service'; -import {containsAtleastOneFilterEntry, toAssetFilter, toGlobalSearchAssetFilter} from '@shared/helper/filter-helper'; -import {setMultiSorting} from '@shared/helper/table-helper'; -import {NotificationType} from '@shared/model/notification.model'; -import {View} from '@shared/model/view.model'; -import {PartDetailsFacade} from '@shared/modules/part-details/core/partDetails.facade'; -import {BomLifecycleSettingsService, UserSettingView} from '@shared/service/bom-lifecycle-settings.service'; -import {StaticIdService} from '@shared/service/staticId.service'; -import {BehaviorSubject, combineLatest, Observable, Subject} from 'rxjs'; -import {map} from 'rxjs/operators'; +import { AfterViewInit, Component, OnDestroy, OnInit, QueryList, ViewChildren } from '@angular/core'; +import { FormControl, FormGroup } from '@angular/forms'; +import { ActivatedRoute, Params, Router } from '@angular/router'; +import { Pagination } from '@core/model/pagination.model'; +import { DEFAULT_PAGE_SIZE, FIRST_PAGE } from '@core/pagination/pagination.model'; +import { RoleService } from '@core/user/role.service'; +import { SharedPartService } from '@page/notifications/detail/edit/shared-part.service'; +import { PartsFacade } from '@page/parts/core/parts.facade'; +import { resetMultiSelectionAutoCompleteComponent } from '@page/parts/core/parts.helper'; +import { MainAspectType } from '@page/parts/model/mainAspectType.enum'; +import { Owner } from '@page/parts/model/owner.enum'; +import { AssetAsBuiltFilter, AssetAsPlannedFilter, Part } from '@page/parts/model/parts.model'; +import { BomLifecycleSize } from '@shared/components/bom-lifecycle-activator/bom-lifecycle-activator.model'; +import { TableType } from '@shared/components/multi-select-autocomplete/table-type.model'; +import { PartsTableComponent } from '@shared/components/parts-table/parts-table.component'; +import { QuickFilterComponent } from '@shared/components/quick-filter/quick-filter.component'; +import { TableEventConfig, TableHeaderSort } from '@shared/components/table/table.model'; +import { ToastService } from '@shared/components/toasts/toast.service'; +import { containsAtleastOneFilterEntry, toAssetFilter, toGlobalSearchAssetFilter } from '@shared/helper/filter-helper'; +import { setMultiSorting } from '@shared/helper/table-helper'; +import { NotificationType } from '@shared/model/notification.model'; +import { View } from '@shared/model/view.model'; +import { PartDetailsFacade } from '@shared/modules/part-details/core/partDetails.facade'; +import { BomLifecycleSettingsService } from '@shared/service/bom-lifecycle-settings.service'; +import { StaticIdService } from '@shared/service/staticId.service'; +import { BehaviorSubject, combineLatest, Observable, Subject } from 'rxjs'; +import { map } from 'rxjs/operators'; @Component({ - selector: 'app-parts', - templateUrl: './parts.component.html', - styleUrls: ['./parts.component.scss'], + selector: 'app-parts', + templateUrl: './parts.component.html', + styleUrls: [ './parts.component.scss' ], }) export class PartsComponent implements OnInit, OnDestroy, AfterViewInit { - public readonly titleId = this.staticIdService.generateId('PartsComponent.title'); - public readonly partsAsBuilt$: Observable>>; - public readonly partsAsPlanned$: Observable>>; - - public readonly isAlertOpen$ = new BehaviorSubject(false); - - public readonly deselectPartTrigger$ = new Subject(); - public readonly addPartTrigger$ = new Subject(); - public readonly currentSelectedItems$ = new BehaviorSubject([]); - public readonly currentSelectedAsPlannedItems$ = new BehaviorSubject([]); - public allSelectedItems$ = combineLatest([this.currentSelectedItems$, this.currentSelectedAsPlannedItems$]) - .pipe( - map(([array1, array2]) => { - return [...array1, ...array2]; - }) - ); - - public tableAsBuiltSortList: TableHeaderSort[]; - public tableAsPlannedSortList: TableHeaderSort[]; - - public DEFAULT_PAGE_SIZE = 50; - public ctrlKeyState = false; - isPublisherOpen$ = new Subject(); - public currentPartTablePage = {AS_BUILT_OWN_PAGE: 0, AS_PLANNED_OWN_PAGE: 0} - - @ViewChildren(PartsTableComponent) partsTableComponents: QueryList; - - constructor( - private readonly partsFacade: PartsFacade, - private readonly partDetailsFacade: PartDetailsFacade, - private readonly staticIdService: StaticIdService, - private readonly userSettingService: BomLifecycleSettingsService, - public toastService: ToastService, - public roleService: RoleService, - public router: Router, - public route: ActivatedRoute - ) { - this.partsAsBuilt$ = this.partsFacade.partsAsBuilt$; - this.partsAsPlanned$ = this.partsFacade.partsAsPlanned$; - this.tableAsBuiltSortList = []; - this.tableAsPlannedSortList = []; - - window.addEventListener('keydown', (event) => { - this.ctrlKeyState = setMultiSorting(event); - }); - window.addEventListener('keyup', (event) => { - this.ctrlKeyState = setMultiSorting(event); - }); + public readonly titleId = this.staticIdService.generateId('PartsComponent.title'); + public readonly partsAsBuilt$: Observable>>; + public readonly partsAsPlanned$: Observable>>; + + public readonly isAlertOpen$ = new BehaviorSubject(false); + + public readonly deselectPartTrigger$ = new Subject(); + public readonly addPartTrigger$ = new Subject(); + public readonly currentSelectedItems$ = new BehaviorSubject([]); + public readonly currentSelectedAsPlannedItems$ = new BehaviorSubject([]); + public allSelectedItems$ = combineLatest([ this.currentSelectedItems$, this.currentSelectedAsPlannedItems$ ]) + .pipe( + map(([ array1, array2 ]) => { + return [ ...array1, ...array2 ]; + }), + ); + + public tableAsBuiltSortList: TableHeaderSort[]; + public tableAsPlannedSortList: TableHeaderSort[]; + + public ctrlKeyState = false; + isPublisherOpen$ = new Subject(); + public currentPartTablePage = { AS_BUILT_OWN_PAGE: 0, AS_PLANNED_OWN_PAGE: 0 }; + + @ViewChildren(PartsTableComponent) partsTableComponents: QueryList; + @ViewChildren(QuickFilterComponent) quickFilterComponents: QueryList; + + constructor( + private readonly partsFacade: PartsFacade, + private readonly partDetailsFacade: PartDetailsFacade, + private readonly staticIdService: StaticIdService, + private readonly userSettingService: BomLifecycleSettingsService, + private readonly sharedPartService: SharedPartService, + public toastService: ToastService, + public roleService: RoleService, + public router: Router, + public route: ActivatedRoute, + ) { + this.partsAsBuilt$ = this.partsFacade.partsAsBuilt$; + this.partsAsPlanned$ = this.partsFacade.partsAsPlanned$; + this.tableAsBuiltSortList = []; + this.tableAsPlannedSortList = []; + + window.addEventListener('keydown', (event) => { + this.ctrlKeyState = setMultiSorting(event); + }); + window.addEventListener('keyup', (event) => { + this.ctrlKeyState = setMultiSorting(event); + }); + } + + public bomLifecycleSize: BomLifecycleSize = this.userSettingService.getUserSettings(); + + public searchFormGroup = new FormGroup({}); + public searchControl: FormControl; + + assetAsBuiltFilter: AssetAsBuiltFilter; + assetsAsPlannedFilter: AssetAsPlannedFilter; + + public ngOnInit(): void { + this.partsFacade.setPartsAsBuilt(); + this.partsFacade.setPartsAsPlanned(); + this.searchFormGroup.addControl('partSearch', new FormControl([])); + this.searchControl = this.searchFormGroup.get('partSearch') as unknown as FormControl; + this.route.queryParams.subscribe(params => this.setupPageByUrlParams(params)); + + } + + splitAreaChanged(data: any) { + this.bomLifecycleSize = { + asBuiltSize: data.sizes[0], + asPlannedSize: data.sizes[1], + }; + this.userSettingService.setUserSettings(this.bomLifecycleSize); + } + + maximizeClicked(tableType: TableType) { + if (tableType === TableType.AS_BUILT_OWN) { + if (this.bomLifecycleSize.asBuiltSize === 100) { + this.bomLifecycleSize = { + asBuiltSize: 50, + asPlannedSize: 50, + }; + } else { + this.bomLifecycleSize = { + asBuiltSize: 100, + asPlannedSize: 0, + }; + } + this.userSettingService.setUserSettings(this.bomLifecycleSize); } - public bomLifecycleSize: BomLifecycleSize = this.userSettingService.getSize(UserSettingView.PARTS); - - public searchFormGroup = new FormGroup({}); - public searchControl: FormControl; - - assetAsBuiltFilter: AssetAsBuiltFilter; - assetsAsPlannedFilter: AssetAsPlannedFilter; - - public ngOnInit(): void { - this.partsFacade.setPartsAsBuilt(); - this.partsFacade.setPartsAsPlanned(); - this.searchFormGroup.addControl('partSearch', new FormControl([])); - this.searchControl = this.searchFormGroup.get('partSearch') as unknown as FormControl; - this.route.queryParams.subscribe(params => this.setupPageByUrlParams(params)); - + if (tableType === TableType.AS_PLANNED_OWN) { + if (this.bomLifecycleSize.asPlannedSize === 100) { + this.bomLifecycleSize = { + asBuiltSize: 50, + asPlannedSize: 50, + }; + } else { + this.bomLifecycleSize = { + asBuiltSize: 0, + asPlannedSize: 100, + }; + } + this.userSettingService.setUserSettings(this.bomLifecycleSize); } + } + - filterActivated(isAsBuilt: boolean, assetFilter: any): void { - if (isAsBuilt) { - this.assetAsBuiltFilter = assetFilter; - this.partsFacade.setPartsAsBuilt(this.currentPartTablePage['AS_BUILT_OWN_PAGE'] ?? 0, this.DEFAULT_PAGE_SIZE, this.tableAsBuiltSortList, toAssetFilter(this.assetAsBuiltFilter, true)); - } else { - this.assetsAsPlannedFilter = assetFilter; - this.partsFacade.setPartsAsPlanned(this.currentPartTablePage['AS_PLANNED_OWN_PAGE'] ?? 0, this.DEFAULT_PAGE_SIZE, this.tableAsPlannedSortList, toAssetFilter(this.assetsAsPlannedFilter, false)); - } + filterActivated(isAsBuilt: boolean, assetFilter: any): void { + if (isAsBuilt) { + this.assetAsBuiltFilter = assetFilter; + this.partsFacade.setPartsAsBuilt(this.currentPartTablePage['AS_BUILT_OWN_PAGE'] ?? FIRST_PAGE, DEFAULT_PAGE_SIZE, this.tableAsBuiltSortList, toAssetFilter(this.assetAsBuiltFilter, true)); + } else { + this.assetsAsPlannedFilter = assetFilter; + this.partsFacade.setPartsAsPlanned(this.currentPartTablePage['AS_PLANNED_OWN_PAGE'] ?? FIRST_PAGE, DEFAULT_PAGE_SIZE, this.tableAsPlannedSortList, toAssetFilter(this.assetsAsPlannedFilter, false)); } + } - triggerPartSearch() { + triggerPartSearch() { - this.resetFilterAndShowToast(); - const searchValue = this.searchFormGroup.get('partSearch').value; + this.resetFilterAndShowToast(true); - if (searchValue && searchValue !== '') { - this.partsFacade.setPartsAsPlanned(0, this.DEFAULT_PAGE_SIZE, this.tableAsPlannedSortList, toGlobalSearchAssetFilter(searchValue, false), true); - this.partsFacade.setPartsAsBuilt(0, this.DEFAULT_PAGE_SIZE, this.tableAsBuiltSortList, toGlobalSearchAssetFilter(searchValue, true), true); - } else { - this.partsFacade.setPartsAsBuilt(); - this.partsFacade.setPartsAsPlanned(); - } + const searchValue = this.searchFormGroup.get('partSearch').value; + if (searchValue && searchValue !== '') { + this.partsFacade.setPartsAsPlanned(FIRST_PAGE, DEFAULT_PAGE_SIZE, this.tableAsPlannedSortList, toGlobalSearchAssetFilter(searchValue, false), true); + this.partsFacade.setPartsAsBuilt(FIRST_PAGE, DEFAULT_PAGE_SIZE, this.tableAsBuiltSortList, toGlobalSearchAssetFilter(searchValue, true), true); + } else { + this.partsFacade.setPartsAsBuilt(); + this.partsFacade.setPartsAsPlanned(); } - refreshPartsOnPublish(message: string) { - if (message) { - this.toastService.error(message); - } else { - this.toastService.success("requestPublishAssets.success") - this.partsFacade.setPartsAsBuilt(); - this.partsFacade.setPartsAsPlanned(); - this.partsTableComponents.map(component => component.clearAllRows()) - } - } + } - private resetFilterAndShowToast() { - let filterIsSet = resetMultiSelectionAutoCompleteComponent(this.partsTableComponents, false); - if (filterIsSet) { - this.toastService.info('parts.input.global-search.toastInfo'); - } + updatePartsByOwner(owner: Owner) { + this.resetFilterAndShowToast(); + let filter = {}; + if (owner != Owner.UNKNOWN) { + filter = { + owner, + }; } - - public ngAfterViewInit(): void { - this.handleTableActivationEvent(this.bomLifecycleSize); + this.partsFacade.setPartsAsPlanned(FIRST_PAGE, DEFAULT_PAGE_SIZE, this.tableAsPlannedSortList, filter, true); + this.partsFacade.setPartsAsBuilt(FIRST_PAGE, DEFAULT_PAGE_SIZE, this.tableAsBuiltSortList, filter, true); + } + + refreshPartsOnPublish(message: string) { + if (message) { + this.toastService.error(message); + } else { + this.toastService.success('requestPublishAssets.success'); + this.partsFacade.setPartsAsBuilt(); + this.partsFacade.setPartsAsPlanned(); + this.partsTableComponents.map(component => component.clearAllRows()); } + } - public ngOnDestroy(): void { - this.partsFacade.unsubscribeParts(); + private resetFilterAndShowToast(resetOwner?: boolean) { + let filterIsSet = resetMultiSelectionAutoCompleteComponent(this.partsTableComponents, false); + if (resetOwner) { + this.quickFilterComponents.get(0).owner = Owner.UNKNOWN; + } + if (filterIsSet) { + this.toastService.info('parts.input.global-search.toastInfo'); } + } + + public ngAfterViewInit(): void { + this.handleTableActivationEvent(this.bomLifecycleSize); + } - public onSelectItem($event: Record): void { - this.partDetailsFacade.selectedPart = $event as unknown as Part; - let tableData = {}; - for (let component of this.partsTableComponents) { - tableData[component.tableType + "_PAGE"] = component.pageIndex; - } - this.router.navigate([`parts/${$event?.id}`], {queryParams: tableData}) + public ngOnDestroy(): void { + this.partsFacade.unsubscribeParts(); + } + + public onSelectItem($event: Record): void { + this.partDetailsFacade.selectedPart = $event as unknown as Part; + let tableData = {}; + for (let component of this.partsTableComponents) { + tableData[component.tableType + '_PAGE'] = component.pageIndex; + } + tableData['isAsBuilt'] = $event?.partId !== undefined; + this.router.navigate([ `parts/${ $event?.id }` ], { queryParams: tableData }); + } + + public onAsBuiltTableConfigChange({ page, pageSize, sorting }: TableEventConfig): void { + this.setTableSortingList(sorting, MainAspectType.AS_BUILT); + this.currentPartTablePage['AS_BUILT_OWN_PAGE'] = page; + let pageSizeValue = DEFAULT_PAGE_SIZE; + if (pageSize !== 0) { + pageSizeValue = pageSize; } + if (this.quickFilterComponents && this.quickFilterComponents?.get(0)?.owner !== Owner.UNKNOWN){ + this.assetAsBuiltFilter.owner = this.quickFilterComponents.get(0)?.owner; + } + if (this.assetAsBuiltFilter && containsAtleastOneFilterEntry(this.assetAsBuiltFilter)) { + this.partsFacade.setPartsAsBuilt(FIRST_PAGE, pageSizeValue, this.tableAsBuiltSortList, toAssetFilter(this.assetAsBuiltFilter, true)); + } else { + this.partsFacade.setPartsAsBuilt(page, pageSizeValue, this.tableAsBuiltSortList); + } + + } - public onAsBuiltTableConfigChange({page, pageSize, sorting}: TableEventConfig): void { - this.setTableSortingList(sorting, MainAspectType.AS_BUILT); - this.currentPartTablePage['AS_BUILT_OWN_PAGE'] = page; - let pageSizeValue = this.DEFAULT_PAGE_SIZE; - if (pageSize !== 0) { - pageSizeValue = pageSize; - } - if (this.assetAsBuiltFilter && containsAtleastOneFilterEntry(this.assetAsBuiltFilter)) { - this.partsFacade.setPartsAsBuilt(0, pageSizeValue, this.tableAsBuiltSortList, toAssetFilter(this.assetAsBuiltFilter, true)); - } else { - this.partsFacade.setPartsAsBuilt(page, pageSizeValue, this.tableAsBuiltSortList); - } + public onAsPlannedTableConfigChange({ page, pageSize, sorting }: TableEventConfig): void { + this.setTableSortingList(sorting, MainAspectType.AS_PLANNED); + this.currentPartTablePage['AS_PLANNED_OWN_PAGE'] = page; + let pageSizeValue = DEFAULT_PAGE_SIZE; + if (pageSize !== 0) { + pageSizeValue = pageSize; + } + if (this.quickFilterComponents && this.quickFilterComponents?.get(0)?.owner !== Owner.UNKNOWN){ + this.assetsAsPlannedFilter.owner = this.quickFilterComponents.get(0)?.owner; + } + if (this.assetsAsPlannedFilter && containsAtleastOneFilterEntry(this.assetsAsPlannedFilter)) { + this.partsFacade.setPartsAsPlanned(FIRST_PAGE, pageSizeValue, this.tableAsPlannedSortList, toAssetFilter(this.assetsAsPlannedFilter, true)); + } else { + this.partsFacade.setPartsAsPlanned(page, pageSizeValue, this.tableAsPlannedSortList); } - public onAsPlannedTableConfigChange({page, pageSize, sorting}: TableEventConfig): void { - this.setTableSortingList(sorting, MainAspectType.AS_PLANNED); - this.currentPartTablePage['AS_PLANNED_OWN_PAGE'] = page; + } - let pageSizeValue = this.DEFAULT_PAGE_SIZE; - if (pageSize !== 0) { - pageSizeValue = pageSize; - } - if (this.assetsAsPlannedFilter && containsAtleastOneFilterEntry(this.assetsAsPlannedFilter)) { - this.partsFacade.setPartsAsPlanned(0, pageSizeValue, this.tableAsPlannedSortList, toAssetFilter(this.assetsAsPlannedFilter, true)); - } else { - this.partsFacade.setPartsAsPlanned(page, pageSizeValue, this.tableAsPlannedSortList); - } + public handleTableActivationEvent(bomLifecycleSize: BomLifecycleSize) { + this.bomLifecycleSize = bomLifecycleSize; + } + private setTableSortingList(sorting: TableHeaderSort, partTable: MainAspectType): void { + // if a sorting Columnlist exists but a column gets resetted: + if (!sorting && (this.tableAsBuiltSortList || this.tableAsPlannedSortList)) { + this.resetTableSortingList(partTable); + return; } - public handleTableActivationEvent(bomLifecycleSize: BomLifecycleSize) { - this.bomLifecycleSize = bomLifecycleSize; + // if CTRL is pressed at to sortList + if (this.ctrlKeyState) { + const [ columnName ] = sorting; + const tableSortList = partTable === MainAspectType.AS_BUILT ? this.tableAsBuiltSortList : this.tableAsPlannedSortList; + + // Find the index of the existing entry with the same first item + const index = tableSortList.findIndex( + ([ itemColumnName ]) => itemColumnName === columnName, + ); + + if (index !== -1) { + // Replace the existing entry + tableSortList[index] = sorting; + } else { + // Add the new entry if it doesn't exist + tableSortList.push(sorting); + } + if (partTable === MainAspectType.AS_BUILT) { + this.tableAsBuiltSortList = tableSortList; + } else { + this.tableAsPlannedSortList = tableSortList; + } } - - private setTableSortingList(sorting: TableHeaderSort, partTable: MainAspectType): void { - // if a sorting Columnlist exists but a column gets resetted: - if (!sorting && (this.tableAsBuiltSortList || this.tableAsPlannedSortList)) { - this.resetTableSortingList(partTable); - return; - } - - // if CTRL is pressed at to sortList - if (this.ctrlKeyState) { - const [columnName] = sorting; - const tableSortList = partTable === MainAspectType.AS_BUILT ? this.tableAsBuiltSortList : this.tableAsPlannedSortList; - - // Find the index of the existing entry with the same first item - const index = tableSortList.findIndex( - ([itemColumnName]) => itemColumnName === columnName, - ); - - if (index !== -1) { - // Replace the existing entry - tableSortList[index] = sorting; - } else { - // Add the new entry if it doesn't exist - tableSortList.push(sorting); - } - if (partTable === MainAspectType.AS_BUILT) { - this.tableAsBuiltSortList = tableSortList; - } else { - this.tableAsPlannedSortList = tableSortList; - } - } - // If CTRL is not pressed just add a list with one entry - else if (partTable === MainAspectType.AS_BUILT) { - this.tableAsBuiltSortList = [sorting]; - } else { - this.tableAsPlannedSortList = [sorting]; - } + // If CTRL is not pressed just add a list with one entry + else if (partTable === MainAspectType.AS_BUILT) { + this.tableAsBuiltSortList = [ sorting ]; + } else { + this.tableAsPlannedSortList = [ sorting ]; } + } - private resetTableSortingList(partTable: MainAspectType): void { - if (partTable === MainAspectType.AS_BUILT) { - this.tableAsBuiltSortList = []; - } else { - this.tableAsPlannedSortList = []; - } + private resetTableSortingList(partTable: MainAspectType): void { + if (partTable === MainAspectType.AS_BUILT) { + this.tableAsBuiltSortList = []; + } else { + this.tableAsPlannedSortList = []; } + } - private setupPageByUrlParams(params: Params) { - if (!params) { - return; - } - this.onAsBuiltTableConfigChange({page: params['AS_BUILT_OWN_PAGE'], pageSize: 50, sorting: null}); - this.onAsPlannedTableConfigChange({page: params['AS_PLANNED_OWN_PAGE'], pageSize: 50, sorting: null}); + private setupPageByUrlParams(params: Params) { + if (!params) { + return; + } + this.onAsBuiltTableConfigChange({ page: params['AS_BUILT_OWN_PAGE'], pageSize: DEFAULT_PAGE_SIZE, sorting: null }); + this.onAsPlannedTableConfigChange({ + page: params['AS_PLANNED_OWN_PAGE'], + pageSize: DEFAULT_PAGE_SIZE, + sorting: null, + }); + } + + openPublisherSideNav(): void { + this.isPublisherOpen$.next(true); + } + + navigateToNotificationCreationView(type?: NotificationType) { + this.sharedPartService.affectedParts = this.currentSelectedItems$.value; + if (this.sharedPartService?.affectedParts.length > 0 && type) { + this.router.navigate([ 'inbox/create' ], { queryParams: { initialType: type } }); + } else { + this.router.navigate([ 'inbox/create' ]); } + } + + + protected readonly TableType = TableType; + protected readonly MainAspectType = MainAspectType; + protected readonly NotificationType = NotificationType; + - protected readonly UserSettingView = UserSettingView; - protected readonly TableType = TableType; - protected readonly MainAspectType = MainAspectType; - protected readonly NotificationType = NotificationType; } diff --git a/frontend/src/app/modules/shared/abstraction/baseInput/baseInput.component.ts b/frontend/src/app/modules/shared/abstraction/baseInput/baseInput.component.ts index 55486e032a..7a76057dc8 100644 --- a/frontend/src/app/modules/shared/abstraction/baseInput/baseInput.component.ts +++ b/frontend/src/app/modules/shared/abstraction/baseInput/baseInput.component.ts @@ -29,16 +29,17 @@ import { NgControl, NgModel, } from '@angular/forms'; +import { MyErrorStateMatcher } from '@shared/abstraction/baseInput/baseInput.helper'; import { StaticIdService } from '@shared/service/staticId.service'; import { Subject } from 'rxjs'; import { takeUntil, tap } from 'rxjs/operators'; -import { MyErrorStateMatcher } from '@shared/abstraction/baseInput/baseInput.helper'; @Component({ selector: 'app-baseInput', template: '' }) export class BaseInputComponent implements ControlValueAccessor, OnInit { @ViewChild('inputElement') inputElement: ElementRef; @Input() label = ''; @Input() hint = ''; + @Input() isDisabled: boolean; public control!: FormControl; public matcher = new MyErrorStateMatcher(); @@ -58,6 +59,10 @@ export class BaseInputComponent implements ControlValueAccessor, OnInit { public ngOnInit(): void { this.setComponentControl(); + if (this.isDisabled) { + this.control.disable(); + } + // Check validators for length validators const oneMillion = 1000000; const minLengthErrors = new FormControl('#', this.control.validator).errors; diff --git a/frontend/src/app/modules/shared/assembler/notification-action-helper.service.ts b/frontend/src/app/modules/shared/assembler/notification-action-helper.service.ts index c9a56e5893..b1f91ea459 100644 --- a/frontend/src/app/modules/shared/assembler/notification-action-helper.service.ts +++ b/frontend/src/app/modules/shared/assembler/notification-action-helper.service.ts @@ -31,6 +31,14 @@ export class NotificationActionHelperService { constructor(private readonly roleService: RoleService) { } + public isAtLeastSupervisor(): boolean { + return this.roleService.isSupervisor(); + } + + public showEditButton({ status, isFromSender } = {} as Notification): boolean { + return isFromSender && status === NotificationStatus.CREATED; + } + public showApproveButton({ status, isFromSender } = {} as Notification): boolean { return isFromSender && status === NotificationStatus.CREATED; } @@ -56,10 +64,15 @@ export class NotificationActionHelperService { return !isFromSender && status === NotificationStatus.ACKNOWLEDGED; } + public isAllowedToEdit() { + return this.roleService.isSupervisor() || this.roleService.isUser(); + } + public isAuthorizedForButton(action: NotificationAction): boolean { - if(action === NotificationAction.APPROVE || action === NotificationAction.CLOSE) { - return this.roleService.isAtLeastSupervisor(); + if (action === NotificationAction.APPROVE || action === NotificationAction.CLOSE) { + return this.roleService.isSupervisor(); } else { - return this.roleService.isAtLeastUser(); - }} + return this.roleService.isUser(); + } + } } diff --git a/frontend/src/app/modules/shared/assembler/notificationMenuActions.assembler.ts b/frontend/src/app/modules/shared/assembler/notificationMenuActions.assembler.ts index aec5385a9e..036039f8c3 100644 --- a/frontend/src/app/modules/shared/assembler/notificationMenuActions.assembler.ts +++ b/frontend/src/app/modules/shared/assembler/notificationMenuActions.assembler.ts @@ -70,4 +70,3 @@ export class NotificationMenuActionsAssembler { ]; } } - diff --git a/frontend/src/app/modules/shared/components/asset-publisher/asset-publisher.component.html b/frontend/src/app/modules/shared/components/asset-publisher/asset-publisher.component.html index 367a315ef0..079f4bd7fb 100644 --- a/frontend/src/app/modules/shared/components/asset-publisher/asset-publisher.component.html +++ b/frontend/src/app/modules/shared/components/asset-publisher/asset-publisher.component.html @@ -37,6 +37,7 @@

{{'publisher.policyToApply' | i18n}}:

class="custom-button_import" color="primary" [isDisabled]="policyFormControl.invalid || checkForIllegalAssetStateToPublish()" + onkeydown="publish()" (click)="publish()"> {{'publisher.publish' | i18n}} diff --git a/frontend/src/app/modules/shared/components/bom-lifecycle-activator/bom-lifecycle-activator.component.html b/frontend/src/app/modules/shared/components/bom-lifecycle-activator/bom-lifecycle-activator.component.html deleted file mode 100644 index 96a73db982..0000000000 --- a/frontend/src/app/modules/shared/components/bom-lifecycle-activator/bom-lifecycle-activator.component.html +++ /dev/null @@ -1,30 +0,0 @@ - -
- - {{ 'bomLifecycleActivator.asBuilt' | i18n }} - - - {{ 'bomLifecycleActivator.asPlanned' | i18n }} - -
diff --git a/frontend/src/app/modules/shared/components/bom-lifecycle-activator/bom-lifecycle-activator.component.spec.ts b/frontend/src/app/modules/shared/components/bom-lifecycle-activator/bom-lifecycle-activator.component.spec.ts deleted file mode 100644 index 4225bf3914..0000000000 --- a/frontend/src/app/modules/shared/components/bom-lifecycle-activator/bom-lifecycle-activator.component.spec.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { BomLifecycleActivatorComponent } from './bom-lifecycle-activator.component'; -import { SharedModule } from '@shared/shared.module'; -import { BomLifecycleSettingsService, UserSettingView } from '@shared/service/bom-lifecycle-settings.service'; -import { renderComponent } from '@tests/test-render.utils'; - -describe('BomLifecycleActivatorComponent', () => { - - const renderBomLifecycleActivator = (view: UserSettingView = UserSettingView.PARTS) => { - return renderComponent(BomLifecycleActivatorComponent, { - imports: [ SharedModule ], - providers: [ BomLifecycleSettingsService ], - componentProperties: { view }, - }); - }; - - it('should create the component', async () => { - const { fixture } = await renderBomLifecycleActivator(UserSettingView.PARTS); - const { componentInstance } = fixture; - expect(componentInstance).toBeTruthy(); - }); - - it('should initialize bomLifecycleConfig correctly', async () => { - const { fixture } = await renderBomLifecycleActivator(UserSettingView.PARTS); - const { componentInstance } = fixture; - expect(componentInstance.bomLifecycleConfig.asBuiltActive).toBe(true); - expect(componentInstance.bomLifecycleConfig.asPlannedActive).toBe(true); - }); - - it('should toggle asPlannedActive when toggleAsPlanned is called', async () => { - const { fixture } = await renderBomLifecycleActivator(UserSettingView.PARTS); - const { componentInstance } = fixture; - - componentInstance.toggleAsPlanned(); - expect(componentInstance.bomLifecycleConfig.asPlannedActive).toBe(false); - - componentInstance.toggleAsPlanned(); - expect(componentInstance.bomLifecycleConfig.asPlannedActive).toBe(true); - }); - - it('should toggle asBuiltActive when toggleAsBuilt is called', async () => { - const { fixture } = await renderBomLifecycleActivator(UserSettingView.PARTS); - const { componentInstance } = fixture; - componentInstance.toggleAsBuilt(); - expect(componentInstance.bomLifecycleConfig.asBuiltActive).toBe(false); - - componentInstance.toggleAsBuilt(); - expect(componentInstance.bomLifecycleConfig.asBuiltActive).toBe(true); - }); -}); diff --git a/frontend/src/app/modules/shared/components/bom-lifecycle-activator/bom-lifecycle-activator.component.ts b/frontend/src/app/modules/shared/components/bom-lifecycle-activator/bom-lifecycle-activator.component.ts deleted file mode 100644 index bb196e2951..0000000000 --- a/frontend/src/app/modules/shared/components/bom-lifecycle-activator/bom-lifecycle-activator.component.ts +++ /dev/null @@ -1,70 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2023 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 - ********************************************************************************/ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { - BomLifecycleConfig, - BomLifecycleSize, -} from '@shared/components/bom-lifecycle-activator/bom-lifecycle-activator.model'; -import { BomLifecycleSettingsService, UserSettingView } from '@shared/service/bom-lifecycle-settings.service'; - - -@Component({ - selector: 'app-bom-lifecycle-activator', - templateUrl: './bom-lifecycle-activator.component.html', - styleUrls: [ './bom-lifecycle-activator.component.scss' ], -}) -export class BomLifecycleActivatorComponent implements OnInit { - - @Input() view: UserSettingView; - public bomLifecycleConfig: BomLifecycleConfig; - - constructor(public bomLifeCycleUserSetting: BomLifecycleSettingsService) { - - } - - ngOnInit() { - if (this.view) { - this.bomLifecycleConfig = this.bomLifeCycleUserSetting.getUserSettings(this.view); - } else { - throw new DOMException('Unsupported view', 'BomLifecycleActivatorComponent'); - } - } - - @Output() buttonClickEvent = new EventEmitter(); - - - toggleAsPlanned() { - this.bomLifecycleConfig.asPlannedActive = !this.bomLifecycleConfig.asPlannedActive; - this.emitBomLifecycleState(); - } - - toggleAsBuilt() { - // If the other button is also inactive, prevent this one from being deactivated - this.bomLifecycleConfig.asBuiltActive = !this.bomLifecycleConfig.asBuiltActive; - this.emitBomLifecycleState(); - } - - emitBomLifecycleState() { - this.bomLifeCycleUserSetting.setUserSettings({ - asBuiltActive: this.bomLifecycleConfig.asBuiltActive, - asPlannedActive: this.bomLifecycleConfig.asPlannedActive, - }, this.view); - this.buttonClickEvent.emit(this.bomLifeCycleUserSetting.getSize(this.view)); - } -} diff --git a/frontend/src/app/modules/shared/components/button/button.component.ts b/frontend/src/app/modules/shared/components/button/button.component.ts index b93e28701c..07b51b8f88 100644 --- a/frontend/src/app/modules/shared/components/button/button.component.ts +++ b/frontend/src/app/modules/shared/components/button/button.component.ts @@ -20,6 +20,8 @@ ********************************************************************************/ import { Component, ElementRef, HostBinding, Input, ViewChild } from '@angular/core'; +import { TableType } from '@shared/components/multi-select-autocomplete/table-type.model'; + type ButtonVariant = 'button' | 'raised' | 'flat' | 'stroked' | 'icon' | 'fab' | 'miniFab'; @@ -32,11 +34,15 @@ export class ButtonComponent { return this.isDisabled ? 'none' : 'auto'; } + constructor() { + } + + @ViewChild('ButtonElement') buttonElement: ElementRef; @Input() color: 'primary' | 'accent' | 'warn'; @Input() variant: ButtonVariant = 'button'; - @Input() label: string; @Input() iconName: string; @Input() isDisabled: boolean = false; + protected readonly TableType = TableType; } diff --git a/frontend/src/app/modules/shared/components/card-list/card-list.component.scss b/frontend/src/app/modules/shared/components/card-list/card-list.component.scss index 8a636fa77c..7e4b90ffe2 100644 --- a/frontend/src/app/modules/shared/components/card-list/card-list.component.scss +++ b/frontend/src/app/modules/shared/components/card-list/card-list.component.scss @@ -86,7 +86,6 @@ mat-card { } .card-list--full-value { - //text-overflow: ; width: 100%; } diff --git a/frontend/src/app/modules/shared/components/card-metric/card-metric.component.html b/frontend/src/app/modules/shared/components/card-metric/card-metric.component.html index cbe556453d..f8fc14f3fa 100644 --- a/frontend/src/app/modules/shared/components/card-metric/card-metric.component.html +++ b/frontend/src/app/modules/shared/components/card-metric/card-metric.component.html @@ -6,9 +6,4 @@

{{(value | number) | abbreviateNumber}} {{'pageDashboard.million' | i18n}}

- diff --git a/frontend/src/app/modules/shared/components/input/input.component.html b/frontend/src/app/modules/shared/components/input/input.component.html index 81e7519cdf..0437b713f7 100644 --- a/frontend/src/app/modules/shared/components/input/input.component.html +++ b/frontend/src/app/modules/shared/components/input/input.component.html @@ -29,6 +29,7 @@ [color]="suffixIconColor" [class.cursor-pointer]="suffixIconHover" [attr.data-testId]="htmlId + '-icon'" + onkeydown="suffixIconClick.emit()" (click)="suffixIconClick.emit()" matSuffix >{{ suffixIcon }}clear diff --git a/frontend/src/app/modules/shared/components/multi-select-autocomplete/autocomplete-strategy.spec.ts b/frontend/src/app/modules/shared/components/multi-select-autocomplete/autocomplete-strategy.spec.ts index 4607c7c09d..a1986c0d37 100644 --- a/frontend/src/app/modules/shared/components/multi-select-autocomplete/autocomplete-strategy.spec.ts +++ b/frontend/src/app/modules/shared/components/multi-select-autocomplete/autocomplete-strategy.spec.ts @@ -19,30 +19,15 @@ import { Owner } from '@page/parts/model/owner.enum'; import { channelOfNotification, - getOwnerOfTable, isAsBuilt, } from '@shared/components/multi-select-autocomplete/autocomplete-strategy'; import { NotificationChannel, TableType } from '@shared/components/multi-select-autocomplete/table-type.model'; describe('Autocomplete Strategies', () => { - it('should determine owner of table', async () => { - expect(getOwnerOfTable(TableType.AS_BUILT_OWN)).toBe(Owner.OWN); - expect(getOwnerOfTable(TableType.AS_BUILT_CUSTOMER)).toBe(Owner.CUSTOMER); - expect(getOwnerOfTable(TableType.AS_BUILT_SUPPLIER)).toBe(Owner.SUPPLIER); - expect(getOwnerOfTable(TableType.AS_PLANNED_OWN)).toBe(Owner.OWN); - expect(getOwnerOfTable(TableType.AS_PLANNED_CUSTOMER)).toBe(Owner.CUSTOMER); - expect(getOwnerOfTable(TableType.AS_PLANNED_SUPPLIER)).toBe(Owner.SUPPLIER); - }); - it('should determine isAsBuilt correctly', async () => { - expect(isAsBuilt(TableType.AS_BUILT_SUPPLIER)).toBeTrue(); - expect(isAsBuilt(TableType.AS_BUILT_CUSTOMER)).toBeTrue(); expect(isAsBuilt(TableType.AS_BUILT_OWN)).toBeTrue(); - expect(isAsBuilt(TableType.AS_PLANNED_CUSTOMER)).toBeFalse(); - expect(isAsBuilt(TableType.AS_PLANNED_SUPPLIER)).toBeFalse(); expect(isAsBuilt(TableType.AS_PLANNED_OWN)).toBeFalse(); - }); it('should determine channel of notification', async () => { diff --git a/frontend/src/app/modules/shared/components/multi-select-autocomplete/autocomplete-strategy.ts b/frontend/src/app/modules/shared/components/multi-select-autocomplete/autocomplete-strategy.ts index 844312b540..15183bcac9 100644 --- a/frontend/src/app/modules/shared/components/multi-select-autocomplete/autocomplete-strategy.ts +++ b/frontend/src/app/modules/shared/components/multi-select-autocomplete/autocomplete-strategy.ts @@ -18,13 +18,13 @@ ********************************************************************************/ import { Injectable } from '@angular/core'; import { AdminService } from '@page/admin/core/admin.service'; -import { Owner } from '@page/parts/model/owner.enum'; import { NotificationChannel, TableType } from '@shared/components/multi-select-autocomplete/table-type.model'; import { NotificationService } from '@shared/service/notification.service'; import { PartsService } from '@shared/service/parts.service'; +import { of } from 'rxjs'; export abstract class AutocompleteStrategy { - abstract retrieveSuggestionValues(tableType: TableType, filterColumns: string, searchElement: string): any; + abstract retrieveSuggestionValues(tableType: TableType, filterColumns: string, searchElement: string, inAssetIds?: string[]): any; } @Injectable({ @@ -38,14 +38,18 @@ export class PartsStrategy extends AutocompleteStrategy { this.partsService = partsService; } - retrieveSuggestionValues(tableType: TableType, filterColumns: string, searchElement: string): any { - const tableOwner = getOwnerOfTable(tableType); + retrieveSuggestionValues(tableType: TableType, filterColumns: string, searchElement: string, inAssetIds?: string[]): any { const asBuilt = isAsBuilt(tableType); + + if(inAssetIds?.length < 1) { + return of([]); + } + return this.partsService.getDistinctFilterValues( asBuilt, - tableOwner, filterColumns, searchElement, + inAssetIds, ); } } @@ -66,7 +70,7 @@ export class NotificationStrategy extends AutocompleteStrategy { return this.notificationService.getDistinctFilterValues( notificationChannel, filterColumns, - searchElement + searchElement, ); } } @@ -92,30 +96,15 @@ export class ContractsStrategy extends AutocompleteStrategy { export const AutocompleteStrategyMap = new Map([ [ TableType.AS_BUILT_OWN, PartsStrategy ], - [ TableType.AS_BUILT_SUPPLIER, PartsStrategy ], - [ TableType.AS_BUILT_CUSTOMER, PartsStrategy ], [ TableType.AS_PLANNED_OWN, PartsStrategy ], - [ TableType.AS_PLANNED_CUSTOMER, PartsStrategy ], - [ TableType.AS_PLANNED_SUPPLIER, PartsStrategy ], [ TableType.RECEIVED_NOTIFICATION, NotificationStrategy ], [ TableType.SENT_NOTIFICATION, NotificationStrategy ], [ TableType.CONTRACTS, ContractsStrategy ], ]); -export function getOwnerOfTable(tableType: TableType): Owner { - if (tableType === TableType.AS_BUILT_OWN || tableType === TableType.AS_PLANNED_OWN) { - return Owner.OWN; - } else if (tableType === TableType.AS_BUILT_CUSTOMER || tableType === TableType.AS_PLANNED_CUSTOMER) { - return Owner.CUSTOMER; - } else if (tableType === TableType.AS_BUILT_SUPPLIER || tableType === TableType.AS_PLANNED_SUPPLIER) { - return Owner.SUPPLIER; - } else { - return Owner.UNKNOWN; - } -} export function isAsBuilt(tableType: TableType): boolean { - const isAsBuiltElement = [ TableType.AS_BUILT_SUPPLIER, TableType.AS_BUILT_OWN, TableType.AS_BUILT_CUSTOMER ]; + const isAsBuiltElement = [ TableType.AS_BUILT_OWN ]; return isAsBuiltElement.includes(tableType); } diff --git a/frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.html b/frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.html index f688aaf7ad..736452bc62 100644 --- a/frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.html +++ b/frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.html @@ -19,9 +19,11 @@ + (selectionChange)="onSelectionChange($event)" panelClass="app-multiselect-filter-dropdown" + (openedChange)="options = []">
-
+
@@ -69,7 +71,7 @@ - {{this.searchElement}} diff --git a/frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.ts b/frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.ts index 38a2187710..59d574c0d4 100644 --- a/frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.ts +++ b/frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.ts @@ -30,7 +30,6 @@ import { AutocompleteStrategyMap, } from '@shared/components/multi-select-autocomplete/autocomplete-strategy'; import { TableType } from '@shared/components/multi-select-autocomplete/table-type.model'; -import { NotificationType } from '@shared/model/notification.model'; import { FormatPartSemanticDataModelToCamelCasePipe } from '@shared/pipes/format-part-semantic-data-model-to-camelcase.pipe'; import { PartsService } from '@shared/service/parts.service'; import { firstValueFrom } from 'rxjs'; @@ -89,6 +88,9 @@ export class MultiSelectAutocompleteComponent implements OnChanges { searchElement: string = ''; + @Input() + inAssetIds: string[] = []; + searchElementChange: EventEmitter = new EventEmitter(); @ViewChild('selectElem', { static: true }) selectElem: any; @@ -169,14 +171,8 @@ export class MultiSelectAutocompleteComponent implements OnChanges { suffix = (' + ' + (this.selectedValue?.length - 1)) + ' ' + this.placeholderMultiple; } - // apply CamelCase to semanticDataModel labels - if (this.filterColumn === 'semanticDataModel') { - displayValue = [ this.formatPartSemanticDataModelToCamelCasePipe.transformModel(this.selectedValue[0]), suffix ]; - } else if (this.filterColumn === 'type') { - displayValue = [ NotificationType[this.selectedValue[0]], suffix ]; - } else { - displayValue = [ this.selectedValue[0], suffix ]; - } + displayValue = [ this.selectedValue[0], suffix ]; + // if no value selected, return empty string if (!this.selectedValue.length) { @@ -212,46 +208,14 @@ export class MultiSelectAutocompleteComponent implements OnChanges { const timeoutCallback = async (): Promise => { this.isLoadingSuggestions = true; try { - firstValueFrom(this.strategy.retrieveSuggestionValues(this.tableType, this.filterColumn, this.searchElement)).then((res) => { - if (this.filterColumn === 'semanticDataModel') { - // @ts-ignore - this.searchedOptions = res.filter(option => !this.selectedValue.includes(option)) - .map(option => ({ - display: this.formatPartSemanticDataModelToCamelCasePipe.transformModel(option), - value: option, - })); - this.options = this.searchedOptions; - // @ts-ignore - this.allOptions = res.map(option => ({ - display: this.formatPartSemanticDataModelToCamelCasePipe.transformModel(option), - value: option, - })); - - } else if (this.filterColumn === 'type') { - - // @ts-ignore - this.searchedOptions = res.filter(option => !this.selectedValue.includes(option)) - .map(option => ({ - display: NotificationType[option], - value: option, - })); - this.options = this.searchedOptions; - // @ts-ignore - this.allOptions = res.map(option => ({ - display: NotificationType[option], - value: option, - })); - } else { - // add filter for not selected - // @ts-ignore - this.searchedOptions = res.filter(option => !this.selectedValue.includes(option)) - .map(option => ({ display: option, value: option })); - this.options = this.searchedOptions; - // @ts-ignore - this.allOptions = res.map(option => ({ display: option, value: option })); - this.handleAllSelectedCheckbox(); - } - + firstValueFrom(this.strategy.retrieveSuggestionValues(this.tableType, this.filterColumn, this.searchElement, this.inAssetIds)).then((res) => { + // @ts-ignore + this.searchedOptions = res.filter(option => !this.selectedValue?.includes(option)) + .map(option => ({ display: option, value: option })); + this.options = this.searchedOptions; + // @ts-ignore + this.allOptions = res.map(option => ({ display: option, value: option })); + this.handleAllSelectedCheckbox(); this.suggestionError = !this.searchedOptions?.length; }).catch((error) => { console.error('Error fetching data: ', error); diff --git a/frontend/src/app/modules/shared/components/multi-select-autocomplete/table-type.model.ts b/frontend/src/app/modules/shared/components/multi-select-autocomplete/table-type.model.ts index b18f55f3a0..27a8a5a6d7 100644 --- a/frontend/src/app/modules/shared/components/multi-select-autocomplete/table-type.model.ts +++ b/frontend/src/app/modules/shared/components/multi-select-autocomplete/table-type.model.ts @@ -20,10 +20,6 @@ export enum TableType { AS_BUILT_OWN = 'AS_BUILT_OWN', AS_PLANNED_OWN = 'AS_PLANNED_OWN', - AS_BUILT_SUPPLIER = 'AS_BUILT_SUPPLIER', - AS_BUILT_CUSTOMER = 'AS_BUILT_CUSTOMER', - AS_PLANNED_SUPPLIER = 'AS_PLANNED_SUPPLIER', - AS_PLANNED_CUSTOMER = 'AS_PLANNED_CUSTOMER', RECEIVED_NOTIFICATION = 'RECEIVED_NOTIFICATION', SENT_NOTIFICATION = 'SENT_NOTIFICATION', CONTRACTS='CONTRACTS' diff --git a/frontend/src/app/modules/shared/components/notification-common-modal/notification-common-modal.component.ts b/frontend/src/app/modules/shared/components/notification-common-modal/notification-common-modal.component.ts index 30cceeeeb0..c7885f9cf8 100644 --- a/frontend/src/app/modules/shared/components/notification-common-modal/notification-common-modal.component.ts +++ b/frontend/src/app/modules/shared/components/notification-common-modal/notification-common-modal.component.ts @@ -34,6 +34,7 @@ export class NotificationCommonModalComponent { @ViewChild(NotificationActionModalComponent) notificationActionModalComponent: NotificationActionModalComponent; + // TODO do not delete the facade here. This will lead to a nullpointer exception within the modal call. public constructor( @Optional() private readonly notificationsFacade: NotificationsFacade, @@ -47,8 +48,6 @@ export class NotificationCommonModalComponent { public show(desiredStatus: NotificationStatus, notification?: Notification) { let notificationToShow = notification || this.selectedNotification; - console.log(notificationToShow, "notification"); - console.log(desiredStatus, "desiredstatus"); this.notificationActionModalComponent.show(notificationToShow, desiredStatus); } diff --git a/frontend/src/app/modules/shared/components/notification-overview/notification-overview.component.html b/frontend/src/app/modules/shared/components/notification-overview/notification-overview.component.html index de922ba86c..a03085aeb7 100644 --- a/frontend/src/app/modules/shared/components/notification-overview/notification-overview.component.html +++ b/frontend/src/app/modules/shared/components/notification-overview/notification-overview.component.html @@ -24,15 +24,21 @@ {{ 'table.column.id' | i18n }} {{ notification?.id }}
+
+ {{ 'table.column.title' | i18n }} + {{ + notification?.title + }} +
{{ 'table.column.description' | i18n }} - {{ + {{ notification?.description }}
{{ 'table.column.status' | i18n }} - @@ -42,6 +48,7 @@
{{ 'table.column.createdDate' | i18n }} {{ 'table.column.createdBy' | i18n }} - {{notification.createdBy}} + {{notification.createdBy}}
{{ 'table.column.createdByName' | i18n }} - {{notification.createdByName}} + {{notification.createdByName}}
{{ 'table.column.sendTo' | i18n }} - {{notification.sendTo}} + {{notification.sendTo}}
{{ 'table.column.sendToName' | i18n }} - {{notification.sendToName}} + {{notification.sendToName}}
{{ 'table.column.targetDate' | i18n }} {{ 'table.column.severity' | i18n }} - +
diff --git a/frontend/src/app/modules/shared/components/notification-type/notification-type.component.html b/frontend/src/app/modules/shared/components/notification-type/notification-type.component.html new file mode 100644 index 0000000000..bfe1f06d92 --- /dev/null +++ b/frontend/src/app/modules/shared/components/notification-type/notification-type.component.html @@ -0,0 +1,24 @@ + + +

+ {{ getIconByNotificationType(notificationType) }} + {{ 'requestNotification.' + notificationType?.toLowerCase() | i18n }} +

diff --git a/frontend/src/app/modules/shared/components/parts-table/parts-as-planned-supplier-configuration.model.ts b/frontend/src/app/modules/shared/components/notification-type/notification-type.component.scss similarity index 60% rename from frontend/src/app/modules/shared/components/parts-table/parts-as-planned-supplier-configuration.model.ts rename to frontend/src/app/modules/shared/components/notification-type/notification-type.component.scss index a984d20372..9b6438132a 100644 --- a/frontend/src/app/modules/shared/components/parts-table/parts-as-planned-supplier-configuration.model.ts +++ b/frontend/src/app/modules/shared/components/notification-type/notification-type.component.scss @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2023 Contributors to the Eclipse Foundation + * Copyright (c) 2024 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. @@ -16,22 +16,27 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { TableFilterConfiguration } from '@shared/components/parts-table/parts-config.model'; -export class PartsAsPlannedSupplierConfigurationModel extends TableFilterConfiguration { +.severity { + &__container { + display: flex; + align-items: center; + color: currentColor; + } - constructor() { - const sortableColumns = { - select: false, - semanticDataModel: true, - nameAtManufacturer: true, - businessPartner: true, - manufacturerName: true, - manufacturerPartId: true, - semanticModelId: true, - menu: false, - }; - super(sortableColumns); + &__MINOR { + @apply text-severityMinor; + } + + &__MAJOR { + @apply text-severityMajor; } -} + &__CRITICAL { + @apply text-severityCritical; + } + + &__LIFE-THREATENING { + @apply text-severityLifeThreatening; + } +} diff --git a/frontend/src/app/modules/shared/components/notification-type/notification-type.component.spec.ts b/frontend/src/app/modules/shared/components/notification-type/notification-type.component.spec.ts new file mode 100644 index 0000000000..a1e68c4d00 --- /dev/null +++ b/frontend/src/app/modules/shared/components/notification-type/notification-type.component.spec.ts @@ -0,0 +1,52 @@ +/******************************************************************************** + * Copyright (c) 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 + ********************************************************************************/ + +import { Severity } from '@shared/model/severity.model'; +import { SharedModule } from '@shared/shared.module'; +import { screen } from '@testing-library/angular'; +import { renderComponent } from '@tests/test-render.utils'; + +describe('SeverityComponent', () => { + const renderSeverity = (severity: Severity) => { + return renderComponent(`Test`, { + imports: [ SharedModule ], + componentProperties: { severity }, + }); + }; + + it('should render correct Minor icon', async () => { + await renderSeverity(Severity.MINOR); + expect(screen.getByText('error_outline')).toBeInTheDocument(); + }); + + it('should render correct Major icon', async () => { + await renderSeverity(Severity.MAJOR); + expect(screen.getByText('error')).toBeInTheDocument(); + }); + + it('should render correct Critical icon', async () => { + await renderSeverity(Severity.CRITICAL); + expect(screen.getByText('error_outline')).toBeInTheDocument(); + }); + + it('should render correct LifeThreatening icon', async () => { + await renderSeverity(Severity.LIFE_THREATENING); + expect(screen.getByText('error')).toBeInTheDocument(); + }); +}); diff --git a/frontend/src/app/modules/shared/components/notification-type/notification-type.component.ts b/frontend/src/app/modules/shared/components/notification-type/notification-type.component.ts new file mode 100644 index 0000000000..fa44984ddb --- /dev/null +++ b/frontend/src/app/modules/shared/components/notification-type/notification-type.component.ts @@ -0,0 +1,38 @@ +/******************************************************************************** + * Copyright (c) 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 + ********************************************************************************/ + +import { Component, Input } from '@angular/core'; +import { NotificationType } from '@shared/model/notification.model'; + +@Component({ + selector: 'app-notification-type', + templateUrl: './notification-type.component.html', + styleUrls: [ './notification-type.component.scss' ], +}) +export class NotificationTypeComponent { + @Input() notificationType: NotificationType; + + public getIconByNotificationType(notificationType: NotificationType): string { + const iconMap = new Map([ + [ NotificationType.INVESTIGATION, 'search' ], + [ NotificationType.ALERT, 'warning' ] + ]); + return iconMap.get(notificationType) || ''; + } +} diff --git a/frontend/src/app/modules/shared/components/parts-table/notifications-received-configuration.model.ts b/frontend/src/app/modules/shared/components/parts-table/notifications-received-configuration.model.ts new file mode 100644 index 0000000000..2688f76db6 --- /dev/null +++ b/frontend/src/app/modules/shared/components/parts-table/notifications-received-configuration.model.ts @@ -0,0 +1,22 @@ +import { TableFilterConfiguration } from '@shared/components/parts-table/parts-config.model'; + +export class NotificationsReceivedConfigurationModel extends TableFilterConfiguration { + constructor() { + const sortableColumns = { + select: false, + createdBy: true, + createdByName: true, + createdDate: true, + description: true, + severity: true, + status: true, + title: true, + type: true, + menu: false, + }; + + const dateFields = [ 'createdDate' ]; + const singleSearchFields = []; + super(sortableColumns, dateFields, singleSearchFields, true); + } +} diff --git a/frontend/src/app/modules/shared/components/parts-table/notifications-sent-configuration.model.ts b/frontend/src/app/modules/shared/components/parts-table/notifications-sent-configuration.model.ts new file mode 100644 index 0000000000..87e08fbc90 --- /dev/null +++ b/frontend/src/app/modules/shared/components/parts-table/notifications-sent-configuration.model.ts @@ -0,0 +1,22 @@ +import { TableFilterConfiguration } from '@shared/components/parts-table/parts-config.model'; + +export class NotificationsSentConfigurationModel extends TableFilterConfiguration { + constructor() { + const sortableColumns = { + select: false, + description: true, + title: true, + status: true, + createdDate: true, + severity: true, + sendTo: true, + sendToName: true, + type: true, + menu: false, + }; + + const dateFields = [ 'createdDate' ]; + const singleSearchFields = []; + super(sortableColumns, dateFields, singleSearchFields, true); + } +} diff --git a/frontend/src/app/modules/shared/components/parts-table/parts-as-built-configuration.model.ts b/frontend/src/app/modules/shared/components/parts-table/parts-as-built-configuration.model.ts index 301f9562ec..d997f3245e 100644 --- a/frontend/src/app/modules/shared/components/parts-table/parts-as-built-configuration.model.ts +++ b/frontend/src/app/modules/shared/components/parts-table/parts-as-built-configuration.model.ts @@ -22,6 +22,7 @@ export class PartsAsBuiltConfigurationModel extends TableFilterConfiguration { constructor() { const sortableColumns = { select: false, + owner: true, id: true, idShort: true, nameAtManufacturer: true, @@ -42,7 +43,6 @@ export class PartsAsBuiltConfigurationModel extends TableFilterConfiguration { importState: true, importNote: true, menu: false, - }; const dateFields = [ 'manufacturingDate' ]; diff --git a/frontend/src/app/modules/shared/components/parts-table/parts-as-built-customer-configuration.model.ts b/frontend/src/app/modules/shared/components/parts-table/parts-as-built-customer-configuration.model.ts deleted file mode 100644 index a95c9838a2..0000000000 --- a/frontend/src/app/modules/shared/components/parts-table/parts-as-built-customer-configuration.model.ts +++ /dev/null @@ -1,44 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2023 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 - ********************************************************************************/ -import {TableFilterConfiguration} from '@shared/components/parts-table/parts-config.model'; - -export class PartsAsBuiltCustomerConfigurationModel extends TableFilterConfiguration { - - constructor() { - const sortableColumns = { - select: false, - semanticDataModel: true, - nameAtManufacturer: true, - businessPartner: true, - manufacturerName: true, - manufacturerPartId: true, - semanticModelId: true, - manufacturingDate: true, - receivedActiveAlerts: true, - receivedActiveInvestigations: true, - sentActiveAlerts: true, - sentActiveInvestigations: true, - menu: false, - }; - const dateFields = [ 'manufacturingDate' ]; - const singleSearchFields = [ 'receivedActiveAlerts', 'sentActiveAlerts', 'receivedActiveInvestigations', 'sentActiveInvestigations' ]; - super(sortableColumns, dateFields, singleSearchFields); - } -} - diff --git a/frontend/src/app/modules/shared/components/parts-table/parts-as-built-supplier-configuration.model.ts b/frontend/src/app/modules/shared/components/parts-table/parts-as-built-supplier-configuration.model.ts deleted file mode 100644 index b56071c01b..0000000000 --- a/frontend/src/app/modules/shared/components/parts-table/parts-as-built-supplier-configuration.model.ts +++ /dev/null @@ -1,45 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2023 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 - ********************************************************************************/ -import {TableFilterConfiguration} from '@shared/components/parts-table/parts-config.model'; - -export class PartsAsBuiltSupplierConfigurationModel extends TableFilterConfiguration { - constructor() { - const sortableColumns = { - select: false, - semanticDataModel: true, - nameAtManufacturer: true, - businessPartner: true, - manufacturerName: true, - manufacturerPartId: true, - semanticModelId: true, - manufacturingDate: true, - receivedActiveAlerts: true, - receivedActiveInvestigations: true, - sentActiveAlerts: true, - sentActiveInvestigations: true, - menu: false, - }; - const dateFields = [ 'manufacturingDate' ]; - const singleSearchFields = [ 'receivedActiveAlerts', 'sentActiveAlerts', 'receivedActiveInvestigations', 'sentActiveInvestigations' ]; - super(sortableColumns, dateFields, singleSearchFields); - } - - -} - diff --git a/frontend/src/app/modules/shared/components/parts-table/parts-as-planned-configuration.model.ts b/frontend/src/app/modules/shared/components/parts-table/parts-as-planned-configuration.model.ts index 007a70bfe7..011068b42f 100644 --- a/frontend/src/app/modules/shared/components/parts-table/parts-as-planned-configuration.model.ts +++ b/frontend/src/app/modules/shared/components/parts-table/parts-as-planned-configuration.model.ts @@ -23,6 +23,7 @@ export class PartsAsPlannedConfigurationModel extends TableFilterConfiguration { constructor() { const sortableColumns = { select: false, + owner: true, id: true, idShort: true, nameAtManufacturer: true, diff --git a/frontend/src/app/modules/shared/components/parts-table/parts-config.model.ts b/frontend/src/app/modules/shared/components/parts-table/parts-config.model.ts index 43f7953437..de4c11b4c1 100644 --- a/frontend/src/app/modules/shared/components/parts-table/parts-config.model.ts +++ b/frontend/src/app/modules/shared/components/parts-table/parts-config.model.ts @@ -18,10 +18,8 @@ ********************************************************************************/ -import { TableViewConfig } from '@shared/components/parts-table/table-view-config.model'; - - import { PartsTableConfigUtils } from '@shared/components/parts-table/parts-table-config.utils'; +import { TableViewConfig } from '@shared/components/parts-table/table-view-config.model'; export class TableFilterConfiguration implements TableViewConfig { @@ -31,12 +29,12 @@ export class TableFilterConfiguration implements TableViewConfig { filterFormGroup: any; sortableColumns: any; - constructor(sortableColumns: any, dateFields?: any, singleSearchFields?: any) { + constructor(sortableColumns: any, dateFields?: any, singleSearchFields?: any, hasFilterColumn?: boolean) { this.displayedColumns = Object.keys(sortableColumns); this.filterFormGroup = PartsTableConfigUtils.createFormGroup(this.displayedColumns); - this.filterColumns = PartsTableConfigUtils.createFilterColumns(this.displayedColumns); + this.filterColumns = PartsTableConfigUtils.createFilterColumns(this.displayedColumns, hasFilterColumn); this.sortableColumns = sortableColumns; - this.displayFilterColumnMappings = PartsTableConfigUtils.generateFilterColumnsMapping(sortableColumns, dateFields, singleSearchFields); + this.displayFilterColumnMappings = PartsTableConfigUtils.generateFilterColumnsMapping(sortableColumns, dateFields, singleSearchFields, hasFilterColumn); } diff --git a/frontend/src/app/modules/shared/components/parts-table/parts-table-config.utils.ts b/frontend/src/app/modules/shared/components/parts-table/parts-table-config.utils.ts index 2d978d8bb1..e77ab0befd 100644 --- a/frontend/src/app/modules/shared/components/parts-table/parts-table-config.utils.ts +++ b/frontend/src/app/modules/shared/components/parts-table/parts-table-config.utils.ts @@ -3,6 +3,9 @@ import { FormControl } from '@angular/forms'; export class PartsTableConfigUtils { public static createFormGroup(displayedColumns: any): Record { + if (!displayedColumns) { + return; + } const formGroup: Record = {}; for (const column of displayedColumns) { @@ -15,6 +18,9 @@ export class PartsTableConfigUtils { } public static createFilterColumns(displayedColumns: string[], hasFilterCol: boolean = true, hasMenuCol: boolean = true): string[] { + if (!displayedColumns) { + return; + } const array = displayedColumns.filter((column: string) => 'select' !== column && 'menu' !== column).map((column: string) => 'filter' + column); let filter = null; let menu = null; @@ -60,4 +66,13 @@ export class PartsTableConfigUtils { return [ first, ...filterColumnsMapping, last ].filter(value => value !== null); } + + public static getDefaultColumnVisibilityMap(displayedColumns: string[]): Map { + const initialColumnMap = new Map(); + for (const column of displayedColumns) { + initialColumnMap.set(column, true); + } + return initialColumnMap; + } + } diff --git a/frontend/src/app/modules/shared/components/parts-table/parts-table.component.html b/frontend/src/app/modules/shared/components/parts-table/parts-table.component.html index b55838a54a..033b6baba3 100644 --- a/frontend/src/app/modules/shared/components/parts-table/parts-table.component.html +++ b/frontend/src/app/modules/shared/components/parts-table/parts-table.component.html @@ -19,35 +19,88 @@
-
-
{{tableHeader}} - - settings - -
-
-

{{ selectedPartsInfoLabel | i18n : {count: selection?.selected?.length || 0} }}

-
+
+
+ {{ tableHeader }} +
+ +
+
+ [matTooltipShowDelay]="500"> -
- announcement - {{ selectedPartsActionLabel | i18n }} -
- + iconName="settings" + class="action-button-tile ml-2" + (click)="openDialog()" + (keydown)="handleKeyDownOpenDialog($event)" + > +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ + +
+ +
+ +
+
+

{{ selectedPartsInfoLabel | i18n : {count: selection?.selected?.length || 0} }}

@@ -83,6 +136,7 @@ [singleSearch]="filter.singleSearch" [filterColumn]="filter.filterKey" [tableType]="tableType" + [inAssetIds]="assetIdsForAutoCompleteFilter" [placeholderMultiple]="('multiSelect.multipleResults' | i18n)" ngDefaultControl [formControl]="filterFormGroup.controls[filter.filterKey]"> @@ -154,23 +208,25 @@

{{ 'table.noResultFound' | i18n }}

- - - - nearby_error - + + + + nearby_error + +
@@ -243,9 +299,23 @@

{{ 'table.noResultFound' | i18n }}

+ + + + {{'table.owner.' + element[column]?.toLowerCase() | i18n}} + + + + + + + {{'table.semanticDataModel.' + element[column] | i18n}} + + + - - + {{ element[column]?.length }} @@ -317,10 +387,10 @@

{{ 'table.noResultFound' | i18n }}

- + -
+
- - - -
-

{{ 'requestNotification.restoreItem' | i18n }}

- - - restore - {{ removedItemsHistory[0]?.nameAtManufacturer || removedItemsHistory[0]?.id }} - - -
-
- -
-
-
- -
-
- -
-
- - -
-
- -
- -
- - -
- {{ 'requestNotification.cancel' | i18n }} - - {{ 'requestNotification.submit' | i18n }} -
-
- - diff --git a/frontend/src/app/modules/shared/components/request-notification/notification-request.component.spec.ts b/frontend/src/app/modules/shared/components/request-notification/notification-request.component.spec.ts deleted file mode 100644 index d950db9d70..0000000000 --- a/frontend/src/app/modules/shared/components/request-notification/notification-request.component.spec.ts +++ /dev/null @@ -1,177 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2022, 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - * Copyright (c) 2022, 2023 ZF Friedrichshafen AG - * Copyright (c) 2022, 2023 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 - ********************************************************************************/ - -import {LayoutModule} from '@layout/layout.module'; -import {OtherPartsModule} from '@page/other-parts/other-parts.module'; -import {NotificationType} from '@shared/model/notification.model'; -import {SharedModule} from '@shared/shared.module'; -import {fireEvent, screen, waitFor} from '@testing-library/angular'; -import {renderComponent} from '@tests/test-render.utils'; -import {sleepForTests} from '../../../../../test'; -import {RequestNotificationComponent} from '@shared/components/request-notification/request-notification.component'; -import {NotificationService} from "@shared/service/notification.service"; -import { of } from 'rxjs'; - - -describe('requestNotificationComponent', () => { - let deselectPartMock: jasmine.Spy; - let clearSelectedMock: jasmine.Spy; - let submittedMock: jasmine.Spy; - let notificationServiceMock: jasmine.SpyObj; // Assuming your service is named NotificationService - - const currentSelectedItems = [ { nameAtManufacturer: 'part_1' }, { nameAtManufacturer: 'part_2' }, { nameAtManufacturer: 'part_3' } ]; - - const renderRequestNotificationComponent = async (notificationType: NotificationType) => { - return renderComponent( - ``, - { - declarations: [ RequestNotificationComponent ], - imports: [ SharedModule, LayoutModule, OtherPartsModule ], - translations: [ 'page.otherParts', 'partDetail' ], - componentProperties: { - deselectPartMock, - clearSelectedMock, - submittedMock, - currentSelectedItems, - notificationType, - }, - }, - ); - }; - - beforeEach(() => { - deselectPartMock = jasmine.createSpy(); - clearSelectedMock = jasmine.createSpy(); - submittedMock = jasmine.createSpy(); - notificationServiceMock = jasmine.createSpyObj('NotificationService', ['createNotification' /* add more methods as needed */]); - }); - - describe('Request Investigation', () => { - it('should render', async () => { - await renderRequestNotificationComponent(NotificationType.INVESTIGATION); - await shouldRender('requestInvestigations'); - - }); - - it('should render parts in chips', async () => { - await renderRequestNotificationComponent(NotificationType.INVESTIGATION); - await shouldRenderPartsInChips(); - }); - - it('should render textarea', async () => { - await renderRequestNotificationComponent(NotificationType.INVESTIGATION); - await shouldRenderTextarea(); - }); - - it('should render buttons', async () => { - await renderRequestNotificationComponent(NotificationType.INVESTIGATION); - await shouldRenderButtons(); - }); - - it('should submit alert', async () => { - await renderRequestNotificationComponent(NotificationType.INVESTIGATION); - await shouldSubmitParts(); - }); - - }); - - describe('Request Alert', () => { - it('should render', async () => { - await renderRequestNotificationComponent(NotificationType.ALERT); - await shouldRender('requestAlert'); - }); - - it('should render parts in chips', async () => { - await renderRequestNotificationComponent(NotificationType.ALERT); - await shouldRenderPartsInChips(); - }); - - it('should render textarea', async () => { - await renderRequestNotificationComponent(NotificationType.ALERT); - await shouldRenderTextarea(); - }); - - it('should render buttons', async () => { - await renderRequestNotificationComponent(NotificationType.ALERT); - await shouldRenderButtons(); - }); - it('should submit alert', async () => { - await renderRequestNotificationComponent(NotificationType.ALERT); - await shouldSubmitParts(true); - }); - - }); - - const shouldRender = async (context: string) => { - const headline = await waitFor(() => screen.getByText(context + '.headline'), { timeout: 2000 }); - expect(headline).toBeInTheDocument(); - }; - - const shouldRenderPartsInChips = async () => { - const part_1 = await waitFor(() => screen.getByText('part_1')); - const part_2 = await screen.getByText('part_2'); - const part_3 = await screen.getByText('part_3'); - - expect(part_1).toBeInTheDocument(); - expect(part_2).toBeInTheDocument(); - expect(part_3).toBeInTheDocument(); - }; - - const shouldRenderTextarea = async () => { - const textAreaElement = await waitFor(() => screen.getByText('requestNotification.textAreaLabel')); - - expect(textAreaElement).toBeInTheDocument(); - }; - - const shouldRenderButtons = async () => { - const cancelElement = await waitFor(() => screen.getByText('requestNotification.cancel')); - const submitElement = await screen.getByText('requestNotification.submit'); - - expect(cancelElement).toBeInTheDocument(); - expect(submitElement).toBeInTheDocument(); - }; - const shouldSubmitParts = async (shouldFillBpn = false) => { - const testText = 'This is for a testing purpose.'; - const textArea = (await waitFor(() => screen.getByTestId('BaseInputElement-1'))) as HTMLTextAreaElement; - - fireEvent.input(textArea, { target: { value: testText } }); - - if (shouldFillBpn) { - const bpnInput = (await waitFor(() => screen.getByTestId('BaseInputElement-3'))) as HTMLTextAreaElement; - fireEvent.input(bpnInput, { target: { value: 'BPNA0123TEST0123' } }); - } - - const submit = await waitFor(() => screen.getByText('requestNotification.submit')); - expect(submit).toBeInTheDocument(); - expect(textArea.value).toEqual(testText); - fireEvent.click(submit); - - await sleepForTests(2000); - debugger; - expect(textArea.value).toEqual(''); - }; -}); diff --git a/frontend/src/app/modules/shared/components/request-notification/request-notification.component.ts b/frontend/src/app/modules/shared/components/request-notification/request-notification.component.ts deleted file mode 100644 index 8f3f0bceaf..0000000000 --- a/frontend/src/app/modules/shared/components/request-notification/request-notification.component.ts +++ /dev/null @@ -1,169 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2023 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 - ********************************************************************************/ - -import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { FormControl, FormGroup, Validators } from '@angular/forms'; -import { NOTIFICATION_BASE_ROUTE, getRoute } from '@core/known-route'; -import { bpnRegex } from '@page/admin/presentation/bpn-configuration/bpn-configuration.component'; -import { Part, SemanticDataModel } from '@page/parts/model/parts.model'; -import { BaseInputHelper } from '@shared/abstraction/baseInput/baseInput.helper'; -import { DateValidators } from '@shared/components/dateTime/dateValidators.model'; -import { ToastService } from '@shared/components/toasts/toast.service'; -import { NotificationStatusGroup, NotificationType } from '@shared/model/notification.model'; -import { Severity } from '@shared/model/severity.model'; -import { NotificationService } from '@shared/service/notification.service'; -import { BehaviorSubject } from 'rxjs'; - -@Component({ - selector: 'app-notification-request', - templateUrl: './notification-request.component.html', -}) -export class RequestNotificationComponent { - @Input() selectedItems: Part[]; - @Input() showHeadline = true; - - context: string; - isInvestigation: boolean; - formGroup = new FormGroup({}); - - @Input() set notificationType(notificationType: NotificationType) { - this.context = notificationType === NotificationType.INVESTIGATION ? 'requestInvestigations' : 'requestAlert'; - this.isInvestigation = notificationType === NotificationType.INVESTIGATION; - this.formGroup.addControl('title', new FormControl('', [ Validators.maxLength(30), Validators.minLength(0) ])); - this.formGroup.addControl('description', new FormControl('', [ Validators.required, Validators.maxLength(1000), Validators.minLength(15) ])); - this.formGroup.addControl('severity', new FormControl(Severity.MINOR, [ Validators.required ])); - if (this.isInvestigation) { - this.formGroup.addControl('targetDate', new FormControl(null, [ DateValidators.atLeastNow() ])); - } else { - this.formGroup.addControl('bpn', new FormControl(null, [ Validators.required, BaseInputHelper.getCustomPatternValidator(bpnRegex, 'bpn') ])); - } - } - - - @Output() deselectPart = new EventEmitter(); - @Output() restorePart = new EventEmitter(); - @Output() clearSelected = new EventEmitter(); - @Output() submitted = new EventEmitter(); - - public readonly isLoading$ = new BehaviorSubject(false); - public readonly minDate = new Date(); - - public removedItemsHistory: Part[] = []; - - constructor(private readonly toastService: ToastService, private readonly notificationService: NotificationService) { - this.toastService.retryAction.subscribe((event: string) => this.submit()); - } - - protected prepareSubmit(): void { - this.formGroup.markAllAsTouched(); - this.formGroup.updateValueAndValidity(); - - if (this.formGroup.invalid) return; - - this.isLoading$.next(true); - this.formGroup.disable(); - } - - protected onUnsuccessfulSubmit(err: string): void { - this.isLoading$.next(false); - this.formGroup.enable(); - this.openErrorToast(err); - } - - public submit(): void { - this.prepareSubmit(); - - if (this.formGroup.invalid) return; - const partIds = this.selectedItems.map(part => part.id); - // TODO this is not correct behaviour BUG! - // set asBuilt parameter if one of the selectedItems are a asPlanned Part - const isAsBuilt = this.selectedItems.map(part => part.semanticDataModel === SemanticDataModel.PARTASPLANNED).includes(true); - - let { description, bpn, severity, title } = this.formGroup.value; - const { link, queryParams } = getRoute(NOTIFICATION_BASE_ROUTE, NotificationStatusGroup.QUEUED_AND_REQUESTED); - let type = this.isInvestigation ? 'INVESTIGATION' : 'ALERT'; - - if (title === ""){ - title = null; - } - - this.notificationService.createNotification(partIds, description, severity, bpn, isAsBuilt, type, title).subscribe({ - next: () => this.onSuccessfulSubmit(link, queryParams), - error: (err) => this.onUnsuccessfulSubmit(err.error.message), - }); - - } - - protected onSuccessfulSubmit(link: string, linkQueryParams: Record): void { - this.isLoading$.next(false); - const amountOfItems = this.selectedItems.length; - this.resetForm(); - this.openSuccessToast(amountOfItems, link, linkQueryParams); - } - - - protected openSuccessToast(count: number, link: string, linkQueryParams: Record): void { - - this.toastService.success({ - id: `${ this.context }.success`, - values: { count }, - }, - 5000, - [ - { - text: 'actions.goToQueue', - linkQueryParams, - link, - }, - ], - ); - } - - protected openErrorToast(errorMessage: string) { - this.toastService.error({ - id: `${ this.context }.serverError`, - }, - 5000, true, errorMessage); - } - - public resetForm(): void { - this.formGroup.enable(); - this.removedItemsHistory = []; - - this.submitted.emit(); - this.clearSelected.emit(); - - this.formGroup.markAsUntouched(); - this.formGroup.reset(); - - this.formGroup.markAsUntouched(); - this.formGroup.reset(); - } - - - public cancelAction(part: Part): void { - this.removedItemsHistory.unshift(part); - this.deselectPart.emit(part); - } - - public restoreLastItem(): void { - this.restorePart.emit(this.removedItemsHistory[0]); - this.removedItemsHistory.shift(); - } -} diff --git a/frontend/src/app/modules/shared/components/severity-select/severity-select.component.spec.ts b/frontend/src/app/modules/shared/components/severity-select/severity-select.component.spec.ts index 06d71dd480..248a52957a 100644 --- a/frontend/src/app/modules/shared/components/severity-select/severity-select.component.spec.ts +++ b/frontend/src/app/modules/shared/components/severity-select/severity-select.component.spec.ts @@ -39,12 +39,12 @@ describe('SeveritySelectComponent', () => { it('should render selected Minor icon', async () => { await renderSeveritySelect(Severity.MINOR); - expect(await waitFor(() => screen.getByText('info'))).toBeInTheDocument(); + expect(await waitFor(() => screen.getByText('error_outline'))).toBeInTheDocument(); }); it('should render selected Major icon', async () => { await renderSeveritySelect(Severity.MAJOR); - expect(await waitFor(() => screen.getByText('warning'))).toBeInTheDocument(); + expect(await waitFor(() => screen.getByText('error'))).toBeInTheDocument(); }); it('should render selected Critical icon', async () => { diff --git a/frontend/src/app/modules/shared/components/severity/severity.component.spec.ts b/frontend/src/app/modules/shared/components/severity/severity.component.spec.ts index fe1c9cb449..f213e2cd3b 100644 --- a/frontend/src/app/modules/shared/components/severity/severity.component.spec.ts +++ b/frontend/src/app/modules/shared/components/severity/severity.component.spec.ts @@ -19,7 +19,6 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Severity } from '@shared/model/severity.model'; import { SharedModule } from '@shared/shared.module'; import { screen } from '@testing-library/angular'; @@ -37,12 +36,12 @@ describe('SeverityComponent', () => { it('should render correct Minor icon', async () => { await renderSeverity(Severity.MINOR); - expect(screen.getByText('info')).toBeInTheDocument(); + expect(screen.getByText('error_outline')).toBeInTheDocument(); }); it('should render correct Major icon', async () => { await renderSeverity(Severity.MAJOR); - expect(screen.getByText('warning')).toBeInTheDocument(); + expect(screen.getByText('error')).toBeInTheDocument(); }); it('should render correct Critical icon', async () => { diff --git a/frontend/src/app/modules/shared/components/severity/severity.component.ts b/frontend/src/app/modules/shared/components/severity/severity.component.ts index 8e7bbaba7e..a46d3db434 100644 --- a/frontend/src/app/modules/shared/components/severity/severity.component.ts +++ b/frontend/src/app/modules/shared/components/severity/severity.component.ts @@ -32,8 +32,8 @@ export class SeverityComponent { public getIconBySeverity(severity: Severity): string { const iconMap = new Map([ - [ Severity.MINOR, 'info' ], - [ Severity.MAJOR, 'warning' ], + [ Severity.MINOR, 'error_outline' ], + [ Severity.MAJOR, 'error' ], [ Severity.CRITICAL, 'error_outline' ], [ Severity.LIFE_THREATENING, 'error' ], ]); diff --git a/frontend/src/app/modules/shared/components/table-settings/table-settings.component.html b/frontend/src/app/modules/shared/components/table-settings/table-settings.component.html index 6e79ae3ecb..8bc89c18c7 100644 --- a/frontend/src/app/modules/shared/components/table-settings/table-settings.component.html +++ b/frontend/src/app/modules/shared/components/table-settings/table-settings.component.html @@ -19,8 +19,9 @@
-

{{title | i18n}}

+

{{ title | i18n }}

close @@ -29,6 +30,7 @@
arrow_downward {{'table.tableSettings.selectAll' | i18n}} + >{{ 'table.tableSettings.selectAll' | i18n }} - - {{'table.column.' + item | i18n}} +
+ +
+ {{ 'table.column.' + item | i18n }} - - notification_important - - - + + notification_important + + + - inbox - + inbox + - - - - + +
+
@@ -100,6 +105,7 @@ [matTooltipShowDelay]="1000" > refresh @@ -111,7 +117,8 @@
+ (click)="save()">{{ 'table.tableSettings.saveAction' | i18n }} +
diff --git a/frontend/src/app/modules/shared/components/table-settings/table-settings.component.scss b/frontend/src/app/modules/shared/components/table-settings/table-settings.component.scss index 185dcc72d3..182c14e0fe 100644 --- a/frontend/src/app/modules/shared/components/table-settings/table-settings.component.scss +++ b/frontend/src/app/modules/shared/components/table-settings/table-settings.component.scss @@ -96,10 +96,10 @@ } - .selected-item { - background-color: rgba(139, 139, 139, 0.4); - } +} +.selected-item { + background-color: rgba(139, 139, 139, 0.4); } @@ -143,7 +143,10 @@ .dialog--actions--save--button:hover, .dialog--actions--save--button:active, .dialog--actions--save--button:focus { background-color: rgb(13, 85, 175) } +} +.hoverable:hover { + background-color: rgb(237, 237, 237); } diff --git a/frontend/src/app/modules/shared/components/table-settings/table-settings.component.spec.ts b/frontend/src/app/modules/shared/components/table-settings/table-settings.component.spec.ts index 05756fb5ee..37ef774f00 100644 --- a/frontend/src/app/modules/shared/components/table-settings/table-settings.component.spec.ts +++ b/frontend/src/app/modules/shared/components/table-settings/table-settings.component.spec.ts @@ -113,7 +113,6 @@ describe('TableSettingsComponent', () => { expect(component.tableType).toEqual(TableType.AS_BUILT_OWN); expect(component.defaultColumns).toEqual([ 'column1', 'column2' ]); expect(component.defaultFilterColumns).toEqual([ 'filtercolumn1', 'filtercolumn2' ]); - expect(component.isCustomerTable).toEqual(false); }); it('should call save method and update tableSettingsService', () => { diff --git a/frontend/src/app/modules/shared/components/table-settings/table-settings.component.ts b/frontend/src/app/modules/shared/components/table-settings/table-settings.component.ts index a65d238002..c0a1914a4c 100644 --- a/frontend/src/app/modules/shared/components/table-settings/table-settings.component.ts +++ b/frontend/src/app/modules/shared/components/table-settings/table-settings.component.ts @@ -47,14 +47,10 @@ export class TableSettingsComponent { selectAllSelected: boolean; selectedColumn: string = null; - isCustomerTable: boolean; - - constructor(public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any, public readonly tableSettingsService: TableSettingsService) { // Layout this.title = data.title; this.panelClass = data.panelClass; - this.isCustomerTable = data.tableType === TableType.AS_BUILT_CUSTOMER || data.tableType === TableType.AS_PLANNED_CUSTOMER; // Passed Data this.tableType = data.tableType; this.defaultColumns = data.defaultColumns; @@ -68,6 +64,7 @@ export class TableSettingsComponent { this.selectAllSelected = this.dialogColumns.length === this.tableColumns.length; + } save() { @@ -111,9 +108,9 @@ export class TableSettingsComponent { } handleListItemClick(event: MouseEvent, item: string) { - let element = event.target as HTMLElement; - - if (element.tagName !== 'INPUT') { + ; + let element = event.currentTarget as HTMLElement; + if ((event.target as HTMLElement).tagName !== 'INPUT') { this.selectedColumn = item; element.classList.toggle('selected-item'); } @@ -125,11 +122,13 @@ export class TableSettingsComponent { return; } - let oldPosition = this.dialogColumns.indexOf(this.selectedColumn); - // in non customer table we have the select Column as first and why - let upperLimit = this.isCustomerTable ? 0 : 1; + const oldPosition = this.dialogColumns.indexOf(this.selectedColumn); + // for tables where we have a select column at first + const upperLimit = this.dialogColumns.includes('select') ? 1 : 0; + // for tables where we have a menu column at last + const bottomLimit = this.dialogColumns.includes('menu') ? this.dialogColumns.length - 2 : this.dialogColumns.length - 1; let step = direction === 'up' ? -1 : 1; - if ((oldPosition == upperLimit && direction === 'up') || (oldPosition === this.dialogColumns.length - 1 && direction === 'down')) { + if ((oldPosition == upperLimit && direction === 'up') || (oldPosition === bottomLimit && direction === 'down')) { return; } let temp = this.dialogColumns[oldPosition + step]; diff --git a/frontend/src/app/modules/shared/components/table/table.component.html b/frontend/src/app/modules/shared/components/table/table.component.html index a51fe1803c..841eea23b6 100644 --- a/frontend/src/app/modules/shared/components/table/table.component.html +++ b/frontend/src/app/modules/shared/components/table/table.component.html @@ -21,17 +21,118 @@
-
{{tableHeader | i18n}}
+
{{ tableHeader | i18n }} + + settings + +
+
+
+ +
+ +
+ + +
+ +
+ + + + +
+ +
-
+

{{tableHeader | i18n }}

 + class="large-text table--header">{{ tableHeader | i18n }}

{{ selectedPartsInfoLabel | i18n : {count: selection?.selected?.length || 0} }}

- + - - + + *ngFor="let filter of tableViewConfig?.displayFilterColumnMappings"> + [formControl]="filterFormGroup.controls[filter.filterKey]"> + + - + {{ 'table.noResultFound' | i18n }}

{{ 'table.noResultFound' | i18n }} - +
; @Input() additionalTableHeader = false; + @Input() tableHeaderMenuEnabled = false; @Input() set tableConfig(tableConfig: TableConfig) { @@ -61,15 +69,13 @@ export class TableComponent { const { menuActionsConfig: menuActions, displayedColumns: dc, columnRoles, hasPagination = true } = tableConfig; const displayedColumns = dc.filter(column => this.roleService.hasAccess(columnRoles?.[column] ?? 'user') || this.roleService.hasAccess('admin')); + const menuActionsConfig = this.menuActionsWithAddedDefaultActions(menuActions); + this._tableConfig = { ...tableConfig, displayedColumns, hasPagination, menuActionsConfig }; - const viewDetailsMenuAction: MenuActionConfig = { - label: 'actions.viewDetails', - icon: 'remove_red_eye', - action: (data: Record) => this.selected.emit(data), - }; + } - const menuActionsConfig = menuActions ? [ viewDetailsMenuAction, ...menuActions ] : null; - this._tableConfig = { ...tableConfig, displayedColumns, hasPagination, menuActionsConfig }; + isEditable(data: any): boolean { + return data.status === NotificationStatus.CREATED; } get tableConfig(): TableConfig { @@ -122,7 +128,7 @@ export class TableComponent { } this.removeSelectedValues(deselectItem); - this.emitMultiSelect(); + this.handleSelectionChange(); } @Input() set addTrigger(newItem: unknown) { @@ -131,16 +137,18 @@ export class TableComponent { } this.selection.select(newItem); - this.emitMultiSelect(); + this.handleSelectionChange(); } @Output() selected = new EventEmitter>(); + @Output() editClicked = new EventEmitter>(); @Output() configChanged = new EventEmitter(); @Output() multiSelect = new EventEmitter(); @Output() clickSelectAction = new EventEmitter(); @Output() filterActivated = new EventEmitter(); @Input() public autocompleteEnabled = false; + @Input() tableSettingsEnabled: boolean = false; public readonly dataSource = new MatTableDataSource(); public readonly selection = new SelectionModel(true, []); @@ -151,6 +159,8 @@ export class TableComponent { public selectedRow: Record; public isMenuOpen: boolean; + public notificationsSelectedOnlyInStatusCreated: boolean; + private pageSize: number; private sorting: TableHeaderSort; @@ -161,41 +171,116 @@ export class TableComponent { filterFormGroup = new FormGroup({}); // input notification type map to parttable type, - @Input() - tableType: TableType = TableType.AS_BUILT_OWN; + @Input() tableType: TableType = TableType.AS_BUILT_OWN; + + public displayedColumns: string[]; + public defaultColumns: string[]; - constructor(private readonly roleService: RoleService) { + constructor( + public readonly roleService: RoleService, + private dialog: MatDialog, + private tableSettingsService: TableSettingsService, + public toastService: ToastService, + private readonly router: Router, + ) { } ngOnInit(): void { - const displayFilterColumnMappings = this.tableType === TableType.CONTRACTS ? - PartsTableConfigUtils.generateFilterColumnsMapping(this.tableConfig?.sortableColumns, [ 'creationDate', 'endDate' ], [], true, false) - : PartsTableConfigUtils.generateFilterColumnsMapping(this.tableConfig?.sortableColumns, [ 'createdDate', 'targetDate' ], [], false, true); - - const filterColumns = this.tableType === TableType.CONTRACTS ? - PartsTableConfigUtils.createFilterColumns(this.tableConfig?.displayedColumns, true, false) - : PartsTableConfigUtils.createFilterColumns(this.tableConfig?.displayedColumns, false, true); - - this.tableViewConfig = { - displayedColumns: Object.keys(this.tableConfig.sortableColumns), - filterFormGroup: PartsTableConfigUtils.createFormGroup(this.tableConfig?.displayedColumns), - filterColumns: filterColumns, - sortableColumns: this.tableConfig?.sortableColumns, - displayFilterColumnMappings: displayFilterColumnMappings, - }; - for (const controlName in this.tableViewConfig.filterFormGroup) { - if (this.tableViewConfig.filterFormGroup.hasOwnProperty(controlName)) { - this.filterFormGroup.addControl(controlName, this.tableViewConfig.filterFormGroup[controlName]); + if (this.tableSettingsEnabled) { + this.tableViewConfig = this.tableSettingsService.initializeTableViewSettings(this.tableType); + this.tableSettingsService.getEvent().subscribe(() => { + this.setupTableViewSettings(); + }); + this.setupTableViewSettings(); + } else { + const displayFilterColumnMappings = this.tableType === TableType.CONTRACTS ? + PartsTableConfigUtils.generateFilterColumnsMapping(this.tableConfig?.sortableColumns, [ 'creationDate', 'endDate' ], [], true, false) + : PartsTableConfigUtils.generateFilterColumnsMapping(this.tableConfig?.sortableColumns, [ 'createdDate', 'targetDate' ], [], false, true); + + const filterColumns = this.tableType === TableType.CONTRACTS ? + PartsTableConfigUtils.createFilterColumns(this.tableConfig?.displayedColumns, true, false) + : PartsTableConfigUtils.createFilterColumns(this.tableConfig?.displayedColumns, false, true); + + this.tableViewConfig = { + displayedColumns: this.tableConfig?.sortableColumns ? Object.keys(this.tableConfig?.sortableColumns) : [], + filterFormGroup: PartsTableConfigUtils.createFormGroup(this.tableConfig?.displayedColumns), + filterColumns: filterColumns, + sortableColumns: this.tableConfig?.sortableColumns, + displayFilterColumnMappings: displayFilterColumnMappings, + }; + for (const controlName in this.tableViewConfig.filterFormGroup) { + if (this.tableViewConfig.filterFormGroup.hasOwnProperty(controlName)) { + this.filterFormGroup.addControl(controlName, this.tableViewConfig.filterFormGroup[controlName]); + } } } this.filterFormGroup.valueChanges.subscribe((formValues) => { this.filterActivated.emit(formValues); }); + + } + + private setupTableViewSettings() { + + this.tableSettingsService.storedTableSettingsInvalid(this.tableViewConfig, this.tableType); + + const tableSettingsList = this.tableSettingsService.getStoredTableSettings(); + // check if there are table settings list + if (tableSettingsList) { + // if yes, check if there is a table-setting for this table type + if (tableSettingsList[this.tableType]) { + // if yes, get the effective displayedcolumns from the settings and set the tableconfig after it. + this.setupTableConfigurations(tableSettingsList[this.tableType].columnsForTable, tableSettingsList[this.tableType].filterColumnsForTable, this.tableViewConfig.sortableColumns, this.tableViewConfig.displayFilterColumnMappings, this.tableViewConfig.filterFormGroup); + } else { + // if no, create new a table setting for this.tabletype and put it into the list. Additionally, intitialize default table configuration + tableSettingsList[this.tableType] = { + columnsForDialog: this.tableViewConfig.displayedColumns, + columnSettingsOptions: PartsTableConfigUtils.getDefaultColumnVisibilityMap(this.tableViewConfig.displayedColumns), + columnsForTable: this.tableViewConfig.displayedColumns, + filterColumnsForTable: this.tableViewConfig.filterColumns, + }; + this.tableSettingsService.storeTableSettings(tableSettingsList); + this.setupTableConfigurations(this.tableViewConfig.displayedColumns, this.tableViewConfig.filterColumns, this.tableViewConfig.sortableColumns, this.tableViewConfig.displayFilterColumnMappings, this.tableViewConfig.filterFormGroup); + } + } else { + // if no, create new list and a settings entry for this.tabletype with default values and set correspondingly the tableconfig + const newTableSettingsList = { + [this.tableType]: { + columnsForDialog: this.tableViewConfig.displayedColumns, + columnSettingsOptions: PartsTableConfigUtils.getDefaultColumnVisibilityMap(this.tableViewConfig.displayedColumns), + columnsForTable: this.tableViewConfig.displayedColumns, + filterColumnsForTable: this.tableViewConfig.filterColumns, + }, + }; + this.tableSettingsService.storeTableSettings(newTableSettingsList); + this.setupTableConfigurations(this.tableViewConfig.displayedColumns, this.tableViewConfig.filterColumns, this.tableViewConfig.sortableColumns, this.tableViewConfig.displayFilterColumnMappings, this.tableViewConfig.filterFormGroup); + } + + } + + + private setupTableConfigurations(displayedColumnsForTable: string[], displayedColumns: string[], sortableColumns: Record, filterConfiguration: any[], filterFormGroup: any): any { + const headerKey = 'table.column'; + this.tableConfig = { + ...this.tableConfig, + displayedColumns: displayedColumnsForTable, + header: CreateHeaderFromColumns(displayedColumnsForTable, headerKey), + sortableColumns: sortableColumns, + }; + this.displayedColumns = displayedColumns; + + for (const controlName in filterFormGroup) { + if (filterFormGroup.hasOwnProperty(controlName)) { + this.filterFormGroup.addControl(controlName, filterFormGroup[controlName]); + } + } + } + public areAllRowsSelected(): boolean { return this.dataSource.data.every(data => this.isSelected(data)); } @@ -213,7 +298,7 @@ export class TableComponent { ? this.removeSelectedValues(this.dataSource.data) : this.addSelectedValues(this.dataSource.data); - this.emitMultiSelect(); + this.handleSelectionChange(); } public onPaginationChange({ pageIndex, pageSize }: PageEvent): void { @@ -224,7 +309,7 @@ export class TableComponent { public updateSortingOfData({ active, direction }: Sort): void { this.selection.clear(); - this.emitMultiSelect(); + this.handleSelectionChange(); this.sorting = !direction ? null : ([ active, direction ] as TableHeaderSort); this.isDataLoading = true; if (this.pageSize === 0) { @@ -235,7 +320,7 @@ export class TableComponent { public toggleSelection(row: unknown): void { this.isSelected(row) ? this.removeSelectedValues([ row ]) : this.addSelectedValues([ row ]); - this.emitMultiSelect(); + this.handleSelectionChange(); } public selectElement(row: Record) { @@ -246,7 +331,8 @@ export class TableComponent { } } - private emitMultiSelect(): void { + private handleSelectionChange(): void { + this.notificationsSelectedOnlyInStatusCreated = this.selection.selected.every(notification => notification?.['status'] === NotificationStatus.CREATED); this.multiSelect.emit(this.selection.selected); } @@ -278,5 +364,42 @@ export class TableComponent { removeSelectedValues(this.selection, itemsToRemove); } + openDialog() { + const config = new MatDialogConfig(); + config.data = { + title: 'table.tableSettings.title', + panelClass: 'custom', + tableType: this.tableType, + defaultColumns: this.tableViewConfig.displayedColumns, + defaultFilterColumns: this.tableViewConfig.filterColumns, + }; + this.dialog.open(TableSettingsComponent, config); + } + + navigateToNotificationCreationView() { + this.router.navigate([ 'inbox/create' ]); + } + + private menuActionsWithAddedDefaultActions(menuActionsConfig: MenuActionConfig[] = []): MenuActionConfig[] { + const viewDetailsMenuAction: MenuActionConfig = { + label: 'actions.viewDetails', + icon: 'remove_red_eye', + action: (data: Record) => this.selected.emit(data), + }; + + const editDetailsMenuAction: MenuActionConfig = { + label: 'actions.edit', + icon: 'edit', + action: (data: Record) => this.editClicked.emit(data), + condition: data => this.isEditable(data), + isAuthorized: this.roleService.isSupervisor() || this.roleService.isUser(), + }; + const defaultActionsToAdd: MenuActionConfig[] = [ viewDetailsMenuAction, editDetailsMenuAction ] + .filter(action => !menuActionsConfig.some(a => a.label === action.label)); + + return [ ...defaultActionsToAdd, ...menuActionsConfig ]; + }; + protected readonly MainAspectType = MainAspectType; + } diff --git a/frontend/src/app/modules/shared/components/textarea/textarea.component.scss b/frontend/src/app/modules/shared/components/textarea/textarea.component.scss index 021be2236a..2b10011e94 100644 --- a/frontend/src/app/modules/shared/components/textarea/textarea.component.scss +++ b/frontend/src/app/modules/shared/components/textarea/textarea.component.scss @@ -25,7 +25,7 @@ textarea { min-height: 280px; - max-height: 450px; + max-height: 430px; margin-top: 7px; } diff --git a/frontend/src/app/modules/shared/components/toasts/toast-message/toast-message.component.html b/frontend/src/app/modules/shared/components/toasts/toast-message/toast-message.component.html index d96fe73094..a753133acb 100644 --- a/frontend/src/app/modules/shared/components/toasts/toast-message/toast-message.component.html +++ b/frontend/src/app/modules/shared/components/toasts/toast-message/toast-message.component.html @@ -30,6 +30,7 @@
{{"retry" | i18n}} refresh @@ -37,6 +38,6 @@
- close + close
diff --git a/frontend/src/app/modules/shared/components/toasts/toast-message/toast-message.component.scss b/frontend/src/app/modules/shared/components/toasts/toast-message/toast-message.component.scss index 02f4dd6b62..6c35e0f9c6 100644 --- a/frontend/src/app/modules/shared/components/toasts/toast-message/toast-message.component.scss +++ b/frontend/src/app/modules/shared/components/toasts/toast-message/toast-message.component.scss @@ -41,7 +41,7 @@ } .toast-icon-info { - color: rgb(103, 107, 198); + color: rgb(5 113 203); } .btn-close { diff --git a/frontend/src/app/modules/shared/components/type-select/type-select.component.html b/frontend/src/app/modules/shared/components/type-select/type-select.component.html new file mode 100644 index 0000000000..b4f37b18a9 --- /dev/null +++ b/frontend/src/app/modules/shared/components/type-select/type-select.component.html @@ -0,0 +1,30 @@ + + + + + + + diff --git a/frontend/src/app/modules/shared/components/type-select/type-select.component.spec.ts b/frontend/src/app/modules/shared/components/type-select/type-select.component.spec.ts new file mode 100644 index 0000000000..b89c4971ea --- /dev/null +++ b/frontend/src/app/modules/shared/components/type-select/type-select.component.spec.ts @@ -0,0 +1,55 @@ +/******************************************************************************** + * Copyright (c) 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 + ********************************************************************************/ + +import { FormControl } from '@angular/forms'; +import { Severity } from '@shared/model/severity.model'; +import { SharedModule } from '@shared/shared.module'; +import { screen, waitFor } from '@testing-library/angular'; +import { renderComponent } from '@tests/test-render.utils'; + +describe('SeveritySelectComponent', () => { + const renderSeveritySelect = (selectedValue?: Severity) => { + const formControl = new FormControl(selectedValue); + + return renderComponent(`Test`, { + imports: [ SharedModule ], + componentProperties: { formControl }, + }); + }; + + it('should render selected Minor icon', async () => { + await renderSeveritySelect(Severity.MINOR); + expect(await waitFor(() => screen.getByText('error_outline'))).toBeInTheDocument(); + }); + + it('should render selected Major icon', async () => { + await renderSeveritySelect(Severity.MAJOR); + expect(await waitFor(() => screen.getByText('error'))).toBeInTheDocument(); + }); + + it('should render selected Critical icon', async () => { + await renderSeveritySelect(Severity.CRITICAL); + expect(await waitFor(() => screen.getByText('error_outline'))).toBeInTheDocument(); + }); + + it('should render selected LifeThreatening icon', async () => { + await renderSeveritySelect(Severity.LIFE_THREATENING); + expect(await waitFor(() => screen.getByText('error'))).toBeInTheDocument(); + }); +}); diff --git a/frontend/src/app/modules/shared/components/type-select/type-select.component.ts b/frontend/src/app/modules/shared/components/type-select/type-select.component.ts new file mode 100644 index 0000000000..bfc76d09bf --- /dev/null +++ b/frontend/src/app/modules/shared/components/type-select/type-select.component.ts @@ -0,0 +1,38 @@ +/******************************************************************************** + * Copyright (c) 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 + ********************************************************************************/ + +import { Component, Inject, Injector, Input } from '@angular/core'; +import { BaseInputComponent } from '@shared/abstraction/baseInput/baseInput.component'; +import { SelectOption } from '@shared/components/select/select.component'; +import { NotificationType } from '@shared/model/notification.model'; +import { StaticIdService } from '@shared/service/staticId.service'; + +@Component({ + selector: 'app-type-select', + templateUrl: './type-select.component.html', +}) +export class TypeSelectComponent extends BaseInputComponent { + @Input() translationContext: string; + + public options: SelectOption[] = Object.values(NotificationType).map(value => ({ label: value, value })); + + constructor(@Inject(Injector) injector: Injector, staticIdService: StaticIdService) { + super(injector, staticIdService); + } +} diff --git a/frontend/src/app/modules/shared/components/view-selector/view-selector.component.scss b/frontend/src/app/modules/shared/components/view-selector/view-selector.component.scss index 30481c4bb9..45aadb0d50 100644 --- a/frontend/src/app/modules/shared/components/view-selector/view-selector.component.scss +++ b/frontend/src/app/modules/shared/components/view-selector/view-selector.component.scss @@ -17,7 +17,6 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ .view-selector-container { - padding-bottom: 16px; button.selected { color: rgb(13, 85, 175) !important; diff --git a/frontend/src/app/modules/shared/directives/tabs/tab-as-panel.directive.scss b/frontend/src/app/modules/shared/directives/tabs/tab-as-panel.directive.scss index 68dfa8cd47..fbba10d444 100644 --- a/frontend/src/app/modules/shared/directives/tabs/tab-as-panel.directive.scss +++ b/frontend/src/app/modules/shared/directives/tabs/tab-as-panel.directive.scss @@ -18,7 +18,3 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ - -.app-tab-as-panel .mat-mdc-tab-body-wrapper { - // box-shadow: 0px 5px 5px -3px rgb(0 0 0 / 20%), 0px 8px 10px 1px rgb(0 0 0 / 14%), 0px 3px 14px 2px rgb(0 0 0 / 12%); -} diff --git a/frontend/src/app/modules/shared/helper/filter-helper.ts b/frontend/src/app/modules/shared/helper/filter-helper.ts index 37fe599b5e..41b64b1b85 100644 --- a/frontend/src/app/modules/shared/helper/filter-helper.ts +++ b/frontend/src/app/modules/shared/helper/filter-helper.ts @@ -77,13 +77,40 @@ export function enrichFilterAndGetUpdatedParams(filter: AssetAsBuiltFilter, para params = params.append('filter', `${ key },${ operator },${ filterValues },${ filterOperator }`); } + // has single value + if (isAssetIdsFilter(key)) { + operator = getFilterOperatorValue(FilterOperator.EQUAL); + const keyOverride = "id"; + const filterOperatorOverride = "OR"; + for (let value of filterValues){ + params = params.append('filter', `${ keyOverride },${ operator },${ value },${ filterOperatorOverride }`); + } + } + + if (isExcludeAssetIdsFilter(key)) { + operator = getFilterOperatorValue(FilterOperator.EXCLUDE); + const keyOverride = "id"; + const filterOperatorOverride = "AND"; + for (let value of filterValues){ + params = params.append('filter', `${ keyOverride },${ operator },${ value },${ filterOperatorOverride }`); + } + } + } return params; } +export function isAssetIdsFilter(key: string): boolean { + return 'ids' === key; +} + +export function isExcludeAssetIdsFilter(key: string): boolean { + return 'excludeIds' === key; +} + export function isStartsWithFilter(key: string): boolean { - return !isDateFilter(key) && !isNotificationCountFilter(key); + return !isDateFilter(key) && !isNotificationCountFilter(key) && !isAssetIdsFilter(key) && !isExcludeAssetIdsFilter(key); } export function isNotificationCountFilter(key: string): boolean { @@ -102,7 +129,7 @@ export function isSameDate(startDate: string, endDate: string): boolean { return startDate === endDate; } -export function toAssetFilter(formValues: any, isAsBuilt: boolean): AssetAsPlannedFilter | AssetAsBuiltFilter { +export function toAssetFilter(formValues: any, isAsBuilt: boolean, ids?: string[]): AssetAsPlannedFilter | AssetAsBuiltFilter { const transformedFilter: any = {}; @@ -129,6 +156,10 @@ export function toAssetFilter(formValues: any, isAsBuilt: boolean): AssetAsPlann } } + if (ids){ + transformedFilter['ids'] = ids; + } + const filterIsSet = Object.values(transformedFilter).some(value => value !== undefined && value !== null); if (filterIsSet) { if (isAsBuilt) { @@ -169,6 +200,7 @@ export function toGlobalSearchAssetFilter(formValues: string, isAsBuilt: boolean idShort: formValues, customerPartId: formValues, manufacturerPartId: formValues, + businessPartner: formValues, } as AssetAsBuiltFilter; } else { filter = { @@ -176,6 +208,7 @@ export function toGlobalSearchAssetFilter(formValues: string, isAsBuilt: boolean idShort: formValues, semanticModelId: formValues, manufacturerPartId: formValues, + businessPartner: formValues, } as AssetAsPlannedFilter; } @@ -206,6 +239,6 @@ export function provideFilterListForNotifications(filter?: NotificationDeeplinkF export function containsAtleastOneFilterEntry(filter: AssetAsBuiltFilter | AssetAsPlannedFilter): boolean { return Object.keys(filter) - .filter(key => filter[key].length) + .filter(key => filter[key]?.length) .length > 0; } diff --git a/frontend/src/app/modules/shared/modules/modal/component/modal.component.html b/frontend/src/app/modules/shared/modules/modal/component/modal.component.html index 83659b2dfd..e0e47a0d01 100644 --- a/frontend/src/app/modules/shared/modules/modal/component/modal.component.html +++ b/frontend/src/app/modules/shared/modules/modal/component/modal.component.html @@ -36,6 +36,7 @@

{{ data.title | i18n }}

{{ data.buttonLeft | i18n }} { + + const renderNotificationActionModalComponent = () => { + return renderComponent(NotificationActionModalComponent, { + imports: [ SharedModule ], + providers: [], + componentProperties: {}, + }); + }; + it('should create the component', async () => { + const { fixture } = await renderNotificationActionModalComponent(); + const { componentInstance } = fixture; + expect(componentInstance).toBeTruthy(); + }); + + it('should return ACCEPTED state', async () => { + const { fixture } = await renderNotificationActionModalComponent(); + const { componentInstance } = fixture; + const actual = componentInstance.getModalDataBasedOnNotificationStatus(NotificationStatus.ACCEPTED); + const expected = { + title: 'commonInvestigation.modal.acceptTitle', + buttonRight: 'actions.accept', + successMessage: 'commonInvestigation.modal.successfullyAccepted', + errorMessage: 'commonInvestigation.modal.failedAccept', + reasonHint: 'commonInvestigation.modal.acceptReasonHint', + }; + expect(actual).toEqual(expected); + }); + + it('should return DECLINED state', async () => { + const { fixture } = await renderNotificationActionModalComponent(); + const { componentInstance } = fixture; + const actual = componentInstance.getModalDataBasedOnNotificationStatus(NotificationStatus.DECLINED); + const expected = { + title: 'commonInvestigation.modal.declineTitle', + buttonRight: 'actions.decline', + successMessage: 'commonInvestigation.modal.successfullyDeclined', + errorMessage: 'commonInvestigation.modal.failedDecline', + reasonHint: 'commonInvestigation.modal.declineReasonHint', + }; + expect(actual).toEqual(expected); + }); + + it('should return ACKNOWLEDGED state', async () => { + const { fixture } = await renderNotificationActionModalComponent(); + const { componentInstance } = fixture; + const actual = componentInstance.getModalDataBasedOnNotificationStatus(NotificationStatus.ACKNOWLEDGED); + const expected: NotificationModalData = { + title: 'commonInvestigation.modal.acknowledgeTitle', + buttonRight: 'actions.acknowledge', + successMessage: 'commonInvestigation.modal.successfullyAcknowledged', + errorMessage: 'commonInvestigation.modal.failedAcknowledge', + }; + expect(actual).toEqual(expected); + }); + + it('should return APPROVED state', async () => { + const { fixture } = await renderNotificationActionModalComponent(); + const { componentInstance } = fixture; + const actual = componentInstance.getModalDataBasedOnNotificationStatus(NotificationStatus.APPROVED); + const expected: NotificationModalData = { + title: 'commonInvestigation.modal.approvalTitle', + buttonRight: 'actions.confirm', + successMessage: 'commonInvestigation.modal.successfullyApproved', + errorMessage: 'commonInvestigation.modal.failedApprove', + }; + expect(actual).toEqual(expected); + }); + + it('should return CANCELED state', async () => { + const { fixture } = await renderNotificationActionModalComponent(); + const { componentInstance } = fixture; + const actual = componentInstance.getModalDataBasedOnNotificationStatus(NotificationStatus.CANCELED); + const expected: NotificationModalData = { + title: 'commonInvestigation.modal.cancellationTitle', + buttonRight: 'actions.cancellationConfirm', + successMessage: 'commonInvestigation.modal.successfullyCanceled', + errorMessage: 'commonInvestigation.modal.failedCancel', + }; + expect(actual).toEqual(expected); + }); + + it('should return CLOSED state', async () => { + const { fixture } = await renderNotificationActionModalComponent(); + const { componentInstance } = fixture; + const actual = componentInstance.getModalDataBasedOnNotificationStatus(NotificationStatus.CLOSED); + const expected: NotificationModalData = { + title: 'commonInvestigation.modal.closeTitle', + buttonRight: 'actions.close', + successMessage: 'commonInvestigation.modal.successfullyClosed', + errorMessage: 'commonInvestigation.modal.failedClose', + reasonHint: 'commonInvestigation.modal.closeReasonHint', + }; + expect(actual).toEqual(expected); + }); + + it('should execute show successfully and show text area', async () => { + const { fixture } = await renderNotificationActionModalComponent(); + const { componentInstance } = fixture; + const notification: Notification = { + assetIds: [], + createdBy: '', + type: NotificationType.ALERT, + createdByName: '', + createdDate: undefined, + description: '', + isFromSender: false, + reason: undefined, + sendTo: '', + sendToName: '', + severity: undefined, + status: undefined, + title: '', + id: 'abc', + }; + + componentInstance.show(notification, NotificationStatus.CLOSED); + expect(componentInstance.showTextArea).toBeTrue(); + }); + +}); diff --git a/frontend/src/app/modules/shared/modules/notification/modal/actions/notification-action-modal.component.ts b/frontend/src/app/modules/shared/modules/notification/modal/actions/notification-action-modal.component.ts index e06c0ddb5e..62ae37275a 100644 --- a/frontend/src/app/modules/shared/modules/notification/modal/actions/notification-action-modal.component.ts +++ b/frontend/src/app/modules/shared/modules/notification/modal/actions/notification-action-modal.component.ts @@ -24,7 +24,6 @@ import { UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms import { ToastService } from '@shared/components/toasts/toast.service'; import { getTranslationContext } from '@shared/helper/notification-helper'; import { Notification, NotificationStatus } from '@shared/model/notification.model'; -import { TranslationContext } from '@shared/model/translation-context.model'; import { ModalData } from '@shared/modules/modal/core/modal.model'; import { ModalService } from '@shared/modules/modal/core/modal.service'; import { Observable } from 'rxjs'; @@ -59,7 +58,7 @@ export class NotificationActionModalComponent { buttonRight: 'actions.accept', successMessage: context + '.modal.successfullyAccepted', errorMessage: context + '.modal.failedAccept', - reasonHint: context + '.modal.acceptReasonHint' + reasonHint: context + '.modal.acceptReasonHint', }; } case NotificationStatus.DECLINED: { @@ -70,7 +69,7 @@ export class NotificationActionModalComponent { buttonRight: 'actions.decline', successMessage: context + '.modal.successfullyDeclined', errorMessage: context + '.modal.failedDecline', - reasonHint: context + '.modal.declineReasonHint' + reasonHint: context + '.modal.declineReasonHint', }; } case NotificationStatus.ACKNOWLEDGED: { @@ -104,7 +103,7 @@ export class NotificationActionModalComponent { buttonRight: 'actions.close', successMessage: context + '.modal.successfullyClosed', errorMessage: context + '.modal.failedClose', - reasonHint: context + '.modal.closeReasonHint' + reasonHint: context + '.modal.closeReasonHint', }; } } @@ -115,7 +114,7 @@ export class NotificationActionModalComponent { this.notification = notification; const modalData = this.getModalDataBasedOnNotificationStatus(desiredStatus); - if (this.hasTextArea(desiredStatus)){ + if (this.hasTextArea(desiredStatus)) { this.showTextArea = true; this.textAreaControl.setValidators([ Validators.required, Validators.maxLength(1000), Validators.minLength(15) ]); this.formGroup.reset(); @@ -149,7 +148,7 @@ export class NotificationActionModalComponent { options.notificationId = this.notification.id; options.type = getTranslationContext(this.notification) + '.modal.cancellationConfirmationLabel'; } - if (this.hasTextArea(desiredStatus)){ + if (this.hasTextArea(desiredStatus)) { options.formGroup = this.formGroup; } @@ -158,7 +157,6 @@ export class NotificationActionModalComponent { private hasTextArea(desiredStatus: NotificationStatus) { - console.log(desiredStatus, "desired from textarea"); return desiredStatus === NotificationStatus.CLOSED || desiredStatus === NotificationStatus.ACCEPTED || desiredStatus === NotificationStatus.DECLINED; } } diff --git a/frontend/src/app/modules/shared/modules/notification/notification-tab/notification-tab.component.html b/frontend/src/app/modules/shared/modules/notification/notification-tab/notification-tab.component.html index bd9d7028b4..7d80387836 100644 --- a/frontend/src/app/modules/shared/modules/notification/notification-tab/notification-tab.component.html +++ b/frontend/src/app/modules/shared/modules/notification/notification-tab/notification-tab.component.html @@ -26,17 +26,21 @@ diff --git a/frontend/src/app/modules/shared/modules/notification/notification-tab/notification-tab.component.ts b/frontend/src/app/modules/shared/modules/notification/notification-tab/notification-tab.component.ts index 81d579eb77..a48fcbbe8b 100644 --- a/frontend/src/app/modules/shared/modules/notification/notification-tab/notification-tab.component.ts +++ b/frontend/src/app/modules/shared/modules/notification/notification-tab/notification-tab.component.ts @@ -49,10 +49,15 @@ export class NotificationTabComponent implements AfterViewInit { @Input() multiSortList: TableHeaderSort[] = []; @Input() tableType: TableType; @Input() autocompleteEnabled = false; + @Input() tableSettingsEnabled = false; + @Input() tableHeader = ''; + @Input() tableHeaderMenuEnabled = false; @Output() tableConfigChanged = new EventEmitter(); @Output() notificationsFilterChanged = new EventEmitter(); @Output() selected = new EventEmitter(); + @Output() editNotificationClicked = new EventEmitter(); + @Output() multiSelect = new EventEmitter(); @ViewChild('titleTmp') titleTemplate: TemplateRef; @ViewChild('statusTmp') statusTemplate: TemplateRef; @ViewChild('severityTmp') severityTemplate: TemplateRef; @@ -113,9 +118,17 @@ export class NotificationTabComponent implements AfterViewInit { this.selected.emit(notification as unknown as Notification); } + public openEditNotification(notification: Record): void { + this.editNotificationClicked.emit(notification as unknown as Notification); + } + public onTableConfigChange(tableEventConfig: TableEventConfig): void { this.tableConfigChanged.emit(tableEventConfig); } + public emitMultiSelect(selected: Notification[]) { + this.multiSelect.emit(selected); + } + protected readonly NotificationType = NotificationType; } diff --git a/frontend/src/app/modules/shared/modules/notification/presentation/notification.component.html b/frontend/src/app/modules/shared/modules/notification/presentation/notification.component.html index 81f7442ef1..5bd3ec0f7e 100644 --- a/frontend/src/app/modules/shared/modules/notification/presentation/notification.component.html +++ b/frontend/src/app/modules/shared/modules/notification/presentation/notification.component.html @@ -35,6 +35,8 @@ @@ -57,19 +62,22 @@ {{ translationContext + '.tabs.received' | i18n }} diff --git a/frontend/src/app/modules/shared/modules/notification/presentation/notification.component.spec.ts b/frontend/src/app/modules/shared/modules/notification/presentation/notification.component.spec.ts index 57d472b59a..aa0b010b26 100644 --- a/frontend/src/app/modules/shared/modules/notification/presentation/notification.component.spec.ts +++ b/frontend/src/app/modules/shared/modules/notification/presentation/notification.component.spec.ts @@ -88,7 +88,7 @@ describe('NotificationsInboxComponent', () => { [queuedAndRequestedNotifications$]='queuedAndRequestedNotifications$' [receivedNotifications$]='receivedNotifications$' [translationContext]="'commonAlert'" - [menuActionsConfig]="'menuActionsConfig'" + [menuActionsConfig]="[]" [receivedOptionalColumns]="['severity', 'createdBy', 'createdByName', 'targetDate']" [receivedSortableColumns]="{description: true, title: true, status: true, createdDate: true, severity: true, createdBy: true, createdByName: true, targetDate: true, menu: false}" [queuedAndRequestedOptionalColumns]="['severity', 'sendTo', 'sendToName', 'targetDate']" @@ -121,7 +121,6 @@ describe('NotificationsInboxComponent', () => { const descriptionEl = await screen.findByText('Investigation No 1'); const row = descriptionEl.closest('tr'); - debugger; expect(within(row).getByText('commonAlert.status.CREATED')).toBeInTheDocument(); }); diff --git a/frontend/src/app/modules/shared/modules/notification/presentation/notification.component.ts b/frontend/src/app/modules/shared/modules/notification/presentation/notification.component.ts index bf87c7a2fc..6692b30f1f 100644 --- a/frontend/src/app/modules/shared/modules/notification/presentation/notification.component.ts +++ b/frontend/src/app/modules/shared/modules/notification/presentation/notification.component.ts @@ -26,7 +26,7 @@ import { MenuActionConfig, TableEventConfig, TableHeaderSort } from '@shared/com import { Notification, Notifications } from '@shared/model/notification.model'; import { View } from '@shared/model/view.model'; import { StaticIdService } from '@shared/service/staticId.service'; -import { Observable } from 'rxjs'; +import { BehaviorSubject, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; @Component({ @@ -47,12 +47,14 @@ export class NotificationComponent { @Output() onReceivedTableConfigChanged = new EventEmitter(); @Output() onQueuedAndRequestedTableConfigChanged = new EventEmitter(); @Output() selected = new EventEmitter(); + @Output() editNotificationClicked = new EventEmitter(); @Output() notificationsFilterChanged = new EventEmitter(); public readonly tabIndex$ = this.route.queryParams.pipe(map(params => parseInt(params.tabIndex, 10) || 0)); public readonly receivedTabLabelId = this.staticIdService.generateId('Notification.receivedTab'); public readonly queuedAndRequestedTabLabelId = this.staticIdService.generateId('Notification.queuedAndRequestedTab'); + public readonly currentSelectedItems$ = new BehaviorSubject([]); constructor( private readonly router: Router, diff --git a/frontend/src/app/modules/shared/modules/part-details/core/partDetails.facade.ts b/frontend/src/app/modules/shared/modules/part-details/core/partDetails.facade.ts index 50587d9690..c78c66392f 100644 --- a/frontend/src/app/modules/shared/modules/part-details/core/partDetails.facade.ts +++ b/frontend/src/app/modules/shared/modules/part-details/core/partDetails.facade.ts @@ -36,13 +36,14 @@ export class PartDetailsFacade { ) { } - public setPartById(urn: string) { - if(!urn || typeof urn !== 'string') { + public setPartById(urn: string, isAsBuilt?: boolean) { + if (!urn || typeof urn !== 'string') { return; } - this.partsService.getPart(urn).subscribe(part => { - this.partDetailsState.selectedPart = { data: part} - }) + this.partsService.getPartDetailOfIds([ urn ], isAsBuilt).subscribe(parts => { + this.partDetailsState.selectedPart = { data: parts[0] }; + }); + } public get selectedPart$(): Observable> { diff --git a/frontend/src/app/modules/shared/modules/part-details/presentation/start-investigation/start-investigation.component.html b/frontend/src/app/modules/shared/modules/part-details/presentation/start-investigation/start-investigation.component.html index 93af4a4330..f71f4574ec 100644 --- a/frontend/src/app/modules/shared/modules/part-details/presentation/start-investigation/start-investigation.component.html +++ b/frontend/src/app/modules/shared/modules/part-details/presentation/start-investigation/start-investigation.component.html @@ -23,23 +23,13 @@

{{ 'partDetail.invest
- - -
- no_sim -

{{ 'partDetail.investigation.noSelection.header' | i18n }}

-

{{ 'partDetail.investigation.noSelection.text' | i18n }}

-
+ + Create Investigation +
diff --git a/frontend/src/app/modules/shared/modules/part-details/presentation/start-investigation/start-investigation.component.spec.ts b/frontend/src/app/modules/shared/modules/part-details/presentation/start-investigation/start-investigation.component.spec.ts index fcf221ba4f..2bef775683 100644 --- a/frontend/src/app/modules/shared/modules/part-details/presentation/start-investigation/start-investigation.component.spec.ts +++ b/frontend/src/app/modules/shared/modules/part-details/presentation/start-investigation/start-investigation.component.spec.ts @@ -20,14 +20,12 @@ ********************************************************************************/ import { LayoutModule } from '@layout/layout.module'; -import { OtherPartsModule } from '@page/other-parts/other-parts.module'; import { MainAspectType } from '@page/parts/model/mainAspectType.enum'; import { PartsModule } from '@page/parts/parts.module'; import { PartsAssembler } from '@shared/assembler/parts.assembler'; import { StaticIdService } from '@shared/service/staticId.service'; import { fireEvent, screen, waitFor } from '@testing-library/angular'; import { getTableCheckbox, renderComponent } from '@tests/test-render.utils'; -import { sleepForTests } from '../../../../../../../test'; import { MOCK_part_1, MOCK_part_2, @@ -41,7 +39,7 @@ describe('StartInvestigationComponent', () => { const renderStartInvestigation = async () => { const { fixture } = await renderComponent(StartInvestigationComponent, { declarations: [ StartInvestigationComponent ], - imports: [ PartsModule, OtherPartsModule, LayoutModule ], + imports: [ PartsModule, LayoutModule ], providers: [ StaticIdService ], }); @@ -55,33 +53,13 @@ describe('StartInvestigationComponent', () => { await renderStartInvestigation(); expect(await screen.findByText('partDetail.investigation.headline')).toBeInTheDocument(); - expect(await screen.findByText('partDetail.investigation.noSelection.header')).toBeInTheDocument(); }); it('should render request investigation on selection', async () => { await renderStartInvestigation(); fireEvent.click(await getTableCheckbox(screen, 0)); - - await sleepForTests(2000); - expect(await waitFor(() => screen.getByText('requestNotification.partDescription'))).toBeInTheDocument(); }); - /* - it('should render selected items and remove them again', async function() { - await renderStartInvestigation(); - - fireEvent.click(await getTableCheckbox(screen, 0)); - const matChipElement = await waitFor(() => screen.getByTestId('mat-chip--' + PartsAssembler.assemblePart(MOCK_part_2).name)); - expect(matChipElement).toBeInTheDocument(); - fireEvent.click(matChipElement.lastElementChild.firstChild); - const historyElement = await waitFor(() => screen.getByTestId('mat-chip-history--' + PartsAssembler.assemblePart(MOCK_part_2).name)); - expect(historyElement).toBeInTheDocument(); - fireEvent.click(historyElement); - - const restoredElement = await waitFor(() => screen.getByTestId('mat-chip--' + PartsAssembler.assemblePart(MOCK_part_2).name)); - expect(restoredElement).toBeInTheDocument(); - }); - */ it('should sort table data', async () => { const fixture = await renderStartInvestigation(); const spy = spyOn((fixture.componentInstance as any).childPartsState, 'update').and.callThrough(); diff --git a/frontend/src/app/modules/shared/modules/part-details/presentation/start-investigation/start-investigation.component.ts b/frontend/src/app/modules/shared/modules/part-details/presentation/start-investigation/start-investigation.component.ts index 48f5e460e7..a17172371f 100644 --- a/frontend/src/app/modules/shared/modules/part-details/presentation/start-investigation/start-investigation.component.ts +++ b/frontend/src/app/modules/shared/modules/part-details/presentation/start-investigation/start-investigation.component.ts @@ -20,14 +20,16 @@ ********************************************************************************/ import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { Router } from '@angular/router'; +import { SharedPartService } from '@page/notifications/detail/edit/shared-part.service'; import { Part } from '@page/parts/model/parts.model'; import { CreateHeaderFromColumns, TableConfig, TableEventConfig } from '@shared/components/table/table.model'; +import { NotificationType } from '@shared/model/notification.model'; import { State } from '@shared/model/state'; import { View } from '@shared/model/view.model'; import { PartDetailsFacade } from '@shared/modules/part-details/core/partDetails.facade'; import { StaticIdService } from '@shared/service/staticId.service'; import { Observable, Subject, Subscription } from 'rxjs'; -import {NotificationType} from "@shared/model/notification.model"; @Component({ selector: 'app-start-investigation', @@ -73,6 +75,8 @@ export class StartInvestigationComponent { constructor( private readonly partDetailsFacade: PartDetailsFacade, private readonly staticIdService: StaticIdService, + private sharedPartService: SharedPartService, + private readonly router: Router, ) { this.childParts$ = this.childPartsState.observable; this.selectedChildParts$ = this.selectedChildPartsState.observable; @@ -91,20 +95,6 @@ export class StartInvestigationComponent { }; } - public removeChildPartFromSelection(part: Part): void { - this.selectedChildPartsState.update([ ...this.selectedChildPartsState.snapshot.filter(c => c.id !== part.id) ]); - this.deselectPartTrigger$.next([ part ]); - } - - public addChildPartToSelection(part: Part): void { - this.selectedChildPartsState.update([ ...this.selectedChildPartsState.snapshot, part ]); - this.addPartTrigger$.next(part); - } - - public clearSelectedChildParts(): void { - this.selectedChildPartsState.reset(); - } - public onMultiSelect(parts: unknown[]): void { this.selectedChildPartsState.update(parts as Part[]); } @@ -116,5 +106,10 @@ export class StartInvestigationComponent { this.childPartsState.update({ data }); } + navigateToNotificationCreationView() { + this.sharedPartService.affectedParts = this.childPartsState.snapshot.data; + this.router.navigate([ 'inbox/create' ], { queryParams: { initialType: NotificationType.INVESTIGATION } }); + } + protected readonly NotificationType = NotificationType; } diff --git a/frontend/src/app/modules/shared/modules/relations/presentation/part-relation.component.html b/frontend/src/app/modules/shared/modules/relations/presentation/part-relation.component.html index 752b713c32..6f7ccb25b6 100644 --- a/frontend/src/app/modules/shared/modules/relations/presentation/part-relation.component.html +++ b/frontend/src/app/modules/shared/modules/relations/presentation/part-relation.component.html @@ -27,6 +27,7 @@
+ getErrorMapping('required') ], [ 'url', _ => getErrorMapping('url') ], [ 'bpn', _ => getErrorMapping('bpn') ], + [ 'invalidBpn', _ => getErrorMapping('invalidBpn' ) ], [ 'email', _ => getErrorMapping('email') ], [ 'generic', _ => getErrorMapping('generic') ], ]); diff --git a/frontend/src/app/modules/shared/pipes/format-pagination-semantic-data-model-to-camelcase.pipe.ts b/frontend/src/app/modules/shared/pipes/format-pagination-semantic-data-model-to-camelcase.pipe.ts index 079f805c9e..41443a2959 100644 --- a/frontend/src/app/modules/shared/pipes/format-pagination-semantic-data-model-to-camelcase.pipe.ts +++ b/frontend/src/app/modules/shared/pipes/format-pagination-semantic-data-model-to-camelcase.pipe.ts @@ -28,7 +28,6 @@ export class FormatPaginationSemanticDataModelToCamelCasePipe implements PipeTra transform(value: Pagination): Pagination { const transformedContent = value.content.map(part => { switch (part.semanticDataModel.toString().toLowerCase()) { - case 'batch': { part.semanticDataModel = SemanticDataModelInCamelCase.BATCH; break; @@ -49,7 +48,6 @@ export class FormatPaginationSemanticDataModelToCamelCasePipe implements PipeTra part.semanticDataModel = SemanticDataModelInCamelCase.UNKNOWN; break; } - } return { ...part, diff --git a/frontend/src/app/modules/shared/pipes/format-partlist-semantic-data-model-to-camelcase.pipe.ts b/frontend/src/app/modules/shared/pipes/format-partlist-semantic-data-model-to-camelcase.pipe.ts index dc68fe2bd9..e1f67986ba 100644 --- a/frontend/src/app/modules/shared/pipes/format-partlist-semantic-data-model-to-camelcase.pipe.ts +++ b/frontend/src/app/modules/shared/pipes/format-partlist-semantic-data-model-to-camelcase.pipe.ts @@ -45,6 +45,14 @@ export class FormatPartlistSemanticDataModelToCamelCasePipe implements PipeTrans part.semanticDataModel = SemanticDataModelInCamelCase.JUSTINSEQUENCE; break; } + case 'tombstoneasbuilt': { + part.semanticDataModel = SemanticDataModelInCamelCase.TOMBSTONEASBUILT; + break; + } + case 'tombstoneasplanned': { + part.semanticDataModel = SemanticDataModelInCamelCase.TOMBSTONEASPLANNED; + break; + } default: { part.semanticDataModel = SemanticDataModelInCamelCase.UNKNOWN; break; diff --git a/frontend/src/app/modules/shared/service/bom-lifecycle-settings.service.spec.ts b/frontend/src/app/modules/shared/service/bom-lifecycle-settings.service.spec.ts index ad0ccddc4e..92b048b9fc 100644 --- a/frontend/src/app/modules/shared/service/bom-lifecycle-settings.service.spec.ts +++ b/frontend/src/app/modules/shared/service/bom-lifecycle-settings.service.spec.ts @@ -18,7 +18,7 @@ ********************************************************************************/ import { TestBed } from '@angular/core/testing'; -import { BomLifecycleSettingsService, UserSettingView } from '@shared/service/bom-lifecycle-settings.service'; +import { BomLifecycleSettingsService } from '@shared/service/bom-lifecycle-settings.service'; describe('BomLifecycleConfigUserSetting', () => { @@ -30,8 +30,7 @@ describe('BomLifecycleConfigUserSetting', () => { }); afterEach(() => { - service.clearUserSettings(UserSettingView.PARTS); - service.clearUserSettings(UserSettingView.OTHER_PARTS); + service.clearUserSettings(); }); it('should be created', () => { @@ -39,42 +38,34 @@ describe('BomLifecycleConfigUserSetting', () => { }); it('should return default settings when no settings are stored for PARTS', () => { - const defaultSettings = service.getUserSettings(UserSettingView.PARTS); + const defaultSettings = service.getUserSettings(); expect(defaultSettings).toEqual({ - asBuiltActive: true, - asPlannedActive: true, - }); - }); - - it('should return default settings when no settings are stored for OTHER_PARTS', () => { - const defaultSettings = service.getUserSettings(UserSettingView.OTHER_PARTS); - expect(defaultSettings).toEqual({ - asBuiltActive: true, - asPlannedActive: true, + asBuiltSize: 50, + asPlannedSize: 50, }); }); it('should store and retrieve user settings', () => { const newSettings = { - asBuiltActive: false, - asPlannedActive: true, + asBuiltSize: 0, + asPlannedSize: 100, }; - service.setUserSettings(newSettings, UserSettingView.PARTS); - const retrievedSettings = service.getUserSettings(UserSettingView.PARTS); + service.setUserSettings(newSettings); + const retrievedSettings = service.getUserSettings(); expect(retrievedSettings).toEqual(newSettings); }); it('should clear user settings', () => { const newSettings = { - asBuiltActive: false, - asPlannedActive: true, + asBuiltSize: 0, + asPlannedSize: 100, }; - service.setUserSettings(newSettings, UserSettingView.PARTS); - service.clearUserSettings(UserSettingView.PARTS); - const retrievedSettings = service.getUserSettings(UserSettingView.PARTS); + service.setUserSettings(newSettings); + service.clearUserSettings(); + const retrievedSettings = service.getUserSettings(); expect(retrievedSettings).toEqual({ - asBuiltActive: true, - asPlannedActive: true, + asBuiltSize: 50, + asPlannedSize: 50, }); }); diff --git a/frontend/src/app/modules/shared/service/bom-lifecycle-settings.service.ts b/frontend/src/app/modules/shared/service/bom-lifecycle-settings.service.ts index 1447421c9b..99f514739c 100644 --- a/frontend/src/app/modules/shared/service/bom-lifecycle-settings.service.ts +++ b/frontend/src/app/modules/shared/service/bom-lifecycle-settings.service.ts @@ -18,61 +18,31 @@ ********************************************************************************/ import { Injectable } from '@angular/core'; -import { - BomLifecycleConfig, - BomLifecycleSize, -} from '@shared/components/bom-lifecycle-activator/bom-lifecycle-activator.model'; +import { BomLifecycleSize } from '@shared/components/bom-lifecycle-activator/bom-lifecycle-activator.model'; @Injectable({ providedIn: 'root', }) export class BomLifecycleSettingsService { - private readonly DEFAULT: BomLifecycleConfig = { - asBuiltActive: true, - asPlannedActive: true, + private readonly DEFAULT: BomLifecycleSize = { + asBuiltSize: 50, + asPlannedSize: 50, }; + private PART_TABLE_KEY = 'PART'; - getUserSettings(userSettingView: UserSettingView): BomLifecycleConfig { - const settingsJson = localStorage.getItem(userSettingView.toString()); + getUserSettings(): BomLifecycleSize { + const settingsJson = localStorage.getItem(this.PART_TABLE_KEY); if (settingsJson) { return JSON.parse(settingsJson); } return this.DEFAULT; }; - getSize(userSettingView: UserSettingView): BomLifecycleSize { - let size: BomLifecycleSize; - const userSettings: BomLifecycleConfig = this.getUserSettings(userSettingView); - - - if (userSettings.asPlannedActive && userSettings.asBuiltActive) { - size = { - asBuiltSize: 50, - asPlannedSize: 50, - }; - } else if (userSettings.asPlannedActive) { - size = { - asBuiltSize: 0, - asPlannedSize: 100, - }; - } else if (userSettings.asBuiltActive) { - size = { - asBuiltSize: 100, - asPlannedSize: 0, - }; - } - return size; + setUserSettings(settings: BomLifecycleSize): void { + localStorage.setItem(this.PART_TABLE_KEY, JSON.stringify(settings)); } - setUserSettings(settings: BomLifecycleConfig, userSettingView: UserSettingView): void { - localStorage.setItem(userSettingView.toString(), JSON.stringify(settings)); + clearUserSettings(): void { + localStorage.removeItem(this.PART_TABLE_KEY); } - - clearUserSettings(userSettingView: UserSettingView): void { - localStorage.removeItem(userSettingView.toString()); - } -} - -export enum UserSettingView { - PARTS = 'parts', OTHER_PARTS = 'other_parts' } diff --git a/frontend/src/app/modules/shared/service/notification.service.spec.ts b/frontend/src/app/modules/shared/service/notification.service.spec.ts index 35aa48109e..73afe30ada 100644 --- a/frontend/src/app/modules/shared/service/notification.service.spec.ts +++ b/frontend/src/app/modules/shared/service/notification.service.spec.ts @@ -22,6 +22,7 @@ import { ApiService } from '@core/api/api.service'; import { AuthService } from '@core/auth/auth.service'; import { NotificationChannel } from '@shared/components/multi-select-autocomplete/table-type.model'; import { NotificationStatus } from '@shared/model/notification.model'; +import { Severity } from '@shared/model/severity.model'; import { NotificationService } from '@shared/service/notification.service'; import { KeycloakService } from 'keycloak-angular'; @@ -95,6 +96,25 @@ describe('NotificationService', () => { req.flush({}); }); + it('should update a notification by input', () => { + const notificationId = '123'; + const title = 'title'; + const bpn = 'BPN'; + const severity = Severity.CRITICAL; + const targetDate = null; + const description = 'desc'; + const affectedPartIds = ['abc', 'def']; + + spyOn(authService, 'getBearerToken').and.returnValue('testtoken'); + + service.editNotification(notificationId, title, bpn, severity, targetDate, description, affectedPartIds).subscribe(); + + const req = httpTestingController.expectOne(`${ service.notificationUrl() }/${ notificationId }/edit`); + expect(req.request.method).toBe('PUT'); + expect(req.request.body).toEqual('{"title":"title","receiverBpn":"BPN","severity":"CRITICAL","targetDate":null,"description":"desc","affectedPartIds":["abc","def"]}'); + req.flush({}); + }); + it('should get distinct filter values', () => { const channel: NotificationChannel = NotificationChannel.SENDER; const fieldNames = 'SomeField'; diff --git a/frontend/src/app/modules/shared/service/notification.service.ts b/frontend/src/app/modules/shared/service/notification.service.ts index bc3f312a57..da78b9575f 100644 --- a/frontend/src/app/modules/shared/service/notification.service.ts +++ b/frontend/src/app/modules/shared/service/notification.service.ts @@ -23,6 +23,7 @@ import { ApiService } from '@core/api/api.service'; import { environment } from '@env'; import { NotificationAssembler } from '@shared/assembler/notification.assembler'; import { PartsAssembler } from '@shared/assembler/parts.assembler'; +import { DateTimeString } from '@shared/components/dateTime/dateTime.component'; import { NotificationChannel } from '@shared/components/multi-select-autocomplete/table-type.model'; import { TableHeaderSort } from '@shared/components/table/table.model'; import { provideFilterListForNotifications } from '@shared/helper/filter-helper'; @@ -78,8 +79,11 @@ export class NotificationService { .pipe(map(notification => NotificationAssembler.assembleNotification(notification))); } - public createNotification(partIds: string[], description: string, severity: Severity, bpn: string, isAsBuilt: boolean, type: string, title: string): Observable { - const body = { partIds, description, severity, receiverBpn: bpn, isAsBuilt, type, title }; + public createNotification(affectedPartIds: string[], description: string, severity: Severity, bpn: string, type: string, title: string, dateString: DateTimeString, + ): Observable { + const targetDate = null === dateString ? null : new Date(dateString).toISOString(); + const upperCaseType = type ? type.toUpperCase() : null; + const body = { affectedPartIds, description, severity, receiverBpn: bpn, type: upperCaseType, title: title === "" ? null: title, targetDate }; return this.apiService.post(`${ this.url }/notifications`, body).pipe(map(({ id }) => id)); } @@ -111,6 +115,16 @@ export class NotificationService { return this.apiService.post(`${ requestUrl }/${ id }/update`, body); } + public editNotification(notificationId: string, title: string, receiverBpn: string, severity: string, targetDate: string, description: string, affectedPartIds: string[]): Observable { + const requestUrl = this.notificationUrl(); + if(targetDate) { + targetDate = new Date(targetDate).toISOString(); + } + const body = { title: title === "" ? null: title, receiverBpn: receiverBpn, severity, targetDate, description, affectedPartIds: affectedPartIds }; + return this.apiService.put(`${ requestUrl }/${ notificationId }/edit`, body); + } + + public getDistinctFilterValues(channel: NotificationChannel, fieldNames: string, startsWith: string) { const mappedFieldName = PartsAssembler.mapFieldNameToApi(fieldNames); const requestUrl = this.notificationUrl(); diff --git a/frontend/src/app/modules/shared/service/parts.service.spec.ts b/frontend/src/app/modules/shared/service/parts.service.spec.ts index 4842167123..e30d400a7f 100644 --- a/frontend/src/app/modules/shared/service/parts.service.spec.ts +++ b/frontend/src/app/modules/shared/service/parts.service.spec.ts @@ -172,4 +172,49 @@ describe('PartsService', () => { httpMock.verify(); }); + + it('should request partDetails of as built Id', () => { + + spyOn(authService, 'getBearerToken').and.returnValue('your_mocked_token'); + + const asBuiltId = 'MOCK_part_1'; + + service.getPartDetailOfIds([ asBuiltId ], true).subscribe((parts) => { + console.warn(parts); + expect(parts).toBeTruthy(); + }); + + const expectedUrl = `${ environment.apiUrl }/assets/as-built/detail-information`; + + const req = httpMock.expectOne((request) => { + return request.url === expectedUrl && request.method === 'POST'; + }); + + req.flush(mockAssets.content.filter(part => part.id === asBuiltId)); + + httpMock.verify(); + }); + + it('should request partDetails of as built Id', () => { + + spyOn(authService, 'getBearerToken').and.returnValue('your_mocked_token'); + + const asPlannedId = 'urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa01'; + + service.getPartDetailOfIds([ asPlannedId ], false).subscribe((parts) => { + expect(parts).toBeTruthy(); + }); + + const expectedUrl = `${ environment.apiUrl }/assets/as-planned/detail-information`; + + const req = httpMock.expectOne((request) => { + return request.url === expectedUrl && request.method === 'POST'; + }); + + req.flush(mockAssets.content.filter(part => part.id === asPlannedId)); + + httpMock.verify(); + }); + + }); diff --git a/frontend/src/app/modules/shared/service/parts.service.ts b/frontend/src/app/modules/shared/service/parts.service.ts index a7a60a13e3..a0e347f26d 100644 --- a/frontend/src/app/modules/shared/service/parts.service.ts +++ b/frontend/src/app/modules/shared/service/parts.service.ts @@ -25,7 +25,6 @@ import { ApiService } from '@core/api/api.service'; import { Pagination } from '@core/model/pagination.model'; import { environment } from '@env'; import { MainAspectType } from '@page/parts/model/mainAspectType.enum'; -import { Owner } from '@page/parts/model/owner.enum'; import { AssetAsBuiltFilter, AssetAsPlannedFilter, @@ -55,8 +54,8 @@ export class PartsService { let params = new HttpParams() .set('page', page) - .set('size', pageSize) - .set('filter', 'owner,EQUAL,OWN,AND'); + .set('size', pageSize); + sort.forEach(sortingItem => { params = params.append('sort', sortingItem); }); @@ -76,8 +75,7 @@ export class PartsService { let filterOperator = isOrSearch ? 'OR' : 'AND'; let params = new HttpParams() .set('page', page) - .set('size', pageSize) - .set('filter', 'owner,EQUAL,OWN,AND'); + .set('size', pageSize); sort.forEach(sortingItem => { params = params.append('sort', sortingItem); @@ -93,7 +91,7 @@ export class PartsService { } public getPart(id: string): Observable { - if(!id || typeof id !== 'string') { + if (!id || typeof id !== 'string') { throw new Error('invalid ID'); } @@ -101,49 +99,61 @@ export class PartsService { const resultsAsBuilt = this.apiService.get(`${ this.url }/assets/as-built/${ encodedId }`).pipe( map(part => PartsAssembler.assemblePart(part, MainAspectType.AS_BUILT)), - catchError(() => of(null)) + catchError(() => of(null)), ); const resultsAsPlanned = this.apiService.get(`${ this.url }/assets/as-planned/${ encodedId }`).pipe( map(part => PartsAssembler.assemblePart(part, MainAspectType.AS_PLANNED)), - catchError(() => of(null)) + catchError(() => of(null)), ); // Combine both observables and filter out null values from the array - return forkJoin([resultsAsBuilt, resultsAsPlanned]).pipe( - filter(([partAsBuilt, partAsPlanned]) => partAsBuilt !== null || partAsPlanned !== null), - map(([partAsBuilt, partAsPlanned]) => partAsBuilt || partAsPlanned) + return forkJoin([ resultsAsBuilt, resultsAsPlanned ]).pipe( + filter(([ partAsBuilt, partAsPlanned ]) => partAsBuilt !== null || partAsPlanned !== null), + map(([ partAsBuilt, partAsPlanned ]) => partAsBuilt || partAsPlanned), ); } - public getPartDetailOfIds(assetIds: string[]): Observable { + public getPartDetailOfIds(assetIds: string[], isAsBuilt?: boolean): Observable { - let resultsAsBuilt = this.apiService - .post(`${ this.url }/assets/as-built/detail-information`, { assetIds }) - .pipe(map(parts => PartsAssembler.assemblePartList(parts, MainAspectType.AS_BUILT))); + if (isAsBuilt !== undefined) { + if (isAsBuilt) { + return this.apiService + .post(`${ this.url }/assets/as-built/detail-information`, { assetIds }) + .pipe(map(parts => PartsAssembler.assemblePartList(parts, MainAspectType.AS_BUILT))); + } else { + return this.apiService + .post(`${ this.url }/assets/as-planned/detail-information`, { assetIds }) + .pipe(map(parts => PartsAssembler.assemblePartList(parts, MainAspectType.AS_PLANNED))); + } - let resultsAsPlanned = this.apiService - .post(`${ this.url }/assets/as-planned/detail-information`, { assetIds }) - .pipe(map(parts => PartsAssembler.assemblePartList(parts, MainAspectType.AS_PLANNED))); + } else { + let resultsAsBuilt = this.apiService + .post(`${ this.url }/assets/as-built/detail-information`, { assetIds }) + .pipe(map(parts => PartsAssembler.assemblePartList(parts, MainAspectType.AS_BUILT))); - if (resultsAsBuilt) { - return resultsAsBuilt; - } + let resultsAsPlanned = this.apiService + .post(`${ this.url }/assets/as-planned/detail-information`, { assetIds }) + .pipe(map(parts => PartsAssembler.assemblePartList(parts, MainAspectType.AS_PLANNED))); - if (resultsAsPlanned) { - return resultsAsPlanned; + if (resultsAsBuilt) { + return resultsAsBuilt; + } + + if (resultsAsPlanned) { + return resultsAsPlanned; + } } } - public getDistinctFilterValues(isAsBuilt: boolean, owner: Owner, fieldNames: string, startsWith: string) { + public getDistinctFilterValues(isAsBuilt: boolean, fieldNames: string, startsWith: string, inAssetIds?: string[]) { const mappedFieldName = PartsAssembler.mapFieldNameToApi(fieldNames); let params = new HttpParams() .set('fieldName', mappedFieldName) .set('startWith', startsWith) .set('size', 200) - .set('owner', owner); - + .set('inAssetIds', inAssetIds ? inAssetIds.join(',') : ''); if (isAsBuilt) { return this.apiService diff --git a/frontend/src/app/modules/shared/shared.module.ts b/frontend/src/app/modules/shared/shared.module.ts index f57bbd526e..f68ed2e791 100644 --- a/frontend/src/app/modules/shared/shared.module.ts +++ b/frontend/src/app/modules/shared/shared.module.ts @@ -24,7 +24,6 @@ import { NgModule } from '@angular/core'; import { MatPaginatorIntl } from '@angular/material/paginator'; import { RouterModule } from '@angular/router'; import { AssetPublisherComponent } from '@shared/components/asset-publisher/asset-publisher.component'; -import { BomLifecycleActivatorComponent } from '@shared/components/bom-lifecycle-activator/bom-lifecycle-activator.component'; import { CardMetricComponent } from '@shared/components/card-metric/card-metric.component'; import { ChipComponent } from '@shared/components/chip/chip.component'; import { CountryFlagGeneratorComponent } from '@shared/components/country-flag-generator/country-flag-generator.component'; @@ -34,12 +33,15 @@ import { InputComponent } from '@shared/components/input/input.component'; import { MultiSelectAutocompleteComponent } from '@shared/components/multi-select-autocomplete/multi-select-autocomplete.component'; import { NotificationOverviewComponent } from '@shared/components/notification-overview/notification-overview.component'; import { NotificationReasonComponent } from '@shared/components/notification-reason/notification-reason.component'; +import { NotificationTypeComponent } from '@shared/components/notification-type/notification-type.component'; import { PartsTableComponent } from '@shared/components/parts-table/parts-table.component'; -import { RequestNotificationComponent } from '@shared/components/request-notification'; +import { QuickFilterComponent } from '@shared/components/quick-filter/quick-filter.component'; +import { RequestNotificationNewComponent } from '@shared/components/request-notification-new'; import { SeveritySelectComponent } from '@shared/components/severity-select/severity-select.component'; import { SeverityComponent } from '@shared/components/severity/severity.component'; import { TableSettingsComponent } from '@shared/components/table-settings/table-settings.component'; import { TextWithIconComponent } from '@shared/components/text-with-icon/text-with-icon.component'; +import { TypeSelectComponent } from '@shared/components/type-select/type-select.component'; import { ViewSelectorComponent } from '@shared/components/view-selector/view-selector.component'; import { NotificationModalContentComponent } from '@shared/modules/notification/modal/content/notification-modal-content.component'; import { AbbreviateNumberPipe } from '@shared/pipes/abbreviate-number.pipe'; @@ -86,6 +88,7 @@ import { TemplateModule } from './template.module'; TextWithIconComponent, TableComponent, TooltipDirective, + NotificationTypeComponent, RoleDirective, I18nPipe, AutoFormatPipe, @@ -106,7 +109,7 @@ import { TemplateModule } from './template.module'; SidenavWrapperComponent, TextareaComponent, ErrorMessagePipe, - RequestNotificationComponent, + RequestNotificationNewComponent, QualityTypeComponent, ValueToLablePipe, NotificationOverviewComponent, @@ -117,8 +120,9 @@ import { TemplateModule } from './template.module'; FormErrorMessageComponent, SeverityComponent, SeveritySelectComponent, + TypeSelectComponent, InputComponent, - BomLifecycleActivatorComponent, + QuickFilterComponent, ViewSelectorComponent, MultiSelectAutocompleteComponent, CountryFlagGeneratorComponent, @@ -126,7 +130,7 @@ import { TemplateModule } from './template.module'; AbbreviateNumberPipe, CardMetricComponent, AssetPublisherComponent, - ChipComponent + ChipComponent, ], imports: [ TemplateModule, RouterModule, I18NextModule ], exports: [ @@ -142,6 +146,7 @@ import { TemplateModule } from './template.module'; AutoFormatPipe, ViewContainerDirective, AvatarComponent, + NotificationTypeComponent, I18NextModule, LanguageSelectorComponent, CardIconComponent, @@ -153,7 +158,7 @@ import { TemplateModule } from './template.module'; SidenavWrapperComponent, TextareaComponent, ErrorMessagePipe, - RequestNotificationComponent, + RequestNotificationNewComponent, QualityTypeComponent, NotificationOverviewComponent, NotificationReasonComponent, @@ -162,12 +167,13 @@ import { TemplateModule } from './template.module'; BaseInputComponent, SeverityComponent, SeveritySelectComponent, + TypeSelectComponent, InputComponent, FormatPaginationSemanticDataModelToCamelCasePipe, FlattenObjectPipe, FormatPartSemanticDataModelToCamelCasePipe, FormatPartlistSemanticDataModelToCamelCasePipe, - BomLifecycleActivatorComponent, + QuickFilterComponent, ViewSelectorComponent, PartsTableComponent, MultiSelectAutocompleteComponent, @@ -175,7 +181,7 @@ import { TemplateModule } from './template.module'; AbbreviateNumberPipe, CardMetricComponent, AssetPublisherComponent, - ChipComponent + ChipComponent, ], providers: [ FormatDatePipe, diff --git a/frontend/src/assets/locales/de/common.json b/frontend/src/assets/locales/de/common.json index 9f9eb9088d..4916cb9200 100644 --- a/frontend/src/assets/locales/de/common.json +++ b/frontend/src/assets/locales/de/common.json @@ -8,10 +8,11 @@ "about": "Über uns", "relations": "Beziehungen", "admin": "Verwaltung", - "inbox": "Inbox", + "inbox": "Qualitätsthemen", "adminRegistry": "Registry-Abfragen", "adminBpn": "BPN - EDC Konfiguration", "adminImport": "Datenbereitstellung", + "partMismatch": "Die ausgewählten Teile müssen vom selben Eigentümer sein, um ein Qualitätsthema zu erstellen (Eigen, Lieferant)", "unauthorized": "Die Funktion ist aufgrund einer fehlenden Rolle deaktiviert. Bitten Sie Ihren Administrator, die erforderliche Rolle für die Funktion bereitzustellen.", "notAllowedForAsPlanned": "Diese Funktion ist für Produkte im Lebenszyklus \"AsPlanned\" nicht verfügbar.", "noChildPartsForInvestigation": "Diese Funktion ist für Produkte ohne Bauteile nicht verfügbar.", @@ -32,7 +33,9 @@ "about": "Über Catena-X Open-Source Rückverfolgbarkeit", "relations": "Beziehungen", "admin": "Verwaltung Catena-X", - "alerts": "Qualitätsthemen" + "alerts" : "Qualitätsthemen", + "receivedQualityTopics" : "Empfangene Qualitätsthemen", + "sentQualityTopics" : "Versendete Qualitätsthemen" }, "layout": { "nav": { @@ -47,6 +50,7 @@ "approve": "Genehmigen", "close": "Schließen", "viewDetails": "Details anzeigen", + "edit": "Ändern", "cancellationConfirm": "Abbruch bestätigen", "accept": "Akzeptieren", "acknowledge": "Bestätigen", @@ -54,13 +58,15 @@ "decline": "Ablehnen", "help": "Hilfe", "add": "Hinzufügen", - "saveChanges": "Änderungen speicher", - "save": "Speicher", + "saveChanges" : "Änderungen speichern", + "save" : "Speichern", "remove": "Entfernen", "delete": "Löschen", "goToQueue": "Zur Warteschlange", "goBack": "Zurück", - "publishAssets": "Produkte veröffentlichen" + "publishAssets": "Produkte veröffentlichen", + "maximizeTable": "Volle Breite", + "userSettings": "Tabellen Einstellung" }, "publisher": { "selectedAssets": "Ausgewählte Produkte", @@ -79,6 +85,20 @@ "clearAll": "Alle Markierungen aufheben", "multiSortingTooltip": "Erster Klick: aufsteigend sortieren ↑ Zweiter Klick: absteigend sortieren ↓ Dritter Klick: Sortierung zurücksetzen", "filterTitle" : "Filter", + "owner": { + "own" : "Eigene", + "supplier": "Lieferant", + "customer": "Kunde" + }, + "semanticDataModel": { + "BATCH": "Batch", + "SERIALPART": "SerialPart", + "PARTASPLANNED": "PartAsPlanned", + "JUSTINSEQUENCE": "JustInSequence", + "TOMBSTONEASBUILT": "TombstoneAsBuilt", + "TOMBSTONEASPLANNED": "TombstoneAsPlanned", + "TRACTIONBATTERYCODE": "TractionBatteryCode" + }, "tableSettings": { "invalid": "Auf Grund eines Fehlers werden die Tabelleneinstellungen zurückgesetzt", "title": "Tabellenspalten Einstellungen", @@ -89,9 +109,21 @@ "alert": "Qualitätswarnung", "investigation": "Qualitätsuntersuchung" }, + "createNotification" : "Qualitätsthema erstellen", + "sendNotification" : "Qualitätsthemen senden", + "cancelNotification" : "Qualitätsthemen abbrechen", + "addParts" : "Teile hinzufügen", + "viewDetails" : "Details anzeigen", + "more" : "Mehr Aktionen", + "editNotification" : "Qualitätsthemen bearbeiten", + "selectAtLeastOne" : "Aktionen erfordern mindestens eine Selektion in der Tabelle", + "unauthorized" : "Die Funktion ist aufgrund einer fehlenden Rolle deaktiviert. Bitten Sie Ihren Administrator, die erforderliche Rolle für die Funktion bereitzustellen.", + "noFunctionality" : "Funktionalität wurde noch nicht implementiert.", + "onlyNotificationInStatusCreatedAllowed" : "Aktion erfordert eine Selektion an Qualitätsthemen im Status \"Erstellt\".", "column": { "id": "ID", "idShort": "Kurz-ID", + "owner": "Eigentümer", "name": "Name", "manufacturerName": "Hersteller", "businessPartner": "Business Partner Nummer", @@ -175,11 +207,12 @@ "maxLength": "Bitte geben Sie maximal {{maxLength}} Zeichen ein. Momentan: {{current}}", "pattern": "Bitte geben Sie die Daten in folgendem Format ein: {{- pattern}}.", "url": "Bitte geben Sie eine valide URL ein.", - "bpn": "Bitte geben Sie eine valide BPN ein.", + "bpn": "Bitte geben Sie eine valide BPN ein. BPN {{applicationBpn}} ist nicht erlaubt.", "maxDate": "Bitte wählen Sie ein Datum vor dem {{- maxDate}}.", "minDate": "Bitte wählen Sie ein Datum nach dem {{- minDate}}.", "currentDate": "Bitte wählen Sie ein Datum nach dem {{- currentDate}}.", - "generic": "Die Eingabe ist ungültig." + "generic": "Die Eingabe ist ungültig.", + "invalidBpn": "Die eigene BPN darf nicht verwendet werden." }, "requestAlert": { "headline": "Qualitätswarnung erstellen", @@ -198,20 +231,47 @@ "serverError": "Serverfehler:" }, "requestNotification": { + "investigation": "Qualitätsuntersuchung", + "alert": "Qualitätswarnung", + "header": "Qualitätsthema erstellen", + "editNotificationHeader": "Qualitätsthema anpassen", + "createNotificationHeader": "Qualitätsthema erstellen", + "affectedParts": "Betroffene Teile", + "asBuiltParts": "As Built", + "unAffectedParts": "Verfügbare Teile", "partDescription": "Sie haben folgende Produkte ausgewählt:", "targetDateDescription": "Bitte geben Sie das Datum an, bis wann Sie eine Antwort erwarten.", "bpnLabel": "BPN", "bpnDescription": "Bitte geben Sie die Empfänger BPN an.", "restoreItem": "Zuletzt gelöschtes Produkt wiederherstellen?", - "titleDescription": "Titel", + "titleDescription": "Wählen Sie einen kurzen Titel.", "titleLabel": "Titel", + "typeDescription": "Typ des Qualitätsthemas.", + "typeLabel": "Type", "textAreaLabel": "Beschreibung", "targetDateLabel": "Rückmeldedatum", "cancel": "ABBRUCH", "submit": "ZUR WARTESCHLANGE HINZUFÜGEN", "severity": "Gefahrenstufe", - "severityDescription": "Wählen Sie die Gefahrenstufe für das vorliegende Problem", - "serverError": "Serverfehler:" + "severityDescription": "Wählen Sie die Gefahrenstufe für das vorliegende Problem.", + "serverError": "Serverfehler:", + "remove": "Auswahl entfernen", + "add": "Auswahl hinzufügen", + "modifyNotAllowed": "Erfordert mindestens eine Selektion innerhalb der Tabelle", + "modifyAffectedNotAllowed" : "Erfordert mindestens eine Selektion in der Tabelle für betroffene Teile.", + "modifyAvailableNotAllowed" : "Erfordert mindestens eine Selektion in der Tabelle für verfügbare Teile.", + "textAreaDescription": "Beschreiben Sie das Problem.", + "saveNotAllowed": "Erfordert eine valide Eingabe im Formular.", + "noPartsSelected" : "Erfordert mindestens ein betroffenes Teil", + "saveSuccess": "Qualitätsthema wurde erfolgreich erstellt.", + "saveError": "Bei der Erstellung des Qualitätsthemas ist ein Fehler aufgetreten.", + "saveEditSuccess": "Qualitätsthema wurde erfolgreich aktualisiert.", + "saveEditError": "Bei der Aktualisierung des Qualitätsthemas ist ein Fehler aufgetreten.", + "save": "Qualitätsthema speichern" + }, + "editNotification": { + "saveButton": "Speichern", + "cancelButton": "Verwerfen" }, "requestPublishAssets": { "success": "Anfrage zur Veröffentlichung der Produkte war erfolgreich", @@ -314,6 +374,11 @@ "asBuilt": "As Built", "asPlanned": "As Planned" }, + "quickFilter": { + "own": "Eigene", + "supplier": "LIEFERANT", + "customer": "KUNDE" + }, "multiSelect": { "filterLabel": "Filter", "placeholder": "Alle", @@ -337,21 +402,26 @@ "BATCH": "Batch", "SERIALPART": "SerialPart", "PARTASPLANNED": "PartAsPlanned", - "UNKNOWN": "Unknown", "JUSTINSEQUENCE": "JustInSequence", + "TOMBSTONEASBUILT": "TombstoneAsBuilt", + "TOMBSTONEASPLANNED": "TombstoneAsPlanned", "TRACTIONBATTERYCODE": "TractionBatteryCode", "TRANSIENT": "Transient", "PERSISTENT": "Persistent", "IN_SYNCHRONIZATION": "In Synchronisation", "ERROR": "Fehler", "UNSET": "Undefiniert", - "PUBLISHED_TO_CORE_SERVICES": "Veröffentlicht" + "PUBLISHED_TO_CORE_SERVICES": "Veröffentlicht", + "OWN" : "Eigene", + "SUPPLIER": "Lieferant", + "CUSTOMER": "Kunde", + "UNKNOWN": "Unbekannt" } }, "parts": { "input": { "global-search": { - "placeholder": "Suche nach C-X ID, partInstanceId oder partNumber / BPN", + "placeholder" : "Suche nach ID, Produktnummer oder Business Partner Nummer (BPN)", "toastInfo": "Lokale Filterung auf Tabellenebene wurde zurückgesetzt." } } diff --git a/frontend/src/assets/locales/en/common.json b/frontend/src/assets/locales/en/common.json index c94cdaf946..de01b0d767 100644 --- a/frontend/src/assets/locales/en/common.json +++ b/frontend/src/assets/locales/en/common.json @@ -4,14 +4,14 @@ "home": "Home", "dashboard": "Dashboard", "parts": "Parts", - "otherParts": "Other parts", "about": "About", "relations": "Relations", "admin": "Administration", - "inbox": "Inbox", + "inbox": "Quality notifications", "adminRegistry": "Registry lookups", "adminBpn": "BPN - EDC configuration", "adminImport": "Data provisioning", + "partMismatch": "Selected parts must have same owner to create quality topic (Own, Supplier)", "unauthorized": "Functionality is disabled because of missing role. Ask your administrator to provide the required role for the functionality.", "notAllowedForAsPlanned": "This function is not available for Parts in the Lifecycle \"AsPlanned\".", "noChildPartsForInvestigation": "This function is not available for Parts without components.", @@ -27,12 +27,13 @@ }, "pageTitle": { "dashboard": "Dashboard", - "parts": "My Parts", - "otherParts": "Other Parts", + "parts": "My parts", "about": "About Catena-X Open-Source Traceability", - "relations": "Part Relations", + "relations": "Part relations", "admin": "Administration Catena-X", - "alerts": "Quality Topics" + "alerts" : "Quality topics", + "receivedQualityTopics" : "Received quality topics", + "sentQualityTopics" : "Sent quality topics" }, "layout": { "nav": { @@ -52,6 +53,7 @@ "close": "Close", "decline": "Decline", "viewDetails": "View details", + "edit": "Edit", "help": "Help", "add": "Add", "saveChanges": "Save changes", @@ -60,7 +62,9 @@ "delete": "Delete", "goToQueue": "Go to Queue", "goBack": "Back", - "publishAssets": "Publish assets" + "publishAssets": "Publish assets", + "maximizeTable": "Full width", + "userSettings": "Table settings" }, "publisher": { "selectedAssets": "Assets selected", @@ -79,6 +83,20 @@ "clearAll": "Clear all selections", "multiSortingTooltip": "First click: sort in ascending order ↑ Second click: sort in descending order ↓ Third click: reset sorting", "filterTitle": "Filter", + "owner": { + "own": "Own", + "supplier": "Supplier", + "customer": "Customer" + }, + "semanticDataModel": { + "BATCH": "Batch", + "SERIALPART": "SerialPart", + "PARTASPLANNED": "PartAsPlanned", + "JUSTINSEQUENCE": "JustInSequence", + "TOMBSTONEASBUILT": "TombstoneAsBuilt", + "TOMBSTONEASPLANNED": "TombstoneAsPlanned", + "TRACTIONBATTERYCODE": "TractionBatteryCode" + }, "tableSettings": { "invalid": "Due to an error table settings have been reset", "title": "Table column settings", @@ -88,9 +106,21 @@ "saveAction": "Save", "alert": "Quality Alert" }, + "createNotification" : "Create quality topic", + "sendNotification" : "Send quality topics", + "cancelNotification" : "Cancel quality topics", + "addParts" : "Add parts to quality topics", + "viewDetails" : "View details", + "more" : "More actions", + "editNotification" : "Edit quality topics", + "selectAtLeastOne" : "Actions require atleast one selection in the table", + "unauthorized" : "Functionality is disabled because of missing role. Ask your administrator to provide the required role for the functionality.", + "noFunctionality" : "Functionality is not implemented yet", + "onlyNotificationInStatusCreatedAllowed" : "Action only allowed with a selection of notifications in status \"Queued\".", "column": { "id": "ID", "idShort": "ID Short", + "owner": "Owner", "name": "Name", "manufacturerName": "Manufacturer", "partId": "Part number", @@ -176,7 +206,8 @@ "maxDate": "Please select a date that is before {{- maxDate}}.", "minDate": "Please select a date that is after {{- minDate}}.", "currentDate": "Please select a date that is after {{- currentDate}}.", - "generic": "Please enter valid data." + "generic": "Please enter valid data.", + "invalidBpn": "Must not be own BPN." }, "unitTest": { "test01": "This is for unit tests purposes.", @@ -199,11 +230,20 @@ }, "requestNotification": { + "investigation": "Quality investigation", + "alert": "Quality alert", + "header": "Create notification", + "editNotificationHeader": "Edit notification", + "createNotificationHeader": "Create notification", + "affectedParts": "Affected parts", + "unAffectedParts": "Available parts", "partDescription": "You selected the following parts:", "targetDateDescription": "Please specify the deadline by which you expect a response.", "titleLabel": "Title", - "titleDescription": "Title", + "titleDescription": "Specify a short title.", "targetDateLabel": "Deadline", + "typeDescription": "Type of quality topic.", + "typeLabel": "Type", "bpnLabel": "BPN", "bpnDescription": "Please specify the receiver BPN.", "restoreItem": "Do you want to restore your last item?", @@ -211,8 +251,25 @@ "cancel": "CANCEL", "submit": "ADD TO QUEUE", "severity": "Severity", - "severityDescription": "Select the severity for the problem at hand", - "serverError": "Server error:" + "severityDescription": "Select the severity for the problem at hand.", + "serverError": "Server error:", + "remove": "Remove selection", + "add": "Add selection", + "modifyNotAllowed": "Requires at least one selection in the parts table.", + "modifyAffectedNotAllowed" : "Requires at least one selection in the affected parts table.", + "modifyAvailableNotAllowed" : "Requires at least one selection in the available parts table.", + "textAreaDescription": "Describe the quality issue.", + "saveNotAllowed": "Requires valid form input.", + "noPartsSelected" : "Requires at least one affected part", + "saveSuccess": "Quality topic was created successfully.", + "saveError": "An error occurred while creating the quality topic.", + "saveEditSuccess": "Quality topic was updated successfully.", + "saveEditError": "An error occurred while updating the quality topic.", + "save": "Save quality topic" + }, + "editNotification": { + "saveButton": "Save", + "cancelButton": "Cancel" }, "requestPublishAssets": { "success": "Request to publish assets was successful", @@ -272,8 +329,8 @@ "commonAlert": { "viewAll": "View all", "tabs": { - "received": "received", - "queuedAndRequested": "sent" + "received" : "Received", + "queuedAndRequested" : "Sent" }, "status": { "SENT": "Requested", @@ -315,6 +372,11 @@ "asBuilt": "As Built", "asPlanned": "As Planned" }, + "quickFilter": { + "own": "OWN", + "supplier": "SUPPLIER", + "customer": "CUSTOMER" + }, "multiSelect": { "filterLabel": "Filter", "placeholder": "All", @@ -338,7 +400,8 @@ "BATCH": "Batch", "SERIALPART": "SerialPart", "PARTASPLANNED": "PartAsPlanned", - "UNKNOWN": "Unknown", + "TOMBSTONEASBUILT": "TombstoneAsBuilt", + "TOMBSTONEASPLANNED": "TombstoneAsPlanned", "JUSTINSEQUENCE": "JustInSequence", "TRACTIONBATTERYCODE": "TractionBatteryCode", "TRANSIENT": "Transient", @@ -346,15 +409,18 @@ "IN_SYNCHRONIZATION": "In Synchronization", "ERROR": "Error", "UNSET": "Unset", - "PUBLISHED_TO_CORE_SERVICES": "Veröffentlicht" - + "PUBLISHED_TO_CORE_SERVICES": "Veröffentlicht", + "OWN": "Own", + "SUPPLIER": "Supplier", + "CUSTOMER": "Customer", + "UNKNOWN": "Unknown" } }, "parts": { "input": { "global-search": { - "placeholder": "Search by entering C-X ID, partInstanceId or partNumber / BPN", - "toastInfo": "By using global search on view level, the local filters on table level was removed." + "placeholder" : "Search by entering ID, part ID or Business partner number (BPN)", + "toastInfo": "Any local filters on table level were removed." } } }, diff --git a/frontend/src/environments/_environment.base.ts b/frontend/src/environments/_environment.base.ts index c4794057ac..a246c2c1e9 100644 --- a/frontend/src/environments/_environment.base.ts +++ b/frontend/src/environments/_environment.base.ts @@ -30,4 +30,5 @@ export const _environment = { baseUrl: '/', portalUrl: 'https://portal.dev.demo.catena-x.net/', gitTag: '', + bpn: '' }; diff --git a/frontend/src/environments/environment.authE2eA.ts b/frontend/src/environments/environment.authE2eA.ts index fe51dcc59f..6a8d80e2f6 100644 --- a/frontend/src/environments/environment.authE2eA.ts +++ b/frontend/src/environments/environment.authE2eA.ts @@ -28,4 +28,5 @@ export const environment = { clientId: 'Cl17-CX-Part', api: '', gitTag: 'local', + bpn: 'BPNL00000003CML1' }; diff --git a/frontend/src/environments/environment.authE2eB.ts b/frontend/src/environments/environment.authE2eB.ts index aaf02cb250..ec00a10cd9 100644 --- a/frontend/src/environments/environment.authE2eB.ts +++ b/frontend/src/environments/environment.authE2eB.ts @@ -28,4 +28,5 @@ export const environment = { clientId: 'Cl17-CX-Part', api: '', gitTag: 'local', + bpn: 'BPNL00000003CNKC' }; diff --git a/frontend/src/environments/environment.authTest.ts b/frontend/src/environments/environment.authTest.ts index dfc57fde72..837b03d7f7 100644 --- a/frontend/src/environments/environment.authTest.ts +++ b/frontend/src/environments/environment.authTest.ts @@ -27,4 +27,5 @@ export const environment = { keycloakUrl: 'https://centralidp.dev.demo.catena-x.net/auth', clientId: 'Cl17-CX-Part', api: '', + bpn: 'BPNL00000003CNKC' }; diff --git a/frontend/src/environments/environment.dev.ts b/frontend/src/environments/environment.dev.ts index 1f015a117e..b571a9026e 100644 --- a/frontend/src/environments/environment.dev.ts +++ b/frontend/src/environments/environment.dev.ts @@ -25,4 +25,5 @@ export const environment = { ..._environment, mockService: true, authDisabled: true, + bpn: 'BPNL00000003CML1' }; diff --git a/frontend/src/environments/environment.production.ts b/frontend/src/environments/environment.production.ts index 8e9102ca58..5fac9c7271 100644 --- a/frontend/src/environments/environment.production.ts +++ b/frontend/src/environments/environment.production.ts @@ -22,7 +22,7 @@ import { _environment } from './_environment.base'; const SCRIPT_EL_ID = 'envConfig'; -const SUPPORTED_ENV_PARAMS = [ 'keycloakUrl', 'clientId', 'apiUrl', 'baseUrl', 'portalUrl', 'gitTag' ]; +const SUPPORTED_ENV_PARAMS = [ 'keycloakUrl', 'clientId', 'apiUrl', 'baseUrl', 'portalUrl', 'gitTag', 'bpn' ]; export const readDynamicEnv = () => { const scriptEl = document.getElementById(SCRIPT_EL_ID) as HTMLScriptElement; diff --git a/frontend/src/theme/base.scss b/frontend/src/theme/base.scss index 365dd6d360..296abff8d0 100644 --- a/frontend/src/theme/base.scss +++ b/frontend/src/theme/base.scss @@ -183,7 +183,11 @@ as-split { } -app-parts, app-other-parts { +app-parts{ + .parts-search-input .mat-mdc-form-field-subscript-wrapper{ + margin-bottom: -1.25em; + + } .table-wrapper { @media screen and (max-height: 1049px) { height: 52vh !important; @@ -201,31 +205,39 @@ app-parts, app-other-parts { } } -app-other-parts { +app-notifications-tab { .table-wrapper { background-color: white; @media screen and (max-height: 1049px) { - height: 33vh !important; - max-height: 56vh !important + height: 56vh; } @media screen and (min-height: 1050px) { - height: 56vh !important; - max-height: 56vh !important; + height: 70vh; + max-height: 70vh; } + + border-left: 1px solid rgb(220, 220, 220); + box-shadow: 0 3px 5px #888; + border-bottom-right-radius: 25px; + border-bottom-left-radius: 25px; + } } -app-notifications-tab { +app-notification-edit { .table-wrapper { background-color: white; + height:30vh; + overflow:auto; @media screen and (max-height: 1049px) { - height: 56vh ; + max-height: 45vh; + height: 30vh; } @media screen and (min-height: 1050px) { - height: 70vh ; - max-height: 70vh ; + height: 25vh; + max-height: 45vh; } } } @@ -234,6 +246,8 @@ app-parts, app-notification-tab { .table-wrapper { background-color: white; height: 45vh; + border-left: 1px solid rgb(220, 220, 220); + box-shadow: 0 3px 5px #888 } } @@ -254,17 +268,12 @@ app-multiselect { bottom: 0; } -app-parts, app-other-parts, app-notifications-tab { +app-parts, app-notifications-tab { .mat-mdc-table .mdc-data-table__row:last-child { border-bottom: 1px solid lightgrey; } - .app-bom-lifecycle-activator-container { - display: flex; - width: 100%; - } - .table-header-wrapper { mat-icon { float: right; @@ -292,7 +301,6 @@ app-parts, app-other-parts, app-notifications-tab { .mat-mdc-paginator { border-radius: 0 0 24px 24px; - // box-shadow: 0 2px 2px -3px rgba(0, 0, 0, 0.2), 0px 4px 6px -1px rgba(0, 0, 0, 0.14), 0px 1px 8px -2px rgba(0, 0, 0, 0.12); } .mat-mdc-row:hover { diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js index 278fb657fe..e30d48ed49 100644 --- a/frontend/tailwind.config.js +++ b/frontend/tailwind.config.js @@ -151,13 +151,13 @@ module.exports = { qualityTypeOk: '#3db014', qualityTypeMinor: '#ffd74a', - qualityTypeMajor: '#c67700', - qualityTypeCritical: '#981b5e', + qualityTypeMajor: '#ffd74a', + qualityTypeCritical: '#E5231D', qualityTypeLifeThreatening: '#E5231D', severityMinor: '#ffd74a', - severityMajor: '#c67700', - severityCritical: '#981b5e', + severityMajor: '#ffd74a', + severityCritical: '#E5231D', severityLifeThreatening: '#E5231D', semanticDataModelSerialPart: '#3db014', diff --git a/pom.xml b/pom.xml index 9085e09762..ff15aae464 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ SPDX-License-Identifier: Apache-2.0 - 3.2.4 + 3.2.5 17 ${java.version} ${java.version} @@ -49,7 +49,8 @@ SPDX-License-Identifier: Apache-2.0 3.3.2 2.2.4 3.3.1 - 1.12.0 + 1.13.0 + 1.26.1 3.1.1 0.8.11 3.3.0 @@ -62,13 +63,14 @@ SPDX-License-Identifier: Apache-2.0 4.0.0-M11 0.2.1 + 1.5.6 1.1.0 9.37.3 - 2.2.13 + 2.3.0 2.5.8 4.4.0 9.4.3.0 - 2023.0.0 + 2023.0.1 24.1.0 3.0.2 1.6.12 @@ -82,12 +84,13 @@ SPDX-License-Identifier: Apache-2.0 3.24.2 1.3.0 4.4 - 1.18.30 + 1.18.32 3.2.2 - 7.15.0 + 7.17.0 5.10.2 - 3.0.0 - 1.6.0 + 4.2.1 + + 2.0.5-SNAPSHOT 5.4.0 jacoco diff --git a/tx-backend/collection/tracex.json b/tx-backend/collection/tracex.json index 54e782cf3a..1c7b3dfaba 100644 --- a/tx-backend/collection/tracex.json +++ b/tx-backend/collection/tracex.json @@ -1,3030 +1 @@ -{ - "_type" : "export", - "__export_format" : 4, - "__export_date" : "2023-06-01T14:23:44.016Z", - "__export_source" : "insomnia.desktop.app:v2023.2.2", - "resources" : [ - { - "_id" : "req_b64549adef2e4d5691db55fe0300777e", - "parentId" : "fld_e4c20952b4984d53a6d16a13c9224db8", - "modified" : 1684742069277, - "created" : 1684742069277, - "url" : "{{ _.argo_url }}/applications/{{ _.argo_submodelserver }}/resource?group=apps&force=false&orphan=false", - "name" : "Delete Deployment submodelservers", - "description" : "", - "method" : "DELETE", - "body" : {}, - "parameters" : [ - { - "id" : "pair_3e8424fd92d84a758c7a6fbbc275e3c9", - "name" : "resourceName", - "value" : "{{ _.argo_submodelserver_deployment_submodelservers }}", - "description" : "" - }, - { - "id" : "pair_41bcbeecbc064c53a03abff4162ab5ec", - "name" : "version", - "value" : "v1", - "description" : "" - }, - { - "id" : "pair_fa9af878fc574f27b05f9f3c95804c82", - "name" : "kind", - "value" : "Deployment", - "description" : "" - }, - { - "id" : "pair_2a2765277f564bb48c1d941d4d0b5c73", - "name" : "namespace", - "value" : "product-traceability-foss", - "description" : "" - } - ], - "headers" : [], - "authentication" : { - "type" : "bearer", - "token" : "{{ _.argo_access_token }}" - }, - "metaSortKey" : -1684251623152.5, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "fld_e4c20952b4984d53a6d16a13c9224db8", - "parentId" : "fld_0f2e8223d85444d29ef716d4211d05a4", - "modified" : 1684742069262, - "created" : 1684742069262, - "name" : "DELETE", - "description" : "", - "environment" : {}, - "environmentPropertyOrder" : null, - "metaSortKey" : -1684251623165, - "_type" : "request_group" - }, - { - "_id" : "fld_0f2e8223d85444d29ef716d4211d05a4", - "parentId" : "fld_172d09282f564acba3c08eca5fc80bd1", - "modified" : 1684742069248, - "created" : 1684742069248, - "name" : "Submodelserver", - "description" : "", - "environment" : {}, - "environmentPropertyOrder" : null, - "metaSortKey" : -1684247658657, - "_type" : "request_group" - }, - { - "_id" : "fld_172d09282f564acba3c08eca5fc80bd1", - "parentId" : "wrk_f9bd4e398c274e41b35f14904699d120", - "modified" : 1684742068376, - "created" : 1684742068376, - "name" : "Argo", - "description" : "", - "environment" : {}, - "environmentPropertyOrder" : null, - "metaSortKey" : -1684230480867, - "_type" : "request_group" - }, - { - "_id" : "wrk_f9bd4e398c274e41b35f14904699d120", - "parentId" : null, - "modified" : 1685448305900, - "created" : 1685448305900, - "name" : "tracex-v2", - "description" : "", - "scope" : "design", - "_type" : "workspace" - }, - { - "_id" : "req_9bb317e3eef9460f9257ff5ce4911b23", - "parentId" : "fld_0f2e8223d85444d29ef716d4211d05a4", - "modified" : 1684742069321, - "created" : 1684742069321, - "url" : "{{ _.argo_url }}/applications/{{ _.argo_submodelserver }}/sync", - "name" : "Sync Submodelserver", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "{\n\t\"appNamespace\": \"argocd\",\n\t\"revision\": \"helm-environments\",\n\t\"prune\": true,\n\t\"dryRun\": false,\n\t\"strategy\": {\n\t\t\"hook\": {\n\t\t\t\"force\": false\n\t\t}\n\t},\n\t\"resources\": null,\n\t\"syncOptions\": {\n\t\t\"items\": [\n\t\t\t\"Replace=true\"\n\t\t]\n\t}\n}" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{{ _.argo_access_token }}" - }, - "metaSortKey" : -1684251623115, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_68d7cfd5ae4d47dcb7c9c4e516b69e7f", - "parentId" : "fld_f554ccf2b02c45559dab553369c3898e", - "modified" : 1684742068887, - "created" : 1684742068887, - "url" : "{{ _.argo_url }}/applications/{{ _.argo_tracex_instance }}/resource?force=false&orphan=false", - "name" : "Delete PVC backend", - "description" : "", - "method" : "DELETE", - "body" : {}, - "parameters" : [ - { - "id" : "pair_3e8424fd92d84a758c7a6fbbc275e3c9", - "name" : "resourceName", - "value" : "{{ _.argo_tracex_instance_pvc_backend }}", - "description" : "" - }, - { - "id" : "pair_41bcbeecbc064c53a03abff4162ab5ec", - "name" : "version", - "value" : "v1", - "description" : "" - }, - { - "id" : "pair_fa9af878fc574f27b05f9f3c95804c82", - "name" : "kind", - "value" : "PersistentVolumeClaim", - "description" : "" - }, - { - "id" : "pair_2a2765277f564bb48c1d941d4d0b5c73", - "name" : "namespace", - "value" : "product-traceability-foss", - "description" : "" - } - ], - "headers" : [], - "authentication" : { - "type" : "bearer", - "token" : "{{ _.argo_access_token }}" - }, - "metaSortKey" : -1684236443484, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "fld_f554ccf2b02c45559dab553369c3898e", - "parentId" : "fld_fa0c277237fd4a50834583ba7e3ced73", - "modified" : 1684742068871, - "created" : 1684742068871, - "name" : "DELETE", - "description" : "", - "environment" : {}, - "environmentPropertyOrder" : null, - "metaSortKey" : -1684230581328.5, - "_type" : "request_group" - }, - { - "_id" : "fld_fa0c277237fd4a50834583ba7e3ced73", - "parentId" : "fld_172d09282f564acba3c08eca5fc80bd1", - "modified" : 1685526235160, - "created" : 1684742068857, - "name" : "Trace-X Instance", - "description" : "", - "environment" : {}, - "environmentPropertyOrder" : null, - "metaSortKey" : -1684230585004, - "_type" : "request_group" - }, - { - "_id" : "req_50c5dcf1c22947de8d2785fdb546081f", - "parentId" : "fld_f554ccf2b02c45559dab553369c3898e", - "modified" : 1685618160654, - "created" : 1685617832536, - "url" : "{{ _.argo_url }}/applications/{{ _.argo_tracex_instance }}/resource?group=apps&force=true&orphan=false", - "name" : "Delete STS backend", - "description" : "", - "method" : "DELETE", - "body" : {}, - "parameters" : [ - { - "id" : "pair_3e8424fd92d84a758c7a6fbbc275e3c9", - "name" : "resourceName", - "value" : "{{ _.argo_tracex_instance_sts_backend }}", - "description" : "" - }, - { - "id" : "pair_41bcbeecbc064c53a03abff4162ab5ec", - "name" : "version", - "value" : "v1", - "description" : "" - }, - { - "id" : "pair_fa9af878fc574f27b05f9f3c95804c82", - "name" : "kind", - "value" : "StatefulSet", - "description" : "" - }, - { - "id" : "pair_2a2765277f564bb48c1d941d4d0b5c73", - "name" : "namespace", - "value" : "product-traceability-foss", - "description" : "" - } - ], - "headers" : [], - "authentication" : { - "type" : "bearer", - "token" : "{{ _.argo_access_token }}" - }, - "metaSortKey" : -1684236443477.75, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_5e0677cd1f89421f834f94b04d9ec41e", - "parentId" : "fld_f554ccf2b02c45559dab553369c3898e", - "modified" : 1685620818413, - "created" : 1684742068996, - "url" : "{{ _.argo_url }}/applications/{{ _.argo_tracex_instance }}/resource?force=false&orphan=false", - "name" : "Delete PVC consumer-edc", - "description" : "", - "method" : "DELETE", - "body" : {}, - "parameters" : [ - { - "id" : "pair_3e8424fd92d84a758c7a6fbbc275e3c9", - "name" : "resourceName", - "value" : "{{ _.argo_tracex_instance_pvc_consumer_edc }}", - "description" : "" - }, - { - "id" : "pair_41bcbeecbc064c53a03abff4162ab5ec", - "name" : "version", - "value" : "v1", - "description" : "" - }, - { - "id" : "pair_fa9af878fc574f27b05f9f3c95804c82", - "name" : "kind", - "value" : "PersistentVolumeClaim", - "description" : "" - }, - { - "id" : "pair_2a2765277f564bb48c1d941d4d0b5c73", - "name" : "namespace", - "value" : "product-traceability-foss", - "description" : "" - } - ], - "headers" : [], - "authentication" : { - "type" : "bearer", - "token" : "{{ _.argo_access_token }}" - }, - "metaSortKey" : -1684236443476.1875, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_06168dc5b1be4d958875659677ad75d9", - "parentId" : "fld_f554ccf2b02c45559dab553369c3898e", - "modified" : 1685618307141, - "created" : 1685618196329, - "url" : "{{ _.argo_url }}/applications/{{ _.argo_tracex_instance }}/resource?group=apps&force=true&orphan=false", - "name" : "Delete STS consumer edc postgresql", - "description" : "", - "method" : "DELETE", - "body" : {}, - "parameters" : [ - { - "id" : "pair_3e8424fd92d84a758c7a6fbbc275e3c9", - "name" : "resourceName", - "value" : "{{ _.argo_tracex_instance_sts_edc_consumer_postgresql }}", - "description" : "" - }, - { - "id" : "pair_41bcbeecbc064c53a03abff4162ab5ec", - "name" : "version", - "value" : "v1", - "description" : "" - }, - { - "id" : "pair_fa9af878fc574f27b05f9f3c95804c82", - "name" : "kind", - "value" : "StatefulSet", - "description" : "" - }, - { - "id" : "pair_2a2765277f564bb48c1d941d4d0b5c73", - "name" : "namespace", - "value" : "product-traceability-foss", - "description" : "" - } - ], - "headers" : [], - "authentication" : { - "type" : "bearer", - "token" : "{{ _.argo_access_token }}" - }, - "metaSortKey" : -1684236443474.625, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_4c14e436c45e473dab46c1859a5bad23", - "parentId" : "fld_f554ccf2b02c45559dab553369c3898e", - "modified" : 1684742068960, - "created" : 1684742068960, - "url" : "{{ _.argo_url }}/applications/{{ _.argo_tracex_instance }}/resource?group=apps&force=false&orphan=false", - "name" : "Delete Deployment backend", - "description" : "", - "method" : "DELETE", - "body" : {}, - "parameters" : [ - { - "id" : "pair_3e8424fd92d84a758c7a6fbbc275e3c9", - "name" : "resourceName", - "value" : "{{ _.argo_tracex_instance_deployment_backend }}", - "description" : "" - }, - { - "id" : "pair_41bcbeecbc064c53a03abff4162ab5ec", - "name" : "version", - "value" : "v1", - "description" : "" - }, - { - "id" : "pair_fa9af878fc574f27b05f9f3c95804c82", - "name" : "kind", - "value" : "Deployment", - "description" : "" - }, - { - "id" : "pair_2a2765277f564bb48c1d941d4d0b5c73", - "name" : "namespace", - "value" : "product-traceability-foss", - "description" : "" - } - ], - "headers" : [], - "authentication" : { - "type" : "bearer", - "token" : "{{ _.argo_access_token }}" - }, - "metaSortKey" : -1684236443384, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_68120cff7723496985478a8cec8505b2", - "parentId" : "fld_f554ccf2b02c45559dab553369c3898e", - "modified" : 1684742069102, - "created" : 1684742069102, - "url" : "{{ _.argo_url }}/applications/{{ _.argo_tracex_instance }}/resource?group=apps&force=false&orphan=false", - "name" : "Delete Deployment consumer-controlplane", - "description" : "", - "method" : "DELETE", - "body" : {}, - "parameters" : [ - { - "id" : "pair_3e8424fd92d84a758c7a6fbbc275e3c9", - "name" : "resourceName", - "value" : "{{ _.argo_tracex_instance_deployment_consumer_controlplane }}", - "description" : "" - }, - { - "id" : "pair_41bcbeecbc064c53a03abff4162ab5ec", - "name" : "version", - "value" : "v1", - "description" : "" - }, - { - "id" : "pair_fa9af878fc574f27b05f9f3c95804c82", - "name" : "kind", - "value" : "Deployment", - "description" : "" - }, - { - "id" : "pair_2a2765277f564bb48c1d941d4d0b5c73", - "name" : "namespace", - "value" : "product-traceability-foss", - "description" : "" - } - ], - "headers" : [], - "authentication" : { - "type" : "bearer", - "token" : "{{ _.argo_access_token }}" - }, - "metaSortKey" : -1684233534865, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_fe2eb89ac95f4be888ed08768d99d038", - "parentId" : "fld_f554ccf2b02c45559dab553369c3898e", - "modified" : 1684742069139, - "created" : 1684742069139, - "url" : "{{ _.argo_url }}/applications/{{ _.argo_tracex_instance }}/resource?group=apps&force=true&orphan=false", - "name" : "Delete Deployment consumer-dataplane", - "description" : "", - "method" : "DELETE", - "body" : {}, - "parameters" : [ - { - "id" : "pair_3e8424fd92d84a758c7a6fbbc275e3c9", - "name" : "resourceName", - "value" : "{{ _.argo_tracex_instance_deployment_consumer_dataplane }}", - "description" : "" - }, - { - "id" : "pair_41bcbeecbc064c53a03abff4162ab5ec", - "name" : "version", - "value" : "v1", - "description" : "" - }, - { - "id" : "pair_fa9af878fc574f27b05f9f3c95804c82", - "name" : "kind", - "value" : "Deployment", - "description" : "" - }, - { - "id" : "pair_2a2765277f564bb48c1d941d4d0b5c73", - "name" : "namespace", - "value" : "product-traceability-foss", - "description" : "" - } - ], - "headers" : [], - "authentication" : { - "type" : "bearer", - "token" : "{{ _.argo_access_token }}" - }, - "metaSortKey" : -1684232080605.5, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_b0a7177cce524541b270c037af8b1672", - "parentId" : "fld_fa0c277237fd4a50834583ba7e3ced73", - "modified" : 1684742069212, - "created" : 1684742069212, - "url" : "{{ _.argo_url }}/applications/{{ _.argo_tracex_instance }}/sync", - "name" : "Sync Trace-X Instance", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "{\n\t\"appNamespace\": \"argocd\",\n\t\"revision\": \"main\",\n\t\"prune\": true,\n\t\"dryRun\": false,\n\t\"strategy\": {\n\t\t\"hook\": {\n\t\t\t\"force\": false\n\t\t}\n\t},\n\t\"resources\": null,\n\t\"syncOptions\": {\n\t\t\"items\": [\n\t\t\t\"Replace=true\"\n\t\t]\n\t}\n}" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{{ _.argo_access_token }}" - }, - "metaSortKey" : -1684230581278.5, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_940b712a442849c4b6eb90d27125ed44", - "parentId" : "fld_4ce7d0602bcf454ca0c07420ce277ade", - "modified" : 1685620205482, - "created" : 1684742068709, - "url" : "{{ _.argo_url }}/applications/{{ _.argo_edc_provider }}/resource?force=false&orphan=false", - "name" : "Delete PVC postgresql", - "description" : "", - "method" : "DELETE", - "body" : {}, - "parameters" : [ - { - "id" : "pair_3e8424fd92d84a758c7a6fbbc275e3c9", - "name" : "resourceName", - "value" : "{{ _.argo_edc_provider_pvc_postgresql_resourcename }}", - "description" : "" - }, - { - "id" : "pair_41bcbeecbc064c53a03abff4162ab5ec", - "name" : "version", - "value" : "v1", - "description" : "" - }, - { - "id" : "pair_fa9af878fc574f27b05f9f3c95804c82", - "name" : "kind", - "value" : "PersistentVolumeClaim", - "description" : "" - }, - { - "id" : "pair_2a2765277f564bb48c1d941d4d0b5c73", - "name" : "namespace", - "value" : "product-traceability-foss", - "description" : "" - } - ], - "headers" : [], - "authentication" : { - "type" : "bearer", - "token" : "{{ _.argo_access_token }}" - }, - "metaSortKey" : -1684217020514.838, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "fld_4ce7d0602bcf454ca0c07420ce277ade", - "parentId" : "fld_2e299055ad4e486d9aa1ecd77711f287", - "modified" : 1684742068621, - "created" : 1684742068621, - "name" : "DELETE", - "description" : "", - "environment" : {}, - "environmentPropertyOrder" : null, - "metaSortKey" : -1684230626396, - "_type" : "request_group" - }, - { - "_id" : "fld_2e299055ad4e486d9aa1ecd77711f287", - "parentId" : "fld_172d09282f564acba3c08eca5fc80bd1", - "modified" : 1684742068599, - "created" : 1684742068599, - "name" : "EDC Provider", - "description" : "", - "environment" : {}, - "environmentPropertyOrder" : null, - "metaSortKey" : -1684230526196, - "_type" : "request_group" - }, - { - "_id" : "req_2b31ed276f7e4e26beba96b506e260e6", - "parentId" : "fld_4ce7d0602bcf454ca0c07420ce277ade", - "modified" : 1685629119893, - "created" : 1685620198601, - "url" : "{{ _.argo_url }}/applications/{{ _.argo_edc_provider }}/resource?group=apps&force=true&orphan=false", - "name" : "Delete STS backend", - "description" : "", - "method" : "DELETE", - "body" : {}, - "parameters" : [ - { - "id" : "pair_3e8424fd92d84a758c7a6fbbc275e3c9", - "name" : "resourceName", - "value" : "{{ _.argo_edc_provider_sts }}", - "description" : "" - }, - { - "id" : "pair_41bcbeecbc064c53a03abff4162ab5ec", - "name" : "version", - "value" : "v1", - "description" : "" - }, - { - "id" : "pair_fa9af878fc574f27b05f9f3c95804c82", - "name" : "kind", - "value" : "StatefulSet", - "description" : "" - }, - { - "id" : "pair_2a2765277f564bb48c1d941d4d0b5c73", - "name" : "namespace", - "value" : "product-traceability-foss", - "description" : "" - } - ], - "headers" : [], - "authentication" : { - "type" : "bearer", - "token" : "{{ _.argo_access_token }}" - }, - "metaSortKey" : -1684212938049.9893, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_c0bf54b04a8646a8b93ec47d180a211f", - "parentId" : "fld_4ce7d0602bcf454ca0c07420ce277ade", - "modified" : 1684742068636, - "created" : 1684742068636, - "url" : "{{ _.argo_url }}/applications/{{ _.argo_edc_provider }}/resource?group=apps&force=false&orphan=false", - "name" : "Delete Deployment edc-controlpane", - "description" : "", - "method" : "DELETE", - "body" : {}, - "parameters" : [ - { - "id" : "pair_3e8424fd92d84a758c7a6fbbc275e3c9", - "name" : "resourceName", - "value" : "{{ _.argo_edc_provider_controlplane_resourcename }}", - "description" : "" - }, - { - "id" : "pair_41bcbeecbc064c53a03abff4162ab5ec", - "name" : "version", - "value" : "v1", - "description" : "" - }, - { - "id" : "pair_fa9af878fc574f27b05f9f3c95804c82", - "name" : "kind", - "value" : "Deployment", - "description" : "" - }, - { - "id" : "pair_2a2765277f564bb48c1d941d4d0b5c73", - "name" : "namespace", - "value" : "product-traceability-foss", - "description" : "" - } - ], - "headers" : [], - "authentication" : { - "type" : "bearer", - "token" : "{{ _.argo_access_token }}" - }, - "metaSortKey" : -1684208855585.1406, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_51ef141e27314c78b548fe15410bcb03", - "parentId" : "fld_4ce7d0602bcf454ca0c07420ce277ade", - "modified" : 1684742068673, - "created" : 1684742068673, - "url" : "{{ _.argo_url }}/applications/{{ _.argo_edc_provider }}/resource?group=apps&force=false&orphan=false", - "name" : "Delete Deployment edc-dataplane", - "description" : "", - "method" : "DELETE", - "body" : {}, - "parameters" : [ - { - "id" : "pair_3e8424fd92d84a758c7a6fbbc275e3c9", - "name" : "resourceName", - "value" : "{{ _.argo_edc_provider_dataplane_resourcename }}", - "description" : "" - }, - { - "id" : "pair_41bcbeecbc064c53a03abff4162ab5ec", - "name" : "version", - "value" : "v1", - "description" : "" - }, - { - "id" : "pair_fa9af878fc574f27b05f9f3c95804c82", - "name" : "kind", - "value" : "Deployment", - "description" : "" - }, - { - "id" : "pair_2a2765277f564bb48c1d941d4d0b5c73", - "name" : "namespace", - "value" : "product-traceability-foss", - "description" : "" - } - ], - "headers" : [], - "authentication" : { - "type" : "bearer", - "token" : "{{ _.argo_access_token }}" - }, - "metaSortKey" : -1684195791697.625, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_13dfb2c6a3f1491e87a4ec9834e7cb3b", - "parentId" : "fld_2e299055ad4e486d9aa1ecd77711f287", - "modified" : 1685449041566, - "created" : 1684742068819, - "url" : "{{ _.argo_url }}/applications/{{ _.argo_edc_provider }}/resource-tree", - "name" : "Health Check EDC Provider", - "description" : "### PVCs Health Status -> *{% response 'body', 'req_a3a1197b0b0448aa87918ffb87b15d06', 'b64::JC5ub2Rlc1s/KEAua2luZD09J1BlcnNpc3RlbnRWb2x1bWVDbGFpbScpXS5oZWFsdGguc3RhdHVz::46b', 'never', 60 %}*\n\n### Pods Health Status -> *{% response 'body', 'req_a3a1197b0b0448aa87918ffb87b15d06', 'b64::JC5ub2Rlc1s/KEAua2luZD09J1BvZCcpXS5oZWFsdGguc3RhdHVz::46b', 'never', 60 %}*\n\n### Deployments Health Status -> *{% response 'body', 'req_a3a1197b0b0448aa87918ffb87b15d06', 'b64::JC5ub2Rlc1s/KEAua2luZD09J0RlcGxveW1lbnQnKV0uaGVhbHRoLnN0YXR1cw==::46b', 'never', 60 %}*\n", - "method" : "GET", - "body" : {}, - "parameters" : [], - "headers" : [], - "authentication" : { - "type" : "bearer", - "token" : "{{ _.argo_access_token }}" - }, - "metaSortKey" : -1684230626346, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_afe3a19164ca4c86b9a6343289971dde", - "parentId" : "fld_2e299055ad4e486d9aa1ecd77711f287", - "modified" : 1684742068785, - "created" : 1684742068785, - "url" : "{{ _.argo_url }}/applications/{{ _.argo_edc_provider }}/sync", - "name" : "Sync EDC Provider", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "{\n\t\"appNamespace\": \"argocd\",\n\t\"revision\": \"helm-environments\",\n\t\"prune\": true,\n\t\"dryRun\": false,\n\t\"strategy\": {\n\t\t\"hook\": {\n\t\t\t\"force\": false\n\t\t}\n\t},\n\t\"resources\": null,\n\t\"syncOptions\": {\n\t\t\"items\": [\n\t\t\t\"Replace=true\"\n\t\t]\n\t}\n}" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{{ _.argo_access_token }}" - }, - "metaSortKey" : -1684230626296, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_f71244bd9ee943b8b42f7228b2f4e69a", - "parentId" : "fld_6970951b3fef4025ac4c41654e077d32", - "modified" : 1685629115275, - "created" : 1684742068418, - "url" : "{{ _.argo_url }}/applications/{{ _.argo_registry }}/resource?force=false&orphan=false", - "name" : "Delete PVC postgresql", - "description" : "", - "method" : "DELETE", - "body" : {}, - "parameters" : [ - { - "id" : "pair_3e8424fd92d84a758c7a6fbbc275e3c9", - "name" : "resourceName", - "value" : "{{ _.argo_registry_pvc_postgresql_resourcename }}", - "description" : "" - }, - { - "id" : "pair_41bcbeecbc064c53a03abff4162ab5ec", - "name" : "version", - "value" : "v1", - "description" : "" - }, - { - "id" : "pair_fa9af878fc574f27b05f9f3c95804c82", - "name" : "kind", - "value" : "PersistentVolumeClaim", - "description" : "" - }, - { - "id" : "pair_2a2765277f564bb48c1d941d4d0b5c73", - "name" : "namespace", - "value" : "product-traceability-foss", - "description" : "" - } - ], - "headers" : [], - "authentication" : { - "type" : "bearer", - "token" : "{{ _.argo_access_token }}" - }, - "metaSortKey" : -1684236443466.8125, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "fld_6970951b3fef4025ac4c41654e077d32", - "parentId" : "fld_4b5cea39a9394a19b43fdc516352342d", - "modified" : 1684742068403, - "created" : 1684742068403, - "name" : "DELETE", - "description" : "", - "environment" : {}, - "environmentPropertyOrder" : null, - "metaSortKey" : -1684236443509, - "_type" : "request_group" - }, - { - "_id" : "fld_4b5cea39a9394a19b43fdc516352342d", - "parentId" : "fld_172d09282f564acba3c08eca5fc80bd1", - "modified" : 1684742068390, - "created" : 1684742068390, - "name" : "Registry", - "description" : "", - "environment" : {}, - "environmentPropertyOrder" : null, - "metaSortKey" : -1684230502059, - "_type" : "request_group" - }, - { - "_id" : "req_217da56a4d0e45d88a28ae325027e2ff", - "parentId" : "fld_6970951b3fef4025ac4c41654e077d32", - "modified" : 1685629116857, - "created" : 1685618414019, - "url" : "{{ _.argo_url }}/applications/{{ _.argo_registry }}/resource?group=apps&force=true&orphan=false", - "name" : "Delete STS backend", - "description" : "", - "method" : "DELETE", - "body" : {}, - "parameters" : [ - { - "id" : "pair_3e8424fd92d84a758c7a6fbbc275e3c9", - "name" : "resourceName", - "value" : "{{ _.argo_registry_sts }}", - "description" : "" - }, - { - "id" : "pair_41bcbeecbc064c53a03abff4162ab5ec", - "name" : "version", - "value" : "v1", - "description" : "" - }, - { - "id" : "pair_fa9af878fc574f27b05f9f3c95804c82", - "name" : "kind", - "value" : "StatefulSet", - "description" : "" - }, - { - "id" : "pair_2a2765277f564bb48c1d941d4d0b5c73", - "name" : "namespace", - "value" : "product-traceability-foss", - "description" : "" - } - ], - "headers" : [], - "authentication" : { - "type" : "bearer", - "token" : "{{ _.argo_access_token }}" - }, - "metaSortKey" : -1684236443425.4062, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_1ab94f946bd141d8985c1b9afb34f478", - "parentId" : "fld_6970951b3fef4025ac4c41654e077d32", - "modified" : 1684742068488, - "created" : 1684742068488, - "url" : "{{ _.argo_url }}/applications/{{ _.argo_registry }}/resource?group=apps&force=false&orphan=false", - "name" : "Delete Deployment cx-registry", - "description" : "", - "method" : "DELETE", - "body" : {}, - "parameters" : [ - { - "id" : "pair_3e8424fd92d84a758c7a6fbbc275e3c9", - "name" : "resourceName", - "value" : "{{ _.argo_registry_deployment_registry_resourcename }}", - "description" : "" - }, - { - "id" : "pair_41bcbeecbc064c53a03abff4162ab5ec", - "name" : "version", - "value" : "v1", - "description" : "" - }, - { - "id" : "pair_fa9af878fc574f27b05f9f3c95804c82", - "name" : "kind", - "value" : "Deployment", - "description" : "" - }, - { - "id" : "pair_2a2765277f564bb48c1d941d4d0b5c73", - "name" : "namespace", - "value" : "product-traceability-foss", - "description" : "" - } - ], - "headers" : [], - "authentication" : { - "type" : "bearer", - "token" : "{{ _.argo_access_token }}" - }, - "metaSortKey" : -1684236443384, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_8e84bc191c7b4b278036437323448247", - "parentId" : "fld_4b5cea39a9394a19b43fdc516352342d", - "modified" : 1684742068527, - "created" : 1684742068527, - "url" : "{{ _.argo_url }}/applications/{{ _.argo_registry }}/resource-tree", - "name" : "Health Check Registry", - "description" : "### PVCs Health Status -> *{% response 'body', 'req_a3a1197b0b0448aa87918ffb87b15d06', 'b64::JC5ub2Rlc1s/KEAua2luZD09J1BlcnNpc3RlbnRWb2x1bWVDbGFpbScpXS5oZWFsdGguc3RhdHVz::46b', 'never', 60 %}*\n\n### Pods Health Status -> *{% response 'body', 'req_a3a1197b0b0448aa87918ffb87b15d06', 'b64::JC5ub2Rlc1s/KEAua2luZD09J1BvZCcpXS5oZWFsdGguc3RhdHVz::46b', 'never', 60 %}*\n\n### Deployments Health Status -> *{% response 'body', 'req_a55219333dba47cd867953e88d7f28fd', 'b64::JC5ub2Rlc1s/KEAua2luZD09J0RlcGxveW1lbnQnKV0uaGVhbHRoLnN0YXR1cw==::46b', 'never', 60 %}*\n", - "method" : "GET", - "body" : {}, - "parameters" : [], - "headers" : [], - "authentication" : { - "type" : "bearer", - "token" : "{{ _.argo_access_token }}" - }, - "metaSortKey" : -1684236443459, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_cac4a3ad540c44b3abd4a1bfa37c4f6a", - "parentId" : "fld_4b5cea39a9394a19b43fdc516352342d", - "modified" : 1684742068563, - "created" : 1684742068563, - "url" : "{{ _.argo_url }}/applications/{{ _.argo_registry }}/sync", - "name" : "Sync Registry", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "{\n\t\"appNamespace\": \"argocd\",\n\t\"revision\": \"helm-environments\",\n\t\"prune\": true,\n\t\"dryRun\": false,\n\t\"strategy\": {\n\t\t\"hook\": {\n\t\t\t\"force\": false\n\t\t}\n\t},\n\t\"resources\": null,\n\t\"syncOptions\": {\n\t\t\"items\": [\n\t\t\t\"Replace=true\"\n\t\t]\n\t}\n}" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{{ _.argo_access_token }}" - }, - "metaSortKey" : -1684236443409, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_bd6ee8cced224ee280c4d3241b28143b", - "parentId" : "fld_87330fb36e814e25907a9c5f88ea0d74", - "modified" : 1684742068304, - "created" : 1684742068304, - "url" : "{{ _.baseUrl }}/api/edc/notification/contract", - "name" : "CreateNotificationContract Receive", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "{\n\"notificationType\": \"QUALITY_INVESTIGATION\", \"notificationMethod\": \"RECEIVE\"\n}\n" - }, - "parameters" : [], - "headers" : [ - { - "id" : "pair_e91fcc496b5744beb35d556b287863c3", - "name" : "Content-Type", - "value" : "application/json", - "description" : "", - "disabled" : false - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_14fe7a99385f4bc9bf4cfb9c7c53d3a1', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678423983844.7969, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "fld_87330fb36e814e25907a9c5f88ea0d74", - "parentId" : "wrk_f9bd4e398c274e41b35f14904699d120", - "modified" : 1684742068288, - "created" : 1684742068288, - "name" : "Trace-X Contracts", - "description" : "", - "environment" : {}, - "environmentPropertyOrder" : null, - "metaSortKey" : -1683225816817, - "_type" : "request_group" - }, - { - "_id" : "req_9229f2ea4dc74ada88c9072c8b4f2b05", - "parentId" : "fld_87330fb36e814e25907a9c5f88ea0d74", - "modified" : 1684742068339, - "created" : 1684742068339, - "url" : "{{ _.baseUrl }}/api/edc/notification/contract", - "name" : "CreateNotificationContract Update", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "{\"notificationType\" : \"QUALITY_INVESTIGATION\", \"notificationMethod\" : \"UPDATE\"}" - }, - "parameters" : [], - "headers" : [ - { - "id" : "pair_7751eec7ba734c80930d24c87da5d114", - "name" : "Content-Type", - "value" : "application/json", - "description" : "" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_14fe7a99385f4bc9bf4cfb9c7c53d3a1', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678423983794.7969, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_0d2bbc51091f445193989d7eb019f8fd", - "parentId" : "fld_0ae28c07dda448cf85f05e821bd98ebc", - "modified" : 1682686487577, - "created" : 1682514812813, - "url" : "{{ _.baseUrl }}/api/bpn-config", - "name" : "FindAll", - "description" : "", - "method" : "GET", - "body" : {}, - "parameters" : [], - "headers" : [], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_14fe7a99385f4bc9bf4cfb9c7c53d3a1', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'always', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1682514812813, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "fld_0ae28c07dda448cf85f05e821bd98ebc", - "parentId" : "wrk_f9bd4e398c274e41b35f14904699d120", - "modified" : 1682514811574, - "created" : 1681728488551, - "name" : "BPN-Mapping", - "description" : "", - "environment" : {}, - "environmentPropertyOrder" : null, - "metaSortKey" : -1681728488551, - "_type" : "request_group" - }, - { - "_id" : "req_4e80ea406a2a4d36af45e3749fb65554", - "parentId" : "fld_0ae28c07dda448cf85f05e821bd98ebc", - "modified" : 1684829268483, - "created" : 1682686509302, - "url" : "{{ _.baseUrl }}/api/bpn-config/BPNL00000003CNKC", - "name" : "DeleteById", - "description" : "", - "method" : "DELETE", - "body" : {}, - "parameters" : [], - "headers" : [], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_14fe7a99385f4bc9bf4cfb9c7c53d3a1', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'always', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1682473292686.25, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_df4f5f5b44bc49879f1079057d82293c", - "parentId" : "fld_0ae28c07dda448cf85f05e821bd98ebc", - "modified" : 1684829274393, - "created" : 1682686495654, - "url" : "{{ _.baseUrl }}/api/bpn-config", - "name" : "SaveAll", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "[\n\t{\n\t\t\"bpn\": \"BPNL00000003CML1\",\n\t\t\"url\": \"https://tracex-consumer-controlplane-e2e-a.dev.demo.catena-x.net\"\n\t},\n\t{\n\t\t\"bpn\": \"BPNL00000003CNKC\",\n\t\t\"url\": \"https://tracex-consumer-controlplane-e2e-b.dev.demo.catena-x.net\"\n\t}\n]" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_14fe7a99385f4bc9bf4cfb9c7c53d3a1', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'always', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1682431772559.5, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_8c4aa01da3b1453785e308e2b3337449", - "parentId" : "fld_0ae28c07dda448cf85f05e821bd98ebc", - "modified" : 1684828752059, - "created" : 1682686503749, - "url" : "{{ _.baseUrl }}/api/bpn-config", - "name" : "UpdateAll", - "description" : "", - "method" : "PUT", - "body" : { - "mimeType" : "application/json", - "text" : "[\n\t{\n\t\t\"bpn\": \"BPNL00000003CML1\",\n\t\t\"url\": \"https://tracex-consumer-controlplane-e2e-b.dev.demo.catena-x.net\"\n\t},\n\t{\n\t\t\"bpn\": \"BPNL00000003CNKC\",\n\t\t\"url\": \"https://tracex-consumer-controlplane-e2e-a.dev.demo.catena-x.net\"\n\t}\n]" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_14fe7a99385f4bc9bf4cfb9c7c53d3a1', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'always', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1682390252432.75, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_1d793794104d4c0c8c203e18ed1b7272", - "parentId" : "fld_85ff4a62f6954f3bb96d63d0422acf49", - "modified" : 1684742068094, - "created" : 1684742068094, - "url" : "{{ _.registry }}/semantics/registry/registry/shell-descriptors", - "name" : "RetrieveShellDescriptors", - "description" : "", - "method" : "GET", - "body" : {}, - "parameters" : [], - "headers" : [], - "authentication" : {}, - "metaSortKey" : -1681385637898, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "fld_85ff4a62f6954f3bb96d63d0422acf49", - "parentId" : "wrk_f9bd4e398c274e41b35f14904699d120", - "modified" : 1684742068077, - "created" : 1684742068077, - "name" : "DT-Registry", - "description" : "", - "environment" : {}, - "environmentPropertyOrder" : null, - "metaSortKey" : -1681385636476, - "_type" : "request_group" - }, - { - "_id" : "req_731bd9dd9fe64c0eb66111196bb0749e", - "parentId" : "fld_2b146671f9a34eaeabcec303a9b491f1", - "modified" : 1684095037067, - "created" : 1682348732306, - "url" : "{{ _.baseUrlEdcConsumerDev }}/api/v1/management/catalog/request", - "name" : "Catalog", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "{\n\t\"providerUrl\": \"https://trace-x-test-edc.dev.demo.catena-x.net/api/v1/ids/data\",\n\t\"querySpec\": {\n\t\t\"limit\": 1000\n\t}\n\t\n}\n\n\n" - }, - "parameters" : [], - "headers" : [ - { - "name" : "x-api-key", - "value" : "{{ _.edc_api_auth_key_dev }}", - "id" : "pair_6838a24d992a44e4bad61636766ca65d" - }, - { - "id" : "pair_fb11ac85a34246c5b6a8988b9ec55a71", - "name" : "content-type", - "value" : "application/json", - "description" : "" - }, - { - "id" : "pair_b9a20d0b01584ebe911b160d8b375edc", - "name" : "accept", - "value" : "\"/\"", - "description" : "", - "disabled" : true - } - ], - "authentication" : {}, - "metaSortKey" : -1682348732306, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "fld_2b146671f9a34eaeabcec303a9b491f1", - "parentId" : "wrk_f9bd4e398c274e41b35f14904699d120", - "modified" : 1681306081567, - "created" : 1681306081567, - "name" : "EDC", - "description" : "", - "environment" : {}, - "environmentPropertyOrder" : null, - "metaSortKey" : -1681306081567, - "_type" : "request_group" - }, - { - "_id" : "req_74d45a2d11754712b5a67f851eb722a7", - "parentId" : "fld_2b146671f9a34eaeabcec303a9b491f1", - "modified" : 1684161564403, - "created" : 1683225997187, - "url" : "https://tracex-consumer-controlplane-e2e-a.dev.demo.catena-x.net/api/v1/management/catalog/request", - "name" : "Catalog_with_filter_assetId", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "{\n\t\"providerUrl\": \"https://trace-x-edc-e2e-b.dev.demo.catena-x.net/api/v1/ids/data\",\n\t\"querySpec\": {\n\t\t\"limit\": 1000\n\t}\n\t\n}\n\n\n" - }, - "parameters" : [], - "headers" : [ - { - "name" : "x-api-key", - "value" : "{{ _.edc_api_auth_key_dev }}", - "id" : "pair_6838a24d992a44e4bad61636766ca65d" - }, - { - "id" : "pair_fb11ac85a34246c5b6a8988b9ec55a71", - "name" : "content-type", - "value" : "application/json", - "description" : "" - }, - { - "id" : "pair_b9a20d0b01584ebe911b160d8b375edc", - "name" : "accept", - "value" : "\"/\"", - "description" : "", - "disabled" : true - } - ], - "authentication" : {}, - "metaSortKey" : -1682107958704, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_bc978b35564843be8c8a4efed534192a", - "parentId" : "fld_2b146671f9a34eaeabcec303a9b491f1", - "modified" : 1684755758280, - "created" : 1683553577783, - "url" : "https://tracex-consumer-controlplane-e2e-b.dev.demo.catena-x.net/api/v1/management/catalog/request", - "name" : "Catalog_E2E-A-to-E2E-B", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "{\n\t\"providerUrl\": \"https://trace-x-edc-e2e-b.dev.demo.catena-x.net/api/v1/ids/data\",\n\t\"querySpec\": {\n\t\t\"limit\": 1000\n\t}\n}\n\n\n" - }, - "parameters" : [], - "headers" : [ - { - "name" : "x-api-key", - "value" : "{{ _.edc_api_auth_key_dev }}", - "id" : "pair_6838a24d992a44e4bad61636766ca65d" - }, - { - "id" : "pair_fb11ac85a34246c5b6a8988b9ec55a71", - "name" : "content-type", - "value" : "application/json", - "description" : "" - }, - { - "id" : "pair_b9a20d0b01584ebe911b160d8b375edc", - "name" : "accept", - "value" : "\"/\"", - "description" : "", - "disabled" : true - } - ], - "authentication" : {}, - "metaSortKey" : -1681626411500, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_a3913f21b406474f9603a37fdcf3e966", - "parentId" : "fld_2b146671f9a34eaeabcec303a9b491f1", - "modified" : 1684755922021, - "created" : 1684149834854, - "url" : "https://tracex-consumer-controlplane-e2e-b.dev.demo.catena-x.net/api/v1/management/catalog/request", - "name" : "Catalog_E2E-B-to-E2E-A", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "{\n\t\"providerUrl\": \"https://trace-x-edc-e2e-a.dev.demo.catena-x.net/api/v1/ids/data\",\n\t\"querySpec\": {\n\t\t\"limit\": 1000\n\t}\n}\n\n\n" - }, - "parameters" : [], - "headers" : [ - { - "name" : "x-api-key", - "value" : "{{ _.edc_api_auth_key_dev }}", - "id" : "pair_6838a24d992a44e4bad61636766ca65d" - }, - { - "id" : "pair_fb11ac85a34246c5b6a8988b9ec55a71", - "name" : "content-type", - "value" : "application/json", - "description" : "" - }, - { - "id" : "pair_b9a20d0b01584ebe911b160d8b375edc", - "name" : "accept", - "value" : "\"/\"", - "description" : "", - "disabled" : true - } - ], - "authentication" : {}, - "metaSortKey" : -1681506024699, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_6bac783d1c8f411d98bc448e3a051ebb", - "parentId" : "fld_722aeeaceb344fd088d972060909b41f", - "modified" : 1683727280404, - "created" : 1681302844788, - "url" : "{{ _.base_url_portal_int }}/api/administration/connectors/discovery", - "name" : "DiscoveryService", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "[\"BPNL00000003CNKC\"]\n\n\n" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json" - } - ], - "authentication" : { - "type" : "oauth2", - "grantType" : "client_credentials", - "accessTokenUrl" : "{{ _.base_url_central_idp_global }}/auth/realms/CX-Central/protocol/openid-connect/token", - "clientId" : "{{ _.portal_client_int }}", - "clientSecret" : "{{ _.portal_secret_int }}" - }, - "metaSortKey" : -1681302844788, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "fld_722aeeaceb344fd088d972060909b41f", - "parentId" : "wrk_f9bd4e398c274e41b35f14904699d120", - "modified" : 1681302843541, - "created" : 1681302843541, - "name" : "Portal", - "description" : "", - "environment" : {}, - "environmentPropertyOrder" : null, - "metaSortKey" : -1681302843541, - "_type" : "request_group" - }, - { - "_id" : "req_8067720d7f974b64802f1e0b23c35b3c", - "parentId" : "fld_f8c5028732cf45db9105ccdcc940484c", - "modified" : 1684837543458, - "created" : 1684742067686, - "url" : "{{ _.irsBaseUrl }}/irs/jobs", - "name" : "RegisterJob", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "{\n \"aspects\": [\n \"AssemblyPartRelationship\",\n\t\t\t \"SerialPartTypization\",\n\t\t\t \"Batch\"\n ],\n \"bomLifecycle\":\"asBuilt\",\n \"collectAspects\": true,\n \"direction\":\"downward\",\n \"depth\":2,\n \"globalAssetId\": \"urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36e22\"\n} " - }, - "parameters" : [], - "headers" : [ - { - "id" : "pair_8345d381d2b244d9b948fd1245052bcd", - "name" : "Content-Type", - "value" : "application/json", - "description" : "" - } - ], - "authentication" : { - "type" : "oauth2", - "grantType" : "client_credentials", - "accessTokenUrl" : "{{ _.base_url_central_idp_global }}/auth/realms/CX-Central/protocol/openid-connect/token", - "clientSecret" : "{{ _.irs_client_secret_int }}", - "clientId" : "{{ _.client_id }}" - }, - "metaSortKey" : -1681279818545, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "fld_f8c5028732cf45db9105ccdcc940484c", - "parentId" : "wrk_f9bd4e398c274e41b35f14904699d120", - "modified" : 1684742067669, - "created" : 1684742067669, - "name" : "IRS", - "description" : "", - "environment" : {}, - "environmentPropertyOrder" : null, - "metaSortKey" : -1681225712903, - "_type" : "request_group" - }, - { - "_id" : "req_3f5b4de679ed4df8b35063f8aec8e9cb", - "parentId" : "fld_f8c5028732cf45db9105ccdcc940484c", - "modified" : 1685624486065, - "created" : 1684742067728, - "url" : "{{ _.irsBaseUrl }}/irs/jobs/2d9c4ace-1137-4038-adc5-bbb138ee2301", - "name" : "GetJobDetails", - "description" : "", - "method" : "GET", - "body" : {}, - "parameters" : [], - "headers" : [ - { - "id" : "pair_cc52c379ff4b470e95f46be30ecf8a34", - "name" : "Content-Type", - "value" : "application/json", - "description" : "" - } - ], - "authentication" : { - "type" : "oauth2", - "grantType" : "client_credentials", - "clientSecret" : "{{ _.irs_client_secret }}", - "accessTokenUrl" : "{{ _.base_url_central_idp_global }}/auth/realms/CX-Central/protocol/openid-connect/token", - "clientId" : "{{ _.client_id }}" - }, - "metaSortKey" : -1680373302447.5, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_cea5fdfec453486b85f2eab8f0c45bdf", - "parentId" : "fld_f8c5028732cf45db9105ccdcc940484c", - "modified" : 1685622649986, - "created" : 1684742067776, - "url" : "{{ _.irsBaseUrl }}/irs/aspectmodels", - "name" : "Aspectmodels", - "description" : "", - "method" : "GET", - "body" : {}, - "parameters" : [], - "headers" : [ - { - "id" : "pair_cc52c379ff4b470e95f46be30ecf8a34", - "name" : "Content-Type", - "value" : "application/json", - "description" : "" - } - ], - "authentication" : { - "type" : "oauth2", - "grantType" : "client_credentials", - "accessTokenUrl" : "{{ _.base_url_central_idp_global }}/auth/realms/CX-Central/protocol/openid-connect/token", - "clientId" : "{{ _.client_id }}", - "clientSecret" : "{{ _.irs_client_secret }}" - }, - "metaSortKey" : -1679920044398.75, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_9f8256f417f3410b87cc0872acd4ddd3", - "parentId" : "fld_755e13bbdf894d999d1ea90dd93c50e7", - "modified" : 1685624278285, - "created" : 1678889920351, - "url" : "{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token", - "name" : "RetrieveAccessToken", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/x-www-form-urlencoded", - "params" : [ - { - "id" : "pair_56879c89b0034ed181ea9b12c85bac06", - "name" : "grant_type", - "value" : "client_credentials", - "description" : "" - }, - { - "id" : "pair_9ca0b1ecf7e3466ea400f90537950e0e", - "name" : "client_id", - "value" : "{{ _.client_id }}", - "description" : "", - "disabled" : false - }, - { - "id" : "pair_762b17f59d874af2a53a7e7afbe319f0", - "name" : "client_secret", - "value" : "{{ _.client_secret }}", - "description" : "" - } - ] - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/x-www-form-urlencoded" - } - ], - "authentication" : { - "type" : "apikey", - "disabled" : true, - "key" : "", - "value" : "", - "addTo" : "header" - }, - "metaSortKey" : -1678372717854.875, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "fld_755e13bbdf894d999d1ea90dd93c50e7", - "parentId" : "wrk_f9bd4e398c274e41b35f14904699d120", - "modified" : 1678891513163, - "created" : 1678891506121, - "name" : "Authentication", - "description" : "", - "environment" : {}, - "environmentPropertyOrder" : null, - "metaSortKey" : -1678891506121, - "_type" : "request_group" - }, - { - "_id" : "req_48cc72f29ef24ef2806184dc817528d1", - "parentId" : "fld_755e13bbdf894d999d1ea90dd93c50e7", - "modified" : 1684837637566, - "created" : 1681225716310, - "url" : "{{ _.base_url_central_idp_global }}/auth/realms/CX-Central/protocol/openid-connect/certs", - "name" : "Cert (Int)", - "description" : "", - "method" : "GET", - "body" : {}, - "parameters" : [], - "headers" : [], - "authentication" : {}, - "metaSortKey" : -1678372717804.875, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_32f81e1c1efd483da02d9ea2fdbb9530", - "parentId" : "fld_954fcedc178b4fc7a8bf0c873a83b134", - "modified" : 1685622610138, - "created" : 1678443692900, - "url" : "{{ _.baseUrl }}/api/investigations", - "name" : "Create", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "{\n\t\"partIds\": {{ _.assetId }},\n \"description\":\"{% now 'iso-8601', '' %}-requested-by-max\",\n\t\"severity\": \"LIFE-THREATENING\",\n \"targetDate\": \"2024-02-04T13:48:54Z\" \n}" - }, - "parameters" : [], - "headers" : [ - { - "name" : "authority", - "value" : "traceability.dev.demo.catena-x.net", - "id" : "pair_dc7bb20cc17c4f7fb50fa286d6d657e8" - }, - { - "name" : "accept", - "value" : "application/json, text/plain, */*", - "id" : "pair_d9d500857d164605903cbd2d2a277971" - }, - { - "name" : "accept-language", - "value" : "de-DE,de;q=0.9,en-US;q=0.8,en;q=0.7", - "id" : "pair_d32282df29524f8fad00dbfbc96e48e2" - }, - { - "name" : "access", - "value" : "application/json", - "id" : "pair_cc17f507446943c48b486380cd749238" - }, - { - "name" : "content-type", - "value" : "application/json", - "id" : "pair_d6cbe8ea35de4df285bbfedb6fd1e564" - }, - { - "name" : "origin", - "value" : "https://traceability-portal.dev.demo.catena-x.net", - "id" : "pair_4aefeb69f30443a0adf9e010794ccf1b" - }, - { - "name" : "referer", - "value" : "https://traceability-portal.dev.demo.catena-x.net/", - "id" : "pair_a53c45fdeb1941e3bbc349bcea22e82c" - }, - { - "name" : "sec-ch-ua", - "value" : "\"Google Chrome\";v=\"111\", \"Not(A:Brand\";v=\"8\", \"Chromium\";v=\"111\"", - "id" : "pair_6b261299b5cc400ab58c3769aa7d019e" - }, - { - "name" : "sec-ch-ua-mobile", - "value" : "?0", - "id" : "pair_1545e26232144e8d90e266475d839866" - }, - { - "name" : "sec-ch-ua-platform", - "value" : "\"Windows\"", - "id" : "pair_03bff76c5bc74e51a8dd942d50cf6007" - }, - { - "name" : "sec-fetch-dest", - "value" : "empty", - "id" : "pair_534ac4a137d64410b39436125a79ad43" - }, - { - "name" : "sec-fetch-mode", - "value" : "cors", - "id" : "pair_1e734755f88d45e4bbac284ed7a25b1b" - }, - { - "name" : "sec-fetch-site", - "value" : "same-site", - "id" : "pair_c5394aea2dbb428ea723b97faa54d467" - }, - { - "name" : "user-agent", - "value" : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36", - "id" : "pair_f1ac2ccd605a406ca21ed6fcb2171af2" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_9f8256f417f3410b87cc0872acd4ddd3', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678426183021.625, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "fld_954fcedc178b4fc7a8bf0c873a83b134", - "parentId" : "wrk_f9bd4e398c274e41b35f14904699d120", - "modified" : 1678443502032, - "created" : 1678443494124, - "name" : "Investigations", - "description" : "", - "environment" : {}, - "environmentPropertyOrder" : null, - "metaSortKey" : -1678408018961.5, - "_type" : "request_group" - }, - { - "_id" : "req_c06e3658cb6346ca952b906927b0795d", - "parentId" : "fld_954fcedc178b4fc7a8bf0c873a83b134", - "modified" : 1680534726183, - "created" : 1678994885972, - "url" : "{{ _.baseUrl }}/api/investigations/{% response 'body', 'req_52a0d24879db45a69d185e0c67b9f433', 'b64::JC5pZA==::46b', 'never', 60 %}/close", - "name" : "Close", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "{\"reason\":\"This is the close reason by max.\"}" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json", - "id" : "pair_b3b659435cf14b77bded0cc87474005c" - }, - { - "id" : "pair_36d23ffc465a4cc28982c48f0440d8c3", - "name" : "Accept", - "value" : "application/json, text/plain, */*", - "description" : "" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_14fe7a99385f4bc9bf4cfb9c7c53d3a1', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678421784717.9688, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_133f2155ab4b44759c0f0d00a8adc987", - "parentId" : "fld_954fcedc178b4fc7a8bf0c873a83b134", - "modified" : 1679131686163, - "created" : 1678443523796, - "url" : "{{ _.baseUrl }}/api/investigations/{% response 'body', 'req_52a0d24879db45a69d185e0c67b9f433', 'b64::JC5pZA==::46b', 'never', 60 %}/approve", - "name" : "Approve", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "{\n\t\"partIds\": {{ _.assetId }},\n\"description\":\"test\"}" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json", - "id" : "pair_b3b659435cf14b77bded0cc87474005c" - }, - { - "id" : "pair_36d23ffc465a4cc28982c48f0440d8c3", - "name" : "Accept", - "value" : "application/json, text/plain, */*", - "description" : "" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_14fe7a99385f4bc9bf4cfb9c7c53d3a1', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678417386414.3125, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_5d9b177576a84979b8f987abf673506d", - "parentId" : "fld_954fcedc178b4fc7a8bf0c873a83b134", - "modified" : 1685622236200, - "created" : 1678372844863, - "url" : "{{ _.baseUrl }}/api/investigations/received?page=0&size=5", - "name" : "Received", - "description" : "", - "method" : "GET", - "body" : { - "mimeType" : "application/json", - "text" : "" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_9f8256f417f3410b87cc0872acd4ddd3', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678408589807, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_5151c917f26b4a85a82ca7c88a5862a6", - "parentId" : "fld_954fcedc178b4fc7a8bf0c873a83b134", - "modified" : 1678954718656, - "created" : 1678444754820, - "url" : "{{ _.baseUrl }}/api/investigations/created?page=0&size=20", - "name" : "Created", - "description" : "", - "method" : "GET", - "body" : { - "mimeType" : "application/json", - "text" : "" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_14fe7a99385f4bc9bf4cfb9c7c53d3a1', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678390691884.375, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_b25fd6d19cdd48f9aecb30e715afee44", - "parentId" : "fld_954fcedc178b4fc7a8bf0c873a83b134", - "modified" : 1678954727074, - "created" : 1678456288470, - "url" : "{{ _.baseUrl }}/api/investigations/80", - "name" : "InvestigationById", - "description" : "", - "method" : "GET", - "body" : { - "mimeType" : "application/json", - "text" : "" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_14fe7a99385f4bc9bf4cfb9c7c53d3a1', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678381742923.0625, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_2502eaadcf2b436abd0befb313e57982", - "parentId" : "fld_954fcedc178b4fc7a8bf0c873a83b134", - "modified" : 1684243804289, - "created" : 1678444421749, - "url" : "{{ _.baseUrl }}/api/investigations/{% response 'body', 'req_5a892acf8c654d9b855cd5b88c63e182', 'b64::JC5jb250ZW50WzBdLmlk::46b', 'never', 60 %}/update", - "name" : "Acknowledge (Takes Id from Received)", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "{ \n\t\"reason\": \"\", \n\t\"status\": \"ACKNOWLEDGED\"\n}" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_14fe7a99385f4bc9bf4cfb9c7c53d3a1', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678372793961.75, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_fcbeed87865048de86465551bf1bd8d5", - "parentId" : "fld_954fcedc178b4fc7a8bf0c873a83b134", - "modified" : 1683294270125, - "created" : 1678893031171, - "url" : "{{ _.baseUrl }}/api/investigations/{% response 'body', 'req_5a892acf8c654d9b855cd5b88c63e182', 'b64::JC5jb250ZW50WzBdLmlk::46b', 'never', 60 %}/update", - "name" : "Accepted (Takes Id from Received)", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "{ \n \"reason\":\"{% now 'iso-8601', '' %}-accepted-by-max\",\n\t\"status\": \"ACCEPTED\"\n}" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_14fe7a99385f4bc9bf4cfb9c7c53d3a1', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678372755908.3125, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_047ba64a58b641fdbfebb94fe9d380fc", - "parentId" : "fld_954fcedc178b4fc7a8bf0c873a83b134", - "modified" : 1678893251921, - "created" : 1678893088697, - "url" : "{{ _.baseUrl }}/api/investigations/{% response 'body', 'req_5a892acf8c654d9b855cd5b88c63e182', 'b64::JC5jb250ZW50WzBdLmlk::46b', 'never', 60 %}/update", - "name" : "Declined (Takes Id from Received)", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "{ \n \"reason\":\"{% now 'iso-8601', '' %}-declined-by-max\",\n\t\"status\": \"DECLINED\"\n}" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_14fe7a99385f4bc9bf4cfb9c7c53d3a1', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678372736881.5938, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_e66a3859263149bb8090a2e47ce2a5b2", - "parentId" : "fld_17575ba956f84873969a1890ab747c4d", - "modified" : 1685433959143, - "created" : 1685433509004, - "url" : "{{ _.baseUrl }}/api/alerts", - "name" : "Create", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "{\n\t\"partIds\": {{ _.assetId }},\n \"description\":\"{% now 'iso-8601', '' %}-requested-by-max\",\n\t\"severity\": \"LIFE-THREATENING\",\n \"targetDate\": \"2024-02-04T13:48:54Z\" \n}" - }, - "parameters" : [], - "headers" : [ - { - "name" : "authority", - "value" : "traceability.dev.demo.catena-x.net", - "id" : "pair_dc7bb20cc17c4f7fb50fa286d6d657e8" - }, - { - "name" : "accept", - "value" : "application/json, text/plain, */*", - "id" : "pair_d9d500857d164605903cbd2d2a277971" - }, - { - "name" : "accept-language", - "value" : "de-DE,de;q=0.9,en-US;q=0.8,en;q=0.7", - "id" : "pair_d32282df29524f8fad00dbfbc96e48e2" - }, - { - "name" : "access", - "value" : "application/json", - "id" : "pair_cc17f507446943c48b486380cd749238" - }, - { - "name" : "content-type", - "value" : "application/json", - "id" : "pair_d6cbe8ea35de4df285bbfedb6fd1e564" - }, - { - "name" : "origin", - "value" : "https://traceability-portal.dev.demo.catena-x.net", - "id" : "pair_4aefeb69f30443a0adf9e010794ccf1b" - }, - { - "name" : "referer", - "value" : "https://traceability-portal.dev.demo.catena-x.net/", - "id" : "pair_a53c45fdeb1941e3bbc349bcea22e82c" - }, - { - "name" : "sec-ch-ua", - "value" : "\"Google Chrome\";v=\"111\", \"Not(A:Brand\";v=\"8\", \"Chromium\";v=\"111\"", - "id" : "pair_6b261299b5cc400ab58c3769aa7d019e" - }, - { - "name" : "sec-ch-ua-mobile", - "value" : "?0", - "id" : "pair_1545e26232144e8d90e266475d839866" - }, - { - "name" : "sec-ch-ua-platform", - "value" : "\"Windows\"", - "id" : "pair_03bff76c5bc74e51a8dd942d50cf6007" - }, - { - "name" : "sec-fetch-dest", - "value" : "empty", - "id" : "pair_534ac4a137d64410b39436125a79ad43" - }, - { - "name" : "sec-fetch-mode", - "value" : "cors", - "id" : "pair_1e734755f88d45e4bbac284ed7a25b1b" - }, - { - "name" : "sec-fetch-site", - "value" : "same-site", - "id" : "pair_c5394aea2dbb428ea723b97faa54d467" - }, - { - "name" : "user-agent", - "value" : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36", - "id" : "pair_f1ac2ccd605a406ca21ed6fcb2171af2" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_14fe7a99385f4bc9bf4cfb9c7c53d3a1', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678426183021.625, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "fld_17575ba956f84873969a1890ab747c4d", - "parentId" : "wrk_f9bd4e398c274e41b35f14904699d120", - "modified" : 1685433508994, - "created" : 1685433508994, - "name" : "Alerts", - "description" : "", - "environment" : {}, - "environmentPropertyOrder" : null, - "metaSortKey" : -1678408018936.5, - "_type" : "request_group" - }, - { - "_id" : "req_a01b7d36d3b048e6be0b13c857b0af98", - "parentId" : "fld_17575ba956f84873969a1890ab747c4d", - "modified" : 1685433968163, - "created" : 1685433509021, - "url" : "{{ _.baseUrl }}/api/alerts/{% response 'body', 'req_52a0d24879db45a69d185e0c67b9f433', 'b64::JC5pZA==::46b', 'never', 60 %}/close", - "name" : "Close", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "{\"reason\":\"This is the close reason by max.\"}" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json", - "id" : "pair_b3b659435cf14b77bded0cc87474005c" - }, - { - "id" : "pair_36d23ffc465a4cc28982c48f0440d8c3", - "name" : "Accept", - "value" : "application/json, text/plain, */*", - "description" : "" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_14fe7a99385f4bc9bf4cfb9c7c53d3a1', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678421784717.9688, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_dd3391c164644b4db7f4611ab1c6c2db", - "parentId" : "fld_17575ba956f84873969a1890ab747c4d", - "modified" : 1685433979823, - "created" : 1685433509002, - "url" : "{{ _.baseUrl }}/api/alerts/{% response 'body', 'req_52a0d24879db45a69d185e0c67b9f433', 'b64::JC5pZA==::46b', 'never', 60 %}/approve", - "name" : "Approve", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "{\n\t\"partIds\": {{ _.assetId }},\n\"description\":\"test\"}" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json", - "id" : "pair_b3b659435cf14b77bded0cc87474005c" - }, - { - "id" : "pair_36d23ffc465a4cc28982c48f0440d8c3", - "name" : "Accept", - "value" : "application/json, text/plain, */*", - "description" : "" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_14fe7a99385f4bc9bf4cfb9c7c53d3a1', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678417386414.3125, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_eb9f2ea25429497ea63166c59bcd0034", - "parentId" : "fld_17575ba956f84873969a1890ab747c4d", - "modified" : 1685622213083, - "created" : 1685433508998, - "url" : "{{ _.baseUrl }}/api/alerts/received?page=0", - "name" : "Received", - "description" : "", - "method" : "GET", - "body" : { - "mimeType" : "application/json", - "text" : "" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_9f8256f417f3410b87cc0872acd4ddd3', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678408589807, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_114ed59852a84d1bbd5bb352638bebbe", - "parentId" : "fld_17575ba956f84873969a1890ab747c4d", - "modified" : 1685433994217, - "created" : 1685433509009, - "url" : "{{ _.baseUrl }}/api/alerts/created?page=0&size=20", - "name" : "Created", - "description" : "", - "method" : "GET", - "body" : { - "mimeType" : "application/json", - "text" : "" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_14fe7a99385f4bc9bf4cfb9c7c53d3a1', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678390691884.375, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_abe70abdb09c4490852d1e8100201cad", - "parentId" : "fld_17575ba956f84873969a1890ab747c4d", - "modified" : 1685434016675, - "created" : 1685433509011, - "url" : "{{ _.baseUrl }}/api/alerts/80", - "name" : "AlertById", - "description" : "", - "method" : "GET", - "body" : { - "mimeType" : "application/json", - "text" : "" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_14fe7a99385f4bc9bf4cfb9c7c53d3a1', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678381742923.0625, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_9ae825257b9a4be991b834496c328cec", - "parentId" : "fld_17575ba956f84873969a1890ab747c4d", - "modified" : 1685434026411, - "created" : 1685433509007, - "url" : "{{ _.baseUrl }}/api/alerts/{% response 'body', 'req_5a892acf8c654d9b855cd5b88c63e182', 'b64::JC5jb250ZW50WzBdLmlk::46b', 'never', 60 %}/update", - "name" : "Acknowledge (Takes Id from Received)", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "{ \n\t\"reason\": \"\", \n\t\"status\": \"ACKNOWLEDGED\"\n}" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_14fe7a99385f4bc9bf4cfb9c7c53d3a1', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678372793961.75, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_2026774e5f754bf29f8b3871a21cddbf", - "parentId" : "fld_17575ba956f84873969a1890ab747c4d", - "modified" : 1685434030696, - "created" : 1685433509014, - "url" : "{{ _.baseUrl }}/api/alerts/{% response 'body', 'req_5a892acf8c654d9b855cd5b88c63e182', 'b64::JC5jb250ZW50WzBdLmlk::46b', 'never', 60 %}/update", - "name" : "Accepted (Takes Id from Received)", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "{ \n \"reason\":\"{% now 'iso-8601', '' %}-accepted-by-max\",\n\t\"status\": \"ACCEPTED\"\n}" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_14fe7a99385f4bc9bf4cfb9c7c53d3a1', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678372755908.3125, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_141d662aa3d14f8887d29ccc1f824b8a", - "parentId" : "fld_17575ba956f84873969a1890ab747c4d", - "modified" : 1685434034757, - "created" : 1685433509016, - "url" : "{{ _.baseUrl }}/api/alerts/{% response 'body', 'req_5a892acf8c654d9b855cd5b88c63e182', 'b64::JC5jb250ZW50WzBdLmlk::46b', 'never', 60 %}/update", - "name" : "Declined (Takes Id from Received)", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "{ \n \"reason\":\"{% now 'iso-8601', '' %}-declined-by-max\",\n\t\"status\": \"DECLINED\"\n}" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_14fe7a99385f4bc9bf4cfb9c7c53d3a1', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678372736881.5938, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_25d1ae2e4ac04d508a74fb2519e30e62", - "parentId" : "fld_93c7b63f3e474b9099758b4e4ad20f19", - "modified" : 1684742067490, - "created" : 1684742067490, - "url" : "{{ _.baseUrl }}/api/assets/sync", - "name" : "Sync", - "description" : "", - "method" : "POST", - "body" : { - "mimeType" : "application/json", - "text" : "{\n\t\"globalAssetIds\": [\"urn:uuid:6d9be5cc-6eff-47f8-bcc6-f6c639c932cf\"]\n}" - }, - "parameters" : [], - "headers" : [ - { - "name" : "authority", - "value" : "traceability.dev.demo.catena-x.net", - "id" : "pair_dc7bb20cc17c4f7fb50fa286d6d657e8" - }, - { - "name" : "accept", - "value" : "application/json, text/plain, */*", - "id" : "pair_d9d500857d164605903cbd2d2a277971" - }, - { - "name" : "accept-language", - "value" : "de-DE,de;q=0.9,en-US;q=0.8,en;q=0.7", - "id" : "pair_d32282df29524f8fad00dbfbc96e48e2" - }, - { - "name" : "access", - "value" : "application/json", - "id" : "pair_cc17f507446943c48b486380cd749238" - }, - { - "name" : "content-type", - "value" : "application/json", - "id" : "pair_d6cbe8ea35de4df285bbfedb6fd1e564" - }, - { - "name" : "origin", - "value" : "https://traceability-portal.dev.demo.catena-x.net", - "id" : "pair_4aefeb69f30443a0adf9e010794ccf1b" - }, - { - "name" : "referer", - "value" : "https://traceability-portal.dev.demo.catena-x.net/", - "id" : "pair_a53c45fdeb1941e3bbc349bcea22e82c" - }, - { - "name" : "sec-ch-ua", - "value" : "\"Google Chrome\";v=\"111\", \"Not(A:Brand\";v=\"8\", \"Chromium\";v=\"111\"", - "id" : "pair_6b261299b5cc400ab58c3769aa7d019e" - }, - { - "name" : "sec-ch-ua-mobile", - "value" : "?0", - "id" : "pair_1545e26232144e8d90e266475d839866" - }, - { - "name" : "sec-ch-ua-platform", - "value" : "\"Windows\"", - "id" : "pair_03bff76c5bc74e51a8dd942d50cf6007" - }, - { - "name" : "sec-fetch-dest", - "value" : "empty", - "id" : "pair_534ac4a137d64410b39436125a79ad43" - }, - { - "name" : "sec-fetch-mode", - "value" : "cors", - "id" : "pair_1e734755f88d45e4bbac284ed7a25b1b" - }, - { - "name" : "sec-fetch-site", - "value" : "same-site", - "id" : "pair_c5394aea2dbb428ea723b97faa54d467" - }, - { - "name" : "user-agent", - "value" : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36", - "id" : "pair_f1ac2ccd605a406ca21ed6fcb2171af2" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_14fe7a99385f4bc9bf4cfb9c7c53d3a1', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678423983869.7969, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "fld_93c7b63f3e474b9099758b4e4ad20f19", - "parentId" : "wrk_f9bd4e398c274e41b35f14904699d120", - "modified" : 1684742067475, - "created" : 1684742067475, - "name" : "Assets", - "description" : "", - "environment" : {}, - "environmentPropertyOrder" : null, - "metaSortKey" : -1678408018911.5, - "_type" : "request_group" - }, - { - "_id" : "req_2e9d6512bf65447b9c69e4f3d66abcfb", - "parentId" : "fld_93c7b63f3e474b9099758b4e4ad20f19", - "modified" : 1685624071057, - "created" : 1684742067524, - "url" : "{{ _.baseUrl }}/api/registry/reload", - "name" : "RegistryReload", - "description" : "", - "method" : "GET", - "body" : {}, - "parameters" : [], - "headers" : [ - { - "name" : "authority", - "value" : "traceability.dev.demo.catena-x.net", - "id" : "pair_dc7bb20cc17c4f7fb50fa286d6d657e8" - }, - { - "name" : "accept", - "value" : "application/json, text/plain, */*", - "id" : "pair_d9d500857d164605903cbd2d2a277971" - }, - { - "name" : "accept-language", - "value" : "de-DE,de;q=0.9,en-US;q=0.8,en;q=0.7", - "id" : "pair_d32282df29524f8fad00dbfbc96e48e2" - }, - { - "name" : "access", - "value" : "application/json", - "id" : "pair_cc17f507446943c48b486380cd749238" - }, - { - "name" : "origin", - "value" : "https://traceability-portal.dev.demo.catena-x.net", - "id" : "pair_4aefeb69f30443a0adf9e010794ccf1b" - }, - { - "name" : "referer", - "value" : "https://traceability-portal.dev.demo.catena-x.net/", - "id" : "pair_a53c45fdeb1941e3bbc349bcea22e82c" - }, - { - "name" : "sec-ch-ua", - "value" : "\"Google Chrome\";v=\"111\", \"Not(A:Brand\";v=\"8\", \"Chromium\";v=\"111\"", - "id" : "pair_6b261299b5cc400ab58c3769aa7d019e" - }, - { - "name" : "sec-ch-ua-mobile", - "value" : "?0", - "id" : "pair_1545e26232144e8d90e266475d839866" - }, - { - "name" : "sec-ch-ua-platform", - "value" : "\"Windows\"", - "id" : "pair_03bff76c5bc74e51a8dd942d50cf6007" - }, - { - "name" : "sec-fetch-dest", - "value" : "empty", - "id" : "pair_534ac4a137d64410b39436125a79ad43" - }, - { - "name" : "sec-fetch-mode", - "value" : "cors", - "id" : "pair_1e734755f88d45e4bbac284ed7a25b1b" - }, - { - "name" : "sec-fetch-site", - "value" : "same-site", - "id" : "pair_c5394aea2dbb428ea723b97faa54d467" - }, - { - "name" : "user-agent", - "value" : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36", - "id" : "pair_f1ac2ccd605a406ca21ed6fcb2171af2" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_9f8256f417f3410b87cc0872acd4ddd3', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678423983819.7969, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_4e0c67927c444e20b7c9a9f877acd920", - "parentId" : "fld_93c7b63f3e474b9099758b4e4ad20f19", - "modified" : 1685623814058, - "created" : 1684742067560, - "url" : "{{ _.baseUrl }}/api/assets", - "name" : "Assets", - "description" : "", - "method" : "GET", - "body" : { - "mimeType" : "application/json", - "text" : "" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_9f8256f417f3410b87cc0872acd4ddd3', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678423983769.7969, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_f1f2c095e4e345f1b05a620f20e6f659", - "parentId" : "fld_93c7b63f3e474b9099758b4e4ad20f19", - "modified" : 1684742067595, - "created" : 1684742067595, - "url" : "{{ _.baseUrl }}/api/assets?owner=SUPPLIER", - "name" : "SupplierAssets", - "description" : "", - "method" : "GET", - "body" : { - "mimeType" : "application/json", - "text" : "" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_14fe7a99385f4bc9bf4cfb9c7c53d3a1', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678423434006.8398, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "req_fd55878a69b54920a25b92f8f01d98e3", - "parentId" : "fld_93c7b63f3e474b9099758b4e4ad20f19", - "modified" : 1684742067633, - "created" : 1684742067633, - "url" : "{{ _.baseUrl }}/api/assets/urn:uuid:51ff7c73-34e9-45d4-816c-d92ownerbpna", - "name" : "AssetById", - "description" : "", - "method" : "GET", - "body" : { - "mimeType" : "application/json", - "text" : "" - }, - "parameters" : [], - "headers" : [ - { - "name" : "Content-Type", - "value" : "application/json" - } - ], - "authentication" : { - "type" : "bearer", - "token" : "{% response 'body', 'req_14fe7a99385f4bc9bf4cfb9c7c53d3a1', 'b64::JC5hY2Nlc3NfdG9rZW4=::46b', 'when-expired', 60 %}", - "prefix" : "Bearer" - }, - "metaSortKey" : -1678423159125.3613, - "isPrivate" : false, - "settingStoreCookies" : true, - "settingSendCookies" : true, - "settingDisableRenderRequestBody" : false, - "settingEncodeUrl" : true, - "settingRebuildPath" : true, - "settingFollowRedirects" : "global", - "_type" : "request" - }, - { - "_id" : "env_be9c11bd0b1d4b249c50f1cbcea1084b", - "parentId" : "wrk_f9bd4e398c274e41b35f14904699d120", - "modified" : 1685433917125, - "created" : 1678372423794, - "name" : "Base Environment", - "data" : { - "base_url_portal_int" : "https://portal-backend.int.demo.catena-x.net", - "baseUrlEdcConsumerTest" : "https://tracex-test-consumer-controlplane.dev.demo.catena-x.net", - "baseUrlEdcConsumerDev" : "https://tracex-consumer-controlplane.dev.demo.catena-x.net", - "registryBaseDevTest" : "https://trace-x-registry.dev.demo.catena-x.net", - "base_url_central_idp_global" : "https://centralidp.int.demo.catena-x.net", - "base_url_registry_e2e" : "https://trace-x-registry-e2e.dev.demo.catena-x.net", - "baseUrl" : "t" - }, - "dataPropertyOrder" : { - "&" : [ - "base_url_portal_int", - "baseUrlEdcConsumerTest", - "baseUrlEdcConsumerDev", - "registryBaseDevTest", - "base_url_central_idp_global", - "base_url_registry_e2e", - "baseUrl" - ] - }, - "color" : null, - "isPrivate" : false, - "metaSortKey" : 1678372423794, - "_type" : "environment" - }, - { - "_id" : "jar_8e02fdf466c241fbacb0bce694bbcd33", - "parentId" : "wrk_f9bd4e398c274e41b35f14904699d120", - "modified" : 1685624488860, - "created" : 1678372423801, - "name" : "Default Jar", - "cookies" : [ - { - "key" : "KC_RESTART", - "expires" : "1970-01-01T00:00:10.000Z", - "maxAge" : 0, - "domain" : "centralidp.dev.demo.catena-x.net", - "path" : "/auth/realms/CX-Central/", - "httpOnly" : true, - "extensions" : [ - "Version=1" - ], - "hostOnly" : true, - "creation" : "2023-03-28T07:01:57.266Z", - "lastAccessed" : "2023-06-01T12:57:50.180Z", - "id" : "8670071459370072" - }, - { - "key" : "KC_RESTART", - "expires" : "1970-01-01T00:00:10.000Z", - "maxAge" : 0, - "domain" : "centralidp.int.demo.catena-x.net", - "path" : "/auth/realms/CX-Central/", - "httpOnly" : true, - "extensions" : [ - "Version=1" - ], - "hostOnly" : true, - "creation" : "2023-04-04T08:16:29.897Z", - "lastAccessed" : "2023-06-01T13:01:28.860Z", - "id" : "21953480251661905" - }, - { - "key" : "rack.session", - "value" : "8ebba2ae37dff827f137b1674408ce3cc715cde1161922859ae23b0858f925f5", - "domain" : "daps1.int.demo.catena-x.net", - "path" : "/", - "secure" : true, - "httpOnly" : true, - "hostOnly" : true, - "creation" : "2023-04-17T11:58:39.065Z", - "lastAccessed" : "2023-05-04T18:43:59.102Z", - "id" : "08889114252568153" - } - ], - "_type" : "cookie_jar" - }, - { - "_id" : "spc_dbabaeaa49d74b14acb4f7cc3252af0a", - "parentId" : "wrk_f9bd4e398c274e41b35f14904699d120", - "modified" : 1685448305901, - "created" : 1685448305901, - "fileName" : "tracex-v2", - "contents" : "", - "contentType" : "yaml", - "_type" : "api_spec" - }, - { - "_id" : "env_ca4e4f9b68da41b9b6c3ca51f59aa47f", - "parentId" : "env_be9c11bd0b1d4b249c50f1cbcea1084b", - "modified" : 1685448317219, - "created" : 1685433851683, - "name" : "New Environment", - "data" : { - "base_Url" : "t" - }, - "dataPropertyOrder" : { - "&" : [ - "base_Url" - ] - }, - "color" : null, - "isPrivate" : false, - "metaSortKey" : 1685433851683, - "_type" : "environment" - } - ] -} +{"_type":"export","__export_format":4,"__export_date":"2024-04-17T08:44:02.824Z","__export_source":"insomnia.desktop.app:v2023.5.8","resources":[{"_id":"req_e080bb3ea1e3475f93f16be8dfd8c3a8","parentId":"fld_64ee2678608e4f72b01f2034f0b8a392","modified":1700217950808,"created":1690263543725,"url":"https://managed-identity-wallets-new.int.demo.catena-x.net/api/wallets/BPNL00000003CML1","name":"Wallet","description":"","method":"GET","body":{},"parameters":[{"id":"pair_8458162429df4ead8418d2791d334b63","name":"withCredentials","value":"true","description":""}],"headers":[],"authentication":{"type":"oauth2","grantType":"client_credentials","authorizationUrl":"","accessTokenUrl":"{{ _.base_url_central_idp_global }}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.wallet_client_id }}","clientSecret":"{{ _.wallet_client_secret }}"},"metaSortKey":-1690263543725,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_64ee2678608e4f72b01f2034f0b8a392","parentId":"wrk_4b416f7841a74fb5b7e05449db943e93","modified":1690263527331,"created":1690263527331,"name":"Wallet","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1690263527331,"_type":"request_group"},{"_id":"wrk_4b416f7841a74fb5b7e05449db943e93","parentId":null,"modified":1713185001705,"created":1712820419101,"name":"Trace-X@Catena","description":"","scope":"design","_type":"workspace"},{"_id":"req_ff2c98096f0840edb7b333c9cd8b7e94","parentId":"fld_e59c5dbde99f4d48b1a606d13c88c1b8","modified":1713342702116,"created":1686576146948,"url":"{{ _.argo_url }}/applications/{{ _.argo_tracex_instance }}/resource?force=false&orphan=false","name":"Delete PVC backend","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_tracex_instance_pvc_backend }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"PersistentVolumeClaim","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}","disabled":false},"metaSortKey":-1686221053818.5312,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_e59c5dbde99f4d48b1a606d13c88c1b8","parentId":"fld_f35c234ec93c418e82f037d2c3a10059","modified":1686576204051,"created":1686576204051,"name":"*DELETE ENVIRONMENT*","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1686576204051,"_type":"request_group"},{"_id":"fld_f35c234ec93c418e82f037d2c3a10059","parentId":"fld_141947c7b5284beab1d5c74d6a4b4e02","modified":1686576095737,"created":1685973786688,"name":"*ENVIRONMENT ACTIONS*","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1685973786688,"_type":"request_group"},{"_id":"fld_141947c7b5284beab1d5c74d6a4b4e02","parentId":"wrk_4b416f7841a74fb5b7e05449db943e93","modified":1701683893472,"created":1684742068376,"name":"Argo","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1684230480867,"_type":"request_group"},{"_id":"req_c8027f738839415fa4498491b9e7f977","parentId":"fld_e59c5dbde99f4d48b1a606d13c88c1b8","modified":1687339590283,"created":1686576154300,"url":"{{ _.argo_url }}/applications/{{ _.argo_tracex_instance }}/resource?group=apps&force=true&orphan=false","name":"Delete STS backend","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_tracex_instance_sts_backend }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"StatefulSet","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1686221053768.5312,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_6e75fbf19b0c4dffa1f9d150edde57fc","parentId":"fld_e59c5dbde99f4d48b1a606d13c88c1b8","modified":1687339592867,"created":1686576161418,"url":"{{ _.argo_url }}/applications/{{ _.argo_tracex_instance }}/resource?force=false&orphan=false","name":"Delete PVC consumer-edc","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_tracex_instance_pvc_consumer_edc }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"PersistentVolumeClaim","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1686221053718.5312,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_c5c47401cd9740d1bcb586995ab16da2","parentId":"fld_e59c5dbde99f4d48b1a606d13c88c1b8","modified":1687339594612,"created":1686576168792,"url":"{{ _.argo_url }}/applications/{{ _.argo_tracex_instance }}/resource?group=apps&force=true&orphan=false","name":"Delete STS consumer edc postgresql","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_tracex_instance_sts_edc_consumer_postgresql }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"StatefulSet","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1686221053668.5312,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_b8f76a487eff45cbb06ff89445c221b7","parentId":"fld_e59c5dbde99f4d48b1a606d13c88c1b8","modified":1687339596350,"created":1686576293915,"url":"{{ _.argo_url }}/applications/{{ _.argo_tracex_instance }}/resource?group=apps&force=false&orphan=false","name":"Delete Deployment backend","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_tracex_instance_deployment_backend }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"Deployment","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1686221053618.5312,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_9ce52c5db006429e88589784d57bdecf","parentId":"fld_e59c5dbde99f4d48b1a606d13c88c1b8","modified":1687339597844,"created":1686576304833,"url":"{{ _.argo_url }}/applications/{{ _.argo_tracex_instance }}/resource?group=apps&force=false&orphan=false","name":"Delete Deployment consumer-controlplane","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_tracex_instance_deployment_consumer_controlplane }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"Deployment","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1686221053568.5312,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_3a0bc661973a4835b446bb851c443334","parentId":"fld_e59c5dbde99f4d48b1a606d13c88c1b8","modified":1687339600848,"created":1686576313263,"url":"{{ _.argo_url }}/applications/{{ _.argo_tracex_instance }}/resource?group=apps&force=true&orphan=false","name":"Delete Deployment consumer-dataplane","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_tracex_instance_deployment_consumer_dataplane }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"Deployment","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1686221053518.5312,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_ca5a717d85444c39abba8064aa9da8d6","parentId":"fld_e59c5dbde99f4d48b1a606d13c88c1b8","modified":1688760206003,"created":1686576325885,"url":"{{ _.argo_url }}/applications/{{ _.argo_edc_provider }}/resource?force=false&orphan=false","name":"Delete PVC postgresql","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_edc_provider_pvc_postgresql_resourcename }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"PersistentVolumeClaim","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1686221053468.5312,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_b5ea59d338cc490f86cefaba561ce310","parentId":"fld_e59c5dbde99f4d48b1a606d13c88c1b8","modified":1687339605099,"created":1686576332356,"url":"{{ _.argo_url }}/applications/{{ _.argo_edc_provider }}/resource?group=apps&force=true&orphan=false","name":"Delete STS backend","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_edc_provider_sts }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"StatefulSet","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1686221053418.5312,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_0b642cc43439480da0c7864dd0383483","parentId":"fld_e59c5dbde99f4d48b1a606d13c88c1b8","modified":1697019446502,"created":1686576336985,"url":"{{ _.argo_url }}/applications/{{ _.argo_edc_provider }}/resource?group=apps&force=false&orphan=false","name":"Delete Deployment edc-controlpane","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_edc_provider_controlplane_resourcename }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"Deployment","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1686221053368.5312,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_93ffc5fa01114abbbe555913db1fa8a8","parentId":"fld_e59c5dbde99f4d48b1a606d13c88c1b8","modified":1687339608719,"created":1686576342331,"url":"{{ _.argo_url }}/applications/{{ _.argo_edc_provider }}/resource?group=apps&force=false&orphan=false","name":"Delete Deployment edc-dataplane","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_edc_provider_dataplane_resourcename }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"Deployment","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1686221053318.5312,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_7242c70e8f9f4861a67260ca29b3207b","parentId":"fld_e59c5dbde99f4d48b1a606d13c88c1b8","modified":1687339610267,"created":1686576355507,"url":"{{ _.argo_url }}/applications/{{ _.argo_registry }}/resource?force=false&orphan=false","name":"Delete PVC postgresql","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_registry_pvc_postgresql_resourcename }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"PersistentVolumeClaim","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1686221053268.5312,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_072c0524ff5a4446aa2fa0c828c2523e","parentId":"fld_e59c5dbde99f4d48b1a606d13c88c1b8","modified":1687339612571,"created":1686576360452,"url":"{{ _.argo_url }}/applications/{{ _.argo_registry }}/resource?group=apps&force=true&orphan=false","name":"Delete STS backend","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_registry_sts }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"StatefulSet","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1686221053218.5312,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_e271c0a3e14442949c39d27da8a319a7","parentId":"fld_e59c5dbde99f4d48b1a606d13c88c1b8","modified":1687339614602,"created":1686576364928,"url":"{{ _.argo_url }}/applications/{{ _.argo_registry }}/resource?group=apps&force=false&orphan=false","name":"Delete Deployment cx-registry","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_registry_deployment_registry_resourcename }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"Deployment","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1686221053168.5312,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_7a871f053fe048029cbda40abbb381e4","parentId":"fld_75f468d359644badba6dd78ac79d1593","modified":1687339622955,"created":1686576413684,"url":"{{ _.argo_url }}/applications/{{ _.argo_tracex_instance }}/sync","name":"Sync Trace-X Instance","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"appNamespace\": \"argocd\",\n\t\"prune\": true,\n\t\"dryRun\": false,\n\t\"strategy\": {\n\t\t\"hook\": {\n\t\t\t\"force\": false\n\t\t}\n\t},\n\t\"resources\": null,\n\t\"syncOptions\": {\n\t\t\"items\": [\n\t\t\t\"Replace=true\"\n\t\t]\n\t}\n}"},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1686576203901,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_75f468d359644badba6dd78ac79d1593","parentId":"fld_f35c234ec93c418e82f037d2c3a10059","modified":1686576400215,"created":1686576395218,"name":"*SYNC ENVIRONMENT*","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1686576204001,"_type":"request_group"},{"_id":"req_9022e6a4d426463f96c4eacd302eb91c","parentId":"fld_75f468d359644badba6dd78ac79d1593","modified":1687339620324,"created":1686576418852,"url":"{{ _.argo_url }}/applications/{{ _.argo_edc_provider }}/sync","name":"Sync EDC Provider","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"appNamespace\": \"argocd\",\n\t\"revision\": \"helm-environments\",\n\t\"prune\": true,\n\t\"dryRun\": false,\n\t\"strategy\": {\n\t\t\"hook\": {\n\t\t\t\"force\": false\n\t\t}\n\t},\n\t\"resources\": null,\n\t\"syncOptions\": {\n\t\t\"items\": [\n\t\t\t\"Replace=true\"\n\t\t]\n\t}\n}"},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1686576203851,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_3b330e49316f47e48163375c3877601f","parentId":"fld_75f468d359644badba6dd78ac79d1593","modified":1687339626186,"created":1686576425937,"url":"{{ _.argo_url }}/applications/{{ _.argo_registry }}/sync","name":"Sync Registry","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"appNamespace\": \"argocd\",\n\t\"revision\": \"helm-environments\",\n\t\"prune\": true,\n\t\"dryRun\": false,\n\t\"strategy\": {\n\t\t\"hook\": {\n\t\t\t\"force\": false\n\t\t}\n\t},\n\t\"resources\": null,\n\t\"syncOptions\": {\n\t\t\"items\": [\n\t\t\t\"Replace=true\"\n\t\t]\n\t}\n}"},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1686576203801,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_105178a7cebe49e29576ec3ace430039","parentId":"fld_763bbdc6df0a4608a00f23f88b6bd7c0","modified":1687339634012,"created":1684742068887,"url":"{{ _.argo_url }}/applications/{{ _.argo_tracex_instance }}/resource?force=false&orphan=false","name":"Delete PVC backend","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_tracex_instance_pvc_backend }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"PersistentVolumeClaim","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1684236443484,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_763bbdc6df0a4608a00f23f88b6bd7c0","parentId":"fld_d0a6dc476b69458d8140f69cc7ec4e0e","modified":1684742068871,"created":1684742068871,"name":"DELETE","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1684230581328.5,"_type":"request_group"},{"_id":"fld_d0a6dc476b69458d8140f69cc7ec4e0e","parentId":"fld_141947c7b5284beab1d5c74d6a4b4e02","modified":1686576462776,"created":1684742068857,"name":"Trace-X Instance","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1684239121830.5,"_type":"request_group"},{"_id":"req_d0bde4922bb44d8688df580c946b7cae","parentId":"fld_763bbdc6df0a4608a00f23f88b6bd7c0","modified":1687339638650,"created":1685617832536,"url":"{{ _.argo_url }}/applications/{{ _.argo_tracex_instance }}/resource?group=apps&force=true&orphan=false","name":"Delete STS backend","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_tracex_instance_sts_backend }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"StatefulSet","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1684236443477.75,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_d4fa1d3988564cbba2d2c4e558e62350","parentId":"fld_763bbdc6df0a4608a00f23f88b6bd7c0","modified":1687339640931,"created":1684742068996,"url":"{{ _.argo_url }}/applications/{{ _.argo_tracex_instance }}/resource?force=false&orphan=false","name":"Delete PVC consumer-edc","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_tracex_instance_pvc_consumer_edc }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"PersistentVolumeClaim","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1684236443476.1875,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_7641f9d734f64b308f5c59a0217657ea","parentId":"fld_763bbdc6df0a4608a00f23f88b6bd7c0","modified":1687339642620,"created":1685618196329,"url":"{{ _.argo_url }}/applications/{{ _.argo_tracex_instance }}/resource?group=apps&force=true&orphan=false","name":"Delete STS consumer edc postgresql","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_tracex_instance_sts_edc_consumer_postgresql }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"StatefulSet","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1684236443474.625,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_c6c1309e5a8947509ac995d3158048d6","parentId":"fld_763bbdc6df0a4608a00f23f88b6bd7c0","modified":1687339644386,"created":1684742068960,"url":"{{ _.argo_url }}/applications/{{ _.argo_tracex_instance }}/resource?group=apps&force=false&orphan=false","name":"Delete Deployment backend","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_tracex_instance_deployment_backend }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"Deployment","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1684236443384,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_449a270cbe1142558f5c42ee496628c9","parentId":"fld_763bbdc6df0a4608a00f23f88b6bd7c0","modified":1687339646355,"created":1684742069102,"url":"{{ _.argo_url }}/applications/{{ _.argo_tracex_instance }}/resource?group=apps&force=false&orphan=false","name":"Delete Deployment consumer-controlplane","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_tracex_instance_deployment_consumer_controlplane }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"Deployment","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1684233534865,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_a7d95ae4bd384fb58ebc0fe8dd300aed","parentId":"fld_763bbdc6df0a4608a00f23f88b6bd7c0","modified":1687339648010,"created":1684742069139,"url":"{{ _.argo_url }}/applications/{{ _.argo_tracex_instance }}/resource?group=apps&force=true&orphan=false","name":"Delete Deployment consumer-dataplane","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_tracex_instance_deployment_consumer_dataplane }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"Deployment","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1684232080605.5,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_3cc5854585d8495bb6cf54aa472d3b79","parentId":"fld_d0a6dc476b69458d8140f69cc7ec4e0e","modified":1687339651424,"created":1684742069212,"url":"{{ _.argo_url }}/applications/{{ _.argo_tracex_instance }}/sync","name":"Sync Trace-X Instance","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"appNamespace\": \"argocd\",\n\t\"prune\": true,\n\t\"dryRun\": false,\n\t\"strategy\": {\n\t\t\"hook\": {\n\t\t\t\"force\": false\n\t\t}\n\t},\n\t\"resources\": null,\n\t\"syncOptions\": {\n\t\t\"items\": [\n\t\t\t\"Replace=true\"\n\t\t]\n\t}\n}"},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1684230581278.5,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_e6ccb18f8d7e44f2a6677776605f5ef9","parentId":"fld_afe94e3f848e48bb802bfe40be87e511","modified":1687339657015,"created":1684742069277,"url":"{{ _.argo_url }}/applications/{{ _.argo_submodelserver }}/resource?group=apps&force=false&orphan=false","name":"Delete Deployment submodelservers","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_submodelserver_deployment_submodelservers }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"Deployment","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1684251623152.5,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_afe94e3f848e48bb802bfe40be87e511","parentId":"fld_cc63ba486add4abfa02f81d03dd42d34","modified":1684742069262,"created":1684742069262,"name":"DELETE","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1684251623165,"_type":"request_group"},{"_id":"fld_cc63ba486add4abfa02f81d03dd42d34","parentId":"fld_141947c7b5284beab1d5c74d6a4b4e02","modified":1686576464199,"created":1684742069248,"name":"Submodelserver","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1684234824013.25,"_type":"request_group"},{"_id":"req_3c6efe572be548eb8443927b2987cf93","parentId":"fld_cc63ba486add4abfa02f81d03dd42d34","modified":1700232303001,"created":1684742069321,"url":"{{ _.argo_url }}/applications/{{ _.argo_submodelserver }}/sync","name":"Sync Submodelserver","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"appNamespace\": \"argocd\",\n\t\"revision\": \"helm-environments\",\n\t\"prune\": true,\n\t\"dryRun\": false,\n\t\"strategy\": {\n\t\t\"hook\": {\n\t\t\t\"force\": false\n\t\t}\n\t},\n\t\"resources\": null,\n\t\"syncOptions\": {\n\t\t\"items\": [\n\t\t\t\"Replace=true\"\n\t\t]\n\t}\n}"},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1684251623115,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_fa809c78ac1e4789baa2431c0e7724a7","parentId":"fld_fed973f91902404d9a1bdfbd5aa24917","modified":1687339663026,"created":1684742068709,"url":"{{ _.argo_url }}/applications/{{ _.argo_edc_provider }}/resource?force=false&orphan=false","name":"Delete PVC postgresql","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_edc_provider_pvc_postgresql_resourcename }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"PersistentVolumeClaim","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1684217020514.838,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_fed973f91902404d9a1bdfbd5aa24917","parentId":"fld_4697f0e60bf546d082a31618e8b7daa1","modified":1684742068621,"created":1684742068621,"name":"DELETE","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1684230626396,"_type":"request_group"},{"_id":"fld_4697f0e60bf546d082a31618e8b7daa1","parentId":"fld_141947c7b5284beab1d5c74d6a4b4e02","modified":1684742068599,"created":1684742068599,"name":"EDC Provider","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1684230526196,"_type":"request_group"},{"_id":"req_cfe64ec79c0742d896130fe6b1cb7705","parentId":"fld_fed973f91902404d9a1bdfbd5aa24917","modified":1687339665352,"created":1685620198601,"url":"{{ _.argo_url }}/applications/{{ _.argo_edc_provider }}/resource?group=apps&force=true&orphan=false","name":"Delete STS backend","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_edc_provider_sts }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"StatefulSet","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1684212938049.9893,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_c677e88dbd824618ad3dea75eb05c8b9","parentId":"fld_fed973f91902404d9a1bdfbd5aa24917","modified":1687339666858,"created":1684742068636,"url":"{{ _.argo_url }}/applications/{{ _.argo_edc_provider }}/resource?group=apps&force=false&orphan=false","name":"Delete Deployment edc-controlpane","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_edc_provider_controlplane_resourcename }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"Deployment","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1684208855585.1406,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_8e902ec9df1140d4abcfabde3a208a3f","parentId":"fld_fed973f91902404d9a1bdfbd5aa24917","modified":1687339668577,"created":1684742068673,"url":"{{ _.argo_url }}/applications/{{ _.argo_edc_provider }}/resource?group=apps&force=false&orphan=false","name":"Delete Deployment edc-dataplane","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_edc_provider_dataplane_resourcename }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"Deployment","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1684195791697.625,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_944c61523c2f46f6bf62e09f41a85036","parentId":"fld_4697f0e60bf546d082a31618e8b7daa1","modified":1687339670415,"created":1684742068819,"url":"{{ _.argo_url }}/applications/{{ _.argo_edc_provider }}/resource-tree","name":"Health Check EDC Provider","description":"### PVCs Health Status -> *{% response 'body', 'req_a3a1197b0b0448aa87918ffb87b15d06', 'b64::JC5ub2Rlc1s/KEAua2luZD09J1BlcnNpc3RlbnRWb2x1bWVDbGFpbScpXS5oZWFsdGguc3RhdHVz::46b', 'never', 60 %}*\n\n### Pods Health Status -> *{% response 'body', 'req_a3a1197b0b0448aa87918ffb87b15d06', 'b64::JC5ub2Rlc1s/KEAua2luZD09J1BvZCcpXS5oZWFsdGguc3RhdHVz::46b', 'never', 60 %}*\n\n### Deployments Health Status -> *{% response 'body', 'req_a3a1197b0b0448aa87918ffb87b15d06', 'b64::JC5ub2Rlc1s/KEAua2luZD09J0RlcGxveW1lbnQnKV0uaGVhbHRoLnN0YXR1cw==::46b', 'never', 60 %}*\n","method":"GET","body":{},"parameters":[],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1684230626346,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_a2855ce62c104cab8ebf4bfd445097b8","parentId":"fld_4697f0e60bf546d082a31618e8b7daa1","modified":1687339672486,"created":1684742068785,"url":"{{ _.argo_url }}/applications/{{ _.argo_edc_provider }}/sync","name":"Sync EDC Provider","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"appNamespace\": \"argocd\",\n\t\"revision\": \"helm-environments\",\n\t\"prune\": true,\n\t\"dryRun\": false,\n\t\"strategy\": {\n\t\t\"hook\": {\n\t\t\t\"force\": false\n\t\t}\n\t},\n\t\"resources\": null,\n\t\"syncOptions\": {\n\t\t\"items\": [\n\t\t\t\"Replace=true\"\n\t\t]\n\t}\n}"},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1684230626296,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_f685e2e3454a41a080ad3aabe495f87c","parentId":"fld_c4270d93a5fc4128ae80d829738d7a43","modified":1687339677283,"created":1684742068418,"url":"{{ _.argo_url }}/applications/{{ _.argo_registry }}/resource?force=false&orphan=false","name":"Delete PVC postgresql","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_registry_pvc_postgresql_resourcename }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"PersistentVolumeClaim","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1684236443466.8125,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_c4270d93a5fc4128ae80d829738d7a43","parentId":"fld_6bcfddb459f04c0390ddd0fef3e88c53","modified":1684742068403,"created":1684742068403,"name":"DELETE","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1684236443509,"_type":"request_group"},{"_id":"fld_6bcfddb459f04c0390ddd0fef3e88c53","parentId":"fld_141947c7b5284beab1d5c74d6a4b4e02","modified":1684742068390,"created":1684742068390,"name":"Registry","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1684230502059,"_type":"request_group"},{"_id":"req_07b17192d95f4a10b431a840787988e6","parentId":"fld_c4270d93a5fc4128ae80d829738d7a43","modified":1687339679118,"created":1685618414019,"url":"{{ _.argo_url }}/applications/{{ _.argo_registry }}/resource?group=apps&force=true&orphan=false","name":"Delete STS backend","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_registry_sts }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"StatefulSet","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1684236443425.4062,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_6801b134bc2c441c918466da705d9dd2","parentId":"fld_c4270d93a5fc4128ae80d829738d7a43","modified":1687339681205,"created":1684742068488,"url":"{{ _.argo_url }}/applications/{{ _.argo_registry }}/resource?group=apps&force=false&orphan=false","name":"Delete Deployment cx-registry","description":"","method":"DELETE","body":{},"parameters":[{"id":"pair_3e8424fd92d84a758c7a6fbbc275e3c9","name":"resourceName","value":"{{ _.argo_registry_deployment_registry_resourcename }}","description":""},{"id":"pair_41bcbeecbc064c53a03abff4162ab5ec","name":"version","value":"v1","description":""},{"id":"pair_fa9af878fc574f27b05f9f3c95804c82","name":"kind","value":"Deployment","description":""},{"id":"pair_2a2765277f564bb48c1d941d4d0b5c73","name":"namespace","value":"product-traceability-foss","description":""}],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1684236443384,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_9dcafa78d6eb42b488c3ae9f44d6a767","parentId":"fld_6bcfddb459f04c0390ddd0fef3e88c53","modified":1687339683436,"created":1684742068527,"url":"{{ _.argo_url }}/applications/{{ _.argo_registry }}/resource-tree","name":"Health Check Registry","description":"### PVCs Health Status -> *{% response 'body', 'req_a3a1197b0b0448aa87918ffb87b15d06', 'b64::JC5ub2Rlc1s/KEAua2luZD09J1BlcnNpc3RlbnRWb2x1bWVDbGFpbScpXS5oZWFsdGguc3RhdHVz::46b', 'never', 60 %}*\n\n### Pods Health Status -> *{% response 'body', 'req_a3a1197b0b0448aa87918ffb87b15d06', 'b64::JC5ub2Rlc1s/KEAua2luZD09J1BvZCcpXS5oZWFsdGguc3RhdHVz::46b', 'never', 60 %}*\n\n### Deployments Health Status -> *{% response 'body', 'req_a55219333dba47cd867953e88d7f28fd', 'b64::JC5ub2Rlc1s/KEAua2luZD09J0RlcGxveW1lbnQnKV0uaGVhbHRoLnN0YXR1cw==::46b', 'never', 60 %}*\n","method":"GET","body":{},"parameters":[],"headers":[],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1684236443459,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_3db9809f372a40948ceafe7e0e46a5dd","parentId":"fld_6bcfddb459f04c0390ddd0fef3e88c53","modified":1687339685168,"created":1684742068563,"url":"{{ _.argo_url }}/applications/{{ _.argo_registry }}/sync","name":"Sync Registry","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"appNamespace\": \"argocd\",\n\t\"revision\": \"helm-environments\",\n\t\"prune\": true,\n\t\"dryRun\": false,\n\t\"strategy\": {\n\t\t\"hook\": {\n\t\t\t\"force\": false\n\t\t}\n\t},\n\t\"resources\": null,\n\t\"syncOptions\": {\n\t\t\"items\": [\n\t\t\t\"Replace=true\"\n\t\t]\n\t}\n}"},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"bearer","token":"{{ _.argoToken }}"},"metaSortKey":-1684236443409,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_e9786695577d470ebb743154d8aa2983","parentId":"fld_a2125dd3fb0d4fc389706fb52384b3e0","modified":1700232759676,"created":1689789229175,"url":"{{ _.discoveryfinder_tracex_base_url }}/administration/connectors/discovery","name":"RetrieveEdcDiscoveryService","description":"","method":"POST","body":{"mimeType":"application/json","text":"[\"BPNL00000003CNKC\"]"},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{},"metaSortKey":-1689789229175,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_a2125dd3fb0d4fc389706fb52384b3e0","parentId":"wrk_4b416f7841a74fb5b7e05449db943e93","modified":1700232753159,"created":1689845165300,"name":"DiscoveryFinder","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1683728148842,"_type":"request_group"},{"_id":"req_6d84d22ad0da4d5ea4a587c2ef37ac2c","parentId":"fld_a2125dd3fb0d4fc389706fb52384b3e0","modified":1700232771091,"created":1689850592846,"url":"{{ _.discoveryfinder_irs_base_url }}/administration/connectors/discovery","name":"RetrieveEdcDiscoveryServiceIRS","description":"","method":"POST","body":{"mimeType":"application/json","text":"[\"BPNL00000003CML1\"]"},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{},"metaSortKey":-1689478345128.5,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_1493cd08ef6449219a63b1dfdadcf4fc","parentId":"fld_6ddb52f82964432e8151e845142078bd","modified":1689845131934,"created":1684742068304,"url":"{{ _.baseUrl }}/api/edc/notification/contract","name":"CreateInvestigationNotificationContract Receive","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"notificationType\": \"QUALITY_INVESTIGATION\",\n\t\"notificationMethod\": \"RECEIVE\"\n}"},"parameters":[],"headers":[{"id":"pair_e91fcc496b5744beb35d556b287863c3","name":"Content-Type","value":"application/json","description":"","disabled":false}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1678423983844.7969,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_6ddb52f82964432e8151e845142078bd","parentId":"wrk_4b416f7841a74fb5b7e05449db943e93","modified":1700230956401,"created":1684742068288,"name":"Trace-X Contracts","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1683225816817,"_type":"request_group"},{"_id":"req_1303815b3c2f4ca4817f2fb77b5d69ec","parentId":"fld_6ddb52f82964432e8151e845142078bd","modified":1709806278002,"created":1709733968256,"url":"{{ _.baseUrl }}/api/contracts","name":"RequestContractAgreements","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n \"pageAble\": {\n \"page\": 0,\n \"size\": 5,\n \"sort\": [\n ]\n },\n \"searchCriteria\": {\n \"filter\": [\n \"id,EQUAL,urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4eb01,OR\",\n \"id,EQUAL,XXX,OR\"\n ]\n }\n}\n\n"},"parameters":[],"headers":[{"id":"pair_e91fcc496b5744beb35d556b287863c3","name":"Content-Type","value":"application/json","description":"","disabled":false}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1678423983841.6719,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_4f232e55062848d78a15d8101518a03d","parentId":"fld_6ddb52f82964432e8151e845142078bd","modified":1689845130212,"created":1684742068339,"url":"{{ _.baseUrl }}/api/edc/notification/contract","name":"CreateInvestigationNotificationContract Update","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"notificationType\": \"QUALITY_INVESTIGATION\",\n\t\"notificationMethod\": \"UPDATE\"\n}"},"parameters":[],"headers":[{"id":"pair_7751eec7ba734c80930d24c87da5d114","name":"Content-Type","value":"application/json","description":""}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1678423983838.5469,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_5e6c36450df04ea588c86d85d0b0cbe4","parentId":"fld_6ddb52f82964432e8151e845142078bd","modified":1689845128469,"created":1686826811204,"url":"{{ _.baseUrl }}/api/edc/notification/contract","name":"CreateAlertNotificationContract Receive","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"notificationType\": \"QUALITY_ALERT\",\n\t\"notificationMethod\": \"RECEIVE\"\n}"},"parameters":[],"headers":[{"id":"pair_e91fcc496b5744beb35d556b287863c3","name":"Content-Type","value":"application/json","description":"","disabled":false}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1678423983832.2969,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_bacea4e25d424d41bfcc893907f1f770","parentId":"fld_6ddb52f82964432e8151e845142078bd","modified":1689845126732,"created":1686826853075,"url":"{{ _.baseUrl }}/api/edc/notification/contract","name":"CreateAlertNotificationContract Update","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"notificationType\": \"QUALITY_ALERT\",\n\t\"notificationMethod\": \"UPDATE\"\n}"},"parameters":[],"headers":[{"id":"pair_7751eec7ba734c80930d24c87da5d114","name":"Content-Type","value":"application/json","description":""}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1678423983782.2969,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_e55130801b904e35b10c642106308493","parentId":"fld_10e0675feabb4f97ba16cb503a4ea96e","modified":1691496864445,"created":1682514812813,"url":"{{ _.baseUrl }}/api/bpn-config","name":"FindAll","description":"","method":"GET","body":{},"parameters":[],"headers":[],"authentication":{"type":"oauth2","grantType":"client_credentials","authorizationUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token"},"metaSortKey":-1682514812813,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_10e0675feabb4f97ba16cb503a4ea96e","parentId":"wrk_4b416f7841a74fb5b7e05449db943e93","modified":1700232275391,"created":1681728488551,"name":"BPN-Mapping","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1681728488551,"_type":"request_group"},{"_id":"req_19ac23a5df0a4a15a5e49162fc246861","parentId":"fld_10e0675feabb4f97ba16cb503a4ea96e","modified":1694772301963,"created":1682686509302,"url":"{{ _.baseUrl }}/api/bpn-config/BPNL00000003CML1","name":"DeleteById","description":"","method":"DELETE","body":{},"parameters":[],"headers":[],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1682473292686.25,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_d70dabe421a248d1a9a4925784613df5","parentId":"fld_10e0675feabb4f97ba16cb503a4ea96e","modified":1686576836115,"created":1682686495654,"url":"{{ _.baseUrl }}/api/bpn-config","name":"SaveAll","description":"","method":"POST","body":{"mimeType":"application/json","text":"[\n {\n \"bpn\": \"BPNL00000003CML1\",\n \"url\": \"https://tracex-consumer-controlplane-e2e-a.dev.demo.catena-x.net\"\n },\n {\n \"bpn\": \"BPNL00000003CNKC\",\n \"url\": \"https://tracex-consumer-controlplane-e2e-b.dev.demo.catena-x.net\"\n }\n]"},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1682431772559.5,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_ba6c7d6f106d492390de39c02103dc3e","parentId":"fld_10e0675feabb4f97ba16cb503a4ea96e","modified":1686576862202,"created":1682686503749,"url":"{{ _.baseUrl }}/api/bpn-config","name":"UpdateAll","description":"","method":"PUT","body":{"mimeType":"application/json","text":"[\n\t{\n\t\t\"bpn\": \"BPNL00000003CML1\",\n\t\t\"url\": \"https://tracex-consumer-controlplane-e2e-b.dev.demo.catena-x.net\"\n\t},\n\t{\n\t\t\"bpn\": \"BPNL00000003CNKC\",\n\t\t\"url\": \"https://tracex-consumer-controlplane-e2e-a.dev.demo.catena-x.net\"\n\t}\n]"},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1682390252432.75,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_756fdcd518de4d178d40b73d914e80a5","parentId":"fld_8b1e3f98d3d8424d92baa25b33a72d58","modified":1712819531874,"created":1712818134187,"url":"{{ _.registry }}/semantics/registry/api/v3/lookup/shellsByAssetLink","name":"SearchShells","description":"","method":"POST","body":{"mimeType":"application/json","text":"[\n\t{\n\t\t\"name\": \"digitalTwinType\",\n\t\t\"value\": \"PartType\"\n\t}\n]"},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json"},{"name":"Edc-Bpn","value":"BPNL00000003CML1"},{"name":"accept","value":"application/json"}],"authentication":{},"metaSortKey":-1712818134187,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_8b1e3f98d3d8424d92baa25b33a72d58","parentId":"wrk_4b416f7841a74fb5b7e05449db943e93","modified":1684742068077,"created":1684742068077,"name":"DT-Registry","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1681385636476,"_type":"request_group"},{"_id":"req_a697d4522999497fb8772d033d6fe041","parentId":"fld_8b1e3f98d3d8424d92baa25b33a72d58","modified":1712819352599,"created":1684742068094,"url":"{{ _.registry }}/semantics/registry/api/v3/shell-descriptors","name":"RetrieveShellDescriptors","description":"\nhttps://trace-x-registry.dev.demo.catena-x.net/semantics/registry","method":"GET","body":{"mimeType":"application/json","text":""},"parameters":[{"id":"pair_87cf0662efef407bb7c1fde48a029aee","name":"pageSize","value":"1000","description":"","disabled":true}],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{},"metaSortKey":-1681385637898,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_c04b88f48430469287b9a6725eec0bed","parentId":"fld_8b1e3f98d3d8424d92baa25b33a72d58","modified":1712818302365,"created":1693469940560,"url":"{{ _.registry }}/semantics/registry/api/v3/shell-descriptors","name":"RetrieveShellDescriptorsByBPN","description":"\nhttps://trace-x-registry.dev.demo.catena-x.net/semantics/registry","method":"GET","body":{"mimeType":"application/json","text":""},"parameters":[{"id":"pair_87cf0662efef407bb7c1fde48a029aee","name":"pageSize","value":"1000","description":"","disabled":true}],"headers":[{"name":"Content-Type","value":"application/json","id":"pair_020ebe9109194b11b758d6cf3579a887"},{"id":"pair_b5fe03e57342458dacfa2e74be1fc89e","name":"Edc-Bpn","value":"BPNL00000003CNKC","description":"","disabled":false}],"authentication":{},"metaSortKey":-1681380463328.625,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_ac0adbd0d6864b1b89b51971a88867a6","parentId":"fld_8b1e3f98d3d8424d92baa25b33a72d58","modified":1712819355925,"created":1689853598215,"url":"{{ _.registry }}/semantics/registry/api/v3/shell-descriptors","name":"RetrieveShellDescriptorsFiltered","description":"\nhttps://trace-x-registry.dev.demo.catena-x.net/semantics/registry","method":"GET","body":{"mimeType":"application/json","text":""},"parameters":[{"id":"pair_87cf0662efef407bb7c1fde48a029aee","name":"assetIds","value":"[{\"name\": \"globalAssetId\",\"value\": \"{% prompt 'id', '', '', '', false, true %}\"}]","description":"","disabled":true}],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{},"metaSortKey":-1681377876043.9375,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_815efc1be84a4089ae4ef7336837e748","parentId":"fld_8b1e3f98d3d8424d92baa25b33a72d58","modified":1712819503177,"created":1693469539019,"url":"{{ _.registry }}/semantics/registry/api/v3/lookup/shells?YXNzZXRJZHM9W3sibmFtZSI6Im1hbnVmYWN0dXJlcklkIiwidmFsdWUiOiJCUE5MMDAwMDAwMDNDTktDIn1d","name":"LookupShells","description":"\nhttps://trace-x-registry.dev.demo.catena-x.net/semantics/registry","method":"GET","body":{"mimeType":"application/json","text":""},"parameters":[{"id":"pair_87cf0662efef407bb7c1fde48a029aee","name":"pageSize","value":"1000","description":"","disabled":true}],"headers":[{"name":"Content-Type","value":"application/json","id":"pair_b7772de2bbb34965a70f7fd542ca9004"},{"id":"pair_e8a609f750c9498fbcd08289189e7197","name":"Edc-Bpn","value":"BPNL00000003CNKC","description":""}],"authentication":{},"metaSortKey":-1681375288759.25,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_dbde6f324f4a4ecaa61d88cfad64c6da","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1695112738851,"created":1688562408136,"url":"{{ _.baseUrl }}/api/internal/endpoint-data-reference","name":"Callback Endpoint Service","description":"","method":"POST","body":{},"parameters":[],"headers":[],"authentication":{},"metaSortKey":-1688562408136,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_5fe81cd771db403084bb4a8f4f42f804","parentId":"wrk_4b416f7841a74fb5b7e05449db943e93","modified":1681306081567,"created":1681306081567,"name":"EDC","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1681306081567,"_type":"request_group"},{"_id":"req_6c245ebc255b4e2884ce7c2734242dae","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1689924199078,"created":1689924197195,"url":"http://tx-irs-e2e-a:8181/internal/endpoint-data-reference","name":"Callback Endpoint Service IRS","description":"","method":"POST","body":{},"parameters":[],"headers":[],"authentication":{},"metaSortKey":-1688204653026.5,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_705c2a7bbe354e3985ee8a662a29c170","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1708679850774,"created":1688069768394,"url":"{{ _.edc_consumer_own }}/management/v2/assets","name":"CreateNotificationAssetInvestigation","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"@context\": {\n\t\t\"edc\": \"https://w3id.org/edc/v0.0.1/ns/\"\n\t},\n\t\"asset\": {\n\t\t\"@id\": \"Asset1\",\n\t\t\"@type\": \"Asset\",\n\t\t\"properties\": {\n\t\t\t\"description\": \"endpoint to qualityinvestigation receive\",\n\t\t\t\"contenttype\": \"application/json\",\n\t\t\t\"policy-id\": \"use-eu\",\n\t\t\t\"type\": \"receive\",\n\t\t\t\"notificationtype\": \"qualityinvestigation\",\n\t\t\t\"notificationmethod\": \"receive\"\n\t\t}\n\t},\n\t\"dataAddress\": {\n\t\t\"type\": \"HttpData\",\n\t\t\"baseUrl\": \"https://traceability.dev.demo.catena-x.net/api/qualitynotifications/receive\",\n\t\t\"proxyMethod\": \"true\",\n\t\t\"proxyBody\": \"true\",\n\t\t\"method\": \"POST\"\n\t}\n}\n"},"parameters":[],"headers":[{"id":"pair_e91fcc496b5744beb35d556b287863c3","name":"Content-Type","value":"application/json","description":"","disabled":false},{"id":"pair_282f3617e19e4ae3b82be34a5f423e26","name":"X-Api-Key","value":"{{ _.edc_api_auth_key_dev }}","description":""}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1682333683955.875,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_4c7d4e93d6d949cbb064ee9979326fe0","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1708679848226,"created":1688117300254,"url":"{{ _.edc_consumer_own }}/management/v2/assets/request","name":"GetAssets","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"@content\": {},\n\t\"limit\": 100\n}"},"parameters":[{"id":"pair_491a752140c84067bb84ee0679676160","name":"pageSize","value":"100","description":""}],"headers":[{"id":"pair_e91fcc496b5744beb35d556b287863c3","name":"Content-Type","value":"application/json","description":"","disabled":false},{"id":"pair_282f3617e19e4ae3b82be34a5f423e26","name":"X-Api-Key","value":"{{ _.edc_api_auth_key_dev }}","description":""}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1682328040824.5781,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_f8480631430441a0927f17b45e3b4e24","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1708679843650,"created":1703161473705,"url":"{{ _.edc_provider_own }}/management/v2/assets/request","name":"GetAssetsProvider","description":"","method":"POST","body":{"mimeType":"application/json","text":""},"parameters":[{"id":"pair_491a752140c84067bb84ee0679676160","name":"pageSize","value":"100","description":""}],"headers":[{"id":"pair_e91fcc496b5744beb35d556b287863c3","name":"Content-Type","value":"application/json","description":"","disabled":false},{"id":"pair_282f3617e19e4ae3b82be34a5f423e26","name":"X-Api-Key","value":"{{ _.edc_api_auth_key_dev }}","description":""}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1682325219258.9297,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_418159b92e064b6eb96c1cecb39f6b83","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1708679856919,"created":1688067318173,"url":"{{ _.edc_consumer_own }}/management/v2/policydefinitions","name":"CreatePolicyDefinitionInvestigation","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"@context\": {\n\t\t\"odrl\": \"http://www.w3.org/ns/odrl/2/\"\n\t},\n\t\"@id\": \"POLICY_A32333B123\",\n\t\"@type\": \"PolicyDefinitionRequestDto\",\n\t\"policy\": {\n\t\t\"@type\": \"Policy\",\n\t\t\"odrl:permission\": [\n\t\t\t{\n\t\t\t\t\"odrl:action\": \"USE\",\n\t\t\t\t\"odrl:constraint\": {\n\t\t\t\t\t\"@type\": \"AtomicConstraint\",\n\t\t\t\t\t\"odrl:or\": [\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\"@type\": \"Constraint\",\n\t\t\t\t\t\t\t\"odrl:leftOperand\": \"idsc:PURPOSE\",\n\t\t\t\t\t\t\t\"odrl:operator\": \"EQ\",\n\t\t\t\t\t\t\t\"odrl:rightOperand\": \"ID 3.0 Trace\"\n\t\t\t\t\t\t}\n\t\t\t\t\t]\n\t\t\t\t}\n\t\t\t}\n\t\t]\n\t}\n}\n"},"parameters":[],"headers":[{"id":"pair_e91fcc496b5744beb35d556b287863c3","name":"Content-Type","value":"application/json","description":"","disabled":false},{"id":"pair_282f3617e19e4ae3b82be34a5f423e26","name":"X-Api-Key","value":"{{ _.edc_api_auth_key_dev }}","description":""}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1682322397693.2812,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_e094e40c5ee5467996afab018e60e931","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1708679864428,"created":1688584748383,"url":"{{ _.edc_consumer_own }}/management/v2/policydefinitions","name":"CreatePolicyDefinitionInvestigationNoTracePermission","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"@context\": {\n\t\t\"odrl\": \"http://www.w3.org/ns/odrl/2/\"\n\t},\n\t\"@id\": \"POLICY_NO_TRACE\",\n\t\"@type\": \"PolicyDefinitionRequestDto\",\n\t\"policy\": {\n\t\t\"@type\": \"Policy\",\n\t\t\"odrl:permission\": []\n\t}\n}\n"},"parameters":[],"headers":[{"id":"pair_e91fcc496b5744beb35d556b287863c3","name":"Content-Type","value":"application/json","description":"","disabled":false},{"id":"pair_282f3617e19e4ae3b82be34a5f423e26","name":"X-Api-Key","value":"{{ _.edc_api_auth_key_dev }}","description":""}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1682320986910.457,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_050ff282f8bf4ecdba18c14f2cecfdc2","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1708679867624,"created":1688117322974,"url":"{{ _.edc_consumer_own }}/management/v2/policydefinitions/request","name":"GetPolicyDefinitions","description":"","method":"POST","body":{"mimeType":"application/json","text":""},"parameters":[],"headers":[{"id":"pair_e91fcc496b5744beb35d556b287863c3","name":"Content-Type","value":"application/json","description":"","disabled":false},{"id":"pair_282f3617e19e4ae3b82be34a5f423e26","name":"X-Api-Key","value":"{{ _.edc_api_auth_key_dev }}","description":""}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1682319576127.6328,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_3e63b23d01354c9ba6dad1691369d638","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1708679870969,"created":1688111070053,"url":"{{ _.edc_consumer_own }}/management/v2/contractdefinitions","name":"CreateContractDefinitionInvestigation","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"@context\": {\n\t\t\"edc\": \"https://w3id.org/edc/v0.0.1/ns/\"\n\t},\n\t\"@id\": \"CONTRACT_DEFINITION_NO_POLICY\",\n\t\"@type\": \"ContractDefinition\",\n\t\"accessPolicyId\": \"POLICY_NO_TRACE\",\n\t\"contractPolicyId\": \"POLICY_NO_TRACE\",\n\t\"assetsSelector\": {\n\t\t\"@type\": \"CriterionDto\",\n\t\t\"operandLeft\": \"https://w3id.org/edc/v0.0.1/ns/id\",\n\t\t\"operator\": \"=\",\n\t\t\"operandRight\": \"Asset1\"\n\t}\n}\n"},"parameters":[],"headers":[{"id":"pair_e91fcc496b5744beb35d556b287863c3","name":"Content-Type","value":"application/json","description":"","disabled":false},{"id":"pair_282f3617e19e4ae3b82be34a5f423e26","name":"X-Api-Key","value":"{{ _.edc_api_auth_key_dev }}","description":""}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1682316754561.9844,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_042bf2c1a2044758ae697d3961a65102","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1708679873057,"created":1688117338685,"url":"{{ _.edc_consumer_own }}/management/v2/contractdefinitions/request","name":"GetContractDefinitions","description":"","method":"POST","body":{"mimeType":"application/json","text":""},"parameters":[],"headers":[{"id":"pair_e91fcc496b5744beb35d556b287863c3","name":"Content-Type","value":"application/json","description":"","disabled":false},{"id":"pair_282f3617e19e4ae3b82be34a5f423e26","name":"X-Api-Key","value":"{{ _.edc_api_auth_key_dev }}","description":""}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1682313932996.336,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_158aa49c0a824f60be87c2ce156a9ba9","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1709801408754,"created":1708933018506,"url":"{{ _.edc_consumer_own }}/management/v2/contractagreements/request","name":"GetContractAgreement","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"https://w3id.org/edc/v0.0.1/ns/filterExpression\": [\n\t\t{\n\t\t\t\"https://w3id.org/edc/v0.0.1/ns/operandLeft\": \"id\",\n\t\t\t\"https://w3id.org/edc/v0.0.1/ns/operator\": \"in\",\n\t\t\t\"https://w3id.org/edc/v0.0.1/ns/operandRight\": [\"ZDYxNzZhNTYtMWUyMC00M2E1LWJkN2QtYTQxMjkzMDg5OTYz:cmVnaXN0cnktYXNzZXQ=:M2YxOGM3ZDktODYxYi00YTJmLTgxZmMtYzY1NjkwZGU2MTg3\",\"ZDYxNzZhNTYtMWUyMC00M2E1LWJkN2QtYTQxMjkzMDg5OTYz:cmVnaXN0cnktYXNzZXQ=:MTk0YjUxNjAtODBmMS00ZmY2LTg0NGEtY2ZmNDhhMjMyZjJk\"\n\t\t]\n\t\t}\n\t]\n}\n\n"},"parameters":[],"headers":[{"id":"pair_e91fcc496b5744beb35d556b287863c3","name":"Content-Type","value":"application/json","description":"","disabled":false},{"id":"pair_282f3617e19e4ae3b82be34a5f423e26","name":"X-Api-Key","value":"{{ _.edc_api_auth_key_dev }}","description":""}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1682313580300.63,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_bec5b8c178b84deaad28f01ed9f1215c","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1708933663772,"created":1708933609478,"url":"{{ _.edc_consumer_own }}/management/v2/contractagreements/ODA3MmUyNTQtOGNlZi00YzQ2LTljNGYtNGYzNjE2YjQ5NTZl:cmVnaXN0cnktYXNzZXQ=:MDljNDMzY2EtODI5OS00OGE3LWI0MjYtNzZmZjJmODE1ZWE2/negotiation","name":"GetContractAgreementNegotiation","description":"","method":"GET","body":{"mimeType":"application/json","text":""},"parameters":[],"headers":[{"id":"pair_e91fcc496b5744beb35d556b287863c3","name":"Content-Type","value":"application/json","description":"","disabled":false},{"id":"pair_282f3617e19e4ae3b82be34a5f423e26","name":"X-Api-Key","value":"{{ _.edc_api_auth_key_dev }}","description":""}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1682313403952.7769,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_98ce5c5287cd470ea515f39dfd034b82","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1708679875526,"created":1688584566632,"url":"{{ _.edc_consumer_own }}/management/v2/contractdefinitions/CONTRACT_DEFINITION_NO_POLICY","name":"DeleteContractDefinitions","description":"","method":"DELETE","body":{"mimeType":"application/json","text":""},"parameters":[],"headers":[{"id":"pair_e91fcc496b5744beb35d556b287863c3","name":"Content-Type","value":"application/json","description":"","disabled":false},{"id":"pair_282f3617e19e4ae3b82be34a5f423e26","name":"X-Api-Key","value":"{{ _.edc_api_auth_key_dev }}","description":""}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1682313227604.9238,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_483ed7bd483643919a6d2e3e096115bb","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1689059562510,"created":1688412551631,"url":"{{ _.edc_consumer_own }}/management/v2/catalog/request","name":"GetCatalogNoFilter","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n \"@context\": {\"edc\": \"https://w3id.org/edc/v0.0.1/ns/\"},\n\t\"protocol\": \"dataspace-protocol-http\",\n\t\"providerUrl\": \"{{ _.edc_consumer_other }}/api/v1/dsp\"\n}"},"parameters":[],"headers":[{"name":"x-api-key","value":"{{ _.edc_api_auth_key_dev }}","id":"pair_6838a24d992a44e4bad61636766ca65d"},{"id":"pair_fb11ac85a34246c5b6a8988b9ec55a71","name":"content-type","value":"application/json","description":""},{"id":"pair_b9a20d0b01584ebe911b160d8b375edc","name":"accept","value":"\"/\"","description":"","disabled":true}],"authentication":{},"metaSortKey":-1682312522213.5117,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_36ff85f82b0342c1b58662e34e1f1082","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1709220218770,"created":1682348732306,"url":"{{ _.edc_consumer_own }}/management/v2/catalog/request","name":"GetCatalog","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"@context\": {},\n\t\"protocol\": \"dataspace-protocol-http\",\n\t\"providerUrl\": \"{{ _.edc_consumer_other }}/api/v1/dsp\",\n\t\"querySpec\": {\n\t\t\"filterExpression\": [\n\t\t\t{\n\t\t\t\t\"operandLeft\": \"https://w3id.org/edc/v0.0.1/ns/notificationtype\",\n\t\t\t\t\"operandRight\": \"qualityalert\",\n\t\t\t\t\"operator\": \"=\"\n\t\t\t},\n\t\t\t{\n\t\t\t\t\"operandLeft\": \"https://w3id.org/edc/v0.0.1/ns/notificationmethod\",\n\t\t\t\t\"operandRight\": \"update\",\n\t\t\t\t\"operator\": \"=\"\n\t\t\t}\n\t\t]\n\t}\n}"},"parameters":[],"headers":[{"name":"x-api-key","value":"{{ _.edc_api_auth_key_dev }}","id":"pair_6838a24d992a44e4bad61636766ca65d"},{"id":"pair_fb11ac85a34246c5b6a8988b9ec55a71","name":"content-type","value":"application/json","description":""},{"id":"pair_b9a20d0b01584ebe911b160d8b375edc","name":"accept","value":"\"/\"","description":"","disabled":true}],"authentication":{},"metaSortKey":-1682311111430.6875,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_0227284bdee24bdd9910cff9a98efe8c","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1696919060756,"created":1696919016531,"url":"{{ _.edc_consumer_own }}/management/v2/catalog/request","name":"GetCatalogDupl","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"@type\": \"edc:CatalogRequest\",\n\"edc:providerUrl\": \"https://trace-x-edc.dev.demo.catena-x.net/api/v1/dsp\",\n\"edc:protocol\": \"dataspace-protocol-http\",\n\"edc:querySpec\": {\n\t\"@type\": \"edc:QuerySpec\",\n\t\"edc:limit\": 50,\n\t\"edc:offset\": 0,\n\t\"edc:sortOrder\": \"ASC\",\n\t\"edc:filterExpression\": {\n\t\t\"@type\": \"edc:Criterion\",\n\t\t\"edc:operandLeft\": \"https://w3id.org/edc/v0.0.1/ns/type\",\n\t\t\"edc:operator\": \"=\",\n\t\t\"edc:operandRight\": \"data.core.digitalTwinRegistry\"\n\t}\n},\n\"@context\": {\n\t\"dct\": \"https://purl.org/dc/terms/\",\n\t\"tx\": \"https://w3id.org/tractusx/v0.0.1/ns/\",\n\t\"edc\": \"https://w3id.org/edc/v0.0.1/ns/\",\n\t\"odrl\": \"http://www.w3.org/ns/odrl/2/\",\n\t\"dcat\": \"https://www.w3.org/ns/dcat/\",\n\t\"dspace\": \"https://w3id.org/dspace/v0.8/\"\n}\n}"},"parameters":[],"headers":[{"name":"x-api-key","value":"{{ _.edc_api_auth_key_dev }}","id":"pair_6838a24d992a44e4bad61636766ca65d"},{"id":"pair_fb11ac85a34246c5b6a8988b9ec55a71","name":"content-type","value":"application/json","description":""},{"id":"pair_b9a20d0b01584ebe911b160d8b375edc","name":"accept","value":"\"/\"","description":"","disabled":true}],"authentication":{},"metaSortKey":-1682311111429.125,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_fc2e7ddcae1648b595de1889ef7231b3","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1694772095884,"created":1694772093336,"url":"{{ _.edc_consumer_own }}/management/v2/catalog/request","name":"GetCatalogNotifications","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"@type\": \"edc:CatalogRequest\",\n\t\"edc:providerUrl\": \"https://tracex-consumer-controlplane.dev.demo.catena-x.net/api/v1/dsp\",\n\t\"edc:protocol\": \"dataspace-protocol-http\",\n\t\"edc:querySpec\": {\n\t\t\"@type\": \"edc:QuerySpec\",\n\t\t\"edc:limit\": 50,\n\t\t\"edc:offset\": 0,\n\t\t\"edc:sortOrder\": \"ASC\",\n\t\t\"edc:filterExpression\": [\n\t\t\t{\n\t\t\t\t\"@type\": \"edc:Criterion\",\n\t\t\t\t\"edc:operandLeft\": \"https://w3id.org/edc/v0.0.1/ns/notificationtype\",\n\t\t\t\t\"edc:operator\": \"=\",\n\t\t\t\t\"edc:operandRight\": \"qualityalert\"\n\t\t\t},\n\t\t\t{\n\t\t\t\t\"@type\": \"edc:Criterion\",\n\t\t\t\t\"edc:operandLeft\": \"https://w3id.org/edc/v0.0.1/ns/notificationmethod\",\n\t\t\t\t\"edc:operator\": \"=\",\n\t\t\t\t\"edc:operandRight\": \"update\"\n\t\t\t}\n\t\t]\n\t},\n\t\"@context\": {\n\t\t\"dct\": \"https://purl.org/dc/terms/\",\n\t\t\"tx\": \"https://w3id.org/tractusx/v0.0.1/ns/\",\n\t\t\"edc\": \"https://w3id.org/edc/v0.0.1/ns/\",\n\t\t\"odrl\": \"http://www.w3.org/ns/odrl/2/\",\n\t\t\"dcat\": \"https://www.w3.org/ns/dcat/\",\n\t\t\"dspace\": \"https://w3id.org/dspace/v0.8/\"\n\t}\n}"},"parameters":[],"headers":[{"name":"x-api-key","value":"{{ _.edc_api_auth_key_dev }}","id":"pair_6838a24d992a44e4bad61636766ca65d"},{"id":"pair_fb11ac85a34246c5b6a8988b9ec55a71","name":"content-type","value":"application/json","description":""},{"id":"pair_b9a20d0b01584ebe911b160d8b375edc","name":"accept","value":"\"/\"","description":"","disabled":true}],"authentication":{},"metaSortKey":-1682311111427.5625,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_28ff9bbd44db4eda95f878d262d28b5d","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1695903219435,"created":1695897354121,"url":"{{ _.edc_consumer_own }}/management/v2/catalog/request","name":"GetCatalogSDE","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n \"@type\": \"edc:CatalogRequest\",\n \"edc:providerUrl\": \"https://tracex-cd70e024-de.int.cx.dih-cloud.com/api/v1/dsp\",\n \"edc:protocol\": \"dataspace-protocol-http\",\n \"edc:querySpec\": {\n \"@type\": \"edc:QuerySpec\",\n \"edc:limit\": 50,\n \"edc:offset\": 0,\n \"edc:sortOrder\": \"ASC\",\n \"edc:filterExpression\": {\n \"@type\": \"edc:Criterion\",\n \"edc:operandLeft\": \"https://w3id.org/edc/v0.0.1/ns/id\",\n \"edc:operator\": \"=\",\n \"edc:operandRight\": \"urn:uuid:b1b6e0ba-4ed6-4f94-95bd-1000d93e37cd-urn:uuid:685490e0-77f2-4231-aa6b-c4ba573b86f2\"\n }\n },\n \"@context\": {\n \"dct\": \"https://purl.org/dc/terms/\",\n \"tx\": \"https://w3id.org/tractusx/v0.0.1/ns/\",\n \"edc\": \"https://w3id.org/edc/v0.0.1/ns/\",\n \"odrl\": \"http://www.w3.org/ns/odrl/2/\",\n \"dcat\": \"https://www.w3.org/ns/dcat/\",\n \"dspace\": \"https://w3id.org/dspace/v0.8/\"\n }\n}\n"},"parameters":[],"headers":[{"name":"x-api-key","value":"{{ _.edc_api_auth_key_dev }}","id":"pair_6838a24d992a44e4bad61636766ca65d"},{"id":"pair_fb11ac85a34246c5b6a8988b9ec55a71","name":"content-type","value":"application/json","description":""},{"id":"pair_b9a20d0b01584ebe911b160d8b375edc","name":"accept","value":"\"/\"","description":"","disabled":true}],"authentication":{},"metaSortKey":-1682311111426,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_e50dfe7ca14141999fa83aead217afa6","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1695897383835,"created":1692262425804,"url":"https://trace-x-edc-int-bmw.int.demo.catena-x.net/management/v2/catalog/request","name":"GetCatalogTestBMW","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"@context\": {},\n\t\"protocol\": \"dataspace-protocol-http\",\n\t\"providerUrl\": \"{{ _.edc_consumer_other }}/api/v1/dsp\",\n\t\"querySpec\": {\n\t\t\"filterExpression\": [\n\t\t\t{\n\t\t\t\t\"operandLeft\": \"https://w3id.org/edc/v0.0.1/ns/notificationtype\",\n\t\t\t\t\"operandRight\": \"qualityinvestigation\",\n\t\t\t\t\"operator\": \"=\"\n\t\t\t},\n\t\t\t{\n\t\t\t\t\"operandLeft\": \"https://w3id.org/edc/v0.0.1/ns/notificationmethod\",\n\t\t\t\t\"operandRight\": \"receive\",\n\t\t\t\t\"operator\": \"=\"\n\t\t\t}\n\t\t]\n\t}\n}\n"},"parameters":[],"headers":[{"name":"x-api-key","value":"{{ _.edc_api_auth_key_dev }}","id":"pair_6838a24d992a44e4bad61636766ca65d"},{"id":"pair_fb11ac85a34246c5b6a8988b9ec55a71","name":"content-type","value":"application/json","description":""},{"id":"pair_b9a20d0b01584ebe911b160d8b375edc","name":"accept","value":"\"/\"","description":"","disabled":true}],"authentication":{},"metaSortKey":-1682311111424.4375,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_f59accc9839d4991bedd6369ff71143e","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1695897391557,"created":1689851670189,"url":"https://trace-x-edc.dev.demo.catena-x.net/management/v2/catalog/request","name":"GetCatalogProviderFromOwnToOther","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"@context\": {},\n\t\"protocol\": \"dataspace-protocol-http\",\n\t\"providerUrl\": \"https://trace-x-test-edc.dev.demo.catena-x.net/api/v1/dsp\",\n\t\"querySpec\": {}\n}\n"},"parameters":[],"headers":[{"name":"x-api-key","value":"{{ _.edc_api_auth_key_dev }}","id":"pair_6838a24d992a44e4bad61636766ca65d"},{"id":"pair_fb11ac85a34246c5b6a8988b9ec55a71","name":"content-type","value":"application/json","description":""},{"id":"pair_b9a20d0b01584ebe911b160d8b375edc","name":"accept","value":"\"/\"","description":"","disabled":true}],"authentication":{},"metaSortKey":-1682311111418.1875,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_ff13b954f69c478bbcbad5e1fa693e61","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1689919157103,"created":1689852317265,"url":"{{ _.edc_provider_other }}/management/v2/catalog/request","name":"GetCatalogProviderFromOtherToOwn","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n \"@type\": \"edc:CatalogRequest\",\n \"edc:providerUrl\": \"{{ _.edc_provider_own }}/api/v1/dsp\",\n \"edc:protocol\": \"dataspace-protocol-http\",\n \"edc:querySpec\": {\n \"@type\": \"edc:QuerySpec\",\n \"edc:filterExpression\": {\n \"@type\": \"edc:Criterion\",\n \"edc:operandLeft\": \"https://w3id.org/edc/v0.0.1/ns/id\",\n \"edc:operator\": \"=\",\n \"edc:operandRight\": \"urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd-urn:uuid:fbe0eb0b-df86-480a-bef2-1a2f60b878bc\"\n }\n },\n \"@context\": {\n \"dct\": \"https://purl.org/dc/terms/\",\n \"tx\": \"https://w3id.org/tractusx/v0.0.1/ns/\",\n \"edc\": \"https://w3id.org/edc/v0.0.1/ns/\",\n \"odrl\": \"http://www.w3.org/ns/odrl/2/\",\n \"dcat\": \"https://www.w3.org/ns/dcat/\",\n \"dspace\": \"https://w3id.org/dspace/v0.8/\"\n }\n}"},"parameters":[],"headers":[{"name":"x-api-key","value":"{{ _.edc_api_auth_key_dev }}","id":"pair_6838a24d992a44e4bad61636766ca65d"},{"id":"pair_fb11ac85a34246c5b6a8988b9ec55a71","name":"content-type","value":"application/json","description":""},{"id":"pair_b9a20d0b01584ebe911b160d8b375edc","name":"accept","value":"\"/\"","description":"","disabled":true}],"authentication":{},"metaSortKey":-1682311111411.9375,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_829d6510c21848a3a16a62543d4efb3c","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1690274887533,"created":1689922479599,"url":"{{ _.edc_consumer_own }}/management/v2/catalog/request","name":"GetCatalogConsumerFromOtherToOwn","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n \"@type\": \"edc:CatalogRequest\",\n \"edc:providerUrl\": \"{{ _.edc_consumer_own }}/api/v1/dsp\",\n \"edc:protocol\": \"dataspace-protocol-http\",\n \"edc:querySpec\": {\n \"@type\": \"edc:QuerySpec\",\n \"edc:filterExpression\": {\n \"@type\": \"edc:Criterion\",\n \"edc:operandLeft\": \"https://w3id.org/edc/v0.0.1/ns/id\",\n \"edc:operator\": \"=\",\n \"edc:operandRight\": \"urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd-urn:uuid:fbe0eb0b-df86-480a-bef2-1a2f60b878bc\"\n }\n },\n \"@context\": {\n \"dct\": \"https://purl.org/dc/terms/\",\n \"tx\": \"https://w3id.org/tractusx/v0.0.1/ns/\",\n \"edc\": \"https://w3id.org/edc/v0.0.1/ns/\",\n \"odrl\": \"http://www.w3.org/ns/odrl/2/\",\n \"dcat\": \"https://www.w3.org/ns/dcat/\",\n \"dspace\": \"https://w3id.org/dspace/v0.8/\"\n }\n}"},"parameters":[],"headers":[{"name":"x-api-key","value":"{{ _.edc_api_auth_key_dev }}","id":"pair_6838a24d992a44e4bad61636766ca65d"},{"id":"pair_fb11ac85a34246c5b6a8988b9ec55a71","name":"content-type","value":"application/json","description":""},{"id":"pair_b9a20d0b01584ebe911b160d8b375edc","name":"accept","value":"\"/\"","description":"","disabled":true}],"authentication":{},"metaSortKey":-1682311111408.8125,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_24cf58164e064532b6f5688ab2300432","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1699885456778,"created":1699885453673,"url":"{{ _.edc_consumer_own }}/management/v2/catalog/request","name":"GetCatalogConsumerFromOtherToOwn","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"@type\": \"edc:CatalogRequest\",\n\t\"edc:providerUrl\": \"https://trace-x-edc.dev.demo.catena-x.net/api/v1/dsp\",\n\t\"edc:protocol\": \"dataspace-protocol-http\",\n\t\"edc:querySpec\": {\n\t\t\"@type\": \"edc:QuerySpec\",\n\t\t\"edc:limit\": 50,\n\t\t\"edc:offset\": 0,\n\t\t\"edc:sortOrder\": \"ASC\",\n\t\t\"edc:filterExpression\": {\n\t\t\t\"@type\": \"edc:Criterion\",\n\t\t\t\"edc:operandLeft\": \"https://w3id.org/edc/v0.0.1/ns/type\",\n\t\t\t\"edc:operator\": \"=\",\n\t\t\t\"edc:operandRight\": \"data.core.digitalTwinRegistry\"\n\t\t}\n\t},\n\t\"@context\": {\n\t\t\"dct\": \"https://purl.org/dc/terms/\",\n\t\t\"tx\": \"https://w3id.org/tractusx/v0.0.1/ns/\",\n\t\t\"edc\": \"https://w3id.org/edc/v0.0.1/ns/\",\n\t\t\"odrl\": \"http://www.w3.org/ns/odrl/2/\",\n\t\t\"dcat\": \"https://www.w3.org/ns/dcat/\",\n\t\t\"dspace\": \"https://w3id.org/dspace/v0.8/\"\n\t}\n}"},"parameters":[],"headers":[{"name":"x-api-key","value":"{{ _.edc_api_auth_key_dev }}","id":"pair_6838a24d992a44e4bad61636766ca65d"},{"id":"pair_fb11ac85a34246c5b6a8988b9ec55a71","name":"content-type","value":"application/json","description":""},{"id":"pair_b9a20d0b01584ebe911b160d8b375edc","name":"accept","value":"\"/\"","description":"","disabled":true}],"authentication":{},"metaSortKey":-1682311111404.125,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_d961bc606cce41c396223e60d7c0bd3e","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1689852245426,"created":1689852202371,"url":"{{ _.registry }}/semantics/registry/api/v3.0/shell-descriptors","name":"RetrieveShellDescriptorsFiltered","description":"\nhttps://trace-x-registry.dev.demo.catena-x.net/semantics/registry","method":"GET","body":{"mimeType":"application/json","text":"{\n \"@type\": \"edc:CatalogRequest\",\n \"edc:providerUrl\": \"https://trace-x-test-edc.dev.demo.catena-x.net/api/v1/dsp\",\n \"edc:protocol\": \"dataspace-protocol-http\",\n \"edc:querySpec\": {\n \"@type\": \"edc:QuerySpec\",\n \"edc:filterExpression\": {\n \"@type\": \"edc:Criterion\",\n \"edc:operandLeft\": \"https://w3id.org/edc/v0.0.1/ns/id\",\n \"edc:operator\": \"=\",\n \"edc:operandRight\": \"member\"\n }\n },\n \"@context\": {\n \"dct\": \"https://purl.org/dc/terms/\",\n \"tx\": \"https://w3id.org/tractusx/v0.0.1/ns/\",\n \"edc\": \"https://w3id.org/edc/v0.0.1/ns/\",\n \"odrl\": \"http://www.w3.org/ns/odrl/2/\",\n \"dcat\": \"https://www.w3.org/ns/dcat/\",\n \"dspace\": \"https://w3id.org/dspace/v0.8/\"\n }\n}"},"parameters":[{"id":"pair_87cf0662efef407bb7c1fde48a029aee","name":"pageSize","value":"1000","description":"","disabled":true}],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{},"metaSortKey":-1682311111399.4375,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_e781bd3b6c25451eb1e75b71101ef683","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1708679894439,"created":1688478029560,"url":"{{ _.edc_consumer_own }}/management/v2/contractnegotiations","name":"InitiateNegotiation","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"edc:connectorAddress\": \"https://tracex-test-consumer-controlplane.dev.demo.catena-x.net/api/v1/dsp\",\n\t\"edc:connectorId\": \"BPNL00000003CML1\",\n\t\"edc:offer\": {\n\t\t\"@type\": \"edc:ContractOfferDescription\",\n\t\t\"edc:offerId\": \"3839b97a-cbe9-4d83-968b-48c528112dab:5892340a-c25d-4cac-a2ce-8177e7936c7d:8b99af39-7dc7-4ceb-b834-32fd80d763d1\",\n\t\t\"edc:assetId\": \"5892340a-c25d-4cac-a2ce-8177e7936c7d\",\n\t\t\"edc:policy\": {\n\t\t\t\"@id\": \"b49b4a58-418f-42d8-b16d-d553284f1fc7\",\n\t\t\t\"@type\": \"odrl:Set\",\n\t\t\t\"odrl:permission\": [],\n\t\t\t\"odrl:prohibition\": [],\n\t\t\t\"odrl:obligation\": [],\n\t\t\t\"odrl:target\": \"5892340a-c25d-4cac-a2ce-8177e7936c7d\"\n\t\t}\n\t},\n\t\"edc:protocol\": \"dataspace-protocol-http\",\n\t\"edc:callbackAddresses\": [],\n\t\"@context\": {\n\t\t\"dct\": \"https://purl.org/dc/terms/\",\n\t\t\"tx\": \"https://w3id.org/tractusx/v0.0.1/ns/\",\n\t\t\"edc\": \"https://w3id.org/edc/v0.0.1/ns/\",\n\t\t\"odrl\": \"http://www.w3.org/ns/odrl/2/\",\n\t\t\"dcat\": \"https://www.w3.org/ns/dcat/\",\n\t\t\"dspace\": \"https://w3id.org/dspace/v0.8/\"\n\t}\n}"},"parameters":[],"headers":[{"id":"pair_e91fcc496b5744beb35d556b287863c3","name":"Content-Type","value":"application/json","description":"","disabled":false},{"id":"pair_282f3617e19e4ae3b82be34a5f423e26","name":"X-Api-Key","value":"{{ _.edc_api_auth_key_dev }}","description":""}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1682311111380.6875,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_d96689c90191454cbee9b09cb306e526","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1708679897438,"created":1688547509998,"url":"{{ _.edc_consumer_own }}/management/v2/contractnegotiations","name":"InitiateNegotiationBackend","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"edc:connectorAddress\": \"https://tracex-test-consumer-controlplane.dev.demo.catena-x.net/api/v1/dsp\",\n\t\"edc:connectorId\": \"BPNL00000003CNKC\",\n\t\"edc:offer\": {\n\t\t\"@type\": \"edc:ContractOfferDescription\",\n\t\t\"edc:offerId\": \"3c2a7c26-36ad-42fa-a079-f4d0a5d56889:71eae94e-b352-49b1-ac5a-ada8db870fa0:4f912582-f49e-4963-92f0-5fc8c89ad823\",\n\t\t\"edc:assetId\": \"71eae94e-b352-49b1-ac5a-ada8db870fa0\",\n\t\t\"edc:policy\": {\n\t\t\t\"@id\": \"b49b4a58-418f-42d8-b16d-d553284f1fc7\",\n\t\t\t\"@type\": \"odrl:Set\",\n\t\t\t\"odrl:permission\": {\n\t\t\t\t\"odrl:target\": \"71eae94e-b352-49b1-ac5a-ada8db870fa0\",\n\t\t\t\t\"odrl:action\": {\n\t\t\t\t\t\"odrl:type\": \"USE\"\n\t\t\t\t},\n\t\t\t\t\"odrl:constraint\": {\n\t\t\t\t\t\"odrl:or\": {\n\t\t\t\t\t\t\"odrl:leftOperand\": \"idsc:PURPOSE\",\n\t\t\t\t\t\t\"odrl:operator\": \"EQ\",\n\t\t\t\t\t\t\"odrl:rightOperand\": \"ID 3.0 Trace\"\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t},\n\t\t\t\"odrl:prohibition\": [],\n\t\t\t\"odrl:obligation\": [],\n\t\t\t\"odrl:target\": \"5892340a-c25d-4cac-a2ce-8177e7936c7d\"\n\t\t}\n\t},\n\t\"edc:protocol\": \"dataspace-protocol-http\",\n\t\"edc:callbackAddresses\": [],\n\t\"@context\": {\n\t\t\"dct\": \"https://purl.org/dc/terms/\",\n\t\t\"tx\": \"https://w3id.org/tractusx/v0.0.1/ns/\",\n\t\t\"edc\": \"https://w3id.org/edc/v0.0.1/ns/\",\n\t\t\"odrl\": \"http://www.w3.org/ns/odrl/2/\",\n\t\t\"dcat\": \"https://www.w3.org/ns/dcat/\",\n\t\t\"dspace\": \"https://w3id.org/dspace/v0.8/\"\n\t}\n}"},"parameters":[],"headers":[{"id":"pair_e91fcc496b5744beb35d556b287863c3","name":"Content-Type","value":"application/json","description":"","disabled":false},{"id":"pair_282f3617e19e4ae3b82be34a5f423e26","name":"X-Api-Key","value":"{{ _.edc_api_auth_key_dev }}","description":""}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1682285717296.1016,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_1dfb9ebfcd2b4f5f936b4aa63c8e4a58","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1708679900119,"created":1688539872765,"url":"{{ _.edc_consumer_own }}/management/v2/contractnegotiations/61ebead5-8ad5-475b-a96a-72ab450e612c","name":"NegotiationState","description":"","method":"GET","body":{"mimeType":"application/json","text":"{\n \"edc:connectorAddress\": \"https://tracex-test-consumer-controlplane.dev.demo.catena-x.net/api/v1/dsp\",\n \"edc:connectorId\": \"BPNL00000003CNKC\",\n \"edc:offer\": {\n \"@type\": \"edc:ContractOfferDescription\",\n \"edc:offerId\": \"42533389-0380-4c56-a448-119d89f7e838:9b7bba2a-2c73-44df-8a0b-7b521b5af3f1:d24ecfb7-7d0e-40ae-ba95-a976e49d0b84\",\n \"edc:assetId\": \"9b7bba2a-2c73-44df-8a0b-7b521b5af3f1\",\n \"edc:policy\": {\n \"@id\": \"97d81f57-b6de-4897-b0da-bea8dac66e3a\",\n \"@type\": \"odrl:Set\",\n \"odrl:permission\": [],\n \"odrl:prohibition\": [],\n \"odrl:obligation\": [],\n \"odrl:target\": \"9b7bba2a-2c73-44df-8a0b-7b521b5af3f1\"\n }\n },\n \"edc:protocol\": \"dataspace-protocol-http\",\n \"edc:callbackAddresses\": [],\n \"@context\": {\n \"dct\": \"https://purl.org/dc/terms/\",\n \"tx\": \"https://w3id.org/tractusx/v0.0.1/ns/\",\n \"edc\": \"https://w3id.org/edc/v0.0.1/ns/\",\n \"odrl\": \"http://www.w3.org/ns/odrl/2/\",\n \"dcat\": \"https://www.w3.org/ns/dcat/\",\n \"dspace\": \"https://w3id.org/dspace/v0.8/\"\n }\n}\n"},"parameters":[],"headers":[{"id":"pair_e91fcc496b5744beb35d556b287863c3","name":"Content-Type","value":"application/json","description":"","disabled":false},{"id":"pair_282f3617e19e4ae3b82be34a5f423e26","name":"X-Api-Key","value":"{{ _.edc_api_auth_key_dev }}","description":""}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1682260323211.5156,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_f259857648904b69a4545568aa9b8d94","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1708679902699,"created":1688482543409,"url":"{{ _.edc_consumer_own }}/management/v2/transferprocesses/","name":"TransferProcesses","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n \"edc:assetId\": \"71eae94e-b352-49b1-ac5a-ada8db870fa0\",\n \"edc:connectorAddress\": \"https://tracex-test-consumer-controlplane.dev.demo.catena-x.net/api/v1/dsp\",\n \"edc:contractId\": \"3c2a7c26-36ad-42fa-a079-f4d0a5d56889:71eae94e-b352-49b1-ac5a-ada8db870fa0:5eac85cc-053f-4593-abf6-7c87faecf5c2\",\n \"edc:dataDestination\": {\n \"@type\": \"edc:DataAddress\",\n \"edc:type\": \"HttpProxy\"\n },\n \"edc:protocol\": \"dataspace-protocol-http\",\n \"edc:managedResources\": false,\n \"edc:connectorId\": \"BPNL00000003CNKC\",\n \"@context\": {\n \"dct\": \"https://purl.org/dc/terms/\",\n \"tx\": \"https://w3id.org/tractusx/v0.0.1/ns/\",\n \"edc\": \"https://w3id.org/edc/v0.0.1/ns/\",\n \"odrl\": \"http://www.w3.org/ns/odrl/2/\",\n \"dcat\": \"https://www.w3.org/ns/dcat/\",\n \"dspace\": \"https://w3id.org/dspace/v0.8/\"\n }\n}\n"},"parameters":[],"headers":[{"id":"pair_e91fcc496b5744beb35d556b287863c3","name":"Content-Type","value":"application/json","description":"","disabled":false},{"id":"pair_282f3617e19e4ae3b82be34a5f423e26","name":"X-Api-Key","value":"{{ _.edc_api_auth_key_dev }}","description":""}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1682209535042.3438,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_4b374b55bff643eeb0ed2bb5f462781d","parentId":"fld_5fe81cd771db403084bb4a8f4f42f804","modified":1708679904968,"created":1688482638565,"url":"{{ _.edc_consumer_own }}/management/v2/transferprocesses/aaf0f231-a111-4b59-8829-7ec7218c84e3","name":"TransferProcessesGetById","description":"","method":"GET","body":{"mimeType":"application/json","text":""},"parameters":[],"headers":[{"id":"pair_e91fcc496b5744beb35d556b287863c3","name":"Content-Type","value":"application/json","description":"","disabled":false},{"id":"pair_282f3617e19e4ae3b82be34a5f423e26","name":"X-Api-Key","value":"{{ _.edc_api_auth_key_dev }}","description":""}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1682158746873.1719,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_98ec3f7bdcea4ce28a825e3ef569eb68","parentId":"fld_02405387951348a7a7c74bc69a2ea4b8","modified":1713342714147,"created":1684742067686,"url":"{{ _.irsBaseUrl }}/irs/jobs","name":"RegisterJobParent","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"aspects\": [\n\t\t\"SingleLevelUsageAsBuilt\",\n\t\t\"SerialPart\",\n\t\t\"Batch\"\n\t],\n\t\"bomLifecycle\": \"asBuilt\",\n\t\"collectAspects\": true,\n\t\"direction\": \"upward\",\n\t\"depth\": 2,\n\t\"key\": {\n\t\t\"globalAssetId\": \"urn:uuid:6ec3f1db-2798-454b-a73f-0d21a8966c74\",\n\t\t\"bpn\": \"BPNL00000003CML1\"\n\t}\n}"},"parameters":[],"headers":[{"id":"pair_8345d381d2b244d9b948fd1245052bcd","name":"Content-Type","value":"application/json","description":""}],"authentication":{"type":"apikey","disabled":false,"key":"X-API-KEY","value":"{{ _.irs_regular_api_key }}","addTo":"header"},"metaSortKey":-1681279818545,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_02405387951348a7a7c74bc69a2ea4b8","parentId":"wrk_4b416f7841a74fb5b7e05449db943e93","modified":1684742067669,"created":1684742067669,"name":"IRS","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1681225712903,"_type":"request_group"},{"_id":"req_77145d083738449cad9efbd2cef93ef6","parentId":"fld_02405387951348a7a7c74bc69a2ea4b8","modified":1705411342130,"created":1700222699339,"url":"{{ _.irsBaseUrl }}/irs/policies","name":"GetPolicies","description":"","method":"GET","body":{"mimeType":"application/json","text":""},"parameters":[],"headers":[{"id":"pair_8345d381d2b244d9b948fd1245052bcd","name":"Content-Type","value":"application/json","description":""}],"authentication":{"type":"apikey","disabled":false,"key":"X-API-KEY","value":"{{ _.irs_admin_api_key }}","addTo":"header"},"metaSortKey":-1681130542482,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_390f5cc3d1da49e48d8c7700ce9be05e","parentId":"fld_02405387951348a7a7c74bc69a2ea4b8","modified":1705411385983,"created":1686054326331,"url":"{{ _.irsBaseUrl }}/irs/jobs","name":"RegisterJobChild","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"aspects\": [\n\t\t\"SingleLevelBomAsBuilt\",\n\t\t\"SerialPart\",\n\t\t\"Batch\"\n\t],\n\t\"bomLifecycle\": \"asBuilt\",\n\t\"collectAspects\": true,\n\t\"lookupBPNs\": true,\n\t\"direction\": \"downward\",\n\t\"depth\": 2,\n\t\"key\": {\n\t\t\"globalAssetId\": \"urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4da01\",\n\t\t\"bpn\": \"BPNL00000003CML1\"\n\t}\n}"},"parameters":[],"headers":[{"id":"pair_8345d381d2b244d9b948fd1245052bcd","name":"Content-Type","value":"application/json","description":""}],"authentication":{"type":"apikey","disabled":false,"key":"X-API-KEY","value":"{{ _.irs_regular_api_key }}","addTo":"header"},"metaSortKey":-1680981266419,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_707743bfe5634d1b8e4d681f845f2cda","parentId":"fld_02405387951348a7a7c74bc69a2ea4b8","modified":1705411395794,"created":1695898521322,"url":"{{ _.irsBaseUrl }}/irs/jobs","name":"RegisterJobChildSDE","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"aspects\": [\n\t\t\"SingleLevelBomAsBuilt\",\n\t\t\"SerialPart\",\n\t\t\"Batch\"\n\t],\n\t\"bomLifecycle\": \"asBuilt\",\n\t\"collectAspects\": true,\n\t\"lookupBPNs\": true,\n\t\"direction\": \"downward\",\n\t\"depth\": 2,\n\t\"key\": {\n\t\t\"globalAssetId\": \"urn:uuid:8eea5f45-0823-48ce-a4fc-c3bf1cd00b03\",\n\t\t\"bpn\": \"BPNL00000003CNKC\"\n\t}\n}"},"parameters":[],"headers":[{"id":"pair_8345d381d2b244d9b948fd1245052bcd","name":"Content-Type","value":"application/json","description":""}],"authentication":{"type":"apikey","disabled":false,"key":"X-API-KEY","value":"{{ _.irs_regular_api_key }}","addTo":"header"},"metaSortKey":-1680903913457.625,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_7dbc9a089f054994aafffa526e85e818","parentId":"fld_02405387951348a7a7c74bc69a2ea4b8","modified":1705411407759,"created":1686917663892,"url":"{{ _.irsBaseUrl }}/irs/jobs","name":"RegisterJobChildAsPlanned","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n \"aspects\": [\n \"PartAsPlanned\",\n \"PartSiteInformationAsPlanned\"\n ],\n \"bomLifecycle\":\"asPlanned\",\n \"collectAspects\": true,\n \"direction\":\"downward\",\n \"depth\":2,\n \n\t\t\"key\": {\n\t\t\"globalAssetId\": \"urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4da01\",\n\t\t\"bpn\": \"BPNL00000003CML1\"\n\t}\n} "},"parameters":[],"headers":[{"id":"pair_8345d381d2b244d9b948fd1245052bcd","name":"Content-Type","value":"application/json","description":""}],"authentication":{"type":"apikey","disabled":false,"key":"X-API-KEY","value":"{{ _.irs_regular_api_key }}","addTo":"header"},"metaSortKey":-1680677284433.25,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_457e438f52e74f86a8d9a56bc7412eaa","parentId":"fld_02405387951348a7a7c74bc69a2ea4b8","modified":1708932917597,"created":1684742067728,"url":"{{ _.irsBaseUrl }}/irs/jobs/{% response 'body', 'req_56b807009cfe47baa3b382bbfc39b731', 'b64::JC5pZA==::46b', 'never', 60 %}","name":"GetJobDetailsParent","description":"","method":"GET","body":{},"parameters":[],"headers":[{"id":"pair_cc52c379ff4b470e95f46be30ecf8a34","name":"Content-Type","value":"application/json","description":""}],"authentication":{"type":"apikey","disabled":false,"key":"X-API-KEY","value":"{{ _.irs_regular_api_key }}","addTo":"header"},"metaSortKey":-1680373302447.5,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_4935a86d0ec34d04b941eaf40fcf9421","parentId":"fld_02405387951348a7a7c74bc69a2ea4b8","modified":1705411429808,"created":1686054665262,"url":"{{ _.irsBaseUrl }}/irs/jobs/{% response 'body', 'req_42809e3678a047c2a0b8b495832e9356', 'b64::JC5pZA==::46b', 'never', 60 %}","name":"GetJobDetailsChild","description":"","method":"GET","body":{},"parameters":[],"headers":[{"id":"pair_cc52c379ff4b470e95f46be30ecf8a34","name":"Content-Type","value":"application/json","description":""}],"authentication":{"type":"apikey","disabled":false,"key":"X-API-KEY","value":"{{ _.irs_regular_api_key }}","addTo":"header"},"metaSortKey":-1680259987935.3125,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_677b28c419194315bbc82cd610042abb","parentId":"fld_02405387951348a7a7c74bc69a2ea4b8","modified":1705411443405,"created":1687179176130,"url":"{{ _.irsBaseUrl }}/irs/jobs/{% response 'body', 'req_25f4b167c5354b1897f64baca02b45c6', 'b64::JC5pZA==::46b', 'never', 60 %}","name":"GetJobDetailsChildAsPlannedc","description":"","method":"GET","body":{},"parameters":[],"headers":[{"id":"pair_cc52c379ff4b470e95f46be30ecf8a34","name":"Content-Type","value":"application/json","description":""}],"authentication":{"type":"apikey","disabled":false,"key":"X-API-KEY","value":"{{ _.irs_regular_api_key }}","addTo":"header"},"metaSortKey":-1680203330679.2188,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_60324f51d25b4b9a91cc729ac25ad3f8","parentId":"fld_02405387951348a7a7c74bc69a2ea4b8","modified":1705411473077,"created":1684742067776,"url":"{{ _.irsBaseUrl }}/irs/aspectmodels","name":"Aspectmodels","description":"","method":"GET","body":{},"parameters":[],"headers":[{"id":"pair_cc52c379ff4b470e95f46be30ecf8a34","name":"Content-Type","value":"application/json","description":""}],"authentication":{"type":"apikey","disabled":false,"key":"X-API-KEY","value":"{{ _.irs_regular_api_key }}","addTo":"header"},"metaSortKey":-1679920044398.75,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_4422ba59848e4bb8ac581fca9b9819a7","parentId":"fld_d7366f5c85cd41eb86817a4d4743c1ca","modified":1686576599347,"created":1678889920351,"url":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","name":"RetrieveAccessToken","description":"","method":"POST","body":{"mimeType":"application/x-www-form-urlencoded","params":[{"id":"pair_56879c89b0034ed181ea9b12c85bac06","name":"grant_type","value":"client_credentials","description":""},{"id":"pair_9ca0b1ecf7e3466ea400f90537950e0e","name":"client_id","value":"{{ _.client_id }}","description":"","disabled":false},{"id":"pair_762b17f59d874af2a53a7e7afbe319f0","name":"client_secret","value":"{{ _.client_secret }}","description":""}]},"parameters":[],"headers":[{"name":"Content-Type","value":"application/x-www-form-urlencoded"}],"authentication":{"type":"apikey","disabled":false,"key":"","value":"","addTo":"header"},"metaSortKey":-1678372717854.875,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_d7366f5c85cd41eb86817a4d4743c1ca","parentId":"wrk_4b416f7841a74fb5b7e05449db943e93","modified":1700232280186,"created":1678891506121,"name":"Authentication","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1678891506121,"_type":"request_group"},{"_id":"req_48d63c92227148ff96a51ea4c9519c47","parentId":"fld_d7366f5c85cd41eb86817a4d4743c1ca","modified":1684837637566,"created":1681225716310,"url":"{{ _.base_url_central_idp_global }}/auth/realms/CX-Central/protocol/openid-connect/certs","name":"Cert (Int)","description":"","method":"GET","body":{},"parameters":[],"headers":[],"authentication":{},"metaSortKey":-1678372717804.875,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_d667453605664e3785b83c6976cb9f6e","parentId":"fld_96d313a9b019429fb13dec21a0d2c9e6","modified":1713185120645,"created":1685433509004,"url":"{{ _.baseUrl }}/api/notifications","name":"Create","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"affectedPartIds\": {{ _.assetId }},\n \"description\":\"{% now 'iso-8601', '' %}-requested-by-martin\",\n\t\"severity\": \"LIFE-THREATENING\",\n\t\"type\": \"ALERT\",\n \"targetDate\": \"2024-06-04T13:48:54Z\",\n\t\"bpn\": \"BPNL00000003CNKC\"\n}"},"parameters":[],"headers":[{"name":"authority","value":"traceability.dev.demo.catena-x.net","id":"pair_dc7bb20cc17c4f7fb50fa286d6d657e8"},{"name":"accept","value":"application/json, text/plain, */*","id":"pair_d9d500857d164605903cbd2d2a277971"},{"name":"accept-language","value":"de-DE,de;q=0.9,en-US;q=0.8,en;q=0.7","id":"pair_d32282df29524f8fad00dbfbc96e48e2"},{"name":"access","value":"application/json","id":"pair_cc17f507446943c48b486380cd749238"},{"name":"content-type","value":"application/json","id":"pair_d6cbe8ea35de4df285bbfedb6fd1e564"},{"name":"sec-ch-ua","value":"\"Google Chrome\";v=\"111\", \"Not(A:Brand\";v=\"8\", \"Chromium\";v=\"111\"","id":"pair_6b261299b5cc400ab58c3769aa7d019e"},{"name":"sec-ch-ua-mobile","value":"?0","id":"pair_1545e26232144e8d90e266475d839866"},{"name":"sec-ch-ua-platform","value":"\"Windows\"","id":"pair_03bff76c5bc74e51a8dd942d50cf6007"},{"name":"sec-fetch-dest","value":"empty","id":"pair_534ac4a137d64410b39436125a79ad43"},{"name":"sec-fetch-mode","value":"cors","id":"pair_1e734755f88d45e4bbac284ed7a25b1b"},{"name":"sec-fetch-site","value":"same-site","id":"pair_c5394aea2dbb428ea723b97faa54d467"},{"name":"user-agent","value":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36","id":"pair_f1ac2ccd605a406ca21ed6fcb2171af2"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1701685086281,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_96d313a9b019429fb13dec21a0d2c9e6","parentId":"wrk_4b416f7841a74fb5b7e05449db943e93","modified":1701685078720,"created":1701685001214,"name":"QualityNotifications","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1678649762541.25,"_type":"request_group"},{"_id":"req_848225003b9f434897786c29dca069af","parentId":"fld_96d313a9b019429fb13dec21a0d2c9e6","modified":1713185128014,"created":1713185026369,"url":"{{ _.baseUrl }}/api/notifications/{% response 'body', 'req_d667453605664e3785b83c6976cb9f6e', 'b64::JC5pZA==::46b', 'never', 60 %}/edit","name":"Edit","description":"","method":"PUT","body":{"mimeType":"application/json","text":"{\n\t\"affectedPartIds\": {{ _.assetId }},\n \"description\":\"{% now 'iso-8601', '' %}-requested-by-max\",\n\t\"severity\": \"LIFE-THREATENING\",\n\t\"type\": \"ALERT\",\n \"targetDate\": \"2024-06-04T13:48:54Z\",\n\t\"bpn\": \"BPNL00000003CNKC\"\n}"},"parameters":[],"headers":[{"name":"authority","value":"traceability.dev.demo.catena-x.net","id":"pair_dc7bb20cc17c4f7fb50fa286d6d657e8"},{"name":"accept","value":"application/json, text/plain, */*","id":"pair_d9d500857d164605903cbd2d2a277971"},{"name":"accept-language","value":"de-DE,de;q=0.9,en-US;q=0.8,en;q=0.7","id":"pair_d32282df29524f8fad00dbfbc96e48e2"},{"name":"access","value":"application/json","id":"pair_cc17f507446943c48b486380cd749238"},{"name":"content-type","value":"application/json","id":"pair_d6cbe8ea35de4df285bbfedb6fd1e564"},{"name":"sec-ch-ua","value":"\"Google Chrome\";v=\"111\", \"Not(A:Brand\";v=\"8\", \"Chromium\";v=\"111\"","id":"pair_6b261299b5cc400ab58c3769aa7d019e"},{"name":"sec-ch-ua-mobile","value":"?0","id":"pair_1545e26232144e8d90e266475d839866"},{"name":"sec-ch-ua-platform","value":"\"Windows\"","id":"pair_03bff76c5bc74e51a8dd942d50cf6007"},{"name":"sec-fetch-dest","value":"empty","id":"pair_534ac4a137d64410b39436125a79ad43"},{"name":"sec-fetch-mode","value":"cors","id":"pair_1e734755f88d45e4bbac284ed7a25b1b"},{"name":"sec-fetch-site","value":"same-site","id":"pair_c5394aea2dbb428ea723b97faa54d467"},{"name":"user-agent","value":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36","id":"pair_f1ac2ccd605a406ca21ed6fcb2171af2"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1701685086256,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_2bab110e5b87426faae687b6e17e33fe","parentId":"fld_96d313a9b019429fb13dec21a0d2c9e6","modified":1712046014677,"created":1685433509021,"url":"{{ _.baseUrl }}/api/notifications/{% response 'body', 'req_a39e6eb24bdd4d40a524a908706ea956', 'b64::JC5pZA==::46b', 'never', 60 %}/close","name":"Close","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\"reason\":\"This is the close reason by max.\"}"},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json","id":"pair_b3b659435cf14b77bded0cc87474005c"},{"id":"pair_36d23ffc465a4cc28982c48f0440d8c3","name":"Accept","value":"application/json, text/plain, */*","description":""}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1701685086231,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_3756d2198d4f488483817d0b26d2bd96","parentId":"fld_96d313a9b019429fb13dec21a0d2c9e6","modified":1712054275594,"created":1685433509002,"url":"{{ _.baseUrl }}/api/notifications/{% response 'body', 'req_a39e6eb24bdd4d40a524a908706ea956', 'b64::JC5pZA==::46b', 'never', 60 %}/approve","name":"Approve","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"partIds\": {{ _.assetId }},\n\"description\":\"test\"}"},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json","id":"pair_b3b659435cf14b77bded0cc87474005c"},{"id":"pair_36d23ffc465a4cc28982c48f0440d8c3","name":"Accept","value":"application/json, text/plain, */*","description":""}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1701685086206,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_37e3a341dc0c44548473feeee779737e","parentId":"fld_96d313a9b019429fb13dec21a0d2c9e6","modified":1711520502624,"created":1701687286976,"url":"{{ _.baseUrl }}/api/notifications/distinctFilterValues","name":"AutocompleteAlerts","description":"","method":"GET","body":{"mimeType":"application/json","text":""},"parameters":[{"id":"pair_5bf1c1018dfc4525b28789f0fb027a2f","name":"fieldName","value":"severity","description":"","disabled":true},{"id":"pair_bee6770d1c384b44bfd2a89008bcff85","name":"fieldName","value":"bpn","description":"","disabled":true},{"id":"pair_ef766d2ea86e427e901f7b9a58431827","name":"fieldName","value":"createdDate","description":""},{"id":"pair_648746e34fb04a34a77c78effd7dad11","name":"size","value":"200","description":""},{"id":"pair_280e09b0b292420cbd5e58eb14163df3","name":"startWith","value":"","description":"","disabled":true},{"id":"pair_203f0b840cfe4890bfc4c7b50cfc6955","name":"channel","value":"SENDER","description":"","disabled":true},{"id":"pair_506353c44b684e41b1f6024c747e5e15","name":"channel","value":"RECEIVER","description":""},{"id":"pair_61e86a938a644a6eb882e2087c0527f5","name":"type","value":"ALERT","description":"","disabled":false}],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1701685086193.5,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_79f6a2eec2e945099ca5993f3d8d63cc","parentId":"fld_96d313a9b019429fb13dec21a0d2c9e6","modified":1711520507045,"created":1685433508998,"url":"{{ _.baseUrl }}/api/notifications/filter","name":"Received","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n \"pageAble\": {\n \"page\": 0,\n \"size\": 10,\n \"sort\": [\n \"description,ASC\"\n ]\n },\n \"searchCriteria\": {\n \"filter\": [\n \"channel,EQUAL,RECEIVER,AND\"\n ]\n }\n}"},"parameters":[{"id":"pair_abc38d7f29c3423cb1b2e80c0a3e38e2","name":"filter","value":"channel,EQUAL,SENDER,AND","description":"","disabled":false},{"id":"pair_c9a913a99a80482ebc1e05be32d7ba14","name":"filter","value":"createdBy,STARTS_WITH,BPNL,AND","description":"","disabled":true},{"id":"pair_35dd43940be44739b8e3b6dd419a003b","name":"filter","value":"status,EQUAL,ACKNOWLEDGED,AND","description":"","disabled":true},{"id":"pair_676e365515b24b4ba6930fff661b5fbd","name":"filter","value":"type,EQUAL,ALERT,AND","description":"","disabled":false}],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1701685086187.25,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_f1c85294ed0948318b027cdaff5bed46","parentId":"fld_96d313a9b019429fb13dec21a0d2c9e6","modified":1712038737508,"created":1685433509009,"url":"{{ _.baseUrl }}/api/notifications/filter","name":"Created","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n \"pageAble\": {\n \"page\": 0,\n \"size\": 10,\n \"sort\": [\n \"id,DESC\"\n ]\n },\n \"searchCriteria\": {\n \"filter\": [\n \"channel,EQUAL,SENDER,AND\"\n ]\n }\n}"},"parameters":[{"id":"pair_cb9d01cbaa084925be8dea20bf943c53","name":"filter","value":"side,EQUAL,SENDER,AND","description":""},{"id":"pair_051f12d0df194be4a4ac18b5e9f84777","name":"filter","value":"createdBy,STARTS_WITH,BPNL,AND","description":"","disabled":true},{"id":"pair_0e64697ba48e4677b8ee0feeca7de647","name":"filter","value":"status,EQUAL,ACKNOWLEDGED,AND","description":"","disabled":true},{"id":"pair_2fb59eeab8274132b2332b19ec6a714c","name":"filter","value":"type,EQUAL,ALERT,AND","description":""}],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1701685086184.125,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_4f9290134f4f46338fa5f7a0198918db","parentId":"fld_96d313a9b019429fb13dec21a0d2c9e6","modified":1712826112692,"created":1685433509011,"url":"{{ _.baseUrl }}/api/notifications/65","name":"AlertById","description":"","method":"GET","body":{"mimeType":"application/json","text":""},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1701685086182.5625,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_17f428f9d81a442b874171c19935b3bf","parentId":"fld_96d313a9b019429fb13dec21a0d2c9e6","modified":1711520515722,"created":1685433509007,"url":"{{ _.baseUrl }}/api/notifications/{% response 'body', 'req_7eeacbbe1bf74bc5a5c26b8c8cb4aeb3', 'b64::JC5jb250ZW50WzBdLmlk::46b', 'never', 60 %}/update","name":"Acknowledge (Takes Id from Received)","description":"","method":"POST","body":{"mimeType":"application/json","text":"{ \n\t\"reason\": \"\", \n\t\"status\": \"ACKNOWLEDGED\"\n}"},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1701685086181.7812,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_740b94858ced46609523d353dc515d9c","parentId":"fld_96d313a9b019429fb13dec21a0d2c9e6","modified":1711520517994,"created":1685433509014,"url":"{{ _.baseUrl }}/api/notifications/{% response 'body', 'req_7eeacbbe1bf74bc5a5c26b8c8cb4aeb3', 'b64::JC5jb250ZW50WzBdLmlk::46b', 'never', 60 %}/update","name":"Accepted (Takes Id from Received)","description":"","method":"POST","body":{"mimeType":"application/json","text":"{ \n \"reason\":\"{% now 'iso-8601', '' %}-accepted-by-max\",\n\t\"status\": \"ACCEPTED\"\n}"},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1701685086181.3906,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_3a8a75df5f844fefa2b1ddfbde5863ef","parentId":"fld_96d313a9b019429fb13dec21a0d2c9e6","modified":1711520519575,"created":1685433509016,"url":"{{ _.baseUrl }}/api/notifications/{% response 'body', 'req_9ba0dfee7edc4fa0bb14d605c573c97c', 'b64::JC5jb250ZW50WzBdLmlk::46b', 'never', 60 %}/update","name":"Declined (Takes Id from Received)","description":"","method":"POST","body":{"mimeType":"application/json","text":"{ \n \"reason\":\"{% now 'iso-8601', '' %}-declined-by-max\",\n\t\"status\": \"DECLINED\"\n}"},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1701685086181.1953,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_1e68fa58aab74e2cb84971bf6e532e16","parentId":"fld_86429b333f0a46c7802285a698b5efb5","modified":1708679761723,"created":1704891764171,"url":"{{ _.baseUrl }}/api/assets/import","name":"AssetImport","description":"","method":"POST","body":{"mimeType":"multipart/form-data","params":[{"id":"pair_5143a2031c614e0a9050292748a7311e","name":"file","value":"","description":"","type":"file","fileName":"C:\\Users\\lcapellino\\IdeaProjects\\tx-traceability-foss\\tx-backend\\testdata\\import-test-data-CML1_v0.0.12.json"}]},"parameters":[],"headers":[{"name":"Content-Type","value":"multipart/form-data"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1704891736165,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_86429b333f0a46c7802285a698b5efb5","parentId":"wrk_4b416f7841a74fb5b7e05449db943e93","modified":1684742067475,"created":1684742067475,"name":"Assets","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1678408018911.5,"_type":"request_group"},{"_id":"req_4888aa51b495473e85354693d64037f2","parentId":"fld_86429b333f0a46c7802285a698b5efb5","modified":1708679659447,"created":1708679612804,"url":"{{ _.baseUrl }}/api/assets/publish","name":"AssetPublish","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"policyId\": \"Trace-X policy\",\n\t\"assetIds\": [\n\t\t\"urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa01\"\n\t]\n}"},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1704469128066.75,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_1836518b7ac54c9c9b06196e788add27","parentId":"fld_86429b333f0a46c7802285a698b5efb5","modified":1708679776771,"created":1708679520167,"url":"{{ _.baseUrl }}/api/assets/import/report/{% response 'body', 'req_74ad94a8c70f4ff8bcfa476f12ce5233', 'b64::JC5qb2JJZA==::46b', 'never', 60 %}","name":"ImportReport","description":"","method":"GET","body":{"mimeType":"application/json","text":""},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1704046519968.5,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_fdc56ba6345b4f949986f752b2b9855f","parentId":"fld_86429b333f0a46c7802285a698b5efb5","modified":1708679690254,"created":1708679680603,"url":"{{ _.baseUrl }}/api/policies","name":"Policies","description":"","method":"GET","body":{"mimeType":"application/json","text":""},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1703623911870.25,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_61e2ccd3453c43febbbabc831521ff96","parentId":"fld_f05f3d0cffa14b9c89c0cd555314d1b2","modified":1709565019564,"created":1684742067560,"url":"{{ _.baseUrl }}/api/assets/as-built","name":"AssetsAsBuilt","description":"","method":"GET","body":{"mimeType":"application/json","text":""},"parameters":[{"id":"pair_23dcfcbc7c494e01880ece209d3956ae","name":"filter","value":"semanticDataModel,EQUAL,BATCH,OR","description":"","disabled":true},{"id":"pair_ffd3be5fc566454b91c8639a8f2426a2","name":"filter","value":"semanticDataModel,EQUAL,SERIALPART,OR","description":"","disabled":true}],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1698130006493,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_f05f3d0cffa14b9c89c0cd555314d1b2","parentId":"fld_86429b333f0a46c7802285a698b5efb5","modified":1698130000389,"created":1698130000389,"name":"AsBuilt","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1698130000389,"_type":"request_group"},{"_id":"req_085b7fb84cb54f7c971ce6de802f5ac5","parentId":"fld_f05f3d0cffa14b9c89c0cd555314d1b2","modified":1702546293308,"created":1684742067633,"url":"{{ _.baseUrl }}/api/assets/as-built/urn:uuid:254604ab-2153-45fb-8cad-54ef09f4070e","name":"AssetAsBuiltById","description":"","method":"GET","body":{"mimeType":"application/json","text":""},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp }}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1698130006468,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_af0bfd6381614f6e9fbae087bb4da9a6","parentId":"fld_f05f3d0cffa14b9c89c0cd555314d1b2","modified":1701684909202,"created":1701683940750,"url":"{{ _.baseUrl }}/api/assets/as-built/distinctFilterValues","name":"AutocompleteAsBuilt","description":"","method":"GET","body":{"mimeType":"application/json","text":""},"parameters":[{"id":"pair_d2dfb6778b3f470c82fbc4f80d6499a2","name":"fieldName","value":"owner","description":"","disabled":true},{"id":"pair_7dbf63b9edb4410882db6bed2107a9d4","name":"fieldName","value":"manufacturerId","description":"","disabled":true},{"id":"pair_f6b34e4bc1f6471fa84c64f73679dd50","name":"size","value":"200","description":""},{"id":"pair_c9639ddd1f3a4c11b01e0e0287f9560b","name":"startWith","value":"compo","description":"","disabled":false},{"id":"pair_f8028891e69b4a84961c01a16d5663f3","name":"owner","value":"OWN","description":"","disabled":true},{"id":"pair_d09a9c2d5587457686a0ef5458ab0078","name":"fieldName","value":"classification","description":""}],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp }}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1698130006455.5,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_885cbc86542f4e018f8c7dfaf17d209d","parentId":"fld_f05f3d0cffa14b9c89c0cd555314d1b2","modified":1713278875264,"created":1696431215408,"url":"{{ _.baseUrl }}/api/assets/as-built?page=0&size=50","name":"AssetsAsBuiltFilter","description":"","method":"GET","body":{"mimeType":"application/json","text":""},"parameters":[{"id":"pair_8880289c2aa0462da1770d5f667f291b","name":"filter","value":"owner,EQUAL,OWN,OR","description":"","disabled":true},{"id":"pair_824d99c94eb14bf48f29cbefeb8f1236","name":"filter","value":"id,EQUAL,urn:uuid:254604ab-2153-45fb-8cad-54ef09f4070e,AND","description":"","disabled":false},{"id":"pair_0455dba4978b44e79b7026470481a1aa","name":"filter","value":"id,EQUAL,urn:uuid:1233b405-5ac8-4867-93f8-6fdf37733737,AND","description":"","disabled":false},{"id":"pair_6159ecb38c6f4cb69bf438a4931d1ef0","name":"filter","value":"idShort,STARTS_WITH,NO-341449848714937445621543,OR","description":"","disabled":true},{"id":"pair_bcc5e60568b145949f0e7760bdabd140","name":"filter","value":"customerPartId,STARTS_WITH,NO-341449848714937445621543,OR","description":"","disabled":true},{"id":"pair_29938147b4a342779b72d9bcfd2a6ac8","name":"filter","value":"manufacturerPartId,STARTS_WITH,test,OR","description":"","disabled":true},{"id":"pair_bfc18e2448e94d20987eeb7d2d5a61a5","name":"filter","value":"semanticDataModel,EQUAL,JUSTINSEQUENCE,AND","description":"","disabled":true},{"id":"pair_3dbd710542af45e7a1b8d8a74f4a2cf2","name":"filter","value":"semanticDataModel,EQUAL,SERIALPART,AND","description":"","disabled":true},{"id":"pair_37e72093f12741e19452cb39b0ec5539","name":"filter","value":"qualityAlertIdsInStatusActive,NOTIFICATION_COUNT_EQUAL,2,AND","description":"","disabled":true}],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1698130006443,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_86fc944b337940c4b7f3551d1b375688","parentId":"fld_f05f3d0cffa14b9c89c0cd555314d1b2","modified":1698130006467,"created":1684742067490,"url":"{{ _.baseUrl }}/api/assets/as-built/sync","name":"SyncAssetAsBuilt","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"globalAssetIds\": [\"urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4da01\"]\n}"},"parameters":[],"headers":[{"name":"authority","value":"traceability.dev.demo.catena-x.net","id":"pair_dc7bb20cc17c4f7fb50fa286d6d657e8"},{"name":"accept","value":"application/json, text/plain, */*","id":"pair_d9d500857d164605903cbd2d2a277971"},{"name":"accept-language","value":"de-DE,de;q=0.9,en-US;q=0.8,en;q=0.7","id":"pair_d32282df29524f8fad00dbfbc96e48e2"},{"name":"access","value":"application/json","id":"pair_cc17f507446943c48b486380cd749238"},{"name":"content-type","value":"application/json","id":"pair_d6cbe8ea35de4df285bbfedb6fd1e564"},{"name":"origin","value":"https://traceability-portal.dev.demo.catena-x.net","id":"pair_4aefeb69f30443a0adf9e010794ccf1b"},{"name":"referer","value":"https://traceability-portal.dev.demo.catena-x.net/","id":"pair_a53c45fdeb1941e3bbc349bcea22e82c"},{"name":"sec-ch-ua","value":"\"Google Chrome\";v=\"111\", \"Not(A:Brand\";v=\"8\", \"Chromium\";v=\"111\"","id":"pair_6b261299b5cc400ab58c3769aa7d019e"},{"name":"sec-ch-ua-mobile","value":"?0","id":"pair_1545e26232144e8d90e266475d839866"},{"name":"sec-ch-ua-platform","value":"\"Windows\"","id":"pair_03bff76c5bc74e51a8dd942d50cf6007"},{"name":"sec-fetch-dest","value":"empty","id":"pair_534ac4a137d64410b39436125a79ad43"},{"name":"sec-fetch-mode","value":"cors","id":"pair_1e734755f88d45e4bbac284ed7a25b1b"},{"name":"sec-fetch-site","value":"same-site","id":"pair_c5394aea2dbb428ea723b97faa54d467"},{"name":"user-agent","value":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36","id":"pair_f1ac2ccd605a406ca21ed6fcb2171af2"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1698130006393,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_70c21247f0174f91bb68c6172dae7552","parentId":"fld_f05f3d0cffa14b9c89c0cd555314d1b2","modified":1698130035909,"created":1684742067595,"url":"{{ _.baseUrl }}/api/assets/as-built","name":"AssetsAsBuiltByOwner","description":"","method":"GET","body":{"mimeType":"application/json","text":""},"parameters":[{"id":"pair_3fc77d9617e4426fa71ca1cd02c2e1f5","name":"filter","value":"owner,EQUAL,OWN,AND","description":""}],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1698130006293,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_8bc053f04c704cdd91d246dee6ea0fa8","parentId":"fld_be3c7f18b39f4d3c945ea9a01ddd75a4","modified":1701684961452,"created":1701684917886,"url":"{{ _.baseUrl }}/api/assets/as-planned/distinctFilterValues","name":"AutocompleteAsPlanned","description":"","method":"GET","body":{"mimeType":"application/json","text":""},"parameters":[{"id":"pair_d2dfb6778b3f470c82fbc4f80d6499a2","name":"fieldName","value":"owner","description":"","disabled":true},{"id":"pair_7dbf63b9edb4410882db6bed2107a9d4","name":"fieldName","value":"manufacturerId","description":"","disabled":true},{"id":"pair_f6b34e4bc1f6471fa84c64f73679dd50","name":"size","value":"200","description":""},{"id":"pair_c9639ddd1f3a4c11b01e0e0287f9560b","name":"startWith","value":"produ","description":"","disabled":false},{"id":"pair_f8028891e69b4a84961c01a16d5663f3","name":"owner","value":"OWN","description":"","disabled":true},{"id":"pair_d09a9c2d5587457686a0ef5458ab0078","name":"fieldName","value":"classification","description":""}],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp }}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1698129975459,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_be3c7f18b39f4d3c945ea9a01ddd75a4","parentId":"fld_86429b333f0a46c7802285a698b5efb5","modified":1698129964026,"created":1698129964026,"name":"AsPlanned","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1698129964026,"_type":"request_group"},{"_id":"req_76df74ff9e3c49119a952a76ede10353","parentId":"fld_be3c7f18b39f4d3c945ea9a01ddd75a4","modified":1698130019412,"created":1693338574390,"url":"{{ _.baseUrl }}/api/assets/as-planned/sync","name":"SyncAssetAsPlanned","description":"","method":"POST","body":{"mimeType":"application/json","text":"{\n\t\"globalAssetIds\": [\"urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4da01\"]\n}"},"parameters":[],"headers":[{"name":"authority","value":"traceability.dev.demo.catena-x.net","id":"pair_dc7bb20cc17c4f7fb50fa286d6d657e8"},{"name":"accept","value":"application/json, text/plain, */*","id":"pair_d9d500857d164605903cbd2d2a277971"},{"name":"accept-language","value":"de-DE,de;q=0.9,en-US;q=0.8,en;q=0.7","id":"pair_d32282df29524f8fad00dbfbc96e48e2"},{"name":"access","value":"application/json","id":"pair_cc17f507446943c48b486380cd749238"},{"name":"content-type","value":"application/json","id":"pair_d6cbe8ea35de4df285bbfedb6fd1e564"},{"name":"origin","value":"https://traceability-portal.dev.demo.catena-x.net","id":"pair_4aefeb69f30443a0adf9e010794ccf1b"},{"name":"referer","value":"https://traceability-portal.dev.demo.catena-x.net/","id":"pair_a53c45fdeb1941e3bbc349bcea22e82c"},{"name":"sec-ch-ua","value":"\"Google Chrome\";v=\"111\", \"Not(A:Brand\";v=\"8\", \"Chromium\";v=\"111\"","id":"pair_6b261299b5cc400ab58c3769aa7d019e"},{"name":"sec-ch-ua-mobile","value":"?0","id":"pair_1545e26232144e8d90e266475d839866"},{"name":"sec-ch-ua-platform","value":"\"Windows\"","id":"pair_03bff76c5bc74e51a8dd942d50cf6007"},{"name":"sec-fetch-dest","value":"empty","id":"pair_534ac4a137d64410b39436125a79ad43"},{"name":"sec-fetch-mode","value":"cors","id":"pair_1e734755f88d45e4bbac284ed7a25b1b"},{"name":"sec-fetch-site","value":"same-site","id":"pair_c5394aea2dbb428ea723b97faa54d467"},{"name":"user-agent","value":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36","id":"pair_f1ac2ccd605a406ca21ed6fcb2171af2"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1698129975359,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_277c64e4c5514e9793de2dd6f4032e6e","parentId":"fld_be3c7f18b39f4d3c945ea9a01ddd75a4","modified":1698130133792,"created":1693338462795,"url":"{{ _.baseUrl }}/api/assets/as-planned","name":"AssetsAsPlanned","description":"","method":"GET","body":{"mimeType":"application/json","text":""},"parameters":[{"id":"pair_fb58f605e9b040c2815e783078fa191a","name":"filter","value":"owner,EQUAL,OWN,AND","description":""}],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1698129975259,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_f47d86b2b016476da4867b2f4d493e1d","parentId":"fld_be3c7f18b39f4d3c945ea9a01ddd75a4","modified":1698130018043,"created":1695972244193,"url":"{{ _.baseUrl }}/api/assets/as-planned/urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef127c","name":"AssetAsPlannedById","description":"","method":"GET","body":{"mimeType":"application/json","text":""},"parameters":[],"headers":[{"name":"Content-Type","value":"application/json"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1698129975059,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_6ebf412db2ee42df827cb88a76db2066","parentId":"fld_86429b333f0a46c7802285a698b5efb5","modified":1695881679300,"created":1684742067524,"url":"{{ _.baseUrl }}/api/registry/reload","name":"RegistryReload","description":"","method":"GET","body":{},"parameters":[],"headers":[{"name":"authority","value":"traceability.dev.demo.catena-x.net","id":"pair_dc7bb20cc17c4f7fb50fa286d6d657e8"},{"name":"accept","value":"application/json, text/plain, */*","id":"pair_d9d500857d164605903cbd2d2a277971"},{"name":"accept-language","value":"de-DE,de;q=0.9,en-US;q=0.8,en;q=0.7","id":"pair_d32282df29524f8fad00dbfbc96e48e2"},{"name":"access","value":"application/json","id":"pair_cc17f507446943c48b486380cd749238"},{"name":"origin","value":"https://traceability-portal.dev.demo.catena-x.net","id":"pair_4aefeb69f30443a0adf9e010794ccf1b","disabled":true},{"name":"referer","value":"https://traceability-portal.dev.demo.catena-x.net/","id":"pair_a53c45fdeb1941e3bbc349bcea22e82c","disabled":true},{"name":"sec-ch-ua","value":"\"Google Chrome\";v=\"111\", \"Not(A:Brand\";v=\"8\", \"Chromium\";v=\"111\"","id":"pair_6b261299b5cc400ab58c3769aa7d019e"},{"name":"sec-ch-ua-mobile","value":"?0","id":"pair_1545e26232144e8d90e266475d839866"},{"name":"sec-ch-ua-platform","value":"\"Windows\"","id":"pair_03bff76c5bc74e51a8dd942d50cf6007"},{"name":"sec-fetch-dest","value":"empty","id":"pair_534ac4a137d64410b39436125a79ad43"},{"name":"sec-fetch-mode","value":"cors","id":"pair_1e734755f88d45e4bbac284ed7a25b1b"},{"name":"sec-fetch-site","value":"same-site","id":"pair_c5394aea2dbb428ea723b97faa54d467"},{"name":"user-agent","value":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36","id":"pair_f1ac2ccd605a406ca21ed6fcb2171af2"}],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}","disabled":false},"metaSortKey":-1678423983819.7969,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_d9351e7928dc4bb4a6b21acf63662623","parentId":"fld_50cfb87ab5b245be9484bf936ff80bce","modified":1713342178052,"created":1687846897917,"url":"{{ _.baseUrl }}/api/dashboard","name":"Dashboard","description":"","method":"GET","body":{},"parameters":[],"headers":[],"authentication":{"type":"oauth2","grantType":"client_credentials","accessTokenUrl":"{{ _.base_url_central_idp}}/auth/realms/CX-Central/protocol/openid-connect/token","clientId":"{{ _.client_id }}","clientSecret":"{{ _.client_secret }}"},"metaSortKey":-1687846897917,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_50cfb87ab5b245be9484bf936ff80bce","parentId":"wrk_4b416f7841a74fb5b7e05449db943e93","modified":1687846896127,"created":1687846892118,"name":"Dashboard","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1678408018861.5,"_type":"request_group"},{"_id":"env_60bb230df7f544628469dd15213dfe65","parentId":"wrk_4b416f7841a74fb5b7e05449db943e93","modified":1713342659050,"created":1678372423794,"name":"Base Environment","data":{"base_url_portal_int":"https://portal-backend.int.demo.catena-x.net","baseUrlEdcConsumerTest":"https://tracex-test-consumer-controlplane.dev.demo.catena-x.net","baseUrlEdcConsumerDev":"https://tracex-consumer-controlplane.dev.demo.catena-x.net","registryBaseDevTest":"https://trace-x-registry.dev.demo.catena-x.net","base_url_central_idp_global":"https://centralidp.int.demo.catena-x.net","base_url_registry_e2e":"https://trace-x-registry-e2e.dev.demo.catena-x.net"},"dataPropertyOrder":{"&":["base_url_portal_int","baseUrlEdcConsumerTest","baseUrlEdcConsumerDev","registryBaseDevTest","base_url_central_idp_global","base_url_registry_e2e"]},"color":null,"isPrivate":false,"metaSortKey":1678372423794,"_type":"environment"},{"_id":"jar_a900dd68ca56447a82c2476b3eb864ab","parentId":"wrk_4b416f7841a74fb5b7e05449db943e93","modified":1713342179587,"created":1678372423801,"name":"Default Jar","cookies":[{"key":"KC_RESTART","expires":"1970-01-01T00:00:10.000Z","maxAge":0,"domain":"centralidp.dev.demo.catena-x.net","path":"/auth/realms/CX-Central/","httpOnly":true,"extensions":["Version=1"],"hostOnly":true,"creation":"2023-03-28T07:01:57.266Z","lastAccessed":"2024-04-17T08:22:59.584Z","id":"1011684264871735"},{"key":"KC_RESTART","expires":"1970-01-01T00:00:10.000Z","maxAge":0,"domain":"centralidp.int.demo.catena-x.net","path":"/auth/realms/CX-Central/","httpOnly":true,"extensions":["Version=1"],"hostOnly":true,"creation":"2023-04-04T08:16:29.897Z","lastAccessed":"2023-12-05T07:33:23.800Z","id":"7620842365447065"},{"key":"rack.session","value":"8ebba2ae37dff827f137b1674408ce3cc715cde1161922859ae23b0858f925f5","domain":"daps1.int.demo.catena-x.net","path":"/","secure":true,"httpOnly":true,"hostOnly":true,"creation":"2023-04-17T11:58:39.065Z","lastAccessed":"2023-05-04T18:43:59.102Z","id":"9773889932686781"},{"key":"JSESSIONID","value":"A83A839D496ECF6C1C2EFA92944BE38F","domain":"traceability-e2e-a.dev.demo.catena-x.net","path":"/api","secure":true,"httpOnly":true,"hostOnly":true,"creation":"2023-06-16T08:21:03.112Z","lastAccessed":"2023-06-27T06:22:05.966Z","id":"1024062796905798"},{"key":"JSESSIONID","value":"54E3D206C2F70F49A144047BAB25AC6E","domain":"traceability-test.dev.demo.catena-x.net","path":"/api","secure":true,"httpOnly":true,"hostOnly":true,"creation":"2023-06-16T08:22:02.931Z","lastAccessed":"2023-06-16T08:22:02.931Z","id":"5217885251967742"},{"key":"JSESSIONID","value":"512F451C60A863880282A2488D32AE04","domain":"traceability-e2e-b.dev.demo.catena-x.net","path":"/api","secure":true,"httpOnly":true,"hostOnly":true,"creation":"2023-06-16T08:24:36.583Z","lastAccessed":"2023-06-16T08:24:36.583Z","id":"8224181296192503"},{"key":"_gh_sess","value":"T3YzTIVmRasipbCn6OAaCSDSiOvtiQCeZI2CIt1xshYwR%2FsXv8QjmuUJOs7XvByvPRbC%2B8vUQjoSjPIC6bEDH5R03UaM2jwzxkG2QK3ysoyDbK44jJX0jAT%2Bi5fl3Jt51lfBezsv5WItxOvRG9XCUCgAO42%2BighWb6g5N9dx4zC16RkSCba27LsvgBr1SpX6iHFaA1j8YgUzRbewE%2BU3ywGjsASpLQaMBmwtKtLl7qYJVd%2FAjJyQlojqPAp%2BmqXnvTnxEvQ%3D--gjG3hcElc8KXpx2f--NYwBgJzY8ziaT5VRgvkTdQ%3D%3D","domain":"github.com","path":"/","secure":true,"httpOnly":true,"extensions":["SameSite=Lax"],"hostOnly":true,"creation":"2023-06-16T19:40:06.360Z","lastAccessed":"2023-06-16T19:40:06.361Z","id":"7722905365206911"},{"key":"_octo","value":"GH1.1.1938062586.1686944406","expires":"2024-06-16T19:40:06.000Z","domain":"github.com","path":"/","secure":true,"extensions":["SameSite=Lax"],"hostOnly":false,"creation":"2023-06-16T19:40:06.361Z","lastAccessed":"2023-06-16T19:40:06.361Z","id":"7759363435305011"},{"key":"logged_in","value":"no","expires":"2024-06-16T19:40:06.000Z","domain":"github.com","path":"/","secure":true,"httpOnly":true,"extensions":["SameSite=Lax"],"hostOnly":false,"creation":"2023-06-16T19:40:06.361Z","lastAccessed":"2023-06-16T19:40:06.361Z","id":"563578435834146"},{"key":"AWSALB","value":"EZqpY7O9szHhUkXvKTQ/Uvytdbo9xUnf+BmTsEIJNAaX+KWDRiZPgrtGZQ7ysdNLXYxdHUQplKHst0+Uz91fn57S6CE2Mq+lVCPWKFoZw6pxOvqPQh119w+sIHRD","expires":"2023-08-24T09:17:03.000Z","domain":"connector.cx-rel.edc.aws.bmw.cloud","path":"/","hostOnly":true,"creation":"2023-08-17T09:17:03.912Z","lastAccessed":"2023-08-17T09:17:03.912Z","id":"8601720979522209"},{"key":"AWSALBCORS","value":"EZqpY7O9szHhUkXvKTQ/Uvytdbo9xUnf+BmTsEIJNAaX+KWDRiZPgrtGZQ7ysdNLXYxdHUQplKHst0+Uz91fn57S6CE2Mq+lVCPWKFoZw6pxOvqPQh119w+sIHRD","expires":"2023-08-24T09:17:03.000Z","domain":"connector.cx-rel.edc.aws.bmw.cloud","path":"/","secure":true,"hostOnly":true,"creation":"2023-08-17T09:17:03.912Z","lastAccessed":"2023-08-17T09:17:03.912Z","sameSite":"none","id":"27841926142862516"},{"key":"KC_RESTART","expires":"1970-01-01T00:00:10.000Z","maxAge":0,"domain":"centralidp.stable.demo.catena-x.net","path":"/auth/realms/CX-Central/","httpOnly":true,"extensions":["Version=1"],"hostOnly":true,"creation":"2023-11-17T09:46:42.892Z","lastAccessed":"2023-11-17T09:47:45.468Z","id":"1048523791352498"},{"key":"KC_AUTH_STATE","expires":"1970-01-01T00:00:10.000Z","maxAge":0,"domain":"centralidp.dev.demo.catena-x.net","path":"/auth/realms/CX-Central/","extensions":["Version=1"],"hostOnly":true,"creation":"2024-03-27T06:01:30.991Z","lastAccessed":"2024-04-17T08:22:59.586Z","id":"6869860823782703"}],"_type":"cookie_jar"},{"_id":"spc_2859ce1f56274fa8b1d9542d2cccda15","parentId":"wrk_4b416f7841a74fb5b7e05449db943e93","modified":1713185001701,"created":1712820419108,"fileName":"Trace-X@Catena","contents":"","contentType":"yaml","_type":"api_spec"}]} \ No newline at end of file diff --git a/tx-backend/openapi/traceability-foss-backend.json b/tx-backend/openapi/traceability-foss-backend.json index 134b058921..bc56ac8afa 100644 --- a/tx-backend/openapi/traceability-foss-backend.json +++ b/tx-backend/openapi/traceability-foss-backend.json @@ -22,30 +22,128 @@ } ], "paths" : { - "/bpn-config" : { - "get" : { + "/notifications/{notificationId}/edit" : { + "put" : { "tags" : [ - "BpnEdcMapping" + "Notifications" ], - "summary" : "Get BPN EDC URL mappings", - "description" : "The endpoint returns a result of BPN EDC URL mappings.", - "operationId" : "getBpnEdcs", + "summary" : "Update notification by id", + "description" : "The endpoint updates notification by their id.", + "operationId" : "updateNotification", + "parameters" : [ + { + "name" : "notificationId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "integer", + "format" : "int64" + } + } + ], + "requestBody" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/EditNotificationRequest" + } + } + }, + "required" : true + }, "responses" : { - "200" : { - "description" : "Returns the paged result found", + "401" : { + "description" : "Authorization failed.", "content" : { "application/json" : { "schema" : { - "maxItems" : 2147483647, - "minItems" : 0, - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/BpnEdcMappingResponse" - } + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "204" : { + "description" : "No content." + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" } } } }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/bpn-config" : { + "get" : { + "tags" : [ + "BpnEdcMapping" + ], + "summary" : "Get BPN EDC URL mappings", + "description" : "The endpoint returns a result of BPN EDC URL mappings.", + "operationId" : "getBpnEdcs", + "responses" : { "401" : { "description" : "Authorization failed.", "content" : { @@ -106,6 +204,21 @@ } } }, + "200" : { + "description" : "Returns the paged result found", + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 2147483647, + "minItems" : 0, + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/BpnEdcMappingResponse" + } + } + } + } + }, "404" : { "description" : "Not found.", "content" : { @@ -198,16 +311,6 @@ } } }, - "500" : { - "description" : "Internal server error.", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, "200" : { "description" : "Returns the paged result found for BpnEdcMapping", "content" : { @@ -223,6 +326,16 @@ } } }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, "404" : { "description" : "Not found.", "content" : { @@ -315,16 +428,6 @@ } } }, - "500" : { - "description" : "Internal server error.", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, "200" : { "description" : "Returns the paged result found for BpnEdcMapping", "content" : { @@ -340,6 +443,16 @@ } } }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, "404" : { "description" : "Not found.", "content" : { @@ -379,6 +492,16 @@ } ], "responses" : { + "200" : { + "description" : "Returns submodel payload", + "content" : { + "application/json" : { + "schema" : { + "type" : "string" + } + } + } + }, "401" : { "description" : "Authorization failed.", "content" : { @@ -429,16 +552,6 @@ } } }, - "200" : { - "description" : "Returns submodel payload", - "content" : { - "application/json" : { - "schema" : { - "type" : "string" - } - } - } - }, "500" : { "description" : "Internal server error.", "content" : { @@ -698,7 +811,7 @@ ], "summary" : "Update notification by id", "description" : "The endpoint updates notification by their id.", - "operationId" : "updateNotification", + "operationId" : "updateNotification_1", "parameters" : [ { "name" : "notificationId", @@ -714,16 +827,13 @@ "content" : { "application/json" : { "schema" : { - "$ref" : "#/components/schemas/UpdateNotificationRequest" + "$ref" : "#/components/schemas/UpdateNotificationStatusTransitionRequest" } } }, "required" : true }, "responses" : { - "204" : { - "description" : "No content." - }, "401" : { "description" : "Authorization failed.", "content" : { @@ -744,6 +854,9 @@ } } }, + "204" : { + "description" : "No content." + }, "403" : { "description" : "Forbidden.", "content" : { @@ -810,7 +923,7 @@ "Notifications" ], "summary" : "Close notification by id", - "description" : "The endpoint closes alert by id.", + "description" : "The endpoint closes Notification by id.", "operationId" : "closeNotification", "parameters" : [ { @@ -834,9 +947,6 @@ "required" : true }, "responses" : { - "204" : { - "description" : "No content." - }, "200" : { "description" : "Ok." }, @@ -860,6 +970,9 @@ } } }, + "204" : { + "description" : "No content." + }, "403" : { "description" : "Forbidden.", "content" : { @@ -1201,16 +1314,6 @@ } } }, - "500" : { - "description" : "Internal server error.", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, "200" : { "description" : "Returns the paged result found for Notifications", "content" : { @@ -1355,6 +1458,16 @@ } } }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, "404" : { "description" : "Not found.", "content" : { @@ -1503,14 +1616,14 @@ "required" : true }, "responses" : { - "429" : { - "description" : "Too many requests.", + "400" : { + "description" : "Bad request.", "content" : { "application/json" : { "schema" : { "type" : "string", "example" : { - "message" : "Too many requests." + "message" : "Bad request." } } } @@ -1529,19 +1642,6 @@ } } }, - "404" : { - "description" : "Not found.", - "content" : { - "application/json" : { - "schema" : { - "type" : "string", - "example" : { - "message" : "Not found." - } - } - } - } - }, "200" : { "description" : "Ok.", "content" : { @@ -1558,53 +1658,66 @@ } } }, - "500" : { - "description" : "Internal server error.", + "403" : { + "description" : "Forbidden.", "content" : { "application/json" : { "schema" : { "type" : "string", "example" : { - "message" : "Internal server error." + "message" : "Forbidden." } } } } }, - "403" : { - "description" : "Forbidden.", + "429" : { + "description" : "Too many requests.", "content" : { "application/json" : { "schema" : { "type" : "string", "example" : { - "message" : "Forbidden." + "message" : "Too many requests." } } } } }, - "400" : { - "description" : "Bad request.", + "415" : { + "description" : "Unsupported media type.", "content" : { "application/json" : { "schema" : { "type" : "string", "example" : { - "message" : "Bad request." + "message" : "Unsupported media type." } } } } }, - "415" : { - "description" : "Unsupported media type.", + "500" : { + "description" : "Internal server error.", "content" : { "application/json" : { "schema" : { "type" : "string", "example" : { - "message" : "Unsupported media type." + "message" : "Internal server error." + } + } + } + } + }, + "404" : { + "description" : "Not found.", + "content" : { + "application/json" : { + "schema" : { + "type" : "string", + "example" : { + "message" : "Not found." } } } @@ -1714,12 +1827,6 @@ } } }, - "200" : { - "description" : "OK.", - "content" : { - "application/json" : {} - } - }, "404" : { "description" : "Not found.", "content" : { @@ -1729,6 +1836,12 @@ } } } + }, + "200" : { + "description" : "OK.", + "content" : { + "application/json" : {} + } } }, "security" : [ @@ -1800,18 +1913,18 @@ } } }, - "200" : { - "description" : "OK.", + "400" : { + "description" : "Bad request.", "content" : { "application/json" : { "schema" : { - "$ref" : "#/components/schemas/ImportResponse" + "$ref" : "#/components/schemas/ErrorResponse" } } } }, - "400" : { - "description" : "Bad request.", + "429" : { + "description" : "Too many requests.", "content" : { "application/json" : { "schema" : { @@ -1820,12 +1933,12 @@ } } }, - "429" : { - "description" : "Too many requests.", + "200" : { + "description" : "OK.", "content" : { "application/json" : { "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" + "$ref" : "#/components/schemas/ImportResponse" } } } @@ -2374,56 +2487,6 @@ "required" : true }, "responses" : { - "401" : { - "description" : "Authorization failed.", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, - "415" : { - "description" : "Unsupported media type", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, - "403" : { - "description" : "Forbidden.", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, - "400" : { - "description" : "Bad request.", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, - "429" : { - "description" : "Too many requests.", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, "200" : { "description" : "Returns the paged result found for Asset", "content" : { @@ -2616,8 +2679,8 @@ } } }, - "500" : { - "description" : "Internal server error.", + "401" : { + "description" : "Authorization failed.", "content" : { "application/json" : { "schema" : { @@ -2626,8 +2689,8 @@ } } }, - "404" : { - "description" : "Not found.", + "415" : { + "description" : "Unsupported media type", "content" : { "application/json" : { "schema" : { @@ -2635,38 +2698,9 @@ } } } - } - }, - "security" : [ - { - "oAuth2" : [ - "profile email" - ] - } - ] - } - }, - "/assets/as-planned/{assetId}" : { - "get" : { - "tags" : [ - "AssetsAsPlanned" - ], - "summary" : "Get asset by id", - "description" : "The endpoint returns an asset filtered by id .", - "operationId" : "assetById", - "parameters" : [ - { - "name" : "assetId", - "in" : "path", - "required" : true, - "schema" : { - "type" : "string" - } - } - ], - "responses" : { - "401" : { - "description" : "Authorization failed.", + }, + "403" : { + "description" : "Forbidden.", "content" : { "application/json" : { "schema" : { @@ -2675,8 +2709,8 @@ } } }, - "415" : { - "description" : "Unsupported media type", + "400" : { + "description" : "Bad request.", "content" : { "application/json" : { "schema" : { @@ -2685,8 +2719,8 @@ } } }, - "403" : { - "description" : "Forbidden.", + "429" : { + "description" : "Too many requests.", "content" : { "application/json" : { "schema" : { @@ -2695,8 +2729,8 @@ } } }, - "400" : { - "description" : "Bad request.", + "500" : { + "description" : "Internal server error.", "content" : { "application/json" : { "schema" : { @@ -2705,8 +2739,8 @@ } } }, - "429" : { - "description" : "Too many requests.", + "404" : { + "description" : "Not found.", "content" : { "application/json" : { "schema" : { @@ -2714,7 +2748,36 @@ } } } - }, + } + }, + "security" : [ + { + "oAuth2" : [ + "profile email" + ] + } + ] + } + }, + "/assets/as-planned/{assetId}" : { + "get" : { + "tags" : [ + "AssetsAsPlanned" + ], + "summary" : "Get asset by id", + "description" : "The endpoint returns an asset filtered by id .", + "operationId" : "assetById", + "parameters" : [ + { + "name" : "assetId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + } + ], + "responses" : { "200" : { "description" : "Returns the assets found", "content" : { @@ -2902,6 +2965,56 @@ } } }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, "500" : { "description" : "Internal server error.", "content" : { @@ -2959,13 +3072,43 @@ "required" : true }, "responses" : { - "200" : { - "description" : "Returns the updated asset", + "401" : { + "description" : "Authorization failed.", "content" : { "application/json" : { "schema" : { - "maxItems" : 2147483647, - "type" : "array", + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "200" : { + "description" : "Returns the updated asset", + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 2147483647, + "type" : "array", "description" : "Assets", "items" : { "type" : "object", @@ -3146,36 +3289,6 @@ } } }, - "401" : { - "description" : "Authorization failed.", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, - "415" : { - "description" : "Unsupported media type", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, - "403" : { - "description" : "Forbidden.", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, "400" : { "description" : "Bad request.", "content" : { @@ -3245,6 +3358,56 @@ } ], "responses" : { + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, "200" : { "description" : "Returns the assets found", "content" : { @@ -3432,56 +3595,6 @@ } } }, - "401" : { - "description" : "Authorization failed.", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, - "415" : { - "description" : "Unsupported media type", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, - "403" : { - "description" : "Forbidden.", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, - "400" : { - "description" : "Bad request.", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, - "429" : { - "description" : "Too many requests.", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, "500" : { "description" : "Internal server error.", "content" : { @@ -4160,18 +4273,23 @@ } ], "responses" : { - "401" : { - "description" : "Authorization failed.", + "200" : { + "description" : "Returns a distinct filter values for given fieldName.", "content" : { "application/json" : { "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" + "maxItems" : 2147483647, + "minItems" : 0, + "type" : "array", + "items" : { + "type" : "string" + } } } } }, - "415" : { - "description" : "Unsupported media type", + "401" : { + "description" : "Authorization failed.", "content" : { "application/json" : { "schema" : { @@ -4180,17 +4298,12 @@ } } }, - "200" : { - "description" : "Returns a distinct filter values for given fieldName.", + "415" : { + "description" : "Unsupported media type", "content" : { "application/json" : { "schema" : { - "maxItems" : 2147483647, - "minItems" : 0, - "type" : "array", - "items" : { - "type" : "string" - } + "$ref" : "#/components/schemas/ErrorResponse" } } } @@ -4264,16 +4377,6 @@ "description" : "The endpoint can return limited data based on the user role", "operationId" : "dashboard", "responses" : { - "200" : { - "description" : "Returns dashboard data", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/DashboardResponse" - } - } - } - }, "401" : { "description" : "Authorization failed.", "content" : { @@ -4324,6 +4427,16 @@ } } }, + "200" : { + "description" : "Returns dashboard data", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/DashboardResponse" + } + } + } + }, "500" : { "description" : "Internal server error.", "content" : { @@ -4374,16 +4487,6 @@ } ], "responses" : { - "200" : { - "description" : "OK.", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ImportReportResponse" - } - } - } - }, "204" : { "description" : "No Content." }, @@ -4407,6 +4510,16 @@ } } }, + "200" : { + "description" : "OK.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ImportReportResponse" + } + } + } + }, "403" : { "description" : "Forbidden.", "content" : { @@ -4814,9 +4927,35 @@ "UNKNOWN" ] } + }, + { + "name" : "inAssetIds", + "in" : "query", + "required" : false, + "schema" : { + "type" : "array", + "items" : { + "type" : "string" + } + } } ], "responses" : { + "200" : { + "description" : "Returns a distinct filter values for given fieldName.", + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 2147483647, + "minItems" : 0, + "type" : "array", + "items" : { + "type" : "string" + } + } + } + } + }, "401" : { "description" : "Authorization failed.", "content" : { @@ -4837,23 +4976,8 @@ } } }, - "200" : { - "description" : "Returns a distinct filter values for given fieldName.", - "content" : { - "application/json" : { - "schema" : { - "maxItems" : 2147483647, - "minItems" : 0, - "type" : "array", - "items" : { - "type" : "string" - } - } - } - } - }, - "403" : { - "description" : "Forbidden.", + "403" : { + "description" : "Forbidden.", "content" : { "application/json" : { "schema" : { @@ -5225,66 +5349,6 @@ } ], "responses" : { - "401" : { - "description" : "Authorization failed.", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, - "415" : { - "description" : "Unsupported media type", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, - "403" : { - "description" : "Forbidden.", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, - "400" : { - "description" : "Bad request.", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, - "429" : { - "description" : "Too many requests.", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, - "500" : { - "description" : "Internal server error.", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, "200" : { "description" : "Returns the paged result found for Asset", "content" : { @@ -5477,6 +5541,66 @@ } } }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, "404" : { "description" : "Not found.", "content" : { @@ -5518,7 +5642,7 @@ { "name" : "size", "in" : "query", - "required" : true, + "required" : false, "schema" : { "type" : "integer", "format" : "int32" @@ -5527,7 +5651,7 @@ { "name" : "startWith", "in" : "query", - "required" : true, + "required" : false, "schema" : { "type" : "string" } @@ -5535,7 +5659,7 @@ { "name" : "owner", "in" : "query", - "required" : true, + "required" : false, "schema" : { "type" : "string", "enum" : [ @@ -5545,21 +5669,37 @@ "UNKNOWN" ] } + }, + { + "name" : "inAssetIds", + "in" : "query", + "required" : false, + "schema" : { + "type" : "array", + "items" : { + "type" : "string" + } + } } ], "responses" : { - "401" : { - "description" : "Authorization failed.", + "200" : { + "description" : "Returns a distinct filter values for given fieldName.", "content" : { "application/json" : { "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" + "maxItems" : 2147483647, + "minItems" : 0, + "type" : "array", + "items" : { + "type" : "string" + } } } } }, - "415" : { - "description" : "Unsupported media type", + "401" : { + "description" : "Authorization failed.", "content" : { "application/json" : { "schema" : { @@ -5568,17 +5708,12 @@ } } }, - "200" : { - "description" : "Returns a distinct filter values for given fieldName.", + "415" : { + "description" : "Unsupported media type", "content" : { "application/json" : { "schema" : { - "maxItems" : 2147483647, - "minItems" : 0, - "type" : "array", - "items" : { - "type" : "string" - } + "$ref" : "#/components/schemas/ErrorResponse" } } } @@ -5652,6 +5787,21 @@ "description" : "The endpoint returns a map for assets consumed by the map.", "operationId" : "assetsCountryMap", "responses" : { + "200" : { + "description" : "Returns the assets found", + "content" : { + "application/json" : { + "schema" : { + "maxItems" : 2147483647, + "minItems" : 0, + "type" : "array", + "items" : { + "type" : "string" + } + } + } + } + }, "401" : { "description" : "Authorization failed.", "content" : { @@ -5702,21 +5852,6 @@ } } }, - "200" : { - "description" : "Returns the assets found", - "content" : { - "application/json" : { - "schema" : { - "maxItems" : 2147483647, - "minItems" : 0, - "type" : "array", - "items" : { - "type" : "string" - } - } - } - } - }, "500" : { "description" : "Internal server error.", "content" : { @@ -5766,66 +5901,6 @@ } ], "responses" : { - "401" : { - "description" : "Authorization failed.", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, - "415" : { - "description" : "Unsupported media type", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, - "403" : { - "description" : "Forbidden.", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, - "400" : { - "description" : "Bad request.", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, - "429" : { - "description" : "Too many requests.", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, - "500" : { - "description" : "Internal server error.", - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ErrorResponse" - } - } - } - }, "200" : { "description" : "Returns the asset by childId", "content" : { @@ -6013,6 +6088,66 @@ } } }, + "401" : { + "description" : "Authorization failed.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "415" : { + "description" : "Unsupported media type", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "403" : { + "description" : "Forbidden.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "400" : { + "description" : "Bad request.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "429" : { + "description" : "Too many requests.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, + "500" : { + "description" : "Internal server error.", + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ErrorResponse" + } + } + } + }, "404" : { "description" : "Not found.", "content" : { @@ -6197,6 +6332,9 @@ } } }, + "200" : { + "description" : "Okay" + }, "204" : { "description" : "Deleted." }, @@ -6210,9 +6348,6 @@ } } }, - "200" : { - "description" : "Okay" - }, "404" : { "description" : "Not found.", "content" : { @@ -6236,23 +6371,60 @@ }, "components" : { "schemas" : { - "BpnMappingRequest" : { + "EditNotificationRequest" : { "required" : [ - "bpn", - "url" + "affectedPartIds", + "description", + "receiverBpn", + "severity" ], "type" : "object", "properties" : { - "bpn" : { + "title" : { "maxLength" : 255, - "minLength" : 0, + "minLength" : 1, "type" : "string", - "example" : "BPNL00000003CSGV" + "example" : "title" }, - "url" : { - "maxLength" : 255, - "minLength" : 0, - "type" : "string" + "receiverBpn" : { + "type" : "string", + "example" : "BPNL00000003CNKC" + }, + "severity" : { + "type" : "string", + "enum" : [ + "MINOR", + "MAJOR", + "CRITICAL", + "LIFE-THREATENING" + ] + }, + "targetDate" : { + "type" : "string", + "format" : "date-time", + "example" : "2099-03-11T22:44:06.333826952Z" + }, + "description" : { + "maxLength" : 1000, + "minLength" : 15, + "type" : "string", + "example" : "The description" + }, + "affectedPartIds" : { + "maxLength" : 50, + "minLength" : 1, + "maxItems" : 50, + "minItems" : 1, + "type" : "array", + "example" : [ + "urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978" + ], + "items" : { + "maxLength" : 50, + "minLength" : 1, + "type" : "string", + "example" : "[\"urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978\"]" + } } } }, @@ -6268,6 +6440,26 @@ } } }, + "BpnMappingRequest" : { + "required" : [ + "bpn", + "url" + ], + "type" : "object", + "properties" : { + "bpn" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string", + "example" : "BPNL00000003CSGV" + }, + "url" : { + "maxLength" : 255, + "minLength" : 0, + "type" : "string" + } + } + }, "BpnEdcMappingResponse" : { "type" : "object", "properties" : { @@ -6283,6 +6475,7 @@ }, "StartNotificationRequest" : { "required" : [ + "receiverBpn", "severity", "type" ], @@ -6294,7 +6487,7 @@ "type" : "string", "example" : "title" }, - "partIds" : { + "affectedPartIds" : { "maxLength" : 100, "minLength" : 1, "maxItems" : 50, @@ -6332,7 +6525,7 @@ }, "receiverBpn" : { "type" : "string", - "example" : "BPN00001123123AS" + "example" : "BPNL00000003CNKC" }, "type" : { "type" : "string", @@ -6341,9 +6534,6 @@ "ALERT", "INVESTIGATION" ] - }, - "asBuilt" : { - "type" : "boolean" } } }, @@ -6357,7 +6547,7 @@ } } }, - "UpdateNotificationRequest" : { + "UpdateNotificationStatusTransitionRequest" : { "required" : [ "status" ], diff --git a/tx-backend/pom.xml b/tx-backend/pom.xml index 3360e05bb5..cb92614787 100644 --- a/tx-backend/pom.xml +++ b/tx-backend/pom.xml @@ -65,6 +65,8 @@ SPDX-License-Identifier: Apache-2.0 irs-registry-client ${irs-client-lib.version} + + org.eclipse.tractusx.traceability @@ -87,53 +89,6 @@ SPDX-License-Identifier: Apache-2.0 spring-boot-starter-data-jpa - - - org.eclipse.edc - connector-core - ${edc-library.version} - - - runtime-metamodel - org.eclipse.edc - - - - - org.eclipse.edc - dsp - ${edc-library.version} - - - runtime-metamodel - org.eclipse.edc - - - - websocket-jakarta-server - org.eclipse.jetty.websocket - - - - - org.eclipse.edc - json-ld - ${edc-library.version} - - - runtime-metamodel - org.eclipse.edc - - - - - runtime-metamodel - org.eclipse.edc - ${edc-library.version} - - org.yaml snakeyaml @@ -227,7 +182,7 @@ SPDX-License-Identifier: Apache-2.0 org.apache.commons commons-compress - 1.26.0 + ${commons-compress.version} diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asbuilt/rest/AssetAsBuiltController.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asbuilt/rest/AssetAsBuiltController.java index 0a6a83271a..2e064dc1f0 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asbuilt/rest/AssetAsBuiltController.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asbuilt/rest/AssetAsBuiltController.java @@ -33,7 +33,7 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; -import jakarta.ws.rs.QueryParam; +import org.apache.commons.lang3.ArrayUtils; import org.eclipse.tractusx.traceability.assets.application.asbuilt.mapper.AssetAsBuiltFieldMapper; import org.eclipse.tractusx.traceability.assets.application.asbuilt.mapper.AssetAsBuiltResponseMapper; import org.eclipse.tractusx.traceability.assets.application.asbuilt.mapper.QualityTypeMapper; @@ -53,8 +53,10 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -254,8 +256,17 @@ public PageResult assets(OwnPageable pageable, SearchCrite mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class)))}) @GetMapping("distinctFilterValues") - public List distinctFilterValues(@QueryParam("fieldName") String fieldName, @QueryParam("size") Integer size, @QueryParam("startWith") String startWith, @QueryParam("owner") Owner owner) { - return assetBaseService.getDistinctFilterValues(fieldMapper.mapRequestFieldName(fieldName), startWith, size, owner); + public List distinctFilterValues( + @RequestParam("fieldName") String fieldName, + @RequestParam(value = "size", required = false) Integer size, + @RequestParam(value = "startWith", required = false) String startWith, + @RequestParam(value = "owner", required = false) Owner owner, + @RequestParam(value = "inAssetIds", required = false) String[] inAssetIds) { + List inAssetIdsList = List.of(); + if (ArrayUtils.isNotEmpty(inAssetIds)) { + inAssetIdsList = Arrays.asList(inAssetIds); + } + return assetBaseService.getDistinctFilterValues(fieldMapper.mapRequestFieldName(fieldName), startWith, size, owner, inAssetIdsList); } @Operation(operationId = "assetsCountryMap", diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asplanned/rest/AssetAsPlannedController.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asplanned/rest/AssetAsPlannedController.java index be39f76fbd..aed02fc597 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asplanned/rest/AssetAsPlannedController.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asplanned/rest/AssetAsPlannedController.java @@ -31,6 +31,7 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; +import org.apache.commons.lang3.ArrayUtils; import org.eclipse.tractusx.traceability.assets.application.asbuilt.mapper.QualityTypeMapper; import org.eclipse.tractusx.traceability.assets.application.asplanned.mapper.AssetAsPlannedFieldMapper; import org.eclipse.tractusx.traceability.assets.application.asplanned.mapper.AssetAsPlannedResponseMapper; @@ -53,6 +54,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.Arrays; import java.util.List; @RestController @@ -250,8 +252,17 @@ public PageResult assets(OwnPageable pageable, SearchCri mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class)))}) @GetMapping("distinctFilterValues") - public List distinctFilterValues(@RequestParam("fieldName") String fieldName, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "startWith", required = false) String startWith, @RequestParam(value = "owner", required = false) Owner owner) { - return assetService.getDistinctFilterValues(fieldMapper.mapRequestFieldName(fieldName), startWith, size, owner); + public List distinctFilterValues( + @RequestParam("fieldName") String fieldName, + @RequestParam(value = "size", required = false) Integer size, + @RequestParam(value = "startWith", required = false) String startWith, + @RequestParam(value = "owner", required = false) Owner owner, + @RequestParam(value = "inAssetIds", required = false) String[] inAssetIds) { + List inAssetIdsList = List.of(); + if (ArrayUtils.isNotEmpty(inAssetIds)) { + inAssetIdsList = Arrays.asList(inAssetIds); + } + return assetService.getDistinctFilterValues(fieldMapper.mapRequestFieldName(fieldName), startWith, size, owner, inAssetIdsList); } @Operation(operationId = "assetById", diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/base/mapper/AssetBaseResponseMapper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/base/mapper/AssetBaseResponseMapper.java index 11483ce650..7516456e0d 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/base/mapper/AssetBaseResponseMapper.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/base/mapper/AssetBaseResponseMapper.java @@ -63,7 +63,6 @@ public static List fromList(List d List list = emptyIfNull(detailAspectModels).stream() .map(AssetBaseResponseMapper::from) .toList(); - log.info(list.toString()); return list; } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/base/service/AssetBaseService.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/base/service/AssetBaseService.java index f6ee033c21..45d5f6be4f 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/base/service/AssetBaseService.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/base/service/AssetBaseService.java @@ -47,7 +47,7 @@ public interface AssetBaseService { AssetBase updateQualityType(String assetId, QualityType qualityType); - List getDistinctFilterValues(String fieldName, String startWith, Integer size, Owner owner); + List getDistinctFilterValues(String fieldName, String startWith, Integer size, Owner owner, List inAssetIds); List getAssetIdsInImportState(ImportState... importStates); } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/dashboard/rest/DashboardController.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/dashboard/rest/DashboardController.java index 0bf7077edc..bae2278d10 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/dashboard/rest/DashboardController.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/dashboard/rest/DashboardController.java @@ -21,6 +21,7 @@ package org.eclipse.tractusx.traceability.assets.application.dashboard.rest; +import assets.importpoc.ErrorResponse; import assets.response.DashboardResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; @@ -32,7 +33,7 @@ import lombok.RequiredArgsConstructor; import org.eclipse.tractusx.traceability.assets.application.dashboard.mapper.DashboardResponseMapper; import org.eclipse.tractusx.traceability.assets.application.dashboard.service.DashboardService; -import assets.importpoc.ErrorResponse; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -40,6 +41,7 @@ @RestController @Tag(name = "Dashboard") @RequestMapping(path = "/dashboard", produces = "application/json") +@PreAuthorize("hasAnyRole('ROLE_ADMIN', 'ROLE_SUPERVISOR', 'ROLE_USER')") @RequiredArgsConstructor public class DashboardController { diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/importpoc/mapper/PolicyMapper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/importpoc/mapper/PolicyMapper.java index a97c95f107..0afee39a89 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/importpoc/mapper/PolicyMapper.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/importpoc/mapper/PolicyMapper.java @@ -23,7 +23,7 @@ import assets.importpoc.PermissionResponse; import assets.importpoc.PolicyResponse; import lombok.experimental.UtilityClass; -import org.eclipse.tractusx.irs.edc.client.asset.model.OdrlContext; +import org.eclipse.tractusx.irs.edc.client.asset.model.Context; import org.eclipse.tractusx.irs.edc.client.contract.model.EdcOperator; import org.eclipse.tractusx.irs.edc.client.policy.model.EdcCreatePolicyDefinitionRequest; import org.eclipse.tractusx.irs.edc.client.policy.model.EdcPolicy; @@ -33,22 +33,32 @@ import java.util.List; +import static org.apache.commons.collections4.ListUtils.emptyIfNull; + @UtilityClass public class PolicyMapper { public static EdcCreatePolicyDefinitionRequest mapToEdcPolicyRequest(PolicyResponse policy) { - OdrlContext odrlContext = OdrlContext.builder().odrl("http://www.w3.org/ns/odrl/2/").build(); - EdcPolicy edcPolicy = EdcPolicy.builder().odrlPermissions(mapToPermissions(policy.permissions())).type("Policy").build(); + // https://github.com/eclipse-tractusx/traceability-foss/issues/978 context needs to be updated with the required ones + Context odrlContext = Context.builder() + .odrl("http://www.w3.org/ns/odrl/2/") + .edc("https://w3id.org/edc/v0.0.1/ns/") + .vocab("https://w3id.org/edc/v0.0.1/ns/") + .cxPolicy("https://w3id.org/catenax/policy/") + .build(); + + EdcPolicy edcPolicy = EdcPolicy.builder().odrlPermissions(mapToPermissions(policy.permissions())).type("odrl:Set").build(); return EdcCreatePolicyDefinitionRequest.builder() .policyDefinitionId(policy.policyId()) .policy(edcPolicy) - .odrlContext(odrlContext) - .type("PolicyDefinitionRequestDto") + .context(odrlContext) + .type("odrl:Set") .build(); } private static List mapToPermissions(List permissions) { return permissions.stream().map(permission -> EdcPolicyPermission.builder() - .action(permission.action().name()) + // https://github.com/eclipse-tractusx/traceability-foss/issues/978 here we need to make sure that the USE is lowercase in the object. + .action(permission.action().name().toLowerCase()) .edcPolicyPermissionConstraints(mapToConstraint(permission.constraints())) .build() ).toList(); @@ -58,11 +68,12 @@ private static EdcPolicyPermissionConstraint mapToConstraint(ConstraintsResponse return EdcPolicyPermissionConstraint.builder() .type("AtomicConstraint") .orExpressions(mapToConstraintExpression(constraintsResponse.or())) + .andExpressions(mapToConstraintExpression(constraintsResponse.and())) .build(); } private static List mapToConstraintExpression(List constraints) { - return constraints.stream().map(constraint -> EdcPolicyPermissionConstraintExpression.builder() + return emptyIfNull(constraints).stream().map(constraint -> EdcPolicyPermissionConstraintExpression.builder() .type("Constraint") .leftOperand(constraint.leftOperand()) .rightOperand(constraint.rightOperand()) diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/importpoc/validation/JsonFileValidator.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/importpoc/validation/JsonFileValidator.java index e62841b0f8..8c8465dc21 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/importpoc/validation/JsonFileValidator.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/importpoc/validation/JsonFileValidator.java @@ -51,15 +51,15 @@ public class JsonFileValidator { public static final Map SUPPORTED_SCHEMA_VALIDATION = Map.ofEntries( Map.entry("base", "/schema/tracex/schema_V1.json"), - Map.entry("urn:samm:io.catenax.batch:2.0.0#Batch", "/schema/semantichub/Batch_2.0.0-schema.json"), - Map.entry("urn:bamm:io.catenax.just_in_sequence_part:1.0.0#JustInSequencePart", "/schema/semantichub/JustInSequencePart_1.0.0-schema.json"), - Map.entry("urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", "/schema/semantichub/SerialPart_1.0.1-schema.json"), - Map.entry("urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "/schema/semantichub/PartSiteInformationAsPlanned_1.0.0-schema.json"), - Map.entry("urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", "/schema/semantichub/SingleLevelBomAsBuilt_2.0.0-schema.json"), - Map.entry("urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", "/schema/semantichub/SingleLevelUsageAsBuilt_2.0.0-schema.json"), - Map.entry("urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", "/schema/semantichub/TractionBatteryCode_1.0.0-schema.json"), - Map.entry("urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", "/schema/semantichub/PartAsPlanned_1.0.1-schema.json"), - Map.entry("urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", "/schema/semantichub/SingleLevelBomAsPlanned_2.0.0-schema.json") + Map.entry("urn:samm:io.catenax.batch:3.0.0#Batch", "/schema/semantichub/Batch_3.0.0-schema.json"), + Map.entry("urn:samm:io.catenax.just_in_sequence_part:3.0.0#JustInSequencePart", "/schema/semantichub/JustInSequencePart_3.0.0-schema.json"), + Map.entry("urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "/schema/semantichub/SerialPart_3.0.0-schema.json"), + Map.entry("urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "/schema/semantichub/PartSiteInformationAsPlanned_1.0.0-schema.json"), + Map.entry("urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "/schema/semantichub/SingleLevelBomAsBuilt_3.0.0-schema.json"), + Map.entry("urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "/schema/semantichub/SingleLevelUsageAsBuilt_3.0.0-schema.json"), + Map.entry("urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", "/schema/semantichub/TractionBatteryCode_1.0.0-schema.json"), + Map.entry("urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "/schema/semantichub/PartAsPlanned_2.0.0-schema.json"), + Map.entry("urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "/schema/semantichub/SingleLevelBomAsPlanned_3.0.0-schema.json") ); private final JsonSchemaFactory factory = JsonSchemaFactory.byDefault(); @@ -90,7 +90,7 @@ public List isValid(MultipartFile file) { reader.close(); } catch (ProcessingException | IOException e) { - throw new JsonFileProcessingException(e); + return List.of("Json file is not processable." + e.getMessage()); } errors.addAll(validateAspectPayload(file)); return errors; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/base/AssetRepository.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/base/AssetRepository.java index 5bce90ee48..dd46332a48 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/base/AssetRepository.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/base/AssetRepository.java @@ -46,7 +46,7 @@ public interface AssetRepository { long countAssetsByOwner(Owner owner); - List getFieldValues(String fieldName, String startWith, Integer resultLimit, Owner owner); + List getFieldValues(String fieldName, String startWith, Integer resultLimit, Owner owner, List inAssetIds); List findByImportStateIn(ImportState... importStates); diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/base/model/AssetBase.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/base/model/AssetBase.java index 4d7097d136..db908070f6 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/base/model/AssetBase.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/base/model/AssetBase.java @@ -64,6 +64,7 @@ public class AssetBase { private String tombstone; private String contractAgreementId; + public BomLifecycle getBomLifecycle() { if (semanticDataModel.isAsBuilt()) { return BomLifecycle.AS_BUILT; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/base/model/aspect/DetailAspectModel.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/base/model/aspect/DetailAspectModel.java index 1fa4884767..16fb4f4fb7 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/base/model/aspect/DetailAspectModel.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/base/model/aspect/DetailAspectModel.java @@ -21,7 +21,6 @@ import lombok.Builder; import lombok.Getter; import lombok.Setter; -import org.apache.logging.log4j.util.Strings; import org.eclipse.tractusx.traceability.assets.domain.asbuilt.model.aspect.DetailAspectDataAsBuilt; import org.eclipse.tractusx.traceability.assets.domain.asbuilt.model.aspect.DetailAspectDataTractionBatteryCode; import org.eclipse.tractusx.traceability.assets.domain.asplanned.model.aspect.DetailAspectDataAsPlanned; @@ -34,6 +33,7 @@ import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.semanticdatamodel.PartTypeInformation; import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.semanticdatamodel.Site; import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.semanticdatamodel.ValidityPeriod; +import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.List; @@ -63,12 +63,12 @@ public static List from(AssetAsBuiltEntity entity) { .build(); List detailAspectModels = new ArrayList<>(List.of(detailAspectModelAsBuilt)); - if (!Strings.isEmpty(entity.getTractionBatteryCode())) { + if (!CollectionUtils.isEmpty(entity.getSubcomponents())) { DetailAspectModel detailAspectModelTractionBatteryCode = DetailAspectModel. builder() .type(DetailAspectType.TRACTION_BATTERY_CODE) .data(DetailAspectDataTractionBatteryCode.builder() - .tractionBatteryCode(entity.getTractionBatteryCode()) + .tractionBatteryCode(entity.getSubcomponents().get(0).getTractionBatteryCode()) .productType(entity.getProductType()) .subcomponents(TractionBatteryCode.toDomain(entity)) .build() @@ -94,12 +94,12 @@ public static List from(AssetAsBuiltViewEntity entity) { .build(); List detailAspectModels = new ArrayList<>(List.of(detailAspectModelAsBuilt)); - if (!Strings.isEmpty(entity.getTractionBatteryCode())) { + if (!CollectionUtils.isEmpty(entity.getSubcomponents())) { DetailAspectModel detailAspectModelTractionBatteryCode = DetailAspectModel. builder() .type(DetailAspectType.TRACTION_BATTERY_CODE) .data(DetailAspectDataTractionBatteryCode.builder() - .tractionBatteryCode(entity.getTractionBatteryCode()) + .tractionBatteryCode(entity.getSubcomponents().get(0).getTractionBatteryCode()) .productType(entity.getProductType()) .subcomponents(TractionBatteryCode.toDomain(entity)) .build() diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/base/service/AbstractAssetBaseService.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/base/service/AbstractAssetBaseService.java index 60cfec21a7..82cd228a61 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/base/service/AbstractAssetBaseService.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/base/service/AbstractAssetBaseService.java @@ -117,13 +117,13 @@ public Map getAssetsCountryMap() { } @Override - public List getDistinctFilterValues(String fieldName, String startWith, Integer size, Owner owner) { + public List getDistinctFilterValues(String fieldName, String startWith, Integer size, Owner owner, List inAssetIds) { final Integer resultSize = Objects.isNull(size) ? Integer.MAX_VALUE : size; if (isSupportedEnumType(fieldName)) { return getAssetEnumFieldValues(fieldName); } - return getAssetRepository().getFieldValues(fieldName, startWith, resultSize, owner); + return getAssetRepository().getFieldValues(fieldName, startWith, resultSize, owner, inAssetIds); } @Override diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/model/ImportRequest.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/model/ImportRequest.java index 869a9a8a7e..8d8c4baa8d 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/model/ImportRequest.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/model/ImportRequest.java @@ -1,13 +1,13 @@ package org.eclipse.tractusx.traceability.assets.domain.importpoc.model; import com.fasterxml.jackson.annotation.JsonProperty; -import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.GenericSubmodel; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IrsSubmodel; import java.util.List; public record ImportRequest(@JsonProperty("assets") List assets) { public record AssetImportRequest(@JsonProperty("assetMetaInfo") AssetMetaInfoRequest assetMetaInfoRequest, - @JsonProperty("submodels") List submodels) { + @JsonProperty("submodels") List submodels) { } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/model/MainAspectAsBuiltRequest.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/model/MainAspectAsBuiltRequest.java deleted file mode 100644 index 6d7348030d..0000000000 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/model/MainAspectAsBuiltRequest.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.eclipse.tractusx.traceability.assets.domain.importpoc.model; - -import java.util.List; - -public record MainAspectAsBuiltRequest(List localIdentifiers, - ManufacturingInformation manufacturingInformation, - String catenaXId, - PartTypeInformation partTypeInformation) { - - public record LocalIdentifier(String value, String key) { - } - - public record ManufacturingInformation(String date, String country) { - } - - public record PartTypeInformation(String nameAtCustomer, String customerPartId, String manufacturerPartId, String classification, String nameAtManufacturer) { - } - -} diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/model/MainAspectAsPlannedRequest.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/model/MainAspectAsPlannedRequest.java deleted file mode 100644 index 03dd60b447..0000000000 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/model/MainAspectAsPlannedRequest.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.eclipse.tractusx.traceability.assets.domain.importpoc.model; - -public record MainAspectAsPlannedRequest(String catenaXId, ValidityPeriod validityPeriod, - PartTypeInformation partTypeInformation -) { - - public record ValidityPeriod( - String validFrom, - String validTo) { - } - - public record PartTypeInformation(String manufacturerPartId, String classification, String nameAtManufacturer) { - } - - -} diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/model/SingleLevelUsageAsPlannedRequest.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/model/SingleLevelUsageAsPlannedRequest.java deleted file mode 100644 index 458dfe9c87..0000000000 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/model/SingleLevelUsageAsPlannedRequest.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2023 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.traceability.assets.domain.importpoc.model; - -import java.util.List; - -public record SingleLevelUsageAsPlannedRequest( - List parentParts, - String businessPartner, - String catenaXId -) { - - public record ParentPart( - ValidityPeriod validityPeriod, - String parentCatenaXId, - Quantity quantity, - String createdOn, - String lastModifiedOn - ) { - } - - public record ValidityPeriod( - String validFrom, - String validTo - ) { - } - - public record Quantity( - double quantityNumber, - String measurementUnit - ) { - } -} diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/repository/SubmodelPayloadRepository.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/repository/SubmodelPayloadRepository.java index 47782f2a1f..f7bede8c64 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/repository/SubmodelPayloadRepository.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/repository/SubmodelPayloadRepository.java @@ -19,15 +19,15 @@ package org.eclipse.tractusx.traceability.assets.domain.importpoc.repository; -import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.GenericSubmodel; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IrsSubmodel; import java.util.List; import java.util.Map; public interface SubmodelPayloadRepository { - void savePayloadForAssetAsBuilt(String assetId, List submodels); + void savePayloadForAssetAsBuilt(String assetId, List submodels); - void savePayloadForAssetAsPlanned(String assetId, List submodels); + void savePayloadForAssetAsPlanned(String assetId, List submodels); Map getAspectTypesAndPayloadsByAssetId(String assetId); } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/DtrService.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/DtrService.java index d45c43e919..4b043e6b44 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/DtrService.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/DtrService.java @@ -143,7 +143,8 @@ private AssetAdministrationShellDescriptor aasFrom(AssetBase assetBase, List aasIdentifiersFromAsset(AssetBase assetBase) { - return List.of( + + List identifierKeyValuePairs = List.of( IdentifierKeyValuePair.builder() .name("manufacturerId") .value(assetBase.getManufacturerId()) @@ -163,6 +164,8 @@ List aasIdentifiersFromAsset(AssetBase assetBase) { .build()) .build() ); + log.info("IdentifierKeyValuePair {}", identifierKeyValuePairs); + return identifierKeyValuePairs; } private List getExternalSubjectIds() { diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/EdcAssetCreationService.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/EdcAssetCreationService.java index 3f64fb8640..547fe5e845 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/EdcAssetCreationService.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/EdcAssetCreationService.java @@ -56,8 +56,14 @@ public String createEdcContractDefinitionsForDtrAndSubmodel(String policyId) thr PolicyResponse policy = policyService.getPolicyById(policyId); String createdPolicyId; try { - createdPolicyId = edcPolicyDefinitionService.createAccessPolicy(mapToEdcPolicyRequest(policy)); - log.info("DTR Policy Id created :{}", createdPolicyId); + boolean exists = edcPolicyDefinitionService.policyDefinitionExists(policyId); + if (exists) { + log.info("Policy with id " + policyId + " already exists and contains necessary application constraints. Reusing for edc asset contract definition."); + createdPolicyId =policyId; + } else{ + createdPolicyId = edcPolicyDefinitionService.createAccessPolicy(mapToEdcPolicyRequest(policy)); + log.info("DTR Policy Id created :{}", createdPolicyId); + } } catch (EdcPolicyDefinitionAlreadyExists e) { createdPolicyId = policyId; } catch (Exception exception) { diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/ImportServiceImpl.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/ImportServiceImpl.java index 89da294300..935b59d005 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/ImportServiceImpl.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/ImportServiceImpl.java @@ -32,6 +32,7 @@ import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.ImportRequest; import org.eclipse.tractusx.traceability.assets.domain.importpoc.repository.ImportJobRepository; import org.eclipse.tractusx.traceability.assets.domain.importpoc.repository.SubmodelPayloadRepository; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.factory.ImportAssetMapper; import org.eclipse.tractusx.traceability.assets.infrastructure.importJob.model.ImportJobEntity; import org.eclipse.tractusx.traceability.common.properties.TraceabilityProperties; import org.springframework.stereotype.Service; @@ -54,24 +55,16 @@ public class ImportServiceImpl implements ImportService { private final AssetAsPlannedRepository assetAsPlannedRepository; private final AssetAsBuiltRepository assetAsBuiltRepository; private final TraceabilityProperties traceabilityProperties; - private final MappingStrategyFactory strategyFactory; private final SubmodelPayloadRepository submodelPayloadRepository; private final ImportJobRepository importJobRepository; + private final ImportAssetMapper assetMapper; @Override public Map importAssets(MultipartFile file, ImportJob importJob) { try { ImportRequest importRequest = objectMapper.readValue(file.getBytes(), ImportRequest.class); - - Map> assetToUploadByBomLifecycle = - importRequest.assets() - .stream() - .map(assetImportItem -> strategyFactory.mapToAssetBase(assetImportItem, traceabilityProperties)) - .filter(Optional::isPresent) - .map(Optional::get) - .collect(Collectors.groupingBy(AssetBase::getBomLifecycle)); - + Map> assetToUploadByBomLifecycle = assetMapper.toAssetBaseList(importRequest.assets()).stream().collect(Collectors.groupingBy(AssetBase::getBomLifecycle)); assetToUploadByBomLifecycle.values().stream().flatMap(Collection::stream) .forEach(mappedAsset -> { if (!mappedAsset.isOwnAsset(traceabilityProperties.getBpn().toString())) { @@ -79,7 +72,6 @@ public Map importAssets(MultipartFile file, ImportJob import } }); - List persistedAsBuilt = assetAsBuiltRepository.saveAllIfNotInIRSSyncAndUpdateImportStateAndNote(assetToUploadByBomLifecycle.get(BomLifecycle.AS_BUILT)); List persistedAsPlanned = assetAsPlannedRepository.saveAllIfNotInIRSSyncAndUpdateImportStateAndNote(assetToUploadByBomLifecycle.get(BomLifecycle.AS_PLANNED)); diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/MainAspectAsBuiltStrategy.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/MainAspectAsBuiltStrategy.java index e4d1177f53..e69de29bb2 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/MainAspectAsBuiltStrategy.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/MainAspectAsBuiltStrategy.java @@ -1,167 +0,0 @@ -/******************************************************************************** - * Copyright (c) 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.traceability.assets.domain.importpoc.service; - -import org.eclipse.tractusx.traceability.assets.domain.asbuilt.model.aspect.DetailAspectDataAsBuilt; -import org.eclipse.tractusx.traceability.assets.domain.asbuilt.model.aspect.DetailAspectDataTractionBatteryCode; -import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase; -import org.eclipse.tractusx.traceability.assets.domain.base.model.Descriptions; -import org.eclipse.tractusx.traceability.assets.domain.base.model.ImportNote; -import org.eclipse.tractusx.traceability.assets.domain.base.model.ImportState; -import org.eclipse.tractusx.traceability.assets.domain.base.model.Owner; -import org.eclipse.tractusx.traceability.assets.domain.base.model.QualityType; -import org.eclipse.tractusx.traceability.assets.domain.base.model.aspect.DetailAspectModel; -import org.eclipse.tractusx.traceability.assets.domain.base.model.aspect.DetailAspectType; -import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.ImportRequest; -import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.MainAspectAsBuiltRequest; -import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.SingleLevelBomAsBuiltRequest; -import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.SingleLevelUsageAsBuiltRequest; -import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.GenericSubmodel; -import org.eclipse.tractusx.traceability.common.properties.TraceabilityProperties; - -import java.time.OffsetDateTime; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.atomic.AtomicReference; - -import static org.eclipse.tractusx.traceability.assets.domain.base.model.aspect.DetailAspectModel.extractDetailAspectModelTractionBatteryCode; -import static org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.relationship.Aspect.isAsBuiltMainAspect; -import static org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.relationship.Aspect.isDownwardRelationshipAsBuilt; -import static org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.relationship.Aspect.isTractionBatteryCode; -import static org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.relationship.Aspect.isUpwardRelationshipAsBuilt; - -public class MainAspectAsBuiltStrategy implements MappingStrategy { - // TODO the mapping method here is almost the same as in SemanticDataModel.toDomainAsBuilt - @Override - public AssetBase mapToAssetBase(ImportRequest.AssetImportRequest assetImportRequestV2, TraceabilityProperties traceabilityProperties) { - - List submodels = assetImportRequestV2.submodels(); - MainAspectAsBuiltRequest asBuiltAspect = submodels.stream() - .filter(genericSubmodel -> isAsBuiltMainAspect(genericSubmodel.getAspectType())) - .map(GenericSubmodel::getPayload) - .filter(MainAspectAsBuiltRequest.class::isInstance) - .map(MainAspectAsBuiltRequest.class::cast) - .findFirst() - .orElse(null); - - List detailAspectDataTractionBatteryCodes = submodels.stream() - .filter(genericSubmodel -> isTractionBatteryCode(genericSubmodel.getAspectType())) - .map(GenericSubmodel::getPayload) - .filter(DetailAspectDataTractionBatteryCode.class::isInstance) - .map(DetailAspectDataTractionBatteryCode.class::cast) - .toList(); - - List parentRelations = submodels.stream() - .filter(genericSubmodel -> isUpwardRelationshipAsBuilt(genericSubmodel.getAspectType())) - .map(GenericSubmodel::getPayload) - .filter(SingleLevelBomAsBuiltRequest.class::isInstance) - .map(SingleLevelBomAsBuiltRequest.class::cast) - .findFirst() - .map(SingleLevelBomAsBuiltRequest::childItems) - .orElse(Collections.emptyList()) - .stream() - .map(childItem -> new Descriptions(childItem.catenaXId(), null, null, null)) - .toList(); - - - List childRelations = submodels.stream() - .filter(genericSubmodel -> isDownwardRelationshipAsBuilt(genericSubmodel.getAspectType())) - .map(GenericSubmodel::getPayload) - .filter(SingleLevelUsageAsBuiltRequest.class::isInstance) - .map(SingleLevelUsageAsBuiltRequest.class::cast) - .findFirst() - .map(SingleLevelUsageAsBuiltRequest::customers) - .orElse(Collections.emptyList()) - .stream() - .map(SingleLevelUsageAsBuiltRequest.Customer::parentItems) - .flatMap(parentItems -> parentItems.stream().map(parentItem -> new Descriptions(parentItem.catenaXId(), null, null, null))).toList(); - - - final AtomicReference semanticModelId = new AtomicReference<>(); - final AtomicReference semanticDataModel = new AtomicReference<>(); - final AtomicReference manufacturerId = new AtomicReference<>(); - final AtomicReference van = new AtomicReference<>(); - - List detailAspectModels = new ArrayList<>(); - if(asBuiltAspect != null) { - DetailAspectModel asBuiltDetailAspect = extractDetailAspectModelsAsBuilt( - asBuiltAspect.manufacturingInformation(), asBuiltAspect.partTypeInformation()); - detailAspectModels.add(asBuiltDetailAspect); - } - - asBuiltAspect.localIdentifiers().stream().filter(localIdentifier -> localIdentifier.key().equals("partInstanceId")).findFirst().ifPresent(s -> { - semanticModelId.set(s.value()); - semanticDataModel.set(org.eclipse.tractusx.traceability.assets.domain.base.model.SemanticDataModel.SERIALPART); - detailAspectDataTractionBatteryCodes.forEach(detailAspectDataTractionBatteryCode -> detailAspectModels.add(extractDetailAspectModelTractionBatteryCode(detailAspectDataTractionBatteryCode))); - }); - - asBuiltAspect.localIdentifiers().stream().filter(localId -> localId.key().equals("batchId")).findFirst().ifPresent(s -> { - semanticModelId.set(s.value()); - semanticDataModel.set(org.eclipse.tractusx.traceability.assets.domain.base.model.SemanticDataModel.BATCH); - }); - - asBuiltAspect.localIdentifiers().stream().filter(localId -> localId.key().equals("jisNumber")).findFirst().ifPresent(s -> { - semanticModelId.set(s.value()); - semanticDataModel.set(org.eclipse.tractusx.traceability.assets.domain.base.model.SemanticDataModel.JUSTINSEQUENCE); - }); - - asBuiltAspect.localIdentifiers().stream().filter(localId -> localId.key().equals("van")).findFirst().ifPresent(s -> { - van.set(s.value()); - }); - - asBuiltAspect.localIdentifiers().stream().filter(localId -> localId.key().equals("manufacturerId")).findFirst().ifPresent(s -> manufacturerId.set(s.value())); - - if (semanticDataModel.get() == null) { - semanticDataModel.set(org.eclipse.tractusx.traceability.assets.domain.base.model.SemanticDataModel.UNKNOWN); - } - - - return AssetBase.builder() - .id(assetImportRequestV2.assetMetaInfoRequest().catenaXId()) - .semanticModelId(semanticModelId.get()) - .detailAspectModels(detailAspectModels) - .manufacturerId(manufacturerId.get()) - .nameAtManufacturer(asBuiltAspect.partTypeInformation().nameAtManufacturer()) - .manufacturerPartId(asBuiltAspect.partTypeInformation().manufacturerPartId()) - .parentRelations(parentRelations) - .childRelations(childRelations) - .owner(Owner.OWN) - .classification(asBuiltAspect.partTypeInformation().classification()) - .qualityType(QualityType.OK) - .semanticDataModel(semanticDataModel.get()) - .importState(ImportState.TRANSIENT) - .importNote(ImportNote.TRANSIENT_CREATED) - .van(van.get()) - .build(); - } - - public static DetailAspectModel extractDetailAspectModelsAsBuilt(MainAspectAsBuiltRequest.ManufacturingInformation manufacturingInformation, - MainAspectAsBuiltRequest.PartTypeInformation partTypeInformation) { - - DetailAspectDataAsBuilt detailAspectDataAsBuilt = DetailAspectDataAsBuilt.builder() - .customerPartId(partTypeInformation.customerPartId()) - .manufacturingCountry(manufacturingInformation.country()) - .manufacturingDate(OffsetDateTime.parse(manufacturingInformation.date())) - .nameAtCustomer(partTypeInformation.nameAtCustomer()) - .partId(partTypeInformation.manufacturerPartId()) - .build(); - return DetailAspectModel.builder().data(detailAspectDataAsBuilt).type(DetailAspectType.AS_BUILT).build(); - } -} diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/MainAspectAsPlannedStrategy.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/MainAspectAsPlannedStrategy.java deleted file mode 100644 index b780763f65..0000000000 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/MainAspectAsPlannedStrategy.java +++ /dev/null @@ -1,153 +0,0 @@ -/******************************************************************************** - * Copyright (c) 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.traceability.assets.domain.importpoc.service; - -import org.eclipse.tractusx.traceability.assets.domain.asplanned.model.aspect.DetailAspectDataAsPlanned; -import org.eclipse.tractusx.traceability.assets.domain.asplanned.model.aspect.DetailAspectDataPartSiteInformationAsPlanned; -import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase; -import org.eclipse.tractusx.traceability.assets.domain.base.model.Descriptions; -import org.eclipse.tractusx.traceability.assets.domain.base.model.ImportNote; -import org.eclipse.tractusx.traceability.assets.domain.base.model.ImportState; -import org.eclipse.tractusx.traceability.assets.domain.base.model.Owner; -import org.eclipse.tractusx.traceability.assets.domain.base.model.QualityType; -import org.eclipse.tractusx.traceability.assets.domain.base.model.aspect.DetailAspectModel; -import org.eclipse.tractusx.traceability.assets.domain.base.model.aspect.DetailAspectType; -import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.ImportRequest; -import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.MainAspectAsPlannedRequest; -import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.PartSiteInformationAsPlannedRequest; -import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.SingleLevelBomAsPlannedRequest; -import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.SingleLevelUsageAsPlannedRequest; -import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.GenericSubmodel; -import org.eclipse.tractusx.traceability.common.properties.TraceabilityProperties; - -import java.time.OffsetDateTime; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import static org.apache.commons.collections4.ListUtils.emptyIfNull; -import static org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.relationship.Aspect.isAsPlannedMainAspect; -import static org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.relationship.Aspect.isDownwardRelationshipAsPlanned; -import static org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.relationship.Aspect.isPartSiteInformationAsPlanned; -import static org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.relationship.Aspect.isUpwardRelationshipAsPlanned; - - -public class MainAspectAsPlannedStrategy implements MappingStrategy { - - // TODO the mapping method here is almost the same as in SemanticDataModel.toDomainAsPlanned - @Override - public AssetBase mapToAssetBase(ImportRequest.AssetImportRequest assetImportRequestV2, TraceabilityProperties traceabilityProperties) { - List submodels = assetImportRequestV2.submodels(); - - MainAspectAsPlannedRequest partAsPlannedV2 = submodels.stream() - .filter(genericSubmodel -> isAsPlannedMainAspect(genericSubmodel.getAspectType())) - .map(GenericSubmodel::getPayload) - .filter(MainAspectAsPlannedRequest.class::isInstance) - .map(MainAspectAsPlannedRequest.class::cast) - .findFirst() - .orElse(null); - - PartSiteInformationAsPlannedRequest partSiteInformationAsPlannedRequest = submodels.stream() - .filter(genericSubmodel -> isPartSiteInformationAsPlanned(genericSubmodel.getAspectType())) - .map(GenericSubmodel::getPayload) - .filter(PartSiteInformationAsPlannedRequest.class::isInstance) - .map(PartSiteInformationAsPlannedRequest.class::cast) - .findFirst() - .orElse(null); - - List parentRelations = submodels.stream() - .filter(genericSubmodel -> isUpwardRelationshipAsPlanned(genericSubmodel.getAspectType())) - .map(GenericSubmodel::getPayload) - .filter(SingleLevelBomAsPlannedRequest.class::isInstance) - .map(SingleLevelBomAsPlannedRequest.class::cast) - .findFirst() - .map(SingleLevelBomAsPlannedRequest::childItems) - .orElse(Collections.emptyList()) - .stream() - .map(childItem -> new Descriptions(childItem.catenaXId(), null, null, null)) - .toList(); - - - List childRelations = submodels.stream() - .filter(genericSubmodel -> isDownwardRelationshipAsPlanned(genericSubmodel.getAspectType())) - .map(GenericSubmodel::getPayload) - .filter(SingleLevelUsageAsPlannedRequest.class::isInstance) - .map(SingleLevelUsageAsPlannedRequest.class::cast) - .findFirst() - .map(SingleLevelUsageAsPlannedRequest::parentParts) - .orElse(Collections.emptyList()) - .stream() - .map(parentPart -> new Descriptions(parentPart.parentCatenaXId(), null, null, null)) - .toList(); - - List detailAspectModels = new ArrayList<>(); - if (partSiteInformationAsPlannedRequest != null) { - detailAspectModels.addAll(extractDetailAspectModelsPartSiteInformationAsPlanned(emptyIfNull(partSiteInformationAsPlannedRequest.sites()))); - } - - AssetBase.AssetBaseBuilder assetBaseBuilder = AssetBase.builder(); - if (partAsPlannedV2 != null) { - DetailAspectModel asPlannedDetailAspect = extractDetailAspectModelsAsPlanned(partAsPlannedV2.validityPeriod()); - detailAspectModels.add(asPlannedDetailAspect); - - assetBaseBuilder - .id(assetImportRequestV2.assetMetaInfoRequest().catenaXId()) - .manufacturerId(traceabilityProperties.getBpn().value()) - .nameAtManufacturer(partAsPlannedV2.partTypeInformation().nameAtManufacturer()) - .manufacturerPartId(partAsPlannedV2.partTypeInformation().manufacturerPartId()) - .parentRelations(parentRelations) - .detailAspectModels(detailAspectModels) - .childRelations(childRelations) - .owner(Owner.OWN) - .classification(partAsPlannedV2.partTypeInformation().classification()) - .qualityType(QualityType.OK) - .semanticDataModel(org.eclipse.tractusx.traceability.assets.domain.base.model.SemanticDataModel.PARTASPLANNED) - .importState(ImportState.TRANSIENT) - .importNote(ImportNote.TRANSIENT_CREATED); - } - - return assetBaseBuilder.build(); - - } - - public static List extractDetailAspectModelsPartSiteInformationAsPlanned(List sites) { - List detailAspectModels = new ArrayList<>(); - emptyIfNull(sites).forEach(site -> { - DetailAspectDataPartSiteInformationAsPlanned detailAspectDataPartSiteInformationAsPlanned = DetailAspectDataPartSiteInformationAsPlanned.builder() - .catenaXSiteId(site.catenaXSiteId()) - .functionValidFrom(OffsetDateTime.parse(site.functionValidFrom())) - .function(site.function()) - .functionValidUntil(OffsetDateTime.parse(site.functionValidUntil())) - .build(); - detailAspectModels.add(DetailAspectModel.builder().data(detailAspectDataPartSiteInformationAsPlanned).type(DetailAspectType.PART_SITE_INFORMATION_AS_PLANNED).build()); - }); - - return detailAspectModels; - } - - public static DetailAspectModel extractDetailAspectModelsAsPlanned(MainAspectAsPlannedRequest.ValidityPeriod validityPeriod) { - DetailAspectDataAsPlanned detailAspectDataAsPlanned = DetailAspectDataAsPlanned.builder() - .validityPeriodFrom(OffsetDateTime.parse(validityPeriod.validFrom())) - .validityPeriodTo(OffsetDateTime.parse(validityPeriod.validTo())) - .build(); - return DetailAspectModel.builder().data(detailAspectDataAsPlanned).type(DetailAspectType.AS_PLANNED).build(); - } - - -} diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/MappingStrategy.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/MappingStrategy.java deleted file mode 100644 index ed989f7087..0000000000 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/MappingStrategy.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.eclipse.tractusx.traceability.assets.domain.importpoc.service; - -import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase; -import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.ImportRequest; -import org.eclipse.tractusx.traceability.common.properties.TraceabilityProperties; - -public interface MappingStrategy { - AssetBase mapToAssetBase(ImportRequest.AssetImportRequest assetImportRequestV2, TraceabilityProperties traceabilityProperties); -} diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/MappingStrategyFactory.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/MappingStrategyFactory.java deleted file mode 100644 index d30e2af3fc..0000000000 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/MappingStrategyFactory.java +++ /dev/null @@ -1,55 +0,0 @@ -/******************************************************************************** - * Copyright (c) 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.traceability.assets.domain.importpoc.service; - -import lombok.RequiredArgsConstructor; -import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase; -import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.ImportRequest; -import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.GenericSubmodel; -import org.eclipse.tractusx.traceability.common.properties.TraceabilityProperties; -import org.springframework.stereotype.Component; - -import java.util.Optional; - -import static org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.relationship.Aspect.isAsBuiltMainAspect; -import static org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.relationship.Aspect.isAsPlannedMainAspect; -import static org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.relationship.Aspect.isMainAspect; - -@Component -@RequiredArgsConstructor -public class MappingStrategyFactory { - - - public Optional mapToAssetBase(ImportRequest.AssetImportRequest importRequestV2, TraceabilityProperties traceabilityProperties) { - - Optional isMainAspectSubmodel = importRequestV2.submodels().stream().filter(genericSubmodel -> isMainAspect(genericSubmodel.getAspectType())).map(GenericSubmodel::getAspectType).findFirst(); - - if (isMainAspectSubmodel.isEmpty()) { - return Optional.empty(); - } - if (isAsPlannedMainAspect(isMainAspectSubmodel.get())) { - return Optional.of(new MainAspectAsPlannedStrategy().mapToAssetBase(importRequestV2, traceabilityProperties)); - } - if (isAsBuiltMainAspect(isMainAspectSubmodel.get())) { - return Optional.of(new MainAspectAsBuiltStrategy().mapToAssetBase(importRequestV2, traceabilityProperties)); - } - return Optional.empty(); - } -} - diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/PolicyServiceImpl.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/PolicyServiceImpl.java index 027ae5c14f..660f87b85d 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/PolicyServiceImpl.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/PolicyServiceImpl.java @@ -66,7 +66,11 @@ public Optional getFirstPolicyMatchingApplicationConstraint() { permissionResponse.constraints().and().stream(), permissionResponse.constraints().or().stream()) .map(constraintResponse -> new AbstractMap.SimpleEntry<>(policyResponse.policyId(), constraintResponse)))) - .filter(entry -> entry.getValue().rightOperand().equalsIgnoreCase(traceabilityProperties.getRightOperand())) + .filter(entry -> { + boolean hasFirstConstraint = entry.getValue().rightOperand().equalsIgnoreCase(traceabilityProperties.getRightOperand()) && entry.getValue().leftOperand().equalsIgnoreCase(traceabilityProperties.getLeftOperand()); + boolean hasSecondConstraint = entry.getValue().rightOperand().equalsIgnoreCase(traceabilityProperties.getRightOperandSecond()) && entry.getValue().leftOperand().equalsIgnoreCase(traceabilityProperties.getLeftOperandSecond()); + return hasFirstConstraint || hasSecondConstraint; + }) .map(Map.Entry::getKey) .findFirst(); return policyId.map(this::getPolicyById); diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/model/AssetAsBuiltEntity.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/model/AssetAsBuiltEntity.java index 7e413e8cdc..d81ea2bf3a 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/model/AssetAsBuiltEntity.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/model/AssetAsBuiltEntity.java @@ -22,6 +22,7 @@ package org.eclipse.tractusx.traceability.assets.infrastructure.asbuilt.model; import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; import jakarta.persistence.ElementCollection; import jakarta.persistence.Embeddable; import jakarta.persistence.Entity; @@ -42,9 +43,9 @@ import org.eclipse.tractusx.traceability.assets.domain.base.model.aspect.DetailAspectModel; import org.eclipse.tractusx.traceability.assets.infrastructure.base.model.AssetBaseEntity; import org.eclipse.tractusx.traceability.assets.infrastructure.base.model.SemanticDataModelEntity; +import org.eclipse.tractusx.traceability.notification.infrastructure.notification.model.NotificationEntity; import org.eclipse.tractusx.traceability.notification.infrastructure.notification.model.NotificationSideBaseEntity; import org.eclipse.tractusx.traceability.notification.infrastructure.notification.model.NotificationTypeEntity; -import org.eclipse.tractusx.traceability.notification.infrastructure.notification.model.NotificationEntity; import org.eclipse.tractusx.traceability.submodel.infrastructure.model.SubmodelPayloadEntity; import java.time.Instant; @@ -67,10 +68,9 @@ public class AssetAsBuiltEntity extends AssetBaseEntity { private String nameAtCustomer; private String customerPartId; private String productType; - private String tractionBatteryCode; @ElementCollection - @CollectionTable(name = "traction_battery_code_subcomponent", joinColumns = {@JoinColumn(name = "traction_battery_code")}) + @CollectionTable(name = "traction_battery_code_subcomponent", joinColumns = {@JoinColumn(name = "asset_as_built_id")}) private List subcomponents; @@ -118,7 +118,6 @@ public static AssetAsBuiltEntity from(AssetBase asset) { .classification(asset.getClassification()) .semanticDataModel(SemanticDataModelEntity.from(asset.getSemanticDataModel())) .productType(tractionBatteryCodeObj.getProductType()) - .tractionBatteryCode(tractionBatteryCodeObj.getTractionBatteryCode()) .subcomponents(tractionBatteryCodeObj.getSubcomponents()) .importState(asset.getImportState()) .importNote(asset.getImportNote()) @@ -219,6 +218,8 @@ public static class ParentDescription { @Data @Embeddable public static class TractionBatteryCodeSubcomponents { + @Column(name = "traction_battery_code") + private String tractionBatteryCode; private String subcomponentTractionBatteryCode; private String productType; } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/model/AssetAsBuiltViewEntity.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/model/AssetAsBuiltViewEntity.java index 1bd4d0aa57..d1549b2155 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/model/AssetAsBuiltViewEntity.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/model/AssetAsBuiltViewEntity.java @@ -20,6 +20,7 @@ package org.eclipse.tractusx.traceability.assets.infrastructure.asbuilt.model; import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; import jakarta.persistence.ElementCollection; import jakarta.persistence.Embeddable; import jakarta.persistence.Entity; @@ -39,9 +40,9 @@ import org.eclipse.tractusx.traceability.assets.domain.base.model.aspect.DetailAspectModel; import org.eclipse.tractusx.traceability.assets.infrastructure.base.model.AssetBaseEntity; import org.eclipse.tractusx.traceability.assets.infrastructure.base.model.SemanticDataModelEntity; +import org.eclipse.tractusx.traceability.notification.infrastructure.notification.model.NotificationEntity; import org.eclipse.tractusx.traceability.notification.infrastructure.notification.model.NotificationSideBaseEntity; import org.eclipse.tractusx.traceability.notification.infrastructure.notification.model.NotificationTypeEntity; -import org.eclipse.tractusx.traceability.notification.infrastructure.notification.model.NotificationEntity; import org.springframework.data.annotation.Immutable; import java.time.Instant; @@ -64,14 +65,13 @@ public class AssetAsBuiltViewEntity extends AssetBaseEntity { private String nameAtCustomer; private String customerPartId; private String productType; - private String tractionBatteryCode; private String receivedActiveAlerts; private String sentActiveAlerts; private String receivedActiveInvestigations; private String sentActiveInvestigations; @ElementCollection - @CollectionTable(name = "traction_battery_code_subcomponent", joinColumns = {@JoinColumn(name = "traction_battery_code")}) + @CollectionTable(name = "traction_battery_code_subcomponent", joinColumns = {@JoinColumn(name = "asset_as_built_id")}) private List subcomponents; @@ -175,6 +175,8 @@ public static class ParentDescription { @Data @Embeddable public static class TractionBatteryCodeSubcomponents { + @Column(name = "traction_battery_code") + private String tractionBatteryCode; private String subcomponentTractionBatteryCode; private String productType; } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/model/TractionBatteryCode.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/model/TractionBatteryCode.java index ed256d5af9..787f2aa715 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/model/TractionBatteryCode.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/model/TractionBatteryCode.java @@ -25,7 +25,6 @@ import org.eclipse.tractusx.traceability.assets.domain.base.model.aspect.DetailAspectModel; import org.eclipse.tractusx.traceability.assets.domain.base.model.aspect.DetailAspectType; -import java.util.Collections; import java.util.List; import java.util.Optional; @@ -41,30 +40,38 @@ public class TractionBatteryCode { public static TractionBatteryCode from(List detailAspectModels) { - Optional tractionBatteryCodeAspectModel = emptyIfNull(detailAspectModels) + Optional tractionBatteryCodeAspectModelOptional = emptyIfNull(detailAspectModels) .stream() .filter(detailAspectModel -> DetailAspectType.TRACTION_BATTERY_CODE.equals(detailAspectModel.getType())) .findFirst(); - String tractionBatteryCode = tractionBatteryCodeAspectModel.map(detailAspectModel -> (DetailAspectDataTractionBatteryCode) detailAspectModel.getData()) - .map(DetailAspectDataTractionBatteryCode::getTractionBatteryCode).orElse(""); + if (tractionBatteryCodeAspectModelOptional.isEmpty()) { + return TractionBatteryCode.builder().build(); + } - String productType = tractionBatteryCodeAspectModel.map(detailAspectModel -> (DetailAspectDataTractionBatteryCode) detailAspectModel.getData()) - .map(DetailAspectDataTractionBatteryCode::getProductType).orElse(""); + DetailAspectDataTractionBatteryCode tractionBatteryCodeAspectModel = (DetailAspectDataTractionBatteryCode) tractionBatteryCodeAspectModelOptional.get().getData(); - List subcomponents = tractionBatteryCodeAspectModel.map(detailAspectModel -> (DetailAspectDataTractionBatteryCode) detailAspectModel.getData()) - .map(DetailAspectDataTractionBatteryCode::getSubcomponents) - .orElse(Collections.emptyList()) - .stream() - .map(TractionBatteryCode::convertSubcomponents).toList(); + String tractionBatteryCode = tractionBatteryCodeAspectModel.getTractionBatteryCode(); + + String productType = tractionBatteryCodeAspectModel.getProductType(); + + List subcomponents = TractionBatteryCode.convertSubcomponents(tractionBatteryCodeAspectModel); return TractionBatteryCode.builder().productType(productType).tractionBatteryCode(tractionBatteryCode).subcomponents(subcomponents).build(); } - private static AssetAsBuiltEntity.TractionBatteryCodeSubcomponents convertSubcomponents(DetailAspectDataTractionBatteryCodeSubcomponent detailAspectDataTractionBatteryCode) { - return AssetAsBuiltEntity.TractionBatteryCodeSubcomponents.builder().subcomponentTractionBatteryCode(detailAspectDataTractionBatteryCode.getTractionBatteryCode()) - .productType(detailAspectDataTractionBatteryCode.getProductType()).build(); + private static List convertSubcomponents(DetailAspectDataTractionBatteryCode tractionBatteryCodeAspectModel) { + + String tractionBatteryCode1 = tractionBatteryCodeAspectModel.getTractionBatteryCode(); + return tractionBatteryCodeAspectModel.getSubcomponents().stream().map(subComponent -> { + return AssetAsBuiltEntity.TractionBatteryCodeSubcomponents.builder() + .tractionBatteryCode(tractionBatteryCode1) + .subcomponentTractionBatteryCode(subComponent.getTractionBatteryCode()) + .productType(subComponent.getProductType()) + .build(); + }).toList(); + } public static List toDomain(AssetAsBuiltEntity entity) { diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/repository/AssetAsBuiltRepositoryImpl.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/repository/AssetAsBuiltRepositoryImpl.java index a7853ef62e..42b0890198 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/repository/AssetAsBuiltRepositoryImpl.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/repository/AssetAsBuiltRepositoryImpl.java @@ -80,8 +80,8 @@ public AssetBase getAssetByChildId(String childId) { } @Override - public List getFieldValues(String fieldName, String startWith, Integer resultLimit, Owner owner) { - return CriteriaUtility.getDistinctAssetFieldValues(fieldName, startWith, resultLimit, owner, AssetAsBuiltEntity.class, entityManager); + public List getFieldValues(String fieldName, String startWith, Integer resultLimit, Owner owner, List inAssetIds) { + return CriteriaUtility.getDistinctAssetFieldValues(fieldName, startWith, resultLimit, owner, inAssetIds, AssetAsBuiltEntity.class, entityManager); } @Override diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asplanned/repository/AssetAsPlannedRepositoryImpl.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asplanned/repository/AssetAsPlannedRepositoryImpl.java index 9ec86732ce..e728f3ddb8 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asplanned/repository/AssetAsPlannedRepositoryImpl.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asplanned/repository/AssetAsPlannedRepositoryImpl.java @@ -154,8 +154,8 @@ public long countAssetsByOwner(Owner owner) { } @Override - public List getFieldValues(String fieldName, String startWith, Integer resultLimit, Owner owner) { - return CriteriaUtility.getDistinctAssetFieldValues(fieldName, startWith, resultLimit, owner, AssetAsPlannedEntity.class, entityManager); + public List getFieldValues(String fieldName, String startWith, Integer resultLimit, Owner owner, List inAssetIds) { + return CriteriaUtility.getDistinctAssetFieldValues(fieldName, startWith, resultLimit, owner, inAssetIds, AssetAsPlannedEntity.class, entityManager); } @Transactional diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/IrsClient.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/IrsClient.java index 6226139f70..4899fe7843 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/IrsClient.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/IrsClient.java @@ -46,6 +46,7 @@ import java.time.OffsetDateTime; import java.time.ZoneOffset; import java.util.List; +import java.util.Map; import java.util.UUID; import static org.eclipse.tractusx.traceability.common.config.RestTemplateConfiguration.IRS_ADMIN_TEMPLATE; @@ -73,8 +74,9 @@ public IrsClient(@Qualifier(IRS_ADMIN_TEMPLATE) RestTemplate irsAdminTemplate, } public List getPolicies() { - return irsAdminTemplate.exchange(policiesPath, HttpMethod.GET, null, new ParameterizedTypeReference>() { + Map> body = irsAdminTemplate.exchange(policiesPath, HttpMethod.GET, null, new ParameterizedTypeReference>>() { }).getBody(); + return body == null ? List.of() : body.values().stream().flatMap(List::stream).toList(); } public void deletePolicy() { @@ -88,10 +90,10 @@ public void registerPolicy() { String policyId = UUID.randomUUID().toString(); Constraint constraint = new Constraint(traceabilityProperties.getLeftOperand(), new Operator(OperatorType.EQ), traceabilityProperties.getRightOperand()); + Constraint constraintSecond = new Constraint(traceabilityProperties.getLeftOperandSecond(), new Operator(OperatorType.EQ), traceabilityProperties.getRightOperandSecond()); Constraints constraints = Constraints.builder() - .and(List.of(constraint)) - .or(List.of(constraint)) + .and(List.of(constraint, constraintSecond)) .build(); Permission permission = Permission.builder() diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/JobRepositoryImpl.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/JobRepositoryImpl.java index 0998c89568..9c1edefafc 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/JobRepositoryImpl.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/JobRepositoryImpl.java @@ -32,26 +32,27 @@ import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.Direction; import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IRSResponse; import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.JobStatus; -import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.factory.AssetMapperFactory; -import org.eclipse.tractusx.traceability.bpn.domain.service.BpnRepository; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.factory.IrsResponseAssetMapper; +import org.eclipse.tractusx.traceability.bpn.domain.service.BpnService; +import org.eclipse.tractusx.traceability.bpn.infrastructure.repository.BpnRepository; import org.eclipse.tractusx.traceability.common.properties.TraceabilityProperties; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.Optional; import static org.eclipse.tractusx.irs.component.enums.BomLifecycle.AS_BUILT; import static org.eclipse.tractusx.irs.component.enums.BomLifecycle.AS_PLANNED; -import static org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.factory.AssetMapperFactory.extractBpnMap; @Slf4j @Service public class JobRepositoryImpl implements JobRepository { private final BpnRepository bpnRepository; + + private final BpnService bpnService; private final TraceabilityProperties traceabilityProperties; private final AssetCallbackRepository assetAsBuiltCallbackRepository; private final AssetCallbackRepository assetAsPlannedCallbackRepository; @@ -59,19 +60,20 @@ public class JobRepositoryImpl implements JobRepository { private static final String JOB_STATUS_COMPLETED = "COMPLETED"; private static final String JOB_STATUS_RUNNING = "RUNNING"; - private final AssetMapperFactory assetMapperFactory; + private final IrsResponseAssetMapper assetMapperFactory; private final IrsClient irsClient; public JobRepositoryImpl( IrsClient irsClient, BpnRepository bpnRepository, - TraceabilityProperties traceabilityProperties, + BpnService bpnService, TraceabilityProperties traceabilityProperties, @Qualifier("assetAsBuiltRepositoryImpl") AssetCallbackRepository assetAsBuiltCallbackRepository, @Qualifier("assetAsPlannedRepositoryImpl") - AssetCallbackRepository assetAsPlannedCallbackRepository, AssetMapperFactory assetMapperFactory) { + AssetCallbackRepository assetAsPlannedCallbackRepository, IrsResponseAssetMapper assetMapperFactory) { this.bpnRepository = bpnRepository; + this.bpnService = bpnService; this.traceabilityProperties = traceabilityProperties; this.assetAsBuiltCallbackRepository = assetAsBuiltCallbackRepository; this.assetAsPlannedCallbackRepository = assetAsPlannedCallbackRepository; @@ -102,14 +104,7 @@ public void handleJobFinishedCallback(String jobId, String state) { log.info("IRS call for globalAssetId: {} finished with status: {}, runtime {} s.", jobResponseIRS.jobStatus().globalAssetId(), jobResponseIRS.jobStatus().state(), runtime); if (jobCompleted(jobResponseIRS.jobStatus())) { - try { - Map bpnMap = extractBpnMap(jobResponseIRS); - bpnRepository.updateManufacturers(bpnMap); - } catch (Exception e) { - log.warn("BPN Mapping Exception", e); - } - - List assets = assetMapperFactory.mapToAssetBaseList(jobResponseIRS); + List assets = assetMapperFactory.toAssetBaseList(jobResponseIRS); assets.forEach(assetBase -> { if (assetBase.getBomLifecycle() == AS_BUILT) { diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/PolicyRepositoryImpl.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/PolicyRepositoryImpl.java index 8f2636baf2..c16e4c8f4c 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/PolicyRepositoryImpl.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/PolicyRepositoryImpl.java @@ -30,6 +30,7 @@ import java.util.stream.Stream; import static org.apache.commons.collections4.ListUtils.emptyIfNull; + @Slf4j @Service @RequiredArgsConstructor @@ -42,6 +43,7 @@ public class PolicyRepositoryImpl implements PolicyRepository { public List getPolicies() { return irsClient.getPolicies(); } + @Override public void createIrsPolicyIfMissing() { log.info("Check if irs policy exists"); @@ -49,7 +51,9 @@ public void createIrsPolicyIfMissing() { final List irsPoliciesIds = irsPolicies.stream().map(policyResponse -> policyResponse.payload().policyId()).toList(); log.info("Irs has following policies: {}", irsPoliciesIds); - log.info("Required constraints from application yaml are : {}", traceabilityProperties.getRightOperand()); + log.info("Required constraints - 2 -"); + log.info("First constraint requirements: leftOperand {} operator {} and rightOperand {}", traceabilityProperties.getLeftOperand(), traceabilityProperties.getOperatorType(), traceabilityProperties.getRightOperand()); + log.info("Second constraint requirements: eftOperand {} operator {} and rightOperand {}", traceabilityProperties.getLeftOperandSecond(), traceabilityProperties.getOperatorTypeSecond(), traceabilityProperties.getRightOperandSecond()); IrsPolicyResponse matchingPolicy = findMatchingPolicy(irsPolicies); @@ -62,18 +66,45 @@ public void createIrsPolicyIfMissing() { private IrsPolicyResponse findMatchingPolicy(List irsPolicies) { return irsPolicies.stream() - .filter(irsPolicy -> emptyIfNull(irsPolicy.payload().policy().getPermissions()).stream() - .flatMap(permission -> { - Constraints constraint = permission.getConstraint(); - return constraint != null ? constraint.getAnd().stream() : Stream.empty(); - }) - .anyMatch(constraint -> constraint.getRightOperand().equals(traceabilityProperties.getRightOperand())) - || emptyIfNull(irsPolicy.payload().policy().getPermissions()).stream() - .flatMap(permission -> { - Constraints constraint = permission.getConstraint(); - return constraint != null ? constraint.getOr().stream() : Stream.empty(); - }) - .anyMatch(constraint -> constraint.getRightOperand().equals(traceabilityProperties.getRightOperand()))) + .filter(irsPolicy -> { + // Logging all policy constraints + irsPolicy.payload().policy().getPermissions().forEach(permission -> { + Constraints constraint = permission.getConstraint(); + if (constraint != null) { + constraint.getAnd().forEach(constraint1 -> log.info("From IRS Policy Response -> Leftoperand {} operator {} and rightOperand {}", constraint1.getLeftOperand(), constraint1.getOperator(), constraint1.getRightOperand())); + } + }); + + // Check if all constraints exist in the policy + boolean firstConstraintExists = emptyIfNull(irsPolicy.payload().policy().getPermissions()).stream() + .flatMap(permission -> { + Constraints constraint = permission.getConstraint(); + return constraint != null ? emptyIfNull(constraint.getAnd()).stream() : Stream.empty(); + }) + .anyMatch(constraint -> constraint.getRightOperand().equals(traceabilityProperties.getRightOperand())) + || emptyIfNull(irsPolicy.payload().policy().getPermissions()).stream() + .flatMap(permission -> { + Constraints constraint = permission.getConstraint(); + return constraint != null ? emptyIfNull(constraint.getOr()).stream() : Stream.empty(); + }) + .anyMatch(constraint -> constraint.getRightOperand().equals(traceabilityProperties.getRightOperand())); + + boolean secondConstraintExists = emptyIfNull(irsPolicy.payload().policy().getPermissions()).stream() + .flatMap(permission -> { + Constraints constraint = permission.getConstraint(); + return constraint != null ? emptyIfNull(constraint.getAnd()).stream() : Stream.empty(); + }) + .anyMatch(constraint -> constraint.getRightOperand().equals(traceabilityProperties.getRightOperandSecond())) + || emptyIfNull(irsPolicy.payload().policy().getPermissions()).stream() + .flatMap(permission -> { + Constraints constraint = permission.getConstraint(); + return constraint != null ? emptyIfNull(constraint.getOr()).stream() : Stream.empty(); + }) + .anyMatch(constraint -> constraint.getRightOperand().equals(traceabilityProperties.getRightOperandSecond())); + + // Return true if both constraints exist + return firstConstraintExists && secondConstraintExists; + }) .findFirst() .orElse(null); } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/GenericSubmodel.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/GenericSubmodel.java deleted file mode 100644 index 44fe390c13..0000000000 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/GenericSubmodel.java +++ /dev/null @@ -1,113 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2023 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.traceability.assets.infrastructure.base.irs.model.response; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonSubTypes.Type; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import lombok.extern.slf4j.Slf4j; -import org.eclipse.tractusx.traceability.assets.domain.asbuilt.model.aspect.DetailAspectDataTractionBatteryCode; -import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.MainAspectAsBuiltRequest; -import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.MainAspectAsPlannedRequest; -import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.PartSiteInformationAsPlannedRequest; -import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.SingleLevelBomAsBuiltRequest; -import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.SingleLevelBomAsPlannedRequest; -import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.SingleLevelUsageAsBuiltRequest; -import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.SingleLevelUsageAsPlannedRequest; - - -@Slf4j -public class GenericSubmodel { - @JsonTypeInfo( - use = JsonTypeInfo.Id.NAME, - include = JsonTypeInfo.As.EXTERNAL_PROPERTY, - defaultImpl = Void.class, - property = "aspectType") - @JsonSubTypes({ - @Type(value = MainAspectAsBuiltRequest.class, names = { - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", - "urn:samm:io.catenax.batch:2.0.0#Batch", - "urn:bamm:io.catenax.just_in_sequence_part:1.0.0#JustInSequencePart" - }), - - @Type(value = MainAspectAsPlannedRequest.class, names = { - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned" - }), - @Type(value = PartSiteInformationAsPlannedRequest.class, names = { - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned" - }), - - @Type(value = DetailAspectDataTractionBatteryCode.class, names = { - "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode" - }), - @Type(value = SingleLevelBomAsBuiltRequest.class, names = { - "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt" - }), - @Type(value = SingleLevelUsageAsBuiltRequest.class, names = { - "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt" - }), - @Type(value = SingleLevelUsageAsPlannedRequest.class, names = { - "urn:bamm:io.catenax.single_level_usage_as_planned:1.1.0#SingleLevelUsageAsPlanned" - }), - @Type(value = SingleLevelBomAsPlannedRequest.class, names = { - "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned" - }) - }) - private final Object payload; - - private String payloadRaw; - - @JsonProperty("aspectType") - private String aspectType; - - @JsonCreator - public GenericSubmodel(@JsonProperty("aspectType") String aspectType, @JsonProperty("payload") Object payload) { - this.aspectType = aspectType; - this.payload = payload; - ObjectMapper objectMapper = new ObjectMapper(); - objectMapper.registerModule(new JavaTimeModule()); - try { - this.payloadRaw = objectMapper.writeValueAsString(payload); - } catch (JsonProcessingException exception) { - this.payloadRaw = exception.getMessage(); - } - } - - public Object getPayload() { - return payload; - } - - public String getAspectType() { - return aspectType; - } - - public String getPayloadRaw() { - return payloadRaw; - } - -} - - - diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/IrsPolicyResponse.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/IrsPolicyResponse.java index 0f2b9e60a4..878ecbc21a 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/IrsPolicyResponse.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/IrsPolicyResponse.java @@ -34,12 +34,16 @@ import java.time.OffsetDateTime; import java.util.List; +import static org.apache.commons.collections4.ListUtils.emptyIfNull; + /** * Policy representation for get all policies response */ @Builder @Schema(example = IrsPolicyResponse.EXAMPLE_PAYLOAD) public record IrsPolicyResponse(OffsetDateTime validUntil, Payload payload) { + // https://github.com/eclipse-tractusx/traceability-foss/issues/978 + // "odrl:action" USE will be use (lowercase) make sure to migrate @SuppressWarnings({"FileTabCharacter", "java:S2479"}) // required to show correctly example payload in open-api @@ -49,13 +53,16 @@ public record IrsPolicyResponse(OffsetDateTime validUntil, Payload payload) { "validUntil": "2025-12-12T23:59:59.999Z", "payload": { "@context": { + "@vocab" : "https://w3id.org/edc/v0.0.1/ns/", + "edc": "https://w3id.org/edc/v0.0.1/ns/", + "cx-policy": "https://w3id.org/catenax/policy/", "odrl": "http://www.w3.org/ns/odrl/2/" }, "@id": "policy-id", "policy": { "odrl:permission": [ { - "odrl:action": "USE", + "odrl:action": "use", "odrl:constraint": { "odrl:and": [ { @@ -104,8 +111,8 @@ private static List map(Policy policy) { private static ConstraintsResponse map(Permission permission) { return ConstraintsResponse.builder() - .and(mapConstraints(permission.getConstraint().getAnd())) - .or(mapConstraints(permission.getConstraint().getOr())) + .and(mapConstraints(emptyIfNull(permission.getConstraint().getAnd()))) + .or(mapConstraints(emptyIfNull(permission.getConstraint().getOr()))) .build(); } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/IrsSubmodel.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/IrsSubmodel.java index e01d337d20..1bce8b1fa1 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/IrsSubmodel.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/IrsSubmodel.java @@ -4,12 +4,18 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import lombok.Getter; -import org.eclipse.tractusx.traceability.generated.Batch200Schema; -import org.eclipse.tractusx.traceability.generated.JustInSequencePart100Schema; -import org.eclipse.tractusx.traceability.generated.PartAsPlanned101Schema; +import org.eclipse.tractusx.traceability.generated.Batch300Schema; +import org.eclipse.tractusx.traceability.generated.JustInSequencePart300Schema; +import org.eclipse.tractusx.traceability.generated.PartAsPlanned200Schema; import org.eclipse.tractusx.traceability.generated.PartSiteInformationAsPlanned100Schema; -import org.eclipse.tractusx.traceability.generated.SerialPart101Schema; +import org.eclipse.tractusx.traceability.generated.SerialPart300Schema; +import org.eclipse.tractusx.traceability.generated.SingleLevelBomAsBuilt300Schema; +import org.eclipse.tractusx.traceability.generated.SingleLevelBomAsPlanned300Schema; +import org.eclipse.tractusx.traceability.generated.SingleLevelUsageAsBuilt300Schema; import org.eclipse.tractusx.traceability.generated.TractionBatteryCode100Schema; @Getter @@ -20,27 +26,38 @@ public class IrsSubmodel { defaultImpl = Void.class, property = "aspectType") @JsonSubTypes({ - @JsonSubTypes.Type(value = SerialPart101Schema.class, names = { - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + @JsonSubTypes.Type(value = SerialPart300Schema.class, names = { + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", }), - @JsonSubTypes.Type(value = Batch200Schema.class, names = { - "urn:samm:io.catenax.batch:2.0.0#Batch" + @JsonSubTypes.Type(value = Batch300Schema.class, names = { + "urn:samm:io.catenax.batch:3.0.0#Batch" }), - @JsonSubTypes.Type(value = PartAsPlanned101Schema.class, names = { - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + @JsonSubTypes.Type(value = PartAsPlanned200Schema.class, names = { + "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", }), @JsonSubTypes.Type(value = PartSiteInformationAsPlanned100Schema.class, names = { - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned" + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned" }), - @JsonSubTypes.Type(value = JustInSequencePart100Schema.class, names = { - "urn:bamm:io.catenax.just_in_sequence_part:1.0.0#JustInSequencePart" + @JsonSubTypes.Type(value = JustInSequencePart300Schema.class, names = { + "urn:samm:io.catenax.just_in_sequence_part:3.0.0#JustInSequencePart" }), @JsonSubTypes.Type(value = TractionBatteryCode100Schema.class, names = { - "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode" + "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode" + }), + @JsonSubTypes.Type(value = SingleLevelBomAsBuilt300Schema.class, names = { + "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt" + }), + @JsonSubTypes.Type(value = SingleLevelUsageAsBuilt300Schema.class, names = { + "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt" + }), + @JsonSubTypes.Type(value = SingleLevelBomAsPlanned300Schema.class, names = { + "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned" }) }) private Object payload; + private String payloadRaw; + @JsonProperty("aspectType") private String aspectType; @@ -51,6 +68,14 @@ public class IrsSubmodel { public IrsSubmodel(@JsonProperty("aspectType") String aspectType, @JsonProperty("payload") Object payload) { this.aspectType = aspectType; this.payload = payload; + ObjectMapper objectMapper = new ObjectMapper(); + objectMapper.registerModule(new JavaTimeModule()); + try { + this.payloadRaw = objectMapper.writeValueAsString(payload); + } catch (JsonProcessingException exception) { + this.payloadRaw = exception.getMessage(); + } + } } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/factory/AssetBaseMapperProvider.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/factory/AssetBaseMapperProvider.java new file mode 100644 index 0000000000..e4d1a2dbb1 --- /dev/null +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/factory/AssetBaseMapperProvider.java @@ -0,0 +1,62 @@ +/******************************************************************************** + * Copyright (c) 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.traceability.assets.infrastructure.base.irs.model.response.factory; + +import lombok.RequiredArgsConstructor; +import org.eclipse.tractusx.irs.component.Relationship; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IrsSubmodel; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.asbuilt.AsBuiltDetailMapper; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.asplanned.AsPlannedDetailMapper; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.relationship.RelationshipMapper; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.submodel.SubmodelMapper; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.submodel.relationship.SubmodelRelationshipMapper; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Optional; + +@Component +@RequiredArgsConstructor +public class AssetBaseMapperProvider { + private final List baseMappers; + private final List submodelRelationshipMapper; + private final List relationshipMappers; + private final List asPlannedDetailMappers; + private final List asBuiltDetailMappers; + + public Optional getMainSubmodelMapper(IrsSubmodel irsSubmodel) { + return baseMappers.stream().filter(assetBaseMapper -> assetBaseMapper.validMapper(irsSubmodel)).findFirst(); + } + + public Optional getRelationshipSubmodelMapper(IrsSubmodel irsSubmodel) { + return submodelRelationshipMapper.stream().filter(assetBaseMapper -> assetBaseMapper.validMapper(irsSubmodel)).findFirst(); + } + + public Optional getRelationshipMapper(Relationship relationship) { + return relationshipMappers.stream().filter(relationshipMapper -> relationshipMapper.validMapper(relationship)).findFirst(); + } + + public Optional getAsPlannedDetailMapper(IrsSubmodel irsSubmodel) { + return asPlannedDetailMappers.stream().filter(asPlannedDetailMapper -> asPlannedDetailMapper.validMapper(irsSubmodel)).findFirst(); + } + + public Optional getAsBuiltDetailMapper(IrsSubmodel irsSubmodel) { + return asBuiltDetailMappers.stream().filter(asBuiltDetailMapper -> asBuiltDetailMapper.validMapper(irsSubmodel)).findFirst(); + } +} diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/factory/AssetMapperFactory.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/factory/AssetMapperFactory.java deleted file mode 100644 index d7f4e06e5a..0000000000 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/factory/AssetMapperFactory.java +++ /dev/null @@ -1,208 +0,0 @@ -/******************************************************************************** - * Copyright (c) 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.traceability.assets.infrastructure.base.irs.model.response.factory; - -import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.eclipse.tractusx.irs.component.Bpn; -import org.eclipse.tractusx.irs.component.Relationship; -import org.eclipse.tractusx.irs.component.enums.Direction; -import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase; -import org.eclipse.tractusx.traceability.assets.domain.base.model.Descriptions; -import org.eclipse.tractusx.traceability.assets.domain.base.model.aspect.DetailAspectModel; -import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.mapper.TombstoneMapper; -import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IRSResponse; -import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IrsSubmodel; -import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.asbuilt.AsBuiltDetailMapper; -import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.asplanned.AsPlannedDetailMapper; -import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.relationship.RelationshipMapper; -import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.submodel.SubmodelMapper; -import org.jetbrains.annotations.NotNull; -import org.springframework.stereotype.Component; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static org.apache.commons.collections4.ListUtils.emptyIfNull; -import static org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.submodel.MapperHelper.enrichAssetBase; -import static org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.submodel.MapperHelper.enrichManufacturingInformation; -import static org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.submodel.MapperHelper.getContractAgreementId; -import static org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.submodel.MapperHelper.getOwner; -import static org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.submodel.MapperHelper.getShortId; - -@Component -@Slf4j -@RequiredArgsConstructor -public class AssetMapperFactory { - - private final List baseMappers; - private final List relationshipMappers; - private final List asPlannedDetailMappers; - private final List asBuiltDetailMappers; - private final ObjectMapper objectMapper; - - public List mapToAssetBaseList(IRSResponse irsResponse) { - - Map> descriptionMap = extractRelationshipToDescriptionMap(irsResponse); - - Map bpnMap = extractBpnMap(irsResponse); - - List tractionBatteryCode = extractTractionBatteryCode(irsResponse); - - List partSiteInformationAsPlanned = extractPartSiteInformationAsPlanned(irsResponse); - List tombstones = TombstoneMapper.mapTombstones(irsResponse.jobStatus(), irsResponse.tombstones(), objectMapper); - if (tombstones != null) { - log.info("Found {} tombstones", tombstones.size()); - } - return toAssetBase(irsResponse, descriptionMap, bpnMap, tractionBatteryCode, partSiteInformationAsPlanned, tombstones); - } - - @NotNull - private List toAssetBase(IRSResponse irsResponse, - Map> descriptionMap, - Map bpnMap, List tractionBatteryCode, - List partSiteInformationAsPlanned, - List tombstones) { - List submodelAssets = new ArrayList<>(irsResponse - .submodels() - .stream() - .map(irsSubmodel -> { - Optional mapper = getSubmodelMapper(irsSubmodel); - if (mapper.isPresent()) { - AssetBase assetBase = mapper.get().extractSubmodel(irsSubmodel); - assetBase.setOwner(getOwner(assetBase, irsResponse)); - assetBase.setIdShort(getShortId(irsResponse.shells(), assetBase.getId())); - assetBase.setContractAgreementId(getContractAgreementId(irsResponse.shells(), assetBase.getId())); - - enrichUpwardAndDownwardDescriptions(descriptionMap, assetBase); - enrichManufacturingInformation(irsResponse, bpnMap, assetBase); - enrichAssetBase(tractionBatteryCode, assetBase); - enrichAssetBase(partSiteInformationAsPlanned, assetBase); - - return assetBase; - } - return null; - }) - .filter(Objects::nonNull) - .toList()); - - submodelAssets.addAll(tombstones); - return submodelAssets; - } - - - @NotNull - private List extractPartSiteInformationAsPlanned(IRSResponse irsResponse) { - return irsResponse - .submodels() - .stream() - .flatMap(irsSubmodel -> { - Optional mapper = getAsPlannedDetailMapper(irsSubmodel); - return mapper.map(asPlannedDetailMapper -> asPlannedDetailMapper.extractDetailAspectModel(irsSubmodel).stream()).orElseGet(Stream::empty); - }) - .filter(Objects::nonNull) - .toList(); - } - - @NotNull - private List extractTractionBatteryCode(IRSResponse irsResponse) { - return irsResponse - .submodels() - .stream() - .flatMap(irsSubmodel -> { - Optional mapper = getAsBuiltDetailMapper(irsSubmodel); - return mapper.map(asBuiltDetailMapper -> asBuiltDetailMapper.extractDetailAspectModel(irsSubmodel, irsResponse.jobStatus().globalAssetId()).stream()).orElseGet(Stream::empty); - }) - .filter(Objects::nonNull) - .toList(); - } - - @NotNull - public static Map extractBpnMap(IRSResponse irsResponse) { - return irsResponse - .bpns() - .stream() - .map(bpn -> { - Bpn bpn1 = Bpn.withManufacturerId(bpn.getManufacturerId()); - bpn1.updateManufacturerName(bpn.getManufacturerName()); - return bpn1; - }).filter(bpn -> bpn.getManufacturerName() != null) - .collect(Collectors.toMap(Bpn::getManufacturerId, - Bpn::getManufacturerName)); - } - - private static void enrichUpwardAndDownwardDescriptions(Map> descriptionsMap, AssetBase assetBase) { - List upwardDescriptions = new ArrayList<>(); - List downwardDescriptions = new ArrayList<>(); - - List descriptions = descriptionsMap.get(assetBase.getId()); - for (Descriptions description : emptyIfNull(descriptions)) { - if (description.direction() == Direction.UPWARD) { - upwardDescriptions.add(description); - } else if (description.direction() == Direction.DOWNWARD) { - downwardDescriptions.add(description); - } - } - - assetBase.setChildRelations(downwardDescriptions); - assetBase.setParentRelations(upwardDescriptions); - } - - @NotNull - private Map> extractRelationshipToDescriptionMap(IRSResponse irsResponse) { - Map> descriptionMap = new HashMap<>(); - - irsResponse.relationships().forEach(relationship -> { - Optional relationshipMapper = getRelationshipMapper(relationship); - if (relationshipMapper.isPresent()) { - Descriptions descriptions = relationshipMapper.get().extractDescription(relationship); - String catenaXIdString = String.valueOf(relationship.getCatenaXId()); - descriptionMap.computeIfAbsent(catenaXIdString, key -> new ArrayList<>()).add(descriptions); - } - - }); - return descriptionMap; - } - - private Optional getSubmodelMapper(IrsSubmodel irsSubmodel) { - return baseMappers.stream().filter(assetBaseMapper -> assetBaseMapper.validMapper(irsSubmodel)).findFirst(); - } - - private Optional getRelationshipMapper(Relationship relationship) { - return relationshipMappers.stream().filter(relationshipMapper -> relationshipMapper.validMapper(relationship)).findFirst(); - } - - private Optional getAsPlannedDetailMapper(IrsSubmodel irsSubmodel) { - return asPlannedDetailMappers.stream().filter(asPlannedDetailMapper -> asPlannedDetailMapper.validMapper(irsSubmodel)).findFirst(); - } - - private Optional getAsBuiltDetailMapper(IrsSubmodel irsSubmodel) { - return asBuiltDetailMappers.stream().filter(asBuiltDetailMapper -> asBuiltDetailMapper.validMapper(irsSubmodel)).findFirst(); - } - -} - - diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/factory/ImportAssetMapper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/factory/ImportAssetMapper.java new file mode 100644 index 0000000000..4578c03a35 --- /dev/null +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/factory/ImportAssetMapper.java @@ -0,0 +1,107 @@ +/******************************************************************************** + * Copyright (c) 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.traceability.assets.infrastructure.base.irs.model.response.factory; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase; +import org.eclipse.tractusx.traceability.assets.domain.base.model.Descriptions; +import org.eclipse.tractusx.traceability.assets.domain.base.model.ImportNote; +import org.eclipse.tractusx.traceability.assets.domain.base.model.ImportState; +import org.eclipse.tractusx.traceability.assets.domain.base.model.Owner; +import org.eclipse.tractusx.traceability.assets.domain.base.model.QualityType; +import org.eclipse.tractusx.traceability.assets.domain.base.model.aspect.DetailAspectModel; +import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.AssetMetaInfoRequest; +import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.ImportRequest; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IrsSubmodel; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.AssetBaseMappers; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.submodel.MapperHelper; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.submodel.SubmodelMapper; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.submodel.relationship.SubmodelRelationshipMapper; +import org.eclipse.tractusx.traceability.common.properties.TraceabilityProperties; +import org.jetbrains.annotations.NotNull; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + +import static org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.submodel.MapperHelper.enrichAssetBase; +import static org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.submodel.MapperHelper.enrichUpwardAndDownwardDescriptions; + +@Component +@Slf4j +@RequiredArgsConstructor +public class ImportAssetMapper implements AssetBaseMappers> { + + private final AssetBaseMapperProvider assetBaseMapperProvider; + private final TraceabilityProperties traceabilityProperties; + + @Override + public List toAssetBaseList(List assetImportRequestList) { + List assetBaseList = new ArrayList<>(); + assetImportRequestList.forEach(assetImportRequest -> { + AssetMetaInfoRequest assetMetaInfoRequest = assetImportRequest.assetMetaInfoRequest(); + List submodels = assetImportRequest.submodels(); + Map> descriptionMap = extractRelationshipToDescriptionMap(assetMetaInfoRequest, submodels); + List tractionBatteryCode = MapperHelper.extractTractionBatteryCode(submodels, assetMetaInfoRequest.catenaXId(), assetBaseMapperProvider); + List partSiteInformationAsPlanned = MapperHelper.extractPartSiteInformationAsPlanned(submodels, assetBaseMapperProvider); + List mainSubmodels = submodels.stream().map(irsSubmodel -> { + Optional mapper = assetBaseMapperProvider.getMainSubmodelMapper(irsSubmodel); + if (mapper.isPresent()) { + AssetBase assetBase = mapper.get().extractSubmodel(irsSubmodel); + assetBase.setOwner(Owner.OWN); + assetBase.setQualityType(QualityType.OK); + assetBase.setImportNote(ImportNote.TRANSIENT_CREATED); + assetBase.setImportState(ImportState.TRANSIENT); + assetBase.setManufacturerId(traceabilityProperties.getBpn().value()); + enrichUpwardAndDownwardDescriptions(descriptionMap, assetBase); + enrichUpwardAndDownwardDescriptions(descriptionMap, assetBase); + enrichAssetBase(tractionBatteryCode, assetBase); + enrichAssetBase(partSiteInformationAsPlanned, assetBase); + return assetBase; + } + return null; + }).filter(Objects::nonNull).toList(); + assetBaseList.addAll(mainSubmodels); + }); + return assetBaseList; + } + + @NotNull + private Map> extractRelationshipToDescriptionMap(AssetMetaInfoRequest assetMetaInfoRequest, List irsSubmodels) { + Map> descriptionMap = new HashMap<>(); + irsSubmodels.forEach(irsSubmodel -> { + Optional relationshipSubmodelMapper = assetBaseMapperProvider.getRelationshipSubmodelMapper(irsSubmodel); + if (relationshipSubmodelMapper.isPresent()) { + Descriptions descriptions = relationshipSubmodelMapper.get().extractDescription(irsSubmodel); + String catenaXIdString = String.valueOf(assetMetaInfoRequest.catenaXId()); + descriptionMap.computeIfAbsent(catenaXIdString, key -> new ArrayList<>()).add(descriptions); + } + }); + return descriptionMap; + } + + +} + + diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/factory/IrsResponseAssetMapper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/factory/IrsResponseAssetMapper.java new file mode 100644 index 0000000000..73635d4240 --- /dev/null +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/factory/IrsResponseAssetMapper.java @@ -0,0 +1,120 @@ +/******************************************************************************** + * Copyright (c) 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.traceability.assets.infrastructure.base.irs.model.response.factory; + +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase; +import org.eclipse.tractusx.traceability.assets.domain.base.model.Descriptions; +import org.eclipse.tractusx.traceability.assets.domain.base.model.aspect.DetailAspectModel; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.mapper.TombstoneMapper; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IRSResponse; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.AssetBaseMappers; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.relationship.RelationshipMapper; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.submodel.MapperHelper; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.submodel.SubmodelMapper; +import org.eclipse.tractusx.traceability.bpn.domain.service.BpnService; +import org.jetbrains.annotations.NotNull; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + +import static org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.submodel.MapperHelper.enrichAssetBase; +import static org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.submodel.MapperHelper.enrichUpwardAndDownwardDescriptions; +import static org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.submodel.MapperHelper.getContractAgreementId; +import static org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.submodel.MapperHelper.getOwner; +import static org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.submodel.MapperHelper.getShortId; + +@Component +@Slf4j +@RequiredArgsConstructor +public class IrsResponseAssetMapper implements AssetBaseMappers { + + private final AssetBaseMapperProvider assetBaseMapperProvider; + private final ObjectMapper objectMapper; + private final BpnService bpnService; + + @Override + public List toAssetBaseList(IRSResponse irsResponse) { + Map> descriptionMap = extractRelationshipToDescriptionMap(irsResponse); + List tractionBatteryCode = MapperHelper.extractTractionBatteryCode(irsResponse.submodels(), irsResponse.jobStatus().globalAssetId(), assetBaseMapperProvider); + List partSiteInformationAsPlanned = MapperHelper.extractPartSiteInformationAsPlanned(irsResponse.submodels(), assetBaseMapperProvider); + List tombstones = TombstoneMapper.mapTombstones(irsResponse.jobStatus(), irsResponse.tombstones(), objectMapper); + if (tombstones != null) { + log.info("Found {} tombstones", tombstones.size()); + } + List submodelAssets = new ArrayList<>(irsResponse + .submodels() + .stream() + .map(irsSubmodel -> { + Optional mapper = assetBaseMapperProvider.getMainSubmodelMapper(irsSubmodel); + if (mapper.isPresent()) { + AssetBase assetBase = mapper.get().extractSubmodel(irsSubmodel); + assetBase.setOwner(getOwner(assetBase, irsResponse)); + assetBase.setIdShort(getShortId(irsResponse.shells(), assetBase.getId())); + assetBase.setContractAgreementId(getContractAgreementId(irsResponse.shells(), assetBase.getId())); + assetBase.setManufacturerId(getManufacturerId(irsResponse, assetBase)); + assetBase.setManufacturerName(bpnService.findByBpn(assetBase.getManufacturerId())); + enrichUpwardAndDownwardDescriptions(descriptionMap, assetBase); + enrichAssetBase(tractionBatteryCode, assetBase); + enrichAssetBase(partSiteInformationAsPlanned, assetBase); + return assetBase; + } + return null; + }) + .filter(Objects::nonNull) + .toList()); + + if (tombstones != null) { + submodelAssets.addAll(tombstones); + } + return submodelAssets; + } + + + @NotNull + private Map> extractRelationshipToDescriptionMap(IRSResponse irsResponse) { + Map> descriptionMap = new HashMap<>(); + irsResponse.relationships().forEach(relationship -> { + Optional relationshipMapper = assetBaseMapperProvider.getRelationshipMapper(relationship); + if (relationshipMapper.isPresent()) { + Descriptions descriptions = relationshipMapper.get().extractDescription(relationship); + String catenaXIdString = String.valueOf(relationship.getCatenaXId()); + descriptionMap.computeIfAbsent(catenaXIdString, key -> new ArrayList<>()).add(descriptions); + } + }); + return descriptionMap; + } + + private String getManufacturerId(IRSResponse irsResponse, AssetBase assetBase) { + if (assetBase.getManufacturerId() == null && assetBase.getId().equals(irsResponse.jobStatus().globalAssetId())) { + return irsResponse.jobStatus().parameter().bpn(); + } + return assetBase.getManufacturerId(); + } + +} + + diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/AssetBaseMappers.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/AssetBaseMappers.java new file mode 100644 index 0000000000..16dc84bb25 --- /dev/null +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/AssetBaseMappers.java @@ -0,0 +1,9 @@ +package org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping; + +import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase; + +import java.util.List; + +public interface AssetBaseMappers { + List toAssetBaseList(T input); +} diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/BatchMapper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/BatchMapper.java index d529e21c82..91873cd360 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/BatchMapper.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/BatchMapper.java @@ -28,10 +28,10 @@ import org.eclipse.tractusx.traceability.assets.domain.base.model.aspect.DetailAspectType; import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IrsSubmodel; import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.semanticdatamodel.LocalIdKey; -import org.eclipse.tractusx.traceability.generated.Batch200Schema; -import org.eclipse.tractusx.traceability.generated.UrnSammIoCatenaxBatch200KeyValueList; -import org.eclipse.tractusx.traceability.generated.UrnSammIoCatenaxBatch200ManufacturingCharacteristic; -import org.eclipse.tractusx.traceability.generated.UrnSammIoCatenaxBatch200PartTypeInformationCharacteristic; +import org.eclipse.tractusx.traceability.generated.Batch300Schema; +import org.eclipse.tractusx.traceability.generated.UrnSammIoCatenaxBatch300KeyValueList; +import org.eclipse.tractusx.traceability.generated.UrnSammIoCatenaxBatch300ManufacturingCharacteristic; +import org.eclipse.tractusx.traceability.generated.UrnSammIoCatenaxBatch300PartTypeInformationCharacteristic; import org.springframework.stereotype.Component; import java.time.OffsetDateTime; @@ -46,7 +46,7 @@ public class BatchMapper implements SubmodelMapper { @Override public AssetBase extractSubmodel(IrsSubmodel irsSubmodel) { - Batch200Schema batch = (Batch200Schema) irsSubmodel.getPayload(); + Batch300Schema batch = (Batch300Schema) irsSubmodel.getPayload(); String batchId = getValue(batch.getLocalIdentifiers(), LocalIdKey.BATCH_ID.getValue()); String manufacturerId = getValue(batch.getLocalIdentifiers(), LocalIdKey.MANUFACTURER_ID.getValue()); @@ -60,7 +60,15 @@ public AssetBase extractSubmodel(IrsSubmodel irsSubmodel) { .manufacturerId(manufacturerId) .nameAtManufacturer(batch.getPartTypeInformation().getNameAtManufacturer()) .manufacturerPartId(batch.getPartTypeInformation().getManufacturerPartId()) - .classification(batch.getPartTypeInformation().getClassification().value()) + // TODO + /* + { + "classificationStandard": "ISO 12345", + "classificationID": "6789", + "classificationDescription": "Standard for widgets" + } + * */ + .classification(null) .qualityType(QualityType.OK) .semanticDataModel(BATCH) .van(van) @@ -71,11 +79,11 @@ public AssetBase extractSubmodel(IrsSubmodel irsSubmodel) { @Override public boolean validMapper(IrsSubmodel submodel) { - return submodel.getPayload() instanceof Batch200Schema; + return submodel.getPayload() instanceof Batch300Schema; } - private static DetailAspectModel extractDetailAspectModelsAsBuilt(UrnSammIoCatenaxBatch200ManufacturingCharacteristic manufacturingInformation, - UrnSammIoCatenaxBatch200PartTypeInformationCharacteristic partTypeInformation) { + private static DetailAspectModel extractDetailAspectModelsAsBuilt(UrnSammIoCatenaxBatch300ManufacturingCharacteristic manufacturingInformation, + UrnSammIoCatenaxBatch300PartTypeInformationCharacteristic partTypeInformation) { OffsetDateTime offsetDateTime = MapperHelper.getOffsetDateTime(manufacturingInformation.getDate()); @@ -89,8 +97,8 @@ private static DetailAspectModel extractDetailAspectModelsAsBuilt(UrnSammIoCaten return DetailAspectModel.builder().data(detailAspectDataAsBuilt).type(DetailAspectType.AS_BUILT).build(); } - private String getValue(Set localIdentifiers, String key) { - UrnSammIoCatenaxBatch200KeyValueList object = localIdentifiers.stream() + private String getValue(Set localIdentifiers, String key) { + UrnSammIoCatenaxBatch300KeyValueList object = localIdentifiers.stream() .filter(localId -> localId.getKey().equalsIgnoreCase(key)) .findFirst() .orElseGet(() -> null); diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/JustInSequenceMapper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/JustInSequenceMapper.java index 0ec1c1d352..f428ed4fbb 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/JustInSequenceMapper.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/JustInSequenceMapper.java @@ -28,10 +28,10 @@ import org.eclipse.tractusx.traceability.assets.domain.base.model.aspect.DetailAspectType; import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IrsSubmodel; import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.semanticdatamodel.LocalIdKey; -import org.eclipse.tractusx.traceability.generated.JustInSequencePart100Schema; -import org.eclipse.tractusx.traceability.generated.UrnBammIoCatenaxJustInSequencePart100KeyValueList; -import org.eclipse.tractusx.traceability.generated.UrnBammIoCatenaxJustInSequencePart100ManufacturingCharacteristic; -import org.eclipse.tractusx.traceability.generated.UrnBammIoCatenaxJustInSequencePart100PartTypeInformationCharacteristic; +import org.eclipse.tractusx.traceability.generated.JustInSequencePart300Schema; +import org.eclipse.tractusx.traceability.generated.UrnSammIoCatenaxJustInSequencePart300KeyValueList; +import org.eclipse.tractusx.traceability.generated.UrnSammIoCatenaxJustInSequencePart300ManufacturingCharacteristic; +import org.eclipse.tractusx.traceability.generated.UrnSammIoCatenaxJustInSequencePart300PartTypeInformationCharacteristic; import org.springframework.stereotype.Component; import java.time.OffsetDateTime; @@ -45,10 +45,10 @@ public class JustInSequenceMapper implements SubmodelMapper { @Override public AssetBase extractSubmodel(IrsSubmodel irsSubmodel) { - JustInSequencePart100Schema justInSequencePart = (JustInSequencePart100Schema) irsSubmodel.getPayload(); + JustInSequencePart300Schema justInSequencePart = (JustInSequencePart300Schema) irsSubmodel.getPayload(); String justInSequenceId = getValue(justInSequencePart.getLocalIdentifiers(), LocalIdKey.JIS_NUMBER.getValue()); - String manufacturerName = getValue(justInSequencePart.getLocalIdentifiers(), LocalIdKey.MANUFACTURER_ID.getValue()); + String manufacturerId = getValue(justInSequencePart.getLocalIdentifiers(), LocalIdKey.MANUFACTURER_ID.getValue()); String van = getValue(justInSequencePart.getLocalIdentifiers(), LocalIdKey.VAN.getValue()); DetailAspectModel detailAspectModel = extractDetailAspectModelsAsBuilt(justInSequencePart.getManufacturingInformation(), justInSequencePart.getPartTypeInformation()); @@ -56,11 +56,11 @@ public AssetBase extractSubmodel(IrsSubmodel irsSubmodel) { .id(justInSequencePart.getCatenaXId()) .semanticModelId(justInSequenceId) .detailAspectModels(List.of(detailAspectModel)) - .manufacturerId(manufacturerName) - .manufacturerName(manufacturerName) + .manufacturerId(manufacturerId) .nameAtManufacturer(justInSequencePart.getPartTypeInformation().getNameAtManufacturer()) .manufacturerPartId(justInSequencePart.getPartTypeInformation().getManufacturerPartId()) - .classification(justInSequencePart.getPartTypeInformation().getClassification().value()) + // TODO extend data model to include all classification attributes + .classification(null) .qualityType(QualityType.OK) .semanticDataModel(JUSTINSEQUENCE) .van(van) @@ -71,11 +71,11 @@ public AssetBase extractSubmodel(IrsSubmodel irsSubmodel) { @Override public boolean validMapper(IrsSubmodel submodel) { - return submodel.getPayload() instanceof JustInSequencePart100Schema; + return submodel.getPayload() instanceof JustInSequencePart300Schema; } - private static DetailAspectModel extractDetailAspectModelsAsBuilt(UrnBammIoCatenaxJustInSequencePart100ManufacturingCharacteristic manufacturingInformation, - UrnBammIoCatenaxJustInSequencePart100PartTypeInformationCharacteristic partTypeInformation) { + private static DetailAspectModel extractDetailAspectModelsAsBuilt(UrnSammIoCatenaxJustInSequencePart300ManufacturingCharacteristic manufacturingInformation, + UrnSammIoCatenaxJustInSequencePart300PartTypeInformationCharacteristic partTypeInformation) { OffsetDateTime offsetDateTime = MapperHelper.getOffsetDateTime(manufacturingInformation.getDate()); @@ -89,8 +89,8 @@ private static DetailAspectModel extractDetailAspectModelsAsBuilt(UrnBammIoCaten return DetailAspectModel.builder().data(detailAspectDataAsBuilt).type(DetailAspectType.AS_BUILT).build(); } - private String getValue(Set localIdentifiers, String key) { - UrnBammIoCatenaxJustInSequencePart100KeyValueList object = localIdentifiers.stream() + private String getValue(Set localIdentifiers, String key) { + UrnSammIoCatenaxJustInSequencePart300KeyValueList object = localIdentifiers.stream() .filter(localId -> localId.getKey().equalsIgnoreCase(key)) .findFirst() .orElseGet(() -> null); diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/MapperHelper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/MapperHelper.java index 121c4c0c75..a3ff7996ac 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/MapperHelper.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/MapperHelper.java @@ -4,18 +4,30 @@ import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase; +import org.eclipse.tractusx.traceability.assets.domain.base.model.Descriptions; import org.eclipse.tractusx.traceability.assets.domain.base.model.Owner; import org.eclipse.tractusx.traceability.assets.domain.base.model.aspect.DetailAspectModel; import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.Direction; import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IRSResponse; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IrsSubmodel; import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.Shell; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.factory.AssetBaseMapperProvider; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.asbuilt.AsBuiltDetailMapper; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.asplanned.AsPlannedDetailMapper; +import org.jetbrains.annotations.NotNull; import java.time.LocalDateTime; import java.time.OffsetDateTime; import java.time.ZoneOffset; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static org.apache.commons.collections4.ListUtils.emptyIfNull; @UtilityClass @Slf4j @@ -71,16 +83,46 @@ public static void enrichAssetBase(List detailAspectModels, A .ifPresent(detailAspectModel -> assetBase.setDetailAspectModels(List.of(detailAspectModel))); } - public static void enrichManufacturingInformation(IRSResponse irsResponse, Map bpnMap, AssetBase assetBase) { - if (assetBase.getManufacturerId() == null && assetBase.getId().equals(irsResponse.jobStatus().globalAssetId())) { - String bpn = irsResponse.jobStatus().parameter().bpn(); - assetBase.setManufacturerId(bpn); - assetBase.setManufacturerName(bpnMap.get(bpn)); - } else { - String bpnName = bpnMap.get(assetBase.getManufacturerId()); - if (bpnName != null) { - assetBase.setManufacturerName(bpnName); + public static void enrichUpwardAndDownwardDescriptions(Map> descriptionsMap, AssetBase assetBase) { + List upwardDescriptions = new ArrayList<>(); + List downwardDescriptions = new ArrayList<>(); + + List descriptions = descriptionsMap.get(assetBase.getId()); + for (Descriptions description : emptyIfNull(descriptions)) { + if (description.direction() == org.eclipse.tractusx.irs.component.enums.Direction.UPWARD) { + upwardDescriptions.add(description); + } else if (description.direction() == org.eclipse.tractusx.irs.component.enums.Direction.DOWNWARD) { + downwardDescriptions.add(description); } } + + assetBase.setChildRelations(downwardDescriptions); + assetBase.setParentRelations(upwardDescriptions); + } + + + @NotNull + public List extractTractionBatteryCode(List irsSubmodels, String globalAssetId, AssetBaseMapperProvider assetBaseMapperProvider) { + return irsSubmodels + .stream() + .flatMap(irsSubmodel -> { + Optional mapper = assetBaseMapperProvider.getAsBuiltDetailMapper(irsSubmodel); + return mapper.map(asBuiltDetailMapper -> asBuiltDetailMapper.extractDetailAspectModel(irsSubmodel, globalAssetId).stream()).orElseGet(Stream::empty); + }) + .filter(Objects::nonNull) + .toList(); } + + @NotNull + public List extractPartSiteInformationAsPlanned(List irsSubmodels, AssetBaseMapperProvider assetBaseMapperProvider) { + return irsSubmodels + .stream() + .flatMap(irsSubmodel -> { + Optional mapper = assetBaseMapperProvider.getAsPlannedDetailMapper(irsSubmodel); + return mapper.map(asPlannedDetailMapper -> asPlannedDetailMapper.extractDetailAspectModel(irsSubmodel).stream()).orElseGet(Stream::empty); + }) + .filter(Objects::nonNull) + .toList(); + } + } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/PartAsPlannedMapper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/PartAsPlannedMapper.java index a5834c7ff5..63c361d880 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/PartAsPlannedMapper.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/PartAsPlannedMapper.java @@ -23,7 +23,7 @@ import org.eclipse.tractusx.traceability.assets.domain.base.model.ImportState; import org.eclipse.tractusx.traceability.assets.domain.base.model.QualityType; import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IrsSubmodel; -import org.eclipse.tractusx.traceability.generated.PartAsPlanned101Schema; +import org.eclipse.tractusx.traceability.generated.PartAsPlanned200Schema; import org.springframework.stereotype.Component; import static org.eclipse.tractusx.traceability.assets.domain.base.model.SemanticDataModel.PARTASPLANNED; @@ -33,7 +33,7 @@ public class PartAsPlannedMapper implements SubmodelMapper { @Override public AssetBase extractSubmodel(IrsSubmodel irsSubmodel) { - PartAsPlanned101Schema partAsPlanned = (PartAsPlanned101Schema) irsSubmodel.getPayload(); + PartAsPlanned200Schema partAsPlanned = (PartAsPlanned200Schema) irsSubmodel.getPayload(); return AssetBase .builder() @@ -50,6 +50,6 @@ public AssetBase extractSubmodel(IrsSubmodel irsSubmodel) { @Override public boolean validMapper(IrsSubmodel submodel) { - return submodel.getPayload() instanceof PartAsPlanned101Schema; + return submodel.getPayload() instanceof PartAsPlanned200Schema; } } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/SerialPartMapper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/SerialPartMapper.java index 6a65a084ca..277aadd93c 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/SerialPartMapper.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/SerialPartMapper.java @@ -28,10 +28,10 @@ import org.eclipse.tractusx.traceability.assets.domain.base.model.aspect.DetailAspectType; import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IrsSubmodel; import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.semanticdatamodel.LocalIdKey; -import org.eclipse.tractusx.traceability.generated.SerialPart101Schema; -import org.eclipse.tractusx.traceability.generated.UrnSammIoCatenaxSerialPart101KeyValueList; -import org.eclipse.tractusx.traceability.generated.UrnSammIoCatenaxSerialPart101ManufacturingCharacteristic; -import org.eclipse.tractusx.traceability.generated.UrnSammIoCatenaxSerialPart101PartTypeInformationCharacteristic; +import org.eclipse.tractusx.traceability.generated.SerialPart300Schema; +import org.eclipse.tractusx.traceability.generated.UrnSammIoCatenaxSerialPart300KeyValueList; +import org.eclipse.tractusx.traceability.generated.UrnSammIoCatenaxSerialPart300ManufacturingCharacteristic; +import org.eclipse.tractusx.traceability.generated.UrnSammIoCatenaxSerialPart300PartTypeInformationCharacteristic; import org.springframework.stereotype.Component; import java.time.OffsetDateTime; @@ -45,10 +45,10 @@ public class SerialPartMapper implements SubmodelMapper { @Override public AssetBase extractSubmodel(IrsSubmodel irsSubmodel) { - SerialPart101Schema serialPart = (SerialPart101Schema) irsSubmodel.getPayload(); + SerialPart300Schema serialPart = (SerialPart300Schema) irsSubmodel.getPayload(); String serialPartId = getValue(serialPart.getLocalIdentifiers(), LocalIdKey.PART_INSTANCE_ID.getValue()); - String manufacturerName = getValue(serialPart.getLocalIdentifiers(), LocalIdKey.MANUFACTURER_ID.getValue()); + String manufacturerId = getValue(serialPart.getLocalIdentifiers(), LocalIdKey.MANUFACTURER_ID.getValue()); String van = getValue(serialPart.getLocalIdentifiers(), LocalIdKey.VAN.getValue()); DetailAspectModel detailAspectModel = extractDetailAspectModelsAsBuilt(serialPart.getManufacturingInformation(), serialPart.getPartTypeInformation()); @@ -56,11 +56,11 @@ public AssetBase extractSubmodel(IrsSubmodel irsSubmodel) { .id(serialPart.getCatenaXId()) .semanticModelId(serialPartId) .detailAspectModels(List.of(detailAspectModel)) - .manufacturerId(manufacturerName) - .manufacturerName(manufacturerName) + .manufacturerId(manufacturerId) .nameAtManufacturer(serialPart.getPartTypeInformation().getNameAtManufacturer()) .manufacturerPartId(serialPart.getPartTypeInformation().getManufacturerPartId()) - .classification(serialPart.getPartTypeInformation().getClassification().value()) + // TODO change model to be able to save something here + .classification(null) .qualityType(QualityType.OK) .semanticDataModel(SERIALPART) .van(van) @@ -72,11 +72,11 @@ public AssetBase extractSubmodel(IrsSubmodel irsSubmodel) { @Override public boolean validMapper(IrsSubmodel submodel) { - return submodel.getPayload() instanceof SerialPart101Schema; + return submodel.getPayload() instanceof SerialPart300Schema; } - private static DetailAspectModel extractDetailAspectModelsAsBuilt(UrnSammIoCatenaxSerialPart101ManufacturingCharacteristic manufacturingInformation, - UrnSammIoCatenaxSerialPart101PartTypeInformationCharacteristic partTypeInformation) { + private static DetailAspectModel extractDetailAspectModelsAsBuilt(UrnSammIoCatenaxSerialPart300ManufacturingCharacteristic manufacturingInformation, + UrnSammIoCatenaxSerialPart300PartTypeInformationCharacteristic partTypeInformation) { OffsetDateTime offsetDateTime = MapperHelper.getOffsetDateTime(manufacturingInformation.getDate()); @@ -90,8 +90,8 @@ private static DetailAspectModel extractDetailAspectModelsAsBuilt(UrnSammIoCaten return DetailAspectModel.builder().data(detailAspectDataAsBuilt).type(DetailAspectType.AS_BUILT).build(); } - private String getValue(Set localIdentifiers, String key) { - UrnSammIoCatenaxSerialPart101KeyValueList object = localIdentifiers.stream() + private String getValue(Set localIdentifiers, String key) { + UrnSammIoCatenaxSerialPart300KeyValueList object = localIdentifiers.stream() .filter(localId -> localId.getKey().equalsIgnoreCase(key)) .findFirst() .orElseGet(() -> null); diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/relationship/SingleLevelBomAsBuiltSubmodelMapper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/relationship/SingleLevelBomAsBuiltSubmodelMapper.java new file mode 100644 index 0000000000..0398f67159 --- /dev/null +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/relationship/SingleLevelBomAsBuiltSubmodelMapper.java @@ -0,0 +1,51 @@ +/******************************************************************************** + * Copyright (c) 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.traceability.assets.infrastructure.base.irs.model.response.mapping.submodel.relationship; + +import org.eclipse.tractusx.irs.component.enums.Direction; +import org.eclipse.tractusx.traceability.assets.domain.base.model.Descriptions; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IrsSubmodel; +import org.eclipse.tractusx.traceability.generated.SingleLevelBomAsBuilt300Schema; +import org.eclipse.tractusx.traceability.generated.UrnSammIoCatenaxSingleLevelBomAsBuilt300ChildData; +import org.springframework.stereotype.Component; + + +@Component +public class SingleLevelBomAsBuiltSubmodelMapper implements SubmodelRelationshipMapper { + + @Override + public Descriptions extractDescription(IrsSubmodel irsSubmodel) { + SingleLevelBomAsBuilt300Schema singleLevelBomAsBuilt = (SingleLevelBomAsBuilt300Schema) irsSubmodel.getPayload(); + String parentCatenaXId = singleLevelBomAsBuilt.getCatenaXId(); + + String childItems = singleLevelBomAsBuilt.getChildItems() + .stream() + .findFirst() + .map(UrnSammIoCatenaxSingleLevelBomAsBuilt300ChildData::getCatenaXId) + .orElse(null); + + return new Descriptions(childItems, null, parentCatenaXId, Direction.DOWNWARD); + } + + @Override + public boolean validMapper(IrsSubmodel irsSubmodel) { + return irsSubmodel.getPayload() instanceof SingleLevelBomAsBuilt300Schema; + } + +} diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/relationship/SingleLevelBomAsPlannedSubmodelMapper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/relationship/SingleLevelBomAsPlannedSubmodelMapper.java new file mode 100644 index 0000000000..fb8b4c6cba --- /dev/null +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/relationship/SingleLevelBomAsPlannedSubmodelMapper.java @@ -0,0 +1,51 @@ +/******************************************************************************** + * Copyright (c) 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.traceability.assets.infrastructure.base.irs.model.response.mapping.submodel.relationship; + +import org.eclipse.tractusx.irs.component.enums.Direction; +import org.eclipse.tractusx.traceability.assets.domain.base.model.Descriptions; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IrsSubmodel; +import org.eclipse.tractusx.traceability.generated.SingleLevelBomAsPlanned300Schema; +import org.eclipse.tractusx.traceability.generated.UrnSammIoCatenaxSingleLevelBomAsPlanned300ChildData; +import org.springframework.stereotype.Component; + + +@Component +public class SingleLevelBomAsPlannedSubmodelMapper implements SubmodelRelationshipMapper { + + @Override + public Descriptions extractDescription(IrsSubmodel irsSubmodel) { + SingleLevelBomAsPlanned300Schema singleLevelBomAsBuilt = (SingleLevelBomAsPlanned300Schema) irsSubmodel.getPayload(); + String parentCatenaXId = singleLevelBomAsBuilt.getCatenaXId(); + + String childItems = singleLevelBomAsBuilt.getChildItems() + .stream() + .findFirst() + .map(UrnSammIoCatenaxSingleLevelBomAsPlanned300ChildData::getCatenaXId) + .orElse(null); + + return new Descriptions(childItems, null, parentCatenaXId, Direction.DOWNWARD); + } + + @Override + public boolean validMapper(IrsSubmodel irsSubmodel) { + return irsSubmodel.getPayload() instanceof SingleLevelBomAsPlanned300Schema; + } + +} diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/relationship/SingleLevelUsageAsBuiltSubmodelMapper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/relationship/SingleLevelUsageAsBuiltSubmodelMapper.java new file mode 100644 index 0000000000..e517081e91 --- /dev/null +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/relationship/SingleLevelUsageAsBuiltSubmodelMapper.java @@ -0,0 +1,52 @@ +/******************************************************************************** + * Copyright (c) 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.traceability.assets.infrastructure.base.irs.model.response.mapping.submodel.relationship; + +import org.eclipse.tractusx.irs.component.enums.Direction; +import org.eclipse.tractusx.traceability.assets.domain.base.model.Descriptions; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IrsSubmodel; +import org.eclipse.tractusx.traceability.generated.SingleLevelBomAsBuilt300Schema; +import org.eclipse.tractusx.traceability.generated.SingleLevelUsageAsBuilt300Schema; +import org.eclipse.tractusx.traceability.generated.UrnSammIoCatenaxSingleLevelUsageAsBuilt300ParentData; +import org.springframework.stereotype.Component; + + +@Component +public class SingleLevelUsageAsBuiltSubmodelMapper implements SubmodelRelationshipMapper { + + @Override + public Descriptions extractDescription(IrsSubmodel irsSubmodel) { + SingleLevelUsageAsBuilt300Schema singleLevelBomAsBuilt = (SingleLevelUsageAsBuilt300Schema) irsSubmodel.getPayload(); + String childCatenaXId = singleLevelBomAsBuilt.getCatenaXId(); + + String parentItems = singleLevelBomAsBuilt.getParentItems() + .stream() + .findFirst() + .map(UrnSammIoCatenaxSingleLevelUsageAsBuilt300ParentData::getCatenaXId) + .orElse(null); + + return new Descriptions(parentItems, null, childCatenaXId, Direction.UPWARD); + } + + @Override + public boolean validMapper(IrsSubmodel irsSubmodel) { + return irsSubmodel.getPayload() instanceof SingleLevelBomAsBuilt300Schema; + } + +} diff --git a/frontend/src/app/modules/shared/components/parts-table/parts-as-planned-customer-configuration.model.ts b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/relationship/SubmodelRelationshipMapper.java similarity index 60% rename from frontend/src/app/modules/shared/components/parts-table/parts-as-planned-customer-configuration.model.ts rename to tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/relationship/SubmodelRelationshipMapper.java index ed8a6efa66..fd4e36ee68 100644 --- a/frontend/src/app/modules/shared/components/parts-table/parts-as-planned-customer-configuration.model.ts +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/relationship/SubmodelRelationshipMapper.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2023 Contributors to the Eclipse Foundation + * Copyright (c) 2024 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. @@ -16,22 +16,15 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { TableFilterConfiguration } from '@shared/components/parts-table/parts-config.model'; +package org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.mapping.submodel.relationship; -export class PartsAsPlannedCustomerConfigurationModel extends TableFilterConfiguration { +import org.eclipse.tractusx.traceability.assets.domain.base.model.Descriptions; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IrsSubmodel; - constructor() { - const sortableColumns = { - select: false, - semanticDataModel: true, - nameAtManufacturer: true, - businessPartner: true, - manufacturerName: true, - manufacturerPartId: true, - semanticModelId: true, - menu: false, - }; - super(sortableColumns); - } -} +public interface SubmodelRelationshipMapper { + + Descriptions extractDescription(IrsSubmodel irsSubmodel); + boolean validMapper(IrsSubmodel irsSubmodel); + +} diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/relationship/Aspect.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/relationship/Aspect.java index 4db6455fb5..e82b37d4a3 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/relationship/Aspect.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/relationship/Aspect.java @@ -25,16 +25,15 @@ import java.util.Objects; public enum Aspect { - BATCH("Batch"), - SERIAL_PART("SerialPart"), - SINGLE_LEVEL_BOM_AS_BUILT("SingleLevelBomAsBuilt"), - SINGLE_LEVEL_USAGE_AS_BUILT("SingleLevelUsageAsBuilt"), - SINGLE_LEVEL_BOM_AS_PLANNED("SingleLevelBomAsPlanned"), - SINGLE_LEVEL_USAGE_AS_PLANNED("SingleLevelUsageAsPlanned"), - PART_SITE_INFORMATION_AS_PLANNED("PartSiteInformationAsPlanned"), - PART_AS_PLANNED("PartAsPlanned"), - JUST_IN_SEQUENCE_PART("JustInSequencePart"), - TRACTION_BATTERY_CODE("TractionBatteryCode"); + BATCH("urn:samm:io.catenax.batch:3.0.0#Batch"), + SERIAL_PART("urn:samm:io.catenax.serial_part:3.0.0#SerialPart"), + SINGLE_LEVEL_BOM_AS_BUILT("urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt"), + SINGLE_LEVEL_USAGE_AS_BUILT("urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt"), + SINGLE_LEVEL_BOM_AS_PLANNED("urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned"), + PART_SITE_INFORMATION_AS_PLANNED("urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned"), + PART_AS_PLANNED("urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned"), + JUST_IN_SEQUENCE_PART("urn:samm:io.catenax.just_in_sequence_part:3.0.0#JustInSequencePart"), + TRACTION_BATTERY_CODE("urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode"); private final String aspectName; @@ -99,8 +98,4 @@ public static boolean isDownwardRelationshipAsBuilt(String aspect){ public static boolean isUpwardRelationshipAsPlanned(String aspect){ return aspect.contains(Aspect.SINGLE_LEVEL_BOM_AS_PLANNED.getAspectName()); } - - public static boolean isDownwardRelationshipAsPlanned(String aspect){ - return aspect.contains(Aspect.SINGLE_LEVEL_USAGE_AS_PLANNED.getAspectName()); - } } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/application/rest/BpnMappingController.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/application/rest/BpnMappingController.java index 9b92f8e121..abbcb7253a 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/application/rest/BpnMappingController.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/application/rest/BpnMappingController.java @@ -35,7 +35,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.eclipse.tractusx.traceability.bpn.application.mapper.BpnMapper; -import org.eclipse.tractusx.traceability.bpn.domain.service.BpnServiceImpl; +import org.eclipse.tractusx.traceability.bpn.domain.service.BpnService; import org.springframework.http.HttpStatus; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -60,7 +60,7 @@ @RequiredArgsConstructor public class BpnMappingController { - private final BpnServiceImpl service; + private final BpnService service; @Operation(operationId = "getBpnEdcs", summary = "Get BPN EDC URL mappings", diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/domain/model/BpnEdcMapping.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/domain/model/BpnEdcMapping.java index 5d5805bd49..42626f0ec4 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/domain/model/BpnEdcMapping.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/domain/model/BpnEdcMapping.java @@ -15,18 +15,10 @@ * under the License. * * SPDX-License-Identifier: Apache-2.0 - ********************************************************************************/ + *********************************************************************************/ package org.eclipse.tractusx.traceability.bpn.domain.model; -public record BpnEdcMapping(String bpn, String url) { - - public String getBpn() { - return bpn; - } - - public String getUrl() { - return url; - } +public record BpnEdcMapping(String bpn, String url, String manufacturerName) { } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/application/service/BpnService.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/domain/service/BpnService.java similarity index 93% rename from tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/application/service/BpnService.java rename to tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/domain/service/BpnService.java index 04381fc647..dfbb7fb141 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/application/service/BpnService.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/domain/service/BpnService.java @@ -16,15 +16,16 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.traceability.bpn.application.service; +package org.eclipse.tractusx.traceability.bpn.domain.service; import bpn.request.BpnMappingRequest; import org.eclipse.tractusx.traceability.bpn.domain.model.BpnEdcMapping; - import java.util.List; public interface BpnService { + String findByBpn(String bpn); + List findAllBpnMappings(); List saveAllBpnEdcMappings(List bpnEdcMappings); diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/infrastructure/client/BpdmClient.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/infrastructure/client/BpdmClient.java new file mode 100644 index 0000000000..98a3565bcd --- /dev/null +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/infrastructure/client/BpdmClient.java @@ -0,0 +1,63 @@ +/******************************************************************************** + * Copyright (c) 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.traceability.bpn.infrastructure.client; + +import lombok.extern.slf4j.Slf4j; +import org.eclipse.tractusx.traceability.bpn.infrastructure.model.BusinessPartnerResponse; +import org.eclipse.tractusx.traceability.common.properties.BpdmProperties; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Service; +import org.springframework.web.client.HttpClientErrorException; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.util.UriComponentsBuilder; + +import java.util.Map; + +import static org.eclipse.tractusx.traceability.common.config.RestTemplateConfiguration.BPDM_CLIENT_REST_TEMPLATE; + +@Service +@Slf4j +public class BpdmClient { + + private static final String PLACEHOLDER_BPID = "partnerId"; + private static final String PLACEHOLDER_ID_TYPE = "idType"; + private static final String ID_TYPE = "BPN"; + private final @Qualifier(BPDM_CLIENT_REST_TEMPLATE) RestTemplate bpdmRestTemplate; + private final BpdmProperties bpdmProperties; + + public BpdmClient(@Qualifier(BPDM_CLIENT_REST_TEMPLATE) RestTemplate bpdmRestTemplate, BpdmProperties bpdmProperties) { + this.bpdmRestTemplate = bpdmRestTemplate; + this.bpdmProperties = bpdmProperties; + } + + public BusinessPartnerResponse getBusinessPartner(final String bpn) { + final UriComponentsBuilder uriBuilder = UriComponentsBuilder.fromUriString(bpdmProperties.getBpnEndpoint()); + final Map values = Map.of(PLACEHOLDER_BPID, bpn, PLACEHOLDER_ID_TYPE, ID_TYPE); + + try { + return bpdmRestTemplate.getForObject(uriBuilder.build(values), BusinessPartnerResponse.class); + } catch (HttpClientErrorException httpClientErrorException) { + log.warn("Could not request BPDM service.", httpClientErrorException); + return BusinessPartnerResponse.builder().bpn(bpn).build(); + } + + } + + +} diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/model/PartSiteInformationAsPlannedRequest.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/infrastructure/model/BusinessPartnerResponse.java similarity index 68% rename from tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/model/PartSiteInformationAsPlannedRequest.java rename to tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/infrastructure/model/BusinessPartnerResponse.java index 7ea2621a5d..894b43ff89 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/model/PartSiteInformationAsPlannedRequest.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/infrastructure/model/BusinessPartnerResponse.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2023 Contributors to the Eclipse Foundation + * Copyright (c) 2024 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. @@ -16,17 +16,23 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.traceability.assets.domain.importpoc.model; +package org.eclipse.tractusx.traceability.bpn.infrastructure.model; + +import lombok.Builder; +import lombok.Value; +import lombok.extern.jackson.Jacksonized; import java.util.List; -public record PartSiteInformationAsPlannedRequest(String catenaXId, List sites) { +/** + * Bpn Response + */ +@Value +@Builder +@Jacksonized +public class BusinessPartnerResponse { + + private String bpn; + private List names; - public record Site( - String functionValidUntil, - String function, - String functionValidFrom, - String catenaXSiteId - ) { - } } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/infrastructure/model/NameResponse.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/infrastructure/model/NameResponse.java new file mode 100644 index 0000000000..25f324c1af --- /dev/null +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/infrastructure/model/NameResponse.java @@ -0,0 +1,34 @@ +/******************************************************************************** + * Copyright (c) 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.traceability.bpn.infrastructure.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +/** + * Name response + */ +@Getter +@AllArgsConstructor(staticName = "of") +@NoArgsConstructor +public class NameResponse { + private String value; + +} diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/domain/service/BpnRepository.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/infrastructure/repository/BpnRepository.java similarity index 80% rename from tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/domain/service/BpnRepository.java rename to tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/infrastructure/repository/BpnRepository.java index 1e9fb10008..7a4767ae3b 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/domain/service/BpnRepository.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/infrastructure/repository/BpnRepository.java @@ -17,15 +17,16 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.traceability.bpn.domain.service; +package org.eclipse.tractusx.traceability.bpn.infrastructure.repository; import bpn.request.BpnMappingRequest; import org.eclipse.tractusx.traceability.bpn.domain.model.BpnEdcMapping; +import org.eclipse.tractusx.traceability.bpn.infrastructure.model.BpnEntity; +import org.eclipse.tractusx.traceability.bpn.infrastructure.model.BusinessPartnerResponse; import java.util.List; import java.util.Map; -import java.util.Optional; public interface BpnRepository { @@ -43,4 +44,8 @@ public interface BpnRepository { void updateManufacturers(Map bpns); + BpnEntity save(BusinessPartnerResponse businessPartner); + + List findAllByIdIn(List bpns); + } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/infrastructure/repository/BpnRepositoryImpl.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/infrastructure/repository/BpnRepositoryImpl.java index d829741bca..a2744c7b1d 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/infrastructure/repository/BpnRepositoryImpl.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/infrastructure/repository/BpnRepositoryImpl.java @@ -22,16 +22,16 @@ import bpn.request.BpnMappingRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.eclipse.tractusx.traceability.bpn.domain.model.BpnEdcMapping; import org.eclipse.tractusx.traceability.bpn.domain.model.BpnNotFoundException; -import org.eclipse.tractusx.traceability.bpn.domain.service.BpnRepository; import org.eclipse.tractusx.traceability.bpn.infrastructure.model.BpnEntity; - +import org.eclipse.tractusx.traceability.bpn.infrastructure.model.BusinessPartnerResponse; +import org.eclipse.tractusx.traceability.bpn.infrastructure.model.NameResponse; import org.springframework.stereotype.Component; import java.util.List; import java.util.Map; -import java.util.Optional; @Slf4j @Component @@ -89,6 +89,20 @@ public void updateManufacturers(Map bpns) { } } + @Override + public BpnEntity save(BusinessPartnerResponse businessPartner) { + String value = businessPartner.getNames() == null ? null : businessPartner.getNames().stream() + .filter(it -> StringUtils.isNotBlank(it.getValue())) + .findFirst().map(NameResponse::getValue).orElse(null); + BpnEntity entity = BpnEntity.builder().manufacturerId(businessPartner.getBpn()).manufacturerName(value).build(); + return repository.save(entity); + } + + @Override + public List findAllByIdIn(List bpns) { + return this.toDTOList(repository.findAllById(bpns)); + } + @Override public List saveAll(List bpnEdcMappings) { List bpnEdcMappingEntities = bpnEdcMappings.stream().map(this::toEntity).toList(); @@ -98,10 +112,15 @@ public List saveAll(List bpnEdcMappings) { private BpnEdcMapping toDTO(BpnEntity entity) { return new BpnEdcMapping( entity.getManufacturerId(), - entity.getUrl() + entity.getUrl(), + entity.getManufacturerName() ); } + private List toDTOList(List bpnEntities) { + return bpnEntities.stream().map(this::toDTO).toList(); + } + private BpnEntity toEntity(BpnMappingRequest bpnEdcMappings) { return BpnEntity.builder() .manufacturerId(bpnEdcMappings.bpn()) diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/domain/service/BpnServiceImpl.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/infrastructure/repository/BpnServiceImpl.java similarity index 71% rename from tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/domain/service/BpnServiceImpl.java rename to tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/infrastructure/repository/BpnServiceImpl.java index 760824c324..bec8a4699b 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/domain/service/BpnServiceImpl.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/bpn/infrastructure/repository/BpnServiceImpl.java @@ -17,25 +17,38 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.traceability.bpn.domain.service; +package org.eclipse.tractusx.traceability.bpn.infrastructure.repository; import bpn.request.BpnMappingRequest; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.eclipse.tractusx.traceability.bpn.application.service.BpnService; import org.eclipse.tractusx.traceability.bpn.domain.model.BpnEdcMapping; import org.eclipse.tractusx.traceability.bpn.domain.model.BpnNotFoundException; +import org.eclipse.tractusx.traceability.bpn.domain.service.BpnService; +import org.eclipse.tractusx.traceability.bpn.infrastructure.client.BpdmClient; +import org.eclipse.tractusx.traceability.bpn.infrastructure.model.BpnEntity; +import org.eclipse.tractusx.traceability.bpn.infrastructure.model.BusinessPartnerResponse; import org.springframework.stereotype.Component; import java.util.List; @Slf4j @Component +@RequiredArgsConstructor public class BpnServiceImpl implements BpnService { private final BpnRepository bpnRepository; + private final BpdmClient bpdmClient; - public BpnServiceImpl(BpnRepository bpnRepository) { - this.bpnRepository = bpnRepository; + @Override + public String findByBpn(String bpn) { + String manufacturerName = bpnRepository.findManufacturerName(bpn); + if (manufacturerName == null && bpn != null) { + BusinessPartnerResponse businessPartner = bpdmClient.getBusinessPartner(bpn); + BpnEntity bpnEntity = bpnRepository.save(businessPartner); + manufacturerName = bpnEntity.getManufacturerName(); + } + return manufacturerName; } @Override diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/ErrorHandlingConfig.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/ErrorHandlingConfig.java index ed7ad91594..0af6bc3c41 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/ErrorHandlingConfig.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/ErrorHandlingConfig.java @@ -44,6 +44,7 @@ import org.eclipse.tractusx.traceability.discovery.infrastructure.exception.DiscoveryFinderException; import org.eclipse.tractusx.traceability.notification.application.contract.model.CreateNotificationContractException; import org.eclipse.tractusx.traceability.notification.application.notification.validation.UpdateNotificationValidationException; +import org.eclipse.tractusx.traceability.notification.domain.notification.exception.NotificationSenderAndReceiverBPNEqualException; import org.eclipse.tractusx.traceability.notification.domain.notification.exception.NotificationNotFoundException; import org.eclipse.tractusx.traceability.notification.domain.notification.exception.NotificationIllegalUpdate; import org.eclipse.tractusx.traceability.notification.domain.base.exception.SendNotificationException; @@ -180,6 +181,13 @@ ResponseEntity handleInvestigationReceiverBpnMismatchException(In .body(new ErrorResponse(exception.getMessage())); } + @ExceptionHandler(NotificationSenderAndReceiverBPNEqualException.class) + ResponseEntity handleNotificationSenderAndReceiverBPNEqualException(NotificationSenderAndReceiverBPNEqualException exception) { + log.warn("handleNotificationSenderAndReceiverBPNEqualException", exception); + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .body(new ErrorResponse(exception.getMessage())); + } + @ExceptionHandler(SendNotificationException.class) ResponseEntity handleSendNotificationException(SendNotificationException exception) { log.warn("handleSendNotificationException", exception); diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/PolicyStartUpConfig.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/PolicyStartUpConfig.java index 7e8471a767..c9947bdadf 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/PolicyStartUpConfig.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/PolicyStartUpConfig.java @@ -109,7 +109,7 @@ private List createOwnAcceptedPolicies(OffsetDateTime offsetDate List andConstraintList = new ArrayList<>(); List orConstraintList = new ArrayList<>(); andConstraintList.add(new Constraint(traceabilityProperties.getLeftOperand(), new Operator(OperatorType.fromValue(traceabilityProperties.getOperatorType())), traceabilityProperties.getRightOperand())); - andConstraintList.add(new Constraint(traceabilityProperties.getLeftOperand(), new Operator(OperatorType.fromValue(traceabilityProperties.getOperatorType())), traceabilityProperties.getRightOperand())); + andConstraintList.add(new Constraint(traceabilityProperties.getLeftOperandSecond(), new Operator(OperatorType.fromValue(traceabilityProperties.getOperatorTypeSecond())), traceabilityProperties.getRightOperandSecond())); List permissions = List.of( new Permission( diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/RestTemplateConfiguration.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/RestTemplateConfiguration.java index c154069a01..151bf1f6ec 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/RestTemplateConfiguration.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/RestTemplateConfiguration.java @@ -26,6 +26,7 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.eclipse.tractusx.traceability.common.properties.BpdmProperties; import org.eclipse.tractusx.traceability.common.properties.EdcProperties; import org.eclipse.tractusx.traceability.common.properties.FeignDefaultProperties; import org.eclipse.tractusx.traceability.common.properties.TraceabilityProperties; @@ -63,6 +64,7 @@ public class RestTemplateConfiguration { public static final String SUBMODEL_REST_TEMPLATE = "submodelRestTemplate"; public static final String DIGITAL_TWIN_REGISTRY_REST_TEMPLATE = "digitalTwinRegistryRestTemplate"; public static final String EDC_CLIENT_REST_TEMPLATE= "edcClientRestTemplate"; + public static final String BPDM_CLIENT_REST_TEMPLATE = "bpdmClientRestTemplate"; private static final String EDC_API_KEY_HEADER_NAME = "X-Api-Key"; private static final String IRS_API_KEY_HEADER_NAME = "X-API-KEY"; @@ -71,6 +73,18 @@ public class RestTemplateConfiguration { private final ClientRegistrationRepository clientRegistrationRepository; + /* RestTemplate used by trace x for the resolution of manufacturer names by BPN.*/ + @Bean(BPDM_CLIENT_REST_TEMPLATE) + public RestTemplate bpdmClientRestTemplate(@Autowired BpdmProperties bpdmProperties) { + final var clientRegistration = clientRegistrationRepository.findByRegistrationId(bpdmProperties.getOAuthClientId()); + + return new RestTemplateBuilder().additionalInterceptors( + new OAuthClientCredentialsRestTemplateInterceptor(authorizedClientManager(), clientRegistration)) + .setConnectTimeout(Duration.parse(bpdmProperties.getConnectTimeout())) + .setReadTimeout(Duration.parse(bpdmProperties.getReadTimeout())) + .build(); + } + /* RestTemplate used by trace x for the edc contracts used within the edc provider.*/ @Bean(EDC_REST_TEMPLATE) public RestTemplate edcRestTemplate(@Autowired EdcProperties edcProperties) { diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/mapper/NotificationMapper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/mapper/NotificationMapper.java index 381417b75c..ca5038b949 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/mapper/NotificationMapper.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/mapper/NotificationMapper.java @@ -34,6 +34,8 @@ import java.util.ArrayList; import java.util.List; +import static org.apache.commons.collections4.ListUtils.emptyIfNull; + @RequiredArgsConstructor @Component public class NotificationMapper { @@ -49,7 +51,7 @@ public class NotificationMapper { public Notification toNotification(BPN bpn, String description, NotificationMessage notification, NotificationType notificationType) { List assetIds = new ArrayList<>(); - notification.getAffectedParts().stream() + emptyIfNull(notification.getAffectedParts()).stream() .map(NotificationAffectedPart::assetId) .forEach(assetIds::add); return Notification.builder() @@ -59,7 +61,7 @@ public Notification toNotification(BPN bpn, String description, NotificationMess .notificationType(notificationType) .description(description) .createdAt(Instant.now()) - .assetIds(assetIds) + .affectedPartIds(assetIds) .notifications(List.of(notification)) .build(); } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/mapper/NotificationMessageMapper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/mapper/NotificationMessageMapper.java index abda31df0b..eed36af80d 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/mapper/NotificationMessageMapper.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/mapper/NotificationMessageMapper.java @@ -21,7 +21,7 @@ package org.eclipse.tractusx.traceability.common.mapper; import lombok.RequiredArgsConstructor; -import org.eclipse.tractusx.traceability.bpn.domain.service.BpnRepository; +import org.eclipse.tractusx.traceability.bpn.infrastructure.repository.BpnRepository; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationMessage; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSeverity; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationType; @@ -31,6 +31,8 @@ import java.time.LocalDateTime; import java.util.UUID; +import static org.apache.commons.collections4.ListUtils.emptyIfNull; + @Component @RequiredArgsConstructor public class NotificationMessageMapper { @@ -56,7 +58,7 @@ public NotificationMessage toNotification(EDCNotification edcNotification, Notif .sendToName(getManufacturerName(edcNotification.getRecipientBPN())) .description(edcNotification.getInformation()) .notificationStatus(edcNotification.convertNotificationStatus()) - .affectedParts(edcNotification.getListOfAffectedItems()) + .affectedParts(emptyIfNull(edcNotification.getListOfAffectedItems())) .targetDate(edcNotification.getTargetDate()) .severity(NotificationSeverity.fromString(edcNotification.getSeverity())) .edcNotificationId(edcNotification.getNotificationId()) diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/model/SearchCriteriaStrategy.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/model/SearchCriteriaStrategy.java index daab1ac888..54c165f414 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/model/SearchCriteriaStrategy.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/model/SearchCriteriaStrategy.java @@ -25,5 +25,6 @@ public enum SearchCriteriaStrategy { AT_LOCAL_DATE, AFTER_LOCAL_DATE, BEFORE_LOCAL_DATE, - NOTIFICATION_COUNT_EQUAL + NOTIFICATION_COUNT_EQUAL, + EXCLUDE } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/model/SecurityUtils.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/model/SecurityUtils.java index 81a166d246..c48bcc80fe 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/model/SecurityUtils.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/model/SecurityUtils.java @@ -22,8 +22,9 @@ import lombok.experimental.UtilityClass; import notification.request.CloseNotificationRequest; +import notification.request.EditNotificationRequest; import notification.request.StartNotificationRequest; -import notification.request.UpdateNotificationRequest; +import notification.request.UpdateNotificationStatusTransitionRequest; import org.eclipse.tractusx.traceability.notification.infrastructure.edc.model.EDCNotification; import org.eclipse.tractusx.traceability.notification.infrastructure.edc.model.EDCNotificationContent; import org.eclipse.tractusx.traceability.notification.infrastructure.edc.model.EDCNotificationHeader; @@ -58,28 +59,40 @@ public static List sanitize(List unSanitizedList) { public static StartNotificationRequest sanitize(StartNotificationRequest request) { String cleanDescription = sanitize(request.getDescription()); String cleanReceiverBpn = sanitize(request.getReceiverBpn()); - List cleanPartIds = sanitize(request.getPartIds()); + List cleanPartIds = sanitize(emptyIfNull(request.getAffectedPartIds())); return StartNotificationRequest.builder() .title(request.getTitle()) .description(cleanDescription) .targetDate(request.getTargetDate()) .severity(request.getSeverity()) - .isAsBuilt(request.isAsBuilt()) .receiverBpn(cleanReceiverBpn) .type(request.getType()) - .partIds(cleanPartIds) + .affectedPartIds(cleanPartIds) .build(); } + public static EditNotificationRequest sanitize(EditNotificationRequest request) { + String cleanDescription = sanitize(request.getDescription()); + String cleanReceiverBpn = sanitize(request.getReceiverBpn()); + List cleanPartIds = sanitize(emptyIfNull(request.getAffectedPartIds())); + return EditNotificationRequest.builder() + .title(request.getTitle()) + .description(cleanDescription) + .targetDate(request.getTargetDate()) + .severity(request.getSeverity()) + .receiverBpn(cleanReceiverBpn) + .affectedPartIds(cleanPartIds) + .build(); + } public static CloseNotificationRequest sanitize(CloseNotificationRequest closeInvestigationRequest) { String cleanReason = sanitize(closeInvestigationRequest.getReason()); return CloseNotificationRequest.builder().reason(cleanReason).build(); } - public static UpdateNotificationRequest sanitize(UpdateNotificationRequest updateInvestigationRequest) { + public static UpdateNotificationStatusTransitionRequest sanitize(UpdateNotificationStatusTransitionRequest updateInvestigationRequest) { String cleanReason = sanitize(updateInvestigationRequest.getReason()); - return UpdateNotificationRequest.builder().status(updateInvestigationRequest.getStatus()).reason(cleanReason).build(); + return UpdateNotificationStatusTransitionRequest.builder().status(updateInvestigationRequest.getStatus()).reason(cleanReason).build(); } public static EDCNotification sanitize(EDCNotification edcNotification) { diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/model/SingleLevelUsageAsBuiltRequest.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/properties/BpdmProperties.java similarity index 56% rename from tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/model/SingleLevelUsageAsBuiltRequest.java rename to tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/properties/BpdmProperties.java index e5c80e8738..8617939b53 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/model/SingleLevelUsageAsBuiltRequest.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/properties/BpdmProperties.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2023 Contributors to the Eclipse Foundation + * Copyright (c) 2024 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. @@ -16,19 +16,25 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.traceability.assets.domain.importpoc.model; +package org.eclipse.tractusx.traceability.common.properties; -import java.util.List; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; -public record SingleLevelUsageAsBuiltRequest(String catenaXId, List customers) { +@RequiredArgsConstructor +@Getter +@Configuration +public class BpdmProperties { - public record Customer(List parentItems, String businessPartner, String createdOn, String lastModifiedOn) { - } - - public record ParentItem(Quantity quantity, String catenaXId, String createdOn, String lastModifiedOn) { - } - - public record Quantity(int quantityNumber, String measurementUnit) { - } + @Value("${bpdm.bpnEndpoint}") + private String bpnEndpoint; + @Value("${bpdm.oAuthClientId}") + private String oAuthClientId; + @Value("${bpdm.timeout.read}") + private String readTimeout; + @Value("${bpdm.timeout.connect}") + private String connectTimeout; } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/properties/TraceabilityProperties.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/properties/TraceabilityProperties.java index 06160d5607..12578326c6 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/properties/TraceabilityProperties.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/properties/TraceabilityProperties.java @@ -42,6 +42,9 @@ public class TraceabilityProperties { private String leftOperand; private String operatorType; private String rightOperand; + private String leftOperandSecond; + private String operatorTypeSecond; + private String rightOperandSecond; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime validUntil; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/repository/BaseSpecification.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/repository/BaseSpecification.java index a2de57a0d4..c95f1144a3 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/repository/BaseSpecification.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/repository/BaseSpecification.java @@ -42,6 +42,7 @@ import static java.util.stream.Collectors.groupingBy; import static org.eclipse.tractusx.traceability.common.model.SearchCriteriaStrategy.AFTER_LOCAL_DATE; import static org.eclipse.tractusx.traceability.common.model.SearchCriteriaStrategy.BEFORE_LOCAL_DATE; +import static org.eclipse.tractusx.traceability.common.model.SearchCriteriaStrategy.EXCLUDE; import static org.eclipse.tractusx.traceability.common.model.SearchCriteriaStrategy.NOTIFICATION_COUNT_EQUAL; @Getter @@ -58,6 +59,12 @@ protected Predicate createPredicate(SearchCriteriaFilter criteria, Root root, String fieldName = getJoinTableFieldName(criteria.getKey()); Path fieldPath = getFieldPath(root, criteria); + if (SearchCriteriaStrategy.EXCLUDE.equals(criteria.getStrategy())) { + return builder.notEqual( + fieldPath.as(String.class), + expectedFieldValue); + } + if (SearchCriteriaStrategy.EQUAL.equals(criteria.getStrategy()) || NOTIFICATION_COUNT_EQUAL.equals(criteria.getStrategy())) { return builder.equal( fieldPath.as(String.class), @@ -167,6 +174,10 @@ private static Map.Entry> combineFieldSpe result = combineSpecificationsWith( specifications.stream().map(baseSpec -> (Specification) baseSpec).toList(), SearchCriteriaOperator.AND); + } else if (hasExcludePredicate(specifications)) { + result = combineSpecificationsWith( + specifications.stream().map(baseSpec -> (Specification) baseSpec).toList(), + SearchCriteriaOperator.AND); } else { result = combineSpecificationsWith( specifications.stream().map(baseSpec -> (Specification) baseSpec).toList(), @@ -209,6 +220,10 @@ private static boolean hasBeforePredicate(List> specifi return !specifications.stream().filter(spec -> BEFORE_LOCAL_DATE.equals(spec.getSearchCriteriaFilter().getStrategy())).toList().isEmpty(); } + private static boolean hasExcludePredicate(List> specifications) { + return !specifications.stream().filter(spec -> EXCLUDE.equals(spec.getSearchCriteriaFilter().getStrategy())).toList().isEmpty(); + } + private static boolean isBeforePredicate(BaseSpecification specification) { return BEFORE_LOCAL_DATE.equals(specification.getSearchCriteriaFilter().getStrategy()); } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/repository/CriteriaUtility.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/repository/CriteriaUtility.java index 29f2e5196d..b0cd2e5795 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/repository/CriteriaUtility.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/repository/CriteriaUtility.java @@ -28,6 +28,7 @@ import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; import lombok.experimental.UtilityClass; +import org.apache.commons.collections.CollectionUtils; import org.eclipse.tractusx.traceability.assets.domain.base.model.Owner; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSide; @@ -44,6 +45,7 @@ public List getDistinctAssetFieldValues( String startWith, Integer resultLimit, Owner owner, + List inAssetIds, Class assetEntityClass, EntityManager entityManager) { CriteriaBuilder builder = entityManager.getCriteriaBuilder(); @@ -68,6 +70,11 @@ public List getDistinctAssetFieldValues( if (nonNull(owner)) { predicates.add(builder.equal(root.get("owner").as(String.class), owner.name())); } + + if (!CollectionUtils.isEmpty(inAssetIds)) { + predicates.add(root.get("id").as(String.class).in(inAssetIds)); + } + cq.where(predicates.toArray(new Predicate[0])); return entityManager.createQuery(cq) .setMaxResults(resultLimit) diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/infrastructure/repository/ContractRepositoryImpl.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/infrastructure/repository/ContractRepositoryImpl.java index 22b9ba0102..bcec335d6e 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/infrastructure/repository/ContractRepositoryImpl.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/infrastructure/repository/ContractRepositoryImpl.java @@ -70,7 +70,8 @@ public PageResult getContractsByPageable(Pageable pageable, SearchCrit Page contractAgreementInfoViews = contractAgreementInfoViewRepository.findAll(specification, pageable); if (contractAgreementInfoViews.getContent().isEmpty()) { - throw new ContractException("Cannot find contract agreement Ids for asset ids in searchCriteria: " + searchCriteria.getSearchCriteriaFilterList()); + log.warn("Cannot find contract agreement Ids for asset ids in searchCriteria: " + searchCriteria.getSearchCriteriaFilterList()); + return new PageResult<>(List.of(), 0, 0, 0, 0L); } return new PageResult<>(fetchEdcContractAgreements(contractAgreementInfoViews), diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/discovery/domain/service/DiscoveryServiceImpl.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/discovery/domain/service/DiscoveryServiceImpl.java index 7f094a4b63..f29afa13c2 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/discovery/domain/service/DiscoveryServiceImpl.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/discovery/domain/service/DiscoveryServiceImpl.java @@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.eclipse.tractusx.traceability.bpn.domain.service.BpnRepository; +import org.eclipse.tractusx.traceability.bpn.infrastructure.repository.BpnRepository; import org.eclipse.tractusx.traceability.common.properties.EdcProperties; import org.eclipse.tractusx.traceability.discovery.domain.model.Discovery; import org.eclipse.tractusx.traceability.discovery.domain.repository.DiscoveryRepository; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/mapper/NotificationResponseMapper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/mapper/NotificationResponseMapper.java index f7adc8e55b..c69b8a13b9 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/mapper/NotificationResponseMapper.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/mapper/NotificationResponseMapper.java @@ -50,7 +50,7 @@ public static NotificationResponse from(Notification notification) { .createdBy(getSenderBPN(notification.getNotifications())) .createdByName(getSenderName(notification.getNotifications())) .createdDate(notification.getCreatedAt().toString()) - .assetIds(Collections.unmodifiableList(notification.getAssetIds())) + .assetIds(Collections.unmodifiableList(notification.getAffectedPartIds())) .channel(NotificationMessageMapper.from(notification.getNotificationSide())) .type(NotificationMessageMapper.from(notification.getNotificationType())) .title(notification.getTitle()) @@ -61,6 +61,7 @@ public static NotificationResponse from(Notification notification) { )) .sendTo(getReceiverBPN(notification.getNotifications())) .sendToName(getReceiverName(notification.getNotifications())) + // TODO severity should not be inside the notification it should be in the message .severity(NotificationMessageMapper.from(notification.getNotifications().stream().findFirst().map(NotificationMessage::getSeverity).orElse(NotificationSeverity.MINOR))) .targetDate(notification.getNotifications().stream().findFirst().map(NotificationMessage::getTargetDate).map(Instant::toString).orElse(null)) .messages(fromNotifications(notification.getNotifications())) diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/rest/NotificationController.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/rest/NotificationController.java index 1bcc129bc2..33103ffc88 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/rest/NotificationController.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/rest/NotificationController.java @@ -32,15 +32,23 @@ import jakarta.validation.Valid; import jakarta.ws.rs.QueryParam; import lombok.extern.slf4j.Slf4j; +import notification.request.CloseNotificationRequest; +import notification.request.EditNotificationRequest; +import notification.request.NotificationStatusRequest; +import notification.request.StartNotificationRequest; +import notification.request.UpdateNotificationStatusTransitionRequest; +import notification.response.NotificationIdResponse; +import notification.response.NotificationResponse; import org.eclipse.tractusx.traceability.common.model.BaseRequestFieldMapper; import org.eclipse.tractusx.traceability.common.model.PageResult; import org.eclipse.tractusx.traceability.common.request.OwnPageable; import org.eclipse.tractusx.traceability.common.request.PageableFilterRequest; -import org.eclipse.tractusx.traceability.notification.application.notification.mapper.NotificationResponseMapper; import org.eclipse.tractusx.traceability.notification.application.notification.mapper.NotificationFieldMapper; +import org.eclipse.tractusx.traceability.notification.application.notification.mapper.NotificationResponseMapper; import org.eclipse.tractusx.traceability.notification.application.notification.service.NotificationService; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSide; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationStatus; +import org.eclipse.tractusx.traceability.notification.domain.notification.model.EditNotification; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.http.HttpStatus; import org.springframework.security.access.prepost.PreAuthorize; @@ -48,16 +56,11 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; -import notification.request.CloseNotificationRequest; -import notification.request.NotificationStatusRequest; -import notification.request.StartNotificationRequest; -import notification.request.UpdateNotificationRequest; -import notification.response.NotificationIdResponse; -import notification.response.NotificationResponse; import java.util.List; @@ -136,7 +139,7 @@ public NotificationController( @PostMapping @PreAuthorize("hasAnyRole('ROLE_SUPERVISOR', 'ROLE_USER')") @ResponseStatus(HttpStatus.CREATED) - public NotificationIdResponse alertAssets(@RequestBody @Valid StartNotificationRequest request) { + public NotificationIdResponse createNotification(@RequestBody @Valid StartNotificationRequest request) { StartNotificationRequest cleanStartNotificationRequest = sanitize(request); log.info(RECEIVED_API_CALL_LOG + " with params: {}", cleanStartNotificationRequest); return new NotificationIdResponse(notificationService.start(from(cleanStartNotificationRequest)).value()); @@ -149,7 +152,7 @@ public NotificationIdResponse alertAssets(@RequestBody @Valid StartNotificationR security = @SecurityRequirement(name = "oAuth2", scopes = "profile email")) @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Returns the paged result found for Notifications", content = @Content( mediaType = "application/json", - array = @ArraySchema(arraySchema = @Schema(description = "AlertData", implementation = NotificationResponse.class, additionalProperties = Schema.AdditionalPropertiesValue.FALSE), maxItems = Integer.MAX_VALUE), + array = @ArraySchema(arraySchema = @Schema(description = "NotificationData", implementation = NotificationResponse.class, additionalProperties = Schema.AdditionalPropertiesValue.FALSE), maxItems = Integer.MAX_VALUE), schema = @Schema(implementation = NotificationResponse.class) )), @ApiResponse( @@ -197,7 +200,7 @@ public NotificationIdResponse alertAssets(@RequestBody @Valid StartNotificationR mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class)))}) @PostMapping("/filter") - public PageResult getAlerts(@Valid @RequestBody PageableFilterRequest pageableFilterRequest) { + public PageResult getNotifications(@Valid @RequestBody PageableFilterRequest pageableFilterRequest) { log.info(RECEIVED_API_CALL_LOG + "/filter"); return NotificationResponseMapper.fromAsPageResult( @@ -257,7 +260,7 @@ public PageResult getAlerts(@Valid @RequestBody PageableFi mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class)))}) @GetMapping("/{notificationId}") - public NotificationResponse getAlert(@PathVariable("notificationId") Long notificationId) { + public NotificationResponse getNotificationById(@PathVariable("notificationId") Long notificationId) { log.info(RECEIVED_API_CALL_LOG + "/{}", notificationId); return NotificationResponseMapper.from(notificationService.find(notificationId)); } @@ -321,7 +324,7 @@ public NotificationResponse getAlert(@PathVariable("notificationId") Long notifi @PostMapping("/{notificationId}/approve") @PreAuthorize("hasAnyRole('ROLE_SUPERVISOR')") @ResponseStatus(HttpStatus.NO_CONTENT) - public void approveAlert(@PathVariable("notificationId") Long notificationId) { + public void approveNotificationById(@PathVariable("notificationId") Long notificationId) { log.info(RECEIVED_API_CALL_LOG + "/{}/approve", notificationId); notificationService.approve(notificationId); } @@ -385,7 +388,7 @@ public void approveAlert(@PathVariable("notificationId") Long notificationId) { @PostMapping("/{notificationId}/cancel") @PreAuthorize("hasAnyRole('ROLE_SUPERVISOR', 'ROLE_USER')") @ResponseStatus(HttpStatus.NO_CONTENT) - public void cancelAlert(@PathVariable("notificationId") Long notificationId) { + public void cancelNotificationById(@PathVariable("notificationId") Long notificationId) { log.info(RECEIVED_API_CALL_LOG + "/{}/cancel", notificationId); notificationService.cancel(notificationId); } @@ -393,7 +396,7 @@ public void cancelAlert(@PathVariable("notificationId") Long notificationId) { @Operation(operationId = "closeNotification", summary = "Close notification by id", tags = {"Notifications"}, - description = "The endpoint closes alert by id.", + description = "The endpoint closes Notification by id.", security = @SecurityRequirement(name = "oAuth2", scopes = "profile email")) @ApiResponses(value = { @ApiResponse( @@ -449,12 +452,12 @@ public void cancelAlert(@PathVariable("notificationId") Long notificationId) { @PreAuthorize("hasAnyRole('ROLE_SUPERVISOR')") @PostMapping("/{notificationId}/close") @ResponseStatus(HttpStatus.NO_CONTENT) - public void closeAlert( + public void closeNotificationById( @PathVariable("notificationId") @ApiParam Long notificationId, - @Valid @RequestBody CloseNotificationRequest closeAlertRequest) { - CloseNotificationRequest cleanCloseAlertRequest = sanitize(closeAlertRequest); - log.info(RECEIVED_API_CALL_LOG + "/{}/close with params {}", notificationId, cleanCloseAlertRequest); - notificationService.update(notificationId, NotificationStatus.from(NotificationStatusRequest.CLOSED), cleanCloseAlertRequest.getReason()); + @Valid @RequestBody CloseNotificationRequest closeNotificationRequest) { + CloseNotificationRequest cleanCloseNotificationRequest = sanitize(closeNotificationRequest); + log.info(RECEIVED_API_CALL_LOG + "/{}/close with params {}", notificationId, cleanCloseNotificationRequest); + notificationService.updateStatusTransition(notificationId, NotificationStatus.from(NotificationStatusRequest.CLOSED), cleanCloseNotificationRequest.getReason()); } @Operation(operationId = "updateNotification", @@ -513,13 +516,77 @@ public void closeAlert( @PreAuthorize("hasAnyRole('ROLE_SUPERVISOR', 'ROLE_USER')") @PostMapping("/{notificationId}/update") @ResponseStatus(HttpStatus.NO_CONTENT) - public void updateAlert( + public void updateNotificationStatusById( + @PathVariable("notificationId") Long notificationId, + @Valid @RequestBody UpdateNotificationStatusTransitionRequest updateNotificationStatusTransitionRequest) { + UpdateNotificationStatusTransitionRequest cleanUpdateNotificationStatusTransitionRequest = sanitize(updateNotificationStatusTransitionRequest); + validate(cleanUpdateNotificationStatusTransitionRequest); + log.info(RECEIVED_API_CALL_LOG + "/{}/update with params {}", notificationId, cleanUpdateNotificationStatusTransitionRequest); + notificationService.updateStatusTransition(notificationId, NotificationStatus.from(cleanUpdateNotificationStatusTransitionRequest.getStatus()), cleanUpdateNotificationStatusTransitionRequest.getReason()); + } + + @Operation(operationId = "updateNotification", + summary = "Update notification by id", + tags = {"Notifications"}, + description = "The endpoint updates notification by their id.", + security = @SecurityRequirement(name = "oAuth2", scopes = "profile email")) + @ApiResponses(value = { + @ApiResponse( + responseCode = "204", + description = "No content.", + content = @Content()), + @ApiResponse( + responseCode = "400", + description = "Bad request.", + content = @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class))), + @ApiResponse( + responseCode = "401", + description = "Authorization failed.", + content = @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class))), + + @ApiResponse( + responseCode = "403", + description = "Forbidden.", + content = @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class))), + @ApiResponse( + responseCode = "404", + description = "Not found.", + content = @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class))), + @ApiResponse( + responseCode = "415", + description = "Unsupported media type", + content = @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class))), + @ApiResponse( + responseCode = "429", + description = "Too many requests.", + content = @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class))), + @ApiResponse( + responseCode = "500", + description = "Internal server error.", + content = @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class)))}) + @PreAuthorize("hasAnyRole('ROLE_SUPERVISOR', 'ROLE_USER')") + @PutMapping("/{notificationId}/edit") + @ResponseStatus(HttpStatus.NO_CONTENT) + public void editNotification( @PathVariable("notificationId") Long notificationId, - @Valid @RequestBody UpdateNotificationRequest updateAlertRequest) { - UpdateNotificationRequest cleanUpdateAlertRequest = sanitize(updateAlertRequest); - validate(cleanUpdateAlertRequest); - log.info(RECEIVED_API_CALL_LOG + "/{}/update with params {}", notificationId, cleanUpdateAlertRequest); - notificationService.update(notificationId, NotificationStatus.from(cleanUpdateAlertRequest.getStatus()), cleanUpdateAlertRequest.getReason()); + @Valid @RequestBody EditNotificationRequest editNotificationRequest) { + EditNotificationRequest cleanEditNotificationRequest = sanitize(editNotificationRequest); + log.info(RECEIVED_API_CALL_LOG + "/{}/edit with params {}", notificationId, cleanEditNotificationRequest); + notificationService.editNotification(EditNotification.from(cleanEditNotificationRequest, notificationId)); } @Operation(operationId = "distinctFilterValues", diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/service/NotificationService.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/service/NotificationService.java index 0bb73038b9..530153292a 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/service/NotificationService.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/service/NotificationService.java @@ -21,6 +21,7 @@ import org.eclipse.tractusx.traceability.common.model.PageResult; import org.eclipse.tractusx.traceability.common.model.SearchCriteria; import org.eclipse.tractusx.traceability.notification.domain.base.model.Notification; +import org.eclipse.tractusx.traceability.notification.domain.notification.model.EditNotification; import org.eclipse.tractusx.traceability.notification.domain.notification.model.StartNotification; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationId; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSide; @@ -43,7 +44,9 @@ public interface NotificationService { void cancel(Long notificationId); - void update(Long notificationId, NotificationStatus notificationStatus, String reason); + void editNotification(EditNotification editNotification); + + void updateStatusTransition(Long notificationId, NotificationStatus notificationStatus, String reason); PageResult getNotifications(Pageable pageable, SearchCriteria searchCriteria); diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/validation/UpdateNotificationValidator.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/validation/UpdateNotificationValidator.java index c2e2849084..ba074cb7d9 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/validation/UpdateNotificationValidator.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/validation/UpdateNotificationValidator.java @@ -23,7 +23,7 @@ import lombok.experimental.UtilityClass; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationStatus; -import notification.request.UpdateNotificationRequest; +import notification.request.UpdateNotificationStatusTransitionRequest; import java.util.Set; @@ -39,7 +39,7 @@ public class UpdateNotificationValidator { private static final int MINIMUM_REASON_CHARACTERS_SIZE = 15; private static final int MAXIMUM_REASON_CHARACTERS_SIZE = 1000; - public static void validate(UpdateNotificationRequest updateInvestigationRequest) { + public static void validate(UpdateNotificationStatusTransitionRequest updateInvestigationRequest) { NotificationStatus status = NotificationStatus.fromStringValue(updateInvestigationRequest.getStatus().name()); if (!ALLOWED_STATUSES.contains(status)) { diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/model/Notification.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/model/Notification.java index 8c84c78fb3..4aac71328c 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/model/Notification.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/model/Notification.java @@ -22,17 +22,25 @@ import lombok.Data; import lombok.Getter; import lombok.extern.slf4j.Slf4j; +import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase; +import org.eclipse.tractusx.traceability.bpn.domain.model.BpnEdcMapping; import org.eclipse.tractusx.traceability.common.model.BPN; import org.eclipse.tractusx.traceability.notification.domain.notification.exception.InvestigationIllegalUpdate; import org.eclipse.tractusx.traceability.notification.domain.notification.exception.InvestigationStatusTransitionNotAllowed; +import org.eclipse.tractusx.traceability.notification.domain.notification.model.EditNotification; import java.time.Instant; +import java.util.AbstractMap; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.util.Map; import java.util.Optional; +import static java.util.stream.Collectors.groupingBy; +import static org.apache.commons.collections4.ListUtils.emptyIfNull; + @Data @Builder(toBuilder = true) @Slf4j @@ -46,7 +54,7 @@ public class Notification { private NotificationSide notificationSide; private NotificationType notificationType; @Builder.Default - private List assetIds = new ArrayList<>(); + private List affectedPartIds = new ArrayList<>(); private String closeReason; private String acceptReason; private String declineReason; @@ -64,12 +72,60 @@ public static Notification startNotification(String title, Instant createDate, B .notificationType(notificationType) .description(description) .createdAt(createDate) - .assetIds(Collections.emptyList()) + .affectedPartIds(Collections.emptyList()) .build(); } - public List getAssetIds() { - return Collections.unmodifiableList(assetIds); + public void clearNotifications() { + notifications = new ArrayList<>(); + } + + public void createInitialNotifications(List affectedParts, BPN applicationBPN, EditNotification editNotification, List bpnEdcMappings) { + + if (editNotification.getReceiverBpn() != null) { + Map.Entry> receiverAssetsMap = new AbstractMap.SimpleEntry<>(editNotification.getReceiverBpn(), affectedParts); + Optional sentToName = bpnEdcMappings.stream().filter(bpnEdcMapping -> bpnEdcMapping.bpn().equals(editNotification.getReceiverBpn())).findFirst().map(BpnEdcMapping::manufacturerName); + NotificationMessage notificationMessage = NotificationMessage.create( + applicationBPN, + editNotification.getReceiverBpn(), + editNotification.getDescription(), + editNotification.getTargetDate(), + editNotification.getSeverity(), + this.notificationType, + receiverAssetsMap, + applicationBPN.value(), + sentToName.orElse(null)); + + this.addNotificationMessage(notificationMessage); + + + } else { + Map> assetsAsBuiltBPNMap = affectedParts.stream().collect(groupingBy(AssetBase::getManufacturerId)); + assetsAsBuiltBPNMap + .entrySet() + .stream() + .map(receiverAssetsMapEntry -> { + String sentToBPN = receiverAssetsMapEntry.getKey(); + Optional sentToName = bpnEdcMappings.stream().filter(bpnEdcMapping -> bpnEdcMapping.bpn().equals(sentToBPN)).findFirst().map(BpnEdcMapping::manufacturerName); + return NotificationMessage.create( + applicationBPN, + sentToBPN, + editNotification.getDescription(), + editNotification.getTargetDate(), + editNotification.getSeverity(), + this.notificationType, + receiverAssetsMapEntry, + applicationBPN.value(), + sentToName.orElse(null)); + }) + .forEach(this::addNotificationMessage); + } + + + } + + public List getAffectedPartIds() { + return Collections.unmodifiableList(affectedPartIds); } public String getBpn() { @@ -134,12 +190,12 @@ public void addNotificationMessage(NotificationMessage notification) { updatedNotifications.add(notification); notifications = Collections.unmodifiableList(updatedNotifications); - List newAssetIds = new ArrayList<>(assetIds); // create a mutable copy of assetIds - notification.getAffectedParts().stream() + List newAssetIds = new ArrayList<>(affectedPartIds); // create a mutable copy of assetIds + emptyIfNull(notification.getAffectedParts()).stream() .map(NotificationAffectedPart::assetId) .forEach(newAssetIds::add); - assetIds = Collections.unmodifiableList(newAssetIds); // + affectedPartIds = Collections.unmodifiableList(newAssetIds); // } public void addNotificationMessages(List notificationMessages) { diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/model/NotificationMessage.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/model/NotificationMessage.java index ac1faf0a0c..a086df2de2 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/model/NotificationMessage.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/model/NotificationMessage.java @@ -43,7 +43,7 @@ public class NotificationMessage { private final String createdByName; private final String sendToName; @Builder.Default - private final List affectedParts = new ArrayList<>(); + private List affectedParts = new ArrayList<>(); private String notificationReferenceId; private String createdBy; private String sendTo; @@ -89,6 +89,8 @@ public static NotificationMessage create(BPN applicationBpn, String receiverBpn, .build(); } + + // Important - receiver and sender will be saved in switched order public NotificationMessage copyAndSwitchSenderAndReceiver(BPN applicationBpn) { final String notificationId = UUID.randomUUID().toString(); diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/model/NotificationSeverity.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/model/NotificationSeverity.java index 0ac24ad6c1..418e7136e4 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/model/NotificationSeverity.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/model/NotificationSeverity.java @@ -23,7 +23,7 @@ import lombok.Getter; import notification.request.NotificationSeverityRequest; -@Getter + @ApiModel(description = "Describes the criticality of a notification") public enum NotificationSeverity { MINOR("MINOR"), @@ -33,6 +33,10 @@ public enum NotificationSeverity { private final String realName; + public String getRealName() { + return realName; + } + NotificationSeverity(String realName) { this.realName = realName; } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/AbstractNotificationReceiverService.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/AbstractNotificationReceiverService.java index 72dd7affe6..80b6e99109 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/AbstractNotificationReceiverService.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/AbstractNotificationReceiverService.java @@ -29,6 +29,8 @@ import org.eclipse.tractusx.traceability.notification.domain.notification.repository.NotificationRepository; import org.eclipse.tractusx.traceability.notification.infrastructure.edc.model.EDCNotification; +import static org.apache.commons.collections4.ListUtils.emptyIfNull; + @Slf4j public abstract class AbstractNotificationReceiverService implements NotificationReceiverService { @@ -53,9 +55,11 @@ public void handleReceive(EDCNotification edcNotification, NotificationType noti @Override public void handleUpdate(EDCNotification edcNotification, NotificationType notificationType) { - NotificationMessage notificationMessage = getNotificationMessageMapper().toNotification(edcNotification, notificationType); + Notification notification = getRepository().findByEdcNotificationId(edcNotification.getNotificationId()) .orElseThrow(() -> getNotFoundException(edcNotification.getNotificationId())); + NotificationMessage notificationMessage = getNotificationMessageMapper().toNotification(edcNotification, notificationType); + emptyIfNull(notification.getNotifications()).stream().findFirst().ifPresent(notificationMessage1 -> notificationMessage.setAffectedParts(notificationMessage1.getAffectedParts())); switch (edcNotification.convertNotificationStatus()) { case ACKNOWLEDGED -> notification.acknowledge(); diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/AbstractNotificationService.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/AbstractNotificationService.java index c09dad7b83..6df39d7d47 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/AbstractNotificationService.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/AbstractNotificationService.java @@ -20,12 +20,15 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.eclipse.tractusx.traceability.assets.domain.asbuilt.repository.AssetAsBuiltRepository; +import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase; +import org.eclipse.tractusx.traceability.bpn.domain.model.BpnEdcMapping; +import org.eclipse.tractusx.traceability.bpn.infrastructure.repository.BpnRepository; +import org.eclipse.tractusx.traceability.common.model.BPN; import org.eclipse.tractusx.traceability.common.model.PageResult; import org.eclipse.tractusx.traceability.common.model.SearchCriteria; import org.eclipse.tractusx.traceability.common.properties.TraceabilityProperties; import org.eclipse.tractusx.traceability.notification.application.notification.service.NotificationService; -import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationType; -import org.eclipse.tractusx.traceability.notification.domain.notification.model.StartNotification; import org.eclipse.tractusx.traceability.notification.domain.base.exception.SendNotificationException; import org.eclipse.tractusx.traceability.notification.domain.base.model.Notification; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationId; @@ -33,6 +36,10 @@ import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSeverity; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSide; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationStatus; +import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationType; +import org.eclipse.tractusx.traceability.notification.domain.notification.exception.NotificationSenderAndReceiverBPNEqualException; +import org.eclipse.tractusx.traceability.notification.domain.notification.model.EditNotification; +import org.eclipse.tractusx.traceability.notification.domain.notification.model.StartNotification; import org.eclipse.tractusx.traceability.notification.domain.notification.repository.NotificationRepository; import org.springframework.data.domain.Pageable; @@ -48,10 +55,14 @@ public abstract class AbstractNotificationService implements NotificationService private final TraceabilityProperties traceabilityProperties; private final NotificationPublisherService notificationPublisherService; + private final AssetAsBuiltRepository assetAsBuiltRepository; + private final BpnRepository bpnRepository; + private static final List SUPPORTED_ENUM_FIELDS = List.of("status", "side", "messages_severity", "type"); protected abstract NotificationRepository getNotificationRepository(); + protected abstract RuntimeException getNotFoundException(String message); @Override @@ -61,6 +72,7 @@ public PageResult getNotifications(Pageable pageable, SearchCriter @Override public NotificationId start(StartNotification startNotification) { + validateReceiverIsNotOwnBpn(startNotification.getReceiverBpn(), null); Notification notification = notificationPublisherService.startNotification(startNotification); NotificationId createdAlertId = getNotificationRepository().saveNotification(notification); log.info("Start Quality Notification {}", notification); @@ -68,7 +80,7 @@ public NotificationId start(StartNotification startNotification) { } @Override - public void update(Long notificationId, NotificationStatus notificationStatus, String reason) { + public void updateStatusTransition(Long notificationId, NotificationStatus notificationStatus, String reason) { Notification notification = loadOrNotFoundException(new NotificationId(notificationId)); List messages = notification.getNotifications(); @@ -98,6 +110,36 @@ public void update(Long notificationId, NotificationStatus notificationStatus, S getNotificationRepository().updateNotification(updatedNotification); } + @Override + public void editNotification(EditNotification editNotification) { + validateReceiverIsNotOwnBpn(editNotification.getReceiverBpn(), editNotification.getId()); + Notification notification = loadOrNotFoundException(new NotificationId(editNotification.getId())); + List affectedParts = assetAsBuiltRepository.getAssetsById(editNotification.getAffectedPartIds()); + List bpnMappings = bpnRepository.findAllByIdIn(affectedParts.stream().map(AssetBase::getManufacturerId).toList()); + + List oldMessageIds = + notification.getNotifications().stream().map(NotificationMessage::getId).toList(); + + getNotificationRepository().deleteByIdIn(oldMessageIds); + notification.clearNotifications(); + notification.createInitialNotifications(affectedParts, traceabilityProperties.getBpn(), editNotification, bpnMappings); + if (editNotification.getReceiverBpn() != null) { + notification.setBpn(BPN.of(editNotification.getReceiverBpn())); + } + + notification.setTitle(editNotification.getTitle()); + + if (editNotification.getDescription() != null) { + notification.setDescription(editNotification.getDescription()); + } + if (editNotification.getAffectedPartIds() != null) { + notification.setAffectedPartIds(editNotification.getAffectedPartIds()); + } + + + getNotificationRepository().updateNotificationAndMessage(notification, editNotification.getSeverity()); + } + @Override public Notification find(Long id) { NotificationId investigationId = new NotificationId(id); @@ -174,11 +216,21 @@ private List getAssetEnumFieldValues(String fieldName) { return switch (fieldName) { case "status" -> Arrays.stream(NotificationStatus.values()).map(Enum::name).toList(); case "side" -> Arrays.stream(NotificationSide.values()).map(Enum::name).toList(); - case "messages_severity" -> - Arrays.stream(NotificationSeverity.values()).map(Enum::name).toList(); - case "type" -> - Arrays.stream(NotificationType.values()).map(Enum::name).toList(); + case "messages_severity" -> Arrays.stream(NotificationSeverity.values()).map(Enum::name).toList(); + case "type" -> Arrays.stream(NotificationType.values()).map(Enum::name).toList(); default -> null; }; } + + private void validateReceiverIsNotOwnBpn(String bpn, Long notificationId) { + if (traceabilityProperties.getBpn().value().equals(bpn)) { + if (notificationId != null) { + throw new NotificationSenderAndReceiverBPNEqualException(bpn, notificationId); + } else { + throw new NotificationSenderAndReceiverBPNEqualException(bpn); + } + } + + } + } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/NotificationPublisherService.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/NotificationPublisherService.java index 9bded8c91b..eb9e343a34 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/NotificationPublisherService.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/NotificationPublisherService.java @@ -24,7 +24,7 @@ import lombok.extern.slf4j.Slf4j; import org.eclipse.tractusx.traceability.assets.domain.asbuilt.repository.AssetAsBuiltRepository; import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase; -import org.eclipse.tractusx.traceability.bpn.domain.service.BpnRepository; +import org.eclipse.tractusx.traceability.bpn.infrastructure.repository.BpnRepository; import org.eclipse.tractusx.traceability.common.model.BPN; import org.eclipse.tractusx.traceability.common.properties.TraceabilityProperties; import org.eclipse.tractusx.traceability.notification.domain.base.exception.SendNotificationException; @@ -33,7 +33,6 @@ import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSide; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationStatus; import org.eclipse.tractusx.traceability.notification.domain.base.model.exception.NotificationIllegalUpdate; -import org.eclipse.tractusx.traceability.notification.domain.notification.exception.NotificationNotSupportedException; import org.eclipse.tractusx.traceability.notification.domain.notification.model.StartNotification; import org.springframework.stereotype.Service; @@ -60,30 +59,30 @@ public class NotificationPublisherService { public Notification startNotification(StartNotification startNotification) { BPN applicationBPN = traceabilityProperties.getBpn(); Notification notification = Notification.startNotification(startNotification.getTitle(), clock.instant(), applicationBPN, startNotification.getDescription(), startNotification.getType()); - if (startNotification.isAsBuilt()) { - Map> assetsAsBuiltBPNMap = assetAsBuiltRepository.getAssetsById(startNotification.getPartIds()).stream().collect(groupingBy(AssetBase::getManufacturerId)); - assetsAsBuiltBPNMap - .entrySet() - .stream() - .map(it -> { - String creator = getManufacturerNameByBpn(traceabilityProperties.getBpn().value()); - String sendToName = getManufacturerNameByBpn(startNotification.getReceiverBpn()); - return NotificationMessage.create( - applicationBPN, - startNotification.getReceiverBpn(), - startNotification.getDescription(), - startNotification.getTargetDate(), - startNotification.getSeverity(), - startNotification.getType(), - it, - creator, - sendToName); - }) - .forEach(notification::addNotificationMessage); - return notification; - } else { - throw new NotificationNotSupportedException(); - } + createMessages(startNotification, applicationBPN, notification, assetAsBuiltRepository); + return notification; + } + + private void createMessages(StartNotification startNotification, BPN applicationBPN, Notification notification, AssetAsBuiltRepository assetAsBuiltRepository) { + Map> assetsAsBuiltBPNMap = assetAsBuiltRepository.getAssetsById(startNotification.getAffectedPartIds()).stream().collect(groupingBy(AssetBase::getManufacturerId)); + assetsAsBuiltBPNMap + .entrySet() + .stream() + .map(it -> { + String creator = getManufacturerNameByBpn(applicationBPN.value()); + String sendToName = getManufacturerNameByBpn(startNotification.getReceiverBpn()); + return NotificationMessage.create( + applicationBPN, + startNotification.getReceiverBpn(), + startNotification.getDescription(), + startNotification.getTargetDate(), + startNotification.getSeverity(), + startNotification.getType(), + it, + creator, + sendToName); + }) + .forEach(notification::addNotificationMessage); } private String getManufacturerNameByBpn(String bpn) { diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/NotificationsEDCFacade.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/NotificationsEDCFacade.java index ea194a1486..c917bbedce 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/NotificationsEDCFacade.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/NotificationsEDCFacade.java @@ -61,7 +61,6 @@ import java.util.Optional; import static java.lang.String.format; -import static org.eclipse.tractusx.traceability.common.config.JsonLdConfigurationTraceX.NAMESPACE_EDC; import static org.eclipse.tractusx.traceability.common.config.RestTemplateConfiguration.EDC_NOTIFICATION_TEMPLATE; @Slf4j @@ -85,10 +84,10 @@ public class NotificationsEDCFacade { private final EndpointDataReferenceStorage endpointDataReferenceStorage; private final PolicyCheckerService policyCheckerService; - public static final String ASSET_VALUE_QUALITY_INVESTIGATION = "qualityinvestigation"; - public static final String ASSET_VALUE_QUALITY_ALERT = "qualityalert"; - private static final String ASSET_VALUE_NOTIFICATION_METHOD_UPDATE = "update"; - private static final String ASSET_VALUE_NOTIFICATION_METHOD_RECEIVE = "receive"; + private static final String CX_TAXO_QUALITY_INVESTIGATION_RECEIVE = "https://w3id.org/catenax/taxonomy#ReceiveQualityInvestigationNotification"; + private static final String CX_TAXO_QUALITY_INVESTIGATION_UPDATE = "https://w3id.org/catenax/taxonomy#UpdateQualityInvestigationNotification"; + private static final String CX_TAXO_QUALITY_ALERT_RECEIVE = "https://w3id.org/catenax/taxonomy#ReceiveQualityAlertNotification"; + private static final String CX_TAXO_QUALITY_ALERT_UPDATE = "https://w3id.org/catenax/taxonomy#UpdateQualityAlertNotification"; public void startEdcTransfer( final NotificationMessage notification, @@ -97,7 +96,7 @@ public void startEdcTransfer( CatalogItem catalogItem = getCatalogItem(notification, receiverEdcUrl); - String contractAgreementId = negotiateContractAgreement(receiverEdcUrl, catalogItem); + String contractAgreementId = negotiateContractAgreement(receiverEdcUrl, catalogItem, notification.getSendTo()); final EndpointDataReference dataReference = endpointDataReferenceStorage.get(contractAgreementId) .orElseThrow(() -> new NoEndpointDataReferenceException("No EndpointDataReference was found")); @@ -112,11 +111,11 @@ public void startEdcTransfer( } } - private String negotiateContractAgreement(final String receiverEdcUrl, final CatalogItem catalogItem) { + private String negotiateContractAgreement(final String receiverEdcUrl, final CatalogItem catalogItem, String receiverBpn) { try { log.info("Negotiation of contract agreement for receiverEdcUrl {} and catalogItem {}", receiverEdcUrl, catalogItem); - return Optional.ofNullable(contractNegotiationService.negotiate(receiverEdcUrl + edcProperties.getIdsPath(), catalogItem, null)) + return Optional.ofNullable(contractNegotiationService.negotiate(receiverEdcUrl + edcProperties.getIdsPath(), catalogItem, null, receiverBpn)) .orElseThrow() .getContractAgreementId(); } catch (Exception e) { @@ -126,16 +125,31 @@ private String negotiateContractAgreement(final String receiverEdcUrl, final Cat private CatalogItem getCatalogItem(final NotificationMessage notification, final String receiverEdcUrl) { try { - final String propertyNotificationTypeValue = NotificationType.ALERT.equals(notification.getType()) ? ASSET_VALUE_QUALITY_ALERT : ASSET_VALUE_QUALITY_INVESTIGATION; - final String propertyMethodValue = Boolean.TRUE.equals(notification.getNotificationStatus().equals(NotificationStatus.SENT)) ? ASSET_VALUE_NOTIFICATION_METHOD_RECEIVE : ASSET_VALUE_NOTIFICATION_METHOD_UPDATE; + + String taxoValue = ""; + if (NotificationType.ALERT.equals(notification.getType()) && notification.getNotificationStatus().equals(NotificationStatus.SENT)) { + taxoValue = CX_TAXO_QUALITY_ALERT_RECEIVE; + } else if (!NotificationType.ALERT.equals(notification.getType()) && notification.getNotificationStatus().equals(NotificationStatus.SENT)) { + taxoValue = CX_TAXO_QUALITY_INVESTIGATION_RECEIVE; + } else if (NotificationType.ALERT.equals(notification.getType())) { + taxoValue = CX_TAXO_QUALITY_ALERT_UPDATE; + } else { + taxoValue = CX_TAXO_QUALITY_INVESTIGATION_UPDATE; + } + return edcCatalogFacade.fetchCatalogItems( CatalogRequest.Builder.newInstance() .protocol(DEFAULT_PROTOCOL) .counterPartyAddress(receiverEdcUrl + edcProperties.getIdsPath()) + .counterPartyId(notification.getSendTo()) .querySpec(QuerySpec.Builder.newInstance() + // https://github.com/eclipse-tractusx/traceability-foss/issues/978 + // Probably: + // leftOperand = 'http://purl.org/dc/terms/type'.'@id' + // rightOperand = https://w3id.org/catenax/taxonomy#ReceiveQualityAlertNotification (make sure to check the input for the correct one Receive/Update and Alert or Investigation + // The types are all in the ticket documented .filter( - List.of(new Criterion(NAMESPACE_EDC + "notificationtype", "=", propertyNotificationTypeValue), - new Criterion(NAMESPACE_EDC + "notificationmethod", "=", propertyMethodValue)) + List.of(new Criterion("'http://purl.org/dc/terms/type'.'@id'", "=", taxoValue)) ) .build()) .build() @@ -143,7 +157,8 @@ private CatalogItem getCatalogItem(final NotificationMessage notification, final .filter(catalogItem -> { log.info("-- catalog item check --"); log.info("Item {}: {}", catalogItem.getItemId(), catalogItem); - boolean isValid = policyCheckerService.isValid(catalogItem.getPolicy()); + boolean isValid = policyCheckerService.isValid(catalogItem.getPolicy(), notification.getSendTo() + ); log.info("IsValid : {}", isValid); return isValid; }) diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/contract/EdcNotificationContractService.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/contract/EdcNotificationContractService.java index 8044c5180e..156ac3a013 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/contract/EdcNotificationContractService.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/contract/EdcNotificationContractService.java @@ -17,6 +17,7 @@ * under the License. * * SPDX-License-Identifier: Apache-2.0 + * ********************************************************************************/ package org.eclipse.tractusx.traceability.notification.domain.contract; @@ -90,14 +91,23 @@ public CreateNotificationContractResponse handle(CreateNotificationContractReque String accessPolicyId = ""; + try { - accessPolicyId = edcPolicyDefinitionService.createAccessPolicy(edcCreatePolicyDefinitionRequest); + boolean exists = edcPolicyDefinitionService.policyDefinitionExists(edcCreatePolicyDefinitionRequest.getPolicyDefinitionId()); + if (exists) { + log.info("Policy with id " + edcCreatePolicyDefinitionRequest.getPolicyDefinitionId() + "already exists and contains necessary application constraints. Reusing for notification contract."); + accessPolicyId = edcCreatePolicyDefinitionRequest.getPolicyDefinitionId(); + } else{ + accessPolicyId = edcPolicyDefinitionService.createAccessPolicy(edcCreatePolicyDefinitionRequest); + } } catch (CreateEdcPolicyDefinitionException e) { revertNotificationAsset(notificationAssetId); throw new CreateNotificationContractException(e); } catch (EdcPolicyDefinitionAlreadyExists alreadyExists) { accessPolicyId = optionalPolicyResponse.get().policyId(); log.info("Policy with id " + accessPolicyId + " already exists, using for notification contract."); + } catch(org.eclipse.tractusx.irs.edc.client.policy.model.exception.GetEdcPolicyDefinitionException edcPolicyDefinitionException){ + log.warn("EdcPolicyDefinition could not be queried {}", edcPolicyDefinitionException.getMessage()); } String contractDefinitionId = ""; try { diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/model/SingleLevelBomAsBuiltRequest.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/notification/exception/NotificationSenderAndReceiverBPNEqualException.java similarity index 56% rename from tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/model/SingleLevelBomAsBuiltRequest.java rename to tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/notification/exception/NotificationSenderAndReceiverBPNEqualException.java index c07cad5801..518b728e9c 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/model/SingleLevelBomAsBuiltRequest.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/notification/exception/NotificationSenderAndReceiverBPNEqualException.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2023 Contributors to the Eclipse Foundation + * Copyright (c) 2024 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. @@ -16,23 +16,17 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.traceability.assets.domain.importpoc.model; -import java.util.List; +package org.eclipse.tractusx.traceability.notification.domain.notification.exception; -public record SingleLevelBomAsBuiltRequest(String catenaXId, List childItems) { - public record ChildItem( - Quantity quantity, - boolean hasAlternatives, - String createdOn, - String lastModifiedOn, - String catenaXId, - String businessPartner - ) { +public class NotificationSenderAndReceiverBPNEqualException extends IllegalArgumentException { + + public NotificationSenderAndReceiverBPNEqualException(String bpn) { + super("Quality notification cannot be created. Sender BPN %s is same as receiver BPN.".formatted(bpn)); } - public record Quantity(int quantityNumber, String measurementUnit) { + public NotificationSenderAndReceiverBPNEqualException(String bpn, Long notificationId) { + super("Quality notification with id %s cannot be edited. Sender BPN %s is same as receiver BPN.".formatted(notificationId, bpn)); } } - diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/notification/model/EditNotification.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/notification/model/EditNotification.java new file mode 100644 index 0000000000..0e7773008b --- /dev/null +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/notification/model/EditNotification.java @@ -0,0 +1,63 @@ +/******************************************************************************** + * Copyright (c) 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.traceability.notification.domain.notification.model; + +import lombok.Builder; +import lombok.Data; +import notification.request.EditNotificationRequest; +import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSeverity; + +import java.time.Instant; +import java.util.List; + + + +@Data +@Builder +public class EditNotification { + + private Long id; + + private String title; + + private String description; + + private Instant targetDate; + + private List affectedPartIds; + + private String receiverBpn; + + private NotificationSeverity severity; + + public static EditNotification from(EditNotificationRequest editNotificationRequest, Long notificationId) { + return EditNotification.builder() + .id(notificationId) + .title(editNotificationRequest.getTitle()) + .affectedPartIds(editNotificationRequest.getAffectedPartIds()) + .description(editNotificationRequest.getDescription()) + .targetDate(editNotificationRequest.getTargetDate()) + .severity(NotificationSeverity.fromString(editNotificationRequest.getSeverity() != null ? editNotificationRequest.getSeverity().getRealName() : null)) + .receiverBpn(editNotificationRequest.getReceiverBpn()) + .build(); + } + + +} diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/notification/model/StartNotification.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/notification/model/StartNotification.java index 41cce47e9d..1dd7a694d7 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/notification/model/StartNotification.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/notification/model/StartNotification.java @@ -36,7 +36,7 @@ public class StartNotification { private String title; - private List partIds; + private List affectedPartIds; private String description; @@ -46,21 +46,18 @@ public class StartNotification { private NotificationType type; - private boolean isAsBuilt; - private String receiverBpn; public static StartNotification from(StartNotificationRequest startNotificationRequest) { return StartNotification.builder() .title(startNotificationRequest.getTitle()) - .partIds(startNotificationRequest.getPartIds()) + .affectedPartIds(startNotificationRequest.getAffectedPartIds()) .description(startNotificationRequest.getDescription()) .targetDate(startNotificationRequest.getTargetDate()) .severity(NotificationSeverity.from(startNotificationRequest.getSeverity())) .type(NotificationType.from(startNotificationRequest.getType())) .receiverBpn(startNotificationRequest.getReceiverBpn()) - .isAsBuilt(startNotificationRequest.isAsBuilt()) .build(); } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/notification/repository/NotificationRepository.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/notification/repository/NotificationRepository.java index 6a944e5d62..4dea485c1a 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/notification/repository/NotificationRepository.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/notification/repository/NotificationRepository.java @@ -26,6 +26,7 @@ import org.eclipse.tractusx.traceability.common.model.SearchCriteria; import org.eclipse.tractusx.traceability.notification.domain.base.model.Notification; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationId; +import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSeverity; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSide; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationType; import org.springframework.data.domain.Pageable; @@ -45,6 +46,8 @@ public interface NotificationRepository { void updateNotification(Notification investigation); + void updateNotificationAndMessage(Notification notification, NotificationSeverity notificationSeverity); + PageResult getNotifications(Pageable pageable, SearchCriteria searchCriteria); long countOpenNotificationsByOwnershipAndNotificationType(List owners, NotificationType notificationType); @@ -53,4 +56,6 @@ public interface NotificationRepository { void updateErrorMessage(Notification investigation); + void deleteByIdIn(List messageIds); + } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/notification/service/NotificationServiceImpl.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/notification/service/NotificationServiceImpl.java index 58380fdb80..ec179c7948 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/notification/service/NotificationServiceImpl.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/notification/service/NotificationServiceImpl.java @@ -19,22 +19,26 @@ package org.eclipse.tractusx.traceability.notification.domain.notification.service; +import org.eclipse.tractusx.traceability.assets.domain.asbuilt.repository.AssetAsBuiltRepository; +import org.eclipse.tractusx.traceability.bpn.infrastructure.repository.BpnRepository; import org.eclipse.tractusx.traceability.common.properties.TraceabilityProperties; -import org.eclipse.tractusx.traceability.notification.domain.notification.exception.NotificationNotFoundException; -import org.eclipse.tractusx.traceability.notification.domain.notification.repository.NotificationRepository; import org.eclipse.tractusx.traceability.notification.domain.base.service.AbstractNotificationService; import org.eclipse.tractusx.traceability.notification.domain.base.service.NotificationPublisherService; +import org.eclipse.tractusx.traceability.notification.domain.notification.exception.NotificationNotFoundException; +import org.eclipse.tractusx.traceability.notification.domain.notification.repository.NotificationRepository; import org.springframework.stereotype.Service; @Service("notificationServiceImpl") public class NotificationServiceImpl extends AbstractNotificationService { - - private final NotificationRepository notificationRepository; - public NotificationServiceImpl(TraceabilityProperties traceabilityProperties, NotificationRepository alertRepository, NotificationPublisherService notificationPublisherService) { - super(traceabilityProperties, notificationPublisherService); + public NotificationServiceImpl(TraceabilityProperties traceabilityProperties, + NotificationRepository alertRepository, + NotificationPublisherService notificationPublisherService, + AssetAsBuiltRepository assetAsBuiltRepository, BpnRepository bpnRepository) { + super(traceabilityProperties, notificationPublisherService, assetAsBuiltRepository, bpnRepository); this.notificationRepository = alertRepository; + } @Override diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/edc/EDCNotificationValidator.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/edc/EDCNotificationValidator.java index 287ab24c8f..04ea8256f4 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/edc/EDCNotificationValidator.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/edc/EDCNotificationValidator.java @@ -23,8 +23,9 @@ import jakarta.validation.ConstraintValidatorContext; import org.eclipse.tractusx.traceability.common.model.BPN; import org.eclipse.tractusx.traceability.common.properties.TraceabilityProperties; -import org.eclipse.tractusx.traceability.notification.infrastructure.edc.model.EDCNotification; import org.eclipse.tractusx.traceability.notification.domain.notification.exception.InvestigationReceiverBpnMismatchException; +import org.eclipse.tractusx.traceability.notification.domain.notification.exception.NotificationSenderAndReceiverBPNEqualException; +import org.eclipse.tractusx.traceability.notification.infrastructure.edc.model.EDCNotification; import org.springframework.stereotype.Component; /** @@ -72,11 +73,15 @@ public boolean isValid(EDCNotification edcNotification, ConstraintValidatorConte if (senderBPN == null) { throw new InvestigationReceiverBpnMismatchException("BPN of sender cannot be null."); } + if (applicationBPN.value().equals(senderBPN)) { + throw new NotificationSenderAndReceiverBPNEqualException(senderBPN, Long.valueOf(edcNotification.getNotificationId())); + } if (!senderBPN.equals(applicationBPN.value()) && !recipientBPN.equals(applicationBPN.value())) { final String senderBPNIsNotSameAsReceiverError = String.format("BPN {%s} is not eligible to handle BPN: {%s}", applicationBPN.value(), senderBPN); throw new InvestigationReceiverBpnMismatchException(senderBPNIsNotSameAsReceiverError); } + return true; } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/edc/EdcController.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/edc/EdcController.java index 876452d8f9..4b4e2ecdac 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/edc/EdcController.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/edc/EdcController.java @@ -168,7 +168,6 @@ public void investigationNotificationReceive(final @ValidEDCNotification @Valid public void investigationNotificationUpdate(final @ValidEDCNotification @Valid @RequestBody EDCNotification edcNotification) { EDCNotification cleanEdcNotification = sanitize(edcNotification); log.info("EdcController [investigationNotificationUpdate] notificationId:{}", cleanEdcNotification); - validateIsInvestigation(cleanEdcNotification); notificationReceiverService.handleUpdate(cleanEdcNotification, NotificationType.INVESTIGATION); } @@ -288,7 +287,6 @@ public void alertNotificationReceive(final @ValidEDCNotification @Valid @Request public void alertNotificationUpdate(final @ValidEDCNotification @Valid @RequestBody EDCNotification edcNotification) { EDCNotification cleanEdcNotification = sanitize(edcNotification); log.info("EdcController [alertNotificationUpdate] notificationId:{}", cleanEdcNotification); - validateIsAlert(cleanEdcNotification); notificationReceiverService.handleUpdate(cleanEdcNotification, NotificationType.ALERT); } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/edc/model/EDCNotificationFactory.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/edc/model/EDCNotificationFactory.java index e159dbd99e..a2a488201d 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/edc/model/EDCNotificationFactory.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/edc/model/EDCNotificationFactory.java @@ -26,6 +26,8 @@ import java.util.List; +import static org.apache.commons.collections4.ListUtils.emptyIfNull; + public class EDCNotificationFactory { private EDCNotificationFactory() { @@ -60,7 +62,7 @@ public static EDCNotification createEdcNotification(String senderEDC, Notificati private static List extractAssetIds(NotificationMessage notification) { - return notification.getAffectedParts().stream() + return emptyIfNull(notification.getAffectedParts()).stream() .map(NotificationAffectedPart::assetId).toList(); } } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/notification/model/NotificationEntity.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/notification/model/NotificationEntity.java index 608ad96498..fd304dd815 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/notification/model/NotificationEntity.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/notification/model/NotificationEntity.java @@ -88,7 +88,7 @@ public static Notification toDomain(NotificationEntity notificationEntity) { .createdAt(notificationEntity.getCreatedDate()) .description(notificationEntity.getDescription()) .notificationType(NotificationType.valueOf(notificationEntity.getType().name())) - .assetIds(assetIds) + .affectedPartIds(assetIds) .notifications(messages) .build(); } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/notification/repository/NotificationRepositoryImpl.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/notification/repository/NotificationRepositoryImpl.java index 48de2feb16..1155d32c31 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/notification/repository/NotificationRepositoryImpl.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/notification/repository/NotificationRepositoryImpl.java @@ -35,6 +35,7 @@ import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationAffectedPart; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationId; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationMessage; +import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSeverity; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSide; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationStatus; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationType; @@ -96,13 +97,13 @@ public NotificationId saveNotification(Notification notification) { List assetEntities = getAssetEntitiesByNotification(notification); if (assetEntities.isEmpty()) { - throw new IllegalArgumentException("No assets found for %s asset ids".formatted(String.join(", ", notification.getAssetIds()))); + throw new IllegalArgumentException("No assets found for %s asset ids".formatted(String.join(", ", notification.getAffectedPartIds()))); } NotificationEntity notificationEntity = NotificationEntity.from(notification, assetEntities); jpaNotificationRepository.save(notificationEntity); - notification.getNotifications().forEach(notificationMessage -> handleNotificationCreate(notificationEntity, notificationMessage, assetEntities)); + notification.getNotifications().forEach(notificationMessage -> handleMessageCreate(notificationEntity, notificationMessage, assetEntities)); return new NotificationId(notificationEntity.getId()); } @@ -111,13 +112,29 @@ public NotificationId saveNotification(Notification notification) { public void updateNotification(Notification notification) { NotificationEntity notificationEntity = jpaNotificationRepository.findById(notification.getNotificationId().value()) .orElseThrow(() -> new IllegalArgumentException(String.format("Investigation with id %s not found!", notification.getNotificationId().value()))); + notificationEntity.setStatus(NotificationStatusBaseEntity.fromStringValue(notification.getNotificationStatus().name())); + notificationEntity.setUpdated(clock.instant()); + notificationEntity.setCloseReason(notification.getCloseReason()); + notificationEntity.setAcceptReason(notification.getAcceptReason()); + notificationEntity.setDeclineReason(notification.getDeclineReason()); + handleMessageUpdate(notificationEntity, notification, null); + jpaNotificationRepository.save(notificationEntity); + } + @Override + public void updateNotificationAndMessage(Notification notification, NotificationSeverity notificationSeverity) { + NotificationEntity notificationEntity = jpaNotificationRepository.findById(notification.getNotificationId().value()) + .orElseThrow(() -> new IllegalArgumentException(String.format("Investigation with id %s not found!", notification.getNotificationId().value()))); + notificationEntity.setTitle(notification.getTitle()); + notificationEntity.setDescription(notification.getDescription()); + notificationEntity.setBpn(notification.getBpn()); + notificationEntity.setAssets(getAssetEntitiesByAssetIds(notification.getAffectedPartIds())); notificationEntity.setStatus(NotificationStatusBaseEntity.fromStringValue(notification.getNotificationStatus().name())); notificationEntity.setUpdated(clock.instant()); notificationEntity.setCloseReason(notification.getCloseReason()); notificationEntity.setAcceptReason(notification.getAcceptReason()); notificationEntity.setDeclineReason(notification.getDeclineReason()); - handleNotificationUpdate(notificationEntity, notification); + handleMessageUpdate(notificationEntity, notification, notificationSeverity); jpaNotificationRepository.save(notificationEntity); } @@ -170,12 +187,21 @@ public void updateErrorMessage(Notification notification) { jpaNotificationRepository.save(notificationEntity); } + @Override + public void deleteByIdIn(List messageIds) { + jpaNotificationMessageRepository.deleteAllByIdInBatch(messageIds); + } + private List getAssetEntitiesByNotification(Notification notification) { - return assetsAsBuiltRepository.findByIdIn(notification.getAssetIds()); + return assetsAsBuiltRepository.findByIdIn(notification.getAffectedPartIds()); + } + + private List getAssetEntitiesByAssetIds(List assetIds) { + return assetsAsBuiltRepository.findByIdIn(assetIds); } - private void handleNotificationCreate(NotificationEntity notificationEntity, NotificationMessage notificationDomain, List assetEntities) { - NotificationMessageEntity notificationMessageEntity = toNotificationMessageEntity(notificationEntity, notificationDomain, assetEntities); + private void handleMessageCreate(NotificationEntity notificationEntity, NotificationMessage messageDomain, List assetEntities) { + NotificationMessageEntity notificationMessageEntity = toNotificationMessageEntity(notificationEntity, messageDomain, assetEntities); Optional optionalNotificationMessage = jpaNotificationMessageRepository.findById(notificationMessageEntity.getId()); @@ -191,13 +217,13 @@ private void handleNotificationCreate(NotificationEntity notificationEntity, Not }); } - private NotificationMessageEntity toNotificationMessageEntity(NotificationEntity notificationEntity, NotificationMessage notification, List investigationAssets) { - List notificationAssets = filterNotificationAssets(notification, investigationAssets); + private NotificationMessageEntity toNotificationMessageEntity(NotificationEntity notificationEntity, NotificationMessage notificationMessage, List investigationAssets) { + List notificationAssets = filterNotificationAssets(notificationMessage, investigationAssets); if (notificationAssets.isEmpty()) { - throw new IllegalStateException("Investigation with id %s has no notification assets".formatted(notificationEntity.getId())); + throw new IllegalStateException("Investigation with id %s has no notificationMessage assets".formatted(notificationEntity.getId())); } - return NotificationMessageEntity.from(notificationEntity, notification, notificationAssets); + return NotificationMessageEntity.from(notificationEntity, notificationMessage, notificationAssets); } private List filterNotificationAssets(NotificationMessage notificationMessage, List assets) { @@ -206,10 +232,14 @@ private List filterNotificationAssets(NotificationMessage no return assets.stream().filter(it -> notificationAffectedAssetIds.contains(it.getId())).toList(); } - private void handleNotificationUpdate(NotificationEntity notificationEntity, Notification notification) { + private void handleMessageUpdate(NotificationEntity notificationEntity, Notification notification, NotificationSeverity notificationSeverity) { for (NotificationMessage notificationMessage : notification.getNotifications()) { + if (notificationSeverity != null){ + notificationMessage.setSeverity(notificationSeverity); + } List assetEntitiesByNotification = getAssetEntitiesByNotification(notification); - handleNotificationCreate(notificationEntity, notificationMessage, assetEntitiesByNotification); + handleMessageCreate(notificationEntity, notificationMessage, assetEntitiesByNotification); } } + } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/shelldescriptor/domain/service/DecentralRegistryServiceImpl.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/shelldescriptor/domain/service/DecentralRegistryServiceImpl.java index 74223180a9..405db5f9fe 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/shelldescriptor/domain/service/DecentralRegistryServiceImpl.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/shelldescriptor/domain/service/DecentralRegistryServiceImpl.java @@ -52,6 +52,7 @@ public class DecentralRegistryServiceImpl implements DecentralRegistryService { private final TraceabilityProperties traceabilityProperties; private final DecentralRegistryRepository decentralRegistryRepository; + private static final List AS_BUILT_ASPECT_TYPES = List.of(SERIALPART.getValue(), BATCH.getValue(), JUSTINSEQUENCE.getValue()); private static final List AS_PLANNED_ASPECT_TYPES = List.of(PARTASPLANNED.getValue()); @@ -68,7 +69,9 @@ public void synchronizeAssets() { List asBuiltAssetsToSync = asBuiltAssetIds.stream().filter(assetId -> !existingAsBuiltInSyncAndTransientStates.contains(assetId)).toList(); List asPlannedAssetsToSync = asPlannedAssetIds.stream().filter(assetId -> !existingAsPlannedInSyncAndTransientStates.contains(assetId)).toList(); + log.info("Try to sync {} assets asBuilt", asBuiltAssetsToSync.size()); asBuiltAssetsToSync.forEach(assetAsBuiltService::synchronizeAssetsAsync); + log.info("Try to sync {} assets asPlanned", asPlannedAssetsToSync.size()); asPlannedAssetsToSync.forEach(assetAsPlannedService::synchronizeAssetsAsync); } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/submodel/infrastructure/model/SubmodelPayloadEntity.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/submodel/infrastructure/model/SubmodelPayloadEntity.java index 4a520fc885..ce36e95785 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/submodel/infrastructure/model/SubmodelPayloadEntity.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/submodel/infrastructure/model/SubmodelPayloadEntity.java @@ -33,7 +33,7 @@ import lombok.ToString; import org.eclipse.tractusx.traceability.assets.infrastructure.asbuilt.model.AssetAsBuiltEntity; import org.eclipse.tractusx.traceability.assets.infrastructure.asplanned.model.AssetAsPlannedEntity; -import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.GenericSubmodel; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IrsSubmodel; import java.util.List; @@ -63,7 +63,7 @@ public class SubmodelPayloadEntity { @ToString.Exclude private AssetAsPlannedEntity assetAsPlanned; - public static List from(AssetAsBuiltEntity asset, List submodels) { + public static List from(AssetAsBuiltEntity asset, List submodels) { return submodels.stream().map(submodel -> SubmodelPayloadEntity.builder() .aspectType(submodel.getAspectType()) .json(submodel.getPayloadRaw()) @@ -72,7 +72,7 @@ public static List from(AssetAsBuiltEntity asset, List from(AssetAsPlannedEntity asset, List submodels) { + public static List from(AssetAsPlannedEntity asset, List submodels) { return submodels.stream().map(submodel -> SubmodelPayloadEntity.builder() .aspectType(submodel.getAspectType()) .json(submodel.getPayloadRaw()) diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/submodel/infrastructure/repository/SubmodelPayloadRepositoryImpl.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/submodel/infrastructure/repository/SubmodelPayloadRepositoryImpl.java index ff06d9460b..046f3ada59 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/submodel/infrastructure/repository/SubmodelPayloadRepositoryImpl.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/submodel/infrastructure/repository/SubmodelPayloadRepositoryImpl.java @@ -26,7 +26,7 @@ import org.eclipse.tractusx.traceability.assets.infrastructure.asbuilt.repository.JpaAssetAsBuiltRepository; import org.eclipse.tractusx.traceability.assets.infrastructure.asplanned.model.AssetAsPlannedEntity; import org.eclipse.tractusx.traceability.assets.infrastructure.asplanned.repository.JpaAssetAsPlannedRepository; -import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.GenericSubmodel; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IrsSubmodel; import org.eclipse.tractusx.traceability.submodel.infrastructure.model.SubmodelPayloadEntity; import org.springframework.stereotype.Repository; @@ -45,13 +45,13 @@ public class SubmodelPayloadRepositoryImpl implements SubmodelPayloadRepository private static final String ASSET_NOT_FOUND_EXCEPTION_TEMPLATE = "Asset with id: '%s' not found while saving submodels"; @Override - public void savePayloadForAssetAsBuilt(String assetId, List submodels) { + public void savePayloadForAssetAsBuilt(String assetId, List submodels) { AssetAsBuiltEntity asset = jpaAssetAsBuiltRepository.findById(assetId).orElseThrow(() -> new AssetNotFoundException(ASSET_NOT_FOUND_EXCEPTION_TEMPLATE.formatted(assetId))); jpaSubmodelPayloadRepository.saveAll(SubmodelPayloadEntity.from(asset, submodels)); } @Override - public void savePayloadForAssetAsPlanned(String assetId, List submodels) { + public void savePayloadForAssetAsPlanned(String assetId, List submodels) { AssetAsPlannedEntity asset = jpaAssetAsPlannedRepository.findById(assetId).orElseThrow(() -> new AssetNotFoundException(ASSET_NOT_FOUND_EXCEPTION_TEMPLATE.formatted(assetId))); jpaSubmodelPayloadRepository.saveAll(SubmodelPayloadEntity.from(asset, submodels)); } @@ -61,7 +61,7 @@ public Map getAspectTypesAndPayloadsByAssetId(String assetId) { Optional assetAsBuilt = jpaAssetAsBuiltRepository.findById(assetId); Optional assetAsPlanned = jpaAssetAsPlannedRepository.findById(assetId); - if(assetAsBuilt.isPresent()) { + if (assetAsBuilt.isPresent()) { return toTypesAndPayloadsMap(jpaSubmodelPayloadRepository.findByAssetAsBuilt(assetAsBuilt.get())); } else if (assetAsPlanned.isPresent()) { return toTypesAndPayloadsMap(jpaSubmodelPayloadRepository.findByAssetAsPlanned(assetAsPlanned.get())); diff --git a/tx-backend/src/main/resources/application-integration-spring-boot.yml b/tx-backend/src/main/resources/application-integration-spring-boot.yml index a4a7ee649c..6087663ac9 100644 --- a/tx-backend/src/main/resources/application-integration-spring-boot.yml +++ b/tx-backend/src/main/resources/application-integration-spring-boot.yml @@ -25,6 +25,9 @@ traceability: leftOperand: "PURPOSE" operatorType: "eq" rightOperand: "ID Trace 3.1" + leftOperandSecond: "PURPOSE2" + operatorTypeSecond: "eq" + rightOperandSecond: "ID Trace 3.2" validUntil: "2023-07-04T16:01:05.309Z" adminApiKey: testAdminKey regularApiKey: testRegularKey @@ -42,6 +45,11 @@ edc: provider-dataplane-edc-url: "http://127.0.0.1" spring: + jpa: + show-sql: false + properties: + hibernate: + format_sql: true security: oauth2: client: @@ -68,10 +76,13 @@ management: logging: level: + org.hibernate.sql: DEBUG org.springframework.web.client.RestTemplate: INFO org.springframework.security: INFO org.springframework: INFO + + digitalTwinRegistryClient: oAuthClientId: keycloak discoveryFinderUrl: "" @@ -103,3 +114,5 @@ irs-edc-client: controlplane: api-key: secret: "integration-tests" +bpdm: + oAuthClientId: OKTA diff --git a/tx-backend/src/main/resources/application.yml b/tx-backend/src/main/resources/application.yml index ab9261e152..afefa9fa91 100644 --- a/tx-backend/src/main/resources/application.yml +++ b/tx-backend/src/main/resources/application.yml @@ -24,6 +24,9 @@ traceability: leftOperand: ${TRACEABILITY_LEFT_OPERAND} operatorType: ${TRACEABILITY_OPERATOR_TYPE} rightOperand: ${TRACEABILITY_RIGHT_OPERAND} + leftOperandSecond: ${TRACEABILITY_LEFT_OPERAND_SECOND} + operatorTypeSecond: ${TRACEABILITY_OPERATOR_TYPE_SECOND} + rightOperandSecond: ${TRACEABILITY_RIGHT_OPERAND_SECOND} validUntil: ${TRACEABILITY_VALID_UNTIL} adminApiKey: ${IRS_ADMIN_API_KEY} regularApiKey: ${IRS_REGULAR_API_KEY} @@ -39,6 +42,8 @@ edc: provider-dataplane-edc-url: ${EDC_PROVIDER_DATAPLANE_URL} irs-edc-client: + callback: + mapping: /internal/endpoint-data-reference callback-url: ${EDC_CALLBACK_URL_EDC_CLIENT} controlplane: request-ttl: PT10M # How long to wait for an async EDC negotiation request to finish, ISO 8601 Duration @@ -96,6 +101,11 @@ management: port: 8081 spring: + jpa: + show-sql: false + properties: + hibernate: + format_sql: true main: allow-bean-definition-overriding: true datasource: @@ -159,3 +169,9 @@ digitalTwinRegistryClient: descriptorEndpoint: "" # required if type is "central", must contain the placeholder {aasIdentifier} shellLookupEndpoint: "" # required if type is "central", must contain the placeholder {assetIds} +bpdm: + bpnEndpoint: "${BPDM_URL:}/api/catena/legal-entities/{partnerId}?idType={idType}" # Endpoint to resolve BPNs, must contain the placeholders {partnerId} and {idType} + oAuthClientId: keycloak # ID of the OAuth2 client registration to use, see config spring.security.oauth2.client + timeout: + read: PT90S # HTTP read timeout for the bpdm client + connect: PT90S # HTTP connect timeout for the bpdm client diff --git a/tx-backend/src/main/resources/data/irs_assets_as_planned_v4.json b/tx-backend/src/main/resources/data/irs_assets_as_planned_v4.json index f9a5c1b7bf..178fd3a16f 100644 --- a/tx-backend/src/main/resources/data/irs_assets_as_planned_v4.json +++ b/tx-backend/src/main/resources/data/irs_assets_as_planned_v4.json @@ -102,7 +102,7 @@ "semanticId" : { "keys" : [ { - "value" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "value" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "type" : "Submodel" } ], @@ -132,7 +132,7 @@ "semanticId" : { "keys" : [ { - "value" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "value" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "type" : "Submodel" } ], @@ -188,7 +188,7 @@ "semanticId" : { "keys" : [ { - "value" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "value" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "type" : "Submodel" } ], @@ -218,7 +218,7 @@ "semanticId" : { "keys" : [ { - "value" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "value" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "type" : "Submodel" } ], @@ -274,7 +274,7 @@ "semanticId" : { "keys" : [ { - "value" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "value" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "type" : "Submodel" } ], @@ -304,7 +304,7 @@ "semanticId" : { "keys" : [ { - "value" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "value" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "type" : "Submodel" } ], @@ -334,7 +334,7 @@ "semanticId" : { "keys" : [ { - "value" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "value" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "type" : "Submodel" } ], @@ -364,7 +364,7 @@ "submodels" : [ { "identification" : "urn:uuid:9a1cf54a-56e1-4d20-9931-5479db0ce6f8", - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2019-04-04T03:19:03.000Z", @@ -375,12 +375,20 @@ "manufacturerPartId" : "ZX-55", "classification" : "product", "nameAtManufacturer" : "Vehicle Model A" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { "identification" : "urn:uuid:6507e9fc-2544-4ce1-a41c-b0aa57d7b30a", - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4da01", "sites" : [ @@ -395,7 +403,7 @@ }, { "identification" : "urn:uuid:81d16457-d9af-4b4d-a124-84d3ae17d951", - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2019-04-04T03:19:03.000Z", @@ -406,12 +414,20 @@ "manufacturerPartId" : "ZX-55", "classification" : "product", "nameAtManufacturer" : "Vehicle Model B" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { "identification" : "urn:uuid:3331cecf-8183-4966-aa4c-d99d61d20c0b", - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4eb01", "sites" : [ diff --git a/tx-backend/src/main/resources/data/irs_assets_tractionbatterycode.json b/tx-backend/src/main/resources/data/irs_assets_tractionbatterycode.json index bd95bd5de9..f8c2e29809 100644 --- a/tx-backend/src/main/resources/data/irs_assets_tractionbatterycode.json +++ b/tx-backend/src/main/resources/data/irs_assets_tractionbatterycode.json @@ -64,7 +64,7 @@ "identification" : "urn:uuid:781dabcb-93e7-442d-bc38-8ba1451c0218", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -88,7 +88,7 @@ "identification" : "urn:uuid:50de024d-60b3-49cd-ac74-37d81ce4bb7b", "semanticId" : { "value" : [ - "urn:bamm:com.catenax.single_level_bom_as_built:1.0.0#SingleLevelBomAsBuilt" + "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt" ] }, "endpoints" : [ @@ -113,17 +113,13 @@ "submodels": [ { "identification": "urn:uuid:781dabcb-93e7-442d-bc38-8ba1451c0218", - "aspectType": "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType": "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload": { "localIdentifiers": [ { "value": "BPNL00000003AYRE", "key": "manufacturerId" }, - { - "value": "KR-09", - "key": "manufacturerPartId" - }, { "value": "OMA-TGFAYUHXFLHHUQQMPLTE", "key": "partInstanceId" @@ -141,7 +137,13 @@ "partTypeInformation": { "manufacturerPartId": "KR-09", "customerPartId": "KR-09", - "classification": "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer": "a/dev Door Key", "nameAtCustomer": "Door Key" } @@ -149,7 +151,7 @@ }, { "identification": "urn:uuid:781dabcb-93e7-442d-bc38-8ba1451c0217", - "aspectType": "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", + "aspectType": "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", "payload": { "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", "subcomponents": [ diff --git a/tx-backend/src/main/resources/data/irs_assets_v4.json b/tx-backend/src/main/resources/data/irs_assets_v4.json index 739a761d47..0e5f3d8008 100644 --- a/tx-backend/src/main/resources/data/irs_assets_v4.json +++ b/tx-backend/src/main/resources/data/irs_assets_v4.json @@ -269,7 +269,7 @@ "identification" : "urn:uuid:781dabcb-93e7-442d-bc38-8ba1451c0218", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -293,7 +293,7 @@ "identification" : "urn:uuid:50de024d-60b3-49cd-ac74-37d81ce4bb7b", "semanticId" : { "value" : [ - "urn:bamm:com.catenax.single_level_bom_as_built:1.0.0#SingleLevelBomAsBuilt" + "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt" ] }, "endpoints" : [ @@ -348,7 +348,7 @@ "identification" : "urn:uuid:ff82a14d-8730-488f-b965-89eeb2010991", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -372,7 +372,7 @@ "identification" : "urn:uuid:25d34082-c07f-4850-969a-6c923abea43a", "semanticId" : { "value" : [ - "urn:bamm:com.catenax.single_level_bom_as_built:1.0.0#SingleLevelBomAsBuilt" + "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt" ] }, "endpoints" : [ @@ -427,7 +427,7 @@ "identification" : "urn:uuid:82b89a4c-0e98-499e-ba21-c2a5aa38d70b", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -451,7 +451,7 @@ "identification" : "urn:uuid:e605d785-601f-4249-bd99-6a795ae489c6", "semanticId" : { "value" : [ - "urn:bamm:com.catenax.single_level_bom_as_built:1.0.0#SingleLevelBomAsBuilt" + "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt" ] }, "endpoints" : [ @@ -506,7 +506,7 @@ "identification" : "urn:uuid:34a455a5-20aa-4039-af7e-e9b3420077fc", "semanticId" : { "value" : [ - "urn:bamm:com.catenax.single_level_bom_as_built:1.0.0#SingleLevelBomAsBuilt" + "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt" ] }, "endpoints" : [ @@ -530,7 +530,7 @@ "identification" : "urn:uuid:20c37755-2cb1-4eaf-be09-b44c9b9031fe", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -585,7 +585,7 @@ "identification" : "urn:uuid:2f11ec59-b8e8-4494-b3d8-0bbb7d1517b5", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -640,7 +640,7 @@ "identification" : "urn:uuid:985ae9ac-e810-4b69-b3c1-23dfb1f057b6", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -695,7 +695,7 @@ "identification" : "urn:uuid:bc51058d-fc37-42e8-b7ce-3be50754124f", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -750,7 +750,7 @@ "identification" : "urn:uuid:6901be6e-88e0-4754-b53b-4ccc9942cdbe", "semanticId" : { "value" : [ - "urn:bamm:com.catenax.single_level_bom_as_built:1.0.0#SingleLevelBomAsBuilt" + "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt" ] }, "endpoints" : [ @@ -774,7 +774,7 @@ "identification" : "urn:uuid:cbc837f1-d369-4ff8-9539-42e7bd249204", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -829,7 +829,7 @@ "identification" : "urn:uuid:aaebab0d-fe28-4d2b-af8f-c7680b62342f", "semanticId" : { "value" : [ - "urn:bamm:com.catenax.single_level_bom_as_built:1.0.0#SingleLevelBomAsBuilt" + "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt" ] }, "endpoints" : [ @@ -853,7 +853,7 @@ "identification" : "urn:uuid:162535e9-7baa-47b4-b778-17bc45427546", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -908,7 +908,7 @@ "identification" : "urn:uuid:9aeaac21-7d98-44cc-813c-8ba8a6618564", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -932,7 +932,7 @@ "identification" : "urn:uuid:0502c185-0a58-4f01-81c3-b54260e820ae", "semanticId" : { "value" : [ - "urn:bamm:com.catenax.single_level_bom_as_built:1.0.0#SingleLevelBomAsBuilt" + "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt" ] }, "endpoints" : [ @@ -987,7 +987,7 @@ "identification" : "urn:uuid:8f2fb5a9-eae9-4dd5-8fb8-02d2e10cc4e7", "semanticId" : { "value" : [ - "urn:bamm:com.catenax.single_level_bom_as_built:1.0.0#SingleLevelBomAsBuilt" + "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt" ] }, "endpoints" : [ @@ -1011,7 +1011,7 @@ "identification" : "urn:uuid:326acfa7-07d3-4ad0-bc91-67330c56071e", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -1066,7 +1066,7 @@ "identification" : "urn:uuid:140e0654-765e-4136-ba36-7b1d85832377", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -1121,7 +1121,7 @@ "identification" : "urn:uuid:263e254d-8b7c-4911-b46a-d8bef28970f7", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -1146,17 +1146,13 @@ "submodels" : [ { "identification" : "urn:uuid:781dabcb-93e7-442d-bc38-8ba1451c0218", - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003AYRE", "key" : "manufacturerId" }, - { - "value" : "KR-09", - "key" : "manufacturerPartId" - }, { "value" : "OMA-TGFAYUHXFLHHUQQMPLTE", "key" : "partInstanceId" @@ -1173,24 +1169,27 @@ "catenaXId" : "urn:uuid:d387fa8e-603c-42bd-98c3-4d87fef8d2bb", "partTypeInformation" : { "manufacturerPartID" : "KR-09", - "classification" : "product", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "Vehicle Hybrid" } } }, { "identification" : "urn:uuid:50de024d-60b3-49cd-ac74-37d81ce4bb7b", - "aspectType" : "urn:bamm:com.catenax.single_level_bom_as_built:1.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:d387fa8e-603c-42bd-98c3-4d87fef8d2bb", "childParts" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : { - "datatypeURI" : "urn:bamm:io.openmanufacturing:meta-model:1.0.0#piece", - "lexicalValue" : "piece" - } + "value" : 2.5, + "unit" : "unit:litre" }, "lifecycleContext" : "AsBuilt", "assembledOn" : "2022-02-03T14:48:54.709Z", @@ -1228,17 +1227,13 @@ }, { "identification" : "urn:uuid:ff82a14d-8730-488f-b965-89eeb2010991", - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003B5MJ", "key" : "manufacturerId" }, - { - "value" : "83238F4-36", - "key" : "manufacturerPartId" - }, { "value" : "NO-354879221683258717359442", "key" : "partInstanceId" @@ -1252,7 +1247,13 @@ "partTypeInformation" : { "manufacturerPartID" : "83238F4-36", "customerPartId" : "83238F4-36", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "ECU", "nameAtCustomer" : "ECU" } @@ -1260,17 +1261,14 @@ }, { "identification" : "urn:uuid:25d34082-c07f-4850-969a-6c923abea43a", - "aspectType" : "urn:bamm:com.catenax.single_level_bom_as_built:1.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:6dafbcec-2fce-4cbb-a5a9-b3b32aa5cffc", "childParts" : [ { "quantity" : { - "quantityNumber" : "0.3301", - "measurementUnit" : { - "datatypeURI" : "urn:bamm:io.openmanufacturing:meta-model:1.0.0#kilogram", - "lexicalValue" : "kilogram" - } + "value" : 2.5, + "unit" : "unit:litre" }, "lifecycleContext" : "AsBuilt", "assembledOn" : "2022-02-03T14:48:54.709Z", @@ -1308,17 +1306,13 @@ }, { "identification" : "urn:uuid:82b89a4c-0e98-499e-ba21-c2a5aa38d70b", - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003B2OM", "key" : "manufacturerId" }, - { - "value" : "1O222E8-43", - "key" : "manufacturerPartId" - }, { "value" : "NO-733616531805581150452604", "key" : "partInstanceId" @@ -1332,7 +1326,13 @@ "partTypeInformation" : { "manufacturerPartID" : "1O222E8-43", "customerPartId" : "1O222E8-43", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "Transmission", "nameAtCustomer" : "Transmission" } @@ -1340,17 +1340,14 @@ }, { "identification" : "urn:uuid:e605d785-601f-4249-bd99-6a795ae489c6", - "aspectType" : "urn:bamm:com.catenax.single_level_bom_as_built:1.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:7fa65f10-9dc1-49fe-818a-09c7313a4562", "childParts" : [ { "quantity" : { - "quantityNumber" : "0.2014", - "measurementUnit" : { - "datatypeURI" : "urn:bamm:io.openmanufacturing:meta-model:1.0.0#kilogram", - "lexicalValue" : "kilogram" - } + "value" : 2.5, + "unit" : "unit:litre" }, "lifecycleContext" : "AsBuilt", "assembledOn" : "2022-02-03T14:48:54.709Z", @@ -1388,17 +1385,14 @@ }, { "identification" : "urn:uuid:34a455a5-20aa-4039-af7e-e9b3420077fc", - "aspectType" : "urn:bamm:com.catenax.single_level_bom_as_built:1.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:587cfb38-7149-4f06-b1e0-0e9b6e98be2a", "childParts" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : { - "datatypeURI" : "urn:bamm:io.openmanufacturing:meta-model:1.0.0#piece", - "lexicalValue" : "piece" - } + "value" : 2.5, + "unit" : "unit:litre" }, "lifecycleContext" : "AsBuilt", "assembledOn" : "2022-02-03T14:48:54.709Z", @@ -1410,17 +1404,13 @@ }, { "identification" : "urn:uuid:20c37755-2cb1-4eaf-be09-b44c9b9031fe", - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003AYRE", "key" : "manufacturerId" }, - { - "value" : "95657362-83", - "key" : "manufacturerPartId" - }, { "value" : "NO-369202025208677072946181", "key" : "partInstanceId" @@ -1434,7 +1424,13 @@ "partTypeInformation" : { "manufacturerPartID" : "95657362-83", "customerPartId" : "95657362-83", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "Battery", "nameAtCustomer" : "Battery" } @@ -1442,17 +1438,13 @@ }, { "identification" : "urn:uuid:2f11ec59-b8e8-4494-b3d8-0bbb7d1517b5", - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003B0Q0", "key" : "manufacturerId" }, - { - "value" : "55269I8-71", - "key" : "manufacturerPartId" - }, { "value" : "NO-340460948192054950891951", "key" : "partInstanceId" @@ -1466,7 +1458,13 @@ "partTypeInformation" : { "manufacturerPartID" : "55269I8-71", "customerPartId" : "55269I8-71", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "Engineering Plastics", "nameAtCustomer" : "Engineering Plastics" } @@ -1474,17 +1472,13 @@ }, { "identification" : "urn:uuid:985ae9ac-e810-4b69-b3c1-23dfb1f057b6", - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003AXS3", "key" : "manufacturerId" }, - { - "value" : "91471Z0-84", - "key" : "manufacturerPartId" - }, { "value" : "NO-182660425740222655242543", "key" : "partInstanceId" @@ -1498,7 +1492,13 @@ "partTypeInformation" : { "manufacturerPartID" : "91471Z0-84", "customerPartId" : "91471Z0-84", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "Glue", "nameAtCustomer" : "Glue" } @@ -1506,17 +1506,13 @@ }, { "identification" : "urn:uuid:bc51058d-fc37-42e8-b7ce-3be50754124f", - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003B0Q0", "key" : "manufacturerId" }, - { - "value" : "01697F7-65", - "key" : "manufacturerPartId" - }, { "value" : "NO-947880349904267845729159", "key" : "partInstanceId" @@ -1530,7 +1526,13 @@ "partTypeInformation" : { "manufacturerPartID" : "01697F7-65", "customerPartId" : "01697F7-65", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "Engineering Plastics", "nameAtCustomer" : "Engineering Plastics" } @@ -1538,17 +1540,14 @@ }, { "identification" : "urn:uuid:6901be6e-88e0-4754-b53b-4ccc9942cdbe", - "aspectType" : "urn:bamm:com.catenax.single_level_bom_as_built:1.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:1ae94880-e6b0-4bf3-ab74-8148b63c0640", "childParts" : [ { "quantity" : { - "quantityNumber" : "0.1908", - "measurementUnit" : { - "datatypeURI" : "urn:bamm:io.openmanufacturing:meta-model:1.0.0#kilogram", - "lexicalValue" : "kilogram" - } + "value" : 2.5, + "unit" : "unit:litre" }, "lifecycleContext" : "AsBuilt", "assembledOn" : "2022-02-03T14:48:54.709Z", @@ -1560,17 +1559,13 @@ }, { "identification" : "urn:uuid:cbc837f1-d369-4ff8-9539-42e7bd249204", - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003B3NX", "key" : "manufacturerId" }, - { - "value" : "65847F9-69", - "key" : "manufacturerPartId" - }, { "value" : "NO-628797496367807957077265", "key" : "partInstanceId" @@ -1584,7 +1579,13 @@ "partTypeInformation" : { "manufacturerPartID" : "65847F9-69", "customerPartId" : "65847F9-69", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "Sensor", "nameAtCustomer" : "Sensor" } @@ -1592,25 +1593,32 @@ }, { "identification" : "urn:uuid:aaebab0d-fe28-4d2b-af8f-c7680b62342f", - "aspectType" : "urn:bamm:com.catenax.single_level_bom_as_built:1.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:0ce83951-bc18-4e8f-892d-48bad4eb67ef", - "childParts" : [] + "childParts" : [ + { + "quantity" : { + "value" : 2.5, + "unit" : "unit:litre" + }, + "lifecycleContext" : "AsBuilt", + "assembledOn" : "2022-02-03T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z", + "childCatenaXId" : "urn:uuid:186359fb-4584-40e4-a59b-ed842d3d80d9" + } + ] } }, { "identification" : "urn:uuid:162535e9-7baa-47b4-b778-17bc45427546", - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003AXS3", "key" : "manufacturerId" }, - { - "value" : "31008B0-49", - "key" : "manufacturerPartId" - }, { "value" : "NO-825423826078402432465664", "key" : "partInstanceId" @@ -1624,7 +1632,13 @@ "partTypeInformation" : { "manufacturerPartID" : "31008B0-49", "customerPartId" : "31008B0-49", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "Glue", "nameAtCustomer" : "Glue" } @@ -1632,17 +1646,13 @@ }, { "identification" : "urn:uuid:9aeaac21-7d98-44cc-813c-8ba8a6618564", - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003B3NX", "key" : "manufacturerId" }, - { - "value" : "37754B7-76", - "key" : "manufacturerPartId" - }, { "value" : "NO-159040131155901488695376", "key" : "partInstanceId" @@ -1656,7 +1666,13 @@ "partTypeInformation" : { "manufacturerPartID" : "37754B7-76", "customerPartId" : "37754B7-76", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "Sensor", "nameAtCustomer" : "Sensor" } @@ -1664,17 +1680,14 @@ }, { "identification" : "urn:uuid:0502c185-0a58-4f01-81c3-b54260e820ae", - "aspectType" : "urn:bamm:com.catenax.single_level_bom_as_built:1.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:8eea5f45-0823-48ce-a4fc-c3bf1cdfa4c2", "childParts" : [ { "quantity" : { - "quantityNumber" : "0.1908", - "measurementUnit" : { - "datatypeURI" : "urn:bamm:io.openmanufacturing:meta-model:1.0.0#kilogram", - "lexicalValue" : "kilogram" - } + "value" : 2.5, + "unit" : "unit:litre" }, "lifecycleContext" : "AsBuilt", "assembledOn" : "2022-02-03T14:48:54.709Z", @@ -1686,25 +1699,32 @@ }, { "identification" : "urn:uuid:8f2fb5a9-eae9-4dd5-8fb8-02d2e10cc4e7", - "aspectType" : "urn:bamm:com.catenax.single_level_bom_as_built:1.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978", - "childParts" : [] + "childParts" : [ + { + "quantity" : { + "value" : 2.5, + "unit" : "unit:litre" + }, + "lifecycleContext" : "AsBuilt", + "assembledOn" : "2022-02-03T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z", + "childCatenaXId" : "urn:uuid:f7cf62fe-9e25-472b-9148-66ebcc291f31" + } + ] } }, { "identification" : "urn:uuid:326acfa7-07d3-4ad0-bc91-67330c56071e", - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003AYRE", "key" : "manufacturerId" }, - { - "value" : "8840838-04", - "key" : "manufacturerPartId" - }, { "value" : "NO-397646649734958738335866", "key" : "partInstanceId" @@ -1718,7 +1738,13 @@ "partTypeInformation" : { "manufacturerPartID" : "8840838-04", "customerPartId" : "8840838-04", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "HV MODUL", "nameAtCustomer" : "HV MODUL" } @@ -1726,17 +1752,13 @@ }, { "identification" : "urn:uuid:140e0654-765e-4136-ba36-7b1d85832377", - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003B0Q0", "key" : "manufacturerId" }, - { - "value" : "74268H5-13", - "key" : "manufacturerPartId" - }, { "value" : "NO-565359302028822441908953", "key" : "partInstanceId" @@ -1750,7 +1772,13 @@ "partTypeInformation" : { "manufacturerPartID" : "74268H5-13", "customerPartId" : "74268H5-13", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "Engineering Plastics", "nameAtCustomer" : "Engineering Plastics" } @@ -1758,17 +1786,13 @@ }, { "identification" : "urn:uuid:263e254d-8b7c-4911-b46a-d8bef28970f7", - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003B0Q0", "key" : "manufacturerId" }, - { - "value" : "98801V5-17", - "key" : "manufacturerPartId" - }, { "value" : "NO-056604022229087145032390", "key" : "partInstanceId" @@ -1782,7 +1806,13 @@ "partTypeInformation" : { "manufacturerPartID" : "98801V5-17", "customerPartId" : "98801V5-17", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "NTIER Product", "nameAtCustomer" : "NTIER Product" } diff --git a/tx-backend/src/main/resources/db/migration/R__create_asset_as_built_view.sql b/tx-backend/src/main/resources/db/migration/R__create_asset_as_built_view.sql index 761ed14947..53669e76cd 100644 --- a/tx-backend/src/main/resources/db/migration/R__create_asset_as_built_view.sql +++ b/tx-backend/src/main/resources/db/migration/R__create_asset_as_built_view.sql @@ -1,3 +1,4 @@ +-- ${flyway:timestamp} create or replace view assets_as_built_view as select asset.*, diff --git a/tx-backend/src/main/resources/db/migration/V22__add_asset_as_built_fk_to_tractionbatterycode.sql b/tx-backend/src/main/resources/db/migration/V22__add_asset_as_built_fk_to_tractionbatterycode.sql new file mode 100644 index 0000000000..24df8663ad --- /dev/null +++ b/tx-backend/src/main/resources/db/migration/V22__add_asset_as_built_fk_to_tractionbatterycode.sql @@ -0,0 +1,7 @@ +ALTER TABLE traction_battery_code_subcomponent + ADD COLUMN "asset_as_built_id" varchar(255) NULL; +ALTER TABLE traction_battery_code_subcomponent + ADD CONSTRAINT fk_asset_traction_battery_code_subcomponent FOREIGN KEY (asset_as_built_id) REFERENCES assets_as_built (id) on delete cascade; + +ALTER TABLE assets_as_built + DROP COLUMN traction_battery_code CASCADE; diff --git a/tx-backend/src/main/resources/schema/semantichub/Batch_2.0.0-schema.json b/tx-backend/src/main/resources/schema/semantichub/Batch_2.0.0-schema.json deleted file mode 100644 index 42e3798f0e..0000000000 --- a/tx-backend/src/main/resources/schema/semantichub/Batch_2.0.0-schema.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "$schema" : "http://json-schema.org/draft-04/schema#", - "description" : "A batch is a quantity of (semi-) finished products or (raw) material product that have been produced under the same circumstances (e.g. same production location), as specified groups or amounts, within a certain time frame. Every batch can differ in the number or amount of products. Different batches can have varied specifications, e.g., different colors. A batch is identified via a Batch ID.", - "type" : "object", - "components" : { - "schemas" : { - "urn_samm_io.catenax.batch_2.0.0_CatenaXIdTrait" : { - "type" : "string", - "description" : "The provided regular expression ensures that the UUID is composed of five groups of characters separated by hyphens, in the form 8-4-4-4-12 for a total of 36 characters (32 hexadecimal characters and 4 hyphens), optionally prefixed by \"urn:uuid:\" to make it an IRI.", - "pattern" : "(^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)|(^urn:uuid:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)" - }, - "urn_samm_io.catenax.batch_2.0.0_KeyTrait" : { - "type" : "string", - "description" : "Constraint that ensures that the predefined keys are used.", - "pattern" : "^(manufacturerId|batchId)$" - }, - "urn_samm_io.catenax.batch_2.0.0_ValueCharacteristic" : { - "type" : "string", - "description" : "The value of an identifier." - }, - "urn_samm_io.catenax.batch_2.0.0_KeyValueList" : { - "description" : "A list of key value pairs for local identifiers, which are composed of a key and a corresponding value.", - "type" : "object", - "properties" : { - "key" : { - "description" : "The key of a local identifier.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.batch_2.0.0_KeyTrait" - }, - "value" : { - "description" : "The value of an identifier.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.batch_2.0.0_ValueCharacteristic" - } - }, - "required" : [ "key", "value" ] - }, - "urn_samm_io.catenax.batch_2.0.0_LocalIdentifierCharacteristic" : { - "description" : "A batch may have multiple attributes, which uniquely identify that batch in a specific dataspace (e.g. the manufacturer`s dataspace)", - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/urn_samm_io.catenax.batch_2.0.0_KeyValueList" - }, - "uniqueItems" : true - }, - "urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Timestamp" : { - "type" : "string", - "pattern" : "-?([1-9][0-9]{3,}|0[0-9]{3})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])T(([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](\\.[0-9]+)?|(24:00:00(\\.0+)?))(Z|(\\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00))?", - "description" : "Describes a Property which contains the date and time with an optional timezone." - }, - "urn_samm_io.catenax.batch_2.0.0_ProductionCountryCodeTrait" : { - "type" : "string", - "description" : "Regular Expression that ensures a three-letter code", - "pattern" : "^[A-Z]{3}$" - }, - "urn_samm_io.catenax.batch_2.0.0_ManufacturingCharacteristic" : { - "description" : "Characteristic to describe manufacturing related data", - "type" : "object", - "properties" : { - "date" : { - "description" : "Timestamp of the manufacturing date as the final step in production process (e.g. final quality check, ready-for-shipment event)", - "$ref" : "#/components/schemas/urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Timestamp" - }, - "country" : { - "description" : "Country code where the part was manufactured", - "$ref" : "#/components/schemas/urn_samm_io.catenax.batch_2.0.0_ProductionCountryCodeTrait" - } - }, - "required" : [ "date" ] - }, - "urn_samm_io.catenax.batch_2.0.0_PartIdCharacteristic" : { - "type" : "string", - "description" : "The part ID is a multi-character string, ususally assigned by an ERP system" - }, - "urn_samm_io.catenax.batch_2.0.0_PartNameCharacteristic" : { - "type" : "string", - "description" : "Part Name in string format from the respective system in the value chain" - }, - "urn_samm_io.catenax.batch_2.0.0_ClassificationCharacteristic" : { - "type" : "string", - "description" : "A part type must be placed into one of the following classes: 'component', 'product', 'software', 'assembly', 'tool', or 'raw material'.", - "enum" : [ "product", "raw material", "software", "assembly", "tool", "component" ] - }, - "urn_samm_io.catenax.batch_2.0.0_PartTypeInformationCharacteristic" : { - "description" : "The characteristics of the part type", - "type" : "object", - "properties" : { - "manufacturerPartId" : { - "description" : "Part ID as assigned by the manufacturer of the part. The Part ID identifies the part (as designed) in the manufacturer`s dataspace. The Part ID does not reference a specific instance of a part and thus should not be confused with the serial number or batch number.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.batch_2.0.0_PartIdCharacteristic" - }, - "nameAtManufacturer" : { - "description" : "Name of the part as assigned by the manufacturer", - "$ref" : "#/components/schemas/urn_samm_io.catenax.batch_2.0.0_PartNameCharacteristic" - }, - "classification" : { - "description" : "The classification of the part type according to STEP standard definition", - "$ref" : "#/components/schemas/urn_samm_io.catenax.batch_2.0.0_ClassificationCharacteristic" - } - }, - "required" : [ "manufacturerPartId", "nameAtManufacturer", "classification" ] - } - } - }, - "properties" : { - "catenaXId" : { - "description" : "The fully anonymous Catena-X ID of the batch, valid for the Catena-X dataspace.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.batch_2.0.0_CatenaXIdTrait" - }, - "localIdentifiers" : { - "description" : "A local identifier enables identification of a part in a specific dataspace, but is not unique in Catena-X dataspace. Multiple local identifiers may exist.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.batch_2.0.0_LocalIdentifierCharacteristic" - }, - "manufacturingInformation" : { - "description" : "Information from manufacturing process, such as manufacturing date and manufacturing country", - "$ref" : "#/components/schemas/urn_samm_io.catenax.batch_2.0.0_ManufacturingCharacteristic" - }, - "partTypeInformation" : { - "description" : "The part type of which the batch has been instantiated of.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.batch_2.0.0_PartTypeInformationCharacteristic" - } - }, - "required" : [ "catenaXId", "localIdentifiers", "manufacturingInformation", "partTypeInformation" ] -} diff --git a/tx-backend/src/main/resources/schema/semantichub/Batch_3.0.0-schema.json b/tx-backend/src/main/resources/schema/semantichub/Batch_3.0.0-schema.json new file mode 100644 index 0000000000..0bc9a123cf --- /dev/null +++ b/tx-backend/src/main/resources/schema/semantichub/Batch_3.0.0-schema.json @@ -0,0 +1,193 @@ +{ + "$schema" : "http://json-schema.org/draft-04/schema", + "description" : "A batch is a quantity of(semi-)finished products or(raw)material product that have been produced under the same circumstances(e.g. same production location), as specified groups or amounts, within a certain time frame. Every batch can differ in the number or amount of products. Different batches can have varied specifications, e.g., different colors. A batch is identified via a Batch ID.", + "type" : "object", + "components" : { + "schemas" : { + "urn_samm_io.catenax.shared.uuid_2.0.0_UuidV4Trait" : { + "type" : "string", + "description" : "The provided regular expression ensures that the UUID is composed of five groups of characters separated by hyphens, in the form 8-4-4-4-12 for a total of 36 characters (32 hexadecimal characters and 4 hyphens), optionally prefixed by \"urn:uuid:\" to make it an IRI.", + "pattern" : "(^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)|(^urn:uuid:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)" + }, + "urn_samm_io.catenax.batch_3.0.0_KeyTrait" : { + "type" : "string", + "description" : "Constraint that ensures that the predefined keys are used.", + "pattern" : "^(manufacturerId|batchId|customKey:\\w+)$" + }, + "urn_samm_io.catenax.batch_3.0.0_ValueCharacteristic" : { + "type" : "string", + "description" : "The value of an identifier." + }, + "urn_samm_io.catenax.batch_3.0.0_KeyValueList" : { + "description" : "A list of key value pairs for local identifiers, which are composed of a key and a corresponding value.", + "type" : "object", + "properties" : { + "key" : { + "description" : "The key of a local identifier.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.batch_3.0.0_KeyTrait" + }, + "value" : { + "description" : "The value of an identifier.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.batch_3.0.0_ValueCharacteristic" + } + }, + "required" : [ "key", "value" ] + }, + "urn_samm_io.catenax.batch_3.0.0_LocalIdentifierCharacteristic" : { + "description" : "A batch may have multiple attributes, which uniquely identify that batch in a specific dataspace(e.g. the manufacturer`s dataspace)", + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/urn_samm_io.catenax.batch_3.0.0_KeyValueList" + }, + "uniqueItems" : true + }, + "urn_samm_io.catenax.batch_3.0.0_DateTrait" : { + "type" : "string", + "description" : "Regular Expression to enable UTC and Timezone formats and the possibility to exclude time information.", + "pattern" : "^(?:[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(?:[.][0-9]+)?Z|[0-9]{4}-[0-9]{2}-[0-9]{2}(?:T[0-9]{2}:[0-9]{2}:[0-9]{2}(?:[.][0-9]+)?(?:Z|[+-][0-9]{2}:[0-9]{2}))?)$" + }, + "urn_samm_io.catenax.batch_3.0.0_ProductionCountryCodeTrait" : { + "type" : "string", + "description" : "Regular Expression that ensures a three-letter code", + "pattern" : "^[A-Z]{3}$" + }, + "urn_samm_io.catenax.shared.business_partner_number_2.0.0_BpnsTrait" : { + "type" : "string", + "description" : "The provided regular expression ensures that the BPNS is composed of prefix 'BPNS', 10 digits and two alphanumeric letters.", + "pattern" : "^BPNS[a-zA-Z0-9]{12}$" + }, + "urn_samm_io.catenax.shared.part_site_information_as_built_2.0.0_FunctionCharacteristic" : { + "type" : "string", + "description" : "Describes the characteristics of the function for a site related to the respective part.", + "enum" : [ "production", "warehouse", "spare part warehouse" ] + }, + "urn_samm_io.catenax.shared.part_site_information_as_built_2.0.0_SitesEntity" : { + "description" : "Describes the ID and function of a site for the associated part in the AsBuilt context(e.g. SerialPart, Batch, jIS).", + "type" : "object", + "properties" : { + "catenaXsiteId" : { + "description" : "The identifier of the site according to Catena-X BPDM. The catenaXsiteId must be a valid Catena-X BPN. The BPN is a unique, unchangeable identifier for Business Partners / company locations from foundation to closure, regardless of the different business relationships / structures between or within the Business Partners or company locations.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.business_partner_number_2.0.0_BpnsTrait" + }, + "function" : { + "description" : "The function of the site in relation to the part(i.e. the activity within the value chain of the part that is performed at the site)", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.part_site_information_as_built_2.0.0_FunctionCharacteristic" + } + }, + "required" : [ "catenaXsiteId", "function" ] + }, + "urn_samm_io.catenax.shared.part_site_information_as_built_2.0.0_SitesCharacteristic" : { + "description" : "Sites Characteristic", + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.part_site_information_as_built_2.0.0_SitesEntity" + }, + "uniqueItems" : true + }, + "urn_samm_io.catenax.batch_3.0.0_ManufacturingCharacteristic" : { + "description" : "Characteristic to describe manufacturing related data", + "type" : "object", + "properties" : { + "date" : { + "description" : "Timestamp of the manufacturing date as the final step in production process(e.g. final quality check, ready-for-shipment event)", + "$ref" : "#/components/schemas/urn_samm_io.catenax.batch_3.0.0_DateTrait" + }, + "country" : { + "description" : "Country code where the part was manufactured", + "$ref" : "#/components/schemas/urn_samm_io.catenax.batch_3.0.0_ProductionCountryCodeTrait" + }, + "sites" : { + "description" : "A site is a delimited geographical area where a legal entity does business(geographical address with geo coordinates).A site always has a primary physical address. It is possible that further physical addresses are specified for the site. P.O. box details are only possible in addition to the physical address. A site has a 1:n relation to addresses, means at least 1 address is necessary and multiple addresses are possible.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.part_site_information_as_built_2.0.0_SitesCharacteristic" + } + }, + "required" : [ "date" ] + }, + "urn_samm_io.catenax.batch_3.0.0_PartIdCharacteristic" : { + "type" : "string", + "description" : "The part ID is a multi-character string, usually assigned by an ERP system" + }, + "urn_samm_io.catenax.batch_3.0.0_PartNameCharacteristic" : { + "type" : "string", + "description" : "Part Name in string format from the respective system in the value chain" + }, + "urn_samm_io.catenax.shared.part_classification_1.0.0_ClassificationStandardCharacteristic" : { + "type" : "string", + "description" : "Identified classification standards that align to the Catena-X needs." + }, + "urn_samm_io.catenax.shared.part_classification_1.0.0_ClassificationIDCharacteristic" : { + "type" : "string", + "description" : "It can be numeric or a string, depending on the chosen classification standard." + }, + "urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Text" : { + "type" : "string", + "description" : "Describes a Property which contains plain text. This is intended exclusively for human readable strings, not for identifiers, measurement values, etc." + }, + "urn_samm_io.catenax.shared.part_classification_1.0.0_ClassificationEntity" : { + "description" : "Encapsulates data related to the classification of the part.", + "type" : "object", + "properties" : { + "classificationStandard" : { + "description" : "Identified classification standards that align to the Catena-X needs.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.part_classification_1.0.0_ClassificationStandardCharacteristic" + }, + "classificationID" : { + "description" : "The classification ID of the part type according to the corresponding standard definition mentioned in the key value pair.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.part_classification_1.0.0_ClassificationIDCharacteristic" + }, + "classificationDescription" : { + "description" : "Optional property describing the classification standard.", + "$ref" : "#/components/schemas/urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Text" + } + }, + "required" : [ "classificationStandard", "classificationID" ] + }, + "urn_samm_io.catenax.shared.part_classification_1.0.0_ClassificationCharacteristic" : { + "description" : "Classification characteristic enabling a set of further properties.", + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.part_classification_1.0.0_ClassificationEntity" + }, + "uniqueItems" : true + }, + "urn_samm_io.catenax.batch_3.0.0_PartTypeInformationCharacteristic" : { + "description" : "The characteristics of the part type", + "type" : "object", + "properties" : { + "manufacturerPartId" : { + "description" : "Part ID as assigned by the manufacturer of the part. The Part ID identifies the part(as designed)in the manufacturer`s dataspace. The Part ID does not reference a specific instance of a part and thus should not be confused with the serial number or batch number.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.batch_3.0.0_PartIdCharacteristic" + }, + "nameAtManufacturer" : { + "description" : "Name of the part as assigned by the manufacturer", + "$ref" : "#/components/schemas/urn_samm_io.catenax.batch_3.0.0_PartNameCharacteristic" + }, + "partClassification" : { + "description" : "Property describing the classification of a part.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.part_classification_1.0.0_ClassificationCharacteristic" + } + }, + "required" : [ "manufacturerPartId", "nameAtManufacturer" ] + } + } + }, + "properties" : { + "catenaXId" : { + "description" : "The fully anonymous Catena-X ID of the batch, valid for the Catena-X dataspace.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.uuid_2.0.0_UuidV4Trait" + }, + "localIdentifiers" : { + "description" : "A local identifier enables identification of a part in a specific dataspace, but is not unique in Catena-X dataspace. Multiple local identifiers may exist.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.batch_3.0.0_LocalIdentifierCharacteristic" + }, + "manufacturingInformation" : { + "description" : "Information from manufacturing process, such as manufacturing date and manufacturing country", + "$ref" : "#/components/schemas/urn_samm_io.catenax.batch_3.0.0_ManufacturingCharacteristic" + }, + "partTypeInformation" : { + "description" : "The part type of which the batch has been instantiated of.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.batch_3.0.0_PartTypeInformationCharacteristic" + } + }, + "required" : [ "catenaXId", "localIdentifiers", "manufacturingInformation", "partTypeInformation" ] +} diff --git a/tx-backend/src/main/resources/schema/semantichub/JustInSequencePart_1.0.0-schema.json b/tx-backend/src/main/resources/schema/semantichub/JustInSequencePart_1.0.0-schema.json deleted file mode 100644 index 71efe7b264..0000000000 --- a/tx-backend/src/main/resources/schema/semantichub/JustInSequencePart_1.0.0-schema.json +++ /dev/null @@ -1,129 +0,0 @@ -{ - "$schema" : "http://json-schema.org/draft-04/schema", - "description" : "A just-in-sequence part is an instantiation of a (design-) part, where the particular instantiation can be uniquely identified by means of a combination of several IDs related to a just-in-sequence process.", - "type" : "object", - "components" : { - "schemas" : { - "urn_bamm_io.catenax.just_in_sequence_part_1.0.0_CatenaXIdTrait" : { - "type" : "string", - "description" : "The provided regular expression ensures that the UUID is composed of five groups of characters separated by hyphens, in the form 8-4-4-4-12 for a total of 36 characters (32 hexadecimal characters and 4 hyphens), optionally prefixed by \"urn:uuid:\" to make it an IRI.", - "pattern" : "(^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)|(^urn:uuid:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)" - }, - "urn_bamm_io.catenax.just_in_sequence_part_1.0.0_KeyCharacteristic" : { - "type" : "string", - "description" : "The key characteristic of a local identifier. A specific subset of keys is predefined, but additionally any other custom key is allowed. Predefined keys (to be used when applicable):\n- \"manufacturerId\" - The Business Partner Number (BPN) of the manufacturer. Value: BPN-Nummer\n- \"jisNumber\" - a number that is used to identify the call-off that can be assumed unique within the specific just-in-sequence process. This is typically not the sequence number, but the call-off number.\n- \"jisCallDate\" the date of the just-in-sequence call-off as stated on the call-off document itself. Value: following the ISO 8601 format as follows: \"YYYY-MM-DD\" or \"YYYY-MM-DDThh:mm:ss\" or \"YYYY-MM-DDThh:mm:ss±hh:mm\"\n- \"parentOrderNumber\" - a number identifying the just-in-sequence- part's destination parent part. The parent part is typically known upfront to the supplier for just-in-sequence parts. This might be a temporary unique identifier.\nNot all keys might be relevant for all just-in-sequence parts. It must be ensured that a combination of these identifiers and the optional manufacturer part ID or customer part ID leads to a unique just-in-sequence part." - }, - "urn_bamm_io.catenax.just_in_sequence_part_1.0.0_ValueCharacteristic" : { - "type" : "string", - "description" : "The value of an identifier." - }, - "urn_bamm_io.catenax.just_in_sequence_part_1.0.0_KeyValueList" : { - "description" : "A list of key value pairs for local identifiers, which are composed of a key and a corresponding value.", - "type" : "object", - "properties" : { - "key" : { - "description" : "The key of a local identifier. ", - "$ref" : "#/components/schemas/urn_bamm_io.catenax.just_in_sequence_part_1.0.0_KeyCharacteristic" - }, - "value" : { - "description" : "The value of an identifier.", - "$ref" : "#/components/schemas/urn_bamm_io.catenax.just_in_sequence_part_1.0.0_ValueCharacteristic" - } - }, - "required" : [ "key", "value" ] - }, - "urn_bamm_io.catenax.just_in_sequence_part_1.0.0_LocalIdentifierCharacteristic" : { - "description" : "A single just-in-sequence part may have multiple attributes, that uniquely identify a that part in a specific dataspace (e.g. the manufacturer`s dataspace)", - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/urn_bamm_io.catenax.just_in_sequence_part_1.0.0_KeyValueList" - }, - "uniqueItems" : true - }, - "urn_bamm_io.openmanufacturing_characteristic_2.0.0_Timestamp" : { - "type" : "string", - "pattern" : "-?([1-9][0-9]{3,}|0[0-9]{3})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])T(([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](\\.[0-9]+)?|(24:00:00(\\.0+)?))(Z|(\\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00))?", - "description" : "Describes a Property which contains the date and time with an optional timezone." - }, - "urn_bamm_io.catenax.just_in_sequence_part_1.0.0_ProductionCountryCodeTrait" : { - "type" : "string", - "description" : "Regular Expression that ensures a three-letter code ", - "pattern" : "^[A-Z][A-Z][A-Z]$" - }, - "urn_bamm_io.catenax.just_in_sequence_part_1.0.0_ManufacturingCharacteristic" : { - "description" : "Characteristic to describe manufacturing related data", - "type" : "object", - "properties" : { - "date" : { - "description" : "Timestamp of the manufacturing date as the final step in production process (e.g. final quality check, ready-for-shipment event)", - "$ref" : "#/components/schemas/urn_bamm_io.openmanufacturing_characteristic_2.0.0_Timestamp" - }, - "country" : { - "description" : "Country code where the part was manufactured", - "$ref" : "#/components/schemas/urn_bamm_io.catenax.just_in_sequence_part_1.0.0_ProductionCountryCodeTrait" - } - }, - "required" : [ "date" ] - }, - "urn_bamm_io.catenax.just_in_sequence_part_1.0.0_PartIdCharacteristic" : { - "type" : "string", - "description" : "The part ID is a multi-character string, usually assigned by an ERP system. Alternatively the ID of the part family can be used if no specific part ID exists." - }, - "urn_bamm_io.catenax.just_in_sequence_part_1.0.0_PartNameCharacteristic" : { - "type" : "string", - "description" : "Part Name in string format from the respective system in the value chain" - }, - "urn_bamm_io.catenax.just_in_sequence_part_1.0.0_ClassificationCharacteristic" : { - "type" : "string", - "description" : "A part type must be placed into one of the following classes: 'component', 'product', 'software', 'assembly', 'tool', or 'raw material'.", - "enum" : [ "product", "raw material", "software", "assembly", "tool", "component" ] - }, - "urn_bamm_io.catenax.just_in_sequence_part_1.0.0_PartTypeInformationCharacteristic" : { - "description" : "The characteristics of the part type", - "type" : "object", - "properties" : { - "manufacturerPartId" : { - "description" : "Part ID as assigned by the manufacturer of the part. The manufacturer Part ID identifies the part (as designed) in the manufacturer`s dataspace. The Part ID does not reference a specific instance of a part and thus should not be confused with the serial number or any other instance IDs. \nIf no specific part ID exists a part family ID may be substituted for it.", - "$ref" : "#/components/schemas/urn_bamm_io.catenax.just_in_sequence_part_1.0.0_PartIdCharacteristic" - }, - "customerPartId" : { - "description" : "Part ID as assigned by the customer of the part. The customer Part ID identifies the part (as designed) in the customer`s dataspace. The Part ID does not reference a specific instance of a part and thus should not be confused with the serial number or any other instance IDs. \nIf no specific part ID exists a part family ID may be substituted for it.\n", - "$ref" : "#/components/schemas/urn_bamm_io.catenax.just_in_sequence_part_1.0.0_PartIdCharacteristic" - }, - "nameAtManufacturer" : { - "description" : "Name of the part as assigned by the manufacturer", - "$ref" : "#/components/schemas/urn_bamm_io.catenax.just_in_sequence_part_1.0.0_PartNameCharacteristic" - }, - "nameAtCustomer" : { - "description" : "Name of the part as assigned by the customer", - "$ref" : "#/components/schemas/urn_bamm_io.catenax.just_in_sequence_part_1.0.0_PartNameCharacteristic" - }, - "classification" : { - "description" : "The classification of the part type according to STEP standard definition", - "$ref" : "#/components/schemas/urn_bamm_io.catenax.just_in_sequence_part_1.0.0_ClassificationCharacteristic" - } - }, - "required" : [ "nameAtManufacturer", "classification" ] - } - } - }, - "properties" : { - "catenaXId" : { - "description" : "The fully anonymous Catena-X ID of the just-in-sequence part, valid for the Catena-X dataspace.", - "$ref" : "#/components/schemas/urn_bamm_io.catenax.just_in_sequence_part_1.0.0_CatenaXIdTrait" - }, - "localIdentifiers" : { - "description" : "A local identifier enables identification of a part in a specific dataspace, but is not unique in Catena-X dataspace. Multiple local identifiers may exist.", - "$ref" : "#/components/schemas/urn_bamm_io.catenax.just_in_sequence_part_1.0.0_LocalIdentifierCharacteristic" - }, - "manufacturingInformation" : { - "description" : "Information from manufacturing process, such as manufacturing date and manufacturing country", - "$ref" : "#/components/schemas/urn_bamm_io.catenax.just_in_sequence_part_1.0.0_ManufacturingCharacteristic" - }, - "partTypeInformation" : { - "description" : "The part type or part family from which the just-in-sequence part has been instantiated.", - "$ref" : "#/components/schemas/urn_bamm_io.catenax.just_in_sequence_part_1.0.0_PartTypeInformationCharacteristic" - } - }, - "required" : [ "catenaXId", "localIdentifiers", "manufacturingInformation", "partTypeInformation" ] -} \ No newline at end of file diff --git a/tx-backend/src/main/resources/schema/semantichub/JustInSequencePart_3.0.0-schema.json b/tx-backend/src/main/resources/schema/semantichub/JustInSequencePart_3.0.0-schema.json new file mode 100644 index 0000000000..c246dba14d --- /dev/null +++ b/tx-backend/src/main/resources/schema/semantichub/JustInSequencePart_3.0.0-schema.json @@ -0,0 +1,201 @@ +{ + "$schema" : "http://json-schema.org/draft-04/schema", + "description" : "A just-in-sequence part is an instantiation of a (design-)part, where the particular instantiation can be uniquely identified by means of a combination of several IDs related to a just-in-sequence process.", + "type" : "object", + "components" : { + "schemas" : { + "urn_samm_io.catenax.shared.uuid_2.0.0_UuidV4Trait" : { + "type" : "string", + "description" : "The provided regular expression ensures that the UUID is composed of five groups of characters separated by hyphens, in the form 8-4-4-4-12 for a total of 36 characters (32 hexadecimal characters and 4 hyphens), optionally prefixed by \"urn:uuid:\" to make it an IRI.", + "pattern" : "(^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)|(^urn:uuid:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)" + }, + "urn_samm_io.catenax.just_in_sequence_part_3.0.0_KeyTrait" : { + "type" : "string", + "description" : "Constraint that ensures that the predefined keys are used.", + "pattern" : "^(manufacturerId|jisNumber|jisCallDate|parentOrderNumber|customKey:\\w+)$" + }, + "urn_samm_io.catenax.just_in_sequence_part_3.0.0_ValueCharacteristic" : { + "type" : "string", + "description" : "The value of an identifier." + }, + "urn_samm_io.catenax.just_in_sequence_part_3.0.0_KeyValueList" : { + "description" : "A list of key value pairs for local identifiers, which are composed of a key and a corresponding value.", + "type" : "object", + "properties" : { + "key" : { + "description" : "The key of a local identifier. ", + "$ref" : "#/components/schemas/urn_samm_io.catenax.just_in_sequence_part_3.0.0_KeyTrait" + }, + "value" : { + "description" : "The value of an identifier.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.just_in_sequence_part_3.0.0_ValueCharacteristic" + } + }, + "required" : [ "key", "value" ] + }, + "urn_samm_io.catenax.just_in_sequence_part_3.0.0_LocalIdentifierCharacteristic" : { + "description" : "A single just-in-sequence part may have multiple attributes, that uniquely identify a that part in a specific dataspace (e.g. the manufacturer`s dataspace)", + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/urn_samm_io.catenax.just_in_sequence_part_3.0.0_KeyValueList" + }, + "uniqueItems" : true + }, + "urn_samm_io.catenax.just_in_sequence_part_3.0.0_DateTimeTrait" : { + "type" : "string", + "description" : "Regular Expression to enable UTC and Timezone formats and the possibility to exclude time information.", + "pattern" : "^(?:[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(?:[.][0-9]+)?Z|[0-9]{4}-[0-9]{2}-[0-9]{2}(?:T[0-9]{2}:[0-9]{2}:[0-9]{2}(?:[.][0-9]+)?(?:Z|[+-][0-9]{2}:[0-9]{2}))?)$" + }, + "urn_samm_io.catenax.just_in_sequence_part_3.0.0_ProductionCountryCodeTrait" : { + "type" : "string", + "description" : "Regular Expression that ensures a three-letter code ", + "pattern" : "^[A-Z][A-Z][A-Z]$" + }, + "urn_samm_io.catenax.shared.business_partner_number_2.0.0_BpnsTrait" : { + "type" : "string", + "description" : "The provided regular expression ensures that the BPNS is composed of prefix 'BPNS', 10 digits and two alphanumeric letters.", + "pattern" : "^BPNS[a-zA-Z0-9]{12}$" + }, + "urn_samm_io.catenax.shared.part_site_information_as_built_2.0.0_FunctionCharacteristic" : { + "type" : "string", + "description" : "Describes the characteristics of the function for a site related to the respective part.", + "enum" : [ "production", "warehouse", "spare part warehouse" ] + }, + "urn_samm_io.catenax.shared.part_site_information_as_built_2.0.0_SitesEntity" : { + "description" : "Describes the ID and function of a site for the associated part in the AsBuilt context(e.g. SerialPart, Batch, jIS).", + "type" : "object", + "properties" : { + "catenaXsiteId" : { + "description" : "The identifier of the site according to Catena-X BPDM. The catenaXsiteId must be a valid Catena-X BPN. The BPN is a unique, unchangeable identifier for Business Partners / company locations from foundation to closure, regardless of the different business relationships / structures between or within the Business Partners or company locations.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.business_partner_number_2.0.0_BpnsTrait" + }, + "function" : { + "description" : "The function of the site in relation to the part(i.e. the activity within the value chain of the part that is performed at the site)", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.part_site_information_as_built_2.0.0_FunctionCharacteristic" + } + }, + "required" : [ "catenaXsiteId", "function" ] + }, + "urn_samm_io.catenax.shared.part_site_information_as_built_2.0.0_SitesCharacteristic" : { + "description" : "Sites Characteristic", + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.part_site_information_as_built_2.0.0_SitesEntity" + }, + "uniqueItems" : true + }, + "urn_samm_io.catenax.just_in_sequence_part_3.0.0_ManufacturingCharacteristic" : { + "description" : "Characteristic to describe manufacturing related data", + "type" : "object", + "properties" : { + "date" : { + "description" : "Timestamp of the manufacturing date as the final step in production process (e.g. final quality check, ready-for-shipment event)", + "$ref" : "#/components/schemas/urn_samm_io.catenax.just_in_sequence_part_3.0.0_DateTimeTrait" + }, + "country" : { + "description" : "Country code where the part was manufactured", + "$ref" : "#/components/schemas/urn_samm_io.catenax.just_in_sequence_part_3.0.0_ProductionCountryCodeTrait" + }, + "sites" : { + "description" : "A site is a delimited geographical area where a legal entity does business(geographical address with geo coordinates).A site always has a primary physical address. It is possible that further physical addresses are specified for the site. P.O. box details are only possible in addition to the physical address. A site has a 1:n relation to addresses, means at least 1 address is necessary and multiple addresses are possible.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.part_site_information_as_built_2.0.0_SitesCharacteristic" + } + }, + "required" : [ "date" ] + }, + "urn_samm_io.catenax.just_in_sequence_part_3.0.0_PartIdCharacteristic" : { + "type" : "string", + "description" : "The part ID is a multi-character string, usually assigned by an ERP system. Alternatively the ID of the part family can be used if no specific part ID exists." + }, + "urn_samm_io.catenax.just_in_sequence_part_3.0.0_PartNameCharacteristic" : { + "type" : "string", + "description" : "Part Name in string format from the respective system in the value chain" + }, + "urn_samm_io.catenax.shared.part_classification_1.0.0_ClassificationStandardCharacteristic" : { + "type" : "string", + "description" : "Identified classification standards that align to the Catena-X needs." + }, + "urn_samm_io.catenax.shared.part_classification_1.0.0_ClassificationIDCharacteristic" : { + "type" : "string", + "description" : "It can be numeric or a string, depending on the chosen classification standard." + }, + "urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Text" : { + "type" : "string", + "description" : "Describes a Property which contains plain text. This is intended exclusively for human readable strings, not for identifiers, measurement values, etc." + }, + "urn_samm_io.catenax.shared.part_classification_1.0.0_ClassificationEntity" : { + "description" : "Encapsulates data related to the classification of the part.", + "type" : "object", + "properties" : { + "classificationStandard" : { + "description" : "Identified classification standards that align to the Catena-X needs.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.part_classification_1.0.0_ClassificationStandardCharacteristic" + }, + "classificationID" : { + "description" : "The classification ID of the part type according to the corresponding standard definition mentioned in the key value pair.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.part_classification_1.0.0_ClassificationIDCharacteristic" + }, + "classificationDescription" : { + "description" : "Optional property describing the classification standard.", + "$ref" : "#/components/schemas/urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Text" + } + }, + "required" : [ "classificationStandard", "classificationID" ] + }, + "urn_samm_io.catenax.shared.part_classification_1.0.0_ClassificationCharacteristic" : { + "description" : "Classification characteristic enabling a set of further properties.", + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.part_classification_1.0.0_ClassificationEntity" + }, + "uniqueItems" : true + }, + "urn_samm_io.catenax.just_in_sequence_part_3.0.0_PartTypeInformationCharacteristic" : { + "description" : "The characteristics of the part type", + "type" : "object", + "properties" : { + "manufacturerPartId" : { + "description" : "Part ID as assigned by the manufacturer of the part. The manufacturer Part ID identifies the part (as designed)in the manufacturer`s dataspace. The Part ID does not reference a specific instance of a part and thus should not be confused with the serial number or any other instance IDs. \nIf no specific part ID exists a part family ID may be substituted for it.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.just_in_sequence_part_3.0.0_PartIdCharacteristic" + }, + "customerPartId" : { + "description" : "Part ID as assigned by the customer of the part. The customer Part ID identifies the part (as designed)in the customer`s dataspace. The Part ID does not reference a specific instance of a part and thus should not be confused with the serial number or any other instance IDs. \nIf no specific part ID exists a part family ID may be substituted for it.\n", + "$ref" : "#/components/schemas/urn_samm_io.catenax.just_in_sequence_part_3.0.0_PartIdCharacteristic" + }, + "nameAtManufacturer" : { + "description" : "Name of the part as assigned by the manufacturer", + "$ref" : "#/components/schemas/urn_samm_io.catenax.just_in_sequence_part_3.0.0_PartNameCharacteristic" + }, + "nameAtCustomer" : { + "description" : "Name of the part as assigned by the customer", + "$ref" : "#/components/schemas/urn_samm_io.catenax.just_in_sequence_part_3.0.0_PartNameCharacteristic" + }, + "partClassification" : { + "description" : "Property describing the classification of a part.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.part_classification_1.0.0_ClassificationCharacteristic" + } + }, + "required" : [ "nameAtManufacturer" ] + } + } + }, + "properties" : { + "catenaXId" : { + "description" : "The fully anonymous Catena-X ID of the just-in-sequence part, valid for the Catena-X dataspace.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.uuid_2.0.0_UuidV4Trait" + }, + "localIdentifiers" : { + "description" : "A local identifier enables identification of a part in a specific dataspace, but is not unique in Catena-X dataspace. Multiple local identifiers may exist.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.just_in_sequence_part_3.0.0_LocalIdentifierCharacteristic" + }, + "manufacturingInformation" : { + "description" : "Information from manufacturing process, such as manufacturing date and manufacturing country", + "$ref" : "#/components/schemas/urn_samm_io.catenax.just_in_sequence_part_3.0.0_ManufacturingCharacteristic" + }, + "partTypeInformation" : { + "description" : "The part type or part family from which the just-in-sequence part has been instantiated.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.just_in_sequence_part_3.0.0_PartTypeInformationCharacteristic" + } + }, + "required" : [ "catenaXId", "localIdentifiers", "manufacturingInformation", "partTypeInformation" ] +} diff --git a/tx-backend/src/main/resources/schema/semantichub/PartAsPlanned_1.0.1-schema.json b/tx-backend/src/main/resources/schema/semantichub/PartAsPlanned_1.0.1-schema.json deleted file mode 100644 index 09353d163d..0000000000 --- a/tx-backend/src/main/resources/schema/semantichub/PartAsPlanned_1.0.1-schema.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "$schema" : "http://json-schema.org/draft-04/schema", - "description" : "A Part as Planned represents an item in the Catena-X Bill of Material (BOM) in As-Planned lifecycle status in a specific version. ", - "type" : "object", - "components" : { - "schemas" : { - "urn_bamm_io.catenax.part_as_planned_1.0.1_CatenaXIdTrait" : { - "type" : "string", - "description" : "The provided regular expression ensures that the UUID is composed of five groups of characters separated by hyphens, in the form 8-4-4-4-12 for a total of 36 characters (32 hexadecimal characters and 4 hyphens).", - "pattern" : "(^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)|(^urn:uuid:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)" - }, - "urn_bamm_io.catenax.part_as_planned_1.0.1_PartIdCharacteristic" : { - "type" : "string", - "description" : "The part ID is a multi-character string, ususally assigned by an ERP system" - }, - "urn_bamm_io.catenax.part_as_planned_1.0.1_PartNameCharacteristic" : { - "type" : "string", - "description" : "Part Name in string format from the respective system in the value chain" - }, - "urn_bamm_io.catenax.part_as_planned_1.0.1_ClassificationEnumerationCharacteristic" : { - "type" : "string", - "description" : "A part type must be placed into one of the following classes: 'component', 'product', 'software', ‘assembly’, 'tool', or 'raw material'.", - "enum" : [ "product", "raw material", "software", "assembly", "tool", "component" ] - }, - "urn_bamm_io.catenax.part_as_planned_1.0.1_PartTypeInformationCharacteristic" : { - "description" : "The characteristics of the part type", - "type" : "object", - "properties" : { - "manufacturerPartId" : { - "description" : "Part ID as assigned by the manufacturer of the part. The Part ID identifies the part in the manufacturer`s dataspace. The Part ID references a specific version of a part. The version number must be included in the Part ID if it is available.\n\nThe Part ID does not reference a specific instance of a part and must not be confused with the serial number.", - "$ref" : "#/components/schemas/urn_bamm_io.catenax.part_as_planned_1.0.1_PartIdCharacteristic" - }, - "nameAtManufacturer" : { - "description" : "Name of the part as assigned by the manufacturer", - "$ref" : "#/components/schemas/urn_bamm_io.catenax.part_as_planned_1.0.1_PartNameCharacteristic" - }, - "classification" : { - "description" : "The classification of the part type according to STEP standard definition", - "$ref" : "#/components/schemas/urn_bamm_io.catenax.part_as_planned_1.0.1_ClassificationEnumerationCharacteristic" - } - }, - "required" : [ "manufacturerPartId", "nameAtManufacturer", "classification" ] - }, - "urn_bamm_io.openmanufacturing_characteristic_2.0.0_Timestamp" : { - "type" : "string", - "pattern" : "-?([1-9][0-9]{3,}|0[0-9]{3})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])T(([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](\\.[0-9]+)?|(24:00:00(\\.0+)?))(Z|(\\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00))?", - "description" : "Describes a Property which contains the date and time with an optional timezone." - }, - "urn_bamm_io.catenax.part_as_planned_1.0.1_ValidityPeriodCharacteristic" : { - "description" : "Characteristic to define a continuous validity period.", - "type" : "object", - "properties" : { - "validFrom" : { - "description" : "Start date of validity period", - "$ref" : "#/components/schemas/urn_bamm_io.openmanufacturing_characteristic_2.0.0_Timestamp" - }, - "validTo" : { - "description" : "End date of validity period", - "$ref" : "#/components/schemas/urn_bamm_io.openmanufacturing_characteristic_2.0.0_Timestamp" - } - } - } - } - }, - "properties" : { - "catenaXId" : { - "description" : "The fully anonymous Catena-X ID of the serialized part, valid for the Catena-X dataspace.", - "$ref" : "#/components/schemas/urn_bamm_io.catenax.part_as_planned_1.0.1_CatenaXIdTrait" - }, - "partTypeInformation" : { - "description" : "The part type from which the serialized part has been instantiated", - "$ref" : "#/components/schemas/urn_bamm_io.catenax.part_as_planned_1.0.1_PartTypeInformationCharacteristic" - }, - "validityPeriod" : { - "description" : "The period of time during which the Part is offered by the manufacturer and can be purchased by customers.", - "$ref" : "#/components/schemas/urn_bamm_io.catenax.part_as_planned_1.0.1_ValidityPeriodCharacteristic" - } - }, - "required" : [ "catenaXId", "partTypeInformation" ] -} \ No newline at end of file diff --git a/tx-backend/src/main/resources/schema/semantichub/PartAsPlanned_2.0.0-schema.json b/tx-backend/src/main/resources/schema/semantichub/PartAsPlanned_2.0.0-schema.json new file mode 100644 index 0000000000..1309f7aaf0 --- /dev/null +++ b/tx-backend/src/main/resources/schema/semantichub/PartAsPlanned_2.0.0-schema.json @@ -0,0 +1,106 @@ +{ + "$schema" : "http://json-schema.org/draft-04/schema", + "description" : "A Part as Planned represents an item in the Catena-X Bill of Material(BOM) in As-Planned lifecycle status in a specific version. ", + "type" : "object", + "components" : { + "schemas" : { + "urn_samm_io.catenax.shared.uuid_1.0.0_UuidV4Trait" : { + "type" : "string", + "description" : "The provided regular expression ensures that the UUID is composed of five groups of characters separated by hyphens, in the form 8-4-4-4-12 for a total of 36 characters (32 hexadecimal characters and 4 hyphens), optionally prefixed by \"urn:uuid:\" to make it an IRI.", + "pattern" : "(^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)|(^urn:uuid:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)" + }, + "urn_samm_io.catenax.part_as_planned_2.0.0_PartIdCharacteristic" : { + "type" : "string", + "description" : "The part ID is a multi-character string, usually assigned by an ERP system" + }, + "urn_samm_io.catenax.part_as_planned_2.0.0_PartNameCharacteristic" : { + "type" : "string", + "description" : "Part Name in string format from the respective system in the value chain" + }, + "urn_samm_io.catenax.part_as_planned_2.0.0_ClassificationEnumerationCharacteristic" : { + "type" : "string", + "description" : "A part type must be placed into one of the following classes: 'component', 'product', 'software', ?assembly?, 'tool', or 'raw material'.", + "enum" : [ "product", "raw material", "software", "assembly", "tool", "component" ] + }, + "urn_samm_io.catenax.part_as_planned_2.0.0_PartTypeInformationCharacteristic" : { + "description" : "The characteristics of the part type", + "type" : "object", + "properties" : { + "manufacturerPartId" : { + "description" : "Part ID as assigned by the manufacturer of the part. The Part ID identifies the part in the manufacturer`s dataspace. The Part ID references a specific version of a part. The version number must be included in the Part ID if it is available.\n\nThe Part ID does not reference a specific instance of a part and must not be confused with the serial number.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.part_as_planned_2.0.0_PartIdCharacteristic" + }, + "nameAtManufacturer" : { + "description" : "Name of the part as assigned by the manufacturer", + "$ref" : "#/components/schemas/urn_samm_io.catenax.part_as_planned_2.0.0_PartNameCharacteristic" + }, + "classification" : { + "description" : "The classification of the part type according to STEP standard definition", + "$ref" : "#/components/schemas/urn_samm_io.catenax.part_as_planned_2.0.0_ClassificationEnumerationCharacteristic" + } + }, + "required" : [ "manufacturerPartId", "nameAtManufacturer", "classification" ] + }, + "urn_samm_io.catenax.shared.business_partner_number_1.0.0_BpnsCharacteristic" : { + "type" : "string", + "description" : "BPNS (Business Partner Number Site) represents a site which can be a production plant. A site can also be e.g. an office or a warehouse. An information related to a site is e.g. needed for reporting issues (How many sites does e.g. Beispiel AG have?), status of operation (out of operations due to environmental disaster), for certificates on site level (e.g. environment certificates) or for internal regulations on site level, (e.g. security topics, Corona rules,...). Several addresses (= BPNA with different streets and different gates) can belong to one site. A BPNS should be always linked to one BPNL via relationship 'belongs to legal entity'." + }, + "urn_samm_io.catenax.part_as_planned_2.0.0_FunctionCharacteristic" : { + "type" : "string", + "description" : "Describes the characteristics of the function for a site related to the respective part", + "enum" : [ "production", "warehouse", "spare part warehouse" ] + }, + "urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Timestamp" : { + "type" : "string", + "pattern" : "-?([1-9][0-9]{3,}|0[0-9]{3})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])T(([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](\\.[0-9]+)?|(24:00:00(\\.0+)?))(Z|(\\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00))?", + "description" : "Describes a Property which contains the date and time with an optional timezone." + }, + "urn_samm_io.catenax.part_as_planned_2.0.0_partSitesInformationAsPlannedEntity" : { + "description" : "Describes the ID, function and validity date of a site for the associated part in the AsPlanned context.", + "type" : "object", + "properties" : { + "catenaXsiteId" : { + "description" : "The identifier of the site according to Catena-X BPDM. The catenaXsiteId must be a valid Catena-X BPN. The BPN is a unique, unchangeable identifier for Business Partners / company locations from foundation to closure, regardless of the different business relationships / structures between or within the Business Partners or company locations.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.business_partner_number_1.0.0_BpnsCharacteristic" + }, + "function" : { + "description" : "The function of the site in relation to the part(i.e. the activity within the value chain of the part that is performed at the site)", + "$ref" : "#/components/schemas/urn_samm_io.catenax.part_as_planned_2.0.0_FunctionCharacteristic" + }, + "functionValidFrom" : { + "description" : "Timestamp, from when the site has the specified function for the given part", + "$ref" : "#/components/schemas/urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Timestamp" + }, + "functionValidUntil" : { + "description" : "Timestamp, until when the site has the specified function for the given part", + "$ref" : "#/components/schemas/urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Timestamp" + } + }, + "required" : [ "catenaXsiteId", "function" ] + }, + "urn_samm_io.catenax.part_as_planned_2.0.0_partSitesInformationAsPlannedCharacteristic" : { + "description" : "The characteristic of the part site information that represents a set of possible site to a repective part. ", + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/urn_samm_io.catenax.part_as_planned_2.0.0_partSitesInformationAsPlannedEntity" + }, + "uniqueItems" : true + } + } + }, + "properties" : { + "catenaXId" : { + "description" : "The fully anonymous Catena-X ID of the serialized part, valid for the Catena-X dataspace.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.uuid_1.0.0_UuidV4Trait" + }, + "partTypeInformation" : { + "description" : "The part type from which the serialized part has been instantiated", + "$ref" : "#/components/schemas/urn_samm_io.catenax.part_as_planned_2.0.0_PartTypeInformationCharacteristic" + }, + "partSitesInformationAsPlanned" : { + "description" : "A site is a delimited geographical area where a legal entity does business(geographical address with geo coordinates).A site always has a primary physical address. It is possible that further physical addresses are specified for the site. P.O. box details are only possible in addition to the physical address. A site has a 1:n relation to addresses, means at least 1 address is necessary and multiple addresses are possible.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.part_as_planned_2.0.0_partSitesInformationAsPlannedCharacteristic" + } + }, + "required" : [ "catenaXId", "partTypeInformation" ] +} diff --git a/tx-backend/src/main/resources/schema/semantichub/SerialPart_1.0.1-schema.json b/tx-backend/src/main/resources/schema/semantichub/SerialPart_1.0.1-schema.json deleted file mode 100644 index a1d78b4c8a..0000000000 --- a/tx-backend/src/main/resources/schema/semantichub/SerialPart_1.0.1-schema.json +++ /dev/null @@ -1,129 +0,0 @@ -{ - "$schema" : "http://json-schema.org/draft-04/schema", - "description" : "A serialized part is an instantiation of a (design-) part, where the particular instantiation can be uniquely identified by means of a serial number or a similar identifier (e.g. VAN) or a combination of multiple identifiers (e.g. combination of manufacturer, date and number)", - "type" : "object", - "components" : { - "schemas" : { - "urn_samm_io.catenax.serial_part_1.0.1_CatenaXIdTrait" : { - "type" : "string", - "description" : "The provided regular expression ensures that the UUID is composed of five groups of characters separated by hyphens, in the form 8-4-4-4-12 for a total of 36 characters (32 hexadecimal characters and 4 hyphens), optionally prefixed by \"urn:uuid:\" to make it an IRI.", - "pattern" : "(^urn:uuid:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)" - }, - "urn_samm_io.catenax.serial_part_1.0.1_KeyCharacteristic" : { - "type" : "string", - "description" : "The key characteristic of a local identifier. A specific subset of keys is predefined, but additionally any other custom key is allowed. Predefined keys (to be used when applicable):\n- \"manufacturerId\" - The Business Partner Number (BPN) of the manufacturer. Value: BPN-Nummer\n- \"partInstanceId\" - The identifier of the manufacturer for the serialized instance of the part, e.g. the serial number\n- \"batchId\" - The identifier of the batch, to which the serialzed part belongs\n- \"van\" - The anonymized vehicle identification number (VIN). Value: anonymized VIN according to OEM anonymization rules. Note: If the key \"van\" is available, \"partInstanceId\" must also be available and hold the identical value." - }, - "urn_samm_io.catenax.serial_part_1.0.1_ValueCharacteristic" : { - "type" : "string", - "description" : "The value of an identifier." - }, - "urn_samm_io.catenax.serial_part_1.0.1_KeyValueList" : { - "description" : "A list of key value pairs for local identifiers, which are composed of a key and a corresponding value.", - "type" : "object", - "properties" : { - "key" : { - "description" : "The key of a local identifier. ", - "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_1.0.1_KeyCharacteristic" - }, - "value" : { - "description" : "The value of an identifier.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_1.0.1_ValueCharacteristic" - } - }, - "required" : [ "key", "value" ] - }, - "urn_samm_io.catenax.serial_part_1.0.1_LocalIdentifierCharacteristic" : { - "description" : "A single serialized part may have multiple attributes, that uniquely identify a that part in a specific dataspace (e.g. the manufacturer`s dataspace)", - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_1.0.1_KeyValueList" - }, - "uniqueItems" : true - }, - "urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Timestamp" : { - "type" : "string", - "pattern" : "-?([1-9][0-9]{3,}|0[0-9]{3})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])T(([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](\\.[0-9]+)?|(24:00:00(\\.0+)?))(Z|(\\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00))?", - "description" : "Describes a Property which contains the date and time with an optional timezone." - }, - "urn_samm_io.catenax.serial_part_1.0.1_ProductionCountryCodeTrait" : { - "type" : "string", - "description" : "Regular Expression that ensures a three-letter code ", - "pattern" : "^[A-Z][A-Z][A-Z]$" - }, - "urn_samm_io.catenax.serial_part_1.0.1_ManufacturingCharacteristic" : { - "description" : "Characteristic to describe manufacturing related data", - "type" : "object", - "properties" : { - "date" : { - "description" : "Timestamp of the manufacturing date as the final step in production process (e.g. final quality check, ready-for-shipment event)", - "$ref" : "#/components/schemas/urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Timestamp" - }, - "country" : { - "description" : "Country code where the part was manufactured", - "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_1.0.1_ProductionCountryCodeTrait" - } - }, - "required" : [ "date" ] - }, - "urn_samm_io.catenax.serial_part_1.0.1_PartIdCharacteristic" : { - "type" : "string", - "description" : "The part ID is a multi-character string, ususally assigned by an ERP system" - }, - "urn_samm_io.catenax.serial_part_1.0.1_PartNameCharacteristic" : { - "type" : "string", - "description" : "Part Name in string format from the respective system in the value chain" - }, - "urn_samm_io.catenax.serial_part_1.0.1_ClassificationCharacteristic" : { - "type" : "string", - "description" : "A part type must be placed into one of the following classes: 'component', 'product', 'software', 'assembly', 'tool', or 'raw material'.", - "enum" : [ "product", "raw material", "software", "assembly", "tool", "component" ] - }, - "urn_samm_io.catenax.serial_part_1.0.1_PartTypeInformationCharacteristic" : { - "description" : "The characteristics of the part type", - "type" : "object", - "properties" : { - "manufacturerPartId" : { - "description" : "Part ID as assigned by the manufacturer of the part. The Part ID identifies the part (as designed) in the manufacturer`s dataspace. The Part ID does not reference a specific instance of a part and thus should not be confused with the serial number.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_1.0.1_PartIdCharacteristic" - }, - "customerPartId" : { - "description" : "Part ID as assigned by the manufacturer of the part. The Part ID identifies the part (as designed) in the customer`s dataspace. The Part ID does not reference a specific instance of a part and thus should not be confused with the serial number.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_1.0.1_PartIdCharacteristic" - }, - "nameAtManufacturer" : { - "description" : "Name of the part as assigned by the manufacturer", - "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_1.0.1_PartNameCharacteristic" - }, - "nameAtCustomer" : { - "description" : "Name of the part as assigned by the customer", - "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_1.0.1_PartNameCharacteristic" - }, - "classification" : { - "description" : "The classification of the part type according to STEP standard definition", - "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_1.0.1_ClassificationCharacteristic" - } - }, - "required" : [ "manufacturerPartId", "nameAtManufacturer", "classification" ] - } - } - }, - "properties" : { - "catenaXId" : { - "description" : "The fully anonymous Catena-X ID of the serialized part, valid for the Catena-X dataspace.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_1.0.1_CatenaXIdTrait" - }, - "localIdentifiers" : { - "description" : "A local identifier enables identification of a part in a specific dataspace, but is not unique in Catena-X dataspace. Multiple local identifiers may exist.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_1.0.1_LocalIdentifierCharacteristic" - }, - "manufacturingInformation" : { - "description" : "Information from manufacturing process, such as manufacturing date and manufacturing country", - "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_1.0.1_ManufacturingCharacteristic" - }, - "partTypeInformation" : { - "description" : "The part type from which the serialized part has been instantiated", - "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_1.0.1_PartTypeInformationCharacteristic" - } - }, - "required" : [ "catenaXId", "localIdentifiers", "manufacturingInformation", "partTypeInformation" ] -} \ No newline at end of file diff --git a/tx-backend/src/main/resources/schema/semantichub/SerialPart_3.0.0-schema.json b/tx-backend/src/main/resources/schema/semantichub/SerialPart_3.0.0-schema.json new file mode 100644 index 0000000000..26d0224082 --- /dev/null +++ b/tx-backend/src/main/resources/schema/semantichub/SerialPart_3.0.0-schema.json @@ -0,0 +1,201 @@ +{ + "$schema" : "http://json-schema.org/draft-04/schema", + "description" : "A serialized part is an instantiation of a (design-)part, where the particular instantiation can be uniquely identified by means of a serial number or a similar identifier (e.g. VAN)or a combination of multiple identifiers (e.g. combination of manufacturer, date and number)", + "type" : "object", + "components" : { + "schemas" : { + "urn_samm_io.catenax.shared.uuid_2.0.0_UuidV4Trait" : { + "type" : "string", + "description" : "The provided regular expression ensures that the UUID is composed of five groups of characters separated by hyphens, in the form 8-4-4-4-12 for a total of 36 characters (32 hexadecimal characters and 4 hyphens), optionally prefixed by \"urn:uuid:\" to make it an IRI.", + "pattern" : "(^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)|(^urn:uuid:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)" + }, + "urn_samm_io.catenax.serial_part_3.0.0_KeyTrait" : { + "type" : "string", + "description" : "Constraint that ensures that the standard keys and custom key prefixes can be used.", + "pattern" : "^(manufacturerId|partInstanceId|batchId|van|customKey:\\w+)$" + }, + "urn_samm_io.catenax.serial_part_3.0.0_ValueCharacteristic" : { + "type" : "string", + "description" : "The value of an identifier." + }, + "urn_samm_io.catenax.serial_part_3.0.0_KeyValueList" : { + "description" : "A list of key value pairs for local identifiers, which are composed of a key and a corresponding value.", + "type" : "object", + "properties" : { + "key" : { + "description" : "The key of a local identifier. ", + "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_3.0.0_KeyTrait" + }, + "value" : { + "description" : "The value of an identifier.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_3.0.0_ValueCharacteristic" + } + }, + "required" : [ "key", "value" ] + }, + "urn_samm_io.catenax.serial_part_3.0.0_LocalIdentifierCharacteristic" : { + "description" : "A single serialized part may have multiple attributes, that uniquely identify a that part in a specific dataspace (e.g. the manufacturer`s dataspace)", + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_3.0.0_KeyValueList" + }, + "uniqueItems" : true + }, + "urn_samm_io.catenax.serial_part_3.0.0_DateTimeTrait" : { + "type" : "string", + "description" : "Regular Expression to enable UTC and Timezone formats and the possibility to exclude time information.", + "pattern" : "^(?:[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(?:[.][0-9]+)?Z|[0-9]{4}-[0-9]{2}-[0-9]{2}(?:T[0-9]{2}:[0-9]{2}:[0-9]{2}(?:[.][0-9]+)?(?:Z|[+-][0-9]{2}:[0-9]{2}))?)$" + }, + "urn_samm_io.catenax.serial_part_3.0.0_ProductionCountryCodeTrait" : { + "type" : "string", + "description" : "Regular Expression that ensures a three-letter code ", + "pattern" : "^[A-Z][A-Z][A-Z]$" + }, + "urn_samm_io.catenax.shared.business_partner_number_2.0.0_BpnsTrait" : { + "type" : "string", + "description" : "The provided regular expression ensures that the BPNS is composed of prefix 'BPNS', 10 digits and two alphanumeric letters.", + "pattern" : "^BPNS[a-zA-Z0-9]{12}$" + }, + "urn_samm_io.catenax.shared.part_site_information_as_built_2.0.0_FunctionCharacteristic" : { + "type" : "string", + "description" : "Describes the characteristics of the function for a site related to the respective part.", + "enum" : [ "production", "warehouse", "spare part warehouse" ] + }, + "urn_samm_io.catenax.shared.part_site_information_as_built_2.0.0_SitesEntity" : { + "description" : "Describes the ID and function of a site for the associated part in the AsBuilt context(e.g. SerialPart, Batch, jIS).", + "type" : "object", + "properties" : { + "catenaXsiteId" : { + "description" : "The identifier of the site according to Catena-X BPDM. The catenaXsiteId must be a valid Catena-X BPN. The BPN is a unique, unchangeable identifier for Business Partners / company locations from foundation to closure, regardless of the different business relationships / structures between or within the Business Partners or company locations.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.business_partner_number_2.0.0_BpnsTrait" + }, + "function" : { + "description" : "The function of the site in relation to the part(i.e. the activity within the value chain of the part that is performed at the site)", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.part_site_information_as_built_2.0.0_FunctionCharacteristic" + } + }, + "required" : [ "catenaXsiteId", "function" ] + }, + "urn_samm_io.catenax.shared.part_site_information_as_built_2.0.0_SitesCharacteristic" : { + "description" : "Sites Characteristic", + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.part_site_information_as_built_2.0.0_SitesEntity" + }, + "uniqueItems" : true + }, + "urn_samm_io.catenax.serial_part_3.0.0_ManufacturingCharacteristic" : { + "description" : "Characteristic to describe manufacturing related data", + "type" : "object", + "properties" : { + "date" : { + "description" : "Timestamp of the manufacturing date as the final step in production process (e.g. final quality check, ready-for-shipment event)", + "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_3.0.0_DateTimeTrait" + }, + "country" : { + "description" : "Country code where the part was manufactured", + "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_3.0.0_ProductionCountryCodeTrait" + }, + "sites" : { + "description" : "A site is a delimited geographical area where a legal entity does business(geographical address with geo coordinates).A site always has a primary physical address. It is possible that further physical addresses are specified for the site. P.O. box details are only possible in addition to the physical address. A site has a 1:n relation to addresses, means at least 1 address is necessary and multiple addresses are possible.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.part_site_information_as_built_2.0.0_SitesCharacteristic" + } + }, + "required" : [ "date" ] + }, + "urn_samm_io.catenax.serial_part_3.0.0_PartIdCharacteristic" : { + "type" : "string", + "description" : "The part ID is a multi-character string, usually assigned by an ERP system" + }, + "urn_samm_io.catenax.serial_part_3.0.0_PartNameCharacteristic" : { + "type" : "string", + "description" : "Part Name in string format from the respective system in the value chain" + }, + "urn_samm_io.catenax.shared.part_classification_1.0.0_ClassificationStandardCharacteristic" : { + "type" : "string", + "description" : "Identified classification standards that align to the Catena-X needs." + }, + "urn_samm_io.catenax.shared.part_classification_1.0.0_ClassificationIDCharacteristic" : { + "type" : "string", + "description" : "It can be numeric or a string, depending on the chosen classification standard." + }, + "urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Text" : { + "type" : "string", + "description" : "Describes a Property which contains plain text. This is intended exclusively for human readable strings, not for identifiers, measurement values, etc." + }, + "urn_samm_io.catenax.shared.part_classification_1.0.0_ClassificationEntity" : { + "description" : "Encapsulates data related to the classification of the part.", + "type" : "object", + "properties" : { + "classificationStandard" : { + "description" : "Identified classification standards that align to the Catena-X needs.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.part_classification_1.0.0_ClassificationStandardCharacteristic" + }, + "classificationID" : { + "description" : "The classification ID of the part type according to the corresponding standard definition mentioned in the key value pair.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.part_classification_1.0.0_ClassificationIDCharacteristic" + }, + "classificationDescription" : { + "description" : "Optional property describing the classification standard.", + "$ref" : "#/components/schemas/urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Text" + } + }, + "required" : [ "classificationStandard", "classificationID" ] + }, + "urn_samm_io.catenax.shared.part_classification_1.0.0_ClassificationCharacteristic" : { + "description" : "Classification characteristic enabling a set of further properties.", + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.part_classification_1.0.0_ClassificationEntity" + }, + "uniqueItems" : true + }, + "urn_samm_io.catenax.serial_part_3.0.0_PartTypeInformationCharacteristic" : { + "description" : "The characteristics of the part type", + "type" : "object", + "properties" : { + "manufacturerPartId" : { + "description" : "Part ID as assigned by the manufacturer of the part. The Part ID identifies the part (as designed)in the manufacturer`s dataspace. The Part ID does not reference a specific instance of a part and thus should not be confused with the serial number.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_3.0.0_PartIdCharacteristic" + }, + "customerPartId" : { + "description" : "Part ID as assigned by the manufacturer of the part. The Part ID identifies the part (as designed)in the customer`s dataspace. The Part ID does not reference a specific instance of a part and thus should not be confused with the serial number.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_3.0.0_PartIdCharacteristic" + }, + "nameAtManufacturer" : { + "description" : "Name of the part as assigned by the manufacturer", + "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_3.0.0_PartNameCharacteristic" + }, + "nameAtCustomer" : { + "description" : "Name of the part as assigned by the customer", + "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_3.0.0_PartNameCharacteristic" + }, + "partClassification" : { + "description" : "Property describing the classification of a part.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.part_classification_1.0.0_ClassificationCharacteristic" + } + }, + "required" : [ "manufacturerPartId", "nameAtManufacturer" ] + } + } + }, + "properties" : { + "catenaXId" : { + "description" : "The fully anonymous Catena-X ID of the serialized part, valid for the Catena-X dataspace.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.uuid_2.0.0_UuidV4Trait" + }, + "localIdentifiers" : { + "description" : "A local identifier enables identification of a part in a specific dataspace, but is not unique in Catena-X dataspace. Multiple local identifiers may exist.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_3.0.0_LocalIdentifierCharacteristic" + }, + "manufacturingInformation" : { + "description" : "Information from manufacturing process, such as manufacturing date and manufacturing country", + "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_3.0.0_ManufacturingCharacteristic" + }, + "partTypeInformation" : { + "description" : "The part type from which the serialized part has been instantiated", + "$ref" : "#/components/schemas/urn_samm_io.catenax.serial_part_3.0.0_PartTypeInformationCharacteristic" + } + }, + "required" : [ "catenaXId", "localIdentifiers", "manufacturingInformation", "partTypeInformation" ] +} diff --git a/tx-backend/src/main/resources/schema/semantichub/SingleLevelBomAsBuilt_2.0.0-schema.json b/tx-backend/src/main/resources/schema/semantichub/SingleLevelBomAsBuilt_3.0.0-schema.json similarity index 50% rename from tx-backend/src/main/resources/schema/semantichub/SingleLevelBomAsBuilt_2.0.0-schema.json rename to tx-backend/src/main/resources/schema/semantichub/SingleLevelBomAsBuilt_3.0.0-schema.json index 70fbf22bb0..56f26d15f3 100644 --- a/tx-backend/src/main/resources/schema/semantichub/SingleLevelBomAsBuilt_2.0.0-schema.json +++ b/tx-backend/src/main/resources/schema/semantichub/SingleLevelBomAsBuilt_3.0.0-schema.json @@ -4,85 +4,86 @@ "type" : "object", "components" : { "schemas" : { - "urn_samm_io.catenax.single_level_bom_as_built_2.0.0_CatenaXIdTraitCharacteristic" : { + "urn_samm_io.catenax.shared.uuid_2.0.0_UuidV4Trait" : { "type" : "string", "description" : "The provided regular expression ensures that the UUID is composed of five groups of characters separated by hyphens, in the form 8-4-4-4-12 for a total of 36 characters (32 hexadecimal characters and 4 hyphens), optionally prefixed by \"urn:uuid:\" to make it an IRI.", "pattern" : "(^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)|(^urn:uuid:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)" }, - "urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Timestamp" : { + "urn_samm_io.catenax.single_level_bom_as_built_3.0.0_DateTimeTrait" : { "type" : "string", - "pattern" : "-?([1-9][0-9]{3,}|0[0-9]{3})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])T(([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](\\.[0-9]+)?|(24:00:00(\\.0+)?))(Z|(\\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00))?", - "description" : "Describes a Property which contains the date and time with an optional timezone." + "description" : "Regular Expression to enable UTC and Timezone formats and the possibility to exclude time information.", + "pattern" : "^-?([1-9][0-9]{3,}|0[0-9]{3})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])(T(([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](\\.[0-9]+)?|(24:00:00(\\.0+)?))(Z|(\\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00))?)?$" }, - "urn_samm_io.catenax.single_level_bom_as_built_2.0.0_NumberOfObjects" : { + "urn_samm_io.catenax.shared.quantity_2.0.0_QuantityValueCharacteristic" : { "type" : "number", - "description" : "Quantifiable number of objects in reference to the measurementUnit" + "description" : "The quantity value associated with the unit expressed as float." }, - "urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_UnitReference" : { + "urn_samm_io.catenax.shared.quantity_2.0.0_ItemUnitEnumeration" : { "type" : "string", "pattern" : "[a-zA-Z]*:[a-zA-Z]+", - "description" : "Describes a Property containing a reference to one of the units in the Unit Catalog." + "description" : "Enumeration for common item units.", + "enum" : [ "unit:piece", "unit:set", "unit:pair", "unit:page", "unit:cycle", "unit:kilowattHour", "unit:gram", "unit:kilogram", "unit:tonneMetricTon", "unit:tonUsOrShortTonUkorus", "unit:ounceAvoirdupois", "unit:pound", "unit:metre", "unit:centimetre", "unit:kilometre", "unit:inch", "unit:foot", "unit:yard", "unit:squareCentimetre", "unit:squareMetre", "unit:squareInch", "unit:squareFoot", "unit:squareYard", "unit:cubicCentimetre", "unit:cubicMetre", "unit:cubicInch", "unit:cubicFoot", "unit:cubicYard", "unit:litre", "unit:millilitre", "unit:hectolitre", "unit:secondUnitOfTime", "unit:minuteUnitOfTime", "unit:hourUnitOfTime", "unit:day" ] }, - "urn_samm_io.catenax.single_level_bom_as_built_2.0.0_QuantityCharacteristic" : { - "description" : "Describes the quantity in which the child item is assembled in the given parent item by providing a quantity value and the measurement unit in which the quantity is measured.", + "urn_samm_io.catenax.shared.quantity_2.0.0_ItemQuantityCharacteristic" : { + "description" : "Characteristic for measurements of an item (mass, count, linear, area, volume, misc).", "type" : "object", "properties" : { - "quantityNumber" : { - "description" : "The number of objects related to the measurement unit", - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_built_2.0.0_NumberOfObjects" + "value" : { + "description" : "The quantity value associated with the unit.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.quantity_2.0.0_QuantityValueCharacteristic" }, - "measurementUnit" : { - "description" : "Unit of Measurement for the quantity of serialized objects", - "$ref" : "#/components/schemas/urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_UnitReference" + "unit" : { + "description" : "The unit of an item. Common units may be related to mass, count, linear, area, volume or misc.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.quantity_2.0.0_ItemUnitEnumeration" } }, - "required" : [ "quantityNumber", "measurementUnit" ] + "required" : [ "value", "unit" ] }, - "urn_samm_io.catenax.single_level_bom_as_built_2.0.0_BpnTrait" : { + "urn_samm_io.catenax.shared.business_partner_number_2.0.0_BpnlTrait" : { "type" : "string", - "description" : "Business Partner Number Regular Expression allowing only BPNL which stands for a legal entity.", - "pattern" : "^(BPNL)([0-9]{8})([a-zA-Z0-9]{4})$" + "description" : "The provided regular expression ensures that the BPNL is composed of prefix 'BPNL', 10 digits and two alphanumeric letters.", + "pattern" : "^BPNL[a-zA-Z0-9]{12}$" }, - "urn_samm_io.catenax.single_level_bom_as_built_2.0.0_HasAlternativesCharacteristic" : { + "urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Boolean" : { "type" : "boolean", - "description" : "Describes the value whether the child data has alternatives." + "description" : "Represents a boolean value (i.e. a \"flag\")." }, - "urn_samm_io.catenax.single_level_bom_as_built_2.0.0_ChildData" : { + "urn_samm_io.catenax.single_level_bom_as_built_3.0.0_ChildData" : { "description" : "Catena-X ID and meta data of the assembled child item.", "type" : "object", "properties" : { "createdOn" : { "description" : "Timestamp when the relation between the parent item and the child item was created, e.g. when the serialized child part was assembled into the given part.", - "$ref" : "#/components/schemas/urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Timestamp" + "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_built_3.0.0_DateTimeTrait" }, "quantity" : { "description" : "Quantity of which the child item is assembled into the parent item. In general it is '1' for serialized parts.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_built_2.0.0_QuantityCharacteristic" + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.quantity_2.0.0_ItemQuantityCharacteristic" }, "lastModifiedOn" : { "description" : "Timestamp when the assembly relationship between parent item and child item was last modified.", - "$ref" : "#/components/schemas/urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Timestamp" - }, - "catenaXId" : { - "description" : "The Catena-X ID of the given part (e.g. the assembly), valid for the Catena-X dataspace.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_built_2.0.0_CatenaXIdTraitCharacteristic" + "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_built_3.0.0_DateTimeTrait" }, "businessPartner" : { "description" : "The supplier of the given child item.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_built_2.0.0_BpnTrait" + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.business_partner_number_2.0.0_BpnlTrait" }, "hasAlternatives" : { - "description" : "Expresses wether the part is built-in or wether it is one of several options. If the value is false, it can be assumend this exact item is built-in. If the value is true, it is unknown wether this or an alternative item is built-in.\nThis is the case when, e.g. the same item is supplied by two suppliers, the item is only tracked by a customer part ID during assembly. Thus, these items can not be differentiated from each other.\n\n", - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_built_2.0.0_HasAlternativesCharacteristic" + "description" : "Expresses whether the part is built-in or wether it is one of several options. If the value is false, it can be assumed this exact item is built-in. If the value is true, it is unknown wether this or an alternative item is built-in.\nThis is the case when, e.g. the same item is supplied by two suppliers, the item is only tracked by a customer part ID during assembly. Thus, these items can not be differentiated from each other.\n\n", + "$ref" : "#/components/schemas/urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Boolean" + }, + "catenaXId" : { + "description" : "The Catena-X ID of the given part (e.g. the component), valid for the Catena-X dataspace.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.uuid_2.0.0_UuidV4Trait" } }, - "required" : [ "createdOn", "quantity", "catenaXId", "businessPartner", "hasAlternatives" ] + "required" : [ "createdOn", "quantity", "businessPartner", "hasAlternatives", "catenaXId" ] }, - "urn_samm_io.catenax.single_level_bom_as_built_2.0.0_SetOfChildItemsCharacteristic" : { - "description" : "Set of child items the parent item is assembled by (one structural level down).", + "urn_samm_io.catenax.single_level_bom_as_built_3.0.0_SetOfChildItemsCharacteristic" : { + "description" : "Set of child items the parent item was assembled by (one structural level down).", "type" : "array", "items" : { - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_built_2.0.0_ChildData" + "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_built_3.0.0_ChildData" }, "uniqueItems" : true } @@ -90,12 +91,12 @@ }, "properties" : { "catenaXId" : { - "description" : "The Catena-X ID of the given part (e.g. the assembly), valid for the Catena-X dataspace.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_built_2.0.0_CatenaXIdTraitCharacteristic" + "description" : "The Catena-X ID of the given part (e.g. the component), valid for the Catena-X dataspace.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.uuid_2.0.0_UuidV4Trait" }, "childItems" : { - "description" : "Set of child items, of which the given parent item is assembled by (one structural level down).", - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_built_2.0.0_SetOfChildItemsCharacteristic" + "description" : "Set of child items, of which the given parent item was assembled by (one structural level down).", + "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_built_3.0.0_SetOfChildItemsCharacteristic" } }, "required" : [ "catenaXId", "childItems" ] diff --git a/tx-backend/src/main/resources/schema/semantichub/SingleLevelBomAsPlanned_2.0.0-schema.json b/tx-backend/src/main/resources/schema/semantichub/SingleLevelBomAsPlanned_2.0.0-schema.json deleted file mode 100644 index 2e76a33c89..0000000000 --- a/tx-backend/src/main/resources/schema/semantichub/SingleLevelBomAsPlanned_2.0.0-schema.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "$schema" : "http://json-schema.org/draft-04/schema", - "description" : "The single-level bill of material (BoM) represents one sub-level of an assembly and does not include any lower-level subassemblies. In the As-Planned lifecycle state all variants are covered (\"120% BoM\").\nIf multiple versions of child parts exist that can be assembled into the same parent part, all versions of the child part are included in the BoM.\nIf there are multiple suppliers for the same child part, each supplier has an entry for their child part in the BoM.", - "type" : "object", - "components" : { - "schemas" : { - "urn_samm_io.catenax.single_level_bom_as_planned_2.0.0_CatenaXIdTraitCharacteristic" : { - "type" : "string", - "description" : "The provided regular expression ensures that the UUID is composed of five groups of characters separated by hyphens, in the form 8-4-4-4-12 for a total of 36 characters (32 hexadecimal characters and 4 hyphens), optionally prefixed by \"urn:uuid:\" to make it an IRI.", - "pattern" : "(^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)|(^urn:uuid:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)" - }, - "urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Timestamp" : { - "type" : "string", - "pattern" : "-?([1-9][0-9]{3,}|0[0-9]{3})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])T(([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](\\.[0-9]+)?|(24:00:00(\\.0+)?))(Z|(\\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00))?", - "description" : "Describes a Property which contains the date and time with an optional timezone." - }, - "urn_samm_io.catenax.single_level_bom_as_planned_2.0.0_NumberofObjects" : { - "type" : "number", - "description" : "Quantifiable number of objects in reference to the measurementUnit" - }, - "urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_UnitReference" : { - "type" : "string", - "pattern" : "[a-zA-Z]*:[a-zA-Z]+", - "description" : "Describes a Property containing a reference to one of the units in the Unit Catalog." - }, - "urn_samm_io.catenax.single_level_bom_as_planned_2.0.0_QuantityCharacteristic" : { - "description" : "Describes the quantity in which the child part is assembled in the given parent object by providing a quantity value and the measurement unit in which the quantity is measured.", - "type" : "object", - "properties" : { - "quantityNumber" : { - "description" : "The number of objects related to the measurement unit", - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_planned_2.0.0_NumberofObjects" - }, - "measurementUnit" : { - "description" : "Unit of measurement for the quantity of objects.\nIf possible, use units from the aspect meta model unit catalog, which is based on the UNECE Recommendation No. 20 \"Codes for Units of Measure used in International Trade\".", - "$ref" : "#/components/schemas/urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_UnitReference" - } - }, - "required" : [ "quantityNumber", "measurementUnit" ] - }, - "urn_samm_io.catenax.single_level_bom_as_planned_2.0.0_ValidityPeriodCharacteristic" : { - "description" : "Characteristic for a validity period defined by an (optional) start and an (optional) end timestamp.", - "type" : "object", - "properties" : { - "validFrom" : { - "description" : "Start date of validity period", - "$ref" : "#/components/schemas/urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Timestamp" - }, - "validTo" : { - "description" : "End date of validity period", - "$ref" : "#/components/schemas/urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Timestamp" - } - } - }, - "urn_samm_io.catenax.single_level_bom_as_planned_2.0.0_BpnTrait" : { - "type" : "string", - "description" : "Business Partner Number Regular Expression allowing only BPNL which stands for a legal entity.", - "pattern" : "^(BPNL)([0-9]{8})([a-zA-Z0-9]{4})$" - }, - "urn_samm_io.catenax.single_level_bom_as_planned_2.0.0_ChildData" : { - "description" : "Catena-X ID and meta data of the child part.", - "type" : "object", - "properties" : { - "createdOn" : { - "description" : "Timestamp when the relation between the parent part and the child part was created", - "$ref" : "#/components/schemas/urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Timestamp" - }, - "quantity" : { - "description" : "Quantity of which the child part is assembled into the parent part.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_planned_2.0.0_QuantityCharacteristic" - }, - "lastModifiedOn" : { - "description" : "Timestamp when the relationship between parent part and child part was last modified.", - "$ref" : "#/components/schemas/urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Timestamp" - }, - "validityPeriod" : { - "description" : "The period of time during which the parent-child relation is valid. This relates to whether a child part can be built into the parent part at a given time.\nIf no validity period is given the relation is considered valid at any point in time.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_planned_2.0.0_ValidityPeriodCharacteristic" - }, - "catenaXId" : { - "description" : "The Catena-X ID of the given part (e.g. the component), valid for the Catena-X dataspace.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_planned_2.0.0_CatenaXIdTraitCharacteristic" - }, - "businessPartner" : { - "description" : "The supplier of the given child item.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_planned_2.0.0_BpnTrait" - } - }, - "required" : [ "createdOn", "quantity", "catenaXId", "businessPartner" ] - }, - "urn_samm_io.catenax.single_level_bom_as_planned_2.0.0_SetOfChildItemsCharacteristic" : { - "description" : "Set of child items the parent object is assembled by (one structural level down).", - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_planned_2.0.0_ChildData" - }, - "uniqueItems" : true - } - } - }, - "properties" : { - "catenaXId" : { - "description" : "The Catena-X ID of the given part (e.g. the component), valid for the Catena-X dataspace.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_planned_2.0.0_CatenaXIdTraitCharacteristic" - }, - "childItems" : { - "description" : "Set of child items in As-Planned lifecycle phase, of which the given parent object is assembled by (one structural level down).", - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_planned_2.0.0_SetOfChildItemsCharacteristic" - } - }, - "required" : [ "catenaXId", "childItems" ] -} \ No newline at end of file diff --git a/tx-backend/src/main/resources/schema/semantichub/SingleLevelBomAsPlanned_3.0.0-schema.json b/tx-backend/src/main/resources/schema/semantichub/SingleLevelBomAsPlanned_3.0.0-schema.json new file mode 100644 index 0000000000..59737d1fce --- /dev/null +++ b/tx-backend/src/main/resources/schema/semantichub/SingleLevelBomAsPlanned_3.0.0-schema.json @@ -0,0 +1,113 @@ +{ + "$schema" : "http://json-schema.org/draft-04/schema", + "description" : "The single-level bill of material (BoM)represents one sub-level of an assembly and does not include any lower-level subassemblies. In the As-Planned lifecycle state all variants are covered (\"120% BoM\").\nIf multiple versions of child parts exist that can be assembled into the same parent part, all versions of the child part are included in the BoM.\nIf there are multiple suppliers for the same child part, each supplier has an entry for their child part in the BoM.", + "type" : "object", + "components" : { + "schemas" : { + "urn_samm_io.catenax.shared.uuid_2.0.0_UuidV4Trait" : { + "type" : "string", + "description" : "The provided regular expression ensures that the UUID is composed of five groups of characters separated by hyphens, in the form 8-4-4-4-12 for a total of 36 characters (32 hexadecimal characters and 4 hyphens), optionally prefixed by \"urn:uuid:\" to make it an IRI.", + "pattern" : "(^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)|(^urn:uuid:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)" + }, + "urn_samm_io.catenax.single_level_bom_as_planned_3.0.0_DateTimeTrait" : { + "type" : "string", + "description" : "Regular Expression to enable UTC and Timezone formats and the possibility to exclude time information.", + "pattern" : "^-?([1-9][0-9]{3,}|0[0-9]{3})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])(T(([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](\\.[0-9]+)?|(24:00:00(\\.0+)?))(Z|(\\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00))?)?$" + }, + "urn_samm_io.catenax.shared.quantity_2.0.0_QuantityValueCharacteristic" : { + "type" : "number", + "description" : "The quantity value associated with the unit expressed as float." + }, + "urn_samm_io.catenax.shared.quantity_2.0.0_ItemUnitEnumeration" : { + "type" : "string", + "pattern" : "[a-zA-Z]*:[a-zA-Z]+", + "description" : "Enumeration for common item units.", + "enum" : [ "unit:piece", "unit:set", "unit:pair", "unit:page", "unit:cycle", "unit:kilowattHour", "unit:gram", "unit:kilogram", "unit:tonneMetricTon", "unit:tonUsOrShortTonUkorus", "unit:ounceAvoirdupois", "unit:pound", "unit:metre", "unit:centimetre", "unit:kilometre", "unit:inch", "unit:foot", "unit:yard", "unit:squareCentimetre", "unit:squareMetre", "unit:squareInch", "unit:squareFoot", "unit:squareYard", "unit:cubicCentimetre", "unit:cubicMetre", "unit:cubicInch", "unit:cubicFoot", "unit:cubicYard", "unit:litre", "unit:millilitre", "unit:hectolitre", "unit:secondUnitOfTime", "unit:minuteUnitOfTime", "unit:hourUnitOfTime", "unit:day" ] + }, + "urn_samm_io.catenax.shared.quantity_2.0.0_ItemQuantityCharacteristic" : { + "description" : "Characteristic for measurements of an item (mass, count, linear, area, volume, misc).", + "type" : "object", + "properties" : { + "value" : { + "description" : "The quantity value associated with the unit.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.quantity_2.0.0_QuantityValueCharacteristic" + }, + "unit" : { + "description" : "The unit of an item. Common units may be related to mass, count, linear, area, volume or misc.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.quantity_2.0.0_ItemUnitEnumeration" + } + }, + "required" : [ "value", "unit" ] + }, + "urn_samm_io.catenax.single_level_bom_as_planned_3.0.0_ValidityPeriodCharacteristic" : { + "description" : "Characteristic for a validity period defined by an (optional)start and an (optional)end timestamp.", + "type" : "object", + "properties" : { + "validFrom" : { + "description" : "Start date of validity period.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_planned_3.0.0_DateTimeTrait" + }, + "validTo" : { + "description" : "End date of validity period.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_planned_3.0.0_DateTimeTrait" + } + } + }, + "urn_samm_io.catenax.shared.business_partner_number_2.0.0_BpnlTrait" : { + "type" : "string", + "description" : "The provided regular expression ensures that the BPNL is composed of prefix 'BPNL', 10 digits and two alphanumeric letters.", + "pattern" : "^BPNL[a-zA-Z0-9]{12}$" + }, + "urn_samm_io.catenax.single_level_bom_as_planned_3.0.0_ChildData" : { + "description" : "Catena-X ID and meta data of the assembled child item.", + "type" : "object", + "properties" : { + "createdOn" : { + "description" : "Timestamp when the relation between the parent part and the child part was created", + "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_planned_3.0.0_DateTimeTrait" + }, + "quantity" : { + "description" : "Quantity of which the child part will be assembled into the parent part.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.quantity_2.0.0_ItemQuantityCharacteristic" + }, + "lastModifiedOn" : { + "description" : "Timestamp when the relationship between parent part and child part was last modified.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_planned_3.0.0_DateTimeTrait" + }, + "validityPeriod" : { + "description" : "The period of time during which the parent-child relation is valid. This relates to whether a child part can be built into the parent part at a given time.\nIf no validity period is given the relation is considered valid at any point in time.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_planned_3.0.0_ValidityPeriodCharacteristic" + }, + "businessPartner" : { + "description" : "The supplier of the given child item.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.business_partner_number_2.0.0_BpnlTrait" + }, + "catenaXId" : { + "description" : "The Catena-X ID of the given part (e.g. the component), valid for the Catena-X dataspace.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.uuid_2.0.0_UuidV4Trait" + } + }, + "required" : [ "createdOn", "quantity", "businessPartner", "catenaXId" ] + }, + "urn_samm_io.catenax.single_level_bom_as_planned_3.0.0_SetOfChildItemsCharacteristic" : { + "description" : "Set of child items the parent object will be assembled by (one structural level down).", + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_planned_3.0.0_ChildData" + }, + "uniqueItems" : true + } + } + }, + "properties" : { + "catenaXId" : { + "description" : "The Catena-X ID of the given part (e.g. the component), valid for the Catena-X dataspace.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.uuid_2.0.0_UuidV4Trait" + }, + "childItems" : { + "description" : "Set of child items in As-Planned lifecycle phase, of which the given parent object is assembled by (one structural level down).", + "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_bom_as_planned_3.0.0_SetOfChildItemsCharacteristic" + } + }, + "required" : [ "catenaXId", "childItems" ] +} \ No newline at end of file diff --git a/tx-backend/src/main/resources/schema/semantichub/SingleLevelUsageAsBuilt_2.0.0-schema.json b/tx-backend/src/main/resources/schema/semantichub/SingleLevelUsageAsBuilt_2.0.0-schema.json deleted file mode 100644 index e57b316f66..0000000000 --- a/tx-backend/src/main/resources/schema/semantichub/SingleLevelUsageAsBuilt_2.0.0-schema.json +++ /dev/null @@ -1,120 +0,0 @@ -{ - "$schema" : "http://json-schema.org/draft-04/schema", - "description" : "The aspect provides the information in which parent part(s)/product(s) the given item is assembled in. Could be a 1:1 relationship in terms of a e.g. a brake component or 1:n for e.g. coatings. The given item as well as the parent item must refer to an object from as-built lifecycle phase, i.e. a batch or a serialized part.", - "type" : "object", - "components" : { - "schemas" : { - "urn_samm_io.catenax.single_level_usage_as_built_2.0.0_CatenaXIdTraitCharacteristic" : { - "type" : "string", - "description" : "The provided regular expression ensures that the UUID is composed of five groups of characters separated by hyphens, in the form 8-4-4-4-12 for a total of 36 characters (32 hexadecimal characters and 4 hyphens), optionally prefixed by \"urn:uuid:\" to make it an IRI.", - "pattern" : "(^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)|(^urn:uuid:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)" - }, - "urn_samm_io.catenax.single_level_usage_as_built_2.0.0_NumberOfObjects" : { - "type" : "number", - "description" : "Quantifiable number of objects in reference to the measurementUnit" - }, - "urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_UnitReference" : { - "type" : "string", - "pattern" : "[a-zA-Z]*:[a-zA-Z]+", - "description" : "Describes a Property containing a reference to one of the units in the Unit Catalog." - }, - "urn_samm_io.catenax.single_level_usage_as_built_2.0.0_QuantityCharacteristic" : { - "description" : "Describes the quantity in which the child part is assembled in the parent object by providing a quantity value and the measurement unit in which the quantity is measured.", - "type" : "object", - "properties" : { - "quantityNumber" : { - "description" : "The number of objects related to the measurement unit", - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_usage_as_built_2.0.0_NumberOfObjects" - }, - "measurementUnit" : { - "description" : "Unit of Measurement for the quantity of serialized objects", - "$ref" : "#/components/schemas/urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_UnitReference" - } - }, - "required" : [ "quantityNumber", "measurementUnit" ] - }, - "urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Timestamp" : { - "type" : "string", - "pattern" : "-?([1-9][0-9]{3,}|0[0-9]{3})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])T(([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](\\.[0-9]+)?|(24:00:00(\\.0+)?))(Z|(\\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00))?", - "description" : "Describes a Property which contains the date and time with an optional timezone." - }, - "urn_samm_io.catenax.single_level_usage_as_built_2.0.0_ParentData" : { - "description" : "Catena-X ID and meta data of the parent item.", - "type" : "object", - "properties" : { - "quantity" : { - "description" : "Quantity of which the child part is assembled into the parent part. In general it is '1' for serialized parts.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_usage_as_built_2.0.0_QuantityCharacteristic" - }, - "catenaXId" : { - "description" : "The Catena-X ID of the given part (e.g. the assembly), valid for the Catena-X dataspace.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_usage_as_built_2.0.0_CatenaXIdTraitCharacteristic" - }, - "createdOn" : { - "description" : "Timestamp when the relation between the parent part and the child part was created, e.g. when the given child part was assembled into the parent part.", - "$ref" : "#/components/schemas/urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Timestamp" - }, - "lastModifiedOn" : { - "description" : "Timestamp when the assembly relationship between parent part and child part was last modified.", - "$ref" : "#/components/schemas/urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Timestamp" - } - }, - "required" : [ "quantity", "catenaXId", "createdOn" ] - }, - "urn_samm_io.catenax.single_level_usage_as_built_2.0.0_SetOfParentItemsCharacteristic" : { - "description" : "Set of parent items the given child object is assembled in (one structural level up).", - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_usage_as_built_2.0.0_ParentData" - }, - "uniqueItems" : true - }, - "urn_samm_io.catenax.single_level_usage_as_built_2.0.0_BpnTrait" : { - "type" : "string", - "description" : "Business Partner Number Regular Expression allowing only BPNL which stands for a legal entity.", - "pattern" : "^(BPNL)([0-9]{8})([a-zA-Z0-9]{4})$" - }, - "urn_samm_io.catenax.single_level_usage_as_built_2.0.0_Customer" : { - "description" : "A customer and their related items, if known.", - "type" : "object", - "properties" : { - "parentItems" : { - "description" : "Set of parent items, in which the given child object is assembled in (one structural level up).\n\nFor serialized items the list should contain only one parent item.\nAs different subsets of a batch might be used by a customer in different items this is a list.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_usage_as_built_2.0.0_SetOfParentItemsCharacteristic" - }, - "businessPartner" : { - "description" : "The supplier of the given child item.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_usage_as_built_2.0.0_BpnTrait" - }, - "createdOn" : { - "description" : "Timestamp when the relation between the parent part and the child part was created, e.g. when the given child part was assembled into the parent part.", - "$ref" : "#/components/schemas/urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Timestamp" - }, - "lastModifiedOn" : { - "description" : "Timestamp when the assembly relationship between parent part and child part was last modified.", - "$ref" : "#/components/schemas/urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Timestamp" - } - }, - "required" : [ "businessPartner", "createdOn" ] - }, - "urn_samm_io.catenax.single_level_usage_as_built_2.0.0_ListOfCustomersCharacteristic" : { - "description" : "A list of customers and their related parent items.", - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_usage_as_built_2.0.0_Customer" - } - } - } - }, - "properties" : { - "catenaXId" : { - "description" : "The Catena-X ID of the given part (e.g. the assembly), valid for the Catena-X dataspace.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_usage_as_built_2.0.0_CatenaXIdTraitCharacteristic" - }, - "customers" : { - "description" : "A list of all customers of this item. If the parent items in which this item is assembled into are known, they should be listed as well.\n\nFor serialized items the list should contain only one customer with one parent item.\nAs different subsets of a batch might be sold to different customers this is a list.", - "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_usage_as_built_2.0.0_ListOfCustomersCharacteristic" - } - }, - "required" : [ "catenaXId", "customers" ] -} \ No newline at end of file diff --git a/tx-backend/src/main/resources/schema/semantichub/SingleLevelUsageAsBuilt_3.0.0-schema.json b/tx-backend/src/main/resources/schema/semantichub/SingleLevelUsageAsBuilt_3.0.0-schema.json new file mode 100644 index 0000000000..641635985e --- /dev/null +++ b/tx-backend/src/main/resources/schema/semantichub/SingleLevelUsageAsBuilt_3.0.0-schema.json @@ -0,0 +1,116 @@ +{ + "$schema" : "http://json-schema.org/draft-04/schema", + "description" : "The aspect provides the information in which parent part(s)/product(s)the given item is assembled in. Could be a 1:1 relationship in terms of an e.g. a brake component or 1:n for e.g. coatings. The parent item must refer to an object from as-built lifecycle phase, i.e. a batch or a serialized part.", + "type" : "object", + "components" : { + "schemas" : { + "urn_samm_io.catenax.shared.uuid_2.0.0_UuidV4Trait" : { + "type" : "string", + "description" : "The provided regular expression ensures that the UUID is composed of five groups of characters separated by hyphens, in the form 8-4-4-4-12 for a total of 36 characters (32 hexadecimal characters and 4 hyphens), optionally prefixed by \"urn:uuid:\" to make it an IRI.", + "pattern" : "(^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)|(^urn:uuid:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)" + }, + "urn_samm_io.catenax.single_level_usage_as_built_3.0.0_ListOfCustomersCharacteristic" : { + "description" : "A list of customers and their related parent items.", + "type" : "array", + "items" : { + "type" : "string", + "description" : "The provided regular expression ensures that the BPNL is composed of prefix 'BPNL', 10 digits and two alphanumeric letters.", + "pattern" : "^BPNL[a-zA-Z0-9]{12}$" + } + }, + "urn_samm_io.catenax.shared.quantity_2.0.0_QuantityValueCharacteristic" : { + "type" : "number", + "description" : "The quantity value associated with the unit expressed as float." + }, + "urn_samm_io.catenax.shared.quantity_2.0.0_ItemUnitEnumeration" : { + "type" : "string", + "pattern" : "[a-zA-Z]*:[a-zA-Z]+", + "description" : "Enumeration for common item units.", + "enum" : [ "unit:piece", "unit:set", "unit:pair", "unit:page", "unit:cycle", "unit:kilowattHour", "unit:gram", "unit:kilogram", "unit:tonneMetricTon", "unit:tonUsOrShortTonUkorus", "unit:ounceAvoirdupois", "unit:pound", "unit:metre", "unit:centimetre", "unit:kilometre", "unit:inch", "unit:foot", "unit:yard", "unit:squareCentimetre", "unit:squareMetre", "unit:squareInch", "unit:squareFoot", "unit:squareYard", "unit:cubicCentimetre", "unit:cubicMetre", "unit:cubicInch", "unit:cubicFoot", "unit:cubicYard", "unit:litre", "unit:millilitre", "unit:hectolitre", "unit:secondUnitOfTime", "unit:minuteUnitOfTime", "unit:hourUnitOfTime", "unit:day" ] + }, + "urn_samm_io.catenax.shared.quantity_2.0.0_ItemQuantityCharacteristic" : { + "description" : "Characteristic for measurements of an item (mass, count, linear, area, volume, misc).", + "type" : "object", + "properties" : { + "value" : { + "description" : "The quantity value associated with the unit.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.quantity_2.0.0_QuantityValueCharacteristic" + }, + "unit" : { + "description" : "The unit of an item. Common units may be related to mass, count, linear, area, volume or misc.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.quantity_2.0.0_ItemUnitEnumeration" + } + }, + "required" : [ "value", "unit" ] + }, + "urn_samm_io.catenax.single_level_usage_as_built_3.0.0_DateTimeTrait" : { + "type" : "string", + "description" : "Regular Expression to enable UTC and Timezone formats and the possibility to exclude time information.", + "pattern" : "^-?([1-9][0-9]{3,}|0[0-9]{3})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])(T(([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](\\.[0-9]+)?|(24:00:00(\\.0+)?))(Z|(\\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00))?)?$" + }, + "urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Boolean" : { + "type" : "boolean", + "description" : "Represents a boolean value (i.e. a \"flag\")." + }, + "urn_samm_io.catenax.shared.business_partner_number_2.0.0_BpnlTrait" : { + "type" : "string", + "description" : "The provided regular expression ensures that the BPNL is composed of prefix 'BPNL', 10 digits and two alphanumeric letters.", + "pattern" : "^BPNL[a-zA-Z0-9]{12}$" + }, + "urn_samm_io.catenax.single_level_usage_as_built_3.0.0_ParentData" : { + "description" : "Catena-X ID and meta data of the parent item.", + "type" : "object", + "properties" : { + "quantity" : { + "description" : "Quantity of which the child part is assembled into the parent part. In general it is '1' for serialized parts.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.quantity_2.0.0_ItemQuantityCharacteristic" + }, + "createdOn" : { + "description" : "Timestamp when the relation between the parent part and the child part was created, e.g. when the given child part was assembled into the parent part.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_usage_as_built_3.0.0_DateTimeTrait" + }, + "lastModifiedOn" : { + "description" : "Timestamp when the assembly or usage relationship between parent part and child part was last modified.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_usage_as_built_3.0.0_DateTimeTrait" + }, + "isOnlyPotentialParent" : { + "description" : "Expresses the certainty whether the part has been used as component or input material in the produced item. If the value is false, it can be assumed that the part has been used. If the value is true, there are alternatives for that part, and it is unknown if this part item or an alternative part item has been used.\nThis is the case when, e.g. the same item is supplied by two suppliers, and the item is only tracked by a customer part ID during assembly. Thus, these items cannot be differentiated from each other.\n", + "$ref" : "#/components/schemas/urn_samm_org.eclipse.esmf.samm_characteristic_2.1.0_Boolean" + }, + "businessPartner" : { + "description" : "The supplier of the given child item.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.business_partner_number_2.0.0_BpnlTrait" + }, + "catenaXId" : { + "description" : "The Catena-X ID of the given part (e.g. the component), valid for the Catena-X dataspace.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.uuid_2.0.0_UuidV4Trait" + } + }, + "required" : [ "createdOn", "isOnlyPotentialParent", "businessPartner", "catenaXId" ] + }, + "urn_samm_io.catenax.single_level_usage_as_built_3.0.0_SetOfParentItemsCharacteristic" : { + "description" : "Set of parent items the given child object is assembled in (one structural level up).", + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_usage_as_built_3.0.0_ParentData" + }, + "uniqueItems" : true + } + } + }, + "properties" : { + "catenaXId" : { + "description" : "The Catena-X ID of the given part (e.g. the component), valid for the Catena-X dataspace.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.shared.uuid_2.0.0_UuidV4Trait" + }, + "customers" : { + "description" : "A list of all customers of this item. If the parent items in which this item is assembled into are known, they should be listed as well.\n\nFor serialized items the list should contain only one customer with one parent item.\nAs different subsets of a batch might be sold to different customers this is a list.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_usage_as_built_3.0.0_ListOfCustomersCharacteristic" + }, + "parentItems" : { + "description" : "Set of parent items, in which the given child object is assembled in (one structural level up).\n\nFor serialized items the list should contain only one parent item.\nAs different subsets of a batch might be used by a customer in different items this is a list.", + "$ref" : "#/components/schemas/urn_samm_io.catenax.single_level_usage_as_built_3.0.0_SetOfParentItemsCharacteristic" + } + }, + "required" : [ "catenaXId", "customers", "parentItems" ] +} \ No newline at end of file diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/JsonSchemaTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/JsonSchemaTest.java new file mode 100644 index 0000000000..1aa4c1ea59 --- /dev/null +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/JsonSchemaTest.java @@ -0,0 +1,191 @@ +/******************************************************************************** + * Copyright (c) 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.traceability; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.fge.jackson.JsonLoader; +import com.github.fge.jsonschema.core.exceptions.ProcessingException; +import com.github.fge.jsonschema.core.report.LogLevel; +import com.github.fge.jsonschema.core.report.ProcessingMessage; +import com.github.fge.jsonschema.core.report.ProcessingReport; +import com.github.fge.jsonschema.main.JsonSchema; +import com.github.fge.jsonschema.main.JsonSchemaFactory; +import lombok.extern.slf4j.Slf4j; +import org.eclipse.tractusx.traceability.assets.application.importpoc.validation.exception.JsonFileProcessingException; +import org.eclipse.tractusx.traceability.assets.application.importpoc.validation.exception.NotSupportedSchemaException; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.mock.web.MockMultipartFile; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.AbstractMap; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; + +import static java.util.Objects.isNull; +import static org.junit.Assert.assertEquals; + +@Slf4j +public class JsonSchemaTest { + + + public static final Map SUPPORTED_SCHEMA_VALIDATION = Map.ofEntries( + Map.entry("urn:samm:io.catenax.batch:3.0.0#Batch", "/schema/semantichub/Batch_3.0.0-schema.json"), + Map.entry("urn:samm:io.catenax.just_in_sequence_part:3.0.0#JustInSequencePart", "/schema/semantichub/JustInSequencePart_3.0.0-schema.json"), + Map.entry("urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "/schema/semantichub/SerialPart_3.0.0-schema.json"), + Map.entry("urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "/schema/semantichub/PartSiteInformationAsPlanned_1.0.0-schema.json"), + Map.entry("urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "/schema/semantichub/SingleLevelBomAsBuilt_3.0.0-schema.json"), + Map.entry("urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "/schema/semantichub/SingleLevelUsageAsBuilt_3.0.0-schema.json"), + Map.entry("urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", "/schema/semantichub/TractionBatteryCode_1.0.0-schema.json"), + Map.entry("urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "/schema/semantichub/PartAsPlanned_2.0.0-schema.json"), + Map.entry("urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "/schema/semantichub/SingleLevelBomAsPlanned_3.0.0-schema.json") + ); + private final JsonSchemaFactory factory = JsonSchemaFactory.byDefault(); + + @Value("") + @Test + public void test() throws IOException { + + InputStream file = JsonSchemaTest.class.getResourceAsStream("/testdata/CX_Testdata_MessagingTest_v0.0.13.json"); + // Convert the file to a MockMultipartFile + MockMultipartFile multipartFile = new MockMultipartFile( + "file", // Parameter name in the multipart request + "import-request.json", // Original file name + "application/json", // Content type + file + ); + + List strings = isValid(multipartFile); + for (String string : strings) { + log.info(string); + } + + + assertEquals(0, strings.size()); + + } + + public List isValid(MultipartFile file) { + if (file == null || file.isEmpty()) { + return List.of(); + } + String fileName = file.getOriginalFilename(); + if (isNull(fileName)) { + throw new IllegalStateException(); + } + String[] fileNameSplit = fileName.split("\\."); + if (!Objects.equals(fileNameSplit[fileNameSplit.length - 1], "json")) { + return List.of("Supported file is *.json"); + } + + + final List errors = new ArrayList<>(); + + errors.addAll(validateAspectPayload(file)); + return errors; + } + + private List validateAspectPayload(MultipartFile file) { + List errors = new ArrayList<>(); + ObjectMapper objectMapper = new ObjectMapper(); + JsonNode rootNode; + try { + rootNode = objectMapper.readTree(file.getInputStream()); + } catch (IOException e) { + throw new IllegalStateException(e); + } + + JsonNode assetsNode = rootNode.get("submodels"); + if (isNull(assetsNode)) { + errors.add("Could not find submodels"); + return errors; + } + Map> processingMessages = new HashMap<>(); + for (JsonNode asset : assetsNode) { + String assetId = asset.get("catenaXId").asText(); + + + Map map = SUPPORTED_SCHEMA_VALIDATION.keySet() + .stream() + .filter(key -> !isNull(asset.get(key))) + .map(key -> new AbstractMap.SimpleEntry(key, asset.get(key)) + ) + .collect(Collectors.toMap(entry -> (String) entry.getKey(), entry -> (JsonNode) entry.getValue())); + + for (Map.Entry submodel : map.entrySet()) { + + try { + final JsonSchema schema = factory.getJsonSchema(JsonLoader.fromURL(getSchemaUrl(submodel.getKey()))); + + submodel.getValue().forEach(entry -> { + ProcessingReport report = null; + try { + report = schema.validate(JsonLoader.fromString(entry.toPrettyString())); + } catch (ProcessingException e) { + throw new RuntimeException(e); + } catch (IOException e) { + throw new RuntimeException(e); + } + List payloadProcessingMessages = StreamSupport.stream(report.spliterator(), false) + .filter(processingMessage -> !processingMessage.getLogLevel().equals(LogLevel.WARNING)) + .filter(processingMessage -> !processingMessage.getLogLevel().equals(LogLevel.INFO)) + .toList(); + processingMessages.put("For Asset with ID: " + assetId + " And aspectType: " + submodel.getKey(), payloadProcessingMessages); + }); + + + } catch (NotSupportedSchemaException e) { + errors.add(e.getMessage()); + } catch (ProcessingException | IOException e) { + throw new JsonFileProcessingException(e); + } + + } + } + + List constructedErrorMessages = processingMessages.entrySet().stream().map(entry -> + entry.getValue().stream().map(processingMessage -> entry.getKey() + " Following error occurred: " + processingMessage.getMessage()).toList() + ).flatMap(Collection::stream) + .toList(); + errors.addAll(constructedErrorMessages); + return errors; + } + + private URL getSchemaUrl(String schemaName) { + String schemaPath = SUPPORTED_SCHEMA_VALIDATION.get(schemaName); + if (isNull(schemaPath)) { + throw new NotSupportedSchemaException(schemaName); + } + + return org.eclipse.tractusx.traceability.assets.application.importpoc.validation.JsonFileValidator.class.getResource(schemaPath); + } + +} + + diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/domain/base/service/AbstractAssetBaseServiceTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/domain/base/service/AbstractAssetBaseServiceTest.java index a829c36802..c8771248f8 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/domain/base/service/AbstractAssetBaseServiceTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/domain/base/service/AbstractAssetBaseServiceTest.java @@ -32,7 +32,7 @@ void givenEnumFieldName(String fieldName, String startWith, List expecte // given params // when - List result = service.getDistinctFilterValues(fieldName, startWith, 10, null); + List result = service.getDistinctFilterValues(fieldName, startWith, 10, null, List.of()); // then assertThat(result).containsAll(expectedValues); diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/repository/SubmodelPayloadRepositoryIT.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/repository/SubmodelPayloadRepositoryIT.java index e2c85aed9e..82a4096eea 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/repository/SubmodelPayloadRepositoryIT.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/repository/SubmodelPayloadRepositoryIT.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.ImportRequest; import org.eclipse.tractusx.traceability.assets.infrastructure.asbuilt.repository.JpaAssetAsBuiltRepository; -import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.GenericSubmodel; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IrsSubmodel; import org.eclipse.tractusx.traceability.integration.IntegrationTestSpecification; import org.eclipse.tractusx.traceability.integration.common.support.AssetsSupport; import org.junit.jupiter.api.BeforeEach; @@ -50,7 +50,7 @@ void givenAssetAsBuilt_when() throws IOException { String jsonString = Files.readString(Path.of(filePath)); String assetId = "urn:uuid:d387fa8e-603c-42bd-98c3-4d87fef8d2bb"; ImportRequest importRequest = objectMapper.readValue(jsonString, ImportRequest.class); - List submodels = importRequest.assets().stream() + List submodels = importRequest.assets().stream() .filter(asset -> Objects.equals(asset.assetMetaInfoRequest().catenaXId(), assetId)).findFirst() .map(ImportRequest.AssetImportRequest::submodels).get(); diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/ImportServiceImplTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/ImportServiceImplTest.java index e236d34a32..7e75fa70f3 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/ImportServiceImplTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/ImportServiceImplTest.java @@ -26,6 +26,7 @@ import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.ImportJobStatus; import org.eclipse.tractusx.traceability.assets.domain.importpoc.repository.ImportJobRepository; import org.eclipse.tractusx.traceability.assets.domain.importpoc.repository.SubmodelPayloadRepository; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.factory.ImportAssetMapper; import org.eclipse.tractusx.traceability.common.model.BPN; import org.eclipse.tractusx.traceability.common.properties.TraceabilityProperties; import org.junit.jupiter.api.BeforeEach; @@ -42,6 +43,9 @@ import java.util.List; import java.util.UUID; +import static org.eclipse.tractusx.traceability.testdata.AssetTestDataFactory.createAssetAsBuiltTestdata; +import static org.eclipse.tractusx.traceability.testdata.AssetTestDataFactory.createAssetAsPlannedTestdata; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -65,12 +69,15 @@ class ImportServiceImplTest { @Mock private ImportJobRepository importJobRepository; + @Mock + private ImportAssetMapper assetMapper; + @BeforeEach public void testSetup() { ObjectMapper objectMapper = new ObjectMapper(); objectMapper.registerModule(new JavaTimeModule()); - importService = new ImportServiceImpl(objectMapper, assetAsPlannedRepository, assetAsBuiltRepository, traceabilityProperties, new MappingStrategyFactory(), submodelPayloadRepository, importJobRepository); + importService = new ImportServiceImpl(objectMapper, assetAsPlannedRepository, assetAsBuiltRepository, traceabilityProperties, submodelPayloadRepository, importJobRepository, assetMapper); } @@ -86,6 +93,7 @@ void testImportRequestSuccessful() throws IOException { file ); + when(assetMapper.toAssetBaseList(any())).thenReturn(List.of(createAssetAsBuiltTestdata(), createAssetAsPlannedTestdata())); when(traceabilityProperties.getBpn()).thenReturn(BPN.of("BPNL00000003CML1")); importService.importAssets(multipartFile, new ImportJob(UUID.randomUUID(), Instant.now(), null, ImportJobStatus.RUNNING, List.of(), List.of())); verify(assetAsBuiltRepository, times(1)).saveAllIfNotInIRSSyncAndUpdateImportStateAndNote(anyList()); diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/MainAspectAsPlannedStrategyTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/MainAspectAsPlannedStrategyTest.java deleted file mode 100644 index 5fe5055645..0000000000 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/MainAspectAsPlannedStrategyTest.java +++ /dev/null @@ -1,56 +0,0 @@ -/******************************************************************************** - * Copyright (c) 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.traceability.assets.domain.importpoc.service; - -import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase; -import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.AssetMetaInfoRequest; -import org.eclipse.tractusx.traceability.assets.domain.importpoc.model.ImportRequest; -import org.eclipse.tractusx.traceability.common.properties.TraceabilityProperties; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; - -class MainAspectAsPlannedStrategyTest { - - MainAspectAsPlannedStrategy strategy; - - @BeforeEach - void setUp() { - strategy = new MainAspectAsPlannedStrategy(); - } - - - @Test - void testMappingWithNoSubmodels() { - // given - ImportRequest.AssetImportRequest assetImportRequestV2 = new ImportRequest.AssetImportRequest( - new AssetMetaInfoRequest("catenaXId"), - List.of() - ); - - // when - AssetBase assetBase = strategy.mapToAssetBase(assetImportRequestV2, new TraceabilityProperties()); - - // then - assertThat(assetBase.getDetailAspectModels()).isNull(); - } -} diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/PolicyServiceImplTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/PolicyServiceImplTest.java index 69abfcec4d..12ac9dc162 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/PolicyServiceImplTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/PolicyServiceImplTest.java @@ -56,7 +56,7 @@ void testGetPolicyByID() { // GIVEN String policyId = "policy123"; OffsetDateTime createdOn = OffsetDateTime.parse("2023-07-03T16:01:05.309Z"); - List acceptedPolicies = List.of(createIrsPolicyResponse(policyId, createdOn, "", "")); + List acceptedPolicies = List.of(createIrsPolicyResponse(policyId, createdOn, "", "", "", "")); // WHEN when(policyRepository.getPolicies()).thenReturn(acceptedPolicies); @@ -71,13 +71,14 @@ void testGetPolicyByID() { @Test void getPolicyByConstraintRightOperand() { // Given - IrsPolicyResponse firstPolicyResponse = createIrsPolicyResponse("test", OffsetDateTime.now(), "my-constraint1", ""); - IrsPolicyResponse secondPolicyResponse = createIrsPolicyResponse("test2", OffsetDateTime.now(), "my-constraint2", ""); - IrsPolicyResponse thirdPolicyResponse = createIrsPolicyResponse("test3", OffsetDateTime.now(), "my-constraint3", ""); - IrsPolicyResponse fourthPolicyResponse = createIrsPolicyResponse("test4", OffsetDateTime.now(), "my-constraint4", ""); + IrsPolicyResponse firstPolicyResponse = createIrsPolicyResponse("test", OffsetDateTime.now(), "my-left-constraint1", "", "", "my-constraint1"); + IrsPolicyResponse secondPolicyResponse = createIrsPolicyResponse("test2", OffsetDateTime.now(), "my-left-constraint2", "", "", "my-constraint2"); + IrsPolicyResponse thirdPolicyResponse = createIrsPolicyResponse("test3", OffsetDateTime.now(), "my-left-constraint3", "", "", "my-constraint3"); + IrsPolicyResponse fourthPolicyResponse = createIrsPolicyResponse("test4", OffsetDateTime.now(), "my-left-constraint4", "", "my-constraint4", ""); List policyResponseList = List.of(firstPolicyResponse, secondPolicyResponse, thirdPolicyResponse, fourthPolicyResponse); when(policyRepository.getPolicies()).thenReturn(policyResponseList); when(traceabilityProperties.getRightOperand()).thenReturn("my-constraint4"); + when(traceabilityProperties.getLeftOperand()).thenReturn("my-left-constraint4"); // When Optional policyResult = policyService.getFirstPolicyMatchingApplicationConstraint(); @@ -91,10 +92,10 @@ void getPolicyByConstraintRightOperand() { @Test void getPolicyByConstraintRightOperandNotFound() { // Given - IrsPolicyResponse firstPolicyResponse = createIrsPolicyResponse("test", OffsetDateTime.now(), "my-constraint1", ""); - IrsPolicyResponse secondPolicyResponse = createIrsPolicyResponse("test2", OffsetDateTime.now(), "my-constraint2", ""); - IrsPolicyResponse thirdPolicyResponse = createIrsPolicyResponse("test3", OffsetDateTime.now(), "my-constraint3", ""); - IrsPolicyResponse fourthPolicyResponse = createIrsPolicyResponse("test4", OffsetDateTime.now(), "my-constraint4", ""); + IrsPolicyResponse firstPolicyResponse = createIrsPolicyResponse("test", OffsetDateTime.now(), "my-constraint1", "","",""); + IrsPolicyResponse secondPolicyResponse = createIrsPolicyResponse("test2", OffsetDateTime.now(), "my-constraint2", "","",""); + IrsPolicyResponse thirdPolicyResponse = createIrsPolicyResponse("test3", OffsetDateTime.now(), "my-constraint3", "","",""); + IrsPolicyResponse fourthPolicyResponse = createIrsPolicyResponse("test4", OffsetDateTime.now(), "my-constraint4", "","",""); List policyResponseList = List.of(firstPolicyResponse, secondPolicyResponse, thirdPolicyResponse, fourthPolicyResponse); when(policyRepository.getPolicies()).thenReturn(policyResponseList); when(traceabilityProperties.getRightOperand()).thenReturn("not-exists"); diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/JobRepositoryImplTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/JobRepositoryImplTest.java index f8c8869d80..1b77177385 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/JobRepositoryImplTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/JobRepositoryImplTest.java @@ -31,12 +31,11 @@ import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.Direction; import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IrsPolicyResponse; import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.Payload; -import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.factory.AssetMapperFactory; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.factory.IrsResponseAssetMapper; import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.relationship.Aspect; -import org.eclipse.tractusx.traceability.bpn.domain.service.BpnRepository; +import org.eclipse.tractusx.traceability.bpn.infrastructure.repository.BpnRepository; import org.eclipse.tractusx.traceability.common.model.BPN; import org.eclipse.tractusx.traceability.common.properties.TraceabilityProperties; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; @@ -47,7 +46,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import java.time.OffsetDateTime; -import java.util.Collections; import java.util.List; import java.util.stream.Stream; @@ -55,7 +53,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) @@ -79,7 +76,7 @@ class JobRepositoryImplTest { private IrsClient irsClient; @Mock - private AssetMapperFactory assetMapperFactory; + private IrsResponseAssetMapper assetMapperFactory; @ParameterizedTest @MethodSource("provideDirections") diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/PolicyRepositoryImplTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/PolicyRepositoryImplTest.java index 7434f25523..66dc92f7f7 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/PolicyRepositoryImplTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/PolicyRepositoryImplTest.java @@ -28,8 +28,6 @@ import org.eclipse.tractusx.irs.edc.client.policy.PolicyType; import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IrsPolicyResponse; import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.Payload; -import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.factory.AssetMapperFactory; -import org.eclipse.tractusx.traceability.bpn.domain.service.BpnRepository; import org.eclipse.tractusx.traceability.common.properties.TraceabilityProperties; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -79,11 +77,14 @@ void givenPolicyExist_whenCreateIrsPolicyIfMissing_thenDoNotCreateIt() { // given OffsetDateTime validUntil = OffsetDateTime.parse("2023-07-03T16:01:05.309Z"); OffsetDateTime createdOn = OffsetDateTime.now(); - Policy policy = new Policy("1", createdOn, validUntil, List.of(new Permission(PolicyType.USE, new Constraints(List.of(), List.of(new Constraint("leftOperand1", new Operator(OperatorType.EQ), "test")))))); + Constraint constraint = new Constraint("leftOperand1", new Operator(OperatorType.EQ), "test"); + Constraint constraintSecond = new Constraint("leftOperand2", new Operator(OperatorType.EQ), "test2"); + Policy policy = new Policy("1", createdOn, validUntil, List.of(new Permission(PolicyType.USE, new Constraints(List.of(constraint, constraintSecond), List.of())))); Payload payload = new Payload(null, "1", policy); final IrsPolicyResponse existingPolicy = new IrsPolicyResponse(validUntil, payload); when(irsClient.getPolicies()).thenReturn(List.of(existingPolicy)); when(traceabilityProperties.getRightOperand()).thenReturn("test"); + when(traceabilityProperties.getRightOperandSecond()).thenReturn("test2"); when(traceabilityProperties.getValidUntil()).thenReturn(OffsetDateTime.parse("2023-07-02T16:01:05.309Z")); // when @@ -99,12 +100,16 @@ void givenOutdatedPolicyExist_whenCreateIrsPolicyIfMissing_thenUpdateIt() { OffsetDateTime validUntil = OffsetDateTime.parse("2023-07-03T16:01:05.309Z"); OffsetDateTime createdOn = OffsetDateTime.now(); - Policy policy = new Policy("test", createdOn, validUntil, List.of(new Permission(PolicyType.USE, new Constraints(List.of(), List.of(new Constraint("leftOperand1", new Operator(OperatorType.EQ), "test")))))); + Constraint constraint = new Constraint("leftOperand1", new Operator(OperatorType.EQ), "test"); + Constraint constraintSecond = new Constraint("leftOperand2", new Operator(OperatorType.EQ), "test2"); + Policy policy = new Policy("test", createdOn, validUntil, List.of(new Permission(PolicyType.USE, new Constraints(List.of(constraint, constraintSecond), List.of())))); Payload payload = new Payload(null, "test", policy); final IrsPolicyResponse existingPolicy = new IrsPolicyResponse(validUntil, payload); when(irsClient.getPolicies()).thenReturn(List.of(existingPolicy)); when(traceabilityProperties.getRightOperand()).thenReturn("test"); + when(traceabilityProperties.getRightOperandSecond()).thenReturn("test2"); + when(traceabilityProperties.getValidUntil()).thenReturn(OffsetDateTime.parse("2023-07-04T16:01:05.309Z")); // when diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/semanticdatamodel/SemanticDataModelTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/semanticdatamodel/SemanticDataModelTest.java index 74fcd3e86c..faff6e1ccc 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/semanticdatamodel/SemanticDataModelTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/semanticdatamodel/SemanticDataModelTest.java @@ -27,8 +27,8 @@ class SemanticDataModelTest { @ParameterizedTest @ValueSource(strings = { - "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", - "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned" + "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned" }) void test_IsAsPlanned(String aspectType) { //GIVEN @@ -42,9 +42,9 @@ void test_IsAsPlanned(String aspectType) { @ParameterizedTest @ValueSource(strings = { - "urn:bamm:io.catenax.just_in_sequence_part:1.0.0#JustInSequencePart", - "urn:samm:io.catenax.batch:2.0.0#Batch", - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart"}) + "urn:samm:io.catenax.just_in_sequence_part:3.0.0#JustInSequencePart", + "urn:samm:io.catenax.batch:3.0.0#Batch", + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart"}) void test_IsAsBuilt(String aspectType) { //GIVEN SemanticDataModel semanticDataModel = new SemanticDataModel(); diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/infrastructure/repository/jpa/PersistentAssetsAsBuiltRepositoryTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/infrastructure/repository/jpa/PersistentAssetsAsBuiltRepositoryTest.java index f7e2df466d..c1f5d700ff 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/infrastructure/repository/jpa/PersistentAssetsAsBuiltRepositoryTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/infrastructure/repository/jpa/PersistentAssetsAsBuiltRepositoryTest.java @@ -32,7 +32,7 @@ import java.time.Instant; import java.util.List; -import static org.eclipse.tractusx.traceability.testdata.AssetTestDataFactory.createAssetTestData; +import static org.eclipse.tractusx.traceability.testdata.AssetTestDataFactory.createAssetAsBuiltTestdata; @ExtendWith(MockitoExtension.class) class PersistentAssetsAsBuiltRepositoryTest { @@ -84,7 +84,7 @@ void testToAsset() { // then - AssetBase expected = createAssetTestData(); + AssetBase expected = createAssetAsBuiltTestdata(); Assertions.assertEquals(asset.getId(), expected.getId()); Assertions.assertEquals(asset.getIdShort(), expected.getIdShort()); diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/common/mapper/NotificationMapperTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/common/mapper/NotificationMapperTest.java index 04b6a00464..ba43986cde 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/common/mapper/NotificationMapperTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/common/mapper/NotificationMapperTest.java @@ -20,7 +20,7 @@ ********************************************************************************/ package org.eclipse.tractusx.traceability.common.mapper; -import org.eclipse.tractusx.traceability.bpn.domain.service.BpnRepository; +import org.eclipse.tractusx.traceability.bpn.infrastructure.repository.BpnRepository; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationMessage; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationType; import org.eclipse.tractusx.traceability.notification.infrastructure.edc.model.EDCNotification; diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/common/mapper/NotificationMessageMapperTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/common/mapper/NotificationMessageMapperTest.java index f8f305852b..9e7203b965 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/common/mapper/NotificationMessageMapperTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/common/mapper/NotificationMessageMapperTest.java @@ -71,7 +71,7 @@ void testToReceiverInvestigation() { assertEquals(NotificationStatus.RECEIVED, result.getNotificationStatus()); assertEquals(NotificationSide.RECEIVER, result.getNotificationSide()); assertEquals(description, result.getDescription()); - assertEquals(List.of("123"), result.getAssetIds()); + assertEquals(List.of("123"), result.getAffectedPartIds()); assertEquals(List.of(notification), result.getNotifications()); assertEquals(NotificationType.INVESTIGATION, result.getNotificationType()); } diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/common/properties/TraceabilityPropertiesTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/common/properties/TraceabilityPropertiesTest.java index 4b11123f52..f6cb03aa00 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/common/properties/TraceabilityPropertiesTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/common/properties/TraceabilityPropertiesTest.java @@ -46,10 +46,12 @@ void test_traceabilityProperties() { //THEN assertThat(traceabilityProperties.getUrl()).isNotEmpty(); assertThat(traceabilityProperties.getBpn().toString()).isNotEmpty(); - assertThat(traceabilityProperties.getLeftOperand()).isNotEmpty(); assertThat(traceabilityProperties.getOperatorType()).isNotEmpty(); assertThat(traceabilityProperties.getRightOperand()).isNotEmpty(); + assertThat(traceabilityProperties.getLeftOperandSecond()).isNotEmpty(); + assertThat(traceabilityProperties.getOperatorTypeSecond()).isNotEmpty(); + assertThat(traceabilityProperties.getRightOperandSecond()).isNotEmpty(); } diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/discovery/domain/service/DiscoveryServiceImplTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/discovery/domain/service/DiscoveryServiceImplTest.java index def633abab..8fb9f72dff 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/discovery/domain/service/DiscoveryServiceImplTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/discovery/domain/service/DiscoveryServiceImplTest.java @@ -19,10 +19,10 @@ package org.eclipse.tractusx.traceability.discovery.domain.service; import org.eclipse.tractusx.traceability.bpn.domain.model.BpnEdcMapping; -import org.eclipse.tractusx.traceability.bpn.domain.service.BpnRepository; +import org.eclipse.tractusx.traceability.bpn.infrastructure.repository.BpnRepository; +import org.eclipse.tractusx.traceability.common.properties.EdcProperties; import org.eclipse.tractusx.traceability.discovery.domain.model.Discovery; import org.eclipse.tractusx.traceability.discovery.domain.repository.DiscoveryRepository; -import org.eclipse.tractusx.traceability.common.properties.EdcProperties; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -56,7 +56,7 @@ void testGetDiscoveryByBPNSuccessfulBoth() { // given Discovery discoveryByService = Discovery.builder().receiverUrls(List.of("receiver2.de")).senderUrl("sender2.de").build(); - BpnEdcMapping bpnEdcMapping = new BpnEdcMapping("bpn", "receiver.de"); + BpnEdcMapping bpnEdcMapping = new BpnEdcMapping("bpn", "receiver.de", "name"); when(bpnRepository.existsWhereUrlNotNull(any())).thenReturn(true); when(bpnRepository.findByIdOrThrowNotFoundException(any())).thenReturn(bpnEdcMapping); when(discoveryRepository.retrieveDiscoveryByFinderAndEdcDiscoveryService(any())).thenReturn(Optional.of(discoveryByService)); @@ -72,7 +72,7 @@ void testGetDiscoveryByBPNSuccessfulBoth() { void givenTrailingUrl_whenTestGetDiscoveryByBPN_thenSuccessfulBoth() { // given Discovery discoveryByService = Discovery.builder().receiverUrls(List.of("receiver2.de/")).senderUrl("sender2.de").build(); - BpnEdcMapping bpnEdcMapping = new BpnEdcMapping("bpn", "receiver.de"); + BpnEdcMapping bpnEdcMapping = new BpnEdcMapping("bpn", "receiver.de", "name"); when(bpnRepository.existsWhereUrlNotNull(any())).thenReturn(true); when(bpnRepository.findByIdOrThrowNotFoundException(any())).thenReturn(bpnEdcMapping); when(discoveryRepository.retrieveDiscoveryByFinderAndEdcDiscoveryService(any())).thenReturn(Optional.of(discoveryByService)); diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/edc/blackbox/NotificationsEDCFacadeTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/edc/blackbox/NotificationsEDCFacadeTest.java index c83e8d1707..ce1a91d3e8 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/edc/blackbox/NotificationsEDCFacadeTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/edc/blackbox/NotificationsEDCFacadeTest.java @@ -82,8 +82,8 @@ void givenCorrectInvestigationMessageButSendRequestThrowsException_whenStartEdcT final String idsPath = "/api/v1/dsp"; when(edcProperties.getIdsPath()).thenReturn(idsPath); when(edcCatalogFacade.fetchCatalogItems(any())).thenReturn(List.of(catalogItem)); - when(policyCheckerService.isValid(null)).thenReturn(true); - when(contractNegotiationService.negotiate(receiverEdcUrl + idsPath, catalogItem, null)) + when(policyCheckerService.isValid(null, null)).thenReturn(true); + when(contractNegotiationService.negotiate(receiverEdcUrl + idsPath, catalogItem, null, null)) .thenReturn(NegotiationResponse.builder().contractAgreementId(agreementId).build()); when(endpointDataReference.getEndpoint()).thenReturn("endpoint"); when(endpointDataReference.getAuthCode()).thenReturn("authCode"); @@ -111,8 +111,8 @@ void givenCorrectInvestigationMessageButNegotiateContractAgreementHasNoCatalogIt final String idsPath = "/api/v1/dsp"; when(edcProperties.getIdsPath()).thenReturn(idsPath); when(edcCatalogFacade.fetchCatalogItems(any())).thenReturn(List.of(catalogItem)); - when(policyCheckerService.isValid(null)).thenReturn(true); - when(contractNegotiationService.negotiate(receiverEdcUrl + idsPath, catalogItem, null)) + when(policyCheckerService.isValid(null, null)).thenReturn(true); + when(contractNegotiationService.negotiate(receiverEdcUrl + idsPath, catalogItem, null, null)) .thenReturn(null); // when/then diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/edc/blackbox/validators/EDCNotificationValidatorTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/edc/blackbox/validators/EDCNotificationValidatorTest.java index 986162f554..30da61bb4b 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/edc/blackbox/validators/EDCNotificationValidatorTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/edc/blackbox/validators/EDCNotificationValidatorTest.java @@ -22,6 +22,7 @@ import jakarta.validation.ConstraintValidatorContext; import org.eclipse.tractusx.traceability.common.model.BPN; import org.eclipse.tractusx.traceability.common.properties.TraceabilityProperties; +import org.eclipse.tractusx.traceability.notification.domain.notification.exception.NotificationSenderAndReceiverBPNEqualException; import org.eclipse.tractusx.traceability.notification.infrastructure.edc.model.EDCNotification; import org.eclipse.tractusx.traceability.notification.domain.notification.exception.InvestigationReceiverBpnMismatchException; import org.eclipse.tractusx.traceability.notification.infrastructure.edc.EDCNotificationValidator; @@ -64,20 +65,6 @@ void testIsValidWithNullEDCNotification() { } - - @Test - void testIsValidSenderBpnMatch() { - // Given - when(traceabilityProperties.getBpn()).thenReturn(BPN.of("BPN_OF_APPLICATION")); - when(edcNotification.getSenderBPN()).thenReturn("BPN_OF_APPLICATION"); - when(edcNotification.getRecipientBPN()).thenReturn("OTHER"); - // When - boolean result = validator.isValid(edcNotification, context); - - // Then - assertTrue(result); - } - @Test void testReceiverIsApplicationOwner() { // Given @@ -92,6 +79,17 @@ void testReceiverIsApplicationOwner() { assertTrue(result); } + @Test + void testSenderAndReceiverSameBPNException(){ + String bpn = "APPLICATION_BON"; + // Given + when(traceabilityProperties.getBpn()).thenReturn(BPN.of(bpn)); + when(edcNotification.getSenderBPN()).thenReturn(bpn); + when(edcNotification.getRecipientBPN()).thenReturn(bpn); + when(edcNotification.getNotificationId()).thenReturn("123"); + assertThrows(NotificationSenderAndReceiverBPNEqualException.class, () -> validator.isValid(edcNotification, context)); + } + @Test void testThrowsExceptionNoBpnMatch() { // Given diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/edc/model/EdcNotificationModelTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/edc/model/EdcNotificationModelTest.java index d21473efd7..1cf0326697 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/edc/model/EdcNotificationModelTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/edc/model/EdcNotificationModelTest.java @@ -26,7 +26,7 @@ import notification.request.NotificationSeverityRequest; import notification.request.NotificationTypeRequest; import notification.request.StartNotificationRequest; -import notification.request.UpdateNotificationRequest; +import notification.request.UpdateNotificationStatusTransitionRequest; import notification.request.UpdateNotificationStatusRequest; import java.time.Instant; @@ -92,7 +92,6 @@ public void testSanitizeStartNotificationRequest() { "The description\n", targetDate, severity, - true, "BPN00001123123AS\n", NotificationTypeRequest.ALERT ); @@ -102,9 +101,8 @@ public void testSanitizeStartNotificationRequest() { StartNotificationRequest cleanRequest = sanitize(request); //THEN - assertEquals("urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca979 ", cleanRequest.getPartIds().get(1)); + assertEquals("urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca979 ", cleanRequest.getAffectedPartIds().get(1)); assertEquals("The description ", cleanRequest.getDescription()); - assertTrue(cleanRequest.isAsBuilt()); assertEquals("BPN00001123123AS ", cleanRequest.getReceiverBpn()); } @@ -127,17 +125,17 @@ public void testSanitizeCloseInvestigationRequest() { @Test public void testSanitizeUpdateNotificationRequest() { //GIVEN - UpdateNotificationRequest updateNotificationRequest = UpdateNotificationRequest + UpdateNotificationStatusTransitionRequest updateNotificationStatusTransitionRequest = UpdateNotificationStatusTransitionRequest .builder() .reason("Reason\n") .status(UpdateNotificationStatusRequest.ACCEPTED) .build(); //WHEN - UpdateNotificationRequest cleanUpdateNotificationRequest = sanitize(updateNotificationRequest); + UpdateNotificationStatusTransitionRequest cleanUpdateNotificationStatusTransitionRequest = sanitize(updateNotificationStatusTransitionRequest); //THEN - assertEquals("Reason ", cleanUpdateNotificationRequest.getReason()); + assertEquals("Reason ", cleanUpdateNotificationStatusTransitionRequest.getReason()); } } diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/edc/notificationcontract/service/EdcNotificationContractServiceTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/edc/notificationcontract/service/EdcNotificationContractServiceTest.java index 59a6e218e7..dba9c0aecb 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/edc/notificationcontract/service/EdcNotificationContractServiceTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/edc/notificationcontract/service/EdcNotificationContractServiceTest.java @@ -88,7 +88,7 @@ void testHandle() throws CreateEdcAssetException, CreateEdcPolicyDefinitionExcep // given NotificationType notificationType = NotificationType.QUALITY_INVESTIGATION; NotificationMethod notificationMethod = NotificationMethod.RESOLVE; - List policyResponses = IrsPolicyResponse.toResponse(List.of(createIrsPolicyResponse("test", OffsetDateTime.now(), "or", "and"))); + List policyResponses = IrsPolicyResponse.toResponse(List.of(createIrsPolicyResponse("test", OffsetDateTime.now(), "orLeft", "andLeft", "or", "and"))); when(policyService.getFirstPolicyMatchingApplicationConstraint()).thenReturn(Optional.of(policyResponses.get(0))); CreateNotificationContractRequest request = new CreateNotificationContractRequest(notificationType, notificationMethod); when(edcNotificationAssetService.createNotificationAsset(any(), any(), any(), any())).thenReturn(notificationAssetId); @@ -128,7 +128,7 @@ void givenService_whenPolicyDefinitionServiceThrowsException_thenThrowException( // given NotificationType notificationType = NotificationType.QUALITY_INVESTIGATION; NotificationMethod notificationMethod = NotificationMethod.RESOLVE; - List policyResponses = IrsPolicyResponse.toResponse(List.of(createIrsPolicyResponse("test", OffsetDateTime.now(), "or", "and"))); + List policyResponses = IrsPolicyResponse.toResponse(List.of(createIrsPolicyResponse("test", OffsetDateTime.now(), "orLeft", "andLeft", "or", "and"))); when(policyService.getFirstPolicyMatchingApplicationConstraint()).thenReturn(Optional.of(policyResponses.get(0))); CreateNotificationContractRequest request = new CreateNotificationContractRequest(notificationType, notificationMethod); when(edcNotificationAssetService.createNotificationAsset(any(), any(), any(), any())).thenReturn(notificationAssetId); @@ -146,7 +146,7 @@ void givenService_whenContractDefinitionServiceThrowsException_thenThrowExceptio NotificationType notificationType = NotificationType.QUALITY_INVESTIGATION; NotificationMethod notificationMethod = NotificationMethod.RESOLVE; CreateNotificationContractRequest request = new CreateNotificationContractRequest(notificationType, notificationMethod); - List policyResponses = IrsPolicyResponse.toResponse(List.of(createIrsPolicyResponse("test", OffsetDateTime.now(), "or", "and"))); + List policyResponses = IrsPolicyResponse.toResponse(List.of(createIrsPolicyResponse("test", OffsetDateTime.now(),"orLeft", "andLeft", "or", "and"))); when(policyService.getFirstPolicyMatchingApplicationConstraint()).thenReturn(Optional.of(policyResponses.get(0))); when(edcNotificationAssetService.createNotificationAsset(any(), any(), any(), any())).thenReturn(notificationAssetId); when(traceabilityProperties.getUrl()).thenReturn("https://test"); diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/jpa/bpn_edc/BpnRepositoryImplTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/jpa/bpn_edc/BpnRepositoryImplTest.java index b1db52283c..f785bcbafe 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/jpa/bpn_edc/BpnRepositoryImplTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/jpa/bpn_edc/BpnRepositoryImplTest.java @@ -20,9 +20,9 @@ package org.eclipse.tractusx.traceability.infrastructure.jpa.bpn_edc; import org.eclipse.tractusx.traceability.bpn.domain.model.BpnNotFoundException; -import org.eclipse.tractusx.traceability.bpn.domain.service.BpnRepository; -import org.eclipse.tractusx.traceability.bpn.infrastructure.repository.JpaBpnRepository; +import org.eclipse.tractusx.traceability.bpn.infrastructure.repository.BpnRepository; import org.eclipse.tractusx.traceability.bpn.infrastructure.repository.BpnRepositoryImpl; +import org.eclipse.tractusx.traceability.bpn.infrastructure.repository.JpaBpnRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/jpa/bpn_edc/BpnServiceImplTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/jpa/bpn_edc/BpnServiceImplTest.java index 4b43e5d954..58ea9ea570 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/jpa/bpn_edc/BpnServiceImplTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/infrastructure/jpa/bpn_edc/BpnServiceImplTest.java @@ -21,9 +21,8 @@ import bpn.request.BpnMappingRequest; import org.eclipse.tractusx.traceability.bpn.domain.model.BpnNotFoundException; -import org.eclipse.tractusx.traceability.bpn.domain.service.BpnRepository; -import org.eclipse.tractusx.traceability.bpn.domain.service.BpnServiceImpl; - +import org.eclipse.tractusx.traceability.bpn.infrastructure.repository.BpnRepository; +import org.eclipse.tractusx.traceability.bpn.infrastructure.repository.BpnServiceImpl; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/IntegrationTestSpecification.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/IntegrationTestSpecification.java index bac6eb493b..176e60bd98 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/IntegrationTestSpecification.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/IntegrationTestSpecification.java @@ -58,6 +58,7 @@ public class IntegrationTestSpecification { @BeforeEach void beforeEach() throws JoseException { + oAuth2ApiSupport.oauth2ApiReturnsTechnicalUserToken(); oAuth2ApiSupport.oauth2ApiReturnsJwkCerts(oAuth2Support.jwk()); } diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/AssetAsBuiltControllerAllIT.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/AssetAsBuiltControllerAllIT.java index 3995a97c83..1a314cb81f 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/AssetAsBuiltControllerAllIT.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/AssetAsBuiltControllerAllIT.java @@ -38,6 +38,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.everyItem; import static org.hamcrest.Matchers.hasEntry; +import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.not; import static org.junit.jupiter.params.provider.Arguments.arguments; @@ -129,7 +130,7 @@ void shouldReturnAllAssets() throws JoseException { .body("content[0]", hasEntry("idShort", "vehicle_hybrid.asm")) .body("content[0]", hasEntry("semanticModelId", "OMA-TGFAYUHXFLHHUQQMPLTE")) .body("content[0]", hasEntry("businessPartner", "BPNL00000003AYRE")) - .body("content[0]", hasEntry("manufacturerName", "Manufacturer Name 1")) + .body("content[0]", hasEntry("manufacturerName", "OEM A")) .body("content[0]", hasEntry("qualityType", "Ok")) .body("content[0]", hasEntry("van", "OMA-TGFAYUHXFLHHUQQMPLTE")) .body("content[0].detailAspectModels[0].data", hasEntry("manufacturingCountry", "DEU")) @@ -199,6 +200,48 @@ void shouldGetTractionBatteryCodeAsset() throws JoseException { .body("content[0].detailAspectModels[1]", hasEntry("type", "TRACTION_BATTERY_CODE")); } + @Test + void shouldPersistTractionBatteryCodeAssetsOnlyOnce() throws JoseException { + //GIVEN + assetsSupport.tractionBatteryCodeAssetsStored(); + + //WHEN + given() + .header(oAuth2Support.jwtAuthorization(ADMIN)) + .contentType(ContentType.JSON) + .param("page", "0") + .param("size", "10") + .when() + .log().all() + .get("/api/assets/as-built") + .then() + .log().all() + .statusCode(200) + .body("page", Matchers.is(0)) + .body("pageSize", Matchers.is(10)) + .body("content[0].detailAspectModels", hasSize(2)); + + //This should not cause any duplicates in traction_battery_code_subcomponent table + assetsSupport.tractionBatteryCodeAssetsStored(); + + //THEN + given() + .header(oAuth2Support.jwtAuthorization(ADMIN)) + .contentType(ContentType.JSON) + .param("page", "0") + .param("size", "10") + .when() + .log().all() + .get("/api/assets/as-built") + .then() + .log().all() + .statusCode(200) + .body("page", Matchers.is(0)) + .body("pageSize", Matchers.is(10)) + .body("content[0].detailAspectModels", hasSize(2)); + + } + @Test void givenNonExistingSortField_whenGetAssetsAsBuilt_thenBadRequest() throws JoseException { //THEN diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/AssetAsBuiltControllerFilterValuesIT.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/AssetAsBuiltControllerFilterValuesIT.java index 7c08f27a59..2684ffa17d 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/AssetAsBuiltControllerFilterValuesIT.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/AssetAsBuiltControllerFilterValuesIT.java @@ -278,6 +278,33 @@ void givenEnumTypeFieldNameImportState_whenCallDistinctFilterValues_thenProperRe .body("size()", is(6)); } + @Test + void givenInAssetListIsProvided_whenCallDistinctFilterValues_thenProperResponse() throws JoseException { + // given + assetsSupport.defaultAssetsStored(); + String fieldName = "id"; + String resultLimit = "100"; + String owner = "SUPPLIER"; + String inAssetIds = "urn:uuid:0ce83951-bc18-4e8f-892d-48bad4eb67ef,urn:uuid:16bb1a7e-8ed8-48ca-a839-5f38b704fcae"; + + // then + given() + .header(oAuth2Support.jwtAuthorization(ADMIN)) + .contentType(ContentType.JSON) + .log().all() + .when() + .param("fieldName", fieldName) + .param("size", resultLimit) + .param("owner", owner) + .param("inAssetIds", inAssetIds) + .get("/api/assets/as-built/distinctFilterValues") + .then() + .log().all() + .statusCode(200) + .assertThat() + .body("size()", is(2)); + } + private static Stream fieldNameTestProvider() { return Stream.of( Arguments.of("id", 10L, 10), diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/AssetAsBuiltControllerFilteringIT.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/AssetAsBuiltControllerFilteringIT.java index af9c9a29b5..0e252796d3 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/AssetAsBuiltControllerFilteringIT.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/AssetAsBuiltControllerFilteringIT.java @@ -81,6 +81,42 @@ void givenNoFilter_whenCallFilteredEndpoint_thenReturnExpectedResult() throws Jo .body("totalItems", equalTo(13)); } + @Test + void givenExcludeFilter_whenCallFilteredEndpoint_thenReturnExpectedResult() throws JoseException { + // given + assetsSupport.defaultAssetsStored(); + final String filter = "?filter=id,EXCLUDE,urn:uuid:d387fa8e-603c-42bd-98c3-4d87fef8d2bb,AND&filter=id,EXCLUDE,urn:uuid:6dafbcec-2fce-4cbb-a5a9-b3b32aa5cffc,AND"; + + // then + given() + .header(oAuth2Support.jwtAuthorization(ADMIN)) + .contentType(ContentType.JSON) + .log().all() + .when() + .get("/api/assets/as-built" + filter) + .then() + .statusCode(200) + .body("totalItems", equalTo(11)); + } + + @Test + void givenExcludeFilterMultiFilter_whenCallFilteredEndpoint_thenReturnExpectedResult() throws JoseException { + // given + assetsSupport.defaultAssetsStored(); + final String filter = "?filter=id,EXCLUDE,urn:uuid:d387fa8e-603c-42bd-98c3-4d87fef8d2bb,AND&filter=id,EQUAL,urn:uuid:6dafbcec-2fce-4cbb-a5a9-b3b32aa5cffc,AND"; + + // then + given() + .header(oAuth2Support.jwtAuthorization(ADMIN)) + .contentType(ContentType.JSON) + .log().all() + .when() + .get("/api/assets/as-built" + filter) + .then() + .statusCode(200) + .body("totalItems", equalTo(1)); + } + @Test void givenIdAndIdShortFilter_whenCallFilteredEndpoint_thenReturnExpectedResult() throws JoseException { // given @@ -461,7 +497,7 @@ void givenAssetsWithAlerts_whenGetAssetSortedBySentActiveAlertsDesc_thenReturnPr for (int i = 0; i < assets.size(); i++) { for (int j = i; j > 0; j--) { - alertsSupport.storeAlertWithStatusAndAssets(CREATED, List.of(assets.get(i)),SENDER); + alertsSupport.storeAlertWithStatusAndAssets(CREATED, List.of(assets.get(i)), SENDER); } } diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/AssetAsPlannedControllerByIdIT.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/AssetAsPlannedControllerByIdIT.java index 4a28bd5a3f..24cfab181a 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/AssetAsPlannedControllerByIdIT.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/AssetAsPlannedControllerByIdIT.java @@ -191,7 +191,7 @@ void shouldReturnAssetAsPlannedWithBusinessPartner() throws JoseException { assetsSupport.defaultAssetsAsPlannedStored(); String existingAssetId = "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4da01"; String expectedBusinessPartner = "BPNL00000003CML1"; - String expectedManufacturerName = "TEST_MANUFACTURER_NAME_CML1"; + String expectedManufacturerName = "OEM A"; //THEN given() diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/AssetAsPlannedControllerDetailInformationIT.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/AssetAsPlannedControllerDetailInformationIT.java index 32d1d12a81..3bc04c3f5e 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/AssetAsPlannedControllerDetailInformationIT.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/AssetAsPlannedControllerDetailInformationIT.java @@ -45,7 +45,6 @@ class AssetAsPlannedControllerDetailInformationIT extends IntegrationTestSpecifi @Test void shouldNotReturnAassetsDetailInformationWhenUserIsNotAuthenticated() { //GIVEN - bpnSupport.cachedBpnsForAsPlannedAssets(); assetsSupport.defaultAssetsAsPlannedStored(); //THEN @@ -64,7 +63,6 @@ void shouldNotReturnAassetsDetailInformationWhenUserIsNotAuthenticated() { @Test void shouldReturnAssetsDetailInformation() throws JoseException { //GIVEN - bpnSupport.cachedBpnsForAsPlannedAssets(); assetsSupport.defaultAssetsAsPlannedStored(); //THEN diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/AssetAsPlannedControllerFilterValuesIT.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/AssetAsPlannedControllerFilterValuesIT.java index 06a935961b..f4608235dc 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/AssetAsPlannedControllerFilterValuesIT.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/AssetAsPlannedControllerFilterValuesIT.java @@ -244,6 +244,33 @@ void givenEnumTypeFieldNameImportState_whenCallDistinctFilterValues_thenProperRe .body("size()", is(6)); } + @Test + void givenInAssetListIsProvided_whenCallDistinctFilterValues_thenProperResponse() throws JoseException { + // given + assetsSupport.defaultAssetsAsPlannedStored(); + String fieldName = "id"; + String resultLimit = "100"; + String owner = "OWN"; + String inAssetIds = "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4da01"; + + // then + given() + .header(oAuth2Support.jwtAuthorization(ADMIN)) + .contentType(ContentType.JSON) + .log().all() + .when() + .param("fieldName", fieldName) + .param("size", resultLimit) + .param("owner", owner) + .param("inAssetIds", inAssetIds) + .get("/api/assets/as-planned/distinctFilterValues") + .then() + .log().all() + .statusCode(200) + .assertThat() + .body("size()", is(1)); + } + private static Stream fieldNameTestProvider() { return Stream.of( Arguments.of("id", 10L, 2), diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/DashboardControllerIT.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/DashboardControllerIT.java index 5d70d73bfb..6d5abf9dc7 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/DashboardControllerIT.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/DashboardControllerIT.java @@ -20,6 +20,9 @@ package org.eclipse.tractusx.traceability.integration.assets; import io.restassured.http.ContentType; +import notification.request.NotificationSeverityRequest; +import notification.request.NotificationTypeRequest; +import notification.request.StartNotificationRequest; import org.eclipse.tractusx.traceability.assets.domain.base.model.Owner; import org.eclipse.tractusx.traceability.assets.infrastructure.asbuilt.model.AssetAsBuiltEntity; import org.eclipse.tractusx.traceability.assets.infrastructure.asbuilt.repository.JpaAssetAsBuiltRepository; @@ -36,9 +39,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.testcontainers.shaded.com.fasterxml.jackson.core.JsonProcessingException; import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper; -import notification.request.NotificationSeverityRequest; -import notification.request.NotificationTypeRequest; -import notification.request.StartNotificationRequest; import java.util.List; import java.util.stream.Stream; @@ -155,6 +155,20 @@ void givenNoRoles_whenGetDashboard_thenReturn401() throws JoseException { .then().statusCode(401); } + @Test + void givenNoRoles_whenGetDashboard_thenReturn403() throws JoseException { + // given + assetsSupport.defaultAssetsStored(); + + // when/then + given() + .header(oAuth2Support.jwtAuthorizationWithNoRole()) + .contentType(ContentType.JSON) + .log().all() + .when().get("/api/dashboard") + .then().statusCode(403); + } + @Test void givenPendingInvestigation_whenGetDashboard_thenReturnPendingInvestigation() throws JoseException, JsonProcessingException { // given @@ -162,11 +176,11 @@ void givenPendingInvestigation_whenGetDashboard_thenReturnPendingInvestigation() notificationSupport.defaultReceivedInvestigationStored(); String assetId = "urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978"; var notificationRequest = StartNotificationRequest.builder() - .partIds(List.of(assetId)) + .affectedPartIds(List.of(assetId)) .description("at least 15 characters long investigation description") .severity(NotificationSeverityRequest.MINOR) .type(NotificationTypeRequest.INVESTIGATION) - .isAsBuilt(true) + .receiverBpn("BPNL00000003CNKC") .build(); // when diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/asbuilt/infrastructure/repository/AssetAsBuiltRepositoryIT.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/asbuilt/infrastructure/repository/AssetAsBuiltRepositoryIT.java index 50d1e54f3e..1c2ad12af4 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/asbuilt/infrastructure/repository/AssetAsBuiltRepositoryIT.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/asbuilt/infrastructure/repository/AssetAsBuiltRepositoryIT.java @@ -60,7 +60,7 @@ void givenIdField_whenGetFieldValues_thenSorted( assetsSupport.defaultAssetsStored(); // when - List result = assetAsBuiltRepository.getFieldValues(fieldName, startWith, resultLimit, null); + List result = assetAsBuiltRepository.getFieldValues(fieldName, startWith, resultLimit, null, List.of()); // then assertThat(result) diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/asplanned/infrastructure/repository/AssetAsPlannedRepositoryIT.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/asplanned/infrastructure/repository/AssetAsPlannedRepositoryIT.java index 2663e8b457..3e30953491 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/asplanned/infrastructure/repository/AssetAsPlannedRepositoryIT.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/asplanned/infrastructure/repository/AssetAsPlannedRepositoryIT.java @@ -52,7 +52,7 @@ void givenFieldNameAndResultLimit_whenGetFieldValues_thenSorted( assetsSupport.defaultAssetsAsPlannedStored(); // when - List result = assetAsPlannedRepository.getFieldValues(fieldName, startWith, resultLimit, null); + List result = assetAsPlannedRepository.getFieldValues(fieldName, startWith, resultLimit, null, List.of()); // then assertThat(result) diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/infrastructure/base/IrsCallbackControllerIT.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/infrastructure/base/IrsCallbackControllerIT.java index 928728ae3e..c62e3e91de 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/infrastructure/base/IrsCallbackControllerIT.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/assets/infrastructure/base/IrsCallbackControllerIT.java @@ -24,6 +24,7 @@ import org.eclipse.tractusx.traceability.common.security.JwtRole; import org.eclipse.tractusx.traceability.integration.IntegrationTestSpecification; import org.eclipse.tractusx.traceability.integration.common.support.AssetsSupport; +import org.eclipse.tractusx.traceability.integration.common.support.BpnSupport; import org.eclipse.tractusx.traceability.integration.common.support.IrsApiSupport; import org.eclipse.tractusx.traceability.integration.common.support.repository.AssetAsBuiltSupportRepository; import org.eclipse.tractusx.traceability.integration.common.support.repository.BpnSupportRepository; @@ -44,6 +45,9 @@ class IrsCallbackControllerIT extends IntegrationTestSpecification { @Autowired BpnSupportRepository bpnSupportRepository; + @Autowired + BpnSupport bpnSupport; + @Autowired AssetsSupport assetsSupport; @@ -55,6 +59,7 @@ class IrsCallbackControllerIT extends IntegrationTestSpecification { void givenNoAssets_whenCallbackReceived_thenSaveThem() throws JoseException { // given + bpnSupport.providesBpdmLookup(); oAuth2ApiSupport.oauth2ApiReturnsTechnicalUserToken(); irsApiSupport.irsApiReturnsJobDetails(); String jobId = "ebb79c45-7bba-4169-bf17-3e719989ab54"; @@ -73,7 +78,7 @@ void givenNoAssets_whenCallbackReceived_thenSaveThem() throws JoseException { .statusCode(200); // then - assertThat(bpnSupportRepository.findAll()).hasSize(6); + assertThat(bpnSupportRepository.findAll()).hasSize(1); assetsSupport.assertAssetAsBuiltSize(16); assetsSupport.assertAssetAsPlannedSize(0); String contractAgreementId = given() @@ -93,6 +98,7 @@ void givenNoAssets_whenCallbackReceived_thenSaveThem() throws JoseException { @Test void givenNoAssets_whenCallbackReceivedForAsPlanned_thenSaveThem() { // given + bpnSupport.providesBpdmLookup(); oAuth2ApiSupport.oauth2ApiReturnsTechnicalUserToken(); irsApiSupport.irsJobDetailsAsPlanned(); String jobId = "ebb79c45-7bba-4169-bf17-SUCCESSFUL_AS_PLANNED"; @@ -111,7 +117,7 @@ void givenNoAssets_whenCallbackReceivedForAsPlanned_thenSaveThem() { .statusCode(200); // then - assertThat(bpnSupportRepository.findAll()).hasSize(2); + assertThat(bpnSupportRepository.findAll()).hasSize(1); assetsSupport.assertAssetAsBuiltSize(0); assetsSupport.assertAssetAsPlannedSize(3); } @@ -145,6 +151,7 @@ void givenInvalidJobId_whenCallbackReceivedForAsPlanned_thenNothingSynchronized( @Test void givenAssetExist_whenCallbackReceived_thenUpdateIt() { // given + bpnSupport.providesBpdmLookup(); oAuth2ApiSupport.oauth2ApiReturnsTechnicalUserToken(); irsApiSupport.irsApiReturnsJobDetails(); String jobId = "ebb79c45-7bba-4169-bf17-3e719989ab54"; @@ -174,7 +181,7 @@ void givenAssetExist_whenCallbackReceived_thenUpdateIt() { .statusCode(200); // then - assertThat(bpnSupportRepository.findAll()).hasSize(6); + assertThat(bpnSupportRepository.findAll()).hasSize(1); assetsSupport.assertAssetAsBuiltSize(16); assetsSupport.assertAssetAsPlannedSize(0); } @@ -182,6 +189,8 @@ void givenAssetExist_whenCallbackReceived_thenUpdateIt() { @Test void givenSuccessImportJob_whenCallbackReceivedWithTombsones_thenUpdateAsBuiltAsset() throws JoseException { // given + + bpnSupport.providesBpdmLookup(); oAuth2ApiSupport.oauth2ApiReturnsTechnicalUserToken(); irsApiSupport.irsApiReturnsJobDetails(); String jobId = "ebb79c45-7bba-4169-bf17-3e719989ab54"; @@ -231,6 +240,7 @@ void givenSuccessImportJob_whenCallbackReceivedWithTombsones_thenUpdateAsBuiltAs @Test void givenSuccessImportJob_whenCallbackReceivedWithTombsones_thenUpdateAsPlannedAsset() throws JoseException { // given + bpnSupport.providesBpdmLookup(); oAuth2ApiSupport.oauth2ApiReturnsTechnicalUserToken(); irsApiSupport.irsJobDetailsAsPlanned(); String jobId = "ebb79c45-7bba-4169-bf17-SUCCESSFUL_AS_PLANNED"; @@ -276,4 +286,44 @@ void givenSuccessImportJob_whenCallbackReceivedWithTombsones_thenUpdateAsPlanned assertThat(tombstoneAsPlanned).isNotEmpty(); } + + @Test + void givenNoAssets_whenCallbackReceived_thenSaveThem_withoutManufacturerName() throws JoseException { + // given + + bpnSupport.returnsBpdmLookup401Unauthorized(); + irsApiSupport.irsApiReturnsJobDetails(); + String jobId = "ebb79c45-7bba-4169-bf17-3e719989ab54"; + String jobState = "COMPLETED"; + + // when + given() + .contentType(ContentType.JSON) + .log().all() + .when() + .param("id", jobId) + .param("state", jobState) + .get("/api/irs/job/callback") + .then() + .log().all() + .statusCode(200); + + // then + assetsSupport.assertAssetAsBuiltSize(16); + assetsSupport.assertAssetAsPlannedSize(0); + String manufacturerName = given() + .header(oAuth2Support.jwtAuthorization(JwtRole.ADMIN)) + .contentType(ContentType.JSON) + .log().all() + .when() + .pathParam("assetId", "urn:uuid:d387fa8e-603c-42bd-98c3-4d87fef8d2bb") + .get("/api/assets/as-built/{assetId}") + .then() + .log().all() + .statusCode(200) + .extract().path("manufacturerName"); + assertThat(manufacturerName).isNull(); + } + + } diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/config/RestitoConfig.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/config/RestitoConfig.java index aca244feb3..eb9b41cb34 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/config/RestitoConfig.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/config/RestitoConfig.java @@ -61,7 +61,8 @@ public void initialize(ConfigurableApplicationContext configurableApplicationCon "irs-edc-client.controlplane.endpoint.data=http://localhost:" + STUB_SERVER_PORT + "/management", "registry.urlWithPath=http://127.0.0.1:" + STUB_SERVER_PORT + "/semantics/registry/api/v3.0", "edc.parts-provider-edc-controlplane-url=http://localhost:" + STUB_SERVER_PORT, - "edc.callbackUrls=http://localhost:" + STUB_SERVER_PORT + "/callback/redirect" + "edc.callbackUrls=http://localhost:" + STUB_SERVER_PORT + "/callback/redirect", + "bpdm.bpnEndpoint=http://localhost:" + STUB_SERVER_PORT + "/api/catena/legal-entities/{partnerId}?idType={idType}" ).applyTo(configurableApplicationContext.getEnvironment()); } } diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/AssetRepositoryProvider.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/AssetRepositoryProvider.java index 65ae720bc7..78eebc3622 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/AssetRepositoryProvider.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/AssetRepositoryProvider.java @@ -20,7 +20,7 @@ import org.eclipse.tractusx.traceability.assets.domain.asbuilt.repository.AssetAsBuiltRepository; import org.eclipse.tractusx.traceability.assets.domain.asplanned.repository.AssetAsPlannedRepository; -import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.factory.AssetMapperFactory; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.factory.IrsResponseAssetMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -34,7 +34,7 @@ public class AssetRepositoryProvider { AssetAsBuiltRepository assetAsBuiltRepository; @Autowired - AssetMapperFactory assetMapperFactory; + IrsResponseAssetMapper assetMapperFactory; @Autowired AssetTestData assetTestData; diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/AssetTestData.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/AssetTestData.java index 754cf057b6..e86cf2b89a 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/AssetTestData.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/AssetTestData.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase; import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IRSResponse; -import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.factory.AssetMapperFactory; +import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.factory.IrsResponseAssetMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -40,7 +40,7 @@ public class AssetTestData { @Autowired - private AssetMapperFactory assetMapperFactory; + private IrsResponseAssetMapper assetMapperFactory; private final ObjectMapper mapper = new ObjectMapper() .registerModule(new JavaTimeModule()) .registerModule(new SimpleModule().addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ISO_LOCAL_DATE_TIME))) @@ -51,7 +51,7 @@ List readAndConvertAssetsForTests() { try { InputStream file = AssetTestData.class.getResourceAsStream("/data/irs_assets_v4.json"); IRSResponse response = mapper.readValue(file, IRSResponse.class); - return assetMapperFactory.mapToAssetBaseList(response); + return assetMapperFactory.toAssetBaseList(response); } catch (IOException e) { return Collections.emptyList(); } @@ -61,7 +61,7 @@ List readAndConvertTractionBatteryCodeAssetsForTests() { try { InputStream file = AssetTestData.class.getResourceAsStream("/data/irs_assets_tractionbatterycode.json"); IRSResponse response = mapper.readValue(file, IRSResponse.class); - return assetMapperFactory.mapToAssetBaseList(response); + return assetMapperFactory.toAssetBaseList(response); } catch (IOException e) { return Collections.emptyList(); } @@ -71,7 +71,7 @@ List readAndConvertAssetsAsPlannedForTests() { try { InputStream file = AssetTestData.class.getResourceAsStream("/data/irs_assets_as_planned_v4.json"); IRSResponse response = mapper.readValue(file, IRSResponse.class); - return assetMapperFactory.mapToAssetBaseList(response); + return assetMapperFactory.toAssetBaseList(response); } catch (IOException e) { e.printStackTrace(); return Collections.emptyList(); diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/AssetsSupport.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/AssetsSupport.java index 417e31bf38..719ccc59e4 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/AssetsSupport.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/AssetsSupport.java @@ -30,12 +30,20 @@ public class AssetsSupport { @Autowired AssetRepositoryProvider assetRepositoryProvider; + @Autowired + BpnSupport bpnSupport; + + @Autowired + OAuth2ApiSupport oAuth2ApiSupport; + public String emptyText() { return ""; } public void defaultAssetsStored() { + oAuth2ApiSupport.oauth2ApiReturnsTechnicalUserToken(); + bpnSupport.providesBpdmLookup(); assetRepositoryProvider.assetAsBuiltRepository().saveAll(assetRepositoryProvider.testdataProvider().readAndConvertAssetsForTests()); } @@ -44,10 +52,12 @@ public AssetAsBuiltEntity findById(String id) { } public void tractionBatteryCodeAssetsStored() { + bpnSupport.providesBpdmLookup(); assetRepositoryProvider.assetAsBuiltRepository().saveAll(assetRepositoryProvider.testdataProvider().readAndConvertTractionBatteryCodeAssetsForTests()); } public void defaultAssetsAsPlannedStored() { + bpnSupport.providesBpdmLookup(); assetRepositoryProvider.assetAsPlannedRepository().saveAll(assetRepositoryProvider.testdataProvider().readAndConvertAssetsAsPlannedForTests()); } diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/BpnEdcMappingSupport.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/BpnEdcMappingSupport.java index a3f5bbdcad..d46c8a01c8 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/BpnEdcMappingSupport.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/BpnEdcMappingSupport.java @@ -20,7 +20,7 @@ package org.eclipse.tractusx.traceability.integration.common.support; import bpn.request.BpnMappingRequest; -import org.eclipse.tractusx.traceability.bpn.domain.service.BpnRepository; +import org.eclipse.tractusx.traceability.bpn.infrastructure.repository.BpnRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/BpnSupport.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/BpnSupport.java index 566b5893f4..6b9cb5a152 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/BpnSupport.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/BpnSupport.java @@ -19,7 +19,8 @@ package org.eclipse.tractusx.traceability.integration.common.support; import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase; -import org.eclipse.tractusx.traceability.bpn.domain.service.BpnRepository; +import org.eclipse.tractusx.traceability.bpn.infrastructure.repository.BpnRepository; +import org.glassfish.grizzly.http.util.HttpStatus; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; @@ -27,6 +28,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.regex.Pattern; + +import static com.xebialabs.restito.builder.stub.StubHttp.whenHttp; +import static com.xebialabs.restito.semantics.Action.status; +import static com.xebialabs.restito.semantics.Condition.matchesUri; @Component public class BpnSupport { @@ -36,10 +42,15 @@ public class BpnSupport { @Autowired AssetRepositoryProvider assetRepositoryProvider; + + @Autowired + RestitoProvider restitoProvider; + @Value("${traceability.bpn}") String bpn = null; public void cachedBpnsForDefaultAssets() { + providesBpdmLookup(); List assetIds = assetRepositoryProvider.testdataProvider().readAndConvertAssetsForTests().stream().map(AssetBase::getManufacturerId).toList(); Map bpnMappings = new HashMap<>(); @@ -64,4 +75,21 @@ public void cachedBpnsForAsPlannedAssets() { public String testBpn() { return bpn; } + + public void providesBpdmLookup() { + whenHttp(restitoProvider.stubServer()).match( + matchesUri(Pattern.compile("/api/catena/legal-entities/.+")) + ).then( + status(HttpStatus.OK_200), + restitoProvider.jsonResponseFromFile("stubs/bpdm/response_200.json") + ); + } + + public void returnsBpdmLookup401Unauthorized() { + whenHttp(restitoProvider.stubServer()).match( + matchesUri(Pattern.compile("/api/catena/legal-entities/.+")) + ).then( + status(HttpStatus.UNAUTHORIZED_401) + ); + } } diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/NotificationApiSupport.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/NotificationApiSupport.java new file mode 100644 index 0000000000..7fc3947c93 --- /dev/null +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/NotificationApiSupport.java @@ -0,0 +1,101 @@ +/******************************************************************************** + * Copyright (c) 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.traceability.integration.common.support; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import io.restassured.common.mapper.TypeRef; +import io.restassured.http.ContentType; +import io.restassured.http.Header; +import io.restassured.response.Response; +import io.restassured.response.ResponseBody; +import lombok.RequiredArgsConstructor; +import notification.request.EditNotificationRequest; +import notification.request.StartNotificationRequest; +import notification.response.NotificationResponse; +import org.eclipse.tractusx.traceability.common.model.PageResult; +import org.eclipse.tractusx.traceability.common.request.OwnPageable; +import org.eclipse.tractusx.traceability.common.request.PageableFilterRequest; +import org.eclipse.tractusx.traceability.common.request.SearchCriteriaRequestParam; +import org.hamcrest.Matchers; +import org.springframework.stereotype.Component; + +import java.util.Collections; +import java.util.List; + +import static io.restassured.RestAssured.given; +import static org.eclipse.tractusx.traceability.common.security.JwtRole.SUPERVISOR; + +@Component +@RequiredArgsConstructor +public class NotificationApiSupport { + + private final AssetsSupport assetsSupport; + private final ObjectMapper objectMapper; + + public int createNotificationRequest_withDefaultAssetsStored(Header authHeader, StartNotificationRequest startNotificationRequest, int expectedStatusCode) throws JsonProcessingException { + + assetsSupport.defaultAssetsStored(); + + // when + Response response = given() + .contentType(ContentType.JSON) + .body(objectMapper.writeValueAsString(startNotificationRequest)) + .header(authHeader) + .when() + .post("/api/notifications") + .then() + .statusCode(expectedStatusCode) + .extract() + .response(); + + return response.path("id") != null ? response.path("id") : 9999; + + } + + public void editNotificationRequest(Header authHeader, EditNotificationRequest editNotificationRequest, int notificationId, int expectedStatusCode) throws JsonProcessingException { + + // when + given() + .contentType(ContentType.JSON) + .body(objectMapper.writeValueAsString(editNotificationRequest)) + .header(authHeader) + .when() + .put("/api/notifications/" + notificationId + "/edit") + .then() + .statusCode(expectedStatusCode); + } + + public PageResult getNotificationsRequest(Header authHeader){ + Response response = given() + .header(authHeader) + .body(new PageableFilterRequest(new OwnPageable(0, 10, Collections.emptyList()), new SearchCriteriaRequestParam(List.of("channel,EQUAL,SENDER,AND")))) + .contentType(ContentType.JSON) + .when() + .post("/api/notifications/filter") + .then() + .statusCode(200) + .extract().response(); + + return response.as(new TypeRef>() {}); + + } +} diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/NotificationMessageSupport.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/NotificationMessageSupport.java index 7121cf9b9d..d39458cf10 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/NotificationMessageSupport.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/NotificationMessageSupport.java @@ -34,7 +34,7 @@ public class NotificationMessageSupport { private final JpaNotificationMessageRepository jpaNotificationMessageRepository; - public void assertNotificationsSize(int size) { + public void assertMessageSize(int size) { List notifications = jpaNotificationMessageRepository.findAll(); assertThat(notifications).hasSize(size); } diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/contracts/ContractControllerIT.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/contracts/ContractControllerIT.java index c43af62c09..6412e82d0f 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/contracts/ContractControllerIT.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/contracts/ContractControllerIT.java @@ -90,6 +90,7 @@ void shouldReturnNextPageOfPaginatedContracts() throws JoseException { .then() .log().all() .statusCode(200) + .log().all() .extract().body().as(new TypeRef<>() { }); @@ -111,7 +112,9 @@ void shouldReturnNextPageOfPaginatedContracts() throws JoseException { List secondContractagreementIds = List.of("abc6", "abc7", "abc8", "abc9", "abc10"); assertThat(contractResponsePage1Result.content()).isNotEmpty(); + assertThat(contractResponsePage1Result.content().get(0).getCounterpartyAddress()).isNotEmpty(); assertThat(contractResponsePage2Result.content()).isNotEmpty(); + assertThat(contractResponsePage2Result.content().get(0).getCounterpartyAddress()).isNotEmpty(); assertThat(contractResponsePage1Result.content().stream().map(ContractResponse::getContractId).collect(Collectors.toList())).containsAll(firstContractagreementIds); assertThat(contractResponsePage2Result.content().stream().map(ContractResponse::getContractId).toList()).containsAll(secondContractagreementIds); @@ -139,17 +142,18 @@ void shouldReturnOnlyOneContract() throws JoseException { }); //THEN assertThat(contractResponsePageResult.content()).isNotEmpty(); + assertThat(contractResponsePageResult.content().get(0).getCounterpartyAddress()).isNotEmpty(); } @Test - void shouldReturn404IfAssetIdIsUnknown() throws JoseException { + void shouldReturnEmptyIfAssetIdIsUnknown() throws JoseException { //GIVEN edcSupport.edcWillReturnOnlyOneContractAgreement(); edcSupport.edcWillReturnContractAgreementNegotiation(); assetsSupport.defaultAssetsStored(); //WHEN//THEN - given() + PageResult contractResponsePageResult = given() .header(oAuth2Support.jwtAuthorization(ADMIN)) .contentType(ContentType.JSON) .log().all() @@ -158,7 +162,11 @@ void shouldReturn404IfAssetIdIsUnknown() throws JoseException { .post("/api/contracts") .then() .log().all() - .statusCode(404); + .statusCode(200) + .extract().body().as(new TypeRef<>() { + }); + //THEN + assertThat(contractResponsePageResult.content()).isEmpty(); } } diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/edc/blackbox/EdcControllerIT.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/edc/blackbox/EdcControllerIT.java index 522f1a5bbe..b54f064849 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/edc/blackbox/EdcControllerIT.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/edc/blackbox/EdcControllerIT.java @@ -65,7 +65,7 @@ void setUp() { } @Test - void shouldCreateAnInvestigationIncludingNotificationOnAPICallClass() throws IOException, JoseException { + void shouldRejectInvestigationNotificationOnAPICallClass_whenAppBpnEqualsSenderBpn() throws IOException, JoseException { // given assetsSupport.defaultAssetsStored(); String notificationJson = readFile("/testdata/edc_notification_okay.json"); @@ -79,12 +79,11 @@ void shouldCreateAnInvestigationIncludingNotificationOnAPICallClass() throws IOE .when() .post("/api/qualitynotifications/receive") .then() - .statusCode(200); + .statusCode(400); // then - investigationNotificationsSupport.assertNotificationsSize(1); - investigationsSupport.assertInvestigationsSize(1); - investigationsSupport.assertInvestigationStatus(NotificationStatus.RECEIVED); + investigationNotificationsSupport.assertNotificationsSize(0); + investigationsSupport.assertInvestigationsSize(0); } @Test @@ -133,7 +132,7 @@ void shouldAddANotificationToExistingInvestigationOnAPICallback() throws IOExcep NotificationEntity investigation = NotificationEntity.builder() .assets(Collections.emptyList()) - .bpn("BPNL00000003AXS3") + .bpn("BPNL00000003AXB3") .status(NotificationStatusBaseEntity.SENT) .type(NotificationTypeEntity.INVESTIGATION) .side(NotificationSideBaseEntity.SENDER) diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/importdata/ImportControllerIT.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/importdata/ImportControllerIT.java index 5f7bc24497..8f96f8f904 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/importdata/ImportControllerIT.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/importdata/ImportControllerIT.java @@ -157,6 +157,7 @@ void givenValidFileWithAsPlannedOnly_whenImportData_thenValidationShouldPass() t .multiPart(file) .post("/api/assets/import") .then() + .log().all() .statusCode(200) .extract().as(ImportResponse.class); @@ -301,8 +302,8 @@ void givenInvalidFile_whenImportData_thenValidationShouldNotPass() throws JoseEx assertThat(result.validationResult().validationErrors()) .containsExactlyInAnyOrder( "Missing property aspectType", - "For Asset with ID: invalidUUID And aspectType: urn:bamm:io.catenax.serial_part:1.0.1#SerialPart Following error occurred: object has missing required properties ([\"localIdentifiers\"])", - "For Asset with ID: urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a And aspectType: urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt Following error occurred: object has missing required properties ([\"catenaXId\",\"childItems\"])" + "For Asset with ID: invalidUUID And aspectType: urn:samm:io.catenax.serial_part:3.0.0#SerialPart Following error occurred: object has missing required properties ([\"localIdentifiers\"])", + "For Asset with ID: urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a And aspectType: urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt Following error occurred: object has missing required properties ([\"catenaXId\",\"childItems\"])" ); } @@ -330,26 +331,6 @@ void givenInvalidFile_whenImportDataWithBadStructure_thenValidationShouldNotPass ); } - @Test - void givenValidFile_whenImportDataWithWrongBPN_thenValidationShouldNotPass() throws JoseException { - // given - String path = getClass().getResource("/testdata/importfiles/validImportFileButWrongBPN.json").getFile(); - File file = new File(path); - - // when/then - given() - .header(oAuth2Support.jwtAuthorization(JwtRole.ADMIN)) - .when() - .multiPart(file) - .post("/api/assets/import") - .then() - .statusCode(400) - .body("validationResult.validationErrors", Matchers.contains( - List.of( - "At least one asset does not match the application bpn BPNL00000003AXS3" - ).toArray())) - .body("jobId", Matchers.notNullValue()); - } @Test void givenInvalidFileExtension_whenImportData_thenValidationShouldPass() throws JoseException { @@ -450,6 +431,7 @@ void givenValidFile2_whenPublishData_thenStatusShouldChangeToPublishedToCx() thr .multiPart(file) .post("/api/assets/import") .then() + .log().all() .statusCode(200) .extract().as(ImportResponse.class); diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/notification/EditNotificationIT.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/notification/EditNotificationIT.java new file mode 100644 index 0000000000..daf388dee0 --- /dev/null +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/notification/EditNotificationIT.java @@ -0,0 +1,253 @@ +package org.eclipse.tractusx.traceability.integration.notification; + +import io.restassured.http.ContentType; +import io.restassured.http.Header; +import lombok.RequiredArgsConstructor; +import lombok.val; +import notification.request.EditNotificationRequest; +import notification.request.NotificationSeverityRequest; +import notification.request.NotificationTypeRequest; +import notification.request.StartNotificationRequest; +import notification.response.NotificationResponse; +import org.eclipse.tractusx.traceability.assets.domain.asbuilt.repository.AssetAsBuiltRepository; +import org.eclipse.tractusx.traceability.common.model.PageResult; +import org.eclipse.tractusx.traceability.common.request.OwnPageable; +import org.eclipse.tractusx.traceability.common.request.PageableFilterRequest; +import org.eclipse.tractusx.traceability.common.request.SearchCriteriaRequestParam; +import org.eclipse.tractusx.traceability.integration.IntegrationTestSpecification; +import org.eclipse.tractusx.traceability.integration.common.support.NotificationApiSupport; +import org.eclipse.tractusx.traceability.integration.common.support.NotificationMessageSupport; +import org.hamcrest.Matchers; +import org.jose4j.lang.JoseException; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.testcontainers.shaded.com.fasterxml.jackson.core.JsonProcessingException; +import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper; + +import java.util.Collections; +import java.util.List; + +import static io.restassured.RestAssured.given; +import static org.assertj.core.api.Assertions.assertThat; +import static org.eclipse.tractusx.traceability.common.security.JwtRole.SUPERVISOR; + +@RequiredArgsConstructor +class EditNotificationIT extends IntegrationTestSpecification { + + @Autowired + NotificationMessageSupport notificationMessageSupport; + @Autowired + AssetAsBuiltRepository assetAsBuiltRepository; + + ObjectMapper objectMapper; + @Autowired + NotificationApiSupport notificationAPISupport; + + @BeforeEach + void setUp() { + objectMapper = new ObjectMapper(); + } + + @Test + void shouldUpdateInvestigation_RemovingOnePartOnly() throws JoseException, com.fasterxml.jackson.core.JsonProcessingException { + Header authHeader = oAuth2Support.jwtAuthorization(SUPERVISOR); + // given + List partIds = List.of( + "urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978", // BPN: BPNL00000003AYRE + "urn:uuid:d387fa8e-603c-42bd-98c3-4d87fef8d2bb", // BPN: BPNL00000003AYRE + "urn:uuid:0ce83951-bc18-4e8f-892d-48bad4eb67ef" // BPN: BPNL00000003AXS3 + ); + String description = "at least 15 characters long investigation description"; + String title = "the title"; + + val startNotificationRequest = StartNotificationRequest.builder() + .affectedPartIds(partIds) + .description(description) + .title(title) + .type(NotificationTypeRequest.INVESTIGATION) + .receiverBpn("BPNL00000003CNKC") + .severity(NotificationSeverityRequest.MINOR) + .build(); + int id = notificationAPISupport.createNotificationRequest_withDefaultAssetsStored(authHeader, startNotificationRequest, 201); + + // given + List editedPartIds = List.of( + "urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978", // BPN: BPNL00000003AYRE + "urn:uuid:d387fa8e-603c-42bd-98c3-4d87fef8d2bb" // BPN: BPNL00000003AYRE + ); + + val request = EditNotificationRequest.builder() + .affectedPartIds(editedPartIds) + .severity(startNotificationRequest.getSeverity()) + .description(startNotificationRequest.getDescription()) + .title(startNotificationRequest.getTitle()) + .receiverBpn("BPNL00000003CNKC") + .build(); + + // when + notificationAPISupport.editNotificationRequest(authHeader, request, id, 204); + + // then + notificationMessageSupport.assertMessageSize(1); + + given() + .header(authHeader) + .body(new PageableFilterRequest(new OwnPageable(0, 10, Collections.emptyList()), new SearchCriteriaRequestParam(List.of("channel,EQUAL,SENDER,AND")))) + .contentType(ContentType.JSON) + .when() + .post("/api/notifications/filter") + .then() + .statusCode(200) + .body("page", Matchers.is(0)) + .body("pageSize", Matchers.is(10)) + .body("content", Matchers.hasSize(1)) + .log().all(); + } + + @Test + void shouldThrowBadRequestWhenUpdateInvestigation_SenderAndReceiverBpnIsSame() throws JoseException, com.fasterxml.jackson.core.JsonProcessingException { + Header authHeader = oAuth2Support.jwtAuthorization(SUPERVISOR); + // given + List partIds = List.of( + "urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978", // BPN: BPNL00000003AYRE + "urn:uuid:d387fa8e-603c-42bd-98c3-4d87fef8d2bb", // BPN: BPNL00000003AYRE + "urn:uuid:0ce83951-bc18-4e8f-892d-48bad4eb67ef" // BPN: BPNL00000003AXS3 + ); + String description = "at least 15 characters long investigation description"; + String title = "the title"; + + val startNotificationRequest = StartNotificationRequest.builder() + .affectedPartIds(partIds) + .description(description) + .title(title) + .type(NotificationTypeRequest.INVESTIGATION) + .receiverBpn("BPNL00000003CNKC") + .severity(NotificationSeverityRequest.MINOR) + .build(); + int id = notificationAPISupport.createNotificationRequest_withDefaultAssetsStored(authHeader, startNotificationRequest, 201); + + List editedPartIds = List.of( + "urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978", // BPN: BPNL00000003AYRE + "urn:uuid:d387fa8e-603c-42bd-98c3-4d87fef8d2bb" // BPN: BPNL00000003AYRE + ); + + val request = EditNotificationRequest.builder() + .affectedPartIds(editedPartIds) + .severity(startNotificationRequest.getSeverity()) + .description(startNotificationRequest.getDescription()) + .title(startNotificationRequest.getTitle()) + .receiverBpn("BPNL00000003AXS3") + .build(); + + // when + notificationAPISupport.editNotificationRequest(authHeader, request, id, 400); + } + + @Test + void shouldUpdateInvestigationFields() throws JsonProcessingException, JoseException, com.fasterxml.jackson.core.JsonProcessingException { + Header authHeader = oAuth2Support.jwtAuthorization(SUPERVISOR); + // given + List partIds = List.of( + "urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978", // BPN: BPNL00000003AYRE + "urn:uuid:d387fa8e-603c-42bd-98c3-4d87fef8d2bb", // BPN: BPNL00000003AYRE + "urn:uuid:0ce83951-bc18-4e8f-892d-48bad4eb67ef" // BPN: BPNL00000003AXS3 + ); + String description = "at least 15 characters long investigation description"; + String title = "the initial title"; + val startNotificationRequest = StartNotificationRequest.builder() + .affectedPartIds(partIds) + .description(description) + .title(title) + .type(NotificationTypeRequest.INVESTIGATION) + .severity(NotificationSeverityRequest.MINOR) + .receiverBpn("BPNL00000003AYRE") + .build(); + + + int id = notificationAPISupport.createNotificationRequest_withDefaultAssetsStored(authHeader, startNotificationRequest, 201); + + // given + String editedDescription = "at least 15 characters long investigation description which was edited"; + + String editedTitle = "changed title"; + val editNotificationRequest = EditNotificationRequest.builder() + .affectedPartIds(partIds) + .description(editedDescription) + .title(editedTitle) + .affectedPartIds(startNotificationRequest.getAffectedPartIds()) + .severity(NotificationSeverityRequest.CRITICAL) + .receiverBpn("BPNL00000003AYRE") + .build(); + + // when + notificationAPISupport.editNotificationRequest(authHeader, editNotificationRequest, id, 204); + + // then + notificationMessageSupport.assertMessageSize(1); + + PageResult notificationResponsePageResult + = notificationAPISupport.getNotificationsRequest(authHeader); + + NotificationResponse notificationResponse = notificationResponsePageResult.content().get(0); + assertThat(notificationResponse.getId()).isEqualTo(id); + assertThat(notificationResponse.getDescription()).isEqualTo(editNotificationRequest.getDescription()); + assertThat(notificationResponse.getTitle()).isEqualTo(editNotificationRequest.getTitle()); + assertThat(notificationResponse.getAssetIds()).hasSize(editNotificationRequest.getAffectedPartIds().size()); + assertThat(notificationResponse.getSeverity().getRealName()).isEqualTo(editNotificationRequest.getSeverity().getRealName()); + assertThat(notificationResponsePageResult.content()).hasSize(1); + assertThat(notificationResponse.getMessages().get(0).getSeverity().getRealName()).isEqualTo(editNotificationRequest.getSeverity().getRealName()); + assertThat(notificationResponse.getMessages().get(0).getTargetDate()).isEqualTo(editNotificationRequest.getTargetDate()); + + } + + @Test + void shouldNotUpdateInvestigationFields_whenBpnWrongFormatted() throws JsonProcessingException, JoseException, com.fasterxml.jackson.core.JsonProcessingException { + Header authHeader = oAuth2Support.jwtAuthorization(SUPERVISOR); + // given + List partIds = List.of( + "urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978", // BPN: BPNL00000003AYRE + "urn:uuid:d387fa8e-603c-42bd-98c3-4d87fef8d2bb", // BPN: BPNL00000003AYRE + "urn:uuid:0ce83951-bc18-4e8f-892d-48bad4eb67ef" // BPN: BPNL00000003AXS3 + ); + String description = "at least 15 characters long investigation description"; + String title = "the initial title"; + val startNotificationRequest = StartNotificationRequest.builder() + .affectedPartIds(partIds) + .description(description) + .title(title) + .type(NotificationTypeRequest.INVESTIGATION) + .severity(NotificationSeverityRequest.MINOR) + .receiverBpn("BPNL00000003CNKC") + .build(); + + + int id = notificationAPISupport.createNotificationRequest_withDefaultAssetsStored(authHeader, startNotificationRequest, 201); + + // given + String editedDescription = "at least 15 characters long investigation description which was edited"; + + String editedTitle = "changed title"; + val editNotificationRequest = EditNotificationRequest.builder() + .affectedPartIds(partIds) + .description(editedDescription) + .title(editedTitle) + .receiverBpn("WRONG_FORMAT") + .affectedPartIds(startNotificationRequest.getAffectedPartIds()) + .severity(NotificationSeverityRequest.CRITICAL) + .build(); + + // when + notificationAPISupport.editNotificationRequest(authHeader, editNotificationRequest, id, 400); + + // then + + PageResult notificationResponsePageResult + = notificationAPISupport.getNotificationsRequest(authHeader); + + NotificationResponse notificationResponse = notificationResponsePageResult.content().get(0); + assertThat(notificationResponse.getSendTo()).isEqualTo("BPNL00000003CNKC"); + + + } +} diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/notification/alert/PublisherAlertsControllerIT.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/notification/alert/PublisherAlertsControllerIT.java index 42e0854d78..73ebee8cb0 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/notification/alert/PublisherAlertsControllerIT.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/notification/alert/PublisherAlertsControllerIT.java @@ -33,6 +33,7 @@ import org.eclipse.tractusx.traceability.integration.common.support.AlertNotificationsSupport; import org.eclipse.tractusx.traceability.integration.common.support.AlertsSupport; import org.eclipse.tractusx.traceability.integration.common.support.AssetsSupport; +import org.eclipse.tractusx.traceability.integration.common.support.NotificationApiSupport; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationAffectedPart; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationMessage; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSeverity; @@ -53,7 +54,7 @@ import notification.request.NotificationSeverityRequest; import notification.request.NotificationTypeRequest; import notification.request.StartNotificationRequest; -import notification.request.UpdateNotificationRequest; +import notification.request.UpdateNotificationStatusTransitionRequest; import notification.request.UpdateNotificationStatusRequest; import java.time.Instant; @@ -79,6 +80,8 @@ class PublisherAlertsControllerIT extends IntegrationTestSpecification { AssetAsBuiltRepository assetAsBuiltRepository; @Autowired AssetAsPlannedRepository assetAsPlannedRepository; + @Autowired + NotificationApiSupport notificationApiSupport; @BeforeEach void setUp() { @@ -128,17 +131,15 @@ void shouldStartAlert() throws JsonProcessingException, JoseException { ); String description = "at least 15 characters long investigation description"; NotificationSeverityRequest severity = NotificationSeverityRequest.MINOR; - String receiverBpn = "BPN"; assetsSupport.defaultAssetsStored(); val request = StartNotificationRequest.builder() - .partIds(partIds) + .affectedPartIds(partIds) .description(description) .severity(severity) .type(NotificationTypeRequest.ALERT) - .receiverBpn(receiverBpn) - .isAsBuilt(true) + .receiverBpn("BPNL00000003CNKC") .build(); // when @@ -185,7 +186,7 @@ void givenMissingSeverity_whenStartAlert_thenBadRequest() throws JsonProcessingE ); String description = "at least 15 characters long investigation description"; val request = StartNotificationRequest.builder() - .partIds(partIds) + .affectedPartIds(partIds) .description(description) .build(); @@ -212,7 +213,7 @@ void givenDescriptionOverMaxLength_whenStartAlert_thenBadRequest() throws JsonPr String description = RandomStringUtils.random(1001); val request = StartNotificationRequest.builder() - .partIds(partIds) + .affectedPartIds(partIds) .description(description) .severity(NotificationSeverityRequest.MINOR) .receiverBpn("BPN") @@ -235,7 +236,7 @@ void givenTooLongAlertReason_whenUpdateAlert_thenBadRequest() throws JsonProcess // given String description = RandomStringUtils.random(1001); - UpdateNotificationRequest request = UpdateNotificationRequest + UpdateNotificationStatusTransitionRequest request = UpdateNotificationStatusTransitionRequest .builder() .status(UpdateNotificationStatusRequest.ACCEPTED) .reason(description) @@ -259,7 +260,7 @@ void givenWrongStatus_whenUpdateAlert_thenBadRequest() throws JsonProcessingExce String description = RandomStringUtils.random(15); - UpdateNotificationRequest request = UpdateNotificationRequest + UpdateNotificationStatusTransitionRequest request = UpdateNotificationStatusTransitionRequest .builder() .status(UpdateNotificationStatusRequest.ACCEPTED) .reason(description) @@ -280,28 +281,20 @@ void givenWrongStatus_whenUpdateAlert_thenBadRequest() throws JsonProcessingExce } @Test - void shouldCancelAlert() throws JsonProcessingException, JoseException { + void shouldCancelAlert() throws JsonProcessingException, JoseException, com.fasterxml.jackson.core.JsonProcessingException { // given String filterString = "channel,EQUAL,SENDER,AND"; assetsSupport.defaultAssetsStored(); val startAlertRequest = StartNotificationRequest.builder() - .partIds(List.of("urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978")) + .affectedPartIds(List.of("urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978")) .description("at least 15 characters long investigation description") .severity(NotificationSeverityRequest.MAJOR) .type(NotificationTypeRequest.ALERT) - .receiverBpn("BPN") - .isAsBuilt(true) + .receiverBpn("BPNL00000003CNKC") .build(); - val alertId = given() - .contentType(ContentType.JSON) - .body(objectMapper.writeValueAsString(startAlertRequest)) - .header(oAuth2Support.jwtAuthorization(SUPERVISOR)) - .when() - .post("/api/notifications") - .then() - .statusCode(201) - .extract().path("id"); + val id = notificationApiSupport.createNotificationRequest_withDefaultAssetsStored(oAuth2Support.jwtAuthorization(SUPERVISOR), startAlertRequest, 201); + given() .header(oAuth2Support.jwtAuthorization(SUPERVISOR)) @@ -320,7 +313,7 @@ void shouldCancelAlert() throws JsonProcessingException, JoseException { .header(oAuth2Support.jwtAuthorization(SUPERVISOR)) .contentType(ContentType.JSON) .when() - .post("/api/notifications/$alertId/cancel".replace("$alertId", alertId.toString())) + .post("/api/notifications/$alertId/cancel".replace("$alertId", String.valueOf(id))) .then() .statusCode(204); @@ -339,7 +332,7 @@ void shouldCancelAlert() throws JsonProcessingException, JoseException { } @Test - void shouldApproveAlertStatus() throws JsonProcessingException, JoseException { + void shouldApproveAlertStatus() throws JsonProcessingException, JoseException, com.fasterxml.jackson.core.JsonProcessingException { // given String filterString = "channel,EQUAL,SENDER,AND"; List partIds = List.of( @@ -351,24 +344,16 @@ void shouldApproveAlertStatus() throws JsonProcessingException, JoseException { assetsSupport.defaultAssetsStored(); val startAlertRequest = StartNotificationRequest.builder() - .partIds(partIds) + .affectedPartIds(partIds) .description(description) .severity(NotificationSeverityRequest.MINOR) .type(NotificationTypeRequest.ALERT) - .receiverBpn("BPN") - .isAsBuilt(true) + .receiverBpn("BPNL00000003CNKC") .build(); // when - var alertId = given() - .contentType(ContentType.JSON) - .body(objectMapper.writeValueAsString(startAlertRequest)) - .header(oAuth2Support.jwtAuthorization(SUPERVISOR)) - .when() - .post("/api/notifications") - .then() - .statusCode(201) - .extract().path("id"); + val id = notificationApiSupport.createNotificationRequest_withDefaultAssetsStored(oAuth2Support.jwtAuthorization(SUPERVISOR), startAlertRequest, 201); + alertsSupport.assertAlertsSize(1); @@ -376,7 +361,7 @@ void shouldApproveAlertStatus() throws JsonProcessingException, JoseException { .contentType(ContentType.JSON) .header(oAuth2Support.jwtAuthorization(SUPERVISOR)) .when() - .post("/api/notifications/$alertId/approve".replace("$alertId", alertId.toString())) + .post("/api/notifications/$alertId/approve".replace("$alertId", String.valueOf(id))) .then() .statusCode(204); @@ -397,7 +382,7 @@ void shouldApproveAlertStatus() throws JsonProcessingException, JoseException { } @Test - void shouldCloseAlertStatus() throws JsonProcessingException, JoseException { + void shouldCloseAlertStatus() throws JsonProcessingException, JoseException, com.fasterxml.jackson.core.JsonProcessingException { // given String filterString = "channel,EQUAL,SENDER,AND"; List partIds = List.of( @@ -408,24 +393,16 @@ void shouldCloseAlertStatus() throws JsonProcessingException, JoseException { assetsSupport.defaultAssetsStored(); val startAlertRequest = StartNotificationRequest.builder() - .partIds(partIds) + .affectedPartIds(partIds) .description(description) .severity(NotificationSeverityRequest.MINOR) .type(NotificationTypeRequest.ALERT) - .receiverBpn("BPN") - .isAsBuilt(true) + .receiverBpn("BPNL00000003CNKC") .build(); // when - val alertId = given() - .contentType(ContentType.JSON) - .body(objectMapper.writeValueAsString(startAlertRequest)) - .header(oAuth2Support.jwtAuthorization(SUPERVISOR)) - .when() - .post("/api/notifications") - .then() - .statusCode(201) - .extract().path("id"); + val id = notificationApiSupport.createNotificationRequest_withDefaultAssetsStored(oAuth2Support.jwtAuthorization(SUPERVISOR), startAlertRequest, 201); + // then alertsSupport.assertAlertsSize(1); @@ -435,7 +412,7 @@ void shouldCloseAlertStatus() throws JsonProcessingException, JoseException { .contentType(ContentType.JSON) .header(oAuth2Support.jwtAuthorization(SUPERVISOR)) .when() - .post("/api/notifications/$alertId/approve".replace("$alertId", alertId.toString())) + .post("/api/notifications/$alertId/approve".replace("$alertId", String.valueOf(id))) .then() .statusCode(204); @@ -464,7 +441,7 @@ void shouldCloseAlertStatus() throws JsonProcessingException, JoseException { .body(objectMapper.writeValueAsString(closeAlertRequest)) .header(oAuth2Support.jwtAuthorization(SUPERVISOR)) .when() - .post("/api/notifications/$alertId/close".replace("$alertId", alertId.toString())) + .post("/api/notifications/$alertId/close".replace("$alertId", String.valueOf(id))) .then() .statusCode(204); @@ -510,7 +487,7 @@ void givenNoAuthorization_whenCancel_thenReturn401() { } @Test - void shouldBeCreatedBySender() throws JsonProcessingException, JoseException { + void shouldBeCreatedBySender() throws JsonProcessingException, JoseException, com.fasterxml.jackson.core.JsonProcessingException { // given String filterString = "channel,EQUAL,SENDER,AND"; List partIds = List.of( @@ -521,24 +498,16 @@ void shouldBeCreatedBySender() throws JsonProcessingException, JoseException { String description = "at least 15 characters long investigation description"; assetsSupport.defaultAssetsStored(); val startAlertRequest = StartNotificationRequest.builder() - .partIds(partIds) + .affectedPartIds(partIds) .description(description) .severity(NotificationSeverityRequest.MINOR) .type(NotificationTypeRequest.ALERT) - .receiverBpn("BPN") - .isAsBuilt(true) + .receiverBpn("BPNL00000003CNKC") .build(); // when - given() - .contentType(ContentType.JSON) - .body(objectMapper.writeValueAsString(startAlertRequest)) - .header(oAuth2Support.jwtAuthorization(SUPERVISOR)) - .when() - .post("/api/notifications") - .then() - .statusCode(201) - .body("id", Matchers.isA(Number.class)); + notificationApiSupport.createNotificationRequest_withDefaultAssetsStored(oAuth2Support.jwtAuthorization(SUPERVISOR), startAlertRequest, 201); + // then partIds.forEach(partId -> { @@ -573,11 +542,10 @@ void shouldReturn404WhenNoNotificationTypeSpecified() throws JsonProcessingExcep assetsSupport.defaultAssetsStored(); val startAlertRequest = StartNotificationRequest.builder() - .partIds(partIds) + .affectedPartIds(partIds) .description(description) .severity(NotificationSeverityRequest.MINOR) .receiverBpn("BPN") - .isAsBuilt(true) .build(); // when diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/notification/alert/ReadAlertsControllerIT.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/notification/alert/ReadAlertsControllerIT.java index 6a472071b4..c190e2b82a 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/notification/alert/ReadAlertsControllerIT.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/notification/alert/ReadAlertsControllerIT.java @@ -117,30 +117,6 @@ void givenAlerts_whenGetSenderAlertsSortedAsc_thenReturnProperlySorted() throws .body("content.description", Matchers.containsInRelativeOrder("1", "2", "3", "4", "5", "6", "7", "8")); } - @Test - void givenAlerts_whenGetSenderAlertsSortedDesc_thenReturnProperlySorted() throws JoseException { - // given - String filterString = "channel,EQUAL,SENDER,AND"; - String sortString = "createdDate,DESC"; - alertNotificationsSupport.defaultAlertsStored(); - - // then - given() - .header(oAuth2Support.jwtAuthorization(ADMIN)) - .body(new PageableFilterRequest(new OwnPageable(0, 10, List.of(sortString)), new SearchCriteriaRequestParam(List.of(filterString)))) - .contentType(ContentType.JSON) - .when() - .post("/api/notifications/filter") - .then() - .statusCode(200) - .body("page", Matchers.is(0)) - .body("pageSize", Matchers.is(10)) - .body("totalItems", Matchers.is(8)) - .body("content", Matchers.hasSize(8)) - .body("content.description", Matchers.containsInRelativeOrder("8", "7", "6", "5", "4", "3", "2", "1")); - } - - @Test void givenSortByDescriptionProvided_whenGetInvestigations_thenReturnInvestigationsProperlySorted() throws JoseException { // given diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/notification/investigation/PublisherInvestigationsControllerIT.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/notification/investigation/PublisherInvestigationsControllerIT.java index db1439e0d7..3632471db1 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/notification/investigation/PublisherInvestigationsControllerIT.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/notification/investigation/PublisherInvestigationsControllerIT.java @@ -21,6 +21,12 @@ import io.restassured.http.ContentType; import lombok.val; +import notification.request.CloseNotificationRequest; +import notification.request.NotificationSeverityRequest; +import notification.request.NotificationTypeRequest; +import notification.request.StartNotificationRequest; +import notification.request.UpdateNotificationStatusRequest; +import notification.request.UpdateNotificationStatusTransitionRequest; import org.apache.commons.lang3.RandomStringUtils; import org.eclipse.tractusx.traceability.assets.domain.asbuilt.repository.AssetAsBuiltRepository; import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase; @@ -30,6 +36,7 @@ import org.eclipse.tractusx.traceability.common.security.JwtRole; import org.eclipse.tractusx.traceability.integration.IntegrationTestSpecification; import org.eclipse.tractusx.traceability.integration.common.support.AssetsSupport; +import org.eclipse.tractusx.traceability.integration.common.support.NotificationApiSupport; import org.eclipse.tractusx.traceability.integration.common.support.NotificationMessageSupport; import org.eclipse.tractusx.traceability.integration.common.support.NotificationSupport; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationAffectedPart; @@ -48,12 +55,6 @@ import org.springframework.transaction.annotation.Transactional; import org.testcontainers.shaded.com.fasterxml.jackson.core.JsonProcessingException; import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper; -import notification.request.CloseNotificationRequest; -import notification.request.NotificationSeverityRequest; -import notification.request.NotificationTypeRequest; -import notification.request.StartNotificationRequest; -import notification.request.UpdateNotificationRequest; -import notification.request.UpdateNotificationStatusRequest; import java.time.Instant; import java.util.Collections; @@ -63,20 +64,21 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.tractusx.traceability.common.security.JwtRole.SUPERVISOR; + class PublisherInvestigationsControllerIT extends IntegrationTestSpecification { @Autowired NotificationReceiverService notificationReceiverService; - @Autowired AssetsSupport assetsSupport; @Autowired NotificationMessageSupport notificationMessageSupport; - @Autowired NotificationSupport notificationSupport; @Autowired AssetAsBuiltRepository assetAsBuiltRepository; + @Autowired + NotificationApiSupport notificationApiSupport; ObjectMapper objectMapper; @@ -114,11 +116,13 @@ void shouldReceiveNotification() { // then notificationSupport.assertInvestigationsSize(1); - notificationMessageSupport.assertNotificationsSize(1); + notificationMessageSupport.assertMessageSize(1); } @Test - void shouldStartInvestigation() throws JsonProcessingException, JoseException { + void shouldStartInvestigation() throws JoseException, com.fasterxml.jackson.core.JsonProcessingException { + + // given List partIds = List.of( "urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978", // BPN: BPNL00000003AYRE @@ -126,35 +130,22 @@ void shouldStartInvestigation() throws JsonProcessingException, JoseException { "urn:uuid:0ce83951-bc18-4e8f-892d-48bad4eb67ef" // BPN: BPNL00000003AXS3 ); String description = "at least 15 characters long investigation description"; + String title = "the title"; - assetsSupport.defaultAssetsStored(); - - val request = StartNotificationRequest.builder() - .partIds(partIds) + val startNotificationRequest = StartNotificationRequest.builder() + .affectedPartIds(partIds) .description(description) + .title(title) .type(NotificationTypeRequest.INVESTIGATION) .severity(NotificationSeverityRequest.MINOR) - .isAsBuilt(true) + .receiverBpn("BPNL00000003CNKC") .build(); // when - given() - .contentType(ContentType.JSON) - .body(objectMapper.writeValueAsString(request)) - .header(oAuth2Support.jwtAuthorization(SUPERVISOR)) - .when() - .post("/api/notifications") - .then() - .statusCode(201) - .body("id", Matchers.isA(Number.class)); + notificationApiSupport.createNotificationRequest_withDefaultAssetsStored(oAuth2Support.jwtAuthorization(SUPERVISOR), startNotificationRequest, 201); // then - partIds.forEach(partId -> { - AssetBase asset = assetAsBuiltRepository.getAssetById(partId); - assertThat(asset).isNotNull(); - }); - - notificationMessageSupport.assertNotificationsSize(2); + notificationMessageSupport.assertMessageSize(2); given() .header(oAuth2Support.jwtAuthorization(SUPERVISOR)) @@ -167,6 +158,55 @@ void shouldStartInvestigation() throws JsonProcessingException, JoseException { .body("page", Matchers.is(0)) .body("pageSize", Matchers.is(10)) .body("content", Matchers.hasSize(1)); + + } + + @Test + void givenMissingPartIds_whenStartInvestigation_thenBadRequest() throws JoseException, com.fasterxml.jackson.core.JsonProcessingException { + + + // given + + String description = "at least 15 characters long investigation description"; + String title = "the title"; + + val startNotificationRequest = StartNotificationRequest.builder() + .description(description) + .title(title) + .type(NotificationTypeRequest.INVESTIGATION) + .severity(NotificationSeverityRequest.MINOR) + .build(); + + // when + // then + notificationApiSupport.createNotificationRequest_withDefaultAssetsStored(oAuth2Support.jwtAuthorization(SUPERVISOR), startNotificationRequest, 400); + } + + @Test + void givenMissingBPN_whenStartInvestigation_thenBadRequest() throws JoseException, com.fasterxml.jackson.core.JsonProcessingException { + + + // given + // given + List partIds = List.of( + "urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978", // BPN: BPNL00000003AYRE + "urn:uuid:d387fa8e-603c-42bd-98c3-4d87fef8d2bb", // BPN: BPNL00000003AYRE + "urn:uuid:0ce83951-bc18-4e8f-892d-48bad4eb67ef" // BPN: BPNL00000003AXS3 + ); + String description = "at least 15 characters long investigation description"; + String title = "the title"; + + val startNotificationRequest = StartNotificationRequest.builder() + .affectedPartIds(partIds) + .description(description) + .title(title) + .type(NotificationTypeRequest.INVESTIGATION) + .severity(NotificationSeverityRequest.MINOR) + .build(); + + // when + // then + notificationApiSupport.createNotificationRequest_withDefaultAssetsStored(oAuth2Support.jwtAuthorization(SUPERVISOR), startNotificationRequest, 400); } @Test @@ -180,7 +220,7 @@ void givenMissingSeverity_whenStartInvestigation_thenBadRequest() throws JsonPro String description = "at least 15 characters long investigation description"; val request = StartNotificationRequest.builder() - .partIds(partIds) + .affectedPartIds(partIds) .description(description) .build(); // when/then @@ -206,7 +246,7 @@ void givenDescriptionExceedsMaxLength_whenStartInvestigation_thenBadRequest() th String description = RandomStringUtils.random(1001); val request = StartNotificationRequest.builder() - .partIds(partIds) + .affectedPartIds(partIds) .description(description) .severity(NotificationSeverityRequest.MINOR) .build(); @@ -223,18 +263,19 @@ void givenDescriptionExceedsMaxLength_whenStartInvestigation_thenBadRequest() th .body(Matchers.containsString("Description should have at least 15 characters and at most 1000 characters")); } + @Test void givenInvestigationReasonTooLong_whenUpdate_thenBadRequest() throws JsonProcessingException, JoseException { // given String description = RandomStringUtils.random(1001); - UpdateNotificationRequest request = - UpdateNotificationRequest + UpdateNotificationStatusTransitionRequest request = + UpdateNotificationStatusTransitionRequest .builder() .reason(description) .status(UpdateNotificationStatusRequest.ACCEPTED) .build(); - // when/then + // when/then given() .contentType(ContentType.JSON) .body(objectMapper.writeValueAsString(request)) @@ -251,8 +292,8 @@ void givenWrongStatus_whenUpdateInvestigation_thenBadRequest() throws JsonProces // given String description = RandomStringUtils.random(15); - UpdateNotificationRequest request = - UpdateNotificationRequest + UpdateNotificationStatusTransitionRequest request = + UpdateNotificationStatusTransitionRequest .builder() .reason(description) .status(UpdateNotificationStatusRequest.ACCEPTED) @@ -272,26 +313,18 @@ void givenWrongStatus_whenUpdateInvestigation_thenBadRequest() throws JsonProces } @Test - void shouldCancelInvestigation() throws JsonProcessingException, JoseException { + void shouldCancelInvestigation() throws JsonProcessingException, JoseException, com.fasterxml.jackson.core.JsonProcessingException { // given assetsSupport.defaultAssetsStored(); val startInvestigationRequest = StartNotificationRequest.builder() - .partIds(List.of("urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978")) + .affectedPartIds(List.of("urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978")) .description("at least 15 characters long investigation description") .type(NotificationTypeRequest.INVESTIGATION) .severity(NotificationSeverityRequest.MAJOR) - .isAsBuilt(true) + .receiverBpn("BPNL00000003CNKC") .build(); - val investigationId = given() - .contentType(ContentType.JSON) - .body(objectMapper.writeValueAsString(startInvestigationRequest)) - .header(oAuth2Support.jwtAuthorization(SUPERVISOR)) - .when() - .post("/api/notifications") - .then() - .statusCode(201) - .extract().path("id"); + val investigationId = notificationApiSupport.createNotificationRequest_withDefaultAssetsStored(oAuth2Support.jwtAuthorization(SUPERVISOR), startInvestigationRequest, 201); given() .header(oAuth2Support.jwtAuthorization(SUPERVISOR)) @@ -309,7 +342,7 @@ void shouldCancelInvestigation() throws JsonProcessingException, JoseException { .header(oAuth2Support.jwtAuthorization(SUPERVISOR)) .contentType(ContentType.JSON) .when() - .post("/api/notifications/$investigationId/cancel".replace("$investigationId", investigationId.toString())) + .post("/api/notifications/$investigationId/cancel".replace("$investigationId", String.valueOf(investigationId))) .then() .statusCode(204); @@ -327,7 +360,7 @@ void shouldCancelInvestigation() throws JsonProcessingException, JoseException { } @Test - void shouldApproveInvestigationStatus() throws JsonProcessingException, JoseException { + void shouldApproveInvestigationStatus() throws JsonProcessingException, JoseException, com.fasterxml.jackson.core.JsonProcessingException { // given List partIds = List.of( "urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978", // BPN: BPNL00000003AYRE @@ -337,23 +370,16 @@ void shouldApproveInvestigationStatus() throws JsonProcessingException, JoseExce assetsSupport.defaultAssetsStored(); val startInvestigationRequest = StartNotificationRequest.builder() - .partIds(partIds) + .affectedPartIds(partIds) .description(description) .severity(NotificationSeverityRequest.MINOR) .type(NotificationTypeRequest.INVESTIGATION) - .isAsBuilt(true) + .receiverBpn("BPNL00000003CNKC") .build(); // when - val investigationId = given() - .contentType(ContentType.JSON) - .body(objectMapper.writeValueAsString(startInvestigationRequest)) - .header(oAuth2Support.jwtAuthorization(SUPERVISOR)) - .when() - .post("/api/notifications") - .then() - .statusCode(201) - .extract().path("id"); + val investigationId = notificationApiSupport.createNotificationRequest_withDefaultAssetsStored(oAuth2Support.jwtAuthorization(SUPERVISOR), startInvestigationRequest, 201); + notificationSupport.assertInvestigationsSize(1); @@ -380,11 +406,11 @@ void shouldApproveInvestigationStatus() throws JsonProcessingException, JoseExce .body("content", Matchers.hasSize(1)) .body("content[0].sendTo", Matchers.is(Matchers.not(Matchers.blankOrNullString()))); - notificationMessageSupport.assertNotificationsSize(4); + notificationMessageSupport.assertMessageSize(4); } @Test - void shouldCloseInvestigationStatus() throws JsonProcessingException, JoseException { + void shouldCloseInvestigationStatus() throws JsonProcessingException, JoseException, com.fasterxml.jackson.core.JsonProcessingException { // given List partIds = List.of( "urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978" // BPN: BPNL00000003AYRE @@ -394,24 +420,14 @@ void shouldCloseInvestigationStatus() throws JsonProcessingException, JoseExcept assetsSupport.defaultAssetsStored(); val startInvestigationRequest = StartNotificationRequest.builder() - .partIds(partIds) + .affectedPartIds(partIds) .description(description) .type(NotificationTypeRequest.INVESTIGATION) + .receiverBpn("BPNL00000003CNKC") .severity(NotificationSeverityRequest.MINOR) - .isAsBuilt(true) .build(); - - // when - val investigationId = given() - .contentType(ContentType.JSON) - .body(objectMapper.writeValueAsString(startInvestigationRequest)) - .header(oAuth2Support.jwtAuthorization(SUPERVISOR)) - .when() - .post("/api/notifications") - .then() - .statusCode(201) - .extract().path("id"); + val investigationId = notificationApiSupport.createNotificationRequest_withDefaultAssetsStored(oAuth2Support.jwtAuthorization(SUPERVISOR), startInvestigationRequest, 201); // then notificationSupport.assertInvestigationsSize(1); @@ -466,7 +482,7 @@ void shouldCloseInvestigationStatus() throws JsonProcessingException, JoseExcept .body("pageSize", Matchers.is(10)) .body("content", Matchers.hasSize(1)); - notificationMessageSupport.assertNotificationsSize(3); + notificationMessageSupport.assertMessageSize(3); notificationSupport.assertInvestigationsSize(1); notificationSupport.assertInvestigationStatus(NotificationStatus.CLOSED); } @@ -496,7 +512,7 @@ void givenNoAuthorization_whenCancel_thenReturn401() { } @Test - void shouldBeCreatedBySender() throws JsonProcessingException, JoseException { + void shouldBeCreatedBySender() throws JsonProcessingException, JoseException, com.fasterxml.jackson.core.JsonProcessingException { // given List partIds = List.of( "urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978", // BPN: BPNL00000003AYRE @@ -506,23 +522,15 @@ void shouldBeCreatedBySender() throws JsonProcessingException, JoseException { String description = "at least 15 characters long investigation description"; assetsSupport.defaultAssetsStored(); val startInvestigationRequest = StartNotificationRequest.builder() - .partIds(partIds) + .affectedPartIds(partIds) .description(description) .severity(NotificationSeverityRequest.MINOR) + .receiverBpn("BPNL00000003CNKC") .type(NotificationTypeRequest.INVESTIGATION) - .isAsBuilt(true) .build(); // when - given() - .contentType(ContentType.JSON) - .body(objectMapper.writeValueAsString(startInvestigationRequest)) - .header(oAuth2Support.jwtAuthorization(SUPERVISOR)) - .when() - .post("/api/notifications") - .then() - .statusCode(201) - .body("id", Matchers.isA(Number.class)); + notificationApiSupport.createNotificationRequest_withDefaultAssetsStored(oAuth2Support.jwtAuthorization(SUPERVISOR), startInvestigationRequest, 201); // then partIds.forEach(partId -> { @@ -530,7 +538,7 @@ void shouldBeCreatedBySender() throws JsonProcessingException, JoseException { assertThat(asset).isNotNull(); }); - notificationMessageSupport.assertNotificationsSize(2); + notificationMessageSupport.assertMessageSize(2); given() .header(oAuth2Support.jwtAuthorization(SUPERVISOR)) .body(new PageableFilterRequest(new OwnPageable(0, 10, Collections.emptyList()), new SearchCriteriaRequestParam(List.of("channel,EQUAL,SENDER,AND")))) diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/openapi/OpenApiDocumentationIT.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/openapi/OpenApiDocumentationIT.java index a969284652..33b444f2ff 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/openapi/OpenApiDocumentationIT.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/openapi/OpenApiDocumentationIT.java @@ -19,22 +19,24 @@ package org.eclipse.tractusx.traceability.integration.openapi; -import org.apache.commons.io.FileUtils; import org.eclipse.tractusx.traceability.integration.IntegrationTestSpecification; import org.junit.jupiter.api.Test; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; +import java.util.List; import static io.restassured.RestAssured.given; +import static org.apache.commons.io.FileUtils.writeStringToFile; class OpenApiDocumentationIT extends IntegrationTestSpecification { - private static final String DOCUMENTATION_FILENAME = "./openapi/traceability-foss-backend.json"; + private static final List API_DOCUMENTATION_LOCATIONS = List.of("./openapi/traceability-foss-backend.json", + "../docs/api/traceability-foss-backend.json"); @Test - void shouldGenerateOpenapiDocumentation() throws IOException { + void shouldGenerateOpenapiDocumentation() { // when var response = given() .when() @@ -44,6 +46,13 @@ void shouldGenerateOpenapiDocumentation() throws IOException { response.then() .statusCode(200); - FileUtils.writeStringToFile(new File(DOCUMENTATION_FILENAME), response.body().print(), StandardCharsets.UTF_8); + API_DOCUMENTATION_LOCATIONS.forEach(location -> { + try { + writeStringToFile(new File(location), response.body().print(), StandardCharsets.UTF_8); + } catch (IOException e) { + throw new RuntimeException(e); + } + }); + ; } } diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/application/alert/response/AlertResponseTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/application/alert/response/AlertResponseTest.java index f1f74535bf..e135ae3f9d 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/application/alert/response/AlertResponseTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/application/alert/response/AlertResponseTest.java @@ -60,7 +60,7 @@ void givenNotification_whenFrom_thenConstructProperAlertResponse() { .map(NotificationMessage::getCreatedByName) .orElse(null)) .hasFieldOrPropertyWithValue("createdDate", notification.getCreatedAt().toString()) - .hasFieldOrPropertyWithValue("assetIds", notification.getAssetIds()) + .hasFieldOrPropertyWithValue("assetIds", notification.getAffectedPartIds()) .hasFieldOrPropertyWithValue("channel", NotificationSideResponse.SENDER) .hasFieldOrPropertyWithValue("reason", new NotificationReasonResponse( notification.getCloseReason(), diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/application/alert/rest/AlertControllerTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/application/alert/rest/NotificationControllerTest.java similarity index 83% rename from tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/application/alert/rest/AlertControllerTest.java rename to tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/application/alert/rest/NotificationControllerTest.java index a317dc43cb..e9bb49929a 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/application/alert/rest/AlertControllerTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/application/alert/rest/NotificationControllerTest.java @@ -36,7 +36,7 @@ import notification.request.NotificationSeverityRequest; import notification.request.NotificationTypeRequest; import notification.request.StartNotificationRequest; -import notification.request.UpdateNotificationRequest; +import notification.request.UpdateNotificationStatusTransitionRequest; import notification.request.UpdateNotificationStatusRequest; import notification.response.NotificationIdResponse; import notification.response.NotificationReasonResponse; @@ -55,10 +55,10 @@ import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) -class AlertControllerTest { +class NotificationControllerTest { @Mock - private NotificationService alertService; + private NotificationService notificationService; @InjectMocks @@ -71,17 +71,17 @@ void givenRequestBody_whenAlertAssets_thenResponse() { final Instant targetDate = Instant.parse("2099-03-11T22:44:06.333826952Z"); final NotificationId notificationId = new NotificationId(666L); final StartNotificationRequest request = StartNotificationRequest.builder() - .partIds(partIds) + .affectedPartIds(partIds) .description("description") .targetDate(targetDate) .type(NotificationTypeRequest.ALERT) .severity(NotificationSeverityRequest.MINOR) .receiverBpn("BPN00001") .build(); - when(alertService.start(Mockito.eq(from(request)))).thenReturn(notificationId); + when(notificationService.start(Mockito.eq(from(request)))).thenReturn(notificationId); // when - final NotificationIdResponse result = controller.alertAssets(request); + final NotificationIdResponse result = controller.createNotification(request); // then assertThat(result).hasFieldOrPropertyWithValue("id", notificationId.value()); @@ -95,10 +95,10 @@ void givenRequest_whenGetAlert_thenProperResponse() { NotificationStatus.ACCEPTED, "bpn" ); - when(alertService.find(request)).thenReturn(notification); + when(notificationService.find(request)).thenReturn(notification); // when - final NotificationResponse result = controller.getAlert(request); + final NotificationResponse result = controller.getNotificationById(request); // then assertThat(result) @@ -114,7 +114,7 @@ void givenRequest_whenGetAlert_thenProperResponse() { .map(NotificationMessage::getCreatedByName) .orElse(null)) .hasFieldOrPropertyWithValue("createdDate", notification.getCreatedAt().toString()) - .hasFieldOrPropertyWithValue("assetIds", notification.getAssetIds()) + .hasFieldOrPropertyWithValue("assetIds", notification.getAffectedPartIds()) .hasFieldOrPropertyWithValue("channel", NotificationSideResponse.SENDER) .hasFieldOrPropertyWithValue("reason", new NotificationReasonResponse( notification.getCloseReason(), @@ -132,10 +132,10 @@ void givenRequest_whenApproveAlert_thenProcessCorrectly() { final Long request = 1L; // when - controller.approveAlert(request); + controller.approveNotificationById(request); // then - verify(alertService, times(1)).approve(request); + verify(notificationService, times(1)).approve(request); } @Test @@ -144,10 +144,10 @@ void givenRequest_whenCancelAlert_thenProcessCorrectly() { final Long request = 1L; // when - controller.cancelAlert(request); + controller.cancelNotificationById(request); // then - verify(alertService, times(1)).cancel(request); + verify(notificationService, times(1)).cancel(request); } @Test @@ -158,10 +158,10 @@ void givenRequest_whenCloseAlert_thenProcessCorrectly() { CloseNotificationRequest request = CloseNotificationRequest.builder().reason("just because").build(); // when - controller.closeAlert(param, request); + controller.closeNotificationById(param, request); // then - verify(alertService, times(1)).update(param, NotificationStatus.CLOSED, "just because"); + verify(notificationService, times(1)).updateStatusTransition(param, NotificationStatus.CLOSED, "just because"); } @Test @@ -170,18 +170,18 @@ void givenRequest_whenUpdateAlert_thenProcessCorrectly() { final Long param = 1L; - UpdateNotificationRequest request = - UpdateNotificationRequest.builder() + UpdateNotificationStatusTransitionRequest request = + UpdateNotificationStatusTransitionRequest.builder() .status(UpdateNotificationStatusRequest.ACCEPTED) .reason("just because I say so") .build(); // when - controller.updateAlert(param, request); + controller.updateNotificationStatusById(param, request); // then - verify(alertService, times(1)).update(param, NotificationStatus.ACCEPTED, "just because I say so"); + verify(notificationService, times(1)).updateStatusTransition(param, NotificationStatus.ACCEPTED, "just because I say so"); } } diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/domain/service/NotificationPublisherServiceTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/domain/service/NotificationPublisherServiceTest.java index 3d7fd8529a..4919be1bba 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/domain/service/NotificationPublisherServiceTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/domain/service/NotificationPublisherServiceTest.java @@ -21,7 +21,7 @@ import org.eclipse.tractusx.traceability.assets.domain.asbuilt.repository.AssetAsBuiltRepository; import org.eclipse.tractusx.traceability.assets.domain.asbuilt.service.AssetAsBuiltServiceImpl; -import org.eclipse.tractusx.traceability.bpn.domain.service.BpnRepository; +import org.eclipse.tractusx.traceability.bpn.infrastructure.repository.BpnRepository; import org.eclipse.tractusx.traceability.common.model.BPN; import org.eclipse.tractusx.traceability.common.properties.TraceabilityProperties; import org.eclipse.tractusx.traceability.notification.domain.base.exception.SendNotificationException; @@ -35,7 +35,6 @@ import org.eclipse.tractusx.traceability.notification.domain.base.model.exception.NotificationIllegalUpdate; import org.eclipse.tractusx.traceability.notification.domain.base.service.EdcNotificationService; import org.eclipse.tractusx.traceability.notification.domain.base.service.NotificationPublisherService; -import org.eclipse.tractusx.traceability.notification.domain.notification.exception.NotificationNotSupportedException; import org.eclipse.tractusx.traceability.notification.domain.notification.model.StartNotification; import org.eclipse.tractusx.traceability.notification.domain.notification.repository.NotificationRepository; import org.eclipse.tractusx.traceability.testdata.AssetTestDataFactory; @@ -91,18 +90,17 @@ void testStartInvestigationSuccessful() { String description = "Test investigation"; List assets = Arrays.asList("asset-1", "asset-2"); Instant targetDate = Instant.parse("2022-03-01T12:00:00Z"); - when(assetRepository.getAssetsById(assets)).thenReturn(List.of(AssetTestDataFactory.createAssetTestData())); + when(assetRepository.getAssetsById(assets)).thenReturn(List.of(AssetTestDataFactory.createAssetAsBuiltTestdata())); when(traceabilityProperties.getBpn()).thenReturn(BPN.of("bpn-123")); String receiverBpn = "someReceiverBpn"; StartNotification startNotification = StartNotification.builder() .title(title) - .partIds(assets) + .affectedPartIds(assets) .description(description) .targetDate(targetDate) .severity(NotificationSeverity.MINOR) .type(NotificationType.INVESTIGATION) .receiverBpn(receiverBpn) - .isAsBuilt(true) .build(); // When @@ -118,29 +116,6 @@ void testStartInvestigationSuccessful() { verify(assetRepository).getAssetsById(Arrays.asList("asset-1", "asset-2")); } - @Test - void testThrowNotificationNotSupportedException() { - // Given - String title = "Title"; - String description = "Test investigation"; - String receiverBpn = "someReceiverBpn"; - Instant targetDate = Instant.parse("2022-03-01T12:00:00Z"); - List assets = Arrays.asList("asset-1", "asset-2"); - StartNotification startNotification = StartNotification.builder() - .title(title) - .partIds(assets) - .description(description) - .targetDate(targetDate) - .severity(NotificationSeverity.MINOR) - .type(NotificationType.INVESTIGATION) - .receiverBpn(receiverBpn) - .isAsBuilt(false) - .build(); - - // Then - assertThrows(NotificationNotSupportedException.class, () -> notificationPublisherService.startNotification(startNotification)); - } - @Test void testStartAlertSuccessful() { // Given @@ -150,16 +125,15 @@ void testStartAlertSuccessful() { Instant targetDate = Instant.parse("2022-03-01T12:00:00Z"); List assets = Arrays.asList("asset-1", "asset-2"); when(traceabilityProperties.getBpn()).thenReturn(BPN.of("bpn-123")); - when(assetRepository.getAssetsById(assets)).thenReturn(List.of(AssetTestDataFactory.createAssetTestData())); + when(assetRepository.getAssetsById(assets)).thenReturn(List.of(AssetTestDataFactory.createAssetAsBuiltTestdata())); StartNotification startNotification = StartNotification.builder() .title(title) - .partIds(assets) + .affectedPartIds(assets) .description(description) .targetDate(targetDate) .severity(NotificationSeverity.MINOR) .type(NotificationType.INVESTIGATION) .receiverBpn(receiverBpn) - .isAsBuilt(true) .build(); // When Notification result = notificationPublisherService.startNotification(startNotification); diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/infrastructure/investigation/repository/InvestigationsRepositoryImplTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/infrastructure/investigation/repository/InvestigationsRepositoryImplTest.java index 8f75a39118..6226585fd0 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/infrastructure/investigation/repository/InvestigationsRepositoryImplTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/infrastructure/investigation/repository/InvestigationsRepositoryImplTest.java @@ -71,7 +71,7 @@ void updateErrorMessage() { // Given NotificationMessage message = NotificationMessage.builder().notificationStatus(NotificationStatus.ACKNOWLEDGED).affectedParts(List.of(new NotificationAffectedPart("123"))).build(); - Notification notification = Notification.builder().notificationStatus(NotificationStatus.ACKNOWLEDGED).assetIds(List.of("123")).notificationId(new NotificationId(123L)).bpn(BPN.of("ABC")).notifications(List.of(message)).build(); + Notification notification = Notification.builder().notificationStatus(NotificationStatus.ACKNOWLEDGED).affectedPartIds(List.of("123")).notificationId(new NotificationId(123L)).bpn(BPN.of("ABC")).notifications(List.of(message)).build(); AssetAsBuiltEntity assetAsBuiltEntity = AssetAsBuiltEntity.builder().id("123").build(); NotificationEntity entity = NotificationEntity.builder().assets(List.of(assetAsBuiltEntity)).build(); NotificationMessageEntity notificationEntity = NotificationMessageEntity.from(entity, message, List.of(assetAsBuiltEntity)); diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/infrastructure/investigation/repository/NotificationRepositoryImplTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/infrastructure/investigation/repository/NotificationRepositoryImplTest.java index 83134ef3c8..174d8d9c2e 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/infrastructure/investigation/repository/NotificationRepositoryImplTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/infrastructure/investigation/repository/NotificationRepositoryImplTest.java @@ -71,7 +71,7 @@ void updateErrorMessage() { // Given NotificationMessage message = NotificationMessage.builder().notificationStatus(NotificationStatus.ACKNOWLEDGED).affectedParts(List.of(new NotificationAffectedPart("123"))).build(); - Notification notification = Notification.builder().notificationStatus(NotificationStatus.ACKNOWLEDGED).assetIds(List.of("123")).notificationId(new NotificationId(123L)).bpn(BPN.of("ABC")).notifications(List.of(message)).build(); + Notification notification = Notification.builder().notificationStatus(NotificationStatus.ACKNOWLEDGED).affectedPartIds(List.of("123")).notificationId(new NotificationId(123L)).bpn(BPN.of("ABC")).notifications(List.of(message)).build(); AssetAsBuiltEntity assetAsBuiltEntity = AssetAsBuiltEntity.builder().id("123").build(); NotificationEntity entity = NotificationEntity.builder().assets(List.of(assetAsBuiltEntity)).build(); NotificationMessageEntity notificationEntity = NotificationMessageEntity.from(entity, message, List.of(assetAsBuiltEntity)); diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/investigation/rest/model/UpdateNotificationStatusTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/investigation/rest/model/EditNotificationStatusTest.java similarity index 98% rename from tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/investigation/rest/model/UpdateNotificationStatusTest.java rename to tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/investigation/rest/model/EditNotificationStatusTest.java index da5557b7d2..af80c1159e 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/investigation/rest/model/UpdateNotificationStatusTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/investigation/rest/model/EditNotificationStatusTest.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; -class UpdateNotificationStatusTest { +class EditNotificationStatusTest { @Test void testToInvestigationStatusACCEPTED() { diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/investigation/rest/validation/UpdateNotificationValidatorTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/investigation/rest/validation/EditNotificationValidatorTest.java similarity index 88% rename from tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/investigation/rest/validation/UpdateNotificationValidatorTest.java rename to tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/investigation/rest/validation/EditNotificationValidatorTest.java index e2922ad1c8..350ffa38f7 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/investigation/rest/validation/UpdateNotificationValidatorTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/notification/investigation/rest/validation/EditNotificationValidatorTest.java @@ -27,14 +27,14 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import notification.request.UpdateNotificationRequest; +import notification.request.UpdateNotificationStatusTransitionRequest; import notification.request.UpdateNotificationStatusRequest; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @ExtendWith(MockitoExtension.class) -class UpdateNotificationValidatorTest { +class EditNotificationValidatorTest { @Test @DisplayName("No Validation Success for invalid Reason") @@ -44,7 +44,7 @@ void testUnsuccessfulValidationForInvalidReason() { String reason = "some-reason-for-update"; String errorMessage = "Update investigation reason can't be present for ACKNOWLEDGED status"; - UpdateNotificationRequest request = UpdateNotificationRequest.builder().build(); + UpdateNotificationStatusTransitionRequest request = UpdateNotificationStatusTransitionRequest.builder().build(); request.setReason(reason); request.setStatus(acknowledged); UpdateNotificationValidationException exception = assertThrows(UpdateNotificationValidationException.class, () -> UpdateNotificationValidator.validate(request)); @@ -56,7 +56,7 @@ void testUnsuccessfulValidationForInvalidReason() { @DisplayName("Execute Validation successfully") void testSuccessfulValidation() { UpdateNotificationStatusRequest accepted = UpdateNotificationStatusRequest.ACCEPTED; - UpdateNotificationRequest request = UpdateNotificationRequest.builder().build(); + UpdateNotificationStatusTransitionRequest request = UpdateNotificationStatusTransitionRequest.builder().build(); request.setReason("abcdefg12313212321123"); request.setStatus(accepted); UpdateNotificationValidator.validate(request); diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/shelldescriptor/infrastructure/rest/DecentralRegistryRepositoryImplTest.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/shelldescriptor/infrastructure/rest/DecentralRegistryRepositoryImplTest.java index 3415865af6..e73469b98a 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/shelldescriptor/infrastructure/rest/DecentralRegistryRepositoryImplTest.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/shelldescriptor/infrastructure/rest/DecentralRegistryRepositoryImplTest.java @@ -58,7 +58,7 @@ void testRetrieveShellDescriptorsByBpnSuccess() throws RegistryServiceException .keys(List.of( SemanticId.builder() .type("GlobalReference") - .value("urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SerialPart").build() + .value("urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SerialPart").build() ) ) .build() @@ -76,7 +76,7 @@ void testRetrieveShellDescriptorsByBpnSuccess() throws RegistryServiceException .keys(List.of( SemanticId.builder() .type("GlobalReference") - .value("urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#PartAsPlanned").build() + .value("urn:samm:io.catenax.single_level_usage_as_built:2.0.0#PartAsPlanned").build() ) ) .build() diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/testdata/AssetTestDataFactory.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/testdata/AssetTestDataFactory.java index ddefb5d27e..8024b84799 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/testdata/AssetTestDataFactory.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/testdata/AssetTestDataFactory.java @@ -20,6 +20,7 @@ package org.eclipse.tractusx.traceability.testdata; import org.eclipse.tractusx.traceability.assets.domain.asbuilt.model.aspect.DetailAspectDataAsBuilt; +import org.eclipse.tractusx.traceability.assets.domain.asplanned.model.aspect.DetailAspectDataPartSiteInformationAsPlanned; import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase; import org.eclipse.tractusx.traceability.assets.domain.base.model.Descriptions; import org.eclipse.tractusx.traceability.assets.domain.base.model.Owner; @@ -37,13 +38,13 @@ public class AssetTestDataFactory { public static AssetBase createAssetTestDataWithRelations(List parents, List childs) { - AssetBase assetTestData = createAssetTestData(); + AssetBase assetTestData = createAssetAsBuiltTestdata(); assetTestData.setParentRelations(parents); assetTestData.setChildRelations(childs); return assetTestData; } - public static AssetBase createAssetTestData() { + public static AssetBase createAssetAsBuiltTestdata() { DetailAspectDataAsBuilt detailAspectDataAsBuilt = DetailAspectDataAsBuilt.builder() @@ -93,6 +94,40 @@ public static AssetBase createAssetTestData() { .build(); } + public static AssetBase createAssetAsPlannedTestdata() { + + + DetailAspectDataPartSiteInformationAsPlanned detailAspectDataPartSiteInfoAsPlanned = DetailAspectDataPartSiteInformationAsPlanned.builder() + .catenaXSiteId("abc") + .function("function") + .functionValidFrom(OffsetDateTime.now()) + .functionValidUntil(OffsetDateTime.now().plusDays(1L)) + .build(); + + DetailAspectModel detailAspectModel = DetailAspectModel.builder() + .data(detailAspectDataPartSiteInfoAsPlanned) + .type(DetailAspectType.AS_PLANNED) + .build(); + + ArrayList detailAspectModels = new ArrayList<>(); + detailAspectModels.add(detailAspectModel); + + return AssetBase.builder() + .id("urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4eb01") + .idShort("a/devNTierAPlastics") + .semanticModelId("456") + .semanticDataModel(SemanticDataModel.PARTASPLANNED) + .parentRelations(AssetTestDataFactory.provideParentRelations()) + .childRelations(AssetTestDataFactory.provideChildRelations()) + .van("OMAOYGBDTSRCMYSCX") + .qualityType(QualityType.CRITICAL) + .owner(Owner.OWN) + .manufacturerName("manuName") + .manufacturerId("BPNL00000003CML1") + .detailAspectModels(detailAspectModels) + .build(); + } + public static List provideParentRelations() { List parentDescriptions = new ArrayList<>(); parentDescriptions.add(new Descriptions("parent1", "desc1", null, null)); diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/testdata/InvestigationTestDataFactory.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/testdata/InvestigationTestDataFactory.java index ac2e0e40e6..6e4e8b6c8e 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/testdata/InvestigationTestDataFactory.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/testdata/InvestigationTestDataFactory.java @@ -68,7 +68,7 @@ public static Notification createInvestigationTestData(NotificationStatus invest .description(description) .notificationType(NotificationType.INVESTIGATION) .createdAt(createdAt) - .assetIds(assetIds) + .affectedPartIds(assetIds) .notifications(notifications) .build(); } @@ -89,7 +89,7 @@ public static Notification createInvestigationTestDataWithNotificationList(Notif .notificationSide(investigationSide) .description(description) .createdAt(createdAt) - .assetIds(assetIds) + .affectedPartIds(assetIds) .notifications(notifications) .build(); } @@ -147,7 +147,7 @@ public static Notification createInvestigationTestData(NotificationStatus invest .description(description) .createdAt(createdAt) .notificationType(NotificationType.INVESTIGATION) - .assetIds(assetIds) + .affectedPartIds(assetIds) .notifications(notifications) .build(); } @@ -184,7 +184,7 @@ public static Notification createInvestigationTestData(NotificationSide investig .notificationSide(investigationSide) .description(description) .createdAt(createdAt) - .assetIds(assetIds) + .affectedPartIds(assetIds) .notifications(notifications) .build(); } diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/testdata/PolicyTestDataFactory.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/testdata/PolicyTestDataFactory.java index b10989c2a9..a945b19132 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/testdata/PolicyTestDataFactory.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/testdata/PolicyTestDataFactory.java @@ -35,7 +35,7 @@ public class PolicyTestDataFactory { @NotNull - public static IrsPolicyResponse createIrsPolicyResponse(String policyId, OffsetDateTime createdOn, String orRightOperand, String andRightOperand) { + public static IrsPolicyResponse createIrsPolicyResponse(String policyId, OffsetDateTime createdOn, String orLeftOperand, String andLeftOperand, String orRightOperand, String andRightOperand) { return IrsPolicyResponse.builder() .validUntil(OffsetDateTime.now()) @@ -50,8 +50,8 @@ public static IrsPolicyResponse createIrsPolicyResponse(String policyId, OffsetD Permission.builder() .action(PolicyType.USE) .constraint(Constraints.builder() - .and(List.of(new Constraint("", new Operator(OperatorType.EQ), andRightOperand))) - .or(List.of(new Constraint("", new Operator(OperatorType.EQ), orRightOperand))) + .and(List.of(new Constraint(andLeftOperand, new Operator(OperatorType.EQ), andRightOperand))) + .or(List.of(new Constraint(orLeftOperand, new Operator(OperatorType.EQ), orRightOperand))) .build()) .build())) .build()) diff --git a/tx-backend/src/test/resources/stubs/bpdm/response_200.json b/tx-backend/src/test/resources/stubs/bpdm/response_200.json new file mode 100644 index 0000000000..9c4182290b --- /dev/null +++ b/tx-backend/src/test/resources/stubs/bpdm/response_200.json @@ -0,0 +1,6 @@ +{ + "bpn" : "BPNL000000012345", + "names" : [ + "OEM A" + ] +} diff --git a/tx-backend/src/test/resources/stubs/edc/post/data/contractagreements/contractagreement_negotiation_response_200.json b/tx-backend/src/test/resources/stubs/edc/post/data/contractagreements/contractagreement_negotiation_response_200.json index e99e592351..8aa4ac952a 100644 --- a/tx-backend/src/test/resources/stubs/edc/post/data/contractagreements/contractagreement_negotiation_response_200.json +++ b/tx-backend/src/test/resources/stubs/edc/post/data/contractagreements/contractagreement_negotiation_response_200.json @@ -1,14 +1,14 @@ { "@type" : "edc:ContractNegotiation", "@id" : "a521a424-a07b-4a08-a845-676f2ddd0e89", - "edc:type" : "CONSUMER", - "edc:protocol" : "dataspace-protocol-http", - "edc:state" : "FINALIZED", - "edc:counterPartyId" : "BPNL00000003CML1", - "edc:counterPartyAddress" : "https://trace-x-edc-e2e-a.dev.demo.catena-x.net/api/v1/dsp", - "edc:callbackAddresses" : [], - "edc:createdAt" : 1708590580001, - "edc:contractAgreementId" : "ODA3MmUyNTQtOGNlZi00YzQ2LTljNGYtNGYzNjE2YjQ5NTZl:cmVnaXN0cnktYXNzZXQ=:MDljNDMzY2EtODI5OS00OGE3LWI0MjYtNzZmZjJmODE1ZWE2", + "type" : "CONSUMER", + "protocol" : "dataspace-protocol-http", + "state" : "FINALIZED", + "counterPartyId" : "BPNL00000003CML1", + "counterPartyAddress" : "https://trace-x-edc-e2e-a.dev.demo.catena-x.net/api/v1/dsp", + "callbackAddresses" : [], + "createdAt" : 1708590580001, + "contractAgreementId" : "ODA3MmUyNTQtOGNlZi00YzQ2LTljNGYtNGYzNjE2YjQ5NTZl:cmVnaXN0cnktYXNzZXQ=:MDljNDMzY2EtODI5OS00OGE3LWI0MjYtNzZmZjJmODE1ZWE2", "@context" : { "dct" : "https://purl.org/dc/terms/", "tx" : "https://w3id.org/tractusx/v0.0.1/ns/", diff --git a/tx-backend/src/test/resources/stubs/edc/post/data/contractagreements/first_page_contractagreements_response_200.json b/tx-backend/src/test/resources/stubs/edc/post/data/contractagreements/first_page_contractagreements_response_200.json index 5f0f720079..31c43f0ca1 100644 --- a/tx-backend/src/test/resources/stubs/edc/post/data/contractagreements/first_page_contractagreements_response_200.json +++ b/tx-backend/src/test/resources/stubs/edc/post/data/contractagreements/first_page_contractagreements_response_200.json @@ -1,9 +1,9 @@ [ { - "@type" : "edc:ContractAgreement", + "@type" : "ContractAgreement", "@id" : "abc1", - "edc:assetId" : "registry-asset", - "edc:policy" : { + "assetId" : "registry-asset", + "policy" : { "@id" : "eb0c8486-914a-4d36-84c0-b4971cbc52e4", "@type" : "odrl:Set", "odrl:permission" : { @@ -25,9 +25,9 @@ "odrl:obligation" : [], "odrl:target" : "registry-asset" }, - "edc:contractSigningDate" : 1708951087, - "edc:consumerId" : "BPNL00000003CML1", - "edc:providerId" : "BPNL00000003CML1", + "contractSigningDate" : 1708951087, + "consumerId" : "BPNL00000003CML1", + "providerId" : "BPNL00000003CML1", "@context" : { "dct" : "https://purl.org/dc/terms/", "tx" : "https://w3id.org/tractusx/v0.0.1/ns/", @@ -38,10 +38,10 @@ } }, { - "@type" : "edc:ContractAgreement", + "@type" : "ContractAgreement", "@id" : "abc2", - "edc:assetId" : "registry-asset", - "edc:policy" : { + "assetId" : "registry-asset", + "policy" : { "@id" : "eb0c8486-914a-4d36-84c0-b4971cbc52e4", "@type" : "odrl:Set", "odrl:permission" : { @@ -63,9 +63,9 @@ "odrl:obligation" : [], "odrl:target" : "registry-asset" }, - "edc:contractSigningDate" : 1708951087, - "edc:consumerId" : "BPNL00000003CML1", - "edc:providerId" : "BPNL00000003CML1", + "contractSigningDate" : 1708951087, + "consumerId" : "BPNL00000003CML1", + "providerId" : "BPNL00000003CML1", "@context" : { "dct" : "https://purl.org/dc/terms/", "tx" : "https://w3id.org/tractusx/v0.0.1/ns/", @@ -76,10 +76,10 @@ } }, { - "@type" : "edc:ContractAgreement", + "@type" : "ContractAgreement", "@id" : "abc3", - "edc:assetId" : "registry-asset", - "edc:policy" : { + "assetId" : "registry-asset", + "policy" : { "@id" : "eb0c8486-914a-4d36-84c0-b4971cbc52e4", "@type" : "odrl:Set", "odrl:permission" : { @@ -101,9 +101,9 @@ "odrl:obligation" : [], "odrl:target" : "registry-asset" }, - "edc:contractSigningDate" : 1708951087, - "edc:consumerId" : "BPNL00000003CML1", - "edc:providerId" : "BPNL00000003CML1", + "contractSigningDate" : 1708951087, + "consumerId" : "BPNL00000003CML1", + "providerId" : "BPNL00000003CML1", "@context" : { "dct" : "https://purl.org/dc/terms/", "tx" : "https://w3id.org/tractusx/v0.0.1/ns/", @@ -114,10 +114,10 @@ } }, { - "@type" : "edc:ContractAgreement", + "@type" : "ContractAgreement", "@id" : "abc4", - "edc:assetId" : "registry-asset", - "edc:policy" : { + "assetId" : "registry-asset", + "policy" : { "@id" : "eb0c8486-914a-4d36-84c0-b4971cbc52e4", "@type" : "odrl:Set", "odrl:permission" : { @@ -139,9 +139,9 @@ "odrl:obligation" : [], "odrl:target" : "registry-asset" }, - "edc:contractSigningDate" : 1708951087, - "edc:consumerId" : "BPNL00000003CML1", - "edc:providerId" : "BPNL00000003CML1", + "contractSigningDate" : 1708951087, + "consumerId" : "BPNL00000003CML1", + "providerId" : "BPNL00000003CML1", "@context" : { "dct" : "https://purl.org/dc/terms/", "tx" : "https://w3id.org/tractusx/v0.0.1/ns/", @@ -152,10 +152,10 @@ } }, { - "@type" : "edc:ContractAgreement", + "@type" : "ContractAgreement", "@id" : "abc5", - "edc:assetId" : "registry-asset", - "edc:policy" : { + "assetId" : "registry-asset", + "policy" : { "@id" : "eb0c8486-914a-4d36-84c0-b4971cbc52e4", "@type" : "odrl:Set", "odrl:permission" : { @@ -177,9 +177,9 @@ "odrl:obligation" : [], "odrl:target" : "registry-asset" }, - "edc:contractSigningDate" : 1708951087, - "edc:consumerId" : "BPNL00000003CML1", - "edc:providerId" : "BPNL00000003CML1", + "contractSigningDate" : 1708951087, + "consumerId" : "BPNL00000003CML1", + "providerId" : "BPNL00000003CML1", "@context" : { "dct" : "https://purl.org/dc/terms/", "tx" : "https://w3id.org/tractusx/v0.0.1/ns/", diff --git a/tx-backend/src/test/resources/stubs/edc/post/data/contractagreements/one_contractagreement_response_200.json b/tx-backend/src/test/resources/stubs/edc/post/data/contractagreements/one_contractagreement_response_200.json index 341a8b61b3..f75dd1e15e 100644 --- a/tx-backend/src/test/resources/stubs/edc/post/data/contractagreements/one_contractagreement_response_200.json +++ b/tx-backend/src/test/resources/stubs/edc/post/data/contractagreements/one_contractagreement_response_200.json @@ -1,9 +1,9 @@ [ { - "@type" : "edc:ContractAgreement", + "@type" : "ContractAgreement", "@id" : "abc1", - "edc:assetId" : "registry-asset", - "edc:policy" : { + "assetId" : "registry-asset", + "policy" : { "@id" : "eb0c8486-914a-4d36-84c0-b4971cbc52e4", "@type" : "odrl:Set", "odrl:permission" : { @@ -25,9 +25,9 @@ "odrl:obligation" : [], "odrl:target" : "registry-asset" }, - "edc:contractSigningDate" : 1708951087, - "edc:consumerId" : "BPNL00000003CML1", - "edc:providerId" : "BPNL00000003CML1", + "contractSigningDate" : 1708951087, + "consumerId" : "BPNL00000003CML1", + "providerId" : "BPNL00000003CML1", "@context" : { "dct" : "https://purl.org/dc/terms/", "tx" : "https://w3id.org/tractusx/v0.0.1/ns/", diff --git a/tx-backend/src/test/resources/stubs/edc/post/data/contractagreements/second_page_contractagreements_response_200.json b/tx-backend/src/test/resources/stubs/edc/post/data/contractagreements/second_page_contractagreements_response_200.json index 13b119fcff..00aec9c955 100644 --- a/tx-backend/src/test/resources/stubs/edc/post/data/contractagreements/second_page_contractagreements_response_200.json +++ b/tx-backend/src/test/resources/stubs/edc/post/data/contractagreements/second_page_contractagreements_response_200.json @@ -1,9 +1,9 @@ [ { - "@type" : "edc:ContractAgreement", + "@type" : "ContractAgreement", "@id" : "abc6", - "edc:assetId" : "registry-asset", - "edc:policy" : { + "assetId" : "registry-asset", + "policy" : { "@id" : "eb0c8486-914a-4d36-84c0-b4971cbc52e4", "@type" : "odrl:Set", "odrl:permission" : { @@ -25,9 +25,9 @@ "odrl:obligation" : [], "odrl:target" : "registry-asset" }, - "edc:contractSigningDate" : 1708951087, - "edc:consumerId" : "BPNL00000003CML1", - "edc:providerId" : "BPNL00000003CML1", + "contractSigningDate" : 1708951087, + "consumerId" : "BPNL00000003CML1", + "providerId" : "BPNL00000003CML1", "@context" : { "dct" : "https://purl.org/dc/terms/", "tx" : "https://w3id.org/tractusx/v0.0.1/ns/", @@ -38,10 +38,10 @@ } }, { - "@type" : "edc:ContractAgreement", + "@type" : "ContractAgreement", "@id" : "abc7", - "edc:assetId" : "registry-asset", - "edc:policy" : { + "assetId" : "registry-asset", + "policy" : { "@id" : "eb0c8486-914a-4d36-84c0-b4971cbc52e4", "@type" : "odrl:Set", "odrl:permission" : { @@ -63,9 +63,9 @@ "odrl:obligation" : [], "odrl:target" : "registry-asset" }, - "edc:contractSigningDate" : 1708951087, - "edc:consumerId" : "BPNL00000003CML1", - "edc:providerId" : "BPNL00000003CML1", + "contractSigningDate" : 1708951087, + "consumerId" : "BPNL00000003CML1", + "providerId" : "BPNL00000003CML1", "@context" : { "dct" : "https://purl.org/dc/terms/", "tx" : "https://w3id.org/tractusx/v0.0.1/ns/", @@ -76,10 +76,10 @@ } }, { - "@type" : "edc:ContractAgreement", + "@type" : "ContractAgreement", "@id" : "abc8", - "edc:assetId" : "registry-asset", - "edc:policy" : { + "assetId" : "registry-asset", + "policy" : { "@id" : "eb0c8486-914a-4d36-84c0-b4971cbc52e4", "@type" : "odrl:Set", "odrl:permission" : { @@ -101,9 +101,9 @@ "odrl:obligation" : [], "odrl:target" : "registry-asset" }, - "edc:contractSigningDate" : 1708951087, - "edc:consumerId" : "BPNL00000003CML1", - "edc:providerId" : "BPNL00000003CML1", + "contractSigningDate" : 1708951087, + "consumerId" : "BPNL00000003CML1", + "providerId" : "BPNL00000003CML1", "@context" : { "dct" : "https://purl.org/dc/terms/", "tx" : "https://w3id.org/tractusx/v0.0.1/ns/", @@ -114,10 +114,10 @@ } }, { - "@type" : "edc:ContractAgreement", + "@type" : "ContractAgreement", "@id" : "abc9", - "edc:assetId" : "registry-asset", - "edc:policy" : { + "assetId" : "registry-asset", + "policy" : { "@id" : "eb0c8486-914a-4d36-84c0-b4971cbc52e4", "@type" : "odrl:Set", "odrl:permission" : { @@ -139,9 +139,9 @@ "odrl:obligation" : [], "odrl:target" : "registry-asset" }, - "edc:contractSigningDate" : 1708951087, - "edc:consumerId" : "BPNL00000003CML1", - "edc:providerId" : "BPNL00000003CML1", + "contractSigningDate" : 1708951087, + "consumerId" : "BPNL00000003CML1", + "providerId" : "BPNL00000003CML1", "@context" : { "dct" : "https://purl.org/dc/terms/", "tx" : "https://w3id.org/tractusx/v0.0.1/ns/", @@ -152,10 +152,10 @@ } }, { - "@type" : "edc:ContractAgreement", + "@type" : "ContractAgreement", "@id" : "abc10", - "edc:assetId" : "registry-asset", - "edc:policy" : { + "assetId" : "registry-asset", + "policy" : { "@id" : "eb0c8486-914a-4d36-84c0-b4971cbc52e4", "@type" : "odrl:Set", "odrl:permission" : { @@ -177,9 +177,9 @@ "odrl:obligation" : [], "odrl:target" : "registry-asset" }, - "edc:contractSigningDate" : 1708951087, - "edc:consumerId" : "BPNL00000003CML1", - "edc:providerId" : "BPNL00000003CML1", + "contractSigningDate" : 1708951087, + "consumerId" : "BPNL00000003CML1", + "providerId" : "BPNL00000003CML1", "@context" : { "dct" : "https://purl.org/dc/terms/", "tx" : "https://w3id.org/tractusx/v0.0.1/ns/", diff --git a/tx-backend/src/test/resources/stubs/irs/get/jobs/id/response_200.json b/tx-backend/src/test/resources/stubs/irs/get/jobs/id/response_200.json index 52e9acd5c1..f17ceff94a 100644 --- a/tx-backend/src/test/resources/stubs/irs/get/jobs/id/response_200.json +++ b/tx-backend/src/test/resources/stubs/irs/get/jobs/id/response_200.json @@ -304,7 +304,7 @@ "identification" : "urn:uuid:781dabcb-93e7-442d-bc38-8ba1451c0218", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -383,7 +383,7 @@ "identification" : "urn:uuid:ff82a14d-8730-488f-b965-89eeb2010991", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -462,7 +462,7 @@ "identification" : "urn:uuid:82b89a4c-0e98-499e-ba21-c2a5aa38d70b", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -565,7 +565,7 @@ "identification" : "urn:uuid:20c37755-2cb1-4eaf-be09-b44c9b9031fe", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -620,7 +620,7 @@ "identification" : "urn:uuid:2f11ec59-b8e8-4494-b3d8-0bbb7d1517b5", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -675,7 +675,7 @@ "identification" : "urn:uuid:985ae9ac-e810-4b69-b3c1-23dfb1f057b6", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -730,7 +730,7 @@ "identification" : "urn:uuid:bc51058d-fc37-42e8-b7ce-3be50754124f", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -809,7 +809,7 @@ "identification" : "urn:uuid:cbc837f1-d369-4ff8-9539-42e7bd249204", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -888,7 +888,7 @@ "identification" : "urn:uuid:162535e9-7baa-47b4-b778-17bc45427546", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -943,7 +943,7 @@ "identification" : "urn:uuid:9aeaac21-7d98-44cc-813c-8ba8a6618564", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -1046,7 +1046,7 @@ "identification" : "urn:uuid:326acfa7-07d3-4ad0-bc91-67330c56071e", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -1101,7 +1101,7 @@ "identification" : "urn:uuid:140e0654-765e-4136-ba36-7b1d85832377", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -1156,7 +1156,7 @@ "identification" : "urn:uuid:263e254d-8b7c-4911-b46a-d8bef28970f7", "semanticId" : { "value" : [ - "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart" + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" ] }, "endpoints" : [ @@ -1193,7 +1193,7 @@ "submodels": [ { "identification" : "urn:uuid:318f4d45-7856-4467-8238-4959b56e6841", - "aspectType" : "urn:bamm:io.catenax.just_in_sequence_part:1.0.0#JustInSequencePart", + "aspectType" : "urn:samm:io.catenax.just_in_sequence_part:3.0.0#JustInSequencePart", "payload" : { "localIdentifiers" : [ { @@ -1206,7 +1206,7 @@ } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "HUR" }, "catenaXId" : "urn:uuid:580d3adf-1981-44a0-a214-13d6ceed6841", @@ -1221,7 +1221,7 @@ }, { "identification" : "urn:uuid:318f4d45-7856-4467-8238-4959b56e8912", - "aspectType" : "urn:samm:io.catenax.batch:2.0.0#Batch", + "aspectType" : "urn:samm:io.catenax.batch:3.0.0#Batch", "payload" : { "localIdentifiers" : [ { @@ -1249,7 +1249,7 @@ }, { "identification": "urn:uuid:781dabcb-93e7-442d-bc38-8ba1451c0218", - "aspectType": "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType": "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload": { "localIdentifiers": [ { @@ -1331,7 +1331,7 @@ }, { "identification": "urn:uuid:ff82a14d-8730-488f-b965-89eeb2010991", - "aspectType": "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType": "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload": { "localIdentifiers": [ { @@ -1411,7 +1411,7 @@ }, { "identification": "urn:uuid:82b89a4c-0e98-499e-ba21-c2a5aa38d70b", - "aspectType": "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType": "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload": { "localIdentifiers": [ { @@ -1547,7 +1547,7 @@ }, { "identification": "urn:uuid:20c37755-2cb1-4eaf-be09-b44c9b9031fe", - "aspectType": "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType": "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload": { "localIdentifiers": [ { @@ -1579,7 +1579,7 @@ }, { "identification": "urn:uuid:2f11ec59-b8e8-4494-b3d8-0bbb7d1517b5", - "aspectType": "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType": "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload": { "localIdentifiers": [ { @@ -1611,7 +1611,7 @@ }, { "identification": "urn:uuid:985ae9ac-e810-4b69-b3c1-23dfb1f057b6", - "aspectType": "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType": "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload": { "localIdentifiers": [ { @@ -1643,7 +1643,7 @@ }, { "identification": "urn:uuid:bc51058d-fc37-42e8-b7ce-3be50754124f", - "aspectType": "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType": "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload": { "localIdentifiers": [ { @@ -1697,7 +1697,7 @@ }, { "identification": "urn:uuid:cbc837f1-d369-4ff8-9539-42e7bd249204", - "aspectType": "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType": "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload": { "localIdentifiers": [ { @@ -1737,7 +1737,7 @@ }, { "identification": "urn:uuid:162535e9-7baa-47b4-b778-17bc45427546", - "aspectType": "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType": "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload": { "localIdentifiers": [ { @@ -1769,7 +1769,7 @@ }, { "identification": "urn:uuid:9aeaac21-7d98-44cc-813c-8ba8a6618564", - "aspectType": "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType": "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload": { "localIdentifiers": [ { @@ -1831,7 +1831,7 @@ }, { "identification": "urn:uuid:326acfa7-07d3-4ad0-bc91-67330c56071e", - "aspectType": "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType": "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload": { "localIdentifiers": [ { @@ -1863,7 +1863,7 @@ }, { "identification": "urn:uuid:140e0654-765e-4136-ba36-7b1d85832377", - "aspectType": "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType": "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload": { "localIdentifiers": [ { @@ -1895,7 +1895,7 @@ }, { "identification": "urn:uuid:263e254d-8b7c-4911-b46a-d8bef28970f7", - "aspectType": "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType": "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload": { "localIdentifiers": [ { diff --git a/tx-backend/src/test/resources/stubs/irs/get/jobs/id/response_200_downward_asPlanned.json b/tx-backend/src/test/resources/stubs/irs/get/jobs/id/response_200_downward_asPlanned.json index a367189a81..0df555feba 100644 --- a/tx-backend/src/test/resources/stubs/irs/get/jobs/id/response_200_downward_asPlanned.json +++ b/tx-backend/src/test/resources/stubs/irs/get/jobs/id/response_200_downward_asPlanned.json @@ -102,7 +102,7 @@ "semanticId" : { "keys" : [ { - "value" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "value" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "type" : "Submodel" } ], @@ -132,7 +132,7 @@ "semanticId" : { "keys" : [ { - "value" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "value" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "type" : "Submodel" } ], @@ -188,7 +188,7 @@ "semanticId" : { "keys" : [ { - "value" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "value" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "type" : "Submodel" } ], @@ -218,7 +218,7 @@ "semanticId" : { "keys" : [ { - "value" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "value" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "type" : "Submodel" } ], @@ -274,7 +274,7 @@ "semanticId" : { "keys" : [ { - "value" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "value" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "type" : "Submodel" } ], @@ -304,7 +304,7 @@ "semanticId" : { "keys" : [ { - "value" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "value" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "type" : "Submodel" } ], @@ -334,7 +334,7 @@ "semanticId" : { "keys" : [ { - "value" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "value" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "type" : "Submodel" } ], @@ -376,7 +376,7 @@ "submodels" : [ { "identification" : "urn:uuid:9a1cf54a-56e1-4d20-9931-5479db0ce6f8", - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2019-04-04T03:19:03.000Z", @@ -387,12 +387,20 @@ "manufacturerPartId" : "ZX-55", "classification" : "product", "nameAtManufacturer" : "Vehicle Model A" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { "identification" : "urn:uuid:6507e9fc-2544-4ce1-a41c-b0aa57d7b30a", - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4da01", "sites" : [ @@ -407,7 +415,7 @@ }, { "identification" : "urn:uuid:81d16457-d9af-4b4d-a124-84d3ae17d951", - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2019-04-04T03:19:03.000Z", @@ -418,12 +426,20 @@ "manufacturerPartId" : "ZX-55", "classification" : "product", "nameAtManufacturer" : "Vehicle Model B" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { "identification" : "urn:uuid:3331cecf-8183-4966-aa4c-d99d61d20c0b", - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4eb01", "sites" : [ diff --git a/tx-backend/src/test/resources/stubs/irs/policies/response_200_get_policies.json b/tx-backend/src/test/resources/stubs/irs/policies/response_200_get_policies.json index 1d00283d88..9f43921cd3 100644 --- a/tx-backend/src/test/resources/stubs/irs/policies/response_200_get_policies.json +++ b/tx-backend/src/test/resources/stubs/irs/policies/response_200_get_policies.json @@ -1,97 +1,102 @@ -[ - { - "validUntil" : "2029-03-11T11:04:52.771949893Z", - "payload" : { - "@context" : { - "odrl" : "http://www.w3.org/ns/odrl/2/" - }, - "@id" : "default-policy", - "policy" : { - "policyId" : "default-policy", - "createdOn" : "2024-03-11T11:04:52.771906693Z", - "validUntil" : "2029-03-11T11:04:52.771949893Z", - "permissions" : [ - { - "action" : "USE", - "constraint" : { - "and" : [ - { - "leftOperand" : "PURPOSE", - "operator" : { - "@id" : "eq" +{ + "BPNL00000003CML1" : [ + { + "validUntil" : "2029-04-03T13:04:58.000819786Z", + "payload" : { + "@context" : { + "@vocab" : "https://w3id.org/edc/v0.0.1/ns/", + "edc" : "https://w3id.org/edc/v0.0.1/ns/", + "cx-policy" : "https://w3id.org/catenax/policy/", + "odrl" : "http://www.w3.org/ns/odrl/2/" + }, + "@id" : "default-policy", + "policy" : { + "policyId" : "default-policy", + "createdOn" : "2024-04-03T13:04:58.000772685Z", + "validUntil" : "2029-04-03T13:04:58.000819786Z", + "permissions" : [ + { + "action" : "use", + "constraint" : { + "and" : [ + { + "leftOperand" : "PURPOSE", + "operator" : { + "@id" : "eq" + }, + "odrl:rightOperand" : "ID 3.0 Trace" }, - "odrl:rightOperand" : "ID 3.0 Trace" - }, - { - "leftOperand" : "PURPOSE", - "operator" : { - "@id" : "eq" + { + "leftOperand" : "PURPOSE", + "operator" : { + "@id" : "eq" + }, + "odrl:rightOperand" : "ID 3.1 Trace" }, - "odrl:rightOperand" : "ID 3.1 Trace" - }, - { - "leftOperand" : "PURPOSE", - "operator" : { - "@id" : "eq" + { + "leftOperand" : "PURPOSE", + "operator" : { + "@id" : "eq" + }, + "odrl:rightOperand" : "R2_Traceability" }, - "odrl:rightOperand" : "R2_Traceability" - }, - { - "leftOperand" : "FrameworkAgreement.traceability", - "operator" : { - "@id" : "eq" + { + "leftOperand" : "FrameworkAgreement.traceability", + "operator" : { + "@id" : "eq" + }, + "odrl:rightOperand" : "active" }, - "odrl:rightOperand" : "active" - }, - { - "leftOperand" : "Membership", - "operator" : { - "@id" : "eq" + { + "leftOperand" : "Membership", + "operator" : { + "@id" : "eq" + }, + "odrl:rightOperand" : "active" + } + ], + "or" : [ + { + "leftOperand" : "PURPOSE", + "operator" : { + "@id" : "eq" + }, + "odrl:rightOperand" : "ID 3.0 Trace" }, - "odrl:rightOperand" : "active" - } - ], - "or" : [ - { - "leftOperand" : "PURPOSE", - "operator" : { - "@id" : "eq" + { + "leftOperand" : "PURPOSE", + "operator" : { + "@id" : "eq" + }, + "odrl:rightOperand" : "ID 3.1 Trace" }, - "odrl:rightOperand" : "ID 3.0 Trace" - }, - { - "leftOperand" : "PURPOSE", - "operator" : { - "@id" : "eq" + { + "leftOperand" : "PURPOSE", + "operator" : { + "@id" : "eq" + }, + "odrl:rightOperand" : "R2_Traceability" }, - "odrl:rightOperand" : "ID 3.1 Trace" - }, - { - "leftOperand" : "PURPOSE", - "operator" : { - "@id" : "eq" + { + "leftOperand" : "FrameworkAgreement.traceability", + "operator" : { + "@id" : "eq" + }, + "odrl:rightOperand" : "active" }, - "odrl:rightOperand" : "R2_Traceability" - }, - { - "leftOperand" : "FrameworkAgreement.traceability", - "operator" : { - "@id" : "eq" - }, - "odrl:rightOperand" : "active" - }, - { - "leftOperand" : "Membership", - "operator" : { - "@id" : "eq" - }, - "odrl:rightOperand" : "active" - } - ] + { + "leftOperand" : "Membership", + "operator" : { + "@id" : "eq" + }, + "odrl:rightOperand" : "active" + } + ] + } } - } - ] + ] + } } } - } -] + ] +} diff --git a/tx-backend/src/test/resources/testdata/edc_notification_okay_update.json b/tx-backend/src/test/resources/testdata/edc_notification_okay_update.json index ef512623d8..496a61c306 100644 --- a/tx-backend/src/test/resources/testdata/edc_notification_okay_update.json +++ b/tx-backend/src/test/resources/testdata/edc_notification_okay_update.json @@ -1,19 +1,15 @@ { "header" : { "notificationId" : "cda2d956-fa91-4a75-bb4a-8e5ba39b268a", - "senderBPN" : "BPNL00000003AXS3", + "senderBPN" : "BPNL00000003AXB3", "senderAddress" : "https://some-url.com", "recipientBPN" : "BPNL00000003AXS3", - "classification" : "QM-Investigation", "severity" : "CRITICAL", "relatedNotificationId" : "REPLACE_ME", "status" : "ACKNOWLEDGED", "targetDate" : "2099-03-11T22:44:06.333826952Z" }, "content" : { - "information" : "Some long description", - "listOfAffectedItems" : [ - "urn:uuid:d387fa8e-603c-42bd-98c3-4d87fef8d2bb" - ] + "information" : "Some long description" } } diff --git a/tx-backend/src/test/resources/testdata/import-request.json b/tx-backend/src/test/resources/testdata/import-request.json index 62711da288..942f7ae4bf 100644 --- a/tx-backend/src/test/resources/testdata/import-request.json +++ b/tx-backend/src/test/resources/testdata/import-request.json @@ -6,17 +6,13 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003CML1", "key" : "manufacturerId" }, - { - "value" : "22782277-50", - "key" : "manufacturerPartId" - }, { "value" : "NO-313869652971440618042264", "key" : "partInstanceId" @@ -30,21 +26,27 @@ "partTypeInformation" : { "manufacturerPartId" : "22782277-50", "customerPartId" : "22782277-50", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "Door f-l", "nameAtCustomer" : "b/test Door front-left" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:d387fa8e-603c-42bd-98c3-4d87fef8d2bb", "childItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2023-02-20T14:48:54.709Z", @@ -56,27 +58,23 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:d387fa8e-603c-42bd-98c3-4d87fef8d2bb", - "customers" : [ - { - "parentItems" : [ + "customers": ["BPNL00000003CML1"], + "parentItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "catenaXId" : "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36e22", "createdOn" : "2023-05-29T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "isOnlyPotentialParent": false, + "businessPartner" : "BPNL00000003CML1" } - ], - "businessPartner" : "BPNL00000003CML1", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ] + ] } } ] @@ -87,17 +85,13 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003CML1", "key" : "manufacturerId" }, - { - "value" : "3880383-57", - "key" : "manufacturerPartId" - }, { "value" : "NO-989134870198932317923938", "key" : "partInstanceId" @@ -111,21 +105,27 @@ "partTypeInformation" : { "manufacturerPartId" : "3880383-57", "customerPartId" : "3880383-57", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door f-l", "nameAtCustomer" : "Door front-left" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a", "childItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2020-05-02T14:48:54.709Z", @@ -137,27 +137,25 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a", - "customers" : [ - { - "parentItems" : [ + "customers": [ + "BPNL00000003CML1" + ], + "parentItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "catenaXId" : "urn:uuid:d8030bbf-a874-49fb-b2e1-7610f0ccad12", "createdOn" : "2023-07-15T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CML1", + "isOnlyPotentialParent": false } - ], - "businessPartner" : "BPNL00000003CML1", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ] + ] } } ] @@ -168,17 +166,13 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003CML1", "key" : "manufacturerId" }, - { - "value" : "9069675-60", - "key" : "manufacturerPartId" - }, { "value" : "NO-004314332935115065980115", "key" : "partInstanceId" @@ -192,21 +186,27 @@ "partTypeInformation" : { "manufacturerPartId" : "9069675-60", "customerPartId" : "9069675-60", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door f-l", "nameAtCustomer" : "Door front-left" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd", "childItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2018-09-17T14:48:54.709Z", @@ -218,27 +218,25 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd", - "customers" : [ - { - "parentItems" : [ + "customers": [ + "BPNL00000003CML1" + ], + "parentItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "catenaXId" : "urn:uuid:7c7d5aec-b15d-491c-8fbd-c61c6c02c69a", "createdOn" : "2023-02-16T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CML1", + "isOnlyPotentialParent": false } - ], - "businessPartner" : "BPNL00000003CML1", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ] + ] } } ] @@ -249,17 +247,13 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003CML1", "key" : "manufacturerId" }, - { - "value" : "9879317-51", - "key" : "manufacturerPartId" - }, { "value" : "NO-477013846751358222215326", "key" : "partInstanceId" @@ -273,21 +267,27 @@ "partTypeInformation" : { "manufacturerPartId" : "9879317-51", "customerPartId" : "9879317-51", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door f-l", "nameAtCustomer" : "Door front-left" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:c47b9f8b-48d0-4ef4-8f0b-e965a225cb8d", "childItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2022-06-28T14:48:54.709Z", @@ -299,27 +299,26 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:c47b9f8b-48d0-4ef4-8f0b-e965a225cb8d", - "customers" : [ - { + "customers": [ + "BPNL00000003CSGV" + ], + "parentItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "catenaXId" : "urn:uuid:4d33bfa6-0f1f-43a5-ad63-c3fe07a2d076", "createdOn" : "2023-03-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CSGV", + "isOnlyPotentialParent": false } - ], - "businessPartner" : "BPNL00000003CSGV", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ] + ] } } ] @@ -330,17 +329,13 @@ }, "submodels" : [ { - "aspectType" : "urn:samm:io.catenax.batch:2.0.0#Batch", + "aspectType" : "urn:samm:io.catenax.batch:3.0.0#Batch", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003CML1", "key" : "manufacturerId" }, - { - "value" : "5894914-94", - "key" : "manufacturerPartId" - }, { "value" : "NO-341449848714937445621543", "key" : "batchId" @@ -353,33 +348,39 @@ "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb01", "partTypeInformation" : { "manufacturerPartId" : "5894914-94", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door Key" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb01", - "customers" : [ - { + "customers": [ + "BPNL00000003CML1" + ], + + "parentItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02", "createdOn" : "2023-08-08T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CML1", + "isOnlyPotentialParent": false } - ], - "businessPartner" : "BPNL00000003CML1", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ] + ] } } ] @@ -390,17 +391,13 @@ }, "submodels" : [ { - "aspectType" : "urn:samm:io.catenax.batch:2.0.0#Batch", + "aspectType" : "urn:samm:io.catenax.batch:3.0.0#Batch", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003CML1", "key" : "manufacturerId" }, - { - "value" : "6245773-32", - "key" : "manufacturerPartId" - }, { "value" : "NO-341449848714937445621543", "key" : "batchId" @@ -413,20 +410,26 @@ "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb02", "partTypeInformation" : { "manufacturerPartId" : "6245773-32", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door Key" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb02", "childItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2019-08-15T14:48:54.709Z", @@ -445,17 +448,13 @@ }, "submodels" : [ { - "aspectType" : "urn:samm:io.catenax.batch:2.0.0#Batch", + "aspectType" : "urn:samm:io.catenax.batch:3.0.0#Batch", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003CML1", "key" : "manufacturerId" }, - { - "value" : "9770171-23", - "key" : "manufacturerPartId" - }, { "value" : "NO-341449848714937445621543", "key" : "batchId" @@ -468,7 +467,13 @@ "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb03", "partTypeInformation" : { "manufacturerPartId" : "9770171-23", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door Key" } } @@ -481,22 +486,26 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { - "validityPeriod" : { - "validFrom" : "2019-04-04T03:19:03.000Z", - "validTo" : "2024-12-29T10:25:12.000Z" - }, "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4eb01", "partTypeInformation" : { "manufacturerPartId" : "7805659-25", "classification" : "product", "nameAtManufacturer" : "b/test Vehicle Model B" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4eb01", "childItems" : [ @@ -506,8 +515,8 @@ "validTo" : "2024-07-01T16:10:00.000+01:00" }, "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "createdOn" : "2022-09-03T14:48:54.709Z", "lastModifiedOn" : "2022-02-03T14:48:54.709Z", @@ -518,7 +527,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4eb01", "sites" : [ @@ -539,7 +548,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.just_in_sequence_part:1.0.0#JustInSequencePart", + "aspectType" : "urn:samm:io.catenax.just_in_sequence_part:3.0.0#JustInSequencePart", "payload" : { "localIdentifiers" : [ { @@ -559,7 +568,13 @@ "partTypeInformation" : { "manufacturerPartId" : "3578115-43", "customerPartId" : "PRT-12345", - "classification" : "product", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "Mirror left", "nameAtCustomer" : "b/test side element A" } @@ -573,22 +588,27 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { - "validityPeriod" : { - "validFrom" : "2017-01-03T07:45:04.000Z", - "validTo" : "2029-11-15T11:57:45.000Z" - }, + "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4c79e", "partTypeInformation" : { "manufacturerPartId" : "2586427-48", "classification" : "product", "nameAtManufacturer" : "b/test Vehicle Model A" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4c79e", "childItems" : [ @@ -599,8 +619,8 @@ }, "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef127c", "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:litre" + "value" : 1, + "unit" : "unit:piece" }, "businessPartner" : "BPNL00000003AYRE", "createdOn" : "2022-12-03T14:48:54.709Z", @@ -610,7 +630,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4c79e", "sites" : [ @@ -631,22 +651,27 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { - "validityPeriod" : { - "validFrom" : "2016-04-28T20:00:55.000Z", - "validTo" : "2027-04-27T00:59:41.000Z" - }, + "catenaXId" : "urn:uuid:c7a2b803-f8fe-4b79-b6fc-967ce847c9a1", "partTypeInformation" : { "manufacturerPartId" : "8840374-09", "classification" : "product", "nameAtManufacturer" : "b/test ZB ZELLE" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:c7a2b803-f8fe-4b79-b6fc-967ce847c9a1", "sites" : [ @@ -667,22 +692,27 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { - "validityPeriod" : { - "validFrom" : "2015-05-18T23:10:44.000Z", - "validTo" : "2025-10-23T14:46:01.000Z" - }, + "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef128c", "partTypeInformation" : { "manufacturerPartId" : "6288246-67", "classification" : "product", "nameAtManufacturer" : "b/test OEM A High Voltage Battery" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef128c", "childItems" : [ @@ -693,8 +723,8 @@ }, "catenaXId" : "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca98", "quantity" : { - "quantityNumber" : 6, - "measurementUnit" : "unit:litre" + "value" : 1, + "unit" : "unit:piece" }, "businessPartner" : "BPNL00000003CML1", "createdOn" : "2022-02-08T14:48:54.709Z", @@ -704,7 +734,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef128c", "sites" : [ @@ -725,22 +755,27 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { - "validityPeriod" : { - "validFrom" : "2017-07-03T05:23:01.000Z", - "validTo" : "2032-09-25T10:26:27.000Z" - }, + "catenaXId" : "urn:uuid:2c57b0e9-a653-411d-bdcd-64787e9fd3a7", "partTypeInformation" : { "manufacturerPartId" : "32494586-73", "classification" : "product", "nameAtManufacturer" : "b/test Tier A Gearbox" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:2c57b0e9-a653-411d-bdcd-64787e9fd3a7", "childItems" : [ @@ -751,8 +786,8 @@ }, "catenaXId" : "urn:uuid:bee5614f-9e46-4c98-9209-61a6f2b2a7fc", "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:litre" + "value" : 1, + "unit" : "unit:piece" }, "businessPartner" : "BPNL00000003CML1", "createdOn" : "2022-02-09T14:48:54.709Z", @@ -765,8 +800,8 @@ }, "catenaXId" : "urn:uuid:4518c080-14fb-4252-b8de-4362d615868d", "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:litre" + "value" : 1, + "unit" : "unit:litre" }, "businessPartner" : "BPNL00000003CML1", "createdOn" : "2022-02-10T14:48:54.709Z", @@ -776,7 +811,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:2c57b0e9-a653-411d-bdcd-64787e9fd3a7", "sites" : [ @@ -797,22 +832,26 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { - "validityPeriod" : { - "validFrom" : "2016-04-24T08:26:56.000Z", - "validTo" : "2031-12-17T23:55:04.000Z" - }, "catenaXId" : "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b", "partTypeInformation" : { "manufacturerPartId" : "8583898-48", "classification" : "product", "nameAtManufacturer" : "b/test Tier B ECU1" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b", "childItems" : [ @@ -823,8 +862,8 @@ }, "catenaXId" : "urn:uuid:3cdd2826-5df0-4c7b-b540-9eeccecb2301", "quantity" : { - "quantityNumber" : 0.3301, - "measurementUnit" : "unit:kilogram" + "value" : 1, + "unit" : "unit:piece" }, "businessPartner" : "BPNL00000003CML1", "createdOn" : "2022-02-13T14:48:54.709Z", @@ -834,7 +873,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b", "sites" : [ @@ -855,22 +894,27 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { - "validityPeriod" : { - "validFrom" : "2019-11-02T11:14:15.000Z", - "validTo" : "2024-07-17T02:07:07.000Z" - }, + "catenaXId" : "urn:uuid:e8c48a8e-d2d7-43d9-a867-65c70c85f5b8", "partTypeInformation" : { "manufacturerPartId" : "1987361-42", "classification" : "product", "nameAtManufacturer" : "b/test Tire Model A" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:e8c48a8e-d2d7-43d9-a867-65c70c85f5b8", "sites" : [ @@ -891,17 +935,13 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003CML1", "key" : "manufacturerId" }, - { - "value" : "8840374-09", - "key" : "manufacturerPartId" - }, { "value" : "NO-917923082133064161014067", "key" : "partInstanceId" @@ -915,14 +955,20 @@ "partTypeInformation" : { "manufacturerPartId" : "8840374-09", "customerPartId" : "8840374-09", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "b/test ZB ZELLE", "nameAtCustomer" : "ZB ZELLE" } } }, { - "aspectType" : "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", + "aspectType" : "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", "payload" : { "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382320", "subcomponents" : [ @@ -942,17 +988,13 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003CML1", "key" : "manufacturerId" }, - { - "value" : "1142469-27", - "key" : "manufacturerPartId" - }, { "value" : "NO-655858074471261486971940", "key" : "partInstanceId" @@ -966,14 +1008,20 @@ "partTypeInformation" : { "manufacturerPartId" : "1142469-27", "customerPartId" : "1142469-27", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door Key", "nameAtCustomer" : "Door Key" } } }, { - "aspectType" : "urn:bamm:io.catenax.just_in_sequence_part:1.0.0#JustInSequencePart", + "aspectType" : "urn:samm:io.catenax.just_in_sequence_part:3.0.0#JustInSequencePart", "payload" : { "localIdentifiers" : [ { @@ -989,7 +1037,13 @@ "partTypeInformation" : { "manufacturerPartId" : "1417058-05", "customerPartId" : "PRT-12345", - "classification" : "product", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door Key", "nameAtCustomer" : "Door Key" } @@ -1003,17 +1057,13 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003CML1", "key" : "manufacturerId" }, - { - "value" : "8840837-48", - "key" : "manufacturerPartId" - }, { "value" : "NO-570196089623842018037372", "key" : "partInstanceId" @@ -1027,22 +1077,28 @@ "partTypeInformation" : { "manufacturerPartId" : "8840838-04", "customerPartId" : "8840838-04", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "HV MODUL", "nameAtCustomer" : "HV MODUL" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4080f", "childItems" : [ { "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fcb5f", "quantity" : { - "quantityNumber" : 2.5, - "measurementUnit" : "unit:litre" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "businessPartner" : "BPNL00000003CML1", @@ -1053,15 +1109,23 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4080f", - "customers" : [ + "customers": [ + "BPNL00000003CML1" + ], + "parentItems" : [ { - "businessPartner" : "BPNL00000003CML1", - "parentItems" : [], - "createdOn" : "2022-02-03T14:48:54.709Z", - "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36e22", + "createdOn" : "2023-05-29T14:48:54.709Z", + "isOnlyPotentialParent": false, + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CML1" } ] } diff --git a/tx-backend/src/test/resources/testdata/importfiles/invalidImportFile.json b/tx-backend/src/test/resources/testdata/importfiles/invalidImportFile.json index cde1fa3962..828193e827 100644 --- a/tx-backend/src/test/resources/testdata/importfiles/invalidImportFile.json +++ b/tx-backend/src/test/resources/testdata/importfiles/invalidImportFile.json @@ -6,45 +6,47 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "invalidlocalIdentifiers" : [ { "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, - { - "value" : "22782277-50", - "key" : "manufacturerPartId" - }, { "value" : "NO-313869652971440618042264", "key" : "partInstanceId" } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd", "partTypeInformation" : { "manufacturerPartId" : "22782277-50", "customerPartId" : "22782277-50", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "Door f-l", "nameAtCustomer" : "b/test Door front-left" } } }, { - "invalidaspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "invalidaspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd", "childItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2023-02-20T14:48:54.709Z", @@ -56,27 +58,25 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd", - "customers" : [ - { + "customers": [ + "BPNL00000003CML1" + ], "parentItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "catenaXId" : "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36e22", "createdOn" : "2023-05-29T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CML1", + "isOnlyPotentialParent": false } - ], - "businessPartner" : "BPNL00000003CML1", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ] + ] } } ] @@ -87,45 +87,47 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, - { - "value" : "3880383-57", - "key" : "manufacturerPartId" - }, { "value" : "NO-989134870198932317923938", "key" : "partInstanceId" } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a", "partTypeInformation" : { "manufacturerPartId" : "3880383-57", "customerPartId" : "3880383-57", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door f-l", "nameAtCustomer" : "Door front-left" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaX1Id" : "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a", "invalidchildItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2020-05-02T14:48:54.709Z", @@ -137,27 +139,27 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a", - "customers" : [ - { - "parentItems" : [ + "customers": [ + "BPNL00000003CML1" + ], + "parentItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "catenaXId" : "urn:uuid:d8030bbf-a874-49fb-b2e1-7610f0ccad12", "createdOn" : "2023-07-15T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CML1", + "isOnlyPotentialParent": false } - ], - "businessPartner" : "BPNL00000003CML1", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ] + ] + + } } ] @@ -168,45 +170,47 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, - { - "value" : "9069675-60", - "key" : "manufacturerPartId" - }, { "value" : "NO-004314332935115065980115", "key" : "partInstanceId" } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd", "partTypeInformation" : { "manufacturerPartId" : "9069675-60", "customerPartId" : "9069675-60", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door f-l", "nameAtCustomer" : "Door front-left" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd", "childItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2018-09-17T14:48:54.709Z", @@ -218,27 +222,26 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd", - "customers" : [ - { + "customers": [ + "BPNL00000003CML1" + ], "parentItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "catenaXId" : "urn:uuid:7c7d5aec-b15d-491c-8fbd-c61c6c02c69a", "createdOn" : "2023-02-16T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CML1", + "isOnlyPotentialParent": false } - ], - "businessPartner" : "BPNL00000003CML1", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ] + ] + } } ] @@ -249,45 +252,47 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, - { - "value" : "9879317-51", - "key" : "manufacturerPartId" - }, { "value" : "NO-477013846751358222215326", "key" : "partInstanceId" } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:c47b9f8b-48d0-4ef4-8f0b-e965a225cb8d", "partTypeInformation" : { "manufacturerPartId" : "9879317-51", "customerPartId" : "9879317-51", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door f-l", "nameAtCustomer" : "Door front-left" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:c47b9f8b-48d0-4ef4-8f0b-e965a225cb8d", "childItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2022-06-28T14:48:54.709Z", @@ -299,27 +304,26 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:c47b9f8b-48d0-4ef4-8f0b-e965a225cb8d", - "customers" : [ - { + "customers": [ + "BPNL00000003CSGV" + ], + "parentItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "catenaXId" : "urn:uuid:4d33bfa6-0f1f-43a5-ad63-c3fe07a2d076", "createdOn" : "2023-03-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CSGV", + "isOnlyPotentialParent": false } - ], - "businessPartner" : "BPNL00000003CSGV", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ] + ] } } ] @@ -330,7 +334,7 @@ }, "submodels" : [ { - "aspectType" : "urn:samm:io.catenax.batch:2.0.0#Batch", + "aspectType" : "urn:samm:io.catenax.batch:3.0.0#Batch", "payload" : { "localIdentifiers" : [ { @@ -343,7 +347,7 @@ } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb01", @@ -355,27 +359,25 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb01", - "customers" : [ - { + "customers": [ + "BPNL0987654321CD" + ], "parentItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02", "createdOn" : "2023-08-08T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CML1", + "isOnlyPotentialParent": false } - ], - "businessPartner" : "BPNL00000003CML1", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ] + ] } } ] @@ -386,7 +388,7 @@ }, "submodels" : [ { - "aspectType" : "urn:samm:io.catenax.batch:2.0.0#Batch", + "aspectType" : "urn:samm:io.catenax.batch:3.0.0#Batch", "payload" : { "localIdentifiers" : [ { @@ -399,7 +401,7 @@ } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb02", @@ -411,14 +413,14 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb02", "childItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2019-08-15T14:48:54.709Z", @@ -437,7 +439,7 @@ }, "submodels" : [ { - "aspectType" : "urn:samm:io.catenax.batch:2.0.0#Batch", + "aspectType" : "urn:samm:io.catenax.batch:3.0.0#Batch", "payload" : { "localIdentifiers" : [ { @@ -450,7 +452,7 @@ } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb03", @@ -469,7 +471,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2019-04-04T03:19:03.000Z", @@ -480,11 +482,19 @@ "manufacturerPartId" : "7805659-25", "classification" : "product", "nameAtManufacturer" : "b/test Vehicle Model B" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4eb01", "childItems" : [ @@ -494,8 +504,8 @@ "validTo" : "2024-07-01T16:10:00.000+01:00" }, "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "createdOn" : "2022-09-03T14:48:54.709Z", "lastModifiedOn" : "2022-02-03T14:48:54.709Z", @@ -506,7 +516,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4eb01", "sites" : [ @@ -527,7 +537,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.just_in_sequence_part:1.0.0#JustInSequencePart", + "aspectType" : "urn:samm:io.catenax.just_in_sequence_part:3.0.0#JustInSequencePart", "payload" : { "localIdentifiers" : [ { @@ -540,7 +550,7 @@ } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "HUN" }, "catenaXId" : "urn:uuid:580d3adf-1981-44a0-a214-13d6ceed6841", @@ -561,7 +571,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2017-01-03T07:45:04.000Z", @@ -572,11 +582,19 @@ "manufacturerPartId" : "2586427-48", "classification" : "product", "nameAtManufacturer" : "b/test Vehicle Model A" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4c79e", "childItems" : [ @@ -587,8 +605,8 @@ }, "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef127c", "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:litre" + "value" : 1, + "unit" : "unit:piece" }, "businessPartner" : "BPNL00000003AYRE", "createdOn" : "2022-12-03T14:48:54.709Z", @@ -598,7 +616,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4c79e", "sites" : [ @@ -619,7 +637,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2016-04-28T20:00:55.000Z", @@ -630,11 +648,19 @@ "manufacturerPartId" : "8840374-09", "classification" : "product", "nameAtManufacturer" : "b/test ZB ZELLE" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:c7a2b803-f8fe-4b79-b6fc-967ce847c9a1", "sites" : [ @@ -655,7 +681,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2015-05-18T23:10:44.000Z", @@ -666,11 +692,19 @@ "manufacturerPartId" : "6288246-67", "classification" : "product", "nameAtManufacturer" : "b/test OEM A High Voltage Battery" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef128c", "childItems" : [ @@ -681,8 +715,8 @@ }, "catenaXId" : "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca98", "quantity" : { - "quantityNumber" : 6, - "measurementUnit" : "unit:litre" + "value" : 1, + "unit" : "unit:piece" }, "businessPartner" : "BPNL00000003CML1", "createdOn" : "2022-02-08T14:48:54.709Z", @@ -692,7 +726,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef128c", "sites" : [ @@ -713,7 +747,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2017-07-03T05:23:01.000Z", @@ -724,11 +758,19 @@ "manufacturerPartId" : "32494586-73", "classification" : "product", "nameAtManufacturer" : "b/test Tier A Gearbox" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:2c57b0e9-a653-411d-bdcd-64787e9fd3a7", "childItems" : [ @@ -739,8 +781,8 @@ }, "catenaXId" : "urn:uuid:bee5614f-9e46-4c98-9209-61a6f2b2a7fc", "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:litre" + "value" : 1, + "unit" : "unit:piece" }, "businessPartner" : "BPNL00000003CML1", "createdOn" : "2022-02-09T14:48:54.709Z", @@ -753,8 +795,8 @@ }, "catenaXId" : "urn:uuid:4518c080-14fb-4252-b8de-4362d615868d", "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:litre" + "value" : 1, + "unit" : "unit:litre" }, "businessPartner" : "BPNL00000003CML1", "createdOn" : "2022-02-10T14:48:54.709Z", @@ -764,7 +806,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:2c57b0e9-a653-411d-bdcd-64787e9fd3a7", "sites" : [ @@ -785,7 +827,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2016-04-24T08:26:56.000Z", @@ -796,11 +838,19 @@ "manufacturerPartId" : "8583898-48", "classification" : "product", "nameAtManufacturer" : "b/test Tier B ECU1" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b", "childItems" : [ @@ -811,8 +861,8 @@ }, "catenaXId" : "urn:uuid:3cdd2826-5df0-4c7b-b540-9eeccecb2301", "quantity" : { - "quantityNumber" : 0.3301, - "measurementUnit" : "unit:kilogram" + "value" : 1, + "unit" : "unit:piece" }, "businessPartner" : "BPNL00000003CML1", "createdOn" : "2022-02-13T14:48:54.709Z", @@ -822,7 +872,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b", "sites" : [ @@ -843,7 +893,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2019-11-02T11:14:15.000Z", @@ -854,11 +904,19 @@ "manufacturerPartId" : "1987361-42", "classification" : "product", "nameAtManufacturer" : "b/test Tire Model A" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:e8c48a8e-d2d7-43d9-a867-65c70c85f5b8", "sites" : [ @@ -879,38 +937,40 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, - { - "value" : "8840374-09", - "key" : "manufacturerPartId" - }, { "value" : "NO-917923082133064161014067", "key" : "partInstanceId" } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:b0acf3e1-3fbe-46c0-aa0b-0724caae7772", "partTypeInformation" : { "manufacturerPartId" : "8840374-09", "customerPartId" : "8840374-09", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "b/test ZB ZELLE", "nameAtCustomer" : "ZB ZELLE" } } }, { - "aspectType" : "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", + "aspectType" : "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", "payload" : { "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382320", "subcomponents" : [ @@ -930,38 +990,40 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, - { - "value" : "1142469-27", - "key" : "manufacturerPartId" - }, { "value" : "NO-655858074471261486971940", "key" : "partInstanceId" } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:da978a30-4dde-4d76-808a-b7946763ff0d", "partTypeInformation" : { "manufacturerPartId" : "1142469-27", "customerPartId" : "1142469-27", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door Key", "nameAtCustomer" : "Door Key" } } }, { - "aspectType" : "urn:bamm:io.catenax.just_in_sequence_part:1.0.0#JustInSequencePart", + "aspectType" : "urn:samm:io.catenax.just_in_sequence_part:3.0.0#JustInSequencePart", "payload" : { "localIdentifiers" : [ { @@ -970,7 +1032,7 @@ } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "HUN" }, "catenaXId" : "urn:uuid:da978a30-4dde-4d76-808a-b7946763ff0d", @@ -991,46 +1053,48 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, - { - "value" : "8840837-48", - "key" : "manufacturerPartId" - }, { "value" : "NO-570196089623842018037372", "key" : "partInstanceId" } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4080f", "partTypeInformation" : { "manufacturerPartId" : "8840838-04", "customerPartId" : "8840838-04", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "HV MODUL", "nameAtCustomer" : "HV MODUL" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4080f", "childItems" : [ { "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fcb5f", "quantity" : { - "quantityNumber" : 2.5, - "measurementUnit" : "unit:litre" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "businessPartner" : "BPNL00000003CNKC", @@ -1041,15 +1105,23 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4080f", - "customers" : [ - { - "businessPartner" : "BPNL00000003CNKC", - "parentItems" : [], - "createdOn" : "2022-02-03T14:48:54.709Z", - "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + "customers": [ + "BPNL0987654321CD" + ], + "parentItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36e22", + "createdOn" : "2023-05-29T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CNKC", + "isOnlyPotentialParent": false } ] } diff --git a/tx-backend/src/test/resources/testdata/importfiles/invalidImportFileBadStructure.json b/tx-backend/src/test/resources/testdata/importfiles/invalidImportFileBadStructure.json index 48a907f198..206b321166 100644 --- a/tx-backend/src/test/resources/testdata/importfiles/invalidImportFileBadStructure.json +++ b/tx-backend/src/test/resources/testdata/importfiles/invalidImportFileBadStructure.json @@ -6,17 +6,13 @@ }, "afd" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "invalidlocalIdentifiers" : [ { "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, - { - "value" : "22782277-50", - "key" : "manufacturerPartId" - }, { "value" : "NO-313869652971440618042264", "key" : "partInstanceId" @@ -30,21 +26,27 @@ "partTypeInformation" : { "manufacturerPartId" : "22782277-50", "customerPartId" : "22782277-50", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "Door f-l", "nameAtCustomer" : "b/test Door front-left" } } }, { - "invalidaspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "invalidaspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd", "childItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2023-02-20T14:48:54.709Z", @@ -56,25 +58,23 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd", "customers" : [ + "BPNL00000003CML1" + ], + "parentItems" : [ { - "parentItems" : [ - { - "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" - }, - "catenaXId" : "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36e22", - "createdOn" : "2023-05-29T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ], + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36e22", + "createdOn" : "2023-05-29T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", "businessPartner" : "BPNL00000003CML1", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "isOnlyPotentialParent" : false } ] } @@ -87,17 +87,13 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, - { - "value" : "3880383-57", - "key" : "manufacturerPartId" - }, { "value" : "NO-989134870198932317923938", "key" : "partInstanceId" @@ -111,21 +107,27 @@ "partTypeInformation" : { "manufacturerPartId" : "3880383-57", "customerPartId" : "3880383-57", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door f-l", "nameAtCustomer" : "Door front-left" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaX1Id" : "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a", "invalidchildItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2020-05-02T14:48:54.709Z", @@ -137,25 +139,23 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a", "customers" : [ + "BPNL00000003CML1" + ], + "parentItems" : [ { - "parentItems" : [ - { - "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" - }, - "catenaXId" : "urn:uuid:d8030bbf-a874-49fb-b2e1-7610f0ccad12", - "createdOn" : "2023-07-15T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ], + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:d8030bbf-a874-49fb-b2e1-7610f0ccad12", + "createdOn" : "2023-07-15T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", "businessPartner" : "BPNL00000003CML1", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "isOnlyPotentialParent" : false } ] } @@ -168,17 +168,13 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, - { - "value" : "9069675-60", - "key" : "manufacturerPartId" - }, { "value" : "NO-004314332935115065980115", "key" : "partInstanceId" @@ -192,21 +188,27 @@ "partTypeInformation" : { "manufacturerPartId" : "9069675-60", "customerPartId" : "9069675-60", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door f-l", "nameAtCustomer" : "Door front-left" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd", "childItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2018-09-17T14:48:54.709Z", @@ -218,25 +220,23 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd", "customers" : [ + "BPNL00000003CML1" + ], + "parentItems" : [ { - "parentItems" : [ - { - "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" - }, - "catenaXId" : "urn:uuid:7c7d5aec-b15d-491c-8fbd-c61c6c02c69a", - "createdOn" : "2023-02-16T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ], + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:7c7d5aec-b15d-491c-8fbd-c61c6c02c69a", + "createdOn" : "2023-02-16T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", "businessPartner" : "BPNL00000003CML1", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "isOnlyPotentialParent" : false } ] } @@ -249,17 +249,13 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, - { - "value" : "9879317-51", - "key" : "manufacturerPartId" - }, { "value" : "NO-477013846751358222215326", "key" : "partInstanceId" @@ -273,21 +269,27 @@ "partTypeInformation" : { "manufacturerPartId" : "9879317-51", "customerPartId" : "9879317-51", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door f-l", "nameAtCustomer" : "Door front-left" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:c47b9f8b-48d0-4ef4-8f0b-e965a225cb8d", "childItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2022-06-28T14:48:54.709Z", @@ -299,25 +301,23 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:c47b9f8b-48d0-4ef4-8f0b-e965a225cb8d", "customers" : [ + "BPNL00000003CSGV" + ], + "parentItems" : [ { - "parentItems" : [ - { - "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" - }, - "catenaXId" : "urn:uuid:4d33bfa6-0f1f-43a5-ad63-c3fe07a2d076", - "createdOn" : "2023-03-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ], + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:4d33bfa6-0f1f-43a5-ad63-c3fe07a2d076", + "createdOn" : "2023-03-03T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", "businessPartner" : "BPNL00000003CSGV", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "isOnlyPotentialParent" : false } ] } @@ -330,7 +330,7 @@ }, "submodels" : [ { - "aspectType" : "urn:samm:io.catenax.batch:2.0.0#Batch", + "aspectType" : "urn:samm:io.catenax.batch:3.0.0#Batch", "payload" : { "localIdentifiers" : [ { @@ -359,25 +359,23 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb01", "customers" : [ + "BPNL00000003CML1" + ], + "parentItems" : [ { - "parentItems" : [ - { - "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" - }, - "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02", - "createdOn" : "2023-08-08T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ], + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02", + "createdOn" : "2023-08-08T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", "businessPartner" : "BPNL00000003CML1", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "isOnlyPotentialParent" : false } ] } @@ -390,7 +388,7 @@ }, "submodels" : [ { - "aspectType" : "urn:samm:io.catenax.batch:2.0.0#Batch", + "aspectType" : "urn:samm:io.catenax.batch:3.0.0#Batch", "payload" : { "localIdentifiers" : [ { @@ -419,14 +417,14 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb02", "childItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2019-08-15T14:48:54.709Z", @@ -445,7 +443,7 @@ }, "submodels" : [ { - "aspectType" : "urn:samm:io.catenax.batch:2.0.0#Batch", + "aspectType" : "urn:samm:io.catenax.batch:3.0.0#Batch", "payload" : { "localIdentifiers" : [ { @@ -481,7 +479,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2019-04-04T03:19:03.000Z", @@ -492,11 +490,19 @@ "manufacturerPartId" : "7805659-25", "classification" : "product", "nameAtManufacturer" : "b/test Vehicle Model B" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4eb01", "childItems" : [ @@ -506,8 +512,8 @@ "validTo" : "2024-07-01T16:10:00.000+01:00" }, "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "createdOn" : "2022-09-03T14:48:54.709Z", "lastModifiedOn" : "2022-02-03T14:48:54.709Z", @@ -518,7 +524,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4eb01", "sites" : [ @@ -539,7 +545,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.just_in_sequence_part:1.0.0#JustInSequencePart", + "aspectType" : "urn:samm:io.catenax.just_in_sequence_part:3.0.0#JustInSequencePart", "payload" : { "localIdentifiers" : [ { @@ -573,7 +579,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2017-01-03T07:45:04.000Z", @@ -584,11 +590,19 @@ "manufacturerPartId" : "2586427-48", "classification" : "product", "nameAtManufacturer" : "b/test Vehicle Model A" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4c79e", "childItems" : [ @@ -599,8 +613,8 @@ }, "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef127c", "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:litre" + "value" : 1, + "unit" : "unit:piece" }, "businessPartner" : "BPNL00000003AYRE", "createdOn" : "2022-12-03T14:48:54.709Z", @@ -610,7 +624,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4c79e", "sites" : [ @@ -631,7 +645,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2016-04-28T20:00:55.000Z", @@ -642,11 +656,19 @@ "manufacturerPartId" : "8840374-09", "classification" : "product", "nameAtManufacturer" : "b/test ZB ZELLE" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:c7a2b803-f8fe-4b79-b6fc-967ce847c9a1", "sites" : [ @@ -667,7 +689,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2015-05-18T23:10:44.000Z", @@ -678,11 +700,19 @@ "manufacturerPartId" : "6288246-67", "classification" : "product", "nameAtManufacturer" : "b/test OEM A High Voltage Battery" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef128c", "childItems" : [ @@ -693,8 +723,8 @@ }, "catenaXId" : "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca98", "quantity" : { - "quantityNumber" : 6, - "measurementUnit" : "unit:litre" + "value" : 1, + "unit" : "unit:piece" }, "businessPartner" : "BPNL00000003CML1", "createdOn" : "2022-02-08T14:48:54.709Z", @@ -704,7 +734,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef128c", "sites" : [ @@ -725,7 +755,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2017-07-03T05:23:01.000Z", @@ -736,11 +766,19 @@ "manufacturerPartId" : "32494586-73", "classification" : "product", "nameAtManufacturer" : "b/test Tier A Gearbox" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:2c57b0e9-a653-411d-bdcd-64787e9fd3a7", "childItems" : [ @@ -751,8 +789,8 @@ }, "catenaXId" : "urn:uuid:bee5614f-9e46-4c98-9209-61a6f2b2a7fc", "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:litre" + "value" : 1, + "unit" : "unit:piece" }, "businessPartner" : "BPNL00000003CML1", "createdOn" : "2022-02-09T14:48:54.709Z", @@ -776,7 +814,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:2c57b0e9-a653-411d-bdcd-64787e9fd3a7", "sites" : [ @@ -797,7 +835,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2016-04-24T08:26:56.000Z", @@ -808,11 +846,19 @@ "manufacturerPartId" : "8583898-48", "classification" : "product", "nameAtManufacturer" : "b/test Tier B ECU1" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b", "childItems" : [ @@ -823,8 +869,8 @@ }, "catenaXId" : "urn:uuid:3cdd2826-5df0-4c7b-b540-9eeccecb2301", "quantity" : { - "quantityNumber" : 0.3301, - "measurementUnit" : "unit:kilogram" + "value" : 1, + "unit" : "unit:piece" }, "businessPartner" : "BPNL00000003CML1", "createdOn" : "2022-02-13T14:48:54.709Z", @@ -834,7 +880,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b", "sites" : [ @@ -855,7 +901,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2019-11-02T11:14:15.000Z", @@ -866,11 +912,19 @@ "manufacturerPartId" : "1987361-42", "classification" : "product", "nameAtManufacturer" : "b/test Tire Model A" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:e8c48a8e-d2d7-43d9-a867-65c70c85f5b8", "sites" : [ @@ -891,17 +945,13 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, - { - "value" : "8840374-09", - "key" : "manufacturerPartId" - }, { "value" : "NO-917923082133064161014067", "key" : "partInstanceId" @@ -915,14 +965,20 @@ "partTypeInformation" : { "manufacturerPartId" : "8840374-09", "customerPartId" : "8840374-09", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "b/test ZB ZELLE", "nameAtCustomer" : "ZB ZELLE" } } }, { - "aspectType" : "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", + "aspectType" : "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", "payload" : { "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382320", "subcomponents" : [ @@ -942,17 +998,13 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, - { - "value" : "1142469-27", - "key" : "manufacturerPartId" - }, { "value" : "NO-655858074471261486971940", "key" : "partInstanceId" @@ -966,14 +1018,20 @@ "partTypeInformation" : { "manufacturerPartId" : "1142469-27", "customerPartId" : "1142469-27", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door Key", "nameAtCustomer" : "Door Key" } } }, { - "aspectType" : "urn:bamm:io.catenax.just_in_sequence_part:1.0.0#JustInSequencePart", + "aspectType" : "urn:samm:io.catenax.just_in_sequence_part:3.0.0#JustInSequencePart", "payload" : { "localIdentifiers" : [ { @@ -1003,17 +1061,13 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, - { - "value" : "8840837-48", - "key" : "manufacturerPartId" - }, { "value" : "NO-570196089623842018037372", "key" : "partInstanceId" @@ -1027,22 +1081,28 @@ "partTypeInformation" : { "manufacturerPartId" : "8840838-04", "customerPartId" : "8840838-04", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "HV MODUL", "nameAtCustomer" : "HV MODUL" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4080f", "childItems" : [ { "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fcb5f", "quantity" : { - "quantityNumber" : 2.5, - "measurementUnit" : "unit:litre" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "businessPartner" : "BPNL00000003CNKC", @@ -1053,27 +1113,35 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4080f", "customers" : [ + "BPNL00000003CNKC" + ], + "parentItems" : [ { "businessPartner" : "BPNL00000003CNKC", - "parentItems" : [], "createdOn" : "2022-02-03T14:48:54.709Z", - "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + "lastModifiedOn" : "2022-02-03T14:48:54.709Z", + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4080f", + "isOnlyPotentialParent" : false } ] } + }, + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fcb5f" + }, + "submodels" : [ + ] } ] - }, - { - "assetMetaInfo" : { - "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fcb5f" - }, - "submodels" : [ - ] } ] } diff --git a/tx-backend/src/test/resources/testdata/importfiles/validImportFile-onlyAsBuiltAsset.json b/tx-backend/src/test/resources/testdata/importfiles/validImportFile-onlyAsBuiltAsset.json index 218c056bda..4fc0f9645f 100644 --- a/tx-backend/src/test/resources/testdata/importfiles/validImportFile-onlyAsBuiltAsset.json +++ b/tx-backend/src/test/resources/testdata/importfiles/validImportFile-onlyAsBuiltAsset.json @@ -6,17 +6,13 @@ }, "submodels": [ { - "aspectType": "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType": "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload": { "localIdentifiers": [ { "value": "BPNL00000003AXS3", "key": "manufacturerId" }, - { - "value": "3500011-11", - "key": "manufacturerPartId" - }, { "value": "OMAOYGBDTSRCMYSCX", "key": "partInstanceId" @@ -33,20 +29,26 @@ "catenaXId": "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36111", "partTypeInformation": { "manufacturerPartId": "3500011-11", - "classification": "product", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer": "a/dev Test Produkt AB" } } }, { - "aspectType": "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType": "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload": { "catenaXId": "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36111", "childItems": [ { "quantity": { - "quantityNumber": 1, - "measurementUnit": "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives": true, "createdOn": "2022-02-03T14:48:54.709Z", @@ -58,27 +60,26 @@ } }, { - "aspectType": "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType": "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload": { "catenaXId": "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36111", "customers": [ - { + "BPNL00000003CNKC" + ], + "parentItems": [ { "quantity": { - "quantityNumber": 1, - "measurementUnit": "unit:piece" + "value": 1, + "unit": "unit:piece" }, "catenaXId": "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd", "createdOn": "2023-04-13T14:48:54.709Z", - "lastModifiedOn": "2023-02-03T14:48:54.709Z" + "lastModifiedOn": "2023-02-03T14:48:54.709Z", + "businessPartner": "BPNL00000003CNKC", + "isOnlyPotentialParent": false } - ], - "businessPartner": "BPNL00000003CNKC", - "createdOn": "2023-02-03T14:48:54.709Z", - "lastModifiedOn": "2023-02-03T14:48:54.709Z" - } - ] + ] } } diff --git a/tx-backend/src/test/resources/testdata/importfiles/validImportFile-onlyAsPlannedAsset.json b/tx-backend/src/test/resources/testdata/importfiles/validImportFile-onlyAsPlannedAsset.json index 32b267c507..c74d988541 100644 --- a/tx-backend/src/test/resources/testdata/importfiles/validImportFile-onlyAsPlannedAsset.json +++ b/tx-backend/src/test/resources/testdata/importfiles/validImportFile-onlyAsPlannedAsset.json @@ -6,7 +6,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2019-04-04T03:19:03.000Z", @@ -17,11 +17,19 @@ "manufacturerPartId" : "7805659-25", "classification" : "product", "nameAtManufacturer" : "b/test Vehicle Model B" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4eb02", "childItems" : [ @@ -31,8 +39,8 @@ "validTo" : "2024-07-01T16:10:00.000+01:00" }, "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "createdOn" : "2022-09-03T14:48:54.709Z", "lastModifiedOn" : "2022-02-03T14:48:54.709Z", @@ -43,7 +51,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4eb02", "sites" : [ diff --git a/tx-backend/src/test/resources/testdata/importfiles/validImportFile.json b/tx-backend/src/test/resources/testdata/importfiles/validImportFile.json index 8bb8c5ae63..82258526bb 100644 --- a/tx-backend/src/test/resources/testdata/importfiles/validImportFile.json +++ b/tx-backend/src/test/resources/testdata/importfiles/validImportFile.json @@ -6,17 +6,13 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003AXS3", "key" : "manufacturerId" }, - { - "value" : "22782277-50", - "key" : "manufacturerPartId" - }, { "value" : "NO-313869652971440618042264", "key" : "partInstanceId" @@ -30,21 +26,27 @@ "partTypeInformation" : { "manufacturerPartId" : "22782277-50", "customerPartId" : "22782277-50", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "Door f-l", "nameAtCustomer" : "b/test Door front-left" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd", "childItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2023-02-20T14:48:54.709Z", @@ -56,27 +58,25 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd", - "customers" : [ - { + "customers": [ + "BPNL00000003CML1" + ], "parentItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "catenaXId" : "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36e22", "createdOn" : "2023-05-29T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CML1", + "isOnlyPotentialParent": false } - ], - "businessPartner" : "BPNL00000003CML1", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ] + ] } } ] @@ -87,17 +87,13 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003AXS3", "key" : "manufacturerId" }, - { - "value" : "3880383-57", - "key" : "manufacturerPartId" - }, { "value" : "NO-989134870198932317923938", "key" : "partInstanceId" @@ -111,21 +107,27 @@ "partTypeInformation" : { "manufacturerPartId" : "3880383-57", "customerPartId" : "3880383-57", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door f-l", "nameAtCustomer" : "Door front-left" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a", "childItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2020-05-02T14:48:54.709Z", @@ -137,27 +139,25 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a", - "customers" : [ - { + "customers": [ + "BPNL00000003CML1" + ], "parentItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "catenaXId" : "urn:uuid:d8030bbf-a874-49fb-b2e1-7610f0ccad12", "createdOn" : "2023-07-15T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CML1", + "isOnlyPotentialParent": false } - ], - "businessPartner" : "BPNL00000003CML1", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ] + ] } } ] @@ -168,17 +168,13 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003AXS3", "key" : "manufacturerId" }, - { - "value" : "9069675-60", - "key" : "manufacturerPartId" - }, { "value" : "NO-004314332935115065980115", "key" : "partInstanceId" @@ -192,21 +188,27 @@ "partTypeInformation" : { "manufacturerPartId" : "9069675-60", "customerPartId" : "9069675-60", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door f-l", "nameAtCustomer" : "Door front-left" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd", "childItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2018-09-17T14:48:54.709Z", @@ -218,27 +220,25 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd", - "customers" : [ - { + "customers": [ + "BPNL00000003CML1" + ], "parentItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "catenaXId" : "urn:uuid:7c7d5aec-b15d-491c-8fbd-c61c6c02c69a", "createdOn" : "2023-02-16T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CML1", + "isOnlyPotentialParent": false } - ], - "businessPartner" : "BPNL00000003CML1", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ] + ] } } ] @@ -249,17 +249,13 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003AXS3", "key" : "manufacturerId" }, - { - "value" : "9879317-51", - "key" : "manufacturerPartId" - }, { "value" : "NO-477013846751358222215326", "key" : "partInstanceId" @@ -273,21 +269,27 @@ "partTypeInformation" : { "manufacturerPartId" : "9879317-51", "customerPartId" : "9879317-51", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door f-l", "nameAtCustomer" : "Door front-left" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:c47b9f8b-48d0-4ef4-8f0b-e965a225cb8d", "childItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2022-06-28T14:48:54.709Z", @@ -299,27 +301,25 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:c47b9f8b-48d0-4ef4-8f0b-e965a225cb8d", - "customers" : [ - { + "customers": [ + "BPNL00000003CSGV" + ], "parentItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "catenaXId" : "urn:uuid:4d33bfa6-0f1f-43a5-ad63-c3fe07a2d076", "createdOn" : "2023-03-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CSGV", + "isOnlyPotentialParent": false } - ], - "businessPartner" : "BPNL00000003CSGV", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ] + ] } } ] @@ -330,7 +330,7 @@ }, "submodels" : [ { - "aspectType" : "urn:samm:io.catenax.batch:2.0.0#Batch", + "aspectType" : "urn:samm:io.catenax.batch:3.0.0#Batch", "payload" : { "localIdentifiers" : [ { @@ -355,27 +355,25 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb01", - "customers" : [ - { + "customers": [ + "BPNL00000003CML1" + ], "parentItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02", "createdOn" : "2023-08-08T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CML1", + "isOnlyPotentialParent": false } - ], - "businessPartner" : "BPNL00000003CML1", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ] + ] } } ] @@ -386,7 +384,7 @@ }, "submodels" : [ { - "aspectType" : "urn:samm:io.catenax.batch:2.0.0#Batch", + "aspectType" : "urn:samm:io.catenax.batch:3.0.0#Batch", "payload" : { "localIdentifiers" : [ { @@ -411,14 +409,14 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb02", "childItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2019-08-15T14:48:54.709Z", @@ -437,7 +435,7 @@ }, "submodels" : [ { - "aspectType" : "urn:samm:io.catenax.batch:2.0.0#Batch", + "aspectType" : "urn:samm:io.catenax.batch:3.0.0#Batch", "payload" : { "localIdentifiers" : [ { @@ -469,7 +467,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2019-04-04T03:19:03.000Z", @@ -480,11 +478,19 @@ "manufacturerPartId" : "7805659-25", "classification" : "product", "nameAtManufacturer" : "b/test Vehicle Model B" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4eb01", "childItems" : [ @@ -494,8 +500,8 @@ "validTo" : "2024-07-01T16:10:00.000+01:00" }, "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "createdOn" : "2022-09-03T14:48:54.709Z", "lastModifiedOn" : "2022-02-03T14:48:54.709Z", @@ -506,7 +512,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4eb01", "sites" : [ @@ -527,7 +533,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.just_in_sequence_part:1.0.0#JustInSequencePart", + "aspectType" : "urn:samm:io.catenax.just_in_sequence_part:3.0.0#JustInSequencePart", "payload" : { "localIdentifiers" : [ { @@ -547,7 +553,13 @@ "partTypeInformation" : { "manufacturerPartId" : "3578115-43", "customerPartId" : "PRT-12345", - "classification" : "product", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "Mirror left", "nameAtCustomer" : "b/test side element A" } @@ -561,7 +573,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2017-01-03T07:45:04.000Z", @@ -572,11 +584,19 @@ "manufacturerPartId" : "2586427-48", "classification" : "product", "nameAtManufacturer" : "b/test Vehicle Model A" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4c79e", "childItems" : [ @@ -587,8 +607,8 @@ }, "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef127c", "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:litre" + "value" : 1, + "unit" : "unit:piece" }, "businessPartner" : "BPNL00000003AYRE", "createdOn" : "2022-12-03T14:48:54.709Z", @@ -598,7 +618,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4c79e", "sites" : [ @@ -619,7 +639,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2016-04-28T20:00:55.000Z", @@ -630,11 +650,19 @@ "manufacturerPartId" : "8840374-09", "classification" : "product", "nameAtManufacturer" : "b/test ZB ZELLE" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:c7a2b803-f8fe-4b79-b6fc-967ce847c9a1", "sites" : [ @@ -655,7 +683,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2015-05-18T23:10:44.000Z", @@ -666,11 +694,19 @@ "manufacturerPartId" : "6288246-67", "classification" : "product", "nameAtManufacturer" : "b/test OEM A High Voltage Battery" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef128c", "childItems" : [ @@ -681,8 +717,8 @@ }, "catenaXId" : "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca98", "quantity" : { - "quantityNumber" : 6, - "measurementUnit" : "unit:litre" + "value" : 1, + "unit" : "unit:piece" }, "businessPartner" : "BPNL00000003CML1", "createdOn" : "2022-02-08T14:48:54.709Z", @@ -692,7 +728,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef128c", "sites" : [ @@ -713,7 +749,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2017-07-03T05:23:01.000Z", @@ -724,11 +760,19 @@ "manufacturerPartId" : "32494586-73", "classification" : "product", "nameAtManufacturer" : "b/test Tier A Gearbox" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:2c57b0e9-a653-411d-bdcd-64787e9fd3a7", "childItems" : [ @@ -739,8 +783,8 @@ }, "catenaXId" : "urn:uuid:bee5614f-9e46-4c98-9209-61a6f2b2a7fc", "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:litre" + "value" : 1, + "unit" : "unit:piece" }, "businessPartner" : "BPNL00000003CML1", "createdOn" : "2022-02-09T14:48:54.709Z", @@ -753,8 +797,8 @@ }, "catenaXId" : "urn:uuid:4518c080-14fb-4252-b8de-4362d615868d", "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:litre" + "value" : 1, + "unit" : "unit:litre" }, "businessPartner" : "BPNL00000003CML1", "createdOn" : "2022-02-10T14:48:54.709Z", @@ -764,7 +808,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:2c57b0e9-a653-411d-bdcd-64787e9fd3a7", "sites" : [ @@ -785,7 +829,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2016-04-24T08:26:56.000Z", @@ -796,11 +840,19 @@ "manufacturerPartId" : "8583898-48", "classification" : "product", "nameAtManufacturer" : "b/test Tier B ECU1" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b", "childItems" : [ @@ -811,8 +863,8 @@ }, "catenaXId" : "urn:uuid:3cdd2826-5df0-4c7b-b540-9eeccecb2301", "quantity" : { - "quantityNumber" : 0.3301, - "measurementUnit" : "unit:kilogram" + "value" : 1, + "unit" : "unit:piece" }, "businessPartner" : "BPNL00000003CML1", "createdOn" : "2022-02-13T14:48:54.709Z", @@ -822,7 +874,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b", "sites" : [ @@ -843,7 +895,7 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { "validityPeriod" : { "validFrom" : "2019-11-02T11:14:15.000Z", @@ -854,11 +906,19 @@ "manufacturerPartId" : "1987361-42", "classification" : "product", "nameAtManufacturer" : "b/test Tire Model A" - } + }, + "partSitesInformationAsPlanned": [ + { + "catenaXsiteId": "BPNS123456789A", + "function": "production", + "functionValidFrom": "2024-04-25T10:00:00Z", + "functionValidUntil": "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:e8c48a8e-d2d7-43d9-a867-65c70c85f5b8", "sites" : [ @@ -879,17 +939,13 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003AXS3", "key" : "manufacturerId" }, - { - "value" : "8840374-09", - "key" : "manufacturerPartId" - }, { "value" : "NO-917923082133064161014067", "key" : "partInstanceId" @@ -903,14 +959,20 @@ "partTypeInformation" : { "manufacturerPartId" : "8840374-09", "customerPartId" : "8840374-09", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "b/test ZB ZELLE", "nameAtCustomer" : "ZB ZELLE" } } }, { - "aspectType" : "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", + "aspectType" : "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", "payload" : { "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382320", "subcomponents" : [ @@ -930,17 +992,13 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003AXS3", "key" : "manufacturerId" }, - { - "value" : "1142469-27", - "key" : "manufacturerPartId" - }, { "value" : "NO-655858074471261486971940", "key" : "partInstanceId" @@ -954,30 +1012,13 @@ "partTypeInformation" : { "manufacturerPartId" : "1142469-27", "customerPartId" : "1142469-27", - "classification" : "component", - "nameAtManufacturer" : "b/test Door Key", - "nameAtCustomer" : "Door Key" - } - } - }, - { - "aspectType" : "urn:bamm:io.catenax.just_in_sequence_part:1.0.0#JustInSequencePart", - "payload" : { - "localIdentifiers" : [ - { - "value" : "92879626SFC", - "key" : "jisNumber" - } - ], - "manufacturingInformation" : { - "date" : "2018-09-28T04:15:57.000Z", - "country" : "HUN" - }, - "catenaXId" : "urn:uuid:da978a30-4dde-4d76-808a-b7946763ff0d", - "partTypeInformation" : { - "manufacturerPartId" : "1417058-05", - "customerPartId" : "PRT-12345", - "classification" : "product", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door Key", "nameAtCustomer" : "Door Key" } @@ -991,17 +1032,13 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { "value" : "BPNL00000003AXS3", "key" : "manufacturerId" }, - { - "value" : "8840837-48", - "key" : "manufacturerPartId" - }, { "value" : "NO-570196089623842018037372", "key" : "partInstanceId" @@ -1015,22 +1052,28 @@ "partTypeInformation" : { "manufacturerPartId" : "8840838-04", "customerPartId" : "8840838-04", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], "nameAtManufacturer" : "HV MODUL", "nameAtCustomer" : "HV MODUL" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4080f", "childItems" : [ { "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fcb5f", "quantity" : { - "quantityNumber" : 2.5, - "measurementUnit" : "unit:litre" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "businessPartner" : "BPNL00000003AXS3", @@ -1041,16 +1084,24 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4080f", - "customers" : [ - { - "businessPartner" : "BPNL00000003AXS3", - "parentItems" : [], - "createdOn" : "2022-02-03T14:48:54.709Z", - "lastModifiedOn" : "2022-02-03T14:48:54.709Z" - } + "customers": [ + "BPNL00000003CML1" + ], + "parentItems": [ + { + "catenaXId": "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36e22", + "quantity": { + "value": 1, + "unit": "unit:piece" + }, + "createdOn": "2023-02-03T14:48:54.709Z", + "lastModifiedOn": "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003AXS3", + "isOnlyPotentialParent": false + } ] } } diff --git a/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.13.json b/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.13.json new file mode 100644 index 0000000000..a5d690cc44 --- /dev/null +++ b/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.13.json @@ -0,0 +1,2646 @@ +{ + "policies": { + "traceability-core": { + "@context": { + "odrl": "http://www.w3.org/ns/odrl/2/" + }, + "@type": "PolicyDefinitionRequestDto", + "@id": "traceability-core", + "policy": { + "@type": "odrl:Set", + "odrl:permission": [ + { + "odrl:action" : "use", + "odrl:constraint": { + "@type": "AtomicConstraint", + "odrl:and": [ + { + "@type": "Constraint", + "odrl:leftOperand": "cx-policy:FrameworkAgreement", + "odrl:operator": { + "@id": "odrl:eq" + }, + "odrl:rightOperand": "traceability:1.0" + }, + { + "@type": "Constraint", + "odrl:leftOperand": "cx-policy:UsagePurpose", + "odrl:operator": { + "@id": "odrl:eq" + }, + "odrl:rightOperand": "cx.core.industrycore:1" + } + ] + } + } + ] + } + } + }, + "https://catenax.io/schema/TestDataContainer/1.0.0" : [ + { + "catenaXId" : "urn:uuid:0fed587c-7ab4-4597-9841-1718e9693003", + "bpnl" : "BPNL00000003CML1", + "PlainObject" : [ + { + "BPN_OEM_C" : "BPNL00000003CML1", + "BPN_OEM_A" : "BPNL00000003CSGV", + "BPN_OEM_B" : "BPNL00000003AZQP", + "BPN_OEM_D" : "BPNL00000003CNKC", + "CREATION_DATE" : "2022-09-26T12:43:51.079Z" + } + ] + }, + { + "catenaXId" : "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36e22", + "bpnl" : "BPNL00000003CML1", + "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt" : [ + { + "catenaXId" : "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36e22", + "childItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "createdOn" : "2022-02-03T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z", + "catenaXId" : "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd", + "businessPartner" : "BPNL00000003CNKC", + "hasAlternatives" : false + } + ] + } + ], + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "OMAOYGBDTSRCMYSCX", + "key" : "partInstanceId" + }, + { + "value" : "OMAOYGBDTSRCMYSCX", + "key" : "van" + } + ], + "manufacturingInformation" : { + "date" : "2018-09-28T04:15:57.000Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36e22", + "partTypeInformation" : { + "manufacturerPartId" : "3500076-05", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "a/dev Vehicle Hybrid" + } + } + ] + }, + { + "catenaXId" : "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd", + "bpnl" : "BPNL00000003CNKC", + "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt" : [ + { + "catenaXId" : "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd", + "childItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "createdOn" : "2023-02-20T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z", + "catenaXId" : "urn:uuid:1d2d8480-90a5-4a17-9ecb-2ff039d35fec", + "businessPartner" : "BPNL00000003CSGV", + "hasAlternatives" : false + } + ] + } + ], + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CNKC", + "key" : "manufacturerId" + }, + { + "value" : "NO-313869652971440618042264", + "key" : "partInstanceId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd", + "partTypeInformation" : { + "manufacturerPartId" : "22782277-50", + "customerPartId" : "22782277-50", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "Door f-l", + "nameAtCustomer" : "b/test Door front-left" + } + } + ], + "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt" : [ + { + "catenaXId" : "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd", + "customers" : [ + "BPNL00000003CML1" + ], + "parentItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36e22", + "createdOn" : "2023-05-29T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CML1", + "isOnlyPotentialParent" : false + } + ] + } + ] + }, + { + "catenaXId" : "urn:uuid:1d2d8480-90a5-4a17-9ecb-2ff039d35fec", + "bpnl" : "BPNL00000003CSGV", + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CSGV", + "key" : "manufacturerId" + }, + { + "value" : "NO-584478761469608738361558", + "key" : "partInstanceId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:1d2d8480-90a5-4a17-9ecb-2ff039d35fec", + "partTypeInformation" : { + "manufacturerPartId" : "95657762-59", + "customerPartId" : "95657762-59", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "Door Key", + "nameAtCustomer" : "Door Key" + } + } + ], + "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt" : [ + { + "catenaXId" : "urn:uuid:1d2d8480-90a5-4a17-9ecb-2ff039d35fec", + "customers" : [ + "BPNL00000003CNKC" + ], + "parentItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd", + "createdOn" : "2023-06-18T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "isOnlyPotentialParent" : false, + "businessPartner" : "BPNL00000003CNKC" + } + ] + } + ] + }, + { + "catenaXId" : "urn:uuid:d8030bbf-a874-49fb-b2e1-7610f0ccad12", + "bpnl" : "BPNL00000003CML1", + "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt" : [ + { + "catenaXId" : "urn:uuid:d8030bbf-a874-49fb-b2e1-7610f0ccad12", + "childItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "createdOn" : "2021-01-15T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z", + "catenaXId" : "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a", + "businessPartner" : "BPNL00000003CNKC", + "hasAlternatives" : false + } + ] + } + ], + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "OMAYSKEITUGNVHKKX", + "key" : "partInstanceId" + }, + { + "value" : "OMAYSKEITUGNVHKKX", + "key" : "van" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:d8030bbf-a874-49fb-b2e1-7610f0ccad12", + "partTypeInformation" : { + "manufacturerPartId" : "4922009-56", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "a/dev Vehicle Hybrid" + } + } + ] + }, + { + "catenaXId" : "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a", + "bpnl" : "BPNL00000003CNKC", + "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt" : [ + { + "catenaXId" : "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a", + "childItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "createdOn" : "2020-05-02T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z", + "catenaXId" : "urn:uuid:4e390dab-707f-446e-bfbe-653f6f5b1f37", + "businessPartner" : "BPNL00000003CML1", + "hasAlternatives" : false + } + ] + } + ], + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CNKC", + "key" : "manufacturerId" + }, + { + "value" : "NO-989134870198932317923938", + "key" : "partInstanceId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a", + "partTypeInformation" : { + "manufacturerPartId" : "3880383-57", + "customerPartId" : "3880383-57", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "b/test Door f-l", + "nameAtCustomer" : "Door front-left" + } + } + ], + "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt" : [ + { + "catenaXId" : "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a", + "customers" : [ + "BPNL00000003CML1" + ], + "parentItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:d8030bbf-a874-49fb-b2e1-7610f0ccad12", + "createdOn" : "2023-07-15T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CML1", + "isOnlyPotentialParent" : false + } + ] + } + ] + }, + { + "catenaXId" : "urn:uuid:4e390dab-707f-446e-bfbe-653f6f5b1f37", + "bpnl" : "BPNL00000003CML1", + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "NO-493575190274381019348907", + "key" : "partInstanceId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:4e390dab-707f-446e-bfbe-653f6f5b1f37", + "partTypeInformation" : { + "manufacturerPartId" : "6683834-82", + "customerPartId" : "6683834-82", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "Door Key", + "nameAtCustomer" : "Door Key" + } + } + ], + "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt" : [ + { + "catenaXId" : "urn:uuid:4e390dab-707f-446e-bfbe-653f6f5b1f37", + "customers" : [ + "BPNL00000003CNKC" + ], + "parentItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a", + "createdOn" : "2023-12-05T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CNKC", + "isOnlyPotentialParent" : false + } + ] + } + ] + }, + { + "catenaXId" : "urn:uuid:7c7d5aec-b15d-491c-8fbd-c61c6c02c69a", + "bpnl" : "BPNL00000003CML1", + "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt" : [ + { + "catenaXId" : "urn:uuid:7c7d5aec-b15d-491c-8fbd-c61c6c02c69a", + "childItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "createdOn" : "2022-11-22T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z", + "catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd", + "businessPartner" : "BPNL00000003CNKC", + "hasAlternatives" : false + } + ] + } + ], + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "OMAZRXWWMSPTQUEKI", + "key" : "partInstanceId" + }, + { + "value" : "OMAZRXWWMSPTQUEKI", + "key" : "van" + } + ], + "manufacturingInformation" : { + "date" : "2015-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:7c7d5aec-b15d-491c-8fbd-c61c6c02c69a", + "partTypeInformation" : { + "manufacturerPartId" : "5519583-63", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "Vehicle Hybrid" + } + } + ] + }, + { + "catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd", + "bpnl" : "BPNL00000003CNKC", + "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt" : [ + { + "catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd", + "childItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "createdOn" : "2018-09-17T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z", + "catenaXId" : "urn:uuid:4a5e9ff6-2d5c-4510-a90e-d55af3ba502f", + "businessPartner" : "BPNL00000003CML1", + "hasAlternatives" : false + } + ] + } + ], + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CNKC", + "key" : "manufacturerId" + }, + { + "value" : "NO-004314332935115065980115", + "key" : "partInstanceId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd", + "partTypeInformation" : { + "manufacturerPartId" : "9069675-60", + "customerPartId" : "9069675-60", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "b/test Door f-l", + "nameAtCustomer" : "Door front-left" + } + } + ], + "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt" : [ + { + "catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd", + "customers" : [ + "BPNL00000003CML1" + ], + "parentItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:7c7d5aec-b15d-491c-8fbd-c61c6c02c69a", + "createdOn" : "2023-02-16T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CML1", + "isOnlyPotentialParent" : false + } + ] + } + ] + }, + { + "catenaXId" : "urn:uuid:4a5e9ff6-2d5c-4510-a90e-d55af3ba502f", + "bpnl" : "BPNL00000003CML1", + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "NO-246880451848384868750731", + "key" : "partInstanceId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:4a5e9ff6-2d5c-4510-a90e-d55af3ba502f", + "partTypeInformation" : { + "manufacturerPartId" : "8770123-80", + "customerPartId" : "8770123-80", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "a/dev Door Key", + "nameAtCustomer" : "Door Key" + } + } + ], + "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt" : [ + { + "catenaXId" : "urn:uuid:4a5e9ff6-2d5c-4510-a90e-d55af3ba502f", + "customers" : [ + "BPNL00000003CNKC" + ], + "parentItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd", + "createdOn" : "2023-04-13T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CNKC", + "isOnlyPotentialParent" : false + } + ] + } + ] + }, + { + "catenaXId" : "urn:uuid:4d33bfa6-0f1f-43a5-ad63-c3fe07a2d076", + "bpnl" : "BPNL00000003CSGV", + "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt" : [ + { + "catenaXId" : "urn:uuid:4d33bfa6-0f1f-43a5-ad63-c3fe07a2d076", + "childItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "createdOn" : "2021-10-24T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z", + "catenaXId" : "urn:uuid:c47b9f8b-48d0-4ef4-8f0b-e965a225cb8d", + "businessPartner" : "BPNL00000003CNKC", + "hasAlternatives" : false + } + ] + } + ], + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CSGV", + "key" : "manufacturerId" + }, + { + "value" : "OMAFIVCDHEBNXKNHH", + "key" : "partInstanceId" + }, + { + "value" : "OMAFIVCDHEBNXKNHH", + "key" : "van" + } + ], + "manufacturingInformation" : { + "date" : "2015-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:4d33bfa6-0f1f-43a5-ad63-c3fe07a2d076", + "partTypeInformation" : { + "manufacturerPartId" : "9321782-89", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "Vehicle Hybrid" + } + } + ] + }, + { + "catenaXId" : "urn:uuid:c47b9f8b-48d0-4ef4-8f0b-e965a225cb8d", + "bpnl" : "BPNL00000003CNKC", + "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt" : [ + { + "catenaXId" : "urn:uuid:c47b9f8b-48d0-4ef4-8f0b-e965a225cb8d", + "childItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "createdOn" : "2022-06-28T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z", + "catenaXId" : "urn:uuid:6ec3f1db-2798-454b-a73f-0d21a8966c74", + "businessPartner" : "BPNL00000003CML1", + "hasAlternatives" : false + } + ] + } + ], + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CNKC", + "key" : "manufacturerId" + }, + { + "value" : "NO-477013846751358222215326", + "key" : "partInstanceId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:c47b9f8b-48d0-4ef4-8f0b-e965a225cb8d", + "partTypeInformation" : { + "manufacturerPartId" : "9879317-51", + "customerPartId" : "9879317-51", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "b/test Door f-l", + "nameAtCustomer" : "Door front-left" + } + } + ], + "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt" : [ + { + "catenaXId" : "urn:uuid:c47b9f8b-48d0-4ef4-8f0b-e965a225cb8d", + "customers" : [ + "BPNL00000003CSGV" + ], + "parentItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:4d33bfa6-0f1f-43a5-ad63-c3fe07a2d076", + "createdOn" : "2023-03-03T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CSGV", + "isOnlyPotentialParent" : false + } + ] + } + ] + }, + { + "catenaXId" : "urn:uuid:6ec3f1db-2798-454b-a73f-0d21a8966c74", + "bpnl" : "BPNL00000003CML1", + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "NO-613963493493659233961306", + "key" : "partInstanceId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:6ec3f1db-2798-454b-a73f-0d21a8966c74", + "partTypeInformation" : { + "manufacturerPartId" : "5756987-94", + "customerPartId" : "5756987-94", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "a/dev Door Key", + "nameAtCustomer" : "Door Key" + } + } + ], + "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt" : [ + { + "catenaXId" : "urn:uuid:6ec3f1db-2798-454b-a73f-0d21a8966c74", + "customers" : [ + "BPNL00000003CNKC" + ], + "parentItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:c47b9f8b-48d0-4ef4-8f0b-e965a225cb8d", + "createdOn" : "2023-08-21T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "isOnlyPotentialParent" : false, + "businessPartner" : "BPNL00000003CNKC" + } + ] + } + ] + }, + { + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284b170", + "bpnl" : "BPNL00000003CSGV", + "urn:samm:io.catenax.batch:3.0.0#Batch" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CSGV", + "key" : "manufacturerId" + }, + { + "value" : "NO-341449848714937445621543", + "key" : "batchId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284b170", + "partTypeInformation" : { + "manufacturerPartId" : "5290709-55", + "classification" : "component", + "nameAtManufacturer" : "a/dev Door Key" + } + } + ], + "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt" : [ + { + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284b170", + "customers" : [ + "BPNL00000003CML1" + ], + "parentItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:6ec3f1db-2798-454b-a73f-0d21a8966c74", + "createdOn" : "2023-06-14T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "isOnlyPotentialParent" : false, + "businessPartner" : "BPNL00000003CML1" + } + ] + } + ] + }, + { + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa01", + "bpnl" : "BPNL00000003CML1", + "urn:samm:io.catenax.batch:3.0.0#Batch" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "NO-341449848714937445621543", + "key" : "batchId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa01", + "partTypeInformation" : { + "manufacturerPartId" : "9858559-85", + "classification" : "component", + "nameAtManufacturer" : "a/dev Door Key" + } + } + ] + }, + { + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02", + "bpnl" : "BPNL00000003CML1", + "urn:samm:io.catenax.batch:3.0.0#Batch" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "NO-341449848714937445621543", + "key" : "batchId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02", + "partTypeInformation" : { + "manufacturerPartId" : "9623673-66", + "classification" : "component", + "nameAtManufacturer" : "a/dev Door Key" + } + } + ], + "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt" : [ + { + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02", + "childItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "createdOn" : "2016-01-20T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z", + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb01", + "businessPartner" : "BPNL00000003CNKC", + "hasAlternatives" : false + } + ] + } + ] + }, + { + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb01", + "bpnl" : "BPNL00000003CNKC", + "urn:samm:io.catenax.batch:3.0.0#Batch" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CNKC", + "key" : "manufacturerId" + }, + { + "value" : "NO-341449848714937445621543", + "key" : "batchId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb01", + "partTypeInformation" : { + "manufacturerPartId" : "5894914-94", + "classification" : "component", + "nameAtManufacturer" : "b/test Door Key" + } + } + ], + "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt" : [ + { + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb01", + "customers" : [ + "BPNL00000003CML1" + ], + "parentItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02", + "createdOn" : "2023-08-08T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CML1", + "isOnlyPotentialParent" : false + } + ] + } + ] + }, + { + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb02", + "bpnl" : "BPNL00000003CNKC", + "urn:samm:io.catenax.batch:3.0.0#Batch" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CNKC", + "key" : "manufacturerId" + }, + { + "value" : "NO-341449848714937445621543", + "key" : "batchId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb02", + "partTypeInformation" : { + "manufacturerPartId" : "6245773-32", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "b/test Door Key" + } + } + ], + "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt" : [ + { + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb02", + "childItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "createdOn" : "2019-08-15T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z", + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa03", + "businessPartner" : "BPNL00000003CML1", + "hasAlternatives" : false + } + ] + } + ] + }, + { + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa03", + "bpnl" : "BPNL00000003CML1", + "urn:samm:io.catenax.batch:3.0.0#Batch" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "NO-341449848714937445621543", + "key" : "batchId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa03", + "partTypeInformation" : { + "manufacturerPartId" : "4902203-92", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "a/dev Door Key" + } + } + ], + "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt" : [ + { + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa03", + "customers" : [ + "BPNL00000003CNKC" + ], + "parentItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb02", + "createdOn" : "2022-07-03T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "isOnlyPotentialParent" : false, + "businessPartner" : "BPNL00000003CNKC" + } + ] + } + ] + }, + { + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb03", + "bpnl" : "BPNL00000003CNKC", + "urn:samm:io.catenax.batch:3.0.0#Batch" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CNKC", + "key" : "manufacturerId" + }, + { + "value" : "NO-341449848714937445621543", + "key" : "batchId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb03", + "partTypeInformation" : { + "manufacturerPartId" : "9770171-23", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "b/test Door Key" + } + } + ] + }, + { + "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4da01", + "bpnl" : "BPNL00000003CML1", + "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ + { + "localIdentifiers" : [ + ], + "validityPeriod" : { + "validFrom" : "2019-04-04T03:19:03.000Z", + "validTo" : "2024-12-29T10:25:12.000Z" + }, + "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4da01", + "partTypeInformation" : { + "manufacturerPartId" : "9649571-63", + "classification" : "product", + "nameAtManufacturer" : "a/dev Vehicle Model A" + }, + "partSitesInformationAsPlanned" : [ + { + "catenaXsiteId" : "BPNS123456789A", + "function" : "production", + "functionValidFrom" : "2024-04-25T10:00:00Z", + "functionValidUntil" : "2024-04-30T10:00:00Z" + } + ] + } + ], + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned" : [ + { + "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4da01", + "sites" : [ + { + "functionValidUntil" : "2025-02-08T04:30:48.000Z", + "function" : "production", + "functionValidFrom" : "2019-08-21T02:10:36.000Z", + "catenaXSiteId" : "BPNS000004711DMY" + } + ] + } + ], + "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned" : [ + { + "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4da01", + "childItems" : [ + { + "validityPeriod" : { + "validFrom" : "2023-03-21T08:17:29.187+01:00", + "validTo" : "2024-07-01T16:10:00.000+01:00" + }, + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "createdOn" : "2022-08-03T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z", + "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4eb01", + "businessPartner" : "BPNL00000003CNKC" + } + ] + } + ] + }, + { + "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4eb01", + "bpnl" : "BPNL00000003CNKC", + "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ + { + "localIdentifiers" : [ + ], + "validityPeriod" : { + "validFrom" : "2019-04-04T03:19:03.000Z", + "validTo" : "2024-12-29T10:25:12.000Z" + }, + "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4eb01", + "partTypeInformation" : { + "manufacturerPartId" : "7805659-25", + "classification" : "product", + "nameAtManufacturer" : "b/test Vehicle Model B" + }, + "partSitesInformationAsPlanned" : [ + { + "catenaXsiteId" : "BPNS123456789A", + "function" : "production", + "functionValidFrom" : "2024-04-25T10:00:00Z", + "functionValidUntil" : "2024-04-30T10:00:00Z" + } + ] + } + ], + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned" : [ + { + "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4eb01", + "sites" : [ + { + "functionValidUntil" : "2025-02-08T04:30:48.000Z", + "function" : "production", + "functionValidFrom" : "2019-08-21T02:10:36.000Z", + "catenaXSiteId" : "BPNS000004711DMY" + } + ] + } + ], + "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned" : [ + { + "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4eb01", + "childItems" : [ + { + "validityPeriod" : { + "validFrom" : "2023-03-21T08:17:29.187+01:00", + "validTo" : "2024-07-01T16:10:00.000+01:00" + }, + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "createdOn" : "2022-09-03T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z", + "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4da01", + "businessPartner" : "BPNL00000003CML1" + } + ] + } + ] + }, + { + "catenaXId" : "urn:uuid:580d3adf-1981-44a0-a214-13d6ceed6841", + "bpnl" : "BPNL00000003CNKC", + "urn:samm:io.catenax.just_in_sequence_part:3.0.0#JustInSequencePart" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CNKC", + "key" : "manufacturerId" + }, + { + "value" : "12345678ABC", + "key" : "jisNumber" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "HUN" + }, + "catenaXId" : "urn:uuid:580d3adf-1981-44a0-a214-13d6ceed6841", + "partTypeInformation" : { + "manufacturerPartId" : "3578115-43", + "customerPartId" : "PRT-12345", + "classification" : "product", + "nameAtManufacturer" : "Mirror left", + "nameAtCustomer" : "b/test side element A" + } + } + ] + }, + { + "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e43842", + "bpnl" : "BPNL00000003CML1", + "urn:samm:io.catenax.just_in_sequence_part:3.0.0#JustInSequencePart" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "12345678ABC", + "key" : "jisNumber" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "HUN" + }, + "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e43842", + "partTypeInformation" : { + "manufacturerPartId" : "8397292-13", + "customerPartId" : "PRT-12345", + "classification" : "product", + "nameAtManufacturer" : "Mirror left", + "nameAtCustomer" : "a/dev side element A" + } + } + ] + }, + { + "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef127c", + "bpnl" : "BPNL00000003CML1", + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned" : [ + { + "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef127c", + "sites" : [ + { + "functionValidUntil" : "2027-05-23T09:16:30.000Z", + "catenaXSiteId" : "BPNS000004711DMY", + "function" : "production", + "functionValidFrom" : "2013-11-17T23:59:54.000Z" + } + ] + } + ], + "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ + { + "localIdentifiers" : [ + ], + "validityPeriod" : { + "validFrom" : "2015-05-18T23:10:44.000Z", + "validTo" : "2025-10-23T14:46:01.000Z" + }, + "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef127c", + "partTypeInformation" : { + "manufacturerPartId" : "38049661-08", + "classification" : "product", + "nameAtManufacturer" : "a/dev OEM A High Voltage Battery" + }, + "partSitesInformationAsPlanned" : [ + { + "catenaXsiteId" : "BPNS123456789A", + "function" : "production", + "functionValidFrom" : "2024-04-25T10:00:00Z", + "functionValidUntil" : "2024-04-30T10:00:00Z" + } + ] + } + ], + "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned" : [ + { + "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef127c", + "childItems" : [ + { + "validityPeriod" : { + "validFrom" : "2023-03-21T08:17:29.187+01:00", + "validTo" : "2024-07-01T16:10:00.000+01:00" + }, + "catenaXId" : "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca97", + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "businessPartner" : "BPNL00000003CML1", + "createdOn" : "2022-10-03T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + } + ] + } + ], + "urn:samm:io.catenax.single_level_usage_as_planned:1.1.0#SingleLevelUsageAsPlanned" : [ + { + "parentParts" : [ + { + "validityPeriod" : { + "validFrom" : "2023-03-21T08:47:14.438+01:00", + "validTo" : "2024-08-02T09:00:00.000+01:00" + }, + "parentCatenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4c79e", + "quantity" : { + "quantityNumber" : 2.5, + "measurementUnit" : "unit:litre" + }, + "createdOn" : "2022-11-03T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + } + ], + "businessPartner" : "BPNL00000003CNKC", + "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef127c" + } + ] + }, + { + "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4c79e", + "bpnl" : "BPNL00000003CNKC", + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned" : [ + { + "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4c79e", + "sites" : [ + { + "functionValidUntil" : "2025-04-04T04:14:11.000Z", + "catenaXSiteId" : "BPNS000004711DMY", + "function" : "production", + "functionValidFrom" : "2018-03-24T13:38:32.000Z" + } + ] + } + ], + "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ + { + "localIdentifiers" : [ + ], + "validityPeriod" : { + "validFrom" : "2017-01-03T07:45:04.000Z", + "validTo" : "2029-11-15T11:57:45.000Z" + }, + "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4c79e", + "partTypeInformation" : { + "manufacturerPartId" : "2586427-48", + "classification" : "product", + "nameAtManufacturer" : "b/test Vehicle Model A" + }, + "partSitesInformationAsPlanned" : [ + { + "catenaXsiteId" : "BPNS123456789A", + "function" : "production", + "functionValidFrom" : "2024-04-25T10:00:00Z", + "functionValidUntil" : "2024-04-30T10:00:00Z" + } + ] + } + ], + "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned" : [ + { + "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4c79e", + "childItems" : [ + { + "validityPeriod" : { + "validFrom" : "2023-03-21T08:17:29.187+01:00", + "validTo" : "2024-07-01T16:10:00.000+01:00" + }, + "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef127c", + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "businessPartner" : "BPNL00000003AYRE", + "createdOn" : "2022-12-03T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + } + ] + } + ] + }, + { + "catenaXId" : "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca98", + "bpnl" : "BPNL00000003CML1", + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned" : [ + { + "catenaXId" : "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca98", + "sites" : [ + { + "functionValidUntil" : "2031-11-21T03:24:27.000Z", + "catenaXSiteId" : "BPNS000004711DMY", + "function" : "production", + "functionValidFrom" : "2020-06-07T07:30:47.000Z" + } + ] + } + ], + "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ + { + "localIdentifiers" : [ + ], + "validityPeriod" : { + "validFrom" : "2018-01-25T08:42:58.000Z", + "validTo" : "2029-02-10T03:24:30.000Z" + }, + "catenaXId" : "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca98", + "partTypeInformation" : { + "manufacturerPartId" : "8840838-04", + "classification" : "product", + "nameAtManufacturer" : "a/dev HV Modul" + }, + "partSitesInformationAsPlanned" : [ + { + "catenaXsiteId" : "BPNS123456789A", + "function" : "production", + "functionValidFrom" : "2024-04-25T10:00:00Z", + "functionValidUntil" : "2024-04-30T10:00:00Z" + } + ] + } + ], + "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned" : [ + { + "catenaXId" : "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca98", + "childItems" : [ + { + "validityPeriod" : { + "validFrom" : "2023-03-21T08:17:29.187+01:00", + "validTo" : "2024-07-01T16:10:00.000+01:00" + }, + "catenaXId" : "urn:uuid:c7a2b803-f8fe-4b79-b6fc-967ce847c9a1", + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "businessPartner" : "BPNL00000003CNKC", + "createdOn" : "2022-01-03T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + } + ] + } + ], + "urn:samm:io.catenax.single_level_usage_as_planned:1.1.0#SingleLevelUsageAsPlanned" : [ + { + "parentParts" : [ + { + "validityPeriod" : { + "validFrom" : "2023-03-21T08:47:14.438+01:00", + "validTo" : "2024-08-02T09:00:00.000+01:00" + }, + "parentCatenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef128c", + "quantity" : { + "quantityNumber" : 2.5, + "measurementUnit" : "unit:litre" + }, + "createdOn" : "2022-02-06T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + } + ], + "businessPartner" : "BPNL00000003CNKC", + "catenaXId" : "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca98" + } + ] + }, + { + "catenaXId" : "urn:uuid:c7a2b803-f8fe-4b79-b6fc-967ce847c9a1", + "bpnl" : "BPNL00000003CNKC", + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned" : [ + { + "catenaXId" : "urn:uuid:c7a2b803-f8fe-4b79-b6fc-967ce847c9a1", + "sites" : [ + { + "functionValidUntil" : "2028-04-27T13:34:20.000Z", + "catenaXSiteId" : "BPNS000004711DMY", + "function" : "production", + "functionValidFrom" : "2017-05-03T09:10:04.000Z" + } + ] + } + ], + "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ + { + "localIdentifiers" : [ + ], + "validityPeriod" : { + "validFrom" : "2016-04-28T20:00:55.000Z", + "validTo" : "2027-04-27T00:59:41.000Z" + }, + "catenaXId" : "urn:uuid:c7a2b803-f8fe-4b79-b6fc-967ce847c9a1", + "partTypeInformation" : { + "manufacturerPartId" : "8840374-09", + "classification" : "product", + "nameAtManufacturer" : "b/test ZB ZELLE" + }, + "partSitesInformationAsPlanned" : [ + { + "catenaXsiteId" : "BPNS123456789A", + "function" : "production", + "functionValidFrom" : "2024-04-25T10:00:00Z", + "functionValidUntil" : "2024-04-30T10:00:00Z" + } + ] + } + ], + "urn:samm:io.catenax.single_level_usage_as_planned:1.1.0#SingleLevelUsageAsPlanned" : [ + { + "parentParts" : [ + { + "validityPeriod" : { + "validFrom" : "2023-03-21T08:47:14.438+01:00", + "validTo" : "2024-08-02T09:00:00.000+01:00" + }, + "parentCatenaXId" : "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca98", + "quantity" : { + "quantityNumber" : 2.5, + "measurementUnit" : "unit:litre" + }, + "createdOn" : "2022-02-07T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + } + ], + "catenaXId" : "urn:uuid:c7a2b803-f8fe-4b79-b6fc-967ce847c9a1" + } + ] + }, + { + "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef128c", + "bpnl" : "BPNL00000003CNKC", + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned" : [ + { + "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef128c", + "sites" : [ + { + "functionValidUntil" : "2027-05-23T09:16:30.000Z", + "catenaXSiteId" : "BPNS000004711DMY", + "function" : "production", + "functionValidFrom" : "2013-11-17T23:59:54.000Z" + } + ] + } + ], + "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ + { + "localIdentifiers" : [ + ], + "validityPeriod" : { + "validFrom" : "2015-05-18T23:10:44.000Z", + "validTo" : "2025-10-23T14:46:01.000Z" + }, + "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef128c", + "partTypeInformation" : { + "manufacturerPartId" : "6288246-67", + "classification" : "product", + "nameAtManufacturer" : "b/test OEM A High Voltage Battery" + }, + "partSitesInformationAsPlanned" : [ + { + "catenaXsiteId" : "BPNS123456789A", + "function" : "production", + "functionValidFrom" : "2024-04-25T10:00:00Z", + "functionValidUntil" : "2024-04-30T10:00:00Z" + } + ] + } + ], + "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned" : [ + { + "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef128c", + "childItems" : [ + { + "validityPeriod" : { + "validFrom" : "2023-03-21T08:17:29.187+01:00", + "validTo" : "2024-07-01T16:10:00.000+01:00" + }, + "catenaXId" : "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca98", + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "businessPartner" : "BPNL00000003CML1", + "createdOn" : "2022-02-08T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + } + ] + } + ] + }, + { + "catenaXId" : "urn:uuid:4f7b1cf2-a598-4027-bc78-63f6d8e55699", + "bpnl" : "BPNL00000003CML1", + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned" : [ + { + "catenaXId" : "urn:uuid:4f7b1cf2-a598-4027-bc78-63f6d8e55699", + "sites" : [ + { + "functionValidUntil" : "2025-03-05T00:33:55.000Z", + "catenaXSiteId" : "BPNS00000003B0Q0", + "function" : "production", + "functionValidFrom" : "2019-09-10T14:41:50.000Z" + } + ] + } + ], + "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ + { + "localIdentifiers" : [ + ], + "validityPeriod" : { + "validFrom" : "2013-11-24T00:27:33.000Z", + "validTo" : "2025-08-16T09:18:35.000Z" + }, + "catenaXId" : "urn:uuid:4f7b1cf2-a598-4027-bc78-63f6d8e55699", + "partTypeInformation" : { + "manufacturerPartId" : "7A047C7-01", + "classification" : "product", + "nameAtManufacturer" : "a/dev N Tier A CathodeMaterial" + }, + "partSitesInformationAsPlanned" : [ + { + "catenaXsiteId" : "BPNS123456789A", + "function" : "production", + "functionValidFrom" : "2024-04-25T10:00:00Z", + "functionValidUntil" : "2024-04-30T10:00:00Z" + } + ] + } + ] + }, + { + "catenaXId" : "urn:uuid:2c57b0e9-a653-411d-bdcd-64787e9fd3a7", + "bpnl" : "BPNL00000003CNKC", + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned" : [ + { + "catenaXId" : "urn:uuid:2c57b0e9-a653-411d-bdcd-64787e9fd3a7", + "sites" : [ + { + "functionValidUntil" : "2031-10-27T21:24:04.000Z", + "catenaXSiteId" : "BPNS00000003B2OM", + "function" : "production", + "functionValidFrom" : "2016-01-29T21:44:37.000Z" + } + ] + } + ], + "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ + { + "localIdentifiers" : [ + ], + "validityPeriod" : { + "validFrom" : "2017-07-03T05:23:01.000Z", + "validTo" : "2032-09-25T10:26:27.000Z" + }, + "catenaXId" : "urn:uuid:2c57b0e9-a653-411d-bdcd-64787e9fd3a7", + "partTypeInformation" : { + "manufacturerPartId" : "32494586-73", + "classification" : "product", + "nameAtManufacturer" : "b/test Tier A Gearbox" + }, + "partSitesInformationAsPlanned" : [ + { + "catenaXsiteId" : "BPNS123456789A", + "function" : "production", + "functionValidFrom" : "2024-04-25T10:00:00Z", + "functionValidUntil" : "2024-04-30T10:00:00Z" + } + ] + } + ], + "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned" : [ + { + "catenaXId" : "urn:uuid:2c57b0e9-a653-411d-bdcd-64787e9fd3a7", + "childItems" : [ + { + "validityPeriod" : { + "validFrom" : "2023-03-21T08:17:29.187+01:00", + "validTo" : "2024-07-01T16:10:00.000+01:00" + }, + "catenaXId" : "urn:uuid:bee5614f-9e46-4c98-9209-61a6f2b2a7fc", + "quantity" : { + "value" : 1, + "unit" : "unit:litre" + }, + "businessPartner" : "BPNL00000003CML1", + "createdOn" : "2022-02-09T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + }, + { + "validityPeriod" : { + "validFrom" : "2023-03-21T08:17:29.187+01:00", + "validTo" : "2024-07-01T16:10:00.000+01:00" + }, + "catenaXId" : "urn:uuid:4518c080-14fb-4252-b8de-4362d615868d", + "quantity" : { + "value" : 1, + "unit" : "unit:litre" + }, + "businessPartner" : "BPNL00000003CML1", + "createdOn" : "2022-02-10T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + } + ] + } + ] + }, + { + "catenaXId" : "urn:uuid:bee5614f-9e46-4c98-9209-61a6f2b2a7fc", + "bpnl" : "BPNL00000003CML1", + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned" : [ + { + "catenaXId" : "urn:uuid:bee5614f-9e46-4c98-9209-61a6f2b2a7fc", + "sites" : [ + { + "functionValidUntil" : "2031-04-16T11:07:09.000Z", + "catenaXSiteId" : "BPNS00000003B3NX", + "function" : "production", + "functionValidFrom" : "2013-12-07T09:33:50.000Z" + } + ] + } + ], + "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ + { + "localIdentifiers" : [ + ], + "validityPeriod" : { + "validFrom" : "2013-06-18T03:47:22.000Z", + "validTo" : "2030-12-31T23:33:25.000Z" + }, + "catenaXId" : "urn:uuid:bee5614f-9e46-4c98-9209-61a6f2b2a7fc", + "partTypeInformation" : { + "manufacturerPartId" : "6740244-02", + "classification" : "product", + "nameAtManufacturer" : "a/dev Sub Tier A Sensor" + }, + "partSitesInformationAsPlanned" : [ + { + "catenaXsiteId" : "BPNS123456789A", + "function" : "production", + "functionValidFrom" : "2024-04-25T10:00:00Z", + "functionValidUntil" : "2024-04-30T10:00:00Z" + } + ] + } + ], + "urn:samm:io.catenax.single_level_usage_as_planned:1.1.0#SingleLevelUsageAsPlanned" : [ + { + "parentParts" : [ + { + "validityPeriod" : { + "validFrom" : "2023-03-21T08:47:14.438+01:00", + "validTo" : "2024-08-02T09:00:00.000+01:00" + }, + "parentCatenaXId" : "urn:uuid:2c57b0e9-a653-411d-bdcd-64787e9fd3a7", + "quantity" : { + "quantityNumber" : 2.5, + "measurementUnit" : "unit:litre" + }, + "createdOn" : "2022-02-11T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + } + ], + "businessPartner" : "BPNL00000003CNKC", + "catenaXId" : "urn:uuid:bee5614f-9e46-4c98-9209-61a6f2b2a7fc" + } + ] + }, + { + "catenaXId" : "urn:uuid:4518c080-14fb-4252-b8de-4362d615868d", + "bpnl" : "BPNL00000003CML1", + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned" : [ + { + "catenaXId" : "urn:uuid:4518c080-14fb-4252-b8de-4362d615868d", + "sites" : [ + { + "functionValidUntil" : "2030-01-29T19:43:54.000Z", + "catenaXSiteId" : "BPNS00000003B0Q0", + "function" : "production", + "functionValidFrom" : "2015-11-17T18:35:23.000Z" + } + ] + } + ], + "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ + { + "localIdentifiers" : [ + ], + "validityPeriod" : { + "validFrom" : "2015-01-23T16:24:59.000Z", + "validTo" : "2031-05-04T12:01:38.000Z" + }, + "catenaXId" : "urn:uuid:4518c080-14fb-4252-b8de-4362d615868d", + "partTypeInformation" : { + "manufacturerPartId" : "7A987KK-04", + "classification" : "product", + "nameAtManufacturer" : "a/dev N Tier A Plastics" + }, + "partSitesInformationAsPlanned" : [ + { + "catenaXsiteId" : "BPNS123456789A", + "function" : "production", + "functionValidFrom" : "2024-04-25T10:00:00Z", + "functionValidUntil" : "2024-04-30T10:00:00Z" + } + ] + } + ], + "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned" : [ + { + "catenaXId" : "urn:uuid:4518c080-14fb-4252-b8de-4362d615868d", + "childItems" : [ + { + "validityPeriod" : { + "validFrom" : "2023-03-21T08:17:29.187+01:00", + "validTo" : "2024-07-01T16:10:00.000+01:00" + }, + "catenaXId" : "urn:uuid:c7a2b803-f8fe-4b79-b6fc-967ce847c9a1", + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "businessPartner" : "BPNL00000003CNKC", + "createdOn" : "2022-01-03T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + } + ] + } + ], + "urn:samm:io.catenax.single_level_usage_as_planned:1.1.0#SingleLevelUsageAsPlanned" : [ + { + "parentParts" : [ + { + "validityPeriod" : { + "validFrom" : "2023-03-21T08:47:14.438+01:00", + "validTo" : "2024-08-02T09:00:00.000+01:00" + }, + "parentCatenaXId" : "urn:uuid:2c57b0e9-a653-411d-bdcd-64787e9fd3a7", + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "createdOn" : "2022-02-12T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + } + ], + "businessPartner" : "BPNL00000003CNKC", + "catenaXId" : "urn:uuid:4518c080-14fb-4252-b8de-4362d615868d" + } + ] + }, + { + "catenaXId" : "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b", + "bpnl" : "BPNL00000003CNKC", + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned" : [ + { + "catenaXId" : "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b", + "sites" : [ + { + "functionValidUntil" : "2028-09-29T13:56:09.000Z", + "catenaXSiteId" : "BPNS00000003B5MJ", + "function" : "production", + "functionValidFrom" : "2017-01-30T12:55:30.000Z" + } + ] + } + ], + "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ + { + "localIdentifiers" : [ + ], + "validityPeriod" : { + "validFrom" : "2016-04-24T08:26:56.000Z", + "validTo" : "2031-12-17T23:55:04.000Z" + }, + "catenaXId" : "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b", + "partTypeInformation" : { + "manufacturerPartId" : "8583898-48", + "classification" : "product", + "nameAtManufacturer" : "b/test Tier B ECU1" + }, + "partSitesInformationAsPlanned" : [ + { + "catenaXsiteId" : "BPNS123456789A", + "function" : "production", + "functionValidFrom" : "2024-04-25T10:00:00Z", + "functionValidUntil" : "2024-04-30T10:00:00Z" + } + ] + } + ], + "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned" : [ + { + "catenaXId" : "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b", + "childItems" : [ + { + "validityPeriod" : { + "validFrom" : "2023-03-21T08:17:29.187+01:00", + "validTo" : "2024-07-01T16:10:00.000+01:00" + }, + "catenaXId" : "urn:uuid:3cdd2826-5df0-4c7b-b540-9eeccecb2301", + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "businessPartner" : "BPNL00000003CML1", + "createdOn" : "2022-02-13T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + } + ] + } + ], + "urn:samm:io.catenax.single_level_usage_as_planned:1.1.0#SingleLevelUsageAsPlanned" : [ + { + "parentParts" : [ + { + "validityPeriod" : { + "validFrom" : "2023-03-21T08:47:14.438+01:00", + "validTo" : "2024-08-02T09:00:00.000+01:00" + }, + "parentCatenaXId" : "urn:uuid:68904173-ad59-4a77-8412-3e73fcafbd8b", + "quantity" : { + "quantityNumber" : 2.5, + "measurementUnit" : "unit:litre" + }, + "businessPartner" : "BPNL00000003CML1", + "createdOn" : "2022-02-14T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + } + ], + "catenaXId" : "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b" + } + ] + }, + { + "catenaXId" : "urn:uuid:3cdd2826-5df0-4c7b-b540-9eeccecb2301", + "bpnl" : "BPNL00000003CML1", + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned" : [ + { + "catenaXId" : "urn:uuid:3cdd2826-5df0-4c7b-b540-9eeccecb2301", + "sites" : [ + { + "functionValidUntil" : "2032-01-21T11:22:57.000Z", + "catenaXSiteId" : "BPNS00000003AXS3", + "function" : "production", + "functionValidFrom" : "2017-05-27T13:54:13.000Z" + } + ] + } + ], + "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ + { + "localIdentifiers" : [ + ], + "validityPeriod" : { + "validFrom" : "2019-08-17T14:14:30.000Z", + "validTo" : "2032-08-30T04:32:28.000Z" + }, + "catenaXId" : "urn:uuid:3cdd2826-5df0-4c7b-b540-9eeccecb2301", + "partTypeInformation" : { + "manufacturerPartId" : "6775244-06", + "classification" : "product", + "nameAtManufacturer" : "a/dev Sub Tier B Glue" + }, + "partSitesInformationAsPlanned" : [ + { + "catenaXsiteId" : "BPNS123456789A", + "function" : "production", + "functionValidFrom" : "2024-04-25T10:00:00Z", + "functionValidUntil" : "2024-04-30T10:00:00Z" + } + ] + } + ], + "urn:samm:io.catenax.single_level_usage_as_planned:1.1.0#SingleLevelUsageAsPlanned" : [ + { + "parentParts" : [ + { + "validityPeriod" : { + "validFrom" : "2023-03-21T08:47:14.438+01:00", + "validTo" : "2024-08-02T09:00:00.000+01:00" + }, + "parentCatenaXId" : "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b", + "quantity" : { + "quantityNumber" : 2.5, + "measurementUnit" : "unit:litre" + }, + "createdOn" : "2022-02-15T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + } + ], + "businessPartner" : "BPNL00000003CML1", + "catenaXId" : "urn:uuid:3cdd2826-5df0-4c7b-b540-9eeccecb2301" + } + ] + }, + { + "catenaXId" : "urn:uuid:68904173-ad59-4a77-8412-3e73fcafbd8b", + "bpnl" : "BPNL00000003CML1", + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned" : [ + { + "catenaXId" : "urn:uuid:68904173-ad59-4a77-8412-3e73fcafbd8b", + "sites" : [ + { + "functionValidUntil" : "2030-05-16T19:21:46.000Z", + "catenaXSiteId" : "BPNS000000815DMY", + "function" : "production", + "functionValidFrom" : "2019-10-17T03:16:09.000Z" + } + ] + } + ], + "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ + { + "localIdentifiers" : [ + ], + "validityPeriod" : { + "validFrom" : "2016-04-09T20:41:14.000Z", + "validTo" : "2023-12-09T04:46:33.000Z" + }, + "catenaXId" : "urn:uuid:68904173-ad59-4a77-8412-3e73fcafbd8b", + "partTypeInformation" : { + "manufacturerPartId" : "6004474-20", + "classification" : "product", + "nameAtManufacturer" : "a/dev Vehicle Model B" + }, + "partSitesInformationAsPlanned" : [ + { + "catenaXsiteId" : "BPNS123456789A", + "function" : "production", + "functionValidFrom" : "2024-04-25T10:00:00Z", + "functionValidUntil" : "2024-04-30T10:00:00Z" + } + ] + } + ], + "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned" : [ + { + "catenaXId" : "urn:uuid:68904173-ad59-4a77-8412-3e73fcafbd8b", + "childItems" : [ + { + "validityPeriod" : { + "validFrom" : "2023-03-21T08:17:29.187+01:00", + "validTo" : "2024-07-01T16:10:00.000+01:00" + }, + "catenaXId" : "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b", + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "businessPartner" : "BPNL00000003CNKC", + "createdOn" : "2022-02-16T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + } + ] + } + ] + }, + { + "catenaXId" : "urn:uuid:e8c48a8e-d2d7-43d9-a867-65c70c85f5b8", + "bpnl" : "BPNL00000003CNKC", + "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned" : [ + { + "catenaXId" : "urn:uuid:e8c48a8e-d2d7-43d9-a867-65c70c85f5b8", + "sites" : [ + { + "functionValidUntil" : "2028-02-14T21:42:45.000Z", + "catenaXSiteId" : "BPNS00000003B2OM", + "function" : "production", + "functionValidFrom" : "2015-07-21T06:33:16.000Z" + } + ] + } + ], + "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ + { + "localIdentifiers" : [ + ], + "validityPeriod" : { + "validFrom" : "2019-11-02T11:14:15.000Z", + "validTo" : "2024-07-17T02:07:07.000Z" + }, + "catenaXId" : "urn:uuid:e8c48a8e-d2d7-43d9-a867-65c70c85f5b8", + "partTypeInformation" : { + "manufacturerPartId" : "1987361-42", + "classification" : "product", + "nameAtManufacturer" : "b/test Tire Model A" + }, + "partSitesInformationAsPlanned" : [ + { + "catenaXsiteId" : "BPNS123456789A", + "function" : "production", + "functionValidFrom" : "2024-04-25T10:00:00Z", + "functionValidUntil" : "2024-04-30T10:00:00Z" + } + ] + } + ] + }, + { + "catenaXId" : "urn:uuid:44347dec-21d1-47aa-b2a7-f959bf9d424b", + "bpnl" : "BPNL00000003CML1", + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "NO-282209222605524629600815", + "key" : "partInstanceId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:44347dec-21d1-47aa-b2a7-f959bf9d424b", + "partTypeInformation" : { + "manufacturerPartId" : "8840837-48", + "customerPartId" : "9560617-12", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "a/dev HV MODUL", + "nameAtCustomer" : "HV MODUL" + } + } + ], + "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode" : [ + { + "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382320", + "subcomponents" : [ + { + "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382320", + "productType" : "module" + }, + { + "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382321", + "productType" : "module" + }, + { + "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382322", + "productType" : "module" + }, + { + "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382323", + "productType" : "module" + }, + { + "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382324", + "productType" : "module" + }, + { + "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382325", + "productType" : "module" + }, + { + "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382326", + "productType" : "module" + } + ], + "productType" : "module" + } + ] + }, + { + "catenaXId" : "urn:uuid:b0acf3e1-3fbe-46c0-aa0b-0724caae7772", + "bpnl" : "BPNL00000003CNKC", + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CNKC", + "key" : "manufacturerId" + }, + { + "value" : "NO-917923082133064161014067", + "key" : "partInstanceId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:b0acf3e1-3fbe-46c0-aa0b-0724caae7772", + "partTypeInformation" : { + "manufacturerPartId" : "8840374-09", + "customerPartId" : "8840374-09", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "b/test ZB ZELLE", + "nameAtCustomer" : "ZB ZELLE" + } + } + ], + "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode" : [ + { + "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382320", + "subcomponents" : [ + { + "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382320", + "productType" : "cell" + } + ], + "productType" : "cell" + } + ] + }, + { + "catenaXId" : "urn:uuid:1233b405-5ac8-4867-93f8-6fdf37733737", + "bpnl" : "BPNL00000003CML1", + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "NO-135342108157438763234738", + "key" : "partInstanceId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:1233b405-5ac8-4867-93f8-6fdf37733737", + "partTypeInformation" : { + "manufacturerPartId" : "4683655-00", + "customerPartId" : "4683655-00", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "a/dev ZB ZELLE", + "nameAtCustomer" : "ZB ZELLE" + } + } + ], + "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode" : [ + { + "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382320", + "subcomponents" : [ + { + "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382320", + "productType" : "cell" + } + ], + "productType" : "cell" + } + ] + }, + { + "catenaXId" : "urn:uuid:da978a30-4dde-4d76-808a-b7946763ff0d", + "bpnl" : "BPNL00000003CNKC", + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CNKC", + "key" : "manufacturerId" + }, + { + "value" : "NO-655858074471261486971940", + "key" : "partInstanceId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:da978a30-4dde-4d76-808a-b7946763ff0d", + "partTypeInformation" : { + "manufacturerPartId" : "1142469-27", + "customerPartId" : "1142469-27", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "b/test Door Key", + "nameAtCustomer" : "Door Key" + } + } + ], + "urn:samm:io.catenax.just_in_sequence_part:3.0.0#JustInSequencePart" : [ + { + "localIdentifiers" : [ + { + "value" : "92879626SFC", + "key" : "jisNumber" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "HUN" + }, + "catenaXId" : "urn:uuid:da978a30-4dde-4d76-808a-b7946763ff0d", + "partTypeInformation" : { + "manufacturerPartId" : "1417058-05", + "customerPartId" : "PRT-12345", + "classification" : "product", + "nameAtManufacturer" : "b/test Door Key", + "nameAtCustomer" : "Door Key" + } + } + ] + }, + { + "catenaXId" : "urn:uuid:bcfae197-40fa-4be0-821d-5c1873a1b7c2", + "bpnl" : "BPNL00000003CML1", + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "NO-200738629800530338038454", + "key" : "partInstanceId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:bcfae197-40fa-4be0-821d-5c1873a1b7c2", + "partTypeInformation" : { + "manufacturerPartId" : "1261027-41", + "customerPartId" : "1261027-41", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "a/dev Door Key", + "nameAtCustomer" : "Door Key" + } + } + ], + "urn:samm:io.catenax.just_in_sequence_part:3.0.0#JustInSequencePart" : [ + { + "localIdentifiers" : [ + { + "value" : "85851549CBX", + "key" : "jisNumber" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "HUN" + }, + "catenaXId" : "urn:uuid:bcfae197-40fa-4be0-821d-5c1873a1b7c2", + "partTypeInformation" : { + "manufacturerPartId" : "5464168-83", + "customerPartId" : "PRT-12345", + "classification" : "product", + "nameAtManufacturer" : "a/dev Door Key", + "nameAtCustomer" : "Door Key" + } + } + ] + }, + { + "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4070e", + "bpnl" : "BPNL00000003CML1", + "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt" : [ + { + "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4070e", + "customers" : [ + "BPNL00000003CML1" + ], + "parentItems" : [ + { + "catenaXId" : "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36e22", + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "createdOn" : "2023-02-03T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CML1", + "isOnlyPotentialParent" : false + } + ] + } + ], + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "NO-570196089623842018037372", + "key" : "partInstanceId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4070e", + "partTypeInformation" : { + "manufacturerPartId" : "8840838-04", + "customerPartId" : "8840838-04", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "HV MODUL", + "nameAtCustomer" : "HV MODUL" + } + } + ], + "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt" : [ + { + "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4070e", + "childItems" : [ + { + "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fca4f", + "quantity" : { + "value" : 2.5, + "unit" : "unit:litre" + }, + "hasAlternatives" : true, + "businessPartner" : "BPNL00000003CML1", + "createdOn" : "2022-02-03T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + } + ] + } + ] + }, + { + "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fca4f", + "bpnl" : "BPNL00000003CML1", + "urn:samm:io.catenax.batch:3.0.0#Batch" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "BID12345678", + "key" : "batchId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "HUN" + }, + "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fca4f", + "partTypeInformation" : { + "manufacturerPartId" : "123-0.740-3434-A", + "classification" : "product", + "nameAtManufacturer" : "Sealant" + } + } + ] + }, + { + "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4080f", + "bpnl" : "BPNL00000003CNKC", + "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt" : [ + { + "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4080f", + "customers" : [ + "BPNL00000003CNKC" + ], + "businessPartner" : "BPNL00000003CNKC", + "parentItems" : [], + "createdOn" : "2022-02-03T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + } + ], + "urn:samm:io.catenax.serial_part:3.0.0#SerialPart" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CNKC", + "key" : "manufacturerId" + }, + { + "value" : "NO-570196089623842018037372", + "key" : "partInstanceId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4080f", + "partTypeInformation" : { + "manufacturerPartId" : "8840838-04", + "customerPartId" : "8840838-04", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "HV MODUL", + "nameAtCustomer" : "HV MODUL" + } + } + ], + "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt" : [ + { + "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4080f", + "childItems" : [ + { + "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fcb5f", + "quantity" : { + "value" : 2.5, + "unit" : "unit:litre" + }, + "hasAlternatives" : true, + "businessPartner" : "BPNL00000003CNKC", + "createdOn" : "2022-02-03T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + } + ] + } + ] + }, + { + "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fcb5f", + "bpnl" : "BPNL00000003CNKC", + "urn:samm:io.catenax.batch:3.0.0#Batch" : [ + { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CNKC", + "key" : "manufacturerId" + }, + { + "value" : "BID12345678", + "key" : "batchId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54Z", + "country" : "HUN" + }, + "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fcb5f", + "partTypeInformation" : { + "manufacturerPartId" : "123-0.740-5656-A", + "classification" : "product", + "nameAtManufacturer" : "Sealant" + } + } + ] + } + ] +} diff --git a/tx-backend/testdata/import-test-data-CML1_v0.0.13.json b/tx-backend/testdata/import-test-data-CML1_v0.0.13.json new file mode 100644 index 0000000000..12872f5d2d --- /dev/null +++ b/tx-backend/testdata/import-test-data-CML1_v0.0.13.json @@ -0,0 +1,1343 @@ +{ + "assets" : [ + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36e22" + }, + "submodels" : [ + { + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", + "payload" : { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "OMAOYGBDTSRCMYSCX", + "key" : "partInstanceId" + }, + { + "value" : "OMAOYGBDTSRCMYSCX", + "key" : "van" + } + ], + "manufacturingInformation" : { + "date" : "2018-09-28T04:15:57.000Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36e22", + "partTypeInformation" : { + "manufacturerPartId" : "3500076-05", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "a/dev Vehicle Hybrid" + } + } + }, + { + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", + "payload" : { + "catenaXId" : "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36e22", + "childItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "hasAlternatives" : true, + "createdOn" : "2022-02-03T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z", + "catenaXId" : "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd", + "businessPartner" : "BPNL00000003CNKC" + } + ] + } + } + ] + }, + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:d8030bbf-a874-49fb-b2e1-7610f0ccad12" + }, + "submodels" : [ + { + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", + "payload" : { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "OMAYSKEITUGNVHKKX", + "key" : "partInstanceId" + }, + { + "value" : "OMAYSKEITUGNVHKKX", + "key" : "van" + } + ], + "manufacturingInformation" : { + "date" : "2015-03-07T19:38:12.000Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:d8030bbf-a874-49fb-b2e1-7610f0ccad12", + "partTypeInformation" : { + "manufacturerPartId" : "4922009-56", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "a/dev Vehicle Hybrid" + } + } + }, + { + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", + "payload" : { + "catenaXId" : "urn:uuid:d8030bbf-a874-49fb-b2e1-7610f0ccad12", + "childItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "hasAlternatives" : true, + "createdOn" : "2021-01-15T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z", + "catenaXId" : "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a", + "businessPartner" : "BPNL00000003CNKC" + } + ] + } + } + ] + }, + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:4e390dab-707f-446e-bfbe-653f6f5b1f37" + }, + "submodels" : [ + { + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", + "payload" : { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "NO-493575190274381019348907", + "key" : "partInstanceId" + } + + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54.000Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:4e390dab-707f-446e-bfbe-653f6f5b1f37", + "partTypeInformation" : { + "manufacturerPartId" : "6683834-82", + "customerPartId" : "6683834-82", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "Door Key", + "nameAtCustomer" : "Door Key" + } + } + }, + { + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", + "payload" : { + "catenaXId" : "urn:uuid:4e390dab-707f-446e-bfbe-653f6f5b1f37", + "customers" : [ + "BPNL00000003CNKC" + ], + "parentItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a", + "createdOn" : "2023-12-05T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CNKC", + "isOnlyPotentialParent": false + } + ] + } + } + ] + }, + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:7c7d5aec-b15d-491c-8fbd-c61c6c02c69a" + }, + "submodels" : [ + { + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", + "payload" : { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "OMAZRXWWMSPTQUEKI", + "key" : "partInstanceId" + }, + { + "value" : "OMAZRXWWMSPTQUEKI", + "key" : "van" + } + ], + "manufacturingInformation" : { + "date" : "2015-07-04T14:30:31.000Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:7c7d5aec-b15d-491c-8fbd-c61c6c02c69a", + "partTypeInformation" : { + "manufacturerPartId" : "5519583-63", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "Vehicle Hybrid" + } + } + }, + { + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", + "payload" : { + "catenaXId" : "urn:uuid:7c7d5aec-b15d-491c-8fbd-c61c6c02c69a", + "childItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "hasAlternatives" : true, + "createdOn" : "2022-11-22T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z", + "catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd", + "businessPartner" : "BPNL00000003CNKC" + } + ] + } + } + ] + }, + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:4a5e9ff6-2d5c-4510-a90e-d55af3ba502f" + }, + "submodels" : [ + { + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", + "payload" : { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "NO-246880451848384868750731", + "key" : "partInstanceId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54.000Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:4a5e9ff6-2d5c-4510-a90e-d55af3ba502f", + "partTypeInformation" : { + "manufacturerPartId" : "8770123-80", + "customerPartId" : "8770123-80", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "a/dev Door Key", + "nameAtCustomer" : "Door Key" + } + } + }, + { + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", + "payload" : { + "catenaXId" : "urn:uuid:4a5e9ff6-2d5c-4510-a90e-d55af3ba502f", + "customers" : [ + "BPNL00000003CNKC" + ], + "parentItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd", + "createdOn" : "2023-04-13T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CNKC", + "isOnlyPotentialParent" : false + } + ] + } + } + ] + }, + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:6ec3f1db-2798-454b-a73f-0d21a8966c74" + }, + "submodels" : [ + { + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", + "payload" : { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "NO-613963493493659233961306", + "key" : "partInstanceId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54.000Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:6ec3f1db-2798-454b-a73f-0d21a8966c74", + "partTypeInformation" : { + "manufacturerPartId" : "5756987-94", + "customerPartId" : "5756987-94", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], + "nameAtManufacturer" : "a/dev Door Key", + "nameAtCustomer" : "Door Key" + } + } + }, + { + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", + "payload" : { + "catenaXId" : "urn:uuid:6ec3f1db-2798-454b-a73f-0d21a8966c74", + "customers" : [ + "BPNL00000003CNKC" + ], + "parentItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:c47b9f8b-48d0-4ef4-8f0b-e965a225cb8d", + "createdOn" : "2023-08-21T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "isOnlyPotentialParent" : false, + "businessPartner" : "BPNL00000003CNKC" + } + ] + } + } + ] + }, + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa01" + }, + "submodels" : [ + { + "aspectType" : "urn:samm:io.catenax.batch:3.0.0#Batch", + "payload" : { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "NO-341449848714937445621543", + "key" : "batchId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54.000Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa01", + "partTypeInformation" : { + "manufacturerPartId" : "9858559-85", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], + "nameAtManufacturer" : "a/dev Door Key" + } + } + } + ] + }, + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02" + }, + "submodels" : [ + { + "aspectType" : "urn:samm:io.catenax.batch:3.0.0#Batch", + "payload" : { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "NO-341449848714937445621543", + "key" : "batchId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54.000Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02", + "partTypeInformation" : { + "manufacturerPartId" : "9623673-66", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], + "nameAtManufacturer" : "a/dev Door Key" + } + } + }, + { + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", + "payload" : { + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02", + "childItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "hasAlternatives" : true, + "createdOn" : "2016-01-20T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z", + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb01", + "businessPartner" : "BPNL00000003CNKC" + } + ] + } + } + ] + }, + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa03" + }, + "submodels" : [ + { + "aspectType" : "urn:samm:io.catenax.batch:3.0.0#Batch", + "payload" : { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "NO-341449848714937445621543", + "key" : "batchId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54.000Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa03", + "partTypeInformation" : { + "manufacturerPartId" : "4902203-92", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], + "nameAtManufacturer" : "a/dev Door Key" + } + } + }, + { + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", + "payload" : { + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa03", + "customers" : [ + "BPNL00000003CNKC" + ], + "parentItems" : [ + { + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb02", + "createdOn" : "2022-07-03T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "isOnlyPotentialParent" : false, + "businessPartner" : "BPNL00000003CNKC" + } + ] + } + } + ] + }, + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4da01" + }, + "submodels" : [ + { + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", + "payload" : { + "localIdentifiers" : [ + + ], + "validityPeriod" : { + "validFrom" : "2019-04-04T03:19:03.000Z", + "validTo" : "2024-12-29T10:25:12.000Z" + }, + "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4da01", + "partTypeInformation" : { + "manufacturerPartId" : "9649571-63", + "classification" : "product", + "nameAtManufacturer" : "a/dev Vehicle Model A" + }, + "partSitesInformationAsPlanned" : [ + { + "catenaXsiteId" : "BPNS123456789A", + "function" : "production", + "functionValidFrom" : "2024-04-25T10:00:00Z", + "functionValidUntil" : "2024-04-30T10:00:00Z" + } + ] + } + }, + { + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", + "payload" : { + "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4da01", + "childItems" : [ + { + "validityPeriod" : { + "validFrom" : "2023-03-21T08:17:29.187+01:00", + "validTo" : "2024-07-01T16:10:00.000+01:00" + }, + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "createdOn" : "2022-08-03T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z", + "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4eb01", + "businessPartner" : "BPNL00000003CNKC" + } + ] + } + }, + { + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "payload" : { + "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4da01", + "sites" : [ + { + "functionValidUntil" : "2025-02-08T04:30:48.000Z", + "function" : "production", + "functionValidFrom" : "2019-08-21T02:10:36.000Z", + "catenaXSiteId" : "BPNS000004711DMY" + } + ] + } + } + ] + }, + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e43842" + }, + "submodels" : [ + { + "aspectType" : "urn:samm:io.catenax.just_in_sequence_part:3.0.0#JustInSequencePart", + "payload" : { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "12345678ABC", + "key" : "jisNumber" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54.000Z", + "country" : "HUN" + }, + "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e43842", + "partTypeInformation" : { + "manufacturerPartId" : "8397292-13", + "customerPartId" : "PRT-12345", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], + "nameAtManufacturer" : "Mirror left", + "nameAtCustomer" : "a/dev side element A" + } + } + } + ] + }, + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef127c" + }, + "submodels" : [ + { + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", + "payload" : { + "localIdentifiers" : [ + + ], + "validityPeriod" : { + "validFrom" : "2015-05-18T23:10:44.000Z", + "validTo" : "2025-10-23T14:46:01.000Z" + }, + "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef127c", + "partTypeInformation" : { + "manufacturerPartId" : "38049661-08", + "classification" : "product", + "nameAtManufacturer" : "a/dev OEM A High Voltage Battery" + }, + "partSitesInformationAsPlanned" : [ + { + "catenaXsiteId" : "BPNS123456789A", + "function" : "production", + "functionValidFrom" : "2024-04-25T10:00:00Z", + "functionValidUntil" : "2024-04-30T10:00:00Z" + } + ] + } + }, + { + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", + "payload" : { + "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef127c", + "childItems" : [ + { + "validityPeriod" : { + "validFrom" : "2023-03-21T08:17:29.187+01:00", + "validTo" : "2024-07-01T16:10:00.000+01:00" + }, + "catenaXId" : "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca97", + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "businessPartner" : "BPNL00000003CML1", + "createdOn" : "2022-10-03T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + } + ] + } + }, + { + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "payload" : { + "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef127c", + "sites" : [ + { + "functionValidUntil" : "2027-05-23T09:16:30.000Z", + "catenaXSiteId" : "BPNS000004711DMY", + "function" : "production", + "functionValidFrom" : "2013-11-17T23:59:54.000Z" + } + ] + } + } + ] + }, + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca98" + }, + "submodels" : [ + { + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", + "payload" : { + "localIdentifiers" : [ + + ], + "validityPeriod" : { + "validFrom" : "2018-01-25T08:42:58.000Z", + "validTo" : "2029-02-10T03:24:30.000Z" + }, + "catenaXId" : "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca98", + "partTypeInformation" : { + "manufacturerPartId" : "7805659-25", + "classification" : "product", + "nameAtManufacturer" : "b/test Vehicle Model B" + }, + "partSitesInformationAsPlanned" : [ + { + "catenaXsiteId" : "BPNS123456789A", + "function" : "production", + "functionValidFrom" : "2024-04-25T10:00:00Z", + "functionValidUntil" : "2024-04-30T10:00:00Z" + } + ] + } + }, + { + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", + "payload" : { + "catenaXId" : "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca98", + "childItems" : [ + { + "validityPeriod" : { + "validFrom" : "2023-03-21T08:17:29.187+01:00", + "validTo" : "2024-07-01T16:10:00.000+01:00" + }, + "catenaXId" : "urn:uuid:c7a2b803-f8fe-4b79-b6fc-967ce847c9a1", + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "businessPartner" : "BPNL00000003CNKC", + "createdOn" : "2022-01-03T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + } + ] + } + }, + { + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "payload" : { + "catenaXId" : "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca98", + "sites" : [ + { + "functionValidUntil" : "2031-11-21T03:24:27.000Z", + "catenaXSiteId" : "BPNS000004711DMY", + "function" : "production", + "functionValidFrom" : "2020-06-07T07:30:47.000Z" + } + ] + } + } + ] + }, + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:4f7b1cf2-a598-4027-bc78-63f6d8e55699" + }, + "submodels" : [ + { + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", + "payload" : { + "localIdentifiers" : [ + + ], + "validityPeriod" : { + "validFrom" : "2013-11-24T00:27:33.000Z", + "validTo" : "2025-08-16T09:18:35.000Z" + }, + "catenaXId" : "urn:uuid:4f7b1cf2-a598-4027-bc78-63f6d8e55699", + "partTypeInformation" : { + "manufacturerPartId" : "7A047C7-01", + "classification" : "product", + "nameAtManufacturer" : "a/dev N Tier A CathodeMaterial" + }, + "partSitesInformationAsPlanned" : [ + { + "catenaXsiteId" : "BPNS123456789A", + "function" : "production", + "functionValidFrom" : "2024-04-25T10:00:00Z", + "functionValidUntil" : "2024-04-30T10:00:00Z" + } + ] + } + }, + { + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "payload" : { + "catenaXId" : "urn:uuid:4f7b1cf2-a598-4027-bc78-63f6d8e55699", + "sites" : [ + { + "functionValidUntil" : "2025-03-05T00:33:55.000Z", + "catenaXSiteId" : "BPNS00000003B0Q0", + "function" : "production", + "functionValidFrom" : "2019-09-10T14:41:50.000Z" + } + ] + } + } + ] + }, + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:bee5614f-9e46-4c98-9209-61a6f2b2a7fc" + }, + "submodels" : [ + { + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", + "payload" : { + "localIdentifiers" : [ + + ], + "validityPeriod" : { + "validFrom" : "2013-06-18T03:47:22.000Z", + "validTo" : "2030-12-31T23:33:25.000Z" + }, + "catenaXId" : "urn:uuid:bee5614f-9e46-4c98-9209-61a6f2b2a7fc", + "partTypeInformation" : { + "manufacturerPartId" : "6740244-02", + "classification" : "product", + "nameAtManufacturer" : "a/dev Sub Tier A Sensor" + }, + "partSitesInformationAsPlanned" : [ + { + "catenaXsiteId" : "BPNS123456789A", + "function" : "production", + "functionValidFrom" : "2024-04-25T10:00:00Z", + "functionValidUntil" : "2024-04-30T10:00:00Z" + } + ] + } + }, + { + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "payload" : { + "catenaXId" : "urn:uuid:bee5614f-9e46-4c98-9209-61a6f2b2a7fc", + "sites" : [ + { + "functionValidUntil" : "2031-04-16T11:07:09.000Z", + "catenaXSiteId" : "BPNS00000003B3NX", + "function" : "production", + "functionValidFrom" : "2013-12-07T09:33:50.000Z" + } + ] + } + } + ] + }, + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:4518c080-14fb-4252-b8de-4362d615868d" + }, + "submodels" : [ + { + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", + "payload" : { + "localIdentifiers" : [ + + ], + "validityPeriod" : { + "validFrom" : "2015-01-23T16:24:59.000Z", + "validTo" : "2031-05-04T12:01:38.000Z" + }, + "catenaXId" : "urn:uuid:4518c080-14fb-4252-b8de-4362d615868d", + "partTypeInformation" : { + "manufacturerPartId" : "7A987KK-04", + "classification" : "product", + "nameAtManufacturer" : "a/dev N Tier A Plastics" + }, + "partSitesInformationAsPlanned" : [ + { + "catenaXsiteId" : "BPNS123456789A", + "function" : "production", + "functionValidFrom" : "2024-04-25T10:00:00Z", + "functionValidUntil" : "2024-04-30T10:00:00Z" + } + ] + } + }, + { + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", + "payload" : { + "catenaXId" : "urn:uuid:4518c080-14fb-4252-b8de-4362d615868d", + "childItems" : [ + { + "validityPeriod" : { + "validFrom" : "2023-03-21T08:17:29.187+01:00", + "validTo" : "2024-07-01T16:10:00.000+01:00" + }, + "catenaXId" : "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b", + "quantity" : { + "value" : 1, + "unit" : "unit:litre" + }, + "businessPartner" : "BPNL00000003CNKC", + "createdOn" : "2022-02-16T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + } + ] + } + }, + { + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "payload" : { + "catenaXId" : "urn:uuid:4518c080-14fb-4252-b8de-4362d615868d", + "sites" : [ + { + "functionValidUntil" : "2030-01-29T19:43:54.000Z", + "catenaXSiteId" : "BPNS00000003B0Q0", + "function" : "production", + "functionValidFrom" : "2015-11-17T18:35:23.000Z" + } + ] + } + } + ] + }, + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:3cdd2826-5df0-4c7b-b540-9eeccecb2301" + }, + "submodels" : [ + { + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", + "payload" : { + "localIdentifiers" : [ + + ], + "validityPeriod" : { + "validFrom" : "2019-08-17T14:14:30.000Z", + "validTo" : "2032-08-30T04:32:28.000Z" + }, + "catenaXId" : "urn:uuid:3cdd2826-5df0-4c7b-b540-9eeccecb2301", + "partTypeInformation" : { + "manufacturerPartId" : "6775244-06", + "classification" : "product", + "nameAtManufacturer" : "a/dev Sub Tier B Glue" + }, + "partSitesInformationAsPlanned" : [ + { + "catenaXsiteId" : "BPNS123456789A", + "function" : "production", + "functionValidFrom" : "2024-04-25T10:00:00Z", + "functionValidUntil" : "2024-04-30T10:00:00Z" + } + ] + } + }, + { + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "payload" : { + "catenaXId" : "urn:uuid:3cdd2826-5df0-4c7b-b540-9eeccecb2301", + "sites" : [ + { + "functionValidUntil" : "2032-01-21T11:22:57.000Z", + "catenaXSiteId" : "BPNS00000003AXS3", + "function" : "production", + "functionValidFrom" : "2017-05-27T13:54:13.000Z" + } + ] + } + } + ] + }, + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:68904173-ad59-4a77-8412-3e73fcafbd8b" + }, + "submodels" : [ + { + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", + "payload" : { + "localIdentifiers" : [ + + ], + "validityPeriod" : { + "validFrom" : "2016-04-09T20:41:14.000Z", + "validTo" : "2023-12-09T04:46:33.000Z" + }, + "catenaXId" : "urn:uuid:68904173-ad59-4a77-8412-3e73fcafbd8b", + "partTypeInformation" : { + "manufacturerPartId" : "6004474-20", + "classification" : "product", + "nameAtManufacturer" : "a/dev Vehicle Model B" + }, + "partSitesInformationAsPlanned" : [ + { + "catenaXsiteId" : "BPNS123456789A", + "function" : "production", + "functionValidFrom" : "2024-04-25T10:00:00Z", + "functionValidUntil" : "2024-04-30T10:00:00Z" + } + ] + } + }, + { + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", + "payload" : { + "catenaXId" : "urn:uuid:68904173-ad59-4a77-8412-3e73fcafbd8b", + "childItems" : [ + { + "validityPeriod" : { + "validFrom" : "2023-03-21T08:17:29.187+01:00", + "validTo" : "2024-07-01T16:10:00.000+01:00" + }, + "catenaXId" : "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b", + "quantity" : { + "value" : 1, + "unit" : "unit:litre" + }, + "businessPartner" : "BPNL00000003CNKC", + "createdOn" : "2022-02-16T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + } + ] + } + }, + { + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "payload" : { + "catenaXId" : "urn:uuid:68904173-ad59-4a77-8412-3e73fcafbd8b", + "sites" : [ + { + "functionValidUntil" : "2030-05-16T19:21:46.000Z", + "catenaXSiteId" : "BPNS000000815DMY", + "function" : "production", + "functionValidFrom" : "2019-10-17T03:16:09.000Z" + } + ] + } + } + ] + }, + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:44347dec-21d1-47aa-b2a7-f959bf9d424b" + }, + "submodels" : [ + { + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", + "payload" : { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "NO-282209222605524629600815", + "key" : "partInstanceId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54.000Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:44347dec-21d1-47aa-b2a7-f959bf9d424b", + "partTypeInformation" : { + "manufacturerPartId" : "8840837-48", + "customerPartId" : "9560617-12", + "classification" : "component", + "nameAtManufacturer" : "a/dev HV MODUL", + "nameAtCustomer" : "HV MODUL" + } + } + }, + { + "aspectType" : "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", + "payload" : { + "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382320", + "subcomponents" : [ + { + "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382320", + "productType" : "module" + }, + { + "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382321", + "productType" : "module" + }, + { + "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382322", + "productType" : "module" + }, + { + "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382323", + "productType" : "module" + }, + { + "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382324", + "productType" : "module" + }, + { + "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382325", + "productType" : "module" + }, + { + "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382326", + "productType" : "module" + } + ], + "productType" : "module" + } + } + ] + }, + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:1233b405-5ac8-4867-93f8-6fdf37733737" + }, + "submodels" : [ + { + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", + "payload" : { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "NO-135342108157438763234738", + "key" : "partInstanceId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54.000Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:1233b405-5ac8-4867-93f8-6fdf37733737", + "partTypeInformation" : { + "manufacturerPartId" : "4683655-00", + "customerPartId" : "4683655-00", + "classification" : "component", + "nameAtManufacturer" : "a/dev ZB ZELLE", + "nameAtCustomer" : "ZB ZELLE" + } + } + }, + { + "aspectType" : "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", + "payload" : { + "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382320", + "subcomponents" : [ + { + "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382320", + "productType" : "cell" + } + ], + "productType" : "cell" + } + } + ] + }, + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:bcfae197-40fa-4be0-821d-5c1873a1b7c2" + }, + "submodels" : [ + { + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", + "payload" : { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "NO-200738629800530338038454", + "key" : "partInstanceId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54.000Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:bcfae197-40fa-4be0-821d-5c1873a1b7c2", + "partTypeInformation" : { + "manufacturerPartId" : "1261027-41", + "customerPartId" : "1261027-41", + "classification" : "component", + "nameAtManufacturer" : "a/dev Door Key", + "nameAtCustomer" : "Door Key" + } + } + }, + { + "aspectType" : "urn:samm:io.catenax.just_in_sequence_part:3.0.0#JustInSequencePart", + "payload" : { + "localIdentifiers" : [ + { + "value" : "85851549CBX", + "key" : "jisNumber" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54.000Z", + "country" : "HUN" + }, + "catenaXId" : "urn:uuid:bcfae197-40fa-4be0-821d-5c1873a1b7c2", + "partTypeInformation" : { + "manufacturerPartId" : "5464168-83", + "customerPartId" : "PRT-12345", + "classification" : "product", + "nameAtManufacturer" : "a/dev Door Key", + "nameAtCustomer" : "Door Key" + } + } + } + ] + }, + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4070e" + }, + "submodels" : [ + { + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", + "payload" : { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "NO-570196089623842018037372", + "key" : "partInstanceId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54.000Z", + "country" : "DEU" + }, + "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4070e", + "partTypeInformation" : { + "manufacturerPartId" : "8840838-04", + "customerPartId" : "8840838-04", + "classification" : "component", + "nameAtManufacturer" : "HV MODUL", + "nameAtCustomer" : "HV MODUL" + } + } + }, + { + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", + "payload" : { + "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4070e", + "childItems" : [ + { + "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fca4f", + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "hasAlternatives" : true, + "businessPartner" : "BPNL00000003CML1", + "createdOn" : "2022-02-03T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + } + ] + } + }, + { + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", + "payload" : { + "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4070e", + "customers" : [ + "BPNL00000003CML1" + ], + "parentItems" : [ + { + "catenaXId" : "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36e22", + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "createdOn" : "2023-02-03T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CML1", + "isOnlyPotentialParent" : false + } + ] + } + } + ] + }, + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fca4f" + }, + "submodels" : [ + { + "aspectType" : "urn:samm:io.catenax.batch:3.0.0#Batch", + "payload" : { + "localIdentifiers" : [ + { + "value" : "BPNL00000003CML1", + "key" : "manufacturerId" + }, + { + "value" : "BID12345678", + "key" : "batchId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54.000Z", + "country" : "HUN" + }, + "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fca4f", + "partTypeInformation" : { + "manufacturerPartId" : "123-0.740-3434-A", + "partClassification" : [ + { + "classificationStandard": "classificationStandard", + "classificationID": "classificationID", + "classificationDescription": "classificationDescription" + } + ], + "nameAtManufacturer" : "Sealant" + } + } + } + ] + } + ] +} diff --git a/tx-backend/src/test/resources/testdata/importfiles/validImportFileButWrongBPN.json b/tx-backend/testdata/import-test-data-CNKC_v0.0.13.json similarity index 70% rename from tx-backend/src/test/resources/testdata/importfiles/validImportFileButWrongBPN.json rename to tx-backend/testdata/import-test-data-CNKC_v0.0.13.json index 3ff5f783fa..66676b3002 100644 --- a/tx-backend/src/test/resources/testdata/importfiles/validImportFileButWrongBPN.json +++ b/tx-backend/testdata/import-test-data-CNKC_v0.0.13.json @@ -6,45 +6,47 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { - "value" : "BPNL00000003XXX1", + "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, - { - "value" : "22782277-50", - "key" : "manufacturerPartId" - }, { "value" : "NO-313869652971440618042264", "key" : "partInstanceId" } ], "manufacturingInformation" : { - "date" : "2018-09-28T04:15:57.000Z", + "date" : "2022-02-04T14:48:54.000Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd", "partTypeInformation" : { "manufacturerPartId" : "22782277-50", "customerPartId" : "22782277-50", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], "nameAtManufacturer" : "Door f-l", "nameAtCustomer" : "b/test Door front-left" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd", "childItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2023-02-20T14:48:54.709Z", @@ -56,25 +58,23 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd", "customers" : [ + "BPNL00000003CML1" + ], + "parentItems" : [ { - "parentItems" : [ - { - "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" - }, - "catenaXId" : "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36e22", - "createdOn" : "2023-05-29T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ], + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36e22", + "createdOn" : "2023-05-29T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", "businessPartner" : "BPNL00000003CML1", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "isOnlyPotentialParent" : false } ] } @@ -87,45 +87,47 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { - "value" : "BPNL00000003AXS3", + "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, - { - "value" : "3880383-57", - "key" : "manufacturerPartId" - }, { "value" : "NO-989134870198932317923938", "key" : "partInstanceId" } ], "manufacturingInformation" : { - "date" : "2018-09-28T04:15:57.000Z", + "date" : "2022-02-04T14:48:54.000Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a", "partTypeInformation" : { "manufacturerPartId" : "3880383-57", "customerPartId" : "3880383-57", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door f-l", "nameAtCustomer" : "Door front-left" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a", "childItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2020-05-02T14:48:54.709Z", @@ -137,25 +139,23 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a", "customers" : [ + "BPNL00000003CML1" + ], + "parentItems" : [ { - "parentItems" : [ - { - "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" - }, - "catenaXId" : "urn:uuid:d8030bbf-a874-49fb-b2e1-7610f0ccad12", - "createdOn" : "2023-07-15T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ], + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:d8030bbf-a874-49fb-b2e1-7610f0ccad12", + "createdOn" : "2023-07-15T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", "businessPartner" : "BPNL00000003CML1", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "isOnlyPotentialParent" : false } ] } @@ -168,45 +168,47 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { - "value" : "BPNL00000003AXS3", + "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, - { - "value" : "9069675-60", - "key" : "manufacturerPartId" - }, { "value" : "NO-004314332935115065980115", "key" : "partInstanceId" } ], "manufacturingInformation" : { - "date" : "2018-09-28T04:15:57.000Z", + "date" : "2022-02-04T14:48:54.000Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd", "partTypeInformation" : { "manufacturerPartId" : "9069675-60", "customerPartId" : "9069675-60", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door f-l", "nameAtCustomer" : "Door front-left" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd", "childItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2018-09-17T14:48:54.709Z", @@ -218,25 +220,23 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd", "customers" : [ + "BPNL00000003CML1" + ], + "parentItems" : [ { - "parentItems" : [ - { - "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" - }, - "catenaXId" : "urn:uuid:7c7d5aec-b15d-491c-8fbd-c61c6c02c69a", - "createdOn" : "2023-02-16T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ], + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:7c7d5aec-b15d-491c-8fbd-c61c6c02c69a", + "createdOn" : "2023-02-16T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", "businessPartner" : "BPNL00000003CML1", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "isOnlyPotentialParent" : false } ] } @@ -249,45 +249,47 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { - "value" : "BPNL00000003AXS3", + "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, - { - "value" : "9879317-51", - "key" : "manufacturerPartId" - }, { "value" : "NO-477013846751358222215326", "key" : "partInstanceId" } ], "manufacturingInformation" : { - "date" : "2018-09-28T04:15:57.000Z", + "date" : "2022-02-04T14:48:54.000Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:c47b9f8b-48d0-4ef4-8f0b-e965a225cb8d", "partTypeInformation" : { "manufacturerPartId" : "9879317-51", "customerPartId" : "9879317-51", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door f-l", "nameAtCustomer" : "Door front-left" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:c47b9f8b-48d0-4ef4-8f0b-e965a225cb8d", "childItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2022-06-28T14:48:54.709Z", @@ -299,25 +301,23 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:c47b9f8b-48d0-4ef4-8f0b-e965a225cb8d", "customers" : [ + "BPNL00000003CSGV" + ], + "parentItems" : [ { - "parentItems" : [ - { - "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" - }, - "catenaXId" : "urn:uuid:4d33bfa6-0f1f-43a5-ad63-c3fe07a2d076", - "createdOn" : "2023-03-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ], + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:4d33bfa6-0f1f-43a5-ad63-c3fe07a2d076", + "createdOn" : "2023-03-03T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", "businessPartner" : "BPNL00000003CSGV", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "isOnlyPotentialParent" : false } ] } @@ -330,11 +330,11 @@ }, "submodels" : [ { - "aspectType" : "urn:samm:io.catenax.batch:2.0.0#Batch", + "aspectType" : "urn:samm:io.catenax.batch:3.0.0#Batch", "payload" : { "localIdentifiers" : [ { - "value" : "BPNL00000003AXS3", + "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, { @@ -343,37 +343,41 @@ } ], "manufacturingInformation" : { - "date" : "2018-09-28T04:15:57.000Z", + "date" : "2022-02-04T14:48:54.000Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb01", "partTypeInformation" : { "manufacturerPartId" : "5894914-94", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door Key" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb01", "customers" : [ + "BPNL00000003CML1" + ], + "parentItems" : [ { - "parentItems" : [ - { - "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" - }, - "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02", - "createdOn" : "2023-08-08T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" - } - ], + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02", + "createdOn" : "2023-08-08T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", "businessPartner" : "BPNL00000003CML1", - "createdOn" : "2023-02-03T14:48:54.709Z", - "lastModifiedOn" : "2023-02-03T14:48:54.709Z" + "isOnlyPotentialParent" : false } ] } @@ -386,11 +390,11 @@ }, "submodels" : [ { - "aspectType" : "urn:samm:io.catenax.batch:2.0.0#Batch", + "aspectType" : "urn:samm:io.catenax.batch:3.0.0#Batch", "payload" : { "localIdentifiers" : [ { - "value" : "BPNL00000003AXS3", + "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, { @@ -399,26 +403,32 @@ } ], "manufacturingInformation" : { - "date" : "2018-09-28T04:15:57.000Z", + "date" : "2022-02-04T14:48:54.000Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb02", "partTypeInformation" : { "manufacturerPartId" : "6245773-32", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door Key" } } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb02", "childItems" : [ { "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, "createdOn" : "2019-08-15T14:48:54.709Z", @@ -437,11 +447,11 @@ }, "submodels" : [ { - "aspectType" : "urn:samm:io.catenax.batch:2.0.0#Batch", + "aspectType" : "urn:samm:io.catenax.batch:3.0.0#Batch", "payload" : { "localIdentifiers" : [ { - "value" : "BPNL00000003AXS3", + "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, { @@ -450,13 +460,19 @@ } ], "manufacturingInformation" : { - "date" : "2018-09-28T04:15:57.000Z", + "date" : "2022-02-04T14:48:54.000Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb03", "partTypeInformation" : { "manufacturerPartId" : "9770171-23", - "classification" : "component", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], "nameAtManufacturer" : "b/test Door Key" } } @@ -469,8 +485,10 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { + "localIdentifiers" : [ + ], "validityPeriod" : { "validFrom" : "2019-04-04T03:19:03.000Z", "validTo" : "2024-12-29T10:25:12.000Z" @@ -480,11 +498,19 @@ "manufacturerPartId" : "7805659-25", "classification" : "product", "nameAtManufacturer" : "b/test Vehicle Model B" - } + }, + "partSitesInformationAsPlanned" : [ + { + "catenaXsiteId" : "BPNS123456789A", + "function" : "production", + "functionValidFrom" : "2024-04-25T10:00:00Z", + "functionValidUntil" : "2024-04-30T10:00:00Z" + } + ] } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4eb01", "childItems" : [ @@ -494,8 +520,8 @@ "validTo" : "2024-07-01T16:10:00.000+01:00" }, "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:piece" + "value" : 1, + "unit" : "unit:litre" }, "createdOn" : "2022-09-03T14:48:54.709Z", "lastModifiedOn" : "2022-02-03T14:48:54.709Z", @@ -506,7 +532,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4eb01", "sites" : [ @@ -527,11 +553,11 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.just_in_sequence_part:1.0.0#JustInSequencePart", + "aspectType" : "urn:samm:io.catenax.just_in_sequence_part:3.0.0#JustInSequencePart", "payload" : { "localIdentifiers" : [ { - "value" : "BPNL00000003AXS3", + "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, { @@ -540,14 +566,20 @@ } ], "manufacturingInformation" : { - "date" : "2018-09-28T04:15:57.000Z", + "date" : "2022-02-04T14:48:54.000Z", "country" : "HUN" }, "catenaXId" : "urn:uuid:580d3adf-1981-44a0-a214-13d6ceed6841", "partTypeInformation" : { "manufacturerPartId" : "3578115-43", "customerPartId" : "PRT-12345", - "classification" : "product", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], "nameAtManufacturer" : "Mirror left", "nameAtCustomer" : "b/test side element A" } @@ -561,8 +593,10 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { + "localIdentifiers" : [ + ], "validityPeriod" : { "validFrom" : "2017-01-03T07:45:04.000Z", "validTo" : "2029-11-15T11:57:45.000Z" @@ -576,7 +610,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4c79e", "childItems" : [ @@ -587,8 +621,8 @@ }, "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef127c", "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:litre" + "value" : 1, + "unit" : "unit:litre" }, "businessPartner" : "BPNL00000003AYRE", "createdOn" : "2022-12-03T14:48:54.709Z", @@ -598,7 +632,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4c79e", "sites" : [ @@ -619,8 +653,10 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { + "localIdentifiers" : [ + ], "validityPeriod" : { "validFrom" : "2016-04-28T20:00:55.000Z", "validTo" : "2027-04-27T00:59:41.000Z" @@ -634,7 +670,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:c7a2b803-f8fe-4b79-b6fc-967ce847c9a1", "sites" : [ @@ -655,8 +691,10 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { + "localIdentifiers" : [ + ], "validityPeriod" : { "validFrom" : "2015-05-18T23:10:44.000Z", "validTo" : "2025-10-23T14:46:01.000Z" @@ -670,7 +708,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef128c", "childItems" : [ @@ -681,8 +719,8 @@ }, "catenaXId" : "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca98", "quantity" : { - "quantityNumber" : 6, - "measurementUnit" : "unit:litre" + "value" : 1, + "unit" : "unit:litre" }, "businessPartner" : "BPNL00000003CML1", "createdOn" : "2022-02-08T14:48:54.709Z", @@ -692,7 +730,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef128c", "sites" : [ @@ -713,8 +751,10 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { + "localIdentifiers" : [ + ], "validityPeriod" : { "validFrom" : "2017-07-03T05:23:01.000Z", "validTo" : "2032-09-25T10:26:27.000Z" @@ -728,7 +768,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:2c57b0e9-a653-411d-bdcd-64787e9fd3a7", "childItems" : [ @@ -739,8 +779,8 @@ }, "catenaXId" : "urn:uuid:bee5614f-9e46-4c98-9209-61a6f2b2a7fc", "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:litre" + "value" : 1, + "unit" : "unit:litre" }, "businessPartner" : "BPNL00000003CML1", "createdOn" : "2022-02-09T14:48:54.709Z", @@ -753,8 +793,8 @@ }, "catenaXId" : "urn:uuid:4518c080-14fb-4252-b8de-4362d615868d", "quantity" : { - "quantityNumber" : 1, - "measurementUnit" : "unit:litre" + "value" : 1, + "unit" : "unit:litre" }, "businessPartner" : "BPNL00000003CML1", "createdOn" : "2022-02-10T14:48:54.709Z", @@ -764,7 +804,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:2c57b0e9-a653-411d-bdcd-64787e9fd3a7", "sites" : [ @@ -785,8 +825,10 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { + "localIdentifiers" : [ + ], "validityPeriod" : { "validFrom" : "2016-04-24T08:26:56.000Z", "validTo" : "2031-12-17T23:55:04.000Z" @@ -800,7 +842,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_planned:2.0.0#SingleLevelBomAsPlanned", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", "payload" : { "catenaXId" : "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b", "childItems" : [ @@ -811,8 +853,8 @@ }, "catenaXId" : "urn:uuid:3cdd2826-5df0-4c7b-b540-9eeccecb2301", "quantity" : { - "quantityNumber" : 0.3301, - "measurementUnit" : "unit:kilogram" + "value" : 1, + "unit" : "unit:litre" }, "businessPartner" : "BPNL00000003CML1", "createdOn" : "2022-02-13T14:48:54.709Z", @@ -822,7 +864,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b", "sites" : [ @@ -843,8 +885,10 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", "payload" : { + "localIdentifiers" : [ + ], "validityPeriod" : { "validFrom" : "2019-11-02T11:14:15.000Z", "validTo" : "2024-07-17T02:07:07.000Z" @@ -858,7 +902,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", + "aspectType" : "urn:samm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned", "payload" : { "catenaXId" : "urn:uuid:e8c48a8e-d2d7-43d9-a867-65c70c85f5b8", "sites" : [ @@ -879,24 +923,20 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { - "value" : "BPNL00000003AXS3", + "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, - { - "value" : "8840374-09", - "key" : "manufacturerPartId" - }, { "value" : "NO-917923082133064161014067", "key" : "partInstanceId" } ], "manufacturingInformation" : { - "date" : "2018-09-28T04:15:57.000Z", + "date" : "2022-02-04T14:48:54.000Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:b0acf3e1-3fbe-46c0-aa0b-0724caae7772", @@ -910,7 +950,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", + "aspectType" : "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", "payload" : { "tractionBatteryCode" : "X12MCPM27KLPCLX2M2382320", "subcomponents" : [ @@ -930,24 +970,20 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { - "value" : "BPNL00000003AXS3", + "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, - { - "value" : "1142469-27", - "key" : "manufacturerPartId" - }, { "value" : "NO-655858074471261486971940", "key" : "partInstanceId" } ], "manufacturingInformation" : { - "date" : "2018-09-28T04:15:57.000Z", + "date" : "2022-02-04T14:48:54.000Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:da978a30-4dde-4d76-808a-b7946763ff0d", @@ -961,7 +997,7 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.just_in_sequence_part:1.0.0#JustInSequencePart", + "aspectType" : "urn:samm:io.catenax.just_in_sequence_part:3.0.0#JustInSequencePart", "payload" : { "localIdentifiers" : [ { @@ -970,7 +1006,7 @@ } ], "manufacturingInformation" : { - "date" : "2018-09-28T04:15:57.000Z", + "date" : "2022-02-04T14:48:54.000Z", "country" : "HUN" }, "catenaXId" : "urn:uuid:da978a30-4dde-4d76-808a-b7946763ff0d", @@ -991,24 +1027,20 @@ }, "submodels" : [ { - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", + "aspectType" : "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", "payload" : { "localIdentifiers" : [ { - "value" : "BPNL00000003AXS3", + "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, - { - "value" : "8840837-48", - "key" : "manufacturerPartId" - }, { "value" : "NO-570196089623842018037372", "key" : "partInstanceId" } ], "manufacturingInformation" : { - "date" : "2018-09-28T04:15:57.000Z", + "date" : "2022-02-04T14:48:54.000Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4080f", @@ -1022,18 +1054,18 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", "payload" : { "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4080f", "childItems" : [ { "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fcb5f", "quantity" : { - "quantityNumber" : 2.5, - "measurementUnit" : "unit:litre" + "value" : 1, + "unit" : "unit:piece" }, "hasAlternatives" : true, - "businessPartner" : "BPNL00000003AXS3", + "businessPartner" : "BPNL00000003CNKC", "createdOn" : "2022-02-03T14:48:54.709Z", "lastModifiedOn" : "2022-02-03T14:48:54.709Z" } @@ -1041,15 +1073,23 @@ } }, { - "aspectType" : "urn:bamm:io.catenax.single_level_usage_as_built:2.0.0#SingleLevelUsageAsBuilt", + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", "payload" : { "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4080f", "customers" : [ + "BPNL00000003CNKC" + ], + "parentItems" : [ { - "businessPartner" : "BPNL00000003AXS3", - "parentItems" : [], - "createdOn" : "2022-02-03T14:48:54.709Z", - "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + "catenaXId" : "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36e22", + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "createdOn" : "2023-02-03T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CNKC", + "isOnlyPotentialParent" : false } ] } diff --git a/tx-cucumber-tests/src/test/java/org/eclipse/tractusx/traceability/test/TestStepDefinition.java b/tx-cucumber-tests/src/test/java/org/eclipse/tractusx/traceability/test/TestStepDefinition.java deleted file mode 100644 index 5579233e99..0000000000 --- a/tx-cucumber-tests/src/test/java/org/eclipse/tractusx/traceability/test/TestStepDefinition.java +++ /dev/null @@ -1,57 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2022, 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - * Copyright (c) 2022, 2023 ZF Friedrichshafen AG - * Copyright (c) 2022, 2023 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.traceability.test; - - - -import static org.assertj.core.api.Assertions.assertThat; - -import io.cucumber.java.en.Given; -import io.cucumber.java.en.Then; -import io.cucumber.java.en.When; - - public class TestStepDefinition { - private Integer int1; - private Integer int2; - private Integer result; - - @Given("I have entered {int} into the calculator") - public void iHaveEnteredIntoTheCalculator(Integer int1) { - this.int2 = this.int1; - this.int1 = int1; - } - - @When("I press add") - public void iPressAdd() { - this.result = this.int1 + this.int2; - } - - @When("I press multiply") - public void iPressMultiply() { - this.result = this.int1 * this.int2; - } - - @Then("the result should be {int} on the screen") - public void theResultShouldBeOnTheScreen(Integer value) { - assertThat(this.result).isEqualTo(value); - } - } - diff --git a/tx-cucumber-tests/src/test/java/org/eclipse/tractusx/traceability/test/TraceabilityTestStepDefinition.java b/tx-cucumber-tests/src/test/java/org/eclipse/tractusx/traceability/test/TraceabilityTestStepDefinition.java index 67d71d2ab1..d73993b2d0 100644 --- a/tx-cucumber-tests/src/test/java/org/eclipse/tractusx/traceability/test/TraceabilityTestStepDefinition.java +++ b/tx-cucumber-tests/src/test/java/org/eclipse/tractusx/traceability/test/TraceabilityTestStepDefinition.java @@ -28,15 +28,16 @@ import io.cucumber.java.en.Then; import io.cucumber.java.en.When; import lombok.extern.slf4j.Slf4j; -import org.awaitility.Duration; +import notification.request.UpdateNotificationStatusRequest; +import notification.response.NotificationIdResponse; +import notification.response.NotificationResponse; +import org.awaitility.Durations; import org.eclipse.tractusx.traceability.test.exteption.MissingStepDefinitionException; +import org.eclipse.tractusx.traceability.test.tooling.NotificationTypeEnum; import org.eclipse.tractusx.traceability.test.tooling.TraceXEnvironmentEnum; import org.eclipse.tractusx.traceability.test.tooling.rest.RestProvider; import org.eclipse.tractusx.traceability.test.validator.NotificationValidator; import org.hamcrest.Matchers; -import notification.request.UpdateNotificationStatusRequest; -import notification.response.NotificationIdResponse; -import notification.response.NotificationResponse; import java.time.Instant; import java.util.Arrays; @@ -49,8 +50,6 @@ import static org.apache.commons.lang3.ObjectUtils.isEmpty; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; -import static org.eclipse.tractusx.traceability.test.tooling.NotificationTypeEnum.ALERT; -import static org.eclipse.tractusx.traceability.test.tooling.NotificationTypeEnum.INVESTIGATION; import static org.eclipse.tractusx.traceability.test.tooling.TraceXEnvironmentEnum.TRACE_X_A; import static org.eclipse.tractusx.traceability.test.tooling.TraceXEnvironmentEnum.TRACE_X_B; import static org.eclipse.tractusx.traceability.test.validator.TestUtils.normalize; @@ -62,6 +61,8 @@ public class TraceabilityTestStepDefinition { private RestProvider restProvider; private Long notificationID_TXA = null; private Long notificationID_TXB = null; + protected static final String BPN_TXA = "BPNL00000003CML1"; + protected static final String BPN_TXB = "BPNL00000003CNKC"; private String notificationDescription = null; private List requestedAssets; private List testAssets; @@ -87,8 +88,8 @@ public void iUseAssetWithIds(String assetIds) { testAssets = Arrays.stream(assetIds.split(",")).toList(); } - @Given("I create quality investigation") - public void iCreateQualityInvestigation(DataTable dataTable) { + @Given("I create quality notification") + public void iCreateQualityNotification(DataTable dataTable) { final Map input = normalize(dataTable.asMap()); if (isEmpty(testAssets)) { @@ -101,22 +102,56 @@ public void iCreateQualityInvestigation(DataTable dataTable) { final String severity = input.get("severity"); + final NotificationTypeEnum type = NotificationTypeEnum.valueOf(input.get("type")); + + final String title = input.get("title"); + final NotificationIdResponse idResponse = restProvider.createNotification( testAssets, notificationDescription, targetDate, severity, - null, - INVESTIGATION + BPN_TXB, + title, + type ); notificationID_TXA = idResponse.id(); assertThat(dataTable).isNotNull(); } - @When("I check, if quality investigation has proper values") - public void iCheckIfQualityInvestigationHasProperValues(DataTable dataTable) { + @When("I edit quality notification") + public void iEditQualityNotification(DataTable dataTable) { + final Map input = normalize(dataTable.asMap()); + + if (isEmpty(testAssets)) { + throw MissingStepDefinitionException.missingAssetDefinition(); + } + + notificationDescription = wrapStringWithTimestamp(input.get("description")); + + final Instant targetDate = input.get("targetDate") == null ? null : Instant.parse(input.get("targetDate")); + + final String severity = input.get("severity"); + final String title = input.get("title"); + + restProvider.editNotification( + getNotificationIdBasedOnEnv(), + testAssets, + notificationDescription, + targetDate, + severity, + title, + BPN_TXB + + ); + notificationID_TXA = getNotificationIdBasedOnEnv(); + assertThat(dataTable).isNotNull(); + } + + @When("I check, if quality notification has proper values") + public void iCheckIfQualityNotificationHasProperValues(DataTable dataTable) { await() - .atMost(Duration.FIVE_MINUTES) + .atMost(Durations.FIVE_MINUTES) .pollInterval(1, TimeUnit.SECONDS) .ignoreExceptions() .until(() -> { @@ -132,36 +167,27 @@ public void iCheckIfQualityInvestigationHasProperValues(DataTable dataTable) { ); } - @When("I approve quality investigation") - public void iApproveQualityInvestigation() { + @When("I approve quality notification") + public void iApproveQualityNotification() { restProvider.approveNotification(getNotificationIdBasedOnEnv()); } - @When("I cancel quality investigation") - public void iCancelQualityInvestigation() { + @When("I cancel quality notification") + public void iCancelQualityNotification() { restProvider.cancelNotification(getNotificationIdBasedOnEnv()); } - @When("I cancel quality alert") - public void iCancelQualityAlert() { - restProvider.cancelNotification(getNotificationIdBasedOnEnv()); - } - - @When("I close quality investigation") - public void iCloseQualityInvestigation() { + @When("I close quality notification") + public void iCloseQualityNotification() { restProvider.closeNotification(getNotificationIdBasedOnEnv()); } - @When("I close quality alert") - public void iCloseQualityAlert() { - restProvider.closeNotification(getNotificationIdBasedOnEnv()); - } - @When("I check, if quality investigation has been received") + @When("I check, if quality notification has been received") public void iCanSeeNotificationWasReceived() { System.out.println("searching for notificationDescription: " + notificationDescription); final NotificationResponse notification = await() - .atMost(Duration.FIVE_MINUTES) + .atMost(Durations.FIVE_MINUTES) .pollInterval(1, TimeUnit.SECONDS) .until(() -> { final List result = restProvider.getReceivedNotifications(); @@ -175,45 +201,29 @@ public void iCanSeeNotificationWasReceived() { assertThat(notification).isNotNull(); } - @When("I check, if quality investigation has not been received") - public void iCanSeeInvestigationWasNotReceived() { - final List result = restProvider.getReceivedNotifications(); - Optional first = result.stream() - .filter(qualityNotificationResponse -> Objects.equals(qualityNotificationResponse.getId(), getNotificationIdBasedOnEnv())) - .findFirst(); - assertThat(first.isEmpty()).isTrue(); - } - - @When("I check, if quality alert has not been received") - public void iCanSeeAlertWasNotReceived() { + @When("I check, if quality notification has not been received") + public void iCanSeeNotificationWasNotReceived() { final List result = restProvider.getReceivedNotifications(); Optional first = result.stream() .filter(qualityNotificationResponse -> Objects.equals(qualityNotificationResponse.getId(), getNotificationIdBasedOnEnv())) .findFirst(); - assertThat(first.isEmpty()).isTrue(); + assertThat(first).isNotPresent(); } - @When("I acknowledge quality investigation") - public void iAcknowledgeQualityInvestigation() { + @When("I acknowledge quality notification") + public void iAcknowledgeQualityNotification() { restProvider.updateNotification(getNotificationIdBasedOnEnv(), UpdateNotificationStatusRequest.ACKNOWLEDGED, ""); } - @When("I accept quality investigation") - public void iAcceptQualityInvestigation(DataTable dataTable) { + @When("I accept quality notification") + public void iAcceptQualityNotification(DataTable dataTable) { String reason = normalize(dataTable.asMap()).get("reason"); System.out.println("reason: " + reason); restProvider.updateNotification(getNotificationIdBasedOnEnv(), UpdateNotificationStatusRequest.ACCEPTED, reason); } - @When("I decline quality investigation") - public void iDeclineQualityInvestigation(DataTable dataTable) { - String reason = normalize(dataTable.asMap()).get("reason"); - System.out.println("reason: " + reason); - restProvider.updateNotification(getNotificationIdBasedOnEnv(), UpdateNotificationStatusRequest.DECLINED, reason); - } - - @When("I decline quality alert") - public void iDeclineQualityAlert(DataTable dataTable) { + @When("I decline quality notification") + public void iDeclineQualityNotification(DataTable dataTable) { String reason = normalize(dataTable.asMap()).get("reason"); System.out.println("reason: " + reason); restProvider.updateNotification(getNotificationIdBasedOnEnv(), UpdateNotificationStatusRequest.DECLINED, reason); @@ -229,7 +239,6 @@ private Long getNotificationIdBasedOnEnv() { throw new UnsupportedOperationException("First need to Log In"); } - @And("I request assets with {string}") public void iRequestAssetsWith(String ownerFilter) { requestedAssets = restProvider.getAssets(ownerFilter); @@ -240,87 +249,4 @@ public void iCheckIfOnlyAssetsWithOwnerFilterAreResponded(String ownerFilter) { requestedAssets.forEach(asset -> assertThat(ownerFilter).isEqualTo(asset.getOwner().toString())); } - @Given("I create quality alert") - public void iCreateQualityAlert(DataTable dataTable) { - - final Map input = normalize(dataTable.asMap()); - - if (isEmpty(testAssets)) { - throw MissingStepDefinitionException.missingAssetDefinition(); - } - - notificationDescription = wrapStringWithTimestamp(input.get("description")); - - final Instant targetDate = input.get("targetDate") == null ? null : Instant.parse(input.get("targetDate")); - - final String severity = input.get("severity"); - - final NotificationIdResponse idResponse = restProvider.createNotification( - testAssets, - notificationDescription, - targetDate, - severity, - "BPNL00000003CNKC", - ALERT - ); - notificationID_TXA = idResponse.id(); - assertThat(dataTable).isNotNull(); - } - - @When("I check, if quality alert has proper values") - public void iCheckIfQualityAlertHasProperValues(DataTable dataTable) { - await() - .atMost(Duration.FIVE_MINUTES) - .pollInterval(1, TimeUnit.SECONDS) - .ignoreExceptions() - .until(() -> { - try { - NotificationResponse result = restProvider.getNotification(getNotificationIdBasedOnEnv()); - NotificationValidator.assertHasFields(result, normalize(dataTable.asMap())); - return true; - } catch (AssertionError assertionError) { - assertionError.printStackTrace(); - return false; - } - } - ); - } - - - @When("I approve quality alert") - public void iApproveQualityAlert() { - restProvider.approveNotification(getNotificationIdBasedOnEnv()); - } - - - @When("I check, if quality alert has been received") - public void iCanSeeQualityAlertWasReceived() { - System.out.println("searching for notificationDescription: " + notificationDescription); - final NotificationResponse notification = await() - .atMost(Duration.FIVE_MINUTES) - .pollInterval(1, TimeUnit.SECONDS) - .until(() -> { - final List result = restProvider.getReceivedNotifications(); - result.stream().map(NotificationResponse::getDescription).forEach(System.out::println); - return result.stream().filter(qn -> Objects.equals(qn.getDescription(), notificationDescription)).findFirst().orElse(null); - }, Matchers.notNullValue() - ); - - notificationID_TXB = notification.getId(); - - assertThat(notification).isNotNull(); - } - - @When("I acknowledge quality alert") - public void iAcknowledgeQualityAlert() { - restProvider.updateNotification(getNotificationIdBasedOnEnv(), UpdateNotificationStatusRequest.ACKNOWLEDGED, ""); - } - - - @When("I accept quality alert") - public void iAcceptQualityAlert(DataTable dataTable) { - String reason = normalize(dataTable.asMap()).get("reason"); - System.out.println("reason: " + reason); - restProvider.updateNotification(getNotificationIdBasedOnEnv(), UpdateNotificationStatusRequest.ACCEPTED, reason); - } } diff --git a/tx-cucumber-tests/src/test/java/org/eclipse/tractusx/traceability/test/tooling/rest/RestProvider.java b/tx-cucumber-tests/src/test/java/org/eclipse/tractusx/traceability/test/tooling/rest/RestProvider.java index 60174ed25a..047fe1c914 100644 --- a/tx-cucumber-tests/src/test/java/org/eclipse/tractusx/traceability/test/tooling/rest/RestProvider.java +++ b/tx-cucumber-tests/src/test/java/org/eclipse/tractusx/traceability/test/tooling/rest/RestProvider.java @@ -31,17 +31,18 @@ import io.restassured.response.ValidatableResponse; import io.restassured.specification.RequestSpecification; import lombok.Getter; -import org.apache.http.HttpStatus; -import org.awaitility.Duration; -import org.eclipse.tractusx.traceability.test.tooling.EnvVariablesResolver; -import org.eclipse.tractusx.traceability.test.tooling.NotificationTypeEnum; -import org.eclipse.tractusx.traceability.test.tooling.TraceXEnvironmentEnum; +import notification.request.EditNotificationRequest; import notification.request.NotificationSeverityRequest; import notification.request.StartNotificationRequest; -import notification.request.UpdateNotificationRequest; import notification.request.UpdateNotificationStatusRequest; +import notification.request.UpdateNotificationStatusTransitionRequest; import notification.response.NotificationIdResponse; import notification.response.NotificationResponse; +import org.apache.http.HttpStatus; +import org.awaitility.Durations; +import org.eclipse.tractusx.traceability.test.tooling.EnvVariablesResolver; +import org.eclipse.tractusx.traceability.test.tooling.NotificationTypeEnum; +import org.eclipse.tractusx.traceability.test.tooling.TraceXEnvironmentEnum; import java.time.Instant; import java.util.List; @@ -97,15 +98,16 @@ public NotificationIdResponse createNotification( Instant targetDate, String severity, String receiverBpn, + String title, NotificationTypeEnum notificationType) { final StartNotificationRequest requestBody = StartNotificationRequest.builder() - .partIds(partIds) - .isAsBuilt(true) + .affectedPartIds(partIds) .description(description) .targetDate(targetDate) .severity(NotificationSeverityRequest.fromValue(severity)) .type(notificationType.toRequest()) .receiverBpn(receiverBpn) + .title(title) .build(); return given().log().body() .spec(getRequestSpecification()) @@ -120,9 +122,35 @@ public NotificationIdResponse createNotification( } + public void editNotification(Long notificationId, + List partIds, + String description, + Instant targetDate, + String severity, + String title, + String receiverBpn) { + final EditNotificationRequest requestBody = EditNotificationRequest.builder() + .affectedPartIds(partIds) + .description(description) + .targetDate(targetDate) + .severity(NotificationSeverityRequest.fromValue(severity)) + .receiverBpn(receiverBpn) + .title(title) + .build(); + given().log().body() + .spec(getRequestSpecification()) + .contentType(ContentType.JSON) + .body(requestBody) + .when() + .put("/api/notifications/" + notificationId + "/edit") + .then() + .statusCode(HttpStatus.SC_NO_CONTENT); + + } + public void approveNotification(final Long notificationId) { await() - .atMost(Duration.FIVE_MINUTES) + .atMost(Durations.FIVE_MINUTES) .pollInterval(10, TimeUnit.SECONDS) .ignoreExceptions() .until(() -> { @@ -160,7 +188,7 @@ public void cancelNotification(final Long notificationId) { public void closeNotification(final Long notificationId) { await() - .atMost(Duration.FIVE_MINUTES) + .atMost(Durations.FIVE_MINUTES) .pollInterval(10, TimeUnit.SECONDS) .ignoreExceptions() .until(() -> { @@ -185,13 +213,13 @@ public void closeNotification(final Long notificationId) { public void updateNotification(final Long notificationId, UpdateNotificationStatusRequest status, String reason) { - UpdateNotificationRequest requestBody = UpdateNotificationRequest.builder() + UpdateNotificationStatusTransitionRequest requestBody = UpdateNotificationStatusTransitionRequest.builder() .status(status) .reason(reason) .build(); await() - .atMost(Duration.FIVE_MINUTES) + .atMost(Durations.FIVE_MINUTES) .pollInterval(10, TimeUnit.SECONDS) .ignoreExceptions() .until(() -> { diff --git a/tx-cucumber-tests/src/test/java/org/eclipse/tractusx/traceability/test/validator/NotificationValidator.java b/tx-cucumber-tests/src/test/java/org/eclipse/tractusx/traceability/test/validator/NotificationValidator.java index 4503c75cbe..24d528c63e 100644 --- a/tx-cucumber-tests/src/test/java/org/eclipse/tractusx/traceability/test/validator/NotificationValidator.java +++ b/tx-cucumber-tests/src/test/java/org/eclipse/tractusx/traceability/test/validator/NotificationValidator.java @@ -22,13 +22,13 @@ import lombok.Getter; import notification.response.NotificationResponse; - import java.util.Arrays; import java.util.List; import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.tractusx.traceability.test.validator.NotificationValidator.SupportedFields.ACCEPT_REASON; +import static org.eclipse.tractusx.traceability.test.validator.NotificationValidator.SupportedFields.AFFECTED_PART_ID; import static org.eclipse.tractusx.traceability.test.validator.NotificationValidator.SupportedFields.ASSET_ID_COUNT; import static org.eclipse.tractusx.traceability.test.validator.NotificationValidator.SupportedFields.CHANNEL; import static org.eclipse.tractusx.traceability.test.validator.NotificationValidator.SupportedFields.CLOSE_REASON; @@ -39,6 +39,8 @@ import static org.eclipse.tractusx.traceability.test.validator.NotificationValidator.SupportedFields.SEVERITY; import static org.eclipse.tractusx.traceability.test.validator.NotificationValidator.SupportedFields.STATUS; import static org.eclipse.tractusx.traceability.test.validator.NotificationValidator.SupportedFields.TARGET_DATE; +import static org.eclipse.tractusx.traceability.test.validator.NotificationValidator.SupportedFields.TITLE; +import static org.eclipse.tractusx.traceability.test.validator.NotificationValidator.SupportedFields.TYPE; public class NotificationValidator { @@ -104,8 +106,21 @@ public static void assertHasFields(NotificationResponse notification, Map Then I check, if only assets with are responded - - Examples: + + Examples: | owner-filter | | "SUPPLIER" | | "CUSTOMER" | - | "OWN" | \ No newline at end of file + | "OWN" | diff --git a/tx-cucumber-tests/src/test/resources/features/11_TRACEFOSS-1125.feature b/tx-cucumber-tests/src/test/resources/features/11_TRACEFOSS-1125.feature index 57c5617d73..2a181f8266 100644 --- a/tx-cucumber-tests/src/test/resources/features/11_TRACEFOSS-1125.feature +++ b/tx-cucumber-tests/src/test/resources/features/11_TRACEFOSS-1125.feature @@ -33,36 +33,37 @@ Feature: ⭐[BE] User select severity for Quality Investigation # * Add new secrets to the code # #  - @TRACEFOSS-1220 @TRACEFOSS-3128 @TRACEFOSS-2910 @TEST-1217 @TRACEFOSS-2715 @TEST-904 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @TRACEFOSS-1139 @TRACEFOSS-1138 @INTEGRATION_TEST @[QualityInvestigation] - Scenario Outline: [BE] Check correct processing of severity in quality investigation + @TRACEFOSS-1220 @TRACEFOSS-3373 @TRACEFOSS-3128 @TRACEFOSS-2910 @TEST-1217 @TRACEFOSS-2715 @TEST-904 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @TRACEFOSS-1139 @TRACEFOSS-1138 @INTEGRATION_TEST @[QualityInvestigation] + Scenario Outline: [BE] Check correct processing of severity in quality investigation When I am logged into TRACE_X_A application When I use assets with ids 'urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd' - And I create quality investigation + And I create quality notification | "severity" | | | "description" | "Testing severity TRACEFOSS-1220" | - Then I check, if quality investigation has proper values + | "type" | "INVESTIGATION" | + Then I check, if quality notification has proper values | "severity" | | | "description" | "Testing severity TRACEFOSS-1220" | | "status" | "CREATED" | - When I approve quality investigation - Then I check, if quality investigation has proper values + When I approve quality notification + Then I check, if quality notification has proper values | "status" | "SENT" | When I am logged into TRACE_X_B application - Then I check, if quality investigation has been received - Then I check, if quality investigation has proper values + Then I check, if quality notification has been received + Then I check, if quality notification has proper values | "severity" | | | "description" | "Testing severity TRACEFOSS-1220" | | "status" | "RECEIVED" | - When I acknowledge quality investigation - Then I check, if quality investigation has proper values + When I acknowledge quality notification + Then I check, if quality notification has proper values | "status" | "ACKNOWLEDGED" | When I am logged into TRACE_X_A application - Then I check, if quality investigation has proper values + Then I check, if quality notification has proper values | "status" | "ACKNOWLEDGED" | - - Examples: + + Examples: |severity| |"MINOR"| |"MAJOR"| |"CRITICAL"| - |"LIFE-THREATENING"| \ No newline at end of file + |"LIFE-THREATENING"| diff --git a/tx-cucumber-tests/src/test/resources/features/1_TRACEFOSS-1393.feature b/tx-cucumber-tests/src/test/resources/features/1_TRACEFOSS-1393.feature index a22cc7a01e..2afe7b857d 100644 --- a/tx-cucumber-tests/src/test/resources/features/1_TRACEFOSS-1393.feature +++ b/tx-cucumber-tests/src/test/resources/features/1_TRACEFOSS-1393.feature @@ -1,32 +1,62 @@ @TRACEFOSS-1393 Feature: ⭐ [BE][QUALITY_ALERTS] Create (POST) quality alerts (Rest API) - #h2. User Story + #h2. User Story # #*As a* user #*I want to* be able to see all quality alerts / notifications based on their status and type with the date created in a separate Quality Alerts inbox #*so that* I can have an overview and perform actions like view details on the notifications. # - #h2. Outcome + #h2. Outcome # #- (-) New table is added which shows "Quality Alerts" + #Check if *edit* of quality notification is processed correctly which contains following checks: + # * create notification  + # * edit notification in status created + # * validate the values have been updated + @TRACEFOSS-3354 @TRACEFOSS-3373 @TRACEFOSS-3128 @TRACEFOSS-1920 @TRACEFOSS-2910 @TRACEFOSS-1101 @TRACEFOSS-1673 @TEST-904 @TRACEFOSS-2715 @TEST-1217 @INTEGRATION_TEST + Scenario: [BE] Check edit notification of quality notification + When I am logged into TRACE_X_A application + When I use assets with ids 'urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02' + And I create quality notification + | "severity" | "MAJOR" | + | "description" | "Testing ACCEPTANCE TRACEFOSS-1864" | + | "type" | "ALERT" | + | "title" | "Initial title" | + Then I check, if quality notification has proper values + | "description" | "Testing ACCEPTANCE TRACEFOSS-1864" | + | "status" | "CREATED" | + When I use assets with ids 'urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa03' + When I edit quality notification + | "severity" | "MINOR" | + | "description" | "Testing ACCEPTANCE TRACEFOSS-1864 edited" | + | "title" | "New Title" | + + Then I check, if quality notification has proper values + | "status" | "CREATED" | + | "severity" | "MINOR" | + | "description" | "Testing ACCEPTANCE TRACEFOSS-1864 edited" | + | "title" | "New Title" | + | "affectedPartId" | "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa03" | + #Check if *CANCELLATION* of quality alerts is processed correctly which contains following checks: #* correct CANCELLATION on receiver side #* correct reception of status update on sender side #* correct reason on receiver and sender side - @TRACEFOSS-1864 @TRACEFOSS-3128 @TRACEFOSS-2910 @TEST-1217 @TRACEFOSS-2715 @TEST-904 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @INTEGRATION_TEST @[QUALITY_ALERTS] + @TRACEFOSS-1864 @TRACEFOSS-3373 @TRACEFOSS-3128 @TRACEFOSS-2910 @TEST-1217 @TRACEFOSS-2715 @TEST-904 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @INTEGRATION_TEST @[QUALITY_ALERTS] Scenario: [BE] Check correct processing of CANCELLATION of quality alerts When I am logged into TRACE_X_A application When I use assets with ids 'urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02' - And I create quality alert + And I create quality notification | "severity" | "MAJOR" | | "description" | "Testing ACCEPTANCE TRACEFOSS-1864" | - Then I check, if quality alert has proper values + | "type" | "ALERT" | + Then I check, if quality notification has proper values | "description" | "Testing ACCEPTANCE TRACEFOSS-1864" | | "status" | "CREATED" | - When I cancel quality alert - Then I check, if quality alert has proper values + When I cancel quality notification + Then I check, if quality notification has proper values | "status" | "CANCELED" | - - When I am logged into TRACE_X_B application - Then I check, if quality alert has not been received \ No newline at end of file + + When I am logged into TRACE_X_B application + Then I check, if quality notification has not been received diff --git a/tx-cucumber-tests/src/test/resources/features/2_TRACEFOSS-600.feature b/tx-cucumber-tests/src/test/resources/features/2_TRACEFOSS-600.feature index 85615c8d2f..3009823690 100644 --- a/tx-cucumber-tests/src/test/resources/features/2_TRACEFOSS-600.feature +++ b/tx-cucumber-tests/src/test/resources/features/2_TRACEFOSS-600.feature @@ -33,220 +33,227 @@ Feature: ⭐ [BE][QUALITY_ALERTS] Enable Quality Alerts #* correct CLOSURE on receiver side #* correct reception of status update on sender side #* correct reason on receiver and sender side - @TRACEFOSS-1863 @TRACEFOSS-3128 @TRACEFOSS-2910 @TEST-1217 @TRACEFOSS-2715 @TEST-904 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @INTEGRATION_TEST @[QUALITY_ALERTS] + @TRACEFOSS-1863 @TRACEFOSS-3373 @TRACEFOSS-3128 @TRACEFOSS-2910 @TEST-1217 @TRACEFOSS-2715 @TEST-904 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @INTEGRATION_TEST @[QUALITY_ALERTS] Scenario: [BE] Check correct processing of CLOSURE of quality alerts When I am logged into TRACE_X_A application When I use assets with ids 'urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02' - And I create quality alert + And I create quality notification | "severity" | "MAJOR" | | "description" | "Testing ACCEPTANCE TRACEFOSS-1863" | - Then I check, if quality alert has proper values + | "type" | "ALERT" | + Then I check, if quality notification has proper values | "description" | "Testing ACCEPTANCE TRACEFOSS-1863" | | "status" | "CREATED" | - When I approve quality alert - Then I check, if quality alert has proper values + When I approve quality notification + Then I check, if quality notification has proper values | "status" | "SENT" | When I am logged into TRACE_X_B application - Then I check, if quality alert has been received - And I check, if quality alert has proper values + Then I check, if quality notification has been received + And I check, if quality notification has proper values | "status" | "RECEIVED" | - When I acknowledge quality alert - Then I check, if quality alert has proper values + When I acknowledge quality notification + Then I check, if quality notification has proper values | "status" | "ACKNOWLEDGED" | - + When I am logged into TRACE_X_A application - Then I check, if quality alert has proper values + Then I check, if quality notification has proper values | "status" | "ACKNOWLEDGED" | - When I close quality alert - Then I check, if quality alert has proper values - | "status" | "CLOSED" | - - When I am logged into TRACE_X_B application - Then I check, if quality alert has proper values - | "status" | "CLOSED" | + When I close quality notification + Then I check, if quality notification has proper values + | "status" | "CLOSED" | + + When I am logged into TRACE_X_B application + Then I check, if quality notification has proper values + | "status" | "CLOSED" | #Check if *bpn names* of *sender and receiver* are processed correctly for created quality alerts which contains following checks: #* correct creation on sender side #* correct reception on receiver side - @TRACEFOSS-1547 @TRACEFOSS-3128 @TRACEFOSS-2910 @TRACEFOSS-2715 @TEST-904 @TEST-1217 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @INTEGRATION_TEST @[QUALITY_ALERTS] + @TRACEFOSS-1547 @TRACEFOSS-3373 @TRACEFOSS-3128 @TRACEFOSS-2910 @TRACEFOSS-2715 @TEST-904 @TEST-1217 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @INTEGRATION_TEST @[QUALITY_ALERTS] Scenario: [BE] Check correct processing of bpn names in quality alerts When I am logged into TRACE_X_A application When I use assets with ids 'urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02' - And I create quality alert + And I create quality notification | "description" | "Testing BPNs TRACEFOSS-1547" | | "severity" | "MINOR" | - Then I check, if quality alert has proper values + | "type" | "ALERT" | + Then I check, if quality notification has proper values | "description" | "Testing BPNs TRACEFOSS-1547" | | "createdBy" | "BPNL00000003CML1" | | "sendTo" | "BPNL00000003CNKC" | | "status" | "CREATED" | - When I approve quality alert - Then I check, if quality alert has proper values + When I approve quality notification + Then I check, if quality notification has proper values | "status" | "SENT" | When I am logged into TRACE_X_B application - Then I check, if quality alert has been received - Then I check, if quality alert has proper values + Then I check, if quality notification has been received + Then I check, if quality notification has proper values | "description" | "Testing BPNs TRACEFOSS-1547" | | "createdBy" | "BPNL00000003CML1" | | "sendTo" | "BPNL00000003CNKC" | - | "status" | "RECEIVED" | + | "status" | "RECEIVED" | #Check if *targetDate = null* is processed correctly for created quality alerts which contains following checks: #* correct sending of _targetDate_ = *null* #* correct reception on receiver side - @TRACEFOSS-1546 @TRACEFOSS-3128 @TRACEFOSS-2910 @TRACEFOSS-2715 @TEST-904 @TEST-1217 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @INTEGRATION_TEST @[QUALITY_ALERTS] + @TRACEFOSS-1546 @TRACEFOSS-3373 @TRACEFOSS-3128 @TRACEFOSS-2910 @TRACEFOSS-2715 @TEST-904 @TEST-1217 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @INTEGRATION_TEST @[QUALITY_ALERTS] Scenario: [BE] Check correct processing of targetDate = null in quality alerts When I am logged into TRACE_X_A application When I use assets with ids 'urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02' - And I create quality alert + And I create quality notification | "severity" | "MINOR" | | "description" | "Testing without targetDate TRACEFOSS-1546" | - Then I check, if quality alert has proper values + | "type" | "ALERT" | + Then I check, if quality notification has proper values | "description" | "Testing without targetDate TRACEFOSS-1546" | | "targetDate" | "" | | "status" | "CREATED" | - When I approve quality alert - Then I check, if quality alert has proper values + When I approve quality notification + Then I check, if quality notification has proper values | "status" | "SENT" | When I am logged into TRACE_X_B application - Then I check, if quality alert has been received - Then I check, if quality alert has proper values + Then I check, if quality notification has been received + Then I check, if quality notification has proper values | "description" | "Testing without targetDate TRACEFOSS-1546" | | "targetDate" | "" | - | "status" | "RECEIVED" | + | "status" | "RECEIVED" | #Check if *DECLINATION* of quality alerts is processed correctly which contains following checks: #* correct DECLINATION status on receiver side #* correct reception of status update on sender side #* correct reason on receiver and sender side - @TRACEFOSS-1545 @TRACEFOSS-3128 @TRACEFOSS-2910 @TRACEFOSS-2715 @TEST-904 @TEST-1217 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @INTEGRATION_TEST @[QUALITY_ALERTS] + @TRACEFOSS-1545 @TRACEFOSS-3373 @TRACEFOSS-3128 @TRACEFOSS-2910 @TRACEFOSS-2715 @TEST-904 @TEST-1217 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @INTEGRATION_TEST @[QUALITY_ALERTS] Scenario: [BE] Check correct processing of DECLINATION of quality alerts When I am logged into TRACE_X_A application When I use assets with ids 'urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02' - And I create quality alert + And I create quality notification | "severity" | "MAJOR" | | "description" | "Testing DECLINATION TRACEFOSS-1545" | - Then I check, if quality alert has proper values + | "type" | "ALERT" | + Then I check, if quality notification has proper values | "severity" | "MAJOR" | | "description" | "Testing DECLINATION TRACEFOSS-1545" | | "status" | "CREATED" | - When I approve quality alert - Then I check, if quality alert has proper values + When I approve quality notification + Then I check, if quality notification has proper values | "status" | "SENT" | When I am logged into TRACE_X_B application - Then I check, if quality alert has been received - Then I check, if quality alert has proper values + Then I check, if quality notification has been received + Then I check, if quality notification has proper values | "severity" | "MAJOR" | | "description" | "Testing DECLINATION TRACEFOSS-1545" | | "status" | "RECEIVED" | - When I acknowledge quality alert - Then I check, if quality alert has proper values + When I acknowledge quality notification + Then I check, if quality notification has proper values | "status" | "ACKNOWLEDGED" | - When I decline quality alert + When I decline quality notification | "reason" | "declined in TRACEFOSS-1545" | - Then I check, if quality alert has proper values + Then I check, if quality notification has proper values | "status" | "DECLINED" | When I am logged into TRACE_X_A application - Then I check, if quality alert has proper values + Then I check, if quality notification has proper values | "status" | "DECLINED" | - And I check, if quality alert has proper values - | "declineReason" | "declined in TRACEFOSS-1545" | + And I check, if quality notification has proper values + | "declineReason" | "declined in TRACEFOSS-1545" | #Check if *ACCEPTANCE* of quality alerts is processed correctly which contains following checks: #* correct ACCEPTANCE on receiver side #* correct reception of status update on sender side #* correct reason on receiver and sender side - @TRACEFOSS-1544 @TRACEFOSS-3128 @TRACEFOSS-2910 @TRACEFOSS-2715 @TEST-904 @TEST-1217 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @INTEGRATION_TEST @[QUALITY_ALERTS] + @TRACEFOSS-1544 @TRACEFOSS-3373 @TRACEFOSS-3128 @TRACEFOSS-2910 @TRACEFOSS-2715 @TEST-904 @TEST-1217 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @INTEGRATION_TEST @[QUALITY_ALERTS] Scenario: [BE] Check correct processing of ACCEPTANCE of quality alerts When I am logged into TRACE_X_A application When I use assets with ids 'urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02' - And I create quality alert + And I create quality notification | "severity" | "MAJOR" | | "description" | "Testing ACCEPTANCE TRACEFOSS-1544" | - Then I check, if quality alert has proper values + | "type" | "ALERT" | + Then I check, if quality notification has proper values | "severity" | "MAJOR" | | "description" | "Testing ACCEPTANCE TRACEFOSS-1544" | | "status" | "CREATED" | - When I approve quality alert - Then I check, if quality alert has proper values + When I approve quality notification + Then I check, if quality notification has proper values | "status" | "SENT" | When I am logged into TRACE_X_B application - Then I check, if quality alert has been received - Then I check, if quality alert has proper values + Then I check, if quality notification has been received + Then I check, if quality notification has proper values | "severity" | "MAJOR" | | "description" | "Testing ACCEPTANCE TRACEFOSS-1544" | | "status" | "RECEIVED" | - When I acknowledge quality alert - Then I check, if quality alert has proper values + When I acknowledge quality notification + Then I check, if quality notification has proper values | "status" | "ACKNOWLEDGED" | - When I accept quality alert + When I accept quality notification | "reason" | "accepted in TRACEFOSS-1544" | - Then I check, if quality alert has proper values + Then I check, if quality notification has proper values | "status" | "ACCEPTED" | When I am logged into TRACE_X_A application - Then I check, if quality alert has proper values + Then I check, if quality notification has proper values | "status" | "ACCEPTED" | - And I check, if quality alert has proper values - | "acceptReason" | "accepted in TRACEFOSS-1544" | + And I check, if quality notification has proper values + | "acceptReason" | "accepted in TRACEFOSS-1544" | #Check if *targetDate* is processed correctly for created quality alerts which contains following checks: #* correct sending of _targetDate_ #* correct reception on receiver side - @TRACEFOSS-1543 @TRACEFOSS-3128 @TRACEFOSS-2910 @TRACEFOSS-2715 @TEST-904 @TEST-1217 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @INTEGRATION_TEST @[QUALITY_ALERTS] - Scenario: [BE] Check correct processing of targetDate in quality alerts + @TRACEFOSS-1543 @TRACEFOSS-3373 @TRACEFOSS-3128 @TRACEFOSS-2910 @TRACEFOSS-2715 @TEST-904 @TEST-1217 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @INTEGRATION_TEST @[QUALITY_ALERTS] + Scenario: [BE] Check correct processing of targetDate in quality alerts When I am logged into TRACE_X_A application When I use assets with ids 'urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02' - And I create quality alert + And I create quality notification | "severity" | "MINOR" | | "description" | "Testing targetDate TRACEFOSS-1543" | | "targetDate" | "2055-05-30T20:43:06.333827Z" | - Then I check, if quality alert has proper values + | "type" | "ALERT" | + Then I check, if quality notification has proper values | "description" | "Testing targetDate TRACEFOSS-1543" | | "targetDate" | "2055-05-30T20:43:06.333827Z" | | "status" | "CREATED" | - When I approve quality alert - Then I check, if quality alert has proper values + When I approve quality notification + Then I check, if quality notification has proper values | "status" | "SENT" | When I am logged into TRACE_X_B application - Then I check, if quality alert has been received - Then I check, if quality alert has proper values + Then I check, if quality notification has been received + Then I check, if quality notification has proper values | "description" | "Testing targetDate TRACEFOSS-1543" | | "targetDate" | "2055-05-30T20:43:06.333827Z" | - | "status" | "RECEIVED" | + | "status" | "RECEIVED" | #Check if *severity* is processed correctly for created quality alerts which contains following checks: #* correct creation #* correct reception on receiver side - @TRACEFOSS-1539 @TRACEFOSS-3128 @TRACEFOSS-2910 @TEST-1217 @TRACEFOSS-2715 @TEST-904 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @INTEGRATION_TEST @[QUALITY_ALERTS] - Scenario Outline: [BE] Check correct processing of severity in quality alerts + @TRACEFOSS-1539 @TRACEFOSS-3373 @TRACEFOSS-3128 @TRACEFOSS-2910 @TEST-1217 @TRACEFOSS-2715 @TEST-904 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @INTEGRATION_TEST @[QUALITY_ALERTS] + Scenario Outline: [BE] Check correct processing of severity in quality alerts When I am logged into TRACE_X_A application When I use assets with ids 'urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02' - And I create quality alert + And I create quality notification | "severity" | | | "description" | "Testing severity TRACEFOSS-1539" | - Then I check, if quality alert has proper values + | "type" | "ALERT" | + Then I check, if quality notification has proper values | "severity" | | | "description" | "Testing severity TRACEFOSS-1539" | | "status" | "CREATED" | - When I approve quality alert - Then I check, if quality alert has proper values + When I approve quality notification + Then I check, if quality notification has proper values | "status" | "SENT" | When I am logged into TRACE_X_B application - Then I check, if quality alert has been received - Then I check, if quality alert has proper values + Then I check, if quality notification has been received + Then I check, if quality notification has proper values | "severity" | | | "description" | "Testing severity TRACEFOSS-1539" | | "status" | "RECEIVED" | - When I acknowledge quality alert - Then I check, if quality alert has proper values + When I acknowledge quality notification + Then I check, if quality notification has proper values | "status" | "ACKNOWLEDGED" | When I am logged into TRACE_X_A application - Then I check, if quality alert has proper values + Then I check, if quality notification has proper values | "status" | "ACKNOWLEDGED" | - - Examples: + + Examples: |severity| |"MINOR"| |"MAJOR"| |"CRITICAL"| - |"LIFE-THREATENING"| \ No newline at end of file + |"LIFE-THREATENING"| diff --git a/tx-cucumber-tests/src/test/resources/features/3_TRACEFOSS-938.feature b/tx-cucumber-tests/src/test/resources/features/3_TRACEFOSS-938.feature index ffff53fabe..bf2d377e28 100644 --- a/tx-cucumber-tests/src/test/resources/features/3_TRACEFOSS-938.feature +++ b/tx-cucumber-tests/src/test/resources/features/3_TRACEFOSS-938.feature @@ -35,18 +35,19 @@ Feature: ⭐[TEST] Update Quality Investigation (over EDC) #* correct CANCELLATION on receiver side #* correct reception of status update on sender side #* correct reason on receiver and sender side - @TRACEFOSS-1862 @TRACEFOSS-3128 @TRACEFOSS-2910 @TEST-1217 @TRACEFOSS-2715 @TEST-904 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @INTEGRATION_TEST @[QualityInvestigation] - Scenario: [BE] Check correct processing of CANCELLATION of quality investigation + @TRACEFOSS-1862 @TRACEFOSS-3373 @TRACEFOSS-3128 @TRACEFOSS-2910 @TEST-1217 @TRACEFOSS-2715 @TEST-904 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @INTEGRATION_TEST @[QualityInvestigation] + Scenario: [BE] Check correct processing of CANCELLATION of quality notification When I am logged into TRACE_X_A application When I use assets with ids 'urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd' - And I create quality investigation + And I create quality notification | "severity" | "MAJOR" | | "description" | "Testing ACCEPTANCE TRACEFOSS-1862" | - Then I check, if quality investigation has proper values + | "type" | "INVESTIGATION" | + Then I check, if quality notification has proper values | "description" | "Testing ACCEPTANCE TRACEFOSS-1862" | | "status" | "CREATED" | - When I cancel quality investigation - Then I check, if quality investigation has proper values + When I cancel quality notification + Then I check, if quality notification has proper values | "status" | "CANCELED" | When I am logged into TRACE_X_B application - Then I check, if quality investigation has not been received \ No newline at end of file + Then I check, if quality notification has not been received diff --git a/tx-cucumber-tests/src/test/resources/features/4_TRACEFOSS-936.feature b/tx-cucumber-tests/src/test/resources/features/4_TRACEFOSS-936.feature index ac5293918a..242d83cf37 100644 --- a/tx-cucumber-tests/src/test/resources/features/4_TRACEFOSS-936.feature +++ b/tx-cucumber-tests/src/test/resources/features/4_TRACEFOSS-936.feature @@ -10,9 +10,9 @@ Feature: ⭐[BE] Include reason for receiver and sender investigations #with following object: #{code:java} #{ - # "reason" : { - # "close" : $string, - # "accept": $string, | nullable + # "reason" : { + # "close" : $string, + # "accept": $string, | nullable # "decline": $string | nullable # } #} {code} @@ -24,70 +24,72 @@ Feature: ⭐[BE] Include reason for receiver and sender investigations #* correct CLOSE on receiver side #* correct reception of status update on sender side #* correct reason on receiver and sender side - @TRACEFOSS-1861 @TRACEFOSS-3128 @TRACEFOSS-2910 @TEST-1217 @TRACEFOSS-2715 @TEST-904 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @INTEGRATION_TEST @[QualityInvestigation] - Scenario: [BE] Check correct processing of CLOSURE of quality investigation + @TRACEFOSS-1861 @TRACEFOSS-3373 @TRACEFOSS-3128 @TRACEFOSS-2910 @TEST-1217 @TRACEFOSS-2715 @TEST-904 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @INTEGRATION_TEST @[QualityInvestigation] + Scenario: [BE] Check correct processing of CLOSURE of quality investigation When I am logged into TRACE_X_A application When I use assets with ids 'urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd' - And I create quality investigation + And I create quality notification | "severity" | "MAJOR" | | "description" | "Testing CLOSURE TRACEFOSS-1861" | - Then I check, if quality investigation has proper values + | "type" | "INVESTIGATION" | + Then I check, if quality notification has proper values | "description" | "Testing CLOSURE TRACEFOSS-1861" | | "status" | "CREATED" | - When I approve quality investigation - Then I check, if quality investigation has proper values + When I approve quality notification + Then I check, if quality notification has proper values | "status" | "SENT" | When I am logged into TRACE_X_B application - Then I check, if quality investigation has been received - And I check, if quality investigation has proper values + Then I check, if quality notification has been received + And I check, if quality notification has proper values | "status" | "RECEIVED" | - When I acknowledge quality investigation - Then I check, if quality investigation has proper values + When I acknowledge quality notification + Then I check, if quality notification has proper values | "status" | "ACKNOWLEDGED" | - + When I am logged into TRACE_X_A application - Then I check, if quality investigation has proper values + Then I check, if quality notification has proper values | "status" | "ACKNOWLEDGED" | - When I close quality investigation - Then I check, if quality investigation has proper values + When I close quality notification + Then I check, if quality notification has proper values | "status" | "CLOSED" | - + When I am logged into TRACE_X_B application - Then I check, if quality investigation has proper values - | "status" | "CLOSED" | + Then I check, if quality notification has proper values + | "status" | "CLOSED" | #Check if *ACCEPTANCE* of quality investigations is processed correctly which contains following checks: #* correct ACCEPTANCE on receiver side #* correct reception of status update on sender side #* correct reason on receiver and sender side - @TRACEFOSS-1222 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1139 @TRACEFOSS-1138 @TRACEFOSS-1101 @TRACEFOSS-2910 @TRACEFOSS-2715 @TEST-1217 @TEST-904 @TRACEFOSS-3128 @INTEGRATION_TEST @[QualityInvestigation] - Scenario: [BE] Check correct processing of ACCEPTANCE of quality investigation + @TRACEFOSS-1222 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1139 @TRACEFOSS-1138 @TRACEFOSS-1101 @TRACEFOSS-2910 @TRACEFOSS-2715 @TEST-1217 @TEST-904 @TRACEFOSS-3128 @TRACEFOSS-3373 @INTEGRATION_TEST @[QualityInvestigation] + Scenario: [BE] Check correct processing of ACCEPTANCE of quality investigation When I am logged into TRACE_X_A application When I use assets with ids 'urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd' - And I create quality investigation + And I create quality notification | "severity" | "MAJOR" | | "description" | "Testing ACCEPTANCE TRACEFOSS-1222" | - Then I check, if quality investigation has proper values + | "type" | "INVESTIGATION" | + Then I check, if quality notification has proper values | "severity" | "MAJOR" | | "description" | "Testing ACCEPTANCE TRACEFOSS-1222" | | "status" | "CREATED" | - When I approve quality investigation - Then I check, if quality investigation has proper values + When I approve quality notification + Then I check, if quality notification has proper values | "status" | "SENT" | When I am logged into TRACE_X_B application - Then I check, if quality investigation has been received - Then I check, if quality investigation has proper values + Then I check, if quality notification has been received + Then I check, if quality notification has proper values | "severity" | "MAJOR" | | "description" | "Testing ACCEPTANCE TRACEFOSS-1222" | | "status" | "RECEIVED" | - When I acknowledge quality investigation - Then I check, if quality investigation has proper values + When I acknowledge quality notification + Then I check, if quality notification has proper values | "status" | "ACKNOWLEDGED" | - When I accept quality investigation + When I accept quality notification | "reason" | "accepted in TRACEFOSS-1222" | - Then I check, if quality investigation has proper values + Then I check, if quality notification has proper values | "status" | "ACCEPTED" | When I am logged into TRACE_X_A application - Then I check, if quality investigation has proper values + Then I check, if quality notification has proper values | "status" | "ACCEPTED" | - | "acceptReason" | "accepted in TRACEFOSS-1222" | \ No newline at end of file + | "acceptReason" | "accepted in TRACEFOSS-1222" | diff --git a/tx-cucumber-tests/src/test/resources/features/5_TRACEFOSS-1625.feature b/tx-cucumber-tests/src/test/resources/features/5_TRACEFOSS-1625.feature index 7da7dd0b3f..ac2d2a9404 100644 --- a/tx-cucumber-tests/src/test/resources/features/5_TRACEFOSS-1625.feature +++ b/tx-cucumber-tests/src/test/resources/features/5_TRACEFOSS-1625.feature @@ -18,30 +18,31 @@ Feature: [BE][FE]Handling of several parts in one quality alert #* correct sending of several parts in *one* alert #* correct reception of several parts in *one* alert on receiver side #* correct update of *one* alert with several parts - @TRACEFOSS-1670 @TRACEFOSS-3128 @TRACEFOSS-2910 @TRACEFOSS-2715 @TEST-904 @TEST-1217 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @INTEGRATION_TEST @[QUALITY_ALERTS] + @TRACEFOSS-1670 @TRACEFOSS-3373 @TRACEFOSS-3128 @TRACEFOSS-2910 @TRACEFOSS-2715 @TEST-904 @TEST-1217 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @INTEGRATION_TEST @[QUALITY_ALERTS] Scenario: [BE] Check correct processing of several parts in quality alerts When I am logged into TRACE_X_A application When I use assets with ids 'urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36e22,urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02' - And I create quality alert + And I create quality notification | "severity" | "MINOR" | - | "description" | "Testing severity TRACEFOSS-1670" | - Then I check, if quality alert has proper values + | "description" | "Testing severity TRACEFOSS-1670" | + | "type" | "ALERT" | + Then I check, if quality notification has proper values | "description" | "Testing severity TRACEFOSS-1670" | | "status" | "CREATED" | | "assetIdCount" | "2" | - When I approve quality alert - Then I check, if quality alert has proper values + When I approve quality notification + Then I check, if quality notification has proper values | "status" | "SENT" | When I am logged into TRACE_X_B application - Then I check, if quality alert has been received - Then I check, if quality alert has proper values + Then I check, if quality notification has been received + Then I check, if quality notification has proper values | "description" | "Testing severity TRACEFOSS-1670" | | "status" | "RECEIVED" | | "assetIdCount" | "2" | - When I acknowledge quality alert - Then I check, if quality alert has proper values + When I acknowledge quality notification + Then I check, if quality notification has proper values | "status" | "ACKNOWLEDGED" | When I am logged into TRACE_X_A application - Then I check, if quality alert has proper values + Then I check, if quality notification has proper values | "status" | "ACKNOWLEDGED" | - | "assetIdCount" | "2" | \ No newline at end of file + | "assetIdCount" | "2" | diff --git a/tx-cucumber-tests/src/test/resources/features/6_TRACEFOSS-382.feature b/tx-cucumber-tests/src/test/resources/features/6_TRACEFOSS-382.feature index 3cc5ca9bc2..abe13d8071 100644 --- a/tx-cucumber-tests/src/test/resources/features/6_TRACEFOSS-382.feature +++ b/tx-cucumber-tests/src/test/resources/features/6_TRACEFOSS-382.feature @@ -1,13 +1,13 @@ @TRACEFOSS-382 Feature: Create Request for quality investigation / store in queue - #h2. Remarks - #* (-) Test the solution - #* (-) Provide test data - #* (-) TRACEFOSS-392 - #* (-) TRACEFOSS-384 - #* (-) - # - #h2. User story + #h2. Remarks + #* (-) Test the solution + #* (-) Provide test data + #* (-) TRACEFOSS-392 + #* (-) TRACEFOSS-384 + #* (-) + # + #h2. User story #As a user # #I want to be able to create a quality investigation for selected parts with a description of the defect @@ -31,30 +31,31 @@ Feature: Create Request for quality investigation / store in queue #* correct sending of several parts in *one* investigation #* correct reception of several parts in *one* investigation on receiver side #* correct update of *one* investigation with several parts - @TRACEFOSS-1652 @TRACEFOSS-3128 @TRACEFOSS-2910 @TRACEFOSS-2715 @TRACEFOSS-1101 @INTEGRATION_TEST @[QualityInvestigation] - Scenario: [BE] Check correct processing of several parts in quality investigation + @TRACEFOSS-1652 @TRACEFOSS-3373 @TRACEFOSS-3128 @TRACEFOSS-2910 @TRACEFOSS-2715 @TRACEFOSS-1101 @INTEGRATION_TEST @[QualityInvestigation] + Scenario: [BE] Check correct processing of several parts in quality investigation When I am logged into TRACE_X_A application When I use assets with ids 'urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd,urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a' - And I create quality investigation + And I create quality notification | "severity" | "MINOR" | | "description" | "Testing severity TRACEFOSS-1652" | - Then I check, if quality investigation has proper values + | "type" | "INVESTIGATION" | + Then I check, if quality notification has proper values | "description" | "Testing severity TRACEFOSS-1652" | | "status" | "CREATED" | | "assetIdCount" | "2" | - When I approve quality investigation - Then I check, if quality investigation has proper values + When I approve quality notification + Then I check, if quality notification has proper values | "status" | "SENT" | When I am logged into TRACE_X_B application - Then I check, if quality investigation has been received - Then I check, if quality investigation has proper values + Then I check, if quality notification has been received + Then I check, if quality notification has proper values | "description" | "Testing severity TRACEFOSS-1652" | | "status" | "RECEIVED" | | "assetIdCount" | "2" | - When I acknowledge quality investigation - Then I check, if quality investigation has proper values + When I acknowledge quality notification + Then I check, if quality notification has proper values | "status" | "ACKNOWLEDGED" | When I am logged into TRACE_X_A application - Then I check, if quality investigation has proper values + Then I check, if quality notification has proper values | "status" | "ACKNOWLEDGED" | - | "assetIdCount" | "2" | \ No newline at end of file + | "assetIdCount" | "2" | diff --git a/tx-cucumber-tests/src/test/resources/features/7_TRACEFOSS-1090.feature b/tx-cucumber-tests/src/test/resources/features/7_TRACEFOSS-1090.feature index 0b3da19ee6..e993130f92 100644 --- a/tx-cucumber-tests/src/test/resources/features/7_TRACEFOSS-1090.feature +++ b/tx-cucumber-tests/src/test/resources/features/7_TRACEFOSS-1090.feature @@ -10,35 +10,36 @@ Feature: 🪓⭐[BE] Add information to notification inbox # * Add an additional field for severity # # - #h3. Hint - #* BPN name and severity is published over the API that it could be requested by the frontend API . - #* Mapping between BPN number and company name is part of the job response of IRS. - # - #h3. Sprint Planning 2 + #h3. Hint + #* BPN name and severity is published over the API that it could be requested by the frontend API . + #* Mapping between BPN number and company name is part of the job response of IRS. + # + #h3. Sprint Planning 2 #* Add BPN and severity to the investigation response. #Check if *bpn names* of *sender and receiver* are processed correctly for created quality investigations which contains following checks: #* correct creation on sender side #* correct reception on receiver side - @TRACEFOSS-1344 @TRACEFOSS-3128 @TRACEFOSS-2910 @TEST-1217 @TRACEFOSS-2715 @TEST-904 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @TRACEFOSS-1139 @TRACEFOSS-1138 @INTEGRATION_TEST @[QualityInvestigation] - Scenario: [BE] Check correct processing of bpn names in quality investigation + @TRACEFOSS-1344 @TRACEFOSS-3373 @TRACEFOSS-3128 @TRACEFOSS-2910 @TEST-1217 @TRACEFOSS-2715 @TEST-904 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @TRACEFOSS-1139 @TRACEFOSS-1138 @INTEGRATION_TEST @[QualityInvestigation] + Scenario: [BE] Check correct processing of bpn names in quality investigation When I am logged into TRACE_X_A application When I use assets with ids 'urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd' - And I create quality investigation + And I create quality notification | "description" | "Testing BPNs TRACEFOSS-1344" | | "severity" | "MINOR" | - Then I check, if quality investigation has proper values + | "type" | "INVESTIGATION" | + Then I check, if quality notification has proper values | "description" | "Testing BPNs TRACEFOSS-1344" | | "createdBy" | "BPNL00000003CML1" | | "sendTo" | "BPNL00000003CNKC" | | "status" | "CREATED" | - When I approve quality investigation - Then I check, if quality investigation has proper values + When I approve quality notification + Then I check, if quality notification has proper values | "status" | "SENT" | When I am logged into TRACE_X_B application - Then I check, if quality investigation has been received - Then I check, if quality investigation has proper values + Then I check, if quality notification has been received + Then I check, if quality notification has proper values | "description" | "Testing BPNs TRACEFOSS-1344" | | "createdBy" | "BPNL00000003CML1" | | "sendTo" | "BPNL00000003CNKC" | - | "status" | "RECEIVED" | \ No newline at end of file + | "status" | "RECEIVED" | diff --git a/tx-cucumber-tests/src/test/resources/features/8_TRACEFOSS-608.feature b/tx-cucumber-tests/src/test/resources/features/8_TRACEFOSS-608.feature index 796858da41..f2a1fb0f64 100644 --- a/tx-cucumber-tests/src/test/resources/features/8_TRACEFOSS-608.feature +++ b/tx-cucumber-tests/src/test/resources/features/8_TRACEFOSS-608.feature @@ -4,54 +4,56 @@ Feature: ⭐[TEST] [BE] Set and show notification target date #*I want to* be able to set a target date for my notification while creating it #*so that* I am able to monitor if a reply was given in time. # - #h2. Hints + #h2. Hints #[Concept | https://confluence.catena-x.net/pages/viewpage.action?pageId=69429778] #Check if *targetDate = null* is processed correctly for created quality investigations which contains following checks: #* correct sending of _targetDate_ = *null* #* correct reception on receiver side - @TRACEFOSS-1247 @TRACEFOSS-1920 @TRACEFOSS-1139 @TRACEFOSS-1673 @TRACEFOSS-2715 @TRACEFOSS-2910 @TRACEFOSS-1138 @TRACEFOSS-1101 @TEST-1217 @TRACEFOSS-3128 @TEST-904 @INTEGRATION_TEST @[QualityInvestigation] - Scenario: [BE] Check correct processing of targetDate = null in quality investigation + @TRACEFOSS-1247 @TRACEFOSS-1920 @TRACEFOSS-1139 @TRACEFOSS-1673 @TRACEFOSS-2715 @TRACEFOSS-2910 @TRACEFOSS-1138 @TRACEFOSS-1101 @TEST-1217 @TRACEFOSS-3128 @TEST-904 @TRACEFOSS-3373 @INTEGRATION_TEST @[QualityInvestigation] + Scenario: [BE] Check correct processing of targetDate = null in quality investigation When I am logged into TRACE_X_A application When I use assets with ids 'urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd' - And I create quality investigation + And I create quality notification | "severity" | "MINOR" | | "description" | "Testing without targetDate TRACEFOSS-1247" | - Then I check, if quality investigation has proper values + | "type" | "INVESTIGATION" | + Then I check, if quality notification has proper values | "description" | "Testing without targetDate TRACEFOSS-1247" | | "targetDate" | "" | | "status" | "CREATED" | - When I approve quality investigation - Then I check, if quality investigation has proper values + When I approve quality notification + Then I check, if quality notification has proper values | "status" | "SENT" | When I am logged into TRACE_X_B application - Then I check, if quality investigation has been received - Then I check, if quality investigation has proper values + Then I check, if quality notification has been received + Then I check, if quality notification has proper values | "description" | "Testing without targetDate TRACEFOSS-1247" | | "targetDate" | "" | - | "status" | "RECEIVED" | + | "status" | "RECEIVED" | #Check if *targetDate* is processed correctly for created quality investigations which contains following checks: #* correct sending of _targetDate_ #* correct reception on receiver side - @TRACEFOSS-1216 @TRACEFOSS-1920 @TRACEFOSS-1139 @TRACEFOSS-1673 @TRACEFOSS-1138 @TRACEFOSS-1101 @TRACEFOSS-2715 @TRACEFOSS-2910 @TEST-1217 @TEST-904 @TRACEFOSS-3128 @INTEGRATION_TEST @[QualityInvestigation] - Scenario: [BE] Check correct processing of targetDate in quality investigation + @TRACEFOSS-1216 @TRACEFOSS-1920 @TRACEFOSS-1139 @TRACEFOSS-1673 @TRACEFOSS-1138 @TRACEFOSS-1101 @TRACEFOSS-2715 @TRACEFOSS-2910 @TEST-1217 @TEST-904 @TRACEFOSS-3128 @TRACEFOSS-3373 @INTEGRATION_TEST @[QualityInvestigation] + Scenario: [BE] Check correct processing of targetDate in quality investigation When I am logged into TRACE_X_A application When I use assets with ids 'urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd' - And I create quality investigation + And I create quality notification | "severity" | "MINOR" | | "description" | "Testing targetDate TRACEFOSS-1216" | | "targetDate" | "2099-03-11T22:44:06.333827Z" | - Then I check, if quality investigation has proper values + | "type" | "INVESTIGATION" | + Then I check, if quality notification has proper values | "description" | "Testing targetDate TRACEFOSS-1216" | | "targetDate" | "2099-03-11T22:44:06.333827Z" | | "status" | "CREATED" | - When I approve quality investigation - Then I check, if quality investigation has proper values + When I approve quality notification + Then I check, if quality notification has proper values | "status" | "SENT" | When I am logged into TRACE_X_B application - Then I check, if quality investigation has been received - Then I check, if quality investigation has proper values + Then I check, if quality notification has been received + Then I check, if quality notification has proper values | "description" | "Testing targetDate TRACEFOSS-1216" | | "targetDate" | "2099-03-11T22:44:06.333827Z" | - | "status" | "RECEIVED" | \ No newline at end of file + | "status" | "RECEIVED" | diff --git a/tx-cucumber-tests/src/test/resources/features/9_TRACEFOSS-607.feature b/tx-cucumber-tests/src/test/resources/features/9_TRACEFOSS-607.feature index 9b372e752a..5ef57a78f9 100644 --- a/tx-cucumber-tests/src/test/resources/features/9_TRACEFOSS-607.feature +++ b/tx-cucumber-tests/src/test/resources/features/9_TRACEFOSS-607.feature @@ -32,34 +32,35 @@ Feature: ⭐ [BE] Provisioning of Receiver update Quality Investigation over Bac #* correct DECLINATION status on receiver side #* correct reception of status update on sender side #* correct reason on receiver and sender side - @TRACEFOSS-1223 @TRACEFOSS-3128 @TRACEFOSS-2910 @TEST-1217 @TRACEFOSS-2715 @TEST-904 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @TRACEFOSS-1139 @TRACEFOSS-1138 @INTEGRATION_TEST @[QualityInvestigation] - Scenario: [BE] Check correct processing of DECLINATION of quality investigation + @TRACEFOSS-1223 @TRACEFOSS-3373 @TRACEFOSS-3128 @TRACEFOSS-2910 @TEST-1217 @TRACEFOSS-2715 @TEST-904 @TRACEFOSS-1920 @TRACEFOSS-1673 @TRACEFOSS-1101 @TRACEFOSS-1139 @TRACEFOSS-1138 @INTEGRATION_TEST @[QualityInvestigation] + Scenario: [BE] Check correct processing of DECLINATION of quality notification When I am logged into TRACE_X_A application When I use assets with ids 'urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd' - And I create quality investigation + And I create quality notification | "severity" | "MAJOR" | | "description" | "Testing DECLINATION TRACEFOSS-1223" | - Then I check, if quality investigation has proper values + | "type" | "INVESTIGATION" | + Then I check, if quality notification has proper values | "severity" | "MAJOR" | | "description" | "Testing DECLINATION TRACEFOSS-1223" | | "status" | "CREATED" | - When I approve quality investigation - Then I check, if quality investigation has proper values + When I approve quality notification + Then I check, if quality notification has proper values | "status" | "SENT" | When I am logged into TRACE_X_B application - Then I check, if quality investigation has been received - Then I check, if quality investigation has proper values + Then I check, if quality notification has been received + Then I check, if quality notification has proper values | "severity" | "MAJOR" | | "description" | "Testing DECLINATION TRACEFOSS-1223" | | "status" | "RECEIVED" | - When I acknowledge quality investigation - Then I check, if quality investigation has proper values + When I acknowledge quality notification + Then I check, if quality notification has proper values | "status" | "ACKNOWLEDGED" | - When I decline quality investigation + When I decline quality notification | "reason" | "declined in TRACEFOSS-1223" | - Then I check, if quality investigation has proper values + Then I check, if quality notification has proper values | "status" | "DECLINED" | When I am logged into TRACE_X_A application - Then I check, if quality investigation has proper values + Then I check, if quality notification has proper values | "status" | "DECLINED" | - | "declineReason" | "declined in TRACEFOSS-1223" | \ No newline at end of file + | "declineReason" | "declined in TRACEFOSS-1223" | diff --git a/tx-models/pom.xml b/tx-models/pom.xml index e8a3ab1199..2ca17f3c16 100644 --- a/tx-models/pom.xml +++ b/tx-models/pom.xml @@ -80,12 +80,12 @@ SPDX-License-Identifier: Apache-2.0 ch.qos.logback logback-classic - 1.4.14 + ${logback.version} ch.qos.logback logback-core - 1.4.14 + ${logback.version} org.mockito diff --git a/tx-models/src/main/java/bpn/request/BpnValidator.java b/tx-models/src/main/java/bpn/request/BpnValidator.java index 22ff664fff..f403bc5df4 100644 --- a/tx-models/src/main/java/bpn/request/BpnValidator.java +++ b/tx-models/src/main/java/bpn/request/BpnValidator.java @@ -34,6 +34,10 @@ public void initialize(ValidBPN constraintAnnotation) { @Override public boolean isValid(String value, ConstraintValidatorContext context) { - return value != null && Pattern.matches(BPN_REGEX, value); + if (value == null) { + return true; + } else { + return Pattern.matches(BPN_REGEX, value); + } } } diff --git a/tx-models/src/main/java/notification/request/EditNotificationRequest.java b/tx-models/src/main/java/notification/request/EditNotificationRequest.java new file mode 100644 index 0000000000..890765458e --- /dev/null +++ b/tx-models/src/main/java/notification/request/EditNotificationRequest.java @@ -0,0 +1,69 @@ +/******************************************************************************** + * Copyright (c) 2023 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 notification.request; + +import bpn.request.ValidBPN; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Future; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.RequiredArgsConstructor; + +import java.time.Instant; +import java.util.List; + +@Data +@Builder +@AllArgsConstructor +@RequiredArgsConstructor +public class EditNotificationRequest { + + @Size(min = 1, max = 255, message = "Specify at least 1 and at most 255 characters for the title") + @Schema(example = "title", minLength = 1, maxLength = 255) + private String title; + + @NotNull(message = "Field: receiverBpn must not be null.") + @ValidBPN + @Schema(example = "BPNL00000003CNKC") + private String receiverBpn; + + @NotNull(message = "Field: severity must not be null.") + private NotificationSeverityRequest severity; + + @Schema(example = "2099-03-11T22:44:06.333826952Z") + @Future(message = "Specify at least the current day or a date in future") + private Instant targetDate; + + @Schema(example = "The description", minLength = 15, maxLength = 1000) + @NotNull(message = "Field: description must not be null.") + @Size(min = 15, max = 1000, message = "Description should have at least 15 characters and at most 1000 characters") + private String description; + + @Size(min = 1, max = 50, message = "Specify at least 1 and at most 50 assetIds") + @Schema(example = "[\"urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978\"]", minLength = 1, maxLength = 50) + @NotNull(message = "Field: affectedPartIds must not be null.") + private List affectedPartIds; +} + + + diff --git a/tx-models/src/main/java/notification/request/StartNotificationRequest.java b/tx-models/src/main/java/notification/request/StartNotificationRequest.java index 3aa31ebb11..f0bc80c485 100644 --- a/tx-models/src/main/java/notification/request/StartNotificationRequest.java +++ b/tx-models/src/main/java/notification/request/StartNotificationRequest.java @@ -21,6 +21,7 @@ package notification.request; +import bpn.request.ValidBPN; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Future; import jakarta.validation.constraints.NotNull; @@ -45,7 +46,7 @@ public class StartNotificationRequest { @Size(min = 1, max = 50, message = "Specify at least 1 and at most 50 assetIds") @Schema(example = "[\"urn:uuid:fe99da3d-b0de-4e80-81da-882aebcca978\"]", minLength = 1, maxLength = 100) - private List partIds; + private List affectedPartIds; @Schema(example = "The description", minLength = 15, maxLength = 1000) @Size(min = 15, max = 1000, message = "Description should have at least 15 characters and at most 1000 characters") @@ -55,17 +56,16 @@ public class StartNotificationRequest { @Future(message = "Specify at least the current day or a date in future") private Instant targetDate; - @NotNull + @NotNull(message = "Field: severity must not be null.") private NotificationSeverityRequest severity; - @Schema(example = "true") - private boolean isAsBuilt = true; - - @Schema(example = "BPN00001123123AS") + @NotNull(message = "Field: receiverBpn must not be null.") + @ValidBPN + @Schema(example = "BPNL00000003CNKC") private String receiverBpn; @Schema(example = "ALERT") - @NotNull + @NotNull(message = "Field: type must not be null.") private NotificationTypeRequest type; } diff --git a/tx-models/src/main/java/notification/request/UpdateNotificationRequest.java b/tx-models/src/main/java/notification/request/UpdateNotificationStatusTransitionRequest.java similarity index 96% rename from tx-models/src/main/java/notification/request/UpdateNotificationRequest.java rename to tx-models/src/main/java/notification/request/UpdateNotificationStatusTransitionRequest.java index 432bc41aa2..c25c1d5227 100644 --- a/tx-models/src/main/java/notification/request/UpdateNotificationRequest.java +++ b/tx-models/src/main/java/notification/request/UpdateNotificationStatusTransitionRequest.java @@ -33,7 +33,7 @@ @Builder @AllArgsConstructor @RequiredArgsConstructor -public class UpdateNotificationRequest { +public class UpdateNotificationStatusTransitionRequest { @NotNull(message = "status must be present") private UpdateNotificationStatusRequest status; @Schema(example = "The reason.")