Skip to content

Commit

Permalink
fix: Long type 비교로직 변경 (#177)
Browse files Browse the repository at this point in the history
  • Loading branch information
@kimJH47
kimJH47 authored Feb 19, 2024
1 parent 8440162 commit 7db2af4
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 61 deletions.
78 changes: 18 additions & 60 deletions src/main/java/com/salmalteam/salmal/comment/application/CommentService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,37 @@
import static java.util.stream.Collectors.*;

import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.Predicate;
import java.util.stream.Collectors;

import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.salmalteam.salmal.comment.dto.request.CommentPageRequest;
import com.salmalteam.salmal.comment.dto.request.CommentReplyCreateRequest;
import com.salmalteam.salmal.comment.dto.request.ReplyPageRequest;
import com.salmalteam.salmal.comment.dto.response.CommentPageResponse;
import com.salmalteam.salmal.comment.dto.response.CommentResponse;
import com.salmalteam.salmal.comment.dto.response.ReplayCommentDto;
import com.salmalteam.salmal.comment.exception.like.CommentLikeException;
import com.salmalteam.salmal.comment.exception.like.CommentLikeExceptionType;
import com.salmalteam.salmal.comment.exception.report.CommentReportException;
import com.salmalteam.salmal.comment.exception.report.CommentReportExceptionType;
import com.salmalteam.salmal.member.application.MemberService;
import com.salmalteam.salmal.comment.dto.response.ReplyPageResponse;
import com.salmalteam.salmal.comment.dto.response.ReplyResponse;
import com.salmalteam.salmal.comment.entity.Comment;
import com.salmalteam.salmal.comment.entity.CommentRepository;
import com.salmalteam.salmal.comment.entity.CommentType;
import com.salmalteam.salmal.comment.entity.like.CommentLike;
import com.salmalteam.salmal.comment.entity.like.CommentLikeRepository;
import com.salmalteam.salmal.comment.entity.report.CommentReport;
import com.salmalteam.salmal.comment.entity.report.CommentReportRepository;
import com.salmalteam.salmal.comment.exception.CommentException;
import com.salmalteam.salmal.comment.exception.CommentExceptionType;
import com.salmalteam.salmal.comment.exception.like.CommentLikeException;
import com.salmalteam.salmal.comment.exception.like.CommentLikeExceptionType;
import com.salmalteam.salmal.comment.exception.report.CommentReportException;
import com.salmalteam.salmal.comment.exception.report.CommentReportExceptionType;
import com.salmalteam.salmal.member.application.MemberService;
import com.salmalteam.salmal.member.entity.Member;
import com.salmalteam.salmal.vote.dto.request.VoteCommentUpdateRequest;
import com.salmalteam.salmal.vote.entity.Vote;
import com.salmalteam.salmal.vote.entity.VoteRepository;
import com.salmalteam.salmal.comment.dto.request.CommentPageRequest;
import com.salmalteam.salmal.comment.dto.request.CommentReplyCreateRequest;
import com.salmalteam.salmal.comment.dto.request.ReplyPageRequest;
import com.salmalteam.salmal.vote.dto.request.VoteCommentUpdateRequest;
import com.salmalteam.salmal.comment.dto.response.CommentPageResponse;
import com.salmalteam.salmal.comment.dto.response.CommentResponse;
import com.salmalteam.salmal.comment.dto.response.ReplyPageResponse;
import com.salmalteam.salmal.comment.dto.response.ReplyResponse;
import com.salmalteam.salmal.comment.exception.CommentException;
import com.salmalteam.salmal.comment.exception.CommentExceptionType;

import lombok.RequiredArgsConstructor;

Expand Down Expand Up @@ -71,7 +69,7 @@ public void deleteComment(final Long memberId, final Long commentId) {
}

private void validateDeleteAuthority(final Long commenterId, final Long requesterId) {
if (commenterId != requesterId) {
if (!Objects.equals(commenterId, requesterId)) {
throw new CommentException(CommentExceptionType.FORBIDDEN_DELETE);
}
}
Expand Down Expand Up @@ -142,7 +140,7 @@ public void updateComment(final Long memberId, final Long commentId,
}

private void validateAuthority(final Comment comment, final Member member) {
if (comment.getCommenter().getId() != member.getId()) {
if (!Objects.equals(comment.getCommenter().getId(), member.getId())) {
throw new CommentException(CommentExceptionType.FORBIDDEN_UPDATE);
}
}
Expand Down Expand Up @@ -218,44 +216,4 @@ private Comment getCommentById(final Long commentId) {
return commentRepository.findById(commentId)
.orElseThrow(() -> new CommentException(CommentExceptionType.NOT_FOUND));
}

/**
* 회원 삭제 이벤트 : 댓글의 대댓글 개수 감소
*/
@Transactional
public void decreaseReplyCountByMemberDelete(final Long memberId) {

// 회원이 작성한 대댓글 목록 조회
final List<Comment> replies = commentRepository.findALlByCommenter_idAndCommentType(memberId,
CommentType.REPLY);

// parent_id 기준으로 Comment 묶기
Map<Comment, List<Comment>> commentListMap = replies.stream()
.collect(Collectors.groupingBy(Comment::getParentComment));

// 대댓글 개수 감소
commentListMap.forEach((comment, replyList) -> {
comment.decreaseReplyCount(replyList.size());
});

}

// /**
// * 회원 삭제 이벤트 : 댓글의 좋아요 개수 감소
// */
// @Transactional
// public void decreaseLikeCountByMemberDelete(final Long memberId){
// // 회원이 작성한 좋아요 목록 조회
// final List<CommentLike> commentLikes = commentLikeRepository.findAllByLiker_Id(memberId);
//
// // vote 기준으로 좋아요 묶기
// Map<Comment, List<CommentLike>> commentListMap = commentLikes.stream()
// .collect(Collectors.groupingBy(CommentLike::getComment));
//
// // 좋아요 개수 감소
// commentListMap.forEach((comment, commentLikeList) -> {
// comment.decreaseLikeCount(commentLikeList.size());
// });
// }

}
3 changes: 2 additions & 1 deletion src/main/java/com/salmalteam/salmal/vote/application/VoteService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import static java.util.stream.Collectors.*;

import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.function.Predicate;

Expand Down Expand Up @@ -97,7 +98,7 @@ public void delete(final Long requesterId, final Long voteId) {
}

private void validateDeleteAuthority(final Long writerId, final Long requesterId) {
if (writerId == null || writerId != requesterId) {
if (writerId == null || !Objects.equals(writerId,requesterId)) {
throw new VoteException(VoteExceptionType.FORBIDDEN_DELETE);
}
}
Expand Down

0 comments on commit 7db2af4

Please sign in to comment.