✨ [Untested] grouped patching is now possible as new entities are generated from businessDtoFacade.

Author: Pa-Touche

sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageFacade.java

@@ -2,7 +2,6 @@
 
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 import javax.annotation.Nullable;
 import javax.ejb.Remote;
@@ -13,6 +12,7 @@
 import de.symeda.sormas.api.ReferenceDto;
 import de.symeda.sormas.api.caze.surveillancereport.SurveillanceReportReferenceDto;
 import de.symeda.sormas.api.common.Page;
+import de.symeda.sormas.api.externalmessage.survey.PatchDictionary;
 import de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse;
 import de.symeda.sormas.api.sample.SampleReferenceDto;
 import de.symeda.sormas.api.user.UserReferenceDto;
@@ -96,7 +96,7 @@ default List<ExternalMessageDto> saveAndProcessSurveyResponses() {
 	 *            the corrected field path -> value map to apply
 	 * @return updated ExternalMessageDto after reprocessing
 	 */
-	ExternalMessageDto overwriteSurveyResponse(String uuid, Map<String, Object> correctedDictionary);
+	ExternalMessageDto overwriteSurveyResponse(String uuid, PatchDictionary correctedDictionary);
 
 	/**
 	 * Retrieves display-ready field information (translated names and current case values) for all fields

sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java

@@ -2,7 +2,6 @@
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Objects;
 
@@ -43,14 +42,14 @@ public class ExternalMessageSurveyResponseRequest implements Serializable, Compa
 	 * The accepted fields are those from {@link InfoFacade#generateDataDictionary()}.
 	 */
 	@NotNull
-	private LinkedHashMap<String, Object> patchDictionary;
+	private PatchDictionary patchDictionary = new PatchDictionary();
 
 	/**
 	 * Contains fields that were excluded from the patch dictionary, meant for fields that may not start with the prefix.
 	 * The prefix allows to safely exclude fields that are not meant to be mapped into SORMAS.
 	 */
 	@NotNull
-	private LinkedHashMap<String, Object> excludedPatchDictionary;
+	private PatchDictionary excludedPatchDictionary = new PatchDictionary();
 
 	/**
 	 * Origin that wants the patch operation.
@@ -140,11 +139,11 @@ public ExternalMessageSurveyResponseRequest setEmptyValueBehavior(EmptyValueBeha
 		return this;
 	}
 
-	public LinkedHashMap<String, Object> getPatchDictionary() {
+	public PatchDictionary getPatchDictionary() {
 		return patchDictionary;
 	}
 
-	public ExternalMessageSurveyResponseRequest setPatchDictionary(LinkedHashMap<String, Object> patchDictionary) {
+	public ExternalMessageSurveyResponseRequest setPatchDictionary(PatchDictionary patchDictionary) {
 		this.patchDictionary = patchDictionary;
 		return this;
 	}
@@ -187,11 +186,11 @@ public ExternalMessageSurveyResponseRequest setSkipIfAlreadyProcessed(boolean sk
 		return this;
 	}
 
-	public LinkedHashMap<String, Object> getExcludedPatchDictionary() {
+	public PatchDictionary getExcludedPatchDictionary() {
 		return excludedPatchDictionary;
 	}
 
-	public ExternalMessageSurveyResponseRequest setExcludedPatchDictionary(LinkedHashMap<String, Object> excludedPatchDictionary) {
+	public ExternalMessageSurveyResponseRequest setExcludedPatchDictionary(PatchDictionary excludedPatchDictionary) {
 		this.excludedPatchDictionary = excludedPatchDictionary;
 		return this;
 	}

sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/PatchDictionary.java

@@ -0,0 +1,69 @@
+package de.symeda.sormas.api.externalmessage.survey;
+
+import java.io.Serializable;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Objects;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * Wrapper around concrete storage for patch dictionary.
+ */
+public class PatchDictionary implements Serializable {
+
+	@NotNull
+	private LinkedHashMap<PatchField, Object> dictionary = new LinkedHashMap<>();
+
+	/**
+	 * Helper method when you don't have any grouped fields.
+	 * 
+	 * @param key
+	 *            {@link PatchField#getField()}
+	 * @param value
+	 *            value within dictionary
+	 */
+	public void put(String key, Object value) {
+		dictionary.put(new PatchField().setField(key), value);
+	}
+
+	public void put(PatchField key, Object value) {
+		dictionary.put(key, value);
+	}
+
+	public LinkedHashMap<PatchField, Object> getDictionary() {
+		return dictionary;
+	}
+
+	public PatchDictionary setDictionary(LinkedHashMap<PatchField, Object> dictionary) {
+		this.dictionary = dictionary;
+		return this;
+	}
+
+	public PatchDictionary setNonTypedPatchDictionary(Map<PatchField, Object> patchDictionary) {
+		this.dictionary = new LinkedHashMap<>(patchDictionary);
+		return this;
+	}
+
+	public boolean isEmpty() {
+		return dictionary.isEmpty();
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (o == null || getClass() != o.getClass())
+			return false;
+		PatchDictionary that = (PatchDictionary) o;
+		return Objects.equals(dictionary, that.dictionary);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hashCode(dictionary);
+	}
+
+	@Override
+	public String toString() {
+		return "PatchDictionary{" + "dictionary=" + dictionary + '}';
+	}
+}

sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/PatchField.java

@@ -0,0 +1,74 @@
+package de.symeda.sormas.api.externalmessage.survey;
+
+import java.io.Serializable;
+import java.util.Objects;
+import java.util.Optional;
+
+import javax.annotation.Nullable;
+import javax.validation.constraints.NotNull;
+
+/**
+ * To be able to repeat some groups and make them belong together, the groupIndex was added.
+ */
+public class PatchField implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@NotNull
+	private String field;
+
+	/**
+	 * 0-based index of belonging within the repeated occurrence.
+	 */
+	@Nullable
+	private Integer groupIndex;
+
+	public static PatchField of(String field, Integer groupIndex) {
+		return new PatchField().setField(field).setGroupIndex(groupIndex);
+	}
+
+	public static PatchField of(String field) {
+		return new PatchField().setField(field);
+	}
+
+	public String getField() {
+		return field;
+	}
+
+	public PatchField setField(String field) {
+		this.field = field;
+		return this;
+	}
+
+	@Nullable
+	public Integer getGroupIndex() {
+		return groupIndex;
+	}
+
+	public PatchField setGroupIndex(@Nullable Integer groupIndex) {
+		this.groupIndex = groupIndex;
+		return this;
+	}
+
+	public Optional<Integer> getGroupNumber() {
+		return Optional.ofNullable(groupIndex).map(index -> index + 1);
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (o == null || getClass() != o.getClass())
+			return false;
+		PatchField that = (PatchField) o;
+		return Objects.equals(field, that.field) && Objects.equals(groupIndex, that.groupIndex);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(field, groupIndex);
+	}
+
+	@Override
+	public String toString() {
+		return "PatchField{" + "field='" + field + '\'' + ", groupIndex=" + groupIndex + '}';
+	}
+}

sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java

@@ -8,6 +8,7 @@
 import javax.validation.constraints.NotNull;
 
 import de.symeda.sormas.api.Language;
+import de.symeda.sormas.api.externalmessage.survey.PatchDictionary;
 import de.symeda.sormas.api.info.InfoFacade;
 
 /**
@@ -31,7 +32,7 @@ public class CaseDataPatchRequest {
 	 * The accepted fields are those from {@link InfoFacade#generateDataDictionary()}.
 	 */
 	@NotNull
-	private Map<String, Object> patchDictionary;
+	private PatchDictionary patchDictionary;
 
 	/**
 	 * Origin that wants the patch operation.
@@ -70,15 +71,22 @@ public CaseDataPatchRequest setReplacementStrategy(DataReplacementStrategy repla
 		return this;
 	}
 
-	public Map<String, Object> getPatchDictionary() {
+	public PatchDictionary getPatchDictionary() {
 		return patchDictionary;
 	}
 
-	public CaseDataPatchRequest setPatchDictionary(Map<String, Object> patchDictionary) {
+	public CaseDataPatchRequest setPatchDictionary(PatchDictionary patchDictionary) {
 		this.patchDictionary = patchDictionary;
 		return this;
 	}
 
+	public CaseDataPatchRequest setPatchDictionary(Map<String, Object> patchDictionary) {
+		PatchDictionary patchDictionaryWrapper = new PatchDictionary();
+		patchDictionary.forEach(patchDictionaryWrapper::put);
+		this.patchDictionary = patchDictionaryWrapper;
+		return this;
+	}
+
 	public EmptyValueBehavior getEmptyValueBehavior() {
 		return emptyValueBehavior;
 	}

sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java

@@ -6,6 +6,9 @@
 
 import org.apache.commons.collections4.MapUtils;
 
+import de.symeda.sormas.api.externalmessage.survey.PatchDictionary;
+import de.symeda.sormas.api.externalmessage.survey.PatchField;
+
 /**
  * Response to a patch request.
  */
