diff --git a/TrabajoFinalJava b/TrabajoFinalJava new file mode 160000 index 0000000000000000000000000000000000000000..d14b0a0e3316393b016f26b7dc1abcfcd588f219 --- /dev/null +++ b/TrabajoFinalJava @@ -0,0 +1 @@ +Subproject commit d14b0a0e3316393b016f26b7dc1abcfcd588f219 diff --git a/src/main/java/com/stock/model/Compra.java b/src/main/java/com/stock/model/Compra.java index 86619aaf3d9cffb4c93cbaffe281bfb3df5c99bd..3e009f25d2099e0cdea3f67bf0177e45db07c2d9 100644 --- a/src/main/java/com/stock/model/Compra.java +++ b/src/main/java/com/stock/model/Compra.java @@ -5,14 +5,14 @@ import java.util.List; import javax.persistence.*; +import com.fasterxml.jackson.annotation.JsonIgnore; + @Entity @Table(name="COMPRA") public class Compra extends Base { -// @Column(name = "CODIGO") -// private int codigo; - @OneToMany(mappedBy = "compra") + @JsonIgnore private List<Item> items; @Column(name = "IMPORTE") @@ -21,12 +21,7 @@ public class Compra extends Base { @Column(name = "FECHA") private Date fecha; -// public int getCodigo() { -// return codigo; -// } -// public void setCodigo(int codigo) { -// this.codigo = codigo; -// } + public Compra() {} public List<Item> getItems() { return items; diff --git a/src/main/java/com/stock/model/ProductoLimpieza.java b/src/main/java/com/stock/model/ProductoLimpieza.java index ac57caabce4e4bd01d95f8097d8ddc0afed6438d..4537b2d2568825f96cd64c513a21b75bec8d90eb 100644 --- a/src/main/java/com/stock/model/ProductoLimpieza.java +++ b/src/main/java/com/stock/model/ProductoLimpieza.java @@ -6,14 +6,6 @@ import javax.persistence.*; @Table(name="PRODUCTO_LIMPIEZA") public class ProductoLimpieza extends Base{ -// @Id -// @GeneratedValue(strategy=GenerationType.AUTO) -// @Column(name="PRODUCTO_LIMPIEZA_ID") -// private Long id; - -// @Column(name = "CODIGO") -// private int codigo; - @Column(name = "PRODUCTO") private String producto; diff --git a/src/main/java/com/stock/model/Venta.java b/src/main/java/com/stock/model/Venta.java index 9f29ac686bbb75112efe8f311650c2428dec3c7e..ab6931f152580cea432656521aacc5e2a14df31f 100644 --- a/src/main/java/com/stock/model/Venta.java +++ b/src/main/java/com/stock/model/Venta.java @@ -5,14 +5,14 @@ import java.util.List; import javax.persistence.*; +import com.fasterxml.jackson.annotation.JsonIgnore; + @Entity @Table(name="VENTA") public class Venta extends Base{ -// @Column(name = "CODIGO") -// private int codigo; - @OneToMany(mappedBy = "venta") + @JsonIgnore private List<Item> items; @Column(name = "UNIDADES") @@ -26,13 +26,6 @@ public class Venta extends Base{ public Venta(){} -// public int getCodigo() { -// return codigo; -// } -// public void setCodigo(int codigo) { -// this.codigo = codigo; -// } - public List<Item> getItems() { return items; } diff --git a/src/main/java/com/stock/resources/BaseResource.java b/src/main/java/com/stock/resources/BaseResource.java index ba9a9525df2bc7de2d71811131621db14634b26f..a0d830617d0b6591650768aa2eed1c9ded472653 100644 --- a/src/main/java/com/stock/resources/BaseResource.java +++ b/src/main/java/com/stock/resources/BaseResource.java @@ -6,7 +6,6 @@ import com.stock.dao.*; import com.stock.model.*; import jakarta.inject.Inject; -import jakarta.websocket.server.PathParam; import jakarta.ws.rs.*; import jakarta.ws.rs.core.*; diff --git a/src/main/java/com/stock/resources/CompraResource.java b/src/main/java/com/stock/resources/CompraResource.java index ca67eed178ae4ee80a0d8bb14fade0279c17029a..e2ae5973fea3a9630309d38d1df5ab41201d1b86 100644 --- a/src/main/java/com/stock/resources/CompraResource.java +++ b/src/main/java/com/stock/resources/CompraResource.java @@ -6,7 +6,6 @@ import com.stock.dao.*; import com.stock.model.*; import jakarta.inject.Inject; -import jakarta.websocket.server.PathParam; import jakarta.ws.rs.*; import jakarta.ws.rs.core.*; diff --git a/src/main/java/com/stock/resources/FamProdResource.java b/src/main/java/com/stock/resources/FamProdResource.java index 16183061794ad0b8b3d2b445eac87efc19527dbd..e321f0f1ec83f71fea52df3097011b44bd586b16 100644 --- a/src/main/java/com/stock/resources/FamProdResource.java +++ b/src/main/java/com/stock/resources/FamProdResource.java @@ -6,7 +6,6 @@ import com.stock.dao.*; import com.stock.model.*; import jakarta.inject.Inject; -import jakarta.websocket.server.PathParam; import jakarta.ws.rs.*; import jakarta.ws.rs.core.*; diff --git a/src/main/java/com/stock/resources/InsumoResource.java b/src/main/java/com/stock/resources/InsumoResource.java index 1e2ee01ad65e5ac022a682b0ea0f92e5509ee45e..a2e746bfd74c0f33e8ee4ddbeddf2e75f35dbbcd 100644 --- a/src/main/java/com/stock/resources/InsumoResource.java +++ b/src/main/java/com/stock/resources/InsumoResource.java @@ -6,7 +6,6 @@ import com.stock.dao.*; import com.stock.model.*; import jakarta.inject.Inject; -import jakarta.websocket.server.PathParam; import jakarta.ws.rs.*; import jakarta.ws.rs.core.*; diff --git a/src/main/java/com/stock/resources/ItemResource.java b/src/main/java/com/stock/resources/ItemResource.java index 441840c4b2ef8b7018eefd1596bbf29cff17b350..52b3724f0410b7bff591e7f394bab54dabbcb8a3 100644 --- a/src/main/java/com/stock/resources/ItemResource.java +++ b/src/main/java/com/stock/resources/ItemResource.java @@ -6,7 +6,6 @@ import com.stock.dao.*; import com.stock.model.*; import jakarta.inject.Inject; -import jakarta.websocket.server.PathParam; import jakarta.ws.rs.*; import jakarta.ws.rs.core.*; diff --git a/src/main/java/com/stock/resources/ProductoLimpiezaResource.java b/src/main/java/com/stock/resources/ProductoLimpiezaResource.java index f5d0f7117b7c9aa6bd6507855d1f3526c37296dd..40e20cba04bd38ee99ecdf7052cfc34397f4f918 100644 --- a/src/main/java/com/stock/resources/ProductoLimpiezaResource.java +++ b/src/main/java/com/stock/resources/ProductoLimpiezaResource.java @@ -6,7 +6,6 @@ import com.stock.dao.*; import com.stock.model.*; import jakarta.inject.Inject; -import jakarta.websocket.server.PathParam; import jakarta.ws.rs.*; import jakarta.ws.rs.core.*; diff --git a/src/main/java/com/stock/resources/ProductoResource.java b/src/main/java/com/stock/resources/ProductoResource.java index 31caf6e625155278039c929448bc552d663fa99d..1edaf55db61c9639962ec9b7f93d5a06d8127683 100644 --- a/src/main/java/com/stock/resources/ProductoResource.java +++ b/src/main/java/com/stock/resources/ProductoResource.java @@ -6,7 +6,6 @@ import com.stock.dao.*; import com.stock.model.*; import jakarta.inject.Inject; -import jakarta.websocket.server.PathParam; import jakarta.ws.rs.*; import jakarta.ws.rs.core.*; diff --git a/src/main/java/com/stock/resources/ProductoTerminadoResource.java b/src/main/java/com/stock/resources/ProductoTerminadoResource.java index bdcd571a0a0e8b9bc5a41da88ccba4c01d553945..ab1cd0ab11de0146246d7d44e5263dedc8e93cac 100644 --- a/src/main/java/com/stock/resources/ProductoTerminadoResource.java +++ b/src/main/java/com/stock/resources/ProductoTerminadoResource.java @@ -6,7 +6,6 @@ import com.stock.dao.*; import com.stock.model.*; import jakarta.inject.Inject; -import jakarta.websocket.server.PathParam; import jakarta.ws.rs.*; import jakarta.ws.rs.core.*; diff --git a/src/main/java/com/stock/resources/RecetaResource.java b/src/main/java/com/stock/resources/RecetaResource.java index e7ee6aa185a372936effa64fe53cc802ac1531f6..733bb6941346c70055674bae79880446fc7d737c 100644 --- a/src/main/java/com/stock/resources/RecetaResource.java +++ b/src/main/java/com/stock/resources/RecetaResource.java @@ -6,7 +6,6 @@ import com.stock.dao.*; import com.stock.model.*; import jakarta.inject.Inject; -import jakarta.websocket.server.PathParam; import jakarta.ws.rs.*; import jakarta.ws.rs.core.*; diff --git a/src/main/java/com/stock/resources/VentaResource.java b/src/main/java/com/stock/resources/VentaResource.java index 46c0829253f1c2a322b8696167e8a2b0580a7b20..d3fa16d1ea26e1db6991b27b9e722f43a32df7bc 100644 --- a/src/main/java/com/stock/resources/VentaResource.java +++ b/src/main/java/com/stock/resources/VentaResource.java @@ -6,7 +6,6 @@ import com.stock.dao.*; import com.stock.model.*; import jakarta.inject.Inject; -import jakarta.websocket.server.PathParam; import jakarta.ws.rs.*; import jakarta.ws.rs.core.*;