Skip to content

refactor : 댓글 응답 형식 수정 #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doohaaa merged 2 commits into from
Jun 19, 2025
Merged

refactor : 댓글 응답 형식 수정 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02638f5
refactor : 댓글 응답 형식 수정
doohaaa Jun 19, 2025
5324df7
fix : 변수명 재지정(프론트 연동 오류 해결), 출력 메세지 변경
doohaaa Jun 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 7 additions & 19 deletions src/main/java/com/example/onederful/domain/comment/controller/CommentController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ public class CommentController {
@PostMapping("/tasks/{task_id}/comments")
public ResponseEntity<ApiResponseDto> save(@PathVariable Long task_id, HttpServletRequest httpServletRequest, @RequestBody CommentRequestDto requestDto){

CreateCommentResponseDataDto createCommentResponseDataDto =
CommentResponseDataDto CommentResponseDataDto =
commentService.save(task_id, httpServletRequest, requestDto.getContent());

ApiResponseDto success = ApiResponseDto.success("댓글이 생성되었습니다,", createCommentResponseDataDto);
ApiResponseDto success = ApiResponseDto.success("댓글이 생성되었습니다,", CommentResponseDataDto);

return ResponseEntity.status(HttpStatus.OK).body(success);
}
Expand All @@ -40,28 +40,16 @@ public ResponseEntity<ApiResponseDto> updateComment(
@PathVariable Long task_id, @PathVariable Long comment_id, @RequestBody CommentRequestDto requestDto, HttpServletRequest httpServletRequest
) {

UpdateCommentResponseDataDto updateCommentResponseDataDto =
CommentResponseDataDto CommentResponseDataDto =
commentService.updateComment(task_id, comment_id, requestDto.getContent(), httpServletRequest);

ApiResponseDto success = ApiResponseDto.success("댓글이 수정되었습니다.", updateCommentResponseDataDto);
ApiResponseDto success = ApiResponseDto.success("댓글이 수정되었습니다.", CommentResponseDataDto);

return ResponseEntity.status(HttpStatus.OK).body(success);
}

// 테스크별 댓글 조회
// 댓글 조회 (테스크별)
@GetMapping("/tasks/{task_id}/comments")
public ResponseEntity<ApiResponseDto> findAllCommentByTaskId(
@PathVariable Long task_id) {

List<CommentResponseDataDto> commentResponseDataDtoList = commentService.findAllCommentByTaskId(task_id);

ApiResponseDto success = ApiResponseDto.success("task " + task_id + "에 달린 댓글 목록", commentResponseDataDtoList);

return ResponseEntity.status(HttpStatus.OK).body(success);
}

// 테스크별 댓글 조회 페이지화
@GetMapping("/tasks/{task_id}/comments/pages")
public ResponseEntity<ApiResponseDto> findAllCommentByTaskIdInPage(
@PathVariable Long task_id,
@RequestParam(defaultValue = "0") int page,
Expand All @@ -70,12 +58,12 @@ public ResponseEntity<ApiResponseDto> findAllCommentByTaskIdInPage(
Pageable pageable = PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "createdAt"));
Page<CommentResponseDataDto> commentResponseDtoInPage = commentService.findAllCommentByTaskIdInPage(task_id,pageable);

ApiResponseDto success = ApiResponseDto.success("task " + task_id + "에 달린 댓글 목록", commentResponseDtoInPage);
ApiResponseDto success = ApiResponseDto.success("댓글 목록을 조회했습니다.", commentResponseDtoInPage);

return ResponseEntity.status(HttpStatus.OK).body(success);
}

