YEL-193 [feat] vote type fix

team-yello · Jan 30, 2024 · bc6b303 · bc6b303
1 parent c592b43
commit bc6b303
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/src/main/java/com/yello/server/domain/vote/entity/VoteType.java b/src/main/java/com/yello/server/domain/vote/entity/VoteType.java
@@ -8,7 +8,7 @@
 @Getter
 @RequiredArgsConstructor
 public enum VoteType {
-    send("send");
+    SEND("send");
 
     private final String intial;
 

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
@@ -121,9 +121,9 @@ public VoteFriendResponse findAllFriendVotes(Long userId, Pageable pageable) {
         return VoteFriendResponse.of(totalCount, list);
     }
 
-    public VoteFriendAndUserResponse findAllFriendVotesWithType(Long userId, Pageable pageable, String type) {
+    public VoteFriendAndUserResponse findAllFriendVotesWithType(Long userId, Pageable pageable, String voteType) {
 
-        if(!StringUtils.hasText(type)) {
+        if(!StringUtils.hasText(voteType)) {
             final Long totalCount = Long.valueOf(voteRepository.countAllReceivedByFriends(userId));
             final List<VoteFriendAndUserVO> list = voteRepository.findAllReceivedByFriends(userId, pageable)
                 .stream()
@@ -133,8 +133,8 @@ public VoteFriendAndUserResponse findAllFriendVotesWithType(Long userId, Pageabl
             return VoteFriendAndUserResponse.of(totalCount, list);
         }
 
-        switch(VoteType.valueOf(type)) {
-            case send -> {
+        switch(VoteType.fromCode(voteType)) {
+            case SEND -> {
                 final Long totalCount = voteRepository.countUserSendReceivedByFriends(userId);
                 List<VoteFriendAndUserVO> list =
                     voteRepository.findUserSendReceivedByFriends(userId, pageable)

diff --git a/src/main/resources/static/docs/find-friend-votes-v2.html b/src/main/resources/static/docs/find-friend-votes-v2.html
@@ -642,7 +642,14 @@ <h3 id="_note">NOTE</h3>
 <div class="ulist">
 <ul>
 <li>
-<p>모든 종류의 쪽지를 조회할 때 <code>/api/v1/vote/friend?page=0&amp;type=null</code> 으로 요청해주세요</p>
+<p>모든 종류의 쪽지를 조회할 때 <code>/api/v1/vote/friend?page=0</code> 으로 요청해주세요</p>
+<div class="ulist">
+<ul>
+<li>
+<p>type을 명시하지 마세요</p>
+</li>
+</ul>
+</div>
 </li>
 <li>
 <p>내가 보낸 쪽지를 조회할 때 <code>/api/v1/vote/friend?page=0&amp;type=send</code> 으로 요청해주세요</p>