Fix: 와이어프레임 확인 후 status 제거 / actor 추가 작업

Author: jueunk617

src/main/java/com/back/domain/notification/controller/NotificationController.java

@@ -46,36 +46,58 @@ public ResponseEntity<RsData<NotificationResponse>> createNotification(
 
         Notification notification = switch (request.targetType()) {
             case "USER" -> {
-                User targetUser = userRepository.findById(request.targetId())
+                // 수신자 조회
+                User receiver = userRepository.findById(request.targetId())
                         .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
+
+                // 발신자 조회
+                User actor = userRepository.findById(request.actorId())
+                        .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
+
                 yield notificationService.createPersonalNotification(
-                        targetUser,
+                        receiver,
+                        actor,
                         request.title(),
                         request.message(),
                         request.redirectUrl()
                 );
             }
             case "ROOM" -> {
+                // 스터디룸 조회
                 Room room = roomRepository.findById(request.targetId())
                         .orElseThrow(() -> new CustomException(ErrorCode.ROOM_NOT_FOUND));
+
+                // 발신자 조회
+                User actor = userRepository.findById(request.actorId())
+                        .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
+
                 yield notificationService.createRoomNotification(
                         room,
+                        actor,
                         request.title(),
                         request.message(),
                         request.redirectUrl()
                 );
             }
             case "COMMUNITY" -> {
-                User targetUser = userRepository.findById(request.targetId())
+                // 수신자 조회 (리뷰/게시글 작성자)
+                User receiver = userRepository.findById(request.targetId())
+                        .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
+
+                // 발신자 조회 (댓글/좋아요 작성자)
+                User actor = userRepository.findById(request.actorId())
                         .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
+
                 yield notificationService.createCommunityNotification(
-                        targetUser,
+                        receiver,
+                        actor,
                         request.title(),
                         request.message(),
                         request.redirectUrl()
                 );
             }
             case "SYSTEM" -> {
+                // 시스템 알림은 발신자 없음
                 yield notificationService.createSystemNotification(
                         request.title(),
                         request.message(),

src/main/java/com/back/domain/notification/dto/ActorDto.java

@@ -0,0 +1,18 @@
+package com.back.domain.notification.dto;
+
+import com.back.domain.user.entity.User;
+
+public record ActorDto(
+        Long userId,
+        String username,
+        String profileImageUrl
+) {
+    public static ActorDto from(User user) {
+        if (user == null) return null;
+        return new ActorDto(
+                user.getId(),
+                user.getNickname(),
+                user.getProfileImageUrl()
+        );
+    }
+}

src/main/java/com/back/domain/notification/dto/NotificationCreateRequest.java

@@ -1,13 +1,10 @@
 package com.back.domain.notification.dto;
 
 public record NotificationCreateRequest(
-        String targetType,      // USER, ROOM, SYSTEM
-        Long targetId,          // nullable (SYSTEM일 때 null)
+        String targetType,
+        Long targetId,
+        Long actorId,
         String title,
         String message,
-        String notificationType, // STUDY_REMINDER, ROOM_JOIN 등
-        String redirectUrl,      // targetUrl
-        String scheduleType,     // ONE_TIME (향후 확장용)
-        String scheduledAt       // 예약 시간 (향후 확장용)
-) {
-}
+        String redirectUrl
+) {}

src/main/java/com/back/domain/notification/dto/NotificationItemDto.java

@@ -15,6 +15,7 @@ public record NotificationItemDto(
         NotificationType notificationType,
         String targetUrl,
         boolean isRead,
+        ActorDto actor,
         LocalDateTime createdAt
 ) {
     public static NotificationItemDto from(Notification notification, boolean isRead) {
@@ -25,6 +26,7 @@ public static NotificationItemDto from(Notification notification, boolean isRead
                 notification.getType(),
                 notification.getTargetUrl(),
                 isRead,
+                ActorDto.from(notification.getActor()),
                 notification.getCreatedAt()
         );
     }

src/main/java/com/back/domain/notification/dto/NotificationListResponse.java

@@ -15,7 +15,6 @@ public record NotificationListResponse(
         long unreadCount
 ) {
 
-    // 페이지 정보 DTO
     public record PageableDto(
             int page,
             int size,

src/main/java/com/back/domain/notification/dto/NotificationResponse.java

@@ -6,7 +6,7 @@
 import java.time.LocalDateTime;
 
 /**
- * 알림 응답 DTO
+ * 알림 상세 응답 DTO
  */
 public record NotificationResponse(
         Long notificationId,
@@ -15,6 +15,7 @@ public record NotificationResponse(
         NotificationType notificationType,
         String targetUrl,
         boolean isRead,
+        ActorDto actor,
         LocalDateTime createdAt,
         LocalDateTime readAt
 ) {
@@ -25,9 +26,10 @@ public static NotificationResponse from(Notification notification) {
                 notification.getContent(),
                 notification.getType(),
                 notification.getTargetUrl(),
-                false, // 읽음 여부는 NotificationListResponse에서 처리
+                false,
+                ActorDto.from(notification.getActor()),
                 notification.getCreatedAt(),
-                null   // readAt은 NotificationRead에서 가져와야 함
+                null
         );
     }
 
@@ -39,6 +41,7 @@ public static NotificationResponse from(Notification notification, boolean isRea
                 notification.getType(),
                 notification.getTargetUrl(),
                 isRead,
+                ActorDto.from(notification.getActor()),
                 notification.getCreatedAt(),
                 readAt
         );

src/main/java/com/back/domain/notification/dto/NotificationWebSocketDto.java

@@ -1,5 +1,6 @@
 package com.back.domain.notification.dto;
 
+import com.back.domain.notification.entity.Notification;
 import com.back.domain.notification.entity.NotificationType;
 
 import java.time.LocalDateTime;
@@ -10,24 +11,18 @@ public record NotificationWebSocketDto(
         String message,
         NotificationType notificationType,
         String targetUrl,
+        ActorDto actor,
         LocalDateTime createdAt
 ) {
-
-    public static NotificationWebSocketDto from(
-            Long notificationId,
-            String title,
-            String content,
-            NotificationType type,
-            String targetUrl,
-            LocalDateTime createdAt) {
-
+    public static NotificationWebSocketDto from(Notification notification) {
         return new NotificationWebSocketDto(
-                notificationId,
-                title,
-                content,
-                type,
-                targetUrl,
-                createdAt
+                notification.getId(),
+                notification.getTitle(),
+                notification.getContent(),
+                notification.getType(),
+                notification.getTargetUrl(),
+                ActorDto.from(notification.getActor()),
+                notification.getCreatedAt()
         );
     }
 }

src/main/java/com/back/domain/notification/entity/Notification.java

@@ -20,22 +20,22 @@ public class Notification extends BaseEntity {
     private NotificationType type;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "user_id")
-    private User user;
+    @JoinColumn(name = "receiver_id")
+    private User receiver; // 수신자 (누가 받는지)
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "actor_id")
+    private User actor;  // 발신자 (누가 이 활동을 했는지)
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "room_id")
     private Room room;
 
     @Column(nullable = false)
-    private String title;
-
-    @Column(columnDefinition = "TEXT", nullable = false)
-    private String content;
+    private String title; // 알림 제목 (필수)
 
-    @Enumerated(EnumType.STRING)
-    @Column(nullable = false)
-    private NotificationStatus status;
+    @Column(columnDefinition = "TEXT")
+    private String content; // 알림 본문 또는 댓글 미리보기 (선택)
 
     private String targetUrl;
 
@@ -47,40 +47,55 @@ private Notification(NotificationType type, String title, String content, String
         this.title = title;
         this.content = content;
         this.targetUrl = targetUrl;
-        this.status = NotificationStatus.UNREAD;
     }
 
     // 개인 알림 생성
-    public static Notification createPersonalNotification(User user, String title, String content, String targetUrl) {
+    public static Notification createPersonalNotification(
+            User receiver,
+            User actor,
+            String title,
+            String content,
+            String targetUrl) {
         Notification notification = new Notification(NotificationType.PERSONAL, title, content, targetUrl);
-        notification.user = user;
+        notification.receiver = receiver;
+        notification.actor = actor;
         return notification;
     }
 
     // 스터디룸 알림 생성
-    public static Notification createRoomNotification(Room room, String title, String content, String targetUrl) {
+    public static Notification createRoomNotification(
+            Room room,
+            User actor,
+            String title,
+            String content,
+            String targetUrl) {
         Notification notification = new Notification(NotificationType.ROOM, title, content, targetUrl);
         notification.room = room;
+        notification.actor = actor;
         return notification;
     }
 
-    // 시스템 알림 생성
-    public static Notification createSystemNotification(String title, String content, String targetUrl) {
+    // 시스템 알림 생성 (발신자 없음, 모두에게 전달)
+    public static Notification createSystemNotification(
+            String title,
+            String content,
+            String targetUrl) {
         return new Notification(NotificationType.SYSTEM, title, content, targetUrl);
     }
 
-    // 커뮤니티 알림 생성
-    public static Notification createCommunityNotification(User user, String title, String content, String targetUrl) {
+    // 커뮤니티 알림 생성 (댓글, 좋아요 등)
+    public static Notification createCommunityNotification(
+            User receiver,      // 수신자 (게시글 작성자)
+            User actor,         // 발신자 (댓글 작성자)
+            String title,
+            String content,
+            String targetUrl) {
         Notification notification = new Notification(NotificationType.COMMUNITY, title, content, targetUrl);
-        notification.user = user;
+        notification.receiver = receiver;
+        notification.actor = actor;
         return notification;
     }
 
-    // 알림을 읽음 상태로 변경
-    public void markAsRead() {
-        this.status = NotificationStatus.READ;
-    }
-
     // 전체 알림인지 확인
     public boolean isSystemNotification() {
         return this.type == NotificationType.SYSTEM;
@@ -93,13 +108,18 @@ public boolean isPersonalNotification() {
 
     // 특정 유저에게 표시되어야 하는 알림인지 확인
     public boolean isVisibleToUser(Long userId) {
-
         // 시스템 알림은 모두에게 표시
         if (isSystemNotification()) {
             return true;
         }
 
-        // 개인 알림은 해당 유저에게만 표시
-        return user != null && user.getId().equals(userId);
+        // 개인/커뮤니티 알림은 수신자에게만 표시
+        return receiver != null && receiver.getId().equals(userId);
+    }
+
+    // 특정 유저가 이 알림을 읽었는지 확인
+    public boolean isReadBy(Long userId) {
+        return notificationReads.stream()
+                .anyMatch(read -> read.getUser().getId().equals(userId));
     }
 }

src/main/java/com/back/domain/notification/entity/NotificationStatus.java

@@ -9,6 +9,9 @@
 import java.util.List;
 
 public interface NotificationRepository extends JpaRepository<Notification, Long>, NotificationRepositoryCustom {
+    // 특정 스터디룸의 알림 조회
     Page<Notification> findByRoomIdOrderByCreatedAtDesc(Long roomId, Pageable pageable);
+
+    // 특정 타입의 알림 조회
     List<Notification> findByType(NotificationType type);
 }