Merge pull request #40 from volo-db/document-del-route

Document del route

Author: fabian-urner

src/main/java/dev/urner/volodb/exception/VolunteerDocumentNotFoundException.java

@@ -0,0 +1,7 @@
+package dev.urner.volodb.exception;
+
+public class VolunteerDocumentNotFoundException extends RuntimeException {
+  public VolunteerDocumentNotFoundException(String message) {
+    super(message);
+  }
+}

src/main/java/dev/urner/volodb/rest/VolunteerRestController.java

@@ -216,6 +216,19 @@ public VolunteerDocument postNewDocument(
     return volunteerService.saveDocument(document, documentTypeId, volunteerId, documentName, principal.getUsername());
   }
 
+  @PatchMapping("/{volunteerId}/documents/{documentId}")
+  public VolunteerDocument deleteDocument(@PathVariable int volunteerId, @PathVariable int documentId,
+      @RequestBody Map<String, Object> fields) {
+
+    return volunteerService.updateDocument(documentId, volunteerId, fields);
+  }
+
+  @DeleteMapping("/{volunteerId}/documents/{documentId}")
+  public String deleteDocument(@PathVariable int volunteerId, @PathVariable int documentId) {
+
+    return volunteerService.deleteDocument(documentId, volunteerId);
+  }
+
   // **********************************
   // Exceptionhandling:
   // **********************************

src/main/java/dev/urner/volodb/service/FileService.java

@@ -10,6 +10,7 @@
 import io.minio.MakeBucketArgs;
 import io.minio.MinioClient;
 import io.minio.PutObjectArgs;
+import io.minio.RemoveObjectArgs;
 import lombok.RequiredArgsConstructor;
 
 @Service
@@ -47,4 +48,15 @@ public void saveFile(MultipartFile file, String bucket, String object) {
       throw new RuntimeException(e.getMessage());
     }
   }
+
+  public void deleteFile(String bucket, String object) {
+    try {
+      minioClient.removeObject(RemoveObjectArgs.builder()
+          .bucket(bucket)
+          .object(object)
+          .build());
+    } catch (Exception e) {
+      throw new RuntimeException(e.getMessage());
+    }
+  }
 }

src/main/java/dev/urner/volodb/service/VolunteerDocumentService.java

@@ -3,15 +3,11 @@
 import java.util.Map;
 import java.util.List;
 
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
 import dev.urner.volodb.dao.VolunteerDocumentDAO;
 import dev.urner.volodb.entity.VolunteerDocument;
-import dev.urner.volodb.entity.VolunteerNote;
-import dev.urner.volodb.exception.ContactTypeNotFoundException;
 import dev.urner.volodb.exception.DocumentNotFoundException;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
@@ -52,7 +48,7 @@ public VolunteerDocument update(int documentId, Map<String, Object> fields) {
 
   @Transactional
   public void deleteById(int documentId) {
-    documentTypeService.deleteById(documentId);
+    volunteerDocumentDAO.deleteById(documentId);
   }
 
   public List<VolunteerDocument> findAllByVolunteerId(int volunteerId, String sortField, boolean descending,

src/main/java/dev/urner/volodb/service/VolunteerService.java

@@ -4,7 +4,9 @@
 import dev.urner.volodb.entity.Gender;
 import dev.urner.volodb.entity.Volunteer;
 import dev.urner.volodb.entity.VolunteerDocument;
+import dev.urner.volodb.entity.VolunteerDocumentType;
 import dev.urner.volodb.entity.Enums.OngoingLegalProceedingsState;
+import dev.urner.volodb.exception.VolunteerDocumentNotFoundException;
 import dev.urner.volodb.exception.VolunteerInvalidFormatException;
 import dev.urner.volodb.exception.VolunteerNotFoundException;
 
@@ -278,4 +280,44 @@ public VolunteerDocument saveDocument(MultipartFile file, int documentTypeId, in
     return volunteerDocumentService.save(voloDoc);
   }
 
+  public VolunteerDocument updateDocument(int documentId, int volunteerId, Map<String, Object> fields) {
+
+    VolunteerDocument dbDocument = volunteerDocumentService.findById(documentId);
+
+    if (dbDocument == null)
+      throw new VolunteerDocumentNotFoundException("Document with Id " + documentId + " not found.");
+
+    fields.forEach((key, value) -> {
+
+      // Name
+      if (key.toLowerCase() == "name") {
+        dbDocument.setName(value.toString());
+      }
+
+      // documentType
+      if (key.toLowerCase().equals("documenttype")) {
+        VolunteerDocumentType dbType = volunteerDocumentTypeService.findById(Integer.parseInt(value.toString()));
+        dbDocument.setDocumentType(dbType);
+      }
+
+    });
+
+    return volunteerDocumentService.save(dbDocument);
+  }
+
+  public String deleteDocument(int documentId, int volunteerId) {
+    VolunteerDocument dbDocument = volunteerDocumentService.findById(documentId);
+
+    if (dbDocument.getVolunteerId() != volunteerId)
+      throw new VolunteerInvalidFormatException("Volunteer do not have a document with this id.");
+
+    String bucket = dbDocument.getPath().split("/")[0];
+    String object = dbDocument.getPath().replace(bucket + "/", "");
+
+    volunteerDocumentService.deleteById(documentId);
+    fileService.deleteFile(bucket, object);
+
+    return "File with Id " + documentId + " deleted.";
+  }
+
 }