Merge pull request #363 from catenax-ng/feature/TRACEFOSS-1535-update…

…-aspect-models

feature: TRACEFOSS-1535 test data for updated aspect models

CHANGELOG.md

@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ## [Unreleased]
 
 ### Added
+
 - Added back button in notification detailed view
 - Added alert detail view
 - EDC SPI Dependency for using provided models
@@ -20,6 +21,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Changed request parameter for registerjob request to irs to match requirements of irs
 - Migration of edc 0.4.1 endpoints and api flow
 - fixed bug where language switcher did not update to the selected language
+- Changed SerialPartTypization aspect model to SerialPart
+- Changed AssemblyPartRelationship aspect model to SingleLevelBomAsBuilt
 
 ### Removed
 

charts/traceability-foss/Chart.yaml

@@ -39,7 +39,7 @@ dependencies:
     condition: pgadmin4.enabled
   - name: irs-helm
     repository: https://eclipse-tractusx.github.io/item-relationship-service
-    version: 6.0.1
+    version: 6.1.0
     condition: irs-helm.enabled
   - condition: tractusx-connector.enabled
     name: tractusx-connector

dev/README.md

@@ -30,25 +30,25 @@ In order to upload data to EDC Provider, please use [IRS project script](https:/
 Sample invocation (DEV)
 
 ```
-python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.3.json -s https://tracex-submodel-server.dev.demo.catena-x.net -edc https://trace-x-edc.dev.demo.catena-x.net -a https://trace-x-registry.dev.demo.catena-x.net/semantics/registry -p id-3.0-trace -k <apiKey>
+python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.4.json -s https://tracex-submodel-server.dev.demo.catena-x.net -edc https://trace-x-edc.dev.demo.catena-x.net -a https://trace-x-registry.dev.demo.catena-x.net/semantics/registry -p id-3.0-trace -k <apiKey>
 ```
 
 Sample invocation (TEST)
 
 ```
-python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.3.json -s https://tracex-submodel-server-test.dev.demo.catena-x.net -edc https://trace-x-test-edc.dev.demo.catena-x.net -a https://trace-x-registry-test.dev.demo.catena-x.net/semantics/registry -p id-3.0-trace -k <apiKey>
+python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.4.json -s https://tracex-submodel-server-test.dev.demo.catena-x.net -edc https://trace-x-test-edc.dev.demo.catena-x.net -a https://trace-x-registry-test.dev.demo.catena-x.net/semantics/registry -p id-3.0-trace -k <apiKey>
 ```
 
 Sample invocation (E2E A)
 
 ```
-python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.3.json -s https://tracex-submodel-server-e2e-a.dev.demo.catena-x.net -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 -p id-3.0-trace -k <apiKey>
+python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.4.json -s https://tracex-submodel-server-e2e-a.dev.demo.catena-x.net -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 -p id-3.0-trace -k <apiKey>
 ```
 
 Sample invocation (E2E B)
 
 ```
-python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.3.json -s https://tracex-submodel-server-e2e-b.dev.demo.catena-x.net -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 -p id-3.0-trace -k <apiKey>
+python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.4.json -s https://tracex-submodel-server-e2e-b.dev.demo.catena-x.net -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 -p id-3.0-trace -k <apiKey>
 ```
 
 where:
@@ -162,7 +162,7 @@ Consists of a List of the following structured entries:
         "childCatenaXId" : "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd"
       } ]
     } ],
