main 최신화

.github/workflows/main-ci-workflow.yml

@@ -52,6 +52,8 @@ jobs:
       GOOGLE_AUTHORIZATION_URI: ${{secrets.GOOGLE_AUTHORIZATION_URI}}
       GOOGLE_TOKEN_URI: ${{secrets.GOOGLE_TOKEN_URI}}
       GOOGLE_USER_INFO_URI: ${{secrets.GOOGLE_USER_INFO_URI}}
+      NAVER_MAIL_USERNAME: ${{secrets.NAVER_MAIL_USERNAME}}
+      NAVER_MAIL_PASSWORD: ${{secrets.NAVER_MAIL_PASSWORD}}
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/main-deploy-workflow.yml

@@ -59,6 +59,8 @@ jobs:
       GOOGLE_AUTHORIZATION_URI: ${{secrets.GOOGLE_AUTHORIZATION_URI}}
       GOOGLE_TOKEN_URI: ${{secrets.GOOGLE_TOKEN_URI}}
       GOOGLE_USER_INFO_URI: ${{secrets.GOOGLE_USER_INFO_URI}}
+      NAVER_MAIL_USERNAME: ${{secrets.NAVER_MAIL_USERNAME}}
+      NAVER_MAIL_PASSWORD: ${{secrets.NAVER_MAIL_PASSWORD}}
 
     steps:
       - uses: actions/checkout@v4
@@ -178,6 +180,8 @@ jobs:
               -e GOOGLE_AUTHORIZATION_URI=${{secrets.GOOGLE_AUTHORIZATION_URI}} \
               -e GOOGLE_TOKEN_URI=${{secrets.GOOGLE_TOKEN_URI}} \
               -e GOOGLE_USER_INFO_URI=${{secrets.GOOGLE_USER_INFO_URI}} \
+              -e NAVER_MAIL_USERNAME=${{secrets.NAVER_MAIL_USERNAME}} \
+              -e NAVER_MAIL_PASSWORD=${{secrets.NAVER_MAIL_PASSWORD}} \
               ${{secrets.DOCKER_USERNAME}}/sequence:latest
 
             # monitoring 네트워크 연결 추가

.github/workflows/test-server-prTest.yml

@@ -52,6 +52,9 @@ jobs:
       GOOGLE_AUTHORIZATION_URI: ${{secrets.GOOGLE_AUTHORIZATION_URI}}
       GOOGLE_TOKEN_URI: ${{secrets.GOOGLE_TOKEN_URI}}
       GOOGLE_USER_INFO_URI: ${{secrets.GOOGLE_USER_INFO_URI}}
+      NAVER_MAIL_USERNAME: ${{secrets.NAVER_MAIL_USERNAME}}
+      NAVER_MAIL_PASSWORD: ${{secrets.NAVER_MAIL_PASSWORD}}
+
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK 17

.github/workflows/test-server-release.yml

@@ -59,6 +59,8 @@ jobs:
       GOOGLE_AUTHORIZATION_URI: ${{secrets.GOOGLE_AUTHORIZATION_URI}}
       GOOGLE_TOKEN_URI: ${{secrets.GOOGLE_TOKEN_URI}}
       GOOGLE_USER_INFO_URI: ${{secrets.GOOGLE_USER_INFO_URI}}
+      NAVER_MAIL_USERNAME: ${{secrets.NAVER_MAIL_USERNAME}}
+      NAVER_MAIL_PASSWORD: ${{secrets.NAVER_MAIL_PASSWORD}}
 
     steps:
     - uses: actions/checkout@v4
@@ -178,6 +180,8 @@ jobs:
               -e GOOGLE_AUTHORIZATION_URI=${{secrets.GOOGLE_AUTHORIZATION_URI}} \
               -e GOOGLE_TOKEN_URI=${{secrets.GOOGLE_TOKEN_URI}} \
               -e GOOGLE_USER_INFO_URI=${{secrets.GOOGLE_USER_INFO_URI}} \
+              -e NAVER_MAIL_USERNAME=${{secrets.NAVER_MAIL_USERNAME}} \
+              -e NAVER_MAIL_PASSWORD=${{secrets.NAVER_MAIL_PASSWORD}} \
               ${{secrets.DOCKER_USERNAME}}/test-sequence:latest
             # monitoring 네트워크 연결 추가
             docker network connect monitoring test-sequence-spring-container

