favs fix

eclipse-tractusx · Oct 26, 2023 · bf6e97e · bf6e97e
1 parent 5bfa8f4
commit bf6e97e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/...x/demandcapacitymgmt/demandcapacitymgmtbackend/repositories/LoggingHistoryRepository.java b/...x/demandcapacitymgmt/demandcapacitymgmtbackend/repositories/LoggingHistoryRepository.java
@@ -24,12 +24,14 @@
 
 import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.entities.LoggingHistoryEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Repository;
 
 import java.util.UUID;
 
 @Repository
 public interface LoggingHistoryRepository extends JpaRepository<LoggingHistoryEntity, Integer> {
+    @Query("select l from LoggingHistoryEntity l where l.logID = ?1")
     LoggingHistoryEntity findByLogID(@NonNull UUID logID);
 }
diff --git a/...ctusx/demandcapacitymgmt/demandcapacitymgmtbackend/services/impl/FavoriteServiceImpl.java b/...ctusx/demandcapacitymgmt/demandcapacitymgmtbackend/services/impl/FavoriteServiceImpl.java
@@ -180,18 +180,15 @@ private CompanyDtoFavoriteResponse convertToCompanyDto(FavoriteEntity entity) {
     }
 
     private EventFavoriteResponse convertToEventDto(FavoriteEntity entity){
-        Optional<LoggingHistoryEntity> eEntity = Optional.ofNullable(eventRepository.findByLogID(entity.getFavoriteId()));
-        if(eEntity.isPresent()){
+        LoggingHistoryEntity eEntity = eventRepository.findByLogID(entity.getFavoriteId());
             EventFavoriteResponse eventEntity = new EventFavoriteResponse();
-            LoggingHistoryEntity loggingHistoryEntity = eEntity.get();
-            eventEntity.setEventType(loggingHistoryEntity.getEventType().toString());
-            eventEntity.setDescription(loggingHistoryEntity.getDescription());
-            eventEntity.setUserAccount(loggingHistoryEntity.getUserAccount());
-            eventEntity.setId(String.valueOf(loggingHistoryEntity.getId()));
-            eventEntity.setLogID(loggingHistoryEntity.getLogID().toString());
-            eventEntity.setTimeCreated(loggingHistoryEntity.getTime_created().toString());
+            eventEntity.setEventType(eEntity.getEventType().toString());
+            eventEntity.setDescription(eEntity.getDescription());
+            eventEntity.setUserAccount(eEntity.getUserAccount());
+            eventEntity.setId(String.valueOf(eEntity.getId()));
+            eventEntity.setLogID(eEntity.getLogID().toString());
+            eventEntity.setTimeCreated(eEntity.getTime_created().toString());
             return eventEntity;
-        } else return null;
     }
 
     @Override

diff --git a/demand-capacity-mgmt-frontend/src/components/demands/DemandManagement.tsx b/demand-capacity-mgmt-frontend/src/components/demands/DemandManagement.tsx
@@ -40,8 +40,7 @@ import {LoadingMessage} from '../common/LoadingMessages';
 import DemandManagementTable from './DemandManagementTable';
 import {
     FavoriteType,
-    MaterialDemandFavoriteResponse,
-    SingleCapacityGroupFavoriteResponse
+    MaterialDemandFavoriteResponse
 } from "../../interfaces/Favorite_interface";
 import {FavoritesContext} from "../../contexts/FavoritesContextProvider";
 import {de} from "date-fns/locale";