Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public ResponseEntity<GlobalResponse<Void>> createAnswer(

@GetMapping("/answers/all")
public ResponseEntity<GlobalResponse<SliceResponse<PublicAnswerResDto>>> getPublicAnswers(
@RequestParam(defaultValue = "0") int page,
@RequestParam(defaultValue = "1") int page,
@RequestParam(defaultValue = "10") int size
) {
return ResponseEntity.ok(GlobalResponse.success("였늘의 질문 PUBLIC λ‹΅λ³€ 쑰회 성곡", todayQuestionService.getPublicAnswers(page, size)));
Expand All @@ -57,7 +57,7 @@ public ResponseEntity<GlobalResponse<Void>> updateAnswer(
@GetMapping("/answers/friends")
public ResponseEntity<GlobalResponse<SliceResponse<FriendAnswerResDto>>> getFriendsAnswers(
@AuthenticationPrincipal(expression = "userAuthDto.userId") Long userId,
@RequestParam(defaultValue = "0") int page,
@RequestParam(defaultValue = "1") int page,
@RequestParam(defaultValue = "10") int size
) {
return ResponseEntity.ok(GlobalResponse.success("친ꡬ 곡개 λ‹΅λ³€ 쑰회 성곡", todayQuestionService.getFriendsAnswers(userId, page, size)));
Expand All @@ -66,7 +66,7 @@ public ResponseEntity<GlobalResponse<SliceResponse<FriendAnswerResDto>>> getFrie
@GetMapping("/answers/me/history")
public ResponseEntity<GlobalResponse<SliceResponse<MyAnswerHistoryResDto>>> getMyAnswerHistory(
@AuthenticationPrincipal(expression = "userAuthDto.userId") Long userId,
@RequestParam(defaultValue = "0") int page,
@RequestParam(defaultValue = "1") int page,
@RequestParam(defaultValue = "10") int size
) {
return ResponseEntity.ok(GlobalResponse.success("λ‚΄ λ‹΅λ³€ 전체 쑰회 성곡", todayQuestionService.getMyAnswerHistory(userId, page, size)));
Expand All @@ -92,7 +92,7 @@ public ResponseEntity<GlobalResponse<AnswerReportResDto>> reportAnswer(

@GetMapping
public ResponseEntity<GlobalResponse<SliceResponse<AnswerReportAdminResDto>>> getReportedAnswers(
@RequestParam(defaultValue = "0") int page,
@RequestParam(defaultValue = "1") int page,
@RequestParam(defaultValue = "20") int size
) {
return ResponseEntity.ok(GlobalResponse.success("μ‹ κ³ λœ λ‹΅λ³€ 쑰회 성곡", answerReportAdminService.getReportedAnswers(page, size)));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ResponseEntity<GlobalResponse<Void>> createAnswer(
description = "였늘의 μ§ˆλ¬Έμ— λŒ€ν•œ PUBLIC 닡변을 μ‘°νšŒν•©λ‹ˆλ‹€."
)
ResponseEntity<GlobalResponse<SliceResponse<PublicAnswerResDto>>> getPublicAnswers(
@RequestParam(defaultValue = "0") int page,
@RequestParam(defaultValue = "1") int page,
@RequestParam(defaultValue = "10") int size
);

Expand All @@ -57,14 +57,14 @@ ResponseEntity<GlobalResponse<Void>> updateAnswer(
@Operation(summary = "친ꡬ λ‹΅λ³€ 쑰회", description = "였늘의 μ§ˆλ¬Έμ— λŒ€ν•œ μΉœκ΅¬λ“€μ˜ 닡변을 μ‘°νšŒν•©λ‹ˆλ‹€.")
ResponseEntity<GlobalResponse<SliceResponse<FriendAnswerResDto>>> getFriendsAnswers(
@AuthenticationPrincipal(expression = "userAuthDto.userId") Long userId,
@RequestParam(defaultValue = "0") int page,
@RequestParam(defaultValue = "1") int page,
@RequestParam(defaultValue = "10") int size
);

@Operation(summary = "λ‚΄κ°€ μž‘μ„±ν•œ λͺ¨λ“  질문 λ‹΅λ³€ 쑰회", description = "λ‘œκ·ΈμΈν•œ μ‚¬μš©μžκ°€ μ§€κΈˆκΉŒμ§€ μž‘μ„±ν•œ λͺ¨λ“  질문 닡변을 μ‘°νšŒν•©λ‹ˆλ‹€.")
ResponseEntity<GlobalResponse<SliceResponse<MyAnswerHistoryResDto>>> getMyAnswerHistory(
@AuthenticationPrincipal(expression = "userAuthDto.userId") Long userId,
@RequestParam(defaultValue = "0") int page,
@RequestParam(defaultValue = "1") int page,
@RequestParam(defaultValue = "10") int size
);

Expand Down Expand Up @@ -100,7 +100,7 @@ ResponseEntity<GlobalResponse<AnswerReportResDto>> reportAnswer(

@Operation(summary = "μ‹ κ³ λœ λ‹΅λ³€ λͺ©λ‘ 쑰회 (κ΄€λ¦¬μž)", description = "μ‹ κ³ λœ λͺ¨λ“  닡변을 μ‘°νšŒν•©λ‹ˆλ‹€.")
ResponseEntity<GlobalResponse<SliceResponse<AnswerReportAdminResDto>>> getReportedAnswers(
@RequestParam(defaultValue = "0") int page,
@RequestParam(defaultValue = "1") int page,
@RequestParam(defaultValue = "20") int size
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public SliceResponse<PublicAnswerResDto> getPublicAnswers(int page, int size) {
);

PageRequest pageable = PageRequest.of(
page,
page -1,
size,
Sort.by(Sort.Direction.DESC, "createdAt")
);
Expand Down Expand Up @@ -278,7 +278,7 @@ public SliceResponse<FriendAnswerResDto> getFriendsAnswers(
List<Long> friendIds = friendRepository.findFriendIdsByUser(me);

Pageable pageable = PageRequest.of(
page,
page - 1,
size,
Sort.by(Sort.Direction.DESC, "createdAt")
);
Expand Down Expand Up @@ -344,7 +344,7 @@ public SliceResponse<MyAnswerHistoryResDto> getMyAnswerHistory(
);

Pageable pageable = PageRequest.of(
page,
page -1 ,
size,
Sort.by(Sort.Direction.DESC, "createdAt")
);
Expand Down
Loading