[GITFLOW]merging 'hotfix-1.66.1' into 'master'

.github/workflows/ci.yml

@@ -9,9 +9,9 @@ env:
 
 on:
   push:
-    branches: [ development, master ]
+    branches: [ development, master, hotfix* ]
   pull_request:
-    branches: [ development ]
+    branches: [ development, hotfix* ]
 
 jobs:
   test:

.github/workflows/linter.yml

@@ -17,7 +17,7 @@ name: Lint Code Base
 on:
   workflow_dispatch:
   pull_request:
-    branches: [development]
+    branches: [development, hotfix*]
 
 ###############
 # Set the Job #

.github/workflows/sormas_app_ci.yml

@@ -9,12 +9,12 @@ env:
 
 on:
   push:
-    branches: [ development, master ]
+    branches: [ development, master, hotfix* ]
     paths:
       - 'sormas-app/**'
       - 'sormas-api/**'
   pull_request:
-    branches: [ development ]
+    branches: [ development, hotfix* ]
     paths:
       - 'sormas-app/**'
       - 'sormas-api/**'

sormas-api/pom.xml

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

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

@@ -75,7 +75,7 @@
 import de.symeda.sormas.api.utils.pseudonymization.valuepseudonymizers.LatitudePseudonymizer;
 import de.symeda.sormas.api.utils.pseudonymization.valuepseudonymizers.LongitudePseudonymizer;
 
