Skip to content

[REFACTOR] 일정 및 준비/실행 항목 알람 리펙토링 #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
taerimiiii merged 4 commits into from
Aug 12, 2026
Merged

[REFACTOR] 일정 및 준비/실행 항목 알람 리펙토링 #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e37a1f7
refactor: 폴더 구조 리펙토링
taerimiiii Aug 11, 2026
a575fc1
refactor: 알람 약관 응답 케이스 세분화
taerimiiii Aug 11, 2026
a008650
style: 주석 수정
taerimiiii Aug 11, 2026
58c3e30
Merge remote-tracking branch 'origin/develop' into refactor/larfor/236
taerimiiii Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 22 additions & 16 deletions ...ain/alarm/controller/AlarmController.java → .../reminder/controller/AlarmController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -45,10 +45,16 @@ public class AlarmController implements AlarmControllerDocs {
@PostMapping("/term")
@Override
public ResponseEntity<ApiResponse<Void>> 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)
);
}

Expand Down
17 changes: 9 additions & 8 deletions .../controller/docs/AlarmControllerDocs.java → .../controller/docs/AlarmControllerDocs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -27,6 +27,7 @@ public interface AlarmControllerDocs {
description = """
ALARM 약관에 동의하고 사용자의 알람 발송 상태(alarm_state)를 활성화합니다.
terms 테이블의 ALARM 약관에 대한 user_agreed_terms 이력을 생성합니다.
이미 동의한 사용자가 재요청하면 200과 함께 이미 동의되어 있다는 메시지를 반환합니다.
""",
operationId = "agreeAlarmTerm"
)
Expand Down
2 changes: 1 addition & 1 deletion ...alarm/dto/ActionItemReminderResponse.java → ...inder/dto/ActionItemReminderResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tryna.domain.alarm.dto;
package com.tryna.domain.reminder.dto;

import com.tryna.domain.reminder.entity.Reminders;

Expand Down
2 changes: 1 addition & 1 deletion ...in/alarm/dto/AlarmCorrectionResponse.java → ...reminder/dto/AlarmCorrectionResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...domain/alarm/dto/AlarmDetailResponse.java → ...ain/reminder/dto/AlarmDetailResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...a/domain/alarm/dto/AlarmListResponse.java → ...omain/reminder/dto/AlarmListResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tryna.domain.alarm.dto;
package com.tryna.domain.reminder.dto;

import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion ...main/alarm/dto/AlarmPushTokenRequest.java → ...n/reminder/dto/AlarmPushTokenRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../domain/alarm/dto/AlarmStateResponse.java → ...main/reminder/dto/AlarmStateResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tryna.domain.alarm.dto;
package com.tryna.domain.reminder.dto;

public record AlarmStateResponse(
boolean alarmState
Expand Down
2 changes: 1 addition & 1 deletion ...main/alarm/dto/EventReminderResponse.java → ...n/reminder/dto/EventReminderResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tryna.domain.alarm.dto;
package com.tryna.domain.reminder.dto;

import com.tryna.domain.reminder.entity.Reminders;

Expand Down
2 changes: 1 addition & 1 deletion .../alarm/service/AlarmPushTokenService.java → ...minder/service/AlarmPushTokenService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...main/alarm/service/AlarmQueryService.java → ...n/reminder/service/AlarmQueryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/tryna/domain/reminder/service/AlarmReminderDispatchExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/tryna/domain/reminder/service/AlarmReminderScheduleService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...main/alarm/service/AlarmStateService.java → ...n/reminder/service/AlarmStateService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
7 changes: 4 additions & 3 deletions ...omain/alarm/service/AlarmTermService.java → ...in/reminder/service/AlarmTermService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -29,7 +29,7 @@ public class AlarmTermService {
* ALARM 약관 동의 이력을 저장하고 사용자의 alarm_state를 true로 변경합니다.
*/
@Transactional
public void agreeAlarmTerm(Long userId) {
public boolean agreeAlarmTerm(Long userId) {
Users user = userRepository.findByUserIdAndDeletedAtIsNull(userId)
.orElseThrow(() -> new BusinessException(AuthErrorCode.AUTH_401));

Expand All @@ -38,10 +38,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;
}
}
2 changes: 1 addition & 1 deletion .../domain/alarm/service/FcmPushService.java → ...main/reminder/service/FcmPushService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...a/domain/alarm/util/AlarmCursorCodec.java → ...omain/reminder/util/AlarmCursorCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading