Merge branch 'develop' of https://github.com/prgrms-web-devcourse-final-project/WEB3_4_Log4U_BE into develop

sapiens2000 · sapiens2000 · commit 11b4cd6c0a9d · 2025-04-01T18:47:28.000+09:00
diff --git a/src/main/java/com/example/log4u/domain/comment/controller/CommentController.java b/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);
+	}
 }
diff --git a/src/main/java/com/example/log4u/domain/comment/dto/response/CommentResponseDto.java b/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()
+		);
+	}
+}
diff --git a/src/main/java/com/example/log4u/domain/comment/repository/CommentRepository.java b/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 {
 }
diff --git a/src/main/java/com/example/log4u/domain/comment/repository/CommentRepositoryCustom.java b/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);
+}
diff --git a/src/main/java/com/example/log4u/domain/comment/repository/CommentRepositoryImpl.java b/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);
+	}
+}
diff --git a/src/main/java/com/example/log4u/domain/comment/service/CommentService.java b/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);
+	}
 }
diff --git a/src/main/java/com/example/log4u/domain/reports/entity/Report.java b/src/main/java/com/example/log4u/domain/reports/entity/Report.java
@@ -1,15 +1,11 @@
 package com.example.log4u.domain.reports.entity;
 
-import java.time.LocalDateTime;
-
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
+import com.example.log4u.common.entity.BaseEntity;
 import com.example.log4u.domain.reports.reportTargetType.ReportTargetType;
 import com.example.log4u.domain.reports.reportType.ReportType;
 
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
 import jakarta.persistence.GeneratedValue;
@@ -27,24 +23,25 @@
 @AllArgsConstructor(access = AccessLevel.PACKAGE)
 
 @Entity
-@EntityListeners(AuditingEntityListener.class)
-public class Report {
+public class Report extends BaseEntity {
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Long id;
 
+	@Column(nullable = false)
 	private Long reporterId;
 
+	@Column(nullable = false)
 	@Enumerated(EnumType.STRING)
 	private ReportTargetType reportTargetType;
 
+	@Column(nullable = false)
 	@Enumerated(EnumType.STRING)
 	private ReportType reportType;
 
+	@Column(nullable = false)
 	private Long reportTargetId;
 
+	@Column(nullable = false)
 	private String content;
-
-	@CreatedDate
-	private LocalDateTime createdAt;
 }
diff --git a/src/main/java/com/example/log4u/domain/supports/controller/SupportController.java b/src/main/java/com/example/log4u/domain/supports/controller/SupportController.java
@@ -37,7 +37,7 @@ public ResponseEntity<Void> createSupport(
 
 	@GetMapping
 	public ResponseEntity<Page<SupportOverviewGetResponseDto>> getSupportOverviewPage(
-		@RequestParam(required = false) Integer page,
+		@RequestParam(defaultValue = "1") int page,
 		@RequestParam(required = false) SupportType supportType
 	) {
 		long requesterId = 1L;
diff --git a/src/main/java/com/example/log4u/domain/supports/entity/Support.java b/src/main/java/com/example/log4u/domain/supports/entity/Support.java
@@ -1,14 +1,13 @@
 package com.example.log4u.domain.supports.entity;
 
-import java.time.LocalDateTime;
-
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
+import com.example.log4u.common.entity.BaseEntity;
 import com.example.log4u.domain.supports.supportType.SupportType;
 
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
@@ -25,25 +24,26 @@
 @AllArgsConstructor(access = AccessLevel.PACKAGE)
 
 @Entity
-@EntityListeners(AuditingEntityListener.class)
-public class Support {
+@AttributeOverride(name = "updatedAt", column = @Column(name = "ANSWERED_AT"))
+public class Support extends BaseEntity {
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Long id;
 
-	private long requesterId;
+	@Column(nullable = false)
+	private Long requesterId;
 
+	@Column(nullable = false)
+	@Enumerated(value = EnumType.STRING)
 	private SupportType supportType;
 
+	@Column(nullable = false)
 	private String title;
 
+	@Column(nullable = false)
 	private String content;
 
-	@CreatedDate
-	private LocalDateTime createdAt;
-
 	@Setter
+	@Column(nullable = true)
 	private String answerContent;
-
-	private LocalDateTime answeredAt;
 }
diff --git a/src/main/java/com/example/log4u/domain/supports/repository/SupportQuerydsl.java b/src/main/java/com/example/log4u/domain/supports/repository/SupportQuerydsl.java
@@ -43,7 +43,7 @@ public Page<SupportOverviewGetResponseDto> getSupportOverviewGetResponseDtoPage(
 				support.supportType,
 				support.title,
 				support.createdAt,
-				support.answeredAt.isNotNull() // answered 필드는 answeredAt이 null 이 아니면 true
+				support.updatedAt.isNotNull() // answered 필드는 answeredAt이 null 이 아니면 true
 			))
 			.where(builder)
 			.orderBy(support.createdAt.desc())
@@ -67,7 +67,7 @@ public SupportGetResponseDto getSupportGetResponseDtoById(
 				support.content,
 				support.createdAt,
 				support.answerContent,
-				support.answeredAt))
+				support.updatedAt))
 			.where(support.id.eq(supportId)
 				.and(support.requesterId.eq(requesterId)))
 			.fetchOne();
