Merge pull request #156 from navikt/versions

Support for versions.

Author: flexable777

deploy/nais.yaml

@@ -66,9 +66,6 @@ spec:
       rules:
         - application: kabal-frontend
         - application: kabal-api
-    outbound:
-      rules:
-        - application: kabal-json-to-pdf
   azure:
     application:
       enabled: true

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

@@ -2,18 +2,16 @@ package no.nav.klage.document.api
 
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag
+import no.nav.klage.document.api.views.DocumentUpdateInput
+import no.nav.klage.document.api.views.DocumentVersionView
 import no.nav.klage.document.api.views.DocumentView
 import no.nav.klage.document.config.SecurityConfiguration.Companion.ISSUER_AAD
-import no.nav.klage.document.domain.Document
+import no.nav.klage.document.domain.DocumentVersion
 import no.nav.klage.document.service.DocumentService
+import no.nav.klage.document.util.TokenUtil
 import no.nav.klage.document.util.getLogger
 import no.nav.klage.document.util.getSecureLogger
 import no.nav.security.token.support.core.api.ProtectedWithClaims
-import no.nav.security.token.support.core.context.TokenValidationContextHolder
-import org.springframework.http.HttpHeaders
-import org.springframework.http.HttpStatus
-import org.springframework.http.MediaType
-import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
 import java.util.*
 
@@ -23,7 +21,7 @@ import java.util.*
 @RequestMapping("/documents")
 class DocumentController(
     private val documentService: DocumentService,
-    private val tokenValidationContextHolder: TokenValidationContextHolder
+    private val tokenUtil: TokenUtil,
 ) {
 
     companion object {
@@ -52,21 +50,28 @@ class DocumentController(
     @PutMapping("/{documentId}")
     fun updateDocument(
         @PathVariable("documentId") documentId: UUID,
-        @RequestBody json: String
+        @RequestBody(required = false) input: DocumentUpdateInput,
     ): DocumentView {
         log("updateDocument called with id $documentId")
-        secureLogger.debug("updateDocument with id {}: received json: {}", documentId, json)
-        return mapToDocumentView(documentService.updateDocument(documentId, json))
+        secureLogger.debug("updateDocument with id {}: current version: {} received json: {}", documentId, input.currentVersion, input.json)
+        return mapToDocumentView(documentService.updateDocument(
+            documentId = documentId,
+            json = input.json,
+            currentVersion = input.currentVersion,
+        ))
     }
 
     @Operation(
         summary = "Get document",
         description = "Get document"
     )
-    @GetMapping("/{documentId}")
-    fun getDocument(@PathVariable("documentId") documentId: UUID): DocumentView {
-        log("getDocument called with id $documentId")
-        return mapToDocumentView(documentService.getDocument(documentId))
+    @GetMapping("/{documentId}", "/{documentId}/versions/{version}")
+    fun getDocument(
+        @PathVariable("documentId") documentId: UUID,
+        @PathVariable("version", required = false) version: Int?,
+    ): DocumentView {
+        log("getDocument called with id $documentId and version $version")
+        return mapToDocumentView(documentService.getDocument(documentId = documentId, version = version))
     }
 
     @Operation(
@@ -80,43 +85,42 @@ class DocumentController(
     }
 
     @Operation(
-        summary = "Generer PDF",
-        description = "Generer PDF"
+        summary = "Get document versions",
+        description = "Get document versions"
     )
-    @ResponseBody
-    @GetMapping("/{documentId}/pdf")
-    fun getDocumentAsPDF(
-        @PathVariable("documentId") documentId: UUID
-    ): ResponseEntity<ByteArray> {
-        log("getDocumentAsPDF with id : $documentId")
-
-        val pdfDocument = documentService.getDocumentAsPDF(documentId)
+    @GetMapping("/{documentId}/versions")
+    fun getDocumentVersions(@PathVariable("documentId") documentId: UUID): List<DocumentVersionView> {
+        log("getDocumentVersions called with id $documentId")
+        val documentVersions = documentService.getDocumentVersions(documentId = documentId)
 
-        val responseHeaders = HttpHeaders()
-        responseHeaders.contentType = MediaType.APPLICATION_PDF
-        responseHeaders.add("Content-Disposition", "inline; filename=${pdfDocument.filename}.pdf")
-        return ResponseEntity(
-            pdfDocument.bytes,
-            responseHeaders,
-            HttpStatus.OK
-        )
+        return documentVersions.map {
+            mapToDocumentVersionView(it)
+        }
     }
 
-    private fun mapToDocumentView(document: Document): DocumentView =
+    private fun mapToDocumentView(documentVersion: DocumentVersion): DocumentView =
         DocumentView(
-            id = document.id,
-            json = document.json,
-            created = document.created,
-            modified = document.modified
+            id = documentVersion.documentId,
+            documentId = documentVersion.documentId,
+            version = documentVersion.version,
+            json = documentVersion.json,
+            authorNavIdent = documentVersion.authorNavIdent,
+            created = documentVersion.created,
+            modified = documentVersion.modified
+        )
+
+    private fun mapToDocumentVersionView(documentVersion: DocumentVersion): DocumentVersionView =
+        DocumentVersionView(
+            documentId = documentVersion.documentId,
+            version = documentVersion.version,
+            authorNavIdent = documentVersion.authorNavIdent,
+            created = documentVersion.created,
+            modified = documentVersion.modified
         )
 
     private fun log(message: String) {
         logger.debug(message)
-        secureLogger.debug("{}. On-behalf-of: {}", message, getIdent())
+        secureLogger.debug("{}. On-behalf-of: {}", message, tokenUtil.getIdent())
     }
 
-    fun getIdent(): String? =
-        tokenValidationContextHolder.tokenValidationContext.getJwtToken(ISSUER_AAD)
-            .jwtTokenClaims?.get("NAVident")?.toString()
-
 }

src/main/kotlin/no/nav/klage/document/api/views/DocumentUpdateInput.kt

@@ -0,0 +1,6 @@
+package no.nav.klage.document.api.views
+
+data class DocumentUpdateInput(
+    val json: String,
+    val currentVersion: Int?,
+)

src/main/kotlin/no/nav/klage/document/api/views/DocumentView.kt

@@ -4,8 +4,19 @@ import java.time.LocalDateTime
 import java.util.*
 
 data class DocumentView(
-    val id: UUID,
     val json: String,
+    val documentId: UUID,
+    val id: UUID,
+    val version: Int,
+    val authorNavIdent: String?,
     val created: LocalDateTime,
     val modified: LocalDateTime
 )
+
+data class DocumentVersionView(
+    val documentId: UUID,
+    val version: Int,
+    val authorNavIdent: String?,
+    val created: LocalDateTime,
+    val modified: LocalDateTime,
+)

src/main/kotlin/no/nav/klage/document/clients/KabalJsonToPdfClient.kt

@@ -12,12 +12,10 @@ import java.util.*
 class Document(
     @Id
     val id: UUID = UUID.randomUUID(),
-    @Column(name = "json")
-    var json: String,
     @Column(name = "created")
     val created: LocalDateTime,
     @Column(name = "modified")
-    var modified: LocalDateTime
+    var modified: LocalDateTime,
 ) {
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -35,7 +33,7 @@ class Document(
     }
 
     override fun toString(): String {
-        return "Document(id=$id, json='$json', created=$created, modified=$modified)"
+        return "Document(id=$id, created=$created, modified=$modified)"
     }
 
 }

src/main/kotlin/no/nav/klage/document/config/KabalJsonToPdfClientConfiguration.kt

@@ -0,0 +1,48 @@
+package no.nav.klage.document.domain
+
+import jakarta.persistence.Column
+import jakarta.persistence.Entity
+import jakarta.persistence.Id
+import jakarta.persistence.IdClass
+import jakarta.persistence.Table
+import java.time.LocalDateTime
+import java.util.*
+
+@Entity
+@Table(name = "document_version", schema = "klage")
+@IdClass(DocumentVersionId::class)
+class DocumentVersion(
+    @Id
+    val documentId: UUID,
+    @Id
+    val version: Int,
+    @Column(name = "json")
+    var json: String,
+    @Column(name = "created")
+    val created: LocalDateTime,
+    @Column(name = "modified")
+    var modified: LocalDateTime,
+    @Column(name = "author_nav_ident")
+    var authorNavIdent: String,
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as DocumentVersion
+
+        if (documentId != other.documentId) return false
+        if (version != other.version) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return documentId.hashCode()
+    }
+
+    override fun toString(): String {
+        return "Document(id=$documentId, version=$version, json='$json', created=$created, modified=$modified, authorNavIdent='$authorNavIdent')"
+    }
+
+}

src/main/kotlin/no/nav/klage/document/domain/Document.kt

@@ -0,0 +1,11 @@
+package no.nav.klage.document.domain
+
+import jakarta.persistence.Embeddable
+import java.io.Serializable
+import java.util.*
+
+@Embeddable
+data class DocumentVersionId(
+    val documentId: UUID,
+    val version: Int = 1,
+): Serializable