Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ public interface LunaticJsonRawDataApiPort {
Set<String> findDistinctQuestionnaireIds();
long countResponsesByQuestionnaireId(String campaignId);
Page<LunaticJsonRawDataModel> findRawDataByCampaignIdAndDate(String campaignId, Instant startDt, Instant endDt, Pageable pageable);

DataProcessResult processRawData(String campaignName, List<String> interrogationIdList, List<GenesisError> errors) throws GenesisException;
Map<String, List<String>> findProcessedIdsgroupedByQuestionnaireSince(LocalDateTime since);
}
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,9 @@ private static void convertListVar(Object valuesForState, Map.Entry<String, Obje
if (!values.isEmpty()) {
int iteration = 1;
for (String value : values) {
convertOneVar(collectedVariable, value, variablesMap, iteration, dstSurveyUnitModel);
if (value!=null) {
convertOneVar(collectedVariable, value, variablesMap, iteration, dstSurveyUnitModel);
}
iteration++;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/fr/insee/genesis/domain/utils/JsonUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public static Map<String, Object> asMap(Object obj) {
public static List<String> asStringList(Object obj) {
if (obj instanceof List<?> list) {
return list.stream()
.map(e -> e == null ? "" : String.valueOf(e))
.map(e -> e == null ? null : String.valueOf(e))
.toList();
}
throw new IllegalArgumentException("Object is not a List");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void asStringList_shouldConvertValidList() {
log.info("test");
List<String> result = JsonUtils.asStringList(obj);

Assertions.assertThat(result).containsExactly("1", "text", "");
Assertions.assertThat(result).containsExactly("1", "text", null);
}

@Test
Expand Down
Loading