Load less data when getting versions. Getting OOM otherwise.

Author: flexable777

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

@@ -7,6 +7,7 @@ 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
@@ -132,7 +133,7 @@ class DocumentController(
             modified = documentVersion.modified
         )
 
-    private fun mapToDocumentVersionView(documentVersion: DocumentVersion): DocumentVersionView =
+    private fun mapToDocumentVersionView(documentVersion: ShortDocumentVersion): DocumentVersionView =
         DocumentVersionView(
             documentId = documentVersion.documentId,
             version = documentVersion.version,

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

@@ -43,5 +43,16 @@ class DocumentVersion(
         return "DocumentVersion(documentId=$documentId, version=$version, json='$json', data=$data, 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

@@ -3,6 +3,7 @@ package no.nav.klage.document.service
 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
@@ -113,8 +114,8 @@ class DocumentService(
         documentRepository.deleteById(documentId)
     }
 
-    fun getDocumentVersions(documentId: UUID): List<DocumentVersion> {
-        return documentVersionRepository.findByDocumentId(documentId = documentId).sortedBy { it.version }
+    fun getDocumentVersions(documentId: UUID): List<ShortDocumentVersion> {
+        return documentVersionRepository.findVersionsByDocumentId(documentId = documentId)
     }
 
 }