feat: finish migrate otherModeQuestionaire Table

Author: EmmanuelDemey

api/src/main/java/fr/insee/pearljam/api/domain/OtherModeQuestionnaireState.java

@@ -0,0 +1,31 @@
+package fr.insee.pearljam.api.domain;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table
+@NoArgsConstructor
+@Getter
+@Setter
+public class OtherModeQuestionnaireState {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(length = 50)
+    private String id;
+
+    @Column
+    private String state;
+
+    @Column(name = "date", insertable = false, updatable = false)
+    private LocalDateTime date;
+
+    @ManyToOne
+    @JsonIgnore
+    private SurveyUnit surveyUnit;
+}

api/src/main/java/fr/insee/pearljam/api/domain/SurveyUnit.java

@@ -99,6 +99,9 @@ public class SurveyUnit implements Serializable {
 			"surveyUnit", orphanRemoval = true)
 	private IdentificationDB identification;
 
+	@OneToMany(fetch = FetchType.EAGER, targetEntity = OtherModeQuestionnaireState.class, cascade = CascadeType.ALL, mappedBy = "surveyUnit", orphanRemoval = true)
+	private Set<OtherModeQuestionnaireState> otherModeQuestionnaireState;
+
 	/**
 	 * The Campaign of SurveyUnit
 	 */

api/src/main/java/fr/insee/pearljam/api/dto/otherModeQuestionnaire/OtherModeQuestionnaireDto.java

@@ -0,0 +1,4 @@
+package fr.insee.pearljam.api.dto.otherModeQuestionnaire;
+
+public record OtherModeQuestionnaireDto(String surveyUnitId, String type) {
+}

api/src/main/java/fr/insee/pearljam/api/repository/OtherModeQuestionnaireRepository.java

@@ -0,0 +1,7 @@
+package fr.insee.pearljam.api.repository;
+
+import fr.insee.pearljam.api.domain.OtherModeQuestionnaireState;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface OtherModeQuestionnaireRepository extends JpaRepository<OtherModeQuestionnaireState, String> {
+}

api/src/main/java/fr/insee/pearljam/api/service/impl/OtherModeQuestionnaireServiceImpl.java

@@ -0,0 +1,33 @@
+package fr.insee.pearljam.api.service.impl;
+
+import fr.insee.pearljam.api.domain.OtherModeQuestionnaireState;
+import fr.insee.pearljam.api.repository.OtherModeQuestionnaireRepository;
+import fr.insee.pearljam.api.repository.SurveyUnitRepository;
+import fr.insee.pearljam.domain.surveyunit.model.OtherModeQuestionnaire;
+import fr.insee.pearljam.domain.surveyunit.port.serverside.OtherModeQuestionnaireService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional
+@Slf4j
+@RequiredArgsConstructor
+public class OtherModeQuestionnaireServiceImpl implements OtherModeQuestionnaireService {
+
+    private final OtherModeQuestionnaireRepository repository;
+    private final SurveyUnitRepository surveyUnitRepository;
+
+
+    @Override
+    public void addOtherModeQuestionnaire(OtherModeQuestionnaire otherModeQuestionnaire) {
+        var surveyUnit = surveyUnitRepository.findById(otherModeQuestionnaire.surveyUnitId());
+        var otherModeQuestionnaireState = new OtherModeQuestionnaireState();
+        otherModeQuestionnaireState.setState(otherModeQuestionnaire.type());
+        if(surveyUnit.isPresent()){
+            otherModeQuestionnaireState.setSurveyUnit(surveyUnit.get());
+            this.repository.save(otherModeQuestionnaireState);
+        }
+    }
+}

api/src/main/java/fr/insee/pearljam/api/surveyunit/dto/SurveyUnitInterviewerResponseDto.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import fr.insee.pearljam.api.bussinessrules.BusinessRules;
 import fr.insee.pearljam.api.campaign.dto.output.CommunicationTemplateResponseDto;
+import fr.insee.pearljam.api.domain.OtherModeQuestionnaireState;
 import fr.insee.pearljam.api.domain.State;
 import fr.insee.pearljam.api.domain.SurveyUnit;
 import fr.insee.pearljam.api.dto.address.AddressDto;
@@ -16,6 +17,7 @@
 
 import java.util.Comparator;
 import java.util.List;
+import java.util.Set;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public record SurveyUnitInterviewerResponseDto(
@@ -35,7 +37,8 @@ public record SurveyUnitInterviewerResponseDto(
 	List<CommunicationTemplateResponseDto> communicationTemplates,
 	List<CommunicationRequestResponseDto> communicationRequests,
 	PreviousContactHistoryDto previousContactHistory,
-	NextContactHistoryDto nextContactHistory
+	NextContactHistoryDto nextContactHistory,
+	Set<OtherModeQuestionnaireState> otherModeQuestionnaireState
 ) {
 
 	public static SurveyUnitInterviewerResponseDto fromModel(SurveyUnitForInterviewer surveyUnitForInterviewer) {
@@ -75,6 +78,6 @@ public static SurveyUnitInterviewerResponseDto fromModel(SurveyUnitForInterviewe
 				IdentificationDto.fromModel(surveyUnit.getModelIdentification()),
 				CommunicationTemplateResponseDto.fromModel(surveyUnitForInterviewer.communicationTemplates()),
 				CommunicationRequestResponseDto.fromModel(surveyUnit.getModelCommunicationRequests()),
-				previousContactHistory, nextContactHistory);
+				previousContactHistory, nextContactHistory, surveyUnit.getOtherModeQuestionnaireState());
 	}
 }

