Merge pull request SORMAS-Foundation#2932 from hzi-braunschweig/2728-event-participant-count

SORMAS-Foundation#2728 do not count deleted participants

Author: MateStrysewske

sormas-api/src/main/java/de/symeda/sormas/api/event/EventExportDto.java

@@ -29,7 +29,7 @@ public class EventExportDto implements Serializable {
 	private String uuid;
 	private String externalId;
 	private EventStatus eventStatus;
-	private int participantsCount;
+	private long participantsCount;
 	private Disease disease;
 	private String diseaseDetails;
 	private Date startDate;
@@ -59,7 +59,7 @@ public EventExportDto(
 		String uuid,
 		String externalId,
 		EventStatus eventStatus,
-		int participantsCount,
+		long participantsCount,
 		Disease disease,
 		String diseaseDetails,
 		Date startDate,
@@ -310,11 +310,11 @@ public void setReportDateTime(Date reportDateTime) {
 	}
 
 	@Order(25)
-	public int getParticipantsCount() {
+	public long getParticipantsCount() {
 		return participantsCount;
 	}
 
-	public void setParticipantsCount(int participantsCount) {
+	public void setParticipantsCount(long participantsCount) {
 		this.participantsCount = participantsCount;
 	}
 

sormas-api/src/main/java/de/symeda/sormas/api/event/EventIndexDto.java

@@ -47,7 +47,7 @@ public class EventIndexDto implements WithJurisdiction<EventJurisdictionDto>, Se
 
 	private String uuid;
 	private EventStatus eventStatus;
-	private int participantCount;
+	private long participantCount;
 	private Disease disease;
 	private String diseaseDetails;
 	private Date startDate;
@@ -66,7 +66,7 @@ public class EventIndexDto implements WithJurisdiction<EventJurisdictionDto>, Se
 	public EventIndexDto(
 		String uuid,
 		EventStatus eventStatus,
-		Integer participantCount,
+		Long participantCount,
 		Disease disease,
 		String diseaseDetails,
 		Date startDate,
@@ -227,11 +227,11 @@ public void setReportDateTime(Date reportDateTime) {
 		this.reportDateTime = reportDateTime;
 	}
 
-	public int getParticipantCount() {
+	public long getParticipantCount() {
 		return participantCount;
 	}
 
-	public void setParticipantCount(int participantCount) {
+	public void setParticipantCount(long participantCount) {
 		this.participantCount = participantCount;
 	}
 

sormas-api/src/main/resources/doc/SORMAS_Data_Dictionary.xlsx

@@ -40,6 +40,7 @@
 import javax.persistence.criteria.Join;
 import javax.persistence.criteria.JoinType;
 import javax.persistence.criteria.Order;
+import javax.persistence.criteria.ParameterExpression;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import javax.persistence.criteria.Subquery;
@@ -216,10 +217,12 @@ public List<EventIndexDto> getIndexList(EventCriteria eventCriteria, Integer fir
 		Join<Location, District> district = location.join(Location.DISTRICT, JoinType.LEFT);
 		Join<Location, Community> community = location.join(Location.COMMUNITY, JoinType.LEFT);
 
-		Subquery<Integer> participantCount = cq.subquery(Integer.class);
-		Root<Event> participantCountRoot = participantCount.from(Event.class);
-		participantCount.where(cb.equal(participantCountRoot.get(AbstractDomainObject.ID), event.get(AbstractDomainObject.ID)));
-		participantCount.select(cb.size(participantCountRoot.get(Event.EVENT_PERSONS)));
+		Subquery<Long> participantCount = cq.subquery(Long.class);
+		Root<EventParticipant> eventParticipantRoot = participantCount.from(EventParticipant.class);
+		Predicate assignedToEvent = cb.equal(eventParticipantRoot.get(EventParticipant.EVENT), event.get(AbstractDomainObject.ID));
+		Predicate notDeleted = cb.isFalse(eventParticipantRoot.get(EventParticipant.DELETED));
+		participantCount.select(cb.count(eventParticipantRoot));
+		participantCount.where(assignedToEvent, notDeleted);
 
 		cq.multiselect(
 			event.get(Event.UUID),
@@ -317,10 +320,12 @@ public List<EventExportDto> getExportList(EventCriteria eventCriteria, Integer f
 		Join<Location, District> district = location.join(Location.DISTRICT, JoinType.LEFT);
 		Join<Location, Community> community = location.join(Location.COMMUNITY, JoinType.LEFT);
 
-		Subquery<Integer> participantCount = cq.subquery(Integer.class);
-		Root<Event> participantCountRoot = participantCount.from(Event.class);
-		participantCount.where(cb.equal(participantCountRoot.get(AbstractDomainObject.ID), event.get(AbstractDomainObject.ID)));
-		participantCount.select(cb.size(participantCountRoot.get(Event.EVENT_PERSONS)));
+		Subquery<Long> participantCount = cq.subquery(Long.class);
+		Root<EventParticipant> eventParticipantRoot = participantCount.from(EventParticipant.class);
+		Predicate assignedToEvent = cb.equal(eventParticipantRoot.get(EventParticipant.EVENT), event.get(AbstractDomainObject.ID));
+		Predicate notDeleted = cb.isFalse(eventParticipantRoot.get(EventParticipant.DELETED));
+		participantCount.select(cb.count(eventParticipantRoot));
+		participantCount.where(assignedToEvent, notDeleted);
 
 		cq.multiselect(
 			event.get(Event.UUID),