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

Author: jenkins

CONTRIBUTING.md

@@ -107,3 +107,5 @@ There are a couple of things you can do to fix these problems:
 * Re-deploy the server artifacts
 
 If the problem occurred right after you've pulled new code from GitHub, your safest bet is probably to start with the Maven update. For most other problems, a simple re-deployment or, if necessary, server restart should suffice.
+
+When you have problems like this - `An internal error occurred during: "Polling news feeds".  javax/xml/bind/JAXBContext` - then disable setting `Window --> Preferences --> General --> News --> "Enable automatic news polling"` (may happen when running Eclipse with JDK 11).

SERVER_SETUP.md

@@ -5,7 +5,7 @@
 
 ## Content
 * [Prerequisites](#prerequisites)
-  * [Java 8](#java-8)
+  * [Java 11](#java-11)
   * [Postgres Database](#postgres-database)
 * [SORMAS Server](#sormas-server)
 * [Web Server Setup](#web-server-setup)
@@ -21,24 +21,22 @@
 
 ## Prerequisites
 
-### Java 8
+### Java 11
 
-**Please note:** Because of a bug in the current Payara version, deployment will fail with a Java version above 8u202!
-
-* Download and install the Java 8u202 **JDK** (not JRE) for your operating system. We suggest to use Zulu OpenJDK: https://www.azul.com/downloads/zulu/
+* Download and install the Java 11 **JDK** (not JRE) for your operating system. We suggest to use Zulu OpenJDK: https://www.azul.com/downloads/zulu/
   * **Linux**: https://docs.azul.com/zulu/zuludocs/#ZuluUserGuide/PrepareZuluPlatform/AttachAPTRepositoryUbuntuOrDebianSys.htm
 
 		sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9
 		sudo apt-add-repository 'deb http://repos.azulsystems.com/ubuntu stable main'
 		sudo apt-get update
-		sudo apt-get install zulu-8
-  * **Windows**: For testing and development environments we suggest to download and run the installer of the Java 8 **JDK** for 32 or 64 bit client systems (depending on your system).
+		sudo apt-get install zulu-11
+  * **Windows**: For testing and development environments we suggest to download and run the installer of the Java 11 **JDK** for 32 or 64 bit client systems (depending on your system).
 * You can check your Java version from the shell/command line using: ``java -version``
 
 ### Postgres Database
 
 * Install PostgreSQL (currently 9.5, 9.6 or 10) on your system (manuals for all OS can be found here: https://www.postgresql.org/download)
-* set **max_prepared_transactions = 64** (at least) in postgresql.conf (e.g. ``/etc/postgresql/10.0/main/postgresql.conf``; ``C:/Program Files/PostgreSQL/10.0/data``) - make sure the property is uncommented
+* Set **max_connections = 288** and **max_prepared_transactions = 256** (at least, sum of all connection pools) in ``postgresql.conf`` (e.g. ``/etc/postgresql/10.0/main/postgresql.conf``; ``C:/Program Files/PostgreSQL/10.0/data``) - make sure the property is uncommented
 * Install the "temporal tables" extension for Postgres (https://github.com/arkhipov/temporal_tables)
     * **Windows**: Download the latest version for your Postgres version: https://github.com/arkhipov/temporal_tables/releases/latest, then copy the DLL from the project into the PostgreSQL's lib directory and the .sql and .control files into the directory share\extension.	
     * **Linux** (see https://github.com/arkhipov/temporal_tables#installation):

sormas-api/pom.xml

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

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

@@ -84,7 +84,13 @@ public interface ConfigFacade {
 
 	String getGeocodingOsgtsEndpoint();
 
-	String getPIAUrl();
+	String getSymptomJournalUrl();
+
+	String getSymptomJournalAuthUrl();
+
+	String getSymptomJournalClientId();
+
+	String getSymptomJournalSecret();
 
 	void validateExternalUrls();
 }

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

@@ -0,0 +1,108 @@
+/*
+ * 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.campaign.data;
+
+import de.symeda.sormas.api.BaseCriteria;
+import de.symeda.sormas.api.campaign.CampaignReferenceDto;
+import de.symeda.sormas.api.campaign.form.CampaignFormReferenceDto;
+import de.symeda.sormas.api.region.CommunityReferenceDto;
+import de.symeda.sormas.api.region.DistrictReferenceDto;
+import de.symeda.sormas.api.region.RegionReferenceDto;
+
+import java.io.Serializable;
+
+public class CampaignFormDataCriteria extends BaseCriteria implements Serializable {
+
+	public static final String CAMPAIGN = "campaign";
+	public static final String CAMPAIGN_FORM = "campaignForm";
+	public static final String REGION = "region";
+	public static final String DISTRICT = "district";
+	public static final String COMMUNITY = "community";
+
+	private static final long serialVersionUID = 8124072093160133408L;
+
+	private CampaignReferenceDto campaign;
+	private CampaignFormReferenceDto campaignForm;
+	private RegionReferenceDto region;
+	private DistrictReferenceDto district;
+	private CommunityReferenceDto community;
+
+	public CampaignReferenceDto getCampaign() {
+		return campaign;
+	}
+
+	public void setCampaign(CampaignReferenceDto campaign) {
+		this.campaign = campaign;
+	}
+
+	public CampaignFormDataCriteria campaign(CampaignReferenceDto campaign) {
+		this.campaign = campaign;
+		return this;
+	}
+
+	public CampaignFormReferenceDto getCampaignForm() {
+		return campaignForm;
+	}
+
+	public void setCampaignForm(CampaignFormReferenceDto campaignForm) {
+		this.campaignForm = campaignForm;
+	}
+
+	public CampaignFormDataCriteria campaignForm(CampaignFormReferenceDto campaignForm) {
+		this.campaignForm = campaignForm;
+		return this;
+	}
+
+	public RegionReferenceDto getRegion() {
+		return region;
+	}
+
+	public void setRegion(RegionReferenceDto region) {
+		this.region = region;
+	}
+
+	public CampaignFormDataCriteria region(RegionReferenceDto region) {
+		this.region = region;
+		return this;
+	}
+
+	public DistrictReferenceDto getDistrict() {
+		return district;
+	}
+
+	public void setDistrict(DistrictReferenceDto district) {
+		this.district = district;
+	}
+
+	public CampaignFormDataCriteria district(DistrictReferenceDto district) {
+		this.district = district;
+		return this;
+	}
+
+	public CommunityReferenceDto getCommunity() {
+		return community;
+	}
+
+	public void setCommunity(CommunityReferenceDto community) {
+		this.community = community;
+	}
+
+	public CampaignFormDataCriteria community(CommunityReferenceDto community) {
+		this.community = community;
+		return this;
+	}
+
+}

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

@@ -28,22 +28,26 @@
 import de.symeda.sormas.api.region.RegionReferenceDto;
 import de.symeda.sormas.api.utils.DataHelper;
 
+import java.util.Date;
 import java.util.List;
 
 public class CampaignFormDataDto extends EntityDto {
 
 	private static final long serialVersionUID = -8087195060395038093L;
 
-	public static final String I18N_PREFIX = "campaignformdata";
+	public static final String I18N_PREFIX = "CampaignFormData";
 
 	public static final String CAMPAIGN = "campaign";
+	public static final String CAMPAIGN_FORM = "campaignForm";
+	public static final String FORM_DATE = "formDate";
 	public static final String REGION = "region";
 	public static final String DISTRICT = "district";
 	public static final String COMMUNITY = "community";
 
 	private List<CampaignFormValue> formValues;
 	private CampaignReferenceDto campaign;
 	private CampaignFormReferenceDto campaignForm;
+	private Date formDate;
 	private RegionReferenceDto region;
 	private DistrictReferenceDto district;
 	private CommunityReferenceDto community;
@@ -61,6 +65,7 @@ public static CampaignFormDataDto build(
 		campaignFormData.setRegion(region);
 		campaignFormData.setDistrict(district);
 		campaignFormData.setCommunity(community);
+		campaignFormData.setFormDate(new Date());
 		return campaignFormData;
 	}
 
@@ -88,6 +93,14 @@ public void setCampaign(CampaignReferenceDto campaign) {
 		this.campaign = campaign;
 	}
 
+	public Date getFormDate() {
+		return formDate;
+	}
+
+	public void setFormDate(Date formDate) {
+		this.formDate = formDate;
+	}
+
 	public RegionReferenceDto getRegion() {
 		return region;
 	}

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

@@ -20,6 +20,8 @@
 
 package de.symeda.sormas.api.campaign.data;
 
+import de.symeda.sormas.api.utils.SortProperty;
+
 import javax.ejb.Remote;
 import java.util.List;
 
@@ -39,4 +41,8 @@ public interface CampaignFormDataFacade {
 	boolean exists(String uuid);
 
 	CampaignFormDataReferenceDto getReferenceByUuid(String uuid);
+
+	List<CampaignFormDataIndexDto> getIndexList(CampaignFormDataCriteria criteria, Integer first, Integer max, List<SortProperty> sortProperties);
+
+	long count(CampaignFormDataCriteria criteria);
 }

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

@@ -0,0 +1,97 @@
+/*
+ * 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.campaign.data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class CampaignFormDataIndexDto implements Serializable, Cloneable {
+
+	public static final String I18N_PREFIX = "CampaignFormData";
+
+	public static final String UUID = "uuid";
+	public static final String CAMPAIGN = "campaign";
+	public static final String REGION = "region";
+	public static final String DISTRICT = "district";
+	public static final String COMMUNITY = "community";
+	public static final String FORM_DATE = "formDate";
+
+	private static final long serialVersionUID = -6672198324526771162L;
+
+	private String uuid;
+	private String campaign;
+	private String region;
+	private String district;
+	private String community;
+	private Date formDate;
+
+	public CampaignFormDataIndexDto(String uuid, String campaign, String region, String district, String community, Date formDate) {
+		this.uuid = uuid;
+		this.campaign = campaign;
+		this.region = region;
+		this.district = district;
+		this.community = community;
+		this.formDate = formDate;
+	}
+
+	public String getUuid() {
+		return uuid;
+	}
+
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+
+	public String getCampaign() {
+		return campaign;
+	}
+
+	public void setCampaign(String campaign) {
+		this.campaign = campaign;
+	}
+
+	public String getRegion() {
+		return region;
+	}
+
+	public void setRegion(String region) {
+		this.region = region;
+	}
+
+	public String getDistrict() {
+		return district;
+	}
+
+	public void setDistrict(String district) {
+		this.district = district;
+	}
+
+	public String getCommunity() {
+		return community;
+	}
+
+	public void setCommunity(String community) {
+		this.community = community;
+	}
+
+	public Date getFormDate() {
+		return formDate;
+	}
+
+	public void setFormDate(Date formDate) {
+		this.formDate = formDate;
+	}
+}

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

@@ -16,6 +16,7 @@
 package de.symeda.sormas.api.campaign.data;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 public class CampaignFormValue implements Serializable {
 
@@ -24,6 +25,15 @@ public class CampaignFormValue implements Serializable {
 	private String id;
 	private Object value;
 
+	public CampaignFormValue() {
+
+	}
+
+	public CampaignFormValue(String id, Object value) {
+		this.id = id;
+		this.value = value;
+	}
+
 	public String getId() {
 		return id;
 	}
@@ -39,4 +49,19 @@ public Object getValue() {
 	public void setValue(Object value) {
 		this.value = value;
 	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		CampaignFormValue that = (CampaignFormValue) o;
+		return Objects.equals(id, that.id);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(id);
+	}
 }

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

@@ -28,6 +28,8 @@ public enum CaseClassification
 	SUSPECT,
 	PROBABLE,
 	CONFIRMED,
+	CONFIRMED_NO_SYMPTOMS,
+	CONFIRMED_UNKNOWN_SYMPTOMS,
 	NO_CASE;
 
 	public String getName() {