missing error-message

Author: Pa-Touche

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

@@ -12,8 +12,6 @@
 import javax.ejb.EJB;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
 import javax.transaction.Transactional;
 
 import org.apache.commons.collections4.CollectionUtils;
@@ -35,7 +33,6 @@
 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.ModelConstants;
 
 /**
  * Performs the coordinating for patch operations out of Survey-responses.
@@ -54,9 +51,6 @@ public class AutomaticSurveyResponseProcessor {
 	@EJB
 	private SurveyTokenFacadeEjb.SurveyTokenFacadeEjbLocal surveyTokenFacade;
 
-	@PersistenceContext(unitName = ModelConstants.PERSISTENCE_UNIT_NAME)
-	private EntityManager em;
-
 	public AutomaticSurveyResponseProcessor() {
 	}
 

sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java

@@ -312,14 +312,15 @@ private <T extends EntityDto> T saveDirectEntity(@NotNull EntityDto entityDto) {
 	public void save(@NotNull List<Tuple<Integer, EntityDto>> entityDtosByKey) {
 		List<Tuple<Integer, EntityDto>> dtosInProgress = new ArrayList<>(entityDtosByKey);
 
+		// ordering is important: root entities must be saved first to avoid OutdatedEntityException as leaf entities seem to update the case.
 		List<Tuple<Integer, EntityDto>> orderedRootEntities = entityDtosByKey.stream()
 			.filter(tuple -> leafAttacherDictionary.keySet().stream().noneMatch(leafClass -> leafClass.isInstance(tuple.getSecond())))
 			.sorted(Comparator.comparing(Tuple::getSecond, new EntityDtoTypeComparator()))
 			.collect(Collectors.toList());
 
 		orderedRootEntities.stream().map(Tuple::getSecond).forEach(this::saveDirectEntity);
 
-		// once it's done, leaf entities can be saved.
+		// once it's done, leaf entities can be saved, as updating root entities will not break
 		leafAttacherDictionary.forEach((leafClass, attacher) -> {
 			List<Tuple<Integer, EntityDto>> leaves =
 				dtosInProgress.stream().filter(t -> leafClass.isInstance(t.getSecond())).collect(Collectors.toList());

sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java

@@ -125,7 +125,7 @@ public DataPatchResponse patch(CaseDataPatchRequest request) {
 
 		List<PlainSinglePatchResult> patchingTuples = computePatchingTuples(request);
 
-		logger.debug("Computed patchingTuples: [{}]", patchingTuples);
+		logger.trace("Computed patchingTuples: [{}]", patchingTuples);
 
 		Predicate<PlainSinglePatchResult> customizableFieldsPredicate =
 			patchResult -> patchResult.getField().getField().contains(PatchFieldHelper.CUSTOM_PREFIX);

sormas-backend/src/main/java/de/symeda/sormas/backend/patch/EntityDtoTypeComparator.java

@@ -11,8 +11,9 @@
 import de.symeda.sormas.api.person.PersonDto;
 
 /**
- * Orders {@link AttachedEntityWrapper}s so that {@link CaseDataDto} comes first, {@link PersonDto} second,
- * and any other DTO type last.
+ * Orders {@link EntityDto}s so that root entities come first.
+ * Needed to properly store the "root-est" entity is persisted first, to avoid {@link de.symeda.sormas.api.utils.OutdatedEntityException} in
+ * case a leaf modifies the parent.
  */
 public class EntityDtoTypeComparator implements Comparator<EntityDto> {
 

sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageController.java

@@ -168,7 +168,7 @@ public void processSurveyResponse(String surveyResponseMessageUuid, Runnable suc
 				? externalMessage.getSurveyResponseData().getLatest().getResult()
 				: null;
 
-		// when button click:
+		// In case of failure during operation, attempt to process the message again.
 		if (result == null) {
 			try {
 				result = FacadeProvider.getExternalMessageFacade()