Merge pull request #14074 from SORMAS-Foundation/bugfix-14058-ipi_lab_message_reference_laboratory

#14058 - Add 'performedByReferenceLaboratory' field to TestReport and related classes

Author: raulbob

sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/labmessage/TestReportDto.java

@@ -71,6 +71,7 @@ public class TestReportDto extends EntityDto {
 	public static final String PRESCRIBER_POSTAL_CODE = "prescriberPostalCode";
 	public static final String PRESCRIBER_CITY = "prescriberCity";
 	public static final String PRESCRIBER_COUNTRY = "prescriberCountry";
+	public static final String PERFORMED_BY_REFERENCE_LABORATORY = "performedByReferenceLaboratory";
 
 	@NotNull(message = Validations.requiredField)
 	private SampleReportReferenceDto sampleReport;
@@ -220,6 +221,7 @@ public class TestReportDto extends EntityDto {
 
 	private PathogenTestCategory pathogenTestCategory;
 	private boolean fourFoldIncreaseAntibodyTiter;
+	private Boolean performedByReferenceLaboratory;
 
 	public SampleReportReferenceDto getSampleReport() {
 		return sampleReport;
@@ -932,4 +934,12 @@ public void setFourFoldIncreaseAntibodyTiter(boolean fourFoldIncreaseAntibodyTit
 		this.fourFoldIncreaseAntibodyTiter = fourFoldIncreaseAntibodyTiter;
 	}
 
+	public Boolean getPerformedByReferenceLaboratory() {
+		return performedByReferenceLaboratory;
+	}
+
+	public void setPerformedByReferenceLaboratory(Boolean performedByReferenceLaboratory) {
+		this.performedByReferenceLaboratory = performedByReferenceLaboratory;
+	}
+
 }

sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/processing/ExternalMessageMapper.java

@@ -55,7 +55,6 @@
 import de.symeda.sormas.api.sample.PathogenTestDto;
 import de.symeda.sormas.api.sample.PathogenTestResultType;
 import de.symeda.sormas.api.sample.SampleDto;
-import de.symeda.sormas.api.sample.Serotype;
 import de.symeda.sormas.api.therapy.DrugSusceptibilityDto;
 import de.symeda.sormas.api.utils.DataHelper;
 import de.symeda.sormas.api.utils.DateHelper;
@@ -994,7 +993,12 @@ public List<String[]> mapToPathogenTest(TestReportDto sourceTestReport, Pathogen
 							pathogenTest::setFourFoldIncreaseAntibodyTiter,
 							pathogenTest.isFourFoldIncreaseAntibodyTiter(),
 							sourceTestReport.getFourFoldIncreaseAntibodyTiter(),
-							PathogenTestDto.FOUR_FOLD_INCREASE_ANTIBODY_TITER))
+							PathogenTestDto.FOUR_FOLD_INCREASE_ANTIBODY_TITER),
+						Mapping.of(
+							pathogenTest::setPerformedByReferenceLaboratory,
+							pathogenTest.getPerformedByReferenceLaboratory(),
+							sourceTestReport.getPerformedByReferenceLaboratory(),
+							PathogenTestDto.PERFORMED_BY_REFERENCE_LABORATORY))
 
 				));
 		}

sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/labmessage/TestReport.java

