Fix OOM

build.gradle.kts

@@ -41,7 +41,6 @@ dependencies {
     implementation("org.postgresql:postgresql")
 
     implementation("io.micrometer:micrometer-registry-prometheus")
-    implementation("io.micrometer:micrometer-tracing-bridge-brave")
 
     implementation("ch.qos.logback:logback-classic")
     implementation("net.logstash.logback:logstash-logback-encoder:$logstashVersion")

deploy/nais.yaml

@@ -48,10 +48,10 @@ spec:
     timeout: 1
   resources:
     limits:
-      memory: 1024Mi
+      memory: 2024Mi
     requests:
-      cpu: 40m
-      memory: 256Mi
+      cpu: 80m
+      memory: 1024Mi
   ingresses:
   {{#each ingresses as |ingress|}}
     - {{ingress}}

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

@@ -6,7 +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.service.DocumentService
 import no.nav.klage.document.util.TokenUtil
 import no.nav.klage.document.util.getLogger
@@ -40,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(
@@ -61,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,
             )
         }
     }
@@ -93,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(
@@ -113,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: 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, tokenUtil.getIdentNullable())

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 {

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,8 +38,19 @@ 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')"
     }
 
-
 }
+
+/**
+ * Using this when we don't need the full DocumentVersion object, just a subset of the fields.
+ * Otherwise, we would have to fetch the full object from the database and that's too much data.
+ */
+data class ShortDocumentVersion(
+    val documentId: UUID,
+    val version: Int,
+    val authorNavIdent: String,
+    val created: LocalDateTime,
+    val modified: LocalDateTime,
+)

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

@@ -2,12 +2,24 @@ package no.nav.klage.document.repositories
 
 import no.nav.klage.document.domain.DocumentVersion
 import no.nav.klage.document.domain.DocumentVersionId
+import no.nav.klage.document.domain.ShortDocumentVersion
 import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Query
 import java.util.*
 
 interface DocumentVersionRepository : JpaRepository<DocumentVersion, DocumentVersionId> {
 
     fun findByDocumentId(documentId: UUID): List<DocumentVersion>
 
+    @Query(
+        """
+        SELECT new no.nav.klage.document.domain.ShortDocumentVersion(documentId, version, authorNavIdent, created, modified)
+        FROM DocumentVersion
+        WHERE documentId = :documentId
+        ORDER BY version
+        """
+    )
+    fun findVersionsByDocumentId(documentId: UUID): List<ShortDocumentVersion>
+
     fun deleteByDocumentId(documentId: UUID)
 }

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

@@ -1,8 +1,11 @@
 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
+import no.nav.klage.document.domain.ShortDocumentVersion
 import no.nav.klage.document.repositories.CommentRepository
 import no.nav.klage.document.repositories.DocumentRepository
 import no.nav.klage.document.repositories.DocumentVersionRepository
@@ -31,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
 
@@ -83,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) {
@@ -113,8 +124,30 @@ class DocumentService(
         documentRepository.deleteById(documentId)
     }
 
-    fun getDocumentVersions(documentId: UUID): List<DocumentVersion> {
-        return documentVersionRepository.findByDocumentId(documentId = documentId).sortedBy { it.version }
+    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
+        )
+
 }

src/main/resources/application-dev-gcp.yml

@@ -1,4 +1,4 @@
 spring:
   datasource:
     hikari:
-      maximum-pool-size: 5
+      maximum-pool-size: 4