Merge pull request #390 from JNU-econovation/feature/BE-148

[BE-148] 코멘트 숨김 기능

Author: westzeroright

server/Recruit-Api/src/main/java/com/econovation/recruit/api/comment/controller/CommentController.java

@@ -50,7 +50,7 @@ public ResponseEntity<List<CommentPairVo>> findByCardId(
         return new ResponseEntity(comments, HttpStatus.OK);
     }
 
-    @Operation(summary = "applicationId로 댓글 조회")
+    @Operation(summary = "applicationId로 댓글 조회", description = "권한별로 회장단만 모든 코멘트 조회 가능, TF들은 자신의 코멘트만 조회 가능")
     @GetMapping("/applicants/{applicant-id}/comments")
     public ResponseEntity<List<CommentPairVo>> findByApplicantId(
             @PathVariable(name = "applicant-id") String applicantId) {

server/Recruit-Api/src/main/java/com/econovation/recruit/api/comment/service/CommentService.java

@@ -12,6 +12,7 @@
 import com.econovation.recruitdomain.domains.dto.CommentPairVo;
 import com.econovation.recruitdomain.domains.dto.CommentRegisterDto;
 import com.econovation.recruitdomain.domains.interviewer.domain.Interviewer;
+import com.econovation.recruitdomain.domains.interviewer.domain.Role;
 import com.econovation.recruitdomain.out.CardLoadPort;
 import com.econovation.recruitdomain.out.CommentLikeLoadPort;
 import com.econovation.recruitdomain.out.CommentLikeRecordPort;
@@ -165,14 +166,16 @@ public void deleteCommentLike(Long commentId) {
     @Override
     public List<CommentPairVo> findByCardId(Long cardId) {
         Long idpId = SecurityUtils.getCurrentUserId();
+        Interviewer interviewer = interviewerLoadPort.loadInterviewById(idpId);
+
         Card card = cardLoadPort.findById(cardId);
         List<Comment> comments = commentLoadPort.findByCardId(card.getId());
 
-        return getCommentPairVo(idpId, comments);
+        return getCommentPairVo(idpId, comments, isAdminRole(interviewer));
     }
 
     @NotNull
-    private List<CommentPairVo> getCommentPairVo(Long idpId, List<Comment> comments) {
+    private List<CommentPairVo> getCommentPairVo(Long idpId, List<Comment> comments, boolean isAdmin) {
         List<Long> idpIds = comments.stream().map(Comment::getIdpId).collect(Collectors.toList());
 
         List<Interviewer> interviewers = interviewerLoadPort.loadInterviewerByIdpIds(idpIds);
@@ -194,6 +197,7 @@ private List<CommentPairVo> getCommentPairVo(Long idpId, List<Comment> comments)
                                                                             .equals(idpId));
 
                             Boolean canEdit = Objects.equals(comment.getIdpId(), idpId);
+                            Boolean isBlurred = !isAdmin && !canEdit;
                             String interviewersName =
                                     interviewers.stream()
                                             .filter(
@@ -204,7 +208,7 @@ private List<CommentPairVo> getCommentPairVo(Long idpId, List<Comment> comments)
                                             .findFirst()
                                             .map(Interviewer::getName)
                                             .orElse("");
-                            return CommentPairVo.of(comment, isLiked, interviewersName, canEdit);
+                            return CommentPairVo.of(comment, isLiked, interviewersName, canEdit, isBlurred);
                         })
                 .collect(Collectors.toList());
     }
@@ -227,13 +231,14 @@ public void updateCommentContent(Long commentId, Map<String, String> contents) {
         comment.updateContent(content);
     }
 
-    //
     @Override
     @Transactional(readOnly = true)
     public List<CommentPairVo> findByApplicantId(String applicantId) {
         Long idpId = SecurityUtils.getCurrentUserId();
+        Interviewer interviewer = interviewerLoadPort.loadInterviewById(idpId);
         List<Comment> comments = commentLoadPort.findByApplicantId(applicantId);
-        return getCommentPairVo(idpId, comments);
+
+        return getCommentPairVo(idpId, comments, isAdminRole(interviewer));
     }
 
     @Override
@@ -248,4 +253,9 @@ public void deleteCommentByCardId(Long cardId) {
                 commentLikeLoadPort.findByCommentIds(
                         comments.stream().map(Comment::getId).collect(Collectors.toList())));
     }
+
+    private boolean isAdminRole(Interviewer interviewer) {
+        return interviewer.getRole() == Role.ROLE_OPERATION
+                || interviewer.getRole() == Role.ROLE_PRESIDENT;
+    }
 }

server/Recruit-Domain/src/main/java/com/econovation/recruitdomain/domains/comment/adaptor/CommentAdapter.java

@@ -70,6 +70,15 @@ public List<Comment> findByApplicantId(String applicantId) {
         return comments;
     }
 
+    @Override
+    public List<Comment> findByApplicantIdAndIdpId(String applicantId, Long idpId) {
+        List<Comment> comments = commentRepository.findByApplicantIdAndIdpId(applicantId, idpId);
+        if (comments.isEmpty()) {
+            return Collections.emptyList();
+        }
+        return comments;
+    }
+
     @Override
     public CommentLike saveCommentLike(CommentLike commentLike) {
         return commentLikeRepository.save(commentLike);

server/Recruit-Domain/src/main/java/com/econovation/recruitdomain/domains/comment/domain/CommentRepository.java

@@ -13,6 +13,8 @@ public interface CommentRepository extends JpaRepository<Comment, Long> {
 
     List<Comment> findByApplicantId(String applicantId);
 
+    List<Comment> findByApplicantIdAndIdpId(String applicantId, Long idpId);
+
     @Modifying
     @Query("delete from Comment c where c.idpId = :idpId")
     void deleteByIdpId(@Param("idpId") Long idpId);

server/Recruit-Domain/src/main/java/com/econovation/recruitdomain/domains/dto/CommentPairVo.java

@@ -15,17 +15,20 @@ public class CommentPairVo {
     private Boolean isLike;
     private Integer likeCount;
     private Boolean canEdit;
+    private Boolean isBlurred;
 
     public static CommentPairVo of(
-            Comment comment, Boolean isLike, String interviewerName, Boolean canEdit) {
+            Comment comment, Boolean isLike, String interviewerName, Boolean canEdit, Boolean isBlurred) {
         return CommentPairVo.builder()
                 .id(comment.getId())
                 .createdAt(String.valueOf(Timestamp.valueOf(comment.getCreatedAt()).getTime()))
-                .content(comment.getContent())
+                .content(isBlurred ? "자신의 댓글만 조회할 수 있습니다." : comment.getContent())
                 .isLike(isLike)
                 .likeCount(comment.getLikeCount())
                 .interviewerName(interviewerName)
                 .canEdit(canEdit)
+                .isBlurred(isBlurred)
                 .build();
     }
 }
+

server/Recruit-Domain/src/main/java/com/econovation/recruitdomain/out/CommentLoadPort.java

@@ -11,4 +11,6 @@ public interface CommentLoadPort {
     List<Comment> findByCardId(Long cardId);
 
     List<Comment> findByApplicantId(String applicantId);
+
+    List<Comment> findByApplicantIdAndIdpId(String applicantId, Long idpId);
 }