Merge branch 'develop' into feature/login

Author: sapiens2000

.github/workflows/ci.cd.prod.yml

@@ -34,16 +34,17 @@ jobs:
           java-version: 21
           distribution: 'temurin'
 
-      # application.yml 생성
+      # application.yml 운영 환경 용 생성
       - name: Make application.yml
         run: |
           mkdir -p ./src/main/resources
           cd ./src/main/resources
           touch ./application.yml
           touch ./application-secret.yml
           
-          echo "${{ secrets.APPLICATION }}" | base64 --decode > ./application.yml
-          echo "${{ secrets.SECRET }}" | base64 --decode > ./application-secret.yml
+          echo "${{ secrets.production_COMMON }}" | base64 --decode > ./application.yml
+          echo "${{ secrets.production_PROD }}" | base64 --decode > ./application-prod.yml
+          echo "${{ secrets.production_SECRET }}" | base64 --decode > ./application-prod-secret.yml
 
       # Gradle cache 설정
       - name: Cache Gradle packages
@@ -53,11 +54,34 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
           restore-keys: ${{ runner.os }}-gradle
 
-      # Gradle build (우선 Test 제외)
-      - name: Build with Gradle
-        uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee
-        with:
-          arguments: clean build -x test
+      - name: MySQL 컨테이너 실행
+        run: |
+          docker run --name log4u-mysql \
+            -e MYSQL_ROOT_PASSWORD=root \
+            -e MYSQL_DATABASE=log4u \
+            -e MYSQL_USER=dev \
+            -e MYSQL_PASSWORD=devcos4-team08 \
+            -d \
+            -p 3307:3306 \
+            mysql:8.0.33
+
+      - name: Build and analyze
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          DB_URL: jdbc:mysql://localhost:3307/log4u
+          DB_USERNAME: dev
+          DB_PASSWORD: devcos4-team08
+
+        # 테스트용으로 dev 프로필 사용(시크릿 제외하고 prod 와 동일)
+        run: |
+          chmod +x ./gradlew        
+          ./gradlew build jacocoTestReport -Pprofile=dev 
+
+      - name: Docker MySQL 종료 및 제거
+        run: |
+          docker stop log4u-mysql
+          docker rm log4u-mysql
 
   deploy:
     runs-on: ubuntu-latest

pull_request_template.md

@@ -0,0 +1,24 @@
+## 📌 PR 제목
+<!-- 간결하고 명확한 PR 제목 작성 -->
+
+## ✨ 변경 사항
+<!-- 이번 PR에서 변경된 내용을 요약하여 설명 -->
+- 변경 사항 1
+- 변경 사항 2
+- 변경 사항 3
+
+## 🔍 변경 이유
+<!-- 이번 PR이 필요한 이유 또는 해결하는 문제 -->
+
+## ✅ 체크리스트
+<!-- PR을 제출하기 전에 확인해야 할 사항 -->
+- [ ] 코드가 정상적으로 동작하는지 확인
+- [ ] 관련 테스트 코드 작성 및 통과 여부 확인
+- [ ] 문서화(README 등) 필요 여부 확인 및 반영
+- [ ] 리뷰어가 알아야 할 사항 추가 설명
+
+## 📸 스크린샷 (선택)
+<!-- UI 변경이 포함된 경우 관련 스크린샷 첨부 -->
+
+## 📌 참고 사항
+<!-- 기타 리뷰어가 참고해야 할 사항 -->

src/main/java/com/example/log4u/domain/comment/controller/CommentController.java

@@ -2,14 +2,18 @@
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.example.log4u.common.dto.PageResponse;
 import com.example.log4u.domain.comment.dto.request.CommentCreateRequestDto;
 import com.example.log4u.domain.comment.dto.response.CommentCreateResponseDto;
+import com.example.log4u.domain.comment.dto.response.CommentResponseDto;
 import com.example.log4u.domain.comment.service.CommentService;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -39,4 +43,14 @@ public ResponseEntity<Void> deleteComment(@PathVariable Long commentId) {
 		commentService.deleteComment(userId, commentId);
 		return ResponseEntity.noContent().build();
 	}
+
+	@GetMapping("/{diaryId}")
+	public ResponseEntity<PageResponse<CommentResponseDto>> getCommentListByDiary(
+		@PathVariable Long diaryId,
+		@RequestParam(required = false) Long cursorCommentId,
+		@RequestParam(defaultValue = "5") int size
+	) {
+		PageResponse<CommentResponseDto> response = commentService.getCommentListByDiary(diaryId, cursorCommentId, size);
+		return ResponseEntity.ok(response);
+	}
 }

src/main/java/com/example/log4u/domain/comment/dto/response/CommentResponseDto.java

@@ -0,0 +1,15 @@
+package com.example.log4u.domain.comment.dto.response;
+
+import com.example.log4u.domain.comment.entity.Comment;
+
+public record CommentResponseDto(
+	Long commentId,
+	String content
+) {
+	public static CommentResponseDto of(Comment comment) {
+		return new CommentResponseDto(
+			comment.getCommentId(),
+			comment.getContent()
+		);
+	}
+}

src/main/java/com/example/log4u/domain/comment/entity/Comment.java

@@ -30,5 +30,6 @@ public class Comment extends BaseEntity {
 	@Column(nullable = false)
 	private Long diaryId;
 
+	@Column(nullable = false)
 	private String content;
 }

src/main/java/com/example/log4u/domain/comment/repository/CommentRepository.java

