Merge branch 'feature-4082-send-events-to-survnet-button' into hotfix-1.54.1

MateStrysewske · MateStrysewske · commit ad0ca8f7e523 · 2021-01-28T13:15:41.000+01:00
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/event/EventParticipantFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/event/EventParticipantFacade.java
@@ -75,4 +75,6 @@ List<EventParticipantIndexDto> getIndexList(
 	List<EventParticipantExportDto> getExportList(EventParticipantCriteria eventParticipantCriteria, int first, int max, Language userLanguage);
 
 	List<SimilarEventParticipantDto> getSimilarEventParticipants(EventParticipantSimilarityCriteria eventParticipantSimilarityCriteria);
+
+	List<EventParticipantDto> getByEventUuids(List<String> eventUuids);
 }
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survnet/SurvnetGatewayFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/survnet/SurvnetGatewayFacade.java
@@ -34,4 +34,6 @@ public interface SurvnetGatewayFacade {
 	 * @return http response code of the gateway
 	 */
 	int sendCases(List<String> caseUuids);
+
+	int sendEvents(List<String> eventUuids);
 }
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/event/EventParticipantFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/event/EventParticipantFacadeEjb.java
@@ -763,4 +763,10 @@ public List<EventParticipantDto> getAllActiveEventParticipantsByEvent(String eve
 		return eventParticipantService.getAllActiveByEvent(event).stream().map(e -> toDto(e)).collect(Collectors.toList());
 	}
 
+	@Override
+	public List<EventParticipantDto> getByEventUuids(List<String> eventUuids) {
+		Pseudonymizer pseudonymizer = Pseudonymizer.getDefault(userService::hasRight);
+		return eventParticipantService.getByEventUuids(eventUuids).stream().map(e -> convertToDto(e, pseudonymizer)).collect(Collectors.toList());
+	}
+
 }
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/event/EventParticipantService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/event/EventParticipantService.java
@@ -37,6 +37,7 @@
 import de.symeda.sormas.api.utils.DataHelper;
 import de.symeda.sormas.backend.caze.Case;
 import de.symeda.sormas.backend.common.AbstractCoreAdoService;
+import de.symeda.sormas.backend.common.AbstractDomainObject;
 import de.symeda.sormas.backend.common.CriteriaBuilderHelper;
 import de.symeda.sormas.backend.person.Person;
 import de.symeda.sormas.backend.sample.SampleService;
@@ -311,4 +312,17 @@ public Optional<EventParticipant> getFirst(EventParticipantCriteria criteria) {
 		}
 	}
 
