Merge pull request #335 from team-haribo/327-test-push-alert-api

🔁 FCM 스케쥴 조건문 변경
team-haribo · Dec 11, 2024 · aaaa311 · aaaa311
2 parents f445137 + 466ee14
commit aaaa311
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/...cation/src/main/kotlin/com/goms/v2/domain/notification/usecase/SendNotificationUseCase.kt b/...cation/src/main/kotlin/com/goms/v2/domain/notification/usecase/SendNotificationUseCase.kt
@@ -15,17 +15,17 @@ class SendNotificationUseCase(
 ) {
 
     fun execute(notificationType: NotificationType) {
-        val isExistTodayOutingDate = deniedOutingDateRepository.existsByOutingDate(LocalDate.now())
+        val isTodayDeniedOuting = deniedOutingDateRepository.existsByOutingDate(LocalDate.now())
 
         when (notificationType) {
             NotificationType.FIRST_NOTIFICATION -> {
                 runCatching {
                     notificationPort.sendNotification(
                         deviceTokens = deviceTokenRepository.findAll().map { it.token },
                         notificationConfig = NotificationConfig(
-                                title = if(isExistTodayOutingDate) Topic.DENIED_NOTIFICATION.title
+                                title = if(isTodayDeniedOuting) Topic.DENIED_NOTIFICATION.title
                                     else Topic.FIRST_NOTIFICATION.title,
-                                content = if(isExistTodayOutingDate) Topic.DENIED_NOTIFICATION.content
+                                content = if(isTodayDeniedOuting) Topic.DENIED_NOTIFICATION.content
                                     else Topic.FIRST_NOTIFICATION.content,
                                 writer = Writer.GOMS
                             )
@@ -36,7 +36,7 @@ class SendNotificationUseCase(
             }
 
             NotificationType.FINAL_NOTIFICATION -> {
-                if(!isExistTodayOutingDate){
+                if(!isTodayDeniedOuting){
                     runCatching {
                         notificationPort.sendNotification(
                             deviceTokens = deviceTokenRepository.findAll().map { it.token },

diff --git a/...pplication/src/main/kotlin/com/goms/v2/domain/outingDate/usecase/SetTodayOutingUseCase.kt b/...pplication/src/main/kotlin/com/goms/v2/domain/outingDate/usecase/SetTodayOutingUseCase.kt
@@ -22,19 +22,20 @@ class SetTodayOutingUseCase(
 		}
 
 		val nowDate = LocalDate.now()
-		val isExistDeniedOutingDate = deniedOutingDateRepository.existsByOutingDate(nowDate)
+		val isTodayDeniedOuting = deniedOutingDateRepository.existsByOutingDate(nowDate)
 
-		if(isExistDeniedOutingDate){
-			if(!setTodayOutingDto.outingStatus) deniedOutingDateRepository.deleteByOutingDate(nowDate)
+		if(isTodayDeniedOuting){
+			if(setTodayOutingDto.outingStatus) deniedOutingDateRepository.deleteByOutingDate(nowDate)
 			else throw DuplicatedOutingDateException()
 		} else {
-			if(setTodayOutingDto.outingStatus){
+			if(setTodayOutingDto.outingStatus) throw DuplicatedOutingDateException()
+			else {
 				val newDeniedOutingDate = DeniedOutingDate(
 					idx = -1,
 					outingDate = LocalDate.now()
 				)
 				deniedOutingDateRepository.save(newDeniedOutingDate)
-			} else throw DuplicatedOutingDateException()
+			}
 		}
 	}