Skip to content

Feat[post]:post 투표수 페이징 추가 #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 10, 2025
Merged

Feat[post]:post 투표수 페이징 추가 #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0731c33
feat[post]:post투표수페이징추가
GarakChoi Oct 8, 2025
d9d02f9
fix[poll]:test fix
GarakChoi Oct 8, 2025
21b1e86
feat[poll]:중복투표제거
GarakChoi Oct 8, 2025
f66cc3e
faet[post]:투표 본인 확인 추가
GarakChoi Oct 10, 2025
50ee479
faet[post]:투표 본인 확인 추가
GarakChoi Oct 10, 2025
b97b7b6
faet[post]:투표 본인 확인 추가
GarakChoi Oct 10, 2025
07b3dbd
faet[post]:투표 본인 확인 추가
GarakChoi Oct 10, 2025
4450f10
fix[poll]:fix updatepoll
GarakChoi Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 43 additions & 38 deletions backend/src/main/java/com/ai/lawyer/domain/poll/controller/PollController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
package com.ai.lawyer.domain.poll.controller;

import com.ai.lawyer.domain.poll.dto.PollCreateDto;
import com.ai.lawyer.domain.poll.dto.PollDto;
import com.ai.lawyer.domain.poll.dto.PollStaticsResponseDto;
import com.ai.lawyer.domain.poll.dto.PollVoteDto;
import com.ai.lawyer.domain.poll.dto.*;
import com.ai.lawyer.domain.poll.entity.PollVote;
import com.ai.lawyer.domain.poll.entity.PollOptions;
import com.ai.lawyer.domain.poll.service.PollService;
import com.ai.lawyer.domain.post.dto.PostDetailDto;
import com.ai.lawyer.domain.post.service.PostService;
import com.ai.lawyer.global.response.ApiResponse;
import com.ai.lawyer.global.util.AuthUtil;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
Expand All @@ -26,6 +25,7 @@
@RestController
@RequestMapping("/api/polls")
@RequiredArgsConstructor
@Slf4j
public class PollController {

private final PollService pollService;
Expand All @@ -34,17 +34,12 @@ public class PollController {
@Operation(summary = "투표 단일 조회")
@GetMapping("/{pollId}")
public ResponseEntity<ApiResponse<PollDto>> getPoll(@PathVariable Long pollId) {
PollDto poll = pollService.getPoll(pollId);
Long memberId = AuthUtil.getCurrentMemberId();
log.info("PollController getPoll: memberId={}", memberId);
PollDto poll = pollService.getPoll(pollId, memberId);
return ResponseEntity.ok(new ApiResponse<>(200, "투표 단일 조회 성공", poll));
}

@Operation(summary = "투표 옵션 목록 조회")
@GetMapping("/{pollId}/options")
public ResponseEntity<ApiResponse<List<PollOptions>>> getPollOptions(@PathVariable Long pollId) {
List<PollOptions> options = pollService.getPollOptions(pollId);
return ResponseEntity.ok(new ApiResponse<>(200, "투표 옵션 목록 조회 성공", options));
}

@Operation(summary = "투표하기")
@PostMapping("/{pollId}/vote")
public ResponseEntity<ApiResponse<PollVoteDto>> vote(@PathVariable Long pollId, @RequestParam Long pollItemsId) {
Expand All @@ -68,24 +63,39 @@ public ResponseEntity<ApiResponse<Void>> closePoll(@PathVariable Long pollId) {
return ResponseEntity.ok(new ApiResponse<>(200, "투표가 종료되었습니다.", null));
}

@Operation(summary = "투표 수정")
@PutMapping("/{pollId}")
public ResponseEntity<ApiResponse<PollDto>> updatePoll(@PathVariable Long pollId, @RequestBody PollUpdateDto pollUpdateDto) {
Long currentMemberId = AuthUtil.getCurrentMemberId();
PollDto updated = pollService.updatePoll(pollId, pollUpdateDto, currentMemberId);
return ResponseEntity.ok(new ApiResponse<>(200, "투표가 수정되었습니다.", updated));
}

@Operation(summary = "투표 삭제")
@DeleteMapping("/{pollId}")
public ResponseEntity<ApiResponse<Void>> deletePoll(@PathVariable Long pollId) {
Long currentMemberId = AuthUtil.getCurrentMemberId();
PollDto poll = pollService.getPoll(pollId, currentMemberId);
if (!poll.getPostId().equals(currentMemberId)) {
return ResponseEntity.status(403).body(new ApiResponse<>(403, "본인만 투표를 삭제할 수 있습니다.", null));
}
pollService.deletePoll(pollId);
return ResponseEntity.ok(new ApiResponse<>(200, "투표가 삭제되었습니다.", null));
}

@Operation(summary = "진행중인 투표 Top 1 조회")
@GetMapping("/top/ongoing")
public ResponseEntity<ApiResponse<PollDto>> getTopOngoingPoll() {
PollDto poll = pollService.getTopPollByStatus(PollDto.PollStatus.ONGOING);
Long memberId = AuthUtil.getCurrentMemberId();
PollDto poll = pollService.getTopPollByStatus(PollDto.PollStatus.ONGOING, memberId);
return ResponseEntity.ok(new ApiResponse<>(200, "진행중인 투표 Top 1 조회 성공", poll));
}

@Operation(summary = "종료된 투표 Top 1 조회")
@GetMapping("/top/closed")
public ResponseEntity<ApiResponse<PollDto>> getTopClosedPoll() {
PollDto poll = pollService.getTopPollByStatus(PollDto.PollStatus.CLOSED);
Long memberId = AuthUtil.getCurrentMemberId();
PollDto poll = pollService.getTopPollByStatus(PollDto.PollStatus.CLOSED, memberId);
return ResponseEntity.ok(new ApiResponse<>(200, "종료된 투표 Top 1 조회 성공", poll));
}

Expand All @@ -112,42 +122,37 @@ public ResponseEntity<ApiResponse<PollDto>> createPoll(@RequestBody PollCreateDt
return ResponseEntity.ok(new ApiResponse<>(201, "투표가 생성되었습니다.", created));
}

@Operation(summary = "투표 수정")
@PutMapping("/{pollId}")
public ResponseEntity<ApiResponse<PollDto>> updatePoll(@PathVariable Long pollId, @RequestBody com.ai.lawyer.domain.poll.dto.PollUpdateDto pollUpdateDto) {
PollDto updated = pollService.updatePoll(pollId, pollUpdateDto);
return ResponseEntity.ok(new ApiResponse<>(200, "투표가 수정되었습니다.", updated));
}

@Operation(summary = "진행중인 투표 전체 목록 조회")
@GetMapping("/ongoing")
public ResponseEntity<ApiResponse<List<PollDto>>> getOngoingPolls() {
List<PollDto> polls = pollService.getPollsByStatus(PollDto.PollStatus.ONGOING);
Long memberId = AuthUtil.getCurrentMemberId();
List<PollDto> polls = pollService.getPollsByStatus(PollDto.PollStatus.ONGOING, memberId);
return ResponseEntity.ok(new ApiResponse<>(200, "진행중인 투표 전체 목록 조회 성공", polls));
}

@Operation(summary = "종료된 투표 전체 목록 조회")
@GetMapping("/closed")
public ResponseEntity<ApiResponse<List<PollDto>>> getClosedPolls() {
List<PollDto> polls = pollService.getPollsByStatus(PollDto.PollStatus.CLOSED);
Long memberId = AuthUtil.getCurrentMemberId();
List<PollDto> polls = pollService.getPollsByStatus(PollDto.PollStatus.CLOSED, memberId);
return ResponseEntity.ok(new ApiResponse<>(200, "종료된 투표 전체 목록 조회 성공", polls));
}

@Operation(summary = "종료된 투표 Top N 조회")
@GetMapping("/top/closed-list") //검색조건 : pi/polls/top/closed-list?size=3
public ResponseEntity<ApiResponse<List<PollDto>>> getTopClosedPolls(@RequestParam(defaultValue = "3") int size) {
List<PollDto> polls = pollService.getTopNPollsByStatus(PollDto.PollStatus.CLOSED, size);
String message = String.format("종료된 투표 Top %d 조회 성공", size);
return ResponseEntity.ok(new ApiResponse<>(200, message, polls));
}

@Operation(summary = "진행중인 투표 Top N 조회")
@GetMapping("/top/ongoing-list") //검색조건 : api/polls/top/ongoing-list?size=3
public ResponseEntity<ApiResponse<List<PollDto>>> getTopOngoingPolls(@RequestParam(defaultValue = "3") int size) {
List<PollDto> polls = pollService.getTopNPollsByStatus(PollDto.PollStatus.ONGOING, size);
String message = String.format("진행중인 투표 Top %d 조회 성공", size);
return ResponseEntity.ok(new ApiResponse<>(200, message, polls));
}
// @Operation(summary = "종료된 투표 Top N 조회")
// @GetMapping("/top/closed-list") //검색조건 : pi/polls/top/closed-list?size=3
// public ResponseEntity<ApiResponse<List<PollDto>>> getTopClosedPolls(@RequestParam(defaultValue = "3") int size) {
// List<PollDto> polls = pollService.getTopNPollsByStatus(PollDto.PollStatus.CLOSED, size);
// String message = String.format("종료된 투표 Top %d 조회 성공", size);
// return ResponseEntity.ok(new ApiResponse<>(200, message, polls));
// }
//
// @Operation(summary = "진행중인 투표 Top N 조회")
// @GetMapping("/top/ongoing-list") //검색조건 : api/polls/top/ongoing-list?size=3
// public ResponseEntity<ApiResponse<List<PollDto>>> getTopOngoingPolls(@RequestParam(defaultValue = "3") int size) {
// List<PollDto> polls = pollService.getTopNPollsByStatus(PollDto.PollStatus.ONGOING, size);
// String message = String.format("진행중인 투표 Top %d 조회 성공", size);
// return ResponseEntity.ok(new ApiResponse<>(200, message, polls));
// }

@Operation(summary = "index(순번)로 투표하기")
@PostMapping("/{pollId}/voting")
Expand Down
1 change: 1 addition & 0 deletions backend/src/main/java/com/ai/lawyer/domain/poll/dto/PollOptionDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ public class PollOptionDto {
private Long voteCount;
private java.util.List<PollStaticsDto> statics;
private int pollOptionIndex;
private boolean voted; // 해당 옵션에 투표했는지 여부
}
2 changes: 1 addition & 1 deletion backend/src/main/java/com/ai/lawyer/domain/poll/dto/PollVoteDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ public class PollVoteDto {
private Long pollItemsId;
private Long memberId;
private Long voteCount;
private String message;
}

6 changes: 5 additions & 1 deletion backend/src/main/java/com/ai/lawyer/domain/poll/repository/PollVoteRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
import com.ai.lawyer.domain.poll.entity.PollVote;
import org.springframework.data.jpa.repository.JpaRepository;

import java.util.Optional;

public interface PollVoteRepository extends JpaRepository<PollVote, Long>, PollVoteRepositoryCustom {
Optional<PollVote> findByMember_MemberIdAndPoll_PollId(Long memberId, Long pollId);
void deleteByMember_MemberIdAndPoll_PollId(Long memberId, Long pollId);
Optional<PollVote> findByMember_MemberIdAndPollOptions_PollItemsId(Long memberId, Long pollItemsId);
}

1 change: 0 additions & 1 deletion backend/src/main/java/com/ai/lawyer/domain/poll/repository/PollVoteRepositoryCustom.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ public interface PollVoteRepositoryCustom {
List<Object[]> getOptionAgeStatics(Long pollId);
List<Object[]> getOptionGenderStatics(Long pollId);
}

12 changes: 6 additions & 6 deletions backend/src/main/java/com/ai/lawyer/domain/poll/service/PollService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@

public interface PollService {
// ===== 조회 관련 =====
PollDto getPoll(Long pollId);
PollDto getPollWithStatistics(Long pollId);
PollDto getPoll(Long pollId, Long memberId);
PollDto getPollWithStatistics(Long pollId, Long memberId);
List<PollOptions> getPollOptions(Long pollId);
List<PollDto> getPollsByStatus(PollDto.PollStatus status);
PollDto getTopPollByStatus(PollDto.PollStatus status);
List<PollDto> getTopNPollsByStatus(PollDto.PollStatus status, int n);
List<PollDto> getPollsByStatus(PollDto.PollStatus status, Long memberId);
PollDto getTopPollByStatus(PollDto.PollStatus status, Long memberId);
List<PollDto> getTopNPollsByStatus(PollDto.PollStatus status, int n, Long memberId);

// ===== 통계 관련 =====
PollStaticsResponseDto getPollStatics(Long pollId);
Expand All @@ -31,7 +31,7 @@ public interface PollService {

// ===== 생성/수정/삭제 관련 =====
PollDto createPoll(PollCreateDto request, Long memberId);
PollDto updatePoll(Long pollId, PollUpdateDto pollUpdateDto);
PollDto updatePoll(Long pollId, PollUpdateDto pollUpdateDto, Long memberId);
void patchUpdatePoll(Long pollId, PollUpdateDto pollUpdateDto);
void closePoll(Long pollId);
void deletePoll(Long pollId);
Expand Down
Loading