Merge branch 'development' of https://github.com/SORMAS-Foundation/SORMAS-Project into feat/ngsurvey-v2

Author: Pa-Touche

sormas-api/src/main/java/de/symeda/sormas/api/exposure/ExposureDto.java

@@ -20,6 +20,7 @@
 import java.util.Set;
 
 import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 import de.symeda.sormas.api.CountryHelper;
@@ -153,6 +154,7 @@ public class ExposureDto extends PseudonymizableDto {
 	@SensitiveData
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong)
 	private String description;
+	@NotNull(message = Validations.requiredField)
 	private ExposureType exposureType;
 	@SensitiveData
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong)

sormas-api/src/main/java/de/symeda/sormas/api/exposure/ExposureType.java

@@ -15,6 +15,14 @@
 
 package de.symeda.sormas.api.exposure;
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.utils.Diseases;
@@ -24,63 +32,94 @@ public enum ExposureType {
 	@Diseases(value = {
 		Disease.CRYPTOSPORIDIOSIS,
 		Disease.GIARDIASIS }, hide = true)
-	WORK,
+	WORK(true),
 	@Diseases({
 		Disease.CRYPTOSPORIDIOSIS,
 		Disease.GIARDIASIS })
-	TRAVEL,
+	TRAVEL(true),
 	@Diseases(value = {
 		Disease.CRYPTOSPORIDIOSIS,
 		Disease.GIARDIASIS }, hide = true)
-	SPORT,
+	SPORT(false),
 	@Diseases(value = {
 		Disease.CRYPTOSPORIDIOSIS,
 		Disease.GIARDIASIS }, hide = true)
-	VISIT,
+	VISIT(false),
 	@Diseases(value = {
 		Disease.CRYPTOSPORIDIOSIS,
 		Disease.GIARDIASIS }, hide = true)
-	GATHERING,
+	GATHERING(true),
 	@Diseases(value = {
 		Disease.CRYPTOSPORIDIOSIS,
 		Disease.GIARDIASIS }, hide = true)
-	HABITATION,
+	HABITATION(false),
 	@Diseases(value = {
 		Disease.CRYPTOSPORIDIOSIS,
 		Disease.GIARDIASIS }, hide = true)
-	PERSONAL_SERVICES,
+	PERSONAL_SERVICES(false),
 	@Diseases(value = {
 		Disease.RESPIRATORY_SYNCYTIAL_VIRUS })
-	CHILDCARE_FACILITY,
+	CHILDCARE_FACILITY(false),
 	@Diseases(value = {
 		Disease.CORONAVIRUS,
 		Disease.GIARDIASIS,
 		Disease.CRYPTOSPORIDIOSIS }, hide = true)
-	BURIAL,
+	BURIAL(false),
 	@Diseases(value = {
 		Disease.CORONAVIRUS }, hide = true)
-	ANIMAL_CONTACT,
+	ANIMAL_CONTACT(false),
 	@Diseases({
 		Disease.GIARDIASIS,
 		Disease.CRYPTOSPORIDIOSIS })
-	RECREATIONAL_WATER,
+	RECREATIONAL_WATER(false, ExposureCategory.WATER_BORNE),
 	@Diseases({
 		Disease.GIARDIASIS,
 		Disease.CRYPTOSPORIDIOSIS })
-	FOOD,
+	FOOD(false, ExposureCategory.FOOD_BORNE),
 	@Diseases({
 		Disease.GIARDIASIS,
 		Disease.CRYPTOSPORIDIOSIS })
-	SEXUAL_CONTACT,
+	SEXUAL_CONTACT(false, ExposureCategory.DIRECT_CONTACT),
 	@Diseases({
 		Disease.CRYPTOSPORIDIOSIS })
-	SYMPTOMATIC_CONTACT,
+	SYMPTOMATIC_CONTACT(false, ExposureCategory.DIRECT_CONTACT),
 	@Diseases({
 		Disease.CRYPTOSPORIDIOSIS,
 		Disease.GIARDIASIS })
-	FLOOD_EXPOSURE,
-	OTHER,
-	UNKNOWN;
+	FLOOD_EXPOSURE(false, ExposureCategory.WATER_BORNE),
+	OTHER(true),
+	UNKNOWN(true);
+
+	private final boolean defaultType;
+	private final Set<ExposureCategory> categories;
+
+	ExposureType(boolean defaultType, ExposureCategory... categories) {
+		this.defaultType = defaultType;
+		this.categories = categories.length == 0 ? Collections.emptySet() : Collections.unmodifiableSet(EnumSet.copyOf(Arrays.asList(categories)));
+	}
+
+	public boolean isDefaultType() {
+		return defaultType;
+	}
+
+	public Set<ExposureCategory> getCategories() {
+		return categories;
+	}
+
+	public static List<ExposureType> getValues(Collection<ExposureCategory> diseaseCategories) {
+		boolean hasConfig = diseaseCategories != null && !diseaseCategories.isEmpty();
+		Set<ExposureCategory> configured = hasConfig ? EnumSet.copyOf(diseaseCategories) : EnumSet.noneOf(ExposureCategory.class);
+
+		return Arrays.stream(values()).filter(type -> {
+			if (type.isDefaultType()) {
+				return true;
+			}
+			if (!hasConfig) {
+				return false;
+			}
+			return type.getCategories().stream().anyMatch(configured::contains);
+		}).collect(Collectors.toList());
+	}
 
 	@Override
 	public String toString() {

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

@@ -3381,6 +3381,7 @@ public interface Captions {
 	String titleDiseaseConfigurationGeneral = "titleDiseaseConfigurationGeneral";
 	String titleExposureActivitySection = "titleExposureActivitySection";
 	String titleExposureLocationSection = "titleExposureLocationSection";
+	String titleExposuresGeneralSection = "titleExposuresGeneralSection";
 	String titleExposuresSection = "titleExposuresSection";
 	String titleNoComplications = "titleNoComplications";
 	String to = "to";

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

@@ -1622,6 +1622,7 @@ Exposure.travelPurposeDetails=Reason for travel details
 Exposure.eatingOutVenues=Eating out venues
 Exposure.eatingOutVenueOther=Other venue (please specify)
 Exposure.shoppingForFoodDetails=Shopping for food (location/details)
+titleExposuresGeneralSection=General information
 titleExposuresSection=Exposure details
 titleExposureActivitySection=Activity details
 titleExposureLocationSection=Location of exposure

sormas-backend/src/main/java/de/symeda/sormas/backend/exposure/Exposure.java

@@ -262,6 +262,7 @@ public void setDescription(String description) {
 	}
 
 	@Enumerated(EnumType.STRING)
+	@Column(nullable = false)
 	public ExposureType getExposureType() {
 		return exposureType;
 	}

sormas-backend/src/main/resources/sql/sormas_schema.sql

@@ -15996,7 +15996,16 @@ ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS flatulence text;
 ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS lossofappetite text;
 ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS smellyburps text;
 
-INSERT INTO schema_version (version_number, comment)
-VALUES (629, '#13832 - External Survey integration');
+INSERT INTO schema_version (version_number, comment) VALUES (629, '#13832 - External Survey integration');
+
+UPDATE featureconfiguration
+SET properties = json_build_object(
+    'FETCH_MODE', false,
+    'FORCE_AUTOMATIC_PROCESSING', true,
+    'SURVEY_FETCH_ENABLED', true
+)
+WHERE featuretype = 'EXTERNAL_MESSAGES';
+
+INSERT INTO schema_version (version_number, comment) VALUES (630, 'Fix corrupt JSON in featureconfiguration.properties for EXTERNAL_MESSAGES from 629');
 
 -- *** Insert new sql commands BEFORE this line. Remember to always consider _history tables. ***