Merge branch 'master' into master-web

This commit is contained in:
MangKyu
2022-02-01 03:49:38 +09:00

View File

@@ -36,6 +36,7 @@ public class QuizRepositoryImpl implements QuizRepositoryCustom {
.offset(pageable.getOffset()) .offset(pageable.getOffset())
.limit(pageable.getPageSize()) .limit(pageable.getPageSize())
.where(qQuiz.answer.isNotNull()) .where(qQuiz.answer.isNotNull())
.where(qQuiz.isEnable.isTrue())
.fetch(); .fetch();
final long count = query.selectFrom(qQuiz) final long count = query.selectFrom(qQuiz)
@@ -43,6 +44,7 @@ public class QuizRepositoryImpl implements QuizRepositoryCustom {
.where(quizCategoriesIn(qQuiz, condition.getCategories())) .where(quizCategoriesIn(qQuiz, condition.getCategories()))
.where(quizLevelsIn(qQuiz, condition.getLevels())) .where(quizLevelsIn(qQuiz, condition.getLevels()))
.where(qQuiz.answer.isNotNull()) .where(qQuiz.answer.isNotNull())
.where(qQuiz.isEnable.isTrue())
.stream().count(); .stream().count();
return new PageImpl<>(quizList, pageable, count); return new PageImpl<>(quizList, pageable, count);