Merge development into master

Author: SORMAS-Robot

funding.json

@@ -0,0 +1,90 @@
+{
+    "$schema": "https://floss.fund/schema/v1.0.0/funding.schema.json#",
+    "version": "v1.0.0",
+    "entity": {
+        "type": "organisation",
+        "role": "owner",
+        "name": "SORMAS Foundation",
+        "email": "info@sormas.org",
+        "phone": "004953139399434",
+        "description": "The SORMAS Foundation is a non-profit organization that aims to support countries in strengthening their surveillance and outbreak management systems through the implementation of SORMAS, as well as to ensure the high-quality standards and sustainability of the software itself.",
+        "webpageUrl": {
+            "url": "https://github.com/SORMAS-Foundation/SORMAS-Project",
+            "wellKnown": ""
+        }
+    },
+    "projects": [{
+        "guid": "sormas",
+        "name": "SORMAS (Surveillance Outbreak Response Management and Analysis System)",
+        "description": "SORMAS is an open-source digital platform for epidemic and pandemic preparedness and response. The system allows epidemiological diseases surveillance, early detection and management of disease outbreaks. It started as a research project in 2015 and has since then been recognized as a Digital Public Good (DPG) and mature digital Global Good (DGG) and is in use in several countries across 5 WHO regions.",
+        "webpageUrl": {
+            "url": "https://github.com/SORMAS-Foundation/SORMAS-Project",
+			"wellKnown": ""
+        },
+        "repositoryUrl": {
+            "url": "https://github.com/SORMAS-Foundation/SORMAS-Project",
+			"wellKnown": ""
+        },
+        "licenses": ["spdx:GPL-3.0"],
+        "tags": ["publichealth", "health", "surveillance", "epidemic", "nonprofit", "globalgood", "digitalpublicgood"]
+    }],
+    "funding": {
+        "channels": [
+            {
+                "guid": "bank",
+                "type": "bank",
+                "address": "",
+                "description": "We accept donations through direct bank transfer. Please e-mail us for more details."
+            },
+            {
+                "guid": "paypal",
+                "type": "payment-provider",
+                "address": "https://paypal.me/sormasfoundation",
+                "description": "We accept donations through PayPal. Please note that we can not provide donation receipts in this case. If you require a donation receipt, please e-mail us for information about making a donation through direct bank transfer."
+            }
+        ],
+        "plans": [
+            {
+                "guid": "infrastructure-hosting",
+                "status": "active",
+                "name": "Hosting Costs for Infrastructure",
+                "description": "This will cover our monthly costs for maintaining Development and QA systems, as well as a publicly available demo system.",
+                "amount": 500,
+                "currency": "EUR",
+                "frequency": "monthly",
+                "channels": ["bank", "paypal"]
+            },
+			{
+                "guid": "community-exchange-systems",
+                "status": "active",
+                "name": "Community Exchange Systems",
+                "description": "This will cover our monthly costs for hosting our public website (https://www.sormas.org) as well as the community exchange platform (https://community.sormas.org) for one month.",
+                "amount": 200,
+                "currency": "EUR",
+                "frequency": "yearly",
+                "channels": ["bank", "paypal"]
+            },
+            {
+                "guid": "developer-full-time-onemonth",
+                "status": "active",
+                "name": "Developer Salary Full-Time Monthly",
+                "description": "This will cover the cost of one developer working full-time on the project for one month.",
+                "amount": 8000,
+                "currency": "EUR",
+                "frequency": "monthly",
+                "channels": ["bank", "paypal"]
+            },
+            {
+                "guid": "angel-plan",
+                "status": "active",
+                "name": "Goodwill plan",
+                "description": "Pay anything you wish to show your support for the project. Thank you for your support!",
+                "amount": 0,
+                "currency": "EUR",
+                "frequency": "one-time",
+                "channels": ["bank", "paypal"]
+            }
+		]
+    }
+}
+

sormas-api/pom.xml

@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-        <version>1.100.1</version>
+        <version>1.101.0-SNAPSHOT</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

sormas-api/src/main/java/de/symeda/sormas/api/FacadeProvider.java

@@ -103,6 +103,8 @@
 import de.symeda.sormas.api.sormastosormas.share.outgoing.ShareRequestInfoFacade;
 import de.symeda.sormas.api.sormastosormas.share.outgoing.SormasToSormasShareInfoFacade;
 import de.symeda.sormas.api.specialcaseaccess.SpecialCaseAccessFacade;
+import de.symeda.sormas.api.survey.SurveyFacade;
+import de.symeda.sormas.api.survey.SurveyTokenFacade;
 import de.symeda.sormas.api.symptoms.SymptomsFacade;
 import de.symeda.sormas.api.systemevents.SystemEventFacade;
 import de.symeda.sormas.api.systemevents.sync.SyncFacade;
@@ -554,6 +556,14 @@ public static SelfReportImportFacade getSelfReportImportFacade() {
 		return get().lookupEjbRemote(SelfReportImportFacade.class);
 	}
 
