Handled downloading of survey request / ignore option for some fields

Author: Pa-Touche

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

@@ -204,6 +204,8 @@ public class ExternalMessageDto extends SormasToSormasShareableDto {
 	private String externalMessageDetails;
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong)
 	private String caseComments;
+
+	// TODO: reportId can be used as dedup - idempotency key
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
 	private String reportId;
 

sormas-api/src/main/java/de/symeda/sormas/api/hospitalization/HospitalizationDto.java

@@ -119,6 +119,8 @@ public class HospitalizationDto extends EntityDto {
 		Disease.CRYPTOSPORIDIOSIS })
 	private Integer durationOfHospitalization;
 
+	private YesNoUnknown oxygenTherapy;
+
 	public static HospitalizationDto build() {
 		HospitalizationDto hospitalization = new HospitalizationDto();
 		hospitalization.setUuid(DataHelper.createUuid());
@@ -278,4 +280,12 @@ public Integer getDurationOfHospitalization() {
 	public void setDurationOfHospitalization(Integer durationOfHospitalization) {
 		this.durationOfHospitalization = durationOfHospitalization;
 	}
+
+	public YesNoUnknown getOxygenTherapy() {
+		return oxygenTherapy;
+	}
+
+	public void setOxygenTherapy(YesNoUnknown oxygenTherapy) {
+		this.oxygenTherapy = oxygenTherapy;
+	}
 }

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

@@ -22,9 +22,9 @@
 
 public enum YesNoUnknown {
 
+	@ValueMapperDefault
 	YES,
 	NO,
-	@ValueMapperDefault
 	UNKNOWN;
 
 	@Override

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

@@ -17,6 +17,7 @@
 import org.slf4j.LoggerFactory;
 
 import de.symeda.sormas.api.externalmessage.ExternalMessageDto;
+import de.symeda.sormas.api.externalmessage.ExternalMessageStatus;
 import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseRequest;
 import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseResult;
 import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseWrapper;
@@ -27,6 +28,7 @@
 import de.symeda.sormas.api.survey.SurveyTokenDto;
 import de.symeda.sormas.api.utils.Tuple;
 import de.symeda.sormas.api.utils.dataprocessing.ProcessingResultStatus;
+import de.symeda.sormas.backend.externalmessage.labmessage.ExternalMessageProcessingFacadeEjbLocal;
 import de.symeda.sormas.backend.survey.SurveyFacadeEjb;
 import de.symeda.sormas.backend.survey.SurveyTokenFacadeEjb;
 import de.symeda.sormas.backend.util.CollectorUtils;
@@ -45,6 +47,9 @@ public class AutomaticSurveyResponseProcessor {
 	@EJB
 	private SurveyTokenFacadeEjb.SurveyTokenFacadeEjbLocal surveyTokenFacade;
 
+	@EJB
+	private ExternalMessageProcessingFacadeEjbLocal processingFacade;
+
 	@Transactional(Transactional.TxType.REQUIRES_NEW)
 	public List<SurveyResponseProcessingResult> processSurveyResponses(List<ExternalMessageDto> externalMessages)
 		throws InterruptedException, ExecutionException {
@@ -111,6 +116,10 @@ public List<SurveyResponseProcessingResult> processSurveyResponses(List<External
 			if (!response.isApplied()) {
 				return surveyResponseProcessingResult.setResultStatus(ProcessingResultStatus.CANCELED);
 			}
+
+			externalMessage.setStatus(ExternalMessageStatus.PROCESSED);
+			processingFacade.saveExternalMessage(externalMessage);
+
 			return surveyResponseProcessingResult.setResultStatus(ProcessingResultStatus.DONE);
 
 		} catch (RuntimeException e) {

sormas-backend/src/main/java/de/symeda/sormas/backend/hospitalization/Hospitalization.java

@@ -82,6 +82,9 @@ public class Hospitalization extends AbstractDomainObject {
 	private YesNoUnknown currentlyHospitalized;
 	private Integer durationOfHospitalization;
 
+	// TODO: add-UI + DB
+	private YesNoUnknown oxygenTherapy;
+
 	@Temporal(TemporalType.TIMESTAMP)
 	public Date getAdmissionDate() {
 		return admissionDate;
@@ -262,4 +265,12 @@ public Integer getDurationOfHospitalization() {
 	public void setDurationOfHospitalization(Integer durationOfHospitalization) {
 		this.durationOfHospitalization = durationOfHospitalization;
 	}
+
+	public YesNoUnknown getOxygenTherapy() {
+		return oxygenTherapy;
+	}
+
+	public void setOxygenTherapy(YesNoUnknown oxygenTherapy) {
+		this.oxygenTherapy = oxygenTherapy;
+	}
 }