YEL-193 [feat] 친구 쪽지 전체 조회하기

src/main/java/com/yello/server/domain/vote/controller/VoteController.java

@@ -20,6 +20,7 @@
 import com.yello.server.domain.vote.dto.response.VoteFriendResponse;
 import com.yello.server.domain.vote.dto.response.VoteListResponse;
 import com.yello.server.domain.vote.dto.response.VoteUnreadCountResponse;
+import com.yello.server.domain.vote.entity.VoteType;
 import com.yello.server.domain.vote.service.VoteService;
 import com.yello.server.global.common.SuccessCode;
 import com.yello.server.global.common.annotation.AccessTokenUser;
@@ -74,7 +75,7 @@ public BaseResponse<VoteDetailResponse> findVote(@PathVariable Long voteId,
 
     @GetMapping("/v2/vote/friend")
     public BaseResponse<VoteFriendAndUserResponse> findAllFriendVotesWithType(
-        @RequestParam("page") Integer page, @RequestParam("type") String type,
+        @RequestParam("page") Integer page, @RequestParam(value = "type", required = false) String type,
         @AccessTokenUser User user) {
         val data = voteService.findAllFriendVotesWithType(user.getId(), createPageableLimitTen(page), type);
         return BaseResponse.success(READ_VOTE_SUCCESS, data);

src/main/java/com/yello/server/domain/vote/entity/VoteType.java

@@ -0,0 +1,27 @@
+package com.yello.server.domain.vote.entity;
+
+import java.text.MessageFormat;
+import java.util.Arrays;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum VoteType {
+    send("send");
+
+    private final String intial;
+
+    public static VoteType fromCode(String dbData) {
+        return Arrays.stream(VoteType.values())
+            .filter(v -> v.getIntial().equals(dbData))
+            .findAny()
+            .orElseThrow(() -> new IllegalArgumentException(
+                MessageFormat.format("존재하지 않는 투표 타입입니다. {0}", dbData)));
+    }
+
+    public String intial() {
+        return intial;
+    }
+
+}

src/main/java/com/yello/server/domain/vote/entity/VoteTypeConverter.java

@@ -0,0 +1,32 @@
+package com.yello.server.domain.vote.entity;
+
+import com.yello.server.domain.user.entity.Social;
+import javax.persistence.AttributeConverter;
+import javax.persistence.Converter;
+import lombok.extern.log4j.Log4j2;
+
+@Converter
+@Log4j2
+public class VoteTypeConverter implements AttributeConverter<VoteType, String> {
+
+    @Override
+    public String convertToDatabaseColumn(VoteType voteType) {
+        if (voteType == null) {
+            return null;
+        }
+        return voteType.getIntial();
+    }
+
+    @Override
+    public VoteType convertToEntityAttribute(String dbData) {
+        if (dbData == null) {
+            return null;
+        }
+        try {
+            return VoteType.fromCode(dbData);
+        } catch (IllegalArgumentException exception) {
+            log.error("failure to convert cause unexpected code" + dbData + exception);
+            throw exception;
+        }
+    }
+}

src/main/java/com/yello/server/domain/vote/service/VoteService.java

@@ -43,6 +43,7 @@
 import com.yello.server.domain.vote.dto.response.VoteResponse;
 import com.yello.server.domain.vote.dto.response.VoteUnreadCountResponse;
 import com.yello.server.domain.vote.entity.Vote;
+import com.yello.server.domain.vote.entity.VoteType;
 import com.yello.server.domain.vote.exception.VoteForbiddenException;
 import com.yello.server.domain.vote.exception.VoteNotFoundException;
 import com.yello.server.domain.vote.repository.VoteRepository;
@@ -57,6 +58,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 @Service
 @Builder
@@ -121,18 +123,7 @@ public VoteFriendResponse findAllFriendVotes(Long userId, Pageable pageable) {
 
     public VoteFriendAndUserResponse findAllFriendVotesWithType(Long userId, Pageable pageable, String type) {
 
-        if(type.equals(USER_VOTE_TYPE)) {
-            final Long totalCount = voteRepository.countUserSendReceivedByFriends(userId);
-
-            List<VoteFriendAndUserVO> list =
-                voteRepository.findUserSendReceivedByFriends(userId, pageable)
-                    .stream()
-                    .filter(vote -> vote.getNameHint()!=-3)
-                    .map(vote -> VoteFriendAndUserVO.of(vote, vote.getSender().getId().equals(userId)))
-                    .toList();
-            return VoteFriendAndUserResponse.of(totalCount,list);
-        }
-        if(type.equals(ALL_VOTE_TYPE)) {
+        if(!StringUtils.hasText(type)) {
             final Long totalCount = Long.valueOf(voteRepository.countAllReceivedByFriends(userId));
             final List<VoteFriendAndUserVO> list = voteRepository.findAllReceivedByFriends(userId, pageable)
                 .stream()
@@ -142,6 +133,19 @@ public VoteFriendAndUserResponse findAllFriendVotesWithType(Long userId, Pageabl
             return VoteFriendAndUserResponse.of(totalCount, list);
         }
 
+        switch(VoteType.valueOf(type)) {
+            case send -> {
+                final Long totalCount = voteRepository.countUserSendReceivedByFriends(userId);
+                List<VoteFriendAndUserVO> list =
+                    voteRepository.findUserSendReceivedByFriends(userId, pageable)
+                        .stream()
+                        .filter(vote -> vote.getNameHint()!=-3)
+                        .map(vote -> VoteFriendAndUserVO.of(vote, vote.getSender().getId().equals(userId)))
+                        .toList();
+                return VoteFriendAndUserResponse.of(totalCount,list);
+            }
+        }
+
         throw new VoteForbiddenException(WRONG_VOTE_TYPE_FORBIDDEN);
     }
 

src/test/java/com/yello/server/domain/vote/medium/VoteControllerTest.java

@@ -44,6 +44,7 @@
 import com.yello.server.domain.vote.dto.response.VoteResponse;
 import com.yello.server.domain.vote.dto.response.VoteUnreadCountResponse;
 import com.yello.server.domain.vote.entity.Vote;
+import com.yello.server.domain.vote.entity.VoteType;
 import com.yello.server.domain.vote.service.VoteService;
 import com.yello.server.global.exception.ControllerExceptionAdvice;
 import com.yello.server.infrastructure.firebase.service.NotificationService;
@@ -201,7 +202,8 @@ void init() {
         final VoteFriendAndUserResponse voteFriendResponse =
             VoteFriendAndUserResponse.of(1L, Arrays.asList(voteFriendAndUserVO));
 
-        given(voteService.findAllFriendVotesWithType(anyLong(), any(Pageable.class), anyString()))
+        given(voteService.findAllFriendVotesWithType(anyLong(), any(Pageable.class),
+            anyString()))
             .willReturn(voteFriendResponse);
 
         // when