Merge branch 'development' into bug-4008-MergeCasesFilterFix

# Conflicts:
#	sormas-backend/src/test/java/de/symeda/sormas/backend/caze/CaseFacadeEjbTest.java

Author: barnabartha

sormas-api/src/main/java/de/symeda/sormas/api/ConfigFacade.java

@@ -117,4 +117,5 @@ public interface ConfigFacade {
 
 	boolean isSmsServiceSetUp();
 
+	String getDemisJndiName();
 }

sormas-api/src/main/java/de/symeda/sormas/api/FacadeProvider.java

@@ -14,6 +14,7 @@
  */
 package de.symeda.sormas.api;
 
+import javax.naming.ConfigurationException;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
@@ -48,6 +49,8 @@
 import de.symeda.sormas.api.infrastructure.InfrastructureFacade;
 import de.symeda.sormas.api.infrastructure.PointOfEntryFacade;
 import de.symeda.sormas.api.infrastructure.PopulationDataFacade;
+import de.symeda.sormas.api.labmessage.ExternalLabResultsFacade;
+import de.symeda.sormas.api.labmessage.LabMessageFacade;
 import de.symeda.sormas.api.outbreak.OutbreakFacade;
 import de.symeda.sormas.api.person.PersonFacade;
 import de.symeda.sormas.api.region.AreaFacade;
@@ -327,6 +330,23 @@ public static SystemEventFacade getSystemEventFacade() {
 		return get().lookupEjbRemote(SystemEventFacade.class);
 	}
 
