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

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

Author: FredrikSchäferVitagroup

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

@@ -54,6 +54,7 @@
 import de.symeda.sormas.api.person.PersonFacade;
 import de.symeda.sormas.api.region.AreaFacade;
 import de.symeda.sormas.api.region.CommunityFacade;
+import de.symeda.sormas.api.region.CountryFacade;
 import de.symeda.sormas.api.region.DistrictFacade;
 import de.symeda.sormas.api.region.GeoShapeProvider;
 import de.symeda.sormas.api.region.RegionFacade;
@@ -158,6 +159,9 @@ public static FacilityFacade getFacilityFacade() {
 		return get().lookupEjbRemote(FacilityFacade.class);
 	}
 
+	public static CountryFacade getCountryFacade() {
+		return get().lookupEjbRemote(CountryFacade.class);
+	}
 	public static RegionFacade getRegionFacade() {
 		return get().lookupEjbRemote(RegionFacade.class);
 	}

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

@@ -21,6 +21,7 @@ public class CampaignDto extends EntityDto {
 	public static final String START_DATE = "startDate";
 	public static final String END_DATE = "endDate";
 	public static final String CREATING_USER = "creatingUser";
+	public static final String CAMPAIGN_FORM_METAS = "campaignFormMetas";
 
 	private String name;
 	private String description;

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

@@ -1,18 +1,19 @@
 package de.symeda.sormas.api.campaign.diagram;
 
 import java.io.Serializable;
-import java.util.Objects;
 
 public class CampaignDashboardElement implements Serializable {
 
 	public static String DIAGRAM_ID = "diagramId";
 	public static String TAB_ID = "tabId";
+	public static String SUB_TAB_ID = "subTabId";
 	public static String ORDER = "order";
 	public static String WIDTH = "width";
 	public static String HEIGHT = "height";
 
 	private String diagramId;
 	private String tabId;
+	private String subTabId;
 	private Integer order;
 	private Integer width;
 	private Integer height;
@@ -28,6 +29,11 @@ public CampaignDashboardElement(String diagramId, String tabId, Integer order, I
 		this.height = height;
 	}
 
+	public CampaignDashboardElement(String diagramId, String tabId, String subTabId, Integer order, Integer width, Integer height) {
+		this(diagramId, tabId, order, width, height);
+		this.subTabId = subTabId;
+	}
+
 	public String getDiagramId() {
 		return diagramId;
 	}
@@ -44,6 +50,14 @@ public void setTabId(String tabId) {
 		this.tabId = tabId;
 	}
 
+	public String getSubTabId() {
+		return subTabId;
+	}
+
+	public void setSubTabId(String subTabId) {
+		this.subTabId = subTabId;
+	}
+
 	public Integer getOrder() {
 		return order;
 	}

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

@@ -1,6 +1,8 @@
 package de.symeda.sormas.api.campaign.diagram;
 
 import de.symeda.sormas.api.EntityDto;
+import de.symeda.sormas.api.campaign.CampaignDto;
+import de.symeda.sormas.api.utils.DataHelper;
 
 import java.util.List;
 
@@ -13,6 +15,12 @@ public class CampaignDiagramDefinitionDto extends EntityDto {
 	private List<CampaignDiagramSeries> campaignSeriesTotal;
 	private boolean percentageDefault;
 
+	public static CampaignDiagramDefinitionDto build() {
+		CampaignDiagramDefinitionDto campaignDiagramDefinition = new CampaignDiagramDefinitionDto();
+		campaignDiagramDefinition.setUuid(DataHelper.createUuid());
+		return campaignDiagramDefinition;
+	}
+
 	public String getDiagramId() {
 		return diagramId;
 	}

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

@@ -151,7 +151,7 @@ Map<PresentCondition, Long> getCaseCountPerPersonCondition(
 
 	List<CaseReferenceDto> getRandomCaseReferences(CaseCriteria criteria, int count);
 
-	Boolean isCaseEditAllowed(String caseUuid);
+	boolean isCaseEditAllowed(String caseUuid);
 
 	boolean exists(String uuid);
 

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

@@ -25,6 +25,7 @@
 import de.symeda.sormas.api.EntityRelevanceStatus;
 import de.symeda.sormas.api.action.ActionStatus;
 import de.symeda.sormas.api.caze.CaseReferenceDto;
+import de.symeda.sormas.api.person.PersonReferenceDto;
 import de.symeda.sormas.api.region.CommunityReferenceDto;
 import de.symeda.sormas.api.region.DistrictReferenceDto;
 import de.symeda.sormas.api.region.RegionReferenceDto;
@@ -65,6 +66,7 @@ public class EventCriteria extends BaseCriteria implements Serializable {
 	private CaseReferenceDto caze;
 	private Boolean userFilterIncluded = true;
 	private TypeOfPlace typeOfPlace;
+	private PersonReferenceDto person;
 
 	// Actions criterias
 	private ActionStatus actionStatus;
@@ -376,4 +378,18 @@ public enum DateType {
 		EVENT,
 		ACTION,
 	}
+
+	public PersonReferenceDto getPerson() {
+		return person;
+	}
+
+	public void setPerson(PersonReferenceDto person) {
+		this.person = person;
+	}
+
+	public EventCriteria person(PersonReferenceDto person) {
+		this.person = person;
+		return this;
+	}
+
 }

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

@@ -3,6 +3,7 @@
 import java.io.Serializable;
 
 import de.symeda.sormas.api.BaseCriteria;
+import de.symeda.sormas.api.person.PersonReferenceDto;
 import de.symeda.sormas.api.utils.IgnoreForUrl;
 
 public class EventParticipantCriteria extends BaseCriteria implements Serializable {
@@ -15,6 +16,7 @@ public class EventParticipantCriteria extends BaseCriteria implements Serializab
 	public static final String BIRTHDATE_DD = "birthdateDD";
 
 	private EventReferenceDto event;
+	private PersonReferenceDto person;
 	private String freeText;
 	private Integer birthdateYYYY;
 	private Integer birthdateMM;
@@ -30,6 +32,16 @@ public EventParticipantCriteria event(EventReferenceDto event) {
 		return this;
 	}
 
+	@IgnoreForUrl
+	public PersonReferenceDto getPerson() {
+		return person;
+	}
+
+	public EventParticipantCriteria person(PersonReferenceDto person) {
+		this.person = person;
+		return this;
+	}
+
 	public EventParticipantCriteria freeText(String freeText) {
 		this.freeText = freeText;
 		return this;

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

@@ -69,6 +69,14 @@ public static EventParticipantDto buildFromCase(
 		return eventParticipantDto;
 	}
 
+	public static EventParticipantDto buildFromPerson(PersonDto person, EventReferenceDto event, UserReferenceDto reportingUser) {
+		EventParticipantDto eventParticipantDto = build(event, reportingUser);
+
+		eventParticipantDto.setPerson(person);
+
+		return eventParticipantDto;
+	}
+
 	public UserReferenceDto getReportingUser() {
 		return reportingUser;
 	}

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

@@ -50,6 +50,8 @@ List<EventParticipantIndexDto> getIndexList(
 		Integer max,
 		List<SortProperty> sortProperties);
 
+	EventParticipantDto getByUuid(String uuid);
+
 	void validate(EventParticipantDto eventParticipant);
 
 	long count(EventParticipantCriteria eventParticipantCriteria);
@@ -58,10 +60,14 @@ List<EventParticipantIndexDto> getIndexList(
 
 	EventParticipantReferenceDto getReferenceByUuid(String uuid);
 
+	EventParticipantReferenceDto getReferenceByEventAndPerson(String eventUuid, String personUuid);
+
 	List<String> getDeletedUuidsSince(Date date);
 
 	boolean isEventParticipantEditAllowed(String uuid);
 
+	EventParticipantDto getFirst(EventParticipantCriteria eventParticipantCriteria);
+
 	List<EventParticipantExportDto> getExportList(EventParticipantCriteria eventParticipantCriteria, int first, int max, Language userLanguage);
 
 }

sormas-api/src/main/java/de/symeda/sormas/api/externaljournal/ExternalJournalFacade.java

@@ -11,9 +11,9 @@ public interface ExternalJournalFacade {
 
 	String getPatientDiaryAuthToken();
 
-	ExternalPatientDto getPatientDiaryPerson(String personUuid);
+	PatientDiaryPersonDto getPatientDiaryPerson(String personUuid);
 
-	RegisterResult registerPatientDiaryPerson(PersonDto person);
+	PatientDiaryRegisterResult registerPatientDiaryPerson(PersonDto person);
 
-	ExternalPersonValidation validatePatientDiaryPerson(PersonDto person);
+	PatientDiaryPersonValidation validatePatientDiaryPerson(PersonDto person);
 }