Merge branch 'refs/heads/main' into add-data

oyvind-wedoe · oyvind-wedoe · commit 136885c1219d · 2024-09-05T22:33:50.000+02:00
# Conflicts:
#	src/main/kotlin/no/nav/klage/document/service/CommentService.kt
diff --git a/src/main/kotlin/no/nav/klage/document/service/CommentService.kt b/src/main/kotlin/no/nav/klage/document/service/CommentService.kt
@@ -1,5 +1,6 @@
 package no.nav.klage.document.service
 
+import no.nav.klage.document.api.views.CommentView
 import no.nav.klage.document.domain.Comment
 import no.nav.klage.document.exceptions.MissingAccessException
 import no.nav.klage.document.repositories.CommentRepository
@@ -89,6 +90,6 @@ class CommentService(private val commentRepository: CommentRepository) {
         )
         commentRepository.delete(comment)
 
-        return commentCopy
+        return comment
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package no.nav.klage.document.service`
`2`	`2`
	`3`	`+import no.nav.klage.document.api.views.CommentView`
`3`	`4`	`import no.nav.klage.document.domain.Comment`
`4`	`5`	`import no.nav.klage.document.exceptions.MissingAccessException`
`5`	`6`	`import no.nav.klage.document.repositories.CommentRepository`
`@@ -89,6 +90,6 @@ class CommentService(private val commentRepository: CommentRepository) {`
`89`	`90`	`)`
`90`	`91`	`commentRepository.delete(comment)`
`91`	`92`
`92`		`- return commentCopy`
	`93`	`+ return comment`
`93`	`94`	`}`
`94`	`95`	`}`