diff --git a/src/danielcortes/xyz/models/caja/CajaDAO.java b/src/danielcortes/xyz/models/caja/CajaDAO.java index e40890f..fcd86eb 100644 --- a/src/danielcortes/xyz/models/caja/CajaDAO.java +++ b/src/danielcortes/xyz/models/caja/CajaDAO.java @@ -24,6 +24,7 @@ package danielcortes.xyz.models.caja; +import danielcortes.xyz.data.Configuration; import danielcortes.xyz.data.ConnectionHolder; import java.sql.ResultSet; @@ -31,8 +32,12 @@ import java.sql.SQLException; import java.time.LocalDate; import java.util.ArrayList; import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; public abstract class CajaDAO { + private static final Logger LOGGER = Logger.getLogger(Configuration.class.getName()); + protected ConnectionHolder connectionHolder; public abstract List findAll(); @@ -47,13 +52,15 @@ public abstract class CajaDAO { public abstract void createCajasForMonth(LocalDate month); - protected List cajasFromResultSet(ResultSet rs) throws SQLException { + List cajasFromResultSet(ResultSet rs) throws SQLException { List cajaList = new ArrayList<>(); while (rs.next()) { Caja caja = new Caja(); caja.setId(rs.getInt("id")); caja.setFecha(LocalDate.parse(rs.getString("fecha"))); cajaList.add(caja); + + LOGGER.log(Level.FINER, "Se a creo: {0}", caja); } return cajaList; } diff --git a/src/danielcortes/xyz/models/caja/SQLiteCajaDAO.java b/src/danielcortes/xyz/models/caja/SQLiteCajaDAO.java index 82935fc..0ce2f16 100644 --- a/src/danielcortes/xyz/models/caja/SQLiteCajaDAO.java +++ b/src/danielcortes/xyz/models/caja/SQLiteCajaDAO.java @@ -80,7 +80,7 @@ public class SQLiteCajaDAO extends CajaDAO { ps.setInt(1, id); ResultSet rs = ps.executeQuery(); - LOGGER.log(Level.FINE, "QUERY: {0} | values [{1}]", new Object[]{query, id}); + LOGGER.log(Level.FINE, "QUERY: {0} | values: {1}", new Object[]{query, id}); caja = this.cajasFromResultSet(rs).get(0); @@ -102,7 +102,7 @@ public class SQLiteCajaDAO extends CajaDAO { ps.setString(1, fecha.toString()); ResultSet rs = ps.executeQuery(); - LOGGER.log(Level.FINE, "QUERY: {0} | values [{1}]", new Object[]{query, fecha}); + LOGGER.log(Level.FINE, "QUERY: {0} | values: {1}", new Object[]{query, fecha}); List cajaList = this.cajasFromResultSet(rs); @@ -128,7 +128,7 @@ public class SQLiteCajaDAO extends CajaDAO { updates = ps.executeUpdate(); - LOGGER.log(Level.FINE, "QUERY: {0} values [{1}]", new Object[]{query, caja.getFecha().toString()}); + LOGGER.log(Level.FINE, "QUERY: {0} values: {1}", new Object[]{query, caja.getFecha().toString()}); ps.close(); @@ -161,7 +161,7 @@ public class SQLiteCajaDAO extends CajaDAO { ps.setInt(2, caja.getId()); updates = ps.executeUpdate(); - LOGGER.log(Level.FINE, "QUERY: {0} | values [{1},{2}]", new Object[]{query, caja.getFecha().toString(), caja.getId()}); + LOGGER.log(Level.FINE, "QUERY: {0} | values: [{1},{2}]", new Object[]{query, caja.getFecha().toString(), caja.getId()}); ps.close(); diff --git a/src/danielcortes/xyz/models/calculo_fondo/CalculoFondoDAO.java b/src/danielcortes/xyz/models/calculo_fondo/CalculoFondoDAO.java index 1bb87f1..89291ba 100644 --- a/src/danielcortes/xyz/models/calculo_fondo/CalculoFondoDAO.java +++ b/src/danielcortes/xyz/models/calculo_fondo/CalculoFondoDAO.java @@ -24,6 +24,7 @@ package danielcortes.xyz.models.calculo_fondo; +import danielcortes.xyz.data.Configuration; import danielcortes.xyz.data.ConnectionHolder; import danielcortes.xyz.models.caja.Caja; import danielcortes.xyz.models.caja.SQLiteCajaDAO; @@ -32,8 +33,12 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; public abstract class CalculoFondoDAO { + private static final Logger LOGGER = Logger.getLogger(Configuration.class.getName()); + protected ConnectionHolder connectionHolder; public abstract List findAll(); @@ -61,6 +66,9 @@ public abstract class CalculoFondoDAO { calculoFondo.setDescripcion(rs.getString("descripcion")); calculoFondo.setCaja(caja); calculoFondoList.add(calculoFondo); + + LOGGER.log(Level.FINER, "Se a creo: {0}", calculoFondo); + } return calculoFondoList; } diff --git a/src/danielcortes/xyz/models/calculo_fondo/SQLiteCalculoFondoDAO.java b/src/danielcortes/xyz/models/calculo_fondo/SQLiteCalculoFondoDAO.java index 1a79cbd..fd4c5ed 100644 --- a/src/danielcortes/xyz/models/calculo_fondo/SQLiteCalculoFondoDAO.java +++ b/src/danielcortes/xyz/models/calculo_fondo/SQLiteCalculoFondoDAO.java @@ -52,7 +52,7 @@ public class SQLiteCalculoFondoDAO extends CalculoFondoDAO { PreparedStatement ps = conn.prepareStatement(query); ResultSet rs = ps.executeQuery(); - LOGGER.log(Level.FINE, "Se ejecuta query: {0}", query); + LOGGER.log(Level.FINE, "QUERY: {0}", query); calculoFondoList = this.cajasFromResultSet(rs); @@ -73,7 +73,7 @@ public class SQLiteCalculoFondoDAO extends CalculoFondoDAO { ps.setInt(1, caja.getId()); ResultSet rs = ps.executeQuery(); - LOGGER.log(Level.FINE, "Se ejecuta query: {0} con caja_id = {1}", new Object[]{query, caja.getId()}); + LOGGER.log(Level.FINE, "QUERY: {0} | values: [{1}]", new Object[]{query, caja.getId()}); calculoFondoList = this.cajasFromResultSet(rs); @@ -94,7 +94,7 @@ public class SQLiteCalculoFondoDAO extends CalculoFondoDAO { ps.setInt(1, id); ResultSet rs = ps.executeQuery(); - LOGGER.log(Level.FINE, "Se ejecuta query: {0} con id = {1}", new Object[]{query, id}); + LOGGER.log(Level.FINE, "QUERY: {0} | values: [{1}]", new Object[]{query, id}); calculoFondo = this.cajasFromResultSet(rs).get(0); @@ -117,7 +117,7 @@ public class SQLiteCalculoFondoDAO extends CalculoFondoDAO { ps.setInt(3, calculoFondo.getCaja().getId()); updates = ps.executeUpdate(); - LOGGER.log(Level.FINE, "Se ejecuta query: {0} con valor = {1}, descripcion = {2}, caja_id = {3}. se realizaron {4} updates", new Object[]{query, calculoFondo.getValor(), calculoFondo.getDescripcion(), calculoFondo.getCaja().getId(), updates}); + LOGGER.log(Level.FINE, "QUERY {0} | values: [{1},{2},{3}] | updates: {4}", new Object[]{query, calculoFondo.getValor(), calculoFondo.getDescripcion(), calculoFondo.getCaja().getId(), updates}); ps.close(); @@ -149,7 +149,8 @@ public class SQLiteCalculoFondoDAO extends CalculoFondoDAO { ps.setInt(4, calculoFondo.getId()); updates = ps.executeUpdate(); - LOGGER.log(Level.FINE, "Se ejecuta query: {0} con valor = {1}, descripcion = {2}, caja_id = {3}, id = {4}. se realizaron {5} updates", new Object[]{query, calculoFondo.getValor(), calculoFondo.getDescripcion(), calculoFondo.getCaja().getId(), calculoFondo.getId(), updates}); + LOGGER.log(Level.FINE, "QUERY {0} | values: [{1},{2},{3},{4}] | updates: {5}", new Object[]{query, calculoFondo.getValor(), calculoFondo.getDescripcion(), calculoFondo.getCaja().getId(), updates}); + ps.close(); } catch (SQLException e) { @@ -168,7 +169,7 @@ public class SQLiteCalculoFondoDAO extends CalculoFondoDAO { ps.setInt(1, calculoFondo.getId()); updates = ps.executeUpdate(); - LOGGER.log(Level.FINE, "Se ejecuta query: {0} con id = {1}. Se realizaron {2} updates", new Object[]{query, calculoFondo.getId(), updates}); + LOGGER.log(Level.FINE, "QUERY: {0} | values: {1} | updates: {2}", new Object[]{query, calculoFondo.getId(), updates}); ps.close(); } catch (SQLException e) { @@ -187,7 +188,7 @@ public class SQLiteCalculoFondoDAO extends CalculoFondoDAO { ps.setInt(1, caja.getId()); ResultSet rs = ps.executeQuery(); - LOGGER.log(Level.FINE, "Se ejecuta query: {0} con caja_id = {1}", new Object[]{query, caja.getId()}); + LOGGER.log(Level.FINE, "QUERY: {0} | values: {1}", new Object[]{query, caja.getId()}); rs.next(); sum = rs.getInt(1); diff --git a/src/danielcortes/xyz/models/documentos/DocumentosDAO.java b/src/danielcortes/xyz/models/documentos/DocumentosDAO.java index 6a6e0ee..bcbafb7 100644 --- a/src/danielcortes/xyz/models/documentos/DocumentosDAO.java +++ b/src/danielcortes/xyz/models/documentos/DocumentosDAO.java @@ -24,6 +24,7 @@ package danielcortes.xyz.models.documentos; +import danielcortes.xyz.data.Configuration; import danielcortes.xyz.data.ConnectionHolder; import danielcortes.xyz.models.caja.Caja; import danielcortes.xyz.models.caja.CajaDAO; @@ -33,8 +34,12 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; public abstract class DocumentosDAO { + private static final Logger LOGGER = Logger.getLogger(Configuration.class.getName()); + protected ConnectionHolder connectionHolder; public abstract List findAll(); @@ -66,7 +71,10 @@ public abstract class DocumentosDAO { documentos.setTarjetas(rs.getInt("tarjetas")); documentos.setRetiros(rs.getInt("retiros")); + LOGGER.log(Level.FINER, "Se a creo: {0}", documentos); + documentosList.add(documentos); + } return documentosList; } diff --git a/src/danielcortes/xyz/models/documentos/SQLiteDocumentosDAO.java b/src/danielcortes/xyz/models/documentos/SQLiteDocumentosDAO.java index aa73976..d3f1a61 100644 --- a/src/danielcortes/xyz/models/documentos/SQLiteDocumentosDAO.java +++ b/src/danielcortes/xyz/models/documentos/SQLiteDocumentosDAO.java @@ -24,6 +24,7 @@ package danielcortes.xyz.models.documentos; +import danielcortes.xyz.data.Configuration; import danielcortes.xyz.data.SQLiteConnectionHolder; import danielcortes.xyz.models.caja.Caja; @@ -33,8 +34,12 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; public class SQLiteDocumentosDAO extends DocumentosDAO { + private static final Logger LOGGER = Logger.getLogger(Configuration.class.getName()); + public SQLiteDocumentosDAO() { this.connectionHolder = new SQLiteConnectionHolder(); } @@ -43,15 +48,18 @@ public class SQLiteDocumentosDAO extends DocumentosDAO { public List findAll() { List documentosList = new ArrayList<>(); try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("select * from documentos"); + String query = "select * from documentos"; + PreparedStatement ps = conn.prepareStatement(query); ResultSet rs = ps.executeQuery(); + LOGGER.log(Level.FINE, "QUERY: {0}", query); + documentosList = this.documentosFromResultSet(rs); rs.close(); ps.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); } return documentosList; } @@ -60,11 +68,13 @@ public class SQLiteDocumentosDAO extends DocumentosDAO { public Documentos findById(int id) { Documentos documentos = null; try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("select * from documentos where id = ?"); + String query = "select * from documentos where id = ?"; + PreparedStatement ps = conn.prepareStatement(query); ps.setInt(1, id); - ResultSet rs = ps.executeQuery(); + LOGGER.log(Level.FINE, "QUERY: {0} | values: {1}", new Object[]{query, id}); + List documentosList = this.documentosFromResultSet(rs); if (documentosList.size() > 0) { documentos = documentosList.get(0); @@ -73,7 +83,7 @@ public class SQLiteDocumentosDAO extends DocumentosDAO { rs.close(); ps.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); } return documentos; } @@ -82,11 +92,13 @@ public class SQLiteDocumentosDAO extends DocumentosDAO { public Documentos findByCaja(Caja caja) { Documentos documentos = null; try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("select * from documentos where caja_id = ?"); + String query = "select * from documentos where caja_id = ?"; + PreparedStatement ps = conn.prepareStatement(query); ps.setInt(1, caja.getId()); - ResultSet rs = ps.executeQuery(); + LOGGER.log(Level.FINE, "QUERY: {0} | values: {1}", new Object[]{query, caja.getId()}); + List documentosList = this.documentosFromResultSet(rs); if (documentosList.size() > 0) { documentos = documentosList.get(0); @@ -95,7 +107,7 @@ public class SQLiteDocumentosDAO extends DocumentosDAO { rs.close(); ps.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); } return documentos; } @@ -104,24 +116,31 @@ public class SQLiteDocumentosDAO extends DocumentosDAO { public boolean insertDocumentos(Documentos documentos) { int updates; try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("insert into documentos (cheques, tarjetas, retiros, caja_id) values (?,?,?,?)"); + String query = "insert into documentos (cheques, tarjetas, retiros, caja_id) values (?,?,?,?)"; + PreparedStatement ps = conn.prepareStatement(query); ps.setInt(1, documentos.getCheques()); ps.setInt(2, documentos.getTarjetas()); ps.setInt(3, documentos.getRetiros()); ps.setInt(4, documentos.getCaja().getId()); - updates = ps.executeUpdate(); + + LOGGER.log(Level.FINE, "QUERY: {0} | values: [{1}, {2}, {3}, {4}]", new Object[]{query, documentos.getCheques(), documentos.getTarjetas(), documentos.getRetiros(), documentos.getCaja().getId()}); + ps.close(); - ps = conn.prepareStatement("select last_insert_rowid()"); + query = "select last_insert_rowid()"; + ps = conn.prepareStatement(query); ResultSet rs = ps.executeQuery(); + + LOGGER.log(Level.FINE, "QUERY: {0}", query); + rs.next(); documentos.setId(rs.getInt(1)); rs.close(); ps.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); return false; } return updates > 0; @@ -131,21 +150,27 @@ public class SQLiteDocumentosDAO extends DocumentosDAO { public boolean insertDefaultDocumentos(Documentos documentos) { int updates; try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("insert into documentos (cheques, tarjetas, retiros, caja_id) values (0,0,0,?)"); + String query = "insert into documentos (cheques, tarjetas, retiros, caja_id) values (0,0,0,?)"; + PreparedStatement ps = conn.prepareStatement(query); ps.setInt(1, documentos.getCaja().getId()); - updates = ps.executeUpdate(); + + LOGGER.log(Level.FINE, "QUERY: {0} | values: {1}", new Object[]{query, documentos.getCaja().getId()}); + ps.close(); ps = conn.prepareStatement("select last_insert_rowid()"); ResultSet rs = ps.executeQuery(); + + LOGGER.log(Level.FINE, "QUERY: {0}", query); + rs.next(); documentos.setId(rs.getInt(1)); rs.close(); ps.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); return false; } return updates > 0; @@ -155,7 +180,8 @@ public class SQLiteDocumentosDAO extends DocumentosDAO { public boolean updateDocumentos(Documentos documentos) { int updates; try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("update documentos set tarjetas = ?, cheques = ?, retiros = ?, caja_id = ? where id = ?"); + String query = "update documentos set tarjetas = ?, cheques = ?, retiros = ?, caja_id = ? where id = ?"; + PreparedStatement ps = conn.prepareStatement(query); ps.setInt(1, documentos.getTarjetas()); ps.setInt(2, documentos.getCheques()); ps.setInt(3, documentos.getRetiros()); @@ -163,9 +189,11 @@ public class SQLiteDocumentosDAO extends DocumentosDAO { ps.setInt(5, documentos.getId()); updates = ps.executeUpdate(); + LOGGER.log(Level.FINE, "QUERY: {0} | values: [{1}, {2}, {3}, {4}]", new Object[]{query, documentos.getCheques(), documentos.getTarjetas(), documentos.getRetiros(), documentos.getCaja().getId(), documentos.getId()}); + ps.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); return false; } return updates > 0; @@ -175,14 +203,16 @@ public class SQLiteDocumentosDAO extends DocumentosDAO { public boolean deleteDocumentos(Documentos documentos) { int updates; try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("delete from documentos where id = ?"); + String query = "delete from documentos where id = ?"; + PreparedStatement ps = conn.prepareStatement(query); ps.setInt(1, documentos.getId()); - updates = ps.executeUpdate(); + LOGGER.log(Level.FINE, "QUERY: {0} | values: {1}", new Object[]{query, documentos.getCaja().getId()}); + ps.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); return false; } return updates > 0; @@ -192,17 +222,20 @@ public class SQLiteDocumentosDAO extends DocumentosDAO { public int getTotalDocumentos(Caja caja) { int total = 0; try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("select cheques + tarjetas + retiros from documentos where caja_id = ?"); + String query = "select cheques + tarjetas + retiros from documentos where caja_id = ?"; + PreparedStatement ps = conn.prepareStatement(query); ps.setInt(1, caja.getId()); - ResultSet rs = ps.executeQuery(); + + LOGGER.log(Level.FINE, "QUERY: {0} | values: {1}", new Object[]{query, caja.getId()}); + rs.next(); total = rs.getInt(1); rs.close(); ps.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); } return total; }