🔀 :: (#208) 이미지 추가 전으로 롤백

team-xquare · Mar 21, 2023 · 2db88d5 · 2db88d5
2 parents e981c5d + 58639b7
commit 2db88d5
Show file tree

Hide file tree

Showing 18 changed files with 9 additions and 54 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,6 +12,4 @@ class Category(
     val destination: String,
 
     val defaultActivated: Boolean,
-
-    val categoryImageUrl: String,
 )
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
@@ -5,6 +5,6 @@ import java.util.UUID
 
 interface CategoryApi {
     fun queryNotificationCategory(defaultActivated: Boolean): CategoryListResponse
-    fun createCategory(name: String, destination: String, defaultActivated: Boolean, categoryImage: String)
+    fun createCategory(name: String, destination: String, defaultActivated: Boolean)
     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
@@ -6,5 +6,4 @@ class CategoryElement(
     val id: UUID,
     val name: String,
     val destination: String,
-    val categoryImage: String,
 )
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
@@ -19,18 +19,17 @@ class CategoryApiImpl(
     override fun queryNotificationCategory(defaultActivated: Boolean): CategoryListResponse {
         return CategoryListResponse(
             queryCategoryRepositorySpi.findAllByDefaultActivated(defaultActivated)
-                .map { CategoryElement(it.id, it.name, it.destination, it.categoryImageUrl) }
+                .map { CategoryElement(it.id, it.name, it.destination) }
                 .toList()
         )
     }
 
-    override fun createCategory(name: String, destination: String, defaultActivated: Boolean, categoryImage: String) {
+    override fun createCategory(name: String, destination: String, defaultActivated: Boolean) {
         updateCategoryRepositorySpi.saveCategory(
             Category(
                 name = name,
                 destination = destination,
                 defaultActivated = defaultActivated,
-                categoryImageUrl = categoryImage
             )
         )
     }

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
@@ -10,7 +10,6 @@ class DetailElement(
     val sentAt: LocalDateTime,
     val isRead: Boolean,
     val userId: UUID,
-    val name: String,
+    val categoryName: String,
     val destination: String,
-    val categoryImage: String,
 )
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
@@ -90,9 +90,8 @@ class DetailApiImpl(
                         sentAt = it.sentAt,
                         isRead = it.isRead,
                         userId = it.userId,
-                        name = it.name,
+                        categoryName = it.name,
                         destination = it.destination,
-                        categoryImage = it.categoryImage
                     )
                 }
                 .toList()

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
@@ -19,8 +19,6 @@ class DetailModel(
     val name: String,
 
     val destination: String,
-
-    val categoryImage: String,
 ) {
     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,7 +50,6 @@ class SettingApiImpl(
                         id = it.id,
                         name = it.name,
                         destination = it.destination,
-                        categoryImage = it.categoryImageUrl
                     )
                 }
                 .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
@@ -35,7 +35,6 @@ class InMemoryDetailRepository(
                     it.value.userId,
                     category.name,
                     category.destination,
-                    category.categoryImageUrl
                 )
             }
     }

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
@@ -21,13 +21,11 @@ class CategoryImplTest {
         val name = "Test name"
         val destination = "Test destination"
         val defaultActivated = true
-        val categoryImage = "https://~~"
 
         category.createCategory(
             name = name,
             destination = destination,
             defaultActivated = defaultActivated,
-            categoryImage = categoryImage,
         )
 
         updateCategorySpi.findAllByDefaultActivated(true)
@@ -45,13 +43,11 @@ class CategoryImplTest {
         val name = "Test name"
         val destination = "Test destination"
         val defaultActivated = false
-        val categoryImage = "https://~~"
 
         category.createCategory(
             name = name,
             destination = destination,
             defaultActivated = defaultActivated,
-            categoryImage = categoryImage,
         )
 
         Assertions.assertThat(updateCategorySpi.findAllByDefaultActivated(true).size).isEqualTo(0)
@@ -65,7 +61,6 @@ class CategoryImplTest {
                 "Test category",
                 "Test destination",
                 true,
-                "https://~~"
             )
         )
         assertThat(category.queryNotificationCategory(true).categories.size)
@@ -80,7 +75,6 @@ class CategoryImplTest {
                 "Test category",
                 "Test destination",
                 false,
-                "https://~~"
             )
         )
 
@@ -96,7 +90,6 @@ class CategoryImplTest {
                 "Test category",
                 "Test destination",
                 false,
-                "https://~~"
             )
         )
         assertThat(category.queryNotificationCategory(false).categories.size)
@@ -111,7 +104,6 @@ class CategoryImplTest {
                 "Test category",
                 "Test destination",
                 true,
-                "https://~~"
             )
         )
 
@@ -125,15 +117,13 @@ class CategoryImplTest {
         val name = "Test name"
         val destination = "Test destination"
         val defaultActivated = false
-        val categoryImage = "https://~~"
 
         updateCategorySpi.saveCategory(
             Category(
                 id = id,
                 name = name,
                 destination = destination,
                 defaultActivated = defaultActivated,
-                categoryImageUrl = categoryImage,
             )
         )
 

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
@@ -32,7 +32,6 @@ class DetailApiImplTest {
             "Test category",
             "Test destination",
             true,
-            "https://~~"
         )
         val userId = UUID.randomUUID()
 
@@ -60,14 +59,12 @@ class DetailApiImplTest {
         val content = "Test Content"
         val destination = "/test"
         val categoryName = "Test Category"
-        val categoryImage = "https://~~"
 
         val category = Category(
             id = UUID.randomUUID(),
             name = categoryName,
             destination = destination,
             defaultActivated = true,
-            categoryImageUrl = categoryImage,
         )
 
         categorySpi.saveCategory(category)
@@ -105,7 +102,6 @@ class DetailApiImplTest {
             name = categoryName,
             destination = destination,
             defaultActivated = true,
-            categoryImageUrl = categoryImage
         )
 
         categorySpi.saveCategory(category)
@@ -134,14 +130,12 @@ class DetailApiImplTest {
         val content = "Test Content"
         val destination = "/test"
         val categoryName = "Test Category"
-        val categoryImage = "https://~~"
 
         val category = Category(
             id = UUID.randomUUID(),
             name = categoryName,
             destination = destination,
             defaultActivated = false,
-            categoryImageUrl = categoryImage
         )
 
         categorySpi.saveCategory(category)
@@ -180,14 +174,12 @@ class DetailApiImplTest {
         val content = "Test Content"
         val destination = "/test"
         val categoryName = "Test Category"
-        val categoryImage = "https://~~"
 
         val category = Category(
             id = UUID.randomUUID(),
             name = categoryName,
             destination = destination,
             defaultActivated = true,
-            categoryImageUrl = categoryImage
         )
 
         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
@@ -22,7 +22,7 @@ class SettingApiImplTest {
         val userId = UUID.randomUUID()
         val categoryId = UUID.randomUUID()
 
-        val category = Category(categoryId, "Test name", "Test destination", false, "https://~~")
+        val category = Category(categoryId, "Test name", "Test destination", false)
 
         settingSpi.saveCategory(category)
 
@@ -45,7 +45,7 @@ class SettingApiImplTest {
         val userId = UUID.randomUUID()
         val categoryId = UUID.randomUUID()
         categorySpi.saveCategory(
-            Category(categoryId, "Test name", "Test destination", false, "https://~~")
+            Category(categoryId, "Test name", "Test destination", false)
         )
         Assertions.assertThat(settingApi.deActivateCategory(categoryId, userId))
             .isEqualTo(201)
@@ -58,7 +58,7 @@ class SettingApiImplTest {
         val userId = UUID.randomUUID()
         val categoryId = UUID.randomUUID()
         categorySpi.saveCategory(
-            Category(categoryId, "Test name", "Test destination", false, "https://~~")
+            Category(categoryId, "Test name", "Test destination", false)
         )
         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
@@ -30,11 +30,4 @@ class CategoryEntity(
     @OneToMany(mappedBy = "settingId.categoryEntity", fetch = FetchType.LAZY)
     val settingList: List<SettingEntity> = emptyList(),
 
-    categoryImageUrl: String,
-
-) : BaseUUIDEntity(id) {
-
-    @field:NotNull
-    var categoryImageUrl = categoryImageUrl
-        protected set
-}
+) : 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,7 +13,6 @@ class CategoryMapperImpl: CategoryMapper {
             name = category.name,
             destination = category.destination,
             defaultActivated = category.defaultActivated,
-            categoryImageUrl = category.categoryImageUrl
         )
     }
 
@@ -23,7 +22,6 @@ class CategoryMapperImpl: CategoryMapper {
             name = categoryEntity.name,
             destination = categoryEntity.destination,
             defaultActivated = categoryEntity.defaultActivated,
-            categoryImageUrl = categoryEntity.categoryImageUrl
         )
     }
 }
diff --git a/...kotlin/io/github/v1servicenotification/domain/category/presentation/CategoryController.kt b/...kotlin/io/github/v1servicenotification/domain/category/presentation/CategoryController.kt
@@ -38,7 +38,6 @@ class CategoryController(
             name = request.name,
             destination = request.destination,
             defaultActivated = request.defaultActivated,
-            categoryImage = request.categoryImage
         )
     }
 

diff --git a/...b/v1servicenotification/domain/category/presentation/dto/request/CreateCategoryRequest.kt b/...b/v1servicenotification/domain/category/presentation/dto/request/CreateCategoryRequest.kt
@@ -15,8 +15,4 @@ class CreateCategoryRequest {
 
     var defaultActivated by Delegates.notNull<Boolean>()
         private set
-
-    @NotNull
-    lateinit var categoryImage: String
-        private set
 }
diff --git a/...ithub/v1servicenotification/domain/detail/domain/repository/CustomDetailRepositoryImpl.kt b/...ithub/v1servicenotification/domain/detail/domain/repository/CustomDetailRepositoryImpl.kt
@@ -30,7 +30,6 @@ class CustomDetailRepositoryImpl(
                     detailEntity.userId,
                     categoryEntity.name,
                     categoryEntity.destination,
-                    categoryEntity.categoryImageUrl
                 )
             )
             .from(detailEntity)
@@ -47,7 +46,6 @@ class CustomDetailRepositoryImpl(
                     userId = it.userId,
                     name = it.name,
                     destination = it.destination,
-                    categoryImage = it.categoryImage
                 )
             }
             .toList()

diff --git a/...ain/kotlin/io/github/v1servicenotification/domain/detail/domain/repository/vo/DetailVO.kt b/...ain/kotlin/io/github/v1servicenotification/domain/detail/domain/repository/vo/DetailVO.kt
@@ -21,7 +21,6 @@ class DetailVO @QueryProjection constructor(
 
     val destination: String,
 
-    val categoryImage: String,
 ) {
     var isRead: Boolean = isRead
         private set