+	public List<EventParticipant> getByEventUuids(List<String> eventUuids) {
+
+		CriteriaBuilder cb = em.getCriteriaBuilder();
+		CriteriaQuery<EventParticipant> cq = cb.createQuery(EventParticipant.class);
+		Root<EventParticipant> epRoot = cq.from(EventParticipant.class);
+		Join<EventParticipant, Event> eventJoin = epRoot.join(EventParticipant.EVENT, JoinType.LEFT);
+
+		Predicate filter = cb.and(createDefaultFilter(cb, epRoot), eventJoin.get(AbstractDomainObject.UUID).in(eventUuids));
+
+		cq.where(filter);
+		return em.createQuery(cq).getResultList();
+	}
+
 }
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/survnet/SurvnetGatewayFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/survnet/SurvnetGatewayFacadeEjb.java
@@ -45,6 +45,18 @@ public int sendCases(List<String> caseUuids) {
 		ExportParameters params = new ExportParameters();
 		params.setCaseUuids(caseUuids);
 
+		return sendRequest(params);
+	}
+
+	@Override
+	public int sendEvents(List<String> eventUuids) {
+		ExportParameters params = new ExportParameters();
+		params.setEventUuids(eventUuids);
+
+		return sendRequest(params);
+	}
+
+	private int sendRequest(ExportParameters params) {
 		String serviceUrl = configFacade.getSurvnetGatewayUrl().trim();
 
 		Response response = ClientBuilder.newBuilder()
@@ -60,6 +72,7 @@ public int sendCases(List<String> caseUuids) {
 	public static class ExportParameters {
 
 		private List<String> caseUuids;
+		private List<String> eventUuids;
 
 		public List<String> getCaseUuids() {
 			return caseUuids;
@@ -68,5 +81,13 @@ public List<String> getCaseUuids() {
 		public void setCaseUuids(List<String> caseUuids) {
 			this.caseUuids = caseUuids;
 		}
+
+		public List<String> getEventUuids() {
+			return eventUuids;
+		}
+
+		public void setEventUuids(List<String> eventUuids) {
+			this.eventUuids = eventUuids;
+		}
 	}
 }
diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/event/EventParticipantFacadeEjbTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/event/EventParticipantFacadeEjbTest.java
@@ -21,7 +21,10 @@
 package de.symeda.sormas.backend.event;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasSize;
 
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -33,6 +36,7 @@
 import de.symeda.sormas.api.event.EventDto;
 import de.symeda.sormas.api.event.EventInvestigationStatus;
 import de.symeda.sormas.api.event.EventParticipantCriteria;
+import de.symeda.sormas.api.event.EventParticipantDto;
 import de.symeda.sormas.api.event.EventParticipantExportDto;
 import de.symeda.sormas.api.event.EventStatus;
 import de.symeda.sormas.api.event.TypeOfPlace;
@@ -42,6 +46,7 @@
 import de.symeda.sormas.api.utils.DateHelper;
 import de.symeda.sormas.backend.AbstractBeanTest;
 import de.symeda.sormas.backend.TestDataCreator;
+import de.symeda.sormas.backend.TestDataCreator.RDCFEntities;
 
 public class EventParticipantFacadeEjbTest extends AbstractBeanTest {
 
@@ -80,4 +85,25 @@ public void testGetExportList() {
 		// List should have two entries
 		assertThat(results, Matchers.hasSize(2));
 	}
+
+	@Test
+	public void testGetByEventUuids() {
+
+		RDCFEntities rdcf = creator.createRDCFEntities();
+		UserDto user = creator.createUser(rdcf, UserRole.SURVEILLANCE_SUPERVISOR);
+
+		EventDto event1 = creator.createEvent(user.toReference());
+		EventDto event2 = creator.createEvent(user.toReference());
+
+		PersonDto person1 = creator.createPerson();
+		PersonDto person2 = creator.createPerson();
+		creator.createEventParticipant(event1.toReference(), person1, user.toReference());
+		creator.createEventParticipant(event1.toReference(), person2, user.toReference());
+		creator.createEventParticipant(event2.toReference(), person1, user.toReference());
+
+		List<EventParticipantDto> eps = getEventParticipantFacade().getByEventUuids(Collections.singletonList(event1.getUuid()));
+		assertThat(eps, hasSize(2));
+		eps = getEventParticipantFacade().getByEventUuids(Arrays.asList(event1.getUuid(), event2.getUuid()));
+		assertThat(eps, hasSize(3));
+	}
 }
diff --git a/sormas-rest/src/main/java/de/symeda/sormas/rest/EventParticipantResource.java b/sormas-rest/src/main/java/de/symeda/sormas/rest/EventParticipantResource.java
@@ -63,6 +63,13 @@ public List<EventParticipantDto> getByUuids(List<String> uuids) {
 		return result;
 	}
 
+	@POST
+	@Path("/query/events")
+	public List<EventParticipantDto> getByEventUuids(List<String> uuids) {
+		List<EventParticipantDto> result = FacadeProvider.getEventParticipantFacade().getByEventUuids(uuids);
+		return result;
+	}
+
 	@POST
 	@Path("/push")
 	public List<PushResult> postEventParticipants(List<EventParticipantDto> dtos) {
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseController.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseController.java
@@ -105,6 +105,7 @@
 import de.symeda.sormas.ui.hospitalization.HospitalizationForm;
 import de.symeda.sormas.ui.hospitalization.HospitalizationView;
 import de.symeda.sormas.ui.survnet.SurvnetGateway;
+import de.symeda.sormas.ui.survnet.SurvnetGatewayType;
 import de.symeda.sormas.ui.symptoms.SymptomsForm;
 import de.symeda.sormas.ui.therapy.TherapyView;
 import de.symeda.sormas.ui.utils.AbstractView;
@@ -1406,7 +1407,7 @@ public void sendCasesToSurvnet(Collection<? extends CaseIndexDto> selectedCases,
 			return;
 		}
 
-		SurvnetGateway.sendToSurvnet(selectedUuids);
+		SurvnetGateway.sendToSurvnet(SurvnetGatewayType.CASES, selectedUuids);
 
 		Notification successNotification =
 			new Notification(I18nProperties.getString(Strings.notificationCasesSentToSurvNet), "", Type.HUMANIZED_MESSAGE);
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseDataView.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseDataView.java
@@ -40,6 +40,7 @@
 import de.symeda.sormas.ui.samples.sampleLink.SampleListComponent;
 import de.symeda.sormas.ui.sormastosormas.SormasToSormasListComponent;
 import de.symeda.sormas.ui.survnet.SurvnetGateway;
+import de.symeda.sormas.ui.survnet.SurvnetGatewayType;
 import de.symeda.sormas.ui.task.TaskListComponent;
 import de.symeda.sormas.ui.utils.CommitDiscardWrapperComponent;
 import de.symeda.sormas.ui.utils.CssStyles;
@@ -174,7 +175,7 @@ protected void initView(String params) {
 			layout.addComponent(sormasToSormasLocLayout, SORMAS_TO_SORMAS_LOC);
 		}
 
-		SurvnetGateway.addComponentToLayout(layout, () -> Arrays.asList(caze.getUuid()));
+		SurvnetGateway.addComponentToLayout(layout, SurvnetGatewayType.CASES, () -> Arrays.asList(caze.getUuid()));
 
 		DocGenerationComponent.addComponentToLayout(layout, getCaseRef(), caze.getQuarantine());
 
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/events/EventDataView.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/events/EventDataView.java
@@ -14,6 +14,8 @@
  */
 package de.symeda.sormas.ui.events;
 
+import java.util.Collections;
+
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CustomLayout;
 import com.vaadin.ui.HorizontalLayout;
@@ -36,6 +38,8 @@
 import de.symeda.sormas.ui.document.DocumentListComponent;
 import de.symeda.sormas.ui.events.eventLink.EventListComponent;
 import de.symeda.sormas.ui.events.eventLink.SuperordinateEventComponent;
+import de.symeda.sormas.ui.survnet.SurvnetGateway;
+import de.symeda.sormas.ui.survnet.SurvnetGatewayType;
 import de.symeda.sormas.ui.task.TaskListComponent;
 import de.symeda.sormas.ui.utils.ButtonHelper;
 import de.symeda.sormas.ui.utils.CommitDiscardWrapperComponent;
@@ -77,6 +81,7 @@ protected void initView(String params) {
 			LayoutUtil.fluidColumnLoc(4, 0, 12, 0, DOCUMENTS_LOC),
 			LayoutUtil.fluidColumnLoc(4, 0, 6, 0, SUPERORDINATE_EVENT_LOC),
 			LayoutUtil.fluidColumnLoc(4, 0, 6, 0, SUBORDINATE_EVENTS_LOC),
+			LayoutUtil.fluidColumnLoc(4, 0, 6, 0, SurvnetGateway.SURVNET_GATEWAY_LOC),
 			LayoutUtil.fluidColumnLoc(4, 0, 6, 0, SHORTCUT_LINKS_LOC));
 
 		DetailSubComponentWrapper container = new DetailSubComponentWrapper(() -> editComponent);
@@ -144,6 +149,8 @@ protected void initView(String params) {
 			shortcutLinksLayout.addComponent(seeEventContactsBtn);
 		}
 
+		SurvnetGateway.addComponentToLayout(layout, SurvnetGatewayType.EVENTS, () -> Collections.singletonList(event.getUuid()));
+
 		layout.addComponent(shortcutLinksLayout, SHORTCUT_LINKS_LOC);
 
 		setEventEditPermission(container);
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/survnet/SurvnetGateway.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/survnet/SurvnetGateway.java
@@ -33,16 +33,19 @@ private SurvnetGateway() {
 		//NOOP
 	}
 
-	public static void addComponentToLayout(CustomLayout targetLayout, Supplier<List<String>> caseUuids) {
+	public static void addComponentToLayout(CustomLayout targetLayout, SurvnetGatewayType gatewayType, Supplier<List<String>> uuids) {
 		if (!FacadeProvider.getSurvnetGatewayFacade().isFeatureEnabled()) {
 			return;
 		}
 
 		Label header = new Label(I18nProperties.getCaption(Captions.SurvnetGateway_title));
 		header.addStyleName(CssStyles.H3);
 
-		Button button = ButtonHelper
-			.createIconButton(Captions.SurvnetGateway_send, VaadinIcons.OUTBOX, e -> sendToSurvnet(caseUuids.get()), ValoTheme.BUTTON_PRIMARY);
+		Button button = ButtonHelper.createIconButton(
+			Captions.SurvnetGateway_send,
+			VaadinIcons.OUTBOX,
+			e -> sendToSurvnet(gatewayType, uuids.get()),
+			ValoTheme.BUTTON_PRIMARY);
 
 		HorizontalLayout layout = new HorizontalLayout(header, button);
 		layout.setExpandRatio(button, 1);
@@ -54,9 +57,20 @@ public static void addComponentToLayout(CustomLayout targetLayout, Supplier<List
 		targetLayout.addComponent(layout, SURVNET_GATEWAY_LOC);
 	}
 
-	public static void sendToSurvnet(List<String> caseUuids) {
+	public static void sendToSurvnet(SurvnetGatewayType gatewayType, List<String> uuids) {
 
-		int statusCode = FacadeProvider.getSurvnetGatewayFacade().sendCases(caseUuids);
+		int statusCode;
+
+		switch (gatewayType) {
+		case CASES:
+			statusCode = FacadeProvider.getSurvnetGatewayFacade().sendCases(uuids);
+			break;
+		case EVENTS:
+			statusCode = FacadeProvider.getSurvnetGatewayFacade().sendEvents(uuids);
+			break;
+		default:
+			throw new IllegalArgumentException(gatewayType.toString());
+		}
 
 		Notification.Type type;
 		String message;
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/survnet/SurvnetGatewayType.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/survnet/SurvnetGatewayType.java
@@ -0,0 +1,23 @@
+/*
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2020 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.symeda.sormas.ui.survnet;
+
+public enum SurvnetGatewayType {
+
+	CASES,
+	EVENTS;
+
+}

Original file line number	Diff line number	Diff line change
`@@ -75,4 +75,6 @@ List<EventParticipantIndexDto> getIndexList(`
`75`	`75`	`List<EventParticipantExportDto> getExportList(EventParticipantCriteria eventParticipantCriteria, int first, int max, Language userLanguage);`
`76`	`76`
`77`	`77`	`List<SimilarEventParticipantDto> getSimilarEventParticipants(EventParticipantSimilarityCriteria eventParticipantSimilarityCriteria);`
	`78`	`+`
	`79`	`+ List<EventParticipantDto> getByEventUuids(List<String> eventUuids);`
`78`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,6 @@ public interface SurvnetGatewayFacade {`
`34`	`34`	`* @return http response code of the gateway`
`35`	`35`	`*/`
`36`	`36`	`int sendCases(List<String> caseUuids);`
	`37`	`+`
	`38`	`+ int sendEvents(List<String> eventUuids);`
`37`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -763,4 +763,10 @@ public List<EventParticipantDto> getAllActiveEventParticipantsByEvent(String eve`
`763`	`763`	`return eventParticipantService.getAllActiveByEvent(event).stream().map(e -> toDto(e)).collect(Collectors.toList());`
`764`	`764`	`}`
`765`	`765`
	`766`	`+ @Override`
	`767`	`+ public List<EventParticipantDto> getByEventUuids(List<String> eventUuids) {`
	`768`	`+ Pseudonymizer pseudonymizer = Pseudonymizer.getDefault(userService::hasRight);`
	`769`	`+ return eventParticipantService.getByEventUuids(eventUuids).stream().map(e -> convertToDto(e, pseudonymizer)).collect(Collectors.toList());`
	`770`	`+ }`
	`771`	`+`
`766`	`772`	`}`