Merge remote-tracking branch 'origin/development' into qu-auto/SORQA-482

SORMAS-Foundation · Sep 9, 2022 · 2f43775 · 2f43775
2 parents 7217e48 + 42406d7
commit 2f43775
Show file tree

Hide file tree

Showing 52 changed files with 376 additions and 316 deletions.
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/document/DocumentFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/document/DocumentFacade.java
@@ -38,7 +38,7 @@ public interface DocumentFacade {
 
 	String isExistingDocument(DocumentRelatedEntityType type, String uuid, String name);
 
-	byte[] read(String uuid) throws IOException;
+	byte[] getContent(String uuid) throws IOException;
 
 	void cleanupDeletedDocuments();
 }
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
@@ -769,6 +769,7 @@ public interface Strings {
 	String infoDeveloperOptionsSeedUsage = "infoDeveloperOptionsSeedUsage";
 	String infoDisplayNetworkDiagram = "infoDisplayNetworkDiagram";
 	String infoDocumentAlreadyExists = "infoDocumentAlreadyExists";
+	String infoDocumentOverride = "infoDocumentOverride";
 	String infoDownloadCaseImportTemplate = "infoDownloadCaseImportTemplate";
 	String infoDownloadDocumentTemplateImportGuide = "infoDownloadDocumentTemplateImportGuide";
 	String infoDownloadErrorReport = "infoDownloadErrorReport";

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/person/PersonFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/person/PersonFacade.java
@@ -85,9 +85,5 @@ public interface PersonFacade extends BaseFacade<PersonDto, PersonIndexDto, Pers
 
 	boolean isEnrolledInExternalJournal(String uuid);
 
-	// todo the PersonFacadeEjb has additional pseudonomization methods which causes a
-	// Hibernate LazyInitializationException if this is removed
-	PersonDto getByUuid(String uuid);
-
 	boolean isPersonAssociatedWithNotDeletedEntities(String uuid);
 }
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/user/DefaultUserRole.java b/sormas-api/src/main/java/de/symeda/sormas/api/user/DefaultUserRole.java
@@ -422,6 +422,9 @@ public Set<UserRight> getDefaultUserRights() {
 					TRAVEL_ENTRY_EDIT,
 					TRAVEL_ENTRY_DELETE,
 					TRAVEL_ENTRY_ARCHIVE,
+					DOCUMENT_VIEW,
+					DOCUMENT_UPLOAD,
+					DOCUMENT_DELETE,
 					EXPORT_DATA_PROTECTION_DATA,
 					OUTBREAK_VIEW,
 					OUTBREAK_EDIT,
@@ -532,6 +535,9 @@ public Set<UserRight> getDefaultUserRights() {
 					TRAVEL_ENTRY_CREATE,
 					TRAVEL_ENTRY_EDIT,
 					TRAVEL_ENTRY_DELETE,
+					DOCUMENT_VIEW,
+					DOCUMENT_UPLOAD,
+					DOCUMENT_DELETE,
 					OUTBREAK_VIEW,
 					OUTBREAK_EDIT,
 					SORMAS_REST,
@@ -586,6 +592,8 @@ public Set<UserRight> getDefaultUserRights() {
 					TRAVEL_ENTRY_VIEW,
 					TRAVEL_ENTRY_CREATE,
 					TRAVEL_ENTRY_EDIT,
+					DOCUMENT_VIEW,
+					DOCUMENT_UPLOAD,
 					SORMAS_REST,
 					SORMAS_UI));
 			break;
@@ -662,6 +670,8 @@ public Set<UserRight> getDefaultUserRights() {
 					TRAVEL_ENTRY_VIEW,
 					TRAVEL_ENTRY_CREATE,
 					TRAVEL_ENTRY_EDIT,
+					DOCUMENT_VIEW,
+					DOCUMENT_UPLOAD,
 					SORMAS_REST,
 					SORMAS_UI));
 			break;
@@ -693,6 +703,8 @@ public Set<UserRight> getDefaultUserRights() {
 					TRAVEL_ENTRY_VIEW,
 					TRAVEL_ENTRY_CREATE,
 					TRAVEL_ENTRY_EDIT,
+					DOCUMENT_VIEW,
+					DOCUMENT_UPLOAD,
 					SORMAS_REST,
 					SORMAS_UI));
 			break;
