Added comments and basic API

Author: flexable777

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

@@ -0,0 +1,11 @@
+package no.nav.klage.document.api
+
+import java.time.LocalDateTime
+import java.util.*
+
+data class CommentView(
+    val id: UUID,
+    val text: String,
+    val created: LocalDateTime,
+    val modified: LocalDateTime
+)

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

@@ -1,6 +1,7 @@
 package no.nav.klage.document.api
 
 import no.nav.klage.document.util.getLogger
+import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RestController
@@ -21,4 +22,34 @@ class DocumentController() {
         TODO()
     }
 
+    @GetMapping("/documents/{documentId}")
+    fun getDocument(): DocumentView {
+        logger.debug("getDocument")
+        TODO()
+    }
+
+    @PostMapping("/documents/{documentId}/commentthreads")
+    fun createCommentThread() {
+        logger.debug("createCommentThread")
+        TODO()
+    }
+
+    @GetMapping("/documents/{documentId}/commentthreads")
+    fun getAllThreadsWithComments() {
+        logger.debug("getAllThreadsWithComments")
+        TODO()
+    }
+
+    @PostMapping("/documents/{documentId}/commentthreads/{threadId}")
+    fun createCommentInThread() {
+        logger.debug("createCommentInThread")
+        TODO()
+    }
+
+    @GetMapping("/documents/{documentId}/commentthreads/{threadId}")
+    fun getCommentsInThread() {
+        logger.debug("getCommentsInThread")
+        TODO()
+    }
+
 }

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

@@ -5,6 +5,7 @@ import java.util.*
 
 data class DocumentView(
     val id: UUID,
+    val json: String,
     val created: LocalDateTime,
     val modified: LocalDateTime
 )

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

@@ -0,0 +1,43 @@
+package no.nav.klage.document.domain
+
+import java.time.LocalDateTime
+import java.util.*
+import javax.persistence.Column
+import javax.persistence.Entity
+import javax.persistence.Id
+import javax.persistence.Table
+
+@Entity
+@Table(name = "document_comment", schema = "klage")
+class Comment(
+    @Id
+    val id: UUID = UUID.randomUUID(),
+    @Column(name = "document_id")
+    var documentId: UUID,
+    @Column(name = "text")
+    var text: String,
+    @Column(name = "created")
+    val created: LocalDateTime,
+    @Column(name = "modified")
+    var modified: LocalDateTime
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as Comment
+
+        if (id != other.id) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return id.hashCode()
+    }
+
+    override fun toString(): String {
+        return "Comment(id=$id, documentId=$documentId, text='$text', created=$created, modified=$modified)"
+    }
+
+}

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

@@ -0,0 +1,11 @@
+package no.nav.klage.document.repositories
+
+import no.nav.klage.document.domain.Comment
+import org.springframework.data.jpa.repository.JpaRepository
+import java.util.*
+
+interface CommentRepository : JpaRepository<Comment, UUID> {
+
+    fun findByDocumentId(documentId: UUID): List<Comment>
+
+}

src/main/resources/db/migration/V1__Create_baseline.sql

@@ -16,8 +16,19 @@ $$;
 
 CREATE TABLE klage.document
 (
-    id             UUID PRIMARY KEY,
-    json           TEXT      NOT NULL,
-    created        TIMESTAMP NOT NULL,
-    modified       TIMESTAMP NOT NULL
-);
+    id       UUID PRIMARY KEY,
+    json     TEXT      NOT NULL,
+    created  TIMESTAMP NOT NULL,
+    modified TIMESTAMP NOT NULL
+);
+
+CREATE TABLE klage.document_comment
+(
+    id          UUID PRIMARY KEY,
+    document_id UUID REFERENCES klage.document (id),
+    text        TEXT      NOT NULL,
+    created     TIMESTAMP NOT NULL,
+    modified    TIMESTAMP NOT NULL
+);
+
+CREATE INDEX document_comment_ix ON klage.document_comment (document_id);

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

@@ -1,5 +1,6 @@
 package no.nav.klage.document.repositories
 
+import no.nav.klage.document.domain.Comment
 import no.nav.klage.document.domain.Document
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
@@ -16,7 +17,7 @@ import java.time.LocalDateTime
 @DataJpaTest
 @Testcontainers
 @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
-class DocumentRepositoryTest {
+class RepositoryTest {
 
     companion object {
         @Container
@@ -30,8 +31,11 @@ class DocumentRepositoryTest {
     @Autowired
     lateinit var documentRepository: DocumentRepository
 
+    @Autowired
+    lateinit var commentRepository: CommentRepository
+
     @Test
-    fun `add documents works`() {
+    fun `add document and comments work`() {
 
         val now = LocalDateTime.now()
 
@@ -48,6 +52,30 @@ class DocumentRepositoryTest {
 
         val foundDocument = documentRepository.findById(document.id).get()
         assertThat(foundDocument).isEqualTo(document)
+
+        val comment1 = Comment(
+            documentId = document.id,
+            text = "my comment 1",
+            created = now.plusDays(1),
+            modified = now.plusDays(1)
+        )
+
+        val comment2 = Comment(
+            documentId = document.id,
+            text = "my comment 2",
+            created = now.plusDays(2),
+            modified = now.plusDays(2)
+        )
+
+        commentRepository.save(comment1)
+        commentRepository.save(comment2)
+
+        testEntityManager.flush()
+        testEntityManager.clear()
+
+        val comments = commentRepository.findByDocumentId(document.id)
+
+        assertThat(comments).hasSize(2)
     }
 
 }