Merge pull request #211 from team-xquare/210-topic-enum

team-xquare · Mar 21, 2023 · ee14273 · ee14273
2 parents 2db88d5 + fb1980f
commit ee14273
Show file tree

Hide file tree

Showing 21 changed files with 96 additions and 13 deletions.
diff --git a/notification-domain/src/main/kotlin/io/github/v1servicenotification/category/Category.kt b/notification-domain/src/main/kotlin/io/github/v1servicenotification/category/Category.kt
@@ -12,4 +12,6 @@ class Category(
     val destination: String,
 
     val defaultActivated: Boolean,
+
+    val topic: Topic,
 )
diff --git a/notification-domain/src/main/kotlin/io/github/v1servicenotification/category/Topic.kt b/notification-domain/src/main/kotlin/io/github/v1servicenotification/category/Topic.kt
@@ -0,0 +1,10 @@
+package io.github.v1servicenotification.category
+
+enum class Topic(
+    name: String,
+) {
+    SCHEDULE("일정"),
+    FEED("피드"),
+    APPLICATION("신청"),
+    ALL("전체"),
+}
diff --git a/...cation-domain/src/main/kotlin/io/github/v1servicenotification/category/api/CategoryApi.kt b/...cation-domain/src/main/kotlin/io/github/v1servicenotification/category/api/CategoryApi.kt
@@ -1,10 +1,11 @@
 package io.github.v1servicenotification.category.api
 
+import io.github.v1servicenotification.category.Topic
 import io.github.v1servicenotification.category.api.response.CategoryListResponse
 import java.util.UUID
 
 interface CategoryApi {
     fun queryNotificationCategory(defaultActivated: Boolean): CategoryListResponse
-    fun createCategory(name: String, destination: String, defaultActivated: Boolean)
+    fun createCategory(name: String, destination: String, defaultActivated: Boolean, topic: Topic)
     fun removeCategory(categoryId: UUID)
 }
diff --git a/.../src/main/kotlin/io/github/v1servicenotification/category/api/response/CategoryElement.kt b/.../src/main/kotlin/io/github/v1servicenotification/category/api/response/CategoryElement.kt
@@ -1,9 +1,11 @@
 package io.github.v1servicenotification.category.api.response
 
+import io.github.v1servicenotification.category.Topic
 import java.util.UUID
 
 class CategoryElement(
     val id: UUID,
     val name: String,
     val destination: String,
+    val topic: Topic,
 )
diff --git a/...omain/src/main/kotlin/io/github/v1servicenotification/category/service/CategoryApiImpl.kt b/...omain/src/main/kotlin/io/github/v1servicenotification/category/service/CategoryApiImpl.kt
@@ -2,6 +2,7 @@ package io.github.v1servicenotification.category.service
 
 import io.github.v1servicenotification.annotation.DomainService
 import io.github.v1servicenotification.category.Category
+import io.github.v1servicenotification.category.Topic
 import io.github.v1servicenotification.category.api.CategoryApi
 import io.github.v1servicenotification.category.api.response.CategoryElement
 import io.github.v1servicenotification.category.api.response.CategoryListResponse
@@ -19,17 +20,18 @@ class CategoryApiImpl(
     override fun queryNotificationCategory(defaultActivated: Boolean): CategoryListResponse {
         return CategoryListResponse(
             queryCategoryRepositorySpi.findAllByDefaultActivated(defaultActivated)
-                .map { CategoryElement(it.id, it.name, it.destination) }
+                .map { CategoryElement(it.id, it.name, it.destination, it.topic) }
                 .toList()
         )
     }
 
-    override fun createCategory(name: String, destination: String, defaultActivated: Boolean) {
+    override fun createCategory(name: String, destination: String, defaultActivated: Boolean, topic: Topic) {
         updateCategoryRepositorySpi.saveCategory(
             Category(
                 name = name,
                 destination = destination,
                 defaultActivated = defaultActivated,
+                topic = topic
             )
         )
     }

diff --git a/.../src/main/kotlin/io/github/v1servicenotification/detail/api/dto/response/DetailElement.kt b/.../src/main/kotlin/io/github/v1servicenotification/detail/api/dto/response/DetailElement.kt
@@ -1,5 +1,6 @@
 package io.github.v1servicenotification.detail.api.dto.response
 
+import io.github.v1servicenotification.category.Topic
 import java.time.LocalDateTime
 import java.util.UUID
 
@@ -12,4 +13,5 @@ class DetailElement(
     val userId: UUID,
     val categoryName: String,
     val destination: String,
+    val topic: Topic,
 )
diff --git a/...on-domain/src/main/kotlin/io/github/v1servicenotification/detail/service/DetailApiImpl.kt b/...on-domain/src/main/kotlin/io/github/v1servicenotification/detail/service/DetailApiImpl.kt
@@ -92,6 +92,7 @@ class DetailApiImpl(
                         userId = it.userId,
                         categoryName = it.name,
                         destination = it.destination,
+                        topic = it.topic
                     )
                 }
                 .toList()

diff --git a/...in/src/main/kotlin/io/github/v1servicenotification/detail/spi/QueryDetailRepositorySpi.kt b/...in/src/main/kotlin/io/github/v1servicenotification/detail/spi/QueryDetailRepositorySpi.kt
@@ -1,11 +1,11 @@
 package io.github.v1servicenotification.detail.spi
 
 import io.github.v1servicenotification.annotation.Spi
-import io.github.v1servicenotification.detail.spi.dto.DetailModel
+import io.github.v1servicenotification.detail.spi.dto.TopicDetailModel
 import java.util.UUID
 
 @Spi
 interface QueryDetailRepositorySpi {
-    fun findAllByUserId(userId: UUID): List<DetailModel>
+    fun findAllByUserId(userId: UUID): List<TopicDetailModel>
     fun findAllByUseridAndIsReadFalse(userId: UUID): Int
 }
diff --git a/...tion-domain/src/main/kotlin/io/github/v1servicenotification/detail/spi/dto/DetailModel.kt b/...tion-domain/src/main/kotlin/io/github/v1servicenotification/detail/spi/dto/DetailModel.kt
@@ -1,5 +1,6 @@
 package io.github.v1servicenotification.detail.spi.dto
 
+import io.github.v1servicenotification.category.Topic
 import java.time.LocalDateTime
 import java.util.UUID
 

diff --git a/...domain/src/main/kotlin/io/github/v1servicenotification/detail/spi/dto/TopicDetailModel.kt b/...domain/src/main/kotlin/io/github/v1servicenotification/detail/spi/dto/TopicDetailModel.kt
@@ -0,0 +1,28 @@
+package io.github.v1servicenotification.detail.spi.dto
+
+import io.github.v1servicenotification.category.Topic
+import java.time.LocalDateTime
+import java.util.UUID
+
+class TopicDetailModel(
+    val id: UUID,
+
+    val title: String,
+
+    val content: String,
+
+    val sentAt: LocalDateTime,
+
+    isRead: Boolean,
+
+    val userId: UUID,
+
+    val name: String,
+
+    val destination: String,
+
+    val topic: Topic,
+) {
+    var isRead: Boolean = isRead
+        private set
+}
diff --git a/...-domain/src/main/kotlin/io/github/v1servicenotification/setting/service/SettingApiImpl.kt b/...-domain/src/main/kotlin/io/github/v1servicenotification/setting/service/SettingApiImpl.kt
@@ -50,6 +50,7 @@ class SettingApiImpl(
                         id = it.id,
                         name = it.name,
                         destination = it.destination,
+                        topic = it.topic
                     )
                 }
                 .toList()

diff --git a/...-domain/src/main/kotlin/io/github/v1servicenotification/stubs/InMemoryDetailRepository.kt b/...-domain/src/main/kotlin/io/github/v1servicenotification/stubs/InMemoryDetailRepository.kt
@@ -6,6 +6,7 @@ import io.github.v1servicenotification.detail.Detail
 import io.github.v1servicenotification.detail.spi.PostDetailRepositorySpi
 import io.github.v1servicenotification.detail.spi.QueryDetailRepositorySpi
 import io.github.v1servicenotification.detail.spi.dto.DetailModel
+import io.github.v1servicenotification.detail.spi.dto.TopicDetailModel
 import java.util.UUID
 
 class InMemoryDetailRepository(
@@ -21,12 +22,12 @@ class InMemoryDetailRepository(
         detailMap[detail.id] = detail
     }
 
-    override fun findAllByUserId(userId: UUID): List<DetailModel> {
+    override fun findAllByUserId(userId: UUID): List<TopicDetailModel> {
         return detailMap.filter { it.value.userId == userId }
             .map {
                 val category = categoryMap[it.value.categoryId]
                     ?: throw CategoryNotFoundException.EXCEPTION
-                DetailModel(
+                TopicDetailModel(
                     it.value.id,
                     it.value.title,
                     it.value.content,
@@ -35,6 +36,7 @@ class InMemoryDetailRepository(
                     it.value.userId,
                     category.name,
                     category.destination,
+                    category.topic
                 )
             }
     }

diff --git a/...ation-domain/src/test/kotlin/io/github/v1servicenotification/category/CategoryImplTest.kt b/...ation-domain/src/test/kotlin/io/github/v1servicenotification/category/CategoryImplTest.kt
@@ -26,6 +26,7 @@ class CategoryImplTest {
             name = name,
             destination = destination,
             defaultActivated = defaultActivated,
+            topic = Topic.ALL
         )
 
         updateCategorySpi.findAllByDefaultActivated(true)
@@ -48,6 +49,7 @@ class CategoryImplTest {
             name = name,
             destination = destination,
             defaultActivated = defaultActivated,
+            topic = Topic.ALL
         )
 
         Assertions.assertThat(updateCategorySpi.findAllByDefaultActivated(true).size).isEqualTo(0)
@@ -61,6 +63,7 @@ class CategoryImplTest {
                 "Test category",
                 "Test destination",
                 true,
+                topic = Topic.ALL
             )
         )
         assertThat(category.queryNotificationCategory(true).categories.size)
@@ -75,6 +78,7 @@ class CategoryImplTest {
                 "Test category",
                 "Test destination",
                 false,
+                topic = Topic.ALL
             )
         )
 
@@ -90,6 +94,7 @@ class CategoryImplTest {
                 "Test category",
                 "Test destination",
                 false,
+                topic = Topic.ALL
             )
         )
         assertThat(category.queryNotificationCategory(false).categories.size)
@@ -104,6 +109,7 @@ class CategoryImplTest {
                 "Test category",
                 "Test destination",
                 true,
+                topic = Topic.ALL
             )
         )
 
@@ -124,6 +130,7 @@ class CategoryImplTest {
                 name = name,
                 destination = destination,
                 defaultActivated = defaultActivated,
+                topic = Topic.ALL
             )
         )
 

diff --git a/...cation-domain/src/test/kotlin/io/github/v1servicenotification/detail/DetailApiImplTest.kt b/...cation-domain/src/test/kotlin/io/github/v1servicenotification/detail/DetailApiImplTest.kt
@@ -1,6 +1,7 @@
 package io.github.v1servicenotification.detail
 
 import io.github.v1servicenotification.category.Category
+import io.github.v1servicenotification.category.Topic
 import io.github.v1servicenotification.category.exception.CategoryNotFoundException
 import io.github.v1servicenotification.detail.exception.NotificationDetailNotFoundException
 import io.github.v1servicenotification.detail.service.DetailApiImpl
@@ -32,6 +33,7 @@ class DetailApiImplTest {
             "Test category",
             "Test destination",
             true,
+            topic = Topic.ALL
         )
         val userId = UUID.randomUUID()
 
@@ -65,6 +67,7 @@ class DetailApiImplTest {
             name = categoryName,
             destination = destination,
             defaultActivated = true,
+            topic = Topic.ALL
         )
 
         categorySpi.saveCategory(category)
@@ -102,6 +105,7 @@ class DetailApiImplTest {
             name = categoryName,
             destination = destination,
             defaultActivated = true,
+            topic = Topic.ALL
         )
 
         categorySpi.saveCategory(category)
@@ -136,6 +140,7 @@ class DetailApiImplTest {
             name = categoryName,
             destination = destination,
             defaultActivated = false,
+            topic = Topic.ALL
         )
 
         categorySpi.saveCategory(category)
@@ -180,6 +185,7 @@ class DetailApiImplTest {
             name = categoryName,
             destination = destination,
             defaultActivated = true,
+            topic = Topic.ALL
         )
 
         categorySpi.saveCategory(category)

diff --git a/...tion-domain/src/test/kotlin/io/github/v1servicenotification/setting/SettingApiImplTest.kt b/...tion-domain/src/test/kotlin/io/github/v1servicenotification/setting/SettingApiImplTest.kt
@@ -1,6 +1,7 @@
 package io.github.v1servicenotification.setting
 
 import io.github.v1servicenotification.category.Category
+import io.github.v1servicenotification.category.Topic
 import io.github.v1servicenotification.setting.service.SettingApiImpl
 import io.github.v1servicenotification.stubs.InMemoryCategoryRepository
 import io.github.v1servicenotification.stubs.InMemorySettingRepository
