Skip to content

fix(notify): 대댓글 알림 비밀 처리 및 차단 관계 수신자 오류 수정 #170

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
coldsunn merged 1 commit into from
May 24, 2026
Merged

fix(notify): 대댓글 알림 비밀 처리 및 차단 관계 수신자 오류 수정 #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/main/java/com/devkor/ifive/nadab/domain/comment/application/CommentCommandService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,9 @@ public Long createSubComment(Long parentCommentId, Long authorId, String content
parentCommentId,
parentComment.getAuthor().getId(),
reportOwnerId,
content
content,
finalIsSecret,
parentComment.isSecret()
));

return subComment.getId();
Expand Down
2 changes: 2 additions & 0 deletions .../java/com/devkor/ifive/nadab/domain/comment/application/event/SubCommentCreatedEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@ public class SubCommentCreatedEvent {
private final Long parentCommentAuthorId;
private final Long reportOwnerId;
private final String content;
private final boolean secret;
private final boolean parentSecret;
}
66 changes: 51 additions & 15 deletions .../nadab/domain/notification/application/event/social/CommentNotificationEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.devkor.ifive.nadab.domain.comment.application.event.CommentCreatedEvent;
import com.devkor.ifive.nadab.domain.comment.application.event.SubCommentCreatedEvent;
import com.devkor.ifive.nadab.domain.comment.core.repository.CommentRepository;
import com.devkor.ifive.nadab.domain.moderation.core.repository.UserBlockRepository;
import com.devkor.ifive.nadab.domain.notification.application.NotificationCommandService;
import com.devkor.ifive.nadab.domain.notification.core.entity.NotificationType;
import com.devkor.ifive.nadab.domain.user.core.entity.User;
Expand All @@ -17,6 +18,7 @@

import java.util.List;
import java.util.Map;
import java.util.Set;

@Component
@RequiredArgsConstructor
Expand All @@ -25,6 +27,7 @@ public class CommentNotificationEventListener {

private final UserRepository userRepository;
private final CommentRepository commentRepository;
private final UserBlockRepository userBlockRepository;
private final NotificationMessageFactory messageFactory;
private final NotificationCommandService notificationCommandService;

Expand Down Expand Up @@ -87,8 +90,12 @@ public void handleSubCommentCreated(SubCommentCreatedEvent event) {
"commentContent", truncate(event.getContent())
);

// 1. 부모 댓글 작성자 알림 (author 제외, 역할 무관 최우선)
if (!event.getAuthorId().equals(event.getParentCommentAuthorId())) {
Set<Long> blockedByAuthor = Set.copyOf(
userBlockRepository.findBlockedUserIdsBidirectional(event.getAuthorId()));

// 1. 부모 댓글 작성자 알림 (author 제외, 역할 무관 최우선,차단 관계이면 skip)
if (!event.getAuthorId().equals(event.getParentCommentAuthorId())
&& !blockedByAuthor.contains(event.getParentCommentAuthorId())) {
User parentCommentAuthor = userRepository.findById(event.getParentCommentAuthorId()).orElse(null);
if (parentCommentAuthor == null || parentCommentAuthor.getDeletedAt() != null) {
log.debug("Parent comment author not found or deleted, skip notification: parentCommentAuthorId={}", event.getParentCommentAuthorId());
Expand Down Expand Up @@ -141,20 +148,49 @@ public void handleSubCommentCreated(SubCommentCreatedEvent event) {
}
}

NotificationContent participantContent = messageFactory.createMessage(
NotificationType.REPLY_ON_PARTICIPATED_COMMENT, params);
for (Long participantId : participantIds) {
notificationCommandService.sendNotification(
participantId,
NotificationType.REPLY_ON_PARTICIPATED_COMMENT,
participantContent.title(),
participantContent.body(),
participantContent.inboxMessage(),
event.getDailyReportId().toString(),
String.format("COMMENT_%d_PARTICIPANT_%d", event.getSubCommentId(), participantId)
);
// 4. 참여자 알림
if (!participantIds.isEmpty()) {
if (!event.isSecret() || event.isParentSecret()) {
// 공개 대댓글 or 비밀 부모 아래 대댓글: 참여자들 열람 가능 — 차단 관계 제외
List<Long> notifiableParticipantIds = participantIds.stream()
.filter(id -> !blockedByAuthor.contains(id))
.toList();
if (!notifiableParticipantIds.isEmpty()) {
NotificationContent participantContent = messageFactory.createMessage(
NotificationType.REPLY_ON_PARTICIPATED_COMMENT, params);
for (Long participantId : notifiableParticipantIds) {
notificationCommandService.sendNotification(
participantId,
NotificationType.REPLY_ON_PARTICIPATED_COMMENT,
participantContent.title(),
participantContent.body(),
participantContent.inboxMessage(),
event.getDailyReportId().toString(),
String.format("COMMENT_%d_PARTICIPANT_%d", event.getSubCommentId(), participantId)
);
}
log.debug("Sub-comment notifications sent: subCommentId={}, participantCount={}", event.getSubCommentId(), notifiableParticipantIds.size());
}
} else if (reportOwnerIsParticipant && !reportOwnerIsAuthor
&& !blockedByAuthor.contains(event.getReportOwnerId())) {
// 공개 부모 댓글에 달린 비밀 대댓글 : 일반 참여자는 열람 불가하지만 리포트 당사자는 가능
User reportOwner = userRepository.findById(event.getReportOwnerId()).orElse(null);
if (reportOwner != null && reportOwner.getDeletedAt() == null) {
NotificationContent participantContent = messageFactory.createMessage(
NotificationType.REPLY_ON_PARTICIPATED_COMMENT, params);
notificationCommandService.sendNotification(
event.getReportOwnerId(),
NotificationType.REPLY_ON_PARTICIPATED_COMMENT,
participantContent.title(),
participantContent.body(),
participantContent.inboxMessage(),
event.getDailyReportId().toString(),
String.format("COMMENT_%d_PARTICIPANT_%d", event.getSubCommentId(), event.getReportOwnerId())
);
log.debug("Sub-comment notification sent to report owner (participant): subCommentId={}", event.getSubCommentId());
}
}
}
log.debug("Sub-comment notifications sent: subCommentId={}, participantCount={}", event.getSubCommentId(), participantIds.size());
} catch (Exception e) {
log.error("Failed to handle SubCommentCreatedEvent: subCommentId={}, error={}",
event.getSubCommentId(), e.getMessage(), e);
Expand Down
Loading