Merge branch 'development' of github.com:hzi-braunschweig/SORMAS-Proj…

…ect into #7443
SORMAS-Foundation · Oct 13, 2022 · 9bcbf33 · 9bcbf33
2 parents 53bbd88 + cf9ea58
commit 9bcbf33
Show file tree

Hide file tree

Showing 220 changed files with 2,741 additions and 1,033 deletions.
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/ReferenceDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/ReferenceDto.java
@@ -21,16 +21,20 @@
 
 import org.apache.commons.lang3.ObjectUtils;
 
+import de.symeda.sormas.api.audit.AuditInclude;
+import de.symeda.sormas.api.audit.AuditedClass;
 import de.symeda.sormas.api.i18n.Validations;
 import de.symeda.sormas.api.utils.Required;
 import de.symeda.sormas.api.uuid.HasUuid;
 
+@AuditedClass
 public abstract class ReferenceDto implements Serializable, HasUuid, Comparable<ReferenceDto> {
 
 	public static final String CAPTION = "caption";
 	public static final String NO_REFERENCE_UUID = "SORMAS-CONSTID-NO-REFERENCE";
 
 	@Required
+	@AuditInclude
 	@Pattern(regexp = UUID_REGEX, message = Validations.uuidPatternNotMatching)
 	private String uuid;
 	private String caption;

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseDataDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseDataDto.java
@@ -27,7 +27,6 @@
 import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 import org.apache.commons.lang3.StringUtils;
@@ -263,7 +262,6 @@ public class CaseDataDto extends SormasToSormasShareableDto {
 	@Required
 	private Date reportDate;
 	@Outbreaks
-	@NotNull(message = Validations.validReportingUser)
 	private UserReferenceDto reportingUser;
 	@HideForCountries(countries = {
 		COUNTRY_CODE_FRANCE,

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseSimilarityCriteria.java b/sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseSimilarityCriteria.java
@@ -1,5 +1,6 @@
 package de.symeda.sormas.api.caze;
 
+import java.util.Collection;
 import java.util.Date;
 
 import de.symeda.sormas.api.utils.IgnoreForUrl;
@@ -11,6 +12,7 @@ public class CaseSimilarityCriteria extends BaseCriteria implements Cloneable {
 
 	private CaseCriteria caseCriteria;
 	private String personUuid;
+	private Collection<String> personUuids;
 	private Date reportDate;
 
 	@Override
@@ -54,8 +56,24 @@ public CaseSimilarityCriteria caseCriteria(CaseCriteria caseCriteria) {
 	}
 
 	public static CaseSimilarityCriteria forCase(CaseDataDto caze, String personUuid) {
-		CaseCriteria caseCriteria = new CaseCriteria().disease(caze.getDisease()).region(CaseLogic.getRegionWithFallback(caze));
+		return new CaseSimilarityCriteria().personUuid(personUuid).caseCriteria(buildCaseCriteria(caze)).reportDate(caze.getReportDate());
+	}
+
+	public static CaseSimilarityCriteria forCase(CaseDataDto caze, Collection<String> personUuids) {
+		return new CaseSimilarityCriteria().personUuids(personUuids).caseCriteria(buildCaseCriteria(caze)).reportDate(caze.getReportDate());
+	}
+
+	private static CaseCriteria buildCaseCriteria(CaseDataDto caze) {
+		return new CaseCriteria().disease(caze.getDisease()).region(CaseLogic.getRegionWithFallback(caze));
+	}
+
+	public CaseSimilarityCriteria personUuids(Collection<String> personUuids) {
+		this.personUuids = personUuids;
+
+		return this;
+	}
 
-		return new CaseSimilarityCriteria().personUuid(personUuid).caseCriteria(caseCriteria).reportDate(caze.getReportDate());
+	public Collection<String> getPersonUuids() {
+		return personUuids;
 	}
 }
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactDto.java
@@ -23,7 +23,6 @@
 import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 import de.symeda.sormas.api.Disease;
@@ -162,7 +161,7 @@ public class ContactDto extends SormasToSormasShareableDto {
 
 	@Required
 	private Date reportDateTime;
-	@NotNull(message = Validations.validReportingUser)
+
 	private UserReferenceDto reportingUser;
 	@SensitiveData
 	@Pseudonymizer(LatitudePseudonymizer.class)

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactSimilarityCriteria.java b/sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactSimilarityCriteria.java
@@ -1,9 +1,11 @@
 package de.symeda.sormas.api.contact;
 
 import java.util.Date;
+import java.util.List;
 
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.caze.CaseReferenceDto;
+import de.symeda.sormas.api.infrastructure.district.DistrictReferenceDto;
 import de.symeda.sormas.api.person.PersonReferenceDto;
 import de.symeda.sormas.api.utils.criteria.BaseCriteria;
 
@@ -12,14 +14,17 @@ public class ContactSimilarityCriteria extends BaseCriteria implements Cloneable
 	private static final long serialVersionUID = 6902101244020083789L;
 
 	private PersonReferenceDto person;
+	private List<PersonReferenceDto> persons;
 	private CaseReferenceDto caze;
+	private List<CaseReferenceDto> resultingCases;
 	private Disease disease;
 	private Date lastContactDate;
 	private Date reportDate;
 	private Date relevantDate;
 	private ContactClassification contactClassification;
 	private Boolean excludePseudonymized;
 	private Boolean noResultingCase;
+	private DistrictReferenceDto district;
 
 	public ContactSimilarityCriteria() {
 
@@ -47,6 +52,15 @@ public ContactSimilarityCriteria withPerson(PersonReferenceDto person) {
 		return this;
 	}
 
+	public List<PersonReferenceDto> getPersons() {
+		return persons;
+	}
+
+	public ContactSimilarityCriteria withPersons(List<PersonReferenceDto> persons) {
+		this.persons = persons;
+		return this;
+	}
+
 	public CaseReferenceDto getCaze() {
 		return caze;
 	}
@@ -60,6 +74,16 @@ public ContactSimilarityCriteria withCaze(CaseReferenceDto caze) {
 		return this;
 	}
 
+	public List<CaseReferenceDto> getResultingCases() {
+		return resultingCases;
+	}
+
+	public ContactSimilarityCriteria withResultingCases(List<CaseReferenceDto> resultingCases) {
+		this.resultingCases = resultingCases;
+
+		return this;
+	}
+
 	public Disease getDisease() {
 		return disease;
 	}
@@ -135,4 +159,14 @@ public ContactSimilarityCriteria withNoResultingCase(Boolean noResultingCase) {
 		this.noResultingCase = noResultingCase;
 		return this;
 	}
+
+	public DistrictReferenceDto getDistrict() {
+		return district;
+	}
+
+	public ContactSimilarityCriteria withDistrict(DistrictReferenceDto district) {
+		this.district = district;
+
+		return this;
+	}
 }
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/event/EventDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/event/EventDto.java
@@ -148,7 +148,7 @@ public class EventDto extends SormasToSormasShareableDto {
 	private Date endDate;
 	@NotNull(message = Validations.validReportDateTime)
 	private Date reportDateTime;
-	@NotNull(message = Validations.validReportingUser)
+
 	private UserReferenceDto reportingUser;
 	private Date evolutionDate;
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong)

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/event/EventParticipantDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/event/EventParticipantDto.java
@@ -14,23 +14,22 @@
  */
 package de.symeda.sormas.api.event;
 
-import de.symeda.sormas.api.common.DeletionReason;
-import de.symeda.sormas.api.feature.FeatureType;
-import de.symeda.sormas.api.utils.DependingOnFeatureType;
 import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.caze.CaseReferenceDto;
 import de.symeda.sormas.api.caze.VaccinationStatus;
+import de.symeda.sormas.api.common.DeletionReason;
+import de.symeda.sormas.api.feature.FeatureType;
 import de.symeda.sormas.api.i18n.Validations;
 import de.symeda.sormas.api.infrastructure.district.DistrictReferenceDto;
 import de.symeda.sormas.api.infrastructure.region.RegionReferenceDto;
 import de.symeda.sormas.api.person.PersonDto;
 import de.symeda.sormas.api.sormastosormas.SormasToSormasShareableDto;
 import de.symeda.sormas.api.user.UserReferenceDto;
 import de.symeda.sormas.api.utils.DataHelper;
+import de.symeda.sormas.api.utils.DependingOnFeatureType;
 import de.symeda.sormas.api.utils.Diseases;
 import de.symeda.sormas.api.utils.EmbeddedPersonalData;
 import de.symeda.sormas.api.utils.FieldConstraints;
@@ -58,7 +57,6 @@ public class EventParticipantDto extends SormasToSormasShareableDto {
 	public static final String DELETION_REASON = "deletionReason";
 	public static final String OTHER_DELETION_REASON = "otherDeletionReason";
 
-	@NotNull(message = Validations.validReportingUser)
 	private UserReferenceDto reportingUser;
 	@Required
 	private EventReferenceDto event;

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageCriteria.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageCriteria.java
@@ -3,6 +3,7 @@
 import java.io.Serializable;
 import java.util.Date;
 
+import de.symeda.sormas.api.audit.AuditInclude;
 import de.symeda.sormas.api.caze.CaseReferenceDto;
 import de.symeda.sormas.api.sample.SampleReferenceDto;
 import de.symeda.sormas.api.user.UserReferenceDto;
@@ -19,7 +20,7 @@ public class ExternalMessageCriteria extends BaseCriteria implements Serializabl
 	public static final String BIRTH_DATE_TO = "birthDateTo";
 	public static final String ASSIGNEE = "assignee";
 	public static final String TYPE = "type";
-
+	@AuditInclude
 	private String uuid;
 	private ExternalMessageType type;
 	private ExternalMessageStatus externalMessageStatus;

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/feature/FeatureConfigurationFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/feature/FeatureConfigurationFacade.java
@@ -15,7 +15,6 @@
 
 package de.symeda.sormas.api.feature;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
@@ -64,6 +63,8 @@ Page<FeatureConfigurationIndexDto> getIndexPage(
 
 	boolean isFeatureEnabled(FeatureType featureType);
 
+	boolean isAnyFeatureEnabled(FeatureType... featureType);
+
 	boolean isFeatureEnabled(FeatureType featureType, CoreEntityType entityType);
 
 	<T extends Object> T getProperty(FeatureType featureType, CoreEntityType entityType, FeatureTypeProperty property, Class<T> returnType);

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java
@@ -92,6 +92,10 @@ public interface Captions {
 	String actionNo = "actionNo";
 	String actionNoActions = "actionNoActions";
 	String actionNoAll = "actionNoAll";
+	String actionOkAndGoToContactDetails = "actionOkAndGoToContactDetails";
+	String actionOkAndGoToContactDirectory = "actionOkAndGoToContactDirectory";
+	String actionOkAndGoToMerge = "actionOkAndGoToMerge";
+	String actionOkAndGoToPersonDirectory = "actionOkAndGoToPersonDirectory";
 	String actionOkay = "actionOkay";
 	String actionOverwrite = "actionOverwrite";
 	String actionPick = "actionPick";

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java
@@ -13,6 +13,7 @@ public interface Strings {
 	String active = "active";
 	String address = "address";
 	String aggregateReportLegend = "aggregateReportLegend";
+	String all = "all";
 	String and = "and";
 	String at = "at";
 	String average = "average";
@@ -683,6 +684,7 @@ public interface Strings {
 	String headingSomeEventsNotDeleted = "headingSomeEventsNotDeleted";
 	String headingSormasToSormasCanAcceptContactsWithoutCase = "headingSormasToSormasCanAcceptContactsWithoutCase";
 	String headingSormasToSormasCantShareContactWithoutCase = "headingSormasToSormasCantShareContactWithoutCase";
+	String headingSormasToSormasDuplicateDetection = "headingSormasToSormasDuplicateDetection";
 	String headingStoppedFollowUp = "headingStoppedFollowUp";
 	String headingSurveillanceReports = "headingSurveillanceReports";
 	String headingSymptomJournalAccountCreation = "headingSymptomJournalAccountCreation";
@@ -1184,6 +1186,13 @@ public interface Strings {
 	String messageSamplesDeleted = "messageSamplesDeleted";
 	String messageSelectedPeriodTooLong = "messageSelectedPeriodTooLong";
 	String messageSetContactRegionAndDistrict = "messageSetContactRegionAndDistrict";
+	String messageSormasToSormasSimilarCaseFound = "messageSormasToSormasSimilarCaseFound";
+	String messageSormasToSormasSimilarCaseToContactFound = "messageSormasToSormasSimilarCaseToContactFound";
+	String messageSormasToSormasSimilarContactFound = "messageSormasToSormasSimilarContactFound";
+	String messageSormasToSormasSimilarContactToCaseFound = "messageSormasToSormasSimilarContactToCaseFound";
+	String messageSormasToSormasSimilarConvertedCaseFound = "messageSormasToSormasSimilarConvertedCaseFound";
+	String messageSormasToSormasSimilarConvertedContactFound = "messageSormasToSormasSimilarConvertedContactFound";
+	String messageSormasToSormasSimilarPersonFound = "messageSormasToSormasSimilarPersonFound";
 	String messageSpecifyColumnAttribute = "messageSpecifyColumnAttribute";
 	String messageSpecifyFilterAttributes = "messageSpecifyFilterAttributes";
 	String messageSpecifyRowAttribute = "messageSpecifyRowAttribute";

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/immunization/ImmunizationDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/immunization/ImmunizationDto.java
@@ -15,19 +15,17 @@
 
 package de.symeda.sormas.api.immunization;
 
-import de.symeda.sormas.api.common.DeletionReason;
-import de.symeda.sormas.api.feature.FeatureType;
-import de.symeda.sormas.api.utils.DependingOnFeatureType;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.caze.CaseReferenceDto;
+import de.symeda.sormas.api.common.DeletionReason;
+import de.symeda.sormas.api.feature.FeatureType;
 import de.symeda.sormas.api.i18n.Validations;
 import de.symeda.sormas.api.infrastructure.community.CommunityReferenceDto;
 import de.symeda.sormas.api.infrastructure.country.CountryReferenceDto;
@@ -41,6 +39,7 @@
 import de.symeda.sormas.api.sormastosormas.SormasToSormasShareableDto;
 import de.symeda.sormas.api.user.UserReferenceDto;
 import de.symeda.sormas.api.utils.DataHelper;
+import de.symeda.sormas.api.utils.DependingOnFeatureType;
 import de.symeda.sormas.api.utils.EmbeddedPersonalData;
 import de.symeda.sormas.api.utils.FieldConstraints;
 import de.symeda.sormas.api.utils.Outbreaks;
@@ -104,7 +103,6 @@ public class ImmunizationDto extends SormasToSormasShareableDto {
 	private PersonReferenceDto person;
 	@Required
 	private Date reportDate;
-	@NotNull(message = Validations.validReportingUser)
 	private UserReferenceDto reportingUser;
 	private boolean archived;
 	@Required