[GITFLOW]merging 'release-1.51.0' into 'master'

Author: jenkins

SERVER_CUSTOMIZATION.md

@@ -1,7 +1,7 @@
 
 
 # Installing a SORMAS Server for development
-**Note: This guide explains how to configure a SORMAS server on Linux and Windows systems for development. Please note that there is no database setup because the script supposes the use of the Docker Postgresql image (see [SORMAS-Docker][https://github.com/hzi-braunschweig/SORMAS-Docker]).**
+**Note: This guide explains how to configure a SORMAS server on Linux and Windows systems for development. Please note that there is no database setup because the script supposes the use of the Docker Postgresql image (see [SORMAS-Docker](https://github.com/hzi-braunschweig/SORMAS-Docker)).**
 
 ## Content
 * [Prerequisites](#prerequisites)
@@ -50,6 +50,10 @@ See [Keycloak](SERVER_SETUP.md#keycloak-server) for how to install Docker locall
 
 If you are doing active development on Keycloak (themes, authentication mechanisms, translations, etc.) it's recommended to install the standalone variant.
 
+## VAADIN Debug Mode
+
+To enable [VAADIN Debug Mode](https://vaadin.com/docs/v8/framework/advanced/advanced-debug.html), go to ``sormas-ui/src/main/webapp/WEB-INF/web.xml`` and set ``productionMode`` to ``false``.
+Make sure not to commit your changes to these files, for example by using .gitignore. To access the debug Window, got to <url>/sormas-ui/?debug. You may need to log in as admin once first.
 
 ## Other components
 

SERVER_DEV_SETUP.md

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

sormas-api/pom.xml

@@ -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
@@ -88,17 +90,15 @@ public interface ConfigFacade {
 
 	int getMapZoom();
 
-	String getGeocodingOsgtsEndpoint();
+	String getGeocodingServiceUrlTemplate();
 
-	String getSymptomJournalUrl();
+	String getGeocodingLongitudeJsonPath();
 
-	String getSymptomJournalAuthUrl();
+	String getGeocodingLatitudeJsonPath();
 
-	String getSymptomJournalClientId();
+	SymptomJournalConfig getSymptomJournalConfig();
 
-	String getSymptomJournalSecret();
-
-	String getPatientDiaryUrl();
+	PatientDiaryConfig getPatientDiaryConfig();
 
 	String getSormasToSormasUserPassword();
 
@@ -109,4 +109,8 @@ public interface ConfigFacade {
 	String getSurvnetGatewayUrl();
 
 	String getAuthenticationProvider();
+
+	boolean isExternalJournalActive();
+
+	int getDashboardMapMarkerLimit();
 }

sormas-api/src/main/java/de/symeda/sormas/api/ConfigFacade.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/EntityDtoAccessHelper.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/FacadeProvider.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/VisitOrigin.java

@@ -1,5 +1,6 @@
 package de.symeda.sormas.api.campaign;
 
+import java.util.Date;
 import java.util.List;
 
 import javax.ejb.Remote;
@@ -12,7 +13,7 @@ public interface CampaignFacade {
 
 	List<CampaignIndexDto> getIndexList(CampaignCriteria campaignCriteria, Integer first, Integer max, List<SortProperty> sortProperties);
 
-	List<CampaignReferenceDto> getAllCampaignsAsReference();
+	List<CampaignReferenceDto> getAllActiveCampaignsAsReference();
 
 	CampaignReferenceDto getLastStartedCampaign();
 
@@ -33,4 +34,12 @@ 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();
+
+	void validate(CampaignReferenceDto campaignReferenceDto);
 }

sormas-api/src/main/java/de/symeda/sormas/api/campaign/CampaignFacade.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);
 }