Skip to content

Commit e1fab5e

Browse files
committed
fix: validation date parsing
1 parent 188d756 commit e1fab5e

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
import java.io.IOException;
3333
import java.time.LocalDateTime;
34+
import java.time.format.DateTimeFormatter;
3435
import java.util.ArrayList;
3536
import java.util.HashMap;
3637
import java.util.HashSet;
@@ -322,7 +323,7 @@ private static Boolean getIsCapturedIndirectly(RawResponse rawResponse) {
322323
private static LocalDateTime getValidationDate(RawResponse rawResponse) {
323324
try{
324325
return rawResponse.payload().get("validationDate") == null ? null :
325-
LocalDateTime.parse(rawResponse.payload().get("validationDate").toString());
326+
LocalDateTime.parse(rawResponse.payload().get("validationDate").toString(), DateTimeFormatter.ISO_OFFSET_DATE_TIME);
326327
}catch(Exception e){
327328
log.warn("Exception when parsing validation date : {}",e.toString());
328329
return null;

src/test/java/fr/insee/genesis/domain/service/rawdata/RawResponseServiceUnitTest.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,11 @@ private List<SurveyUnitModel> whenProcessRawResponsesCollectionInstrumentId() th
297297
private void processRawResponsesThen(RawResponseDto.QuestionnaireStateEnum questionnaireState,
298298
List<SurveyUnitModel> createdModels) {
299299
Assertions.assertThat(createdModels).hasSize(1);
300-
Assertions.assertThat(createdModels.getFirst().getValidationDate()).isEqualTo(
301-
LocalDateTime.parse(TEST_VALIDATION_DATE, DateTimeFormatter.ISO_OFFSET_DATE_TIME)
302-
);
300+
if(questionnaireState.equals(RawResponseDto.QuestionnaireStateEnum.FINISHED)){
301+
Assertions.assertThat(createdModels.getFirst().getValidationDate()).isEqualTo(
302+
LocalDateTime.parse(TEST_VALIDATION_DATE, DateTimeFormatter.ISO_OFFSET_DATE_TIME)
303+
);
304+
}
303305
Assertions.assertThat(createdModels.getFirst().getQuestionnaireState()).isEqualTo(questionnaireState);
304306
}
305307
private void processRawResponsesThenValidationDateNull(

0 commit comments

Comments
 (0)