Merge branch 'development' into feature-2183-vaadin-productionmode

Author: DavidBaldsiefen

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

@@ -19,6 +19,8 @@
 
 import javax.ejb.Remote;
 
+import de.symeda.sormas.api.externaljournal.PatientDiaryConfig;
+import de.symeda.sormas.api.externaljournal.SymptomJournalConfig;
 import de.symeda.sormas.api.region.GeoLatLon;
 
 @Remote
@@ -90,15 +92,9 @@ public interface ConfigFacade {
 
 	String getGeocodingOsgtsEndpoint();
 
-	String getSymptomJournalUrl();
+	SymptomJournalConfig getSymptomJournalConfig();
 
-	String getSymptomJournalAuthUrl();
-
-	String getSymptomJournalClientId();
-
-	String getSymptomJournalSecret();
-
-	String getPatientDiaryUrl();
+	PatientDiaryConfig getPatientDiaryConfig();
 
 	String getSormasToSormasUserPassword();
 
@@ -109,4 +105,6 @@ public interface ConfigFacade {
 	String getSurvnetGatewayUrl();
 
 	String getAuthenticationProvider();
+
+	public boolean isExternalJournalActive();
 }

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

@@ -0,0 +1,118 @@
+package de.symeda.sormas.api;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import de.symeda.sormas.api.utils.DataHelper;
+
+public class EntityDtoAccessHelper {
+
+	public static Object getPropertyValue(HasUuid entity, String propertyKey) throws InvocationTargetException, IllegalAccessException {
+		if (entity == null) {
+			return null;
+		}
+		Class<? extends HasUuid> entityClass = entity.getClass();
+		while (entityClass != null) {
+			Method[] declaredMethods = entityClass.getDeclaredMethods();
+			for (Method method : declaredMethods) {
+				String methodName = method.getName();
+				if (methodName.startsWith("get") || methodName.startsWith("is")) {
+					String propertyName = methodName.replaceAll("(^(is|get))|((Reference)?Dto$)", "").toUpperCase();
+					if (propertyName.equals(propertyKey.toUpperCase())) {
+						return method.invoke(entity);
+					}
+				}
+			}
+			Class<?> superclass = entityClass.getSuperclass();
+			entityClass = HasUuid.class.isAssignableFrom(superclass) ? (Class<? extends HasUuid>) superclass : null;
+		}
+		throw new IllegalArgumentException("No property " + propertyKey + " in class " + entity.getClass().getSimpleName());
+	}
+
+	public static Object getPropertyPathValue(HasUuid entity, String propertyPath) {
+		return getPropertyPathValue(entity, propertyPath, null);
+	}
+
+	public static Object getPropertyPathValue(HasUuid entity, String propertyPath, IReferenceDtoResolver referenceDtoResolver) {
+		String[] propertyKeys = propertyPath.split("[.]");
+		Object currentEntity = entity;
+		for (int i = 0; i < propertyKeys.length; i++) {
+			if (currentEntity == null) {
+				return null;
+			}
+			boolean isResolvable = referenceDtoResolver != null && ReferenceDto.class.isAssignableFrom(currentEntity.getClass());
+
+			if (!HasUuid.class.isAssignableFrom(currentEntity.getClass())) {
+				String errorPropertyPath = entity.getClass().getSimpleName() + "." + String.join(".", Arrays.copyOfRange(propertyKeys, 0, i));
+				throw new IllegalArgumentException(errorPropertyPath + " is not an EntityDto or ReferenceDto");
+			}
+			Object propertyValue = null;
+			try {
+				propertyValue = getPropertyValue((HasUuid) currentEntity, propertyKeys[i]);
+			} catch (InvocationTargetException | IllegalAccessException e) {
+				throw new IllegalArgumentException(e);
+			} catch (IllegalArgumentException e) {
+				if (!isResolvable) {
+					throw e;
+				}
+			}
+			if (propertyValue != null) {
+				currentEntity = propertyValue;
+			} else {
+				if (isResolvable) {
+					try {
+						currentEntity = getPropertyValue(referenceDtoResolver.resolve((ReferenceDto) currentEntity), propertyKeys[i]);
+					} catch (InvocationTargetException | IllegalAccessException e) {
+						throw new IllegalArgumentException(e);
+					}
+				} else {
+					currentEntity = null;
+				}
+			}
+		}
+		return currentEntity;
+	}
+
+	public static String getPropertyPathValueString(HasUuid entity, String propertyPath, IReferenceDtoResolver referenceDtoResolver) {
+		return DataHelper.valueToString(getPropertyPathValue(entity, propertyPath, referenceDtoResolver));
+	}
+
+	public interface IReferenceDtoResolver {
+
+		EntityDto resolve(ReferenceDto referenceDto);
+	}
+
+	public static class CachedReferenceDtoResolver implements IReferenceDtoResolver {
+
+		private Map<String, EntityDto> referenceCache = new HashMap<>();
+		private IReferenceDtoResolver referenceDtoResolver;
+
+		public CachedReferenceDtoResolver(IReferenceDtoResolver referenceDtoResolver) {
+			this.referenceDtoResolver = referenceDtoResolver;
+		}
+
+		public EntityDto resolve(ReferenceDto referenceDto) {
+			if (referenceDto != null) {
+				EntityDto entityDto = referenceCache.get(referenceDto.getUuid());
+				if (entityDto != null) {
+					return entityDto;
+				}
+			}
+			if (referenceDtoResolver != null) {
+				EntityDto resolvedEntity = referenceDtoResolver.resolve(referenceDto);
+				addReference(referenceDto, resolvedEntity);
+				return resolvedEntity;
+			}
+			return null;
+		}
+
+		public void addReference(ReferenceDto referenceDto, EntityDto entityDto) {
+			if (referenceDto != null && entityDto != null) {
+				referenceCache.put(referenceDto.getUuid(), entityDto);
+			}
+		}
+	}
+}

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

@@ -36,9 +36,11 @@
 import de.symeda.sormas.api.contact.ContactFacade;
 import de.symeda.sormas.api.disease.DiseaseConfigurationFacade;
 import de.symeda.sormas.api.disease.DiseaseFacade;
+import de.symeda.sormas.api.docgeneneration.QuarantineOrderFacade;
 import de.symeda.sormas.api.epidata.EpiDataFacade;
 import de.symeda.sormas.api.event.EventFacade;
 import de.symeda.sormas.api.event.EventParticipantFacade;
+import de.symeda.sormas.api.externaljournal.ExternalJournalFacade;
 import de.symeda.sormas.api.facility.FacilityFacade;
 import de.symeda.sormas.api.feature.FeatureConfigurationFacade;
 import de.symeda.sormas.api.geocoding.GeocodingFacade;
@@ -304,7 +306,15 @@ public static AreaFacade getAreaFacade() {
 		return get().lookupEjbRemote(AreaFacade.class);
 	}
 
-	@SuppressWarnings("unchecked")
+	public static QuarantineOrderFacade getQuarantineOrderFacade() {
+		return get().lookupEjbRemote(QuarantineOrderFacade.class);
+	}
+
+  public static ExternalJournalFacade getExternalJournalFacade() {
+		return get().lookupEjbRemote(ExternalJournalFacade.class);
+  }
+
+  @SuppressWarnings("unchecked")
 	public <P> P lookupEjbRemote(Class<P> clazz) {
 		try {
 			return (P) get().ic.lookup(buildJndiLookupName(clazz));

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

@@ -0,0 +1,16 @@
+package de.symeda.sormas.api;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+public enum VisitOrigin {
+    USER,
+    EXTERNAL_JOURNAL;
+
+    public String getName() {
+        return this.name();
+    }
+
+    public String toString() {
+        return I18nProperties.getEnumCaption(this);
+    }
+}

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

@@ -1,9 +1,11 @@
 package de.symeda.sormas.api.campaign;
 
+import java.util.Date;
 import java.util.List;
 
 import javax.ejb.Remote;
 
+import de.symeda.sormas.api.campaign.data.CampaignFormDataDto;
 import de.symeda.sormas.api.campaign.diagram.CampaignDashboardElement;
 import de.symeda.sormas.api.utils.SortProperty;
 
@@ -33,4 +35,10 @@ public interface CampaignFacade {
 	CampaignReferenceDto getReferenceByUuid(String uuid);
 
 	boolean exists(String uuid);
+
+	List<CampaignDto> getAllAfter(Date campaignChangeDate);
+
+	List<CampaignDto> getByUuids(List<String> uuids);
+
+	List<String> getAllActiveUuids();
 }

sormas-api/src/main/java/de/symeda/sormas/api/campaign/data/CampaignFormDataFacade.java

@@ -26,6 +26,8 @@
 import de.symeda.sormas.api.utils.SortProperty;
 
 import javax.ejb.Remote;
+
+import java.util.Date;
 import java.util.List;
 
 @Remote
@@ -50,4 +52,8 @@ public interface CampaignFormDataFacade {
 	long count(CampaignFormDataCriteria criteria);
 
 	List<CampaignDiagramDataDto> getDiagramData(List<CampaignDiagramSeries> diagramSeries, CampaignDiagramCriteria campaignDiagramCriteria);
+
+	List<String> getAllActiveUuids();
+
+	List<CampaignFormDataDto> getAllActiveAfter(Date date);
 }

sormas-api/src/main/java/de/symeda/sormas/api/campaign/form/CampaignFormMetaFacade.java

@@ -2,8 +2,11 @@
 
 import javax.ejb.Remote;
 import java.io.IOException;
+import java.util.Date;
 import java.util.List;
 
+import de.symeda.sormas.api.campaign.data.CampaignFormDataDto;
+
 @Remote
 public interface CampaignFormMetaFacade {
 
@@ -25,4 +28,9 @@ CampaignFormMetaDto buildCampaignFormMetaFromJson(String formId, String language
 
 	CampaignFormMetaDto getCampaignFormMetaByUuid(String campaignFormUuid);
 
+    List<CampaignFormMetaDto> getAllAfter(Date campaignFormMetaChangeDate);
+
+	List<String> getAllUuids();
+
+	List<CampaignFormMetaDto> getByUuids(List<String> uuids);
 }

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

@@ -31,13 +31,13 @@ public class CaseFollowUpDto extends FollowUpDto {
 	private final CaseJurisdictionDto jurisdiction;
 
 	//@formatter:off
-	public CaseFollowUpDto(String uuid, String personUuid, String personFirstName, String personLastName,
+	public CaseFollowUpDto(String uuid, String personFirstName, String personLastName,
 							  Date reportDate, Date symptomsOnsetDate, Date followUpUntil, Disease disease,
 							  String caseReportingUserUuid, String caseRegionUuid, String caseDistrictUuid,
 							  String caseCommunityUud, String caseHealthFacilityUuid, String casePointOfEntryUuid
 	) {
 	//formatter:on
-		super(uuid, personUuid, personFirstName, personLastName, reportDate, followUpUntil, disease);
+		super(uuid, personFirstName, personLastName, reportDate, followUpUntil, disease);
 		this.symptomsOnsetDate = symptomsOnsetDate;
 		this.jurisdiction = new CaseJurisdictionDto(
 				caseReportingUserUuid,

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

@@ -26,6 +26,7 @@
 import de.symeda.sormas.api.caze.CaseClassification;
 import de.symeda.sormas.api.caze.CaseReferenceDto;
 import de.symeda.sormas.api.person.PersonReferenceDto;
+import de.symeda.sormas.api.person.SymptomJournalStatus;
 import de.symeda.sormas.api.region.CommunityReferenceDto;
 import de.symeda.sormas.api.region.DistrictReferenceDto;
 import de.symeda.sormas.api.region.RegionReferenceDto;
@@ -44,6 +45,7 @@ public class ContactCriteria extends BaseCriteria implements Serializable {
 	public static final String CONTACT_OFFICER = "contactOfficer";
 	public static final String REPORTING_USER_ROLE = "reportingUserRole";
 	public static final String FOLLOW_UP_UNTIL_TO = "followUpUntilTo";
+	public static final String SYMPTOM_JOURNAL_STATUS = "symptomJournalStatus";
 	public static final String QUARANTINE_TYPE = "quarantineType";
 	public static final String QUARANTINE_ORDERED_VERBALLY = "quarantineOrderedVerbally";
 	public static final String QUARANTINE_ORDERED_OFFICIAL_DOCUMENT = "quarantineOrderedOfficialDocument";
@@ -56,6 +58,8 @@ public class ContactCriteria extends BaseCriteria implements Serializable {
 	public static final String BIRTHDATE_MM = "birthdateMM";
 	public static final String BIRTHDATE_DD = "birthdateDD";
 	public static final String RETURNING_TRAVELER = "returningTraveler";
+	public static final String EVENT_LIKE = "eventLike";
+	public static final String ONLY_CONTACTS_WITH_SOURCE_CASE_IN_EVENT = "onlyContactsWithSourceCaseInEvent";
 
 	private static final long serialVersionUID = 5114202107622217837L;
 
@@ -79,6 +83,7 @@ public class ContactCriteria extends BaseCriteria implements Serializable {
 	 * If yes, the followUpUntilTo filter will search for strict matches instead of a period,
 	 * even if a followUpUntilFrom is specified
 	 */
+	private SymptomJournalStatus symptomJournalStatus;
 	private Boolean followUpUntilToPrecise;
 	private Date lastContactDateFrom;
 	private Date lastContactDateTo;
@@ -102,6 +107,9 @@ public class ContactCriteria extends BaseCriteria implements Serializable {
 	private Integer birthdateMM;
 	private Integer birthdateDD;
 	private YesNoUnknown returningTraveler;
+	private String eventLike;
+	private String eventUuid;
+	private Boolean onlyContactsWithSourceCaseInEvent;
 
 	public UserRole getReportingUserRole() {
 		return reportingUserRole;
@@ -287,6 +295,14 @@ public Date getFollowUpUntilTo() {
 		return followUpUntilTo;
 	}
 
+	public SymptomJournalStatus getSymptomJournalStatus() {
+		return symptomJournalStatus;
+	}
+
+	public void setSymptomJournalStatus(SymptomJournalStatus symptomJournalStatus) {
+		this.symptomJournalStatus = symptomJournalStatus;
+	}
+
 	public Boolean getFollowUpUntilToPrecise() {
 		return followUpUntilToPrecise;
 	}
@@ -428,7 +444,7 @@ public PersonReferenceDto getPerson() {
 		return person;
 	}
 
-	public ContactCriteria person(PersonReferenceDto person) {
+	public ContactCriteria setPerson(PersonReferenceDto person) {
 		this.person = person;
 		return this;
 	}
@@ -464,4 +480,45 @@ public YesNoUnknown getReturningTraveler() {
 	public void setReturningTraveler(YesNoUnknown returningTraveler) {
 		this.returningTraveler = returningTraveler;
 	}
+
+	public void setEventLike(String eventLike) {
+		this.eventLike = eventLike;
+	}
+
+	@IgnoreForUrl
+	public String getEventLike() {
+		return eventLike;
+	}
+
+	public ContactCriteria eventLike(String eventLike) {
+		setEventLike(eventLike);
+		return this;
+	}
+
+	public void setEventUuid(String eventUuid) {
+		this.eventUuid = eventUuid;
+	}
+
+	public String getEventUuid() {
+		return eventUuid;
+	}
+
+	public ContactCriteria eventUuid(String eventUuid) {
+		setEventUuid(eventUuid);
+		return this;
+	}
+
+	public void setOnlyContactsWithSourceCaseInEvent(Boolean onlyContactsWithSourceCaseInEvent) {
+		this.onlyContactsWithSourceCaseInEvent = onlyContactsWithSourceCaseInEvent;
+	}
+
+	@IgnoreForUrl
+	public Boolean getOnlyContactsWithSourceCaseInEvent() {
+		return onlyContactsWithSourceCaseInEvent;
+	}
+
+	public ContactCriteria onlyContactsWithSourceCaseInEvent(Boolean onlyContactsWithSourceCaseInEvent) {
+		this.onlyContactsWithSourceCaseInEvent = onlyContactsWithSourceCaseInEvent;
+		return this;
+	}
 }