diff --git a/dist/Programa Caja.jar b/dist/Programa Caja.jar index 81a0883..49e494c 100644 Binary files a/dist/Programa Caja.jar and b/dist/Programa Caja.jar differ diff --git a/dist/config/logging.properties b/dist/config/logging.properties index eb1acd4..16c5482 100644 --- a/dist/config/logging.properties +++ b/dist/config/logging.properties @@ -1,11 +1,10 @@ #handlers= java.util.logging.ConsoleHandler handlers= java.util.logging.FileHandler - -java.util.logging.FileHandler.level = ALL -java.util.logging.FileHandler.pattern = logs/logs-%u.log -java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter +java.util.logging.FileHandler.level=FINER +java.util.logging.FileHandler.pattern=logs/logs-%u-%g.log +java.util.logging.FileHandler.formatter=java.util.logging.XMLFormatter +java.util.logging.FileHandler.append=true #java.util.logging.ConsoleHandler.level = ALL #java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter - -danielcortes.level= ALL \ No newline at end of file +danielcortes.level=FINER \ No newline at end of file diff --git a/src/danielcortes/xyz/Main.java b/src/danielcortes/xyz/Main.java index f84eca6..d3fb171 100644 --- a/src/danielcortes/xyz/Main.java +++ b/src/danielcortes/xyz/Main.java @@ -29,18 +29,21 @@ import danielcortes.xyz.data.Configuration; import danielcortes.xyz.views.ManagerView; import javax.swing.*; -import java.util.Arrays; -import java.util.Locale; -import java.util.logging.*; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.logging.LogManager; public class Main { + static { + setUpLogger(); + setUpSystemProperties(); + } + public static void main(String[] args) { run(); } private static void run() { - setUpSystemProperties(); - ManagerView view = new ManagerView(); ManagerController managerController = new ManagerController(view); @@ -57,7 +60,6 @@ public class Main { frame.setVisible(true); } - private static void setUpSystemProperties() { System.setProperty("awt.useSystemAAFontSettings", "on"); System.setProperty("swing.aatext", "true"); @@ -68,7 +70,19 @@ public class Main { e.printStackTrace(); } - Locale.setDefault(new Locale("es")); + //Locale.setDefault(new Locale("es")); } -} + private static void setUpLogger() { + LogManager manager = LogManager.getLogManager(); + try { + FileInputStream in = new FileInputStream("config/logging.properties"); + manager.readConfiguration(in); + in.close(); + } catch (IOException e) { + System.exit(1); + } + + + } +} \ No newline at end of file diff --git a/src/danielcortes/xyz/data/SQLiteConnectionHolder.java b/src/danielcortes/xyz/data/SQLiteConnectionHolder.java index b8a7c79..f542499 100644 --- a/src/danielcortes/xyz/data/SQLiteConnectionHolder.java +++ b/src/danielcortes/xyz/data/SQLiteConnectionHolder.java @@ -47,7 +47,7 @@ public class SQLiteConnectionHolder implements ConnectionHolder { try { Class.forName("org.sqlite.JDBC"); con = DriverManager.getConnection(databaseURI); - LOGGER.log(Level.FINER, "Creada conexion a base de datos SQLITE"); + LOGGER.log(Level.FINEST, "Creada conexion a base de datos SQLITE"); } catch (ClassNotFoundException e) { LOGGER.log(Level.SEVERE, e.toString(), e); System.exit(133); diff --git a/src/danielcortes/xyz/models/caja/CajaDAO.java b/src/danielcortes/xyz/models/caja/CajaDAO.java index fcd86eb..ddc519b 100644 --- a/src/danielcortes/xyz/models/caja/CajaDAO.java +++ b/src/danielcortes/xyz/models/caja/CajaDAO.java @@ -24,7 +24,6 @@ package danielcortes.xyz.models.caja; -import danielcortes.xyz.data.Configuration; import danielcortes.xyz.data.ConnectionHolder; import java.sql.ResultSet; @@ -36,7 +35,7 @@ import java.util.logging.Level; import java.util.logging.Logger; public abstract class CajaDAO { - private static final Logger LOGGER = Logger.getLogger(Configuration.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CajaDAO.class.getName()); protected ConnectionHolder connectionHolder; diff --git a/src/danielcortes/xyz/models/caja/SQLiteCajaDAO.java b/src/danielcortes/xyz/models/caja/SQLiteCajaDAO.java index 0ce2f16..571eeaa 100644 --- a/src/danielcortes/xyz/models/caja/SQLiteCajaDAO.java +++ b/src/danielcortes/xyz/models/caja/SQLiteCajaDAO.java @@ -24,7 +24,6 @@ package danielcortes.xyz.models.caja; -import danielcortes.xyz.data.Configuration; import danielcortes.xyz.data.SQLiteConnectionHolder; import danielcortes.xyz.models.documentos.Documentos; import danielcortes.xyz.models.documentos.DocumentosDAO; @@ -44,7 +43,7 @@ import java.util.logging.Level; import java.util.logging.Logger; public class SQLiteCajaDAO extends CajaDAO { - private static final Logger LOGGER = Logger.getLogger( Configuration.class.getName() ); + private static final Logger LOGGER = Logger.getLogger(SQLiteCajaDAO.class.getName()); public SQLiteCajaDAO() { this.connectionHolder = new SQLiteConnectionHolder(); @@ -127,8 +126,7 @@ public class SQLiteCajaDAO extends CajaDAO { ps.setString(1, caja.getFecha().toString()); 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} | updates: {2}", new Object[]{query, caja.getFecha(), updates}); ps.close(); @@ -161,7 +159,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} | updates: {3}]", new Object[]{query, caja.getFecha(), caja.getId(), updates}); ps.close(); @@ -178,7 +176,7 @@ public class SQLiteCajaDAO extends CajaDAO { LocalDate endDate = date.withDayOfMonth(date.lengthOfMonth()).plusDays(1); int count = 0; - LOGGER.log(Level.FINE, "Se intentara crear las cajas para un mes para las fechas entre {0} y {1}", new Object[]{date, endDate}); + LOGGER.log(Level.FINE, "Se intentara crear las cajas no existentes para las fechas entre {0} y {1}", new Object[]{date, endDate}); while (date.isBefore(endDate)) { if (this.findByFecha(date) != null) { diff --git a/src/danielcortes/xyz/models/calculo_fondo/CalculoFondoDAO.java b/src/danielcortes/xyz/models/calculo_fondo/CalculoFondoDAO.java index 89291ba..654692f 100644 --- a/src/danielcortes/xyz/models/calculo_fondo/CalculoFondoDAO.java +++ b/src/danielcortes/xyz/models/calculo_fondo/CalculoFondoDAO.java @@ -24,7 +24,6 @@ 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; @@ -37,7 +36,7 @@ import java.util.logging.Level; import java.util.logging.Logger; public abstract class CalculoFondoDAO { - private static final Logger LOGGER = Logger.getLogger(Configuration.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CalculoFondoDAO.class.getName()); protected ConnectionHolder connectionHolder; diff --git a/src/danielcortes/xyz/models/calculo_fondo/SQLiteCalculoFondoDAO.java b/src/danielcortes/xyz/models/calculo_fondo/SQLiteCalculoFondoDAO.java index fd4c5ed..4545a3f 100644 --- a/src/danielcortes/xyz/models/calculo_fondo/SQLiteCalculoFondoDAO.java +++ b/src/danielcortes/xyz/models/calculo_fondo/SQLiteCalculoFondoDAO.java @@ -24,7 +24,6 @@ package danielcortes.xyz.models.calculo_fondo; -import danielcortes.xyz.data.Configuration; import danielcortes.xyz.data.SQLiteConnectionHolder; import danielcortes.xyz.models.caja.Caja; @@ -38,7 +37,7 @@ import java.util.logging.Level; import java.util.logging.Logger; public class SQLiteCalculoFondoDAO extends CalculoFondoDAO { - private static final Logger LOGGER = Logger.getLogger(Configuration.class.getName()); + private static final Logger LOGGER = Logger.getLogger(SQLiteCalculoFondoDAO.class.getName()); public SQLiteCalculoFondoDAO() { this.connectionHolder = new SQLiteConnectionHolder(); @@ -73,7 +72,7 @@ public class SQLiteCalculoFondoDAO extends CalculoFondoDAO { ps.setInt(1, caja.getId()); ResultSet rs = ps.executeQuery(); - LOGGER.log(Level.FINE, "QUERY: {0} | values: [{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 +93,7 @@ public class SQLiteCalculoFondoDAO extends CalculoFondoDAO { 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}); calculoFondo = this.cajasFromResultSet(rs).get(0); @@ -117,7 +116,7 @@ public class SQLiteCalculoFondoDAO extends CalculoFondoDAO { ps.setInt(3, calculoFondo.getCaja().getId()); updates = ps.executeUpdate(); - LOGGER.log(Level.FINE, "QUERY {0} | values: [{1},{2},{3}] | updates: {4}", 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 +148,7 @@ public class SQLiteCalculoFondoDAO extends CalculoFondoDAO { ps.setInt(4, calculoFondo.getId()); updates = ps.executeUpdate(); - LOGGER.log(Level.FINE, "QUERY {0} | values: [{1},{2},{3},{4}] | updates: {5}", new Object[]{query, calculoFondo.getValor(), calculoFondo.getDescripcion(), calculoFondo.getCaja().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(); diff --git a/src/danielcortes/xyz/models/documentos/DocumentosDAO.java b/src/danielcortes/xyz/models/documentos/DocumentosDAO.java index bcbafb7..fecd2c1 100644 --- a/src/danielcortes/xyz/models/documentos/DocumentosDAO.java +++ b/src/danielcortes/xyz/models/documentos/DocumentosDAO.java @@ -24,7 +24,6 @@ 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; @@ -38,7 +37,7 @@ import java.util.logging.Level; import java.util.logging.Logger; public abstract class DocumentosDAO { - private static final Logger LOGGER = Logger.getLogger(Configuration.class.getName()); + private static final Logger LOGGER = Logger.getLogger(DocumentosDAO.class.getName()); protected ConnectionHolder connectionHolder; diff --git a/src/danielcortes/xyz/models/documentos/SQLiteDocumentosDAO.java b/src/danielcortes/xyz/models/documentos/SQLiteDocumentosDAO.java index d3f1a61..f0908bc 100644 --- a/src/danielcortes/xyz/models/documentos/SQLiteDocumentosDAO.java +++ b/src/danielcortes/xyz/models/documentos/SQLiteDocumentosDAO.java @@ -24,7 +24,6 @@ package danielcortes.xyz.models.documentos; -import danielcortes.xyz.data.Configuration; import danielcortes.xyz.data.SQLiteConnectionHolder; import danielcortes.xyz.models.caja.Caja; @@ -38,7 +37,7 @@ 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()); + private static final Logger LOGGER = Logger.getLogger(SQLiteDocumentosDAO.class.getName()); public SQLiteDocumentosDAO() { this.connectionHolder = new SQLiteConnectionHolder(); @@ -124,7 +123,7 @@ public class SQLiteDocumentosDAO extends DocumentosDAO { 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()}); + LOGGER.log(Level.FINE, "QUERY: {0} | values: [{1}, {2}, {3}, {4}] | updates: {5}", new Object[]{query, documentos.getCheques(), documentos.getTarjetas(), documentos.getRetiros(), documentos.getCaja().getId(), updates}); ps.close(); @@ -155,7 +154,7 @@ public class SQLiteDocumentosDAO extends DocumentosDAO { ps.setInt(1, documentos.getCaja().getId()); updates = ps.executeUpdate(); - LOGGER.log(Level.FINE, "QUERY: {0} | values: {1}", new Object[]{query, documentos.getCaja().getId()}); + LOGGER.log(Level.FINE, "QUERY: {0} | values: {1} | updates: {2}", new Object[]{query, documentos.getCaja().getId(), updates}); ps.close(); @@ -189,7 +188,7 @@ 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()}); + LOGGER.log(Level.FINE, "QUERY: {0} | values: [{1}, {2}, {3}, {4}] | updates: {5}", new Object[]{query, documentos.getCheques(), documentos.getTarjetas(), documentos.getRetiros(), documentos.getCaja().getId(), documentos.getId(), updates}); ps.close(); } catch (SQLException e) { @@ -208,7 +207,7 @@ public class SQLiteDocumentosDAO extends DocumentosDAO { ps.setInt(1, documentos.getId()); updates = ps.executeUpdate(); - LOGGER.log(Level.FINE, "QUERY: {0} | values: {1}", new Object[]{query, documentos.getCaja().getId()}); + LOGGER.log(Level.FINE, "QUERY: {0} | values: {1} | updates: {2}", new Object[]{query, documentos.getCaja().getId(), updates}); ps.close(); } catch (SQLException e) { diff --git a/src/danielcortes/xyz/models/efectivo/EfectivoDAO.java b/src/danielcortes/xyz/models/efectivo/EfectivoDAO.java index 0212925..70bfbfb 100644 --- a/src/danielcortes/xyz/models/efectivo/EfectivoDAO.java +++ b/src/danielcortes/xyz/models/efectivo/EfectivoDAO.java @@ -24,7 +24,6 @@ package danielcortes.xyz.models.efectivo; -import danielcortes.xyz.data.Configuration; import danielcortes.xyz.data.ConnectionHolder; import danielcortes.xyz.models.caja.Caja; import danielcortes.xyz.models.caja.CajaDAO; @@ -38,7 +37,7 @@ import java.util.logging.Level; import java.util.logging.Logger; public abstract class EfectivoDAO { - private static final Logger LOGGER = Logger.getLogger(Configuration.class.getName()); + private static final Logger LOGGER = Logger.getLogger(EfectivoDAO.class.getName()); protected ConnectionHolder connectionHolder; diff --git a/src/danielcortes/xyz/models/efectivo/SQLiteEfectivoDAO.java b/src/danielcortes/xyz/models/efectivo/SQLiteEfectivoDAO.java index 41a345d..323f948 100644 --- a/src/danielcortes/xyz/models/efectivo/SQLiteEfectivoDAO.java +++ b/src/danielcortes/xyz/models/efectivo/SQLiteEfectivoDAO.java @@ -24,7 +24,6 @@ package danielcortes.xyz.models.efectivo; -import danielcortes.xyz.data.Configuration; import danielcortes.xyz.data.SQLiteConnectionHolder; import danielcortes.xyz.models.caja.Caja; @@ -38,7 +37,7 @@ import java.util.logging.Level; import java.util.logging.Logger; public class SQLiteEfectivoDAO extends EfectivoDAO { - private static final Logger LOGGER = Logger.getLogger(Configuration.class.getName()); + private static final Logger LOGGER = Logger.getLogger(SQLiteEfectivoDAO.class.getName()); public SQLiteEfectivoDAO() { this.connectionHolder = new SQLiteConnectionHolder(); diff --git a/src/danielcortes/xyz/models/egreso/EgresoDAO.java b/src/danielcortes/xyz/models/egreso/EgresoDAO.java index 7843efc..a1c2040 100644 --- a/src/danielcortes/xyz/models/egreso/EgresoDAO.java +++ b/src/danielcortes/xyz/models/egreso/EgresoDAO.java @@ -36,8 +36,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 EgresoDAO { + private static final Logger LOGGER = Logger.getLogger(EgresoDAO.class.getName()); + protected ConnectionHolder connectionHolder; public abstract List findAll(); @@ -78,6 +82,8 @@ public abstract class EgresoDAO { egreso.setTipoEgreso(tipoEgreso); egreso.setCaja(caja); + LOGGER.log(Level.FINER, "Se a creado: {0}", egreso); + egresoList.add(egreso); } return egresoList; diff --git a/src/danielcortes/xyz/models/egreso/SQLiteEgresoDAO.java b/src/danielcortes/xyz/models/egreso/SQLiteEgresoDAO.java index 7c321cb..c58a815 100644 --- a/src/danielcortes/xyz/models/egreso/SQLiteEgresoDAO.java +++ b/src/danielcortes/xyz/models/egreso/SQLiteEgresoDAO.java @@ -34,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 SQLiteEgresoDAO extends EgresoDAO { + private static final Logger LOGGER = Logger.getLogger(SQLiteEgresoDAO.class.getName()); + public SQLiteEgresoDAO() { this.connectionHolder = new SQLiteConnectionHolder(); } @@ -44,16 +48,18 @@ public class SQLiteEgresoDAO extends EgresoDAO { public List findAll() { List egresoList = new ArrayList<>(); try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("select * from egresos"); + String query = "select * from egresos"; + PreparedStatement ps = conn.prepareStatement(query); ResultSet rs = ps.executeQuery(); + LOGGER.log(Level.FINE, "QUERY: {0}", query); + egresoList = this.egresosFromResultSet(rs); rs.close(); ps.close(); - conn.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); } return egresoList; } @@ -62,17 +68,19 @@ public class SQLiteEgresoDAO extends EgresoDAO { public List findById(int id) { List egresoList = new ArrayList<>(); try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("select * from egresos where id = ?"); + String query = "select * from egresos 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}); + egresoList = this.egresosFromResultSet(rs); rs.close(); ps.close(); - conn.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); } return egresoList; } @@ -81,17 +89,19 @@ public class SQLiteEgresoDAO extends EgresoDAO { public List findByCaja(Caja caja) { List egresoList = new ArrayList<>(); try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("select * from egresos where caja_id = ?"); + String query = "select * from egresos 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()}); + egresoList = this.egresosFromResultSet(rs); rs.close(); ps.close(); - conn.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); } return egresoList; } @@ -100,17 +110,19 @@ public class SQLiteEgresoDAO extends EgresoDAO { public List findByNro(String nro) { List egresoList = new ArrayList<>(); try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("select * from egresos where nro = ?"); + String query = "select * from egresos where nro = ?"; + PreparedStatement ps = conn.prepareStatement(query); ps.setString(1, nro); ResultSet rs = ps.executeQuery(); + LOGGER.log(Level.FINE, "QUERY: {0} | values {1}", new Object[]{query, nro}); + egresoList = this.egresosFromResultSet(rs); rs.close(); ps.close(); - conn.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); } return egresoList; } @@ -119,17 +131,19 @@ public class SQLiteEgresoDAO extends EgresoDAO { public List findByTipoEgreso(TipoEgreso tipoEgreso) { List egresoList = new ArrayList<>(); try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("select * from egresos where tipo_egreso_id = ?"); + String query = "select * from egresos where tipo_egreso_id = ?"; + PreparedStatement ps = conn.prepareStatement(query); ps.setInt(1, tipoEgreso.getId()); ResultSet rs = ps.executeQuery(); + LOGGER.log(Level.FINE, "QUERY: {0} | values: {1}", new Object[]{query, tipoEgreso.getId()}); + egresoList = this.egresosFromResultSet(rs); rs.close(); ps.close(); - conn.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); } return egresoList; } @@ -138,14 +152,17 @@ public class SQLiteEgresoDAO extends EgresoDAO { public boolean insertEgreso(Egreso egreso) { int updates; try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("insert into egresos (nro, descripcion, valor, tipo_egreso_id, caja_id) values (?,?,?,?,?)"); + String query = "insert into egresos (nro, descripcion, valor, tipo_egreso_id, caja_id) values (?,?,?,?,?)"; + PreparedStatement ps = conn.prepareStatement(query); ps.setString(1, egreso.getNro()); ps.setString(2, egreso.getDescripcion()); ps.setInt(3, egreso.getValor()); ps.setInt(4, egreso.getTipoEgreso().getId()); ps.setInt(5, egreso.getCaja().getId()); - updates = ps.executeUpdate(); + + LOGGER.log(Level.FINE, "QUERY: {0} | values: [{1}, {2}, {3}, {4}, {5}] | updates: {6}", new Object[]{query, egreso.getNro(), egreso.getDescripcion(), egreso.getValor(), egreso.getTipoEgreso().getId(), egreso.getCaja().getId(), updates}); + ps.close(); ps = conn.prepareStatement("select last_insert_rowid()"); @@ -154,9 +171,8 @@ public class SQLiteEgresoDAO extends EgresoDAO { egreso.setId(rs.getInt(1)); rs.close(); - conn.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); return false; } return updates > 0; @@ -166,20 +182,22 @@ public class SQLiteEgresoDAO extends EgresoDAO { public boolean updateEgreso(Egreso egreso) { int updates; try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("update egresos set nro = ?, descripcion = ?, valor = ?, tipo_egreso_id = ?, caja_id = ? where id = ? "); + String query = "update egresos set nro = ?, descripcion = ?, valor = ?, tipo_egreso_id = ?, caja_id = ? where id = ? "; + PreparedStatement ps = conn.prepareStatement(query); ps.setString(1, egreso.getNro()); ps.setString(2, egreso.getDescripcion()); ps.setInt(3, egreso.getValor()); ps.setInt(4, egreso.getTipoEgreso().getId()); ps.setInt(5, egreso.getCaja().getId()); ps.setInt(6, egreso.getId()); - updates = ps.executeUpdate(); + LOGGER.log(Level.FINE, "QUERY: {0} | values: [{1}, {2}, {3}, {4}, {5}, {6}] | updates: {7}", new Object[]{query, egreso.getNro(), egreso.getDescripcion(), egreso.getValor(), egreso.getTipoEgreso().getId(), egreso.getCaja().getId(), egreso.getId(), updates}); + + ps.close(); - conn.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); return false; } return updates > 0; @@ -189,15 +207,16 @@ public class SQLiteEgresoDAO extends EgresoDAO { public boolean deleteEgreso(Egreso egreso) { int updates; try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("delete from egresos where id = ? "); + String query = "delete from egresos where id = ? "; + PreparedStatement ps = conn.prepareStatement(query); ps.setInt(1, egreso.getId()); - updates = ps.executeUpdate(); + LOGGER.log(Level.FINE, "QUERY: {0} | values: {1} | updates: {2}", new Object[]{query, egreso.getId(), updates}); + ps.close(); - conn.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); return false; } return updates > 0; @@ -207,18 +226,20 @@ public class SQLiteEgresoDAO extends EgresoDAO { public int getTotalEgreso(Caja caja) { int total = 0; try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("select sum(valor) from egresos where caja_id = ?"); + String query = "select sum(valor) from egresos 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(); - conn.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); } return total; } diff --git a/src/danielcortes/xyz/models/informes/egresos/SQLiteInformeEgresosContentDAO.java b/src/danielcortes/xyz/models/informes/egresos/SQLiteInformeEgresosContentDAO.java index b252141..941be5f 100644 --- a/src/danielcortes/xyz/models/informes/egresos/SQLiteInformeEgresosContentDAO.java +++ b/src/danielcortes/xyz/models/informes/egresos/SQLiteInformeEgresosContentDAO.java @@ -33,8 +33,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 class SQLiteInformeEgresosContentDAO extends InformeEgresosContentDAO { + private static final Logger LOGGER = Logger.getLogger(InformeEgresosContentDAO.class.getName()); + private List list; public SQLiteInformeEgresosContentDAO() { @@ -46,22 +50,25 @@ public class SQLiteInformeEgresosContentDAO extends InformeEgresosContentDAO { list = new ArrayList<>(); try (Connection conn = connectionHolder.getConnection()) { - String query = "select caja.fecha as \"fecha\",\n" + - "egresos.nro as \"nro\",\n" + - "egresos.descripcion as \"descripcion\",\n" + - "egresos.valor as \"valor\"\n" + - "from egresos inner join caja on egresos.caja_id = caja.id\n" + - "where caja.fecha between date(?) and date(?) and egresos.tipo_egreso_id = ? \n" + - "order by caja.fecha\n"; + String query = "select caja.fecha as \"fecha\"," + + "egresos.nro as \"nro\"," + + "egresos.descripcion as \"descripcion\"," + + "egresos.valor as \"valor\"" + + "from egresos inner join caja on egresos.caja_id = caja.id " + + "where caja.fecha between date(?) and date(?) and egresos.tipo_egreso_id = ? " + + "order by caja.fecha;"; PreparedStatement ps = conn.prepareStatement(query); ps.setString(1, date.withDayOfMonth(1).toString()); ps.setString(2, date.withDayOfMonth(date.lengthOfMonth()).toString()); ps.setInt(3, tipoEgresoId); ResultSet rs = ps.executeQuery(); + + LOGGER.log(Level.FINE, "QUERY: {0} | values: [{1},{2},{3}]", new Object[]{date.withDayOfMonth(1), date.withDayOfMonth(date.lengthOfMonth()), tipoEgresoId}); + this.fillInforme(rs); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); } return list; } @@ -73,6 +80,7 @@ public class SQLiteInformeEgresosContentDAO extends InformeEgresosContentDAO { content.setDescripcion(rs.getString("descripcion")); content.setNro(rs.getString("nro")); content.setValor(rs.getInt("valor")); + LOGGER.log(Level.FINER, "Se a creado: {0}", content); list.add(content); } } diff --git a/src/danielcortes/xyz/models/informes/libro_de_ventas/SQLiteInformeLibroDeVentasContentDAO.java b/src/danielcortes/xyz/models/informes/libro_de_ventas/SQLiteInformeLibroDeVentasContentDAO.java index 5620419..86d40fe 100644 --- a/src/danielcortes/xyz/models/informes/libro_de_ventas/SQLiteInformeLibroDeVentasContentDAO.java +++ b/src/danielcortes/xyz/models/informes/libro_de_ventas/SQLiteInformeLibroDeVentasContentDAO.java @@ -59,8 +59,12 @@ import java.time.LocalDate; import java.util.Collection; import java.util.Comparator; import java.util.HashMap; +import java.util.logging.Level; +import java.util.logging.Logger; public class SQLiteInformeLibroDeVentasContentDAO extends InformeLibroDeVentasContentDAO { + private static final Logger LOGGER = Logger.getLogger(SQLiteInformeLibroDeVentasContentDAO.class.getName()); + private HashMap map; public SQLiteInformeLibroDeVentasContentDAO() { @@ -73,47 +77,52 @@ public class SQLiteInformeLibroDeVentasContentDAO extends InformeLibroDeVentasCo try (Connection conn = connectionHolder.getConnection()) { String queryTotales = "select " + - "caja.id as \"caja\",\n" + - "strftime(\"%w\", caja.fecha) as \"dia\",\n" + - "caja.fecha as \"fecha\",\n" + - "sum(case when ingresos.tipo_ingreso_id = 2 then ingresos.valor else 0 end) as \"manuales\",\n" + - "sum(case when ingresos.tipo_ingreso_id = 1 then ingresos.valor else 0 end) as \"fiscales\",\n" + - "sum(case when ingresos.tipo_ingreso_id = 5 then ingresos.valor else 0 end) as \"exentas\",\n" + - "sum(case when ingresos.tipo_ingreso_id in (2, 1, 5) then ingresos.valor else 0 end) as \"sub_total\",\n" + - "sum(case when ingresos.tipo_ingreso_id = 3 then ingresos.valor else 0 end) as \"facturas\",\n" + - "sum(case when ingresos.tipo_ingreso_id = 4 then ingresos.valor else 0 end) as \"guias\",\n" + - "sum(case when ingresos.valor not null then ingresos.valor else 0 end) as \"total\"\n" + - "from caja left join ingresos on (caja.id = ingresos.caja_id)\n" + - "where caja.fecha between date(?) and date(?)\n" + - "group by caja.fecha\n"; - String queryNumeros = - "select\n" + - "caja.id as \"caja\",\n" + - "caja.fecha as \"fecha\",\n" + - "ingresos.nro_inicial as \"inicial\",\n" + - "ingresos.nro_final as \"final\",\n" + - "ingresos.nro_z_inicial as \"z_inicial\",\n" + - "ingresos.nro_z_final as \"z_final\",\n" + - "ingresos.tipo_ingreso_id as \"tipo_ingreso\"\n" + - "from caja join ingresos on (caja.id = ingresos.caja_id)\n" + - "where caja.fecha between date(?) and date(?)\n"; - + "caja.id as \"caja\"," + + "strftime(\"%w\", caja.fecha) as \"dia\"," + + "caja.fecha as \"fecha\"," + + "sum(case when ingresos.tipo_ingreso_id = 2 then ingresos.valor else 0 end) as \"manuales\"," + + "sum(case when ingresos.tipo_ingreso_id = 1 then ingresos.valor else 0 end) as \"fiscales\"," + + "sum(case when ingresos.tipo_ingreso_id = 5 then ingresos.valor else 0 end) as \"exentas\"," + + "sum(case when ingresos.tipo_ingreso_id in (2, 1, 5) then ingresos.valor else 0 end) as \"sub_total\"," + + "sum(case when ingresos.tipo_ingreso_id = 3 then ingresos.valor else 0 end) as \"facturas\"," + + "sum(case when ingresos.tipo_ingreso_id = 4 then ingresos.valor else 0 end) as \"guias\"," + + "sum(case when ingresos.valor not null then ingresos.valor else 0 end) as \"total\" " + + "from caja left join ingresos on (caja.id = ingresos.caja_id) " + + "where caja.fecha between date(?) and date(?) " + + "group by caja.fecha;"; PreparedStatement ps = conn.prepareStatement(queryTotales); ps.setString(1, date.withDayOfMonth(1).toString()); ps.setString(2, date.withDayOfMonth(date.lengthOfMonth()).toString()); ResultSet rs = ps.executeQuery(); + + LOGGER.log(Level.FINE, "QUERY: {0} | values: [{1},{2}]", new Object[]{queryTotales, date.withDayOfMonth(1), date.withDayOfMonth(date.lengthOfMonth())}); + this.fillTotalesFromResultSet(rs); + String queryNumeros = + "select\n" + + "caja.id as \"caja\"," + + "caja.fecha as \"fecha\"," + + "ingresos.nro_inicial as \"inicial\"," + + "ingresos.nro_final as \"final\"," + + "ingresos.nro_z_inicial as \"z_inicial\"," + + "ingresos.nro_z_final as \"z_final\"," + + "ingresos.tipo_ingreso_id as \"tipo_ingreso\" " + + "from caja join ingresos on (caja.id = ingresos.caja_id) " + + "where caja.fecha between date(?) and date(?);"; ps = conn.prepareStatement(queryNumeros); ps.setString(1, date.withDayOfMonth(1).toString()); ps.setString(2, date.withDayOfMonth(date.lengthOfMonth()).toString()); rs = ps.executeQuery(); + + LOGGER.log(Level.FINE, "QUERY: {0} | values: [{1},{2}]", new Object[]{queryNumeros, date.withDayOfMonth(1), date.withDayOfMonth(date.lengthOfMonth())}); + this.fillBoletasFromResultSet(rs); rs.close(); ps.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); } return map.values(); @@ -131,6 +140,7 @@ public class SQLiteInformeLibroDeVentasContentDAO extends InformeLibroDeVentasCo informe.setFacturas(rs.getInt("facturas")); informe.setGuias(rs.getInt("guias")); informe.setTotal(rs.getInt("total")); + LOGGER.log(Level.FINER, "Se a creado una linea del informe con los totales {0}", informe); map.put(rs.getInt("caja"), informe); } } @@ -260,6 +270,7 @@ public class SQLiteInformeLibroDeVentasContentDAO extends InformeLibroDeVentasCo } break; } + LOGGER.log(Level.FINER, "Se termino de llenar la linea del informe resultando en: {0}", informe); } } } diff --git a/src/danielcortes/xyz/models/ingreso/IngresoDAO.java b/src/danielcortes/xyz/models/ingreso/IngresoDAO.java index 939652f..9766955 100644 --- a/src/danielcortes/xyz/models/ingreso/IngresoDAO.java +++ b/src/danielcortes/xyz/models/ingreso/IngresoDAO.java @@ -37,8 +37,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 IngresoDAO { + private static final Logger LOGGER = Logger.getLogger(IngresoDAO.class.getName()); + protected ConnectionHolder connectionHolder; public abstract List findAll(); @@ -79,6 +83,8 @@ public abstract class IngresoDAO { ingreso.setTipoIngreso(tipoIngreso); ingreso.setCaja(caja); + LOGGER.log(Level.FINER, "Se a creado: {0}", ingreso); + ingresosList.add(ingreso); } return ingresosList; diff --git a/src/danielcortes/xyz/models/ingreso/SQLiteIngresoDAO.java b/src/danielcortes/xyz/models/ingreso/SQLiteIngresoDAO.java index 01ec2bb..47c55ce 100644 --- a/src/danielcortes/xyz/models/ingreso/SQLiteIngresoDAO.java +++ b/src/danielcortes/xyz/models/ingreso/SQLiteIngresoDAO.java @@ -34,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 SQLiteIngresoDAO extends IngresoDAO { + private static final Logger LOGGER = Logger.getLogger(SQLiteIngresoDAO.class.getName()); + public SQLiteIngresoDAO() { this.connectionHolder = new SQLiteConnectionHolder(); } @@ -44,16 +48,18 @@ public class SQLiteIngresoDAO extends IngresoDAO { public List findAll() { List ingresosList = new ArrayList<>(); try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("select * from ingresos"); + String query = "select * from ingresos"; + PreparedStatement ps = conn.prepareStatement(query); ResultSet rs = ps.executeQuery(); + LOGGER.log(Level.FINE, "QUERY: {0}", query); + ingresosList = this.ingresosFromResultSet(rs); rs.close(); ps.close(); - conn.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); } return ingresosList; } @@ -62,15 +68,17 @@ public class SQLiteIngresoDAO extends IngresoDAO { public List findByCaja(Caja caja) { List ingresosList = new ArrayList<>(); try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("select * from ingresos where caja_id = ?"); + String query = "select * from ingresos 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()}); + ingresosList = this.ingresosFromResultSet(rs); rs.close(); ps.close(); - conn.close(); } catch (SQLException e) { e.printStackTrace(); } @@ -81,17 +89,19 @@ public class SQLiteIngresoDAO extends IngresoDAO { public List findById(int id) { List ingresosList = new ArrayList<>(); try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("select * from ingresos where id = ?"); + String query = "select * from ingresos 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}); + ingresosList = this.ingresosFromResultSet(rs); rs.close(); ps.close(); - conn.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); } return ingresosList; } @@ -100,17 +110,20 @@ public class SQLiteIngresoDAO extends IngresoDAO { public List findByTipoIngreso(TipoIngreso tipoIngreso) { List ingresosList = new ArrayList<>(); try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("select ingresos.* from ingresos inner join tipos_ingreso on (ingresos.tipo_ingreso_id = tipos_ingreso.id) where ingresos.tipo_ingreso_id = ?"); + String query = "select ingresos.* from ingresos inner join tipos_ingreso on (ingresos.tipo_ingreso_id = tipos_ingreso.id) where ingresos.tipo_ingreso_id = ?"; + PreparedStatement ps = conn.prepareStatement(query); ps.setInt(1, tipoIngreso.getId()); ResultSet rs = ps.executeQuery(); + LOGGER.log(Level.FINE, "QUERY: {0} | values: {1}", new Object[]{query, tipoIngreso.getId()}); + + ingresosList = this.ingresosFromResultSet(rs); rs.close(); ps.close(); - conn.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); } return ingresosList; } @@ -119,7 +132,8 @@ public class SQLiteIngresoDAO extends IngresoDAO { public boolean insertIngreso(Ingreso ingreso) { int updates; try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("insert into ingresos (valor, nro_z_inicial, nro_z_final, nro_inicial, nro_final, tipo_ingreso_id, caja_id) values (?,?,?,?,?,?,?)"); + String query = "insert into ingresos (valor, nro_z_inicial, nro_z_final, nro_inicial, nro_final, tipo_ingreso_id, caja_id) values (?,?,?,?,?,?,?)"; + PreparedStatement ps = conn.prepareStatement(query); ps.setInt(1, ingreso.getValor()); ps.setString(2, ingreso.getNroZInicial()); ps.setString(3, ingreso.getNroZFinal()); @@ -127,8 +141,10 @@ public class SQLiteIngresoDAO extends IngresoDAO { ps.setString(5, ingreso.getNroFinal()); ps.setInt(6, ingreso.getTipoIngreso().getId()); ps.setInt(7, ingreso.getCaja().getId()); - updates = ps.executeUpdate(); + + LOGGER.log(Level.FINE, "QUERY: {0} | values: [{1},{2},{3},{4},{5},{6},{7}] | updates: {8}", new Object[]{query, ingreso.getValor(), ingreso.getNroZInicial(), ingreso.getNroZFinal(), ingreso.getNroInicial(), ingreso.getNroFinal(), ingreso.getTipoIngreso().getId(), ingreso.getCaja().getId(), updates}); + ps.close(); ps = conn.prepareStatement("select last_insert_rowid()"); @@ -137,9 +153,8 @@ public class SQLiteIngresoDAO extends IngresoDAO { ingreso.setId(rs.getInt(1)); rs.close(); - conn.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); return false; } return updates > 0; @@ -149,7 +164,8 @@ public class SQLiteIngresoDAO extends IngresoDAO { public boolean updateIngreso(Ingreso ingreso) { int updates; try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("update ingresos set valor = ?, nro_z_inicial = ?, nro_z_final = ?, nro_inicial = ?, nro_final = ?, tipo_ingreso_id = ?, caja_id = ? where id = ?"); + String query = "update ingresos set valor = ?, nro_z_inicial = ?, nro_z_final = ?, nro_inicial = ?, nro_final = ?, tipo_ingreso_id = ?, caja_id = ? where id = ?"; + PreparedStatement ps = conn.prepareStatement(query); ps.setInt(1, ingreso.getValor()); ps.setString(2, ingreso.getNroZInicial()); ps.setString(3, ingreso.getNroZFinal()); @@ -158,13 +174,14 @@ public class SQLiteIngresoDAO extends IngresoDAO { ps.setInt(6, ingreso.getTipoIngreso().getId()); ps.setInt(7, ingreso.getCaja().getId()); ps.setInt(8, ingreso.getId()); - updates = ps.executeUpdate(); + LOGGER.log(Level.FINE, "QUERY: {0} | values: [{1},{2},{3},{4},{5},{6},{7},{8}] | updates: {9}", new Object[]{query, ingreso.getValor(), ingreso.getNroZInicial(), ingreso.getNroZFinal(), ingreso.getNroInicial(), ingreso.getNroFinal(), ingreso.getTipoIngreso().getId(), ingreso.getCaja().getId(), ingreso.getId(), updates}); + + ps.close(); - conn.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); return false; } return updates > 0; @@ -174,13 +191,16 @@ public class SQLiteIngresoDAO extends IngresoDAO { public boolean deleteIngreso(Ingreso ingreso) { int updates; try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("delete from ingresos where id = ?"); + String query = "delete from ingresos where id = ?"; + PreparedStatement ps = conn.prepareStatement(query); ps.setInt(1, ingreso.getId()); updates = ps.executeUpdate(); + + LOGGER.log(Level.FINE, "QUERY: {0} | values: {1} | updates: {2}", new Object[]{query, ingreso.getId(), updates}); + ps.close(); - conn.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); return false; } return updates > 0; @@ -190,18 +210,20 @@ public class SQLiteIngresoDAO extends IngresoDAO { public int getTotalIngreso(Caja caja) { int total = 0; try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("select sum(valor) from ingresos where caja_id = ?"); + String query = "select sum(valor) from ingresos 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(); - conn.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); } return total; } diff --git a/src/danielcortes/xyz/models/tipo_egreso/SQLiteTipoEgresoDAO.java b/src/danielcortes/xyz/models/tipo_egreso/SQLiteTipoEgresoDAO.java index 091ad2f..a119d37 100644 --- a/src/danielcortes/xyz/models/tipo_egreso/SQLiteTipoEgresoDAO.java +++ b/src/danielcortes/xyz/models/tipo_egreso/SQLiteTipoEgresoDAO.java @@ -32,8 +32,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 SQLiteTipoEgresoDAO extends TipoEgresoDAO { + private static final Logger LOGGER = Logger.getLogger(SQLiteTipoEgresoDAO.class.getName()); + public SQLiteTipoEgresoDAO() { this.connectionHolder = new SQLiteConnectionHolder(); } @@ -42,16 +46,18 @@ public class SQLiteTipoEgresoDAO extends TipoEgresoDAO { public List findAll() { List tipoEgresoList = new ArrayList<>(); try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("select * from tipos_egreso"); + String query = "select * from tipos_egreso"; + PreparedStatement ps = conn.prepareStatement(query); ResultSet rs = ps.executeQuery(); + LOGGER.log(Level.FINE, "QUERY: {0}", query); + tipoEgresoList = this.tipoEgresoFromResultSet(rs); rs.close(); ps.close(); - conn.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); } return tipoEgresoList; } @@ -60,17 +66,19 @@ public class SQLiteTipoEgresoDAO extends TipoEgresoDAO { public List findById(int id) { List tipoEgresoList = new ArrayList<>(); try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("select * from tipos_egreso where id = ?"); + String query = "select * from tipos_egreso 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}); + tipoEgresoList = this.tipoEgresoFromResultSet(rs); rs.close(); ps.close(); - conn.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); } return tipoEgresoList; } @@ -79,34 +87,20 @@ public class SQLiteTipoEgresoDAO extends TipoEgresoDAO { public List findByNombre(String nombre) { List tipoEgresoList = new ArrayList<>(); try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("select * from tipos_egreso where nombre = ?"); + String query = "select * from tipos_egreso where nombre = ?"; + PreparedStatement ps = conn.prepareStatement(query); ps.setString(1, nombre); ResultSet rs = ps.executeQuery(); + LOGGER.log(Level.FINE, "QUERY: {0} | values: {1}", new Object[]{query, nombre}); + tipoEgresoList = this.tipoEgresoFromResultSet(rs); rs.close(); ps.close(); - conn.close(); } catch (SQLException e) { - e.printStackTrace(); + LOGGER.log(Level.SEVERE, e.toString(), e); } return tipoEgresoList; } - - @Override - public boolean insertTipoEgreso(TipoEgreso tipoEgreso) { - return false; - } - - @Override - public boolean updateTipoEgreso(TipoEgreso tipoEgreso) { - return false; - } - - @Override - public boolean deleteTipoEgreso(TipoEgreso tipoEgreso) { - return false; - } - } diff --git a/src/danielcortes/xyz/models/tipo_egreso/TipoEgresoDAO.java b/src/danielcortes/xyz/models/tipo_egreso/TipoEgresoDAO.java index db2bc7c..8ad4de5 100644 --- a/src/danielcortes/xyz/models/tipo_egreso/TipoEgresoDAO.java +++ b/src/danielcortes/xyz/models/tipo_egreso/TipoEgresoDAO.java @@ -54,8 +54,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 TipoEgresoDAO { + private static final Logger LOGGER = Logger.getLogger(TipoEgresoDAO.class.getName()); + protected ConnectionHolder connectionHolder; public abstract List findAll(); @@ -64,18 +68,15 @@ public abstract class TipoEgresoDAO { public abstract List findByNombre(String nombre); - public abstract boolean insertTipoEgreso(TipoEgreso tipoEgreso); - - public abstract boolean updateTipoEgreso(TipoEgreso tipoEgreso); - - public abstract boolean deleteTipoEgreso(TipoEgreso tipoEgreso); - List tipoEgresoFromResultSet(ResultSet rs) throws SQLException { ArrayList tipoEgresoList = new ArrayList<>(); while (rs.next()) { TipoEgreso tipoEgreso = new TipoEgreso(); tipoEgreso.setId(rs.getInt("id")); tipoEgreso.setNombre(rs.getString("nombre")); + + LOGGER.log(Level.FINER, "Se a creado {0}", tipoEgreso); + tipoEgresoList.add(tipoEgreso); } return tipoEgresoList; diff --git a/src/danielcortes/xyz/models/tipo_ingreso/SQLiteTipoIngresoDAO.java b/src/danielcortes/xyz/models/tipo_ingreso/SQLiteTipoIngresoDAO.java index 261a3af..6bde6e5 100644 --- a/src/danielcortes/xyz/models/tipo_ingreso/SQLiteTipoIngresoDAO.java +++ b/src/danielcortes/xyz/models/tipo_ingreso/SQLiteTipoIngresoDAO.java @@ -32,8 +32,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 SQLiteTipoIngresoDAO extends TipoIngresoDAO { + private static final Logger LOGGER = Logger.getLogger(SQLiteTipoIngresoDAO.class.getName()); + public SQLiteTipoIngresoDAO() { this.connectionHolder = new SQLiteConnectionHolder(); } @@ -42,14 +46,16 @@ public class SQLiteTipoIngresoDAO extends TipoIngresoDAO { public List findAll() { List tiposIngresoList = new ArrayList<>(); try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("select * from tipos_ingreso"); + String query = "select * from tipos_ingreso"; + PreparedStatement ps = conn.prepareStatement(query); ResultSet rs = ps.executeQuery(); + LOGGER.log(Level.FINE, "QUERY: {0}", query); + tiposIngresoList = this.tiposIngresoFromResultSet(rs); rs.close(); ps.close(); - conn.close(); } catch (SQLException e) { e.printStackTrace(); } @@ -60,15 +66,17 @@ public class SQLiteTipoIngresoDAO extends TipoIngresoDAO { public List findById(int id) { List tiposIngresoList = new ArrayList<>(); try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("select * from tipos_ingreso where id = ?"); + String query = "select * from tipos_ingreso 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}); + tiposIngresoList = this.tiposIngresoFromResultSet(rs); rs.close(); ps.close(); - conn.close(); } catch (SQLException e) { e.printStackTrace(); } @@ -79,10 +87,13 @@ public class SQLiteTipoIngresoDAO extends TipoIngresoDAO { public List findByNombre(String nombre) { List tiposIngresoList = new ArrayList<>(); try (Connection conn = connectionHolder.getConnection()) { - PreparedStatement ps = conn.prepareStatement("select * from tipos_ingreso where nombre = ?"); + String query = "select * from tipos_ingreso where nombre = ?"; + PreparedStatement ps = conn.prepareStatement(query); ps.setString(1, nombre); ResultSet rs = ps.executeQuery(); + LOGGER.log(Level.FINE, "QUERY: {0} | values: {1}", new Object[]{query, nombre}); + tiposIngresoList = this.tiposIngresoFromResultSet(rs); rs.close(); @@ -93,19 +104,4 @@ public class SQLiteTipoIngresoDAO extends TipoIngresoDAO { return tiposIngresoList; } - @Override - public boolean insertTipoIngreso(TipoIngreso tipoEgreso) { - return false; - } - - @Override - public boolean updateTipoIngreso(TipoIngreso tipoEgreso) { - return false; - } - - @Override - public boolean deleteTipoIngreso(TipoIngreso tipoEgreso) { - return false; - } - } diff --git a/src/danielcortes/xyz/models/tipo_ingreso/TipoIngresoDAO.java b/src/danielcortes/xyz/models/tipo_ingreso/TipoIngresoDAO.java index 89a907a..7978226 100644 --- a/src/danielcortes/xyz/models/tipo_ingreso/TipoIngresoDAO.java +++ b/src/danielcortes/xyz/models/tipo_ingreso/TipoIngresoDAO.java @@ -30,8 +30,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 TipoIngresoDAO { + private static final Logger LOGGER = Logger.getLogger(SQLiteTipoIngresoDAO.class.getName()); + protected ConnectionHolder connectionHolder; public abstract List findAll(); @@ -40,18 +44,15 @@ public abstract class TipoIngresoDAO { public abstract List findByNombre(String nombre); - public abstract boolean insertTipoIngreso(TipoIngreso tipoEgreso); - - public abstract boolean updateTipoIngreso(TipoIngreso tipoEgreso); - - public abstract boolean deleteTipoIngreso(TipoIngreso tipoEgreso); - List tiposIngresoFromResultSet(ResultSet rs) throws SQLException { ArrayList tiposIngresoList = new ArrayList<>(); while (rs.next()) { TipoIngreso tipoIngreso = new TipoIngreso(); tipoIngreso.setId(rs.getInt("id")); tipoIngreso.setNombre(rs.getString("nombre")); + + LOGGER.log(Level.FINE, "Se a creado: {0]", tipoIngreso); + tiposIngresoList.add(tipoIngreso); } return tiposIngresoList;