Merge branch 'master' into master-web

This commit is contained in:
MangKyu
2022-02-01 04:45:32 +09:00
2 changed files with 3 additions and 2 deletions

View File

@@ -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()

View File

@@ -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);