@@ -22,7 +23,7 @@ class SettingApiImplTest {
         val userId = UUID.randomUUID()
         val categoryId = UUID.randomUUID()
 
-        val category = Category(categoryId, "Test name", "Test destination", false)
+        val category = Category(categoryId, "Test name", "Test destination", false, Topic.ALL)
 
         settingSpi.saveCategory(category)
 
@@ -45,7 +46,7 @@ class SettingApiImplTest {
         val userId = UUID.randomUUID()
         val categoryId = UUID.randomUUID()
         categorySpi.saveCategory(
-            Category(categoryId, "Test name", "Test destination", false)
+            Category(categoryId, "Test name", "Test destination", false, Topic.ALL)
         )
         Assertions.assertThat(settingApi.deActivateCategory(categoryId, userId))
             .isEqualTo(201)
@@ -58,7 +59,7 @@ class SettingApiImplTest {
         val userId = UUID.randomUUID()
         val categoryId = UUID.randomUUID()
         categorySpi.saveCategory(
-            Category(categoryId, "Test name", "Test destination", false)
+            Category(categoryId, "Test name", "Test destination", false, Topic.ALL)
         )
         assertThat(settingApi.activateCategory(categoryId, userId))
             .isEqualTo(201)

diff --git a/.../src/main/kotlin/io/github/v1servicenotification/domain/category/domain/CategoryEntity.kt b/.../src/main/kotlin/io/github/v1servicenotification/domain/category/domain/CategoryEntity.kt
@@ -1,11 +1,14 @@
 package io.github.v1servicenotification.domain.category.domain
 
+import io.github.v1servicenotification.category.Topic
 import io.github.v1servicenotification.domain.setting.domain.SettingEntity
 import io.github.v1servicenotification.global.entity.BaseUUIDEntity
 import java.util.UUID
 import javax.persistence.Table
 import javax.persistence.Column
 import javax.persistence.Entity
+import javax.persistence.EnumType
+import javax.persistence.Enumerated
 import javax.persistence.FetchType
 import javax.persistence.OneToMany
 import javax.validation.constraints.NotNull
@@ -30,4 +33,7 @@ class CategoryEntity(
     @OneToMany(mappedBy = "settingId.categoryEntity", fetch = FetchType.LAZY)
     val settingList: List<SettingEntity> = emptyList(),
 
+    @field:NotNull
+    @Enumerated(EnumType.STRING)
+    val topic: Topic
 ) : BaseUUIDEntity(id)
diff --git a/.../main/kotlin/io/github/v1servicenotification/domain/category/mapper/CategoryMapperImpl.kt b/.../main/kotlin/io/github/v1servicenotification/domain/category/mapper/CategoryMapperImpl.kt
@@ -13,6 +13,7 @@ class CategoryMapperImpl: CategoryMapper {
             name = category.name,
             destination = category.destination,
             defaultActivated = category.defaultActivated,
+            topic = category.topic,
         )
     }
 
@@ -22,6 +23,7 @@ class CategoryMapperImpl: CategoryMapper {
             name = categoryEntity.name,
             destination = categoryEntity.destination,
             defaultActivated = categoryEntity.defaultActivated,
+            topic = categoryEntity.topic,
         )
     }
 }
diff --git a/...kotlin/io/github/v1servicenotification/domain/category/presentation/CategoryController.kt b/...kotlin/io/github/v1servicenotification/domain/category/presentation/CategoryController.kt
@@ -38,6 +38,7 @@ class CategoryController(
             name = request.name,
             destination = request.destination,
             defaultActivated = request.defaultActivated,
+            topic = request.topic
         )
     }
 

diff --git a/...b/v1servicenotification/domain/category/presentation/dto/request/CreateCategoryRequest.kt b/...b/v1servicenotification/domain/category/presentation/dto/request/CreateCategoryRequest.kt
@@ -1,5 +1,6 @@
 package io.github.v1servicenotification.domain.category.presentation.dto.request
 
+import io.github.v1servicenotification.category.Topic
 import javax.validation.constraints.NotNull
 import kotlin.properties.Delegates
 
@@ -15,4 +16,7 @@ class CreateCategoryRequest {
 
     var defaultActivated by Delegates.notNull<Boolean>()
         private set
+
+    lateinit var topic: Topic
+        private set
 }