Skip to content

Commit 7fbe982

Browse files
KennySthKennySth
authored
Merge pull request #51 from iJosueeh/fix/ZonaHoraria
fix: Zona horaria en registros
2 parents 1507084 + b54183d commit 7fbe982

8 files changed

Lines changed: 47 additions & 11 deletions

File tree

‎docker-compose.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ services:
1212
- DB_NAME=${DB_NAME}
1313
- DB_USER=${DB_USER}
1414
- DB_PASSWORD=${DB_PASSWORD}
15+
- TZ=America/Lima
1516
command: >
1617
/bin/bash -c "
1718
/opt/mssql/bin/sqlservr &

‎src/main/java/com/utp/meditrackapp/core/util/DateTimeProvider.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.utp.meditrackapp.core.util;
2+
3+
import java.time.LocalDateTime;
4+
import java.time.ZoneId;
5+
6+
public final class DateTimeProvider {
7+
8+
private static final ZoneId LIMA_ZONE = ZoneId.of("America/Lima");
9+
10+
private DateTimeProvider() {}
11+
12+
public static LocalDateTime now() {
13+
return LocalDateTime.now(LIMA_ZONE);
14+
}
15+
}

‎src/main/java/com/utp/meditrackapp/domain/entities/Sede.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.utp.meditrackapp.domain.entities;
22

3+
import com.utp.meditrackapp.core.util.DateTimeProvider;
4+
35
import java.time.LocalDateTime;
46

