Merge pull request #5 from eunhye-ahn/feature/poll-core-0521

[BE] 투표 : 투표 생성/조회/참여 API 구현

Author: eunhye-ahn

polling-app-server/src/main/java/com/example/polls/controller/GroupPollController.java

@@ -0,0 +1,60 @@
+package com.example.polls.controller;
+
+import com.example.polls.payload.Request.PollRequest;
+import com.example.polls.payload.Request.VoteRequest;
+import com.example.polls.payload.Response.ApiResponse;
+import com.example.polls.payload.Response.PagedResponse;
+import com.example.polls.payload.Response.PollResponse;
+import com.example.polls.security.CurrentUser;
+import com.example.polls.security.UserPrincipal;
+import com.example.polls.service.GroupService;
+import com.example.polls.service.PollService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+@RestController
+@RequestMapping("/api/groups/{groupId}/polls")
+public class GroupPollController {
+    @Autowired
+    private PollService pollService;
+    @Autowired
+    private GroupService groupService;
+
+    @PostMapping
+    public ResponseEntity<?> createPollInGroup (@PathVariable Long groupId,
+            @CurrentUser UserPrincipal currentUser,
+            @Valid @RequestBody PollRequest request) {
+        groupService.validateGroupMember(groupId, currentUser.getId());
+        pollService.createPollInGroup(groupId, request, currentUser);
+        return ResponseEntity.ok(new ApiResponse(true, "Poll Created Successfully"));
+    }
+
+    @GetMapping
+    public ResponseEntity<PagedResponse<PollResponse>> getAllPollInGroup(@PathVariable Long groupId,
+                                                    @CurrentUser UserPrincipal userPrincipal,
+                                                    @RequestParam(value = "page", defaultValue="0") int page,
+                                                    @RequestParam(value = "size", defaultValue="10") int size){
+        PagedResponse<PollResponse> response = pollService.getAllPollsInGroup(groupId, userPrincipal, page, size);
+        return ResponseEntity.ok(response);
+    }
+
+
+    @GetMapping("/{pollId}")
+    public ResponseEntity<PollResponse> getPollByIdInGroup(@PathVariable Long groupId,
+                                                           @PathVariable Long pollId,
+                                                           @CurrentUser UserPrincipal userPrincipal){
+        PollResponse response = pollService.getPollByIdInGroup(pollId, groupId, userPrincipal);
+        return ResponseEntity.ok(response);
+    }
+
+    @PostMapping("/{pollId}/votes")
+    public PollResponse castVote(@CurrentUser UserPrincipal userPrincipal,
+                                 @PathVariable Long pollId,
+                                 @Valid @RequestBody VoteRequest voteRequest){
+        return pollService.castVoteAndGetUpdatedPoll(pollId, voteRequest, userPrincipal);
+    }
+
+}

polling-app-server/src/main/java/com/example/polls/model/Poll.java