-    "urn:bamm:io.catenax.serial_part_typization:1.1.0#SerialPartTypization" : [ {
+    "urn:bamm:io.catenax.serial_part:1.0.0#SerialPart" : [ {
       "localIdentifiers" : [ {
         "value" : "BPNL00000003CML1",
         "key" : "manufacturerId"
@@ -212,10 +212,10 @@ Is achieved by defining the order of the BPNLs of the desired manufacturers. See
   ]
 ```
 ...AZQP -> ...3ML1 -> ...CNKC
-and adding an AssemlyPartRelationship Aspect with the corresponding childCatenaXId:
+and adding an SingleLevelBomAsBuilt Aspect with the corresponding childCatenaXId:
 ```json
 {
-"urn:bamm:io.catenax.assembly_part_relationship:1.1.0#AssemblyPartRelationship" : [ {
+"urn:bamm:io.catenax.single_level_bom_as_built:1.0.0#SingleLevelBomAsBuilt" : [ {
 "catenaXId" : "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd",
 "childParts" : [ {
 "quantity" : {
@@ -243,12 +243,12 @@ Is achieved through adding the SingleLevelusageBuilt - Codeblock and the corresp
 [{
   "catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd",
   "bpnl" : "BPNL00000003CNKC",
-  "urn:bamm:io.catenax.assembly_part_relationship:1.1.1#AssemblyPartRelationship": "[...]",
-  "urn:bamm:io.catenax.serial_part_typization:1.1.0#SerialPartTypization" : "[...]"
+  "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_typization:1.1.0#SerialPartTypization" : "",
+  "urn:bamm:io.catenax.serial_part:1.0.0#SerialPart" : "",
   "urn:bamm:io.catenax.single_level_usage_as_built:1.0.1#SingleLevelUsageAsBuilt": [
     {
       "parentParts": [

docs/src/docs/arc42/introduction-goals/requirements.adoc

@@ -10,7 +10,7 @@
 == Essential features
 * List and view manufactured parts based on BoM AsBuild
 * Show detailed information on manufactured parts from AAS description assets and Aspects
-* Uses Submodels SerialPartTypization, AssemblyPartRelationship and Batch
+* 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

docs/src/docs/user/user-manual.adoc

@@ -43,7 +43,7 @@ Supported languages:
 
 == Parts
 List view of the own manufactured parts and batches.
-Gives detailed information on the assets registered in the Digital Twin Registry of Catena-X for the company. This includes data based on the aspect models of Use Case Traceability: SerialPartTypization, AssemblyPartRelationship, Batch.
+Gives detailed information on the assets registered in the Digital Twin Registry of Catena-X for the company. This includes data based on the aspect models of Use Case Traceability: SerialPart, AssemblyPartRelationship, Batch.
 
 image::https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/parts-list-detailed-view.PNG[]
 
@@ -72,7 +72,7 @@ Once the quality investigation is created you will get a pop-up and can directly
 
 == Other parts
 List view of the supplied with parts and batches (Supplier parts).
-Gives detailed information on the assets registered in the Digital Twin Registry of Catena-X for the supplier companies. This includes data that is ingested based on the aspect model AssemblyPartRelationship of the child parts for Use Case Traceability aspect models: SerialPartTypization, Batch.
+Gives detailed information on the assets registered in the Digital Twin Registry of Catena-X for the supplier companies. This includes data that is ingested based on the aspect model AssemblyPartRelationship of the child parts for Use Case Traceability aspect models: SerialPart, Batch.
 
 image::https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/supplier-parts-list-detailed-view.PNG[]
 

docs/src/uml-diagrams/concept/TRACEFOSS-1423/domain-model.puml

@@ -42,12 +42,12 @@ entity AsBuiltAsset {
 }
 
 note right
-    SerialPartTypization and Batch
+    SerialPart and Batch
 end note
 
 enum SemanticDataModel {
     BATCH,
-    SERIALPARTTYPIZATION
+    SERIALPART
 }
 
 entity AsPlannedAsset {

frontend/src/app/mocks/services/otherParts-mock/otherParts.model.ts

@@ -67,7 +67,7 @@ export const otherPartsAssets = [
     underInvestigation: true,
     qualityType: 'Ok',
     van: 'myvan2',
-    semanticDataModel: 'SERIALPARTTYPIZATION'
+    semanticDataModel: 'SERIALPART',
   },
   {
     id: 'urn:uuid:fccbc75e-6ccd-46e2-ba93-4a3125dfb5a5',
@@ -90,7 +90,7 @@ export const otherPartsAssets = [
     underInvestigation: false,
     qualityType: 'Ok',
     van: 'myvan3',
-    semanticDataModel: 'SERIALPARTTYPIZATION'
+    semanticDataModel: 'SERIALPART',
   },
   {
     id: 'urn:uuid:dad03189-4ce7-47a4-bfc5-e7b77dc6cf68',
@@ -148,7 +148,7 @@ export const otherPartsAssets = [
     underInvestigation: false,
     qualityType: 'Ok',
     van: 'myvan5',
-    semanticDataModel: 'SERIALPARTTYPIZATION'
+    semanticDataModel: 'SERIALPART',
   },
   {
     id: 'urn:uuid:d411568e-d950-44ff-87c2-492ac6beabe9',
@@ -171,7 +171,7 @@ export const otherPartsAssets = [
     underInvestigation: false,
     qualityType: 'Ok',
     van: 'myvanX',
-    semanticDataModel: 'SERIALPARTTYPIZATION'
+    semanticDataModel: 'SERIALPART',
   },
   {
     id: 'urn:uuid:c8504172-21a7-4b02-9cc7-cfaa0fc29bd8',
@@ -252,7 +252,7 @@ export const otherPartsAssets = [
     underInvestigation: false,
     qualityType: 'Ok',
     van: 'myvanX',
-    semanticDataModel: 'SERIALPARTTYPIZATION'
+    semanticDataModel: 'SERIALPART',
   },
   {
     id: 'urn:uuid:6599279a-3fe4-479f-bc11-fcd97bb42607',
@@ -287,7 +287,7 @@ export const otherPartsAssets = [
     underInvestigation: false,
     qualityType: 'Ok',
     van: 'myvanX',
-    semanticDataModel: 'SERIALPARTTYPIZATION'
+    semanticDataModel: 'SERIALPART',
   },
   /* Commented out for now because of amount of effort to change to new structure
   {
@@ -306,7 +306,7 @@ export const otherPartsAssets = [
     specificAssetIds: {},
     childDescriptions: [],
     qualityType: 'Ok',
-    semanticDataModel: 'SERIALPARTTYPIZATION',
+    semanticDataModel: 'SERIALPART',
   },
   {
     id: 'urn:uuid:b8f04288-6685-47cd-b38d-67c88ba1b02d',
@@ -336,7 +336,7 @@ export const otherPartsAssets = [
       { id: 'urn:uuid:24468d86-6718-479a-adc6-f9b65f6ada56', idShort: '--' },
     ],
     qualityType: 'Ok',
-    semanticDataModel: 'SERIALPARTTYPIZATION',
+    semanticDataModel: 'SERIALPART',
   },
   {
     id: 'urn:uuid:09c704a5-c1a7-4b73-9038-e4af72e44dd6',
@@ -372,7 +372,7 @@ export const otherPartsAssets = [
     specificAssetIds: {},
     childDescriptions: [],
     qualityType: 'Ok',
-    semanticDataModel: 'SERIALPARTTYPIZATION',
+    semanticDataModel: 'SERIALPART',
   },
   {
     id: 'urn:uuid:8869d78f-b127-406c-b261-1060e30560f2',
@@ -408,7 +408,7 @@ export const otherPartsAssets = [
     specificAssetIds: {},
     childDescriptions: [],
     qualityType: 'Ok',
-    semanticDataModel: 'SERIALPARTTYPIZATION',
+    semanticDataModel: 'SERIALPART',
   },
   {
     id: 'urn:uuid:0f6b767a-7f8f-4edd-902c-ee563255a5f8',
@@ -438,7 +438,7 @@ export const otherPartsAssets = [
       { id: 'urn:uuid:440e2c89-6db5-4044-9aa3-c020b276ade9', idShort: '--' },
     ],
     qualityType: 'Ok',
-    semanticDataModel: 'SERIALPARTTYPIZATION',
+    semanticDataModel: 'SERIALPART',
   },
   {
     id: 'urn:uuid:06ce2095-d52d-4ab9-a31f-fa6a6b07f685',
@@ -460,7 +460,7 @@ export const otherPartsAssets = [
       { id: 'urn:uuid:5f5bba9c-e24b-4c83-86a0-ec7484f57b7b', idShort: '--' },
     ],
     qualityType: 'Ok',
-    semanticDataModel: 'SERIALPARTTYPIZATION',
+    semanticDataModel: 'SERIALPART',
   },
   {
     id: 'urn:uuid:e35abf46-5a66-47b6-b74b-1753287d576d',

frontend/src/app/mocks/services/parts-mock/parts.model.ts

@@ -98,7 +98,7 @@ export const mockBmwAssets = [
     underInvestigation: false,
     qualityType: QualityType.Ok,
     van: null,
-    semanticDataModel: SemanticDataModel.SERIALPARTTYPIZATION,
+    semanticDataModel: SemanticDataModel.SERIALPART,
   },
   {
     id: 'urn:uuid:ab863676-a37c-41e7-a5f9-efaa071dbbf5',
@@ -182,7 +182,7 @@ export const mockBmwAssets = [
     van: null,
     activeAlert: false,
     underInvestigation: false,
-    semanticDataModel: SemanticDataModel.SERIALPARTTYPIZATION,
+    semanticDataModel: SemanticDataModel.SERIALPART,
   },
 
 {
@@ -240,7 +240,7 @@ export const mockBmwAssets = [
   activeAlert: false,
   underInvestigation: false,
   qualityType: QualityType.Ok,
-  semanticDataModel: SemanticDataModel.SERIALPARTTYPIZATION,
+  semanticDataModel: SemanticDataModel.SERIALPART,
 },
 
   {
@@ -300,7 +300,7 @@ export const mockBmwAssets = [
     underInvestigation: false,
     qualityType: 'Ok',
     van: null,
-    semanticDataModel: SemanticDataModel.SERIALPARTTYPIZATION,
+    semanticDataModel: SemanticDataModel.SERIALPART,
   },
 
   {
@@ -327,7 +327,7 @@ export const mockBmwAssets = [
     underInvestigation: false,
     qualityType: 'Ok',
     van: null,
-    semanticDataModel: SemanticDataModel.SERIALPARTTYPIZATION,
+    semanticDataModel: SemanticDataModel.SERIALPART,
   },
   {
     id: 'urn:uuid:9a80e5ee-6c27-47f5-912a-56945e26b9a6',
@@ -354,7 +354,7 @@ export const mockBmwAssets = [
     underInvestigation: false,
     qualityType: 'Ok',
     van: null,
-    semanticDataModel: SemanticDataModel.SERIALPARTTYPIZATION,
+    semanticDataModel: SemanticDataModel.SERIALPART,
   },
   {
     id: 'urn:uuid:bf5ae91d-02f8-4e33-b130-90ec402ac0db',
@@ -380,7 +380,7 @@ export const mockBmwAssets = [
     underInvestigation: false,
     qualityType: 'Ok',
     van: null,
-    semanticDataModel: SemanticDataModel.SERIALPARTTYPIZATION,
+    semanticDataModel: SemanticDataModel.SERIALPART,
   },
   {
     id: 'urn:uuid:d261e0fa-36f5-4128-875e-0f5735f5a535',

frontend/src/app/mocks/services/parts-mock/parts.test.model.ts

@@ -43,7 +43,7 @@ export const MOCK_part_5 = {
   underInvestigation: false,
   qualityType: QualityType.LifeThreatening,
   van: 'myvan5',
-  semanticDataModel: SemanticDataModel.SERIALPARTTYPIZATION,
+  semanticDataModel: SemanticDataModel.SERIALPART,
 };
 
 export const MOCK_part_4 = {
@@ -67,7 +67,7 @@ export const MOCK_part_4 = {
   underInvestigation: false,
   qualityType: QualityType.Critical,
   van: 'myvan4',
-  semanticDataModel: SemanticDataModel.SERIALPARTTYPIZATION,
+  semanticDataModel: SemanticDataModel.SERIALPART,
 };
 
 export const MOCK_part_3 = {
@@ -85,13 +85,13 @@ export const MOCK_part_3 = {
     nameAtCustomer: 'A 180 Limousine',
   },
   owner: Owner.OWN,
-  childRelations: [{ id: MOCK_part_5.id, idShort: MOCK_part_5.idShort }],
+  childRelations: [ { id: MOCK_part_5.id, idShort: MOCK_part_5.idShort } ],
   parentRelations: [],
   activeAlert: false,
   underInvestigation: false,
   qualityType: QualityType.Major,
   van: 'myvan3',
-  semanticDataModel: SemanticDataModel.SERIALPARTTYPIZATION,
+  semanticDataModel: SemanticDataModel.SERIALPART,
 };
 
 export const MOCK_part_2 = {
@@ -115,7 +115,7 @@ export const MOCK_part_2 = {
   underInvestigation: false,
   qualityType: QualityType.Minor,
   van: 'myvan2',
-  semanticDataModel: SemanticDataModel.SERIALPARTTYPIZATION
+  semanticDataModel: SemanticDataModel.SERIALPART,
 };
 
 export const MOCK_part_1 = {

frontend/src/app/modules/page/parts/model/parts.model.ts

@@ -33,8 +33,8 @@ export enum QualityType {
 }
 
 export enum SemanticDataModel {
-  BATCH= 'BATCH',
-  SERIALPARTTYPIZATION = 'SERIALPARTTYPIZATION',
+  BATCH = 'BATCH',
+  SERIALPART = 'SERIALPART',
   PARTASPLANNED = 'PARTASPLANNED'
 }
 

frontend/src/app/modules/shared/modules/relations/core/relations.facade.spec.ts

@@ -141,7 +141,7 @@ describe('Relations facade', () => {
                 title: 'MOCK_part_4',
               },
             ],
-            state: 'SERIALPARTTYPIZATION',
+            state: 'SERIALPART',
             text: 'BMW 520d Touring',
             title: 'BMW 520d Touring | mysemanticmodelId2',
           },
@@ -156,7 +156,7 @@ describe('Relations facade', () => {
                 title: 'MOCK_part_5',
               },
             ],
-            state: 'SERIALPARTTYPIZATION',
+            state: 'SERIALPART',
             text: 'A 180 Limousine',
             title: 'A 180 Limousine | mysemanticModelId3',
           },

frontend/src/app/modules/shared/modules/relations/presentation/minimap/minimap.d3.spec.ts

@@ -58,7 +58,7 @@ describe('D3 Minimap', () => {
   it('should render minimap status colors', async () => {
     const component = await renderTree();
     component.detectChanges();
-    expect((await waitFor(() => screen.getAllByTestId('tree--element__circle-SERIALPARTTYPIZATION'))).length).toBe(2);
+    expect((await waitFor(() => screen.getAllByTestId('tree--element__circle-SERIALPART'))).length).toBe(2);
     expect((await waitFor(() => screen.getAllByTestId('tree--element__circle-BATCH'))).length).toBe(1);
   });
 

tx-backend/src/integration/groovy/org/eclipse/tractusx/traceability/common/support/AssetTestData.groovy

@@ -31,7 +31,7 @@ class AssetTestData {
 
     List<Asset> readAndConvertAssetsForTests() {
         try {
-            InputStream file = AssetTestData.class.getResourceAsStream("/data/irs_assets_v2.json")
+            InputStream file = AssetTestData.class.getResourceAsStream("/data/irs_assets_v3.json")
             JobDetailResponse response = mapper.readValue(file, JobDetailResponse.class)
             def assets = response.convertAssets()
             return assets