#13197 Add Survey filters to the cases view (#13274)

* #13197 Add Survey filters to the cases view

* #13197 Add Survey filters to the cases view - fix UI issue

---------

Co-authored-by: Levente Gal <levente.gal.ext@vitagroup.ag>

Author: leventegal-she

sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseCriteria.java

@@ -36,6 +36,7 @@
 import de.symeda.sormas.api.person.PresentCondition;
 import de.symeda.sormas.api.person.SymptomJournalStatus;
 import de.symeda.sormas.api.share.ExternalShareCriteria;
+import de.symeda.sormas.api.survey.SurveyReferenceDto;
 import de.symeda.sormas.api.user.UserReferenceDto;
 import de.symeda.sormas.api.user.UserRoleReferenceDto;
 import de.symeda.sormas.api.utils.DateFilterOption;
@@ -87,6 +88,10 @@ public class CaseCriteria extends CriteriaWithDateType implements ExternalShareC
 	public static final String PERSON_LIKE = "personLike";
 	public static final String JURISDICTION_TYPE = "jurisdictionType";
 	public static final String ENTITY_RELEVANCE_STATUS = "relevanceStatus";
+	public static final String SURVEY_ASSIGNED_FROM = "surveyAssignedFrom";
+	public static final String SURVEY_ASSIGNED_TO = "surveyAssignedTo";
+	public static final String SURVEY_RESPONSE_STATUS = "surveyResponseStatus";
+	public static final String SURVEY = "survey";
 
 	private UserRoleReferenceDto reportingUserRole;
 	private Disease disease;
@@ -154,6 +159,11 @@ public class CaseCriteria extends CriteriaWithDateType implements ExternalShareC
 	private Boolean onlyShowCasesWithFulfilledReferenceDefinition;
 	private String personLike;
 	private Boolean withOwnership;
+	private Date surveyAssignedFrom;
+	private Date surveyAssignedTo;
+	private SurveyResponseStatus surveyResponseStatus;
+	private SurveyReferenceDto survey;
+
 	/**
 	 * Used for filtering merge-able cases to filter both lead and similar cases.
 	 */
@@ -833,4 +843,36 @@ public CaseCriteria caseReferenceNumber(String caseReferenceNumber) {
 		this.caseReferenceNumber = caseReferenceNumber;
 		return this;
 	}
