Moved DTOs to right package

InseeFr · Sep 5, 2024 · 13418aa · 13418aa
1 parent 30cc305
commit 13418aa
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 15 deletions.
diff --git a/...surveyunit/CampaignWithQuestionnaire.java → ...roller/dto/CampaignWithQuestionnaire.java b/...surveyunit/CampaignWithQuestionnaire.java → ...roller/dto/CampaignWithQuestionnaire.java
@@ -1,11 +1,13 @@
-package fr.insee.genesis.domain.model.surveyunit;
+package fr.insee.genesis.controller.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 import java.util.Set;
 
 @AllArgsConstructor
+@NoArgsConstructor
 @Getter
 public class CampaignWithQuestionnaire {
     private String idCampaign;

diff --git a/...surveyunit/QuestionnaireWithCampaign.java → ...roller/dto/QuestionnaireWithCampaign.java b/...surveyunit/QuestionnaireWithCampaign.java → ...roller/dto/QuestionnaireWithCampaign.java
@@ -1,11 +1,13 @@
-package fr.insee.genesis.domain.model.surveyunit;
+package fr.insee.genesis.controller.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 import java.util.Set;
 
 @AllArgsConstructor
+@NoArgsConstructor
 @Getter
 public class QuestionnaireWithCampaign {
     private String idQuestionnaire;

diff --git a/...domain/model/surveyunit/SurveyUnitId.java → .../genesis/controller/dto/SurveyUnitId.java b/...domain/model/surveyunit/SurveyUnitId.java → .../genesis/controller/dto/SurveyUnitId.java
@@ -1,4 +1,4 @@
-package fr.insee.genesis.domain.model.surveyunit;
+package fr.insee.genesis.controller.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;

diff --git a/src/main/java/fr/insee/genesis/controller/rest/ResponseController.java b/src/main/java/fr/insee/genesis/controller/rest/ResponseController.java
@@ -15,11 +15,11 @@
 import fr.insee.genesis.controller.sources.xml.LunaticXmlDataSequentialParser;
 import fr.insee.genesis.controller.sources.xml.LunaticXmlSurveyUnit;
 import fr.insee.genesis.controller.utils.ControllerUtils;
-import fr.insee.genesis.domain.model.surveyunit.CampaignWithQuestionnaire;
+import fr.insee.genesis.controller.dto.CampaignWithQuestionnaire;
 import fr.insee.genesis.domain.model.surveyunit.CollectedVariable;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
-import fr.insee.genesis.domain.model.surveyunit.QuestionnaireWithCampaign;
-import fr.insee.genesis.domain.model.surveyunit.SurveyUnitId;
+import fr.insee.genesis.controller.dto.QuestionnaireWithCampaign;
+import fr.insee.genesis.controller.dto.SurveyUnitId;
 import fr.insee.genesis.domain.model.surveyunit.Variable;
 import fr.insee.genesis.domain.ports.api.SurveyUnitApiPort;
 import fr.insee.genesis.exceptions.GenesisError;

diff --git a/src/main/java/fr/insee/genesis/domain/ports/api/SurveyUnitApiPort.java b/src/main/java/fr/insee/genesis/domain/ports/api/SurveyUnitApiPort.java
@@ -1,10 +1,10 @@
 package fr.insee.genesis.domain.ports.api;
 
-import fr.insee.genesis.domain.model.surveyunit.CampaignWithQuestionnaire;
+import fr.insee.genesis.controller.dto.CampaignWithQuestionnaire;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
-import fr.insee.genesis.domain.model.surveyunit.QuestionnaireWithCampaign;
+import fr.insee.genesis.controller.dto.QuestionnaireWithCampaign;
 import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
-import fr.insee.genesis.domain.model.surveyunit.SurveyUnitId;
+import fr.insee.genesis.controller.dto.SurveyUnitId;
 
 import java.util.List;
 import java.util.Set;

diff --git a/src/main/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitService.java b/src/main/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitService.java
@@ -1,11 +1,11 @@
 package fr.insee.genesis.domain.service.surveyunit;
 
-import fr.insee.genesis.domain.model.surveyunit.CampaignWithQuestionnaire;
+import fr.insee.genesis.controller.dto.CampaignWithQuestionnaire;
 import fr.insee.genesis.domain.model.surveyunit.CollectedVariable;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
-import fr.insee.genesis.domain.model.surveyunit.QuestionnaireWithCampaign;
+import fr.insee.genesis.controller.dto.QuestionnaireWithCampaign;
 import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
-import fr.insee.genesis.domain.model.surveyunit.SurveyUnitId;
+import fr.insee.genesis.controller.dto.SurveyUnitId;
 import fr.insee.genesis.domain.model.surveyunit.Variable;
 import fr.insee.genesis.domain.ports.api.SurveyUnitApiPort;
 import fr.insee.genesis.domain.ports.spi.SurveyUnitPersistencePort;

diff --git a/src/test/java/fr/insee/genesis/controller/rest/ResponseControllerTest.java b/src/test/java/fr/insee/genesis/controller/rest/ResponseControllerTest.java
@@ -7,12 +7,12 @@
 import fr.insee.genesis.domain.service.surveyunit.SurveyUnitQualityService;
 import fr.insee.genesis.domain.service.volumetry.VolumetryLogService;
 import fr.insee.genesis.controller.utils.ControllerUtils;
-import fr.insee.genesis.domain.model.surveyunit.CampaignWithQuestionnaire;
+import fr.insee.genesis.controller.dto.CampaignWithQuestionnaire;
 import fr.insee.genesis.domain.model.surveyunit.CollectedVariable;
 import fr.insee.genesis.domain.model.surveyunit.DataState;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
-import fr.insee.genesis.domain.model.surveyunit.QuestionnaireWithCampaign;
-import fr.insee.genesis.domain.model.surveyunit.SurveyUnitId;
+import fr.insee.genesis.controller.dto.QuestionnaireWithCampaign;
+import fr.insee.genesis.controller.dto.SurveyUnitId;
 import fr.insee.genesis.domain.model.surveyunit.Variable;
 import fr.insee.genesis.domain.ports.api.SurveyUnitApiPort;
 import fr.insee.genesis.domain.service.surveyunit.SurveyUnitService;