@@ -1,9 +1,14 @@
 package com.example.log4u.domain.comment.repository;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import com.example.log4u.domain.comment.entity.Comment;
 
-public interface CommentRepository extends JpaRepository<Comment, Long> {
-
+public interface CommentRepository extends JpaRepository<Comment, Long>, CommentRepositoryCustom {
 }

src/main/java/com/example/log4u/domain/comment/repository/CommentRepositoryCustom.java

@@ -0,0 +1,11 @@
+package com.example.log4u.domain.comment.repository;
+
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
+
+import com.example.log4u.domain.comment.entity.Comment;
+
+public interface CommentRepositoryCustom {
+
+	Slice<Comment> findByDiaryIdWithCursor(Long diaryId, Long cursorCommentId, Pageable pageable);
+}

src/main/java/com/example/log4u/domain/comment/repository/CommentRepositoryImpl.java

@@ -0,0 +1,40 @@
+package com.example.log4u.domain.comment.repository;
+
+import static com.example.log4u.domain.comment.entity.QComment.*;
+
+import java.util.List;
+
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
+import org.springframework.data.domain.SliceImpl;
+import org.springframework.stereotype.Repository;
+
+import com.example.log4u.domain.comment.entity.Comment;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+
+import lombok.RequiredArgsConstructor;
+
+@Repository
+@RequiredArgsConstructor
+public class CommentRepositoryImpl implements CommentRepositoryCustom {
+
+	private final JPAQueryFactory queryFactory;
+
+	@Override
+	public Slice<Comment> findByDiaryIdWithCursor(Long diaryId, Long cursorCommentId, Pageable pageable) {
+		List<Comment> result = queryFactory
+			.selectFrom(comment)
+			.where(
+				comment.diaryId.eq(diaryId),
+				cursorCommentId != null ? comment.commentId.lt(cursorCommentId) : null
+			)
+			.orderBy(comment.commentId.desc())
+			.limit(pageable.getPageSize() + 1) // 커서 기반 페이징
+			.fetch();
+
+		boolean hasNext = result.size() > pageable.getPageSize();
+		List<Comment> content = hasNext ? result.subList(0, pageable.getPageSize()) : result;
+
+		return new SliceImpl<>(content, pageable, hasNext);
+	}
+}

src/main/java/com/example/log4u/domain/comment/service/CommentService.java

@@ -1,10 +1,18 @@
 package com.example.log4u.domain.comment.service;
 
+import java.util.List;
+
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
+import org.springframework.data.domain.SliceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.example.log4u.common.dto.PageResponse;
 import com.example.log4u.domain.comment.dto.request.CommentCreateRequestDto;
 import com.example.log4u.domain.comment.dto.response.CommentCreateResponseDto;
+import com.example.log4u.domain.comment.dto.response.CommentResponseDto;
 import com.example.log4u.domain.comment.entity.Comment;
 import com.example.log4u.domain.comment.exception.NotFoundCommentException;
 import com.example.log4u.domain.comment.exception.UnauthorizedAccessException;
@@ -22,7 +30,7 @@ public class CommentService {
 
 	@Transactional
 	public CommentCreateResponseDto addComment(Long userId, CommentCreateRequestDto requestDto) {
-		checkDiaryExists(requestDto);
+		checkDiaryExists(requestDto.diaryId());
 		Comment comment = requestDto.toEntity(userId);
 		commentRepository.save(comment);
 		return CommentCreateResponseDto.of(comment);
@@ -35,8 +43,8 @@ public void deleteComment(Long userId, Long commentId) {
 		commentRepository.delete(comment);
 	}
 
-	private void checkDiaryExists(CommentCreateRequestDto requestDto) {
-		diaryService.checkDiaryExists(requestDto.diaryId());
+	private void checkDiaryExists(Long diaryId) {
+		diaryService.checkDiaryExists(diaryId);
 	}
 
 	private void validateCommentOwner(Long userId, Comment comment) {
@@ -49,4 +57,18 @@ private Comment getComment(Long commentId) {
 		return commentRepository.findById(commentId)
 			.orElseThrow(NotFoundCommentException::new);
 	}
+
+	@Transactional(readOnly = true)
+	public PageResponse<CommentResponseDto> getCommentListByDiary(Long diaryId, Long cursorCommentId, int size) {
+		checkDiaryExists(diaryId);
+		Pageable pageable = PageRequest.of(0, size);
+		Slice<Comment> slice = commentRepository.findByDiaryIdWithCursor(diaryId, cursorCommentId, pageable);
+
+		List<CommentResponseDto> dtoList = slice.getContent().stream()
+			.map(CommentResponseDto::of)
+			.toList();
+
+		Long nextCursor = slice.hasNext() ? dtoList.getLast().commentId() : null;
+		return PageResponse.of(new SliceImpl<>(dtoList, pageable, slice.hasNext()), nextCursor);
+	}
 }

src/main/java/com/example/log4u/domain/diary/controller/DiaryController.java

@@ -45,10 +45,11 @@ public ResponseEntity<Void> createDiary(
 	public ResponseEntity<PageResponse<DiaryResponseDto>> searchDiaries(
 		@RequestParam(required = false) String keyword,
 		@RequestParam(defaultValue = "LATEST") SortType sort,
-		@RequestParam(defaultValue = "0") int page
+		@RequestParam(defaultValue = "0") int page,
+		@RequestParam(defaultValue = "6") int size
 	) {
 		return ResponseEntity.ok(
-			diaryService.searchDiaries(keyword, sort, page)
+			diaryService.searchDiaries(keyword, sort, page, size)
 		);
 	}