Merge pull request #227 from catenax-ng/main

Expanded accepted aspecttypes of testdata
eclipse-tractusx · Jul 21, 2023 · 78eb526 · 78eb526
2 parents 556b578 + ba1c033
commit 78eb526
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/...ractusx/traceability/assets/infrastructure/base/irs/model/response/JobDetailResponse.java b/...ractusx/traceability/assets/infrastructure/base/irs/model/response/JobDetailResponse.java
@@ -54,8 +54,13 @@ public record JobDetailResponse(
     private static final String SINGLE_LEVEL_BOM_AS_PLANNED = "SingleLevelBomAsPlanned";
     private static final String JOB_STATUS_COMPLETED = "COMPLETED";
     private static final String JOB_STATUS_RUNNING = "RUNNING";
-    private static final String AS_PLANNED_MAPPING_ASPECT = "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned";
-    private static final String AS_BUILT_MAPPING_ASPECT_SERIALPART = "urn:bamm:io.catenax.serial_part:1.0.0#SerialPart";
+    private static final String AS_PLANNED_MAPPING_ASPECT_1 = "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned";
+    private static final String AS_PLANNED_MAPPING_ASPECT_2 = "urn:bamm:io.catenax.part_as_planned:1.0.0#PartAsPlanned";
+
+    private static final String AS_BUILT_MAPPING_ASPECT_SERIALPART_1 = "urn:bamm:io.catenax.serial_part:1.0.0#SerialPart";
+    private static final String AS_BUILT_MAPPING_ASPECT_SERIALPART_2 = "urn:samm:io.catenax.serial_part:1.0.0#SerialPart";
+    private static final String AS_BUILT_MAPPING_ASPECT_SERIALPART_3 = "urn:bamm:io.catenax.serial_part:1.1.0#SerialPart";
+
     private static final String AS_BUILT_MAPPING_ASPECT_BATCH = "urn:bamm:io.catenax.batch:1.0.0#Batch";
 
     @JsonCreator
@@ -234,7 +239,9 @@ private List<Descriptions> getParentParts(Map<String, List<Relationship>> relati
 
     private boolean isAsBuiltAndOwnPart(SemanticDataModel semanticDataModel, JobStatus jobStatus) {
         final boolean result = semanticDataModel.getCatenaXId().equals(jobStatus.globalAssetId()) &&
-                (semanticDataModel.aspectType().equals(AS_BUILT_MAPPING_ASPECT_SERIALPART)
+                (semanticDataModel.aspectType().equals(AS_BUILT_MAPPING_ASPECT_SERIALPART_1)
+                        || semanticDataModel.aspectType().equals(AS_BUILT_MAPPING_ASPECT_SERIALPART_2)
+                        || semanticDataModel.aspectType().equals(AS_BUILT_MAPPING_ASPECT_SERIALPART_3)
                         || semanticDataModel.aspectType().equals(AS_BUILT_MAPPING_ASPECT_BATCH));
         log.info(":: isAsBuildAndOwnPart() {}", semanticDataModel);
         log.info(":: result: {}", result);
@@ -244,22 +251,26 @@ private boolean isAsBuiltAndOwnPart(SemanticDataModel semanticDataModel, JobStat
     private boolean isAsBuiltAndOtherPart(SemanticDataModel semanticDataModel, JobStatus jobStatus) {
         final boolean result =!semanticDataModel.getCatenaXId()
                 .equals(jobStatus.globalAssetId()) &&
-                (semanticDataModel.aspectType().equals(AS_BUILT_MAPPING_ASPECT_SERIALPART)
+                (semanticDataModel.aspectType().equals(AS_BUILT_MAPPING_ASPECT_SERIALPART_1)
+                        || semanticDataModel.aspectType().equals(AS_BUILT_MAPPING_ASPECT_SERIALPART_2)
+                        || semanticDataModel.aspectType().equals(AS_BUILT_MAPPING_ASPECT_SERIALPART_3)
                         || semanticDataModel.aspectType().equals(AS_BUILT_MAPPING_ASPECT_BATCH));
         log.info(":: isAsBuiltAndOtherPart() {}", semanticDataModel);
         log.info(":: result: {}", result);
         return result;
     }
 
     private boolean isAsPlannedAndOwnPart(SemanticDataModel semanticDataModel, JobStatus jobStatus) {
-        final boolean result = semanticDataModel.getCatenaXId().equals(jobStatus.globalAssetId()) && semanticDataModel.aspectType().equals(AS_PLANNED_MAPPING_ASPECT);
+        final boolean result = semanticDataModel.getCatenaXId().equals(jobStatus.globalAssetId())
+                && (semanticDataModel.aspectType().equals(AS_PLANNED_MAPPING_ASPECT_1) || semanticDataModel.aspectType().equals(AS_PLANNED_MAPPING_ASPECT_2));
         log.info(":: isAsPlannedAndOwnPart() {}", semanticDataModel);
         log.info(":: result: {}", result);
         return result;
     }
 
     private boolean isAsPlannedAndOtherPart(SemanticDataModel semanticDataModel, JobStatus jobStatus) {
-        final boolean result = !semanticDataModel.getCatenaXId().equals(jobStatus.globalAssetId()) && semanticDataModel.aspectType().equals(AS_PLANNED_MAPPING_ASPECT);
+        final boolean result = !semanticDataModel.getCatenaXId().equals(jobStatus.globalAssetId())
+                && (semanticDataModel.aspectType().equals(AS_PLANNED_MAPPING_ASPECT_1) ||semanticDataModel.aspectType().equals(AS_PLANNED_MAPPING_ASPECT_2) );
         log.info(":: isAsPlannedAndOtherPart() {}", semanticDataModel);
         log.info(":: result: {}", result);
         return result;

diff --git a/...eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/Submodel.java b/...eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/Submodel.java
@@ -36,6 +36,7 @@ class Submodel {
             property = "aspectType")
     @JsonSubTypes({
             @Type(value = SemanticDataModel.class, names = {
+                    "urn:samm:io.catenax.serial_part:1.0.0#SerialPart",
                     "urn:bamm:io.catenax.serial_part:1.0.0#SerialPart",
                     "urn:bamm:io.catenax.serial_part:1.1.0#SerialPart"
 
@@ -45,7 +46,8 @@ class Submodel {
                     "urn:bamm:io.catenax.batch:1.0.0#Batch"
             }),
             @Type(value = SemanticDataModel.class, names = {
-                    "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned"
+                    "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned",
+                    "urn:bamm:io.catenax.part_as_planned:1.0.0#PartAsPlanned"
             }),
             @Type(value = SemanticDataModel.class, names = {
                     "urn:bamm:io.catenax.part_site_information_as_planned:1.0.0#PartSiteInformationAsPlanned"