Merge pull request #13330 from SORMAS-Foundation/13325-survey-token-code-not-appearing-in-body-of-email

13325 survey token code not appearing in body of email

Author: KarnaiahPesula

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

@@ -16,6 +16,7 @@
 package de.symeda.sormas.api.survey;
 
 import de.symeda.sormas.api.caze.CaseReferenceDto;
+import de.symeda.sormas.api.document.DocumentReferenceDto;
 import de.symeda.sormas.api.utils.IgnoreForUrl;
 import de.symeda.sormas.api.utils.criteria.BaseCriteria;
 
@@ -33,6 +34,7 @@ public class SurveyTokenCriteria extends BaseCriteria {
 	private CaseReferenceDto caseAssignedTo;
 	private Boolean responseReceived;
 	private Boolean tokenNotAssigned;
+	private DocumentReferenceDto document;
 
 	@IgnoreForUrl
 	public SurveyReferenceDto getSurvey() {
@@ -97,4 +99,17 @@ public Boolean getTokenNotAssigned() {
 	public void setTokenNotAssigned(Boolean tokenNotAssigned) {
 		this.tokenNotAssigned = tokenNotAssigned;
 	}
+
+	public SurveyTokenCriteria document(DocumentReferenceDto document) {
+		setDocument(document);
+		return this;
+	}
+
+	public DocumentReferenceDto getDocument() {
+		return document;
+	}
+
+	public void setDocument(DocumentReferenceDto document) {
+		this.document = document;
+	}
 }

sormas-backend/src/main/java/de/symeda/sormas/backend/externalemail/ExternalEmailFacadeEjb.java

@@ -28,6 +28,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -38,6 +39,7 @@
 import javax.mail.MessagingException;
 import javax.validation.Valid;
 
+import de.symeda.sormas.api.survey.SurveyTokenCriteria;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -102,6 +104,8 @@
 import de.symeda.sormas.backend.manualmessagelog.ManualMessageLogService;
 import de.symeda.sormas.backend.person.Person;
 import de.symeda.sormas.backend.person.PersonService;
+import de.symeda.sormas.backend.survey.SurveyToken;
+import de.symeda.sormas.backend.survey.SurveyTokenService;
 import de.symeda.sormas.backend.travelentry.services.TravelEntryService;
 import de.symeda.sormas.backend.user.User;
 import de.symeda.sormas.backend.user.UserService;
@@ -111,6 +115,7 @@ public class ExternalEmailFacadeEjb implements ExternalEmailFacade {
 
 	private static final Logger logger = LoggerFactory.getLogger(ExternalEmailFacadeEjb.class);
 	public static final int ATTACHMENT_PASSWORD_LENGTH = 10;
+	private static final String SURVEY_TOKEN_DOCUMENT_PLACEHOLDER = "surveyToken";
 	// @formatter:off
 	private static final Map<DocumentWorkflow, DocumentRelatedEntityType> DOCUMENT_WORKFLOW_DOCUMENT_RELATION_MAPPING = Map.of(
 		DocumentWorkflow.CASE_EMAIL, DocumentRelatedEntityType.CASE,
@@ -158,6 +163,8 @@ public class ExternalEmailFacadeEjb implements ExternalEmailFacade {
 	private ManualMessageLogService manualMessageLogService;
 	@EJB
 	private DocGenerationHelper docGenerationHelper;
+	@EJB
+	private SurveyTokenService surveyTokenService;
 
 	@Override
 	public List<DocumentTemplateDto> getTemplates(DocumentWorkflow documentWorkflow) {
@@ -235,7 +242,22 @@ private void sendEmail(@Valid ExternalEmailOptionsDto options, boolean onlyLinke
 			emailAttachments = attachmentService.createEncryptedPdfs(filesToBeEncryped, password);
 		}
 
-		String generatedText = documentTemplateFacade.generateDocumentTxtFromEntities(options.getTemplate(), documentEntities, null);
+		SurveyTokenCriteria surveyTokenCriteria = new SurveyTokenCriteria();
+		if(options.getRootEntityReference() instanceof CaseReferenceDto){
+			surveyTokenCriteria.caseAssignedTo((CaseReferenceDto) options.getRootEntityReference());
+			if (options.getAttachedDocuments() != null && options.getAttachedDocuments().size() > 0) {
+				DocumentReferenceDto documentRef = options.getAttachedDocuments().iterator().next();
+				surveyTokenCriteria.document(documentRef);
+			}
+		}
+
+		Properties externalEmailProperties = new Properties();
+		SurveyToken surveyToken = surveyTokenService.getToken(surveyTokenCriteria);
+		if (surveyToken != null) {
+			externalEmailProperties.setProperty(SURVEY_TOKEN_DOCUMENT_PLACEHOLDER, surveyToken.getToken());
+		}
+
+		String generatedText = documentTemplateFacade.generateDocumentTxtFromEntities(options.getTemplate(), documentEntities, externalEmailProperties);
 		EmailTemplateTexts emailTexts = splitTemplateContent(generatedText);
 
 		try {

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

@@ -67,6 +67,10 @@ public Predicate buildCriteriaFilter(SurveyTokenCriteria criteria, CriteriaBuild
 			filter = CriteriaBuilderHelper.and(cb, filter, cb.equal(root.get(SurveyToken.RESPONSE_RECEIVED), Boolean.TRUE));
 		}
 
+		if (criteria.getDocument() != null) {
+			filter = CriteriaBuilderHelper.and(cb, filter, cb.equal(joins.getGeneratedDocument().get(Case.UUID), criteria.getDocument().getUuid()));
+		}
+
 		return filter;
 	}
 
@@ -83,15 +87,28 @@ public SurveyToken getFirstUnusedToken(SurveyReferenceDto survey) {
 		return QueryHelper.getFirstResult(em, cq);
 	}
 
+	public SurveyToken getToken(SurveyTokenCriteria criteria) {
+		CriteriaBuilder cb = em.getCriteriaBuilder();
+		CriteriaQuery<SurveyToken> cq = cb.createQuery(SurveyToken.class);
+		Root<SurveyToken> root = cq.from(SurveyToken.class);
+		cq.select(root);
+		Predicate filter = CriteriaBuilderHelper.and(cb, this.buildCriteriaFilter(criteria, cb, root, new SurveyTokenJoins(root)));
+		if (filter != null) {
+			cq.where(filter);
+		}
+		cq.orderBy(cb.desc(root.get(SurveyToken.ASSIGNMENT_DATE)));
+
+		return QueryHelper.getFirstResult(em, cq);
+	}
+
 	public SurveyToken getBySurveyAndToken(SurveyReferenceDto survey, String token) {
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<SurveyToken> cq = cb.createQuery(SurveyToken.class);
 		Root<SurveyToken> root = cq.from(SurveyToken.class);
 		SurveyTokenJoins joins = new SurveyTokenJoins(root);
 
 		cq.select(root);
-		cq.where(cb.equal(joins.getSurvey().get(Survey.UUID), survey.getUuid()),
-				cb.equal(root.get(SurveyToken.TOKEN), token));
+		cq.where(cb.equal(joins.getSurvey().get(Survey.UUID), survey.getUuid()), cb.equal(root.get(SurveyToken.TOKEN), token));
 
 		return QueryHelper.getFirstResult(em, cq);
 	}