Add an investigation status field to events SORMAS-Foundation#2992 (SORMAS-Foundation#3155)

* Add an investigation status field to events SORMAS-Foundation#2992

* Fix event investigation start/end date fields on mobile app SORMAS-Foundation#2992

* Fix an event creation in a test added in the meantime by another PR SORMAS-Foundation#2992

Author: alexandre-gille

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

@@ -30,10 +30,12 @@ public class DashboardEventDto implements Serializable {
 	public static final String I18N_PREFIX = "Event";
 
 	public static final String EVENT_STATUS = "eventStatus";
+	public static final String EVENT_INVESTIGATION_STATUS = "eventInvestigationStatus";
 	public static final String DISEASE = "disease";
 
 	private String uuid;
 	private EventStatus eventStatus;
+	private EventInvestigationStatus eventInvestigationStatus;
 	private Disease disease;
 	private String diseaseDetails;
 	private Date eventDate;
@@ -48,6 +50,7 @@ public class DashboardEventDto implements Serializable {
 	public DashboardEventDto(
 		String uuid,
 		EventStatus eventStatus,
+		EventInvestigationStatus eventInvestigationStatus,
 		Disease disease,
 		String diseaseDetails,
 		Date eventDate,
@@ -64,6 +67,7 @@ public DashboardEventDto(
 
 		this.uuid = uuid;
 		this.eventStatus = eventStatus;
+		this.eventInvestigationStatus = eventInvestigationStatus;
 		this.disease = disease;
 		this.diseaseDetails = diseaseDetails;
 		this.eventDate = eventDate;
@@ -92,6 +96,14 @@ public void setEventStatus(EventStatus eventStatus) {
 		this.eventStatus = eventStatus;
 	}
 
+	public EventInvestigationStatus getEventInvestigationStatus() {
+		return eventInvestigationStatus;
+	}
+
+	public void setEventInvestigationStatus(EventInvestigationStatus eventInvestigationStatus) {
+		this.eventInvestigationStatus = eventInvestigationStatus;
+	}
+
 	public Disease getDisease() {
 		return disease;
 	}
@@ -154,7 +166,7 @@ public DistrictReferenceDto getDistrict() {
 
 	@Override
 	public String toString() {
-		return EventReferenceDto.buildCaption(getDisease(), getDiseaseDetails(), getEventStatus(), getEventDate());
+		return EventReferenceDto.buildCaption(getDisease(), getDiseaseDetails(), getEventStatus(), getEventInvestigationStatus(), getEventDate());
 	}
 
 	public EventJurisdictionDto getJurisdiction() {

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

@@ -35,6 +35,7 @@ public class EventActionIndexDto implements Serializable {
 	public static final String EVENT_START_DATE = "eventStartDate";
 	public static final String EVENT_END_DATE = "eventEndDate";
 	public static final String EVENT_STATUS = "eventStatus";
+	public static final String EVENT_INVESTIGATION_STATUS = "eventInvestigationStatus";
 	public static final String ACTION_TITLE = "actionTitle";
 	public static final String ACTION_CREATION_DATE = "actionCreationDate";
 	public static final String ACTION_CHANGE_DATE = "actionChangeDate";
@@ -47,6 +48,7 @@ public class EventActionIndexDto implements Serializable {
 	private Date eventStartDate;
 	private Date eventEndDate;
 	private EventStatus eventStatus;
+	private EventInvestigationStatus eventInvestigationStatus;
 	private String actionTitle;
 	private Date actionCreationDate;
 	private Date actionChangeDate;
@@ -60,6 +62,7 @@ public EventActionIndexDto(
 		Date eventStartDate,
 		Date eventEndDate,
 		EventStatus eventStatus,
+		EventInvestigationStatus eventInvestigationStatus,
 		String actionTitle,
 		Date actionCreationDate,
 		Date actionChangeDate,
@@ -74,6 +77,7 @@ public EventActionIndexDto(
 		this.eventStartDate = eventStartDate;
 		this.eventEndDate = eventEndDate;
 		this.eventStatus = eventStatus;
+		this.eventInvestigationStatus = eventInvestigationStatus;
 		this.actionTitle = actionTitle;
 		this.actionCreationDate = actionCreationDate;
 		this.actionChangeDate = actionChangeDate;
@@ -122,6 +126,14 @@ public void setEventStatus(EventStatus eventStatus) {
 		this.eventStatus = eventStatus;
 	}
 
+	public EventInvestigationStatus getEventInvestigationStatus() {
+		return eventInvestigationStatus;
+	}
+
+	public void setEventInvestigationStatus(EventInvestigationStatus eventInvestigationStatus) {
+		this.eventInvestigationStatus = eventInvestigationStatus;
+	}
+
 	public String getActionTitle() {
 		return actionTitle;
 	}

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

@@ -41,10 +41,12 @@ public class EventCriteria extends BaseCriteria implements Serializable {
 	public static final String SURVEILLANCE_OFFICER = "surveillanceOfficer";
 	public static final String FREE_TEXT = "freeText";
 	public static final String EVENT_STATUS = "eventStatus";
+	public static final String EVENT_INVESTIGATION_STATUS = "eventInvestigationStatus";
 	public static final String DISTRICT = "district";
 	public static final String REGION = "region";
 
 	private EventStatus eventStatus;
+	private EventInvestigationStatus eventInvestigationStatus;
 	private Disease disease;
 	private UserRole reportingUserRole;
 	private Boolean deleted = Boolean.FALSE;
@@ -83,6 +85,19 @@ public void setEventStatus(EventStatus eventStatus) {
 		this.eventStatus = eventStatus;
 	}
 
+	public EventInvestigationStatus getEventInvestigationStatus() {
+		return eventInvestigationStatus;
+	}
+
+	public void setEventInvestigationStatus(EventInvestigationStatus eventInvestigationStatus) {
+		this.eventInvestigationStatus = eventInvestigationStatus;
+	}
+
+	public EventCriteria eventInvestigationStatus(EventInvestigationStatus eventInvestigationStatus) {
+		this.eventInvestigationStatus = eventInvestigationStatus;
+		return this;
+	}
+
 	public Disease getDisease() {
 		return disease;
 	}

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

@@ -35,6 +35,9 @@ public class EventDto extends PseudonymizableDto {
 	public static final String I18N_PREFIX = "Event";
 
 	public static final String EVENT_STATUS = "eventStatus";
+	public static final String EVENT_INVESTIGATION_STATUS = "eventInvestigationStatus";
+	public static final String EVENT_INVESTIGATION_START_DATE = "eventInvestigationStartDate";
+	public static final String EVENT_INVESTIGATION_END_DATE = "eventInvestigationEndDate";
 	public static final String EVENT_PERSONS = "eventPersons";
 	public static final String PARTICIPANTS_COUNT = "participantCount";
 	public static final String EVENT_ACTIONS = "eventActions";
@@ -66,6 +69,9 @@ public class EventDto extends PseudonymizableDto {
 
 	@Required
 	private EventStatus eventStatus;
+	private EventInvestigationStatus eventInvestigationStatus;
+	private Date eventInvestigationStartDate;
+	private Date eventInvestigationEndDate;
 	private String externalId;
 	private String eventTitle;
 	@Required
@@ -101,6 +107,7 @@ public static EventDto build() {
 		event.setUuid(DataHelper.createUuid());
 
 		event.setEventStatus(EventStatus.SIGNAL);
+		event.setEventInvestigationStatus(EventInvestigationStatus.PENDING);
 		event.setEventLocation(LocationDto.build());
 		event.setReportDateTime(new Date());
 
@@ -115,6 +122,30 @@ public void setEventStatus(EventStatus eventStatus) {
 		this.eventStatus = eventStatus;
 	}
 
+	public EventInvestigationStatus getEventInvestigationStatus() {
+		return eventInvestigationStatus;
+	}
+
+	public void setEventInvestigationStatus(EventInvestigationStatus eventInvestigationStatus) {
+		this.eventInvestigationStatus = eventInvestigationStatus;
+	}
+
+	public Date getEventInvestigationStartDate() {
+		return eventInvestigationStartDate;
+	}
+
+	public void setEventInvestigationStartDate(Date eventInvestigationStartDate) {
+		this.eventInvestigationStartDate = eventInvestigationStartDate;
+	}
+
+	public Date getEventInvestigationEndDate() {
+		return eventInvestigationEndDate;
+	}
+
+	public void setEventInvestigationEndDate(Date eventInvestigationEndDate) {
+		this.eventInvestigationEndDate = eventInvestigationEndDate;
+	}
+
 	public String getExternalId() {
 		return externalId;
 	}