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

sormas-api/pom.xml

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

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

@@ -8,6 +8,7 @@
 import javax.validation.constraints.NotNull;
 
 import de.symeda.sormas.api.utils.SortProperty;
+import de.symeda.sormas.api.utils.ValidationRuntimeException;
 import de.symeda.sormas.api.utils.criteria.BaseCriteria;
 
 public interface BaseFacade<DTO extends EntityDto, INDEX_DTO extends Serializable, REF_DTO extends ReferenceDto, CRITERIA extends BaseCriteria> {
@@ -29,4 +30,6 @@ public interface BaseFacade<DTO extends EntityDto, INDEX_DTO extends Serializabl
 	List<DTO> getAllAfter(Date date);
 
 	List<String> getObsoleteUuidsSince(Date since);
+
+	void validate(DTO dto) throws ValidationRuntimeException;
 }

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

@@ -44,4 +44,6 @@ public interface CoreFacade<DTO extends EntityDto, INDEX_DTO extends Serializabl
 
 	Date calculateEndOfProcessingDate(String entityUuids);
 
+	EditPermissionType isEditAllowed(String uuid);
+
 }

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

@@ -17,7 +17,6 @@
  *******************************************************************************/
 package de.symeda.sormas.api.caze;
 
-import de.symeda.sormas.api.externalsurveillancetool.ExternalSurveillanceToolException;
 import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.Date;
@@ -33,15 +32,13 @@
 import de.symeda.sormas.api.CaseMeasure;
 import de.symeda.sormas.api.CoreFacade;
 import de.symeda.sormas.api.Disease;
-import de.symeda.sormas.api.EditPermissionType;
 import de.symeda.sormas.api.Language;
 import de.symeda.sormas.api.common.DeletionDetails;
 import de.symeda.sormas.api.common.Page;
 import de.symeda.sormas.api.contact.ContactReferenceDto;
 import de.symeda.sormas.api.event.EventParticipantReferenceDto;
 import de.symeda.sormas.api.externaldata.ExternalDataDto;
 import de.symeda.sormas.api.externaldata.ExternalDataUpdateException;
-import de.symeda.sormas.api.externalsurveillancetool.ExternalSurveillanceToolRuntimeException;
 import de.symeda.sormas.api.followup.FollowUpPeriodDto;
 import de.symeda.sormas.api.importexport.ExportConfigurationDto;
 import de.symeda.sormas.api.infrastructure.district.DistrictDto;
