split stock and inventory pages

diogoseveriano · Nov 11, 2024 · fed47e1 · fed47e1
1 parent 3a1d78a
commit fed47e1
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 11 deletions.
diff --git a/src/main/java/context/UserContext.java b/src/main/java/context/UserContext.java
@@ -0,0 +1,15 @@
+package context;
+
+import io.quarkus.security.identity.SecurityIdentity;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
+
+@RequestScoped
+public class UserContext {
+    @Inject
+    SecurityIdentity identity;
+
+    public String getCurrentUsername() {
+        return identity != null ? identity.getPrincipal().getName() : "anonymous";
+    }
+}
diff --git a/src/main/java/controller/AggregatorController.java b/src/main/java/controller/AggregatorController.java
@@ -17,10 +17,19 @@ public class AggregatorController {
     private AggregatorService aggregatorService;
 
     @GET
+    @Path("/inventory")
     @Produces(MediaType.APPLICATION_JSON)
     @RolesAllowed({Role.ROLE_ADMIN, Role.ROLE_GENERIC, Role.ROLE_READ_ONLY})
-    public Response getStatisticsCards() {
-        return Response.ok(aggregatorService.getStatistics()).build();
+    public Response getStatisticsCardsForInventoryPage() {
+        return Response.ok(aggregatorService.getStatisticsForInventoryPage()).build();
+    }
+
+    @GET
+    @Path("/stock")
+    @Produces(MediaType.APPLICATION_JSON)
+    @RolesAllowed({Role.ROLE_ADMIN, Role.ROLE_GENERIC, Role.ROLE_READ_ONLY})
+    public Response getStatisticsCardsForStockPage() {
+        return Response.ok(aggregatorService.getStatisticsForStockPage()).build();
     }
 
 }
diff --git a/src/main/java/model/ItemCategory.java b/src/main/java/model/ItemCategory.java
@@ -1,8 +1,6 @@
 package model;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import lombok.*;
 
 import java.io.Serial;

diff --git a/src/main/java/service/AggregatorService.java b/src/main/java/service/AggregatorService.java
@@ -18,15 +18,21 @@ public class AggregatorService {
     @Inject
     private InventoryService inventoryService;
 
-    public List<StatisticCard> getStatistics() {
+    public List<StatisticCard> getStatisticsForInventoryPage() {
+        return List.of(
+                createStatisticCard("Inventory Items", getTotalNumberOfItems(), "ri-box-1-fill", "primary", false),
+                createStatisticCard("Purchase Orders (Pendind Delivery)", getTotalNumberOfPurchaseOrdersPendingDelivery(), "ri-ship-2-line", "info", false),
+                createStatisticCard("Inventory Price", getInventoryTotalPrice(), "ri-money-euro-circle-line", "info", true),
+                createStatisticCard("Inventory Alerts", getTotalNumberOfInventoryAlerts(), "ri-alert-line", "error", false)
+        );
+    }
+
+    public List<StatisticCard> getStatisticsForStockPage() {
         return List.of(
-          createStatisticCard("Inventory Items", getTotalNumberOfItems(), "ri-box-1-fill", "primary", false),
           createStatisticCard("Stock (Beer) Items", getTotalNumberOfFinishedProducts(), "ri-beer-line", "success", false),
-          createStatisticCard("Purchase Orders (Pendind Delivery)", getTotalNumberOfPurchaseOrdersPendingDelivery(), "ri-ship-2-line", "info", false),
-          createStatisticCard("Inventory Alerts", getTotalNumberOfInventoryAlerts(), "ri-alert-line", "error", false),
-          createStatisticCard("Inventory Price", getInventoryTotalPrice(), "ri-money-euro-circle-line", "info", true),
           createStatisticCard("Stock Price", getStockPrice(), "ri-money-euro-circle-line", "info", true),
-          createStatisticCard("Potential Profit", getPotentialProfit(), "ri-money-euro-circle-line", "warning", true)
+          createStatisticCard("Potential Profit", getPotentialProfit(), "ri-money-euro-circle-line", "warning", true),
+          createStatisticCard("Stock Alerts", getTotalNumberOfInventoryAlerts(), "ri-alert-line", "error", false)
         );
     }