update contactOutcome counts (#86)

expose new closing cause in coutings
InseeFr · Oct 7, 2022 · 3e335b8 · 3e335b8
1 parent 4905614
commit 3e335b8
Show file tree

Hide file tree

Showing 12 changed files with 238 additions and 119 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>fr.insee.pearljam</groupId>
 	<artifactId>pearljam-back-office</artifactId>
-	<version>4.0.3</version>
+	<version>4.0.4</version>
 	<packaging>war</packaging>
 	<name>Pearl-Jam-Back-Office</name>
 	<description>Back-office services for for PearlJam</description>

diff --git a/src/main/java/fr/insee/pearljam/api/constants/Constants.java b/src/main/java/fr/insee/pearljam/api/constants/Constants.java
@@ -98,7 +98,7 @@ private Constants() {
 	public static final String[] CLOSING_CAUSE_FIELDS = { "npaCount", "npiCount", "rowCount", "total" };
 
 	public static final String[] CONTACT_OUTCOME_FIELDS = { "inaCount", "refCount", "impCount", "ucdCount", "utrCount",
-			"alaCount", "acpCount", "dcdCount", "nuhCount", "nerCount" };
+			"alaCount", "dcdCount", "nuhCount", "dukCount", "duuCount", "noaCount" };
 
 	public static final String UNAVAILABLE = "UNAVAILABLE";
 

diff --git a/src/main/java/fr/insee/pearljam/api/controller/SurveyUnitController.java b/src/main/java/fr/insee/pearljam/api/controller/SurveyUnitController.java
@@ -418,6 +418,7 @@ public ResponseEntity<SurveyUnitStatesDto> getStatesBySurveyUnitId(HttpServletRe
 	@GetMapping(path = "/survey-units/closable")
 	public ResponseEntity<List<SurveyUnitCampaignDto>> getClosableSurveyUnits(HttpServletRequest request) {
 		String userId = utilsService.getUserId(request);
+		LOGGER.info("{} try to GET closable units",userId);
 		if (StringUtils.isBlank(userId)) {
 			LOGGER.info("GET closable survey units resulting in 401");
 			return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
@@ -436,6 +437,8 @@ public ResponseEntity<List<SurveyUnitCampaignDto>> getClosableSurveyUnits(HttpSe
 	@ApiOperation(value = "Delete survey-unit")
 	@DeleteMapping(path = "/survey-unit/{id}")
 	public ResponseEntity<Object> deleteSurveyUnit(HttpServletRequest request, @PathVariable(value = "id") String id){
+		String userId = utilsService.getUserId(request);
+		LOGGER.info("{} try to DELETE survey-unit {}",userId, id);
 		Optional<SurveyUnit> surveyUnitOptional = surveyUnitService.findById(id);
 		if (!surveyUnitOptional.isPresent()) {
 			LOGGER.error("DELETE survey-unit with id {} resulting in 404 because it does not exists", id);

diff --git a/src/main/java/fr/insee/pearljam/api/dto/closingcause/ClosingCauseCountDto.java b/src/main/java/fr/insee/pearljam/api/dto/closingcause/ClosingCauseCountDto.java
@@ -12,6 +12,7 @@
 public class ClosingCauseCountDto {
 	private Long npiCount;
 	private Long npaCount;
+	private Long npxCount;
 	private Long rowCount;
 	private Long total;
 
@@ -69,6 +70,20 @@ public void setNpaCount(Long npaCount) {
 		this.npaCount = npaCount;
 	}
 
+	/**
+	 * @return the npxCount
+	 */
+	public Long getNpxCount() {
+		return npxCount;
+	}
+
+	/**
+	 * @param npxCount the npxCount to set
+	 */
+	public void setNpxCount(Long npxCount) {
+		this.npxCount = npxCount;
+	}
+
 	/**
 	 * @return the rowCount
 	 */

diff --git a/src/main/java/fr/insee/pearljam/api/dto/contactoutcome/ContactOutcomeTypeCountDto.java b/src/main/java/fr/insee/pearljam/api/dto/contactoutcome/ContactOutcomeTypeCountDto.java
@@ -11,75 +11,74 @@
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class ContactOutcomeTypeCountDto {
-	
+
 	private String idDem;
-	
-    private String labelDem;
-    
+
+	private String labelDem;
+
 	private CampaignDto campaign;
-	
+
 	private Long inaCount;
-
-    private Long refCount;
-
-    private Long impCount;
-
-    private Long ucdCount;
-
-    private Long utrCount;
-
-    private Long alaCount;
-
-    private Long acpCount;
-
-    private Long dcdCount;
-
-    private Long nuhCount;
-
-    private Long nerCount;
-
-    private Long total;
-
-    public ContactOutcomeTypeCountDto() {
-    	super();
-    }
-
-    public ContactOutcomeTypeCountDto(Map<String, BigInteger> obj) {
-    	if (obj != null && !obj.isEmpty()) {
-    		for(String str : Constants.CONTACT_OUTCOME_FIELDS) {
+
+	private Long refCount;
+
+	private Long impCount;
+
+	private Long ucdCount;
+
+	private Long utrCount;
+
+	private Long alaCount;
+
+	private Long dcdCount;
+
+	private Long nuhCount;
+
+	private Long dukCount;
+
+	private Long duuCount;
+
+	private Long noaCount;
+
+	private Long total;
+
+	public ContactOutcomeTypeCountDto() {
+		super();
+	}
+
+	public ContactOutcomeTypeCountDto(Map<String, BigInteger> obj) {
+		if (obj != null && !obj.isEmpty()) {
+			for (String str : Constants.CONTACT_OUTCOME_FIELDS) {
 				try {
-					setLongField(str, obj.get(str)!=null?obj.get(str).longValue():0L);
+					setLongField(str, obj.get(str) != null ? obj.get(str).longValue() : 0L);
 				} catch (NoSuchFieldException | IllegalAccessException e) {
 					e.printStackTrace();
-				} 
+				}
 			}
 		}
-    	
-    }
-    
-    public ContactOutcomeTypeCountDto(Map<String, BigInteger> obj, CampaignDto campaign) {
-    	this.campaign = campaign;
-    	if (obj != null && !obj.isEmpty()) {
-    		for(String str : Constants.CONTACT_OUTCOME_FIELDS) {
+
+	}
+
+	public ContactOutcomeTypeCountDto(Map<String, BigInteger> obj, CampaignDto campaign) {
+		this.campaign = campaign;
+		if (obj != null && !obj.isEmpty()) {
+			for (String str : Constants.CONTACT_OUTCOME_FIELDS) {
 				try {
-					setLongField(str, obj.get(str)!=null?obj.get(str).longValue():0L);
+					setLongField(str, obj.get(str) != null ? obj.get(str).longValue() : 0L);
 				} catch (NoSuchFieldException | IllegalAccessException e) {
 					e.printStackTrace();
-				} 
+				}
 			}
 		}
-    	
-    }
-    
-    public ContactOutcomeTypeCountDto(String idDem, String labelDem, Map<String, BigInteger> obj) {
+
+	}
+
+	public ContactOutcomeTypeCountDto(String idDem, String labelDem, Map<String, BigInteger> obj) {
 		this(obj);
 		this.idDem = idDem;
 		this.setLabelDem(labelDem);
 	}
-
-
-
-
+
 	/**
 	 * @return the idDem
 	 */
@@ -206,20 +205,6 @@ public void setAlaCount(Long alaCount) {
 		this.alaCount = alaCount;
 	}
 
-	/**
-	 * @return the acpCount
-	 */
-	public Long getAcpCount() {
-		return acpCount;
-	}
-
-	/**
-	 * @param acpCount the acpCount to set
-	 */
-	public void setAcpCount(Long acpCount) {
-		this.acpCount = acpCount;
-	}
-
 	/**
 	 * @return the dcdCount
 	 */
@@ -249,17 +234,45 @@ public void setNuhCount(Long nuhCount) {
 	}
 
 	/**
-	 * @return the nerCount
+	 * @return the dukCount
+	 */
+	public Long getDukCount() {
+		return dukCount;
+	}
+
+	/**
+	 * @param dukCount the dukCount to set
+	 */
+	public void setDukCount(Long dukCount) {
+		this.dukCount = dukCount;
+	}
+
+	/**
+	 * @return the duuCount
+	 */
+	public Long getDuuCount() {
+		return duuCount;
+	}
+
+	/**
+	 * @param nuhCount the duuCount to set
+	 */
+	public void setDuuCount(Long duuCount) {
+		this.duuCount = duuCount;
+	}
+
+	/**
+	 * @return the noaCount
 	 */
-	public Long getNerCount() {
-		return nerCount;
+	public Long getNoaCount() {
+		return noaCount;
 	}
 
 	/**
-	 * @param nerCount the nerCount to set
+	 * @param noaCount the noaCount to set
 	 */
-	public void setNerCount(Long nerCount) {
-		this.nerCount = nerCount;
+	public void setNoaCount(Long noaCount) {
+		this.noaCount = noaCount;
 	}
 
 	/**
@@ -277,9 +290,9 @@ public void setTotal(Long total) {
 	}
 
 	public void setLongField(String fieldName, Long value)
-	        throws NoSuchFieldException, IllegalAccessException {
-	    Field field = getClass().getDeclaredField(fieldName);
-	    field.set(this, value);
+			throws NoSuchFieldException, IllegalAccessException {
+		Field field = getClass().getDeclaredField(fieldName);
+		field.set(this, value);
 	}
 
 }
diff --git a/src/main/java/fr/insee/pearljam/api/dto/state/StateCountDto.java b/src/main/java/fr/insee/pearljam/api/dto/state/StateCountDto.java
@@ -34,6 +34,7 @@ public class StateCountDto {
 	private Long nvaCount;
 	private Long npaCount;
 	private Long npiCount;
+	private Long npxCount;
 	private Long rowCount;
 	private Long total;
 
@@ -316,6 +317,14 @@ public void setNpiCount(Long npiCount) {
 		this.npiCount = npiCount;
 	}
 
+	public Long getNpxCount() {
+		return npxCount;
+	}
+
+	public void setNpxCount(Long npxCount) {
+		this.npxCount = npxCount;
+	}
+
 	public Long getRowCount() {
 		return rowCount;
 	}

diff --git a/src/main/java/fr/insee/pearljam/api/repository/ClosingCauseRepository.java b/src/main/java/fr/insee/pearljam/api/repository/ClosingCauseRepository.java
@@ -19,6 +19,7 @@ public interface ClosingCauseRepository extends JpaRepository<ClosingCause, Long
 	@Query(value = "SELECT " 
 				+ "SUM(CASE WHEN type='NPA' THEN 1 ELSE 0 END) AS npaCount, "
 				+ "SUM(CASE WHEN type='NPI' THEN 1 ELSE 0 END) AS npiCount, "
+				+ "SUM(CASE WHEN type='NPX' THEN 1 ELSE 0 END) AS npxCount, "
 				+ "SUM(CASE WHEN type='ROW' THEN 1 ELSE 0 END) AS rowCount "
 			+ "FROM ( "
 				+ "SELECT DISTINCT(survey_unit_id), type, date "
@@ -46,6 +47,7 @@ Map<String,BigInteger> getStateClosedByClosingCauseCount(@Param("campaignId") St
 	@Query(value = "SELECT " 
 			+ "SUM(CASE WHEN type='NPA' THEN 1 ELSE 0 END) AS npaCount, "
 			+ "SUM(CASE WHEN type='NPI' THEN 1 ELSE 0 END) AS npiCount, "
+			+ "SUM(CASE WHEN type='NPX' THEN 1 ELSE 0 END) AS npxCount, "
 			+ "SUM(CASE WHEN type='ROW' THEN 1 ELSE 0 END) AS rowCount " 
 		+ "FROM ( "
 			+ "SELECT DISTINCT(survey_unit_id), type, date FROM closing_cause WHERE (survey_unit_id, date) IN ("
@@ -70,6 +72,7 @@ Map<String,BigInteger> getgetStateClosedByClosingCauseCountByCampaign(@Param("ca
 	@Query(value = "SELECT " 
 			+ "SUM(CASE WHEN type='NPA' THEN 1 ELSE 0 END) AS npaCount, "
 			+ "SUM(CASE WHEN type='NPI' THEN 1 ELSE 0 END) AS npiCount, "
+			+ "SUM(CASE WHEN type='NPX' THEN 1 ELSE 0 END) AS npxCount, "
 			+ "SUM(CASE WHEN type='ROW' THEN 1 ELSE 0 END) AS rowCount "
 		+ "FROM ( "
 			+ "SELECT DISTINCT(survey_unit_id), type, date FROM closing_cause WHERE (survey_unit_id, date) IN ("
@@ -96,6 +99,7 @@ Map<String,BigInteger> getClosingCauseCountNotAttributed(@Param("campaignId") St
 	@Query(value = "SELECT "
 			+ "SUM(CASE WHEN type='NPA' THEN 1 ELSE 0 END) AS npaCount, "
 			+ "SUM(CASE WHEN type='NPI' THEN 1 ELSE 0 END) AS npiCount, "
+			+ "SUM(CASE WHEN type='NPX' THEN 1 ELSE 0 END) AS npxCount, "
 			+ "SUM(CASE WHEN type='ROW' THEN 1 ELSE 0 END) AS rowCount " 
 		+ "FROM ( "
 			+ "SELECT DISTINCT(survey_unit_id), type, date FROM closing_cause WHERE (survey_unit_id, date) IN ("
@@ -121,6 +125,7 @@ Map<String,BigInteger> getClosingCauseCountSumByInterviewer(@Param("campaignIds"
 	@Query(value = "SELECT "
 			+ "SUM(CASE WHEN type='NPA' THEN 1 ELSE 0 END) AS npaCount, "
 			+ "SUM(CASE WHEN type='NPI' THEN 1 ELSE 0 END) AS npiCount, "
+			+ "SUM(CASE WHEN type='NPX' THEN 1 ELSE 0 END) AS npxCount, "
 			+ "SUM(CASE WHEN type='ROW' THEN 1 ELSE 0 END) AS rowCount " 
 		+ "FROM ( "
 			+ "SELECT DISTINCT(survey_unit_id), type, date FROM closing_cause WHERE (survey_unit_id, date) IN ("
@@ -146,6 +151,7 @@ Map<String,BigInteger> getClosingCauseCountNotAttributed(@Param("campaignIds") L
 	@Query(value = "SELECT " 
 			+ "SUM(CASE WHEN type='NPA' THEN 1 ELSE 0 END) AS npaCount, "
 			+ "SUM(CASE WHEN type='NPI' THEN 1 ELSE 0 END) AS npiCount, "
+			+ "SUM(CASE WHEN type='NPX' THEN 1 ELSE 0 END) AS npxCount, "
 			+ "SUM(CASE WHEN type='ROW' THEN 1 ELSE 0 END) AS rowCount " 
 		+ "FROM ( "
 			+ "SELECT DISTINCT(survey_unit_id), type, date FROM closing_cause WHERE (survey_unit_id, date) IN ("
@@ -169,6 +175,7 @@ Map<String,BigInteger> getClosingCauseCountNotAttributed(@Param("campaignIds") L
 	@Query(value = "SELECT " 
 			+ "SUM(CASE WHEN type='NPA' THEN 1 ELSE 0 END) AS npaCount, "
 			+ "SUM(CASE WHEN type='NPI' THEN 1 ELSE 0 END) AS npiCount, "
+			+ "SUM(CASE WHEN type='NPX' THEN 1 ELSE 0 END) AS npxCount, "
 			+ "SUM(CASE WHEN type='ROW' THEN 1 ELSE 0 END) AS rowCount " 
 		+ "FROM ( "
 			+ "SELECT DISTINCT(survey_unit_id), type, date FROM closing_cause WHERE (survey_unit_id, date) IN ("
@@ -191,6 +198,7 @@ Map<String,BigInteger> getClosingCauseCountNotAttributed(@Param("campaignIds") L
 	@Query(value = "SELECT " 
 			+ "SUM(CASE WHEN type='NPA' THEN 1 ELSE 0 END) AS npaCount, "
 			+ "SUM(CASE WHEN type='NPI' THEN 1 ELSE 0 END) AS npiCount, "
+			+ "SUM(CASE WHEN type='NPX' THEN 1 ELSE 0 END) AS npxCount, "
 			+ "SUM(CASE WHEN type='ROW' THEN 1 ELSE 0 END) AS rowCount "
 		+ "FROM ( "
 			+ "SELECT DISTINCT(survey_unit_id), type, date "