@@ -761,6 +773,8 @@ public Set<UserRight> getDefaultUserRights() {
 					TRAVEL_ENTRY_VIEW,
 					TRAVEL_ENTRY_CREATE,
 					TRAVEL_ENTRY_EDIT,
+					DOCUMENT_VIEW,
+					DOCUMENT_UPLOAD,
 					SORMAS_REST,
 					SORMAS_UI));
 			break;
@@ -804,6 +818,8 @@ public Set<UserRight> getDefaultUserRights() {
 					TRAVEL_ENTRY_VIEW,
 					TRAVEL_ENTRY_CREATE,
 					TRAVEL_ENTRY_EDIT,
+					DOCUMENT_VIEW,
+					DOCUMENT_UPLOAD,
 					SORMAS_REST,
 					SORMAS_UI));
 			break;
@@ -869,6 +885,8 @@ public Set<UserRight> getDefaultUserRights() {
 					TRAVEL_ENTRY_VIEW,
 					TRAVEL_ENTRY_CREATE,
 					TRAVEL_ENTRY_EDIT,
+					DOCUMENT_VIEW,
+					DOCUMENT_UPLOAD,
 					SORMAS_REST,
 					SORMAS_UI));
 			break;
@@ -895,6 +913,7 @@ public Set<UserRight> getDefaultUserRights() {
 					AGGREGATE_REPORT_EDIT,
 					TRAVEL_ENTRY_MANAGEMENT_ACCESS,
 					TRAVEL_ENTRY_VIEW,
+					DOCUMENT_VIEW,
 					OUTBREAK_VIEW,
 					SORMAS_REST,
 					SORMAS_UI));
@@ -945,6 +964,8 @@ public Set<UserRight> getDefaultUserRights() {
 					TRAVEL_ENTRY_VIEW,
 					TRAVEL_ENTRY_CREATE,
 					TRAVEL_ENTRY_EDIT,
+					DOCUMENT_VIEW,
+					DOCUMENT_UPLOAD,
 					SORMAS_REST,
 					SORMAS_UI));
 			break;
@@ -997,6 +1018,8 @@ public Set<UserRight> getDefaultUserRights() {
 					TRAVEL_ENTRY_VIEW,
 					TRAVEL_ENTRY_CREATE,
 					TRAVEL_ENTRY_EDIT,
+					DOCUMENT_VIEW,
+					DOCUMENT_UPLOAD,
 					SORMAS_REST,
 					SORMAS_UI));
 			break;
@@ -1060,6 +1083,8 @@ public Set<UserRight> getDefaultUserRights() {
 					TRAVEL_ENTRY_VIEW,
 					TRAVEL_ENTRY_CREATE,
 					TRAVEL_ENTRY_EDIT,
+					DOCUMENT_VIEW,
+					DOCUMENT_UPLOAD,
 					SORMAS_REST,
 					SORMAS_UI));
 			break;
@@ -1131,6 +1156,8 @@ public Set<UserRight> getDefaultUserRights() {
 					TRAVEL_ENTRY_VIEW,
 					TRAVEL_ENTRY_CREATE,
 					TRAVEL_ENTRY_EDIT,
+					DOCUMENT_VIEW,
+					DOCUMENT_UPLOAD,
 					OUTBREAK_VIEW,
 					SORMAS_REST,
 					SORMAS_UI));
@@ -1158,6 +1185,7 @@ public Set<UserRight> getDefaultUserRights() {
 					AGGREGATE_REPORT_EDIT,
 					TRAVEL_ENTRY_MANAGEMENT_ACCESS,
 					TRAVEL_ENTRY_VIEW,
+					DOCUMENT_VIEW,
 					OUTBREAK_VIEW,
 					SORMAS_REST,
 					SORMAS_UI));
@@ -1274,6 +1302,9 @@ public Set<UserRight> getDefaultUserRights() {
 					TRAVEL_ENTRY_CREATE,
 					TRAVEL_ENTRY_EDIT,
 					TRAVEL_ENTRY_DELETE,
+					DOCUMENT_VIEW,
+					DOCUMENT_UPLOAD,
+					DOCUMENT_DELETE,
 					OUTBREAK_VIEW,
 					OUTBREAK_EDIT,
 					SORMAS_REST,
@@ -1305,6 +1336,8 @@ public Set<UserRight> getDefaultUserRights() {
 					TRAVEL_ENTRY_VIEW,
 					TRAVEL_ENTRY_CREATE,
 					TRAVEL_ENTRY_EDIT,
+					DOCUMENT_VIEW,
+					DOCUMENT_UPLOAD,
 					SORMAS_REST));
 			break;
 		case POE_NATIONAL_USER:
