diff --git a/.github/workflows/publish-documentation.yaml b/.github/workflows/publish-documentation.yaml index b21dc78dd4..dc3ea64e2f 100644 --- a/.github/workflows/publish-documentation.yaml +++ b/.github/workflows/publish-documentation.yaml @@ -45,11 +45,6 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - - name: Build API documentation with Maven - run: | - mvn clean package -pl irs-common,irs-models,irs-policy-store,irs-testing,irs-edc-client,irs-registry-client,irs-api -DskipTests --batch-mode - cp irs-api/target/generated-sources/openapi/index.html docs/src/docs/api-specification/index.html - - name: Build with Maven env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any @@ -112,10 +107,26 @@ jobs: run: | mv docs/src/diagram-replacer/assets/ docs/target/generated-docs/assets/ + - name: Generate Swagger UI + uses: Legion2/swagger-ui-action@v1 + with: + output: swagger-ui + spec-file: docs/src/api/irs-api.yaml + - name: Update documentation on GitHub Pages if: github.ref == 'refs/heads/main' - uses: peaceiris/actions-gh-pages@v3.9.3 + uses: peaceiris/actions-gh-pages@v4 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: "./docs/target/generated-docs" destination_dir: "docs" + + - name: Deploy Swagger UI to GitHub Pages + if: github.ref == 'refs/heads/main' + uses: peaceiris/actions-gh-pages@v4 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: "swagger-ui" + destination_dir: "docs/swagger-ui" + + diff --git a/DEPENDENCIES b/DEPENDENCIES index cc88369343..ed985c44a1 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -130,33 +130,33 @@ 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.11.10, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #9243 -maven/mavencentral/io.micrometer/micrometer-core/1.11.10, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #9238 -maven/mavencentral/io.micrometer/micrometer-observation/1.11.10, Apache-2.0, approved, #9242 +maven/mavencentral/io.micrometer/micrometer-commons/1.11.11, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #9243 +maven/mavencentral/io.micrometer/micrometer-core/1.11.11, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #9238 +maven/mavencentral/io.micrometer/micrometer-observation/1.11.11, Apache-2.0, approved, #9242 maven/mavencentral/io.micrometer/micrometer-registry-prometheus/1.11.4, Apache-2.0, approved, #9805 maven/mavencentral/io.minio/minio/8.5.9, Apache-2.0, approved, #9097 maven/mavencentral/io.netty.incubator/netty-incubator-transport-classes-io_uring/0.0.21.Final, Apache-2.0, approved, #9622 maven/mavencentral/io.netty.incubator/netty-incubator-transport-native-io_uring/0.0.21.Final, GPL-2.0-only WITH Linux-syscall-note OR MIT AND Apache-2.0 AND MIT, approved, #9649 -maven/mavencentral/io.netty/netty-buffer/4.1.107.Final, Apache-2.0, approved, CQ21842 -maven/mavencentral/io.netty/netty-codec-dns/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-codec-http/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-codec-http2/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-codec-mqtt/4.1.107.Final, Apache-2.0 OR LicenseRef-Public-Domain OR BSD-2-Clause OR MIT, approved, CQ15280 -maven/mavencentral/io.netty/netty-codec-socks/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-codec/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-common/4.1.107.Final, Apache-2.0 AND MIT AND CC0-1.0, approved, CQ21843 -maven/mavencentral/io.netty/netty-handler-proxy/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-handler/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-resolver-dns-classes-macos/4.1.107.Final, Apache-2.0, approved, #6367 -maven/mavencentral/io.netty/netty-resolver-dns-native-macos/4.1.107.Final, Apache-2.0, approved, #7004 -maven/mavencentral/io.netty/netty-resolver-dns/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-resolver/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-tcnative-boringssl-static/2.0.61.Final, Apache-2.0 OR LicenseRef-Public-Domain OR BSD-2-Clause OR MIT, approved, CQ15280 -maven/mavencentral/io.netty/netty-tcnative-classes/2.0.61.Final, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.netty/netty-transport-classes-epoll/4.1.107.Final, Apache-2.0, approved, #6366 -maven/mavencentral/io.netty/netty-transport-native-epoll/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-transport-native-unix-common/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-transport/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 +maven/mavencentral/io.netty/netty-buffer/4.1.109.Final, Apache-2.0, approved, CQ21842 +maven/mavencentral/io.netty/netty-codec-dns/4.1.109.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 +maven/mavencentral/io.netty/netty-codec-http/4.1.109.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 +maven/mavencentral/io.netty/netty-codec-http2/4.1.109.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 +maven/mavencentral/io.netty/netty-codec-mqtt/4.1.109.Final, Apache-2.0 OR LicenseRef-Public-Domain OR BSD-2-Clause OR MIT, approved, CQ15280 +maven/mavencentral/io.netty/netty-codec-socks/4.1.109.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 +maven/mavencentral/io.netty/netty-codec/4.1.109.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 +maven/mavencentral/io.netty/netty-common/4.1.109.Final, Apache-2.0 AND MIT AND CC0-1.0, approved, CQ21843 +maven/mavencentral/io.netty/netty-handler-proxy/4.1.109.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 +maven/mavencentral/io.netty/netty-handler/4.1.109.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 +maven/mavencentral/io.netty/netty-resolver-dns-classes-macos/4.1.109.Final, Apache-2.0, approved, #6367 +maven/mavencentral/io.netty/netty-resolver-dns-native-macos/4.1.109.Final, Apache-2.0, approved, #7004 +maven/mavencentral/io.netty/netty-resolver-dns/4.1.109.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 +maven/mavencentral/io.netty/netty-resolver/4.1.109.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 +maven/mavencentral/io.netty/netty-tcnative-boringssl-static/2.0.65.Final, Apache-2.0 OR LicenseRef-Public-Domain OR BSD-2-Clause OR MIT, approved, CQ15280 +maven/mavencentral/io.netty/netty-tcnative-classes/2.0.65.Final, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.netty/netty-transport-classes-epoll/4.1.109.Final, Apache-2.0, approved, #6366 +maven/mavencentral/io.netty/netty-transport-native-epoll/4.1.109.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 +maven/mavencentral/io.netty/netty-transport-native-unix-common/4.1.109.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 +maven/mavencentral/io.netty/netty-transport/4.1.109.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.opentelemetry/opentelemetry-api/1.25.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.opentelemetry/opentelemetry-api/1.29.0, Apache-2.0, approved, #10088 maven/mavencentral/io.opentelemetry/opentelemetry-context/1.25.0, Apache-2.0, approved, clearlydefined @@ -191,10 +191,10 @@ maven/mavencentral/jakarta.ws.rs/jakarta.ws.rs-api/3.1.0, EPL-2.0 OR GPL-2.0-onl maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/4.0.2, BSD-3-Clause, approved, ee4j.jaxb maven/mavencentral/javax.jms/javax.jms-api/2.0.1, CDDL-1.1 OR GPL-2.0 WITH Classpath-exception-2.0, approved, #1516 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-agent/1.14.4, 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.datafaker/datafaker/1.9.0, Apache-2.0, approved, #8797 maven/mavencentral/net.debasishg/redisclient_2.13/3.42, Apache-2.0, approved, clearlydefined maven/mavencentral/net.java.dev.jna/jna/5.12.1, Apache-2.0 OR LGPL-2.1-or-later, approved, #3217 @@ -212,9 +212,9 @@ maven/mavencentral/org.apache.commons/commons-compress/1.26.0, Apache-2.0 AND (A 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.12.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.apache.commons/commons-pool2/2.11.1, Apache-2.0, approved, CQ23795 -maven/mavencentral/org.apache.groovy/groovy-json/4.0.20, Apache-2.0, approved, #7411 -maven/mavencentral/org.apache.groovy/groovy-xml/4.0.20, Apache-2.0, approved, #10179 -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-json/4.0.21, Apache-2.0, approved, #7411 +maven/mavencentral/org.apache.groovy/groovy-xml/4.0.21, Apache-2.0, approved, #10179 +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.16, Apache-2.0, approved, CQ23528 maven/mavencentral/org.apache.httpcomponents/httpmime/4.5.13, Apache-2.0, approved, CQ11718 @@ -223,11 +223,11 @@ maven/mavencentral/org.apache.logging.log4j/log4j-core/2.20.0, Apache-2.0 AND (A maven/mavencentral/org.apache.logging.log4j/log4j-jul/2.20.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.apache.logging.log4j/log4j-slf4j2-impl/2.20.0, Apache-2.0, approved, #8801 maven/mavencentral/org.apache.logging.log4j/log4j-to-slf4j/2.20.0, Apache-2.0, approved, #8799 -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.awaitility/awaitility/4.2.0, Apache-2.0, approved, #14178 maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.78, MIT, approved, #14434 @@ -333,38 +333,39 @@ maven/mavencentral/org.eclipse.tractusx.irs/irs-policy-store/0.0.2-SNAPSHOT, Apa maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/1.10.0-SNAPSHOT, Apache-2.0, approved, automotive.tractusx maven/mavencentral/org.eclipse.tractusx.irs/irs-testing/1.10.0-SNAPSHOT, Apache-2.0, approved, automotive.tractusx 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.external/aopalliance-repackaged/3.0.6, 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-api/3.0.6, 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-locator/3.0.6, 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/hk2-utils/3.0.6, 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, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish 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-core/3.1.6, 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.containers/jersey-container-servlet/3.1.6, 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-client/3.1.6, 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-common/3.1.6, 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.core/jersey-server/3.1.6, 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.ext/jersey-entity-filtering/3.1.6, 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.inject/jersey-hk2/3.1.6, 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-json-jackson/3.1.6, 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.jersey.media/jersey-media-multipart/3.1.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey 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/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.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.javassist/javassist/3.30.2-GA, Apache-2.0 AND LGPL-2.1-or-later AND MPL-1.1, approved, #12108 maven/mavencentral/org.jboss.logging/jboss-logging/3.4.3.Final, Apache-2.0, approved, CQ21255 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.8.22, Apache-2.0, approved, #8910 @@ -408,7 +409,7 @@ 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.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.scala-lang.modules/scala-java8-compat_2.13/1.0.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.scala-lang.modules/scala-parser-combinators_2.13/2.3.0, Apache-2.0, approved, #8628 @@ -417,49 +418,49 @@ maven/mavencentral/org.scala-lang/scala-reflect/2.13.10, Apache-2.0, approved, # maven/mavencentral/org.simpleflatmapper/lightning-csv/8.2.3, MIT, approved, clearlydefined maven/mavencentral/org.simpleflatmapper/sfm-util/8.2.3, 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/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.2.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.springdoc/springdoc-openapi-starter-webmvc-api/2.2.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.springdoc/springdoc-openapi-starter-webmvc-ui/2.2.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.springframework.boot/spring-boot-actuator-autoconfigure/3.1.10, Apache-2.0, approved, #9348 -maven/mavencentral/org.springframework.boot/spring-boot-actuator/3.1.10, Apache-2.0, approved, #9342 -maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/3.1.10, Apache-2.0, approved, #9341 -maven/mavencentral/org.springframework.boot/spring-boot-configuration-metadata/3.1.10, Apache-2.0, approved, #11032 -maven/mavencentral/org.springframework.boot/spring-boot-properties-migrator/3.1.10, Apache-2.0, approved, #10675 -maven/mavencentral/org.springframework.boot/spring-boot-starter-actuator/3.1.10, Apache-2.0, approved, #9344 -maven/mavencentral/org.springframework.boot/spring-boot-starter-aop/3.1.10, Apache-2.0, approved, #9338 -maven/mavencentral/org.springframework.boot/spring-boot-starter-json/3.1.10, Apache-2.0, approved, #9336 -maven/mavencentral/org.springframework.boot/spring-boot-starter-log4j2/3.1.10, Apache-2.0, approved, #8800 -maven/mavencentral/org.springframework.boot/spring-boot-starter-logging/3.1.10, Apache-2.0, approved, #9343 -maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-client/3.1.10, Apache-2.0, approved, #8806 -maven/mavencentral/org.springframework.boot/spring-boot-starter-security/3.1.10, Apache-2.0, approved, #9337 -maven/mavencentral/org.springframework.boot/spring-boot-starter-test/3.1.10, Apache-2.0, approved, #9353 -maven/mavencentral/org.springframework.boot/spring-boot-starter-tomcat/3.1.10, Apache-2.0, approved, #9351 -maven/mavencentral/org.springframework.boot/spring-boot-starter-validation/3.1.10, Apache-2.0, approved, #9335 -maven/mavencentral/org.springframework.boot/spring-boot-starter-web/3.1.10, Apache-2.0, approved, #9347 -maven/mavencentral/org.springframework.boot/spring-boot-starter/3.1.10, Apache-2.0, approved, #9349 -maven/mavencentral/org.springframework.boot/spring-boot-test-autoconfigure/3.1.10, Apache-2.0, approved, #9339 -maven/mavencentral/org.springframework.boot/spring-boot-test/3.1.10, Apache-2.0, approved, #9346 -maven/mavencentral/org.springframework.boot/spring-boot/3.1.10, Apache-2.0, approved, #9352 -maven/mavencentral/org.springframework.data/spring-data-commons/3.1.10, Apache-2.0, approved, #8805 -maven/mavencentral/org.springframework.security/spring-security-config/6.1.8, Apache-2.0, approved, #9736 -maven/mavencentral/org.springframework.security/spring-security-core/6.1.8, Apache-2.0, approved, #9801 -maven/mavencentral/org.springframework.security/spring-security-crypto/6.1.8, Apache-2.0 AND ISC, approved, #9735 -maven/mavencentral/org.springframework.security/spring-security-oauth2-client/6.1.8, Apache-2.0, approved, #9740 -maven/mavencentral/org.springframework.security/spring-security-oauth2-core/6.1.8, Apache-2.0, approved, #9741 -maven/mavencentral/org.springframework.security/spring-security-oauth2-jose/6.1.8, Apache-2.0, approved, #9345 -maven/mavencentral/org.springframework.security/spring-security-test/6.1.8, Apache-2.0, approved, #10674 -maven/mavencentral/org.springframework.security/spring-security-web/6.1.8, Apache-2.0, approved, #9800 -maven/mavencentral/org.springframework/spring-aop/6.0.18, Apache-2.0, approved, #5940 -maven/mavencentral/org.springframework/spring-beans/6.0.18, Apache-2.0, approved, #5937 -maven/mavencentral/org.springframework/spring-context/6.0.18, Apache-2.0, approved, #5936 -maven/mavencentral/org.springframework/spring-core/6.0.18, Apache-2.0 AND BSD-3-Clause, approved, #5948 -maven/mavencentral/org.springframework/spring-expression/6.0.18, Apache-2.0, approved, #3284 -maven/mavencentral/org.springframework/spring-jcl/6.0.18, Apache-2.0, approved, #3283 -maven/mavencentral/org.springframework/spring-test/6.0.18, Apache-2.0, approved, #7003 -maven/mavencentral/org.springframework/spring-web/6.0.18, Apache-2.0, approved, #5942 -maven/mavencentral/org.springframework/spring-webmvc/6.0.18, Apache-2.0, approved, #5944 +maven/mavencentral/org.springframework.boot/spring-boot-actuator-autoconfigure/3.1.11, Apache-2.0, approved, #9348 +maven/mavencentral/org.springframework.boot/spring-boot-actuator/3.1.11, Apache-2.0, approved, #9342 +maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/3.1.11, Apache-2.0, approved, #9341 +maven/mavencentral/org.springframework.boot/spring-boot-configuration-metadata/3.1.11, Apache-2.0, approved, #11032 +maven/mavencentral/org.springframework.boot/spring-boot-properties-migrator/3.1.11, Apache-2.0, approved, #10675 +maven/mavencentral/org.springframework.boot/spring-boot-starter-actuator/3.1.11, Apache-2.0, approved, #9344 +maven/mavencentral/org.springframework.boot/spring-boot-starter-aop/3.1.11, Apache-2.0, approved, #9338 +maven/mavencentral/org.springframework.boot/spring-boot-starter-json/3.1.11, Apache-2.0, approved, #9336 +maven/mavencentral/org.springframework.boot/spring-boot-starter-log4j2/3.1.11, Apache-2.0, approved, #8800 +maven/mavencentral/org.springframework.boot/spring-boot-starter-logging/3.1.11, Apache-2.0, approved, #9343 +maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-client/3.1.11, Apache-2.0, approved, #8806 +maven/mavencentral/org.springframework.boot/spring-boot-starter-security/3.1.11, Apache-2.0, approved, #9337 +maven/mavencentral/org.springframework.boot/spring-boot-starter-test/3.1.11, Apache-2.0, approved, #9353 +maven/mavencentral/org.springframework.boot/spring-boot-starter-tomcat/3.1.11, Apache-2.0, approved, #9351 +maven/mavencentral/org.springframework.boot/spring-boot-starter-validation/3.1.11, Apache-2.0, approved, #9335 +maven/mavencentral/org.springframework.boot/spring-boot-starter-web/3.1.11, Apache-2.0, approved, #9347 +maven/mavencentral/org.springframework.boot/spring-boot-starter/3.1.11, Apache-2.0, approved, #9349 +maven/mavencentral/org.springframework.boot/spring-boot-test-autoconfigure/3.1.11, Apache-2.0, approved, #9339 +maven/mavencentral/org.springframework.boot/spring-boot-test/3.1.11, Apache-2.0, approved, #9346 +maven/mavencentral/org.springframework.boot/spring-boot/3.1.11, Apache-2.0, approved, #9352 +maven/mavencentral/org.springframework.data/spring-data-commons/3.1.11, Apache-2.0, approved, #8805 +maven/mavencentral/org.springframework.security/spring-security-config/6.1.9, Apache-2.0, approved, #9736 +maven/mavencentral/org.springframework.security/spring-security-core/6.1.9, Apache-2.0, approved, #9801 +maven/mavencentral/org.springframework.security/spring-security-crypto/6.1.9, Apache-2.0 AND ISC, approved, #9735 +maven/mavencentral/org.springframework.security/spring-security-oauth2-client/6.1.9, Apache-2.0, approved, #9740 +maven/mavencentral/org.springframework.security/spring-security-oauth2-core/6.1.9, Apache-2.0, approved, #9741 +maven/mavencentral/org.springframework.security/spring-security-oauth2-jose/6.1.9, Apache-2.0, approved, #9345 +maven/mavencentral/org.springframework.security/spring-security-test/6.1.9, Apache-2.0, approved, #10674 +maven/mavencentral/org.springframework.security/spring-security-web/6.1.9, Apache-2.0, approved, #9800 +maven/mavencentral/org.springframework/spring-aop/6.0.19, Apache-2.0, approved, #5940 +maven/mavencentral/org.springframework/spring-beans/6.0.19, Apache-2.0, approved, #5937 +maven/mavencentral/org.springframework/spring-context/6.0.19, Apache-2.0, approved, #5936 +maven/mavencentral/org.springframework/spring-core/6.0.19, Apache-2.0 AND BSD-3-Clause, approved, #5948 +maven/mavencentral/org.springframework/spring-expression/6.0.19, Apache-2.0, approved, #3284 +maven/mavencentral/org.springframework/spring-jcl/6.0.19, Apache-2.0, approved, #3283 +maven/mavencentral/org.springframework/spring-test/6.0.19, Apache-2.0, approved, #7003 +maven/mavencentral/org.springframework/spring-web/6.0.19, Apache-2.0, approved, #5942 +maven/mavencentral/org.springframework/spring-webmvc/6.0.19, Apache-2.0, approved, #5944 maven/mavencentral/org.testcontainers/junit-jupiter/1.18.3, MIT, approved, #7941 maven/mavencentral/org.testcontainers/junit-jupiter/1.19.7, MIT, approved, #10344 maven/mavencentral/org.testcontainers/testcontainers/1.18.3, MIT, approved, #7938 diff --git a/docs/src/docs/api-specification/api-specification.adoc b/docs/src/docs/api-specification/api-specification.adoc deleted file mode 100644 index d12cda4300..0000000000 --- a/docs/src/docs/api-specification/api-specification.adoc +++ /dev/null @@ -1,5 +0,0 @@ -= API specification - -:toc: - -include::api.adoc[leveloffset=1] \ No newline at end of file diff --git a/docs/src/docs/api-specification/api.adoc b/docs/src/docs/api-specification/api.adoc deleted file mode 100644 index 6b3235b426..0000000000 --- a/docs/src/docs/api-specification/api.adoc +++ /dev/null @@ -1,5 +0,0 @@ -= OpenAPI Specification - -++++ -include::index.html[] -++++ diff --git a/docs/src/docs/api-specification/index.html b/docs/src/docs/api-specification/index.html deleted file mode 100644 index bb1634c9d5..0000000000 --- a/docs/src/docs/api-specification/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - IRS API - - -

