ability to display Case info in external messages

Author: Pa-Touche

sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyFacade.java

@@ -17,11 +17,14 @@
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Optional;
 
 import javax.ejb.Remote;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 
+import org.apache.commons.collections4.CollectionUtils;
+
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.docgeneneration.DocumentTemplateDto;
 import de.symeda.sormas.api.docgeneneration.DocumentTemplateException;
@@ -41,7 +44,11 @@ void uploadDocumentTemplate(@NotNull SurveyReferenceDto surveyRef, DocumentTempl
 
 	SurveyDto getByUuid(String uuid);
 
-	List<SurveyDto> getByExternalIds(List<String> externalId);
+	List<SurveyDto> getByExternalIds(List<String> externalIds);
+
+	default Optional<SurveyDto> getByExternalId(@NotNull String externalId) {
+		return Optional.ofNullable(getByExternalIds(List.of(externalId))).filter(CollectionUtils::isNotEmpty).map(surveys -> surveys.get(0));
+	}
 
 	long count(SurveyCriteria criteria);
 

sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyTokenFacade.java

@@ -47,6 +47,8 @@ public interface SurveyTokenFacade {
 
 	SurveyTokenDto getBySurveyAndToken(SurveyReferenceDto survey, String token);
 
+	SurveyTokenDto getBySurveyExternalIdAndToken(String externalSurveyId, String token);
+
 	List<SurveyTokenDto> getBySurveyReferenceTokenTuples(List<Tuple<SurveyReferenceDto, String>> surveyReferenceTokenTuples);
 
 	boolean exists(String uuid);

sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java

@@ -388,11 +388,6 @@ public ExternalMessageDto save(@Valid ExternalMessageDto dto, boolean checkChang
 
 		validate(dto);
 
-		// TODO: is null but should not
-		if (ExternalMessageType.SURVEY_RESPONSE.equals(dto.getType())) {
-			// TODO: fill missing holes from person: fetch the entities: case -> person 
-		}
-
 		externalMessage = fillOrBuildEntity(dto, externalMessage, checkChangeDate);
 
 		// If it is a LabMessage and it has not set a DiseaseVariant, an attempt is made to determine this from the attached TestReports.

sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java

@@ -237,11 +237,11 @@ public SurveyDto getByUuid(String uuid) {
 	}
 
 	@Override
-	public List<SurveyDto> getByExternalIds(List<String> externalId) {
+	public List<SurveyDto> getByExternalIds(List<String> externalIds) {
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<Survey> cq = cb.createQuery(Survey.class);
 		Root<Survey> from = cq.from(Survey.class);
-		cq.where(cb.equal(from.get(Survey.EXTERNAL_ID), externalId));
+		cq.where(cb.equal(from.get(Survey.EXTERNAL_ID), externalIds));
 		cq.orderBy(cb.desc(from.get(Survey.NAME)));
 
 		return getAsStream(cq).map(this::toDto).collect(Collectors.toList());

sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java

@@ -44,6 +44,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import de.symeda.sormas.api.survey.SurveyDto;
 import de.symeda.sormas.api.survey.SurveyReferenceDto;
 import de.symeda.sormas.api.survey.SurveyTokenCriteria;
 import de.symeda.sormas.api.survey.SurveyTokenDto;
@@ -228,6 +229,14 @@ public SurveyTokenDto getBySurveyAndToken(SurveyReferenceDto survey, String toke
 		return toDto(surveyTokenService.getBySurveyAndToken(survey, token));
 	}
 
+	@Override
+	public SurveyTokenDto getBySurveyExternalIdAndToken(String externalSurveyId, String token) {
+		SurveyDto surveyDto = surveyFacade.getByExternalId(externalSurveyId)
+			.orElseThrow(() -> new RuntimeException(String.format("Survey with external id: [%s] not found", externalSurveyId)));
+
+		return toDto(surveyTokenService.getBySurveyAndToken(surveyDto.toReference(), token));
+	}
+
 	@Override
 	public List<SurveyTokenDto> getBySurveyReferenceTokenTuples(
 		List<de.symeda.sormas.api.utils.Tuple<SurveyReferenceDto, String>> surveyReferenceTokenTuples) {