Adds SAL diesease related checks to the various forms Contact, Epi, Exposure, PathogenTest & Case

Author: roldy

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

@@ -389,6 +389,7 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
 		Disease.OTHER })
 	@Outbreaks
 	private VaccinationStatus vaccinationStatus;
+	@Diseases(value = Disease.SALMONELLOSIS, hide = true)
 	@Outbreaks
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
 	private String vaccinationStatusDetails;

sormas-api/src/main/java/de/symeda/sormas/api/epidata/EpiDataDto.java

@@ -78,6 +78,7 @@ public class EpiDataDto extends PseudonymizableDto {
 	public static final String EXPOSURE_INVESTIGATION_TO_DATE = "exposureInvestigationToDate";
 	public static final String ACTIVITY_AS_CASE_FROM_DATE = "activityAsCaseFromDate";
 	public static final String ACTIVITY_AS_CASE_TO_DATE = "activityAsCaseToDate";
+	public static final String FOOD_HISTORY = "foodHistory";
 
 	private YesNoUnknown exposureDetailsKnown;
 	private YesNoUnknown activityAsCaseDetailsKnown;
@@ -200,6 +201,13 @@ public class EpiDataDto extends PseudonymizableDto {
 		CountryHelper.COUNTRY_CODE_LUXEMBOURG })
 	private Date activityAsCaseToDate;
 
+	@Valid
+	@Diseases({
+		Disease.SALMONELLOSIS })
+	@HideForCountriesExcept(countries = {
+		CountryHelper.COUNTRY_CODE_LUXEMBOURG })
+	private FoodHistoryDto foodHistory;
+
 	public YesNoUnknown getExposureDetailsKnown() {
 		return exposureDetailsKnown;
 	}
@@ -437,6 +445,14 @@ public void setActivityAsCaseToDate(Date activityAsCaseToDate) {
 		this.activityAsCaseToDate = activityAsCaseToDate;
 	}
 