@@ -25,37 +28,37 @@ public class DataPatchResponse implements Serializable {
 	 * Actual patched values for the specified keys.
 	 * Will NOT contain fields that were NOT patched (even though passed in original patchDictionary).
 	 */
-	private LinkedHashMap<String, Object> validPatchDictionary = new LinkedHashMap<>();
+	private PatchDictionary validPatchDictionary = new PatchDictionary();
 
 	/**
 	 * Provides the reason for the failure for the impacted fields.
 	 */
-	private LinkedHashMap<String, DataPatchFailure> failures = new LinkedHashMap<>();
+	private LinkedHashMap<PatchField, DataPatchFailure> failures = new LinkedHashMap<>();
 
-	public LinkedHashMap<String, Object> getValidPatchDictionary() {
-		return validPatchDictionary;
+	public boolean isApplied() {
+		return applied;
 	}
 
-	public DataPatchResponse setValidPatchDictionary(LinkedHashMap<String, Object> validPatchDictionary) {
-		this.validPatchDictionary = validPatchDictionary;
+	public DataPatchResponse setApplied(boolean applied) {
+		this.applied = applied;
 		return this;
 	}
 
-	public LinkedHashMap<String, DataPatchFailure> getFailures() {
-		return failures;
+	public PatchDictionary getValidPatchDictionary() {
+		return validPatchDictionary;
 	}
 
-	public DataPatchResponse setFailures(LinkedHashMap<String, DataPatchFailure> failures) {
-		this.failures = failures;
+	public DataPatchResponse setValidPatchDictionary(PatchDictionary validPatchDictionary) {
+		this.validPatchDictionary = validPatchDictionary;
 		return this;
 	}
 
-	public boolean isApplied() {
-		return applied;
+	public LinkedHashMap<PatchField, DataPatchFailure> getFailures() {
+		return failures;
 	}
 
-	public DataPatchResponse setApplied(boolean applied) {
-		this.applied = applied;
+	public DataPatchResponse setFailures(LinkedHashMap<PatchField, DataPatchFailure> failures) {
+		this.failures = failures;
 		return this;
 	}
 

sormas-api/src/main/java/de/symeda/sormas/api/patch/SinglePatchResult.java

@@ -3,23 +3,25 @@
 import javax.annotation.Nullable;
 import javax.validation.constraints.NotNull;
 
+import de.symeda.sormas.api.externalmessage.survey.PatchField;
+
 public class SinglePatchResult {
 
 	@NotNull
-	private String fieldName;
+	private PatchField field;
 
 	@Nullable
 	private Object value;
 
 	@Nullable
 	private DataPatchFailure failure;
 
-	public String getFieldName() {
-		return fieldName;
+	public PatchField getField() {
+		return field;
 	}
 
-	public SinglePatchResult setFieldName(String fieldName) {
-		this.fieldName = fieldName;
+	public SinglePatchResult setField(PatchField field) {
+		this.field = field;
 		return this;
 	}
 

sormas-api/src/main/java/de/symeda/sormas/api/utils/Tuple.java

@@ -11,6 +11,14 @@ public static <F, S> Tuple<F, S> of(final F first, final S second) {
 		return new Tuple<>(first, second);
 	}
 
+	public static <F, S> Tuple<F, S> firstOnly(final F first) {
+		return new Tuple<>(first, null);
+	}
+
+	public static <F, S> Tuple<F, S> secondOnly(final S second) {
+		return new Tuple<>(null, second);
+	}
+
 	public Tuple(final F first, final S second) {
 		this.first = first;
 		this.second = second;