Removes eating out venues from exposure form for SAL disease

Author: roldy

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

@@ -140,8 +140,6 @@ public class ExposureDto extends PseudonymizableDto {
 	public static final String PROPHYLAXIS_ADHERENCE_DETAILS = "prophylaxisAdherenceDetails";
 	public static final String TRAVEL_PURPOSE = "travelPurpose";
 	public static final String TRAVEL_PURPOSE_DETAILS = "travelPurposeDetails";
-	public static final String EATING_OUT_VENUES = "eatingOutVenues";
-	public static final String EATING_OUT_VENUE_OTHER = "eatingOutVenueOther";
 	public static final String SHOPPING_FOR_FOOD_DETAILS = "shoppingForFoodDetails";
 
 	@SensitiveData
@@ -459,17 +457,6 @@ public class ExposureDto extends PseudonymizableDto {
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong)
 	private String travelPurposeDetails;
 
-	@Diseases({
-		Disease.SALMONELLOSIS })
-	@HideForCountriesExcept(countries = {
-		CountryHelper.COUNTRY_CODE_LUXEMBOURG })
-	private Set<EatingOutVenue> eatingOutVenues;
-	@Diseases({
-		Disease.SALMONELLOSIS })
-	@HideForCountriesExcept(countries = {
-		CountryHelper.COUNTRY_CODE_LUXEMBOURG })
-	@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
-	private String eatingOutVenueOther;
 	@Diseases({
 		Disease.SALMONELLOSIS })
 	@HideForCountriesExcept(countries = {
@@ -488,7 +475,6 @@ public static ExposureDto build(ExposureType exposureType) {
 		exposure.setSubSettings(new HashSet<>());
 		exposure.setContactFactors(new HashSet<>());
 		exposure.setProtectiveMeasures(new HashSet<>());
-		exposure.setEatingOutVenues(new HashSet<>());
 
 		return exposure;
 	}
@@ -1173,22 +1159,6 @@ public void setProphylaxisAdherenceDetails(String prophylaxisAdherenceDetails) {
 		this.prophylaxisAdherenceDetails = prophylaxisAdherenceDetails;
 	}
 
-	public Set<EatingOutVenue> getEatingOutVenues() {
-		return eatingOutVenues;
-	}
-
-	public void setEatingOutVenues(Set<EatingOutVenue> eatingOutVenues) {
-		this.eatingOutVenues = eatingOutVenues;
-	}
-
-	public String getEatingOutVenueOther() {
-		return eatingOutVenueOther;
-	}
-
-	public void setEatingOutVenueOther(String eatingOutVenueOther) {
-		this.eatingOutVenueOther = eatingOutVenueOther;
-	}
-
 	public String getShoppingForFoodDetails() {
 		return shoppingForFoodDetails;
 	}

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

@@ -1902,8 +1902,6 @@ public interface Captions {
 	String Exposure_deceasedPersonName = "Exposure.deceasedPersonName";
 	String Exposure_deceasedPersonRelation = "Exposure.deceasedPersonRelation";
 	String Exposure_domesticSwimming = "Exposure.domesticSwimming";
-	String Exposure_eatingOutVenueOther = "Exposure.eatingOutVenueOther";
-	String Exposure_eatingOutVenues = "Exposure.eatingOutVenues";
 	String Exposure_eatingRawAnimalProducts = "Exposure.eatingRawAnimalProducts";
 	String Exposure_endDate = "Exposure.endDate";
 	String Exposure_exposureCategory = "Exposure.exposureCategory";

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

@@ -1619,8 +1619,6 @@ Exposure.prophylaxisAdherence=Prophylaxis adherence
 Exposure.prophylaxisAdherenceDetails=Prophylaxis adherence details
 Exposure.travelPurpose=Reason for travel
 Exposure.travelPurposeDetails=Reason for travel details
-Exposure.eatingOutVenues=Eating out venues
-Exposure.eatingOutVenueOther=Other venue (please specify)
 Exposure.shoppingForFoodDetails=Shopping for food (location/details)
 titleExposuresSection=Exposure details
 titleExposureActivitySection=Activity details

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

@@ -3032,26 +3032,6 @@ ExposureSubSetting.TRAVELED_ABROAD=Traveled abroad
 ExposureSubSetting.UNKNOWN=Unknown
 ExposureSubSetting.OTHER=Other
 
-# EatingOutVenue
-EatingOutVenue.CANTEENS=Canteens (work, school, hospital, nursing home, retirement home)
-EatingOutVenue.FOOD_SERVED_ON_BOARD=Food served on board (airplane, train, ferry, cruise ship)
-EatingOutVenue.GAS_STATIONS=Gas stations
-EatingOutVenue.STREET_VENDORS=Street vendors/mobile food vendors (food trucks, markets)
-EatingOutVenue.FOOD_COURTS=Food courts (shopping malls, entertainment venues)
-EatingOutVenue.CAFES_OR_TEA_ROOMS=Cafés or tea rooms
-EatingOutVenue.SANDWICH_SHOPS_BAKERIES_DELICATESSENS=Sandwich shops, bakeries, or delicatessens
-EatingOutVenue.CAFETERIAS_OR_BARS=Cafeterias or bars
-EatingOutVenue.KEBAB_FALAFEL_SNACK_SHOPS=Kebab/falafel snack shops
-EatingOutVenue.BURGER_RESTAURANTS=Burger restaurants
-EatingOutVenue.FAST_FOOD_SNACK_BARS=Fast food/snack bars
-EatingOutVenue.PIZZERIAS=Pizzerias
-EatingOutVenue.ASIAN_RESTAURANTS=Asian restaurants
-EatingOutVenue.HOTELS=Hotels
-EatingOutVenue.TAKEAWAY_FOOD=Takeaway food (including home delivery)
-EatingOutVenue.BUFFET_STYLE_RESTAURANTS=Buffet-style restaurants (all-you-can-eat, self-service)
-EatingOutVenue.FOOD_AT_EVENTS=Food at events (weddings, conferences, festivals)
-EatingOutVenue.OTHER=Other (please specify)
-
 # ExposureContactFactor
 ExposureContactFactor.DURATION_OF_EXPOSURE=Duration of Exposure
 ExposureContactFactor.PROXIMITY_TO_SOURCE=Proximity to Source

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

@@ -244,8 +244,6 @@ public Exposure fillOrBuildExposureEntity(ExposureDto source, Exposure target, b
 		target.setProphylaxisAdherenceDetails(source.getProphylaxisAdherenceDetails());
 		target.setTravelPurpose(source.getTravelPurpose());
 		target.setTravelPurposeDetails(source.getTravelPurposeDetails());
-		target.setEatingOutVenues(source.getEatingOutVenues() != null ? source.getEatingOutVenues() : new HashSet<>());
-		target.setEatingOutVenueOther(source.getEatingOutVenueOther());
 		target.setShoppingForFoodDetails(source.getShoppingForFoodDetails());
 		return target;
 	}
@@ -437,8 +435,6 @@ public static ExposureDto toExposureDto(Exposure source) {
 		target.setProphylaxisAdherenceDetails(source.getProphylaxisAdherenceDetails());
 		target.setTravelPurpose(source.getTravelPurpose());
 		target.setTravelPurposeDetails(source.getTravelPurposeDetails());
-		target.setEatingOutVenues(source.getEatingOutVenues() != null ? new HashSet<>(source.getEatingOutVenues()) : new HashSet<>());
-		target.setEatingOutVenueOther(source.getEatingOutVenueOther());
 		target.setShoppingForFoodDetails(source.getShoppingForFoodDetails());
 		return target;
 	}

sormas-backend/src/main/java/de/symeda/sormas/backend/epidata/EpiDataFacadeEjb.java

@@ -42,7 +42,6 @@
 import de.symeda.sormas.api.exposure.AnimalCategory;
 import de.symeda.sormas.api.exposure.AnimalContactType;
 import de.symeda.sormas.api.exposure.AnimalLocation;
-import de.symeda.sormas.api.exposure.EatingOutVenue;
 import de.symeda.sormas.api.exposure.ExposureCategory;
 import de.symeda.sormas.api.exposure.ExposureContactFactor;
 import de.symeda.sormas.api.exposure.ExposureProtectiveMeasure;
@@ -92,8 +91,6 @@ public class Exposure extends AbstractDomainObject {
 	public static final String SUB_SETTINGS = "subSettings";
 	public static final String CONTACT_FACTORS = "contactFactors";
 	public static final String PROTECTIVE_MEASURES = "protectiveMeasures";
-	public static final String EATING_OUT_VENUES = "eatingOutVenues";
-	public static final String EATING_OUT_VENUE_OTHER = "eatingOutVenueOther";
 	public static final String SHOPPING_FOR_FOOD_DETAILS = "shoppingForFoodDetails";
 
 	private EpiData epiData;
@@ -201,8 +198,6 @@ public class Exposure extends AbstractDomainObject {
 	private Set<ExposureContactFactor> contactFactors = new HashSet<>();
 	private Set<ExposureProtectiveMeasure> protectiveMeasures = new HashSet<>();
 
-	private Set<EatingOutVenue> eatingOutVenues = new HashSet<>();
-	private String eatingOutVenueOther;
 	private String shoppingForFoodDetails;
 
 	@ManyToOne
@@ -956,28 +951,6 @@ public void setProtectiveMeasures(Set<ExposureProtectiveMeasure> protectiveMeasu
 		this.protectiveMeasures = protectiveMeasures;
 	}
 
-	@ElementCollection(fetch = FetchType.EAGER)
-	@Enumerated(EnumType.STRING)
-	@CollectionTable(name = "exposures_eatingoutvenues",
-		joinColumns = @JoinColumn(name = "exposure_id", referencedColumnName = Exposure.ID, nullable = false))
-	@Column(name = "eatingoutvenue", nullable = false)
-	public Set<EatingOutVenue> getEatingOutVenues() {
-		return eatingOutVenues;
-	}
-
-	public void setEatingOutVenues(Set<EatingOutVenue> eatingOutVenues) {
-		this.eatingOutVenues = eatingOutVenues;
-	}
-
-	@Column(length = CHARACTER_LIMIT_DEFAULT)
-	public String getEatingOutVenueOther() {
-		return eatingOutVenueOther;
-	}
-
-	public void setEatingOutVenueOther(String eatingOutVenueOther) {
-		this.eatingOutVenueOther = eatingOutVenueOther;
-	}
-
 	@Column(length = CHARACTER_LIMIT_DEFAULT)
 	public String getShoppingForFoodDetails() {
 		return shoppingForFoodDetails;

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

@@ -16006,4 +16006,22 @@ DROP TRIGGER IF EXISTS delete_history_trigger ON exposures_eatingoutvenues;
 
 INSERT INTO schema_version (version_number, comment) VALUES (630, '#13917 - Drop broken delete_history_trigger on exposures_eatingoutvenues');
 
+-- 2026-05-19 Remove eating-out venues from Salmonellosis exposure (reverts the v627 join table + eatingoutvenueother columns). #13918
+-- shoppingforfooddetails stays — it lives on the SHOPPING_FOR_FOOD sub-setting and is not part of this removal.
+
+-- Drop versioning triggers on the join table before dropping the table itself.
+-- Guarded with IF EXISTS so the migration is idempotent regardless of whether v630 ran on this DB.
+DROP TRIGGER IF EXISTS versioning_trigger ON exposures_eatingoutvenues;
+DROP TRIGGER IF EXISTS delete_history_trigger ON exposures_eatingoutvenues;
+
+-- Drop join tables (history first to avoid any dangling references).
+DROP TABLE IF EXISTS exposures_eatingoutvenues_history;
+DROP TABLE IF EXISTS exposures_eatingoutvenues;
+
+-- Drop the "other" free-text column from exposures and its history mirror.
+ALTER TABLE exposures         DROP COLUMN IF EXISTS eatingoutvenueother;
+ALTER TABLE exposures_history DROP COLUMN IF EXISTS eatingoutvenueother;
+
+INSERT INTO schema_version (version_number, comment) VALUES (631, '#13918 - Remove eating out venues from Salmonellosis exposure');
+
 -- *** Insert new sql commands BEFORE this line. Remember to always consider _history tables. ***