+	public FoodHistoryDto getFoodHistory() {
+		return foodHistory;
+	}
+
+	public void setFoodHistory(FoodHistoryDto foodHistory) {
+		this.foodHistory = foodHistory;
+	}
+
 	private static void validateDateRange(Date from, Date to, String fromName, String toName) {
 		if (from != null && to != null && from.after(to)) {
 			throw new IllegalArgumentException(fromName + " must be before or equal to " + toName);

sormas-api/src/main/java/de/symeda/sormas/api/epidata/FoodConsumptionItem.java

@@ -0,0 +1,45 @@
+/*
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2026 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.
+ */
+
+package de.symeda.sormas.api.epidata;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+/**
+ * Food consumption items captured by the Salmonellosis (Luxembourg) survey, 5-day window before symptom onset.
+ * Source: SALM_enquête_publipostage.docx, Alimentation / Ernährung / Food section.
+ */
+public enum FoodConsumptionItem {
+
+	TAP_WATER,
+	ICE_CUBES,
+	BOTTLED_WATER,
+	OTHER_DRINKS,
+	POULTRY,
+	BEEF,
+	PORK,
+	OTHER_MEAT,
+	FISH,
+	SEAFOOD,
+	EGGS,
+	CHEESE,
+	DAIRY,
+	DESSERTS,
+	VEGETABLES,
+	FRUITS,
+	DRIED_FRUITS,
+	SPICES,
+	PREPARED_MEALS,
+	SNACKS;
+
+	@Override
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+}

sormas-api/src/main/java/de/symeda/sormas/api/epidata/FoodHistoryDto.java

@@ -0,0 +1,68 @@
+/*
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2026 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.
+ */
+
+package de.symeda.sormas.api.epidata;
+
+import java.util.EnumMap;
+import java.util.Map;
+
+import javax.validation.constraints.Size;
+
+import de.symeda.sormas.api.feature.FeatureType;
+import de.symeda.sormas.api.i18n.Validations;
+import de.symeda.sormas.api.utils.DataHelper;
+import de.symeda.sormas.api.utils.DependingOnFeatureType;
+import de.symeda.sormas.api.utils.FieldConstraints;
+import de.symeda.sormas.api.utils.pseudonymization.PseudonymizableDto;
+
+/**
+ * Salmonellosis (Luxembourg) food consumption history captured during the 5-day window before symptom onset.
+ * Source: SALM_enquête_publipostage.docx, Alimentation / Ernährung / Food section.
+ * Presence of a key in {@link #consumedItemsDetails} means the item was consumed; the value (possibly empty)
+ * carries any free-text details.
+ */
+@DependingOnFeatureType(featureType = {
+	FeatureType.CASE_SURVEILANCE,
+	FeatureType.CONTACT_TRACING })
+public class FoodHistoryDto extends PseudonymizableDto {
+
+	private static final long serialVersionUID = -2148717635193517125L;
+
+	public static final String I18N_PREFIX = "FoodHistory";
+
+	public static final String CONSUMED_ITEMS_DETAILS = "consumedItemsDetails";
+	public static final String OTHER_FOOD_DETAILS = "otherFoodDetails";
+
+	private Map<FoodConsumptionItem, String> consumedItemsDetails = new EnumMap<>(FoodConsumptionItem.class);
+
+	@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
+	private String otherFoodDetails;
+
+	public static FoodHistoryDto build() {
+		FoodHistoryDto dto = new FoodHistoryDto();
+		dto.setUuid(DataHelper.createUuid());
+		return dto;
+	}
+
+	public Map<FoodConsumptionItem, String> getConsumedItemsDetails() {
+		return consumedItemsDetails;
+	}
+
+	public void setConsumedItemsDetails(Map<FoodConsumptionItem, String> consumedItemsDetails) {
+		this.consumedItemsDetails = consumedItemsDetails;
+	}
+
+	public String getOtherFoodDetails() {
+		return otherFoodDetails;
+	}
+
+	public void setOtherFoodDetails(String otherFoodDetails) {
+		this.otherFoodDetails = otherFoodDetails;
+	}
+}

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

@@ -20,7 +20,9 @@
 import java.util.List;
 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;
 
 public enum ExposureSubSetting {
 
@@ -49,6 +51,8 @@ public enum ExposureSubSetting {
 
 	EATING_AT_HOME(ExposureCategory.FOOD_BORNE, null),
 	EATING_OUTSIDE(ExposureCategory.FOOD_BORNE, null),
+	@Diseases({
+		Disease.SALMONELLOSIS })
 	SHOPPING_FOR_FOOD(ExposureCategory.FOOD_BORNE, null),
 
 	UNKNOWN(null, null),
@@ -90,6 +94,15 @@ public static List<ExposureSubSetting> getValues(ExposureCategory category, Expo
 			.collect(Collectors.toList());
 	}
 
+	/**
+	 * Disease-aware overload: filters the values returned by {@link #getValues(ExposureCategory, ExposureSetting)}
+	 * to those whose {@code @Diseases} annotation matches the given disease (or values with no annotation,
+	 * which apply to every disease).
+	 */
+	public static List<ExposureSubSetting> getValues(ExposureCategory category, ExposureSetting setting, Disease disease) {
+		return getValues(category, setting).stream().filter(s -> isVisibleForDisease(s, disease)).collect(Collectors.toList());
+	}
+
 	public static List<ExposureSubSetting> getValuesForCategoryOnly(ExposureCategory category) {
 		if (category == null) {
 			return Collections.emptyList();
@@ -109,6 +122,19 @@ public static List<ExposureSubSetting> getValuesForCategoryOnly(ExposureCategory
 		return Arrays.stream(values()).filter(s -> (s.category == category && s.setting == null) || s.category == null).collect(Collectors.toList());
 	}
 
+	/**
+	 * Disease-aware overload: filters the values returned by {@link #getValuesForCategoryOnly(ExposureCategory)}
+	 * to those whose {@code @Diseases} annotation matches the given disease (or values with no annotation).
+	 */
+	public static List<ExposureSubSetting> getValuesForCategoryOnly(ExposureCategory category, Disease disease) {
+		return getValuesForCategoryOnly(category).stream().filter(s -> isVisibleForDisease(s, disease)).collect(Collectors.toList());
+	}
+
+	private static boolean isVisibleForDisease(ExposureSubSetting subSetting, Disease disease) {
+		return Diseases.DiseasesConfiguration.isMissing(ExposureSubSetting.class, subSetting.name())
+			|| Diseases.DiseasesConfiguration.isDefined(ExposureSubSetting.class, subSetting.name(), disease);
+	}
+
 	@Override
 	public String toString() {
 		return I18nProperties.getEnumCaption(this);

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

@@ -1625,6 +1625,7 @@ public interface Captions {
 	String EpiData_exposureInvestigationFromDate = "EpiData.exposureInvestigationFromDate";
 	String EpiData_exposureInvestigationToDate = "EpiData.exposureInvestigationToDate";
 	String EpiData_exposures = "EpiData.exposures";
+	String EpiData_foodHistory = "EpiData.foodHistory";
 	String EpiData_healthcareProfessional = "EpiData.healthcareProfessional";
 	String EpiData_highTransmissionRiskArea = "EpiData.highTransmissionRiskArea";
 	String EpiData_importedCase = "EpiData.importedCase";
@@ -2080,6 +2081,8 @@ public interface Captions {
 	String FollowUp_followUpUntil = "FollowUp.followUpUntil";
 	String FollowUp_person = "FollowUp.person";
 	String FollowUp_reportDate = "FollowUp.reportDate";
+	String FoodHistory_consumedItemsDetails = "FoodHistory.consumedItemsDetails";
+	String FoodHistory_otherFoodDetails = "FoodHistory.otherFoodDetails";
 	String formatNumberOfVisitsFormat = "formatNumberOfVisitsFormat";
 	String formatNumberOfVisitsLongFormat = "formatNumberOfVisitsLongFormat";
 	String formatSimpleNumberFormat = "formatSimpleNumberFormat";

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

@@ -1887,6 +1887,7 @@ public interface Strings {
 	String promptExternalMessagesPersonBirthDateTo = "promptExternalMessagesPersonBirthDateTo";
 	String promptExternalMessagesSearchField = "promptExternalMessagesSearchField";
 	String promptFilterByPeriod = "promptFilterByPeriod";
+	String promptFoodHistoryItemDetails = "promptFoodHistoryItemDetails";
 	String promptImmunizationDateFrom = "promptImmunizationDateFrom";
 	String promptImmunizationDateTo = "promptImmunizationDateTo";
 	String promptImmunizationDateType = "promptImmunizationDateType";