+	public static LabMessageFacade getLabMessageFacade() {
+		return get().lookupEjbRemote(LabMessageFacade.class);
+	}
+
+	public static ExternalLabResultsFacade getExternalLabResultsFacade() {
+		try {
+			String jndiName = FacadeProvider.getConfigFacade().getDemisJndiName();
+			if (jndiName == null) {
+				throw new ConfigurationException("No LabResultAdapter JNDI name is configured in the sormas.properties");
+			} else {
+				return (ExternalLabResultsFacade) get().ic.lookup(jndiName);
+			}
+		} catch (NamingException e) {
+			throw new RuntimeException(e.getMessage(), e);
+		}
+	}
+
 	@SuppressWarnings("unchecked")
 	public <P> P lookupEjbRemote(Class<P> clazz) {
 		try {

sormas-api/src/main/java/de/symeda/sormas/api/action/ActionDto.java

@@ -41,11 +41,13 @@ public class ActionDto extends EntityDto {
 	public static final String EVENT = "event";
 	public static final String ACTION_CONTEXT = "actionContext";
 	public static final String ACTION_STATUS = "actionStatus";
+	public static final String ACTION_MEASURE = "actionMeasure";
 
 	@Required
 	private ActionContext actionContext;
 	private EventReferenceDto event;
 
+	private ActionMeasure actionMeasure;
 	private ActionPriority priority;
 	@Required
 	private Date date;
@@ -59,12 +61,17 @@ public class ActionDto extends EntityDto {
 	private UserReferenceDto lastModifiedBy;
 
 	public static ActionDto build(ActionContext context, ReferenceDto entityRef) {
+		return build(context, null, entityRef);
+	}
+
+	public static ActionDto build(ActionContext context, ActionMeasure actionMeasure, ReferenceDto entityRef) {
 
 		ActionDto action = new ActionDto();
 		action.setUuid(DataHelper.createUuid());
 		action.setDate(ActionHelper.getDefaultDate());
 		action.setActionStatus(ActionStatus.PENDING);
 		action.setPriority(ActionPriority.NORMAL);
+		action.setActionMeasure(actionMeasure);
 		action.setActionContext(context);
 		switch (context) {
 		case EVENT:
@@ -162,6 +169,14 @@ public void setPriority(ActionPriority priority) {
 		this.priority = priority;
 	}
 
+	public ActionMeasure getActionMeasure() {
+		return actionMeasure;
+	}
+
+	public void setActionMeasure(ActionMeasure actionMeasure) {
+		this.actionMeasure = actionMeasure;
+	}
+
 	public ReferenceDto getContextReference() {
 
 		switch (actionContext) {

sormas-api/src/main/java/de/symeda/sormas/api/action/ActionMeasure.java

@@ -0,0 +1,37 @@
+/*
+ * 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.api.action;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+public enum ActionMeasure {
+
+	PROHIBITION_OF_ENTRY_AND_WORK_CASES,
+	SAMPLE_COLLECTION,
+	FORWARDING_TO_NATIONAL_REFERENCE_CENTER,
+	CONTACT_FOLLOW_UP,
+	VERIFICATION_OF_VACCINATION_IMMUNIZATION,
+	POST_EXPOSURE_PROPHYLAXIS_VACCINATION,
+	CLOSURE_OF_FACILITY,
+	PROHIBITION_OF_ENTRY_AND_WORK_CONTACTS,
+	POPULATION_INFORMATION,
+	OTHER;
+
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+
+}

sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseExportDto.java

@@ -462,7 +462,7 @@ public String getExternalID() {
 	@ExportTarget(caseExportTypes = {
 			CaseExportType.CASE_SURVEILLANCE,
 			CaseExportType.CASE_MANAGEMENT })
-	@ExportProperty(CaseDataDto.EXTERNAL_ID)
+	@ExportProperty(CaseDataDto.EXTERNAL_TOKEN)
 	@ExportGroup(ExportGroupType.CORE)
 	public String getExternalToken() {
 		return externalToken;

sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseFacade.java

@@ -204,4 +204,6 @@ void saveBulkEditWithFacilities(
 		boolean outcomeChange,
 		boolean surveillanceOfficerChange,
 		Boolean doTransfer);
+
+	List<CasePersonDto> getDuplicates(CasePersonDto casePerson);
 }

sormas-api/src/main/java/de/symeda/sormas/api/caze/CasePersonDto.java

@@ -0,0 +1,53 @@
+/*
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2021 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.api.caze;
+
+import java.io.Serializable;
+
+import de.symeda.sormas.api.person.PersonDto;
+
+public class CasePersonDto implements Serializable {
+
+	private static final long serialVersionUID = 4238365446327936524L;
+
+	private CaseDataDto caze;
+
+	private PersonDto person;
+
+	public CasePersonDto() {
+	}
+
+	public CasePersonDto(CaseDataDto caze, PersonDto person) {
+		this.caze = caze;
+		this.person = person;
+	}
+
+	public CaseDataDto getCaze() {
+		return caze;
+	}
+
+	public void setCaze(CaseDataDto caze) {
+		this.caze = caze;
+	}
+
+	public PersonDto getPerson() {
+		return person;
+	}
+
+	public void setPerson(PersonDto person) {
+		this.person = person;
+	}
+}

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

@@ -855,6 +855,8 @@ public String getReportingDistrict() {
 	}
 
 	@Order(84)
+	@ExportProperty(ContactDto.EXTERNAL_TOKEN)
+	@ExportGroup(ExportGroupType.CORE)
 	public String getExternalToken() {
 		return externalToken;
 	}

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

@@ -0,0 +1,33 @@
+/*
+ * 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.api.event;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+public enum DiseaseTransmissionMode {
+
+	HUMAN_TO_HUMAN,
+	ANIMAL,
+	ENVIRONMENT,
+	FOOD,
+	VECTOR_BORNE,
+	UNKNOWN;
+
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+
+}

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

@@ -20,6 +20,7 @@
 import java.io.Serializable;
 import java.util.Date;
 
+import de.symeda.sormas.api.action.ActionMeasure;
 import de.symeda.sormas.api.action.ActionPriority;
 import de.symeda.sormas.api.action.ActionStatus;
 import de.symeda.sormas.api.user.UserReferenceDto;
@@ -37,6 +38,7 @@ public class EventActionExportDto implements Serializable {
 	private String eventDate;
 	private EventStatus eventStatus;
 	private EventInvestigationStatus eventInvestigationStatus;
+	private ActionMeasure actionMeasure;
 	private String actionTitle;
 	private Date actionCreationDate;
 	private Date actionChangeDate;
@@ -52,6 +54,7 @@ public EventActionExportDto(
 		Date eventEndDate,
 		EventStatus eventStatus,
 		EventInvestigationStatus eventInvestigationStatus,
+		ActionMeasure actionMeasure,
 		String actionTitle,
 		Date actionCreationDate,
 		Date actionChangeDate,
@@ -70,6 +73,7 @@ public EventActionExportDto(
 		this.eventDate = EventHelper.buildEventDateString(eventStartDate, eventEndDate);
 		this.eventStatus = eventStatus;
 		this.eventInvestigationStatus = eventInvestigationStatus;
+		this.actionMeasure = actionMeasure;
 		this.actionTitle = actionTitle;
 		this.actionCreationDate = actionCreationDate;
 		this.actionChangeDate = actionChangeDate;
@@ -111,31 +115,36 @@ public EventInvestigationStatus getEventInvestigationStatus() {
 	}
 
 	@Order(6)
+	public ActionMeasure getActionMeasure() {
+		return actionMeasure;
+	}
+
+	@Order(7)
 	public String getActionTitle() {
 		return actionTitle;
 	}
 
-	@Order(7)
+	@Order(8)
 	public Date getActionCreationDate() {
 		return actionCreationDate;
 	}
 
-	@Order(8)
+	@Order(9)
 	public Date getActionChangeDate() {
 		return actionChangeDate;
 	}
 
-	@Order(9)
+	@Order(10)
 	public ActionStatus getActionStatus() {
 		return actionStatus;
 	}
 
-	@Order(10)
+	@Order(11)
 	public ActionPriority getActionPriority() {
 		return actionPriority;
 	}
 
-	@Order(11)
+	@Order(12)
 	public UserReferenceDto getActionLastModifiedBy() {
 		return actionLastModifiedBy;
 	}