@@ -105,8 +102,6 @@ List<CaseExportDto> getExportList(
 
 	void setSampleAssociationsUnrelatedDisease(EventParticipantReferenceDto sourceEventParticipant, CaseReferenceDto cazeRef);
 
-	void validate(CaseDataDto dto) throws ValidationRuntimeException;
-
 	List<String> getAllActiveUuids();
 
 	List<CaseDataDto> getAllActiveCasesAfter(Date date, Integer batchSize, String lastSynchronizedUuid);
@@ -175,8 +170,6 @@ Long countCasesForMap(
 
 	FollowUpPeriodDto calculateFollowUpUntilDate(CaseDataDto caseDto, boolean ignoreOverwrite);
 
-	EditPermissionType isCaseEditAllowed(String caseUuid);
-
 	List<CaseFollowUpDto> getCaseFollowUpList(
 		CaseCriteria caseCriteria,
 		Date referenceDate,

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

@@ -28,10 +28,9 @@
 
 import de.symeda.sormas.api.CoreFacade;
 import de.symeda.sormas.api.Disease;
-import de.symeda.sormas.api.EditPermissionType;
 import de.symeda.sormas.api.Language;
-import de.symeda.sormas.api.caze.CoreAndPersonDto;
 import de.symeda.sormas.api.caze.CaseReferenceDto;
+import de.symeda.sormas.api.caze.CoreAndPersonDto;
 import de.symeda.sormas.api.common.DeletionDetails;
 import de.symeda.sormas.api.common.Page;
 import de.symeda.sormas.api.dashboard.DashboardContactDto;
@@ -137,12 +136,8 @@ List<ContactFollowUpDto> getContactFollowUpList(
 	 */
 	int getNonSourceCaseCountForDashboard(List<String> caseUuids);
 
-	void validate(ContactDto contact);
-
 	List<SimilarContactDto> getMatchingContacts(ContactSimilarityCriteria criteria);
 
-	EditPermissionType isContactEditAllowed(String contactUuid);
-
 	boolean doesExternalTokenExist(String externalToken, String contactUuid);
 
 	List<ContactDto> getByPersonUuids(List<String> personUuids);

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

@@ -27,14 +27,12 @@
 import javax.validation.constraints.NotNull;
 
 import de.symeda.sormas.api.CoreFacade;
-import de.symeda.sormas.api.EditPermissionType;
 import de.symeda.sormas.api.common.DeletionDetails;
 import de.symeda.sormas.api.common.Page;
 import de.symeda.sormas.api.externaldata.ExternalDataDto;
 import de.symeda.sormas.api.externaldata.ExternalDataUpdateException;
 import de.symeda.sormas.api.infrastructure.region.RegionReferenceDto;
 import de.symeda.sormas.api.utils.SortProperty;
-import de.symeda.sormas.api.utils.ValidationRuntimeException;
 
 @Remote
 public interface EventFacade extends CoreFacade<EventDto, EventIndexDto, EventReferenceDto, EventCriteria> {
@@ -59,8 +57,6 @@ public interface EventFacade extends CoreFacade<EventDto, EventIndexDto, EventRe
 
 	void archiveAllArchivableEvents(int daysAfterEventsGetsArchived);
 
-	EditPermissionType isEventEditAllowed(String eventUuid);
-
 	boolean doesExternalTokenExist(String externalToken, String eventUuid);
 
 	String getUuidByCaseUuidOrPersonUuid(String value);
@@ -73,8 +69,6 @@ public interface EventFacade extends CoreFacade<EventDto, EventIndexDto, EventRe
 
 	List<String> getEventUuidsWithOwnershipHandedOver(List<String> eventUuids);
 
-	void validate(EventDto dto) throws ValidationRuntimeException;
-
 	Set<RegionReferenceDto> getAllRegionsRelatedToEventUuids(List<String> uuids);
 
 	void updateExternalData(@Valid List<ExternalDataDto> externalData) throws ExternalDataUpdateException;

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

@@ -27,7 +27,6 @@
 import javax.validation.constraints.NotNull;
 
 import de.symeda.sormas.api.CoreFacade;
-import de.symeda.sormas.api.EditPermissionType;
 import de.symeda.sormas.api.Language;
 import de.symeda.sormas.api.common.Page;
 import de.symeda.sormas.api.importexport.ExportConfigurationDto;
@@ -57,8 +56,6 @@ Page<EventParticipantIndexDto> getIndexPage(
 
 	List<EventParticipantListEntryDto> getListEntries(EventParticipantCriteria eventParticipantCriteria, Integer first, Integer max);
 
-	void validate(EventParticipantDto eventParticipant);
-
 	Map<String, Long> getContactCountPerEventParticipant(List<String> eventParticipantUuids, EventParticipantCriteria eventParticipantCriteria);
 
 	boolean exists(String personUuid, String eventUUID);
@@ -71,8 +68,6 @@ Page<EventParticipantIndexDto> getIndexPage(
 
 	List<String> getDeletedUuidsSince(Date date);
 
-	EditPermissionType isEventParticipantEditAllowed(String uuid);
-
 	EventParticipantDto getFirst(EventParticipantCriteria eventParticipantCriteria);
 
 	List<EventParticipantExportDto> getExportList(

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

@@ -304,11 +304,14 @@ public interface Strings {
 	String errorReadingTemplate = "errorReadingTemplate";
 	String errorSampleNotEditable = "errorSampleNotEditable";
 	String errorSormasToSormasAccept = "errorSormasToSormasAccept";
+	String errorSormasToSormasAcceptContactsBeforeAcceptSourceCase = "errorSormasToSormasAcceptContactsBeforeAcceptSourceCase";
+	String errorSormasToSormasAcceptContactsWithoutCaseShared = "errorSormasToSormasAcceptContactsWithoutCaseShared";
 	String errorSormasToSormasCertNotGenerated = "errorSormasToSormasCertNotGenerated";
 	String errorSormasToSormasConnection = "errorSormasToSormasConnection";
 	String errorSormasToSormasDecrypt = "errorSormasToSormasDecrypt";
 	String errorSormasToSormasDeleteFromExternalSurveillanceTool = "errorSormasToSormasDeleteFromExternalSurveillanceTool";
 	String errorSormasToSormasEncrypt = "errorSormasToSormasEncrypt";
+	String errorSormasToSormasExistingPendingRequest = "errorSormasToSormasExistingPendingRequest";
 	String errorSormasToSormasInvalidRequestMethod = "errorSormasToSormasInvalidRequestMethod";
 	String errorSormasToSormasLoadShares = "errorSormasToSormasLoadShares";
 	String errorSormasToSormasRequestProcessed = "errorSormasToSormasRequestProcessed";
@@ -317,6 +320,8 @@ public interface Strings {
 	String errorSormasToSormasSend = "errorSormasToSormasSend";
 	String errorSormasToSormasServerAccess = "errorSormasToSormasServerAccess";
 	String errorSormasToSormasShare = "errorSormasToSormasShare";
+	String errorSormasToSormasShareContactWithoutCase = "errorSormasToSormasShareContactWithoutCase";
+	String errorSormasToSormasShareContactWithUnsharedSourceCase = "errorSormasToSormasShareContactWithUnsharedSourceCase";
 	String errorTemplateFileCorrupt = "errorTemplateFileCorrupt";
 	String errorViewNotFound = "errorViewNotFound";
 	String errorWasReported = "errorWasReported";
@@ -654,6 +659,8 @@ public interface Strings {
 	String headingSimilarImmunization = "headingSimilarImmunization";
 	String headingSomeCasesNotDeleted = "headingSomeCasesNotDeleted";
 	String headingSomeEventsNotDeleted = "headingSomeEventsNotDeleted";
+	String headingSormasToSormasCanAcceptContactsWithoutCase = "headingSormasToSormasCanAcceptContactsWithoutCase";
+	String headingSormasToSormasCantShareContactWithoutCase = "headingSormasToSormasCantShareContactWithoutCase";
 	String headingStoppedFollowUp = "headingStoppedFollowUp";
 	String headingSurveillanceReports = "headingSurveillanceReports";
 	String headingSymptomJournalAccountCreation = "headingSymptomJournalAccountCreation";
@@ -1372,6 +1379,7 @@ public interface Strings {
 	String text = "text";
 	String toCase = "toCase";
 	String total = "total";
+	String unexpectedErrorSormasToSormasAccept = "unexpectedErrorSormasToSormasAccept";
 	String unsavedChanges_cancel = "unsavedChanges.cancel";
 	String unsavedChanges_discard = "unsavedChanges.discard";
 	String unsavedChanges_save = "unsavedChanges.save";

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

@@ -161,15 +161,21 @@ public interface Validations {
 	String requiredField = "requiredField";
 	String softAddEntryToList = "softAddEntryToList";
 	String softApproximateAgeTooHigh = "softApproximateAgeTooHigh";
+	String sormasToSormasAcceptCaseBeforeContact = "sormasToSormasAcceptCaseBeforeContact";
+	String sormasToSormasAcceptContactHasNoCase = "sormasToSormasAcceptContactHasNoCase";
+	String sormasToSormasAcceptContactWithoutCaseShared = "sormasToSormasAcceptContactWithoutCaseShared";
 	String sormasToSormasCaseExists = "sormasToSormasCaseExists";
 	String sormasToSormasCommunity = "sormasToSormasCommunity";
 	String sormasToSormasContactCaseNotExists = "sormasToSormasContactCaseNotExists";
+	String sormasToSormasContactCaseNotShared = "sormasToSormasContactCaseNotShared";
 	String sormasToSormasContactExists = "sormasToSormasContactExists";
+	String sormasToSormasContactHasNoCase = "sormasToSormasContactHasNoCase";
 	String sormasToSormasContinent = "sormasToSormasContinent";
 	String sormasToSormasCountry = "sormasToSormasCountry";
 	String sormasToSormasDistrict = "sormasToSormasDistrict";
 	String sormasToSormasEventExists = "sormasToSormasEventExists";
 	String sormasToSormasEventParticipantExists = "sormasToSormasEventParticipantExists";
+	String sormasToSormasExistingPendingRequest = "sormasToSormasExistingPendingRequest";
 	String sormasToSormasExternalMessageExists = "sormasToSormasExternalMessageExists";
 	String sormasToSormasFacility = "sormasToSormasFacility";
 	String sormasToSormasImmunizationExists = "sormasToSormasImmunizationExists";

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

@@ -21,16 +21,13 @@
 import javax.ejb.Remote;
 
 import de.symeda.sormas.api.CoreFacade;
-import de.symeda.sormas.api.EditPermissionType;
 import de.symeda.sormas.api.common.DeletionDetails;
 import de.symeda.sormas.api.common.Page;
 import de.symeda.sormas.api.utils.SortProperty;
 
 @Remote
 public interface ImmunizationFacade extends CoreFacade<ImmunizationDto, ImmunizationIndexDto, ImmunizationReferenceDto, ImmunizationCriteria> {
 
-	void validate(ImmunizationDto immunizationDto);
-
 	List<String> getArchivedUuidsSince(Date since);
 
 	void archiveAllArchivableImmunizations(int daysAfterImmunizationsGetsArchived);
@@ -39,8 +36,6 @@ public interface ImmunizationFacade extends CoreFacade<ImmunizationDto, Immuniza
 
 	List<String> deleteImmunizations(List<String> immunizationUuids, DeletionDetails deletionDetails);
 
-	EditPermissionType isImmunizationEditAllowed(String uuid);
-
 	List<ImmunizationDto> getSimilarImmunizations(ImmunizationSimilarityCriteria criteria);
 
 	void updateImmunizationStatuses();

sormas-api/src/main/java/de/symeda/sormas/api/infrastructure/pointofentry/PointOfEntryFacade.java

@@ -9,11 +9,9 @@
 import de.symeda.sormas.api.infrastructure.InfrastructureFacade;
 import de.symeda.sormas.api.infrastructure.district.DistrictReferenceDto;
 import de.symeda.sormas.api.utils.SortProperty;
-import de.symeda.sormas.api.utils.ValidationRuntimeException;
 
 @Remote
-public interface PointOfEntryFacade
-	extends InfrastructureFacade<PointOfEntryDto, PointOfEntryDto, PointOfEntryReferenceDto, PointOfEntryCriteria> {
+public interface PointOfEntryFacade extends InfrastructureFacade<PointOfEntryDto, PointOfEntryDto, PointOfEntryReferenceDto, PointOfEntryCriteria> {
 
 	/**
 	 * @param includeOthers
@@ -22,8 +20,6 @@ public interface PointOfEntryFacade
 	 */
 	List<PointOfEntryReferenceDto> getAllActiveByDistrict(String districtUuid, boolean includeOthers);
 
-	void validate(PointOfEntryDto pointOfEntry) throws ValidationRuntimeException;
-
 	List<PointOfEntryReferenceDto> getByName(String name, DistrictReferenceDto district, boolean includeArchivedEntities);
 
 	Page<PointOfEntryDto> getIndexPage(PointOfEntryCriteria criteria, Integer offset, Integer size, List<SortProperty> sortProperties);

sormas-api/src/main/java/de/symeda/sormas/api/location/LocationDto.java

@@ -147,12 +147,20 @@ public class LocationDto extends PseudonymizableDto {
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
 	private String facilityDetails;
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong)
+	@PersonalData
+	@SensitiveData
 	private String contactPersonFirstName;
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong)
+	@PersonalData
+	@SensitiveData
 	private String contactPersonLastName;
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong)
+	@PersonalData
+	@SensitiveData
 	private String contactPersonPhone;
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong)
+	@PersonalData
+	@SensitiveData
 	private String contactPersonEmail;
 
 	public String getDetails() {

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

@@ -15,6 +15,8 @@
 
 package de.symeda.sormas.api.sormastosormas;
 
+import de.symeda.sormas.api.caze.CaseReferenceDto;
+import de.symeda.sormas.api.sormastosormas.shareinfo.SormasToSormasShareInfoDto;
 import java.util.List;
 
 import javax.ejb.Remote;

sormas-api/src/main/java/de/symeda/sormas/api/sormastosormas/shareinfo/SormasToSormasShareInfoFacade.java

@@ -15,6 +15,9 @@
 
 package de.symeda.sormas.api.sormastosormas.shareinfo;
 
+import de.symeda.sormas.api.caze.CaseReferenceDto;
+import de.symeda.sormas.api.contact.ContactReferenceDto;
+import de.symeda.sormas.api.event.EventReferenceDto;
 import java.util.List;
 
 import javax.ejb.Remote;
@@ -25,4 +28,10 @@ public interface SormasToSormasShareInfoFacade {
 	List<SormasToSormasShareInfoDto> getIndexList(SormasToSormasShareInfoCriteria criteria, Integer first, Integer max);
 
 	SormasToSormasShareInfoDto getShareInfoByUuid(String uuid);
+
+	SormasToSormasShareInfoDto getCaseShareInfoByOrganization(CaseReferenceDto caze, String organizationId);
+
+	SormasToSormasShareInfoDto getContactShareInfoByOrganization(ContactReferenceDto contact, String organizationId);
+
+	SormasToSormasShareInfoDto getEventShareInfoByOrganization(EventReferenceDto event, String organizationId);
 }

sormas-api/src/main/java/de/symeda/sormas/api/sormastosormas/sharerequest/SormasToSormasShareRequestFacade.java

@@ -15,6 +15,7 @@
 
 package de.symeda.sormas.api.sormastosormas.sharerequest;
 
+import de.symeda.sormas.api.caze.CaseReferenceDto;
 import java.util.List;
 
 import javax.ejb.Remote;
@@ -43,4 +44,6 @@ Page<SormasToSormasShareRequestIndexDto> getIndexPage(
 		Integer offset,
 		Integer size,
 		List<SortProperty> sortProperties);
+
+	List<SormasToSormasShareRequestDto> getShareRequestsForCase(CaseReferenceDto caze);
 }