From 5b12685db4a7800111fa03f179a63c861ddee909 Mon Sep 17 00:00:00 2001 From: Kwon Sehoon Date: Mon, 7 Aug 2023 22:09:43 +0900 Subject: [PATCH] =?UTF-8?q?YEL-88=20[fix]=20=ED=88=AC=ED=91=9C=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20=EC=9D=91=EB=8B=B5=EA=B0=92=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vote/controller/VoteController.java | 4 +++- .../vote/dto/response/VoteCreateResponse.java | 14 ++------------ .../vote/dto/response/VoteCreateVO.java | 19 +++++++++++++++++++ .../domain/vote/service/VoteService.java | 6 +++--- .../small/domain/vote/VoteServiceTest.java | 4 ++-- 5 files changed, 29 insertions(+), 18 deletions(-) create mode 100644 src/main/java/com/yello/server/domain/vote/dto/response/VoteCreateVO.java diff --git a/src/main/java/com/yello/server/domain/vote/controller/VoteController.java b/src/main/java/com/yello/server/domain/vote/controller/VoteController.java index 1d8c8147..d8bccf09 100644 --- a/src/main/java/com/yello/server/domain/vote/controller/VoteController.java +++ b/src/main/java/com/yello/server/domain/vote/controller/VoteController.java @@ -144,7 +144,9 @@ public BaseResponse createVote( ) { val data = voteService.createVote(user.getId(), request); data.votes().forEach(notificationService::sendYelloNotification); - return BaseResponse.success(CREATE_VOTE_SUCCESS, data.toOnlyPoint()); + + val response = VoteCreateResponse.of(data.point()); + return BaseResponse.success(CREATE_VOTE_SUCCESS, response); } @Operation(summary = "투표 이름 부분 조회 API", responses = { diff --git a/src/main/java/com/yello/server/domain/vote/dto/response/VoteCreateResponse.java b/src/main/java/com/yello/server/domain/vote/dto/response/VoteCreateResponse.java index 22e19e31..662d525d 100644 --- a/src/main/java/com/yello/server/domain/vote/dto/response/VoteCreateResponse.java +++ b/src/main/java/com/yello/server/domain/vote/dto/response/VoteCreateResponse.java @@ -1,23 +1,13 @@ package com.yello.server.domain.vote.dto.response; -import com.yello.server.domain.vote.entity.Vote; -import java.util.List; import lombok.Builder; @Builder public record VoteCreateResponse( - Integer point, - List votes + Integer point ) { - public static VoteCreateResponse of(Integer point, List votes) { - return VoteCreateResponse.builder() - .point(point) - .votes(votes) - .build(); - } - - public VoteCreateResponse toOnlyPoint() { + public static VoteCreateResponse of(Integer point) { return VoteCreateResponse.builder() .point(point) .build(); diff --git a/src/main/java/com/yello/server/domain/vote/dto/response/VoteCreateVO.java b/src/main/java/com/yello/server/domain/vote/dto/response/VoteCreateVO.java new file mode 100644 index 00000000..9c7e0180 --- /dev/null +++ b/src/main/java/com/yello/server/domain/vote/dto/response/VoteCreateVO.java @@ -0,0 +1,19 @@ +package com.yello.server.domain.vote.dto.response; + +import com.yello.server.domain.vote.entity.Vote; +import java.util.List; +import lombok.Builder; + +@Builder +public record VoteCreateVO( + Integer point, + List votes +) { + + public static VoteCreateVO of(Integer point, List votes) { + return VoteCreateVO.builder() + .point(point) + .votes(votes) + .build(); + } +} diff --git a/src/main/java/com/yello/server/domain/vote/service/VoteService.java b/src/main/java/com/yello/server/domain/vote/service/VoteService.java index fbc77ce6..c5858271 100644 --- a/src/main/java/com/yello/server/domain/vote/service/VoteService.java +++ b/src/main/java/com/yello/server/domain/vote/service/VoteService.java @@ -32,7 +32,7 @@ import com.yello.server.domain.vote.dto.request.VoteAnswer; import com.yello.server.domain.vote.dto.response.RevealNameResponse; import com.yello.server.domain.vote.dto.response.VoteAvailableResponse; -import com.yello.server.domain.vote.dto.response.VoteCreateResponse; +import com.yello.server.domain.vote.dto.response.VoteCreateVO; import com.yello.server.domain.vote.dto.response.VoteDetailResponse; import com.yello.server.domain.vote.dto.response.VoteFriendResponse; import com.yello.server.domain.vote.dto.response.VoteListResponse; @@ -140,7 +140,7 @@ public VoteAvailableResponse checkVoteAvailable(Long userId) { } @Transactional - public VoteCreateResponse createVote(Long userId, CreateVoteRequest request) { + public VoteCreateVO createVote(Long userId, CreateVoteRequest request) { List votes = new ArrayList<>(); final User sender = userRepository.getById(userId); @@ -170,7 +170,7 @@ public VoteCreateResponse createVote(Long userId, CreateVoteRequest request) { } sender.plusPoint(request.totalPoint()); - return VoteCreateResponse.of(sender.getPoint(), votes); + return VoteCreateVO.of(sender.getPoint(), votes); } @Transactional diff --git a/src/test/java/com/yello/server/small/domain/vote/VoteServiceTest.java b/src/test/java/com/yello/server/small/domain/vote/VoteServiceTest.java index 41240cff..31cd79d1 100644 --- a/src/test/java/com/yello/server/small/domain/vote/VoteServiceTest.java +++ b/src/test/java/com/yello/server/small/domain/vote/VoteServiceTest.java @@ -20,7 +20,7 @@ import com.yello.server.domain.vote.dto.request.VoteAnswer; import com.yello.server.domain.vote.dto.response.RevealNameResponse; import com.yello.server.domain.vote.dto.response.VoteAvailableResponse; -import com.yello.server.domain.vote.dto.response.VoteCreateResponse; +import com.yello.server.domain.vote.dto.response.VoteCreateVO; import com.yello.server.domain.vote.dto.response.VoteDetailResponse; import com.yello.server.domain.vote.dto.response.VoteFriendResponse; import com.yello.server.domain.vote.dto.response.VoteListResponse; @@ -323,7 +323,7 @@ void init() { .build(); // when - VoteCreateResponse result = voteService.createVote(userId, request); + VoteCreateVO result = voteService.createVote(userId, request); // then assertThat(result.point()).isEqualTo(2003);