REFACTOR: Modify date expired and price.

chanchobrujo · Sep 20, 2023 · 78f1023 · 78f1023
1 parent c8a982e
commit 78f1023
Show file tree

Hide file tree

Showing 12 changed files with 219 additions and 169 deletions.
diff --git a/bd/db.db b/bd/db.db
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -13,14 +13,14 @@
             <url>src/modules/ModuleProduct.java</url>
             <bookmark id="2">
                 <name/>
-                <line>75</line>
+                <line>76</line>
                 <key/>
             </bookmark>
         </file>
     </editor-bookmarks>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/C:/Users/User/Documents/Ambientes%20de%20desarrollo/BOTICA-CAUTIVO/src/views/reports/ReportSales.java</file>
+            <file>file:/C:/Users/User/Documents/Ambientes%20de%20desarrollo/BOTICA-CAUTIVO/src/views/maintenance/products_views.java</file>
         </group>
     </open-files>
 </project-private>
diff --git a/src/Constans/Headers/HeadersTableSwing.java b/src/Constans/Headers/HeadersTableSwing.java
@@ -14,7 +14,7 @@ public class HeadersTableSwing {
 
     public static final String headres_product[] = 
             new String[] {"ID", "NOMBRE", "MARCA", "PRECIO", "STOCK", "CATEGORIA"
-                    , "ESTADO"};
+                    , "ESTADO", "FECHA DE VENC."};
 
     public static final String headres_productstock[] = new String[] {"ID", "PRODUCTO", "PRECIO", "STOCK", "CATEGORIA"};
 

diff --git a/src/entities/Product.java b/src/entities/Product.java
@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package entities; 
+package entities;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -31,6 +31,7 @@ public class Product {
     private Integer stock; 
     private Category category;
     private Boolean state; 
+    private String date; 
 
     public Product(String name, String brand, Double price, Integer stock, 
             Category category) { 

diff --git a/src/model/ModelProduct.java b/src/model/ModelProduct.java
@@ -5,6 +5,7 @@
  */
 package model; 
 
+import java.util.Date;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -29,6 +30,7 @@ public class ModelProduct {
     private Double price;
     private Integer stock; 
     private String category;
+    private Date date;
     private Boolean state; 
 
 }
diff --git a/src/modules/ModuleProduct.java b/src/modules/ModuleProduct.java
@@ -70,11 +70,11 @@ public List<Product> findAll_Products_Active() {
     }
 
     public String saveProduct(Integer id, String name, String brand,
-            Double price, Integer Stock, String category) {
+            Double price, Integer Stock, String category, String date) {
         boolean verify = Commons.StringsIsEmpty(name, brand, category)
                 || Commons.IntegerIsEmpty(Stock) || Commons.DoublesIsEmpty(price);
 
-        return verify ? messageError : this.productService.save(id, name, brand, price, Stock, category);
+        return verify ? messageError : this.productService.save(id, name, brand, price, Stock, category, date);
     }
 
     public String changeStateProduct(Integer id) {

diff --git a/src/render/table/Entity/TableModelProduct.java b/src/render/table/Entity/TableModelProduct.java
@@ -63,10 +63,9 @@ private void renderTable(JTable table, List<Product> array){
             row.add(product.getStock());
             row.add(product.getCategory().getName());
             row.add(Commons.BooleanToString(product.getState()));
+            row.add(product.getDate());
             return row;
-        }).forEachOrdered(row -> {
-            ((DefaultTableModel) table.getModel()).addRow(row);
-        });
+        }).forEachOrdered(row -> ((DefaultTableModel) table.getModel()).addRow(row));
         table.getColumnModel().getColumn(0).setMaxWidth(0);
         table.getColumnModel().getColumn(3).setMaxWidth(50);
         table.getColumnModel().getColumn(4).setMaxWidth(50);

diff --git a/src/repository/ProductRepository.java b/src/repository/ProductRepository.java
@@ -12,6 +12,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import util.Commons;
 import util.GestorBd;
 import util.Mapper;
@@ -34,12 +35,12 @@ public ProductRepository(){
     }
 
     public String insert(Product product) {
-        String sql = "INSERT INTO product (name, brand, price, stock, id_category, state) VALUES('"
+        String sql = "INSERT INTO product (name, brand, price, stock, id_category, state, expired) VALUES('"
                 +product.getName()+"','"+product.getBrand()+"',"
                 +product.getPrice()+","+product.getStock()+","
                 +product.getCategory().getId()+","
-                +Commons.BooleanToInteger(product.getState()) +");";
-
+                +Commons.BooleanToInteger(product.getState()) +",'"
+                +product.getDate() + "');";
         return GestorBd.execute(sql);
     }
 
