[GITFLOW]merging 'release-1.94.0' into 'master'

Author: jenkins

docs/CONTRIBUTING.md

@@ -104,7 +104,7 @@ The development team uses an epic as an umbrella for large change or feature str
 
 ## Contributing to the Project
 
-There are many ways in which you can contribute to this project as a non-developer. If there is something you would like to do that you don't find instructions about here - or if you want to learn how you can get involved - please contact us at sormas@helmholtz-hzi.de
+There are many ways in which you can contribute to this project as a non-developer. If there is something you would like to do that you don't find instructions about here - or if you want to learn how you can get involved - please contact us at info@sormas.org
 or through our [GitHub Discussions](https://github.com/sormas-foundation/SORMAS-Project/discussions) and let us know how we can assist you!
 
 Some possibilities to contribute to SORMAS are:
@@ -115,7 +115,7 @@ Some possibilities to contribute to SORMAS are:
 ## Contributing to the Code
 
 If you're interested in participating in the development of SORMAS, please follow the [Development Environment Setup Instructions](DEVELOPMENT_ENVIRONMENT.md) before you start developing. If you have problems setting up your development environment or need assistance in choosing the first issue to work on,
-please get in touch with us through our [GitHub Discussions](https://github.com/sormas-foundation/SORMAS-Project/discussions) or by contacting us at sormas@helmholtz-hzi.de.
+please get in touch with us through our [GitHub Discussions](https://github.com/sormas-foundation/SORMAS-Project/discussions) or by contacting us at info@sormas.org.
 
 Additionally, our [Wiki](https://github.com/sormas-foundation/SORMAS-Project/wiki) contains some specific development guides that cover common issues like adding new fields to an entity that we suggest to check out before you start implementing something related to those topics:
 
@@ -249,4 +249,4 @@ These dependencies have been added to the dependabot ignore list, so no dependen
 
 #### Keycloak
 The Keycloak version in SORMAS-Project only defines the version of the Keycloak admin client library. When a new version of Keycloak is available this should be updated after the [Keycloak version is SORMAS-Docker](https://github.com/SORMAS-Foundation/SORMAS-Docker/blob/devops/keycloak/Dockerfile) has been updated. \
-This can be tested locally by building the updated Keycloak docker image and then using it in a  [container](https://github.com/SORMAS-Foundation/SORMAS-Project/tree/development/sormas-base/setup/keycloak) together with a local Payara instance.
+This can be tested locally by building the updated Keycloak docker image and then using it in a  [container](https://github.com/SORMAS-Foundation/SORMAS-Project/tree/development/sormas-base/setup/keycloak) together with a local Payara instance.

sormas-api/pom.xml

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

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

@@ -33,7 +33,7 @@ public class CaseFollowUpDto extends FollowUpDto {
 	private Boolean isInJurisdiction;
 
 	//@formatter:off
-	public CaseFollowUpDto(String uuid, Date changeDate, String personFirstName, String personLastName,
+	public CaseFollowUpDto(String uuid, String personFirstName, String personLastName,
 						   Date reportDate, Date symptomsOnsetDate, Date followUpUntil, SymptomJournalStatus symptomJournalStatus,
 						   Disease disease,
 						   boolean isInJurisdiction

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

@@ -87,15 +87,15 @@ public CaseIndexDetailedDto(long id, String uuid, String epidNumber, String exte
 								YesNoUnknown reInfection, String city, String street, String houseNumber, String additionalInformation, String postalCode, String phone,
 								String reportingUserUuid, String reportingUserFirstName, String reportingUserLastName, Date symptomOnsetDate,
 								String responsibleRegion, String responsibleCommunity,
-								int visitCount, long eventCount, Date latestSampleDateTime, long sampleCount, Date latestChangedDate) {
+								int visitCount, long eventCount, Date latestSampleDateTime, long sampleCount) {
 		super(id, uuid, epidNumber, externalID, externalToken, internalToken, personUuid, personFirstName, personLastName,
 				disease, diseaseVariant, diseaseDetails, caseClassification, investigationStatus,
 				presentCondition, reportDate, creationDate,
 				regionUuid, districtUuid, healthFacilityUuid,
 				healthFacilityName, healthFacilityDetails, pointOfEntryUuid, pointOfEntryName, pointOfEntryDetails, surveillanceOfficerUuid, outcome,
 				age, ageType, birthdateDD, birthdateMM, birthdateYYYY, sex,
 				quarantineTo, completeness, followUpStatus, followUpUntil, symptomJournalStatus, vaccinationStatus, changeDate, facilityId,
-				responsibleRegionUuid, responsibleDistrictUuid, responsibleDistrictName, deletionReason, otherDeleteReason, isInJurisdiction, visitCount, latestChangedDate);
+				responsibleRegionUuid, responsibleDistrictUuid, responsibleDistrictName, deletionReason, otherDeleteReason, isInJurisdiction, visitCount);
 		//@formatter:on
 
 		this.reInfection = reInfection;
@@ -114,38 +114,6 @@ public CaseIndexDetailedDto(long id, String uuid, String epidNumber, String exte
 		this.responsibleCommunity = responsibleCommunity;
 	}
 
-	//@formatter:off
-	public CaseIndexDetailedDto(
-			long id, String uuid, String epidNumber, String externalID, String externalToken, String internalToken,
-			String personUuid, String personFirstName, String personLastName,
-			Disease disease, DiseaseVariant diseaseVariant, String diseaseDetails,
-			CaseClassification caseClassification, InvestigationStatus investigationStatus, PresentCondition presentCondition,
-			Date reportDate, Date creationDate,
-			String regionUuid, String districtUuid,
-			String healthFacilityUuid, String healthFacilityName, String healthFacilityDetails,
-			String pointOfEntryUuid, String pointOfEntryName, String pointOfEntryDetails, String surveillanceOfficerUuid,
-			CaseOutcome outcome, Integer age, ApproximateAgeType ageType, Integer birthdateDD, Integer birthdateMM, Integer birthdateYYYY,
-			Sex sex, Date quarantineTo, Float completeness, FollowUpStatus followUpStatus, Date followUpUntil,
-			SymptomJournalStatus symptomJournalStatus, VaccinationStatus vaccinationStatus, Date changeDate, Long facilityId,
-			String responsibleRegionUuid, String responsibleDistrictUuid, String responsibleDistrictName, DeletionReason deletionReason, String otherDeleteReason, boolean isInJurisdiction,
-			//detailed fields
-			YesNoUnknown reInfection, String city, String street, String houseNumber, String additionalInformation,
-			String postalCode, String phone, String reportingUserUuid, String reportingUserFirstName, String reportingUserLastName,
-			Date symptomOnsetDate, String responsibleRegion, String responsibleCommunity, int visitCount,
-			Date latestSampleDateTime, long sampleCount, Date latestChangedDate) {
-		this(id, uuid, epidNumber, externalID, externalToken, internalToken, personUuid, personFirstName, personLastName,
-				disease, diseaseVariant, diseaseDetails, caseClassification, investigationStatus, presentCondition,
-				reportDate, creationDate, regionUuid, districtUuid, healthFacilityUuid, healthFacilityName,
-				healthFacilityDetails, pointOfEntryUuid, pointOfEntryName, pointOfEntryDetails, surveillanceOfficerUuid,
-				outcome, age, ageType, birthdateDD, birthdateMM, birthdateYYYY, sex, quarantineTo, completeness,
-				followUpStatus, followUpUntil, symptomJournalStatus, vaccinationStatus, changeDate, facilityId,
-				responsibleRegionUuid, responsibleDistrictUuid, responsibleDistrictName, deletionReason, otherDeleteReason, isInJurisdiction, reInfection,
-				city, street, houseNumber, additionalInformation, postalCode, phone, reportingUserUuid,
-				reportingUserFirstName, reportingUserLastName, symptomOnsetDate, responsibleRegion, responsibleCommunity,
-				visitCount, 0, latestSampleDateTime, sampleCount, latestChangedDate);
-		//@formatter:on
-	}
-
 	public YesNoUnknown getReInfection() {
 		return reInfection;
 	}

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

@@ -135,29 +135,6 @@ public class CaseIndexDto extends PseudonymizableIndexDto implements MergeableIn
 
 	private Boolean isInJurisdiction;
 
-	//@formatter:off
-	public CaseIndexDto(long id, String uuid, String epidNumber, String externalID, String externalToken, String internalToken, String personUuid, String personFirstName, String personLastName, Disease disease,
-						DiseaseVariant diseaseVariant, String diseaseDetails, CaseClassification caseClassification, InvestigationStatus investigationStatus,
-						PresentCondition presentCondition, Date reportDate, Date creationDate, String regionUuid,
-						String districtUuid, String healthFacilityUuid, String healthFacilityName, String healthFacilityDetails,
-						String pointOfEntryUuid, String pointOfEntryName, String pointOfEntryDetails, String surveillanceOfficerUuid, CaseOutcome outcome,
-						Integer age, ApproximateAgeType ageType, Integer birthdateDD, Integer birthdateMM, Integer birthdateYYYY, Sex sex, Date quarantineTo,
-						Float completeness, FollowUpStatus followUpStatus, Date followUpUntil, SymptomJournalStatus symptomJournalStatus, VaccinationStatus vaccinationStatus, Date changeDate, Long facilityId,
-						// responsible jurisdiction
-						String responsibleRegionUuid, String responsibleDistrictUuid, String responsibleDistrictName, DeletionReason deletionReason, String otherDeletionReason,  boolean isInJurisdiction) {
-		this(id, uuid, epidNumber, externalID, externalToken, internalToken, personUuid, personFirstName, personLastName, disease,
-				diseaseVariant, diseaseDetails, caseClassification, investigationStatus,
-				presentCondition, reportDate, creationDate, regionUuid,
-				districtUuid, healthFacilityUuid, healthFacilityName, healthFacilityDetails,
-				pointOfEntryUuid, pointOfEntryName, pointOfEntryDetails, surveillanceOfficerUuid, outcome,
-				age, ageType, birthdateDD, birthdateMM, birthdateYYYY, sex, quarantineTo,
-				completeness, followUpStatus, followUpUntil, symptomJournalStatus, vaccinationStatus, changeDate, facilityId,
-				responsibleRegionUuid, responsibleDistrictUuid, responsibleDistrictName, deletionReason, otherDeletionReason, isInJurisdiction,
-				null, null
-		);
-	}
-	//@formatter:on
-
 	//@formatter:off
 	public CaseIndexDto(long id, String uuid, String epidNumber, String externalID, String externalToken, String internalToken, String personUuid, String personFirstName, String personLastName, Disease disease,
 						DiseaseVariant diseaseVariant, String diseaseDetails, CaseClassification caseClassification, InvestigationStatus investigationStatus,
@@ -170,8 +147,7 @@ public CaseIndexDto(long id, String uuid, String epidNumber, String externalID,
 						// responsible jurisdiction
 						String responsibleRegionUuid, String responsibleDistrictUuid, String responsibleDistrictName, DeletionReason deletionReason, String otherDeletionReason, boolean isInJurisdiction,
 						// others
-						Integer visitCount,
-						Date latestChangedDate // unused, only here for TypedQuery mapping
+						Integer visitCount
 	) {
 		//@formatter:on
 

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

@@ -1,7 +1,6 @@
 package de.symeda.sormas.api.caze;
 
 import java.util.Date;
-import java.util.Objects;
 
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.common.DeletionReason;
@@ -79,7 +78,6 @@ public CaseMergeIndexDto(
 			deletionReason,
 			otherDeletionReason,
 			isInJurisdiction,
-			null,
 			null
 		);
 	}

sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactIndexDetailedDto.java

@@ -73,16 +73,15 @@ public ContactIndexDetailedDto(String uuid, String personUuid, String personFirs
 								   String externalID, String externalToken, String internalToken, DeletionReason deletionReason, String otherDeleteReason, boolean isInJurisdiction, boolean isCaseInJurisdiction,
 								   Sex sex, Integer approximateAge, ApproximateAgeType approximateAgeType,
 								   String city, String street, String houseNumber, String additionalInformation, String postalCode, String phone,
-								   String reportingUserFirstName, String reportingUserLastName, ContactRelation relationToCase, int visitCount,
-								   Date latestChangedDate // unused, only here for TypedQuery mapping
+								   String reportingUserFirstName, String reportingUserLastName, ContactRelation relationToCase, int visitCount
 	) {
 	//@formatter:on
 
 		//@formatter:off
 		super(uuid, personUuid, personFirstName, personLastName, cazeUuid, disease, diseaseDetails, caseFirstName, caseLastName,
 			regionName, districtName, lastContactDate, contactCategory, contactProximity, contactClassification, contactStatus,
 				completeness, followUpStatus, followUpUntil, symptomJournalStatus, vaccinationStatus, contactOfficerUuid, reportingUserUuid, reportDateTime, caseClassification,
-			caseRegionName, caseDistrictName, changeDate, externalID, externalToken, internalToken, deletionReason, otherDeleteReason,isInJurisdiction, isCaseInJurisdiction , visitCount, latestChangedDate);
+			caseRegionName, caseDistrictName, changeDate, externalID, externalToken, internalToken, deletionReason, otherDeleteReason,isInJurisdiction, isCaseInJurisdiction , visitCount);
 
 		//@formatter:on
 

sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactIndexDto.java

@@ -109,8 +109,7 @@ public ContactIndexDto(String uuid, String personUuid, String personFirstName, S
 						   CaseClassification caseClassification, String caseRegionName, String caseDistrictName,
 						   Date changeDate, // XXX: unused, only here for TypedQuery mapping
 						   String externalID, String externalToken, String internalToken, DeletionReason deletionReason, String otherDeletionReason, boolean isInJurisdiction, boolean isCaseInJurisdiction,
-						   int visitCount,
-						   Date latestChangedDate // unused, only here for TypedQuery mapping
+						   int visitCount
 	) {
 	//@formatter:on
 

sormas-api/src/main/java/de/symeda/sormas/api/customizableenum/CustomizableEnum.java

@@ -25,7 +25,7 @@
  * Base class for customizable enums. Supposed to be extended for every enum that is made customizable to ensure type safety.
  */
 @AuditedClass
-public abstract class CustomizableEnum implements Serializable {
+public abstract class CustomizableEnum implements Serializable, Cloneable {
 
 	private static final long serialVersionUID = 8698428745095686559L;
 
@@ -96,5 +96,14 @@ public int hashCode() {
 		return Objects.hash(value);
 	}
 
+	@Override
+	public CustomizableEnum clone() {
+		try {
+			return (CustomizableEnum) super.clone();
+		} catch (CloneNotSupportedException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
 	public abstract Map<String, Class<?>> getAllProperties();
 }

sormas-api/src/main/java/de/symeda/sormas/api/customizableenum/CustomizableEnumCriteria.java

@@ -27,6 +27,7 @@ public class CustomizableEnumCriteria extends BaseCriteria implements Serializab
 	private String freeTextFilter;
 	private CustomizableEnumType dataType;
 	private Disease disease;
+	private Boolean active = true;
 
 	public String getFreeTextFilter() {
 		return freeTextFilter;
@@ -55,4 +56,13 @@ public CustomizableEnumCriteria disease(Disease disease) {
 		return this;
 	}
 
+	public Boolean getActive() {
+		return active;
+	}
+
+	public CustomizableEnumCriteria active(Boolean active) {
+		this.active = active;
+		return this;
+	}
+
 }