Merge pull request #184 from Strong-Potato/bugfix/#183-add-space-end-…

…filter [Bugfix] 스페이스가 끝난 경우 투표 목록을 가져오지 않도록 설정
Strong-Potato · Jan 24, 2024 · f8f4e6f · f8f4e6f
2 parents 8c1d519 + 62563c4
commit f8f4e6f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/app/src/main/java/fc/be/app/domain/space/entity/Space.java b/app/src/main/java/fc/be/app/domain/space/entity/Space.java
@@ -156,4 +156,8 @@ public String getSpaceTitle() {
         return String.format("%s 외 %d명의 여행", joinedMemberList.get(0).getMember().getNickname(), joinedMemberList.size() - 1);
     }
 
+    public boolean isClosed(LocalDate localDate) {
+        return this.endDate.isBefore(localDate);
+    }
+
 }
diff --git a/app/src/main/java/fc/be/app/domain/vote/controller/VoteController.java b/app/src/main/java/fc/be/app/domain/vote/controller/VoteController.java
@@ -31,7 +31,7 @@ public interface VoteController {
     )
     @PostMapping
     ApiResponse<String> createNewVote(
-            @Valid VoteCreateApiRequest request,
+            @Valid @RequestBody VoteCreateApiRequest request,
             @AuthenticationPrincipal UserPrincipal userPrincipal
     );
 
@@ -46,7 +46,7 @@ ApiResponse<String> createNewVote(
     @PostMapping("/{voteId}/candidates")
     ApiResponse<VoteDetailResponse> addCandidate(
             @PathVariable Long voteId,
-            CandidateAddApiRequest request,
+            @Valid @RequestBody CandidateAddApiRequest request,
             @AuthenticationPrincipal UserPrincipal userPrincipal
     );
 
@@ -162,4 +162,16 @@ ApiResponse<Void> resetVote(
             @PathVariable Long voteId,
             @AuthenticationPrincipal UserPrincipal userPrincipal
     );
+
+
+    @Operation(
+            operationId = "show vote not voting",
+            summary = "아직 참여하지 않은 투표 목록을 보여준다.",
+            description = "본인이 속한 스페이스 내 아직 참여하지 않은 투표 목록을 보여주는 API 입니다.",
+            security = {
+                    @SecurityRequirement(name = "ACCESS_TOKEN", scopes = {"write:votes"})
+            }
+    )
+    @GetMapping("/notVoted")
+    ApiResponse<VotesResponse> notVotedList(@AuthenticationPrincipal UserPrincipal userPrincipal);
 }
diff --git a/app/src/main/java/fc/be/app/domain/vote/controller/VoteControllerImpl.java b/app/src/main/java/fc/be/app/domain/vote/controller/VoteControllerImpl.java
@@ -43,7 +43,7 @@ public VoteControllerImpl(
 
     @PostMapping
     public ApiResponse<String> createNewVote(
-            @Valid VoteCreateApiRequest request,
+            @Valid @RequestBody VoteCreateApiRequest request,
             @AuthenticationPrincipal UserPrincipal userPrincipal
     ) {
         return ApiResponse.created(VOTE_API_PREFIX + voteManageService.createVote(

diff --git a/app/src/main/java/fc/be/app/domain/vote/service/service/VoteInfoQueryService.java b/app/src/main/java/fc/be/app/domain/vote/service/service/VoteInfoQueryService.java
@@ -19,6 +19,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.util.Comparator;
 import java.util.List;
 
@@ -89,6 +90,7 @@ public VotesResponse findMemberVotes(Long memberId) {
 
         return new VotesResponse(votesNotMemberVoted
                 .stream()
+                .filter(vote -> vote.getSpace().isClosed(LocalDate.now()))
                 .map(vote -> new VotesResponseElement(
                         vote.getId(),
                         vote.getTitle(),