57
/**
@@ -65,7 +67,7 @@ public void toggleEstado() {
6567
public void bloquear(String motivo) {
6668
this.isBloqueada = 1;
6769
this.motivoBloqueo = motivo;
68-
this.fechaBloqueo = LocalDateTime.now();
70+
this.fechaBloqueo = DateTimeProvider.now();
6971
}
7072

7173
/**

‎src/main/java/com/utp/meditrackapp/infrastructure/persistence/jdbc/JdbcAtencionRepository.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.utp.meditrackapp.core.config.DatabaseConfig;
44
import com.utp.meditrackapp.core.models.enums.EntidadPrefix;
5+
import com.utp.meditrackapp.core.util.DateTimeProvider;
56
import com.utp.meditrackapp.core.util.IdGenerator;
67
import com.utp.meditrackapp.core.validation.SedeAccessValidator;
78
import com.utp.meditrackapp.domain.entities.Atencion;
@@ -31,14 +32,15 @@ public Atencion save(Connection conn, Atencion atencion) {
3132
atencion.setId(IdGenerator.generateSedeDependentId(conn, "atenciones", EntidadPrefix.ATENCION, atencion.getSedeId(), 6));
3233
}
3334

34-
String sql = "INSERT INTO atenciones (id, sede_id, paciente_id, usuario_id, numero_receta, medico, fecha_atencion) VALUES (?, ?, ?, ?, ?, ?, GETDATE())";
35+
String sql = "INSERT INTO atenciones (id, sede_id, paciente_id, usuario_id, numero_receta, medico, fecha_atencion) VALUES (?, ?, ?, ?, ?, ?, ?)";
3536
try (PreparedStatement ps = conn.prepareStatement(sql)) {
3637
ps.setString(1, atencion.getId());
3738
ps.setString(2, atencion.getSedeId());
3839
ps.setString(3, atencion.getPacienteId());
3940
ps.setString(4, atencion.getUsuarioId());
4041
ps.setString(5, atencion.getNumeroReceta());
4142
ps.setString(6, atencion.getMedico());
43+
ps.setTimestamp(7, Timestamp.valueOf(DateTimeProvider.now()));
4244
ps.executeUpdate();
4345
}
4446
} catch (SQLException e) {

‎src/main/java/com/utp/meditrackapp/infrastructure/persistence/jdbc/JdbcDashboardRepository.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.utp.meditrackapp.infrastructure.persistence.jdbc;
22

33
import com.utp.meditrackapp.core.config.DatabaseConfig;
4+
import com.utp.meditrackapp.core.util.DateTimeProvider;
45
import com.utp.meditrackapp.core.validation.SedeAccessValidator;
56
import com.utp.meditrackapp.domain.ports.out.DashboardRepository;
67

@@ -56,7 +57,7 @@ public int getLotesPorVencerCount(int dias) {
5657
String sedeId = SedeAccessValidator.getSedeParaConsulta();
5758

5859
StringBuilder sql = new StringBuilder(
59-
"SELECT COUNT(*) as total FROM lotes WHERE fecha_vencimiento <= DATEADD(day, ?, GETDATE()) AND fecha_vencimiento >= GETDATE()"
60+
"SELECT COUNT(*) as total FROM lotes WHERE fecha_vencimiento <= DATEADD(day, ?, ?) AND fecha_vencimiento >= ?"
6061
);
6162

6263
if (sedeId != null) {
@@ -65,8 +66,11 @@ public int getLotesPorVencerCount(int dias) {
6566

6667
try (Connection conn = dbConfig.getConnection();
6768
PreparedStatement ps = conn.prepareStatement(sql.toString())) {
69+
java.sql.Timestamp now = Timestamp.valueOf(DateTimeProvider.now());
6870
int i = 1;
6971
ps.setInt(i++, dias);
72+
ps.setTimestamp(i++, now);
73+
ps.setTimestamp(i++, now);
7074
if (sedeId != null) {
7175
ps.setString(i++, sedeId);
7276
}
@@ -140,7 +144,7 @@ public int getVolumenMovimientos(int dias) {
140144
String sedeId = SedeAccessValidator.getSedeParaConsulta();
141145

142146
StringBuilder sql = new StringBuilder(
143-
"SELECT COUNT(*) as total FROM movimientos WHERE fecha_registro >= DATEADD(day, -?, GETDATE())"
147+
"SELECT COUNT(*) as total FROM movimientos WHERE fecha_registro >= DATEADD(day, -?, ?)"
144148
);
145149

146150
if (sedeId != null) {
@@ -151,6 +155,7 @@ public int getVolumenMovimientos(int dias) {
151155
PreparedStatement ps = conn.prepareStatement(sql.toString())) {
152156
int i = 1;
153157
ps.setInt(i++, dias);
158+
ps.setTimestamp(i++, Timestamp.valueOf(DateTimeProvider.now()));
154159
if (sedeId != null) {
155160
ps.setString(i++, sedeId);
156161
}
@@ -173,7 +178,7 @@ public List<Map<String, Object>> getTendenciaInventario(int meses) {
173178
" SUM(CASE WHEN m.tipo_id = 'MOV-T-01' THEN m.cantidad ELSE 0 END) - " +
174179
" SUM(CASE WHEN m.tipo_id = 'MOV-T-02' THEN m.cantidad ELSE 0 END) as total " +
175180
"FROM movimientos m " +
176-
"WHERE m.fecha_registro >= DATEADD(month, -?, GETDATE()) "
181+
"WHERE m.fecha_registro >= DATEADD(month, -?, ?) "
177182
);
178183

179184
if (sedeId != null) {
@@ -186,6 +191,7 @@ public List<Map<String, Object>> getTendenciaInventario(int meses) {
186191
PreparedStatement ps = conn.prepareStatement(sql.toString())) {
187192
int i = 1;
188193
ps.setInt(i++, meses);
194+
ps.setTimestamp(i++, Timestamp.valueOf(DateTimeProvider.now()));
189195
if (sedeId != null) {
190196
ps.setString(i++, sedeId);
191197
}

‎src/main/java/com/utp/meditrackapp/infrastructure/persistence/jdbc/JdbcMovimientoRepository.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.utp.meditrackapp.core.config.DatabaseConfig;
44
import com.utp.meditrackapp.core.models.enums.EntidadPrefix;
5+
import com.utp.meditrackapp.core.util.DateTimeProvider;
56
import com.utp.meditrackapp.core.util.IdGenerator;
67
import com.utp.meditrackapp.core.validation.SedeAccessValidator;
78
import com.utp.meditrackapp.domain.entities.Movimiento;
@@ -31,7 +32,7 @@ public Movimiento save(Connection conn, Movimiento movimiento) {
3132
}
3233

3334
String sql = "INSERT INTO movimientos (id, tipo_id, motivo_id, sede_id, usuario_id, lote_id, cantidad, observacion, fecha_registro) " +
34-
"VALUES (?, ?, ?, ?, ?, ?, ?, ?, GETDATE())";
35+
"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)";
3536

3637
try (PreparedStatement ps = conn.prepareStatement(sql)) {
3738
ps.setString(1, movimiento.getId());
@@ -42,6 +43,7 @@ public Movimiento save(Connection conn, Movimiento movimiento) {
4243
ps.setString(6, movimiento.getLoteId());
4344
ps.setInt(7, movimiento.getCantidad());
4445
ps.setString(8, movimiento.getObservacion());
46+
ps.setTimestamp(9, Timestamp.valueOf(DateTimeProvider.now()));
4547
ps.executeUpdate();
4648
}
4749
} catch (SQLException e) {

‎src/main/java/com/utp/meditrackapp/infrastructure/persistence/jdbc/JdbcPacienteRepository.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.utp.meditrackapp.core.config.DatabaseConfig;
44
import com.utp.meditrackapp.core.config.SessionManager;
55
import com.utp.meditrackapp.core.models.enums.EntidadPrefix;
6+
import com.utp.meditrackapp.core.util.DateTimeProvider;
67
import com.utp.meditrackapp.core.util.IdGenerator;
78
import com.utp.meditrackapp.domain.entities.Paciente;
89
import com.utp.meditrackapp.domain.ports.out.PacienteRepository;
@@ -12,6 +13,7 @@
1213
import java.sql.ResultSet;
1314
import java.sql.SQLException;
1415
import java.sql.Statement;
16+
import java.sql.Timestamp;
1517
import java.util.ArrayList;
1618
import java.util.List;
1719
import java.util.Optional;
@@ -276,10 +278,11 @@ public List<Paciente> findTypeahead(String query, int limit) {
276278
* Cuenta pacientes atendidos hoy en una sede.
277279
*/
278280
public int countTodayAttentions(String sedeId) {
279-
String sql = "SELECT COUNT(DISTINCT paciente_id) FROM atenciones WHERE sede_id = ? AND CAST(fecha_atencion AS DATE) = CAST(GETDATE() AS DATE)";
281+
String sql = "SELECT COUNT(DISTINCT paciente_id) FROM atenciones WHERE sede_id = ? AND CAST(fecha_atencion AS DATE) = CAST(? AS DATE)";
280282
try (Connection conn = dbConfig.getConnection();
281283
PreparedStatement ps = conn.prepareStatement(sql)) {
282284
ps.setString(1, sedeId);
285+
ps.setTimestamp(2, Timestamp.valueOf(DateTimeProvider.now()));
283286
try (ResultSet rs = ps.executeQuery()) {
284287
if (rs.next()) return rs.getInt(1);
285288
}
@@ -299,11 +302,14 @@ public int countNewPatientsMonth(String sedeId) {
299302
" WHERE sede_id = ? " +
300303
" GROUP BY paciente_id" +
301304
") AS PrimerasAtenciones " +
302-
"WHERE MONTH(primera_atencion) = MONTH(GETDATE()) " +
303-
"AND YEAR(primera_atencion) = YEAR(GETDATE())";
305+
"WHERE MONTH(primera_atencion) = MONTH(?) " +
306+
"AND YEAR(primera_atencion) = YEAR(?)";
304307
try (Connection conn = dbConfig.getConnection();
305308
PreparedStatement ps = conn.prepareStatement(sql)) {
309+
Timestamp now = Timestamp.valueOf(DateTimeProvider.now());
306310
ps.setString(1, sedeId);
311+
ps.setTimestamp(2, now);
312+
ps.setTimestamp(3, now);
307313
try (ResultSet rs = ps.executeQuery()) {
308314
if (rs.next()) return rs.getInt(1);
309315
}

‎src/main/java/com/utp/meditrackapp/infrastructure/persistence/jdbc/JdbcSedeRepository.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.utp.meditrackapp.core.config.DatabaseConfig;
44
import com.utp.meditrackapp.core.models.enums.EntidadPrefix;
5+
import com.utp.meditrackapp.core.util.DateTimeProvider;
56
import com.utp.meditrackapp.core.util.IdGenerator;
67
import com.utp.meditrackapp.domain.entities.Sede;
78
import com.utp.meditrackapp.domain.entities.Usuario;
@@ -146,11 +147,12 @@ public void toggleEstado(String id) {
146147

147148
@Override
148149
public void bloquear(String id, String motivo) {
149-
String sql = "UPDATE sedes SET is_bloqueada = 1, motivo_bloqueo = ?, fecha_bloqueo = GETDATE() WHERE id = ?";
150+
String sql = "UPDATE sedes SET is_bloqueada = 1, motivo_bloqueo = ?, fecha_bloqueo = ? WHERE id = ?";
150151
try (Connection conn = dbConfig.getConnection();
151152
PreparedStatement ps = conn.prepareStatement(sql)) {
152153
ps.setString(1, motivo);
153-
ps.setString(2, id);
154+
ps.setTimestamp(2, Timestamp.valueOf(DateTimeProvider.now()));
155+
ps.setString(3, id);
154156
ps.executeUpdate();
155157
} catch (SQLException e) {
156158
throw new RuntimeException("Error al bloquear sede: " + e.getMessage(), e);

0 commit comments

Comments
 (0)