Merge pull request #21 from catenax-ng/feature/DCMFOSS-59

Feature/dcmfoss 59 - Capacity Group Details View
eclipse-tractusx · Oct 4, 2023 · cbeb04f · cbeb04f
2 parents 861f313 + 4a74fbd
commit cbeb04f
Show file tree

Hide file tree

Showing 21 changed files with 3,387 additions and 1,735 deletions.
diff --git a/...e/tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/entities/CapacityGroupEntity.java b/...e/tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/entities/CapacityGroupEntity.java
@@ -37,10 +37,7 @@
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.entities.converters.ListToStringConverter;
 import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.entities.enums.CapacityGroupStatus;
 
@@ -85,9 +82,11 @@ public class CapacityGroupEntity {
     private UnitMeasureEntity unitMeasure;
 
     @OneToMany(mappedBy = "capacityGroupEntity", cascade = CascadeType.ALL)
+    @ToString.Exclude
     private List<CapacityTimeSeries> capacityTimeSeries;
 
     @OneToMany(mappedBy = "capacityGroupEntity", cascade = CascadeType.ALL)
+    @ToString.Exclude
     private List<LinkedDemandSeries> linkedDemandSeries;
 
     @Column(name = "supplier_locations")

diff --git a/.../demandcapacitymgmt/demandcapacitymgmtbackend/services/impl/CapacityGroupServiceImpl.java b/.../demandcapacitymgmt/demandcapacitymgmtbackend/services/impl/CapacityGroupServiceImpl.java
@@ -24,7 +24,9 @@
 
 import eclipse.tractusx.demand_capacity_mgmt_specification.model.*;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -75,6 +77,7 @@ public CapacityGroupResponse createCapacityGroup(CapacityGroupRequest capacityGr
     @Override
     public CapacityGroupResponse getCapacityGroupById(String capacityGroupId) {
         CapacityGroupEntity capacityGroupEntity = getCapacityGroupEntity(capacityGroupId);
+
         return convertCapacityGroupDto(capacityGroupEntity);
     }
 
@@ -190,7 +193,7 @@ private CapacityGroupEntity enrichCapacityGroup(CapacityGroupRequest capacityGro
             .map(
                 capacityRequest ->
                     enrichCapacityTimeSeries(
-                        DataConverterUtil.convertFromString(capacityRequest.getCalendarWeek()),
+                        LocalDate.parse(capacityRequest.getCalendarWeek()).atStartOfDay(),
                         capacityRequest.getActualCapacity().doubleValue(),
                         capacityRequest.getMaximumCapacity().doubleValue()
                     )
@@ -279,7 +282,8 @@ private CapacityGroupResponse convertCapacityGroupDto(CapacityGroupEntity capaci
         responseDto.setUnitOfMeasure(unitMeasure);
         responseDto.setChangeAt(capacityGroupEntity.getChangedAt().toString());
         responseDto.setName(capacityGroupEntity.getName());
-        responseDto.setCapacityGroupId(capacityGroupEntity.getCapacityGroupId().toString());
+        responseDto.setWeekBasedCapacityGroupId(capacityGroupEntity.getCapacityGroupId().toString());
+        responseDto.setCapacityGroupId(capacityGroupEntity.getId().toString());
 
         List<CapacityRequest> capacityRequests = capacityGroupEntity
             .getCapacityTimeSeries()
@@ -320,9 +324,13 @@ private UnitMeasure enrichUnitMeasure(UnitMeasureEntity unitMeasureEntity) {
     private CapacityRequest convertCapacityTimeSeries(CapacityTimeSeries capacityTimeSeries) {
         CapacityRequest capacityRequest = new CapacityRequest();
 
-        capacityRequest.setActualCapacity(BigDecimal.valueOf(capacityTimeSeries.getActualCapacity()));
-        capacityRequest.setMaximumCapacity(BigDecimal.valueOf(capacityTimeSeries.getMaximumCapacity()));
-        capacityRequest.setCalendarWeek(capacityRequest.getCalendarWeek());
+        capacityRequest.setActualCapacity(new BigDecimal(capacityTimeSeries.getActualCapacity()));
+        capacityRequest.setMaximumCapacity(new BigDecimal(capacityTimeSeries.getMaximumCapacity()));
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        String formattedDate = capacityTimeSeries.getCalendarWeek().format(formatter);
+
+        capacityRequest.setCalendarWeek(formattedDate);
 
         return capacityRequest;
     }

diff --git a/...ctusx/demandcapacitymgmt/demandcapacitymgmtbackend/services/impl/FavoriteServiceImpl.java b/...ctusx/demandcapacitymgmt/demandcapacitymgmtbackend/services/impl/FavoriteServiceImpl.java
@@ -76,13 +76,13 @@ public FavoriteResponse updateFavorite(UUID id, FavoriteType type, FavoriteReque
             entity.setType(FavoriteType.valueOf(favoriteRequest.getfType()));
             favoriteRepository.saveAndFlush(entity);
             return convertFavoriteResponse(entity);
-        } else {
-            throw new NotFoundException(
-                404,
-                "Entity to update was not found in DB." + "\n" + "Did you meant to create?",
-                new ArrayList<>(List.of("provided UUID did not match any records. - " + id))
-            );
-        }
+
+        } else throw new NotFoundException(
+            404,
+            "Demand category not found",
+            new ArrayList<>(List.of("provided UUID did not match any records. - " + id))
+        );
+
     }
 
     @Override