Merge branch 'master' into master-web
This commit is contained in:
@@ -56,7 +56,7 @@ public class QuizService {
|
||||
final Page<Quiz> quizPage = quizRepository.findByQuizCategoryIsAndIsEnableTrue(getQuizRequest.getCategory(), pageRequest);
|
||||
|
||||
final List<GetQuizResponse> quizResponseList = quizPage.getContent().stream()
|
||||
.map(QuizDtoConverter::convert)
|
||||
.map(v -> QuizDtoConverter.convert(v, enumMapperFactory.getElement(EnumMapperKey.QUIZ_CATEGORY, v.getQuizCategory())))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
return GetQuizResponseHolder.builder()
|
||||
@@ -121,7 +121,7 @@ public class QuizService {
|
||||
final Page<Quiz> quizPage = quizRepository.search(condition, pageRequest);
|
||||
|
||||
final List<GetQuizResponse> quizResponseList = quizPage.getContent().stream()
|
||||
.map(QuizDtoConverter::convert)
|
||||
.map(v -> QuizDtoConverter.convert(v, enumMapperFactory.getElement(EnumMapperKey.QUIZ_CATEGORY, v.getQuizCategory())))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
return GetQuizResponseHolder.builder()
|
||||
|
||||
@@ -267,6 +267,7 @@ class QuizServiceTest {
|
||||
.code(quizCategory.name())
|
||||
.title(quizCategory.getTitle())
|
||||
.desc(quizCategory.getDesc())
|
||||
.expose(true)
|
||||
.build();
|
||||
|
||||
doReturn(Collections.singletonList(enumMapperValue)).when(enumMapperFactory).get(EnumMapperKey.QUIZ_CATEGORY);
|
||||
|
||||
Reference in New Issue
Block a user