SORMAS-Foundation#3612: Count eventSummaries instead of subquery (now for getExportList)

Author: Stefan Kock

sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactExportDto.java

@@ -136,7 +136,7 @@ public class ContactExportDto implements Serializable {
 
 	private ContactJurisdictionDto jurisdiction;
 
-	private final Long eventCount;
+	private Long eventCount;
 	private String latestEventId;
 	private String latestEventTitle;
 	private String externalID;
@@ -156,7 +156,7 @@ public ContactExportDto(long id, long personId, String uuid, String sourceCaseUu
 							String facility, String facilityUuid, String facilityDetails,
 							String phone, String phoneOwner, String emailAddress, OccupationType occupationType, String occupationDetails,
 							String region, String district, String community,
-							long epiDataId, YesNoUnknown contactWithSourceCaseKnown, YesNoUnknown returningTraveler, long eventCount, String externalID,							
+							long epiDataId, YesNoUnknown contactWithSourceCaseKnown, YesNoUnknown returningTraveler, String externalID,							
 							String reportingUserUuid, String regionUuid, String districtUuid, String communityUuid,
 							String caseReportingUserUuid, String caseRegionUuid, String caseDistrictUuid, String caseCommunityUuid, String caseHealthFacilityUuid, String casePointOfEntryUuid
 	) {
@@ -218,7 +218,6 @@ public ContactExportDto(long id, long personId, String uuid, String sourceCaseUu
 		this.epiDataId = epiDataId;
 		this.contactWithSourceCaseKnown = contactWithSourceCaseKnown;
 		this.returningTraveler = returningTraveler;
-		this.eventCount = eventCount;
 		this.externalID = externalID;
 
 		CaseJurisdictionDto caseJurisdiction = caseReportingUserUuid != null
@@ -614,6 +613,10 @@ public long getEventCount() {
 		return this.eventCount;
 	}
 
+	public void setEventCount(Long eventCount) {
+		this.eventCount = eventCount;
+	}
+
 	public void setId(long id) {
 		this.id = id;
 	}

sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactFacadeEjb.java

@@ -55,7 +55,6 @@
 import javax.persistence.criteria.Order;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
-import javax.persistence.criteria.Subquery;
 import javax.validation.constraints.NotNull;
 
 import org.apache.commons.collections.CollectionUtils;
@@ -126,8 +125,6 @@
 import de.symeda.sormas.backend.epidata.EpiDataFacadeEjb;
 import de.symeda.sormas.backend.epidata.EpiDataFacadeEjb.EpiDataFacadeEjbLocal;
 import de.symeda.sormas.backend.event.ContactEventSummaryDetails;
-import de.symeda.sormas.backend.event.Event;
-import de.symeda.sormas.backend.event.EventParticipant;
 import de.symeda.sormas.backend.event.EventService;
 import de.symeda.sormas.backend.exposure.Exposure;
 import de.symeda.sormas.backend.externaljournal.ExternalJournalService;
@@ -411,20 +408,6 @@ public List<ContactExportDto> getExportList(ContactCriteria contactCriteria, int
 
 		ContactJoins joins = new ContactJoins(contact);
 
-		// Events count subquery
-		Subquery<Long> eventCountSq = cq.subquery(Long.class);
-		Root<EventParticipant> eventCountRoot = eventCountSq.from(EventParticipant.class);
-		Join<EventParticipant, Event> eventJoin = eventCountRoot.join(EventParticipant.EVENT, JoinType.INNER);
-		Join<Person, Contact> contactJoin = eventCountRoot.join(EventParticipant.PERSON, JoinType.INNER).join(Person.CONTACTS, JoinType.INNER);
-
-		eventCountSq.where(
-			cb.and(
-				cb.equal(contactJoin.get(Contact.UUID), contact.get(Contact.UUID)),
-				cb.isFalse(eventJoin.get(Event.DELETED)),
-				cb.isFalse(eventJoin.get(Event.ARCHIVED)),
-				cb.isFalse(eventCountRoot.get(EventParticipant.DELETED))));
-		eventCountSq.select(cb.countDistinct(eventJoin.get(Event.ID)));
-
 		cq.multiselect(
 			Stream.concat(
 				Stream.of(
@@ -491,7 +474,6 @@ public List<ContactExportDto> getExportList(ContactCriteria contactCriteria, int
 					joins.getEpiData().get(EpiData.ID),
 					joins.getEpiData().get(EpiData.CONTACT_WITH_SOURCE_CASE_KNOWN),
 					contact.get(Contact.RETURNING_TRAVELER),
-					eventCountSq,
 					contact.get(Contact.EXTERNAL_ID)),
 				listCriteriaBuilder.getJurisdictionSelections(joins)).collect(Collectors.toList()));
 
@@ -544,10 +526,10 @@ public List<ContactExportDto> getExportList(ContactCriteria contactCriteria, int
 			List<Exposure> exposureList = em.createQuery(exposuresCq).setHint(ModelConstants.HINT_HIBERNATE_READ_ONLY, true).getResultList();
 			Map<Long, List<Exposure>> exposures = exposureList.stream().collect(Collectors.groupingBy(e -> e.getEpiData().getId()));
 
-			// Load latest events info
-			// Adding a second query here is not perfect, but selecting the last event with a criteria query
-			// doesn't seem to be possible and using a native query is not an option because of user filters
-			List<ContactEventSummaryDetails> eventSummaries = eventService.getEventSummaryDetailsByContacts(resultContactsUuids);
+			// Load event count and latest events info per contact
+			Map<String, List<ContactEventSummaryDetails>> eventSummaries = eventService.getEventSummaryDetailsByContacts(resultContactsUuids)
+				.stream()
+				.collect(Collectors.groupingBy(ContactEventSummaryDetails::getContactUuid, Collectors.toList()));
 
 			// Adding a second query here is not perfect, but selecting the last cooperative visit with a criteria query
 			// doesn't seem to be possible and using a native query is not an option because of user filters
@@ -597,22 +579,18 @@ public List<ContactExportDto> getExportList(ContactCriteria contactCriteria, int
 					});
 				}
 
-				if (eventSummaries != null && exportContact.getEventCount() != 0) {
-					eventSummaries.stream()
-						.filter(v -> v.getContactUuid().equals(exportContact.getUuid()))
-						.max(Comparator.comparing(ContactEventSummaryDetails::getEventDate))
-						.ifPresent(eventSummary -> {
-							exportContact.setLatestEventId(eventSummary.getEventUuid());
-							exportContact.setLatestEventTitle(eventSummary.getEventTitle());
-						});
-				}
+				List<ContactEventSummaryDetails> contactEvents = eventSummaries.getOrDefault(exportContact.getUuid(), Collections.emptyList());
+				exportContact.setEventCount((long) contactEvents.size());
+				contactEvents.stream().max(Comparator.comparing(ContactEventSummaryDetails::getEventDate)).ifPresent(eventSummary -> {
+					exportContact.setLatestEventId(eventSummary.getEventUuid());
+					exportContact.setLatestEventTitle(eventSummary.getEventTitle());
+				});
 
 				pseudonymizer.pseudonymizeDto(ContactExportDto.class, exportContact, inJurisdiction, null);
 			}
 		}
 
 		return exportContacts;
-
 	}
 
 	@Override

sormas-backend/src/test/java/de/symeda/sormas/backend/contact/ContactFacadeEjbTest.java

@@ -736,7 +736,8 @@ public void testGetExportList() {
 		visit.getSymptoms().setAbdominalPain(SymptomState.YES);
 		getVisitFacade().saveVisit(visit);
 
-		List<ContactExportDto> results = getContactFacade().getExportList(null, 0, 100, Language.EN);
+		List<ContactExportDto> results;
+		results = getContactFacade().getExportList(null, 0, 100, Language.EN);
 
 		// Database should contain one contact, associated visit and task
 		assertEquals(1, results.size());
@@ -766,6 +767,23 @@ public void testGetExportList() {
 				exposure.getEndDate(),
 				Language.EN),
 			exportDto.getTravelHistory());
+		assertThat(exportDto.getEventCount(), equalTo(0L));
+
+		// one Contact with 2 Events
+		UserReferenceDto reportingUser = new UserReferenceDto(user.getUuid());
+		EventDto event1 = creator.createEvent(reportingUser, DateHelper.subtractDays(new Date(), 1));
+		EventDto event2 = creator.createEvent(reportingUser, new Date());
+		creator.createEventParticipant(new EventReferenceDto(event2.getUuid()), contactPerson, reportingUser);
+		creator.createEventParticipant(new EventReferenceDto(event1.getUuid()), contactPerson, reportingUser);
+
+		results = getContactFacade().getExportList(null, 0, 100, Language.EN);
+		assertThat(results, hasSize(1));
+		{
+			ContactExportDto dto = results.get(0);
+			assertThat(dto.getLatestEventId(), equalTo(event2.getUuid()));
+			assertThat(dto.getLatestEventTitle(), equalTo(event2.getEventTitle()));
+			assertThat(dto.getEventCount(), equalTo(2L));
+		}
 	}
 
 	@Test