Merge pull request #346 from let-s-record-it/feature-345

feature[#345]: 일정 추가 시 다른 CalendarMember에게 SSE 전송되도록 변경

Author: rt3310

src/main/java/com/sillim/recordit/calendar/controller/CalendarController.java

@@ -32,10 +32,7 @@ public class CalendarController {
 
 	@GetMapping
 	public ResponseEntity<List<CalendarResponse>> calendarList(@CurrentMember Member member) {
-		return ResponseEntity.ok(
-				calendarMemberService.searchCalendarsByMemberId(member.getId()).stream()
-						.map(CalendarResponse::from)
-						.toList());
+		return ResponseEntity.ok(calendarMemberService.searchCalendarsByMemberId(member.getId()));
 	}
 
 	@PostMapping

src/main/java/com/sillim/recordit/calendar/service/CalendarMemberService.java

@@ -3,6 +3,7 @@
 import com.sillim.recordit.calendar.domain.Calendar;
 import com.sillim.recordit.calendar.domain.CalendarMember;
 import com.sillim.recordit.calendar.dto.response.CalendarMemberResponse;
+import com.sillim.recordit.calendar.dto.response.CalendarResponse;
 import com.sillim.recordit.calendar.repository.CalendarMemberRepository;
 import com.sillim.recordit.global.exception.ErrorCode;
 import com.sillim.recordit.global.exception.common.InvalidRequestException;
@@ -50,8 +51,10 @@ public List<CalendarMemberResponse> searchCalendarMembers(Long calendarId) {
 	}
 
 	@Transactional(readOnly = true)
-	public List<Calendar> searchCalendarsByMemberId(Long memberId) {
-		return calendarMemberRepository.findCalendarsByMemberId(memberId);
+	public List<CalendarResponse> searchCalendarsByMemberId(Long memberId) {
+		return calendarMemberRepository.findCalendarsByMemberId(memberId).stream()
+				.map(CalendarResponse::from)
+				.toList();
 	}
 
 	public Long addCalendarMember(Long calendarId, Long memberId) {

src/main/java/com/sillim/recordit/goal/service/WeeklyGoalQueryService.java

@@ -1,6 +1,7 @@
 package com.sillim.recordit.goal.service;
 
 import com.sillim.recordit.calendar.domain.Calendar;
+import com.sillim.recordit.calendar.service.CalendarMemberService;
 import com.sillim.recordit.calendar.service.CalendarQueryService;
 import com.sillim.recordit.global.exception.ErrorCode;
 import com.sillim.recordit.global.exception.common.RecordNotFoundException;
@@ -18,11 +19,12 @@ public class WeeklyGoalQueryService {
 
 	private final CalendarQueryService calendarQueryService;
 	private final WeeklyGoalRepository weeklyGoalRepository;
+	private final CalendarMemberService calendarMemberService;
 
 	public List<WeeklyGoal> searchAllWeeklyGoalByDate(
 			final Integer year, final Integer month, final Long memberId, final Long calendarId) {
 		Calendar calendar = calendarQueryService.searchByCalendarId(calendarId);
-		calendar.validateAuthenticatedMember(memberId);
+		calendarMemberService.validateCalendarMember(calendar.getId(), memberId);
 
 		return weeklyGoalRepository.findWeeklyGoalInMonth(year, month, calendarId);
 	}

src/main/java/com/sillim/recordit/pushalarm/controller/AlarmLogController.java

@@ -17,7 +17,7 @@ public class AlarmLogController {
 	private final AlarmLogService alarmLogService;
 
 	@GetMapping
-	public ResponseEntity<SliceResponse<PushMessage>> alarmLogList(
+	public ResponseEntity<SliceResponse<PushMessage<String>>> alarmLogList(
 			Pageable pageable, @CurrentMember Member member) {
 		return ResponseEntity.ok(alarmLogService.searchRecentCreated(pageable, member.getId()));
 	}

src/main/java/com/sillim/recordit/pushalarm/domain/AlarmLog.java

@@ -18,18 +18,12 @@ public class AlarmLog extends BaseTime {
 	@Column(name = "alarm_log_id", nullable = false)
 	private Long id;
 
-	@Column(nullable = false)
-	private Long activeId;
-
 	@Column(nullable = false)
 	@Enumerated(EnumType.STRING)
 	private AlarmType alarmType;
 
 	@Column(nullable = false)
-	private String title;
-
-	@Column(nullable = false)
-	private String body;
+	private String content;
 
 	@Column(nullable = false)
 	private Long senderId;
@@ -41,17 +35,9 @@ public class AlarmLog extends BaseTime {
 	private boolean deleted;
 
 	@Builder
-	public AlarmLog(
-			Long activeId,
-			AlarmType alarmType,
-			String title,
-			String body,
-			Long senderId,
-			Long receiverId) {
-		this.activeId = activeId;
+	public AlarmLog(AlarmType alarmType, String content, Long senderId, Long receiverId) {
 		this.alarmType = alarmType;
-		this.title = title;
-		this.body = body;
+		this.content = content;
 		this.senderId = senderId;
 		this.receiverId = receiverId;
 		this.deleted = false;

src/main/java/com/sillim/recordit/pushalarm/dto/AlarmType.java

@@ -1,7 +1,9 @@
 package com.sillim.recordit.pushalarm.dto;
 
 public enum AlarmType {
-	SCHEDULE,
+	SCHEDULE_ADD,
+	SCHEDULE_DELETE,
+	SCHEDULE_ALARM,
 	INVITE,
 	FOLLOWING,
 	FEED_LIKE,

src/main/java/com/sillim/recordit/pushalarm/dto/FeedLikeMessage.java

@@ -0,0 +1,3 @@
+package com.sillim.recordit.pushalarm.dto;
+
+public record FeedLikeMessage(Long feedLikeId, String title) {}

src/main/java/com/sillim/recordit/pushalarm/dto/FollowMessage.java

@@ -0,0 +1,3 @@
+package com.sillim.recordit.pushalarm.dto;
+
+public record FollowMessage(Long followerId, String title, String body) {}

src/main/java/com/sillim/recordit/pushalarm/dto/InviteMessage.java

@@ -0,0 +1,3 @@
+package com.sillim.recordit.pushalarm.dto;
+
+public record InviteMessage(Long inviteLogId, String title, String body) {}

src/main/java/com/sillim/recordit/pushalarm/dto/PushMessage.java

@@ -1,49 +1,58 @@
 package com.sillim.recordit.pushalarm.dto;
 
-import com.sillim.recordit.pushalarm.domain.AlarmLog;
+import com.sillim.recordit.schedule.domain.Schedule;
+import java.util.List;
 
-public record PushMessage(Long id, AlarmType type, Long activeId, String title, String body) {
+public record PushMessage<T>(Long id, AlarmType type, T content) {
 
-	public static PushMessage fromInvite(
+	public static PushMessage<InviteMessage> fromInvite(
 			Long activeId, String calendarTitle, String inviterPersonalId) {
-		return new PushMessage(
+		return new PushMessage<>(
 				null,
 				AlarmType.INVITE,
-				activeId,
-				inviterPersonalId + "님의 " + calendarTitle + "캘린더 초대",
-				"참가하시겠습니까?");
+				new InviteMessage(
+						activeId,
+						inviterPersonalId + "님의 " + calendarTitle + "캘린더 초대",
+						"참가하시겠습니까?"));
 	}
 
-	public static PushMessage fromFollowing(Long activeId, String followerPersonalId) {
-		return new PushMessage(
+	public static PushMessage<FollowMessage> fromFollowing(
+			Long activeId, String followerPersonalId) {
+		return new PushMessage<>(
 				null,
 				AlarmType.FOLLOWING,
-				activeId,
-				followerPersonalId + "님이 팔로우했습니다.",
-				"맞팔로우하시겠습니까?");
+				new FollowMessage(activeId, followerPersonalId + "님이 팔로우했습니다.", "맞팔로우하시겠습니까?"));
 	}
 
-	public static PushMessage fromSchedule(
+	public static PushMessage<ScheduleAlarmMessage> fromScheduleAlarm(
 			Long activeId, String scheduleTitle, String scheduledTime) {
-		return new PushMessage(null, AlarmType.SCHEDULE, activeId, scheduleTitle, scheduledTime);
-	}
-
-	public static PushMessage fromAlarmLog(AlarmLog alarmLog) {
-		return new PushMessage(
-				alarmLog.getId(),
-				alarmLog.getAlarmType(),
-				alarmLog.getActiveId(),
-				alarmLog.getTitle(),
-				alarmLog.getBody());
+		return new PushMessage<>(
+				null,
+				AlarmType.SCHEDULE_ALARM,
+				new ScheduleAlarmMessage(activeId, scheduleTitle, scheduledTime));
 	}
 
-	public static PushMessage fromFeedLike(
+	public static PushMessage<FeedLikeMessage> fromFeedLike(
 			Long feedLikeId, String likerPersonalId, String feedTitle) {
-		return new PushMessage(
+		return new PushMessage<>(
 				null,
 				AlarmType.FEED_LIKE,
-				feedLikeId,
-				likerPersonalId + "님이 " + feedTitle + " 피드에 좋아요를 눌렀습니다.",
-				"");
+				new FeedLikeMessage(
+						feedLikeId, likerPersonalId + "님이 " + feedTitle + " 피드에 좋아요를 눌렀습니다."));
+	}
+
+	public static PushMessage<List<ScheduleAddMessage>> fromAddSchedules(List<Schedule> schedules) {
+		return new PushMessage<>(
+				null,
+				AlarmType.SCHEDULE_ADD,
+				schedules.stream().map(ScheduleAddMessage::from).toList());
+	}
+
+	public static PushMessage<List<ScheduleDeleteMessage>> fromDeleteSchedules(
+			List<Schedule> schedules) {
+		return new PushMessage<>(
+				null,
+				AlarmType.SCHEDULE_DELETE,
+				schedules.stream().map(ScheduleDeleteMessage::from).toList());
 	}
 }