Delete document

Author: flexable777

src/main/kotlin/no/nav/klage/document/api/DocumentController.kt

@@ -52,7 +52,7 @@ class DocumentController(
         @PathVariable("documentId") documentId: UUID,
         @RequestBody json: String
     ): DocumentView {
-        logger.debug("updateDocument: received json: {}", json)
+        logger.debug("updateDocument with id {}: received json: {}", documentId, json)
         return mapToDocumentView(documentService.updateDocument(documentId, json))
     }
 
@@ -62,10 +62,20 @@ class DocumentController(
     )
     @GetMapping("/{documentId}")
     fun getDocument(@PathVariable("documentId") documentId: UUID): DocumentView {
-        logger.debug("getDocument")
+        logger.debug("getDocument with id {}", documentId)
         return mapToDocumentView(documentService.getDocument(documentId))
     }
 
+    @ApiOperation(
+        value = "Delete document",
+        notes = "Delete document"
+    )
+    @DeleteMapping("/{documentId}")
+    fun deleteDocument(@PathVariable("documentId") documentId: UUID) {
+        logger.debug("deleteDocument with id {}", documentId)
+        documentService.deleteDocument(documentId)
+    }
+
     @ApiOperation(
         value = "Create comment for a given document",
         notes = "Create comment for a given document"

src/main/kotlin/no/nav/klage/document/repositories/CommentRepository.kt

@@ -11,4 +11,6 @@ interface CommentRepository : JpaRepository<Comment, UUID> {
      */
     fun findByDocumentIdAndParentCommentIdIsNullOrderByCreatedAsc(documentId: UUID): List<Comment>
 
+    fun deleteByDocumentId(documentId: UUID)
+
 }

src/main/kotlin/no/nav/klage/document/service/DocumentService.kt

@@ -3,6 +3,7 @@ package no.nav.klage.document.service
 import no.nav.klage.document.clients.KabalJsonToPdfClient
 import no.nav.klage.document.domain.Document
 import no.nav.klage.document.domain.PDFDocument
+import no.nav.klage.document.repositories.CommentRepository
 import no.nav.klage.document.repositories.DocumentRepository
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
@@ -13,6 +14,7 @@ import java.util.*
 @Transactional
 class DocumentService(
     private val documentRepository: DocumentRepository,
+    private val commentRepository: CommentRepository,
     private val kabalJsonToPdfClient: KabalJsonToPdfClient
 ) {
 
@@ -42,4 +44,9 @@ class DocumentService(
         return kabalJsonToPdfClient.getPDFDocument(documentRepository.getById(documentId).json)
     }
 
+    fun deleteDocument(documentId: UUID) {
+        commentRepository.deleteByDocumentId(documentId)
+        documentRepository.deleteById(documentId)
+    }
+
 }

src/test/kotlin/no/nav/klage/document/repositories/RepositoryTest.kt

@@ -93,6 +93,14 @@ class RepositoryTest {
 
         assertThat(comments.first().comments).hasSize(2)
         assertThat(comments.first().comments.first()).isEqualTo(comment2)
+
+        commentRepository.deleteByDocumentId(document.id)
+        documentRepository.deleteById(document.id)
+
+        testEntityManager.flush()
+        testEntityManager.clear()
+
+        assertThat(documentRepository.findAll()).isEmpty()
     }
 
 }