Skip to content

Commit e66036f

Browse files
alicelaalicela
committed
refactor: minor issues
1 parent d477878 commit e66036f

5 files changed

Lines changed: 31 additions & 52 deletions

File tree

‎src/main/java/fr/insee/genesis/domain/service/editedresponse/editedexternal/EditedExternalResponseJsonService.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void readEditedExternalFile(InputStream inputStream,
5959
if(toSave.size() >= BLOCK_SIZE){
6060
savedCount = saveBlock(toSave, savedCount);
6161
}
62-
jsonParser.nextToken(); //skip }
62+
jsonParser.nextToken();
6363
}
6464
editedExternalResponsePersistancePort.saveAll(toSave);
6565
savedCount += toSave.size();
@@ -81,10 +81,10 @@ private static void goToEditedExternalToken(JsonParser jsonParser) throws IOExce
8181
if(jsonParser.currentToken() == null){
8282
throw new GenesisException(400, "editedExternal object not found in JSON");
8383
}
84-
if(jsonParser.currentToken().equals(JsonToken.FIELD_NAME) && jsonParser.currentName() != null){
85-
if (jsonParser.currentName().equals("editedExternal")) {
84+
if(jsonParser.currentToken().equals(JsonToken.FIELD_NAME)
85+
&& jsonParser.currentName() != null
86+
&& jsonParser.currentName().equals("editedExternal")) {
8687
isTokenFound = true;
87-
}
8888
}
8989
}
9090
}
@@ -124,7 +124,7 @@ private EditedExternalResponseModel readNextEditedExternal(JsonParser jsonParser
124124
.questionnaireId(questionnaireId)
125125
.variables(new HashMap<>())
126126
.build();
127-
jsonParser.nextToken(); // read {
127+
jsonParser.nextToken();
128128
while (!jsonParser.currentToken().equals(JsonToken.END_OBJECT)){
129129
if(jsonParser.currentToken().equals(JsonToken.FIELD_NAME) && jsonParser.currentName().equals("interrogationId")){
130130
jsonParser.nextToken();

‎src/main/java/fr/insee/genesis/domain/service/editedresponse/editedprevious/EditedPreviousResponseJsonService.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void readEditedPreviousFile(InputStream inputStream,
6363
if(toSave.size() >= BLOCK_SIZE){
6464
savedCount = saveBlock(toSave, savedCount);
6565
}
66-
jsonParser.nextToken(); //skip }
66+
jsonParser.nextToken();
6767
}
6868
savedCount = saveBlock(toSave, savedCount);
6969
log.info("Reached end of edited previous file, saved %d interrogations".formatted(savedCount));
@@ -102,10 +102,10 @@ private static void goToEditedPreviousToken(JsonParser jsonParser) throws IOExce
102102
if(jsonParser.currentToken() == null){
103103
throw new GenesisException(400, "editedPrevious object not found in JSON");
104104
}
105-
if(jsonParser.currentToken().equals(JsonToken.FIELD_NAME) && jsonParser.currentName() != null){
106-
if (jsonParser.currentName().equals("editedPrevious")) {
105+
if(jsonParser.currentToken().equals(JsonToken.FIELD_NAME)
106+
&& jsonParser.currentName() != null
107+
&& jsonParser.currentName().equals("editedPrevious")) {
107108
isTokenFound = true;
108-
}
109109
}
110110
}
111111
}
@@ -122,7 +122,7 @@ private EditedPreviousResponseModel readNextEditedPrevious(JsonParser jsonParser
122122
.sourceState(sourceState)
123123
.variables(new HashMap<>())
124124
.build();
125-
jsonParser.nextToken(); // read {
125+
jsonParser.nextToken();
126126
while (!jsonParser.currentToken().equals(JsonToken.END_OBJECT)){
127127
if(jsonParser.currentToken().equals(JsonToken.FIELD_NAME) && jsonParser.currentName().equals("interrogationId")){
128128
jsonParser.nextToken();

‎src/main/java/fr/insee/genesis/infrastructure/adapter/EditedExternalResponseMongoAdapter.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void backup(String questionnaireId) {
3434
MatchOperation match = Aggregation.match(Criteria.where("questionnaireId").is(questionnaireId));
3535
MergeOperation merge = Aggregation
3636
.merge()
37-
.intoCollection("editedExternalResponses_%s_backup".formatted(questionnaireId))
37+
.intoCollection(getFormattedCollection(questionnaireId))
3838
.whenMatched(MergeOperation.WhenDocumentsMatch.replaceDocument())
3939
.whenDocumentsDontMatch(MergeOperation.WhenDocumentsDontMatch.insertNewDocument())
4040
.build();
@@ -44,10 +44,14 @@ public void backup(String questionnaireId) {
4444
mongoTemplate.aggregate(aggregation, "editedExternalResponses", EditedExternalResponseDocument.class);
4545
}
4646

47+
private static String getFormattedCollection(String questionnaireId) {
48+
return "editedExternalResponses_%s_backup".formatted(questionnaireId);
49+
}
50+
4751
@Override
4852
public void deleteBackup(String questionnaireId) {
49-
if (mongoTemplate.collectionExists("editedExternalResponses_%s_backup".formatted(questionnaireId))){
50-
mongoTemplate.dropCollection("editedExternalResponses_%s_backup".formatted(questionnaireId));
53+
if (mongoTemplate.collectionExists(getFormattedCollection(questionnaireId))){
54+
mongoTemplate.dropCollection(getFormattedCollection(questionnaireId));
5155
}
5256
}
5357

@@ -63,7 +67,7 @@ public void restoreBackup(String questionnaireId) {
6367

6468
Aggregation aggregation = Aggregation.newAggregation(merge);
6569

66-
mongoTemplate.aggregate(aggregation, "editedExternalResponses_%s_backup".formatted(questionnaireId),
70+
mongoTemplate.aggregate(aggregation, getFormattedCollection(questionnaireId),
6771
EditedExternalResponseDocument.class);
6872
}
6973

‎src/main/java/fr/insee/genesis/infrastructure/adapter/EditedPreviousResponseMongoAdapter.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void backup(String questionnaireId) {
3434
MatchOperation match = Aggregation.match(Criteria.where("questionnaireId").is(questionnaireId));
3535
MergeOperation merge = Aggregation
3636
.merge()
37-
.intoCollection("editedPreviousResponses_%s_backup".formatted(questionnaireId))
37+
.intoCollection(getFormattedCollection(questionnaireId))
3838
.whenMatched(MergeOperation.WhenDocumentsMatch.replaceDocument())
3939
.whenDocumentsDontMatch(MergeOperation.WhenDocumentsDontMatch.insertNewDocument())
4040
.build();
@@ -44,10 +44,14 @@ public void backup(String questionnaireId) {
4444
mongoTemplate.aggregate(aggregation, "editedPreviousResponses", EditedPreviousResponseDocument.class);
4545
}
4646

47+
private static String getFormattedCollection(String questionnaireId) {
48+
return "editedPreviousResponses_%s_backup".formatted(questionnaireId);
49+
}
50+
4751
@Override
4852
public void deleteBackup(String questionnaireId) {
49-
if (mongoTemplate.collectionExists("editedPreviousResponses_%s_backup".formatted(questionnaireId))){
50-
mongoTemplate.dropCollection("editedPreviousResponses_%s_backup".formatted(questionnaireId));
53+
if (mongoTemplate.collectionExists(getFormattedCollection(questionnaireId))){
54+
mongoTemplate.dropCollection(getFormattedCollection(questionnaireId));
5155
}
5256
}
5357

@@ -63,7 +67,7 @@ public void restoreBackup(String questionnaireId) {
6367

6468
Aggregation aggregation = Aggregation.newAggregation(merge);
6569

66-
mongoTemplate.aggregate(aggregation, "editedPreviousResponses_%s_backup".formatted(questionnaireId),
70+
mongoTemplate.aggregate(aggregation, getFormattedCollection(questionnaireId),
6771
EditedPreviousResponseDocument.class);
6872
}
6973

‎src/test/java/fr/insee/genesis/controller/rest/responses/EditedResponseControllerTest.java‎

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import lombok.extern.slf4j.Slf4j;
2020
import org.assertj.core.api.Assertions;
2121
import org.junit.jupiter.api.BeforeEach;
22+
import org.junit.jupiter.api.DisplayName;
2223
import org.junit.jupiter.api.Test;
2324
import org.junit.jupiter.params.ParameterizedTest;
2425
import org.junit.jupiter.params.provider.ValueSource;
@@ -392,26 +393,12 @@ void readPreviousJson_not_a_json(){
392393
Assertions.assertThat(response.getStatusCode().value()).isEqualTo(400);
393394
}
394395

395-
@Test
396-
@SneakyThrows
397-
void readPreviousJson_no_interrogation_id(){
398-
String fileName = "no_interrogationId.json";
399-
//GIVEN
400-
Files.createDirectories(SOURCE_PATH_PREVIOUS);
401-
Files.copy(
402-
Path.of(TestConstants.TEST_RESOURCES_DIRECTORY).resolve("edited_previous").resolve(fileName),
403-
SOURCE_PATH_PREVIOUS.resolve(fileName),
404-
StandardCopyOption.REPLACE_EXISTING
405-
);
406396

407-
//WHEN + THEN
408-
ResponseEntity<Object> response = editedResponseController.readEditedPreviousJson(QUESTIONNAIRE_ID_PREVIOUS, Mode.WEB, null, fileName);
409-
Assertions.assertThat(response.getStatusCode().value()).isEqualTo(400);
410-
}
411-
@Test
412397
@SneakyThrows
413-
void readPreviousJson_only_one_interrogation_id(){
414-
String fileName = "only_one_interrogationId.json";
398+
@ParameterizedTest
399+
@ValueSource(strings = {"no_interrogationId.json", "only_one_interrogationId.json", "double_interrogationId.json"})
400+
@DisplayName("Previous json return 400 if no interrogationId, only one interrogationId, or double interrogationId")
401+
void readPreviousJson_no_interrogation_id(String fileName){
415402
//GIVEN
416403
Files.createDirectories(SOURCE_PATH_PREVIOUS);
417404
Files.copy(
@@ -425,22 +412,6 @@ void readPreviousJson_only_one_interrogation_id(){
425412
Assertions.assertThat(response.getStatusCode().value()).isEqualTo(400);
426413
}
427414

428-
@Test
429-
@SneakyThrows
430-
void readPreviousJson_double_interrogation_id(){
431-
String fileName = "double_interrogationId.json";
432-
//GIVEN
433-
Files.createDirectories(SOURCE_PATH_PREVIOUS);
434-
Files.copy(
435-
Path.of(TestConstants.TEST_RESOURCES_DIRECTORY).resolve("edited_previous").resolve(fileName),
436-
SOURCE_PATH_PREVIOUS.resolve(fileName),
437-
StandardCopyOption.REPLACE_EXISTING
438-
);
439-
440-
//WHEN + THEN
441-
ResponseEntity<Object> response = editedResponseController.readEditedPreviousJson(QUESTIONNAIRE_ID_PREVIOUS, Mode.WEB, null, fileName);
442-
Assertions.assertThat(response.getStatusCode().value()).isEqualTo(400);
443-
}
444415

445416
//EXTERNAL
446417
@Test

0 commit comments

Comments
 (0)