-public class CaseDataDto extends PseudonymizableDto implements SormasToSormasShareableDto {
+public class CaseDataDto extends SormasToSormasShareableDto {
 
 	private static final long serialVersionUID = 5007131477733638086L;
 

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

@@ -61,7 +61,7 @@
 import de.symeda.sormas.api.utils.pseudonymization.valuepseudonymizers.LatitudePseudonymizer;
 import de.symeda.sormas.api.utils.pseudonymization.valuepseudonymizers.LongitudePseudonymizer;
 
-public class ContactDto extends PseudonymizableDto implements SormasToSormasShareableDto {
+public class ContactDto extends SormasToSormasShareableDto {
 
 	private static final long serialVersionUID = -7764607075875188799L;
 

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

@@ -44,7 +44,7 @@
 import de.symeda.sormas.api.utils.YesNoUnknown;
 import de.symeda.sormas.api.utils.pseudonymization.PseudonymizableDto;
 
-public class EventDto extends PseudonymizableDto implements SormasToSormasShareableDto {
+public class EventDto extends SormasToSormasShareableDto {
 
 	private static final long serialVersionUID = 2430932452606853497L;
 

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

@@ -1,20 +1,17 @@
-/*******************************************************************************
+/*
  * SORMAS® - Surveillance Outbreak Response Management & Analysis System
- * Copyright © 2016-2018 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
- *
+ * Copyright © 2016-2021 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.event;
 
 import javax.validation.Valid;
@@ -38,9 +35,8 @@
 import de.symeda.sormas.api.utils.Required;
 import de.symeda.sormas.api.utils.SensitiveData;
 import de.symeda.sormas.api.sormastosormas.SormasToSormasShareableDto;
-import de.symeda.sormas.api.utils.pseudonymization.PseudonymizableDto;
 
-public class EventParticipantDto extends PseudonymizableDto implements SormasToSormasShareableDto {
+public class EventParticipantDto extends SormasToSormasShareableDto {
 
 	private static final long serialVersionUID = -8725734604520880084L;
 

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java

@@ -1368,6 +1368,7 @@ public interface Captions {
 	String LabMessage_labPostalCode = "LabMessage.labPostalCode";
 	String LabMessage_labSampleId = "LabMessage.labSampleId";
 	String LabMessage_messageDateTime = "LabMessage.messageDateTime";
+	String LabMessage_personBirthDate = "LabMessage.personBirthDate";
 	String LabMessage_personBirthDateDD = "LabMessage.personBirthDateDD";
 	String LabMessage_personBirthDateMM = "LabMessage.personBirthDateMM";
 	String LabMessage_personBirthDateYYYY = "LabMessage.personBirthDateYYYY";
@@ -1386,6 +1387,10 @@ public interface Captions {
 	String LabMessage_specimenCondition = "LabMessage.specimenCondition";
 	String LabMessage_status = "LabMessage.status";
 	String LabMessage_testedDisease = "LabMessage.testedDisease";
+	String LabMessageCriteria_birthDateFrom = "LabMessageCriteria.birthDateFrom";
+	String LabMessageCriteria_birthDateTo = "LabMessageCriteria.birthDateTo";
+	String LabMessageCriteria_messageDateFrom = "LabMessageCriteria.messageDateFrom";
+	String LabMessageCriteria_messageDateTo = "LabMessageCriteria.messageDateTo";
 	String labMessageFetch = "labMessageFetch";
 	String labMessageForwardedMessageFound = "labMessageForwardedMessageFound";
 	String labMessageNoDisease = "labMessageNoDisease";

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java

@@ -1132,6 +1132,9 @@ public interface Strings {
 	String messageUserSyncFailedFull = "messageUserSyncFailedFull";
 	String messageUserSyncPartiallySuccessful = "messageUserSyncPartiallySuccessful";
 	String messageUserSyncSuccessful = "messageUserSyncSuccessful";
+	String messageVaccinationNoDateNotRelevantForCase = "messageVaccinationNoDateNotRelevantForCase";
+	String messageVaccinationNoDateNotRelevantForContact = "messageVaccinationNoDateNotRelevantForContact";
+	String messageVaccinationNoDateNotRelevantForEventParticipant = "messageVaccinationNoDateNotRelevantForEventParticipant";
 	String messageVaccinationNotRelevantForCase = "messageVaccinationNotRelevantForCase";
 	String messageVaccinationNotRelevantForContact = "messageVaccinationNotRelevantForContact";
 	String messageVaccinationNotRelevantForEventParticipant = "messageVaccinationNotRelevantForEventParticipant";
@@ -1261,6 +1264,11 @@ public interface Strings {
 	String promptImmunizationRecoveryDateFrom = "promptImmunizationRecoveryDateFrom";
 	String promptImmunizationStartDateFrom = "promptImmunizationStartDateFrom";
 	String promptImmunizationValidFrom = "promptImmunizationValidFrom";
+	String promptLabMessagesDateFrom = "promptLabMessagesDateFrom";
+	String promptLabMessagesDateTo = "promptLabMessagesDateTo";
+	String promptLabMessagesPersonBirthDateFrom = "promptLabMessagesPersonBirthDateFrom";
+	String promptLabMessagesPersonBirthDateTo = "promptLabMessagesPersonBirthDateTo";
+	String promptLabMessagesSearchField = "promptLabMessagesSearchField";
 	String promptNamePhoneEmail = "promptNamePhoneEmail";
 	String promptNewCaseDateType = "promptNewCaseDateType";
 	String promptPersonDuplicateSearchIdExternalId = "promptPersonDuplicateSearchIdExternalId";

sormas-api/src/main/java/de/symeda/sormas/api/immunization/ImmunizationDto.java

@@ -48,7 +48,7 @@
 import de.symeda.sormas.api.utils.pseudonymization.PseudonymizableDto;
 import de.symeda.sormas.api.vaccination.VaccinationDto;
 
-public class ImmunizationDto extends PseudonymizableDto implements SormasToSormasShareableDto {
+public class ImmunizationDto extends SormasToSormasShareableDto {
 
 	private static final long serialVersionUID = -6538566879882613529L;
 

sormas-api/src/main/java/de/symeda/sormas/api/labmessage/LabMessageCriteria.java

@@ -1,15 +1,29 @@
 package de.symeda.sormas.api.labmessage;
 
 import java.io.Serializable;
+import java.util.Date;
 
 import de.symeda.sormas.api.sample.SampleReferenceDto;
 import de.symeda.sormas.api.utils.criteria.BaseCriteria;
 
 public class LabMessageCriteria extends BaseCriteria implements Serializable {
 
+	public static final String I18N_PREFIX = "LabMessageCriteria";
+
+	public static final String SEARCH_FIELD_LIKE = "searchFieldLike";
+	public static final String MESSAGE_DATE_FROM = "messageDateFrom";
+	public static final String MESSAGE_DATE_TO = "messageDateTo";
+	public static final String BIRTH_DATE_FROM = "birthDateFrom";
+	public static final String BIRTH_DATE_TO = "birthDateTo";
+
 	private String uuid;
 	private LabMessageStatus labMessageStatus;
 	private SampleReferenceDto sample;
+	private String searchFieldLike;
+	private Date messageDateFrom;
+	private Date messageDateTo;
+	private Date birthDateFrom;
+	private Date birthDateTo;
 
 	public String getUuid() {
 		return uuid;
@@ -35,4 +49,44 @@ public SampleReferenceDto getSample() {
 	public void setSample(SampleReferenceDto sample) {
 		this.sample = sample;
 	}
+
+	public String getSearchFieldLike() {
+		return searchFieldLike;
+	}
+
+	public void setSearchFieldLike(String searchFieldLike) {
+		this.searchFieldLike = searchFieldLike;
+	}
+
+	public Date getMessageDateFrom() {
+		return messageDateFrom;
+	}
+
+	public void setMessageDateFrom(Date messageDateFrom) {
+		this.messageDateFrom = messageDateFrom;
+	}
+
+	public Date getMessageDateTo() {
+		return messageDateTo;
+	}
+
+	public void setMessageDateTo(Date messageDateTo) {
+		this.messageDateTo = messageDateTo;
+	}
+
+	public Date getBirthDateFrom() {
+		return birthDateFrom;
+	}
+
+	public void setBirthDateFrom(Date birthDateFrom) {
+		this.birthDateFrom = birthDateFrom;
+	}
+
+	public Date getBirthDateTo() {
+		return birthDateTo;
+	}
+
+	public void setBirthDateTo(Date birthDateTo) {
+		this.birthDateTo = birthDateTo;
+	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/labmessage/LabMessageIndexDto.java

@@ -1,6 +1,7 @@
 package de.symeda.sormas.api.labmessage;
 
 import java.io.Serializable;
+import java.util.Calendar;
 import java.util.Date;
 
 import de.symeda.sormas.api.Disease;
@@ -18,6 +19,7 @@ public class LabMessageIndexDto implements Serializable {
 	public static final String SAMPLE_OVERALL_TEST_RESULT = "sampleOverallTestResult";
 	public static final String PERSON_FIRST_NAME = "personFirstName";
 	public static final String PERSON_LAST_NAME = "personLastName";
+	public static final String PERSON_BIRTH_DATE = "personBirthDate";
 	public static final String PERSON_POSTAL_CODE = "personPostalCode";
 	public static final String STATUS = "status";
 
@@ -30,6 +32,7 @@ public class LabMessageIndexDto implements Serializable {
 	private PathogenTestResultType sampleOverallTestResult;
 	private String personFirstName;
 	private String personLastName;
+	private Date personBirthDate;
 	private String personPostalCode;
 	private LabMessageStatus status;
 
@@ -42,6 +45,9 @@ public LabMessageIndexDto(
 		PathogenTestResultType sampleOverallTestResult,
 		String personFirstName,
 		String personLastName,
+		Integer personBirthDateYYYY,
+		Integer personBirthDateMM,
+		Integer personBirthDateDD,
 		String personPostalCode,
 		LabMessageStatus status) {
 
@@ -55,6 +61,17 @@ public LabMessageIndexDto(
 		this.personLastName = personLastName;
 		this.personPostalCode = personPostalCode;
 		this.status = status;
+
+		if (personBirthDateYYYY != null && personBirthDateMM != null && personBirthDateDD != null) {
+			Calendar birthdate = Calendar.getInstance();
+			birthdate.setLenient(false);
+			try {
+				birthdate.set(personBirthDateYYYY, personBirthDateMM - 1, personBirthDateDD, 0, 0, 0);
+				personBirthDate = birthdate.getTime();
+			} catch (Exception e) {
+				personBirthDate = null;
+			}
+		}
 	}
 
 	public String getUuid() {
@@ -121,6 +138,14 @@ public void setPersonLastName(String personLastName) {
 		this.personLastName = personLastName;
 	}
 
+	public Date getPersonBirthDate() {
+		return personBirthDate;
+	}
+
+	public void setPersonBirthDate(Date personBirthDate) {
+		this.personBirthDate = personBirthDate;
+	}
+
 	public String getPersonPostalCode() {
 		return personPostalCode;
 	}

sormas-api/src/main/java/de/symeda/sormas/api/sample/SampleDto.java

@@ -1,20 +1,17 @@
-/*******************************************************************************
+/*
  * SORMAS® - Surveillance Outbreak Response Management & Analysis System
- * Copyright © 2016-2018 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
- *
+ * Copyright © 2016-2021 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.sample;
 
 import java.util.Date;
@@ -40,7 +37,7 @@
 import de.symeda.sormas.api.utils.SensitiveData;
 import de.symeda.sormas.api.utils.pseudonymization.PseudonymizableDto;
 
-public class SampleDto extends PseudonymizableDto implements SormasToSormasShareableDto {
+public class SampleDto extends SormasToSormasShareableDto {
 
 	private static final long serialVersionUID = -6975445672442728938L;
 

sormas-api/src/main/java/de/symeda/sormas/api/sormastosormas/SormasToSormasShareableDto.java

@@ -15,18 +15,18 @@
 
 package de.symeda.sormas.api.sormastosormas;
 
-import de.symeda.sormas.api.HasUuid;
 import de.symeda.sormas.api.user.UserReferenceDto;
+import de.symeda.sormas.api.utils.pseudonymization.PseudonymizableDto;
 
-public interface SormasToSormasShareableDto extends HasUuid {
+public abstract class SormasToSormasShareableDto extends PseudonymizableDto {
 
-	SormasToSormasOriginInfoDto getSormasToSormasOriginInfo();
+	public abstract SormasToSormasOriginInfoDto getSormasToSormasOriginInfo();
 
-	void setSormasToSormasOriginInfo(SormasToSormasOriginInfoDto originInfo);
+	public abstract void setSormasToSormasOriginInfo(SormasToSormasOriginInfoDto originInfo);
 
-	boolean isOwnershipHandedOver();
+	public abstract boolean isOwnershipHandedOver();
 
-	UserReferenceDto getReportingUser();
+	public abstract UserReferenceDto getReportingUser();
 
-	void setReportingUser(UserReferenceDto user);
+	public abstract void setReportingUser(UserReferenceDto user);
 }

sormas-api/src/main/resources/captions.properties

@@ -1429,6 +1429,7 @@ LabMessage.personCity=City
 LabMessage.personFirstName=First name
 LabMessage.personHouseNumber=House number
 LabMessage.personLastName=Last name
+LabMessage.personBirthDate=Birth date
 LabMessage.personPostalCode=Postal code
 LabMessage.personSex=Sex
 LabMessage.personStreet=Street
@@ -1455,6 +1456,10 @@ labMessageNoNewMessages=No new messages available
 labMessageForwardedMessageFound=Related forwarded lab message(s) found
 labMessageRelatedEntriesFound=Related entries found
 
+LabMessageCriteria.messageDateFrom=Message date from...
+LabMessageCriteria.messageDateTo=... to
+LabMessageCriteria.birthDateFrom=Birth date from...
+LabMessageCriteria.birthDateTo=... to
 
 #Line listing
 lineListing=Line listing