Merge branch 'dev' of https://github.com/prgrms-web-devcourse-final-project/WEB6_8_HaeDokCoding_BE into refactor#234

Author: GerHerMo

src/main/java/com/back/domain/post/comment/repository/CommentRepository.java

@@ -1,7 +1,6 @@
 package com.back.domain.post.comment.repository;
 
 import com.back.domain.post.comment.entity.Comment;
-import com.back.domain.post.comment.enums.CommentStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -13,9 +12,4 @@ public interface CommentRepository extends JpaRepository<Comment, Long> {
   List<Comment> findTop10ByPostIdOrderByIdDesc(Long postId);
 
   List<Comment> findTop10ByPostIdAndIdLessThanOrderByIdDesc(Long postId, Long lastId);
-
-  // DELETED가 아닌 댓글만 조회하는 메서드 추가
-  List<Comment> findTop10ByPostIdAndStatusNotOrderByIdDesc(Long postId, CommentStatus status);
-
-  List<Comment> findTop10ByPostIdAndStatusNotAndIdLessThanOrderByIdDesc(Long postId, CommentStatus status, Long lastId);
 }

src/main/java/com/back/domain/post/comment/service/CommentService.java

@@ -68,15 +68,15 @@ public CommentResponseDto createComment(Long postId, CommentCreateRequestDto req
   @Transactional(readOnly = true)
   public List<CommentResponseDto> getComments(Long postId, Long lastId) {
     if (lastId == null) {
-      return commentRepository.findTop10ByPostIdAndStatusNotOrderByIdDesc(postId, CommentStatus.DELETED)
-              .stream()
-              .map(CommentResponseDto::new)
-              .toList();
+      return commentRepository.findTop10ByPostIdOrderByIdDesc(postId)
+          .stream()
+          .map(CommentResponseDto::new)
+          .toList();
     } else {
-      return commentRepository.findTop10ByPostIdAndStatusNotAndIdLessThanOrderByIdDesc(postId, CommentStatus.DELETED, lastId)
-              .stream()
-              .map(CommentResponseDto::new)
-              .toList();
+      return commentRepository.findTop10ByPostIdAndIdLessThanOrderByIdDesc(postId, lastId)
+          .stream()
+          .map(CommentResponseDto::new)
+          .toList();
     }
   }
 
@@ -85,11 +85,6 @@ public List<CommentResponseDto> getComments(Long postId, Long lastId) {
   public CommentResponseDto getComment(Long postId, Long commentId) {
     Comment comment = findCommentWithValidation(postId, commentId);
 
-    // 삭제된 댓글 조회 방지
-    if (comment.getStatus() == CommentStatus.DELETED) {
-      throw new IllegalArgumentException("삭제된 댓글입니다.");
-    }
-
     return new CommentResponseDto(comment);
   }
 
@@ -136,17 +131,12 @@ public void deleteComment(Long postId, Long commentId) {
   // 댓글과 게시글의 연관관계 검증
   private Comment findCommentWithValidation(Long postId, Long commentId) {
     Comment comment = commentRepository.findById(commentId)
-            .orElseThrow(() -> new IllegalArgumentException("댓글이 존재하지 않습니다. id=" + commentId));
+        .orElseThrow(() -> new IllegalArgumentException("댓글이 존재하지 않습니다. id=" + commentId));
 
     if (!comment.getPost().getId().equals(postId)) {
       throw new IllegalStateException("댓글이 해당 게시글에 속하지 않습니다.");
     }
 
-    // 삭제된 댓글 접근 방지 (수정/삭제 시)
-    if (comment.getStatus() == CommentStatus.DELETED) {
-      throw new IllegalStateException("삭제된 댓글은 수정하거나 삭제할 수 없습니다.");
-    }
-
     return comment;
   }
 }

src/main/java/com/back/domain/user/entity/User.java

@@ -14,6 +14,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 
 @Entity
 @Table(name = "users")  // 예약어 충돌 방지를 위해 "users" 권장
@@ -70,6 +71,17 @@ public class User {
     @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<PostLike> postLikes = new ArrayList<>();
 
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) return false;
+        User user = (User) o;
+        return Objects.equals(id, user.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(id);
+    }
 
     public boolean isAdmin() {
         return "ADMIN".equalsIgnoreCase(role);

src/main/java/com/back/global/security/SecurityUser.java

@@ -38,7 +38,6 @@ public SecurityUser(
                 authorities
         );
 
-
         this.id = id;
         this.nickname = nickname;
         this.email = email;

src/main/resources/application-dev.yml

@@ -29,17 +29,6 @@ spring:
       encoding: UTF-8
       data-locations: classpath:data-h2.sql
 
-  cloud:
-    aws:
-      region:
-        static: ap-northeast-2
-      stack:
-        auto: false
-      credentials:
-        access-key: ${AWS_ACCESS_KEY_ID}  # 로컬용 더미값
-        secret-key: ${AWS_SECRET_ACCESS_KEY}
-      s3:
-        bucket: team2-app-s3-bucket
 
 # Swagger 설정
 springdoc:

src/main/resources/application.yml

@@ -47,6 +47,18 @@ spring:
             user-info-uri: https://openapi.naver.com/v1/nid/me
             user-name-attribute: response
 
+  cloud:
+    aws:
+      region:
+        static: ap-northeast-2
+      stack:
+        auto: false
+      credentials:
+        access-key: ${AWS_ACCESS_KEY_ID}  # 로컬용 더미값
+        secret-key: ${AWS_SECRET_ACCESS_KEY}
+      s3:
+        bucket: team2-app-s3-bucket
+
   ai:
     openai:
       api-key: ${GEMINI_API_KEY}