From 95dc840b965fe8f3f554f53afa6e092308baa420 Mon Sep 17 00:00:00 2001
From: Illia Kovalov <ikovalyov85@gmail.com>
Date: Sun, 21 Jul 2024 20:57:47 +0200
Subject: [PATCH] 107-comments-crud: closes #107

---
 .../com.github.ikovalyov.model/Article.kt     |  30 ++---
 .../com.github.ikovalyov.model/Comment.kt     |  23 ++--
 .../markers/IEditable.kt                      |   7 +-
 .../kotlin/com/github/ikovalyov/Api.kt        |  11 +-
 .../model/service/TemplateService.kt          |   2 +-
 .../model/service/UserService.kt              |   4 +-
 .../com.github.ikovalyov/routes/Index.kt      |  33 ++++--
 .../application/api/ArticlesController.kt     |  12 +-
 .../application/api/CommentsController.kt     |  63 +++++++++++
 .../application/api/TagsController.kt         |   2 +-
 .../application/api/TemplateController.kt     |   2 +-
 .../application/api/UserRolesController.kt    |   4 +-
 .../application/api/UsersApiController.kt     |   2 +-
 ...rticleConverter.kt => ArticleConverter.kt} |  40 +------
 .../dynamodb/converter/CommentConverter.kt    |  27 +++++
 .../repository/AbstractKeyValueRepository.kt  |   5 +-
 .../dynamodb/repository/ArticlesRepository.kt |  50 +++++++-
 .../repository/ConfigurationsRepository.kt    |   5 +-
 .../dynamodb/repository/CrudRepository.kt     |  18 +--
 .../dynamodb/repository/RecordsRepository.kt  |   5 +-
 .../dynamodb/repository/TagsRepository.kt     |   5 +-
 .../repository/TemplatesRepository.kt         |   5 +-
 .../dynamodb/repository/UsersRepository.kt    |  20 ++--
 .../repository/articles/CommentsRepository.kt |  37 ++++++
 .../dynamodb/repository/repositories.md       |   6 +
 .../{ => users}/UserRolesRepository.kt        |   7 +-
 .../infrastructure/service/UserService.kt     |   2 -
 .../application/api/ArticlesControllerTest.kt | 107 ++++++++++++++++++
 .../repository/UserRolesRepositoryTest.kt     |  40 -------
 29 files changed, 401 insertions(+), 173 deletions(-)
 create mode 100644 src/jvmMain/kotlin/com/github/ikovalyov/application/api/CommentsController.kt
 rename src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/converter/{DynamodbArticleConverter.kt => ArticleConverter.kt} (54%)
 create mode 100644 src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/converter/CommentConverter.kt
 create mode 100644 src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/articles/CommentsRepository.kt
 create mode 100644 src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/repositories.md
 rename src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/{ => users}/UserRolesRepository.kt (92%)
 create mode 100644 src/jvmTest/kotlin/com/github/ikovalyov/application/api/ArticlesControllerTest.kt
 delete mode 100644 src/jvmTest/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/UserRolesRepositoryTest.kt

diff --git a/src/commonMain/kotlin/com.github.ikovalyov.model/Article.kt b/src/commonMain/kotlin/com.github.ikovalyov.model/Article.kt
index f7929761..5a205245 100644
--- a/src/commonMain/kotlin/com.github.ikovalyov.model/Article.kt
+++ b/src/commonMain/kotlin/com.github.ikovalyov.model/Article.kt
@@ -5,7 +5,6 @@ package com.github.ikovalyov.model
 import com.benasher44.uuid.Uuid
 import com.benasher44.uuid.uuidFrom
 import com.github.ikovalyov.model.markers.IEditable
-import com.github.ikovalyov.model.security.User
 import com.github.ikovalyov.model.serializer.UuidSerializer
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers
@@ -13,18 +12,7 @@ import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 
 @Serializable
