Store a reference in database to document storage

This reference is the path relative to the documents.path
for the current filesystem-based implementation.

Change-Id: I2e8adfaa8987bd68a199ea4b557d29b6a6b0996d

Author: Thomas Broyer

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

@@ -45,6 +45,7 @@ public class Document extends AbstractDomainObject {
 	private String name;
 	private String contentType;
 	private long size;
+	private String storageReference;
 	private String relatedEntityUuid;
 	private DocumentRelatedEntityType relatedEntityType;
 
@@ -91,6 +92,15 @@ public void setSize(long size) {
 		this.size = size;
 	}
 
+	@Column(name = "storage_reference")
+	public String getStorageReference() {
+		return storageReference;
+	}
+
+	public void setStorageReference(String storageReference) {
+		this.storageReference = storageReference;
+	}
+
 	@Column(name = "relatedentity_uuid")
 	public String getRelatedEntityUuid() {
 		return relatedEntityUuid;

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

@@ -66,11 +66,12 @@ public DocumentDto saveDocument(DocumentDto dto, byte[] content) throws IOExcept
 		}
 
 		Document document = fromDto(dto);
+
+		document.setStorageReference(documentStorageService.save(document, content));
+
 		documentService.persist(document);
 		documentService.doFlush();
 
-		documentStorageService.save(document, content);
-
 		documentSavedEvent.fire(new DocumentSaved(document));
 
 		return toDto(document);
@@ -95,14 +96,14 @@ public String isExistingDocument(DocumentRelatedEntityType type, String uuid, St
 	@Override
 	public byte[] read(String uuid) throws IOException {
 		Document document = documentService.getByUuid(uuid);
-		return documentStorageService.read(document);
+		return documentStorageService.read(document.getStorageReference());
 	}
 
 	@Override
 	public void cleanupDeletedDocuments() {
 		List<Document> deleted = documentService.getDeletedDocuments();
 		for (Document document : deleted) {
-			documentStorageService.delete(document);
+			documentStorageService.delete(document.getStorageReference());
 			documentService.delete(document);
 		}
 	}

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

@@ -29,8 +29,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import de.symeda.sormas.api.ConfigFacade;
-import de.symeda.sormas.backend.common.ConfigFacadeEjb;
 import de.symeda.sormas.backend.common.ConfigFacadeEjb.ConfigFacadeEjbLocal;
 
 @Stateless
@@ -42,25 +40,27 @@ public class DocumentStorageService {
 	@EJB
 	private ConfigFacadeEjbLocal configFacade;
 
-	public byte[] read(Document document) throws IOException {
-		return Files.readAllBytes(computeFilePath(document));
+	public byte[] read(String storageReference) throws IOException {
+		return Files.readAllBytes(Paths.get(configFacade.getDocumentFilesPath(), storageReference));
 	}
 
-	public void save(Document document, byte[] content) throws IOException {
-		Path filePath = computeFilePath(document);
+	public String save(Document document, byte[] content) throws IOException {
+		Path relativePath = computeRelativePath(document);
+		Path filePath = Paths.get(configFacade.getDocumentFilesPath()).resolve(relativePath);
 		Files.createDirectories(filePath.getParent());
 		Files.write(filePath, content, StandardOpenOption.CREATE_NEW, StandardOpenOption.WRITE);
+		return relativePath.toString();
 	}
 
 	/**
 	 * Delete file on disk when a document failed to be saved in database.
 	 */
 	public void cleanupUnsavedDocument(@Observes(during = TransactionPhase.AFTER_FAILURE) DocumentSaved event) {
-		delete(event.getDocument());
+		delete(event.getDocument().getStorageReference());
 	}
 
-	public void delete(Document document) {
-		Path path = computeFilePath(document);
+	public void delete(String storageReference) {
+		Path path = Paths.get(configFacade.getDocumentFilesPath(), storageReference);
 		try {
 			Files.deleteIfExists(path);
 		} catch (IOException e) {
@@ -69,9 +69,8 @@ public void delete(Document document) {
 	}
 
 	@SuppressWarnings("deprecation")
-	private Path computeFilePath(Document document) {
+	private Path computeRelativePath(Document document) {
 		return Paths.get(
-			configFacade.getDocumentFilesPath(),
 			Integer.toString(1900 + document.getCreationDate().getYear()),
 			Integer.toString(1 + document.getCreationDate().getMonth()),
 			Integer.toString(document.getCreationDate().getDate()),

sormas-backend/src/main/resources/sql/sormas_schema.sql

@@ -5565,6 +5565,7 @@ CREATE TABLE documents (
     name character varying(255) NOT NULL,
     contenttype character varying(255) NOT NULL,
     size bigint NOT NULL,
+    storage_reference character varying(255) NOT NULL,
     relatedentity_uuid character varying(36) NOT NULL,
     relatedentity_type character varying(255) NOT NULL,
 

sormas-backend/src/test/java/de/symeda/sormas/backend/document/MockDocumentStorageService.java

@@ -14,7 +14,6 @@
  */
 package de.symeda.sormas.backend.document;
 
-import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
 import javax.enterprise.inject.Specializes;
@@ -23,16 +22,17 @@
 public class MockDocumentStorageService extends DocumentStorageService {
 
 	@Override
-	public byte[] read(Document document) throws IOException {
-		return document.getUuid().getBytes(StandardCharsets.UTF_8);
+	public byte[] read(String storageReference) {
+		return storageReference.getBytes(StandardCharsets.UTF_8);
 	}
 
 	@Override
-	public void save(Document document, byte[] content) throws IOException {
+	public String save(Document document, byte[] content) {
+		return document.getUuid();
 	}
 
 	@Override
-	public void delete(Document document) {
+	public void delete(String storageReference) {
 	}
 
 	@Override