Merge pull request #216 from Gamegoo-repo/refactor/215

[Refactor/215] 알림 엔티티 수정 및 탈퇴한 사용자 소환사명 표시 추가

src/main/generated/com/gamegoo/domain/notification/QNotification.java

@@ -37,7 +37,7 @@ public class QNotification extends EntityPathBase<Notification> {
 
     public final QNotificationType notificationType;
 
-    public final NumberPath<Long> sourceId = createNumber("sourceId", Long.class);
+    public final com.gamegoo.domain.member.QMember sourceMember;
 
     //inherited
     public final DateTimePath<java.time.LocalDateTime> updatedAt = _super.updatedAt;
@@ -62,6 +62,7 @@ public QNotification(Class<? extends Notification> type, PathMetadata metadata,
         super(type, metadata, inits);
         this.member = inits.isInitialized("member") ? new com.gamegoo.domain.member.QMember(forProperty("member")) : null;
         this.notificationType = inits.isInitialized("notificationType") ? new QNotificationType(forProperty("notificationType")) : null;
+        this.sourceMember = inits.isInitialized("sourceMember") ? new com.gamegoo.domain.member.QMember(forProperty("sourceMember")) : null;
     }
 
 }

src/main/java/com/gamegoo/converter/NotificationConverter.java

@@ -48,17 +48,29 @@ public static NotificationResponse.notificationDTO toNotificationDTO(
             StringBuilder urlBuilder = new StringBuilder(
                 notification.getNotificationType().getSourceUrl());
 
-            if (notification.getSourceId() != null) {
-                urlBuilder.append(notification.getSourceId());
+            if (notification.getSourceMember() != null) {
+                urlBuilder.append(notification.getSourceMember().getId());
             }
 
             pageUrl = urlBuilder.toString();
         }
 
+        String content = notification.getContent();
+
+        // sourceMember 닉네임 표시
+        if (notification.getSourceMember() != null) {
+            if (notification.getSourceMember().getBlind()) { // sourceMember가 탈퇴한 회원인 경우
+                content = "(탈퇴한 사용자)" + content;
+            } else {
+                content = notification.getSourceMember().getGameName() + content;
+            }
+
+        }
+
         return NotificationResponse.notificationDTO.builder()
             .notificationId(notification.getId())
             .notificationType(notification.getNotificationType().getId().intValue())
-            .content(notification.getContent())
+            .content(content)
             .pageUrl(pageUrl)
             .read(notification.isRead())
             .createdAt(notification.getCreatedAt().withNano(0))

src/main/java/com/gamegoo/domain/notification/Notification.java

@@ -34,7 +34,10 @@ public class Notification extends BaseDateTimeEntity {
     @Column(nullable = false)
     private boolean isRead;
 
-    private Long sourceId;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "source_member_id")
+    private Member sourceMember;
+
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "member_id", nullable = false)

src/main/java/com/gamegoo/service/manner/MannerService.java