-data class Article(
-    override val id: Uuid,
-    val name: String,
-    val abstract: String,
-    val body: String,
-    val author: User,
-    val tags: List<String>?,
-    val meta: List<String>?,
-    val template: Template?, // Template uuid
-    val userList: List<User>,
-    val templateList: List<Template>,
-) : IEditable {
+data class Article(override val id: Uuid, val name: String, val abstract: String, val body: String, val author: Uuid, val tags: List<String>?, val meta: List<String>?, val template: Uuid?) : IEditable {
     override fun getMetadata(): List<IEditable.EditableMetadata<*, Article>> = listOf(
         IEditable.EditableMetadata(
             fieldType = IEditable.FieldType.Id,
@@ -102,12 +90,10 @@ data class Article(
             fieldType = IEditable.FieldType.Author,
             readOnly = false,
             serialize = {
-                it.id.toString()
+                it.toString()
             },
             deserialize = { uuid ->
-                userList.first {
-                    it.id.toString() == uuid
-                }
+                uuidFrom(uuid)
             },
             update = {
                 copy(author = it)
@@ -116,7 +102,7 @@ data class Article(
                 author
             },
             fieldName = "Author",
-            predefinedList = userList,
+            predefinedList = null,
         ),
         IEditable.EditableMetadata(
             fieldType = IEditable.FieldType.Tags,
@@ -158,12 +144,10 @@ data class Article(
             fieldType = IEditable.FieldType.Template,
             readOnly = false,
             serialize = {
-                it.id.toString()
+                it.toString()
             },
             deserialize = { uuid ->
-                templateList.first {
-                    it.id.toString() == uuid
-                }
+                uuidFrom(uuid)
             },
             update = {
                 copy(template = it)
@@ -172,7 +156,7 @@ data class Article(
                 template
             },
             fieldName = "Template",
-            predefinedList = templateList,
+            predefinedList = null,
         ),
     )
 
diff --git a/src/commonMain/kotlin/com.github.ikovalyov.model/Comment.kt b/src/commonMain/kotlin/com.github.ikovalyov.model/Comment.kt
index a200608d..55689ecb 100644
--- a/src/commonMain/kotlin/com.github.ikovalyov.model/Comment.kt
+++ b/src/commonMain/kotlin/com.github.ikovalyov.model/Comment.kt
@@ -5,7 +5,6 @@ package com.github.ikovalyov.model
 import com.benasher44.uuid.Uuid
 import com.benasher44.uuid.uuidFrom
 import com.github.ikovalyov.model.markers.IEditable
-import com.github.ikovalyov.model.security.User
 import com.github.ikovalyov.model.serializer.UuidSerializer
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers
@@ -13,7 +12,7 @@ import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 
 @Serializable
-data class Comment(override val id: Uuid, val body: String, val author: User, val article: Article, val userList: List<User>, val articleList: List<Article>) : IEditable {
+data class Comment(override val id: Uuid, val body: String, val author: Uuid, val article: Uuid) : IEditable {
     override fun getMetadata(): List<IEditable.EditableMetadata<*, out IEditable>> = listOf(
         IEditable.EditableMetadata(
             fieldType = IEditable.FieldType.Id,
@@ -35,7 +34,7 @@ data class Comment(override val id: Uuid, val body: String, val author: User, va
         ),
         IEditable.EditableMetadata(
             fieldType = IEditable.FieldType.Body,
-            readOnly = true,
+            readOnly = false,
             serialize = {
                 it
             },
@@ -55,12 +54,10 @@ data class Comment(override val id: Uuid, val body: String, val author: User, va
             fieldType = IEditable.FieldType.Author,
             readOnly = false,
             serialize = {
-                it.id.toString()
+                it.toString()
             },
             deserialize = { uuid ->
-                userList.first {
-                    it.id.toString() == uuid
-                }
+                uuidFrom(uuid)
             },
             update = {
                 copy(author = it)
@@ -69,18 +66,16 @@ data class Comment(override val id: Uuid, val body: String, val author: User, va
                 author
             },
             fieldName = "Author",
-            predefinedList = userList,
+            predefinedList = null,
         ),
         IEditable.EditableMetadata(
             fieldType = IEditable.FieldType.Article,
             readOnly = false,
             serialize = {
-                it.id.toString()
+                it.toString()
             },
             deserialize = { uuid ->
-                articleList.first {
-                    it.id.toString() == uuid
-                }
+                uuidFrom(uuid)
             },
             update = {
                 copy(article = it)
@@ -88,8 +83,8 @@ data class Comment(override val id: Uuid, val body: String, val author: User, va
             get = {
                 article
             },
-            fieldName = "Author",
-            predefinedList = articleList,
+            fieldName = "Article",
+            predefinedList = null,
         ),
     )
 
diff --git a/src/commonMain/kotlin/com.github.ikovalyov.model/markers/IEditable.kt b/src/commonMain/kotlin/com.github.ikovalyov.model/markers/IEditable.kt
index a2f941fc..a303b27c 100644
--- a/src/commonMain/kotlin/com.github.ikovalyov.model/markers/IEditable.kt
+++ b/src/commonMain/kotlin/com.github.ikovalyov.model/markers/IEditable.kt
@@ -1,7 +1,6 @@
 package com.github.ikovalyov.model.markers
 
 import com.benasher44.uuid.Uuid
-import com.github.ikovalyov.model.security.User
 import kotlinx.datetime.Instant
 
 interface IEditable {
@@ -18,7 +17,7 @@ interface IEditable {
 
     sealed class FieldType<T : Any> {
         object Id : FieldType<Uuid>()
-        object Author : FieldType<User>()
+        object Author : FieldType<Uuid>()
         object LastModified : FieldType<Instant>()
         object Body : FieldType<String>()
         object Name : FieldType<String>()
@@ -30,8 +29,8 @@ interface IEditable {
         object StringListFiledType : FieldType<List<String>>()
         object Tags : FieldType<List<String>>()
         object Metadata : FieldType<List<String>>()
-        object Template : FieldType<com.github.ikovalyov.model.Template>()
-        object Article : FieldType<com.github.ikovalyov.model.Article>()
+        object Template : FieldType<Uuid>()
+        object Article : FieldType<Uuid>()
     }
 
     val id: Uuid
diff --git a/src/commonMain/kotlin/com/github/ikovalyov/Api.kt b/src/commonMain/kotlin/com/github/ikovalyov/Api.kt
index 86c0224e..50b48357 100644
--- a/src/commonMain/kotlin/com/github/ikovalyov/Api.kt
+++ b/src/commonMain/kotlin/com/github/ikovalyov/Api.kt
@@ -1,13 +1,14 @@
 package com.github.ikovalyov
 
 object Api {
-    const val ARTICLE_API_URL = "/application/api/article"
-    const val TAG_API_URL = "/application/api/tag"
-    const val TEMPLATE_API_URL = "/application/api/template"
+    const val ARTICLES_API_URL = "/application/api/articles"
+    const val COMMENTS_API_URL = "/application/api/comments"
+    const val TAGS_API_URL = "/application/api/tags"
+    const val TEMPLATES_API_URL = "/application/api/templates"
     const val RECORDS_API_URL = "/application/api/records"
     const val VIEWS_API_URL = "/application/api/views"
-    const val USER_ROLE_API_URL = "/application/api/user-role"
-    const val USER_API_URL = "/application/api/user"
+    const val USER_ROLES_API_URL = "/application/api/user-roles"
+    const val USERS_API_URL = "/application/api/users"
     const val USER_URL = "/application/user"
     const val BACKEND_ENDPOINT = "http://localhost:8082"
     const val FRONTEND_ENDPOINT = "http://localhost:8080"
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/model/service/TemplateService.kt b/src/jsMain/kotlin/com.github.ikovalyov/model/service/TemplateService.kt
index c6e51e75..a36a55e8 100644
--- a/src/jsMain/kotlin/com.github.ikovalyov/model/service/TemplateService.kt
+++ b/src/jsMain/kotlin/com.github.ikovalyov/model/service/TemplateService.kt
@@ -16,7 +16,7 @@ class TemplateService {
     suspend fun getAllTemplates(): List<Template> {
         val result = kotlin.runCatching {
             val result = window.fetch(
-                Api.BACKEND_ENDPOINT + Api.TEMPLATE_API_URL,
+                Api.BACKEND_ENDPOINT + Api.TEMPLATES_API_URL,
                 RequestInit(
                     credentials = RequestCredentials.INCLUDE,
                 ),
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/model/service/UserService.kt b/src/jsMain/kotlin/com.github.ikovalyov/model/service/UserService.kt
index 498c1c43..8e4a4c51 100644
--- a/src/jsMain/kotlin/com.github.ikovalyov/model/service/UserService.kt
+++ b/src/jsMain/kotlin/com.github.ikovalyov/model/service/UserService.kt
@@ -18,7 +18,7 @@ class UserService {
     suspend fun getAllUsers(): List<User> {
         val result = kotlin.runCatching {
             val result = window.fetch(
-                Api.BACKEND_ENDPOINT + Api.USER_API_URL,
+                Api.BACKEND_ENDPOINT + Api.USERS_API_URL,
                 RequestInit(
                     credentials = RequestCredentials.INCLUDE,
                 ),
@@ -36,7 +36,7 @@ class UserService {
 
     suspend fun getUser(userId: Uuid): User {
         val result = window.fetch(
-            Api.BACKEND_ENDPOINT + Api.USER_API_URL + "/$userId",
+            Api.BACKEND_ENDPOINT + Api.USERS_API_URL + "/$userId",
             RequestInit(
                 credentials = RequestCredentials.INCLUDE,
             ),
diff --git a/src/jsMain/kotlin/com.github.ikovalyov/routes/Index.kt b/src/jsMain/kotlin/com.github.ikovalyov/routes/Index.kt
index c1e2f0e8..c7ee6cbd 100644
--- a/src/jsMain/kotlin/com.github.ikovalyov/routes/Index.kt
+++ b/src/jsMain/kotlin/com.github.ikovalyov/routes/Index.kt
@@ -3,6 +3,7 @@ package com.github.ikovalyov.routes
 import com.benasher44.uuid.uuid4
 import com.github.ikovalyov.Api
 import com.github.ikovalyov.model.Article
+import com.github.ikovalyov.model.Comment
 import com.github.ikovalyov.model.Tag
 import com.github.ikovalyov.model.Template
 import com.github.ikovalyov.model.security.Email
@@ -67,7 +68,7 @@ val Index = FC<IndexProps> { props ->
                     decodeItems = {
                         Json.decodeFromString(ListSerializer(Template.serializer()), it)
                     }
-                    apiUri = Api.TEMPLATE_API_URL
+                    apiUri = Api.TEMPLATES_API_URL
                     factory = {
                         Template(id = uuid4(), "", "")
                     }
@@ -80,7 +81,7 @@ val Index = FC<IndexProps> { props ->
                     decodeItems = {
                         Json.decodeFromString(ListSerializer(UserRole.serializer()), it)
                     }
-                    apiUri = Api.USER_ROLE_API_URL
+                    apiUri = Api.USER_ROLES_API_URL
                     factory = {
                         UserRole(uuid4(), Clock.System.now(), "")
                     }
@@ -93,7 +94,7 @@ val Index = FC<IndexProps> { props ->
                     decodeItems = {
                         Json.decodeFromString(ListSerializer(User.serializer()), it)
                     }
-                    apiUri = Api.USER_API_URL
+                    apiUri = Api.USERS_API_URL
                     factory = {
                         User(
                             uuid4(),
@@ -113,19 +114,17 @@ val Index = FC<IndexProps> { props ->
                     decodeItems = {
                         Json.decodeFromString(ListSerializer(Article.serializer()), it)
                     }
-                    apiUri = Api.ARTICLE_API_URL
+                    apiUri = Api.ARTICLES_API_URL
                     factory = {
                         Article(
                             id = uuid4(),
                             name = "",
                             abstract = "",
                             body = "",
-                            author = currentUser,
+                            author = currentUser.id,
                             tags = emptyList(),
                             meta = emptyList(),
                             template = null,
-                            userList = props.userList,
-                            templateList = props.templateList,
                         )
                     }
                     header = "Articles"
@@ -137,7 +136,7 @@ val Index = FC<IndexProps> { props ->
                     decodeItems = {
                         Json.decodeFromString(ListSerializer(Tag.serializer()), it)
                     }
-                    apiUri = Api.TAG_API_URL
+                    apiUri = Api.TAGS_API_URL
                     factory = {
                         Tag(
                             id = uuid4(),
@@ -146,6 +145,24 @@ val Index = FC<IndexProps> { props ->
                     }
                     header = "Tags"
                 }
+                crudComponent {
+                    decodeItem = {
+                        Json.decodeFromString(Comment.serializer(), it)
+                    }
+                    decodeItems = {
+                        Json.decodeFromString(ListSerializer(Comment.serializer()), it)
+                    }
+                    apiUri = Api.COMMENTS_API_URL
+                    factory = {
+                        Comment(
+                            id = uuid4(),
+                            body = "",
+                            author = currentUser.id,
+                            article = uuid4(),
+                        )
+                    }
+                    header = "Comments"
+                }
             }
         }
     }
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/application/api/ArticlesController.kt b/src/jvmMain/kotlin/com/github/ikovalyov/application/api/ArticlesController.kt
index a5ba23ac..5c762755 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/application/api/ArticlesController.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/application/api/ArticlesController.kt
@@ -18,7 +18,7 @@ import io.micronaut.security.rules.SecurityRule
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.Json
 
-@Controller(Api.ARTICLE_API_URL)
+@Controller(Api.ARTICLES_API_URL)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 class ArticlesController(private val articlesRepository: ArticlesRepository) {
     @Get
@@ -32,9 +32,8 @@ class ArticlesController(private val articlesRepository: ArticlesRepository) {
 
     @Post("/")
     @Consumes(MediaType.APPLICATION_JSON)
-    suspend fun insert(@Body item: String): HttpResponse<Nothing> {
-        val article = Json.decodeFromString(Article.serializer(), item)
-        val result = articlesRepository.insert(article)
+    suspend fun insert(@Body item: Article): HttpResponse<Nothing> {
+        val result = articlesRepository.insert(item)
         return if (result) {
             HttpResponse.accepted()
         } else {
@@ -53,9 +52,8 @@ class ArticlesController(private val articlesRepository: ArticlesRepository) {
     }
 
     @Patch
-    suspend fun update(@Body item: String): HttpResponse<Nothing> {
-        val article = Json.decodeFromString(Article.serializer(), item)
-        val result = articlesRepository.update(article)
+    suspend fun update(@Body item: Article): HttpResponse<Nothing> {
+        val result = articlesRepository.update(item)
         return if (result) {
             HttpResponse.accepted()
         } else {
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/application/api/CommentsController.kt b/src/jvmMain/kotlin/com/github/ikovalyov/application/api/CommentsController.kt
new file mode 100644
index 00000000..0863ae40
--- /dev/null
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/application/api/CommentsController.kt
@@ -0,0 +1,63 @@
+package com.github.ikovalyov.application.api
+
+import com.benasher44.uuid.Uuid
+import com.github.ikovalyov.Api
+import com.github.ikovalyov.infrastructure.dynamodb.repository.articles.CommentsRepository
+import com.github.ikovalyov.model.Comment
+import io.micronaut.http.HttpResponse
+import io.micronaut.http.MediaType
+import io.micronaut.http.annotation.Body
+import io.micronaut.http.annotation.Consumes
+import io.micronaut.http.annotation.Controller
+import io.micronaut.http.annotation.Delete
+import io.micronaut.http.annotation.Get
+import io.micronaut.http.annotation.Patch
+import io.micronaut.http.annotation.Post
+import io.micronaut.security.annotation.Secured
+import io.micronaut.security.rules.SecurityRule
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.json.Json
+
+@Controller(Api.COMMENTS_API_URL)
+@Secured(SecurityRule.IS_AUTHENTICATED)
+class CommentsController(private val commentsRepository: CommentsRepository) {
+    @Get
+    suspend fun list(): String = Json.encodeToString(ListSerializer(Comment.serializer()), commentsRepository.list())
+
+    @Get("{id}")
+    suspend fun get(id: Uuid): String? {
+        val comment = commentsRepository.get(id) ?: return null
+        return Json.encodeToString(Comment.serializer(), comment)
+    }
+
+    @Post("/")
+    @Consumes(MediaType.APPLICATION_JSON)
+    suspend fun insert(@Body comment: Comment): HttpResponse<Nothing> {
+        val result = commentsRepository.insert(comment)
+        return if (result) {
+            HttpResponse.accepted()
+        } else {
+            HttpResponse.notFound()
+        }
+    }
+
+    @Delete("/{itemId}")
+    suspend fun delete(itemId: Uuid): HttpResponse<Nothing> {
+        val result = commentsRepository.delete(itemId)
+        return if (result) {
+            HttpResponse.accepted()
+        } else {
+            HttpResponse.notFound()
+        }
+    }
+
+    @Patch
+    suspend fun update(@Body comment: Comment): HttpResponse<Nothing> {
+        val result = commentsRepository.update(comment)
+        return if (result) {
+            HttpResponse.accepted()
+        } else {
+            HttpResponse.notFound()
+        }
+    }
+}
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/application/api/TagsController.kt b/src/jvmMain/kotlin/com/github/ikovalyov/application/api/TagsController.kt
index 52f8a22e..6350083f 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/application/api/TagsController.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/application/api/TagsController.kt
@@ -18,7 +18,7 @@ import io.micronaut.security.rules.SecurityRule
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.Json
 
-@Controller(Api.TAG_API_URL)
+@Controller(Api.TAGS_API_URL)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 class TagsController(private val tagsRepository: TagsRepository) {
     @Get
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/application/api/TemplateController.kt b/src/jvmMain/kotlin/com/github/ikovalyov/application/api/TemplateController.kt
index acbded15..5268b567 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/application/api/TemplateController.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/application/api/TemplateController.kt
@@ -17,7 +17,7 @@ import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.Json
 import mu.KotlinLogging
 
-@Controller(Api.TEMPLATE_API_URL)
+@Controller(Api.TEMPLATES_API_URL)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 class TemplateController(private val templatesRepository: TemplatesRepository) {
     private val logger = KotlinLogging.logger {}
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/application/api/UserRolesController.kt b/src/jvmMain/kotlin/com/github/ikovalyov/application/api/UserRolesController.kt
index 943175a0..a9f48ff2 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/application/api/UserRolesController.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/application/api/UserRolesController.kt
@@ -2,7 +2,7 @@ package com.github.ikovalyov.application.api
 
 import com.benasher44.uuid.Uuid
 import com.github.ikovalyov.Api
-import com.github.ikovalyov.infrastructure.dynamodb.repository.UserRolesRepository
+import com.github.ikovalyov.infrastructure.dynamodb.repository.users.UserRolesRepository
 import com.github.ikovalyov.model.security.UserRole
 import io.micronaut.http.HttpResponse
 import io.micronaut.http.annotation.Body
@@ -17,7 +17,7 @@ import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.Json
 import mu.KotlinLogging
 
-@Controller(Api.USER_ROLE_API_URL)
+@Controller(Api.USER_ROLES_API_URL)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 class UserRolesController(private val userRolesRepository: UserRolesRepository) {
     private val logger = KotlinLogging.logger {}
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/application/api/UsersApiController.kt b/src/jvmMain/kotlin/com/github/ikovalyov/application/api/UsersApiController.kt
index 2397889b..9947e463 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/application/api/UsersApiController.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/application/api/UsersApiController.kt
@@ -19,7 +19,7 @@ import kotlinx.serialization.json.Json
 import mu.KotlinLogging
 
 @ExperimentalSerializationApi
-@Controller(Api.USER_API_URL)
+@Controller(Api.USERS_API_URL)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 class UsersApiController(private val usersRepository: UsersRepository) {
     private val logger = KotlinLogging.logger {}
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/converter/DynamodbArticleConverter.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/converter/ArticleConverter.kt
similarity index 54%
rename from src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/converter/DynamodbArticleConverter.kt
rename to src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/converter/ArticleConverter.kt
index 5d6acb17..5c7514f6 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/converter/DynamodbArticleConverter.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/converter/ArticleConverter.kt
@@ -2,53 +2,25 @@ package com.github.ikovalyov.infrastructure.dynamodb.converter
 
 import com.benasher44.uuid.uuidFrom
 import com.github.ikovalyov.infrastructure.dynamodb.DynamodbConverterInterface
-import com.github.ikovalyov.infrastructure.service.TemplateService
-import com.github.ikovalyov.infrastructure.service.UserService
 import com.github.ikovalyov.model.Article
-import jakarta.inject.Inject
 import jakarta.inject.Singleton
-import kotlinx.serialization.ExperimentalSerializationApi
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue
 
-@OptIn(ExperimentalSerializationApi::class)
 @Singleton
-class DynamodbArticleConverter : DynamodbConverterInterface<Article> {
-    @Inject lateinit var userService: UserService
-
-    @Inject lateinit var templateService: TemplateService
-
+class ArticleConverter : DynamodbConverterInterface<Article> {
     override suspend fun fromDynamoDB(map: Map<String, AttributeValue>): Article {
-        val users = userService.getAllUsers()
-        val templates = templateService.getAllTemplates()
-
-        val tags = map["tags"]?.ss()
-        val authorUuid = map["author"]?.let {
-            uuidFrom(it.s())
-        }
-        val author = users.first {
-            it.id.toString() == authorUuid.toString()
-        }
         val templateUuid = map["template"]?.let {
             uuidFrom(it.s())
         }
-        val template = if (templateUuid != null) {
-            templates.first {
-                it.id.toString() == templateUuid.toString()
-            }
-        } else {
-            null
-        }
         return Article(
             id = uuidFrom(map["id"]!!.s()),
             name = map["name"]!!.s(),
             abstract = map["abstract"]!!.s(),
             body = map["body"]!!.s(),
-            author = author,
+            author = uuidFrom(map["author"]!!.s()),
             tags = map["tags"]?.ss(),
             meta = map["meta"]?.ss(),
-            template,
-            userList = users,
-            templateList = templates,
+            template = templateUuid,
         )
     }
 
@@ -58,6 +30,8 @@ class DynamodbArticleConverter : DynamodbConverterInterface<Article> {
             "name" to AttributeValue.builder().s(item.name).build(),
             "abstract" to AttributeValue.builder().s(item.abstract).build(),
             "body" to AttributeValue.builder().s(item.body).build(),
+            "author" to AttributeValue.builder().s(item.author.toString()).build(),
+            "template" to AttributeValue.builder().s(item.template.toString()).build(),
         )
         if (item.meta !== null && item.meta.isNotEmpty()) {
             mutableMap["meta"] = AttributeValue.builder().ss(item.meta).build()
@@ -65,10 +39,6 @@ class DynamodbArticleConverter : DynamodbConverterInterface<Article> {
         if (item.tags !== null && item.tags.isNotEmpty()) {
             mutableMap["tags"] = AttributeValue.builder().ss(item.tags).build()
         }
-        mutableMap["author"] = AttributeValue.builder().s(item.author.id.toString()).build()
-        if (item.template !== null) {
-            mutableMap["template"] = AttributeValue.builder().s(item.template.id.toString()).build()
-        }
         return mutableMap
     }
 }
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/converter/CommentConverter.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/converter/CommentConverter.kt
new file mode 100644
index 00000000..8bca157e
--- /dev/null
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/converter/CommentConverter.kt
@@ -0,0 +1,27 @@
+package com.github.ikovalyov.infrastructure.dynamodb.converter
+
+import com.benasher44.uuid.uuidFrom
+import com.github.ikovalyov.infrastructure.dynamodb.DynamodbConverterInterface
+import com.github.ikovalyov.model.Comment
+import jakarta.inject.Singleton
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue
+
+@Singleton
+class CommentConverter : DynamodbConverterInterface<Comment> {
+    override suspend fun fromDynamoDB(map: Map<String, AttributeValue>): Comment = Comment(
+        id = uuidFrom(map["id"]!!.s()),
+        body = map["body"]!!.s(),
+        author = uuidFrom(map["author"]!!.s()),
+        article = uuidFrom(map["article"]!!.s()),
+    )
+
+    override suspend fun toDynamoDB(item: Comment): Map<String, AttributeValue> {
+        val mutableMap = mutableMapOf<String, AttributeValue>(
+            "id" to AttributeValue.builder().s(item.id.toString()).build(),
+            "body" to AttributeValue.builder().s(item.body).build(),
+            "author" to AttributeValue.builder().s(item.author.toString()).build(),
+            "article" to AttributeValue.builder().s(item.article.toString()).build(),
+        )
+        return mutableMap
+    }
+}
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/AbstractKeyValueRepository.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/AbstractKeyValueRepository.kt
index 6b0d61e5..10ea9941 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/AbstractKeyValueRepository.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/AbstractKeyValueRepository.kt
@@ -1,6 +1,5 @@
 package com.github.ikovalyov.infrastructure.dynamodb.repository
 
-import com.github.ikovalyov.infrastructure.dynamodb.InitDynamoDbDatabaseInterface
 import kotlinx.coroutines.future.await
 import mu.KotlinLogging
 import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
@@ -12,7 +11,7 @@ import software.amazon.awssdk.services.dynamodb.model.ResourceInUseException
 import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType
 import software.amazon.awssdk.services.dynamodb.model.Tag
 
-abstract class AbstractKeyValueRepository(protected val dynamoDbClient: DynamoDbAsyncClient) : InitDynamoDbDatabaseInterface {
+abstract class AbstractKeyValueRepository(protected val dynamoDbClient: DynamoDbAsyncClient) {
     companion object {
         const val PRIMARY_KEY = "id"
     }
@@ -39,7 +38,7 @@ abstract class AbstractKeyValueRepository(protected val dynamoDbClient: DynamoDb
         }
     }
 
-    override suspend fun init(): Boolean? {
+    open suspend fun init(): Boolean? {
         logger.info { "creating $tableName table" }
         return try {
             dynamoDbClient.createTable(tableBuilder.build()).await().sdkHttpResponse().isSuccessful.also {
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/ArticlesRepository.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/ArticlesRepository.kt
index 1f44a1c8..13bd10aa 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/ArticlesRepository.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/ArticlesRepository.kt
@@ -1,16 +1,31 @@
 package com.github.ikovalyov.infrastructure.dynamodb.repository
 
 import com.benasher44.uuid.Uuid
-import com.github.ikovalyov.infrastructure.dynamodb.converter.DynamodbArticleConverter
+import com.benasher44.uuid.uuid4
+import com.github.ikovalyov.infrastructure.dynamodb.InitDynamoDbDatabaseInterface
+import com.github.ikovalyov.infrastructure.dynamodb.converter.ArticleConverter
+import com.github.ikovalyov.infrastructure.dynamodb.repository.articles.CommentsRepository
 import com.github.ikovalyov.model.Article
+import com.github.ikovalyov.model.Comment
 import jakarta.inject.Inject
 import jakarta.inject.Singleton
+import kotlinx.coroutines.delay
 import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
 
 @Singleton
-class ArticlesRepository(dynamoDbClient: DynamoDbAsyncClient) : CrudRepository<Article>(dynamoDbClient) {
+class ArticlesRepository(dynamoDbClient: DynamoDbAsyncClient) :
+    CrudRepository<Article>(dynamoDbClient),
+    InitDynamoDbDatabaseInterface {
 
-    @Inject private lateinit var articleConverter: DynamodbArticleConverter
+    @Inject private lateinit var articleConverter: ArticleConverter
+
+    @Inject private lateinit var commentsRepository: CommentsRepository
+
+    @Inject private lateinit var templatesRepository: TemplatesRepository
+
+    @Inject private lateinit var usersRepository: UsersRepository
+
+    @Inject private lateinit var tagsRepository: TagsRepository
 
     companion object {
         const val TABLE_NAME = "article"
@@ -18,6 +33,35 @@ class ArticlesRepository(dynamoDbClient: DynamoDbAsyncClient) : CrudRepository<A
 
     override val tableName = TABLE_NAME
 
+    override suspend fun init(): Boolean {
+        super.init()
+
+        while (!templatesRepository.initialized) {
+            delay(500)
+        }
+
+        while (!usersRepository.initialized) {
+            delay(50)
+        }
+
+        while (!tagsRepository.initialized) {
+            delay(50)
+        }
+
+        // to catch up with dynamo db
+        delay(2000)
+
+        val templates = templatesRepository.list()
+        val users = usersRepository.list()
+
+        val article = Article(uuid4(), TABLE_NAME, TABLE_NAME, TABLE_NAME, users.first().id, tagsRepository.list().map { it.name }, emptyList(), templates.first().id)
+        insert(article)
+
+        val comment = Comment(uuid4(), "Comment", users.first().id, article.id)
+        commentsRepository.init()
+        return commentsRepository.insert(comment)
+    }
+
     suspend fun list(): List<Article> = list {
         articleConverter.fromDynamoDB(it)
     }
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/ConfigurationsRepository.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/ConfigurationsRepository.kt
index 1bb0573d..4b2fd362 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/ConfigurationsRepository.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/ConfigurationsRepository.kt
@@ -1,6 +1,7 @@
 package com.github.ikovalyov.infrastructure.dynamodb.repository
 
 import com.benasher44.uuid.Uuid
+import com.github.ikovalyov.infrastructure.dynamodb.InitDynamoDbDatabaseInterface
 import io.micronaut.context.annotation.Property
 import jakarta.inject.Singleton
 import kotlinx.coroutines.future.await
@@ -9,7 +10,9 @@ import software.amazon.awssdk.services.dynamodb.model.AttributeValue
 import software.amazon.awssdk.services.dynamodb.model.GetItemResponse
 
 @Singleton
-class ConfigurationsRepository(dynamoDbClient: DynamoDbAsyncClient, @Property(name = "blog.template.default-template") private val defaultTemplate: String) : AbstractKeyValueRepository(dynamoDbClient) {
+class ConfigurationsRepository(dynamoDbClient: DynamoDbAsyncClient, @Property(name = "blog.template.default-template") private val defaultTemplate: String) :
+    AbstractKeyValueRepository(dynamoDbClient),
+    InitDynamoDbDatabaseInterface {
     companion object {
         const val TABLE_NAME = "configuration"
         const val ACTIVE_TEMPLATE_KEY_ID = "active-template"
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/CrudRepository.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/CrudRepository.kt
index 14aa437d..1292d76f 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/CrudRepository.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/CrudRepository.kt
@@ -4,11 +4,13 @@ import com.benasher44.uuid.Uuid
 import com.github.ikovalyov.model.markers.IEditable
 import io.micronaut.http.HttpStatus
 import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.future.await
 import mu.KotlinLogging
 import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue
+import software.amazon.awssdk.services.dynamodb.model.GetItemResponse
 
 abstract class CrudRepository<T : IEditable>(dynamoDbClient: DynamoDbAsyncClient) : AbstractKeyValueRepository(dynamoDbClient) {
 
@@ -20,9 +22,7 @@ abstract class CrudRepository<T : IEditable>(dynamoDbClient: DynamoDbAsyncClient
             async {
                 convert(it)
             }
-        }.map {
-            it.await()
-        }
+        }.awaitAll()
     }
 
     protected suspend fun insert(item: T, convert: suspend (T) -> Map<String, AttributeValue>): Boolean {
@@ -43,13 +43,17 @@ abstract class CrudRepository<T : IEditable>(dynamoDbClient: DynamoDbAsyncClient
     }
 
     protected suspend fun get(id: Uuid, convert: suspend (Map<String, AttributeValue>) -> T): T? {
+        val response = getItemResponse(id)
+        if (!response.hasItem()) return null
+        return convert(response.item())
+    }
+
+    private suspend fun getItemResponse(id: Uuid): GetItemResponse {
         val response = dynamoDbClient.getItem {
             it.tableName(tableName)
             it.key(mapOf(PRIMARY_KEY to AttributeValue.builder().s(id.toString()).build()))
-        }
-            .await()
-        if (!response.hasItem()) return null
-        return convert(response.item())
+        }.await()
+        return response
     }
 
     suspend fun delete(id: Uuid): Boolean {
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/RecordsRepository.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/RecordsRepository.kt
index 1339caae..1b39c057 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/RecordsRepository.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/RecordsRepository.kt
@@ -1,10 +1,13 @@
 package com.github.ikovalyov.infrastructure.dynamodb.repository
 
+import com.github.ikovalyov.infrastructure.dynamodb.InitDynamoDbDatabaseInterface
 import jakarta.inject.Singleton
 import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
 
 @Singleton
-class RecordsRepository(dynamoDbClient: DynamoDbAsyncClient) : AbstractKeyValueRepository(dynamoDbClient) {
+class RecordsRepository(dynamoDbClient: DynamoDbAsyncClient) :
+    AbstractKeyValueRepository(dynamoDbClient),
+    InitDynamoDbDatabaseInterface {
     companion object {
         const val TABLE_NAME = "record"
     }
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/TagsRepository.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/TagsRepository.kt
index 62eb2afb..2f80fdbd 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/TagsRepository.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/TagsRepository.kt
@@ -2,6 +2,7 @@ package com.github.ikovalyov.infrastructure.dynamodb.repository
 
 import com.benasher44.uuid.Uuid
 import com.benasher44.uuid.uuid4
+import com.github.ikovalyov.infrastructure.dynamodb.InitDynamoDbDatabaseInterface
 import com.github.ikovalyov.model.Tag
 import com.github.ikovalyov.model.extension.TagExtension.fromDynamoDbMap
 import com.github.ikovalyov.model.extension.TagExtension.toDynamoDbMap
@@ -12,7 +13,9 @@ import kotlinx.coroutines.coroutineScope
 import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
 
 @Singleton
-class TagsRepository(dynamoDbClient: DynamoDbAsyncClient) : CrudRepository<Tag>(dynamoDbClient) {
+class TagsRepository(dynamoDbClient: DynamoDbAsyncClient) :
+    CrudRepository<Tag>(dynamoDbClient),
+    InitDynamoDbDatabaseInterface {
     companion object {
         const val TABLE_NAME = "tag"
     }
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/TemplatesRepository.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/TemplatesRepository.kt
index 1912712d..5c9b708a 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/TemplatesRepository.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/TemplatesRepository.kt
@@ -2,6 +2,7 @@ package com.github.ikovalyov.infrastructure.dynamodb.repository
 
 import com.benasher44.uuid.Uuid
 import com.benasher44.uuid.uuid4
+import com.github.ikovalyov.infrastructure.dynamodb.InitDynamoDbDatabaseInterface
 import com.github.ikovalyov.model.Template
 import com.github.ikovalyov.model.extension.TemplateExtension.fromDynamoDbMap
 import com.github.ikovalyov.model.extension.TemplateExtension.toDynamoDbMap
@@ -11,7 +12,9 @@ import kotlinx.coroutines.withContext
 import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
 
 @Singleton
-class TemplatesRepository(dynamoDbClient: DynamoDbAsyncClient) : CrudRepository<Template>(dynamoDbClient) {
+class TemplatesRepository(dynamoDbClient: DynamoDbAsyncClient) :
+    CrudRepository<Template>(dynamoDbClient),
+    InitDynamoDbDatabaseInterface {
     companion object {
         const val TABLE_NAME = "template"
     }
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/UsersRepository.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/UsersRepository.kt
index ba6c3b99..959c1c70 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/UsersRepository.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/UsersRepository.kt
@@ -2,21 +2,26 @@ package com.github.ikovalyov.infrastructure.dynamodb.repository
 
 import com.benasher44.uuid.Uuid
 import com.benasher44.uuid.uuid4
+import com.github.ikovalyov.infrastructure.dynamodb.InitDynamoDbDatabaseInterface
+import com.github.ikovalyov.infrastructure.dynamodb.repository.users.UserRolesRepository
 import com.github.ikovalyov.model.extension.UserExtension.fromDynamoDbMap
 import com.github.ikovalyov.model.extension.UserExtension.toDynamoDbMap
 import com.github.ikovalyov.model.security.Email
 import com.github.ikovalyov.model.security.Password
 import com.github.ikovalyov.model.security.ShortString
 import com.github.ikovalyov.model.security.User
+import jakarta.inject.Inject
 import jakarta.inject.Singleton
-import kotlinx.coroutines.delay
-import kotlinx.serialization.ExperimentalSerializationApi
 import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue
 
-@ExperimentalSerializationApi
 @Singleton
-class UsersRepository(dynamoDbClient: DynamoDbAsyncClient, private val userRolesRepository: UserRolesRepository) : CrudRepository<User>(dynamoDbClient) {
+class UsersRepository(dynamoDbClient: DynamoDbAsyncClient) :
+    CrudRepository<User>(dynamoDbClient),
+    InitDynamoDbDatabaseInterface {
+    @Inject
+    private lateinit var userRolesRepository: UserRolesRepository
+
     companion object {
         const val TABLE_NAME = "user"
     }
@@ -25,10 +30,9 @@ class UsersRepository(dynamoDbClient: DynamoDbAsyncClient, private val userRoles
 
     override suspend fun init(): Boolean {
         super.init()
-        while (!userRolesRepository.initialized) {
-            delay(100)
-        }
-        userRolesRepository.createDefaultUserRoles()
+
+        userRolesRepository.init()
+
         val adminRole = userRolesRepository.getByName(UserRolesRepository.ADMIN_ROLE_NAME)!!
         val admin = User(
             id = uuid4(),
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/articles/CommentsRepository.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/articles/CommentsRepository.kt
new file mode 100644
index 00000000..80b62680
--- /dev/null
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/articles/CommentsRepository.kt
@@ -0,0 +1,37 @@
+package com.github.ikovalyov.infrastructure.dynamodb.repository.articles
+
+import com.benasher44.uuid.Uuid
+import com.github.ikovalyov.infrastructure.dynamodb.converter.CommentConverter
+import com.github.ikovalyov.infrastructure.dynamodb.repository.CrudRepository
+import com.github.ikovalyov.model.Comment
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
+
+@Singleton
+class CommentsRepository(dynamoDbClient: DynamoDbAsyncClient) : CrudRepository<Comment>(dynamoDbClient) {
+    @Inject
+    private lateinit var commentConverter: CommentConverter
+
+    companion object {
+        const val TABLE_NAME = "comment"
+    }
+
+    override val tableName = TABLE_NAME
+
+    suspend fun list(): List<Comment> = list {
+        commentConverter.fromDynamoDB(it)
+    }
+
+    suspend fun insert(item: Comment): Boolean = insert(item) {
+        commentConverter.toDynamoDB(it)
+    }
+
+    suspend fun update(item: Comment): Boolean = update(item) {
+        commentConverter.toDynamoDB(it)
+    }
+
+    suspend fun get(id: Uuid): Comment? = get(id) {
+        commentConverter.fromDynamoDB(it)
+    }
+}
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/repositories.md b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/repositories.md
new file mode 100644
index 00000000..ef8926a5
--- /dev/null
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/repositories.md
@@ -0,0 +1,6 @@
+```mermaid
+flowchart
+    Users --> UserGroups
+    
+    Articles --> Comments
+```
\ No newline at end of file
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/UserRolesRepository.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/users/UserRolesRepository.kt
similarity index 92%
rename from src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/UserRolesRepository.kt
rename to src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/users/UserRolesRepository.kt
index d77c293f..0157eb08 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/UserRolesRepository.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/users/UserRolesRepository.kt
@@ -1,7 +1,8 @@
-package com.github.ikovalyov.infrastructure.dynamodb.repository
+package com.github.ikovalyov.infrastructure.dynamodb.repository.users
 
 import com.benasher44.uuid.Uuid
 import com.benasher44.uuid.uuid4
+import com.github.ikovalyov.infrastructure.dynamodb.repository.CrudRepository
 import com.github.ikovalyov.model.extension.UserRoleExtension.fromDynamoDbMap
 import com.github.ikovalyov.model.extension.UserRoleExtension.toDynamoDbMap
 import com.github.ikovalyov.model.security.UserRole
@@ -24,7 +25,9 @@ class UserRolesRepository(dynamoDbClient: DynamoDbAsyncClient) : CrudRepository<
 
     override val tableName = TABLE_NAME
 
-    suspend fun createDefaultUserRoles(): Boolean {
+    override suspend fun init(): Boolean {
+        super.init()
+
         val adminRoleFromDb = getByName(ADMIN_ROLE_NAME)
         val userRole = UserRole(uuid4(), Clock.System.now(), USER_ROLE_NAME)
         val guestRole = UserRole(uuid4(), Clock.System.now(), GUEST_USER_ROLE_NAME)
diff --git a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/service/UserService.kt b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/service/UserService.kt
index ac06a28e..acbc1963 100644
--- a/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/service/UserService.kt
+++ b/src/jvmMain/kotlin/com/github/ikovalyov/infrastructure/service/UserService.kt
@@ -4,9 +4,7 @@ import com.github.ikovalyov.infrastructure.dynamodb.repository.UsersRepository
 import com.github.ikovalyov.model.security.User
 import jakarta.inject.Inject
 import jakarta.inject.Singleton
-import kotlinx.serialization.ExperimentalSerializationApi
 
-@OptIn(ExperimentalSerializationApi::class)
 @Singleton
 class UserService {
     @Inject private lateinit var usersRepository: UsersRepository
diff --git a/src/jvmTest/kotlin/com/github/ikovalyov/application/api/ArticlesControllerTest.kt b/src/jvmTest/kotlin/com/github/ikovalyov/application/api/ArticlesControllerTest.kt
new file mode 100644
index 00000000..ae6494bb
--- /dev/null
+++ b/src/jvmTest/kotlin/com/github/ikovalyov/application/api/ArticlesControllerTest.kt
@@ -0,0 +1,107 @@
+package com.github.ikovalyov.application.api
+
+import com.benasher44.uuid.Uuid
+import com.benasher44.uuid.uuid4
+import com.github.ikovalyov.DockerImages
+import com.github.ikovalyov.command.DynamoDbInitCommand
+import com.github.ikovalyov.model.Article
+import io.micronaut.test.extensions.junit5.annotation.MicronautTest
+import io.micronaut.test.support.TestPropertyProvider
+import jakarta.inject.Inject
+import kotlinx.coroutines.runBlocking
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.json.Json
+import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.MethodOrderer.OrderAnnotation
+import org.junit.jupiter.api.Order
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import org.junit.jupiter.api.TestMethodOrder
+import org.testcontainers.containers.localstack.LocalStackContainer
+import org.testcontainers.utility.DockerImageName
+
+@MicronautTest
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@TestMethodOrder(OrderAnnotation::class)
+class ArticlesControllerTest : TestPropertyProvider {
+    @Inject lateinit var controller: ArticlesController
+
+    @Inject lateinit var dynamoDbInitCommand: DynamoDbInitCommand
+    private val localstackImage = DockerImageName.parse(DockerImages.LOCALSTACK_IMAGE_NAME)
+
+    private val localstack: LocalStackContainer =
+        LocalStackContainer(localstackImage).withServices(LocalStackContainer.Service.DYNAMODB).also {
+            it.start()
+        }
+
+    override fun getProperties(): MutableMap<String, String> = mutableMapOf(
+        "micronaut.server.port" to "0",
+        "blog.aws.endpoint" to localstack.getEndpointOverride(LocalStackContainer.Service.DYNAMODB).toString(),
+    )
+
+    private lateinit var uuid: Uuid
+    private val uuid2 = uuid4()
+
+    @BeforeAll
+    fun init() {
+        dynamoDbInitCommand.run()
+    }
+
+    @Test
+    @Order(1)
+    fun testList() = runBlocking {
+        val resultString = controller.list()
+        val result = Json.decodeFromString(ListSerializer(Article.serializer()), resultString)
+        assert(result.count() == 1)
+        uuid = result.first().id
+    }
+
+    @Test
+    @Order(2)
+    fun testGet() = runBlocking {
+        val articleResponseString = controller.get(uuid)
+        require(articleResponseString != null) { "$uuid article not found" }
+        val articleResponse = Json.decodeFromString(Article.serializer(), articleResponseString)
+        assert(articleResponse.id == uuid)
+    }
+
+    @Test
+    @Order(3)
+    fun testInsert() = runBlocking {
+        val articleString = controller.get(uuid)
+        require(articleString != null) { "$uuid article not found" }
+        val article = Json.decodeFromString(Article.serializer(), articleString)
+        val newArticle = article.copy(id = uuid2, name = "new name")
+        controller.insert(newArticle)
+        val newArticleString = controller.get(uuid2)
+        require(newArticleString != null) { "$uuid2 article not found" }
+        val newArticleResponseBody = Json.decodeFromString(Article.serializer(), newArticleString)
+        assert(newArticleResponseBody.id == uuid2)
+    }
+
+    @Test
+    @Order(4)
+    fun testUpdate() = runBlocking {
+        val articleString = controller.get(uuid)
+        require(articleString != null) { "$uuid article not found" }
+        val article = Json.decodeFromString(Article.serializer(), articleString)
+        val newArticle = article.copy(name = article.name + "TEST")
+        controller.update(newArticle)
+        val updatedArticleString = controller.get(uuid)
+        require(updatedArticleString != null) { "$uuid article not found" }
+        val updatedArticle = Json.decodeFromString(Article.serializer(), updatedArticleString)
+        assert(updatedArticle.name.endsWith("TEST"))
+    }
+
+    @Test
+    @Order(5)
+    fun testDelete() = runBlocking {
+        val resultString = controller.list()
+        val result = Json.decodeFromString(ListSerializer(Article.serializer()), resultString)
+        assert(result.count() == 2)
+        controller.delete(result[0].id)
+        val newResultString = controller.list()
+        val newResult = Json.decodeFromString(ListSerializer(Article.serializer()), newResultString)
+        assert(newResult.count() == 1)
+    }
+}
diff --git a/src/jvmTest/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/UserRolesRepositoryTest.kt b/src/jvmTest/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/UserRolesRepositoryTest.kt
deleted file mode 100644
index a6f579ab..00000000
--- a/src/jvmTest/kotlin/com/github/ikovalyov/infrastructure/dynamodb/repository/UserRolesRepositoryTest.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.github.ikovalyov.infrastructure.dynamodb.repository
-
-import com.github.ikovalyov.LocalstackTestImages
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest
-import io.micronaut.test.support.TestPropertyProvider
-import jakarta.inject.Inject
-import kotlinx.coroutines.future.await
-import kotlinx.coroutines.runBlocking
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.TestInstance
-import org.junit.jupiter.api.TestInstance.Lifecycle
-import org.testcontainers.containers.localstack.LocalStackContainer
-import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
-
-@MicronautTest
-@TestInstance(Lifecycle.PER_CLASS)
-internal class UserRolesRepositoryTest : TestPropertyProvider {
-    var localstack: LocalStackContainer = LocalStackContainer(LocalstackTestImages.LOCALSTACK_2_3_IMAGE)
-        .withServices(
-            LocalStackContainer.Service.DYNAMODB,
-        )
-
-    @Inject lateinit var client: DynamoDbAsyncClient
-
-    @Inject lateinit var userRolesRepository: UserRolesRepository
-
-    init {
-        localstack.start()
-    }
-
-    @Test
-    fun testTableWasCreated() = runBlocking {
-        userRolesRepository.init()
-        val response = client.describeTable { it.tableName(userRolesRepository.tableName) }.await()
-        assert(response.sdkHttpResponse().statusCode() == 200)
-        assert(response.table().tableName() == userRolesRepository.tableName)
-    }
-
-    override fun getProperties(): MutableMap<String, String> = mutableMapOf("blog.aws.endpoint" to localstack.endpoint.toString())
-}