Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bug: xxx fix test data set v14 #1322

Merged
merged 2 commits into from
Aug 2, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -17,6 +17,7 @@ _**For better traceability add the corresponding GitHub issue number in each cha
- #1328 Fixed semanticDataModel translation and part name within notification detail / edit view.
- #908 Renamed header in notification detail for parts from Supplier Parts to Affected parts
- #1151 Display of null values within contracts in datepicker to be empty if null
- #1318 fix testdata v14 where parts had the wrong bpn

### Removed
- #1227 Removed scrollbar on approval dialog
54 changes: 48 additions & 6 deletions tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.14-ev.json
Original file line number Diff line number Diff line change
@@ -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
}
]
}
]
}
]
77 changes: 49 additions & 28 deletions tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.14.json
Original file line number Diff line number Diff line change
@@ -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
}
]
}
]
}
]
2 changes: 1 addition & 1 deletion tx-backend/testdata/import-test-data-0DWF_v0.0.14.json
Original file line number Diff line number Diff line change
@@ -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"
}
84 changes: 83 additions & 1 deletion tx-backend/testdata/import-test-data-0UKM_v0.0.14.json
Original file line number Diff line number Diff line change
@@ -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
}
]
}
}
]
}
]
}
2 changes: 1 addition & 1 deletion tx-backend/testdata/import-test-data-CML1_v0.0.14.json
Original file line number Diff line number Diff line change
@@ -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",

Unchanged files with check annotations Beta

postgres:
image: "postgres:15.4"
volumes:
- postgres-data:/var/lib/postgresql/data

Check warning on line 23 in tx-backend/docker/docker-compose.yml

GitHub Actions / Analyze backend

[INFO] Shared Volumes Between Containers

Volumes shared between containers can cause data corruption or can be used to share malicious files between containers.
- ./db-init:/docker-entrypoint-initdb.d
ports:
- "127.0.0.1:5432:5432"
version: "3.9"
services:
cypress:

Check warning on line 24 in frontend/cypress/docker-compose.yml

GitHub Actions / Analyze frontend

[MEDIUM] Container Capabilities Unrestricted

Some capabilities are not needed in certain (or any) containers. Make sure that you only add capabilities that your container needs. Drop unnecessary capabilities as well.

Check warning on line 24 in frontend/cypress/docker-compose.yml

GitHub Actions / Analyze frontend

[MEDIUM] Healthcheck Not Set

Check containers periodically to see if they are running properly.
build:
context: ../
dockerfile: cypress/Dockerfile
security_opt:
- label:user:testuser
- no-new-privileges:true
network_mode: host # important to be able to connect to localhost url on host machine

Check warning on line 35 in frontend/cypress/docker-compose.yml

GitHub Actions / Analyze frontend

[MEDIUM] Shared Host Network Namespace

Container should not share the host network namespace
# to comply with KICS requirement:
# [MEDIUM] Memory Not Limited
# Memory limits should be defined for each container. This prevents potential resource exhaustion by ensuring that containers consume not more than the designated amount of memory
version: "3.9"
services:
keycloak:

Check warning on line 24 in frontend/docker-compose.yml

GitHub Actions / Analyze frontend

[MEDIUM] Container Capabilities Unrestricted

Some capabilities are not needed in certain (or any) containers. Make sure that you only add capabilities that your container needs. Drop unnecessary capabilities as well.
image: "quay.io/keycloak/keycloak:18.0.0"
ports:
# Bind explicitly to 127.0.0.1
interval: 5s
timeout: 2s
retries: 15
pid: "host"

Check warning on line 45 in frontend/docker-compose.yml

GitHub Actions / Analyze frontend

[MEDIUM] Host Namespace is Shared

The hosts process namespace should not be shared by containers
deploy:
resources:
limits: