fix: HistoryContactOutcome is ContactOutcome + ClosingCause

SimonDmz · SimonDmz · commit 1cb07e2c55f0 · 2025-12-19T12:12:00.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
 	<groupId>fr.insee.pearljam</groupId>
 	<artifactId>pearljam-back-office</artifactId>
-	<version>5.13.5</version>
+	<version>5.13.6</version>
 	<name>Pearl-Jam-Back-Office</name>
 	<description>Back-office services for PearlJam</description>
 
diff --git a/src/main/java/fr/insee/pearljam/api/domain/SurveyUnit.java b/src/main/java/fr/insee/pearljam/api/domain/SurveyUnit.java
@@ -10,9 +10,9 @@
 import fr.insee.pearljam.domain.surveyunit.model.ContactOutcome;
 import fr.insee.pearljam.domain.surveyunit.model.Identification;
 import fr.insee.pearljam.domain.surveyunit.model.communication.CommunicationRequest;
-import fr.insee.pearljam.domain.surveyunit.model.person.ContactHistory;
-import fr.insee.pearljam.domain.surveyunit.model.person.ContactHistoryType;
-import fr.insee.pearljam.domain.surveyunit.model.person.Person;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.ContactHistory;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.ContactHistoryType;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.Person;
 import fr.insee.pearljam.infrastructure.surveyunit.entity.*;
 import fr.insee.pearljam.infrastructure.surveyunit.entity.identification.IdentificationDB;
 import jakarta.persistence.*;
diff --git a/src/main/java/fr/insee/pearljam/api/dto/phonenumber/PhoneNumberDto.java b/src/main/java/fr/insee/pearljam/api/dto/phonenumber/PhoneNumberDto.java
@@ -1,7 +1,7 @@
 package fr.insee.pearljam.api.dto.phonenumber;
 
 import fr.insee.pearljam.api.domain.Source;
