Merge branch 'development' into bugfix-14058-ipi_lab_message_reference_laboratory

raulbob · web-flow · commit f3bf8f054827 · 2026-06-29T15:40:13.000+02:00
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java
@@ -2427,7 +2427,6 @@ public interface Captions {
 	String PathogenTest_quantitativeUnit = "PathogenTest.quantitativeUnit";
 	String PathogenTest_quantitativeValue = "PathogenTest.quantitativeValue";
 	String PathogenTest_reportDate = "PathogenTest.reportDate";
-	String PathogenTest_resultDetails = "PathogenTest.resultDetails";
 	String PathogenTest_retestRequested = "PathogenTest.retestRequested";
 	String PathogenTest_rifampicinResistant = "PathogenTest.rifampicinResistant";
 	String PathogenTest_rsv_testedDiseaseVariant = "PathogenTest.rsv.testedDiseaseVariant";
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/sample/PathogenTestDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/sample/PathogenTestDto.java
@@ -128,7 +128,6 @@ public class PathogenTestDto extends PseudonymizableDto {
 	public static final String ANTIBODY_TITRE = "antibodyTitre";
 	public static final String PERFORMED_BY_REFERENCE_LABORATORY = "performedByReferenceLaboratory";
 	public static final String RETEST_REQUESTED = "retestRequested";
-	public static final String RESULT_DETAILS = "resultDetails";
 	public static final String QUANTITATIVE_VALUE = "quantitativeValue";
 	public static final String QUANTITATIVE_UNIT = "quantitativeUnit";
 	public static final String QUANTITATIVE_BOOLEAN = "quantitativeBoolean";
@@ -336,10 +335,6 @@ public class PathogenTestDto extends PseudonymizableDto {
 	private Boolean performedByReferenceLaboratory;
 	// defaulting this test to false.
 	private Boolean retestRequested = false;
-	@Diseases({
-		Disease.MALARIA })
-	@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
-	private String resultDetails;
 
 	// Generic quantitative result fields, shown per the test method's ResultValueType (issue #13952).
 	private Float quantitativeValue;
@@ -970,14 +965,6 @@ public void setRetestRequested(Boolean retestRequested) {
 		this.retestRequested = retestRequested;
 	}
 
-	public String getResultDetails() {
-		return resultDetails;
-	}
-
-	public void setResultDetails(String resultDetails) {
-		this.resultDetails = resultDetails;
-	}
-
 	public String getSerotypeText() {
 		return serotypeText;
 	}
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/sample/PathogenTestType.java b/sormas-api/src/main/java/de/symeda/sormas/api/sample/PathogenTestType.java
@@ -71,16 +71,12 @@ public enum PathogenTestType {
 	// for every disease per #13951. The legacy ENZYME_LINKED_IMMUNOSORBENT_ASSAY is now
 	// @NotSelectableForNewTests so historic records still render and case-classification rules
 	// referencing IGM_/IGG_SERUM_ANTIBODY continue to fire (they bind to the same enum constants).
-	@Diseases(value = {
-		Disease.SALMONELLOSIS }, hide = true)
 	@PathogenTestCategoryRel(PathogenTestCategory.SEROLOGICAL_TESTS)
 	@ResultValueTypeRel({
 		ResultValueType.QUALITATIVE,
 		ResultValueType.NUMERIC })
 	IGM_SERUM_ANTIBODY,
 
-	@Diseases(value = {
-		Disease.SALMONELLOSIS }, hide = true)
 	@PathogenTestCategoryRel(PathogenTestCategory.SEROLOGICAL_TESTS)
 	@ResultValueTypeRel({
 		ResultValueType.QUALITATIVE,
diff --git a/sormas-api/src/main/resources/captions.properties b/sormas-api/src/main/resources/captions.properties
@@ -2009,7 +2009,6 @@ PathogenTest.tubeMitogeneGT10=Tube Mitogen >10
 PathogenTest.antibodyTitre=Antibody titre
 PathogenTest.performedByReferenceLaboratory=Performed by reference laboratory
 PathogenTest.retestRequested=Retest requested
-PathogenTest.resultDetails=Result details
 PathogenTest.quantitativeValue=Value
 PathogenTest.quantitativeUnit=Unit
 PathogenTest.quantitativeBoolean=Detected
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/sample/PathogenTest.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/sample/PathogenTest.java
@@ -189,7 +189,6 @@ public class PathogenTest extends DeletableAdo {
 	private String antibodyTitre;
 	private Boolean performedByReferenceLaboratory;
 	private Boolean retestRequested;
-	private String resultDetails;
 	private Float quantitativeValue;
 	private String quantitativeUnit;
 	private YesNoUnknown quantitativeBoolean;
@@ -814,14 +813,6 @@ public void setRetestRequested(Boolean retestRequested) {
 		this.retestRequested = retestRequested;
 	}
 
-	public String getResultDetails() {
-		return resultDetails;
-	}
-
-	public void setResultDetails(String resultDetails) {
-		this.resultDetails = resultDetails;
-	}
-
 	public String getSpecieText() {
 		return specieText;
 	}
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/sample/PathogenTestFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/sample/PathogenTestFacadeEjb.java
@@ -348,7 +348,6 @@ public static PathogenTestDto toDto(PathogenTest source) {
 		target.setAntibodyTitre(source.getAntibodyTitre());
 		target.setPerformedByReferenceLaboratory(source.getPerformedByReferenceLaboratory());
 		target.setRetestRequested(source.getRetestRequested());
-		target.setResultDetails(source.getResultDetails());
 		target.setQuantitativeValue(source.getQuantitativeValue());
 		target.setQuantitativeUnit(source.getQuantitativeUnit());
 		target.setQuantitativeBoolean(source.getQuantitativeBoolean());
@@ -678,7 +677,6 @@ public PathogenTest fillOrBuildEntity(@NotNull PathogenTestDto source, PathogenT
 		target.setAntibodyTitre(source.getAntibodyTitre());
 		target.setPerformedByReferenceLaboratory(source.getPerformedByReferenceLaboratory());
 		target.setRetestRequested(source.getRetestRequested());
-		target.setResultDetails(source.getResultDetails());
 		target.setQuantitativeValue(source.getQuantitativeValue());
 		target.setQuantitativeUnit(source.getQuantitativeUnit());
 		target.setQuantitativeBoolean(source.getQuantitativeBoolean());
diff --git a/sormas-backend/src/main/resources/sql/sormas_schema.sql b/sormas-backend/src/main/resources/sql/sormas_schema.sql
@@ -16360,7 +16360,7 @@ BEGIN
             WHERE quantitativetext IS NOT NULL AND quantitativetext <> ''
               AND length(CASE WHEN testresulttext IS NULL OR testresulttext = '' THEN quantitativetext ELSE testresulttext || E'\n' || quantitativetext END) > 4096;
         IF truncated_count > 0 THEN
-            RAISE NOTICE 'Migration 640: % pathogentest row(s) had their preserved quantitativetext truncated to fit varchar(4096).', truncated_count;
+            RAISE NOTICE 'Migration 639: % pathogentest row(s) had their preserved quantitativetext truncated to fit varchar(4096).', truncated_count;
         END IF;
         UPDATE pathogentest
         SET testresulttext = LEFT(CASE
@@ -16374,7 +16374,7 @@ BEGIN
             WHERE quantitativetext IS NOT NULL AND quantitativetext <> ''
               AND length(CASE WHEN testresulttext IS NULL OR testresulttext = '' THEN quantitativetext ELSE testresulttext || E'\n' || quantitativetext END) > 4096;
         IF truncated_count > 0 THEN
-            RAISE NOTICE 'Migration 640: % pathogentest_history row(s) had their preserved quantitativetext truncated to fit varchar(4096).', truncated_count;
+            RAISE NOTICE 'Migration 639: % pathogentest_history row(s) had their preserved quantitativetext truncated to fit varchar(4096).', truncated_count;
         END IF;
         UPDATE pathogentest_history
         SET testresulttext = LEFT(CASE
@@ -16402,11 +16402,70 @@ ALTER TABLE testreport_history ADD COLUMN IF NOT EXISTS fourfoldincreaseantibody
 INSERT INTO schema_version (version_number, comment) VALUES (641, 'Malaria and Dengue DD and Lab message processing fixes');
 
 
--- 2025-06-36 Performed by reference laboratory missing for lab messages
+-- 2025-06-26 Performed by reference laboratory missing for lab messages
 
 ALTER TABLE testreport ADD COLUMN IF NOT EXISTS performedbyreferencelaboratory boolean;
 ALTER TABLE testreport_history ADD COLUMN IF NOT EXISTS performedbyreferencelaboratory boolean;
 
 INSERT INTO schema_version (version_number, comment) VALUES (642, '#14058 - Performed by reference laboratory not toggled');
 
+-- 2026-06-29 Remove Malaria-specific "Result details" pathogen test field (issue #14016)
+-- The Malaria resultdetails field duplicated the generic "Test result details" (testresulttext) field on the
+-- pathogen test form. Drop it and fold any captured value into testresulttext so no free-text result is lost.
+-- Both pathogentest and pathogentest_history are migrated.
+--
+-- versioning_trigger on pathogentest mirrors every UPDATE into pathogentest_history & disable it for the
+-- migration window so the backfill does not inject phantom audit rows, and re-enable when done.
+--
+-- testresulttext is varchar(4096) while resultdetails is varchar(255): LEFT(..., 4096) guards against a
+-- near-full testresulttext overflowing the column once resultdetails is appended.
+ALTER TABLE pathogentest DISABLE TRIGGER versioning_trigger;
+DO $$
+DECLARE
+    truncated_count integer;
+BEGIN
+    IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'pathogentest' AND column_name = 'resultdetails') THEN
+        SELECT count(*) INTO truncated_count FROM pathogentest
+            WHERE resultdetails IS NOT NULL AND resultdetails <> ''
+              AND length(CASE
+                  WHEN testresulttext IS NULL OR testresulttext = '' THEN resultdetails
+                  WHEN testresulttext = resultdetails THEN testresulttext
+                  ELSE testresulttext || E'\n' || resultdetails
+              END) > 4096;
+        IF truncated_count > 0 THEN
+            RAISE NOTICE 'Migration 642: % pathogentest row(s) had their preserved resultdetails truncated to fit varchar(4096).', truncated_count;
+        END IF;
+        UPDATE pathogentest
+        SET testresulttext = LEFT(CASE
+            WHEN testresulttext IS NULL OR testresulttext = '' THEN resultdetails
+            WHEN testresulttext = resultdetails THEN testresulttext
+            ELSE testresulttext || E'\n' || resultdetails
+        END, 4096)
+        WHERE resultdetails IS NOT NULL AND resultdetails <> '';
+    END IF;
+    IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = 'pathogentest_history' AND column_name = 'resultdetails') THEN
+        SELECT count(*) INTO truncated_count FROM pathogentest_history
+            WHERE resultdetails IS NOT NULL AND resultdetails <> ''
+              AND length(CASE
+                  WHEN testresulttext IS NULL OR testresulttext = '' THEN resultdetails
+                  WHEN testresulttext = resultdetails THEN testresulttext
+                  ELSE testresulttext || E'\n' || resultdetails
+              END) > 4096;
+        IF truncated_count > 0 THEN
+            RAISE NOTICE 'Migration 642: % pathogentest_history row(s) had their preserved resultdetails truncated to fit varchar(4096).', truncated_count;
+        END IF;
+        UPDATE pathogentest_history
+        SET testresulttext = LEFT(CASE
+            WHEN testresulttext IS NULL OR testresulttext = '' THEN resultdetails
+            WHEN testresulttext = resultdetails THEN testresulttext
+            ELSE testresulttext || E'\n' || resultdetails
+        END, 4096)
+        WHERE resultdetails IS NOT NULL AND resultdetails <> '';
+    END IF;
+END $$;
+ALTER TABLE pathogentest DROP COLUMN IF EXISTS resultdetails;
+ALTER TABLE pathogentest_history DROP COLUMN IF EXISTS resultdetails;
+ALTER TABLE pathogentest ENABLE TRIGGER versioning_trigger;
+INSERT INTO schema_version (version_number, comment) VALUES (643, 'Remove Malaria-specific result details pathogen test column, preserving values into testresulttext issue #14016');
+
 -- *** Insert new sql commands BEFORE this line. Remember to always consider _history tables. ***
diff --git a/sormas-rest/swagger.json b/sormas-rest/swagger.json
@@ -22780,11 +22780,6 @@
             "type" : "string",
             "format" : "date-time"
           },
-          "resultDetails" : {
-            "type" : "string",
-            "maxLength" : 512,
-            "minLength" : 0
-          },
           "retestRequested" : {
             "type" : "boolean"
           },
diff --git a/sormas-rest/swagger.yaml b/sormas-rest/swagger.yaml
@@ -23091,10 +23091,6 @@ components:
         reportDate:
           type: string
           format: date-time
-        resultDetails:
-          type: string
-          maxLength: 512
-          minLength: 0
         retestRequested:
           type: boolean
         rifampicinResistant:
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/PathogenTestForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/PathogenTestForm.java
@@ -21,11 +21,9 @@
 import static de.symeda.sormas.ui.utils.LayoutUtil.loc;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 
 import com.vaadin.shared.Registration;
 import com.vaadin.ui.Component;
@@ -339,30 +337,19 @@ public void preCommit(CommitEvent commitEvent) throws CommitException {
 			try {
 				comp.validate();
 			} catch (InvalidValueException e) {
-				collectCauses(e, allCauses);
+				FormComponent.collectCauses(e, allCauses);
 			}
 		}
 
 		if (activeSection != null) {
 			try {
 				activeSection.validate();
 			} catch (InvalidValueException e) {
-				collectCauses(e, allCauses);
+				FormComponent.collectCauses(e, allCauses);
 			}
 		}
 
-		if (!allCauses.isEmpty()) {
-			String joinedCaptions = allCauses.stream().map(InvalidValueException::getMessage).collect(Collectors.joining(", "));
-			throw new InvalidValueException(joinedCaptions, allCauses.toArray(new InvalidValueException[0]));
-		}
-	}
-
-	private static void collectCauses(InvalidValueException e, List<InvalidValueException> target) {
-		if (e.getCauses().length > 0) {
-			Collections.addAll(target, e.getCauses());
-		} else {
-			target.add(e);
-		}
+		FormComponent.throwCombined(allCauses);
 	}
 
 	@Override
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/components/FourFoldCtCqComponent.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/components/FourFoldCtCqComponent.java
@@ -157,8 +157,8 @@ public void setDto(PathogenTestDto dto) {
 
 	@Override
 	public void validate() {
-		super.validate();
-		ctCqValueComponent.validate();
+		// Accumulate binder + Ct/Cq value failures so they surface together in a single save.
+		validateAll(this::validateBinderOnly, ctCqValueComponent::validate);
 	}
 
 	@Override
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/components/TestMethodComponent.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/components/TestMethodComponent.java
@@ -346,7 +346,12 @@ public void addTestDateAfterSampleDateValidator(Supplier<Date> sampleDateSupplie
 
 	@Override
 	public void validate() {
-		super.validate();
+		// Accumulate all failures (binder asRequired fields + the manual test-date checks) so a single save
+		// surfaces every missing field at once instead of one per save.
+		validateAll(this::validateBinderOnly, this::validateTestDate);
+	}
+
+	private void validateTestDate() {
 		// Test date is mandatory whenever the field is shown
 		if (testDateField.isVisible() && testDateField.getValue() == null) {
 			throw new com.vaadin.v7.data.Validator.InvalidValueException(
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/components/TestResultComponent.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/components/TestResultComponent.java
@@ -352,17 +352,19 @@ public void setDto(PathogenTestDto dto) {
 
 	@Override
 	public void validate() {
-		super.validate();
-
 		// A result is only mandatory when the administrator has enabled it (#13948 issue #13958) - otherwise
 		// every result-bearing field may be left empty (the Pos/Neg result then defaults to PENDING on
 		// save). The flag gates the qualitative selector and the quantitative result fields alike.
+		// Accumulate all failures so every missing result field is reported in a single save.
+		List<Runnable> checks = new ArrayList<>();
+		checks.add(this::validateBinderOnly);
 		if (resultRequired) {
-			requireIfVisible(testResultField, PathogenTestDto.TEST_RESULT);
-			requireIfVisible(quantitativeBooleanField, PathogenTestDto.QUANTITATIVE_BOOLEAN);
-			requireIfVisible(smearGradeField, PathogenTestDto.SMEAR_GRADE);
-			requireIfVisible(westernBlotInterpretationField, PathogenTestDto.WESTERN_BLOT_INTERPRETATION);
+			checks.add(() -> requireIfVisible(testResultField, PathogenTestDto.TEST_RESULT));
+			checks.add(() -> requireIfVisible(quantitativeBooleanField, PathogenTestDto.QUANTITATIVE_BOOLEAN));
+			checks.add(() -> requireIfVisible(smearGradeField, PathogenTestDto.SMEAR_GRADE));
+			checks.add(() -> requireIfVisible(westernBlotInterpretationField, PathogenTestDto.WESTERN_BLOT_INTERPRETATION));
 		}
+		validateAll(checks.toArray(new Runnable[0]));
 	}
 
 	private void requireIfVisible(com.vaadin.data.HasValue<?> field, String propertyId) {
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/diseasesection/MalariaSectionComponent.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/diseasesection/MalariaSectionComponent.java
@@ -66,13 +66,9 @@ public class MalariaSectionComponent extends AbstractDiseaseSectionComponent {
 		PathogenTestType.OTHER_SEROLOGICAL_TEST,
 		PathogenTestType.OTHER_MOLECULAR_ASSAY);
 
-	private static final List<PathogenTestType> RESULT_DETAILS_VISIBLE_TYPES =
-		Arrays.asList(PathogenTestType.THIN_BLOOD_SMEAR, PathogenTestType.Q_PCR);
-
 	private ComboBox<PathogenSpecie> specieField;
 	private TextField specieTextField;
 	private Label specieTextSpacer;
-	private TextField resultDetailsField;
 
 	private PathogenTestType currentTestType;
 	private PathogenTestResultType currentResult;
@@ -90,13 +86,8 @@ protected void buildLayout() {
 		specieTextSpacer = createSpacer();
 		addToggleRow(specieField, specieTextField, specieTextSpacer);
 
-		resultDetailsField = createTextField(PathogenTestDto.RESULT_DETAILS);
-		resultDetailsField.setVisible(false);
-		addRow(resultDetailsField, createSpacer());
-
 		binder.forField(specieField).bind(PathogenTestDto::getSpecie, PathogenTestDto::setSpecie);
 		binder.forField(specieTextField).bind(PathogenTestDto::getSpecieText, PathogenTestDto::setSpecieText);
-		binder.forField(resultDetailsField).bind(PathogenTestDto::getResultDetails, PathogenTestDto::setResultDetails);
 	}
 
 	@Override
@@ -138,12 +129,6 @@ private void updateVisibility() {
 			specieTextField.clear();
 		}
 
-		boolean showResultDetails = RESULT_DETAILS_VISIBLE_TYPES.contains(currentTestType);
-		resultDetailsField.setVisible(showResultDetails);
-		if (!showResultDetails) {
-			resultDetailsField.clear();
-		}
-
 		updateRowAndSelfVisibility();
 	}
 
@@ -155,6 +140,5 @@ protected void clearOwnedFields() {
 		}
 		dto.setSpecie(null);
 		dto.setSpecieText(null);
-		dto.setResultDetails(null);
 	}
 }
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/FormComponent.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/FormComponent.java
diff --git a/sormas-ui/src/test/java/de/symeda/sormas/ui/utils/FormComponentValidateAllTest.java b/sormas-ui/src/test/java/de/symeda/sormas/ui/utils/FormComponentValidateAllTest.java
