Skip to content

ResponseController refacto #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amarchal-insee wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ResponseController refacto #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
354 changes: 38 additions & 316 deletions src/main/java/fr/insee/genesis/controller/rest/responses/ResponseController.java
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 13 additions & 4 deletions src/main/java/fr/insee/genesis/domain/ports/api/SurveyUnitApiPort.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
package fr.insee.genesis.domain.ports.api;

import fr.insee.bpm.metadata.model.VariablesMap;
import fr.insee.genesis.controller.dto.CampaignWithQuestionnaire;
import fr.insee.genesis.controller.dto.*;
import fr.insee.genesis.domain.model.surveyunit.InterrogationId;
import fr.insee.genesis.controller.dto.QuestionnaireWithCampaign;
import fr.insee.genesis.controller.dto.SurveyUnitDto;
import fr.insee.genesis.controller.dto.SurveyUnitInputDto;
import fr.insee.genesis.domain.model.surveyunit.Mode;
import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
import fr.insee.genesis.exceptions.GenesisException;
import fr.insee.genesis.exceptions.NoDataException;

import java.util.List;
import java.util.Set;
Expand Down Expand Up @@ -84,4 +82,15 @@ List<SurveyUnitModel> parseEditedVariables(SurveyUnitInputDto surveyUnitInputDto
String findQuestionnaireIdByInterrogationId(String interrogationId) throws GenesisException;

Set<String> findCampaignIdsFrom(SurveyUnitInputDto dto);

void saveResponsesFromXmlFile(String xmlFile, String metadataFilePath, Mode modeSpecified, boolean withDDI) throws Exception;

boolean saveResponsesFromXmlCampaignFolder(String campaignName, Mode modeSpecified) throws Exception;

void saveResponsesFromAllCampaignFolders() throws NoDataException, GenesisException;

SurveyUnitQualityToolDto findResponsesByInterrogationAndQuestionnaireLatestStates(String interrogationId, String questionnaireId) throws GenesisException;

void saveEditedVariables(SurveyUnitInputDto surveyUnitInputDto) throws GenesisException;

}
370 changes: 360 additions & 10 deletions src/main/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitService.java
View file
Open in desktop

Large diffs are not rendered by default.