@@ -1345,6 +1378,8 @@ public Set<UserRight> getDefaultUserRights() {
 					TRAVEL_ENTRY_VIEW,
 					TRAVEL_ENTRY_CREATE,
 					TRAVEL_ENTRY_EDIT,
+					DOCUMENT_VIEW,
+					DOCUMENT_UPLOAD,
 					OUTBREAK_VIEW,
 					SORMAS_REST,
 					SORMAS_UI));
@@ -1392,6 +1427,8 @@ public Set<UserRight> getDefaultUserRights() {
 					TRAVEL_ENTRY_VIEW,
 					TRAVEL_ENTRY_CREATE,
 					TRAVEL_ENTRY_EDIT,
+					DOCUMENT_VIEW,
+					DOCUMENT_UPLOAD,
 					OUTBREAK_VIEW,
 					SORMAS_REST,
 					SORMAS_UI));
@@ -1440,6 +1477,7 @@ public Set<UserRight> getDefaultUserRights() {
 					AGGREGATE_REPORT_EDIT,
 					TRAVEL_ENTRY_MANAGEMENT_ACCESS,
 					TRAVEL_ENTRY_VIEW,
+					DOCUMENT_VIEW,
 					OUTBREAK_VIEW,
 					SORMAS_REST,
 					SORMAS_UI));
@@ -1508,6 +1546,8 @@ public Set<UserRight> getDefaultUserRights() {
 					TRAVEL_ENTRY_VIEW,
 					TRAVEL_ENTRY_CREATE,
 					TRAVEL_ENTRY_EDIT,
+					DOCUMENT_VIEW,
+					DOCUMENT_UPLOAD,
 					SORMAS_REST,
 					SORMAS_UI));
 			break;
