Better transactional handling

Author: Pa-Touche

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

@@ -14,6 +14,7 @@
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
+import javax.transaction.Transactional;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.jetbrains.annotations.NotNull;
@@ -69,6 +70,9 @@ public AutomaticSurveyResponseProcessor(
 		this.surveyTokenFacade = surveyTokenFacade;
 	}
 
+	@Transactional(value = Transactional.TxType.REQUIRES_NEW,
+		rollbackOn = {
+			Exception.class })
 	public List<SurveyResponseProcessingResult> processSurveyResponses(List<ExternalMessageDto> externalMessages)
 		throws InterruptedException, ExecutionException {
 
@@ -155,8 +159,6 @@ public List<SurveyResponseProcessingResult> processSurveyResponses(List<External
 				externalMessage.getUuid(),
 				e);
 
-			em.getTransaction().rollback();
-
 			// in case of failure status must be changed to unprocessed
 			externalMessage.setStatus(ExternalMessageStatus.UNPROCESSED);
 

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

@@ -1,6 +1,15 @@
 package de.symeda.sormas.backend.patch;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -56,7 +65,7 @@ public class BusinessDtoFacade {
 	/**
 	 * Some {@link EntityDto} must be attached to a "parent" to be saved.
 	 */
-	private final Map<Class<? extends EntityDto>, LeafAttacher> leafAttacherRegistry = new LinkedHashMap<>();
+	private final Map<Class<? extends EntityDto>, LeafAttacher> leafAttacherDictionary = new LinkedHashMap<>();
 
 	@PostConstruct
 	private void init() {
@@ -190,7 +199,7 @@ private void registerLeafAttacherOperations() {
 	}
 
 	private <T extends EntityDto> void registerLeafAttacher(Class<T> leafClass, LeafAttacher attacher) {
-		leafAttacherRegistry.put(leafClass, attacher);
+		leafAttacherDictionary.put(leafClass, attacher);
 	}
 
 	private CaseDataDto requireCaseData(List<Tuple<Integer, EntityDto>> dtosInProgress) {
@@ -303,7 +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);
 
-		leafAttacherRegistry.forEach((leafClass, attacher) -> {
+		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.
+		leafAttacherDictionary.forEach((leafClass, attacher) -> {
 			List<Tuple<Integer, EntityDto>> leaves =
 				dtosInProgress.stream().filter(t -> leafClass.isInstance(t.getSecond())).collect(Collectors.toList());
 
@@ -312,8 +329,6 @@ public void save(@NotNull List<Tuple<Integer, EntityDto>> entityDtosByKey) {
 				attacher.attachLeaf(leafTuple.getSecond(), leafTuple.getFirst(), dtosInProgress);
 			});
 		});
-
-		dtosInProgress.stream().map(Tuple::getSecond).forEach(this::saveDirectEntity);
 	}
 
 	@FunctionalInterface

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

@@ -16,6 +16,7 @@
 import javax.ejb.EJB;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
+import javax.transaction.Transactional;
 
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
@@ -110,6 +111,7 @@ public DataPatcherImpl(
 		this.configFacade = configFacade;
 	}
 
+	@Transactional(rollbackOn = Exception.class)
 	@Override
 	public DataPatchResponse patch(CaseDataPatchRequest request) {
 		logger.debug("patch: [{}]", request);
@@ -243,7 +245,7 @@ private PlainSinglePatchResult produceSinglePatchResult(
 	private void saveDTOsIfAppropriate(Map<Tuple<String, Integer>, AttachedEntityWrapper> entityCache) {
 		List<Tuple<Integer, EntityDto>> toSave = entityCache.entrySet()
 			.stream()
-			.map(entry -> Tuple.<Integer, EntityDto> of(entry.getKey().getSecond(), entry.getValue().getEntityDto()))
+			.map(entry -> Tuple.of(entry.getKey().getSecond(), entry.getValue().getEntityDto()))
 			.collect(Collectors.toList());
 
 		if (toSave.isEmpty()) {

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

@@ -160,7 +160,7 @@ public void showExternalMessage(String messageUuid, boolean withActions, Runnabl
 		form.setValue(newDto);
 	}
 
-	public void processSurveyResponse(String surveyResponseMessageUuid) {
+	public void processSurveyResponse(String surveyResponseMessageUuid, Runnable successRunnable) {
 		ExternalMessageDto externalMessage = FacadeProvider.getExternalMessageFacade().getByUuid(surveyResponseMessageUuid);
 
 		de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseResult result =
@@ -181,6 +181,11 @@ public void processSurveyResponse(String surveyResponseMessageUuid) {
 			}
 		}
 
+		if (result == null) {
+			Notification.show(I18nProperties.getString(Strings.messageSurveyResponseNotYetProcessed), Notification.Type.HUMANIZED_MESSAGE);
+			return;
+		}
+
 		if (result.getPatchResponse() != null && result.getPatchResponse().hasFailures()) {
 			de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse displayData;
 			try {
@@ -197,6 +202,8 @@ public void processSurveyResponse(String surveyResponseMessageUuid) {
 			UI.getCurrent().addWindow(editor);
 		} else {
 			Notification.show(I18nProperties.getString(Strings.messageSurveyResponseAllFieldsApplied), Notification.Type.HUMANIZED_MESSAGE);
+
+			successRunnable.run();
 		}
 	}
 

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

@@ -226,7 +226,7 @@ private Component buildProcessComponent(ExternalMessageIndexDto indexDto) {
 				} else if (ExternalMessageType.PHYSICIANS_REPORT == indexDto.getType()) {
 					ControllerProvider.getExternalMessageController().processDoctorDeclarationMessage(indexDto.getUuid());
 				} else if (ExternalMessageType.SURVEY_RESPONSE == indexDto.getType()) {
-					ControllerProvider.getExternalMessageController().processSurveyResponse(indexDto.getUuid());
+					ControllerProvider.getExternalMessageController().processSurveyResponse(indexDto.getUuid(), this::reload);
 				}
 			}, ValoTheme.BUTTON_PRIMARY);
 		} else {