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

Author: jenkins

.github/ISSUE_TEMPLATE/bug-report.md

@@ -24,5 +24,7 @@ If you've never submitted an issue to the SORMAS repository before or this is yo
 * Device:
 * SORMAS version:
 * Android version/Browser:
+* Server URL:
+* User Role:
 
 ### Additional Information

.gitignore

@@ -23,3 +23,6 @@ deploy
 /sormas-app/java_pid21052.hprof
 bin
 /sormas-base/setup/setup.log
+/sormas-cargoserver/.env
+/sormas-cargoserver/custom.env
+/sormas-cargoserver/custom.properties

.travis.yml

@@ -2,5 +2,8 @@ language: java
 jdk:
   - openjdk8 # FIXME remove after transition period (#2617)
   - openjdk11
-before_install: cd sormas-base
-install: mvn test -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+before_install:
+  - cd sormas-base
+install: skip
+script:
+  - mvn install -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn

DEVELOPMENT_ENVIRONMENT.md

@@ -2,7 +2,8 @@
 # SORMAS Development Environment
 
 ## Server
-- Install [your local server](SERVER_SETUP.md).
+- Install [your local server](SERVER_SETUP.md)
+- Or install your local development server using [maven cargo](sormas-cargoserver/README.md)
 - Alternatively [SERVER_DEV_SETUP.md](SERVER_DEV_SETUP.md) could be used (at this time not recommended)
 
 ## Git

GUIDE_SORMAS2SORMAS_CERTIFICATE.md

@@ -2,8 +2,10 @@
 
 This guide explains how to:
  * create a new self-signed certificate, used for SORMAS to SORMAS communication
+ * set up the server address list file
  * add certificates of other SORMAS instances to the local truststore
-
+ * add other servers to the local server list
+   
 ### Prerequisites
 
 Java is needed, because the keytool is used for certificate import. <br/>
@@ -31,18 +33,25 @@ the path to the ``sormas.properties`` file.
 5. After providing the requested data, the certificate files will be generated. <br/>
    The generated certificate has a validity of 3 years. 
    The certificate files will be available in the root SORMAS directory, in the folder ``/sormas2sormas``.
-6. The generated ``.p12`` file should not be shared with third parties. <br/>
+6. A CSV file containing the access data for this instance will also be generated in the folder ``/sormas2sormas``.
+   It will be named ``server-access-data.csv``.
+   The file will contain on the first two columns of the first row the Common Name and the Organization, as provided
+   when creating the certificate. <br/>
+   **Please fill in on the third column the full URL of the server.** <br/>
+   You will also have to set up a user for communicating with other SORMAS instances.
+7. The generated ``.p12`` file should not be shared with third parties. <br/>
    The generated ``.crt`` file will be verified and shared with other SORMAS instances, from which this instance
    will be able to request data. Conversely, in order to enable other SORMAS instances to request data from this 
-   instance, their certificate files should be obtained and added to the local truststore. More details can be found
-   in the next section.
-7. The relevant properties will be automatically set by the script in the ``sormas.properties`` file.
+   instance, their certificate files should be obtained and added to the local truststore. The ``server-access-data.csv``
+   file will also have to be shared so that the access data of this instance is known to other instances. 
+   More details can be found in the next section.
+8. The relevant properties will be automatically set by the script in the ``sormas.properties`` file.
 
 ### Adding a new certificate to the Truststore
 
-To enable other SORMAS instances to request data from this instance, their certificate must be added to the 
-truststore of this instance. After obtaining their certificate file, which should be a ``.crt`` file, please
-follow the next steps:
+To enable other SORMAS instances to send and receive data from this instance, their certificate must be added to the 
+truststore of this instance. Furthermore, the access data of other instances must be added to the local server
+list. To complete this setup, please follow the next steps:
 1. Run ``bash ./import-to-truststore.sh``
 2. If the ``sormas2sormas`` directory is not found, you will be prompted to provide its path.
 3. If the ``SORMAS_PROPERTIES`` environment variable is not available, the script will search for the ``sormas.properties`` 
@@ -54,7 +63,13 @@ follow the next steps:
     ``sormas.properties`` file.
     * If it is not found there, you will be prompted to provide the truststore password.
     * The relevant properties will be automatically set by the script in the ``sormas.properties`` file.
-5. You will be prompted to provide the file name of the certificate to be imported. This certificate should be located
+5. If the server address list file ``server-list.csv`` is not found in the folder ``/sormas2sormas``, it will also be created.
+6. You will be prompted to provide the file name of the certificate to be imported. This certificate should be located
 in the ``/sormas2sormas`` folder. Please provide the name including the extension. E.g ``mycert.crt``
-6. After providing the requested data, the certificate will be imported to the truststore.
-7. You may now delete the ``.crt`` file.
+7. After providing the requested data, the certificate will be imported to the truststore.
+8. You should have also received a CSV file with the server access data. From this file, copy the line corresponding to the
+    instance you would like to communicate with and add it to the local server address list file. This file is named
+    ``server-list.csv`` and is located in the ``/sormas2sormas`` folder. <br/>
+    *Note*: You may check that the Common Name and the Organization of the certificate match the ones corresponding to 
+    the server in the CSV file.
+9. You may now delete the ``.crt`` file.

