Merge branch 'fixing/dcmfoss72' into DCMFOSS/72_Fixed

eclipse-tractusx · Oct 9, 2023 · 70c86e3 · 70c86e3
2 parents 486b991 + 84b1a45
commit 70c86e3
Show file tree

Hide file tree

Showing 7 changed files with 2,557 additions and 2,360 deletions.
diff --git a/...e/tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/entities/CapacityGroupEntity.java b/...e/tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/entities/CapacityGroupEntity.java
@@ -26,6 +26,18 @@
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.UUID;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Convert;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 import lombok.*;
 import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.entities.converters.ListToStringConverter;
 import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.entities.enums.CapacityGroupStatus;

diff --git a/.../demandcapacitymgmt/demandcapacitymgmtbackend/services/impl/CapacityGroupServiceImpl.java b/.../demandcapacitymgmt/demandcapacitymgmtbackend/services/impl/CapacityGroupServiceImpl.java
@@ -1,4 +1,4 @@
-/*
+    /*
  *  *******************************************************************************
  *  Copyright (c) 2023 BMW AG
  *  Copyright (c) 2023 Contributors to the Eclipse Foundation
@@ -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()
                     )

diff --git a/...ctusx/demandcapacitymgmt/demandcapacitymgmtbackend/services/impl/FavoriteServiceImpl.java b/...ctusx/demandcapacitymgmt/demandcapacitymgmtbackend/services/impl/FavoriteServiceImpl.java
@@ -73,13 +73,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
@@ -102,4 +102,4 @@ private FavoriteEntity generateFavoriteEntity(FavoriteRequest request, String co
             .type(FavoriteType.valueOf(request.getfType()))
             .build();
     }
-}
+}
diff --git a/demand-capacity-mgmt-frontend/src/index.js b/demand-capacity-mgmt-frontend/src/index.js
@@ -37,9 +37,34 @@ function App() {
 }
 
 
+//Import Default always visible components.
+import TopMenu from "./components/common/TopMenu";
+import { InfoMenuProvider } from './contexts/InfoMenuContextProvider';
+import QuickAcessItems from "./components/common/QuickAcessItems";
+//Import Context Providers
+import DemandContextProvider from "../src/contexts/DemandContextProvider";
+// Import your components for different routes
+import Home from "./components/pages/CapacityGroupPage";
+import CapacityGroupDetailsPage from "./components/pages/CapacityGroupDetailsPage";
+import CapacityGroupsProvider from './contexts/CapacityGroupsContextProvider';
+
 const root = ReactDOM.createRoot(document.getElementById('root'));
 root.render(
-    <>
-        <App/>
-    </>
+<>
+    <InfoMenuProvider>
+    <TopMenu></TopMenu>
+    </InfoMenuProvider>
+
+    <Router>
+    <Routes>
+        <Route  path="/" element={<Home/>} />
+        <Route path="/details/:id" element={<CapacityGroupsProvider><CapacityGroupDetailsPage/></CapacityGroupsProvider>} />
+        <Route path="/contact" />
+    </Routes>
+</Router>
+<DemandContextProvider>
+            <QuickAcessItems></QuickAcessItems>
+</DemandContextProvider>
+</>
+
 );