Skip to content

Commit f8433bf

Browse files
committed
refactor: renamed method
1 parent 53ca66b commit f8433bf

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/main/java/fr/insee/genesis/controller/rest/responses/ResponseController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ public ResponseEntity<Object> saveEditedVariables(
392392
String campaignId = campaignIds.iterator().next();
393393
surveyUnitInputDto.setCampaignId(campaignId);
394394

395-
MetadataModel metadataModel = metadataService.load(
395+
MetadataModel metadataModel = metadataService.loadAndSaveIfNotExists(
396396
surveyUnitInputDto.getCampaignId(),
397397
surveyUnitInputDto.getQuestionnaireId(),
398398
surveyUnitInputDto.getMode(),
@@ -583,7 +583,7 @@ private VariablesMap getVariablesMap(Mode modeSpecified,
583583
}
584584
VariablesMap variablesMap;
585585
List<GenesisError> genesisErrors = new ArrayList<>();
586-
MetadataModel metadataModel = metadataService.load(
586+
MetadataModel metadataModel = metadataService.loadAndSaveIfNotExists(
587587
campaign.getCampaignId(),
588588
surveyUnit.getQuestionnaireModelId(),
589589
modeSpecified,

src/main/java/fr/insee/genesis/domain/ports/api/QuestionnaireMetadataApiPort.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
public interface QuestionnaireMetadataApiPort {
1212
MetadataModel find(String questionnaireId, Mode mode) throws GenesisException;
13-
MetadataModel load(String campaignName, String questionnaireId, Mode mode, FileUtils fileUtils,
14-
List<GenesisError> errors) throws GenesisException;
13+
MetadataModel loadAndSaveIfNotExists(String campaignName, String questionnaireId, Mode mode, FileUtils fileUtils,
14+
List<GenesisError> errors) throws GenesisException;
1515
void remove(String questionnaireId, Mode mode);
1616

1717
void save(String questionnaireId, Mode mode, MetadataModel metadataModel);

src/main/java/fr/insee/genesis/domain/service/metadata/QuestionnaireMetadataService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ public MetadataModel find(String questionnaireId, Mode mode) throws GenesisExcep
4444
}
4545

4646
@Override
47-
public MetadataModel load(String campaignName, String questionnaireId, Mode mode, FileUtils fileUtils,
48-
List<GenesisError> errors) throws GenesisException {
47+
public MetadataModel loadAndSaveIfNotExists(String campaignName, String questionnaireId, Mode mode, FileUtils fileUtils,
48+
List<GenesisError> errors) throws GenesisException {
4949
List<QuestionnaireMetadataModel> questionnaireMetadataModels =
5050
questionnaireMetadataPersistancePort.find(questionnaireId.toUpperCase(), mode);
5151
if(questionnaireMetadataModels.isEmpty() || questionnaireMetadataModels.getFirst().metadataModel() == null){

src/main/java/fr/insee/genesis/domain/service/rawdata/LunaticJsonRawDataService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public DataProcessResult processRawData(String campaignName, List<String> interr
107107
List<Mode> modesList = controllerUtils.getModesList(campaignName, null);
108108
for (Mode mode : modesList) {
109109
//Load and save metadata into database, throw exception if none
110-
VariablesMap variablesMap = metadataService.load(campaignName, campaignName, mode, fileUtils,
110+
VariablesMap variablesMap = metadataService.loadAndSaveIfNotExists(campaignName, campaignName, mode, fileUtils,
111111
errors).getVariables();
112112
if (variablesMap == null) {
113113
throw new GenesisException(400,

src/main/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ public SurveyUnitDto findLatestValuesByStateByIdAndByQuestionnaireId(String inte
251251
VariablesMap variablesMap = null;
252252
for (SurveyUnitModel surveyUnitModel : suByMode) {
253253
if (variablesMap == null) {
254-
variablesMap = metadataService.load(
254+
variablesMap = metadataService.loadAndSaveIfNotExists(
255255
surveyUnitModel.getCampaignId(),
256256
surveyUnitModel.getQuestionnaireId(),
257257
surveyUnitModel.getMode(),

0 commit comments

Comments
 (0)