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.

Sign up for GitHub

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

Jump to bottom

Expanded accepted aspecttypes of testdata #227

Merged
merged 2 commits into from
Jul 21, 2023
Merged

Expanded accepted aspecttypes of testdata #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7dc49fe
feature: TRACEFOSS-XXX supporting test datasets
ds-ext-sceronik Jul 21, 2023
ba1c033
Merge pull request #438 from catenax-ng/chore/TRACEFOSS-support-anoth…
ds-mwesener Jul 21, 2023
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
23 changes: 17 additions & 6 deletions ...ractusx/traceability/assets/infrastructure/base/irs/model/response/JobDetailResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand All @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion ...eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/Submodel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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"
Expand Down
Loading