sequence_member/src/main/java/sequence/sequence_member/archive/dto/ArchiveCommentOutputDTO.java

@@ -23,7 +23,8 @@ public class ArchiveCommentOutputDTO {
     @Builder
     public static class CommentDTO {
         private Long id;
-        private String writer;
+        private String commentWriter;
+        private String commentWriterProfileImg;
         private String content;
         private boolean isDeleted;
         private LocalDateTime createdDateTime;

sequence_member/src/main/java/sequence/sequence_member/archive/dto/ArchiveListDTO.java

@@ -18,6 +18,7 @@ public static class ArchiveSimpleDTO {
         private Long id;
         private String title;
         private String writerNickname;
+        private String writerProfileImg;  // 작성자 프로필 이미지 추가
         private String thumbnail;
         private int commentCount;
         private int view;  // 조회수 추가

sequence_member/src/main/java/sequence/sequence_member/archive/dto/ArchiveOutputDTO.java

@@ -16,7 +16,9 @@
 @AllArgsConstructor
 public class ArchiveOutputDTO {
     private Long id;
+    private String writerUsername;
     private String writerNickname;
+    private String writerProfileImg;
     private String title;
     private String description; 
     private LocalDate startDate;

sequence_member/src/main/java/sequence/sequence_member/archive/entity/ArchiveMember.java

@@ -43,7 +43,7 @@ public class ArchiveMember extends BaseTimeEntity {
     @JoinColumn(name = "archive_id")
     private Archive archive;
 
-    @Column(name = "profile_img")
+    @Column(name = "profile_img", columnDefinition = "TEXT")
     private String profileImg;  // 멤버의 프로필 이미지 URL
 
     @Builder

sequence_member/src/main/java/sequence/sequence_member/archive/repository/ArchiveRepository.java

@@ -20,30 +20,50 @@ public interface ArchiveRepository extends JpaRepository<Archive, Long> {
     // 기본 조회 - 삭제되지 않은 아카이브만
     Optional<Archive> findByIdAndIsDeletedFalse(Long id);
 
+    // 작성자 정보를 함께 조회하는 최적화된 메서드 (FETCH JOIN 사용)
+    @Query("SELECT a FROM Archive a JOIN FETCH a.writer WHERE a.id = :id AND a.isDeleted = false")
+    Optional<Archive> findByIdAndIsDeletedFalseWithWriter(@Param("id") Long id);
+
     // 전체 목록 조회 - 삭제되지 않은 것만
     Page<Archive> findByIsDeletedFalse(Pageable pageable);
 
     // 상태별 조회 - 삭제되지 않은 것만
     Page<Archive> findByStatusAndIsDeletedFalse(Status status, Pageable pageable);
 
+    // 상태별 조회 - 작성자 정보 포함 (FETCH JOIN 사용)
+    @Query("SELECT a FROM Archive a JOIN FETCH a.writer WHERE a.status = :status AND a.isDeleted = false")
+    Page<Archive> findByStatusAndIsDeletedFalseWithWriter(@Param("status") Status status, Pageable pageable);
+
     // 카테고리별 조회 - 삭제되지 않은 것만
     Page<Archive> findByCategoryAndIsDeletedFalse(Category category, Pageable pageable);
 
     // 카테고리와 상태로 조회 - 삭제되지 않은 것만
     Page<Archive> findByCategoryAndStatusAndIsDeletedFalse(Category category, Status status, Pageable pageable);
 
+    // 카테고리와 상태로 조회 - 작성자 정보 포함 (FETCH JOIN 사용)
+    @Query("SELECT a FROM Archive a JOIN FETCH a.writer WHERE a.category = :category AND a.status = :status AND a.isDeleted = false")
+    Page<Archive> findByCategoryAndStatusAndIsDeletedFalseWithWriter(@Param("category") Category category, @Param("status") Status status, Pageable pageable);
+
     // 제목으로 검색 - 삭제되지 않은 것만
     Page<Archive> findByTitleContainingIgnoreCaseAndIsDeletedFalse(String title, Pageable pageable);
 
     // 제목으로 검색하고 상태로 필터링 - 삭제되지 않은 것만
     Page<Archive> findByTitleContainingIgnoreCaseAndStatusAndIsDeletedFalse(String title, Status status, Pageable pageable);
 
+    // 제목으로 검색하고 상태로 필터링 - 작성자 정보 포함 (FETCH JOIN 사용)
+    @Query("SELECT a FROM Archive a JOIN FETCH a.writer WHERE a.title LIKE %:title% AND a.status = :status AND a.isDeleted = false")
+    Page<Archive> findByTitleContainingIgnoreCaseAndStatusAndIsDeletedFalseWithWriter(@Param("title") String title, @Param("status") Status status, Pageable pageable);
+
     // 카테고리와 제목으로 검색 - 삭제되지 않은 것만
     Page<Archive> findByCategoryAndTitleContainingIgnoreCaseAndIsDeletedFalse(Category category, String title, Pageable pageable);
 
     // 카테고리와 제목으로 검색하고 상태로 필터링 - 삭제되지 않은 것만
     Page<Archive> findByCategoryAndTitleContainingIgnoreCaseAndStatusAndIsDeletedFalse(Category category, String title, Status status, Pageable pageable);
 
+    // 카테고리와 제목으로 검색하고 상태로 필터링 - 작성자 정보 포함 (FETCH JOIN 사용)
+    @Query("SELECT a FROM Archive a JOIN FETCH a.writer WHERE a.category = :category AND a.title LIKE %:title% AND a.status = :status AND a.isDeleted = false")
+    Page<Archive> findByCategoryAndTitleContainingIgnoreCaseAndStatusAndIsDeletedFalseWithWriter(@Param("category") Category category, @Param("title") String title, @Param("status") Status status, Pageable pageable);
+
     // 멤버 ID로 아카이브 검색 - 삭제되지 않은 것만
     @Query("SELECT a FROM Archive a JOIN a.archiveMembers am WHERE am.member.id = :memberId AND a.isDeleted = false")
     Page<Archive> findByMemberId(@Param("memberId") Long memberId, Pageable pageable);

sequence_member/src/main/java/sequence/sequence_member/archive/service/ArchiveService.java

@@ -191,7 +191,7 @@ public ArchiveListDTO getAllArchives(int page, SortType sortType, String usernam
         }
 
         Pageable pageable = createPageableWithSort(page, sortType);
-        Page<Archive> archivePage = archiveRepository.findByStatusAndIsDeletedFalse(Status.평가완료, pageable);
+        Page<Archive> archivePage = archiveRepository.findByStatusAndIsDeletedFalseWithWriter(Status.평가완료, pageable);
 
         List<ArchiveListDTO.ArchiveSimpleDTO> archives = archivePage.getContent().stream()
             .map(archive -> {
@@ -203,6 +203,7 @@ public ArchiveListDTO getAllArchives(int page, SortType sortType, String usernam
                     .id(archive.getId())
                     .title(archive.getTitle())
                     .writerNickname(archive.getWriter().getNickname())
+                    .writerProfileImg(archive.getWriter().getProfileImg())
                     .thumbnail(archive.getThumbnail())
                     .commentCount(archive.getComments().size())
                     .view(archive.getView())
@@ -236,15 +237,15 @@ public ArchiveListDTO searchArchives(
         Page<Archive> archivePage;
 
         if (category != null && keyword != null && !keyword.trim().isEmpty()) {
-            archivePage = archiveRepository.findByCategoryAndTitleContainingIgnoreCaseAndStatusAndIsDeletedFalse(
+            archivePage = archiveRepository.findByCategoryAndTitleContainingIgnoreCaseAndStatusAndIsDeletedFalseWithWriter(
                 category, keyword.trim(), Status.평가완료, pageable);
         } else if (category != null) {
-            archivePage = archiveRepository.findByCategoryAndStatusAndIsDeletedFalse(category, Status.평가완료, pageable);
+            archivePage = archiveRepository.findByCategoryAndStatusAndIsDeletedFalseWithWriter(category, Status.평가완료, pageable);
         } else if (keyword != null && !keyword.trim().isEmpty()) {
-            archivePage = archiveRepository.findByTitleContainingIgnoreCaseAndStatusAndIsDeletedFalse(
+            archivePage = archiveRepository.findByTitleContainingIgnoreCaseAndStatusAndIsDeletedFalseWithWriter(
                 keyword.trim(), Status.평가완료, pageable);
         } else {
-            archivePage = archiveRepository.findByStatusAndIsDeletedFalse(Status.평가완료, pageable);
+            archivePage = archiveRepository.findByStatusAndIsDeletedFalseWithWriter(Status.평가완료, pageable);
         }
 
         List<ArchiveListDTO.ArchiveSimpleDTO> archives = archivePage.getContent().stream()
@@ -257,6 +258,7 @@ public ArchiveListDTO searchArchives(
                     .id(archive.getId())
                     .title(archive.getTitle())
                     .writerNickname(archive.getWriter().getNickname())
+                    .writerProfileImg(archive.getWriter().getProfileImg())
                     .thumbnail(archive.getThumbnail())
                     .commentCount(archive.getComments().size())
                     .view(archive.getView())
@@ -287,9 +289,17 @@ private Pageable createPageableWithSort(int page, SortType sortType) {
         return PageRequest.of(page, 18, sort);
     }
 
+    // 댓글 작성자의 프로필 이미지를 가져오는 헬퍼 메서드
+    private String getCommentWriterProfileImg(String writerNickname) {
+        return memberRepository.findByNickname(writerNickname)
+            .map(MemberEntity::getProfileImg)
+            .orElse("default.png");  // 기본 이미지
+    }
+
     // Archive 엔티티를 DTO로 변환
     private ArchiveOutputDTO convertToDTO(Archive archive, String username, int viewCount) {
         List<ArchiveOutputDTO.ArchiveMemberDTO> memberDTOs = archive.getArchiveMembers().stream()
+            .filter(archiveMember -> !archiveMember.getMember().getId().equals(archive.getWriter().getId()))
             .map(archiveMember -> ArchiveOutputDTO.ArchiveMemberDTO.builder()
                 .username(archiveMember.getMember().getUsername())
                 .nickname(archiveMember.getMember().getNickname())
@@ -319,7 +329,8 @@ private ArchiveOutputDTO convertToDTO(Archive archive, String username, int view
         for (ArchiveComment parentComment : parentComments) {
             ArchiveCommentOutputDTO.CommentDTO parentDTO = ArchiveCommentOutputDTO.CommentDTO.builder()
                     .id(parentComment.getId())
-                    .writer(parentComment.getWriter())
+                    .commentWriter(parentComment.getWriter())
+                    .commentWriterProfileImg(getCommentWriterProfileImg(parentComment.getWriter()))
                     .content(parentComment.isDeleted() ? "삭제된 댓글입니다." : parentComment.getContent())
                     .isDeleted(parentComment.isDeleted())
                     .createdDateTime(parentComment.getCreatedDateTime())
@@ -333,7 +344,8 @@ private ArchiveOutputDTO convertToDTO(Archive archive, String username, int view
             for (ArchiveComment childComment : childComments) {
                 ArchiveCommentOutputDTO.CommentDTO childDTO = ArchiveCommentOutputDTO.CommentDTO.builder()
                         .id(childComment.getId())
-                        .writer(childComment.getWriter())
+                        .commentWriter(childComment.getWriter())
+                        .commentWriterProfileImg(getCommentWriterProfileImg(childComment.getWriter()))
                         .content(childComment.isDeleted() ? "삭제된 댓글입니다." : childComment.getContent())
                         .isDeleted(childComment.isDeleted())
                         .createdDateTime(childComment.getCreatedDateTime())
@@ -347,7 +359,9 @@ private ArchiveOutputDTO convertToDTO(Archive archive, String username, int view
 
         return ArchiveOutputDTO.builder()
                 .id(archive.getId())
+                .writerUsername(archive.getWriter().getUsername())
                 .writerNickname(archive.getWriter().getNickname())
+                .writerProfileImg(archive.getWriter().getProfileImg())
                 .title(archive.getTitle())
                 .description(archive.getDescription())
                 .startDate(archive.getStartDate())

sequence_member/src/main/java/sequence/sequence_member/global/exception/AuthException.java

@@ -1,9 +1,12 @@
 package sequence.sequence_member.global.exception;
 
+import lombok.extern.slf4j.Slf4j;
 import sequence.sequence_member.global.response.Code;
 
+@Slf4j
 public class AuthException extends BaseException {
     public AuthException(String message) {
         super(Code.ACCESS_DENIED,message);
+        log.error("접근 불가");
     }
 }

sequence_member/src/main/java/sequence/sequence_member/global/exception/BAD_REQUEST_EXCEPTION.java

@@ -1,7 +1,11 @@
 package sequence.sequence_member.global.exception;
 
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
 public class BAD_REQUEST_EXCEPTION extends RuntimeException {
     public BAD_REQUEST_EXCEPTION(String message) {
         super(message);
+        log.error("Bad Request error");
     }
 }

sequence_member/src/main/java/sequence/sequence_member/global/exception/BaseException.java

@@ -1,10 +1,12 @@
 package sequence.sequence_member.global.exception;
 
 import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
 import sequence.sequence_member.global.response.Code;
 
 import static sequence.sequence_member.global.response.Code.INTERNAL_SERVER_ERROR;
 
+@Slf4j
 @Getter
 public class BaseException extends RuntimeException {
 
@@ -14,48 +16,56 @@ public class BaseException extends RuntimeException {
     public BaseException() {
         super(INTERNAL_SERVER_ERROR.getMessage());
         this.errorCode = INTERNAL_SERVER_ERROR;
+        log.error("BaseException 발생");
     }
 
     // 에러 메시지를 받는 생성자
     public BaseException(String message) {
         super(message);
         this.errorCode = INTERNAL_SERVER_ERROR;
+        log.error("BaseException 발생");
     }
 
     // 에러 메시지와 원인을 받는 생성자
     public BaseException(String message, Throwable cause) {
         super(message, cause);
         this.errorCode = INTERNAL_SERVER_ERROR;
+        log.error("BaseException 발생");
     }
 
     // 원인만을 받는 생성자
     public BaseException(Throwable cause) {
         super(cause);
         this.errorCode = INTERNAL_SERVER_ERROR;
+        log.error("BaseException 발생");
     }
 
     // 에러 코드를 지정하는 생성자
     public BaseException(Code errorCode) {
         super(errorCode.getMessage());
         this.errorCode = errorCode;
+        log.error("BaseException 발생");
     }
 
     // 에러 코드와 메시지를 받는 생성자
     public BaseException(Code errorCode, String message) {
         super(message);
         this.errorCode = errorCode;
+        log.error("BaseException 발생");
     }
 
     // 에러 코드, 메시지, 원인을 받는 생성자
     public BaseException(Code errorCode, String message, Throwable cause) {
         super(message, cause);
         this.errorCode = errorCode;
+        log.error("BaseException 발생");
     }
 
     // 에러 코드와 원인을 받는 생성자
     public BaseException(Code errorCode, Throwable cause) {
         super(cause);
         this.errorCode = errorCode;
+        log.error("BaseException 발생");
     }
 
 }

sequence_member/src/main/java/sequence/sequence_member/global/exception/CanNotFindResourceException.java

@@ -1,9 +1,12 @@
 package sequence.sequence_member.global.exception;
 
+import lombok.extern.slf4j.Slf4j;
 import sequence.sequence_member.global.response.Code;
 
+@Slf4j
 public class CanNotFindResourceException extends BaseException {
     public CanNotFindResourceException(String message) {
         super(Code.CAN_NOT_FIND_RESOURCE,message);
+        log.error("해당 리소스 발견 불가");
     }
 }

sequence_member/src/main/java/sequence/sequence_member/global/exception/UserNotFindException.java

@@ -1,7 +1,11 @@
 package sequence.sequence_member.global.exception;
 
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
 public class UserNotFindException extends RuntimeException {
     public UserNotFindException(String message) {
         super(message);
+        log.error("해당 유저를 찾을 수 없습니다.");
     }
 }

sequence_member/src/main/java/sequence/sequence_member/member/authority/OAuth2FailureHandler.java

@@ -2,27 +2,24 @@
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.AuthenticationFailureHandler;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
 
+@Slf4j
 @Component
 public class OAuth2FailureHandler implements AuthenticationFailureHandler {
 
-    private static final Logger logger = LoggerFactory.getLogger(OAuth2FailureHandler.class);
-
     @Override
     public void onAuthenticationFailure(HttpServletRequest request,
                                         HttpServletResponse response,
                                         AuthenticationException exception)
             throws IOException {
 
-        logger.error("소셜 로그인 실패: {}", exception.getMessage());
-        exception.printStackTrace(); // 에러 로그 확인
+        log.error("소셜 로그인 실패: {}", exception.getMessage());
         response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
         response.setContentType("application/json;charset=UTF-8");
         response.getWriter().write("{\"error\": \"소셜 로그인에 실패했습니다: " + exception.getMessage() + "\"}");