diff --git a/backend/src/main/java/META-INF/persistence.xml b/backend/src/main/java/META-INF/persistence.xml index 8ac0e311b776467955d32bbe3025d03c22802efa..464fcb1041d689410558d43e876d05ef3ca883b5 100644 --- a/backend/src/main/java/META-INF/persistence.xml +++ b/backend/src/main/java/META-INF/persistence.xml @@ -18,6 +18,9 @@ <property name="hibernate.connection.username" value="jyaa2024_usr1"/> <property name="hibernate.default_schema" value="stock"/> <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5InnoDBDialect"/> + <property name="hibernate.show_sql" value="true"/> + <property name="hibernate.format_sql" value="true"/> + <property name="hibernate.use_sql_comments" value="true"/> </properties> </persistence-unit> </persistence> \ No newline at end of file diff --git a/backend/src/main/java/persistance/services/AlmacenamientoDAO.java b/backend/src/main/java/persistance/services/AlmacenamientoDAO.java index b013c30e183b3a6a28fbe838a648fe4f11103224..73dc49f81d9c6a1b00123375f592240ecb18a468 100644 --- a/backend/src/main/java/persistance/services/AlmacenamientoDAO.java +++ b/backend/src/main/java/persistance/services/AlmacenamientoDAO.java @@ -150,7 +150,7 @@ public class AlmacenamientoDAO implements IAlmacenamiento { public List<BienFront> getProductos() { String jpql = "SELECT new models.BienFront(i.id, b.nombre, b.tipo, i.precioUnitario, SUM(i.cantidad)) " + "FROM Ingrediente i " + - "JOIN i.idBien b " + + "JOIN Bien b ON i.idBien = b.id " + "WHERE b.tipo = 1 " + "GROUP BY b.id, b.nombre"; @@ -162,7 +162,7 @@ public class AlmacenamientoDAO implements IAlmacenamiento { public List<BienFront> getInsumos() { String jpql = "SELECT new models.BienFront(i.id, b.nombre, b.tipo, i.precioUnitario, SUM(i.cantidad)) " + "FROM Ingrediente i " + - "JOIN i.idBien b " + + "JOIN Bien b ON i.idBien = b.id " + "WHERE b.tipo = 0 " + "GROUP BY b.id, b.nombre"; @@ -172,27 +172,13 @@ public class AlmacenamientoDAO implements IAlmacenamiento { @Override @Transactional public List<BienFront> getMatPrim() { - String jpql = "SELECT b.id, b.nombre, b.tipo, i.precioUnitario, SUM(i.cantidad) " + + String jpql = "SELECT new models.BienFront(i.id, b.nombre, b.tipo, i.precioUnitario, SUM(i.cantidad)) " + "FROM Ingrediente i " + - "JOIN i.idBien b " + + "JOIN Bien b ON i.idBien = b.id " + "WHERE b.tipo = 2 " + - "GROUP BY b.id, b.nombre"; + "GROUP BY b.nombre, b.tipo"; - List<Object[]> results = entityManager.createQuery(jpql, Object[].class).getResultList(); - - List<BienFront> bienFronts = new ArrayList<>(); - for (Object[] result : results) { - BienFront bienFront = new BienFront( - (Long) result[0], - (String) result[1], - (TipoBien) result[2], - (Double) result[3], - ((Number) result[4]).doubleValue() - ); - bienFronts.add(bienFront); - } - - return bienFronts; + return entityManager.createQuery(jpql, BienFront.class).getResultList(); }