-import fr.insee.pearljam.domain.surveyunit.model.person.PhoneNumber;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.PhoneNumber;
 
 public record PhoneNumberDto(
 		Source source,
diff --git a/src/main/java/fr/insee/pearljam/api/service/impl/SurveyUnitUpdateServiceImpl.java b/src/main/java/fr/insee/pearljam/api/service/impl/SurveyUnitUpdateServiceImpl.java
@@ -17,7 +17,7 @@
 import fr.insee.pearljam.domain.surveyunit.model.Identification;
 import fr.insee.pearljam.domain.surveyunit.model.communication.CommunicationRequest;
 import fr.insee.pearljam.api.service.SurveyUnitUpdateService;
-import fr.insee.pearljam.domain.surveyunit.model.person.Person;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.Person;
 import fr.insee.pearljam.domain.surveyunit.port.serverside.CommunicationRequestRepository;
 import fr.insee.pearljam.infrastructure.surveyunit.entity.identification.IdentificationDB;
 
diff --git a/src/main/java/fr/insee/pearljam/api/surveyunit/dto/PersonDto.java b/src/main/java/fr/insee/pearljam/api/surveyunit/dto/PersonDto.java
@@ -2,8 +2,8 @@
 
 import fr.insee.pearljam.api.domain.Title;
 import fr.insee.pearljam.api.dto.phonenumber.PhoneNumberDto;
-import fr.insee.pearljam.domain.surveyunit.model.person.ContactHistory;
-import fr.insee.pearljam.domain.surveyunit.model.person.Person;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.ContactHistory;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.Person;
 import jakarta.validation.constraints.NotNull;
 
 import java.util.List;
diff --git a/src/main/java/fr/insee/pearljam/api/surveyunit/dto/contactHistory/NextContactHistoryDto.java b/src/main/java/fr/insee/pearljam/api/surveyunit/dto/contactHistory/NextContactHistoryDto.java
@@ -1,8 +1,8 @@
 package fr.insee.pearljam.api.surveyunit.dto.contactHistory;
 
-import fr.insee.pearljam.domain.surveyunit.model.person.ContactHistory;
-import fr.insee.pearljam.domain.surveyunit.model.person.ContactHistoryType;
-import fr.insee.pearljam.domain.surveyunit.model.person.Person;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.ContactHistory;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.ContactHistoryType;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.Person;
 import jakarta.validation.Valid;
 
 import java.util.HashSet;
diff --git a/src/main/java/fr/insee/pearljam/api/surveyunit/dto/contactHistory/NextContactHistoryPersonDto.java b/src/main/java/fr/insee/pearljam/api/surveyunit/dto/contactHistory/NextContactHistoryPersonDto.java
@@ -2,9 +2,9 @@
 
 import fr.insee.pearljam.api.domain.Source;
 import fr.insee.pearljam.api.domain.Title;
-import fr.insee.pearljam.domain.surveyunit.model.person.ContactHistory;
-import fr.insee.pearljam.domain.surveyunit.model.person.Person;
-import fr.insee.pearljam.domain.surveyunit.model.person.PhoneNumber;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.ContactHistory;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.Person;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.PhoneNumber;
 import jakarta.validation.constraints.NotNull;
 
 import java.util.Objects;
diff --git a/src/main/java/fr/insee/pearljam/api/surveyunit/dto/contactHistory/PreviousContactHistoryDto.java b/src/main/java/fr/insee/pearljam/api/surveyunit/dto/contactHistory/PreviousContactHistoryDto.java
@@ -1,9 +1,9 @@
 package fr.insee.pearljam.api.surveyunit.dto.contactHistory;
 
-import fr.insee.pearljam.api.domain.ContactOutcomeType;
-import fr.insee.pearljam.domain.surveyunit.model.person.ContactHistory;
-import fr.insee.pearljam.domain.surveyunit.model.person.ContactHistoryType;
-import fr.insee.pearljam.domain.surveyunit.model.person.Person;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.ContactHistory;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.ContactHistoryType;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.HistoryContactOutcomeType;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.Person;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 
@@ -15,7 +15,7 @@
 public record PreviousContactHistoryDto(
         String comment,
         @NotNull
-        ContactOutcomeType contactOutcomeValue,
+        HistoryContactOutcomeType contactOutcomeValue,
         List<@Valid PreviousContactHistoryPersonDto> persons
 ) {
 
diff --git a/src/main/java/fr/insee/pearljam/api/surveyunit/dto/contactHistory/PreviousContactHistoryPersonDto.java b/src/main/java/fr/insee/pearljam/api/surveyunit/dto/contactHistory/PreviousContactHistoryPersonDto.java
@@ -1,8 +1,8 @@
 package fr.insee.pearljam.api.surveyunit.dto.contactHistory;
 
 import fr.insee.pearljam.api.domain.Title;
-import fr.insee.pearljam.domain.surveyunit.model.person.ContactHistory;
-import fr.insee.pearljam.domain.surveyunit.model.person.Person;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.ContactHistory;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.Person;
 import jakarta.validation.constraints.NotNull;
 
 
diff --git a/src/main/java/fr/insee/pearljam/domain/surveyunit/model/contacthistory/ContactHistory.java b/src/main/java/fr/insee/pearljam/domain/surveyunit/model/contacthistory/ContactHistory.java
@@ -0,0 +1,10 @@
+package fr.insee.pearljam.domain.surveyunit.model.contacthistory;
+
+import java.util.Set;
+
+public record ContactHistory(
+        ContactHistoryType historyType,
+        String comment,
+        HistoryContactOutcomeType contactOutcomeValue,
+        Set<Person>persons) {
+}
diff --git a/src/main/java/fr/insee/pearljam/domain/surveyunit/model/contacthistory/ContactHistoryType.java b/src/main/java/fr/insee/pearljam/domain/surveyunit/model/contacthistory/ContactHistoryType.java
@@ -0,0 +1,5 @@
+package fr.insee.pearljam.domain.surveyunit.model.contacthistory;
+
+public enum ContactHistoryType {
+PREVIOUS,NEXT
+}
diff --git a/src/main/java/fr/insee/pearljam/domain/surveyunit/model/contacthistory/HistoryContactOutcomeType.java b/src/main/java/fr/insee/pearljam/domain/surveyunit/model/contacthistory/HistoryContactOutcomeType.java
@@ -0,0 +1,17 @@
+package fr.insee.pearljam.domain.surveyunit.model.contacthistory;
+
+public enum HistoryContactOutcomeType {
+    INA, //Interview accepted
+    REF, //Refusal
+    IMP, //Impossible to reach
+    UCD, //Unusable Contact Data
+    UTR, //Unable To Respond
+    ALA, //Already answered
+    DUK, //Definitely Unavailable for a Known reason
+    NUH, //No longer Used for Habitation
+    NOA, //Not Applicable
+    NPA, //Not processed because of interviewer absence
+    NPI, //Not processed by interviewer
+    NPX, //Not processed for exceptional reason
+    ROW  //Right of withdrawal
+}
diff --git a/src/main/java/fr/insee/pearljam/domain/surveyunit/model/contacthistory/Person.java b/src/main/java/fr/insee/pearljam/domain/surveyunit/model/contacthistory/Person.java
@@ -1,4 +1,4 @@
-package fr.insee.pearljam.domain.surveyunit.model.person;
+package fr.insee.pearljam.domain.surveyunit.model.contacthistory;
 
 import fr.insee.pearljam.api.domain.Title;
 
diff --git a/src/main/java/fr/insee/pearljam/domain/surveyunit/model/contacthistory/PhoneNumber.java b/src/main/java/fr/insee/pearljam/domain/surveyunit/model/contacthistory/PhoneNumber.java
@@ -1,4 +1,4 @@
-package fr.insee.pearljam.domain.surveyunit.model.person;
+package fr.insee.pearljam.domain.surveyunit.model.contacthistory;
 
 import fr.insee.pearljam.api.domain.Source;
 
diff --git a/src/main/java/fr/insee/pearljam/domain/surveyunit/model/person/ContactHistory.java b/src/main/java/fr/insee/pearljam/domain/surveyunit/model/person/ContactHistory.java
diff --git a/src/main/java/fr/insee/pearljam/domain/surveyunit/model/person/ContactHistoryType.java b/src/main/java/fr/insee/pearljam/domain/surveyunit/model/person/ContactHistoryType.java
diff --git a/src/main/java/fr/insee/pearljam/infrastructure/surveyunit/entity/ContactHistoryDB.java b/src/main/java/fr/insee/pearljam/infrastructure/surveyunit/entity/ContactHistoryDB.java
@@ -1,8 +1,8 @@
 package fr.insee.pearljam.infrastructure.surveyunit.entity;
 
-import fr.insee.pearljam.api.domain.ContactOutcomeType;
 import fr.insee.pearljam.api.domain.SurveyUnit;
-import fr.insee.pearljam.domain.surveyunit.model.person.ContactHistory;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.ContactHistory;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.HistoryContactOutcomeType;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -37,7 +37,7 @@ public class ContactHistoryDB implements Serializable {
     private String comment;
 
     @Enumerated(EnumType.STRING)
-    private ContactOutcomeType contactOutcomeValue;
+    private HistoryContactOutcomeType contactOutcomeValue;
 
     @OneToMany(mappedBy = "contactHistory", fetch = FetchType.LAZY,
             cascade = CascadeType.ALL, orphanRemoval = true)
diff --git a/src/main/java/fr/insee/pearljam/infrastructure/surveyunit/entity/ContactHistoryPK.java b/src/main/java/fr/insee/pearljam/infrastructure/surveyunit/entity/ContactHistoryPK.java
@@ -1,6 +1,6 @@
 package fr.insee.pearljam.infrastructure.surveyunit.entity;
 
-import fr.insee.pearljam.domain.surveyunit.model.person.ContactHistoryType;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.ContactHistoryType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.EnumType;
diff --git a/src/main/java/fr/insee/pearljam/infrastructure/surveyunit/entity/PersonDB.java b/src/main/java/fr/insee/pearljam/infrastructure/surveyunit/entity/PersonDB.java
@@ -2,9 +2,9 @@
 
 import fr.insee.pearljam.api.domain.SurveyUnit;
 import fr.insee.pearljam.api.domain.Title;
-import fr.insee.pearljam.domain.surveyunit.model.person.ContactHistory;
-import fr.insee.pearljam.domain.surveyunit.model.person.ContactHistoryType;
-import fr.insee.pearljam.domain.surveyunit.model.person.Person;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.ContactHistory;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.ContactHistoryType;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.Person;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/fr/insee/pearljam/infrastructure/surveyunit/entity/PhoneNumberDB.java b/src/main/java/fr/insee/pearljam/infrastructure/surveyunit/entity/PhoneNumberDB.java
@@ -1,7 +1,7 @@
 package fr.insee.pearljam.infrastructure.surveyunit.entity;
 
 import fr.insee.pearljam.api.domain.Source;
-import fr.insee.pearljam.domain.surveyunit.model.person.PhoneNumber;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.PhoneNumber;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/test/java/fr/insee/pearljam/api/authKeycloak/TestAuthKeyCloak.java b/src/test/java/fr/insee/pearljam/api/authKeycloak/TestAuthKeyCloak.java
@@ -31,6 +31,7 @@
 import fr.insee.pearljam.api.utils.ScriptConstants;
 import fr.insee.pearljam.config.FixedDateServiceConfiguration;
 import fr.insee.pearljam.domain.surveyunit.model.CommentType;
+import fr.insee.pearljam.domain.surveyunit.model.contacthistory.HistoryContactOutcomeType;
 import fr.insee.pearljam.infrastructure.campaign.entity.VisibilityDB;
 import fr.insee.pearljam.infrastructure.campaign.jpa.VisibilityJpaRepository;
 import lombok.RequiredArgsConstructor;
@@ -1495,7 +1496,7 @@ void testPostSurveyUnits() throws Exception {
 		surveyUnit.setContactAttempts(List.of(new ContactAttemptDto(1743078880000L,Status.MES,Medium.TEL),new ContactAttemptDto(1743078900000L,Status.INA,Medium.FIELD)));
 		surveyUnit.setClosingCause(new ClosingCauseDto(1843078880000L,ClosingCauseType.NPA));
 		surveyUnit.setContactHistory(new PreviousContactHistoryDto("comment",
-				ContactOutcomeType.INA,
+				HistoryContactOutcomeType.INA,
 				List.of()
 		));
 
@@ -1510,7 +1511,7 @@ void testPostSurveyUnits() throws Exception {
 
 	/**
 	 * Test that the POST endpoint
-	 * "/survey-units returns 400 when id dupliate in DB
+	 * "/survey-units returns 400 when id duplicate in DB
 	 *
 	 * @throws JsonProcessingException jpe
 	 * @throws JSONException           jsone
