Merge pull request #57 from UdL-EPS-SoftArch/product

francesc-contreras-tech · web-flow · commit 72aac69b3851 · 2025-12-31T12:55:18.000+01:00
feat: add orders relationship to Product and create ProductSummary pr…
diff --git a/src/main/java/cat/udl/eps/softarch/demo/bootstrap/ProductLoader.java b/src/main/java/cat/udl/eps/softarch/demo/bootstrap/ProductLoader.java
@@ -1,8 +1,12 @@
 package cat.udl.eps.softarch.demo.bootstrap;
 
+import cat.udl.eps.softarch.demo.domain.Business;
 import cat.udl.eps.softarch.demo.domain.Category;
+import cat.udl.eps.softarch.demo.domain.Inventory;
 import cat.udl.eps.softarch.demo.domain.Product;
-import cat.udl.eps.softarch.demo.repository.CategoryRepository; // <--- Import nou
+import cat.udl.eps.softarch.demo.repository.BusinessRepository;
+import cat.udl.eps.softarch.demo.repository.CategoryRepository;
+import cat.udl.eps.softarch.demo.repository.InventoryRepository;
 import cat.udl.eps.softarch.demo.repository.ProductRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.boot.CommandLineRunner;
@@ -19,7 +23,9 @@
 public class ProductLoader implements CommandLineRunner {
 
     private final ProductRepository productRepository;
-    private final CategoryRepository categoryRepository; // <--- Injectem el repo de categories
+    private final CategoryRepository categoryRepository;
+    private final BusinessRepository businessRepository;
+    private final InventoryRepository inventoryRepository;
 
     @Override
     public void run(String... args) throws Exception {
@@ -29,18 +35,41 @@ public void run(String... args) throws Exception {
     }
 
     private void loadData() {
-        // --- 1. CREAR I GUARDAR CATEGORIES ---
+
+
+        Business mainBusiness = new Business();
+        mainBusiness.setName("Lleida Coffee Shop");
+        mainBusiness.setEmail("info@lleidacoffee.com");
+        mainBusiness.setUsername("admin1");
+
+
+        mainBusiness.setPassword("password123"); // Ara té 11 caràcters, ja passarà la validació
+        mainBusiness.setAddress("Carrer Major, 1, Lleida");
+        // ------------------------------------------------
+
+        businessRepository.save(mainBusiness);
+
+        Inventory mainInventory = new Inventory();
+        mainInventory.setName("Main Warehouse");
+        mainInventory.setDescription("Magatzem principal de la botiga");
+        mainInventory.setLocation("Lleida, Rovira Roure 4");
+        mainInventory.setTotalStock(1000);
+        mainInventory.setBusiness(mainBusiness);
+
+        inventoryRepository.save(mainInventory);
+
+        System.out.println("📦 Created Main Inventory: " + mainInventory.getName());
+
+
         Category catCoffee = Category.builder().name("Specialty Coffee").description("Best beans in town").build();
         Category catFood = Category.builder().name("Food & Pastry").description("Freshly baked goods").build();
         Category catDrink = Category.builder().name("Drinks").description("Cold and refreshing").build();
         Category catAlt = Category.builder().name("Alternatives").description("Plant based options").build();
         Category catMerch = Category.builder().name("Merchandise").description("Gifts and accessories").build();
 
-        // Guardem les categories primer per tenir ID i poder associar-les
         categoryRepository.saveAll(Arrays.asList(catCoffee, catFood, catDrink, catAlt, catMerch));
 
 
-        // --- 2. CREAR PRODUCTES AMB LA CATEGORIA ASSIGNADA ---
 
         Product cafeEtiopia = Product.builder()
                 .name("Ethiopia Yirgacheffe (250g)")
@@ -49,7 +78,8 @@ private void loadData() {
                 .stock(20)
                 .isAvailable(true)
                 .brand("Nomad Coffee")
-                .category(catCoffee) // <--- Assignem la categoria
+                .category(catCoffee)
+                .inventory(mainInventory)
                 .barcode("8410000000010")
                 .kcal(2)
                 .ingredients(Set.of("100% Washed Arabica Coffee"))
@@ -66,7 +96,8 @@ private void loadData() {
                 .stock(15)
                 .isAvailable(true)
                 .brand("Local Bakery")
-                .category(catFood) // <--- Assignem la categoria
+                .category(catFood)
+                .inventory(mainInventory)
                 .barcode("8410000000020")
                 .kcal(280)
                 .carbs(30)
@@ -86,7 +117,8 @@ private void loadData() {
                 .stock(3)
                 .isAvailable(true)
                 .brand("MyCoffee House")
-                .category(catDrink) // <--- Assignem la categoria
+                .category(catDrink)
+                .inventory(mainInventory)
                 .barcode("8410000000030")
                 .kcal(5)
                 .ingredients(Set.of("Filtered water", "Coffee"))
@@ -103,7 +135,8 @@ private void loadData() {
                 .stock(0)
                 .isAvailable(true)
                 .brand("Local Bakery")
-                .category(catFood) // <--- Assignem la categoria
+                .category(catFood)
+                .inventory(mainInventory)
                 .barcode("8410000000040")
                 .kcal(350)
                 .allergens(Set.of("Gluten", "Nuts", "Soy"))
@@ -118,7 +151,8 @@ private void loadData() {
                 .stock(50)
                 .isAvailable(true)
                 .brand("Oatly")
-                .category(catAlt) // <--- Assignem la categoria
+                .category(catAlt)
+                .inventory(mainInventory)
                 .barcode("8410000000050")
                 .kcal(60)
                 .ingredients(Set.of("Water", "Oats", "Rapeseed oil"))
@@ -136,7 +170,8 @@ private void loadData() {
                 .stock(10)
                 .isAvailable(true)
                 .brand("MyCoffee House")
-                .category(catMerch) // <--- Assignem la categoria
+                .category(catMerch)
+                .inventory(mainInventory)
                 .barcode("8410000000060")
                 .rating(5.0)
                 .isPartOfLoyaltyProgram(true)
@@ -146,8 +181,8 @@ private void loadData() {
 
         productRepository.saveAll(Arrays.asList(cafeEtiopia, croissant, coldBrew, cookieXoc, oatMilk, giftPack));
 
-        System.out.println("------------------------------------------------");
-        System.out.println("☕ COFFEE SHOP MENU LOADED WITH CATEGORIES ☕");
-        System.out.println("------------------------------------------------");
+        System.out.println("-------------------------------------------------------");
+        System.out.println("☕ COFFEE SHOP MENU LOADED WITH CATEGORIES & INVENTORY ☕");
+        System.out.println("-------------------------------------------------------");
     }
 }
diff --git a/src/main/java/cat/udl/eps/softarch/demo/controller/ProductController.java b/src/main/java/cat/udl/eps/softarch/demo/controller/ProductController.java
@@ -4,6 +4,7 @@
 import cat.udl.eps.softarch.demo.domain.Product;
 import cat.udl.eps.softarch.demo.repository.BusinessRepository;
 import cat.udl.eps.softarch.demo.repository.ProductRepository;
+import org.springframework.data.rest.webmvc.RepositoryRestController;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.AccessDeniedException;
@@ -16,8 +17,9 @@
 import java.util.List;
 import java.util.Map;
 
-@RestController
-@RequestMapping("/products")
+// 1. Mantenim @RepositoryRestController
+@RepositoryRestController
+// 2. IMPORTANT: HEM ESBORRAT @RequestMapping("/products") D'AQUÍ
 public class ProductController {
 
     private final ProductRepository productRepository;
@@ -28,7 +30,10 @@ public ProductController(ProductRepository productRepository, BusinessRepository
         this.businessRepository = businessRepository;
     }
 
-    @PutMapping("/{id}/stock")
+    // 3. Afegim "/products" al path de cada mètode
+
+    @PutMapping("/products/{id}/stock") // <--- Canviat
+    @ResponseBody
     public ResponseEntity<?> updateStock(@PathVariable Long id, @RequestBody Map<String, Integer> request) {
         Product product = productRepository.findById(id)
                 .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Product not found"));
@@ -54,14 +59,14 @@ public ResponseEntity<?> updateStock(@PathVariable Long id, @RequestBody Map<Str
         ));
     }
 
-    @PutMapping("/{id}/toggle-availability")
+    @PutMapping("/products/{id}/toggle-availability") // <--- Canviat
+    @ResponseBody
     public ResponseEntity<?> toggleAvailability(@PathVariable Long id) {
         Product product = productRepository.findById(id)
                 .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Product not found"));
 
         validateProductOwnership(product);
 
-        // Check if we can make it available
         if (!product.isAvailable() && product.getStock() == 0) {
             return ResponseEntity.badRequest().body("Cannot make product available with 0 stock");
         }
@@ -76,7 +81,8 @@ public ResponseEntity<?> toggleAvailability(@PathVariable Long id) {
         ));
     }
 
-    @GetMapping("/low-stock")
+    @GetMapping("/products/low-stock") // <--- Canviat
+    @ResponseBody
     public ResponseEntity<List<Product>> getLowStockProducts(
             @RequestParam(defaultValue = "10") int threshold) {
 
@@ -89,7 +95,8 @@ public ResponseEntity<List<Product>> getLowStockProducts(
         return ResponseEntity.ok(lowStockProducts);
     }
 
-    @GetMapping("/by-business/{businessId}")
+    @GetMapping("/products/by-business/{businessId}") // <--- Canviat
+    @ResponseBody
     public ResponseEntity<List<Product>> getProductsByBusiness(@PathVariable String businessId) {
         Business business = businessRepository.findById(businessId)
                 .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Business not found"));
@@ -125,4 +132,4 @@ private void validateProductOwnership(Product product) {
             throw new AccessDeniedException("You can only modify products from your own business");
         }
     }
-}
+}
diff --git a/src/main/java/cat/udl/eps/softarch/demo/domain/Category.java b/src/main/java/cat/udl/eps/softarch/demo/domain/Category.java
@@ -1,9 +1,11 @@
 package cat.udl.eps.softarch.demo.domain;
 
+import com.fasterxml.jackson.annotation.JsonIgnore; // <--- Importa això
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotBlank;
 import lombok.*;
 import org.hibernate.validator.constraints.Length;
+import java.util.Set;
 
 @EqualsAndHashCode(callSuper = true)
 @Entity(name = "Category")
@@ -26,4 +28,10 @@ public class Category extends UriEntity<Long> {
     @Column(length = 255)
     private String description;
 
-}
+    // --- AFEGIR AIXÒ PER EVITAR BUCLES INFINITS I ERRORS ---
+    @OneToMany(mappedBy = "category")
+    @JsonIgnore
+    @ToString.Exclude
+    @EqualsAndHashCode.Exclude
+    private Set<Product> products;
+}
diff --git a/src/main/java/cat/udl/eps/softarch/demo/domain/Product.java b/src/main/java/cat/udl/eps/softarch/demo/domain/Product.java
@@ -57,9 +57,13 @@ public class Product extends UriEntity<Long>{
     @PositiveOrZero private int proteins;
     @PositiveOrZero private int fats;
 
+    // IMPORTAT: Excloure col·leccions del HashCode/Equals per evitar problemes amb Hibernate
     @ElementCollection
+    @EqualsAndHashCode.Exclude
     private Set<String> ingredients;
+
     @ElementCollection
+    @EqualsAndHashCode.Exclude
     private Set<String> allergens;
 
     @DecimalMin(value = "0")
@@ -68,10 +72,10 @@ public class Product extends UriEntity<Long>{
 
     // Loyalty program related fields
     @PositiveOrZero
-    private Integer pointsGiven; // Points given when purchasing this product
-    
+    private Integer pointsGiven;
+
     @PositiveOrZero
-    private Integer pointsCost;  // Points needed to redeem this product
+    private Integer pointsCost;
 
     @JsonProperty("partOfLoyaltyProgram")
     private boolean isPartOfLoyaltyProgram;
@@ -80,22 +84,36 @@ public class Product extends UriEntity<Long>{
     @Lob
     @JsonIgnore
     @Column(length = 5242880) // 5MB max
+    @ToString.Exclude
+    @EqualsAndHashCode.Exclude
     private byte[] image;
 
     private String imageContentType;
 
-    //TODO
-    // @ManyToMany(mappedBy = "products")
-    //    private Set<Order> orders;
+    // --- CORRECCIONS PRINCIPALS AQUÍ ---
+
+    @ManyToMany(mappedBy = "products")
+    @JsonIgnore
+    @ToString.Exclude
+    @EqualsAndHashCode.Exclude // <--- VITAL: Evita que Hibernate cridi hashCode mentre gestiona la col·lecció
+    private Set<Order> orders;
 
     @ManyToOne
     private Category category;
 
     @ManyToMany
+    @JsonIgnore
+    @ToString.Exclude
+    @EqualsAndHashCode.Exclude // <--- VITAL
     private Set<Basket> baskets;
+    // -----------------------------------
 
     @ManyToOne
     private Inventory inventory;
 
+    @JsonProperty("categoryName")
+    public String getCategoryName() {
+        return category != null ? category.getName() : "General";
+    }
 
-}
+}
diff --git a/src/main/java/cat/udl/eps/softarch/demo/domain/projection/ProductSummary.java b/src/main/java/cat/udl/eps/softarch/demo/domain/projection/ProductSummary.java
@@ -0,0 +1,21 @@
+package cat.udl.eps.softarch.demo.domain.projection;
+
+import cat.udl.eps.softarch.demo.domain.Category;
+import cat.udl.eps.softarch.demo.domain.Product;
+import org.springframework.data.rest.core.config.Projection;
+import java.math.BigDecimal;
+
+// Aquesta projecció només la farem servir per la LLISTA
+@Projection(name = "productSummary", types = { Product.class })
+public interface ProductSummary {
+    Long getId();
+    String getName();
+    BigDecimal getPrice();
+    int getStock();
+    boolean getIsAvailable();
+    String getDescription(); // Per la descripció curta de la card
+
+    // Aquí podem agafar l'objecte sencer o fer servir el truc del categoryName
+    // Si vols l'objecte sencer per la llista:
+    Category getCategory();
+}
diff --git a/src/test/java/cat/udl/eps/softarch/demo/steps/OrderStepsDefs.java b/src/test/java/cat/udl/eps/softarch/demo/steps/OrderStepsDefs.java
@@ -222,10 +222,10 @@ public void i_request_my_list_of_orders(String customerName) throws Exception {
         Customer customer = customerRepository.findById(customerName).orElseThrow();
 
         stepDefs.result = stepDefs.mockMvc.perform(
-                get("/orders/search/findByCustomer?customer={customerUri}", customer.getUri())
-                        .accept(MediaType.APPLICATION_JSON)
-                        .characterEncoding(StandardCharsets.UTF_8)
-                        .with(AuthenticationStepDefs.authenticate()))
+                        get("/orders/search/findByCustomer?customer={customerUri}", customer.getUri())
+                                .accept(MediaType.APPLICATION_JSON)
+                                .characterEncoding(StandardCharsets.UTF_8)
+                                .with(AuthenticationStepDefs.authenticate()))
                 .andDo(print());
     }
 
@@ -262,4 +262,4 @@ public void the_response_should_contain_orders(Integer expectedCount) throws Exc
         stepDefs.result.andExpect(jsonPath("$._embedded.orders").isArray());
         stepDefs.result.andExpect(jsonPath("$._embedded.orders.length()").value(expectedCount));
     }
-}
+}
