SORMAS-Foundation#2902 - extend event participant jurisdiction calculation - added logic for warning on change jurisdiction on save

Author: sergiupacurariu

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

@@ -193,8 +193,8 @@ public EventParticipantDto saveEventParticipant(EventParticipantDto dto) {
 		Event event = eventService.getByUuid(eventReferenceDto.getUuid());
 
 		if (!eventJurisdictionChecker.isInJurisdiction(event) && (dto.getRegion() == null || dto.getDistrict() == null)) {
-			dto.setRegion(new RegionReferenceDto(user.getRegion() != null ? user.getRegion().getUuid() : null));
-			dto.setDistrict(new DistrictReferenceDto(user.getDistrict() != null ? user.getDistrict().getUuid() : null));
+			dto.setRegion(user.getRegion() != null ? new RegionReferenceDto(user.getRegion().getUuid()) : null);
+			dto.setDistrict(user.getDistrict() != null ? new DistrictReferenceDto(user.getDistrict().getUuid()) : null);
 		}
 
 		Pseudonymizer pseudonymizer = Pseudonymizer.getDefault(userService::hasRight);

sormas-ui/src/main/java/de/symeda/sormas/ui/events/EventParticipantsController.java

@@ -220,24 +220,28 @@ private CommitDiscardWrapperComponent<EventParticipantEditForm> createEventParti
 				RegionReferenceDto epEventRegion = eventDto.getEventLocation().getRegion();
 				DistrictReferenceDto epEventDistrict = eventDto.getEventLocation().getDistrict();
 
+				//Responsible region of the event participant is filled and differs from user Region - warning about loosing full access rights to the event participant should be triggered
 				Boolean responsibleRegionDiffersFromUserRegion =
 					(userRegion != null && epResponsibleRegion != null && !userRegion.equals(epResponsibleRegion));
 
+				//Responsible district of the event participant is filled and differs from user District - warning about loosing full access rights to the event participant should be triggered
 				Boolean responsibleDistrictDiffersFromUserDistrict =
 					(userDistrict != null && epResponsibleDistrict != null && !userDistrict.equals(epResponsibleDistrict));
 
-				Boolean responsibleEmptyFallBackToEvent = (epResponsibleRegion == null
+				//both responsible region and district of the event participant are empty and the fall back towards event location: 
+				// event region or event district is different from user's region or district - warning about loosing full access rights to the event participant should be triggered
+				Boolean responsibleFieldsEmptyAndEventOutsideJurisdiction = (epResponsibleRegion == null
 					&& epResponsibleDistrict == null
 					&& (userRegion != null && !userRegion.equals(epEventRegion) || userDistrict != null && !userDistrict.equals(epEventDistrict)));
 
-				Boolean onResponsibleDistrictNullCheckBothRegionAndDistrictAgainstUser =
-					((epResponsibleRegion != null && epResponsibleDistrict == null)
-						&& (userRegion != null && !userRegion.equals(epResponsibleRegion) || userDistrict != null));
+				//if only district is not filled and either responsible region or district are different from user region or district - warning about loosing full access rights to the event participant should be triggered
+				Boolean responsibleDistrictIsEmpty = ((epResponsibleRegion != null && epResponsibleDistrict == null)
+					&& (userRegion != null && !userRegion.equals(epResponsibleRegion) || userDistrict != null));
 
 				if (responsibleRegionDiffersFromUserRegion
 					|| responsibleDistrictDiffersFromUserDistrict
-					|| responsibleEmptyFallBackToEvent
-					|| onResponsibleDistrictNullCheckBothRegionAndDistrictAgainstUser) {
+					|| responsibleFieldsEmptyAndEventOutsideJurisdiction
+					|| responsibleDistrictIsEmpty) {
 					VaadinUiUtil.showConfirmationPopup(
 						I18nProperties.getString(Strings.headingEventParticipantResponsibleJurisdictionUpdated),
 						new Label(I18nProperties.getString(Strings.messageEventParticipantResponsibleJurisdictionUpdated)),