From 48735c163708ea24853afed54eac0e10af670393 Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Fri, 26 Jul 2024 11:45:44 +0200 Subject: [PATCH] bug: 1318 fix testdata v14 where parts had the wrong bpn --- CHANGELOG.md | 1 + .../CX_Testdata_MessagingTest_v0.0.14-ev.json | 54 ++++++++++-- .../CX_Testdata_MessagingTest_v0.0.14.json | 77 ++++++++++------- .../import-test-data-0DWF_v0.0.14.json | 2 +- .../import-test-data-0UKM_v0.0.14.json | 84 ++++++++++++++++++- .../import-test-data-CML1_v0.0.14.json | 2 +- 6 files changed, 183 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0a189d0b1..a438d5e4e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ _**For better traceability add the corresponding GitHub issue number in each cha - #XXX define uid and gid of backend Dockerfile directly in user, instead of variables - #1244 upgraded registry from 0.4.1 to 0.5.0 - #XXX update e2e-tests-xray_frontend.yml to support association int environment +- #1318 fix testdata v14 where parts had the wrong bpn ### Added - #511 Added installation guide for local frontend with umbrella chart diff --git a/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.14-ev.json b/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.14-ev.json index 0d8466e911..fd7e20abea 100644 --- a/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.14-ev.json +++ b/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.14-ev.json @@ -1987,11 +1987,11 @@ "quantityNumber" : 2.5, "measurementUnit" : "unit:litre" }, - "businessPartner" : "BPNL000000000UKM", "createdOn" : "2022-02-14T14:48:54.709Z", "lastModifiedOn" : "2022-02-03T14:48:54.709Z" } ], + "businessPartner" : "BPNL000000000UKM", "catenaXId" : "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b" } ] @@ -2434,7 +2434,7 @@ "date" : "2022-02-04T14:48:54Z", "country" : "HUN" }, - "catenaXId" : "urn:uuid:bcfae197-40fa-4be0-821d-5c1873a1b7c2", + "catenaXId" : "urn:uuid:bcfae197-40fa-4be0-821d-5c1873a1b7c3", "partTypeInformation" : { "manufacturerPartId" : "5464168-83", "customerPartId" : "PRT-12345", @@ -2522,12 +2522,12 @@ }, { "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fca4f", - "bpnl" : "BPNL000000000UKM", + "bpnl" : "BPNL000000000DWF", "urn:samm:io.catenax.batch:3.0.0#Batch" : [ { "localIdentifiers" : [ { - "value" : "BPNL000000000UKM", + "value" : "BPNL000000000DWF", "key" : "manufacturerId" }, { @@ -2546,6 +2546,27 @@ "nameAtManufacturer" : "Sealant" } } + ], + "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt" : [ + { + "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fca4f", + "customers" : [ + "BPNL000000000UKM" + ], + "parentItems" : [ + { + "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4070e", + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "createdOn" : "2023-02-03T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL000000000UKM", + "isOnlyPotentialParent" : false + } + ] + } ] }, { @@ -2616,12 +2637,12 @@ }, { "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fcb5f", - "bpnl" : "BPNL000000000DWF", + "bpnl" : "BPNL000000000UKM", "urn:samm:io.catenax.batch:3.0.0#Batch" : [ { "localIdentifiers" : [ { - "value" : "BPNL000000000DWF", + "value" : "BPNL000000000UKM", "key" : "manufacturerId" }, { @@ -2640,6 +2661,27 @@ "nameAtManufacturer" : "Sealant" } } + ], + "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt" : [ + { + "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fcb5f", + "customers" : [ + "BPNL000000000DWF" + ], + "parentItems" : [ + { + "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4080f", + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "createdOn" : "2023-02-03T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL000000000DWF", + "isOnlyPotentialParent" : false + } + ] + } ] } ] diff --git a/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.14.json b/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.14.json index 69f0cfa325..8571dd1a04 100644 --- a/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.14.json +++ b/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.14.json @@ -1340,27 +1340,6 @@ ] } ], - "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned" : [ - { - "catenaXId" : "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef127c", - "childItems" : [ - { - "validityPeriod" : { - "validFrom" : "2023-03-21T08:17:29.187+01:00", - "validTo" : "2024-07-01T16:10:00.000+01:00" - }, - "catenaXId" : "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca97", - "quantity" : { - "value" : 1, - "unit" : "unit:piece" - }, - "businessPartner" : "BPNL00000003CML1", - "createdOn" : "2022-10-03T14:48:54.709Z", - "lastModifiedOn" : "2022-02-03T14:48:54.709Z" - } - ] - } - ], "urn:samm:io.catenax.single_level_usage_as_planned:1.1.0#SingleLevelUsageAsPlanned" : [ { "parentParts" : [ @@ -1987,11 +1966,11 @@ "quantityNumber" : 2.5, "measurementUnit" : "unit:litre" }, - "businessPartner" : "BPNL00000003CML1", "createdOn" : "2022-02-14T14:48:54.709Z", "lastModifiedOn" : "2022-02-03T14:48:54.709Z" } ], + "businessPartner" : "BPNL00000003CML1", "catenaXId" : "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b" } ] @@ -2434,7 +2413,7 @@ "date" : "2022-02-04T14:48:54Z", "country" : "HUN" }, - "catenaXId" : "urn:uuid:bcfae197-40fa-4be0-821d-5c1873a1b7c2", + "catenaXId" : "urn:uuid:bcfae197-40fa-4be0-821d-5c1873a1b7c3", "partTypeInformation" : { "manufacturerPartId" : "5464168-83", "customerPartId" : "PRT-12345", @@ -2522,12 +2501,12 @@ }, { "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fca4f", - "bpnl" : "BPNL00000003CML1", + "bpnl" : "BPNL00000003CNKC", "urn:samm:io.catenax.batch:3.0.0#Batch" : [ { "localIdentifiers" : [ { - "value" : "BPNL00000003CML1", + "value" : "BPNL00000003CNKC", "key" : "manufacturerId" }, { @@ -2546,6 +2525,27 @@ "nameAtManufacturer" : "Sealant" } } + ], + "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt" : [ + { + "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fca4f", + "customers" : [ + "BPNL00000003CML1" + ], + "parentItems" : [ + { + "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4070e", + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "createdOn" : "2023-02-03T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CML1", + "isOnlyPotentialParent" : false + } + ] + } ] }, { @@ -2606,7 +2606,7 @@ "unit" : "unit:litre" }, "hasAlternatives" : true, - "businessPartner" : "BPNL00000003CNKC", + "businessPartner" : "BPNL00000003CML1", "createdOn" : "2022-02-03T14:48:54.709Z", "lastModifiedOn" : "2022-02-03T14:48:54.709Z" } @@ -2616,12 +2616,12 @@ }, { "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fcb5f", - "bpnl" : "BPNL00000003CNKC", + "bpnl" : "BPNL00000003CML1", "urn:samm:io.catenax.batch:3.0.0#Batch" : [ { "localIdentifiers" : [ { - "value" : "BPNL00000003CNKC", + "value" : "BPNL00000003CML1", "key" : "manufacturerId" }, { @@ -2640,6 +2640,27 @@ "nameAtManufacturer" : "Sealant" } } + ], + "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt" : [ + { + "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fcb5f", + "customers" : [ + "BPNL00000003CNKC" + ], + "parentItems" : [ + { + "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4080f", + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "createdOn" : "2023-02-03T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL00000003CNKC", + "isOnlyPotentialParent" : false + } + ] + } ] } ] diff --git a/tx-backend/testdata/import-test-data-0DWF_v0.0.14.json b/tx-backend/testdata/import-test-data-0DWF_v0.0.14.json index b3c7dbb365..6951cf266d 100644 --- a/tx-backend/testdata/import-test-data-0DWF_v0.0.14.json +++ b/tx-backend/testdata/import-test-data-0DWF_v0.0.14.json @@ -1071,7 +1071,7 @@ "unit" : "unit:piece" }, "hasAlternatives" : true, - "businessPartner" : "BPNL000000000DWF", + "businessPartner" : "BPNL000000000UKM", "createdOn" : "2022-02-03T14:48:54.709Z", "lastModifiedOn" : "2022-02-03T14:48:54.709Z" } diff --git a/tx-backend/testdata/import-test-data-0UKM_v0.0.14.json b/tx-backend/testdata/import-test-data-0UKM_v0.0.14.json index 8d629f0e74..493185ce32 100644 --- a/tx-backend/testdata/import-test-data-0UKM_v0.0.14.json +++ b/tx-backend/testdata/import-test-data-0UKM_v0.0.14.json @@ -971,6 +971,28 @@ } ] } + }, + { + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_planned:1.1.0#SingleLevelUsageAsPlanned", + "payload" : { + "catenaXId" : "urn:uuid:3cdd2826-5df0-4c7b-b540-9eeccecb2301", + "businessPartner" : "BPNL000000000DWF", + "parentParts" : [ + { + "validityPeriod" : { + "validFrom" : "2023-03-21T08:17:29.187+01:00", + "validTo" : "2024-07-01T16:10:00.000+01:00" + }, + "parentCatenaXId" : "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b", + "quantity" : { + "value" : 1, + "unit" : "unit:litre" + }, + "createdOn" : "2022-02-13T14:48:54.709Z", + "lastModifiedOn" : "2022-02-03T14:48:54.709Z" + } + ] + } } ] }, @@ -1211,7 +1233,7 @@ "date" : "2022-02-04T14:48:54.000Z", "country" : "HUN" }, - "catenaXId" : "urn:uuid:bcfae197-40fa-4be0-821d-5c1873a1b7c2", + "catenaXId" : "urn:uuid:bcfae197-40fa-4be0-821d-5c1873a1b7c3", "partTypeInformation" : { "manufacturerPartId" : "5464168-83", "customerPartId" : "PRT-12345", @@ -1335,6 +1357,66 @@ } } ] + }, + { + "assetMetaInfo" : { + "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fcb5f" + }, + "submodels" : [ + { + "aspectType" : "urn:samm:io.catenax.batch:3.0.0#Batch", + "payload" : { + "localIdentifiers" : [ + { + "value" : "BPNL000000000UKM", + "key" : "manufacturerId" + }, + { + "value" : "BID12345678", + "key" : "batchId" + } + ], + "manufacturingInformation" : { + "date" : "2022-02-04T14:48:54.000Z", + "country" : "HUN" + }, + "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fcb5f", + "partTypeInformation" : { + "manufacturerPartId" : "123-0.740-5656-A", + "partClassification" : [ + { + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" + } + ], + "nameAtManufacturer" : "Sealant" + } + } + }, + { + "aspectType" : "urn:samm:io.catenax.single_level_usage_as_built:3.0.0#SingleLevelUsageAsBuilt", + "payload" : { + "catenaXId" : "urn:uuid:e3b2f5e2-5be5-4ea6-98f0-6876de0fcb5f", + "customers" : [ + "BPNL000000000DWF" + ], + "parentItems" : [ + { + "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4080f", + "quantity" : { + "value" : 1, + "unit" : "unit:piece" + }, + "createdOn" : "2023-02-03T14:48:54.709Z", + "lastModifiedOn" : "2023-02-03T14:48:54.709Z", + "businessPartner" : "BPNL000000000DWF", + "isOnlyPotentialParent" : false + } + ] + } + } + ] } ] } diff --git a/tx-backend/testdata/import-test-data-CML1_v0.0.14.json b/tx-backend/testdata/import-test-data-CML1_v0.0.14.json index bd2e272feb..0d37574f2f 100644 --- a/tx-backend/testdata/import-test-data-CML1_v0.0.14.json +++ b/tx-backend/testdata/import-test-data-CML1_v0.0.14.json @@ -1220,7 +1220,7 @@ "date" : "2022-02-04T14:48:54.000Z", "country" : "HUN" }, - "catenaXId" : "urn:uuid:bcfae197-40fa-4be0-821d-5c1873a1b7c2", + "catenaXId" : "urn:uuid:bcfae197-40fa-4be0-821d-5c1873a1b7c3", "partTypeInformation" : { "manufacturerPartId" : "5464168-83", "customerPartId" : "PRT-12345",