Merge branch 'development' into feature-3195-Unit-tests-for-the-ExternalVisitsRessource

# Conflicts:
#	sormas-backend/src/test/java/de/symeda/sormas/backend/person/PersonFacadeEjbTest.java

Author: FredrikSchäferVitagroup

sormas-api/pom.xml

@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>1.51.0-SNAPSHOT</version>
+		<version>1.52.0-SNAPSHOT</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

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

@@ -110,5 +110,7 @@ public interface ConfigFacade {
 
 	String getAuthenticationProvider();
 
-	public boolean isExternalJournalActive();
+	boolean isExternalJournalActive();
+
+	int getDashboardMapMarkerLimit();
 }

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

@@ -17,6 +17,8 @@
  *******************************************************************************/
 package de.symeda.sormas.api;
 
+import de.symeda.sormas.api.utils.Required;
+
 import java.io.Serializable;
 
 import org.apache.commons.lang3.ObjectUtils;
@@ -26,6 +28,7 @@ public abstract class ReferenceDto implements Serializable, HasUuid, Comparable<
 
 	public static final String CAPTION = "caption";
 
+	@Required
 	private String uuid;
 	private String caption;
 

sormas-api/src/main/java/de/symeda/sormas/api/campaign/CampaignFacade.java

@@ -40,4 +40,6 @@ public interface CampaignFacade {
 	List<CampaignDto> getByUuids(List<String> uuids);
 
 	List<String> getAllActiveUuids();
+
+	void validate(CampaignReferenceDto campaignReferenceDto);
 }

sormas-api/src/main/java/de/symeda/sormas/api/campaign/diagram/CampaignDashboardElement.java

