Moving data to document instead of version.

flexable777 · flexable777 · commit f7ccee794844 · 2024-09-27T10:09:03.000+02:00
diff --git a/src/main/kotlin/no/nav/klage/document/api/DocumentController.kt b/src/main/kotlin/no/nav/klage/document/api/DocumentController.kt
@@ -6,8 +6,6 @@ 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.DocumentVersion
-import no.nav.klage.document.domain.ShortDocumentVersion
 import no.nav.klage.document.service.DocumentService
 import no.nav.klage.document.util.TokenUtil
 import no.nav.klage.document.util.getLogger
@@ -41,7 +39,7 @@ class DocumentController(
     ): DocumentView {
         log("createDocument")
         secureLogger.debug("createDocument: received json: {}", input.json)
-        return mapToDocumentView(documentService.createDocument(json = input.json, data = input.data))
+        return documentService.createDocument(json = input.json, data = input.data)
     }
 
     @Operation(
@@ -62,24 +60,20 @@ class DocumentController(
         )
 
         return try {
-            mapToDocumentView(
-                documentService.updateDocument(
-                    documentId = documentId,
-                    json = input.json,
-                    data = input.data,
-                    currentVersion = input.currentVersion,
-                )
+            documentService.updateDocument(
+                documentId = documentId,
+                json = input.json,
+                data = input.data,
+                currentVersion = input.currentVersion,
             )
+
         } catch (e: Exception) {
             logger.warn("Failed to update document $documentId. Trying one more time.", e)
-
-            mapToDocumentView(
-                documentService.updateDocument(
-                    documentId = documentId,
-                    json = input.json,
-                    data = input.data,
-                    currentVersion = input.currentVersion,
-                )
+            documentService.updateDocument(
+                documentId = documentId,
+                json = input.json,
+                data = input.data,
+                currentVersion = input.currentVersion,
             )
         }
     }
@@ -94,7 +88,7 @@ class DocumentController(
         @PathVariable("version", required = false) version: Int?,
     ): DocumentView {
         log("getDocument called with id $documentId and version $version")
-        return mapToDocumentView(documentService.getDocument(documentId = documentId, version = version))
+        return documentService.getDocument(documentId = documentId, version = version)
     }
 
     @Operation(
@@ -114,34 +108,9 @@ class DocumentController(
     @GetMapping("/{documentId}/versions")
     fun getDocumentVersions(@PathVariable("documentId") documentId: UUID): List<DocumentVersionView> {
         log("getDocumentVersions called with id $documentId")
-        val documentVersions = documentService.getDocumentVersions(documentId = documentId)
-
-        return documentVersions.map {
-            mapToDocumentVersionView(it)
-        }
+        return documentService.getDocumentVersions(documentId = documentId)
     }
 
-    private fun mapToDocumentView(documentVersion: DocumentVersion): DocumentView =
-        DocumentView(
-            id = documentVersion.documentId,
-            documentId = documentVersion.documentId,
-            version = documentVersion.version,
-            json = documentVersion.json,
-            data = documentVersion.data,
-            authorNavIdent = documentVersion.authorNavIdent,
-            created = documentVersion.created,
-            modified = documentVersion.modified
-        )
-
-    private fun mapToDocumentVersionView(documentVersion: ShortDocumentVersion): 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, tokenUtil.getIdentNullable())
diff --git a/src/main/kotlin/no/nav/klage/document/domain/Document.kt b/src/main/kotlin/no/nav/klage/document/domain/Document.kt
@@ -12,6 +12,8 @@ import java.util.*
 class Document(
     @Id
     val id: UUID = UUID.randomUUID(),
+    @Column(name = "data")
+    var data: String?,
     @Column(name = "created")
     val created: LocalDateTime,
     @Column(name = "modified")
@@ -23,9 +25,7 @@ class Document(
 
         other as Document
 
-        if (id != other.id) return false
-
-        return true
+        return id == other.id
     }
 
     override fun hashCode(): Int {
diff --git a/src/main/kotlin/no/nav/klage/document/domain/DocumentVersion.kt b/src/main/kotlin/no/nav/klage/document/domain/DocumentVersion.kt
@@ -14,8 +14,6 @@ class DocumentVersion(
     val version: Int,
     @Column(name = "json")
     var json: String,
-    @Column(name = "data")
-    var data: String?,
     @Column(name = "created")
     val created: LocalDateTime,
     @Column(name = "modified")
@@ -40,7 +38,7 @@ class DocumentVersion(
     }
 
     override fun toString(): String {
-        return "DocumentVersion(documentId=$documentId, version=$version, json='$json', data=$data, created=$created, modified=$modified, authorNavIdent='$authorNavIdent')"
+        return "DocumentVersion(documentId=$documentId, version=$version, json='$json', created=$created, modified=$modified, authorNavIdent='$authorNavIdent')"
     }
 
 }
diff --git a/src/main/kotlin/no/nav/klage/document/service/DocumentService.kt b/src/main/kotlin/no/nav/klage/document/service/DocumentService.kt
@@ -1,5 +1,7 @@
 package no.nav.klage.document.service
 
+import no.nav.klage.document.api.views.DocumentVersionView
+import no.nav.klage.document.api.views.DocumentView
 import no.nav.klage.document.domain.Document
 import no.nav.klage.document.domain.DocumentVersion
 import no.nav.klage.document.domain.DocumentVersionId
@@ -32,30 +34,33 @@ class DocumentService(
         private val secureLogger = getSecureLogger()
     }
 
-    fun createDocument(json: String, data: String?): DocumentVersion {
+    fun createDocument(json: String, data: String?): DocumentView {
         val now = LocalDateTime.now()
 
         val document = documentRepository.save(
             Document(
+                data = data,
                 created = now,
                 modified = now,
             )
         )
 
-        return documentVersionRepository.save(
-            DocumentVersion(
-                documentId = document.id,
-                version = 1,
-                json = json,
-                data = data,
-                authorNavIdent = tokenUtil.getIdent(),
-                created = now,
-                modified = now,
-            )
+        return mapToDocumentView(
+            documentVersionRepository.save(
+                DocumentVersion(
+                    documentId = document.id,
+                    version = 1,
+                    json = json,
+                    authorNavIdent = tokenUtil.getIdent(),
+                    created = now,
+                    modified = now,
+                )
+            ),
+            document = document
         )
     }
 
-    fun updateDocument(documentId: UUID, json: String, data: String?, currentVersion: Int?): DocumentVersion {
+    fun updateDocument(documentId: UUID, json: String, data: String?, currentVersion: Int?): DocumentView {
         val now = LocalDateTime.now()
         val latestVersionNumber = latestDocumentRepository.findById(documentId).get().currentVersion
 
@@ -84,27 +89,32 @@ class DocumentService(
                     version = latestVersionNumber
                 )
             ).get()
-        return documentVersionRepository.save(
-            DocumentVersion(
-                documentId = documentVersion.documentId,
-                version = latestVersionNumber + 1,
-                json = json,
-                data = data,
-                created = now,
-                modified = now,
-                authorNavIdent = tokenUtil.getIdent()
-            )
+        return mapToDocumentView(
+            documentVersion = documentVersionRepository.save(
+                DocumentVersion(
+                    documentId = documentVersion.documentId,
+                    version = latestVersionNumber + 1,
+                    json = json,
+                    created = now,
+                    modified = now,
+                    authorNavIdent = tokenUtil.getIdent()
+                )
+            ),
+            document = documentRepository.findById(documentId).get()
         )
     }
 
-    fun getDocument(documentId: UUID, version: Int?): DocumentVersion {
+    fun getDocument(documentId: UUID, version: Int?): DocumentView {
         val versionToUse = version ?: latestDocumentRepository.findById(documentId).get().currentVersion
-        return documentVersionRepository.findById(
-            DocumentVersionId(
-                documentId = documentId,
-                version = versionToUse
-            )
-        ).get()
+        return mapToDocumentView(
+            documentVersion = documentVersionRepository.findById(
+                DocumentVersionId(
+                    documentId = documentId,
+                    version = versionToUse
+                )
+            ).get(),
+            document = documentRepository.findById(documentId).get()
+        )
     }
 
     fun deleteDocument(documentId: UUID) {
@@ -114,8 +124,30 @@ class DocumentService(
         documentRepository.deleteById(documentId)
     }
 
-    fun getDocumentVersions(documentId: UUID): List<ShortDocumentVersion> {
+    fun getDocumentVersions(documentId: UUID): List<DocumentVersionView> {
         return documentVersionRepository.findVersionsByDocumentId(documentId = documentId)
+            .map { mapToDocumentVersionView(it) }
     }
 
+    private fun mapToDocumentView(documentVersion: DocumentVersion, document: Document): DocumentView =
+        DocumentView(
+            id = documentVersion.documentId,
+            documentId = documentVersion.documentId,
+            version = documentVersion.version,
+            json = documentVersion.json,
+            data = document.data,
+            authorNavIdent = documentVersion.authorNavIdent,
+            created = documentVersion.created,
+            modified = documentVersion.modified
+        )
+
+    private fun mapToDocumentVersionView(documentVersion: ShortDocumentVersion): DocumentVersionView =
+        DocumentVersionView(
+            documentId = documentVersion.documentId,
+            version = documentVersion.version,
+            authorNavIdent = documentVersion.authorNavIdent,
+            created = documentVersion.created,
+            modified = documentVersion.modified
+        )
+
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -7,27 +7,25 @@ spring:
     throw-exception-if-no-handler-found: true
   lifecycle:
     timeout-per-shutdown-phase: 20s
-  servlet:
-    multipart:
-      max-request-size: 8MB
-      max-file-size: 8MB
   codec:
-    max-in-memory-size: 16MB
+    max-in-memory-size: 32MB
   datasource:
     url: jdbc:postgresql://${NAIS_DATABASE_KABAL_SMART_EDITOR_API_KABAL_SMART_EDITOR_API_HOST}:${NAIS_DATABASE_KABAL_SMART_EDITOR_API_KABAL_SMART_EDITOR_API_PORT}/${NAIS_DATABASE_KABAL_SMART_EDITOR_API_KABAL_SMART_EDITOR_API_DATABASE}
     username: ${NAIS_DATABASE_KABAL_SMART_EDITOR_API_KABAL_SMART_EDITOR_API_USERNAME}
     password: ${NAIS_DATABASE_KABAL_SMART_EDITOR_API_KABAL_SMART_EDITOR_API_PASSWORD}
     driver-class-name: org.postgresql.Driver
   flyway:
     enabled: true
-    clean-on-validation-error: true
+    clean-on-validation-error: false
     schemas: flyway_history_schema,klage
   sql:
     init:
       platform: postgresql
   web:
     resources:
       add-mappings: false
+  jpa:
+    open-in-view: false
 
 server:
   port: 7095
diff --git a/src/main/resources/db/migration/V7__Move_data.sql b/src/main/resources/db/migration/V7__Move_data.sql
@@ -0,0 +1,7 @@
+ALTER TABLE klage.document_version
+    DROP COLUMN data
+;
+
+ALTER TABLE klage.document
+    ADD COLUMN data TEXT
+;
diff --git a/src/test/kotlin/no/nav/klage/document/repositories/RepositoryTest.kt b/src/test/kotlin/no/nav/klage/document/repositories/RepositoryTest.kt

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,6 @@ class DocumentVersion(`
`14`	`14`	`val version: Int,`
`15`	`15`	`@Column(name = "json")`
`16`	`16`	`var json: String,`
`17`		`- @Column(name = "data")`
`18`		`- var data: String?,`
`19`	`17`	`@Column(name = "created")`
`20`	`18`	`val created: LocalDateTime,`
`21`	`19`	`@Column(name = "modified")`
`@@ -40,7 +38,7 @@ class DocumentVersion(`
`40`	`38`	`}`
`41`	`39`
`42`	`40`	`override fun toString(): String {`
`43`		`- return "DocumentVersion(documentId=$documentId, version=$version, json='$json', data=$data, created=$created, modified=$modified, authorNavIdent='$authorNavIdent')"`
	`41`	`+ return "DocumentVersion(documentId=$documentId, version=$version, json='$json', created=$created, modified=$modified, authorNavIdent='$authorNavIdent')"`
`44`	`42`	`}`
`45`	`43`
`46`	`44`	`}`