code refactoring and confirmation pop up while unlinking the event

Author: KarnaiahPesula

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

@@ -190,6 +190,7 @@ public interface Strings {
 	String confirmationSinceExternalMessages = "confirmationSinceExternalMessages";
 	String confirmationUnclearExternalMessage = "confirmationUnclearExternalMessage";
 	String confirmationUnlinkCaseFromEvent = "confirmationUnlinkCaseFromEvent";
+	String confirmationUnlinkEnvironmentFromEvent = "confirmationUnlinkEnvironmentFromEvent";
 	String confirmationUnlinkEventFromEnvironment = "confirmationUnlinkEventFromEnvironment";
 	String confirmationUpdateCompleteness = "confirmationUpdateCompleteness";
 	String confirmationVaccinationStatusUpdate = "confirmationVaccinationStatusUpdate";
@@ -883,6 +884,7 @@ public interface Strings {
 	String headingUnavailableTaskEdition = "headingUnavailableTaskEdition";
 	String headingUnderFollowUp = "headingUnderFollowUp";
 	String headingUnlinkCaseFromEvent = "headingUnlinkCaseFromEvent";
+	String headingUnlinkEnvironmentFromEvent = "headingUnlinkEnvironmentFromEvent";
 	String headingUnlinkEventFromEnvironment = "headingUnlinkEventFromEnvironment";
 	String headingUpdateCaseWithNewDiseaseVariant = "headingUpdateCaseWithNewDiseaseVariant";
 	String headingUpdatedPathogenTestInformation = "headingUpdatedPathogenTestInformation";

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

@@ -243,6 +243,7 @@ confirmationLocationFacilityAddressOverride = The selected facility has location
 confirmationCancelExternalFollowUpPopup=Are you sure you want to cancel external follow-ups in the eDiary?
 confirmationUnlinkCaseFromEvent = Are you sure you want to unlink this case from this event?
 confirmationUnlinkEventFromEnvironment = Are you sure you want to unlink this event from this environment?
+confirmationUnlinkEnvironmentFromEvent = Are you sure you want to unlink this environment from this event?
 confirmationDeleteExternalMessages = Are you sure you want to delete all %d selected messages?
 confirmationUnclearExternalMessage = Are you sure you want to mark this message as unclear?
 confirmationManuallyForwardedExternalMessage = Are you sure you want to mark this message as forwarded?
@@ -827,6 +828,7 @@ headingCampaignFormDataAlreadyExisting = Campaign Form Data Already Existing
 headingActivityAsCaseDetails = Activity as Case Details
 headingUnlinkCaseFromEvent = Unlink case from event
 headingUnlinkEventFromEnvironment = Unlink event from environment
+headingUnlinkEnvironmentFromEvent = Unlink environment from event
 headingUpdatePersonContactDetails = Update existing person contact details
 headingEventGroupLinkEventIssue = Issue while linking events to event group
 headingEventGroupUnlinkEventIssue = Issue while unlinking events to event group

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

@@ -246,11 +246,10 @@ public void setVectorType(VectorType vectorType) {
 		this.vectorType = vectorType;
 	}
 
-	@ManyToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+	@ManyToMany(fetch = FetchType.LAZY)
 	@JoinTable(name = EVENTS_ENVIRONMENTS_TABLE_NAME,
 		joinColumns = @JoinColumn(name = "environment_id"),
 		inverseJoinColumns = @JoinColumn(name = "event_id"))
-
 	public List<Event> getEvents() {
 		return events;
 	}

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

@@ -57,24 +57,6 @@ public EnvironmentService() {
 		super(Environment.class, DeletableEntityType.ENVIRONMENT);
 	}
 
-	/*
-	 * public List<EnvironmentIndexDto> getAllEnvironmentsByEvent(EnvironmentCriteria criteria) {
-	 * Predicate filter = null;
-	 * CriteriaBuilder cb = em.getCriteriaBuilder();
-	 * CriteriaQuery<EnvironmentIndexDto> cq = cb.createQuery(EnvironmentIndexDto.class);
-	 * Root<Environment> root = cq.from(Environment.class);
-	 * EnvironmentQueryContext queryContext = new EnvironmentQueryContext(cb, cq, root);
-	 * EnvironmentJoins joins = queryContext.getJoins();
-	 * Join<Environment, Event> eventJoin = joins.getEvents().join(Event.ENVIRONMENTS, JoinType.LEFT);
-	 * filter = CriteriaBuilderHelper.and(cb, filter, cb.equal(eventJoin.get(Event.UUID), criteria.getEvent().getUuid()));
-	 * if (filter != null) {
-	 * cq.where(filter);
-	 * }
-	 * cq.distinct(true);
-	 * return em.createQuery(cq).getResultList();
-	 * }
-	 */
-
 	public String getSimilarEnvironmentUuid(EnvironmentCriteria criteria) {
 
 		CriteriaBuilder cb = em.getCriteriaBuilder();

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

@@ -84,7 +84,6 @@ public class Event extends CoreAdo implements SormasToSormasShareable, HasExtern
 	public static final String TABLE_NAME = "events";
 
 	public static final String EVENTS_EVENT_GROUPS_TABLE_NAME = "events_eventgroups";
-	public static final String EVENTS_ENVIRONMENTS_TABLE_NAME = "events_environments";
 
 	public static final String EXTERNAL_ID = "externalId";
 	public static final String EXTERNAL_TOKEN = "externalToken";
@@ -843,7 +842,7 @@ public void setExternalShares(List<ExternalShareInfo> externalShares) {
 		this.externalShares = externalShares;
 	}
 
-	@ManyToMany(mappedBy = Environment.EVENTS, fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+	@ManyToMany(mappedBy = Environment.EVENTS, fetch = FetchType.LAZY)
 	public List<Environment> getEnvironments() {
 		return environments;
 	}

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

@@ -11,11 +11,13 @@
 import de.symeda.sormas.api.event.EventReferenceDto;
 import de.symeda.sormas.api.i18n.Captions;
 import de.symeda.sormas.api.i18n.I18nProperties;
+import de.symeda.sormas.api.i18n.Strings;
 import de.symeda.sormas.api.user.UserRight;
 import de.symeda.sormas.api.utils.DataHelper;
 import de.symeda.sormas.ui.ControllerProvider;
 import de.symeda.sormas.ui.UiUtil;
 import de.symeda.sormas.ui.utils.PaginationList;
+import de.symeda.sormas.ui.utils.VaadinUiUtil;
 
 public class EnvironmentList extends PaginationList<EnvironmentIndexDto> {
 
@@ -56,8 +58,18 @@ protected void drawDisplayedEntries() {
 
 			if (UiUtil.permitted(UserRight.ENVIRONMENT_CREATE)) {
 				listEntry.addUnlinkEnvironmentListener(i, (Button.ClickListener) clickEvent -> {
-					ControllerProvider.getEnvironmentController().unlinkEnvironment(environmentIndex, event.getUuid());
-					reload();
+					VaadinUiUtil.showConfirmationPopup(
+						I18nProperties.getString(Strings.headingUnlinkEnvironmentFromEvent),
+						new Label(I18nProperties.getString(Strings.confirmationUnlinkEnvironmentFromEvent)),
+						I18nProperties.getString(Strings.yes),
+						I18nProperties.getString(Strings.no),
+						480,
+						confirmed -> {
+							if (confirmed) {
+								ControllerProvider.getEnvironmentController().unlinkEnvironment(environmentIndex, event.getUuid());
+								reload();
+							}
+						});
 				});
 			}