25 changes: 24 additions & 1 deletion src/test/java/cucumber/functional_tests/LunaticModelDefinitions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,23 @@
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import fr.insee.genesis.TestConstants;
import fr.insee.genesis.configuration.Config;
import fr.insee.genesis.controller.rest.LunaticModelController;
import fr.insee.genesis.controller.rest.responses.QuestionnaireController;
import fr.insee.genesis.controller.services.MetadataService;
import fr.insee.genesis.controller.utils.AuthUtils;
import fr.insee.genesis.controller.utils.ControllerUtils;
import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
import fr.insee.genesis.domain.ports.api.DataProcessingContextApiPort;
import fr.insee.genesis.domain.service.context.DataProcessingContextService;
import fr.insee.genesis.domain.service.lunaticmodel.LunaticModelService;
import fr.insee.genesis.domain.service.surveyunit.SurveyUnitQualityService;
import fr.insee.genesis.domain.service.surveyunit.SurveyUnitService;
import fr.insee.genesis.domain.utils.JsonUtils;
import fr.insee.genesis.infrastructure.document.lunaticmodel.LunaticModelDocument;
import fr.insee.genesis.infrastructure.utils.FileUtils;
import fr.insee.genesis.stubs.ConfigStub;
import fr.insee.genesis.stubs.DataProcessingContextPersistancePortStub;
import fr.insee.genesis.stubs.LunaticModelPersistanceStub;
import fr.insee.genesis.stubs.SurveyUnitPersistencePortStub;
import io.cucumber.java.Before;
Expand Down Expand Up @@ -46,11 +53,27 @@ public class LunaticModelDefinitions {
LunaticModelController lunaticModelController = new LunaticModelController(new LunaticModelService(lunaticModelPersistanceStub));

SurveyUnitPersistencePortStub surveyUnitPersistencePortStub = new SurveyUnitPersistencePortStub();

Config config = new ConfigStub();
FileUtils fileUtils = new FileUtils(config);
SurveyUnitQualityService surveyUnitQualityService = new SurveyUnitQualityService();
DataProcessingContextPersistancePortStub dataProcessingContextPersistancePortStub =
new DataProcessingContextPersistancePortStub();
DataProcessingContextApiPort dataProcessingContextApiPort = new DataProcessingContextService(
dataProcessingContextPersistancePortStub,
surveyUnitPersistencePortStub
);


QuestionnaireController questionnaireController = new QuestionnaireController(
new SurveyUnitService(
surveyUnitPersistencePortStub,
new MetadataService(),
new FileUtils(new ConfigStub())
fileUtils,
dataProcessingContextApiPort,
surveyUnitQualityService,
new ControllerUtils(fileUtils),
new AuthUtils(config)
)
);

Expand Down
19 changes: 11 additions & 8 deletions src/test/java/cucumber/functional_tests/MainDefinitions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,21 @@ public class MainDefinitions {
);

Config config = new ConfigStub();
FileUtils fileUtils = new FileUtils(config);
ResponseEntity<List<SurveyUnitModel>> surveyUnitModelResponse;
ResponseEntity<Object> surveyUnitLatestStatesResponse;

ResponseController responseController = new ResponseController(
new SurveyUnitService(surveyUnitPersistence, new MetadataService(), new FileUtils(config)),
surveyUnitQualityService,
new FileUtils(config),
new ControllerUtils(new FileUtils(config)),
new AuthUtils(config),
SurveyUnitService surveyUnitService = new SurveyUnitService(
surveyUnitPersistence,
new MetadataService(),
dataProcessingContextApiPort
);
fileUtils,
dataProcessingContextApiPort,
surveyUnitQualityService,
new ControllerUtils(fileUtils),
new AuthUtils(config)
);

ResponseController responseController = new ResponseController(surveyUnitService);

List<SurveyUnitModel> surveyUnitModels;

Expand Down
17 changes: 16 additions & 1 deletion src/test/java/cucumber/functional_tests/RawDataDefinitions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@
import fr.insee.genesis.configuration.Config;
import fr.insee.genesis.controller.rest.responses.RawResponseController;
import fr.insee.genesis.controller.services.MetadataService;
import fr.insee.genesis.controller.utils.AuthUtils;
import fr.insee.genesis.controller.utils.ControllerUtils;
import fr.insee.genesis.domain.model.surveyunit.DataState;
import fr.insee.genesis.domain.model.surveyunit.Mode;
import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
import fr.insee.genesis.domain.model.surveyunit.VariableModel;
import fr.insee.genesis.domain.ports.api.DataProcessingContextApiPort;
import fr.insee.genesis.domain.service.context.DataProcessingContextService;
import fr.insee.genesis.domain.service.rawdata.LunaticJsonRawDataService;
import fr.insee.genesis.domain.service.surveyunit.SurveyUnitQualityService;
Expand Down Expand Up @@ -66,11 +68,24 @@ public class RawDataDefinitions {
DataProcessingContextPersistancePortStub contextStub = new DataProcessingContextPersistancePortStub();
Config config = new ConfigStub();
FileUtils fileUtils = new FileUtils(config);
SurveyUnitService surveyUnitService = new SurveyUnitService(surveyUnitPersistencePortStub, metadataService, fileUtils);
ControllerUtils controllerUtils = new ControllerUtils(fileUtils);
SurveyUnitQualityService surveyUnitQualityService = new SurveyUnitQualityService();
DataProcessingContextPersistancePortStub dataProcessingContextPersistancePortStub =
new DataProcessingContextPersistancePortStub();
DataProcessingContextApiPort dataProcessingContextApiPort = new DataProcessingContextService(
dataProcessingContextPersistancePortStub,
surveyUnitPersistencePortStub
);
SurveyUnitService surveyUnitService = new SurveyUnitService(
surveyUnitPersistencePortStub,
metadataService,
fileUtils,
dataProcessingContextApiPort,
surveyUnitQualityService,
controllerUtils,
new AuthUtils(config));


SurveyUnitQualityToolPerretAdapterStub surveyUnitQualityToolPerretAdapterStub = new SurveyUnitQualityToolPerretAdapterStub();
LunaticJsonRawDataService lunaticJsonRawDataService =
new LunaticJsonRawDataService(
Expand Down
20 changes: 19 additions & 1 deletion src/test/java/fr/insee/genesis/controller/rest/HealthCheckControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
package fr.insee.genesis.controller.rest;

import fr.insee.genesis.configuration.Config;
import fr.insee.genesis.controller.services.MetadataService;
import fr.insee.genesis.controller.utils.AuthUtils;
import fr.insee.genesis.controller.utils.ControllerUtils;
import fr.insee.genesis.domain.model.surveyunit.DataState;
import fr.insee.genesis.domain.model.surveyunit.Mode;
import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
import fr.insee.genesis.domain.model.surveyunit.VariableModel;
import fr.insee.genesis.domain.ports.api.DataProcessingContextApiPort;
import fr.insee.genesis.domain.ports.api.SurveyUnitApiPort;
import fr.insee.genesis.domain.service.context.DataProcessingContextService;
import fr.insee.genesis.domain.service.surveyunit.SurveyUnitQualityService;
import fr.insee.genesis.domain.service.surveyunit.SurveyUnitService;
import fr.insee.genesis.infrastructure.utils.FileUtils;
import fr.insee.genesis.stubs.ConfigStub;
Expand All @@ -27,14 +32,27 @@ class HealthCheckControllerTest {
static HealthCheckController healthCheckController;

static SurveyUnitPersistencePortStub surveyUnitPersistencePortStub;
static Config config = new ConfigStub();
static FileUtils fileUtils = new FileUtils(config);
static SurveyUnitQualityService surveyUnitQualityService = new SurveyUnitQualityService();
static DataProcessingContextPersistancePortStub dataProcessingContextPersistancePortStub =
new DataProcessingContextPersistancePortStub();
static DataProcessingContextApiPort dataProcessingContextApiPort = new DataProcessingContextService(
dataProcessingContextPersistancePortStub,
surveyUnitPersistencePortStub
);

@BeforeAll
static void init() {
surveyUnitPersistencePortStub = new SurveyUnitPersistencePortStub();
SurveyUnitApiPort surveyUnitApiPort = new SurveyUnitService(
surveyUnitPersistencePortStub,
new MetadataService(),
new FileUtils(new ConfigStub())
fileUtils,
dataProcessingContextApiPort,
surveyUnitQualityService,
new ControllerUtils(fileUtils),
new AuthUtils(config)
);
List<VariableModel> externalVariableList = new ArrayList<>();
VariableModel variable = VariableModel.builder()
Expand Down
30 changes: 27 additions & 3 deletions src/test/java/fr/insee/genesis/controller/rest/UtilsControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@

import cucumber.TestConstants;
import fr.insee.genesis.Constants;
import fr.insee.genesis.configuration.Config;
import fr.insee.genesis.controller.utils.AuthUtils;
import fr.insee.genesis.domain.model.surveyunit.InterrogationId;
import fr.insee.genesis.controller.services.MetadataService;
import fr.insee.genesis.controller.utils.ControllerUtils;
import fr.insee.genesis.domain.model.surveyunit.DataState;
import fr.insee.genesis.domain.model.surveyunit.Mode;
import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
import fr.insee.genesis.domain.model.surveyunit.VariableModel;
import fr.insee.genesis.domain.ports.api.DataProcessingContextApiPort;
import fr.insee.genesis.domain.ports.api.LunaticJsonRawDataApiPort;
import fr.insee.genesis.domain.ports.api.SurveyUnitApiPort;
import fr.insee.genesis.domain.ports.spi.DataProcessingContextPersistancePort;
Expand Down Expand Up @@ -50,11 +53,25 @@ class UtilsControllerTest {
static DataProcessingContextPersistancePort contextStub = new DataProcessingContextPersistancePortStub();
static SurveyUnitQualityToolPerretAdapterStub surveyUnitQualityToolPerretAdapterStub;
static List<InterrogationId> interrogationIdList;
static FileUtils fileUtils = new FileUtils(new ConfigStub());
static Config config = new ConfigStub();
static FileUtils fileUtils = new FileUtils(config);
static ControllerUtils controllerUtils = new ControllerUtils(fileUtils);
static MetadataService metadataService = new MetadataService();
static SurveyUnitService surveyUnitService = new SurveyUnitService(new SurveyUnitPersistencePortStub(), metadataService, fileUtils);

static DataProcessingContextApiPort dataProcessingContextApiPort = new DataProcessingContextService(
new DataProcessingContextPersistancePortStub(),
surveyUnitPersistencePortStub
);
static SurveyUnitQualityService surveyUnitQualityService = new SurveyUnitQualityService();
static SurveyUnitService surveyUnitService = new SurveyUnitService(
new SurveyUnitPersistencePortStub(),
metadataService,
fileUtils,
dataProcessingContextApiPort,
surveyUnitQualityService,
controllerUtils,
new AuthUtils(config));

//Constants
static final String DEFAULT_INTERROGATION_ID = "TESTINTERROGATIONID";
static final String DEFAULT_QUESTIONNAIRE_ID = "TESTQUESTIONNAIREID";
Expand All @@ -63,7 +80,14 @@ class UtilsControllerTest {
static void init() {
surveyUnitPersistencePortStub = new SurveyUnitPersistencePortStub();
lunaticJsonRawDataPersistencePort = new LunaticJsonRawDataPersistanceStub();
SurveyUnitApiPort surveyUnitApiPort = new SurveyUnitService(surveyUnitPersistencePortStub, metadataService, fileUtils);
SurveyUnitApiPort surveyUnitApiPort = new SurveyUnitService(
surveyUnitPersistencePortStub,
metadataService,
fileUtils,
dataProcessingContextApiPort,
surveyUnitQualityService,
controllerUtils,
new AuthUtils(config));
LunaticJsonRawDataApiPort lunaticJsonRawDataApiPort = new LunaticJsonRawDataService(
lunaticJsonRawDataPersistencePort,
controllerUtils,
Expand Down
22 changes: 21 additions & 1 deletion src/test/java/fr/insee/genesis/controller/rest/responses/CampaignControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
package fr.insee.genesis.controller.rest.responses;

import fr.insee.genesis.configuration.Config;
import fr.insee.genesis.controller.dto.CampaignWithQuestionnaire;
import fr.insee.genesis.controller.services.MetadataService;
import fr.insee.genesis.controller.utils.AuthUtils;
import fr.insee.genesis.controller.utils.ControllerUtils;
import fr.insee.genesis.domain.ports.api.DataProcessingContextApiPort;
import fr.insee.genesis.domain.ports.api.SurveyUnitApiPort;
import fr.insee.genesis.domain.service.context.DataProcessingContextService;
import fr.insee.genesis.domain.service.surveyunit.SurveyUnitQualityService;
import fr.insee.genesis.domain.service.surveyunit.SurveyUnitService;
import fr.insee.genesis.infrastructure.utils.FileUtils;
import fr.insee.genesis.stubs.ConfigStub;
import fr.insee.genesis.stubs.DataProcessingContextPersistancePortStub;
import fr.insee.genesis.stubs.SurveyUnitPersistencePortStub;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
Expand All @@ -22,6 +29,15 @@ class CampaignControllerTest {
static CampaignController campaignControllerStatic;
static SurveyUnitPersistencePortStub surveyUnitPersistencePortStub;

static Config config = new ConfigStub();
static FileUtils fileUtils = new FileUtils(config);
static DataProcessingContextPersistancePortStub dataProcessingContextPersistancePortStub =
new DataProcessingContextPersistancePortStub();
static DataProcessingContextApiPort dataProcessingContextApiPort = new DataProcessingContextService(
dataProcessingContextPersistancePortStub,
surveyUnitPersistencePortStub
);

//Constants
static final String DEFAULT_INTERROGATION_ID = "TESTINTERROGATIONID";
static final String DEFAULT_QUESTIONNAIRE_ID = "TESTQUESTIONNAIREID";
Expand All @@ -32,7 +48,11 @@ static void init() {
SurveyUnitApiPort surveyUnitApiPort = new SurveyUnitService(
surveyUnitPersistencePortStub,
new MetadataService(),
new FileUtils(new ConfigStub())
fileUtils,
dataProcessingContextApiPort,
new SurveyUnitQualityService(),
new ControllerUtils(fileUtils),
new AuthUtils(config)
);

campaignControllerStatic = new CampaignController( surveyUnitApiPort );
Expand Down
22 changes: 21 additions & 1 deletion src/test/java/fr/insee/genesis/controller/rest/responses/InterrogationControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
package fr.insee.genesis.controller.rest.responses;

import fr.insee.genesis.configuration.Config;
import fr.insee.genesis.controller.utils.AuthUtils;
import fr.insee.genesis.controller.utils.ControllerUtils;
import fr.insee.genesis.domain.model.surveyunit.InterrogationId;
import fr.insee.genesis.controller.services.MetadataService;
import fr.insee.genesis.domain.ports.api.DataProcessingContextApiPort;
import fr.insee.genesis.domain.ports.api.SurveyUnitApiPort;
import fr.insee.genesis.domain.service.context.DataProcessingContextService;
import fr.insee.genesis.domain.service.surveyunit.SurveyUnitQualityService;
import fr.insee.genesis.domain.service.surveyunit.SurveyUnitService;
import fr.insee.genesis.infrastructure.utils.FileUtils;
import fr.insee.genesis.stubs.ConfigStub;
import fr.insee.genesis.stubs.DataProcessingContextPersistancePortStub;
import fr.insee.genesis.stubs.SurveyUnitPersistencePortStub;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
Expand All @@ -24,13 +31,26 @@ class InterrogationControllerTest {
static InterrogationController interrogationControllerStatic;
static SurveyUnitPersistencePortStub surveyUnitPersistencePortStub;

static Config config = new ConfigStub();
static FileUtils fileUtils = new FileUtils(config);
static DataProcessingContextPersistancePortStub dataProcessingContextPersistancePortStub =
new DataProcessingContextPersistancePortStub();
static DataProcessingContextApiPort dataProcessingContextApiPort = new DataProcessingContextService(
dataProcessingContextPersistancePortStub,
surveyUnitPersistencePortStub
);

@BeforeAll
static void init() {
surveyUnitPersistencePortStub = new SurveyUnitPersistencePortStub();
SurveyUnitApiPort surveyUnitApiPort = new SurveyUnitService(
surveyUnitPersistencePortStub,
new MetadataService(),
new FileUtils(new ConfigStub())
fileUtils,
dataProcessingContextApiPort,
new SurveyUnitQualityService(),
new ControllerUtils(fileUtils),
new AuthUtils(config)
);

interrogationControllerStatic = new InterrogationController( surveyUnitApiPort );
Expand Down
Loading
Loading