A1SDS-2452 Code updated for response new version

catenax-ng · Jun 22, 2023 · 9e38331 · 9e38331
1 parent 3956951
commit 9e38331
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/...src/main/java/org/eclipse/tractusx/sde/submodels/apr/mapper/AspectRelationshipMapper.java b/...src/main/java/org/eclipse/tractusx/sde/submodels/apr/mapper/AspectRelationshipMapper.java
@@ -28,7 +28,7 @@
 import org.eclipse.tractusx.sde.submodels.apr.entity.AspectRelationshipEntity;
 import org.eclipse.tractusx.sde.submodels.apr.model.AspectRelationship;
 import org.eclipse.tractusx.sde.submodels.apr.model.AspectRelationshipResponse;
-import org.eclipse.tractusx.sde.submodels.apr.model.ChildPart;
+import org.eclipse.tractusx.sde.submodels.apr.model.ChildItems;
 import org.eclipse.tractusx.sde.submodels.apr.model.Quantity;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
@@ -70,26 +70,31 @@ public JsonObject mapToResponse(String parentCatenaXUuid, List<AspectRelationshi
 			return null;
 		}
 
-		Set<ChildPart> childParts = aspectRelationships.stream().map(this::toChildPart).collect(Collectors.toSet());
+		Set<ChildItems> childItems = aspectRelationships.stream().map(this::toChildItems).collect(Collectors.toSet());
 		return new Gson().toJsonTree(
-				AspectRelationshipResponse.builder().catenaXId(parentCatenaXUuid).childItems(childParts).build())
-				.getAsJsonObject();
+				AspectRelationshipResponse.builder()
+				.catenaXId(parentCatenaXUuid)
+				.childItems(childItems)
+				.build()).getAsJsonObject();
 
 	}
 
 	public AspectRelationshipResponse mapforResponse(JsonObject entity) {
 		return new Gson().fromJson(entity, AspectRelationshipResponse.class);
 	}
 
-	private ChildPart toChildPart(AspectRelationshipEntity entity) {
-		Quantity quantity = Quantity.builder().quantityNumber(entity.getQuantityNumber())
+	private ChildItems toChildItems(AspectRelationshipEntity entity) {
+		Quantity quantity = Quantity.builder()
+				.quantityNumber(entity.getQuantityNumber())
 				.measurementUnit(entity.getMeasurementUnit())
 				.build();
 
-		return ChildPart.builder()
+		return ChildItems.builder()
 				.createdOn(entity.getCreatedOn())
 				.businessPartner(entity.getChildManufacturerId())
-				.catenaXId(entity.getChildCatenaXId()).quantity(quantity).build();
+				.catenaXId(entity.getChildCatenaXId())
+				.quantity(quantity)
+				.build();
 	}
 
 }
diff --git a/...rc/main/java/org/eclipse/tractusx/sde/submodels/apr/model/AspectRelationshipResponse.java b/...rc/main/java/org/eclipse/tractusx/sde/submodels/apr/model/AspectRelationshipResponse.java
@@ -32,5 +32,5 @@
 @AllArgsConstructor
 public class AspectRelationshipResponse {
     private String catenaXId;
-    private Set<ChildPart> childItems;
+    private Set<ChildItems> childItems;
 }
diff --git a/...sx/sde/submodels/apr/model/ChildPart.java → ...x/sde/submodels/apr/model/ChildItems.java b/...sx/sde/submodels/apr/model/ChildPart.java → ...x/sde/submodels/apr/model/ChildItems.java
@@ -28,7 +28,7 @@
 @Data
 @AllArgsConstructor
 @Builder
-public class ChildPart {
+public class ChildItems {
 
     private Quantity quantity;
     private String createdOn;