Review comment fixes

Author: KarnaiahPesula

sormas-api/src/main/java/de/symeda/sormas/api/environment/EnvironmentDto.java

@@ -266,8 +266,10 @@ public void setVectorType(VectorType vectorType) {
 	}
 
 	public void addEventReference(EventReferenceDto eventReferenceDto) {
-		if (!eventReferenceDtos.contains(eventReferenceDto)) {
+		if (eventReferenceDto != null && !eventReferenceDtos.contains(eventReferenceDto)) {
 			this.eventReferenceDtos.add(eventReferenceDto);
+		} else {
+			throw new IllegalArgumentException("event UUID " + eventReferenceDto.getUuid() + " is already added");
 		}
 	}
 

sormas-api/src/main/java/de/symeda/sormas/api/importexport/DatabaseTable.java

@@ -63,6 +63,9 @@ public enum DatabaseTable {
 	EVENTPARTICIPANTS(DatabaseTableType.SORMAS, EVENTS, "event_participants"),
 	ACTIONS(DatabaseTableType.SORMAS, EVENTS, "actions"),
 
+	ENVIRONMENTS(DatabaseTableType.SORMAS, "environments", dependingOnFeature(FeatureType.ENVIRONMENT_MANAGEMENT)),
+	EVENT_ENVIRONMENTS(DatabaseTableType.SORMAS, ENVIRONMENTS, "events_environments"),
+
 	TRAVEL_ENTRIES(DatabaseTableType.SORMAS, "travel_entries", dependingOnFeature(FeatureType.TRAVEL_ENTRIES)),
 
 	IMMUNIZATIONS(DatabaseTableType.SORMAS, "immunizations", dependingOnFeature(FeatureType.IMMUNIZATION_MANAGEMENT)),

sormas-backend/src/main/java/de/symeda/sormas/backend/environment/Environment.java

@@ -255,6 +255,10 @@ public List<Event> getEvents() {
 	}
 
 	public void setEvents(List<Event> events) {
-		this.events = events;
+		if (events != null) {
+			this.events = events;
+		} else {
+			this.events = new ArrayList<>();
+		}
 	}
 }

sormas-backend/src/main/java/de/symeda/sormas/backend/environment/EnvironmentFacadeEjb.java

@@ -7,6 +7,7 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import javax.ejb.EJB;
@@ -364,8 +365,12 @@ protected Environment fillOrBuildEntity(EnvironmentDto source, Environment targe
 		target.setVectorType(EnvironmentMedia.VECTORS.equals(source.getEnvironmentMedia()) ? source.getVectorType() : null);
 
 		if (source.getEventReferenceDtos() != null) {
-			target.getEvents()
-				.addAll(source.getEventReferenceDtos().stream().map(e -> eventService.getByReferenceDto(e)).collect(Collectors.toList()));
+			target.setEvents(
+				source.getEventReferenceDtos()
+					.stream()
+					.filter(Objects::nonNull)
+					.map(e -> eventService.getByReferenceDto(e))
+					.collect(Collectors.toList()));
 		}
 
 		target.setDeleted(source.isDeleted());
@@ -399,7 +404,10 @@ protected EnvironmentDto toDto(Environment source) {
 		target.setWaterType(source.getWaterType());
 		target.setWaterUse(source.getWaterUse());
 		target.setVectorType(source.getVectorType());
-		source.getEvents().stream().map(EventFacadeEjb::toEventDto);
+		if (source.getEvents() != null) {
+			target.setEventReferenceDtos(
+				source.getEvents().stream().filter(Objects::nonNull).map(EventFacadeEjb::toReferenceDto).collect(Collectors.toList()));
+		}
 		target.setDeleted(source.isDeleted());
 		target.setDeletionReason(source.getDeletionReason());
 		target.setOtherDeletionReason(source.getOtherDeletionReason());
@@ -516,11 +524,15 @@ public List<String> getAllActiveUuids() {
 
 	@Override
 	@RightsAllowed(UserRight._ENVIRONMENT_LINK)
-	public void unlinkEnvironment(EnvironmentIndexDto environmentReferenceDto, String eventUuid) {
-		Event event = eventService.getByUuid(eventUuid);
-		Environment environment = service.getByUuid(environmentReferenceDto.getUuid());
-		event.unlinkEnvironment(environment);
-		service.ensurePersisted(environment);
+	public void unlinkEnvironment(EnvironmentIndexDto environmentIndexDto, String eventUuid) {
+		if (environmentIndexDto != null && eventUuid != null) {
+			Event event = eventService.getByUuid(eventUuid);
+			Environment environment = service.getByUuid(environmentIndexDto.getUuid());
+			event.unlinkEnvironment(environment);
+			service.ensurePersisted(environment);
+		} else {
+			throw new IllegalArgumentException("Invalid environment UUID : " + environmentIndexDto.getUuid() + " and event UUID : " + eventUuid);
+		}
 	}
 
 	@Override

sormas-backend/src/main/java/de/symeda/sormas/backend/event/EventService.java

@@ -749,7 +749,6 @@ public Predicate buildCriteriaFilter(EventCriteria eventCriteria, EventQueryCont
 		if (eventCriteria.getTypeOfPlace() != null) {
 			filter = CriteriaBuilderHelper.and(cb, filter, cb.equal(from.get(Event.TYPE_OF_PLACE), eventCriteria.getTypeOfPlace()));
 		}
-
 		if (eventCriteria.getRelevanceStatus() != null) {
 			if (eventCriteria.getRelevanceStatus() == EntityRelevanceStatus.ACTIVE) {
 				filter = CriteriaBuilderHelper.and(cb, filter, cb.or(cb.equal(from.get(Event.ARCHIVED), false), cb.isNull(from.get(Event.ARCHIVED))));

sormas-backend/src/main/java/de/symeda/sormas/backend/importexport/DatabaseExportService.java

@@ -148,6 +148,7 @@ public class DatabaseExportService {
 		EXPORT_CONFIGS.put(DatabaseTable.EVENTS, Event.TABLE_NAME);
 		EXPORT_CONFIGS.put(DatabaseTable.EVENTS_EVENTGROUPS, Event.EVENTS_EVENT_GROUPS_TABLE_NAME);
 		EXPORT_CONFIGS.put(DatabaseTable.EVENTGROUPS, EventGroup.TABLE_NAME);
+		EXPORT_CONFIGS.put(DatabaseTable.EVENT_ENVIRONMENTS, EventGroup.TABLE_NAME);
 		EXPORT_CONFIGS.put(DatabaseTable.EVENTPARTICIPANTS, EventParticipant.TABLE_NAME);
 		EXPORT_CONFIGS.put(DatabaseTable.ACTIONS, Action.TABLE_NAME);
 		EXPORT_CONFIGS.put(DatabaseTable.TRAVEL_ENTRIES, TravelEntry.TABLE_NAME);

sormas-ui/src/main/java/de/symeda/sormas/ui/environment/EnvironmentDataForm.java

@@ -102,6 +102,7 @@ protected void addFields() {
 		ComboBox waterType = addField(EnvironmentDto.WATER_TYPE, ComboBox.class);
 		TextField otherWaterType = addField(EnvironmentDto.OTHER_WATER_TYPE, TextField.class);
 		otherWaterType.setInputPrompt(I18nProperties.getString(Strings.pleaseSpecify));
+
 		ComboBox vectorType = addField(EnvironmentDto.VECTOR_TYPE, ComboBox.class);
 
 		ComboBox infrastructureDetails = addField(EnvironmentDto.INFRASTUCTURE_DETAILS, ComboBox.class);