Merge pull request #59 from UdL-EPS-SoftArch/Inventory

Inventory New Functionalities

Author: rogargon

README.md

@@ -70,6 +70,10 @@ class Inventory {
     description
     location
     totalStock
+    type: [WAREHOUSE, SHELF, FRIDGE...]
+    status: [ACTIVE, FULL, MAINTENANCE, CLOSED]
+    capacity
+    lastUpdated
 }
 class Category {
     name

pom.xml

@@ -132,7 +132,7 @@
                         <path>
                             <groupId>org.projectlombok</groupId>
                             <artifactId>lombok</artifactId>
-                            <version>1.18.34</version>
+                            <version>1.18.36</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>

src/main/java/cat/udl/eps/softarch/demo/config/WebSecurityConfig.java

@@ -60,6 +60,8 @@ protected SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exce
                 .requestMatchers(HttpMethod.PATCH, "/inventories/**").hasRole("BUSINESS")
                 .requestMatchers(HttpMethod.DELETE, "/inventories/**").hasRole("BUSINESS")
 
+                .requestMatchers(HttpMethod.POST, "/categories").hasRole("ADMIN")
+
                 // Identidad (Cualquiera Autenticado)
                 .requestMatchers(HttpMethod.GET, "/identity").authenticated()
 

src/main/java/cat/udl/eps/softarch/demo/domain/Admin.java

@@ -17,8 +17,7 @@
 public class Admin extends User {
 
     @Override
-    @Transient
-    @JsonValue(value = false)
+    @JsonValue(false)
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
     public Collection<? extends GrantedAuthority> getAuthorities() {
         return AuthorityUtils.commaSeparatedStringToAuthorityList("ROLE_ADMIN");

src/main/java/cat/udl/eps/softarch/demo/domain/Inventory.java

@@ -29,5 +29,52 @@ public class Inventory extends UriEntity<Long> {
     @ManyToOne
     private Business business;
 
+    @Enumerated(EnumType.STRING)
+    private InventoryType type;
 
+    @Enumerated(EnumType.STRING)
+    private InventoryStatus status;
+
+    private Integer capacity;
+
+    private java.time.LocalDateTime lastUpdated;
+
+    @OneToMany(mappedBy = "inventory", fetch = FetchType.LAZY)
+    @lombok.ToString.Exclude
+    @lombok.EqualsAndHashCode.Exclude
+    @com.fasterxml.jackson.annotation.JsonIgnore
+    private List<Product> products;
+
+    /**
+     * Calculates the real total stock from the list of products.
+     * Returns 0 if the product list is not loaded/initialized.
+     */
+    public int getCalculatedTotalStock() {
+        if (products == null) {
+            return 0;
+        }
+        return products.stream()
+                .mapToInt(Product::getStock)
+                .sum();
+    }
+
+    /**
+     * Checks if the inventory is full based on capacity.
+     */
+    public boolean isFull() {
+        if (capacity == null || capacity == 0)
+            return false;
+        return getCalculatedTotalStock() >= capacity;
+    }
+
+    /**
+     * Updates the local totalStock field to match the calculated reality.
+     */
+    public void syncTotalStock() {
+        if (products != null && !products.isEmpty()) {
+            this.totalStock = products.stream()
+                    .mapToInt(Product::getStock)
+                    .sum();
+        }
+    }
 }

src/main/java/cat/udl/eps/softarch/demo/domain/InventoryStatus.java

@@ -0,0 +1,8 @@
+package cat.udl.eps.softarch.demo.domain;
+
+public enum InventoryStatus {
+    ACTIVE,
+    FULL,
+    MAINTENANCE,
+    CLOSED
+}

src/main/java/cat/udl/eps/softarch/demo/domain/InventoryType.java

@@ -0,0 +1,9 @@
+package cat.udl.eps.softarch.demo.domain;
+
+public enum InventoryType {
+    WAREHOUSE,
+    SHELF,
+    FRIDGE,
+    DISPLAY,
+    BACKROOM
+}

src/main/java/cat/udl/eps/softarch/demo/handler/CategoryEventHandler.java

@@ -2,9 +2,12 @@
 
 import cat.udl.eps.softarch.demo.domain.Business;
 import cat.udl.eps.softarch.demo.domain.Inventory;
+import cat.udl.eps.softarch.demo.domain.InventoryStatus;
+import cat.udl.eps.softarch.demo.domain.InventoryType;
 import cat.udl.eps.softarch.demo.repository.InventoryRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import java.time.LocalDateTime;
 import org.springframework.data.rest.core.annotation.*;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.core.Authentication;
@@ -14,7 +17,6 @@
 @Component
 @RepositoryEventHandler
 public class InventoryEventHandler {
-
     private final Logger logger = LoggerFactory.getLogger(InventoryEventHandler.class);
     private final InventoryRepository inventoryRepository;
 
@@ -25,29 +27,49 @@ public InventoryEventHandler(InventoryRepository inventoryRepository) {
     @HandleBeforeCreate
     public void handleBeforeCreate(Inventory inventory) {
         logger.info("Before creating inventory: {}", inventory);
-
         Authentication auth = SecurityContextHolder.getContext().getAuthentication();
-        
-        // 1. Validació 
         if (auth == null || !auth.isAuthenticated()) {
             throw new AccessDeniedException("Must be logged in to create inventory");
         }
 
-        
-        Object principal = auth.getPrincipal();
-
-        if (principal instanceof Business) {
-            Business business = (Business) principal;
+        if (auth.getPrincipal() instanceof Business business) {
             inventory.setBusiness(business);
         } else {
-            throw new AccessDeniedException("Only Business accounts can create inventories. You are: " + principal.getClass().getSimpleName());
+            throw new AccessDeniedException("Only Business accounts can create inventories");
         }
+
+        if (inventory.getStatus() == null)
+            inventory.setStatus(InventoryStatus.ACTIVE);
+        if (inventory.getType() == null)
+            inventory.setType(InventoryType.WAREHOUSE);
+        inventory.setLastUpdated(LocalDateTime.now());
     }
 
     @HandleBeforeSave
     public void handleBeforeSave(Inventory inventory) {
         logger.info("Before updating inventory: {}", inventory);
         checkOwnership(inventory);
+
+        // ONLY sync if products are loaded.
+        // If not loaded, respect the totalStock value coming from the UI/request.
+        if (inventory.getProducts() != null && !inventory.getProducts().isEmpty()) {
+            inventory.syncTotalStock();
+        }
+
+        // Capacity logic
+        if (inventory.getCapacity() != null && inventory.getCapacity() > 0) {
+            if (inventory.getTotalStock() >= inventory.getCapacity()) {
+                if (inventory.getStatus() != InventoryStatus.CLOSED
+                        && inventory.getStatus() != InventoryStatus.MAINTENANCE) {
+                    inventory.setStatus(InventoryStatus.FULL);
+                    logger.info("Inventory {} reached capacity. Status set to FULL.", inventory.getId());
+                }
+            } else if (inventory.getStatus() == InventoryStatus.FULL) {
+                inventory.setStatus(InventoryStatus.ACTIVE);
+                logger.info("Inventory {} has space. Status restored to ACTIVE.", inventory.getId());
+            }
+        }
+        inventory.setLastUpdated(LocalDateTime.now());
     }
 
     @HandleBeforeDelete
@@ -59,13 +81,10 @@ public void handleBeforeDelete(Inventory inventory) {
     private void checkOwnership(Inventory inventory) {
         Authentication auth = SecurityContextHolder.getContext().getAuthentication();
         String currentUsername = auth.getName();
-        
         if (inventory.getBusiness() != null && !inventory.getBusiness().getUsername().equals(currentUsername)) {
-            boolean isAdmin = auth.getAuthorities().stream()
-                    .anyMatch(a -> a.getAuthority().equals("ROLE_ADMIN"));
-            
+            boolean isAdmin = auth.getAuthorities().stream().anyMatch(a -> a.getAuthority().equals("ROLE_ADMIN"));
             if (!isAdmin) {
-                throw new AccessDeniedException("You can only modify your own inventory");
+                throw new AccessDeniedException("You are not the owner of this inventory");
             }
         }
     }

src/main/java/cat/udl/eps/softarch/demo/handler/InventoryEventHandler.java

@@ -1,4 +1,4 @@
-allowed-origins: "https://react-template.netlify.app,https://deploy-preview-*--react-template.netlify.app"
+allowed-origins: "https://mycoffee.vercel.app,https://mycoffee-*.vercel.app"
 
 logging:
     level: