Refactor notification setting (#19)

subsub97 · web-flow · commit 2acf179b656d · 2026-02-18T16:25:22.000+09:00
diff --git a/src/main/kotlin/com/moa/controller/NotificationSettingController.kt b/src/main/kotlin/com/moa/controller/NotificationSettingController.kt
@@ -20,21 +20,9 @@ class NotificationSettingController(
         @Auth member: AuthMemberInfo,
     ) = ApiResponse.success(notificationSettingService.getSettings(member.id))
 
-    @PatchMapping("/work")
-    fun updateWorkNotification(
+    @PatchMapping
+    fun updateSetting(
         @Auth member: AuthMemberInfo,
         @RequestBody req: NotificationSettingUpdateRequest,
-    ) = ApiResponse.success(notificationSettingService.updateWorkNotification(member.id, req.enabled))
-
-    @PatchMapping("/payday")
-    fun updatePaydayNotification(
-        @Auth member: AuthMemberInfo,
-        @RequestBody req: NotificationSettingUpdateRequest,
-    ) = ApiResponse.success(notificationSettingService.updatePaydayNotification(member.id, req.enabled))
-
-    @PatchMapping("/promotion")
-    fun updatePromotionNotification(
-        @Auth member: AuthMemberInfo,
-        @RequestBody req: NotificationSettingUpdateRequest,
-    ) = ApiResponse.success(notificationSettingService.updatePromotionNotification(member.id, req.enabled))
+    ) = ApiResponse.success(notificationSettingService.updateSetting(member.id, req.type, req.checked))
 }
diff --git a/src/main/kotlin/com/moa/entity/NotificationSetting.kt b/src/main/kotlin/com/moa/entity/NotificationSetting.kt
@@ -9,16 +9,30 @@ class NotificationSetting(
     val memberId: Long,
 
     @Column(nullable = false)
-    var workNotificationEnabled: Boolean = false,
+    var workNotificationEnabled: Boolean = true,
 
     @Column(nullable = false)
-    var paydayNotificationEnabled: Boolean = false,
+    var paydayNotificationEnabled: Boolean = true,
 
     @Column(nullable = false)
-    var promotionNotificationEnabled: Boolean = false,
+    var marketingNotificationEnabled: Boolean = true,
 ) : BaseEntity() {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     val id: Long = 0
+
+    fun isEnabled(type: NotificationSettingType): Boolean = when (type) {
+        NotificationSettingType.WORK -> workNotificationEnabled
+        NotificationSettingType.PAYDAY -> paydayNotificationEnabled
+        NotificationSettingType.MARKETING -> marketingNotificationEnabled
+    }
+
+    fun update(type: NotificationSettingType, checked: Boolean) {
+        when (type) {
+            NotificationSettingType.WORK -> workNotificationEnabled = checked
+            NotificationSettingType.PAYDAY -> paydayNotificationEnabled = checked
+            NotificationSettingType.MARKETING -> marketingNotificationEnabled = checked
+        }
+    }
 }
diff --git a/src/main/kotlin/com/moa/entity/NotificationSettingType.kt b/src/main/kotlin/com/moa/entity/NotificationSettingType.kt
@@ -0,0 +1,10 @@
+package com.moa.entity
+
+enum class NotificationSettingType(
+    val category: String,
+    val title: String,
+) {
+    WORK("서비스 알림", "출퇴근 알림"),
+    PAYDAY("서비스 알림", "월급날 알림"),
+    MARKETING("광고성 정보 알림", "혜택 및 이벤트 알림"),
+}
diff --git a/src/main/kotlin/com/moa/service/NotificationSettingService.kt b/src/main/kotlin/com/moa/service/NotificationSettingService.kt
@@ -3,6 +3,7 @@ package com.moa.service
 import com.moa.common.exception.BadRequestException
 import com.moa.common.exception.ErrorCode
 import com.moa.entity.NotificationSetting
+import com.moa.entity.NotificationSettingType
 import com.moa.entity.Term
 import com.moa.repository.NotificationSettingRepository
 import com.moa.repository.TermAgreementRepository
@@ -17,47 +18,45 @@ class NotificationSettingService(
 ) {
 
     @Transactional(readOnly = true)
-    fun getSettings(memberId: Long): NotificationSettingResponse {
+    fun getSettings(memberId: Long): List<NotificationSettingResponse> {
         val setting = notificationSettingRepository.findByMemberId(memberId)
-        return NotificationSettingResponse.from(setting)
-    }
-
-    @Transactional
-    fun updateWorkNotification(memberId: Long, enabled: Boolean): NotificationSettingResponse {
-        val setting = getOrCreate(memberId)
-        setting.workNotificationEnabled = enabled
-        return NotificationSettingResponse.from(setting)
-    }
-
-    @Transactional
-    fun updatePaydayNotification(memberId: Long, enabled: Boolean): NotificationSettingResponse {
-        val setting = getOrCreate(memberId)
-        setting.paydayNotificationEnabled = enabled
-        return NotificationSettingResponse.from(setting)
+        if (setting != null) {
+            return NotificationSettingResponse.from(setting)
+        }
+        // Setting 지연생성 때문에 지저분한 코드..
+        return NotificationSettingResponse.from(isMarketingAgreed(memberId))
     }
 
     @Transactional
-    fun updatePromotionNotification(memberId: Long, enabled: Boolean): NotificationSettingResponse {
-        val setting = getOrCreate(memberId)
-
-        if (enabled) {
+    fun updateSetting(
+        memberId: Long,
+        type: NotificationSettingType,
+        checked: Boolean
+    ): List<NotificationSettingResponse> {
+        if (type == NotificationSettingType.MARKETING && checked) {
             validateMarketingAgreed(memberId)
         }
-
-        setting.promotionNotificationEnabled = enabled
-
+        val setting = getOrCreate(memberId)
+        setting.update(type, checked)
         return NotificationSettingResponse.from(setting)
     }
 
     private fun getOrCreate(memberId: Long): NotificationSetting {
         return notificationSettingRepository.findByMemberId(memberId)
-            ?: notificationSettingRepository.save(NotificationSetting(memberId = memberId))
+            ?: notificationSettingRepository.save(
+                NotificationSetting(
+                    memberId = memberId,
+                    marketingNotificationEnabled = isMarketingAgreed(memberId),
+                )
+            )
     }
 
-    private fun validateMarketingAgreed(memberId: Long) {
-        val agreement = termAgreementRepository.findByMemberIdAndTermCode(memberId, Term.MARKETING)
+    private fun isMarketingAgreed(memberId: Long): Boolean {
+        return termAgreementRepository.findByMemberIdAndTermCode(memberId, Term.MARKETING)?.agreed ?: false
+    }
 
-        if (agreement == null || !agreement.agreed) {
+    private fun validateMarketingAgreed(memberId: Long) {
+        if (!isMarketingAgreed(memberId)) {
             throw BadRequestException(ErrorCode.REQUIRED_MARKETING_TERM)
         }
     }
diff --git a/src/main/kotlin/com/moa/service/dto/NotificationSettingResponse.kt b/src/main/kotlin/com/moa/service/dto/NotificationSettingResponse.kt
@@ -1,17 +1,35 @@
 package com.moa.service.dto
 
 import com.moa.entity.NotificationSetting
+import com.moa.entity.NotificationSettingType
 
 data class NotificationSettingResponse(
-    val workNotificationEnabled: Boolean,
-    val paydayNotificationEnabled: Boolean,
-    val promotionNotificationEnabled: Boolean,
+    val type: NotificationSettingType,
+    val category: String,
+    val title: String,
+    val checked: Boolean,
 ) {
     companion object {
-        fun from(setting: NotificationSetting?) = NotificationSettingResponse(
-            workNotificationEnabled = setting?.workNotificationEnabled ?: false,
-            paydayNotificationEnabled = setting?.paydayNotificationEnabled ?: false,
-            promotionNotificationEnabled = setting?.promotionNotificationEnabled ?: false,
-        )
+        fun from(setting: NotificationSetting): List<NotificationSettingResponse> {
+            return NotificationSettingType.entries.map { type ->
+                NotificationSettingResponse(
+                    type = type,
+                    category = type.category,
+                    title = type.title,
+                    checked = setting.isEnabled(type),
+                )
+            }
+        }
+
+        fun from(marketingAgreed: Boolean): List<NotificationSettingResponse> {
+            return NotificationSettingType.entries.map { type ->
+                NotificationSettingResponse(
+                    type = type,
+                    category = type.category,
+                    title = type.title,
+                    checked = if (type == NotificationSettingType.MARKETING) marketingAgreed else true,
+                )
+            }
+        }
     }
 }
diff --git a/src/main/kotlin/com/moa/service/dto/NotificationSettingUpdateRequest.kt b/src/main/kotlin/com/moa/service/dto/NotificationSettingUpdateRequest.kt
@@ -1,5 +1,8 @@
 package com.moa.service.dto
 
+import com.moa.entity.NotificationSettingType
+
 data class NotificationSettingUpdateRequest(
-    val enabled: Boolean,
+    val type: NotificationSettingType,
+    val checked: Boolean,
 )
diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
@@ -1,7 +1,7 @@
 spring:
   jpa:
     hibernate:
-      ddl-auto: create
+      ddl-auto: update
     properties:
       hibernate:
         format_sql: true
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
@@ -8,7 +8,7 @@ spring:
   jpa:
     database-platform: org.hibernate.dialect.MySQLDialect
     hibernate:
-      ddl-auto: create # TODO. validates로 변경
+      ddl-auto: validate
     properties:
       hibernate:
         format_sql: true

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`package com.moa.service.dto`
`2`	`2`
	`3`	`+import com.moa.entity.NotificationSettingType`
	`4`	`+`
`3`	`5`	`data class NotificationSettingUpdateRequest(`
`4`		`- val enabled: Boolean,`
	`6`	`+ val type: NotificationSettingType,`
	`7`	`+ val checked: Boolean,`
`5`	`8`	`)`