Merge DocumentFacade and DocumentStorageFacade

Keep separate DocumentService and DocumentStorageService.

Change-Id: Iea3f3e278522affd99e6473fafc408a0284bb2ec

Author: Thomas Broyer

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

@@ -35,7 +35,6 @@
 import de.symeda.sormas.api.disease.DiseaseFacade;
 import de.symeda.sormas.api.docgeneneration.QuarantineOrderFacade;
 import de.symeda.sormas.api.document.DocumentFacade;
-import de.symeda.sormas.api.document.DocumentStorageFacade;
 import de.symeda.sormas.api.epidata.EpiDataFacade;
 import de.symeda.sormas.api.event.EventFacade;
 import de.symeda.sormas.api.event.EventParticipantFacade;
@@ -317,10 +316,6 @@ public static DocumentFacade getDocumentFacade() {
 		return get().lookupEjbRemote(DocumentFacade.class);
 	}
 
-	public static DocumentStorageFacade getDocumentStorageFacade() {
-		return get().lookupEjbRemote(DocumentStorageFacade.class);
-	}
-
 	@SuppressWarnings("unchecked")
 	public <P> P lookupEjbRemote(Class<P> clazz) {
 		try {

sormas-api/src/main/java/de/symeda/sormas/api/document/DocumentFacade.java

@@ -14,6 +14,7 @@
  */
 package de.symeda.sormas.api.document;
 
+import java.io.IOException;
 import java.util.List;
 
 import javax.ejb.Remote;
@@ -23,11 +24,15 @@ public interface DocumentFacade {
 
 	DocumentDto getDocumentByUuid(String uuid);
 
-	DocumentDto saveDocument(DocumentDto dto);
+	DocumentDto saveDocument(DocumentDto dto, byte[] bytes) throws IOException;
 
 	void deleteDocument(String uuid);
 
 	List<DocumentDto> getDocumentsRelatedToEntity(DocumentRelatedEntityType type, String uuid);
 
 	String isExistingDocument(DocumentRelatedEntityType type, String uuid, String name);
+
+	byte[] read(String uuid) throws IOException;
+
+	void cleanupDeletedDocuments();
 }

sormas-api/src/main/java/de/symeda/sormas/api/document/DocumentStorageFacade.java

@@ -34,7 +34,8 @@
 import de.symeda.sormas.backend.caze.CaseFacadeEjb.CaseFacadeEjbLocal;
 import de.symeda.sormas.backend.common.ConfigFacadeEjb.ConfigFacadeEjbLocal;
 import de.symeda.sormas.backend.contact.ContactFacadeEjb.ContactFacadeEjbLocal;
-import de.symeda.sormas.backend.document.DocumentStorageFacadeEjb.DocumentStorageFacadeEjbLocal;
+import de.symeda.sormas.backend.document.DocumentFacadeEjb;
+import de.symeda.sormas.backend.document.DocumentFacadeEjb.DocumentFacadeEjbLocal;
 import de.symeda.sormas.backend.event.EventFacadeEjb.EventFacadeEjbLocal;
 import de.symeda.sormas.backend.feature.FeatureConfigurationFacadeEjb.FeatureConfigurationFacadeEjbLocal;
 import de.symeda.sormas.backend.report.WeeklyReportFacadeEjb.WeeklyReportFacadeEjbLocal;
@@ -63,7 +64,7 @@ public class CronService {
 	@EJB
 	private EventFacadeEjbLocal eventFacade;
 	@EJB
-	private DocumentStorageFacadeEjbLocal documentStorageFacade;
+	private DocumentFacadeEjbLocal documentFacade;
 
 	@Schedule(hour = "*", minute = "*/" + TASK_UPDATE_INTERVAL, second = "0", persistent = false)
 	public void sendNewAndDueTaskMessages() {
@@ -135,6 +136,6 @@ public void archiveEvents() {
 
 	@Schedule(hour = "1", minute = "25", second = "0", persistent = false)
 	public void cleanupDeletedDocuments() {
-		documentStorageFacade.cleanupDeletedDocuments();
+		documentFacade.cleanupDeletedDocuments();
 	}
 }

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

@@ -14,6 +14,7 @@
  */
 package de.symeda.sormas.backend.document;
 
+import java.io.IOException;
 import java.sql.Timestamp;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -45,6 +46,8 @@ public class DocumentFacadeEjb implements DocumentFacade {
 	private UserService userService;
 	@EJB
 	private DocumentService documentService;
+	@EJB
+	private DocumentStorageService documentStorageService;
 
 	@Inject
 	private Event<DocumentSaved> documentSavedEvent;
@@ -55,7 +58,7 @@ public DocumentDto getDocumentByUuid(String uuid) {
 	}
 
 	@Override
-	public DocumentDto saveDocument(DocumentDto dto) {
+	public DocumentDto saveDocument(DocumentDto dto, byte[] content) throws IOException {
 		Document existingDocument = dto.getUuid() == null ? documentService.getByUuid(dto.getUuid()) : null;
 		if (existingDocument != null) {
 			// TODO: add exception message
@@ -66,6 +69,8 @@ public DocumentDto saveDocument(DocumentDto dto) {
 		documentService.persist(document);
 		documentService.doFlush();
 
+		documentStorageService.save(document, content);
+
 		documentSavedEvent.fire(new DocumentSaved(document));
 
 		return toDto(document);
@@ -87,6 +92,21 @@ public String isExistingDocument(DocumentRelatedEntityType type, String uuid, St
 		return documentService.isExisting(type, uuid, name);
 	}
 
+	@Override
+	public byte[] read(String uuid) throws IOException {
+		Document document = documentService.getByUuid(uuid);
+		return documentStorageService.read(document);
+	}
+
+	@Override
+	public void cleanupDeletedDocuments() {
+		List<Document> deleted = documentService.getDeletedDocuments();
+		for (Document document : deleted) {
+			documentStorageService.delete(document);
+			documentService.delete(document);
+		}
+	}
+
 	public Document fromDto(DocumentDto source) {
 		Document target = documentService.getByUuid(source.getUuid());
 		if (target == null) {

sormas-backend/src/main/java/de/symeda/sormas/backend/document/DocumentFacadeEjb.java

@@ -36,7 +36,7 @@
 import de.symeda.sormas.api.ReferenceDto;
 import de.symeda.sormas.api.document.DocumentContext;
 import de.symeda.sormas.api.document.DocumentDto;
-import de.symeda.sormas.api.document.DocumentStorageFacade;
+import de.symeda.sormas.api.document.DocumentFacade;
 import de.symeda.sormas.api.i18n.Captions;
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.i18n.Strings;
@@ -148,9 +148,9 @@ private Button buildDownloadButton(DocumentDto document) {
 		Button viewButton = new Button(VaadinIcons.DOWNLOAD);
 
 		StreamResource streamResource = new StreamResource((StreamResource.StreamSource) () -> {
-			DocumentStorageFacade documentStorageFacade = FacadeProvider.getDocumentStorageFacade();
+			DocumentFacade documentFacade = FacadeProvider.getDocumentFacade();
 			try {
-				return new ByteArrayInputStream(documentStorageFacade.read(document.getUuid()));
+				return new ByteArrayInputStream(documentFacade.read(document.getUuid()));
 			} catch (IOException | IllegalArgumentException e) {
 				new Notification(
 					String.format(I18nProperties.getString(Strings.errorReadingDocument), document),

sormas-backend/src/main/java/de/symeda/sormas/backend/document/DocumentStorageFacadeEjb.java

@@ -126,9 +126,7 @@ private void saveDocument(Upload.SucceededEvent succeededEvent) {
 			document.setRelatedEntityType(relatedEntityType);
 			document.setRelatedEntityUuid(relatedEntityUuid);
 
-			// document metadata must be saved before file can be stored
-			FacadeProvider.getDocumentFacade().saveDocument(document);
-			FacadeProvider.getDocumentStorageFacade().store(document.getUuid(), Files.readAllBytes(file.toPath()));
+			FacadeProvider.getDocumentFacade().saveDocument(document, Files.readAllBytes(file.toPath()));
 
 			callback.run();
 

sormas-ui/src/main/java/de/symeda/sormas/ui/document/DocumentListComponent.java

@@ -1,3 +1,17 @@
+/*
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2020 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.ui;
 
 import de.symeda.sormas.api.ConfigFacade;
@@ -7,7 +21,6 @@
 import de.symeda.sormas.api.caze.classification.CaseClassificationFacade;
 import de.symeda.sormas.api.contact.ContactFacade;
 import de.symeda.sormas.api.document.DocumentFacade;
-import de.symeda.sormas.api.document.DocumentStorageFacade;
 import de.symeda.sormas.api.epidata.EpiDataFacade;
 import de.symeda.sormas.api.event.EventFacade;
 import de.symeda.sormas.api.event.EventParticipantFacade;
@@ -35,7 +48,7 @@
 import de.symeda.sormas.backend.common.ConfigFacadeEjb.ConfigFacadeEjbLocal;
 import de.symeda.sormas.backend.contact.ContactFacadeEjb.ContactFacadeEjbLocal;
 import de.symeda.sormas.backend.document.DocumentFacadeEjb;
-import de.symeda.sormas.backend.document.DocumentStorageFacadeEjb;
+import de.symeda.sormas.backend.document.DocumentFacadeEjb.DocumentFacadeEjbLocal;
 import de.symeda.sormas.backend.epidata.EpiDataFacadeEjb.EpiDataFacadeEjbLocal;
 import de.symeda.sormas.backend.event.EventFacadeEjb.EventFacadeEjbLocal;
 import de.symeda.sormas.backend.event.EventParticipantFacadeEjb.EventParticipantFacadeEjbLocal;
@@ -120,10 +133,7 @@ public <P> P lookupEjbRemote(Class<P> clazz) {
 			return (P) bm.getBean(CaseImportFacadeEjbLocal.class);
 		}
 		if (DocumentFacade.class == clazz) {
-			return (P) bm.getBean(DocumentFacadeEjb.DocumentFacadeEjbLocal.class);
-		}
-		if (DocumentStorageFacade.class == clazz) {
-			return (P) bm.getBean(DocumentStorageFacadeEjb.class);
+			return (P) bm.getBean(DocumentFacadeEjbLocal.class);
 		}
 
 		return null;