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

Author: SergiuPacurariu

sormas-api/pom.xml

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

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

@@ -163,4 +163,8 @@ public interface ConfigFacade {
 	boolean isAnyCaseClassificationCalculationEnabled();
 
 	Integer getNegaiveCovidTestsMaxAgeDays();
+
+	long getMinimumEmancipatedAge();
+
+	long getMinimumAdultAge();
 }

sormas-api/src/main/java/de/symeda/sormas/api/customizableenum/CustomizableEnumHelper.java

@@ -19,7 +19,7 @@
 
 public class CustomizableEnumHelper {
 
-	private static final String ENUM_VALUE_PATTERN = "[A-Z0-9_.]+";
+	private static final String ENUM_VALUE_PATTERN = "[A-Z0-9_.+]+";
 
 	public static boolean isValidEnumValue(String value) {
 		return Pattern.matches(ENUM_VALUE_PATTERN, value);

sormas-api/src/main/java/de/symeda/sormas/api/customizableenum/CustomizableEnumValueDto.java

@@ -15,6 +15,7 @@
 
 package de.symeda.sormas.api.customizableenum;
 
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -59,7 +60,7 @@ public class CustomizableEnumValueDto extends EntityDto {
 	private String caption;
 	@Valid
 	private List<CustomizableEnumTranslation> translations;
-	private Set<Disease> diseases;
+	private Set<Disease> diseases = new HashSet<>();
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong)
 	private String description;
 	@Valid

sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/processing/AbstractProcessingFlow.java

@@ -22,13 +22,19 @@
 import org.slf4j.LoggerFactory;
 
 import de.symeda.sormas.api.CountryHelper;
+import de.symeda.sormas.api.Disease;
+import de.symeda.sormas.api.caze.CaseClassification;
 import de.symeda.sormas.api.caze.CaseDataDto;
+import de.symeda.sormas.api.caze.CaseOutcome;
+import de.symeda.sormas.api.caze.InvestigationStatus;
 import de.symeda.sormas.api.externalmessage.ExternalMessageDto;
 import de.symeda.sormas.api.feature.FeatureType;
 import de.symeda.sormas.api.infrastructure.facility.FacilityDto;
 import de.symeda.sormas.api.infrastructure.facility.FacilityReferenceDto;
 import de.symeda.sormas.api.infrastructure.facility.FacilityType;
 import de.symeda.sormas.api.person.PersonDto;
+import de.symeda.sormas.api.sample.PathogenTestResultType;
+import de.symeda.sormas.api.sample.PathogenTestType;
 import de.symeda.sormas.api.user.UserDto;
 import de.symeda.sormas.api.utils.dataprocessing.EntitySelection;
 import de.symeda.sormas.api.utils.dataprocessing.HandlerCallback;
@@ -175,6 +181,18 @@ protected CaseDataDto buildCase(PersonDto person, ExternalMessageDto externalMes
 			caseDto.setHealthFacility(processingFacade.getFacilityReferenceByUuid(FacilityDto.NONE_FACILITY_UUID));
 		}
 
+		if (processingFacade.isConfiguredCountry(CountryHelper.COUNTRY_CODE_LUXEMBOURG)) {
+			if (externalMessageDto.getDisease().equals(Disease.PERTUSSIS)
+				&& externalMessageDto.getSampleReports().get(0).getTestReports().get(0).getTestResult().equals(PathogenTestResultType.POSITIVE)) {
+				PathogenTestType testType = externalMessageDto.getSampleReports().get(0).getTestReports().get(0).getTestType();
+				if (testType.equals(PathogenTestType.CULTURE) || testType.equals(PathogenTestType.PCR_RT_PCR)) {
+					caseDto.setCaseClassification(CaseClassification.CONFIRMED);
+				}
+			}
+			caseDto.setInvestigationStatus(InvestigationStatus.PENDING);
+			caseDto.setOutcome(CaseOutcome.NO_OUTCOME);
+		}
+
 		caseDto.setVaccinationStatus(externalMessageDto.getVaccinationStatus());
 		caseDto.getHospitalization().setAdmittedToHealthFacility(externalMessageDto.getAdmittedToHealthFacility());
 

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

@@ -972,6 +972,8 @@ public interface Captions {
 	String Configuration_LineListing = "Configuration.LineListing";
 	String Configuration_Outbreaks = "Configuration.Outbreaks";
 	String Configuration_PointsOfEntry = "Configuration.PointsOfEntry";
+	String confirmChangesField = "confirmChangesField";
+	String confirmChangesValue = "confirmChangesValue";
 	String Contact = "Contact";
 	String Contact_additionalDetails = "Contact.additionalDetails";
 	String Contact_ageAndBirthDate = "Contact.ageAndBirthDate";
@@ -2218,12 +2220,15 @@ public interface Captions {
 	String Person_educationDetails = "Person.educationDetails";
 	String Person_educationType = "Person.educationType";
 	String Person_emailAddress = "Person.emailAddress";
+	String Person_emancipated = "Person.emancipated";
 	String Person_externalId = "Person.externalId";
 	String Person_externalToken = "Person.externalToken";
 	String Person_fathersName = "Person.fathersName";
 	String Person_generalPractitionerDetails = "Person.generalPractitionerDetails";
 	String Person_gestationAgeAtBirth = "Person.gestationAgeAtBirth";
 	String Person_hasCovidApp = "Person.hasCovidApp";
+	String Person_hasGuardian = "Person.hasGuardian";
+	String Person_incapacitated = "Person.incapacitated";
 	String Person_internalToken = "Person.internalToken";
 	String Person_lastDisease = "Person.lastDisease";
 	String Person_matchingCase = "Person.matchingCase";

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

@@ -1203,6 +1203,8 @@ public interface Strings {
 	String messageCasesRestored = "messageCasesRestored";
 	String messageCaseTransfered = "messageCaseTransfered";
 	String messageChangePathogenTestResult = "messageChangePathogenTestResult";
+	String messageChangingCaseOutcome = "messageChangingCaseOutcome";
+	String messageChangingPersonPresentCondition = "messageChangingPersonPresentCondition";
 	String messageCheckInputData = "messageCheckInputData";
 	String messageClinicalCourseSaved = "messageClinicalCourseSaved";
 	String messageClinicalVisitCreated = "messageClinicalVisitCreated";
@@ -1509,6 +1511,7 @@ public interface Strings {
 	String messageRelatedSampleAndLabMessagesFound = "messageRelatedSampleAndLabMessagesFound";
 	String messageRelatedSampleFound = "messageRelatedSampleFound";
 	String messageRestoreNotPossibleAlreadyInEvent = "messageRestoreNotPossibleAlreadyInEvent";
+	String messageReviewChangesAndConfirm = "messageReviewChangesAndConfirm";
 	String messageSampleErrors = "messageSampleErrors";
 	String messageSampleOpened = "messageSampleOpened";
 	String messageSampleSaved = "messageSampleSaved";
@@ -1819,6 +1822,7 @@ public interface Strings {
 	String unsavedChanges_warningTitle = "unsavedChanges.warningTitle";
 	String until = "until";
 	String uuidOf = "uuidOf";
+	String warning = "warning";
 	String warningDashboardMapTooManyMarkers = "warningDashboardMapTooManyMarkers";
 	String warningNetworkDiagramTooManyContacts = "warningNetworkDiagramTooManyContacts";
 	String week = "week";

sormas-api/src/main/java/de/symeda/sormas/api/infrastructure/facility/FacilityFacade.java

@@ -64,7 +64,7 @@ List<FacilityReferenceDto> getByNameAndType(
 		FacilityType type,
 		boolean includeArchivedEntities);
 
-	FacilityReferenceDto getByAddress(String street, String postalCode, String city);
+	FacilityReferenceDto getByAddress(String street, String houseNumber, String postalCode, String city);
 
 	List<FacilityReferenceDto> getLaboratoriesByName(String name, boolean includeArchivedEntities);
 

sormas-api/src/main/java/de/symeda/sormas/api/person/PersonDto.java

@@ -128,6 +128,8 @@ public class PersonDto extends PseudonymizableDto implements IsPerson {
 	public static final String BIRTH_COUNTRY = "birthCountry";
 	public static final String CITIZENSHIP = "citizenship";
 	public static final String ADDITIONAL_DETAILS = "additionalDetails";
+	public static final String IS_EMANCIPATED = "emancipated";
+	public static final String IS_INCAPACITATED = "incapacitated";
 	private static final long serialVersionUID = -8558187171374254398L;
 
 	// Fields are declared in the order they should appear in the import template
@@ -377,6 +379,9 @@ public class PersonDto extends PseudonymizableDto implements IsPerson {
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong)
 	private String additionalDetails;
 
+	private boolean emancipated;
+	private boolean incapacitated;
+
 	@SuppressWarnings("serial")
 	public static class SeveralNonPrimaryContactDetailsException extends RuntimeException {
 
@@ -1031,6 +1036,22 @@ public void setAdditionalDetails(String additionalDetails) {
 		this.additionalDetails = additionalDetails;
 	}
 
+	public boolean isEmancipated() {
+		return emancipated;
+	}
+
+	public void setEmancipated(boolean emancipated) {
+		this.emancipated = emancipated;
+	}
+
+	public boolean isIncapacitated() {
+		return incapacitated;
+	}
+
+	public void setIncapacitated(boolean incapacitated) {
+		this.incapacitated = incapacitated;
+	}
+
 	@Override
 	public String buildCaption() {
 		return buildCaption(firstName, lastName);

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

@@ -1873,7 +1873,7 @@ Person.districtName=District
 Person.educationType=Education
 Person.educationDetails=Details
 Person.fathersName=Father's name
-Person.namesOfGuardians=Names of guardians
+Person.namesOfGuardians=Legal guardian's name
 Person.gestationAgeAtBirth=Gestation age at birth (weeks)
 Person.lastDisease=Last disease
 Person.matchingCase=Matching case
@@ -1916,6 +1916,9 @@ Person.otherSalutation=Other salutation
 Person.birthName=Birth name
 Person.birthCountry=Country of birth
 Person.citizenship=Citizenship
+Person.hasGuardian=Person has a legal guardian (i.e. in case of minors or incapacitated persons)
+Person.incapacitated=Incapacitated (i.e. person will have a legal guardian after 18)
+Person.emancipated=Emancipated (i.e. person is under 18 and does not have a guardian by law)
 personContactDetailOwner=Owner
 personContactDetailOwnerName=Owner name
 personContactDetailThisPerson=This person
@@ -3392,3 +3395,6 @@ selfReportDeletedEnvironments=Deleted self reports
 selfReportSelfReportsList=Self reports list
 selfReportProcess=Process
 
+confirmChangesField=Field:
+confirmChangesValue=Will be changed to:
+

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

@@ -85,6 +85,7 @@ nameOf = Name of %s
 uuidOf = UUID of %s
 listOf = List of %s
 mapOf = Map of <%s , %s>
+warning = Warning
 
 # Aggregate Report
 aggregateReportLegend = %s = %s; %s = %s; %s = %s
@@ -1572,6 +1573,9 @@ messageAdverseEventInvestigationSaved=Adverse event investigation saved
 messagePersonNationalHealthIdInvalid=The entered national health ID does not seem to be correct
 messageSyncUsersFromAuthProviderConfigurationError=Syncing users from authentication provider is not possible because the configuration is incorrect. Please contact an admin and inform them about this issue.
 messageCountriesExcludedFromDataProtection=Countries excluded from data protection for this field:
+messageChangingCaseOutcome=Changing this information will also affect the associated person.
+messageReviewChangesAndConfirm=Please review the changes and confirm them:
+messageChangingPersonPresentCondition = Changing this information will also affect the associated cases.
 
 # Notifications
 notificationCaseClassificationChanged = The classification of case %s has changed to %s.

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

@@ -292,7 +292,7 @@ defaultInfrastructureInvalidParentDistrict = This community is in a different di
 defaultInfrastructureNotRemovableChildCommunity = You have to remove the default community before removing the default district.
 defaultInfrastructureNotRemovableChildDistrict = You have to remove the default district before removing the default region.
 emailTemplateSubjectInvalid=The first line of the email template needs to start with a "#" character followed by at most 50 characters
-customizableEnumValueAllowedCharacters = Value may only consist of uppercase letters, numbers, and the characters "_" and ".".
+customizableEnumValueAllowedCharacters = Value may only consist of uppercase letters, numbers, and the characters "_", "." and "+".
 customizableEnumValueEmptyTranslations = Please select languages and enter captions for all translations in the list.
 customizableEnumValueDuplicateLanguage = Please only add one translation per language.
 customizableEnumValueDuplicateValue = The value %s already exists for data type %s. Enum values have to be unique.

sormas-app/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.100.0</version>
+		<version>1.100.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

sormas-backend/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-        <version>1.100.0</version>
+        <version>1.100.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

sormas-backend/src/main/java/de/symeda/sormas/backend/common/ConfigFacadeEjb.java

@@ -186,9 +186,15 @@ public class ConfigFacadeEjb implements ConfigFacade {
 	private static final String DOCUMENT_UPLOAD_SIZE_LIMIT_MB = "documentUploadSizeLimitMb";
 	public static final int DEFAULT_DOCUMENT_UPLOAD_SIZE_LIMIT_MB = 20;
 	public static final String IMPORT_FILE_SIZE_LIMIT_MB = "importFileSizeLimitMb";
-	public static final int DEFAULT_IMPOR_FILE_SIZE_LIMIT_MB = 20;
+	public static final int DEFAULT_IMPORT_FILE_SIZE_LIMIT_MB = 20;
 	public static final String NEGATIVE_COVID_TESTS_MAX_AGE_DAYS = "negativeCovidTestsMaxAgeDays";
 
+	public static final String MINIMUM_EMANCIPATED_AGE = "minimumEmancipatedAge";
+	public static final int DEFAULT_MINIMUM_EMANCIPATED_AGE = 14;
+
+	public static final String MINIMUM_ADULT_AGE = "minimumAdultAge";
+	public static final int DEFAULT_MINIMUM_ADULT_AGE = 18;
+
 	private final Logger logger = LoggerFactory.getLogger(getClass());
 
 	@Resource(lookup = "sormas/Properties")
@@ -826,7 +832,7 @@ public long getDocumentUploadSizeLimitMb() {
 
 	@Override
 	public long getImportFileSizeLimitMb() {
-		return getLong(IMPORT_FILE_SIZE_LIMIT_MB, DEFAULT_IMPOR_FILE_SIZE_LIMIT_MB);
+		return getLong(IMPORT_FILE_SIZE_LIMIT_MB, DEFAULT_IMPORT_FILE_SIZE_LIMIT_MB);
 	}
 
 	@Override
@@ -844,6 +850,16 @@ public Integer getNegaiveCovidTestsMaxAgeDays() {
 		return parseProperty(NEGATIVE_COVID_TESTS_MAX_AGE_DAYS, null, Integer::parseInt);
 	}
 
+	@Override
+	public long getMinimumEmancipatedAge() {
+		return getLong(MINIMUM_EMANCIPATED_AGE, DEFAULT_MINIMUM_EMANCIPATED_AGE);
+	}
+
+	@Override
+	public long getMinimumAdultAge() {
+		return getLong(MINIMUM_ADULT_AGE, DEFAULT_MINIMUM_ADULT_AGE);
+	}
+
 	@LocalBean
 	@Stateless
 	public static class ConfigFacadeEjbLocal extends ConfigFacadeEjb {

sormas-backend/src/main/java/de/symeda/sormas/backend/infrastructure/facility/FacilityFacadeEjb.java

@@ -333,9 +333,9 @@ public List<FacilityReferenceDto> getByNameAndType(
 	}
 
 	@Override
-	public FacilityReferenceDto getByAddress(String street, String postalCode, String city) {
+	public FacilityReferenceDto getByAddress(String street, String houseNumber, String postalCode, String city) {
 
-		return toReferenceDto(service.getByAddress(street, postalCode, city));
+		return toReferenceDto(service.getByAddress(street, houseNumber, postalCode, city));
 	}
 
 	@Override

sormas-backend/src/main/java/de/symeda/sormas/backend/infrastructure/facility/FacilityService.java

@@ -16,6 +16,7 @@
 package de.symeda.sormas.backend.infrastructure.facility;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.function.BiFunction;
 
 import javax.ejb.EJB;
@@ -200,7 +201,7 @@ public List<Facility> getFacilitiesByNameAndType(
 		return em.createQuery(cq).getResultList();
 	}
 
-	public Facility getByAddress(String street, String postalCode, String city) {
+	public Facility getByAddress(String street, String houseNumber, String postalCode, String city) {
 
 		if (StringUtils.isAnyBlank(street, postalCode, city)) {
 			return null;
@@ -213,6 +214,9 @@ public Facility getByAddress(String street, String postalCode, String city) {
 		Predicate filter = cb.and(
 			createBasicFilter(cb, from),
 			cb.equal(cb.lower(cb.trim(from.get(Facility.STREET))), street.trim().toLowerCase()),
+			cb.equal(
+				cb.lower(cb.trim(from.get(Facility.HOUSE_NUMBER))),
+				Optional.ofNullable(houseNumber).map(s -> s.trim().toLowerCase()).orElse(null)),
 			cb.equal(cb.lower(cb.trim(from.get(Facility.POSTAL_CODE))), postalCode.trim().toLowerCase()),
 			cb.equal(cb.lower(cb.trim(from.get(Facility.CITY))), city.trim().toLowerCase()));
 

sormas-backend/src/main/java/de/symeda/sormas/backend/person/Person.java

@@ -142,6 +142,8 @@ public class Person extends AbstractDomainObject implements IsPerson, HasExterna
 	public static final String IMMUNIZATIONS = "immunizations";
 	public static final String ADDITIONAL_DETAILS = "additionalDetails";
 	public static final String TRAVEL_ENTRIES = "travelEntries";
+	public static final String IS_INCAPACITATED = "isIncapacitated";
+	public static final String IS_EMANCIPATED = "emancipated";
 
 	private String firstName;
 	private String lastName;
@@ -211,6 +213,9 @@ public class Person extends AbstractDomainObject implements IsPerson, HasExterna
 	private Country citizenship;
 	private String additionalDetails;
 
+	private boolean isIncapacitated;
+	private boolean emancipated;
+
 	private List<Case> cases = new ArrayList<>();
 	private List<Contact> contacts = new ArrayList<>();
 	private List<EventParticipant> eventParticipants = new ArrayList<>();
@@ -660,6 +665,24 @@ public void setHasCovidApp(boolean hasCovidApp) {
 		this.hasCovidApp = hasCovidApp;
 	}
 
+	@Column
+	public boolean isIncapacitated() {
+		return isIncapacitated;
+	}
+
+	public void setIncapacitated(boolean incapacitated) {
+		isIncapacitated = incapacitated;
+	}
+
+	@Column
+	public boolean isEmancipated() {
+		return emancipated;
+	}
+
+	public void setEmancipated(boolean emancipated) {
+		this.emancipated = emancipated;
+	}
+
 	@Column
 	public boolean isCovidCodeDelivered() {
 		return covidCodeDelivered;