Merge branch 'Demo_branch' of https://github.com/catenax-ng/tx-demand…

…-capacity-mgmt into Demo_branch
eclipse-tractusx · Oct 26, 2023 · 4d2ae90 · 4d2ae90
2 parents a579dbf + 5bfa8f4
commit 4d2ae90
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 49 deletions.
diff --git a/...eclipse/tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/services/StatusManager.java b/...eclipse/tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/services/StatusManager.java
@@ -23,5 +23,5 @@
 package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services;
 
 public interface StatusManager {
-    void calculateBottleneck(String userID);
+    void calculateBottleneck(String userID,boolean postLog);
 }
diff --git a/.../demandcapacitymgmt/demandcapacitymgmtbackend/services/impl/CapacityGroupServiceImpl.java b/.../demandcapacitymgmt/demandcapacitymgmtbackend/services/impl/CapacityGroupServiceImpl.java
@@ -23,25 +23,29 @@
 package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.impl;
 
 import eclipse.tractusx.demand_capacity_mgmt_specification.model.*;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicBoolean;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.entities.*;
 import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.entities.enums.EventObjectType;
 import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.entities.enums.EventType;
 import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.exceptions.type.NotFoundException;
-import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.repositories.*;
+import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.repositories.CapacityGroupRepository;
+import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.repositories.DemandSeriesRepository;
+import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.repositories.LinkedCapacityGroupMaterialDemandRepository;
+import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.repositories.MaterialDemandRepository;
 import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.*;
 import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.utils.UUIDUtil;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 @RequiredArgsConstructor
 @Service
 @Slf4j
@@ -81,7 +85,7 @@ public CapacityGroupResponse createCapacityGroup(CapacityGroupRequest capacityGr
                 matchedMaterialDemands.addAll(materialDemandEntity.getDemandSeries());
             }
             linkedCapacityGroupMaterialDemandRepository.save(entity);
-            statusManager.calculateBottleneck(userID);
+            statusManager.calculateBottleneck(userID,true);
             capacityGroupEntity.setLinkStatus(EventType.GENERAL_EVENT);
             capacityGroupRepository.save(capacityGroupEntity);
         }
@@ -161,7 +165,7 @@ public void linkCapacityGroupToMaterialDemand(LinkCGDSRequest linkCGDSRequest, S
                 materialDemandRepository.save(demandEntity);
             }
         }
-        statusManager.calculateBottleneck(userID);
+        statusManager.calculateBottleneck(userID,true);
     }
 
     private CapacityGroupEntity enrichCapacityGroup(CapacityGroupRequest request) {

diff --git a/...ractusx/demandcapacitymgmt/demandcapacitymgmtbackend/services/impl/DemandServiceImpl.java b/...ractusx/demandcapacitymgmt/demandcapacitymgmtbackend/services/impl/DemandServiceImpl.java
@@ -24,14 +24,6 @@
 
 import eclipse.tractusx.demand_capacity_mgmt_specification.model.*;
 import jakarta.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicBoolean;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.entities.*;
@@ -48,6 +40,15 @@
 import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.utils.UserUtil;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 @RequiredArgsConstructor
 @Service
 @Slf4j
@@ -86,7 +87,7 @@ public MaterialDemandResponse createDemand(MaterialDemandRequest materialDemandR
         materialDemandEntity = materialDemandRepository.save(materialDemandEntity);
         postLogs(materialDemandEntity.getId().toString(), "Material Demand created", EventType.GENERAL_EVENT, userID);
         statusesService.addOrSubtractTodos(true, userID);
-        statusManager.calculateBottleneck(userID);
+        statusManager.calculateBottleneck(userID,true);
         return convertDemandResponseDto(materialDemandEntity);
     }
 
@@ -167,7 +168,7 @@ public MaterialDemandResponse updateDemand(
             );
         demand = materialDemandRepository.save(demand);
         postLogs(demandId, "MATERIAL DEMAND Updated", EventType.GENERAL_EVENT, userID);
-        statusManager.calculateBottleneck(userID);
+        statusManager.calculateBottleneck(userID,true);
         return convertDemandResponseDto(demand);
     }
 
@@ -184,7 +185,7 @@ public void deleteDemandById(String demandId, String userID) {
         linkedCapacityGroupMaterialDemandRepository.deleteByMaterialDemandID(demand.getId());
         materialDemandRepository.delete(demand);
         statusesService.addOrSubtractTodos(false, userID);
-        statusManager.calculateBottleneck(userID);
+        statusManager.calculateBottleneck(userID,true);
     }
 
     @Override
