From 56054632c4fcf020066c574d23abaacf1ff8f4a6 Mon Sep 17 00:00:00 2001 From: yeseul106 <20191037@sungshin.ac.kr> Date: Thu, 20 Jul 2023 23:10:32 +0900 Subject: [PATCH] =?UTF-8?q?#65=20[REFACTOR]=20=EB=A6=AC=EB=B7=B0=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1=20=EC=8B=9C,=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EC=9D=B4=EB=A6=84=20response=20body=EB=A1=9C=20?= =?UTF-8?q?=EB=82=B4=EB=A0=A4=EC=A3=BC=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../review/controller/ReviewController.java | 15 ++++++--------- .../dto/response/ReviewPostResponseDto.java | 18 ++++++++++++++++++ .../review/service/Impl/ReviewServiceImpl.java | 9 ++++++--- .../api/review/service/ReviewService.java | 6 +++--- 4 files changed, 33 insertions(+), 15 deletions(-) create mode 100644 puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/dto/response/ReviewPostResponseDto.java diff --git a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/controller/ReviewController.java b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/controller/ReviewController.java index c8452ac..fc90b40 100644 --- a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/controller/ReviewController.java +++ b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/controller/ReviewController.java @@ -27,21 +27,18 @@ public ApiResponse getReviewTemplateAll() { } @PostMapping("member/{memberId}/project/{projectId}/review/TIL") - public ApiResponse createReviewTIL(@PathVariable("memberId") Long memberId,@PathVariable("projectId") Long projectId, @Valid @RequestBody ReviewTILRequestDto reviewTILRequestDto){ - reviewService.createReviewTIL(memberId, projectId, reviewTILRequestDto); - return ApiResponse.success(SuccessStatus.POST_REVIEW_SUCCESS.getStatusCode(), SuccessStatus.POST_REVIEW_SUCCESS.getMessage()); + public ApiResponse createReviewTIL(@PathVariable("memberId") Long memberId,@PathVariable("projectId") Long projectId, @Valid @RequestBody ReviewTILRequestDto reviewTILRequestDto){ + return ApiResponse.success(SuccessStatus.POST_REVIEW_SUCCESS, reviewService.createReviewTIL(memberId, projectId, reviewTILRequestDto)); } @PostMapping("member/{memberId}/project/{projectId}/review/5F") - public ApiResponse createReview5F(@PathVariable("memberId") Long memberId,@PathVariable("projectId") Long projectId, @Valid @RequestBody Review5FRequestDto review5FRequestDto){ - reviewService.createReview5F(memberId, projectId, review5FRequestDto); - return ApiResponse.success(SuccessStatus.POST_REVIEW_SUCCESS.getStatusCode(), SuccessStatus.POST_REVIEW_SUCCESS.getMessage()); + public ApiResponse createReview5F(@PathVariable("memberId") Long memberId,@PathVariable("projectId") Long projectId, @Valid @RequestBody Review5FRequestDto review5FRequestDto){ + return ApiResponse.success(SuccessStatus.POST_REVIEW_SUCCESS, reviewService.createReview5F(memberId, projectId, review5FRequestDto)); } @PostMapping("member/{memberId}/project/{projectId}/review/AAR") - public ApiResponse createReviewAAR(@PathVariable("memberId") Long memberId,@PathVariable("projectId") Long projectId, @Valid @RequestBody ReviewAARRequestDto reviewAARRequestDto){ - reviewService.createReviewAAR(memberId, projectId, reviewAARRequestDto); - return ApiResponse.success(SuccessStatus.POST_REVIEW_SUCCESS.getStatusCode(), SuccessStatus.POST_REVIEW_SUCCESS.getMessage()); + public ApiResponse createReviewAAR(@PathVariable("memberId") Long memberId,@PathVariable("projectId") Long projectId, @Valid @RequestBody ReviewAARRequestDto reviewAARRequestDto){ + return ApiResponse.success(SuccessStatus.POST_REVIEW_SUCCESS, reviewService.createReviewAAR(memberId, projectId, reviewAARRequestDto)); } @GetMapping("member/{memberId}/project/{projectId}/review/previous-template") diff --git a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/dto/response/ReviewPostResponseDto.java b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/dto/response/ReviewPostResponseDto.java new file mode 100644 index 0000000..3efdb8d --- /dev/null +++ b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/dto/response/ReviewPostResponseDto.java @@ -0,0 +1,18 @@ +package com.puzzling.puzzlingServer.api.review.dto.response; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import static lombok.AccessLevel.PRIVATE; + +@Getter +@NoArgsConstructor(access = PRIVATE) +@AllArgsConstructor +public class ReviewPostResponseDto { + private String projectName; + + public static ReviewPostResponseDto of (String projectName) { + return new ReviewPostResponseDto(projectName); + } +} diff --git a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/service/Impl/ReviewServiceImpl.java b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/service/Impl/ReviewServiceImpl.java index c52c108..9f161f8 100644 --- a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/service/Impl/ReviewServiceImpl.java +++ b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/service/Impl/ReviewServiceImpl.java @@ -76,7 +76,7 @@ public List getReviewTemplateAll() { @Override @Transactional - public void createReviewTIL(Long memberId, Long projectId, ReviewTILRequestDto reviewTILRequestDto) { + public ReviewPostResponseDto createReviewTIL(Long memberId, Long projectId, ReviewTILRequestDto reviewTILRequestDto) { UserProject userProject = findUserProjectByMemberIdAndProjectId(memberId, projectId); if ( reviewTILRequestDto.getReviewTemplateId() == null ) { @@ -103,11 +103,12 @@ public void createReviewTIL(Long memberId, Long projectId, ReviewTILRequestDto r .actionPlan(reviewTILRequestDto.getActionPlan()) .build(); reviewTILRepository.save(reviewTIL); + return ReviewPostResponseDto.of(findProjectById(projectId).getName()); } @Override @Transactional - public void createReview5F(Long memberId, Long projectId, Review5FRequestDto review5FRequestDto) { + public ReviewPostResponseDto createReview5F(Long memberId, Long projectId, Review5FRequestDto review5FRequestDto) { UserProject userProject = findUserProjectByMemberIdAndProjectId(memberId, projectId); if ( review5FRequestDto.getReviewTemplateId() == null ) { @@ -136,11 +137,12 @@ public void createReview5F(Long memberId, Long projectId, Review5FRequestDto rev .actionPlan(review5FRequestDto.getActionPlan()) .build(); review5FRepository.save(review5F); + return ReviewPostResponseDto.of(findProjectById(projectId).getName()); } @Override @Transactional - public void createReviewAAR(Long memberId, Long projectId, ReviewAARRequestDto reviewAARRequestDto) { + public ReviewPostResponseDto createReviewAAR(Long memberId, Long projectId, ReviewAARRequestDto reviewAARRequestDto) { UserProject userProject = findUserProjectByMemberIdAndProjectId(memberId, projectId); if ( reviewAARRequestDto.getReviewTemplateId() == null ) { @@ -169,6 +171,7 @@ public void createReviewAAR(Long memberId, Long projectId, ReviewAARRequestDto r .actionPlan(reviewAARRequestDto.getActionPlan()) .build(); reviewARRRepository.save(reviewAAR); + return ReviewPostResponseDto.of(findProjectById(projectId).getName()); } @Override diff --git a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/service/ReviewService.java b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/service/ReviewService.java index 85c73b2..ec5b6f8 100644 --- a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/service/ReviewService.java +++ b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/service/ReviewService.java @@ -12,11 +12,11 @@ public interface ReviewService { List getReviewTemplateAll(); - void createReviewTIL(Long memberId, Long projectId, ReviewTILRequestDto reviewTILRequestDto); + ReviewPostResponseDto createReviewTIL(Long memberId, Long projectId, ReviewTILRequestDto reviewTILRequestDto); - void createReviewAAR(Long memberId, Long projectId, ReviewAARRequestDto reviewARRRequestDto); + ReviewPostResponseDto createReviewAAR(Long memberId, Long projectId, ReviewAARRequestDto reviewARRRequestDto); - void createReview5F(Long memberId, Long projectId, Review5FRequestDto review5FRequestDto); + ReviewPostResponseDto createReview5F(Long memberId, Long projectId, Review5FRequestDto review5FRequestDto); ReviewPreviousTemplateResponseDto getPreviousReviewTemplate(Long memberId, Long projectId);