@@ -5,6 +5,12 @@
 
 public class CampaignDashboardElement implements Serializable {
 
+	public static String DIAGRAM_ID = "diagramId";
+	public static String TAB_ID = "tabId";
+	public static String ORDER = "order";
+	public static String WIDTH = "width";
+	public static String HEIGHT = "height";
+
 	private String diagramId;
 	private String tabId;
 	private Integer order;
@@ -61,23 +67,4 @@ public Integer getHeight() {
 	public void setHeight(Integer height) {
 		this.height = height;
 	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o)
-			return true;
-		if (o == null || getClass() != o.getClass())
-			return false;
-		CampaignDashboardElement that = (CampaignDashboardElement) o;
-		return Objects.equals(diagramId, that.diagramId)
-			&& Objects.equals(tabId, that.tabId)
-			&& Objects.equals(order, that.order)
-			&& Objects.equals(width, that.width)
-			&& Objects.equals(height, that.height);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(diagramId, tabId, order, width, height);
-	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/campaign/diagram/CampaignDiagramDefinitionFacade.java

@@ -1,6 +1,7 @@
 package de.symeda.sormas.api.campaign.diagram;
 
 import java.util.List;
+import java.util.Set;
 
 import javax.ejb.Remote;
 
@@ -12,4 +13,8 @@ public interface CampaignDiagramDefinitionFacade {
 	List<CampaignDiagramDefinitionDto> getAll();
 
 	List<CampaignDiagramDefinitionDto> getByUuids(List<String> uuids);
+
+	boolean exists(String diagramId);
+
+	CampaignDiagramDefinitionDto getByDiagramId(String diagramId);
 }

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

@@ -46,7 +46,6 @@ public class CaseCriteria extends BaseCriteria implements Cloneable {
 	public static final String MUST_HAVE_NO_GEO_COORDINATES = "mustHaveNoGeoCoordinates";
 	public static final String MUST_BE_PORT_HEALTH_CASE_WITHOUT_FACILITY = "mustBePortHealthCaseWithoutFacility";
 	public static final String MUST_HAVE_CASE_MANAGEMENT_DATA = "mustHaveCaseManagementData";
-	public static final String EXCLUDE_SHARED_CASES = "excludeSharedCases";
 	public static final String WITHOUT_RESPONSIBLE_OFFICER = "withoutResponsibleOfficer";
 	public static final String WITH_EXTENDED_QUARANTINE = "withExtendedQuarantine";
 	public static final String WITH_REDUCED_QUARANTINE = "withReducedQuarantine";
@@ -102,7 +101,6 @@ public class CaseCriteria extends BaseCriteria implements Cloneable {
 	private EntityRelevanceStatus relevanceStatus;
 	private String sourceCaseInfoLike;
 	private Date quarantineTo;
-	public Boolean excludeSharedCases;
 	private Integer birthdateYYYY;
 	private Integer birthdateMM;
 	private Integer birthdateDD;
@@ -472,14 +470,6 @@ public void setQuarantineTo(Date quarantineTo) {
 		this.quarantineTo = quarantineTo;
 	}
 
-	public Boolean getExcludeSharedCases() {
-		return excludeSharedCases;
-	}
-
-	public void setExcludeSharedCases(Boolean excludeSharedCases) {
-		this.excludeSharedCases = excludeSharedCases;
-	}
-
 	public Integer getBirthdateYYYY() {
 		return birthdateYYYY;
 	}

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

@@ -55,12 +55,10 @@
 import de.symeda.sormas.api.utils.Required;
 import de.symeda.sormas.api.utils.SensitiveData;
 import de.symeda.sormas.api.utils.YesNoUnknown;
-
 import de.symeda.sormas.api.utils.pseudonymization.PseudonymizableDto;
 import de.symeda.sormas.api.utils.pseudonymization.Pseudonymizer;
 import de.symeda.sormas.api.utils.pseudonymization.valuepseudonymizers.LatitudePseudonymizer;
 import de.symeda.sormas.api.utils.pseudonymization.valuepseudonymizers.LongitudePseudonymizer;
-import java.util.Date;
 
 public class CaseDataDto extends PseudonymizableDto {
 
@@ -190,7 +188,9 @@ public class CaseDataDto extends PseudonymizableDto {
 	@EmbeddedPersonalData
 	private PersonReferenceDto person;
 	@Outbreaks
-	@HideForCountries()
+	@HideForCountries(countries = {
+		COUNTRY_CODE_GERMANY,
+		COUNTRY_CODE_SWITZERLAND })
 	private String epidNumber;
 	@Outbreaks
 	@Required
@@ -362,7 +362,9 @@ public class CaseDataDto extends PseudonymizableDto {
 	private String pointOfEntryDetails;
 	@SensitiveData
 	private String additionalDetails;
-	@HideForCountriesExcept
+	@HideForCountriesExcept(countries = {
+		COUNTRY_CODE_GERMANY,
+		COUNTRY_CODE_SWITZERLAND })
 	private String externalID;
 	private boolean sharedToCountry;
 	private QuarantineType quarantine;

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

@@ -236,6 +236,7 @@ public class CaseExportDto implements Serializable {
 	private String latestEventId;
 	private String latestEventTitle;
 	private EventStatus latestEventStatus;
+	private String externalID;
 
 	//@formatter:off
 	public CaseExportDto(long id, long personId, long personAddressId, long epiDataId, long symptomsId,
@@ -263,7 +264,7 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
 						 //Date onsetDate,
 						 Vaccination vaccination, String vaccinationDoses, Date vaccinationDate,
 						 VaccinationInfoSource vaccinationInfoSource, YesNoUnknown postpartum, Trimester trimester,
-						 long eventCount) {
+						 long eventCount, String externalID) {
 		//@formatter:on
 
 		this.id = id;
@@ -340,6 +341,7 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
 		this.followUpStatus = followUpStatus;
 		this.followUpUntil = followUpUntil;
 		this.eventCount = eventCount;
+		this.externalID = externalID;
 
 		jurisdiction = new CaseJurisdictionDto(reportingUserUuid, regionUuid, districtUuid, communityUuid, healthFacilityUuid, pointOfEntryUuid);
 	}
@@ -417,6 +419,16 @@ public String getEpidNumber() {
 	}
 
 	@Order(4)
+	@ExportTarget(caseExportTypes = {
+		CaseExportType.CASE_SURVEILLANCE,
+		CaseExportType.CASE_MANAGEMENT })
+	@ExportProperty(CaseDataDto.EXTERNAL_ID)
+	@ExportGroup(ExportGroupType.CORE)
+	public String getExternalID() {
+		return externalID;
+	}
+
+	@Order(5)
 	@ExportTarget(caseExportTypes = {
 		CaseExportType.CASE_SURVEILLANCE,
 		CaseExportType.CASE_MANAGEMENT })
@@ -1620,4 +1632,8 @@ public void setLatestEventTitle(String latestEventTitle) {
 	public void setLatestEventStatus(EventStatus latestEventStatus) {
 		this.latestEventStatus = latestEventStatus;
 	}
+
+	public void setExternalID(String externalID) {
+		this.externalID = externalID;
+	}
 }

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

@@ -87,6 +87,8 @@ List<CaseExportDto> getExportList(
 
 	List<MapCaseDto> getCasesForMap(RegionReferenceDto regionRef, DistrictReferenceDto districtRef, Disease disease, Date from, Date to);
 
+	Long countCasesForMap(RegionReferenceDto regionRef, DistrictReferenceDto districtRef, Disease disease, Date from, Date to);
+
 	Map<CaseClassification, Long> getCaseCountPerClassification(
 		CaseCriteria caseCriteria,
 		boolean excludeSharedCases,