@@ -270,7 +271,7 @@ public void unlinkComposites(DemandSeriesUnlinkRequest demandSeriesUnlinkRequest
         List<MaterialDemandEntity> oldMaterialDemands = getAllDemands();
         oldMaterialDemands.removeIf(md -> md.getId().equals(mdID));
         statusesService.addOrSubtractTodos(true, userID);
-        statusManager.calculateBottleneck(userID);
+        statusManager.calculateBottleneck(userID,true);
     }
 
     private MaterialDemandEntity getDemandEntity(String demandId) {

diff --git a/.../demandcapacitymgmt/demandcapacitymgmtbackend/services/impl/SecurityTokenServiceImpl.java b/.../demandcapacitymgmt/demandcapacitymgmtbackend/services/impl/SecurityTokenServiceImpl.java
@@ -29,7 +29,6 @@
 import eclipse.tractusx.demand_capacity_mgmt_specification.model.Role;
 import eclipse.tractusx.demand_capacity_mgmt_specification.model.TokenResponse;
 import eclipse.tractusx.demand_capacity_mgmt_specification.model.User;
-import java.util.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.entities.UserEntity;
@@ -46,6 +45,8 @@
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 
+import java.util.*;
+
 @RequiredArgsConstructor
 @Service
 @Slf4j
@@ -260,7 +261,7 @@ private User convertUserEntity(UserEntity userEntity, String accessToken, String
         user.setAccessToken(accessToken);
         user.setRefreshToken(refreshToken);
         user.setExpiresIn(expiresIn);
-        statusManager.calculateBottleneck(user.getUserID());
+        statusManager.calculateBottleneck(user.getUserID(),false);
         return user;
     }
 

diff --git a/...ractusx/demandcapacitymgmt/demandcapacitymgmtbackend/services/impl/StatusManagerImpl.java b/...ractusx/demandcapacitymgmt/demandcapacitymgmtbackend/services/impl/StatusManagerImpl.java
@@ -50,15 +50,15 @@ public class StatusManagerImpl implements StatusManager {
     private final LoggingHistoryRepository loggingRepository;
 
     @Override
-    public void calculateBottleneck(String userID) {
+    public void calculateBottleneck(String userID, boolean postLog) {
         UserEntity user = getUser(userID);
         List<CapacityGroupEntity> capacityGroups = capacityGroupRepository.findByUserID(user.getId());
 
         int accumulatedImprovements = 0;
         int accumulatedDegradations = 0;
 
         for (CapacityGroupEntity cgs : capacityGroups) {
-            EventType eventType = processCapacityGroup(userID, cgs);
+            EventType eventType = processCapacityGroup(userID, cgs,postLog);
 
             if (eventType == EventType.STATUS_IMPROVEMENT) {
                 accumulatedImprovements++;
@@ -72,7 +72,7 @@ public void calculateBottleneck(String userID) {
         statusesRepository.save(status);
     }
 
-    private EventType processCapacityGroup(String userID, CapacityGroupEntity cgs) {
+    private EventType processCapacityGroup(String userID, CapacityGroupEntity cgs,boolean postLog) {
         List<LinkedCapacityGroupMaterialDemandEntity> matchedEntities = matchedDemandsRepository.findByCapacityGroupID(
             cgs.getId()
         );
@@ -91,7 +91,7 @@ private EventType processCapacityGroup(String userID, CapacityGroupEntity cgs) {
         EventType eventType = determineEventType(cgs, aggregatedTotalDemand);
         cgs.setLinkStatus(eventType);
         capacityGroupRepository.save(cgs);
-        logEvent(eventType, userID);
+        logEvent(eventType, userID,postLog);
         return eventType;
     }
 
@@ -139,25 +139,27 @@ private EventType determineEventType(CapacityGroupEntity capacityGroup, double t
         }
     }
 
-    private void logEvent(EventType eventType, String userID) {
-        LoggingHistoryEntity logEntity = new LoggingHistoryEntity();
-        logEntity.setObjectType(EventObjectType.CAPACITY_GROUP);
-        logEntity.setEventType(eventType);
-        logEntity.setUserAccount(getUser(userID).getUsername());
-        logEntity.setTime_created(Timestamp.valueOf(LocalDateTime.now()));
-        logEntity.setLogID(UUID.randomUUID());
-
-        switch (eventType) {
-            case STATUS_IMPROVEMENT:
-                logEntity.setDescription("Status improvement");
-                break;
-            case STATUS_REDUCTION:
-                logEntity.setDescription("Status degradation");
-                break;
-            default:
-                return;
-        }
+    private void logEvent(EventType eventType, String userID,boolean postLog) {
+        if (postLog) {
+            LoggingHistoryEntity logEntity = new LoggingHistoryEntity();
+            logEntity.setObjectType(EventObjectType.CAPACITY_GROUP);
+            logEntity.setEventType(eventType);
+            logEntity.setUserAccount(getUser(userID).getUsername());
+            logEntity.setTime_created(Timestamp.valueOf(LocalDateTime.now()));
+            logEntity.setLogID(UUID.randomUUID());
+
+            switch (eventType) {
+                case STATUS_IMPROVEMENT:
+                    logEntity.setDescription("Status improvement");
+                    break;
+                case STATUS_REDUCTION:
+                    logEntity.setDescription("Status degradation");
+                    break;
+                default:
+                    return;
+            }
 
-        loggingRepository.save(logEntity);
+            loggingRepository.save(logEntity);
+        }
     }
 }