SORMAS-Foundation#3820 add testResultText to LabMessage

Author: [email protected]

sormas-api/src/main/java/de/symeda/sormas/api/labmessage/LabMessageDto.java

@@ -41,6 +41,7 @@ public class LabMessageDto extends EntityDto {
 	public static final String PERSON_HOUSE_NUMBER = "personHouseNumber";
 	public static final String LAB_MESSAGE_DETAILS = "labMessageDetails";
 	public static final String PROCESSED = "processed";
+	public static final String TEST_RESULT_TEXT = "testResultText";
 
 	private Date messageDateTime;
 	private Date sampleDateTime;
@@ -70,6 +71,7 @@ public class LabMessageDto extends EntityDto {
 	private String labMessageDetails;
 
 	private boolean processed;
+	private String testResultText;
 
 	public Date getMessageDateTime() {
 		return messageDateTime;
@@ -279,6 +281,14 @@ public void setProcessed(boolean processed) {
 		this.processed = processed;
 	}
 
+	public String getTestResultText() {
+		return testResultText;
+	}
+
+	public void setTestResultText(String testResultText) {
+		this.testResultText = testResultText;
+	}
+
 	public static LabMessageDto build() {
 
 		LabMessageDto labMessage = new LabMessageDto();

sormas-backend/src/main/java/de/symeda/sormas/backend/labmessage/LabMessage.java

@@ -54,6 +54,7 @@ public class LabMessage extends AbstractDomainObject {
 	public static final String PERSON_HOUSE_NUMBER = "personHouseNumber";
 	public static final String LAB_MESSAGE_DETAILS = "labMessageDetails";
 	public static final String PROCESSED = "processed";
+	public static final String TEST_RESULT_TEXT = "testResultText";
 
 	private Date messageDateTime;
 	private Date sampleDateTime;
@@ -83,6 +84,7 @@ public class LabMessage extends AbstractDomainObject {
 	private String labMessageDetails;
 
 	private boolean processed;
+	private String testResultText;
 
 	@Temporal(TemporalType.TIMESTAMP)
 	public Date getMessageDateTime() {
@@ -317,4 +319,13 @@ public boolean isProcessed() {
 	public void setProcessed(boolean processed) {
 		this.processed = processed;
 	}
+
+	@Column
+	public String getTestResultText() {
+		return testResultText;
+	}
+
+	public void setTestResultText(String testResultText) {
+		this.testResultText = testResultText;
+	}
 }

sormas-backend/src/main/java/de/symeda/sormas/backend/labmessage/LabMessageFacadeEjb.java

@@ -85,6 +85,7 @@ private LabMessage fromDto(@NotNull LabMessageDto source, LabMessage target) {
 		target.setTestLabPostalCode(source.getTestLabPostalCode());
 		target.setTestResult(source.getTestResult());
 		target.setTestType(source.getTestType());
+		target.setTestResultText(source.getTestResultText());
 
 		return target;
 	}
@@ -132,6 +133,7 @@ public LabMessageDto toDto(LabMessage source) {
 		target.setTestLabPostalCode(source.getTestLabPostalCode());
 		target.setTestResult(source.getTestResult());
 		target.setTestType(source.getTestType());
+		target.setTestResultText(source.getTestResultText());
 
 		return target;
 	}
@@ -245,7 +247,7 @@ public void fetchExternalLabMessages() {
 			ExternalLabResultsFacade labResultsFacade = (ExternalLabResultsFacade) ic.lookup(jndiName);
 			newMessages = labResultsFacade.getExternalLabMessages(since);
 			if (newMessages != null) {
-				newMessages.stream().forEach(labMessageDto -> save(labMessageDto));
+				newMessages.forEach(this::save);
 			}
 		} catch (Exception e) {
 			systemEvent.setStatus(SystemEventStatus.ERROR);

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

@@ -6246,6 +6246,6 @@ INSERT INTO schema_version (version_number, comment) VALUES (305, 'Fix labmessag
 ALTER TABLE labmessage ADD COLUMN testresulttext TEXT;
 ALTER TABLE labmessage_history ADD COLUMN testresulttext TEXT;
 
-INSERT INTO schema_version (version_number, comment) VALUES (301, 'Add testresulttext to labmessage #3820');
+INSERT INTO schema_version (version_number, comment) VALUES (306, 'Add testresulttext to labmessage #3820');
 
 -- *** Insert new sql commands BEFORE this line ***