jhynsoo/edufocus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'BE/userinfo' into 'backend'

Browse Source 
feat: qna 페이지네이션 수정

See merge request s11-webmobile1-sub2/S11P12A701!165
This commit is contained in:
박정민 2024-08-12 09:50:01 +09:00
commit f28e690410
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/src/main/java/com/edufocus/edufocus/qna/controller/QnaController.java
View File

@ -144,16 +144,14 @@ public class QnaController {
} }
@GetMapping("/all/{id}") @GetMapping("/all/{id}")
public ResponseEntity<List<QnaResponseDto>> getAllQna(@PathVariable Long id) { public ResponseEntity<List<QnaResponseDto>> getAllQna(
@PathVariable Long id,
@RequestParam(defaultValue = "0") int page) {
try { try {
List<QnaResponseDto> qnaList = qnaService.getAllQnasByLecture(id, page, PAGE_SIZE);
List<QnaResponseDto> qnaList = qnaService.getAllQnasByLecture(id, PAGE_SIZE);
return new ResponseEntity<>(qnaList, HttpStatus.ACCEPTED); return new ResponseEntity<>(qnaList, HttpStatus.ACCEPTED);
} catch (SQLException e) { } catch (SQLException e) {
return new ResponseEntity<>(HttpStatus.NOT_ACCEPTABLE); return new ResponseEntity<>(HttpStatus.NOT_ACCEPTABLE);
} }
} }
} }

2
backend/src/main/java/com/edufocus/edufocus/qna/service/QnaService.java
View File

@ -22,7 +22,7 @@ public interface QnaService {
QnaResponseDto getQna(Long id, Long userId) throws SQLException; QnaResponseDto getQna(Long id, Long userId) throws SQLException;
List<QnaResponseDto> getAllQnasByLecture(Long lectureId, int pageNumber) throws SQLException; List<QnaResponseDto> getAllQnasByLecture(Long lectureId, int page, int pageNumber) throws SQLException;
QnaResponseDto createAnswer(Long id, QnaRequestDto qnaRequestDto) throws SQLException; QnaResponseDto createAnswer(Long id, QnaRequestDto qnaRequestDto) throws SQLException;

9
backend/src/main/java/com/edufocus/edufocus/qna/service/QnaServiceImpl.java
View File

@ -120,19 +120,16 @@ public class QnaServiceImpl implements QnaService {
} }
@Override @Override
public List<QnaResponseDto> getAllQnasByLecture(Long lectureId, int pageSize) { public List<QnaResponseDto> getAllQnasByLecture(Long lectureId, int page, int pageSize) {
Pageable pageable = PageRequest.of(page, pageSize);
Pageable pageable = PageRequest.of(0, pageSize);
Page<Qna> qnaPage = qnaRepository.findByLectureId(lectureId, pageable); Page<Qna> qnaPage = qnaRepository.findByLectureId(lectureId, pageable);
return qnaPage.getContent().stream() return qnaPage.getContent().stream()
.map(QnaResponseDto::toEntity) .map(QnaResponseDto::toEntity)
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
@Override @Override
public QnaResponseDto createAnswer(Long id, QnaRequestDto qnaRequestDto) throws SQLException { public QnaResponseDto createAnswer(Long id, QnaRequestDto qnaRequestDto) throws SQLException {