IRS API

-

This will be automatically generated when workflow "publish-documentation.yaml" is executed.

- - diff --git a/docs/src/docs/index.adoc b/docs/src/docs/index.adoc index 42ba1b47a3..787214f3f2 100644 --- a/docs/src/docs/index.adoc +++ b/docs/src/docs/index.adoc @@ -3,8 +3,8 @@ == Administration Guide xref:administration/administration-guide.adoc[] -== API-Documentation -xref:api-specification/api-specification.adoc[OpenApi specification] +== Swagger-UI +xref:swagger-ui/index.adoc[Swagger-UI] == Architecture Documentation (arc42) - xref:arc42/index.adoc[Single chapters] diff --git a/docs/src/docs/swagger-ui/index.adoc b/docs/src/docs/swagger-ui/index.adoc new file mode 100644 index 0000000000..dd7fc44618 --- /dev/null +++ b/docs/src/docs/swagger-ui/index.adoc @@ -0,0 +1,13 @@ += Swagger-UI + +== NOTICE + +This work is licensed under the https://www.apache.org/licenses/LICENSE-2.0[Apache-2.0]. + +- SPDX-License-Identifier: Apache-2.0 +- SPDX-FileCopyrightText: 2021, 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +- SPDX-FileCopyrightText: 2022, 2023 BOSCH AG +- SPDX-FileCopyrightText: 2021, 2022 ZF Friedrichshafen AG +- SPDX-FileCopyrightText: 2022 ISTOS GmbH +- SPDX-FileCopyrightText: 2021, 2023 Contributors to the Eclipse Foundation +- Source URL: https://github.com/eclipse-tractusx/item-relationship-service \ No newline at end of file diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-1647-expected-submodels.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-1647-expected-submodels.json index 5528d8a886..e0c2790f80 100644 --- a/irs-cucumber-tests/src/test/resources/expected-files/TRI-1647-expected-submodels.json +++ b/irs-cucumber-tests/src/test/resources/expected-files/TRI-1647-expected-submodels.json @@ -1,109 +1,109 @@ { - "submodels": [ - { - "identification": "urn:uuid:662f3a1b-de56-4cbb-8fb4-51779643126d", - "aspectType": "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", - "contractAgreementId": null, - "payload": { - "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", - "subcomponents": [ - { - "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", - "productType": "pack" - } - ], - "productType": "pack" - } - }, - { - "identification": "urn:uuid:73068d1b-e846-4a22-a0ae-b6310f5b0a36", - "aspectType": "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", - "contractAgreementId": null, - "payload": { - "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", - "subcomponents": [ - { - "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", - "productType": "module" - } - ], - "productType": "module" - } - }, - { - "identification": "urn:uuid:b5933d6b-f005-4a9a-996e-a55501b2d651", - "aspectType": "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", - "contractAgreementId": null, - "payload": { - "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", - "subcomponents": [ - { - "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", - "productType": "module" - } - ], - "productType": "module" - } - }, - { - "identification": "urn:uuid:ab703fb6-7869-439b-aedf-43c3f21f8060", - "aspectType": "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", - "contractAgreementId": null, - "payload": { - "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", - "subcomponents": [ - { - "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", - "productType": "module" - } - ], - "productType": "module" - } - }, - { - "identification": "urn:uuid:26aa986b-a443-4b8d-aec5-bc0da9757cbe", - "aspectType": "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", - "contractAgreementId": null, - "payload": { - "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", - "subcomponents": [ - { - "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", - "productType": "module" - } - ], - "productType": "module" - } - }, - { - "identification": "urn:uuid:1753b174-8212-429d-9f37-cfa2e0d6a07c", - "aspectType": "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", - "contractAgreementId": null, - "payload": { - "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", - "subcomponents": [ - { - "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", - "productType": "module" - } - ], - "productType": "module" - } - }, - { - "identification": "urn:uuid:6e6f7237-982e-4359-accf-e3b9c0fb4f0e", - "aspectType": "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", - "contractAgreementId": null, - "payload": { - "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", - "subcomponents": [ - { - "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", - "productType": "module" - } - ], - "productType": "module" - } - } - ] + "submodels": [ + { + "identification": "urn:uuid:0f28e9b8-d683-4ac7-ab04-e2da39f6dbf4", + "aspectType": "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", + "contractAgreementId": "NGFkNjljZjctNzRhYy00MzYzLWJkNGUtZjBjYjc5MTFhNDY2:dXJuOnV1aWQ6MTU5MGU0ZDgtNjRiOS00NDUyLThjZGYtZjgyMjFmNGNlNzEz:ZWQwYjA1Y2EtZTdhMS00OWNjLTgwNzgtYWYxYWU2MWMwYjU4", + "payload": { + "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", + "subcomponents": [ + { + "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", + "productType": "pack" + } + ], + "productType": "pack" + } + }, + { + "identification": "urn:uuid:207317f6-5689-4957-a8b1-be613cf6e811", + "aspectType": "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", + "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy", + "payload": { + "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", + "subcomponents": [ + { + "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", + "productType": "module" + } + ], + "productType": "module" + } + }, + { + "identification": "urn:uuid:bbbb4f96-4ffc-4228-bb8b-6c584c714c13", + "aspectType": "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", + "contractAgreementId": "NTA2OTRiZTktNzZmNS00N2Q4LWI3ZTctNDQ2YjYyNzZkZWE2:dXJuOnV1aWQ6MTkzODIwYTktYTU4NC00NzcxLTlhYjctYmM0ZmY4Mjg2Zjlh:N2I3YWEwYTktYzYyNS00ZjdmLWEzMjMtYmYxYTkxNThlMWUw", + "payload": { + "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", + "subcomponents": [ + { + "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", + "productType": "module" + } + ], + "productType": "module" + } + }, + { + "identification": "urn:uuid:6e432adb-10f0-499f-ad08-bbf36c74f9bb", + "aspectType": "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", + "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy", + "payload": { + "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", + "subcomponents": [ + { + "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", + "productType": "module" + } + ], + "productType": "module" + } + }, + { + "identification": "urn:uuid:3685db54-9d52-4df2-87a2-05c32edbdc49", + "aspectType": "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", + "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy", + "payload": { + "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", + "subcomponents": [ + { + "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", + "productType": "module" + } + ], + "productType": "module" + } + }, + { + "identification": "urn:uuid:86fee0d5-130c-43cc-b476-4fcce3f9a1c5", + "aspectType": "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", + "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy", + "payload": { + "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", + "subcomponents": [ + { + "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", + "productType": "module" + } + ], + "productType": "module" + } + }, + { + "identification": "urn:uuid:5156fe68-a54b-45e6-8c82-0c4fd488be8c", + "aspectType": "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode", + "contractAgreementId": "NGFkNjljZjctNzRhYy00MzYzLWJkNGUtZjBjYjc5MTFhNDY2:dXJuOnV1aWQ6MTU5MGU0ZDgtNjRiOS00NDUyLThjZGYtZjgyMjFmNGNlNzEz:ZWQwYjA1Y2EtZTdhMS00OWNjLTgwNzgtYWYxYWU2MWMwYjU4", + "payload": { + "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", + "subcomponents": [ + { + "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320", + "productType": "module" + } + ], + "productType": "module" + } + } + ] } \ No newline at end of file diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-528-expected-relationships.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-528-expected-relationships.json index 7786f58268..bca88302a2 100644 --- a/irs-cucumber-tests/src/test/resources/expected-files/TRI-528-expected-relationships.json +++ b/irs-cucumber-tests/src/test/resources/expected-files/TRI-528-expected-relationships.json @@ -1,61 +1,61 @@ { - "relationships" : [ - { - "catenaXId": "urn:uuid:e95f3ff2-c5e7-49a5-873b-aee2728917d3", - "linkedItem": { - "quantity": { - "quantityNumber": 2.5, - "measurementUnit": { - "datatypeURI": null, - "lexicalValue": "unit:litre" - } - }, - "lifecycleContext": "asBuilt", - "assembledOn": "2022-02-03T14:48:54.709Z", - "lastModifiedOn": "2022-02-03T14:48:54.709Z", - "childCatenaXId": "urn:uuid:d57a0374-45bc-4d9e-b44c-e6e75cfe84c0", - "hasAlternatives": true - }, - "aspectType": "SingleLevelBomAsBuilt", - "bpn": "BPNL00000003B3NX" + "relationships": [ + { + "catenaXId": "urn:uuid:015aa300-f0ea-47cd-84d5-969f2cb2cf75", + "linkedItem": { + "quantity": { + "quantityNumber": 20.0, + "measurementUnit": { + "datatypeURI": null, + "lexicalValue": "unit:piece" + } }, - { - "catenaXId": "urn:uuid:e95f3ff2-c5e7-49a5-873b-aee2728917d3", - "linkedItem": { - "quantity": { - "quantityNumber": 0.2341, - "measurementUnit": { - "datatypeURI": null, - "lexicalValue": "unit:kilogram" - } - }, - "lifecycleContext": "asBuilt", - "assembledOn": "2022-02-03T14:48:54.709Z", - "lastModifiedOn": "2022-02-03T14:48:54.709Z", - "childCatenaXId": "urn:uuid:098d565e-915a-4794-a60a-d92a8391bdde", - "hasAlternatives": true - }, - "aspectType": "SingleLevelBomAsBuilt", - "bpn": "BPNL00000003AZQP" + "lifecycleContext": "asBuilt", + "assembledOn": "2022-02-03T14:48:54.709Z", + "lastModifiedOn": "2022-02-03T14:48:54.709Z", + "childCatenaXId": "urn:uuid:91ec20ec-67ab-4699-9ae9-029ed5e332dc", + "hasAlternatives": false + }, + "aspectType": "SingleLevelBomAsBuilt", + "bpn": "BPNL00000003B3NX" + }, + { + "catenaXId": "urn:uuid:015aa300-f0ea-47cd-84d5-969f2cb2cf75", + "linkedItem": { + "quantity": { + "quantityNumber": 0.2341, + "measurementUnit": { + "datatypeURI": null, + "lexicalValue": "unit:kilogram" + } }, - { - "catenaXId": "urn:uuid:e95f3ff2-c5e7-49a5-873b-aee2728917d3", - "linkedItem": { - "quantity": { - "quantityNumber": 0.2014, - "measurementUnit": { - "datatypeURI": null, - "lexicalValue": "unit:kilogram" - } - }, - "lifecycleContext": "asBuilt", - "assembledOn": "2022-02-03T14:48:54.709Z", - "lastModifiedOn": "2022-02-03T14:48:54.709Z", - "childCatenaXId": "urn:uuid:aa42c959-a79c-4350-8ff8-3126a9e984a0", - "hasAlternatives": true - }, - "aspectType": "SingleLevelBomAsBuilt", - "bpn": "BPNL00000003AYRE" - } - ] + "lifecycleContext": "asBuilt", + "assembledOn": "2022-02-03T14:48:54.709Z", + "lastModifiedOn": "2022-02-03T14:48:54.709Z", + "childCatenaXId": "urn:uuid:94ae80dd-e5e2-45cc-893c-9fa63622e47f", + "hasAlternatives": false + }, + "aspectType": "SingleLevelBomAsBuilt", + "bpn": "BPNL00000003AZQP" + }, + { + "catenaXId": "urn:uuid:015aa300-f0ea-47cd-84d5-969f2cb2cf75", + "linkedItem": { + "quantity": { + "quantityNumber": 0.2014, + "measurementUnit": { + "datatypeURI": null, + "lexicalValue": "unit:kilogram" + } + }, + "lifecycleContext": "asBuilt", + "assembledOn": "2022-02-03T14:48:54.709Z", + "lastModifiedOn": "2022-02-03T14:48:54.709Z", + "childCatenaXId": "urn:uuid:d5fbfc88-d838-4f9b-b9ba-2d5e81beab94", + "hasAlternatives": false + }, + "aspectType": "SingleLevelBomAsBuilt", + "bpn": "BPNL00000003AYRE" + } + ] } \ No newline at end of file diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-528-expected-submodels.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-528-expected-submodels.json index 75fe752934..bd63449577 100644 --- a/irs-cucumber-tests/src/test/resources/expected-files/TRI-528-expected-submodels.json +++ b/irs-cucumber-tests/src/test/resources/expected-files/TRI-528-expected-submodels.json @@ -1,46 +1,46 @@ { - "submodels" : [ - { - "identification": "urn:uuid:5fbf0548-8119-4550-852e-3c58eac4a36c", - "aspectType": "urn:bamm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling", - "contractAgreementId": null, - "payload": { - "component": [ - { - "materialName": "Carbon Steel", - "recycledContent": 35, - "materialClass": "1.1.2", - "quantity": { - "unit": "unit:kilogram", - "value": 72.843 - }, - "aggregateState": "solid", - "materialAbbreviation": "CS2" - }, - { - "materialName": "Oil", - "recycledContent": 4, - "materialClass": "9.2", - "quantity": { - "unit": "unit:kilogram", - "value": 6.9 - }, - "aggregateState": "liquid", - "materialAbbreviation": "SAE40" - }, - { - "materialName": "Copper", - "recycledContent": 10, - "materialClass": "3.1", - "quantity": { - "unit": "unit:kilogram", - "value": 1.2 - }, - "aggregateState": "solid", - "materialAbbreviation": "CO7" - } - ] - } - } - ] + "submodels": [ + { + "identification": "urn:uuid:46c4b216-bedd-4161-a141-f6c218784ddf", + "aspectType": "urn:samm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling", + "contractAgreementId": "NTA2OTRiZTktNzZmNS00N2Q4LWI3ZTctNDQ2YjYyNzZkZWE2:dXJuOnV1aWQ6MTkzODIwYTktYTU4NC00NzcxLTlhYjctYmM0ZmY4Mjg2Zjlh:N2I3YWEwYTktYzYyNS00ZjdmLWEzMjMtYmYxYTkxNThlMWUw", + "payload": { + "component": [ + { + "materialName": "Carbon Steel", + "recycledContent": 37, + "materialClass": "1.1.2", + "quantity": { + "unit": "unit:kilogram", + "value": 72.843 + }, + "aggregateState": "solid", + "materialAbbreviation": "CS2" + }, + { + "materialName": "Oil", + "recycledContent": 32, + "materialClass": "9.2", + "quantity": { + "unit": "unit:kilogram", + "value": 6.9 + }, + "aggregateState": "liquid", + "materialAbbreviation": "SAE40" + }, + { + "materialName": "Copper", + "recycledContent": 76, + "materialClass": "3.1", + "quantity": { + "unit": "unit:kilogram", + "value": 1.2 + }, + "aggregateState": "solid", + "materialAbbreviation": "CO7" + } + ] + } + } + ] } \ No newline at end of file diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-704-expected-relationships.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-704-expected-relationships.json index aeceb370e2..8d6c017740 100644 --- a/irs-cucumber-tests/src/test/resources/expected-files/TRI-704-expected-relationships.json +++ b/irs-cucumber-tests/src/test/resources/expected-files/TRI-704-expected-relationships.json @@ -1,71 +1,80 @@ { - "relationships" : [ { - "catenaXId" : "urn:uuid:334cce52-1f52-4bc9-9dd1-410bbe497bbc", - "linkedItem" : { - "quantity" : { - "quantityNumber" : 2.5, - "measurementUnit" : { - "datatypeURI" : null, - "lexicalValue" : "unit:litre" - } + "relationships": [ + { + "catenaXId": "urn:uuid:e097c30e-9010-4eb9-8a8c-064736aceab8", + "linkedItem": { + "quantity": { + "quantityNumber": 20.0, + "measurementUnit": { + "datatypeURI": null, + "lexicalValue": "unit:piece" + } + }, + "lifecycleContext": "asBuilt", + "assembledOn": "2022-02-03T14:48:54.709Z", + "lastModifiedOn": "2022-02-03T14:48:54.709Z", + "childCatenaXId": "urn:uuid:622f4933-e02b-436c-9194-9e5bb71a45e2", + "hasAlternatives": false }, - "lifecycleContext" : "asBuilt", - "assembledOn" : "2022-02-03T14:48:54.709Z", - "lastModifiedOn" : "2022-02-03T14:48:54.709Z", - "childCatenaXId" : "urn:uuid:e47f0639-8e20-4ae5-bd4a-6a07e2f106d9" + "aspectType": "SingleLevelBomAsBuilt", + "bpn": "BPNL00000003B3NX" }, - "aspectType" : "SingleLevelBomAsBuilt", - "bpn" : "BPNL00000003B3NX" - }, { - "catenaXId" : "urn:uuid:334cce52-1f52-4bc9-9dd1-410bbe497bbc", - "linkedItem" : { - "quantity" : { - "quantityNumber" : 0.2014, - "measurementUnit" : { - "datatypeURI" : null, - "lexicalValue" : "unit:kilogram" - } + { + "catenaXId": "urn:uuid:e097c30e-9010-4eb9-8a8c-064736aceab8", + "linkedItem": { + "quantity": { + "quantityNumber": 0.2341, + "measurementUnit": { + "datatypeURI": null, + "lexicalValue": "unit:kilogram" + } + }, + "lifecycleContext": "asBuilt", + "assembledOn": "2022-02-03T14:48:54.709Z", + "lastModifiedOn": "2022-02-03T14:48:54.709Z", + "childCatenaXId": "urn:uuid:ee9b9c9e-1416-45a3-b683-d98d5d88e548", + "hasAlternatives": false }, - "lifecycleContext" : "asBuilt", - "assembledOn" : "2022-02-03T14:48:54.709Z", - "lastModifiedOn" : "2022-02-03T14:48:54.709Z", - "childCatenaXId" : "urn:uuid:7e4541ea-bb0f-464c-8cb3-021abccbfaf5" + "aspectType": "SingleLevelBomAsBuilt", + "bpn": "BPNL00000003AZQP" }, - "aspectType" : "SingleLevelBomAsBuilt", - "bpn" : "BPNL00000003AYRE" - }, { - "catenaXId" : "urn:uuid:334cce52-1f52-4bc9-9dd1-410bbe497bbc", - "linkedItem" : { - "quantity" : { - "quantityNumber" : 0.2341, - "measurementUnit" : { - "datatypeURI" : null, - "lexicalValue" : "unit:kilogram" - } + { + "catenaXId": "urn:uuid:e097c30e-9010-4eb9-8a8c-064736aceab8", + "linkedItem": { + "quantity": { + "quantityNumber": 0.2014, + "measurementUnit": { + "datatypeURI": null, + "lexicalValue": "unit:kilogram" + } + }, + "lifecycleContext": "asBuilt", + "assembledOn": "2022-02-03T14:48:54.709Z", + "lastModifiedOn": "2022-02-03T14:48:54.709Z", + "childCatenaXId": "urn:uuid:0218c3f2-2f70-457c-acc8-b70f1ee53d43", + "hasAlternatives": false }, - "lifecycleContext" : "asBuilt", - "assembledOn" : "2022-02-03T14:48:54.709Z", - "lastModifiedOn" : "2022-02-03T14:48:54.709Z", - "childCatenaXId" : "urn:uuid:e0390640-5d3f-4e30-bfb8-05e7e802fcb0" + "aspectType": "SingleLevelBomAsBuilt", + "bpn": "BPNL00000003AYRE" }, - "aspectType" : "SingleLevelBomAsBuilt", - "bpn" : "BPNL00000003AZQP" - }, { - "catenaXId" : "urn:uuid:e47f0639-8e20-4ae5-bd4a-6a07e2f106d9", - "linkedItem" : { - "quantity" : { - "quantityNumber" : 0.1908, - "measurementUnit" : { - "datatypeURI" : null, - "lexicalValue" : "unit:kilogram" - } + { + "catenaXId": "urn:uuid:622f4933-e02b-436c-9194-9e5bb71a45e2", + "linkedItem": { + "quantity": { + "quantityNumber": 0.1908, + "measurementUnit": { + "datatypeURI": null, + "lexicalValue": "unit:kilogram" + } + }, + "lifecycleContext": "asBuilt", + "assembledOn": "2022-02-03T14:48:54.709Z", + "lastModifiedOn": "2022-02-03T14:48:54.709Z", + "childCatenaXId": "urn:uuid:76ad44b1-89bc-47e3-ad84-b668a7899515", + "hasAlternatives": false }, - "lifecycleContext" : "asBuilt", - "assembledOn" : "2022-02-03T14:48:54.709Z", - "lastModifiedOn" : "2022-02-03T14:48:54.709Z", - "childCatenaXId" : "urn:uuid:f3964e8b-dd90-4748-bfeb-53f523b03052" - }, - "aspectType" : "SingleLevelBomAsBuilt", - "bpn" : "BPNL00000003B0Q0" - } ] + "aspectType": "SingleLevelBomAsBuilt", + "bpn": "BPNL00000003B0Q0" + } + ] } \ No newline at end of file diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-704-expected-submodels.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-704-expected-submodels.json index 6176e13b1e..ca9afdf015 100644 --- a/irs-cucumber-tests/src/test/resources/expected-files/TRI-704-expected-submodels.json +++ b/irs-cucumber-tests/src/test/resources/expected-files/TRI-704-expected-submodels.json @@ -1,231 +1,412 @@ { - "submodels" : [ { - "identification" : "fb455e3d-0f87-4476-bda3-7ab4ce5fea09", - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", - "payload" : { - "catenaXId" : "urn:uuid:334cce52-1f52-4bc9-9dd1-410bbe497bbc", - "childItems" : [ { - "catenaXId" : "urn:uuid:7e4541ea-bb0f-464c-8cb3-021abccbfaf5", - "quantity" : { - "quantityNumber" : 0.2014, - "measurementUnit" : "unit:kilogram" + "submodels": [ + { + "identification": "urn:uuid:1f2fd0ac-c7e1-4cb7-984d-48ea0ee4af3d", + "aspectType": "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", + "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy", + "payload": { + "localIdentifiers": [ + { + "value": "BPNL00000003B2OM", + "key": "manufacturerId" + }, + { + "value": "42555H1-52", + "key": "manufacturerPartId" + }, + { + "value": "NO-392235679424701475513847", + "key": "partInstanceId" + }, + { + "value": "Company 2", + "key": "company" + }, + { + "value": "Brand 2", + "key": "brand" + } + ], + "manufacturingInformation": { + "date": "2022-02-04T14:48:54", + "country": "DEU", + "sites": [ + { + "catenaXsiteId": "BPNS00000003B2OM", + "function": "production" + } + ] }, - "hasAlternatives" : true, - "businessPartner" : "BPNL00000003AYRE", - "createdOn" : "2022-02-03T14:48:54.709Z", - "lastModifiedOn" : "2022-02-03T14:48:54.709Z" - }, { - "catenaXId" : "urn:uuid:e47f0639-8e20-4ae5-bd4a-6a07e2f106d9", - "quantity" : { - "quantityNumber" : 2.5, - "measurementUnit" : "unit:litre" + "catenaXId": "urn:uuid:e097c30e-9010-4eb9-8a8c-064736aceab8", + "partTypeInformation": { + "manufacturerPartId": "42555H1-52", + "customerPartId": "42555H1-52", + "partClassification": [ + { + "classificationDescription": "Standard data element types with associated classification scheme for electric components.", + "classificationStandard": "IEC", + "classificationID": "61360- 2:2012 " + } + ], + "nameAtManufacturer": "Transmission", + "nameAtCustomer": "Transmission" }, - "hasAlternatives" : true, - "businessPartner" : "BPNL00000003B3NX", - "createdOn" : "2022-02-03T14:48:54.709Z", - "lastModifiedOn" : "2022-02-03T14:48:54.709Z" - }, { - "catenaXId" : "urn:uuid:e0390640-5d3f-4e30-bfb8-05e7e802fcb0", - "quantity" : { - "quantityNumber" : 0.2341, - "measurementUnit" : "unit:kilogram" - }, - "hasAlternatives" : true, - "businessPartner" : "BPNL00000003AZQP", - "createdOn" : "2022-02-03T14:48:54.709Z", - "lastModifiedOn" : "2022-02-03T14:48:54.709Z" - } ] - } - }, { - "identification" : "c63836f1-3fdf-403e-a9b6-5ddbf8c55c9b", - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", - "payload" : { - "localIdentifiers" : [ { - "value" : "BPNL00000003B2OM", - "key" : "manufacturerId" - }, { - "value" : "1O222E8-43", - "key" : "manufacturerPartId" - }, { - "value" : "NO-223043329736843650243373", - "key" : "partInstanceId" - }, { - "value" : "Company 2", - "key" : "company" - }, { - "value" : "Brand 2", - "key" : "brand" - } ], - "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", - "country" : "DEU" - }, - "catenaXId" : "urn:uuid:334cce52-1f52-4bc9-9dd1-410bbe497bbc", - "partTypeInformation" : { - "manufacturerPartId" : "1O222E8-43", - "customerPartId" : "1O222E8-43", - "classification" : "component", - "nameAtManufacturer" : "Transmission", - "nameAtCustomer" : "Transmission" + "itemVersion": "04" } - } - }, { - "identification" : "8043a4a4-1e8d-4c1e-b7e5-1c563afab80e", - "aspectType" : "urn:bamm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling", - "payload" : { - "component" : [ { - "materialName" : "Carbon Steel", - "recycledContent" : 33, - "materialClass" : "1.1.2", - "quantity" : { - "unit" : "unit:kilogram", - "value" : 72.843 + }, + { + "identification": "urn:uuid:4388f542-6f2b-4188-a6fc-f40e63ecf32c", + "aspectType": "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", + "contractAgreementId": "NTA2OTRiZTktNzZmNS00N2Q4LWI3ZTctNDQ2YjYyNzZkZWE2:dXJuOnV1aWQ6MTkzODIwYTktYTU4NC00NzcxLTlhYjctYmM0ZmY4Mjg2Zjlh:N2I3YWEwYTktYzYyNS00ZjdmLWEzMjMtYmYxYTkxNThlMWUw", + "payload": { + "catenaXId": "urn:uuid:e097c30e-9010-4eb9-8a8c-064736aceab8", + "childItems": [ + { + "catenaXId": "urn:uuid:0218c3f2-2f70-457c-acc8-b70f1ee53d43", + "quantity": { + "unit": "unit:kilogram", + "value": 0.2014 + }, + "hasAlternatives": false, + "businessPartner": "BPNL00000003AYRE", + "createdOn": "2022-02-03T14:48:54.709Z", + "lastModifiedOn": "2022-02-03T14:48:54.709Z" + }, + { + "catenaXId": "urn:uuid:622f4933-e02b-436c-9194-9e5bb71a45e2", + "quantity": { + "unit": "unit:piece", + "value": 20 + }, + "hasAlternatives": false, + "businessPartner": "BPNL00000003B3NX", + "createdOn": "2022-02-03T14:48:54.709Z", + "lastModifiedOn": "2022-02-03T14:48:54.709Z" + }, + { + "catenaXId": "urn:uuid:ee9b9c9e-1416-45a3-b683-d98d5d88e548", + "quantity": { + "unit": "unit:kilogram", + "value": 0.2341 + }, + "hasAlternatives": false, + "businessPartner": "BPNL00000003AZQP", + "createdOn": "2022-02-03T14:48:54.709Z", + "lastModifiedOn": "2022-02-03T14:48:54.709Z" + } + ] + } + }, + { + "identification": "urn:uuid:7dd20ad1-552c-4d39-bb1c-abb7404b212c", + "aspectType": "urn:samm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling", + "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy", + "payload": { + "component": [ + { + "materialName": "Carbon Steel", + "recycledContent": 50, + "materialClass": "1.1.2", + "quantity": { + "unit": "unit:kilogram", + "value": 72.843 + }, + "aggregateState": "solid", + "materialAbbreviation": "CS2" + }, + { + "materialName": "Oil", + "recycledContent": 12, + "materialClass": "9.2", + "quantity": { + "unit": "unit:kilogram", + "value": 6.9 + }, + "aggregateState": "liquid", + "materialAbbreviation": "SAE40" + }, + { + "materialName": "Copper", + "recycledContent": 89, + "materialClass": "3.1", + "quantity": { + "unit": "unit:kilogram", + "value": 1.2 + }, + "aggregateState": "solid", + "materialAbbreviation": "CO7" + } + ] + } + }, + { + "identification": "urn:uuid:1a4df609-8e2f-488c-a7e3-f00e548c0d78", + "aspectType": "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", + "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy", + "payload": { + "catenaXId": "urn:uuid:ee9b9c9e-1416-45a3-b683-d98d5d88e548", + "childItems": [] + } + }, + { + "identification": "urn:uuid:1b721676-f106-4074-905c-f2c21029145a", + "aspectType": "urn:samm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling", + "contractAgreementId": "NTA2OTRiZTktNzZmNS00N2Q4LWI3ZTctNDQ2YjYyNzZkZWE2:dXJuOnV1aWQ6MTkzODIwYTktYTU4NC00NzcxLTlhYjctYmM0ZmY4Mjg2Zjlh:N2I3YWEwYTktYzYyNS00ZjdmLWEzMjMtYmYxYTkxNThlMWUw", + "payload": { + "component": [ + { + "materialName": "Glue", + "materialClass": "6.2", + "quantity": { + "unit": "unit:kilogram", + "value": 2.5 + }, + "weight": "0.2341", + "materialAbbreviation": "GL338" + } + ] + } + }, + { + "identification": "urn:uuid:6f920ae9-80a6-4b6d-a4c0-6ae876798588", + "aspectType": "urn:samm:io.catenax.batch:3.0.0#Batch", + "contractAgreementId": "NTA2OTRiZTktNzZmNS00N2Q4LWI3ZTctNDQ2YjYyNzZkZWE2:dXJuOnV1aWQ6MTkzODIwYTktYTU4NC00NzcxLTlhYjctYmM0ZmY4Mjg2Zjlh:N2I3YWEwYTktYzYyNS00ZjdmLWEzMjMtYmYxYTkxNThlMWUw", + "payload": { + "localIdentifiers": [ + { + "value": "BPNL00000003AXS3", + "key": "batchId" + } + ], + "manufacturingInformation": { + "date": "2022-02-04T14:48:54", + "country": "HUR", + "sites": [ + { + "catenaXsiteId": "BPNS00000003AXS3", + "function": "production" + } + ] }, - "aggregateState" : "solid", - "materialAbbreviation" : "CS2" - }, { - "materialName" : "Oil", - "recycledContent" : 4, - "materialClass" : "9.2", - "quantity" : { - "unit" : "unit:kilogram", - "value" : 6.9 + "catenaXId": "urn:uuid:ee9b9c9e-1416-45a3-b683-d98d5d88e548", + "partTypeInformation": { + "manufacturerPartId": "SC-00", + "partClassification": [ + { + "classificationDescription": "Standard data element types with associated classification scheme for electric components.", + "classificationStandard": "IEC", + "classificationID": "61360- 2:2012 " + } + ], + "nameAtManufacturer": "Mirror left" }, - "aggregateState" : "liquid", - "materialAbbreviation" : "SAE40" - }, { - "materialName" : "Copper", - "recycledContent" : 37, - "materialClass" : "3.1", - "quantity" : { - "unit" : "unit:kilogram", - "value" : 1.2 + "itemVersion": "03" + } + }, + { + "identification": "urn:uuid:b768de63-a985-4baf-a6d6-e26c4b2cf66c", + "aspectType": "urn:samm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling", + "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy", + "payload": { + "materialName": "Engineering Plastics", + "materialClass": "5.1", + "component": [ + { + "materialName": "PA66", + "recycledContent": 31, + "materialClass": "5.1", + "quantity": { + "unit": "unit:percent", + "value": 70 + }, + "aggregateState": "solid", + "materialAbbreviation": "PA66" + }, + { + "materialName": "GF-Faser", + "recycledContent": 74, + "materialClass": "5.1", + "quantity": { + "unit": "unit:percent", + "value": 30 + }, + "aggregateState": "solid", + "materialAbbreviation": "GF30" + } + ] + } + }, + { + "identification": "urn:uuid:1b013dbd-c709-43dc-8d44-eeb12c3caefa", + "aspectType": "urn:samm:io.catenax.batch:3.0.0#Batch", + "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy", + "payload": { + "localIdentifiers": [ + { + "value": "BPNL00000003B0Q0", + "key": "batchId" + } + ], + "manufacturingInformation": { + "date": "2022-02-04T14:48:54", + "country": "HUR", + "sites": [ + { + "catenaXsiteId": "BPNS00000003B0Q0", + "function": "production" + } + ] }, - "aggregateState" : "solid", - "materialAbbreviation" : "CO7" - } ] - } - }, { - "identification" : "1e3766ab-79a0-4592-a708-c5579ca8ac04", - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", - "payload" : { - "catenaXId" : "urn:uuid:e47f0639-8e20-4ae5-bd4a-6a07e2f106d9", - "childItems" : [ { - "catenaXId" : "urn:uuid:f3964e8b-dd90-4748-bfeb-53f523b03052", - "quantity" : { - "quantityNumber" : 0.1908, - "measurementUnit" : "unit:kilogram" + "catenaXId": "urn:uuid:0218c3f2-2f70-457c-acc8-b70f1ee53d43", + "partTypeInformation": { + "manufacturerPartId": "JK-40", + "partClassification": [ + { + "classificationDescription": "Standard data element types with associated classification scheme for electric components.", + "classificationStandard": "IEC", + "classificationID": "61360- 2:2012 " + } + ], + "nameAtManufacturer": "Mirror left" }, - "hasAlternatives" : true, - "businessPartner" : "BPNL00000003B0Q0", - "createdOn" : "2022-02-03T14:48:54.709Z", - "lastModifiedOn" : "2022-02-03T14:48:54.709Z" - } ] - } - }, { - "identification" : "bd7012a5-8e96-4372-838e-263cf117d260", - "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart", - "payload" : { - "localIdentifiers" : [ { - "value" : "BPNL00000003B3NX", - "key" : "manufacturerId" - }, { - "value" : "74470K4-08", - "key" : "manufacturerPartId" - }, { - "value" : "NO-550767244022562000296953", - "key" : "partInstanceId" - } ], - "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", - "country" : "DEU" - }, - "catenaXId" : "urn:uuid:e47f0639-8e20-4ae5-bd4a-6a07e2f106d9", - "partTypeInformation" : { - "manufacturerPartId" : "74470K4-08", - "customerPartId" : "74470K4-08", - "classification" : "component", - "nameAtManufacturer" : "Sensor", - "nameAtCustomer" : "Sensor" + "itemVersion": "02" } - } - }, { - "identification" : "e2105990-e92f-4a3c-b9d3-f1ec0dc28f2b", - "aspectType" : "urn:bamm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling", - "payload" : { - "materialName" : "NTIER Product", - "materialClass" : "5.5", - "component" : [ { - "materialName" : "Aluminium oxide", - "recycledContent" : 1, - "materialClass" : "5.5.1", - "quantity" : { - "unit" : "unit:percent", - "value" : 60 + }, + { + "identification": "urn:uuid:686eb04e-c34e-4995-baae-a2a13c2fd42d", + "aspectType": "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", + "contractAgreementId": "NGFkNjljZjctNzRhYy00MzYzLWJkNGUtZjBjYjc5MTFhNDY2:dXJuOnV1aWQ6MTU5MGU0ZDgtNjRiOS00NDUyLThjZGYtZjgyMjFmNGNlNzEz:ZWQwYjA1Y2EtZTdhMS00OWNjLTgwNzgtYWYxYWU2MWMwYjU4", + "payload": { + "localIdentifiers": [ + { + "value": "BPNL00000003B3NX", + "key": "manufacturerId" + }, + { + "value": "08708I5-06", + "key": "manufacturerPartId" + }, + { + "value": "NO-072282005385522070609321", + "key": "partInstanceId" + } + ], + "manufacturingInformation": { + "date": "2022-02-04T14:48:54", + "country": "DEU", + "sites": [ + { + "catenaXsiteId": "BPNS00000003CSGV", + "function": "production" + } + ] }, - "aggregateState" : "solid", - "materialAbbreviation" : "" - }, { - "materialName" : "Other", - "recycledContent" : 24, - "materialClass" : "5.5.2", - "quantity" : { - "unit" : "unit:percent", - "value" : 40 + "catenaXId": "urn:uuid:622f4933-e02b-436c-9194-9e5bb71a45e2", + "partTypeInformation": { + "manufacturerPartId": "08708I5-06", + "customerPartId": "08708I5-06", + "partClassification": [ + { + "classificationDescription": "Standard data element types with associated classification scheme for electric components.", + "classificationStandard": "IEC", + "classificationID": "61360- 2:2012 " + } + ], + "nameAtManufacturer": "Sensor", + "nameAtCustomer": "Sensor" }, - "aggregateState" : "solid", - "materialAbbreviation" : "" - } ] - } - }, { - "identification" : "d0464051-3535-4ad9-93e7-f91ecac11474", - "aspectType" : "urn:bamm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling", - "payload" : { - "materialName" : "Engineering Plastics", - "materialClass" : "5.1", - "component" : [ { - "materialName" : "PA66", - "recycledContent" : 30, - "materialClass" : "5.1", - "quantity" : { - "unit" : "unit:percent", - "value" : 70 - }, - "aggregateState" : "solid", - "materialAbbreviation" : "PA66" - }, { - "materialName" : "GF-Faser", - "recycledContent" : 19, - "materialClass" : "5.1", - "quantity" : { - "unit" : "unit:percent", - "value" : 30 + "itemVersion": "05" + } + }, + { + "identification": "urn:uuid:02cdc2d5-98eb-406a-951c-94b579660ec3", + "aspectType": "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", + "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy", + "payload": { + "catenaXId": "urn:uuid:622f4933-e02b-436c-9194-9e5bb71a45e2", + "childItems": [ + { + "catenaXId": "urn:uuid:76ad44b1-89bc-47e3-ad84-b668a7899515", + "quantity": { + "unit": "unit:kilogram", + "value": 0.1908 + }, + "hasAlternatives": false, + "businessPartner": "BPNL00000003B0Q0", + "createdOn": "2022-02-03T14:48:54.709Z", + "lastModifiedOn": "2022-02-03T14:48:54.709Z" + } + ] + } + }, + { + "identification": "urn:uuid:9b89f6b2-39e3-41cd-bb5f-65f87fe7e4b2", + "aspectType": "urn:samm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling", + "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy", + "payload": { + "materialName": "NTIER Product", + "materialClass": "5.5", + "component": [ + { + "materialName": "Aluminium oxide", + "recycledContent": 41, + "materialClass": "5.5.1", + "quantity": { + "unit": "unit:percent", + "value": 60 + }, + "aggregateState": "solid", + "materialAbbreviation": "" + }, + { + "materialName": "Other", + "recycledContent": 5, + "materialClass": "5.5.2", + "quantity": { + "unit": "unit:percent", + "value": 40 + }, + "aggregateState": "solid", + "materialAbbreviation": "" + } + ] + } + }, + { + "identification": "urn:uuid:b553e542-a608-4c55-941a-5a246ff23161", + "aspectType": "urn:samm:io.catenax.batch:3.0.0#Batch", + "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy", + "payload": { + "localIdentifiers": [ + { + "value": "BPNL00000003B0Q0", + "key": "batchId" + } + ], + "manufacturingInformation": { + "date": "2022-02-04T14:48:54", + "country": "HUR", + "sites": [ + { + "catenaXsiteId": "BPNS00000003B0Q0", + "function": "production" + } + ] }, - "aggregateState" : "solid", - "materialAbbreviation" : "GF30" - } ] - } - }, { - "identification" : "0b881281-0c15-471d-90cf-855ea3b8585f", - "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt", - "payload" : { - "catenaXId" : "urn:uuid:e0390640-5d3f-4e30-bfb8-05e7e802fcb0", - "childItems" : [ ] - } - }, { - "identification" : "544817ae-1ea2-4614-9fdb-50c448925d51", - "aspectType" : "urn:bamm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling", - "payload" : { - "component" : [ { - "materialName" : "Glue", - "materialClass" : "6.2", - "quantity" : { - "unit" : "unit:kilogram", - "value" : 2.5 + "catenaXId": "urn:uuid:76ad44b1-89bc-47e3-ad84-b668a7899515", + "partTypeInformation": { + "manufacturerPartId": "QQ-78", + "partClassification": [ + { + "classificationDescription": "Standard data element types with associated classification scheme for electric components.", + "classificationStandard": "IEC", + "classificationID": "61360- 2:2012 " + } + ], + "nameAtManufacturer": "Mirror left" }, - "weight" : "0.2341", - "materialAbbreviation" : "GL338" - } ] + "itemVersion": "01" + } } - } ] + ] } \ No newline at end of file diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-893-expected-relationships.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-893-expected-relationships.json index 35b62aff75..8660465e5c 100644 --- a/irs-cucumber-tests/src/test/resources/expected-files/TRI-893-expected-relationships.json +++ b/irs-cucumber-tests/src/test/resources/expected-files/TRI-893-expected-relationships.json @@ -7,7 +7,7 @@ "quantityNumber": 1.0, "measurementUnit": { "datatypeURI": null, - "lexicalValue": "unit:litre" + "lexicalValue": "unit:piece" } }, "lifecycleContext": "asPlanned", @@ -26,7 +26,7 @@ "quantityNumber": 1.0, "measurementUnit": { "datatypeURI": null, - "lexicalValue": "unit:litre" + "lexicalValue": "unit:piece" } }, "lifecycleContext": "asPlanned", @@ -39,61 +39,61 @@ "bpn": "BPNL50096894aNXY" }, { - "catenaXId": "urn:uuid:e3e2a4d8-58bc-4ae9-afa2-e8946fda1f77", + "catenaXId": "urn:uuid:e8c48a8e-d2d7-43d9-a867-65c70c85f5b8", "linkedItem": { "quantity": { - "quantityNumber": 1.0, + "quantityNumber": 1580.0, "measurementUnit": { "datatypeURI": null, - "lexicalValue": "unit:litre" + "lexicalValue": "unit:gram" } }, "lifecycleContext": "asPlanned", "assembledOn": "2022-02-03T14:48:54.709Z", "lastModifiedOn": "2022-02-03T14:48:54.709Z", - "childCatenaXId": "urn:uuid:3cdd2826-5df0-4c7b-b540-9eeccecb2301", + "childCatenaXId": "urn:uuid:94d086c6-0124-4f2c-86b2-1d419e47499d", "hasAlternatives": false }, "aspectType": "SingleLevelBomAsPlanned", - "bpn": "BPNL00000003AXS3" + "bpn": "BPNL50096894aNXY" }, { - "catenaXId": "urn:uuid:e8c48a8e-d2d7-43d9-a867-65c70c85f5b8", + "catenaXId": "urn:uuid:94d086c6-0124-4f2c-86b2-1d419e47499d", "linkedItem": { "quantity": { - "quantityNumber": 1580.0, + "quantityNumber": 1.0, "measurementUnit": { "datatypeURI": null, - "lexicalValue": "unit:gram" + "lexicalValue": "unit:piece" } }, "lifecycleContext": "asPlanned", "assembledOn": "2022-02-03T14:48:54.709Z", "lastModifiedOn": "2022-02-03T14:48:54.709Z", - "childCatenaXId": "urn:uuid:94d086c6-0124-4f2c-86b2-1d419e47499d", + "childCatenaXId": "urn:uuid:b0926d3c-6a8f-4fc7-81a4-88c50817358a", "hasAlternatives": false }, "aspectType": "SingleLevelBomAsPlanned", "bpn": "BPNL50096894aNXY" }, { - "catenaXId": "urn:uuid:94d086c6-0124-4f2c-86b2-1d419e47499d", + "catenaXId": "urn:uuid:e3e2a4d8-58bc-4ae9-afa2-e8946fda1f77", "linkedItem": { "quantity": { "quantityNumber": 1.0, "measurementUnit": { "datatypeURI": null, - "lexicalValue": "unit:litre" + "lexicalValue": "unit:piece" } }, "lifecycleContext": "asPlanned", "assembledOn": "2022-02-03T14:48:54.709Z", "lastModifiedOn": "2022-02-03T14:48:54.709Z", - "childCatenaXId": "urn:uuid:b0926d3c-6a8f-4fc7-81a4-88c50817358a", + "childCatenaXId": "urn:uuid:3cdd2826-5df0-4c7b-b540-9eeccecb2301", "hasAlternatives": false }, "aspectType": "SingleLevelBomAsPlanned", - "bpn": "BPNL50096894aNXY" + "bpn": "BPNL00000003AXS3" } ] } \ No newline at end of file diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-893-expected-submodels.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-893-expected-submodels.json index 7d47f7f5bf..015f05ae38 100644 --- a/irs-cucumber-tests/src/test/resources/expected-files/TRI-893-expected-submodels.json +++ b/irs-cucumber-tests/src/test/resources/expected-files/TRI-893-expected-submodels.json @@ -1,99 +1,129 @@ { "submodels": [ { - "identification": "urn:uuid:cd43ab3a-83c3-42a5-9c93-53a82223c7b8", - "aspectType": "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "identification": "urn:uuid:b82ebca3-b462-4ad3-9cfd-d79b3958e580", + "aspectType": "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", + "contractAgreementId": "M2U1NzRlNGEtZDhkNS00YmE3LTlhZmQtYWQ2MDBmMmY1ZjZm:dXJuOnV1aWQ6NDllYjUwMmItZTY4Yi00YjhhLTk3MjctN2M4NWRlMjUzODZh:OTA1ZWJlNGYtZTI5OC00YmU1LThiNmMtMzAyYmJiODg2Nzc0", "payload": { - "validityPeriod": { - "validFrom": "2018-08-15T15:18:04.000Z", - "validTo": "2028-05-14T00:23:55.000Z" - }, "catenaXId": "urn:uuid:65e1554e-e5cd-4560-bac1-1352582122fb", "partTypeInformation": { "manufacturerPartId": "XK-34", "classification": "product", "nameAtManufacturer": "Vehicle Model C" - } - } - }, - { - "identification": "urn:uuid:8d5bcf49-7d09-4d98-a3b6-3e4253f5bb46", - "aspectType": "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", - "payload": { - "validityPeriod": { - "validFrom": "2018-09-16T00:07:10.000Z", - "validTo": "2032-01-10T15:26:52.000Z" }, - "catenaXId": "urn:uuid:e3e2a4d8-58bc-4ae9-afa2-e8946fda1f77", - "partTypeInformation": { - "manufacturerPartId": "39478586-36", - "classification": "product", - "nameAtManufacturer": "Tier B ECU2" - } + "partSitesInformationAsPlanned": [ + { + "functionValidUntil": "2023-12-11T06:14:55.183Z", + "catenaXsiteId": "BPNS1234567890ZZ", + "function": "production", + "functionValidFrom": "2023-12-11T06:14:55.181Z" + } + ] } }, { - "identification": "urn:uuid:6692c07a-6771-48a2-a729-331d1a488037", - "aspectType": "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "identification": "urn:uuid:724afc8f-240f-40ad-98f0-5fa03d97164e", + "aspectType": "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", + "contractAgreementId": "M2U1NzRlNGEtZDhkNS00YmE3LTlhZmQtYWQ2MDBmMmY1ZjZm:dXJuOnV1aWQ6NDllYjUwMmItZTY4Yi00YjhhLTk3MjctN2M4NWRlMjUzODZh:OTA1ZWJlNGYtZTI5OC00YmU1LThiNmMtMzAyYmJiODg2Nzc0", "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": "123564887-01", "classification": "product", "nameAtManufacturer": "Tire Model A" - } + }, + "partSitesInformationAsPlanned": [ + { + "functionValidUntil": "2023-12-11T06:14:55.183Z", + "catenaXsiteId": "BPNS1234567890ZZ", + "function": "production", + "functionValidFrom": "2023-12-11T06:14:55.181Z" + } + ] } }, { - "identification": "urn:uuid:879aef49-f000-4f1a-b749-def9d4807b22", - "aspectType": "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "identification": "urn:uuid:e1a2222c-6d93-46d5-99d4-b3b396511179", + "aspectType": "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", + "contractAgreementId": "MDRmZjRhZmYtZGRlOS00MmRlLWFiMmYtN2U1MzY0NDcxNTUx:dXJuOnV1aWQ6MmJhZDFjNDktNGRjMC00NDE2LWI2ZGEtZTJlODllOWQwYmY0:NDdkNGI0OGEtMGFjZS00ODE5LTk2OWYtYWYzZWU1YTg1ZWQw", "payload": { - "validityPeriod": { - "validFrom": "2019-08-17T14:14:30.000Z", - "validTo": "2032-08-30T04:32:28.000Z" - }, - "catenaXId": "urn:uuid:3cdd2826-5df0-4c7b-b540-9eeccecb2301", + "catenaXId": "urn:uuid:94d086c6-0124-4f2c-86b2-1d419e47499d", "partTypeInformation": { - "manufacturerPartId": "6775244-06", + "manufacturerPartId": "9953421-03", "classification": "product", - "nameAtManufacturer": "Sub Tier B Glue" - } + "nameAtManufacturer": "Natural Rubber Product(40KG blocks)" + }, + "partSitesInformationAsPlanned": [ + { + "functionValidUntil": "2023-12-11T06:14:55.183Z", + "catenaXsiteId": "BPNS1234567890ZZ", + "function": "production", + "functionValidFrom": "2023-12-11T06:14:55.181Z" + } + ] } }, { - "identification": "urn:uuid:bcfeab97-b97b-47c4-8fae-9f88e83d4579", - "aspectType": "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "identification": "urn:uuid:26f72cc4-5a15-4b26-b3b7-323093c57a53", + "aspectType": "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", + "contractAgreementId": "M2U1NzRlNGEtZDhkNS00YmE3LTlhZmQtYWQ2MDBmMmY1ZjZm:dXJuOnV1aWQ6NDllYjUwMmItZTY4Yi00YjhhLTk3MjctN2M4NWRlMjUzODZh:OTA1ZWJlNGYtZTI5OC00YmU1LThiNmMtMzAyYmJiODg2Nzc0", "payload": { - "validityPeriod": { - "validFrom": "2017-04-29T01:48:37.000Z", - "validTo": "2029-08-26T00:42:55.000Z" - }, - "catenaXId": "urn:uuid:94d086c6-0124-4f2c-86b2-1d419e47499d", + "catenaXId": "urn:uuid:e3e2a4d8-58bc-4ae9-afa2-e8946fda1f77", "partTypeInformation": { - "manufacturerPartId": "9953421-03", + "manufacturerPartId": "39478586-36", "classification": "product", - "nameAtManufacturer": "Natural Rubber Product(40KG blocks)" - } + "nameAtManufacturer": "Tier B ECU2" + }, + "partSitesInformationAsPlanned": [ + { + "functionValidUntil": "2023-12-11T06:14:55.183Z", + "catenaXsiteId": "BPNS1234567890ZZ", + "function": "production", + "functionValidFrom": "2023-12-11T06:14:55.181Z" + } + ] } }, { - "identification": "urn:uuid:374b82cd-8038-4feb-8ae8-f9907c082623", - "aspectType": "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned", + "identification": "urn:uuid:e16c4427-512d-455e-8baa-6cc3a7d0602c", + "aspectType": "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", + "contractAgreementId": "ZWIxNmYxNDItMTUxMC00MDQyLTkyZTgtOTE5OTAwYzY5ODVj:dXJuOnV1aWQ6NDk1MGQ0ZmMtOTA5ZC00ZGNmLTg0OTYtMzg0NWQ1YmQ2Zjc2:NWI2NTdkOWQtNTIyOS00NmY2LWFkNDctZTBiZmYyMmQ2OGMw", "payload": { - "validityPeriod": { - "validFrom": "2014-02-07T16:56:02.000Z", - "validTo": "2029-08-26T11:05:18.000Z" - }, "catenaXId": "urn:uuid:b0926d3c-6a8f-4fc7-81a4-88c50817358a", "partTypeInformation": { "manufacturerPartId": "A26581-11", "classification": "product", "nameAtManufacturer": "Natural Rubber" - } + }, + "partSitesInformationAsPlanned": [ + { + "functionValidUntil": "2023-12-11T06:14:55.183Z", + "catenaXsiteId": "BPNS1234567890ZZ", + "function": "production", + "functionValidFrom": "2023-12-11T06:14:55.181Z" + } + ] + } + }, + { + "identification": "urn:uuid:176135ea-f47f-49f1-a077-997bf1d44c89", + "aspectType": "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", + "contractAgreementId": "ZWIxNmYxNDItMTUxMC00MDQyLTkyZTgtOTE5OTAwYzY5ODVj:dXJuOnV1aWQ6NDk1MGQ0ZmMtOTA5ZC00ZGNmLTg0OTYtMzg0NWQ1YmQ2Zjc2:NWI2NTdkOWQtNTIyOS00NmY2LWFkNDctZTBiZmYyMmQ2OGMw", + "payload": { + "catenaXId": "urn:uuid:3cdd2826-5df0-4c7b-b540-9eeccecb2301", + "partTypeInformation": { + "manufacturerPartId": "6775244-06", + "classification": "product", + "nameAtManufacturer": "Sub Tier B Glue" + }, + "partSitesInformationAsPlanned": [ + { + "functionValidUntil": "2023-12-11T06:14:55.183Z", + "catenaXsiteId": "BPNS1234567890ZZ", + "function": "production", + "functionValidFrom": "2023-12-11T06:14:55.181Z" + } + ] } } ] diff --git a/local/testing/api-tests/README.md b/local/testing/api-tests/README.md index 95c7debcbd..8f733c79d5 100644 --- a/local/testing/api-tests/README.md +++ b/local/testing/api-tests/README.md @@ -4,11 +4,11 @@ This folder contains [Tavern](https://tavern.readthedocs.io) API tests for the I ## Usage -* Install python -* Install pytest: ```py -m pip install pytest``` -* Install tavern: ```py -m pip install tavern``` -* Create variable.env in directory api-tests -* Copy content to variable.env +1. Install python +2. Install pytest: ```py -m pip install pytest``` +3. Install tavern: ```py -m pip install tavern``` +4. Create variable.env in directory api-tests +5. Copy content to variable.env ``` # this is temporary file for local development to setup environments variable such a secrets and URLs # to run it just execute in console: @@ -27,10 +27,19 @@ export REGULAR_USER_API_KEY_ESS= export ADMIN_USER_API_KEY_ESS= ``` * Execute command + +- Note: Execute command from irs root directory ..\item-relationship-service + ```console - source variable.env - py -m pytest irs-api-tests.tavern.yaml + source local/testing/api-tests/variable.env && python -m pytest local/testing/api-tests/irs-api-tests.tavern.yaml ``` + 2. To run a single test: + ```console + py -m pytest local/testing/api-tests/irs-api-tests.tavern.yaml::"" + + # for example: + py -m pytest local/testing/api-tests/irs-api-tests.tavern.yaml::"Make sure job with submodels process with status COMPLETED with asPlanned-id" + ``` diff --git a/pom.xml b/pom.xml index a9ee43e4aa..cb7cdab98f 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ 1.10.0-SNAPSHOT - 3.1.10 + 3.1.11 2.2.0 1.11.4 1.9.0