+
+	public Date getSurveyAssignedFrom() {
+		return surveyAssignedFrom;
+	}
+
+	public void setSurveyAssignedFrom(Date surveyAssignedFrom) {
+		this.surveyAssignedFrom = surveyAssignedFrom;
+	}
+
+	public Date getSurveyAssignedTo() {
+		return surveyAssignedTo;
+	}
+
+	public void setSurveyAssignedTo(Date surveyAssignedTo) {
+		this.surveyAssignedTo = surveyAssignedTo;
+	}
+
+	public SurveyResponseStatus getSurveyResponseStatus() {
+		return surveyResponseStatus;
+	}
+
+	public void setSurveyResponseStatus(SurveyResponseStatus surveyResponseStatus) {
+		this.surveyResponseStatus = surveyResponseStatus;
+	}
+
+	public SurveyReferenceDto getSurvey() {
+		return survey;
+	}
+
+	public void setSurvey(SurveyReferenceDto survey) {
+		this.survey = survey;
+	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/caze/SurveyResponseStatus.java

@@ -0,0 +1,31 @@
+/*
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2025 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.symeda.sormas.api.caze;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+public enum SurveyResponseStatus {
+    RECEIVED,
+    NOT_RECEIVED;
+
+    @Override
+    public String toString() {
+        return I18nProperties.getEnumCaption(this);
+    }
+}

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java

@@ -1804,7 +1804,11 @@ public interface Strings {
 	String promptSelfReportEpiWeekFrom = "promptSelfReportEpiWeekFrom";
 	String promptSelfReportEpiWeekTo = "promptSelfReportEpiWeekTo";
 	String promptSelfReportFreeTextSearch = "promptSelfReportFreeTextSearch";
+	String promptSurvey = "promptSurvey";
+	String promptSurveyAssignedFrom = "promptSurveyAssignedFrom";
+	String promptSurveyAssignedTo = "promptSurveyAssignedTo";
 	String promptSurveyFreeTextSearch = "promptSurveyFreeTextSearch";
+	String promptSurveyResponseStatus = "promptSurveyResponseStatus";
 	String promptTaskDateFrom = "promptTaskDateFrom";
 	String promptTaskDateTo = "promptTaskDateTo";
 	String promptTaskDateType = "promptTaskDateType";

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

@@ -65,4 +65,6 @@ void uploadEmailTemplate(@NotNull SurveyReferenceDto surveyReference, DocumentTe
     boolean hasUnassignedTokens(SurveyReferenceDto survey);
 
     DocumentVariables getDocumentVariables(SurveyReferenceDto surveyRef) throws DocumentTemplateException;
+
+    List<SurveyReferenceDto> getAllAsReference();
 }

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

@@ -21,6 +21,9 @@ public class SurveyReferenceDto extends ReferenceDto {
 
 	private static final long serialVersionUID = -8612115227784272980L;
 
+	public SurveyReferenceDto() {
+	}
+
 	public SurveyReferenceDto(String uuid, String surveyName) {
 		setUuid(uuid);
 		setCaption(surveyName != null ? surveyName : "");

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

@@ -63,10 +63,10 @@ public static SurveyTokenDto build() {
 		return token;
 	}
 
-	public static SurveyTokenDto build(SurveyDto survey) {
+	public static SurveyTokenDto build(SurveyReferenceDto survey) {
 		SurveyTokenDto token = new SurveyTokenDto();
 		token.setUuid(DataHelper.createUuid());
-		token.setSurvey(new SurveyReferenceDto(survey.getUuid(), survey.getName()));
+		token.setSurvey(survey);
 
 		return token;
 	}

sormas-api/src/main/resources/enum.properties

@@ -2491,4 +2491,8 @@ AefiClassification.UNDETERMINED=Undetermined
 AefiClassificationSubType.VACCINE_PRODUCT_RELATED=Vaccine product related
 AefiClassificationSubType.VACCINE_QUALITY_DEFECT_RELATED=Vaccine quality defect related
 AefiClassificationSubType.IMMUNIZATION_ERROR_RELATED=Immunization error related
-AefiClassificationSubType.IMMUNIZATION_ANXIETY_RELATED=Immunization anxiety related
+AefiClassificationSubType.IMMUNIZATION_ANXIETY_RELATED=Immunization anxiety related
+
+# SurveyResponseStatus
+SurveyResponseStatus.RECEIVED=Response received
+SurveyResponseStatus.NOT_RECEIVED=No response received

sormas-api/src/main/resources/strings.properties

@@ -1822,6 +1822,11 @@ promptCustomizableEnumSearchField = Search by value or caption...
 
 promptSurveyFreeTextSearch = Name
 
+promptSurvey=Survey
+promptSurveyResponseStatus=Response status
+promptSurveyAssignedFrom=Assigned date from ...
+promptSurveyAssignedTo=... to
+
 # Unsaved changes
 unsavedChanges.warningTitle = Unsaved changes
 unsavedChanges.warningMessage = This form contains unsaved changes. Please decide whether you want to cancel the action you have just taken in order to review them, or save or discard the changes and continue.

sormas-backend/src/main/java/de/symeda/sormas/backend/caze/Case.java

@@ -96,6 +96,7 @@
 import de.symeda.sormas.backend.sormastosormas.origin.SormasToSormasOriginInfo;
 import de.symeda.sormas.backend.sormastosormas.share.outgoing.SormasToSormasShareInfo;
 import de.symeda.sormas.backend.specialcaseaccess.SpecialCaseAccess;
+import de.symeda.sormas.backend.survey.SurveyToken;
 import de.symeda.sormas.backend.symptoms.Symptoms;
 import de.symeda.sormas.backend.task.Task;
 import de.symeda.sormas.backend.therapy.Therapy;
@@ -245,6 +246,7 @@ public class Case extends CoreAdo implements IsCase, SormasToSormasShareable, Ha
 	public static final String CREATION_VERSION = "creationVersion";
 	public static final String SPECIAL_CASE_ACCESSES = "specialCaseAccesses";
 	public static final String SELF_REPORT = "selfReport";
+	public static final String SURVEY_TOKENS = "surveyTokens";
 
 	private Person person;
 	private String description;
@@ -430,6 +432,8 @@ public class Case extends CoreAdo implements IsCase, SormasToSormasShareable, Ha
 
 	private List<SelfReport> selfReport;
 
+	private List<SurveyToken> surveyTokens;
+
 	public static Case build() {
 		Case caze = new Case();
 		caze.setSystemCaseClassification(CaseClassification.NOT_CLASSIFIED);
@@ -1788,4 +1792,13 @@ public List<SelfReport> getSelfReport() {
 	public void setSelfReport(List<SelfReport> selfReport) {
 		this.selfReport = selfReport;
 	}
+
+	@OneToMany(mappedBy = SurveyToken.CASE_ASSIGNED_TO, fetch = FetchType.LAZY)
+	public List<SurveyToken> getSurveyTokens() {
+		return surveyTokens;
+	}
+
+	public void setSurveyTokens(List<SurveyToken> surveyTokens) {
+		this.surveyTokens = surveyTokens;
+	}
 }

sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseJoins.java

@@ -44,6 +44,8 @@
 import de.symeda.sormas.backend.share.ExternalShareInfo;
 import de.symeda.sormas.backend.sormastosormas.share.outgoing.SormasToSormasShareInfo;
 import de.symeda.sormas.backend.specialcaseaccess.SpecialCaseAccess;
+import de.symeda.sormas.backend.survey.SurveyToken;
+import de.symeda.sormas.backend.survey.SurveyTokenJoins;
 import de.symeda.sormas.backend.symptoms.Symptoms;
 import de.symeda.sormas.backend.user.User;
 import de.symeda.sormas.backend.visit.Visit;
@@ -80,6 +82,8 @@ public class CaseJoins extends QueryJoins<Case> {
 	private SampleJoins sampleJoins;
 	private EventParticipantJoins eventParticipantJoins;
 	private Join<Case, SpecialCaseAccess> specialCaseAccesses;
+	private Join<Case, SurveyToken> surveyTokens;
+	private SurveyTokenJoins surveyTokenJoins;
 
 	public CaseJoins(From<?, Case> caze) {
 		super(caze);
@@ -344,4 +348,20 @@ public Join<Case, SpecialCaseAccess> getSpecialCaseAccesses() {
 	private void setSpecialCaseAccesses(Join<Case, SpecialCaseAccess> specialCaseAccesses) {
 		this.specialCaseAccesses = specialCaseAccesses;
 	}
+
+    public Join<Case, SurveyToken> getSurveyTokens() {
+		return getOrCreate(surveyTokens, Case.SURVEY_TOKENS, JoinType.LEFT, this::setSurveyTokens);
+	}
+
+	private void setSurveyTokens(Join<Case, SurveyToken> surveyTokens) {
+		this.surveyTokens = surveyTokens;
+	}
+
+	public SurveyTokenJoins getSurveyTokenJoins() {
+		return getOrCreate(surveyTokenJoins, () -> new SurveyTokenJoins(getSurveyTokens()), this::setSurveyTokenJoins);
+	}
+
+	private void setSurveyTokenJoins(SurveyTokenJoins surveyTokenJoins) {
+		this.surveyTokenJoins = surveyTokenJoins;
+	}
 }