+	public static SurveyFacade getSurveyFacade() {
+		return get().lookupEjbRemote(SurveyFacade.class);
+	}
+
+	public static SurveyTokenFacade getSurveyTokenFacade() {
+		return get().lookupEjbRemote(SurveyTokenFacade.class);
+	}
+
 	@SuppressWarnings("unchecked")
 	public <P> P lookupEjbRemote(Class<P> clazz) {
 		try {

sormas-api/src/main/java/de/symeda/sormas/api/audit/Constants.java

@@ -8,7 +8,7 @@
 public class Constants {
 
 	public static final Set<String> createPrefix =
-		Collections.unmodifiableSet(new HashSet<>(Arrays.asList("create", "generate", "build", "clone", "calculate")));
+		Collections.unmodifiableSet(new HashSet<>(Arrays.asList("create", "generate", "build", "clone", "calculate", "upload")));
 	public static final Set<String> readPrefix = Collections.unmodifiableSet(
 		new HashSet<>(
 			Arrays.asList(

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/docgeneneration/DocumentTemplateCriteria.java

@@ -0,0 +1,52 @@
+package de.symeda.sormas.api.docgeneneration;
+
+import javax.annotation.Nullable;
+
+import de.symeda.sormas.api.Disease;
+import de.symeda.sormas.api.survey.SurveyReferenceDto;
+import de.symeda.sormas.api.utils.criteria.BaseCriteria;
+
+public class DocumentTemplateCriteria extends BaseCriteria {
+
+	public static final String DOCUMENT_WORKFLOW = "documentWorkflow";
+	public static final String DISEASE = "disease";
+	public static final String SURVEY = "surveyReference";
+
+	private DocumentWorkflow documentWorkflow;
+	@Nullable
+	private Disease disease;
+	private SurveyReferenceDto surveyReference;
+
+	public DocumentTemplateCriteria(DocumentWorkflow documentWorkflow, Disease disease, SurveyReferenceDto surveyReference) {
+		this.documentWorkflow = documentWorkflow;
+		this.disease = disease;
+		this.surveyReference = surveyReference;
+	}
+
+	public DocumentWorkflow getDocumentWorkflow() {
+		return documentWorkflow;
+	}
+
+	public DocumentTemplateCriteria setDocumentWorkflow(DocumentWorkflow documentWorkflow) {
+		this.documentWorkflow = documentWorkflow;
+		return this;
+	}
+
+	public Disease getDisease() {
+		return disease;
+	}
+
+	public DocumentTemplateCriteria setDisease(Disease disease) {
+		this.disease = disease;
+		return this;
+	}
+
+	public SurveyReferenceDto getSurveyReference() {
+		return surveyReference;
+	}
+
+	public DocumentTemplateCriteria setSurveyReference(SurveyReferenceDto surveyReference) {
+		this.surveyReference = surveyReference;
+		return this;
+	}
+}

sormas-api/src/main/java/de/symeda/sormas/api/docgeneneration/DocumentTemplateFacade.java

@@ -22,16 +22,16 @@ String generateDocumentTxtFromEntities(
 		Properties extraProperties)
 		throws DocumentTemplateException;
 
-	List<DocumentTemplateDto> getAvailableTemplates(DocumentWorkflow documentWorkflow, Disease disease);
+	List<DocumentTemplateDto> getAvailableTemplates(DocumentTemplateCriteria documentTemplateCriteria);
 
 	boolean isExistingTemplateFile(DocumentWorkflow documentWorkflow, Disease disease, String templateName);
 
 	DocumentVariables getDocumentVariables(DocumentTemplateReferenceDto templateReference) throws DocumentTemplateException;
 
-	DocumentTemplateDto saveDocumentTemplate(DocumentTemplateDto template, byte[] document)
-		throws DocumentTemplateException;
+	DocumentTemplateDto saveDocumentTemplate(DocumentTemplateDto template, byte[] document) throws DocumentTemplateException;
 
-	boolean deleteDocumentTemplate(DocumentTemplateReferenceDto templateReference) throws DocumentTemplateException;
+	boolean deleteDocumentTemplate(DocumentTemplateReferenceDto templateReference, DocumentWorkflow documentWorkflow)
+		throws DocumentTemplateException;
 
 	byte[] getDocumentTemplateContent(DocumentTemplateReferenceDto templateReference) throws DocumentTemplateException;
 }

sormas-api/src/main/java/de/symeda/sormas/api/docgeneneration/DocumentWorkflow.java

@@ -126,7 +126,23 @@ public enum DocumentWorkflow {
 		UserRight.EMAIL_TEMPLATE_MANAGEMENT,
 		ROOT_TRAVEL_ENTRY,
 		ROOT_PERSON,
-		ROOT_USER);
+		ROOT_USER),
+	SURVEY_DOCUMENT(DocumentWorkflowType.DOCUMENT,
+		"survey",
+						  DOCX,
+						  UserRight.SURVEY_EDIT,
+						  ROOT_CASE,
+						  ROOT_PERSON,
+						  ROOT_USER,
+						  ROOT_SAMPLE),
+	SURVEY_EMAIL(DocumentWorkflowType.EMAIL,
+			Constants.EMAIL_TEMPLATES_FOLDER + "/surveys",
+			TXT,
+			UserRight.SURVEY_EDIT,
+			ROOT_CASE,
+			ROOT_PERSON,
+			ROOT_USER,
+			ROOT_SAMPLE),;
 
 	private final DocumentWorkflowType type;
 	private final String templateDirectory;

sormas-api/src/main/java/de/symeda/sormas/api/document/DocumentFacade.java

@@ -44,4 +44,6 @@ public interface DocumentFacade {
 	byte[] getContent(String uuid) throws IOException;
 
 	void cleanupDeletedDocuments();
+
+	void deleteDocumentFromAllRelations(String documentUuid);
 }