README.md

@@ -25,6 +25,9 @@ Please [create a new issue](https://github.com/hzi-braunschweig/SORMAS-Project/i
 #### Which Browsers and Android Versions Are Supported?
 SORMAS officially supports and is tested on **Chromium-based browsers** (like Google Chrome) and **Mozilla Firefox**, and all Android versions starting from **Android 7.0** (Nougat). In principle, SORMAS should be usable with all web browsers that are supported by Vaadin 8 (Chrome, Firefox, Safari, Edge, Internet Explorer 11; see https://vaadin.com/faq).
 
+#### Is there a ReST API documentation?
+Yes! Please download the [latest release](https://github.com/hzi-braunschweig/SORMAS-Project/releases/latest) and copy the content of /deploy/openapi/sormas-rest.yaml to an editor that generates a visual API documentation (e.g. https://editor.swagger.io/).
+
 <p align="center"><img src="https://user-images.githubusercontent.com/23701005/74659600-ebb8fc00-5194-11ea-836b-a7ca9d682301.png"/></p>
 
 ## Project Structure
@@ -37,6 +40,8 @@ The project consists of the following modules:
 - **sormas-ear:** The ear needed to build the application
 - **sormas-rest:** The REST interface; see [`sormas-rest/README.md`](sormas-rest/README.md)
 - **sormas-ui:** The web application
+- **sormas-base/dependencies:** dependencies to be deployed with the payara server
+- **sormas-cargoserver:** setup for a local dev server using maven-cargo
 
 ## Server Management
 

sormas-api/pom.xml

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

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

@@ -28,6 +28,8 @@ public interface ConfigFacade {
 
 	String getCountryLocale();
 
+	String getCountryCode();
+
 	boolean isConfiguredCountry(String countryCode);
 
 	String getEpidPrefix();
@@ -96,5 +98,9 @@ public interface ConfigFacade {
 
 	String getSymptomJournalSecret();
 
+	String getPatientDiaryUrl();
+
 	void validateExternalUrls();
+
+	Sormas2SormasConfig getSormas2SormasConfig();
 }

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

@@ -0,0 +1,92 @@
+package de.symeda.sormas.api;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+public class Sormas2SormasConfig implements Serializable, Cloneable {
+
+	private static final long serialVersionUID = -7981351672462016280L;
+
+	private String filePath;
+	private String keyAlias;
+	private String keystoreName;
+	private String keystorePass;
+	private String truststoreName;
+	private String truststorePass;
+
+	public String getFilePath() {
+		return filePath;
+	}
+
+	public void setFilePath(String filePath) {
+		this.filePath = filePath;
+	}
+
+	public String getKeyAlias() {
+		return keyAlias;
+	}
+
+	public void setKeyAlias(String keyAlias) {
+		this.keyAlias = keyAlias;
+	}
+
+	public String getKeystoreName() {
+		return keystoreName;
+	}
+
+	public void setKeystoreName(String keystoreName) {
+		this.keystoreName = keystoreName;
+	}
+
+	public String getKeystorePass() {
+		return keystorePass;
+	}
+
+	public void setKeystorePass(String keystorePass) {
+		this.keystorePass = keystorePass;
+	}
+
+	public String getTruststoreName() {
+		return truststoreName;
+	}
+
+	public void setTruststoreName(String truststoreName) {
+		this.truststoreName = truststoreName;
+	}
+
+	public String getTruststorePass() {
+		return truststorePass;
+	}
+
+	public void setTruststorePass(String truststorePass) {
+		this.truststorePass = truststorePass;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		Sormas2SormasConfig that = (Sormas2SormasConfig) o;
+		return Objects.equals(filePath, that.filePath)
+			&& Objects.equals(keyAlias, that.keyAlias)
+			&& Objects.equals(keystorePass, that.keystorePass)
+			&& Objects.equals(truststoreName, that.truststoreName)
+			&& Objects.equals(truststorePass, that.truststorePass);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(filePath, keyAlias, keystorePass, truststoreName, truststorePass);
+	}
+
+	@Override
+	public Sormas2SormasConfig clone() {
+		try {
+			return (Sormas2SormasConfig) super.clone();
+		} catch (CloneNotSupportedException e) {
+			throw new RuntimeException("Clone failed", e);
+		}
+	}
+}

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

@@ -1,5 +1,6 @@
 package de.symeda.sormas.api.campaign;
 
+import de.symeda.sormas.api.campaign.diagram.CampaignDashboardElement;
 import de.symeda.sormas.api.utils.SortProperty;
 
 import javax.ejb.Remote;
@@ -12,16 +13,19 @@ public interface CampaignFacade {
 
 	List<CampaignReferenceDto> getAllCampaignsAsReference();
 
+	CampaignReferenceDto getLastStartedCampaign();
+
 	long count(CampaignCriteria campaignCriteria);
 
 	CampaignDto saveCampaign(CampaignDto dto);
 
 	CampaignDto getByUuid(String uuid);
 
+	List<CampaignDashboardElement> getCampaignDashboardElements(String campaignUuid);
+
 	boolean isArchived(String uuid);
 
 	void deleteCampaign(String uuid);
 
 	void archiveOrDearchiveCampaign(String campaignUuid, boolean archive);
-
 }