@@ -41,7 +41,13 @@ public class Poll extends UserDateAudit {
     @JoinColumn(name = "group_id", nullable = false)
     private Group group;
 
+    public Group getGroup() {
+        return group;
+    }
 
+    public void setGroup(Group group) {
+        this.group = group;
+    }
 
     public Long getId() {
         return id;

polling-app-server/src/main/java/com/example/polls/repository/PollRepository.java

@@ -22,4 +22,6 @@ public interface PollRepository extends JpaRepository<Poll, Long> {
     List<Poll> findByIdIn(List<Long> pollIds);
 
     List<Poll> findByIdIn(List<Long> pollIds, Sort sort);
+
+    Page<Poll> findByGroupId(Long groupId, Pageable pageable);
 }

polling-app-server/src/main/java/com/example/polls/service/GroupService.java

@@ -124,4 +124,10 @@ public GroupDetailResponse getGroupDetail(Long groupId, Long userId) {
         return new GroupDetailResponse(group.getId(),group.getName(),group.getImageUrl(),members);
 
     }
+
+    public void validateGroupMember(Long groupId, Long userId){
+        if(!groupMemberRepository.existsByUserIdAndGroupId(userId, groupId)){
+            throw new BadRequestException("해당 그룹에 소속되지 않았습니다.");
+        }
+    }
 }

polling-app-server/src/main/java/com/example/polls/service/PollService.java

@@ -3,13 +3,11 @@
 import com.example.polls.exception.BadRequestException;
 import com.example.polls.exception.ResourceNotFoundException;
 import com.example.polls.model.*;
-import com.example.polls.payload.Response.PagedResponse;
 import com.example.polls.payload.Request.PollRequest;
-import com.example.polls.payload.Response.PollResponse;
 import com.example.polls.payload.Request.VoteRequest;
-import com.example.polls.repository.PollRepository;
-import com.example.polls.repository.UserRepository;
-import com.example.polls.repository.VoteRepository;
+import com.example.polls.payload.Response.PagedResponse;
+import com.example.polls.payload.Response.PollResponse;
+import com.example.polls.repository.*;
 import com.example.polls.security.UserPrincipal;
 import com.example.polls.util.AppConstants;
 import com.example.polls.util.ModelMapper;
@@ -31,6 +29,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+
 @Service
 public class PollService {
 
@@ -44,36 +43,66 @@ public class PollService {
     private UserRepository userRepository;
 
     private static final Logger logger = LoggerFactory.getLogger(PollService.class);
+    @Autowired
+    private GroupRepository groupRepository;
+    @Autowired
+    private GroupService groupService;
+    @Autowired
+    private GroupMemberRepository groupMemberRepository;
 
-    public PagedResponse<PollResponse> getAllPolls(UserPrincipal currentUser, int page, int size) {
-        validatePageNumberAndSize(page, size);
-
-        // Retrieve Polls
-        Pageable pageable = PageRequest.of(page, size, Sort.Direction.DESC, "createdAt");
-        Page<Poll> polls = pollRepository.findAll(pageable);
 
+    private PagedResponse<PollResponse> mapPollPagetoPageResponse(UserPrincipal currentUser, Page<Poll> polls) {
         if(polls.getNumberOfElements() == 0) {
             return new PagedResponse<>(Collections.emptyList(), polls.getNumber(),
                     polls.getSize(), polls.getTotalElements(), polls.getTotalPages(), polls.isLast());
         }
 
-        // Map Polls to PollResponses containing vote counts and poll creator details
         List<Long> pollIds = polls.map(Poll::getId).getContent();
         Map<Long, Long> choiceVoteCountMap = getChoiceVoteCountMap(pollIds);
         Map<Long, Long> pollUserVoteMap = getPollUserVoteMap(currentUser, pollIds);
         Map<Long, User> creatorMap = getPollCreatorMap(polls.getContent());
 
-        List<PollResponse> pollResponses = polls.map(poll -> {
-            return ModelMapper.mapPollToPollResponse(poll,
-                    choiceVoteCountMap,
-                    creatorMap.get(poll.getCreatedBy()),
-                    pollUserVoteMap == null ? null : pollUserVoteMap.getOrDefault(poll.getId(), null));
-        }).getContent();
+        List<PollResponse> pollResponses = polls.map(poll -> ModelMapper.mapPollToPollResponse(
+                poll,
+                choiceVoteCountMap,
+                creatorMap.get(poll.getCreatedBy()),
+                pollUserVoteMap == null ? null : pollUserVoteMap.getOrDefault(poll.getId(), null)
+        )).getContent();
 
         return new PagedResponse<>(pollResponses, polls.getNumber(),
                 polls.getSize(), polls.getTotalElements(), polls.getTotalPages(), polls.isLast());
     }
 
+
+    public PagedResponse<PollResponse> getAllPolls(UserPrincipal currentUser, int page, int size) {
+        validatePageNumberAndSize(page, size);
+
+        // Retrieve Polls
+        Pageable pageable = PageRequest.of(page, size, Sort.Direction.DESC, "createdAt");
+        Page<Poll> polls = pollRepository.findAll(pageable);
+
+        return mapPollPagetoPageResponse(currentUser, polls);
+    }
+
+    public PagedResponse<PollResponse> getAllPollsInGroup(Long groupId, UserPrincipal userPrincipal, int page, int size) {
+        //그룹 유효성검사
+        Group group = groupRepository.findById(groupId)
+                .orElseThrow(() -> new ResourceNotFoundException("Group", "id", groupId));
+
+        //그룹 멤버 인증
+        if(!groupMemberRepository.existsByUserIdAndGroupId(userPrincipal.getId(), groupId)) {
+            throw new BadRequestException("그룹에 가입된 사용자만 투표를 조회할 수 있습니다.");
+        }
+
+        //page 표시 정보 설정하기
+        Pageable pageable = PageRequest.of(page, size, Sort.by("createdAt").descending());
+        //결과 데이터 가져오기
+        Page<Poll> polls = pollRepository.findByGroupId(groupId, pageable);
+
+        return mapPollPagetoPageResponse(userPrincipal, polls);
+    }
+
+
     public PagedResponse<PollResponse> getPollsCreatedBy(String username, UserPrincipal currentUser, int page, int size) {
         validatePageNumberAndSize(page, size);
 
@@ -143,29 +172,49 @@ public PagedResponse<PollResponse> getPollsVotedBy(String username, UserPrincipa
     }
 
 
-    public Poll createPoll(PollRequest pollRequest) {
+    private Poll createPollInternal(PollRequest request, Long createdBy, Group group) {
         Poll poll = new Poll();
-        poll.setQuestion(pollRequest.getQuestion());
+        poll.setQuestion(request.getQuestion());
+
+        if (createdBy != null) {
+            poll.setCreatedBy(createdBy);
+        }
+
+        if (group != null) {
+            poll.setGroup(group);
+        }
 
-        pollRequest.getChoices().forEach(choiceRequest -> {
+        request.getChoices().forEach(choiceRequest -> {
             poll.addChoice(new Choice(choiceRequest.getText()));
         });
 
         Instant now = Instant.now();
-        Instant expirationDateTime = now.plus(Duration.ofDays(pollRequest.getPollLength().getDays()))
-                .plus(Duration.ofHours(pollRequest.getPollLength().getHours()));
-
+        Instant expirationDateTime = now.plus(Duration.ofDays(request.getPollLength().getDays()))
+                .plus(Duration.ofHours(request.getPollLength().getHours()));
         poll.setExpirationDateTime(expirationDateTime);
 
         return pollRepository.save(poll);
     }
 
-    public PollResponse getPollById(Long pollId, UserPrincipal currentUser) {
-        Poll poll = pollRepository.findById(pollId).orElseThrow(
-                () -> new ResourceNotFoundException("Poll", "id", pollId));
+    public Poll createPoll(PollRequest pollRequest) {
+        return createPollInternal(pollRequest, null, null);
+    }
 
-        // Retrieve Vote Counts of every choice belonging to the current poll
-        List<ChoiceVoteCount> votes = voteRepository.countByPollIdGroupByChoiceId(pollId);
+    //그룹 투표 생성
+    public Poll createPollInGroup(Long groupId, PollRequest request, UserPrincipal userPrincipal) {
+        //그룹 엔티티 조회
+        Group group = groupRepository.findById(groupId)
+                    .orElseThrow(() -> new ResourceNotFoundException("Group", "id", groupId));
+        boolean isMember = groupMemberRepository.existsByUserIdAndGroupId(userPrincipal.getId(), groupId);
+        if(!isMember) {
+            throw new BadRequestException("해당 그룹에 가입된 자만 투표할 수 있습니다.");
+        }
+        //저장
+        return createPollInternal(request, userPrincipal.getId(), group);
+    }
+
+    public PollResponse buildPollResponse(Poll poll, UserPrincipal currentUser) {
+        List<ChoiceVoteCount> votes = voteRepository.countByPollIdGroupByChoiceId(poll.getId());
 
         Map<Long, Long> choiceVotesMap = votes.stream()
                 .collect(Collectors.toMap(ChoiceVoteCount::getChoiceId, ChoiceVoteCount::getVoteCount));
@@ -177,13 +226,38 @@ public PollResponse getPollById(Long pollId, UserPrincipal currentUser) {
         // Retrieve vote done by logged in user
         Vote userVote = null;
         if(currentUser != null) {
-            userVote = voteRepository.findByUserIdAndPollId(currentUser.getId(), pollId);
+            userVote = voteRepository.findByUserIdAndPollId(currentUser.getId(), poll.getId());
         }
 
         return ModelMapper.mapPollToPollResponse(poll, choiceVotesMap,
                 creator, userVote != null ? userVote.getChoice().getId(): null);
     }
 
+    public PollResponse getPollById(Long pollId, UserPrincipal currentUser) {
+        Poll poll = pollRepository.findById(pollId).orElseThrow(
+                () -> new ResourceNotFoundException("Poll", "id", pollId));
+
+        return buildPollResponse(poll, currentUser);
+    }
+
+    public PollResponse  getPollByIdInGroup(Long pollId, Long groupId, UserPrincipal currentUser) {
+        Group group = groupRepository.findById(groupId)
+                .orElseThrow(() -> new ResourceNotFoundException("Group", "id", groupId));
+        boolean isMember = groupMemberRepository.existsByUserIdAndGroupId(currentUser.getId(), groupId);
+        if(!isMember) {
+            throw new BadRequestException("해당 그룹에 가입된 사용자만 투표를 조회할 수 있습니다.");
+        }
+
+        Poll poll = pollRepository.findById(pollId).orElseThrow(
+                () -> new ResourceNotFoundException("Poll", "id", pollId)
+                );
+        if(poll.getGroup() != null && !poll.getGroup().getId().equals(groupId)) {
+            throw new BadRequestException("해당 투표는 요청한 그룹에 속하지 않습니다.");
+        }
+
+        return buildPollResponse(poll, currentUser);
+    }
+
     public PollResponse castVoteAndGetUpdatedPoll(Long pollId, VoteRequest voteRequest, UserPrincipal currentUser) {
         Poll poll = pollRepository.findById(pollId)
                 .orElseThrow(() -> new ResourceNotFoundException("Poll", "id", pollId));