@@ -48,9 +49,9 @@ public String update(Product product) {
                 + "brand = '"+product.getBrand()+"', "
                 + "price = "+product.getPrice()+", "
                 + "stock = "+product.getStock()+", "
+                + "expired = '"+product.getDate()+"', "
                 + "id_category = "+product.getCategory().getId() 
                 + " WHERE id = "+product.getId();
-
         return GestorBd.execute(sql);
     }
 
@@ -79,8 +80,7 @@ public String changeState(int id, Boolean state) {
 
     public List<Product> findAll() {
         List list = GestorBd.findAll(SCRIPT_FINDALL);
-        List<Product> findAll = new ArrayList<>(); 
-
+        List<Product> findAll = new ArrayList<>();
         if (Commons.collectionNonEmptyOrNull(list))
             list.stream()
                     .map(mapper -> {

diff --git a/src/services/ProductService.java b/src/services/ProductService.java
@@ -6,7 +6,7 @@
 package services;
 
 import entities.Category; 
-import entities.Product; 
+import entities.Product;
 
 import java.util.List;   
 import java.util.Objects;
@@ -38,32 +38,27 @@ private Optional<Category> findByName_Categories(String name){
                 .findFirst();
     } 
 
-    public String save(int id, String name, String brand, Double price, 
-            Integer Stock, String category){
+    public String save(Integer id, String name, String brand, Double price, 
+            Integer Stock, String category, String date){
         String message = Constans.Enums.ErrorMessage.REPETED_VALUES.getValue();
         Optional<Category> _category = this.findByName_Categories(category);
-
-        Boolean verify = this.verifyByNameOrBrand(name, brand).isPresent(); 
-
-        if (verify) return message;
-
         Product product = Product.builder()
                 .name(name)
                 .brand(brand)
                 .price(price)
                 .stock(Stock)
                 .category(_category.get())
                 .state(Boolean.TRUE)
+                .date(date)
                 .build();
-
-        switch(id){
-            case 0: 
-                message = this.productRepository.insert(product);
-                break;
-            default: 
-                product.setId(id);
-                message = this.productRepository.update(product);
-                break;
+        if (id == null || id == 0) {
+            Boolean verify = this.verifyByNameOrBrand(name, brand).isPresent(); 
+            if (verify) return message;
+            message = this.productRepository.insert(product);
+        } else {
+            product.setId(id);
+            product.setDate(date);
+            message = this.productRepository.update(product);
         }
         return message;
     }
@@ -128,11 +123,8 @@ public List<Product> searchProduct(String value){
 
     public List<Product> findAllByStockMin(){
         return this.productRepository.findAll().stream()
-                .filter(predicate -> predicate.getStock() <= 10)
-                .map(mapper -> {
-                    this.productRepository.changeState(mapper.getId(), Boolean.FALSE);
-                    return mapper;
-                })
+                .filter(predicate -> predicate.getStock() == 0)
+                .peek(mapper -> this.productRepository.changeState(mapper.getId(), false))
                 .collect(Collectors.toList());
     }
 }
diff --git a/src/util/Mapper.java b/src/util/Mapper.java
@@ -13,6 +13,7 @@
 import model.ModelSale;
 
 import Constans.Constan;
+import java.util.Objects;
 
 /**
  *
@@ -28,7 +29,6 @@ public static Rol mapperRol(Object object) {
                 .id(id)
                 .name(row[1].toString())
                 .build();
-
     }
 
     public static Category mapperCategory(Object obj) {
@@ -60,24 +60,25 @@ public static User mapperUser(Object obj) {
 
     public static Product mapperProduct(Object obj) {
         Object[] row = (Object[]) obj;
-
         Integer id = Integer.parseInt(row[0].toString());
         String name = row[1].toString();
         String brand = row[2].toString();
         Double price = Double.parseDouble(row[3].toString());
         Integer stock = Integer.parseInt(row[4].toString());
 
         Boolean state = Commons.IntegerToBoolean(Integer.parseInt(row[6].toString()));
-
-        return Product.builder()
+        Product prod = Product.builder()
                 .id(id)
                 .name(name)
                 .brand(brand)
                 .price(price)
                 .stock(stock)
                 .state(state)
                 .build();
-
+        if (Objects.nonNull(row[7])) {
+            prod.setDate(row[7].toString());
+        }
+        return prod;
     }
 
     public static ModelSale mapperSale(Object object) {