From e37a1f7e4b4072ebab60d76cbcf9345316b700c1 Mon Sep 17 00:00:00 2001 From: taerimiiii Date: Wed, 12 Aug 2026 02:45:00 +0900 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=ED=8F=B4=EB=8D=94=20=EA=B5=AC?= =?UTF-8?q?=EC=A1=B0=20=EB=A6=AC=ED=8E=99=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AlarmController.java | 28 +++++++++---------- .../controller/docs/AlarmControllerDocs.java | 16 +++++------ .../dto/ActionItemReminderResponse.java | 2 +- .../dto/AlarmCorrectionResponse.java | 2 +- .../dto/AlarmDetailResponse.java | 2 +- .../dto/AlarmListResponse.java | 2 +- .../dto/AlarmPushTokenRequest.java | 2 +- .../dto/AlarmStateResponse.java | 2 +- .../dto/EventReminderResponse.java | 2 +- .../service/AlarmPushTokenService.java | 2 +- .../service/AlarmQueryService.java | 8 +++--- .../AlarmReminderDispatchExecutor.java | 2 +- .../service/AlarmReminderScheduleService.java | 6 ++-- .../service/AlarmStateService.java | 4 +-- .../service/AlarmTermService.java | 2 +- .../service/FcmPushService.java | 2 +- .../util/AlarmCursorCodec.java | 2 +- 17 files changed, 43 insertions(+), 43 deletions(-) rename src/main/java/com/tryna/domain/{alarm => reminder}/controller/AlarmController.java (89%) rename src/main/java/com/tryna/domain/{alarm => reminder}/controller/docs/AlarmControllerDocs.java (92%) rename src/main/java/com/tryna/domain/{alarm => reminder}/dto/ActionItemReminderResponse.java (93%) rename src/main/java/com/tryna/domain/{alarm => reminder}/dto/AlarmCorrectionResponse.java (96%) rename src/main/java/com/tryna/domain/{alarm => reminder}/dto/AlarmDetailResponse.java (96%) rename src/main/java/com/tryna/domain/{alarm => reminder}/dto/AlarmListResponse.java (90%) rename src/main/java/com/tryna/domain/{alarm => reminder}/dto/AlarmPushTokenRequest.java (91%) rename src/main/java/com/tryna/domain/{alarm => reminder}/dto/AlarmStateResponse.java (82%) rename src/main/java/com/tryna/domain/{alarm => reminder}/dto/EventReminderResponse.java (93%) rename src/main/java/com/tryna/domain/{alarm => reminder}/service/AlarmPushTokenService.java (97%) rename src/main/java/com/tryna/domain/{alarm => reminder}/service/AlarmQueryService.java (95%) rename src/main/java/com/tryna/domain/{alarm => reminder}/service/AlarmStateService.java (94%) rename src/main/java/com/tryna/domain/{alarm => reminder}/service/AlarmTermService.java (97%) rename src/main/java/com/tryna/domain/{alarm => reminder}/service/FcmPushService.java (99%) rename src/main/java/com/tryna/domain/{alarm => reminder}/util/AlarmCursorCodec.java (98%) diff --git a/src/main/java/com/tryna/domain/alarm/controller/AlarmController.java b/src/main/java/com/tryna/domain/reminder/controller/AlarmController.java similarity index 89% rename from src/main/java/com/tryna/domain/alarm/controller/AlarmController.java rename to src/main/java/com/tryna/domain/reminder/controller/AlarmController.java index 7db7c1b..c96859f 100644 --- a/src/main/java/com/tryna/domain/alarm/controller/AlarmController.java +++ b/src/main/java/com/tryna/domain/reminder/controller/AlarmController.java @@ -1,18 +1,18 @@ -package com.tryna.domain.alarm.controller; - -import com.tryna.domain.alarm.controller.docs.AlarmControllerDocs; -import com.tryna.domain.alarm.dto.ActionItemReminderResponse; -import com.tryna.domain.alarm.dto.AlarmCorrectionResponse; -import com.tryna.domain.alarm.dto.AlarmDetailResponse; -import com.tryna.domain.alarm.dto.AlarmListResponse; -import com.tryna.domain.alarm.dto.AlarmPushTokenRequest; -import com.tryna.domain.alarm.dto.AlarmStateResponse; -import com.tryna.domain.alarm.dto.EventReminderResponse; -import com.tryna.domain.alarm.service.AlarmPushTokenService; -import com.tryna.domain.alarm.service.AlarmQueryService; -import com.tryna.domain.alarm.service.AlarmStateService; -import com.tryna.domain.alarm.service.AlarmTermService; +package com.tryna.domain.reminder.controller; + +import com.tryna.domain.reminder.controller.docs.AlarmControllerDocs; +import com.tryna.domain.reminder.dto.ActionItemReminderResponse; +import com.tryna.domain.reminder.dto.AlarmCorrectionResponse; +import com.tryna.domain.reminder.dto.AlarmDetailResponse; +import com.tryna.domain.reminder.dto.AlarmListResponse; +import com.tryna.domain.reminder.dto.AlarmPushTokenRequest; +import com.tryna.domain.reminder.dto.AlarmStateResponse; +import com.tryna.domain.reminder.dto.EventReminderResponse; +import com.tryna.domain.reminder.service.AlarmPushTokenService; +import com.tryna.domain.reminder.service.AlarmQueryService; import com.tryna.domain.reminder.service.AlarmReminderScheduleService; +import com.tryna.domain.reminder.service.AlarmStateService; +import com.tryna.domain.reminder.service.AlarmTermService; import com.tryna.global.exception.AuthErrorCode; import com.tryna.global.exception.BusinessException; import com.tryna.global.response.ApiResponse; diff --git a/src/main/java/com/tryna/domain/alarm/controller/docs/AlarmControllerDocs.java b/src/main/java/com/tryna/domain/reminder/controller/docs/AlarmControllerDocs.java similarity index 92% rename from src/main/java/com/tryna/domain/alarm/controller/docs/AlarmControllerDocs.java rename to src/main/java/com/tryna/domain/reminder/controller/docs/AlarmControllerDocs.java index bf69219..6e8739c 100644 --- a/src/main/java/com/tryna/domain/alarm/controller/docs/AlarmControllerDocs.java +++ b/src/main/java/com/tryna/domain/reminder/controller/docs/AlarmControllerDocs.java @@ -1,12 +1,12 @@ -package com.tryna.domain.alarm.controller.docs; +package com.tryna.domain.reminder.controller.docs; -import com.tryna.domain.alarm.dto.ActionItemReminderResponse; -import com.tryna.domain.alarm.dto.AlarmCorrectionResponse; -import com.tryna.domain.alarm.dto.AlarmDetailResponse; -import com.tryna.domain.alarm.dto.AlarmListResponse; -import com.tryna.domain.alarm.dto.AlarmPushTokenRequest; -import com.tryna.domain.alarm.dto.AlarmStateResponse; -import com.tryna.domain.alarm.dto.EventReminderResponse; +import com.tryna.domain.reminder.dto.ActionItemReminderResponse; +import com.tryna.domain.reminder.dto.AlarmCorrectionResponse; +import com.tryna.domain.reminder.dto.AlarmDetailResponse; +import com.tryna.domain.reminder.dto.AlarmListResponse; +import com.tryna.domain.reminder.dto.AlarmPushTokenRequest; +import com.tryna.domain.reminder.dto.AlarmStateResponse; +import com.tryna.domain.reminder.dto.EventReminderResponse; import com.tryna.global.response.ApiResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/src/main/java/com/tryna/domain/alarm/dto/ActionItemReminderResponse.java b/src/main/java/com/tryna/domain/reminder/dto/ActionItemReminderResponse.java similarity index 93% rename from src/main/java/com/tryna/domain/alarm/dto/ActionItemReminderResponse.java rename to src/main/java/com/tryna/domain/reminder/dto/ActionItemReminderResponse.java index 802f66f..e44e22a 100644 --- a/src/main/java/com/tryna/domain/alarm/dto/ActionItemReminderResponse.java +++ b/src/main/java/com/tryna/domain/reminder/dto/ActionItemReminderResponse.java @@ -1,4 +1,4 @@ -package com.tryna.domain.alarm.dto; +package com.tryna.domain.reminder.dto; import com.tryna.domain.reminder.entity.Reminders; diff --git a/src/main/java/com/tryna/domain/alarm/dto/AlarmCorrectionResponse.java b/src/main/java/com/tryna/domain/reminder/dto/AlarmCorrectionResponse.java similarity index 96% rename from src/main/java/com/tryna/domain/alarm/dto/AlarmCorrectionResponse.java rename to src/main/java/com/tryna/domain/reminder/dto/AlarmCorrectionResponse.java index efbdf16..ea37b84 100644 --- a/src/main/java/com/tryna/domain/alarm/dto/AlarmCorrectionResponse.java +++ b/src/main/java/com/tryna/domain/reminder/dto/AlarmCorrectionResponse.java @@ -1,4 +1,4 @@ -package com.tryna.domain.alarm.dto; +package com.tryna.domain.reminder.dto; import com.tryna.domain.reminder.entity.Reminders; import com.tryna.domain.reminder.enums.TargetType; diff --git a/src/main/java/com/tryna/domain/alarm/dto/AlarmDetailResponse.java b/src/main/java/com/tryna/domain/reminder/dto/AlarmDetailResponse.java similarity index 96% rename from src/main/java/com/tryna/domain/alarm/dto/AlarmDetailResponse.java rename to src/main/java/com/tryna/domain/reminder/dto/AlarmDetailResponse.java index 5611815..255ebff 100644 --- a/src/main/java/com/tryna/domain/alarm/dto/AlarmDetailResponse.java +++ b/src/main/java/com/tryna/domain/reminder/dto/AlarmDetailResponse.java @@ -1,4 +1,4 @@ -package com.tryna.domain.alarm.dto; +package com.tryna.domain.reminder.dto; import com.tryna.domain.reminder.entity.Reminders; import com.tryna.domain.reminder.enums.TargetType; diff --git a/src/main/java/com/tryna/domain/alarm/dto/AlarmListResponse.java b/src/main/java/com/tryna/domain/reminder/dto/AlarmListResponse.java similarity index 90% rename from src/main/java/com/tryna/domain/alarm/dto/AlarmListResponse.java rename to src/main/java/com/tryna/domain/reminder/dto/AlarmListResponse.java index 2a3141d..0e05e30 100644 --- a/src/main/java/com/tryna/domain/alarm/dto/AlarmListResponse.java +++ b/src/main/java/com/tryna/domain/reminder/dto/AlarmListResponse.java @@ -1,4 +1,4 @@ -package com.tryna.domain.alarm.dto; +package com.tryna.domain.reminder.dto; import java.util.List; diff --git a/src/main/java/com/tryna/domain/alarm/dto/AlarmPushTokenRequest.java b/src/main/java/com/tryna/domain/reminder/dto/AlarmPushTokenRequest.java similarity index 91% rename from src/main/java/com/tryna/domain/alarm/dto/AlarmPushTokenRequest.java rename to src/main/java/com/tryna/domain/reminder/dto/AlarmPushTokenRequest.java index 0517599..3a1be40 100644 --- a/src/main/java/com/tryna/domain/alarm/dto/AlarmPushTokenRequest.java +++ b/src/main/java/com/tryna/domain/reminder/dto/AlarmPushTokenRequest.java @@ -1,4 +1,4 @@ -package com.tryna.domain.alarm.dto; +package com.tryna.domain.reminder.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/tryna/domain/alarm/dto/AlarmStateResponse.java b/src/main/java/com/tryna/domain/reminder/dto/AlarmStateResponse.java similarity index 82% rename from src/main/java/com/tryna/domain/alarm/dto/AlarmStateResponse.java rename to src/main/java/com/tryna/domain/reminder/dto/AlarmStateResponse.java index 7a13355..4172585 100644 --- a/src/main/java/com/tryna/domain/alarm/dto/AlarmStateResponse.java +++ b/src/main/java/com/tryna/domain/reminder/dto/AlarmStateResponse.java @@ -1,4 +1,4 @@ -package com.tryna.domain.alarm.dto; +package com.tryna.domain.reminder.dto; public record AlarmStateResponse( boolean alarmState diff --git a/src/main/java/com/tryna/domain/alarm/dto/EventReminderResponse.java b/src/main/java/com/tryna/domain/reminder/dto/EventReminderResponse.java similarity index 93% rename from src/main/java/com/tryna/domain/alarm/dto/EventReminderResponse.java rename to src/main/java/com/tryna/domain/reminder/dto/EventReminderResponse.java index 534b04c..df43cfa 100644 --- a/src/main/java/com/tryna/domain/alarm/dto/EventReminderResponse.java +++ b/src/main/java/com/tryna/domain/reminder/dto/EventReminderResponse.java @@ -1,4 +1,4 @@ -package com.tryna.domain.alarm.dto; +package com.tryna.domain.reminder.dto; import com.tryna.domain.reminder.entity.Reminders; diff --git a/src/main/java/com/tryna/domain/alarm/service/AlarmPushTokenService.java b/src/main/java/com/tryna/domain/reminder/service/AlarmPushTokenService.java similarity index 97% rename from src/main/java/com/tryna/domain/alarm/service/AlarmPushTokenService.java rename to src/main/java/com/tryna/domain/reminder/service/AlarmPushTokenService.java index 3f123ef..ba691ad 100644 --- a/src/main/java/com/tryna/domain/alarm/service/AlarmPushTokenService.java +++ b/src/main/java/com/tryna/domain/reminder/service/AlarmPushTokenService.java @@ -1,4 +1,4 @@ -package com.tryna.domain.alarm.service; +package com.tryna.domain.reminder.service; import com.tryna.domain.auth.repository.FcmTokenRedisRepository; import com.tryna.global.exception.AlarmErrorCode; diff --git a/src/main/java/com/tryna/domain/alarm/service/AlarmQueryService.java b/src/main/java/com/tryna/domain/reminder/service/AlarmQueryService.java similarity index 95% rename from src/main/java/com/tryna/domain/alarm/service/AlarmQueryService.java rename to src/main/java/com/tryna/domain/reminder/service/AlarmQueryService.java index d4d6cd2..4940b34 100644 --- a/src/main/java/com/tryna/domain/alarm/service/AlarmQueryService.java +++ b/src/main/java/com/tryna/domain/reminder/service/AlarmQueryService.java @@ -1,10 +1,10 @@ -package com.tryna.domain.alarm.service; +package com.tryna.domain.reminder.service; -import com.tryna.domain.alarm.dto.AlarmDetailResponse; -import com.tryna.domain.alarm.dto.AlarmListResponse; -import com.tryna.domain.alarm.util.AlarmCursorCodec; +import com.tryna.domain.reminder.dto.AlarmDetailResponse; +import com.tryna.domain.reminder.dto.AlarmListResponse; import com.tryna.domain.reminder.entity.Reminders; import com.tryna.domain.reminder.repository.RemindersRepository; +import com.tryna.domain.reminder.util.AlarmCursorCodec; import com.tryna.domain.user.entity.Users; import com.tryna.domain.user.repository.UserRepository; import com.tryna.global.exception.AlarmErrorCode; diff --git a/src/main/java/com/tryna/domain/reminder/service/AlarmReminderDispatchExecutor.java b/src/main/java/com/tryna/domain/reminder/service/AlarmReminderDispatchExecutor.java index 8e6e65a..8f779b7 100644 --- a/src/main/java/com/tryna/domain/reminder/service/AlarmReminderDispatchExecutor.java +++ b/src/main/java/com/tryna/domain/reminder/service/AlarmReminderDispatchExecutor.java @@ -2,7 +2,7 @@ import com.tryna.domain.action.entity.ActionItems; import com.tryna.domain.action.repository.ActionItemOccurrenceStatesRepository; -import com.tryna.domain.alarm.service.FcmPushService; +import com.tryna.domain.reminder.service.FcmPushService; import com.tryna.domain.auth.repository.FcmTokenRedisRepository; import com.tryna.domain.event.entity.Events; import com.tryna.domain.event.util.EventRecurrenceCalculator; diff --git a/src/main/java/com/tryna/domain/reminder/service/AlarmReminderScheduleService.java b/src/main/java/com/tryna/domain/reminder/service/AlarmReminderScheduleService.java index 78e849e..722e1bf 100644 --- a/src/main/java/com/tryna/domain/reminder/service/AlarmReminderScheduleService.java +++ b/src/main/java/com/tryna/domain/reminder/service/AlarmReminderScheduleService.java @@ -3,9 +3,9 @@ import com.tryna.domain.action.entity.ActionItems; import com.tryna.domain.action.enums.ItemType; import com.tryna.domain.action.repository.ActionItemsRepository; -import com.tryna.domain.alarm.dto.ActionItemReminderResponse; -import com.tryna.domain.alarm.dto.AlarmCorrectionResponse; -import com.tryna.domain.alarm.dto.EventReminderResponse; +import com.tryna.domain.reminder.dto.ActionItemReminderResponse; +import com.tryna.domain.reminder.dto.AlarmCorrectionResponse; +import com.tryna.domain.reminder.dto.EventReminderResponse; import com.tryna.domain.auth.repository.FcmTokenRedisRepository; import com.tryna.domain.event.entity.Events; import com.tryna.domain.event.repository.EventsRepository; diff --git a/src/main/java/com/tryna/domain/alarm/service/AlarmStateService.java b/src/main/java/com/tryna/domain/reminder/service/AlarmStateService.java similarity index 94% rename from src/main/java/com/tryna/domain/alarm/service/AlarmStateService.java rename to src/main/java/com/tryna/domain/reminder/service/AlarmStateService.java index 164750b..eadaefd 100644 --- a/src/main/java/com/tryna/domain/alarm/service/AlarmStateService.java +++ b/src/main/java/com/tryna/domain/reminder/service/AlarmStateService.java @@ -1,6 +1,6 @@ -package com.tryna.domain.alarm.service; +package com.tryna.domain.reminder.service; -import com.tryna.domain.alarm.dto.AlarmStateResponse; +import com.tryna.domain.reminder.dto.AlarmStateResponse; import com.tryna.domain.term.entity.Terms; import com.tryna.domain.term.enums.TermType; import com.tryna.domain.term.repository.TermsRepository; diff --git a/src/main/java/com/tryna/domain/alarm/service/AlarmTermService.java b/src/main/java/com/tryna/domain/reminder/service/AlarmTermService.java similarity index 97% rename from src/main/java/com/tryna/domain/alarm/service/AlarmTermService.java rename to src/main/java/com/tryna/domain/reminder/service/AlarmTermService.java index 91adf2f..a59a15e 100644 --- a/src/main/java/com/tryna/domain/alarm/service/AlarmTermService.java +++ b/src/main/java/com/tryna/domain/reminder/service/AlarmTermService.java @@ -1,4 +1,4 @@ -package com.tryna.domain.alarm.service; +package com.tryna.domain.reminder.service; import com.tryna.domain.term.entity.Terms; import com.tryna.domain.term.entity.mapping.UserAgreedTerms; diff --git a/src/main/java/com/tryna/domain/alarm/service/FcmPushService.java b/src/main/java/com/tryna/domain/reminder/service/FcmPushService.java similarity index 99% rename from src/main/java/com/tryna/domain/alarm/service/FcmPushService.java rename to src/main/java/com/tryna/domain/reminder/service/FcmPushService.java index 99a6d88..f8b9336 100644 --- a/src/main/java/com/tryna/domain/alarm/service/FcmPushService.java +++ b/src/main/java/com/tryna/domain/reminder/service/FcmPushService.java @@ -1,4 +1,4 @@ -package com.tryna.domain.alarm.service; +package com.tryna.domain.reminder.service; import com.google.firebase.FirebaseApp; import com.google.firebase.messaging.BatchResponse; diff --git a/src/main/java/com/tryna/domain/alarm/util/AlarmCursorCodec.java b/src/main/java/com/tryna/domain/reminder/util/AlarmCursorCodec.java similarity index 98% rename from src/main/java/com/tryna/domain/alarm/util/AlarmCursorCodec.java rename to src/main/java/com/tryna/domain/reminder/util/AlarmCursorCodec.java index 12d2809..84737a4 100644 --- a/src/main/java/com/tryna/domain/alarm/util/AlarmCursorCodec.java +++ b/src/main/java/com/tryna/domain/reminder/util/AlarmCursorCodec.java @@ -1,4 +1,4 @@ -package com.tryna.domain.alarm.util; +package com.tryna.domain.reminder.util; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; From a575fc181af1d8d2ba2e32d1330bbb32c2f2924e Mon Sep 17 00:00:00 2001 From: taerimiiii Date: Wed, 12 Aug 2026 03:00:07 +0900 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20=EC=95=8C=EB=9E=8C=20=EC=95=BD?= =?UTF-8?q?=EA=B4=80=20=EC=9D=91=EB=8B=B5=20=EC=BC=80=EC=9D=B4=EC=8A=A4=20?= =?UTF-8?q?=EC=84=B8=EB=B6=84=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/reminder/controller/AlarmController.java | 10 ++++++++-- .../reminder/controller/docs/AlarmControllerDocs.java | 1 + .../domain/reminder/service/AlarmTermService.java | 7 +++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/tryna/domain/reminder/controller/AlarmController.java b/src/main/java/com/tryna/domain/reminder/controller/AlarmController.java index c96859f..9be0efa 100644 --- a/src/main/java/com/tryna/domain/reminder/controller/AlarmController.java +++ b/src/main/java/com/tryna/domain/reminder/controller/AlarmController.java @@ -45,10 +45,16 @@ public class AlarmController implements AlarmControllerDocs { @PostMapping("/term") @Override public ResponseEntity> agreeAlarmTerm() { - alarmTermService.agreeAlarmTerm(resolveOptionalUserId()); + boolean newlyAgreed = alarmTermService.agreeAlarmTerm(resolveOptionalUserId()); + + if (newlyAgreed) { + return ResponseEntity.ok( + ApiResponse.success("F100_ALARM_TERM_200", "알람 약관 동의에 성공했습니다.", null) + ); + } return ResponseEntity.ok( - ApiResponse.success("F100_ALARM_TERM_200", "알람 약관 동의에 성공했습니다.", null) + ApiResponse.success("F100_ALARM_TERM_200", "이미 알람 약관에 동의되어 있습니다.", null) ); } diff --git a/src/main/java/com/tryna/domain/reminder/controller/docs/AlarmControllerDocs.java b/src/main/java/com/tryna/domain/reminder/controller/docs/AlarmControllerDocs.java index 6e8739c..d30e2de 100644 --- a/src/main/java/com/tryna/domain/reminder/controller/docs/AlarmControllerDocs.java +++ b/src/main/java/com/tryna/domain/reminder/controller/docs/AlarmControllerDocs.java @@ -27,6 +27,7 @@ public interface AlarmControllerDocs { description = """ ALARM 약관에 동의하고 사용자의 알람 발송 상태(alarm_state)를 활성화합니다. terms 테이블의 ALARM 약관에 대한 user_agreed_terms 이력을 생성합니다. + 이미 동의한 사용자가 재요청하면 200과 함께 이미 동의되어 있다는 메시지를 반환합니다. """, operationId = "agreeAlarmTerm" ) diff --git a/src/main/java/com/tryna/domain/reminder/service/AlarmTermService.java b/src/main/java/com/tryna/domain/reminder/service/AlarmTermService.java index a59a15e..a3e24ca 100644 --- a/src/main/java/com/tryna/domain/reminder/service/AlarmTermService.java +++ b/src/main/java/com/tryna/domain/reminder/service/AlarmTermService.java @@ -27,9 +27,11 @@ public class AlarmTermService { /** * F100: 알람 약관 동의 * ALARM 약관 동의 이력을 저장하고 사용자의 alarm_state를 true로 변경합니다. + * + * @return true면 신규 동의, false면 이미 동의한 상태 */ @Transactional - public void agreeAlarmTerm(Long userId) { + public boolean agreeAlarmTerm(Long userId) { Users user = userRepository.findByUserIdAndDeletedAtIsNull(userId) .orElseThrow(() -> new BusinessException(AuthErrorCode.AUTH_401)); @@ -38,10 +40,11 @@ public void agreeAlarmTerm(Long userId) { .orElseThrow(() -> new BusinessException(AlarmErrorCode.F100_ALARM_TERM_400)); if (userAgreedTermsRepository.existsByUser_UserIdAndTerm_TermId(userId, alarmTerm.getTermId())) { - throw new BusinessException(AlarmErrorCode.F100_ALARM_TERM_400); + return false; } userAgreedTermsRepository.save(UserAgreedTerms.create(user, alarmTerm)); user.updateAlarmState(true); + return true; } } From a0086507de951a5668c90d54a1a7b045c60c3a87 Mon Sep 17 00:00:00 2001 From: taerimiiii Date: Wed, 12 Aug 2026 03:00:42 +0900 Subject: [PATCH 3/3] =?UTF-8?q?style:=20=EC=A3=BC=EC=84=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tryna/domain/reminder/service/AlarmTermService.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/tryna/domain/reminder/service/AlarmTermService.java b/src/main/java/com/tryna/domain/reminder/service/AlarmTermService.java index a3e24ca..0f8f908 100644 --- a/src/main/java/com/tryna/domain/reminder/service/AlarmTermService.java +++ b/src/main/java/com/tryna/domain/reminder/service/AlarmTermService.java @@ -27,8 +27,6 @@ public class AlarmTermService { /** * F100: 알람 약관 동의 * ALARM 약관 동의 이력을 저장하고 사용자의 alarm_state를 true로 변경합니다. - * - * @return true면 신규 동의, false면 이미 동의한 상태 */ @Transactional public boolean agreeAlarmTerm(Long userId) {