fbenoist68
/
hdpos
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases 3 Wiki Activity

Merge pull request 'fix: postgres access and bug order day filter' (#10) from release/1.0.1 into dev 

Reviewed-on: #10
feature/issue-4/bruno
Frédérik Benoist 2024-01-27 07:47:10 +01:00
parent ea70d8281c c0199532d1
commit 0d36bb8a1b
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -26,7 +26,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.2.5</version>
<version>42.3.1</version>
</dependency>
<!-- Jersey for JAX-RS (Java API for RESTful Web Services) -->

9
src/main/java/com/example/services/DatabaseConnectOBI.java
View File

@ -25,6 +25,7 @@ public class DatabaseConnectOBI implements AutoCloseable {
String username = dbProperties.getProperty(environment + ".obi.db.username");
String userpassword = dbProperties.getProperty(environment + ".obi.db.password");
injectClass();
connection = DriverManager.getConnection(url, username, userpassword);
logger.info("OBI Connection OK for user " + username + " on environment " + environment);
@ -66,4 +67,12 @@ public class DatabaseConnectOBI implements AutoCloseable {
}
return properties;
}
private void injectClass() {
try {
Class.forName("org.postgresql.Driver");
} catch (ClassNotFoundException e) {
e.printStackTrace();
}
}
}

6
src/main/java/com/example/services/OrderService.java
View File

@ -84,11 +84,11 @@ public class OrderService {
}
if (minDate != null && !minDate.isEmpty()) {
conditions.add(" oo.transaction_date >= ? ");
conditions.add(" DATE_TRUNC('day', oo.transaction_date) >= ? ");
}
if (maxDate != null && !maxDate.isEmpty()) {
conditions.add(" oo.transaction_date <= ? ");
conditions.add(" DATE_TRUNC('day', oo.transaction_date) <= ? ");
}
if (!conditions.isEmpty()) {
@ -131,7 +131,6 @@ public class OrderService {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
if (minDate != null && !minDate.isEmpty()) {
logger.info("minDate: " + minDate);
try {
java.util.Date parsedMinDate = dateFormat.parse(minDate);
java.sql.Date sqlMinDate = new java.sql.Date(parsedMinDate.getTime());
@ -144,7 +143,6 @@ public class OrderService {
}
if (maxDate != null && !maxDate.isEmpty()) {
logger.info("maxDate: " + maxDate);
try {
java.util.Date parsedMaxDate = dateFormat.parse(maxDate);
java.sql.Date sqlMaxDate = new java.sql.Date(parsedMaxDate.getTime());