@@ -105,9 +105,10 @@ public MannerRating insertManner(MannerRequest.mannerInsertDTO request, Long mem
 
         // 매너평가 등록됨 알림 전송
         // 등록된 매너 평가 키워드 string 생성
-        String mannerKeywordString = mannerRatingKeywordList.stream()
-            .map(MannerKeyword::getContents)
-            .collect(Collectors.joining(", "));
+        String mannerKeywordString = mannerRatingKeywordList.get(0).getContents();
+        if (mannerRatingKeywordList.size() > 1) {
+            mannerKeywordString += " 외 " + (mannerRatingKeywordList.size() - 1) + "개의";
+        }
 
         Notification ratedNotification = notificationService.createNotification(
             NotificationTypeTitle.MANNER_KEYWORD_RATED,
@@ -198,11 +199,12 @@ public MannerRating insertBadManner(MannerRequest.mannerInsertDTO request, Long
             mannerRatingKeywordRepository.save(mannerRatingKeyword);
         });
 
-        // 매너평가 등록됨 알림 전송
+        // 비매너평가 등록됨 알림 전송
         // 등록된 매너 평가 키워드 string 생성
-        String mannerKeywordString = mannerRatingKeywordList.stream()
-            .map(MannerKeyword::getContents)
-            .collect(Collectors.joining(", "));
+        String mannerKeywordString = mannerRatingKeywordList.get(0).getContents();
+        if (mannerRatingKeywordList.size() > 1) {
+            mannerKeywordString += " 외 " + (mannerRatingKeywordList.size() - 1) + "개의";
+        }
 
         Notification ratedNotification = notificationService.createNotification(
             NotificationTypeTitle.MANNER_KEYWORD_RATED,

src/main/java/com/gamegoo/service/member/FriendService.java

@@ -143,11 +143,11 @@ public void sendFriendRequest(Long memberId, Long targetMemberId) {
         // 친구 요청 알림 생성
         // member -> targetMember
         notificationService.createNotification(NotificationTypeTitle.FRIEND_REQUEST_SEND,
-            targetMember.getGameName(), null, member);
+            null, targetMember, member);
 
         // targetMember -> member
         notificationService.createNotification(NotificationTypeTitle.FRIEND_REQUEST_RECEIVED,
-            member.getGameName(), member.getId(), targetMember);
+            null, member, targetMember);
     }
 
     /**
@@ -226,7 +226,7 @@ public void acceptFriendRequest(Long memberId, Long targetMemberId) {
 
         // targetMember에게 친구 요청 수락 알림 생성
         notificationService.createNotification(NotificationTypeTitle.FRIEND_REQUEST_ACCEPTED,
-            member.getGameName(), null, targetMember);
+            member.getGameName(), member, targetMember);
     }
 
     /**
@@ -259,7 +259,7 @@ public void rejectFriendRequest(Long memberId, Long targetMemberId) {
 
         // targetMember에게 친구 요청 거절 알림 생성
         notificationService.createNotification(NotificationTypeTitle.FRIEND_REQUEST_REJECTED,
-            member.getGameName(), null, targetMember);
+            member.getGameName(), member, targetMember);
     }
 
     /**

src/main/java/com/gamegoo/service/notification/NotificationService.java

@@ -35,27 +35,33 @@ public class NotificationService {
      * 새로운 알림 생성 및 저장 메소드
      *
      * @param notificationTypeTitle
-     * @param content               각 알림에 포함되어어야 할 정보 (사용자 닉네임, 매너레벨 단계, 키둬드)
-     * @param sourceId              이동해야할 url의 고유 id 파라미터, FRIEND_REQUEST_RECEIVED에서만 필요
+     * @param content               각 알림에 포함되어어야 할 정보 (매너레벨 단계, 키워드)
+     * @param sourceMember          알림 source 회원
      * @param member                알림을 받을 대상 회원
      * @return
      */
     public Notification createNotification(NotificationTypeTitle notificationTypeTitle,
-        String content, Long sourceId, Member member) {
+        String content, Member sourceMember, Member member) {
 
-        NotificationType notificationType = notificationTypeRepository.findNotificationTypeByTitle(
-                notificationTypeTitle)
-            .orElseThrow(() -> new NotificationHandler(ErrorStatus.NOTIFICATION_TYPE_NOT_FOUND));
+        NotificationType notificationType = findNotificationType(notificationTypeTitle);
+        String notificationContent = generateNotificationContent(notificationType, content,
+            sourceMember);
+
+        return saveNotification(notificationType, notificationContent, sourceMember, member);
+    }
 
-        String notificationContent = switch (notificationTypeTitle) {
+    private String generateNotificationContent(NotificationType notificationType, String content,
+        Member sourceMember) {
+        return switch (notificationType.getTitle()) {
+            // 알림 타입별로 분기 처리
             case FRIEND_REQUEST_SEND, FRIEND_REQUEST_ACCEPTED, FRIEND_REQUEST_REJECTED ->
-                content + notificationType.getContent();
+                notificationType.getContent();
 
             case FRIEND_REQUEST_RECEIVED -> {
-                if (sourceId == null) {
+                if (sourceMember == null) {
                     throw new NotificationHandler(ErrorStatus.NOTIFICATION_METHOD_BAD_REQUEST);
                 }
-                yield content + notificationType.getContent();
+                yield notificationType.getContent();
             }
 
             case MANNER_LEVEL_UP, MANNER_LEVEL_DOWN, MANNER_KEYWORD_RATED ->
@@ -67,14 +73,15 @@ public Notification createNotification(NotificationTypeTitle notificationTypeTit
                 int i = random.nextInt(1000) + 1;
                 yield notificationType.getContent() + i;
             }
-
-            default -> throw new NotificationHandler(ErrorStatus.NOTIFICATION_TYPE_NOT_FOUND);
         };
+    }
 
+    private Notification saveNotification(NotificationType type, String content,
+        Member sourceMember, Member member) {
         Notification notification = Notification.builder()
-            .notificationType(notificationType)
-            .content(notificationContent)
-            .sourceId(sourceId)
+            .notificationType(type)
+            .content(content)
+            .sourceMember(sourceMember)
             .isRead(false)
             .build();
         notification.setMember(member);
@@ -155,4 +162,9 @@ public long countUnreadNotification(Long memberId) {
             .filter(notification -> !notification.isRead())
             .count();
     }
+
+    private NotificationType findNotificationType(NotificationTypeTitle title) {
+        return notificationTypeRepository.findNotificationTypeByTitle(title)
+            .orElseThrow(() -> new NotificationHandler(ErrorStatus.NOTIFICATION_TYPE_NOT_FOUND));
+    }
 }