Added currentVersion for debugging and give possible error when differ.

Author: flexable777

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

@@ -2,6 +2,7 @@ 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
@@ -49,11 +50,18 @@ class DocumentController(
     @PutMapping("/{documentId}")
     fun updateDocument(
         @PathVariable("documentId") documentId: UUID,
-        @RequestBody json: String
+        @RequestBody(required = false) json: String?,
+        @RequestBody(required = false) input: DocumentUpdateInput?,
     ): DocumentView {
+        val jsonToUse = input?.json ?: json!!
+
         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, jsonToUse)
+        return mapToDocumentView(documentService.updateDocument(
+            documentId = documentId,
+            json = jsonToUse,
+            currentVersion = input?.currentVersion,
+        ))
     }
 
     @Operation(

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/service/DocumentService.kt

@@ -7,6 +7,8 @@ import no.nav.klage.document.repositories.CommentRepository
 import no.nav.klage.document.repositories.DocumentRepository
 import no.nav.klage.document.repositories.DocumentVersionRepository
 import no.nav.klage.document.util.TokenUtil
+import no.nav.klage.document.util.getLogger
+import no.nav.klage.document.util.getSecureLogger
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 import java.time.LocalDateTime
@@ -21,6 +23,12 @@ class DocumentService(
     private val tokenUtil: TokenUtil,
 ) {
 
+    companion object {
+        @Suppress("JAVA_CLASS_ON_COMPANION")
+        private val logger = getLogger(javaClass.enclosingClass)
+        private val secureLogger = getSecureLogger()
+    }
+
     fun createDocument(json: String): DocumentVersion {
         val now = LocalDateTime.now()
 
@@ -43,9 +51,14 @@ class DocumentService(
         )
     }
 
-    fun updateDocument(documentId: UUID, json: String): DocumentVersion {
+    fun updateDocument(documentId: UUID, json: String, currentVersion: Int?): DocumentVersion {
         val now = LocalDateTime.now()
         val latestVersionNumber = documentVersionRepository.findLatestVersionNumber(documentId = documentId)
+
+        if (currentVersion != null && latestVersionNumber != currentVersion) {
+            logger.warn("latest version {} does not match clients current version {}", latestVersionNumber, currentVersion)
+        }
+
         val documentVersion = documentVersionRepository.findByDocumentIdAndVersion(documentId = documentId, version = latestVersionNumber)
         return documentVersionRepository.save(
             DocumentVersion(