api/src/main/java/fr/insee/pearljam/api/surveyunit/dto/identification/HouseF2FIdentificationDto.java

@@ -9,7 +9,9 @@ public record HouseF2FIdentificationDto
 		 AccessQuestionValue access,
 		 SituationQuestionValue situation,
 		 CategoryQuestionValue category,
-		 OccupantQuestionValue occupant) implements IdentificationDto {
+		 OccupantQuestionValue occupant,
+		 Boolean demenagementWeb,
+		 Boolean demenagementEnqueteur) implements IdentificationDto {
 
 
 	/**
@@ -26,6 +28,8 @@ public Identification toModel() {
 				.situation(situation)
 				.category(category)
 				.occupant(occupant)
+				.demenagementWeb(demenagementWeb)
+				.demenagementEnqueteur(demenagementEnqueteur)
 				.build();
 	}
 
@@ -42,7 +46,9 @@ public static HouseF2FIdentificationDto fromModel(Identification identification)
 				identification.access(),
 				identification.situation(),
 				identification.category(),
-				identification.occupant()
+				identification.occupant(),
+				identification.demenagementWeb(),
+				identification.demenagementEnqueteur()
 		);
 	}
 }

api/src/main/java/fr/insee/pearljam/api/surveyunit/dto/identification/HouseTelIdentificationDto.java

@@ -7,7 +7,9 @@
 public record HouseTelIdentificationDto
 		(
 		 SituationQuestionValue situation,
-		 CategoryQuestionValue category) implements IdentificationDto {
+		 CategoryQuestionValue category,
+		 Boolean demenagementWeb,
+		 Boolean demenagementEnqueteur) implements IdentificationDto {
 
 
 	/**
@@ -22,6 +24,8 @@ public Identification toModel() {
 				.identificationType(IdentificationType.HOUSETEL)
 				.situation(situation)
 				.category(category)
+				.demenagementWeb(demenagementWeb)
+				.demenagementEnqueteur(demenagementEnqueteur)
 				.build();
 	}
 
@@ -35,7 +39,9 @@ public static HouseTelIdentificationDto fromModel(Identification identification)
 
 		return new HouseTelIdentificationDto(
 				identification.situation(),
-				identification.category()
+				identification.category(),
+				identification.demenagementWeb(),
+				identification.demenagementEnqueteur()
 		);
 	}
 }

api/src/main/java/fr/insee/pearljam/api/surveyunit/dto/identification/IndividualF2FIdentificationDto.java

@@ -9,7 +9,9 @@ public record IndividualF2FIdentificationDto
 		(
 		 IndividualStatusQuestionValue individualStatus,
 		 InterviewerCanProcessQuestionValue interviewerCanProcess,
-		 SituationQuestionValue situation) implements IdentificationDto {
+		 SituationQuestionValue situation,
+		 Boolean demenagementWeb,
+		 Boolean demenagementEnqueteur) implements IdentificationDto {
 
 
 	/**
@@ -23,6 +25,8 @@ public  Identification toModel() {
 				.individualStatus(individualStatus)
 				.interviewerCanProcess(interviewerCanProcess)
 				.situation(situation)
+				.demenagementWeb(demenagementWeb)
+				.demenagementEnqueteur(demenagementEnqueteur)
 				.build();
 	}
 
@@ -37,7 +41,9 @@ public static IndividualF2FIdentificationDto fromModel(Identification identifica
 		return new IndividualF2FIdentificationDto(
 				identification.individualStatus(),
 				identification.interviewerCanProcess(),
-				identification.situation()
+				identification.situation(),
+				identification.demenagementWeb(),
+				identification.demenagementEnqueteur()
 		);
 	}
 }

api/src/main/java/fr/insee/pearljam/api/surveyunit/dto/identification/IndividualTelIdentificationDto.java

@@ -7,7 +7,9 @@
 
 public record IndividualTelIdentificationDto
 		(IndividualStatusQuestionValue individualStatus,
-		 SituationQuestionValue situation) implements IdentificationDto {
+		 SituationQuestionValue situation,
+		 Boolean demenagementWeb,
+		 Boolean demenagementEnqueteur) implements IdentificationDto {
 
 
 	/**
@@ -21,6 +23,8 @@ public Identification toModel() {
 				.identificationType(IdentificationType.INDTEL)
 				.individualStatus(individualStatus)
 				.situation(situation)
+				.demenagementWeb(demenagementWeb)
+				.demenagementEnqueteur(demenagementEnqueteur)
 				.build();
 	}
 
@@ -34,7 +38,9 @@ public static IndividualTelIdentificationDto fromModel(Identification identifica
 
 		return new IndividualTelIdentificationDto(
 				identification.individualStatus(),
-				identification.situation()
+				identification.situation(),
+				identification.demenagementWeb(),
+				identification.demenagementEnqueteur()
 		);
 	}
 }