@@ -184,6 +184,7 @@ public class TestReport extends AbstractDomainObject {
 	private String serotypeText;
 	private PathogenTestCategory pathogenTestCategory;
 	private boolean fourFoldIncreaseAntibodyTiter;
+	private Boolean performedByReferenceLaboratory;
 
 	@Column(length = CHARACTER_LIMIT_DEFAULT)
 	public String getTestLabName() {
@@ -955,4 +956,13 @@ public void setFourFoldIncreaseAntibodyTiter(boolean fourFoldIncreaseAntibodyTit
 		this.fourFoldIncreaseAntibodyTiter = fourFoldIncreaseAntibodyTiter;
 	}
 
+	@Column
+	public Boolean getPerformedByReferenceLaboratory() {
+		return performedByReferenceLaboratory;
+	}
+
+	public void setPerformedByReferenceLaboratory(Boolean performedByReferenceLaboratory) {
+		this.performedByReferenceLaboratory = performedByReferenceLaboratory;
+	}
+
 }

sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/labmessage/TestReportFacadeEjb.java

@@ -166,6 +166,7 @@ public static TestReportDto toDto(TestReport source) {
 		target.setSerotypeText(source.getSerotypeText());
 		target.setPathogenTestCategory(source.getPathogenTestCategory());
 		target.setFourFoldIncreaseAntibodyTiter(source.getFourFoldIncreaseAntibodyTiter());
+		target.setPerformedByReferenceLaboratory(source.getPerformedByReferenceLaboratory());
 
 		return target;
 	}
@@ -219,6 +220,7 @@ public TestReport fillOrBuildEntity(@NotNull TestReportDto source, @NotNull Samp
 		target.setTubeMitogene(source.getTubeMitogene());
 		target.setTubeMitogeneGT10(source.getTubeMitogeneGT10());
 		target.setStrainCallStatus(source.getStrainCallStatus());
+		target.setPerformedByReferenceLaboratory(source.getPerformedByReferenceLaboratory());
 
 		// Drug susceptibility mappings
 		target.setAmikacinMic(source.getAmikacinMic());
@@ -268,6 +270,7 @@ public TestReport fillOrBuildEntity(@NotNull TestReportDto source, @NotNull Samp
 		target.setSerotypeText(source.getSerotypeText());
 		target.setPathogenTestCategory(source.getPathogenTestCategory());
 		target.setFourFoldIncreaseAntibodyTiter(source.getFourFoldIncreaseAntibodyTiter());
+		target.setPerformedByReferenceLaboratory(source.getPerformedByReferenceLaboratory());
 
 		return target;
 	}

sormas-backend/src/main/resources/sql/sormas_schema.sql

@@ -16401,6 +16401,14 @@ 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-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.
@@ -16458,6 +16466,6 @@ 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 (642, 'Remove Malaria-specific result details pathogen test column, preserving values into testresulttext issue #14016');
+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. ***

sormas-backend/src/test/java/de/symeda/sormas/backend/externalmessage/labmessage/TestReportFacadeEjbMappingTest.java

@@ -125,6 +125,7 @@ public void testFromDto() {
 		source.setSeroGroupSpecificationText("SeroGroup A");
 		source.setSeroTypingMethod(SerotypingMethod.MULTIPLEX_PCR);
 		source.setSeroTypingMethodText("Multiplex PCR Method");
+		source.setPerformedByReferenceLaboratory(true);
 
 		TestReport result = sut.fromDto(source, true);
 
@@ -194,6 +195,7 @@ public void testFromDto() {
 		assertEquals(source.getSeroGroupSpecificationText(), result.getSeroGroupSpecificationText());
 		assertEquals(source.getSeroTypingMethod(), result.getSeroTypingMethod());
 		assertEquals(source.getSeroTypingMethodText(), result.getSeroTypingMethodText());
+		assertEquals(source.getPerformedByReferenceLaboratory(), result.getPerformedByReferenceLaboratory());
 
 	}
 
@@ -275,6 +277,7 @@ public void testToDto() {
 		source.setSeroTypingMethodText("Multiplex PCR Method");
 		source.setSerotype(Serotype.OTHER);
 		source.setSerotypeText("Other Serotype");
+		source.setPerformedByReferenceLaboratory(true);
 
 		TestReportDto result = TestReportFacadeEjb.toDto(source);
 
@@ -347,5 +350,6 @@ public void testToDto() {
 		assertEquals(source.getSeroTypingMethodText(), result.getSeroTypingMethodText());
 		assertEquals(source.getSerotype(), result.getSerotype());
 		assertEquals(source.getSerotypeText(), result.getSerotypeText());
+		assertEquals(source.getPerformedByReferenceLaboratory(), result.getPerformedByReferenceLaboratory());
 	}
 }