Merge pull request #1244 from catenax-ng/chore/837-feedback-import

chore(exception):837 fix import.
eclipse-tractusx · May 14, 2024 · b3a72be · b3a72be
2 parents 9bacc0b + 5ca5add
commit b3a72be
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 ### Changed
 - #778 return empty PageResult when no contract agreement Ids are found instead of http 404 in /contacts API
 - #XXX Fixed some sonar issues in frontend application
+- #XXX Switched eclipse-temurin:21-jre-alpine@sha256:fb4150a30569aadae9d693d949684a00653411528e62498b9900940c9b5b8a66 to 23467b3e42617ca197f43f58bc5fb03ca4cb059d68acd49c67128bfded132d67
 
 ## [11.0.0 - 08.05.2024]
 ### Added

diff --git a/Dockerfile b/Dockerfile
@@ -39,7 +39,7 @@ COPY tx-backend tx-backend
 RUN --mount=type=cache,target=/root/.m2 mvn -B clean package -pl :$BUILD_TARGET -am -DskipTests
 
 # Copy the jar and build image
-FROM eclipse-temurin:21-jre-alpine@sha256:fb4150a30569aadae9d693d949684a00653411528e62498b9900940c9b5b8a66 AS traceability-app
+FROM eclipse-temurin:21-jre-alpine@sha256:23467b3e42617ca197f43f58bc5fb03ca4cb059d68acd49c67128bfded132d67 AS traceability-app
 
 ARG UID=10000
 ARG GID=1000

diff --git a/...ipse/tractusx/traceability/assets/application/importpoc/validation/JsonFileValidator.java b/...ipse/tractusx/traceability/assets/application/importpoc/validation/JsonFileValidator.java
@@ -90,7 +90,7 @@ public List<String> isValid(MultipartFile file) {
             reader.close();
 
         } catch (ProcessingException | IOException e) {
-            throw new JsonFileProcessingException(e);
+            return List.of("Json file is not processable." + e.getMessage());
         }
         errors.addAll(validateAspectPayload(file));
         return errors;

diff --git a/...in/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/DtrService.java b/...in/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/DtrService.java
@@ -29,7 +29,6 @@
 import org.eclipse.tractusx.irs.component.assetadministrationshell.SecurityAttribute;
 import org.eclipse.tractusx.irs.component.assetadministrationshell.SemanticId;
 import org.eclipse.tractusx.irs.component.assetadministrationshell.SubmodelDescriptor;
-import org.eclipse.tractusx.irs.component.enums.BomLifecycle;
 import org.eclipse.tractusx.irs.registryclient.decentral.DigitalTwinRegistryCreateShellService;
 import org.eclipse.tractusx.irs.registryclient.decentral.exception.CreateDtrShellException;
 import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase;
@@ -145,18 +144,7 @@ private AssetAdministrationShellDescriptor aasFrom(AssetBase assetBase, List<Sub
 
     List<IdentifierKeyValuePair> aasIdentifiersFromAsset(AssetBase assetBase) {
 
-        final String digitalTwinType = assetBase.getBomLifecycle().equals(BomLifecycle.AS_BUILT) ? "PartInstance" : "PartType";
-
-        return List.of(
-                IdentifierKeyValuePair.builder()
-                        .name("digitalTwinType")
-                        .value(digitalTwinType)
-                        .externalSubjectId(
-                                Reference.builder()
-                                        .type(EXTERNAL_REFERENCE)
-                                        .keys(getExternalSubjectIds())
-                                        .build())
-                        .build(),
+        List<IdentifierKeyValuePair> identifierKeyValuePairs = List.of(
                 IdentifierKeyValuePair.builder()
                         .name("manufacturerId")
                         .value(assetBase.getManufacturerId())
@@ -176,6 +164,8 @@ List<IdentifierKeyValuePair> aasIdentifiersFromAsset(AssetBase assetBase) {
                                         .build())
                         .build()
         );
+        log.info("IdentifierKeyValuePair {}", identifierKeyValuePairs);
+        return identifierKeyValuePairs;
     }
 
     private List<SemanticId> getExternalSubjectIds() {