From f79ccfa865261eefbde9b54b2cce3922b62fd9f6 Mon Sep 17 00:00:00 2001
From: Betty Becuwe <77614323+BettyB979@users.noreply.github.com>
Date: Mon, 9 Oct 2023 11:24:37 +0200
Subject: [PATCH 1/2] Develop (#47)

* fix: get date from state data for platine synchronize (#45)

* fix: get date from state data for platine synchronize (#46)
---
 pom.xml                                                        | 2 +-
 .../insee/queen/batch/dao/impl/jpa/SurveyUnitDaoJpaImpl.java   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3562e3c..711363c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>fr.insee.queen</groupId>
 	<artifactId>queen-batch</artifactId>
-	<version>4.1.13</version>
+	<version>4.1.14</version>
 	<packaging>jar</packaging>
 	<name>QueenBatch</name>
 	<description>Queen Batch</description>
diff --git a/src/main/java/fr/insee/queen/batch/dao/impl/jpa/SurveyUnitDaoJpaImpl.java b/src/main/java/fr/insee/queen/batch/dao/impl/jpa/SurveyUnitDaoJpaImpl.java
index 269c8ac..51daaac 100644
--- a/src/main/java/fr/insee/queen/batch/dao/impl/jpa/SurveyUnitDaoJpaImpl.java
+++ b/src/main/java/fr/insee/queen/batch/dao/impl/jpa/SurveyUnitDaoJpaImpl.java
@@ -76,7 +76,7 @@ public List<String> getAllSurveyUnitByCamapignId(String campaignId) {
 	 */
 	@Override
 	public List<SurveyUnit> getAllSurveyUnitsWithStateByCampaignId(String campaignId){
-		StringBuilder qString = new StringBuilder("SELECT su.id, su.campaign_id, stateData.state FROM survey_unit AS su ")
+		StringBuilder qString = new StringBuilder("SELECT su.id, su.campaign_id, stateData.state, stateData.date FROM survey_unit AS su ")
 				.append("INNER JOIN state_data AS stateData ON stateData.survey_unit_id = su.id ")
 				.append("WHERE stateData.state IS NOT NULL AND su.campaign_id=?");
 		return jdbcTemplate.query(qString.toString(), new Object[]{campaignId}, new SurveyUnitMapper());
@@ -187,6 +187,7 @@ public SurveyUnit mapRow(ResultSet rs, int rowNum) throws SQLException         {
 			camp.setId(rs.getString("campaign_id"));
 			StateData state = new StateData();
 			state.setState(rs.getString("state"));
+			state.setDate(rs.getLong("date"));
 			su.setId(rs.getString("id"));
 			su.setCampaign(camp);
 			su.setStateData(state);

From 0e699d9a8f34aaddd1ef4b2c2e1d73462644f5e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Demazi=C3=A8re?= <simon.demaziere@insee.fr>
Date: Tue, 26 Mar 2024 15:36:32 +0100
Subject: [PATCH 2/2] fix : hotfix CVE-2024-1597 (#52)

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 711363c..f9478a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>fr.insee.queen</groupId>
 	<artifactId>queen-batch</artifactId>
-	<version>4.1.14</version>
+	<version>4.1.15</version>
 	<packaging>jar</packaging>
 	<name>QueenBatch</name>
 	<description>Queen Batch</description>
@@ -73,7 +73,7 @@
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<version>42.3.8</version>
+			<version>42.3.9</version>
 		</dependency>
 		<dependency>
 			<groupId>org.liquibase</groupId>