// 내용으로 댓글 조회
// 댓글 조회 (내용 검색)
@GetMapping("/search")
public ResponseEntity<ApiResponseDto> findCommentByContent(@RequestBody CommentRequestDto requestDto) {

Expand Down
33 changes: 22 additions & 11 deletions src/main/java/com/example/onederful/domain/comment/dto/CommentResponseDataDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,44 @@
package com.example.onederful.domain.comment.dto;

import com.example.onederful.domain.comment.entity.Comment;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;

import java.time.LocalDate;
import java.time.LocalDateTime;

@Builder
@AllArgsConstructor
@Getter
public class CommentResponseDataDto {
private final String writer;
private final Long id;
private final String content;
private final Long comment_id;
private final Long taskId;
private final Long userId;
private final UserData user;
private final LocalDateTime createdAt;
private final LocalDateTime updatedAt;


public CommentResponseDataDto(Long comment_id, String writer, String content, LocalDateTime createdAt, LocalDateTime updatedAt) {
this.comment_id = comment_id;
this.writer = writer;
this.content = content;
this.createdAt = createdAt;
this.updatedAt = updatedAt;
public static CommentResponseDataDto of(Comment comment){
return CommentResponseDataDto.builder()
.id(comment.getId())
.content(comment.getContent())
.taskId(comment.getTask().getId())
.userId(comment.getUser().getId())
.user(UserData.of(comment.getUser()))
.createdAt(comment.getCreatedAt())
.updatedAt(comment.getUpdatedAt())
.build();
}


public static CommentResponseDataDto from(Comment comment){
return new CommentResponseDataDto(
comment.getId(),
comment.getUser().getName(),
comment.getContent(),
comment.getTask().getId(),
comment.getUser().getId(),
UserData.of(comment.getUser()),
comment.getCreatedAt(),
comment.getUpdatedAt()
);
Expand Down
18 changes: 0 additions & 18 deletions src/main/java/com/example/onederful/domain/comment/dto/CreateCommentResponseDataDto.java
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions src/main/java/com/example/onederful/domain/comment/dto/ResponseDto.java
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions src/main/java/com/example/onederful/domain/comment/dto/UpdateCommentResponseDataDto.java
View file
Open in desktop

This file was deleted.

27 changes: 27 additions & 0 deletions src/main/java/com/example/onederful/domain/comment/dto/UserData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package com.example.onederful.domain.comment.dto;


import com.example.onederful.domain.user.entity.User;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;

@Getter
@Builder
@AllArgsConstructor
public class UserData {

private Long id;
private String username;
private String name;
private String email;

public static UserData of(User user) {
return UserData.builder()
.id(user.getId())
.username(user.getUsername())
.name(user.getName())
.email(user.getEmail())
.build();
}
}
45 changes: 17 additions & 28 deletions src/main/java/com/example/onederful/domain/comment/service/CommentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package com.example.onederful.domain.comment.service;

import com.example.onederful.domain.comment.dto.CommentResponseDataDto;
import com.example.onederful.domain.comment.dto.CreateCommentResponseDataDto;
import com.example.onederful.domain.comment.dto.ResponseDto;
import com.example.onederful.domain.comment.dto.UpdateCommentResponseDataDto;
import com.example.onederful.domain.comment.entity.Comment;
import com.example.onederful.domain.comment.repository.CommentRepository;
import com.example.onederful.domain.task.entity.Task;
Expand Down Expand Up @@ -32,7 +29,8 @@ public class CommentService {
private final TaskRepository taskRepository;
private final JwtUtil jwtUtil;

public CreateCommentResponseDataDto save(Long task_id, HttpServletRequest httpServletRequest, String content) {
// 댓글 생성
public CommentResponseDataDto save(Long task_id, HttpServletRequest httpServletRequest, String content) {

// 토큰에서 Id 가져오기
Long user_id = jwtUtil.extractId(httpServletRequest);
Expand All @@ -44,58 +42,48 @@ public CreateCommentResponseDataDto save(Long task_id, HttpServletRequest httpSe
.orElseThrow(() -> new CustomException(ErrorCode.NONEXISTENT_TASK));

Comment comment = new Comment(content, user, task);
Comment savedComment = commentRepository.save(comment);

return new CreateCommentResponseDataDto(savedComment.getId(), user.getName(), savedComment.getContent());
Comment savedComment = commentRepository.save(comment);
return CommentResponseDataDto.of(savedComment);

}

// 댓글 수정
@Transactional
public UpdateCommentResponseDataDto updateComment(Long task_id, Long comment_id, String content, HttpServletRequest httpServletRequest) {
public CommentResponseDataDto updateComment(Long task_id, Long comment_id, String content, HttpServletRequest httpServletRequest) {
Task task = taskRepository.findById(task_id)
.orElseThrow(() -> new CustomException(ErrorCode.NONEXISTENT_TASK));

Comment comment = commentRepository.findById(comment_id)
.orElseThrow(() ->new CustomException(ErrorCode.NONEXISTENT_COMMENT));
.orElseThrow(() -> new CustomException(ErrorCode.NONEXISTENT_COMMENT));

// 토큰에서 Id 가져오기
Long userId = jwtUtil.extractId(httpServletRequest);

User user = userRepository.findById(userId)
.orElseThrow(() -> new CustomException(ErrorCode.NONEXISTENT_USER));

if(comment.getIsDeleted()==true){
if (comment.getIsDeleted() == true) {
throw new CustomException(ErrorCode.INVALID_COMMENT);
}

comment.update(content);
return new UpdateCommentResponseDataDto(comment.getId(), user.getName(), comment.getContent(),comment.getCreatedAt(), comment.getUpdatedAt());
}

public List<CommentResponseDataDto> findAllCommentByTaskId(Long task_id){
Task task = taskRepository.findById(task_id)
.orElseThrow(() -> new CustomException(ErrorCode.NONEXISTENT_TASK));

List<Comment> commentListById = commentRepository.findAllByTaskIdOrderByCreatedAtDesc(task_id);

return commentListById.stream()
.filter(comment -> !comment.getIsDeleted())
.map(CommentResponseDataDto::from)
.collect(Collectors.toList());
return CommentResponseDataDto.of(comment);
}

public Page<CommentResponseDataDto> findAllCommentByTaskIdInPage(Long task_id, Pageable pageable){
// 댓글 조회 (테스크별)
public Page<CommentResponseDataDto> findAllCommentByTaskIdInPage(Long task_id, Pageable pageable) {
// 페이징 대상 조회
final Page<Comment> commentListByIdInPage = commentRepository.findByTaskIdAndIsDeletedFalse(task_id, pageable);

return commentListByIdInPage.map(CommentResponseDataDto::from);
}


public List<CommentResponseDataDto> findCommentByContent(String content){
// 댓글 조회 (내용 검색)
public List<CommentResponseDataDto> findCommentByContent(String content) {

// 찾는 내용을 댓글을 적은 사람과 댓글 내용에서 검색
List<Comment> commentListByContent = commentRepository.findByContentOrUsername("%"+content+"%");
List<Comment> commentListByContent = commentRepository.findByContentOrUsername("%" + content + "%");

return commentListByContent.stream()
.filter(comment -> !comment.getIsDeleted())
Expand All @@ -104,10 +92,11 @@ public List<CommentResponseDataDto> findCommentByContent(String content){
}


// 댓글 삭제
@Transactional
public void deleteComment(Long commentId){
public void deleteComment(Long commentId) {
Comment comment = commentRepository.findById(commentId)
.orElseThrow(() ->new CustomException(ErrorCode.NONEXISTENT_COMMENT));
.orElseThrow(() -> new CustomException(ErrorCode.NONEXISTENT_COMMENT));

comment.delete();
}
Expand Down
10 changes: 4 additions & 6 deletions src/test/java/com/example/onederful/domain/comment/service/CommentServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.example.onederful.domain.comment.service;

import com.example.onederful.domain.comment.dto.CreateCommentResponseDataDto;
import com.example.onederful.domain.comment.dto.UpdateCommentResponseDataDto;
import com.example.onederful.domain.comment.dto.CommentResponseDataDto;
import com.example.onederful.domain.comment.entity.Comment;
import com.example.onederful.domain.comment.repository.CommentRepository;
import com.example.onederful.domain.task.entity.Task;
Expand All @@ -16,7 +15,6 @@
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.http.HttpStatus;

import java.time.LocalDateTime;
import java.util.Optional;
Expand Down Expand Up @@ -68,7 +66,7 @@ void save() {
given(taskRepository.findById(task_id)).willReturn(Optional.of(task));
given(commentRepository.save(any(Comment.class))).willReturn(comment);
// when
CreateCommentResponseDataDto result = commentService.save(task_id, httpServletRequest, content);
CommentResponseDataDto result = commentService.save(task_id, httpServletRequest, content);

// then
assertThat(result.getContent()).isEqualTo(content);
Expand Down Expand Up @@ -103,11 +101,11 @@ void updateComment() {
given(userRepository.findById(userId)).willReturn(Optional.of(user));

// when
UpdateCommentResponseDataDto result = commentService.updateComment(taskId, commentId, updatedContent, httpServletRequest);
CommentResponseDataDto result = commentService.updateComment(taskId, commentId, updatedContent, httpServletRequest);

// then
assertThat(result.getContent()).isEqualTo(updatedContent);
assertThat(result.getUpdated_at()).isNotNull();
assertThat(result.getUpdatedAt()).isNotNull();

}

Expand Down