diff --git a/src/main/java/com/example/log4u/domain/supports/service/SupportService.java b/src/main/java/com/example/log4u/domain/supports/service/SupportService.java
@@ -33,11 +33,10 @@ public void createSupport(
 	@Transactional(readOnly = true)
 	public Page<SupportOverviewGetResponseDto> getSupportPage(
 		long requesterId,
-		Integer page,
+		int page,
 		SupportType supportType
 	) {
-		int primitivePage = page == null ? 0 : page - 1;
-		Pageable pageable = PageRequest.of(primitivePage, 10);
+		Pageable pageable = PageRequest.of(page - 1, 10);
 		return supportQuerydsl.getSupportOverviewGetResponseDtoPage(requesterId, pageable, supportType);
 	}
 
diff --git a/src/test/java/com/example/log4u/domain/comment/service/CommonServiceTest.java b/src/test/java/com/example/log4u/domain/comment/service/CommonServiceTest.java
@@ -4,6 +4,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.BDDMockito.*;
 
+import java.util.List;
 import java.util.Optional;
 
 import org.junit.jupiter.api.DisplayName;
@@ -12,8 +13,14 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+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 com.example.log4u.common.dto.PageResponse;
 import com.example.log4u.domain.comment.dto.request.CommentCreateRequestDto;
+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;
@@ -134,6 +141,34 @@ void commentDelete_Fail_Unauthorized() {
 		verify(commentRepository, never()).delete(any());
 	}
 
+	@DisplayName("성공 테스트: 특정 다이어리 댓글 전체 조회 (커서 기반)")
+	@Test
+	void getCommentsList_In_DiaryDetail_Success() {
+		// given
+		Long diaryId = 1L;
+		int size = 5;
+		Long cursorCommentId = null;
+
+		List<Comment> commentList = CommentFixture.createCommentsListFixture(size + 1); // hasNext 판별 위해 +1
+		Pageable pageable = PageRequest.of(0, size);
+		boolean hasNext = commentList.size() > size;
+
+		List<Comment> sliced = hasNext ? commentList.subList(0, size) : commentList;
+
+		Slice<Comment> slice = new SliceImpl<>(sliced, pageable, hasNext);
+		given(commentRepository.findByDiaryIdWithCursor(diaryId, cursorCommentId, pageable))
+			.willReturn(slice);
+
+		// when
+		PageResponse<CommentResponseDto> response = commentService.getCommentListByDiary(diaryId, cursorCommentId, size);
+
+		// then
+		assertThat(response.content()).hasSize(sliced.size());
+		assertThat(response.pageInfo().hasNext()).isEqualTo(hasNext);
+		assertThat(response.pageInfo().nextCursor()).isEqualTo(hasNext ? sliced.getLast().getCommentId() : null);
+
+		verify(commentRepository).findByDiaryIdWithCursor(diaryId, cursorCommentId, pageable);
+	}
 
 
 }
diff --git a/src/test/java/com/example/log4u/domain/support/service/SupportServiceTest.java b/src/test/java/com/example/log4u/domain/support/service/SupportServiceTest.java
diff --git a/src/test/java/com/example/log4u/fixture/CommentFixture.java b/src/test/java/com/example/log4u/fixture/CommentFixture.java
