🐛: FIX: Only facilities without regions/districts can be patched.

- Reversed condition for cron activation
- copy-paste issue in log
- NPE exception for some occurrences

Author: Pa-Touche

sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java

@@ -57,7 +57,7 @@ private void init() {
 					.collect(Collectors.toList())),
 			Map.entry(
 				FacilityReferenceDto.class,
-				() -> getInstance(FacilityFacade.class).getAllWithoutRegionAfter(DATE_ALL_VALUES)
+				() -> getInstance(FacilityFacade.class).getAllAfter(DATE_ALL_VALUES)
 					.stream()
 					.map(FacilityDto::toReference)
 					.collect(Collectors.toList())),

sormas-backend/src/main/java/de/symeda/sormas/backend/common/CronService.java

@@ -235,7 +235,7 @@ public void fetchExternalMessages() {
 	@Schedule(hour = "*", persistent = false)
 	public void fetchSurveyResponses() {
 		if (!featureConfigurationFacade.isFeatureEnabled(FeatureType.EXTERNAL_MESSAGES)
-			|| featureConfigurationFacade.isPropertyValueTrue(FeatureType.EXTERNAL_MESSAGES, FeatureTypeProperty.SURVEY_FETCH_ENABLED)) {
+			|| !featureConfigurationFacade.isPropertyValueTrue(FeatureType.EXTERNAL_MESSAGES, FeatureTypeProperty.SURVEY_FETCH_ENABLED)) {
 			logger.info("External messages are disabled, survey responses will not be fetched");
 			return;
 		}

sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java

@@ -388,12 +388,12 @@ public List<ExternalMessageDto> saveAndProcessSurveyResponses(Date since) {
 
 			processingResults.forEach(wrapper -> {
 				ProcessingResultStatus result = wrapper.getResultStatus();
-				if (result.isCanceled()) {
+				if (result == null || result.isCanceled()) {
 					logger.error("Processing of surveyResponse with UUID {} has been canceled", wrapper.getExternalMessage().getUuid());
 				}
 			});
 		} catch (InterruptedException e) {
-			logger.error("Could not process lab message with UUID [{}]", extractUuids(filteredSurveyResponses), e);
+			logger.error("Could not process survey responses with UUID [{}]", extractUuids(filteredSurveyResponses), e);
 			Thread.currentThread().interrupt();
 		} catch (ExecutionException e) {
 			logger.error("Could not process survey responses with UUID [{}]", extractUuids(filteredSurveyResponses), e);

sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java

@@ -1,6 +1,10 @@
 package de.symeda.sormas.backend.externalmessage.survey;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 
@@ -9,8 +13,6 @@
 import javax.inject.Inject;
 import javax.transaction.Transactional;
 
-import de.symeda.sormas.backend.survey.SurveyFacadeEjb;
-import de.symeda.sormas.backend.survey.SurveyTokenFacadeEjb;
 import org.apache.commons.collections4.CollectionUtils;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
@@ -24,12 +26,12 @@
 import de.symeda.sormas.api.patch.CaseDataPatchRequest;
 import de.symeda.sormas.api.patch.DataPatchResponse;
 import de.symeda.sormas.api.patch.DataPatcher;
-import de.symeda.sormas.api.survey.SurveyFacade;
 import de.symeda.sormas.api.survey.SurveyReferenceDto;
 import de.symeda.sormas.api.survey.SurveyTokenDto;
-import de.symeda.sormas.api.survey.SurveyTokenFacade;
 import de.symeda.sormas.api.utils.Tuple;
 import de.symeda.sormas.api.utils.dataprocessing.ProcessingResultStatus;
+import de.symeda.sormas.backend.survey.SurveyFacadeEjb;
+import de.symeda.sormas.backend.survey.SurveyTokenFacadeEjb;
 import de.symeda.sormas.backend.util.CollectorUtils;
 
 /**
@@ -146,6 +148,10 @@ public List<SurveyResponseProcessingResult> processSurveyResponses(List<External
 				"Exception while patching survey response for external message: [{}]. Processing will continue for other messages",
 				externalMessage.getUuid(),
 				e);
+
+			// in case of failure status must be changed to unprocessed
+			externalMessage.setStatus(ExternalMessageStatus.UNPROCESSED);
+
 			surveyResponseProcessingResult.setRuntimeException(e);
 		}