Get in order

Author: flexable777

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

@@ -26,6 +26,7 @@ class Comment(
     @JoinColumn(name = "parent_comment_id", referencedColumnName = "id")
     @Fetch(FetchMode.SELECT)
     @BatchSize(size = 100)
+    @OrderBy("created asc")
     val comments: MutableSet<Comment> = mutableSetOf(),
     @Column(name = "created")
     val created: LocalDateTime,

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

@@ -9,6 +9,6 @@ interface CommentRepository : JpaRepository<Comment, UUID> {
     /**
      * Only find parent comments
      */
-    fun findByDocumentIdAndParentCommentIdIsNull(documentId: UUID): List<Comment>
+    fun findByDocumentIdAndParentCommentIdIsNullOrderByCreatedAsc(documentId: UUID): List<Comment>
 
 }

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

@@ -47,7 +47,7 @@ class CommentService(private val commentRepository: CommentRepository) {
     }
 
     fun getComments(documentId: UUID): List<Comment> {
-        return commentRepository.findByDocumentIdAndParentCommentIdIsNull(documentId)
+        return commentRepository.findByDocumentIdAndParentCommentIdIsNullOrderByCreatedAsc(documentId)
     }
 
     fun getComment(commentId: UUID): Comment {

src/test/kotlin/no/nav/klage/document/repositories/RepositoryTest.kt

@@ -65,22 +65,34 @@ class RepositoryTest {
         val comment2 = Comment(
             documentId = document.id,
             parentCommentId = comment1.id,
-            text = "my sub comment 2",
+            text = "my sub comment 1",
             authorName = "Kajsa Anka",
             authorIdent = "Z654321",
             created = now.plusDays(2),
             modified = now.plusDays(2)
         )
 
+        val comment3 = Comment(
+            documentId = document.id,
+            parentCommentId = comment1.id,
+            text = "my sub comment 2",
+            authorName = "Kajsa Anka",
+            authorIdent = "Z654321",
+            created = now.plusDays(3),
+            modified = now.plusDays(3)
+        )
+
         commentRepository.save(comment1)
         commentRepository.save(comment2)
+        commentRepository.save(comment3)
 
         testEntityManager.flush()
         testEntityManager.clear()
 
-        val comments = commentRepository.findByDocumentIdAndParentCommentIdIsNull(document.id)
+        val comments = commentRepository.findByDocumentIdAndParentCommentIdIsNullOrderByCreatedAsc(document.id)
 
-        assertThat(comments.first().comments).hasSize(1)
+        assertThat(comments.first().comments).hasSize(2)
+        assertThat(comments.first().comments.first()).isEqualTo(comment2)
     }
 
 }