@@ -1598,6 +1638,8 @@ public Set<UserRight> getDefaultUserRights() {
 					TRAVEL_ENTRY_VIEW,
 					TRAVEL_ENTRY_CREATE,
 					TRAVEL_ENTRY_EDIT,
+					DOCUMENT_VIEW,
+					DOCUMENT_UPLOAD,
 					OUTBREAK_VIEW,
 					OUTBREAK_EDIT,
 					SORMAS_REST,
@@ -1663,7 +1705,7 @@ public UserRoleDto toUserRole() {
 
 		return userRole;
 	}
-	
+
 	public static DefaultUserRole getByCaption(String caption) {
 		Optional<DefaultUserRole> defaultUserRole =
 			Arrays.stream(values()).filter(dur -> dur.name().equals(caption) || I18nProperties.getEnumCaption(dur).equals(caption)).findAny();

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/user/UserRight.java b/sormas-api/src/main/java/de/symeda/sormas/api/user/UserRight.java
@@ -33,7 +33,7 @@ public enum UserRight {
 	CASE_CREATE(UserRightGroup.CASE, UserRight._CASE_VIEW),
 	CASE_EDIT(UserRightGroup.CASE, UserRight._CASE_VIEW),
 	CASE_ARCHIVE(UserRightGroup.CASE, UserRight._CASE_VIEW),
-	CASE_DELETE(UserRightGroup.CASE, UserRight._CASE_VIEW, UserRight._TASK_DELETE, UserRight._SAMPLE_DELETE, UserRight._VISIT_DELETE, UserRight._PERSON_DELETE, UserRight._TREATMENT_DELETE, UserRight._PRESCRIPTION_DELETE, UserRight._CLINICAL_VISIT_DELETE, UserRight._IMMUNIZATION_DELETE),
+	CASE_DELETE(UserRightGroup.CASE, UserRight._CASE_VIEW, UserRight._TASK_DELETE, UserRight._SAMPLE_DELETE, UserRight._VISIT_DELETE, UserRight._PERSON_DELETE, UserRight._TREATMENT_DELETE, UserRight._PRESCRIPTION_DELETE, UserRight._CLINICAL_VISIT_DELETE, UserRight._IMMUNIZATION_DELETE, UserRight._DOCUMENT_DELETE),
 	CASE_IMPORT(UserRightGroup.CASE, UserRight._CASE_VIEW),
 	CASE_EXPORT(UserRightGroup.CASE, UserRight._CASE_VIEW),
 	/*
@@ -86,7 +86,7 @@ public enum UserRight {
 	CONTACT_CREATE(UserRightGroup.CONTACT, UserRight._CONTACT_VIEW),
 	CONTACT_EDIT(UserRightGroup.CONTACT, UserRight._CONTACT_VIEW),
 	CONTACT_ARCHIVE(UserRightGroup.CONTACT, UserRight._CONTACT_VIEW),
-	CONTACT_DELETE(UserRightGroup.CONTACT, UserRight._CONTACT_VIEW, UserRight._TASK_DELETE, UserRight._SAMPLE_DELETE, UserRight._VISIT_DELETE, UserRight._PERSON_DELETE),
+	CONTACT_DELETE(UserRightGroup.CONTACT, UserRight._CONTACT_VIEW, UserRight._TASK_DELETE, UserRight._SAMPLE_DELETE, UserRight._VISIT_DELETE, UserRight._PERSON_DELETE, UserRight._DOCUMENT_DELETE),
 	CONTACT_IMPORT(UserRightGroup.CONTACT, UserRight._CONTACT_VIEW),
 	CONTACT_EXPORT(UserRightGroup.CONTACT, UserRight._CONTACT_VIEW),
 	// users that are allowed to convert a contact to a case need to be allowed to create a case,
@@ -109,14 +109,14 @@ public enum UserRight {
 	TASK_ASSIGN(UserRightGroup.TASK, UserRight._TASK_EDIT),
 
 	ACTION_CREATE(UserRightGroup.EVENT, UserRight._EVENT_VIEW),
-	ACTION_DELETE(UserRightGroup.EVENT, UserRight._EVENT_VIEW),
+	ACTION_DELETE(UserRightGroup.EVENT, UserRight._EVENT_VIEW, UserRight._DOCUMENT_DELETE),
 	ACTION_EDIT(UserRightGroup.EVENT, UserRight._EVENT_VIEW),
 
 	EVENT_VIEW(UserRightGroup.EVENT),
 	EVENT_CREATE(UserRightGroup.EVENT, UserRight._EVENT_VIEW),
 	EVENT_EDIT(UserRightGroup.EVENT, UserRight._EVENT_VIEW),
 	EVENT_ARCHIVE(UserRightGroup.EVENT, UserRight._EVENT_VIEW),
-	EVENT_DELETE(UserRightGroup.EVENT, UserRight._EVENT_VIEW, UserRight._EVENTPARTICIPANT_DELETE, UserRight._TASK_DELETE, UserRight._ACTION_DELETE),
+	EVENT_DELETE(UserRightGroup.EVENT, UserRight._EVENT_VIEW, UserRight._EVENTPARTICIPANT_DELETE, UserRight._TASK_DELETE, UserRight._ACTION_DELETE, UserRight._DOCUMENT_DELETE),
 	EVENT_IMPORT(UserRightGroup.EVENT, UserRight._EVENT_VIEW),
 	EVENT_EXPORT(UserRightGroup.EVENT, UserRight._EVENT_VIEW),
 	PERFORM_BULK_OPERATIONS_EVENT(UserRightGroup.EVENT, UserRight._EVENT_EDIT),
@@ -206,7 +206,11 @@ public enum UserRight {
 	TRAVEL_ENTRY_CREATE(UserRightGroup.TRAVEL_ENTRY, UserRight._TRAVEL_ENTRY_VIEW),
 	TRAVEL_ENTRY_EDIT(UserRightGroup.TRAVEL_ENTRY, UserRight._TRAVEL_ENTRY_VIEW),
 	TRAVEL_ENTRY_ARCHIVE(UserRightGroup.TRAVEL_ENTRY, UserRight._TRAVEL_ENTRY_VIEW),
-	TRAVEL_ENTRY_DELETE(UserRightGroup.TRAVEL_ENTRY, UserRight._TRAVEL_ENTRY_VIEW, UserRight._TASK_DELETE),
+	TRAVEL_ENTRY_DELETE(UserRightGroup.TRAVEL_ENTRY, UserRight._TRAVEL_ENTRY_VIEW, UserRight._TASK_DELETE, UserRight._DOCUMENT_DELETE),
+
+	DOCUMENT_VIEW(UserRightGroup.DOCUMENT),
+	DOCUMENT_UPLOAD(UserRightGroup.DOCUMENT, UserRight._DOCUMENT_VIEW),
+	DOCUMENT_DELETE(UserRightGroup.DOCUMENT, UserRight._DOCUMENT_VIEW),
 
 	PERFORM_BULK_OPERATIONS(UserRightGroup.GENERAL),
 	PERFORM_BULK_OPERATIONS_PSEUDONYM(UserRightGroup.GENERAL),
@@ -404,6 +408,9 @@ public enum UserRight {
 	public static final String _TRAVEL_ENTRY_EDIT = "TRAVEL_ENTRY_EDIT";
 	public static final String _TRAVEL_ENTRY_DELETE = "TRAVEL_ENTRY_DELETE";
 	public static final String _TRAVEL_ENTRY_ARCHIVE = "TRAVEL_ENTRY_ARCHIVE";
+	public static final String _DOCUMENT_VIEW = "DOCUMENT_VIEW";
+	public static final String _DOCUMENT_UPLOAD = "DOCUMENT_UPLOAD";
+	public static final String _DOCUMENT_DELETE = "DOCUMENT_DELETE";
 	public static final String _EXPORT_DATA_PROTECTION_DATA = "EXPORT_DATA_PROTECTION_DATA";
 	public static final String _OUTBREAK_VIEW = "OUTBREAK_VIEW";
 	public static final String _OUTBREAK_EDIT = "OUTBREAK_EDIT";

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/user/UserRightGroup.java b/sormas-api/src/main/java/de/symeda/sormas/api/user/UserRightGroup.java
@@ -40,6 +40,7 @@ public enum UserRightGroup {
 	STATISTICS,
 	USER,
 	INFRASTRUCTURE,
+	DOCUMENT,
 
 	EXPORT,
 	CONFIGURATION,

diff --git a/sormas-api/src/main/resources/enum.properties b/sormas-api/src/main/resources/enum.properties
@@ -1515,6 +1515,9 @@ UserRight.SORMAS_REST = Access Sormas REST
 UserRight.EXTERNAL_VISITS = External visits
 UserRight.SORMAS_UI = Access Sormas UI
 UserRight.DEV_MODE = Access developer options
+UserRight.DOCUMENT_VIEW = View existing documents
+UserRight.DOCUMENT_UPLOAD = Upload documents
+UserRight.DOCUMENT_DELETE = Delete documents from the system
 
 # UserRight descriptions
 UserRight.Desc.CASE_ARCHIVE = Able to archive cases
@@ -1686,6 +1689,9 @@ UserRight.Desc.SORMAS_REST = Able to access the SORMAS REST interface
 UserRight.Desc.EXTERNAL_VISITS = Able to access external visits REST endpoints
 UserRight.Desc.SORMAS_UI = Able to access the SORMAS graphical user interface
 UserRight.Desc.DEV_MODE = Able to access developer options in the configuration directory
+UserRight.Desc.DOCUMENT_VIEW = Able to view existing documents
+UserRight.Desc.DOCUMENT_UPLOAD = Able to upload documents
+UserRight.Desc.DOCUMENT_DELETE = Able to delete documents from the system
 
 # UserRightGroup
 UserRightGroup.GENERAL = General
@@ -1710,6 +1716,7 @@ UserRightGroup.EXTERNAL = External Systems
 UserRightGroup.USER = Users
 UserRightGroup.INFRASTRUCTURE = Infrastructure
 UserRightGroup.CONFIGURATION = Configuration
+UserRightGroup.DOCUMENT = Documents
 
 # Vaccination
 VaccinationStatus.UNKNOWN = Unknown

diff --git a/sormas-api/src/main/resources/strings.properties b/sormas-api/src/main/resources/strings.properties
@@ -767,7 +767,8 @@ infoDefineOutbreaks = Click on a button to define which districts of the region
 infoDetailedExport = Export the rows that are shown in the table below with an extended set of columns. This may take a while.
 infoCaseManagementExport = Export the rows that are shown in the table below with a customized set of columns that are relevant for the case management process. This may take a while.
 infoDisplayNetworkDiagram = Please maximize to view the disease transmission chains
-infoDocumentAlreadyExists = A Document with filename "%s" already exists. Overwrite?
+infoDocumentAlreadyExists = A Document with filename "%s" already exists. Are you sure you want to upload?
+infoDocumentOverride = A Document with filename "%s" already exists. Overwrite?
 infoDownloadDocumentTemplateImportGuide = If this is your first time uploading document templates to SORMAS, we strongly recommend to read the document template guide first.
 infoDownloadExport = The export is being prepared. This may take a while.<br/>You can close this dialog after the download has completed.
 infoDownloadCaseImportTemplate = You can use this template .csv file to bring your data into a format SORMAS can read. Please do this every time you import data, never use a file you have downloaded before.