From e8aa8df6af0d03a1ddff674c8a9ab62036978a4b Mon Sep 17 00:00:00 2001 From: MangKyu Date: Tue, 1 Feb 2022 05:04:19 +0900 Subject: [PATCH] Modify GetQuizResponse --- .../app/quiz/converter/QuizDtoConverter.java | 4 +++- .../interview/app/quiz/dto/GetQuizResponse.java | 2 +- .../interview/app/quiz/service/QuizService.java | 4 ++-- .../app/quiz/controller/QuizControllerTest.java | 12 ++++++------ .../app/quiz/converter/QuizDtoConverterTest.java | 9 ++++----- .../interview/app/quiz/service/QuizServiceTest.java | 6 +++--- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/mangkyu/employment/interview/app/quiz/converter/QuizDtoConverter.java b/src/main/java/com/mangkyu/employment/interview/app/quiz/converter/QuizDtoConverter.java index eb2092c..d8bd14e 100644 --- a/src/main/java/com/mangkyu/employment/interview/app/quiz/converter/QuizDtoConverter.java +++ b/src/main/java/com/mangkyu/employment/interview/app/quiz/converter/QuizDtoConverter.java @@ -32,17 +32,19 @@ public final class QuizDtoConverter { .resourceId(quiz.getResourceId()) .answerResourceId(getAnswerResourceId(quiz)) .title(quiz.getTitle()) + .category(quiz.getQuizCategory().getTitle()) .quizLevelList(convert(quiz.getQuizLevel())) .createdAt(Timestamp.valueOf(quiz.getCreatedAt()).getTime()) .build(); } + @Deprecated public static GetQuizResponse convert(final Quiz quiz, final EnumMapperValue enumMapperValue) { return GetQuizResponse.builder() .resourceId(quiz.getResourceId()) .answerResourceId(getAnswerResourceId(quiz)) .title(quiz.getTitle()) - .category(enumMapperValue) + .category(quiz.getQuizCategory().getTitle()) .quizLevelList(convert(quiz.getQuizLevel())) .createdAt(Timestamp.valueOf(quiz.getCreatedAt()).getTime()) .build(); diff --git a/src/main/java/com/mangkyu/employment/interview/app/quiz/dto/GetQuizResponse.java b/src/main/java/com/mangkyu/employment/interview/app/quiz/dto/GetQuizResponse.java index 0398c65..56563ec 100644 --- a/src/main/java/com/mangkyu/employment/interview/app/quiz/dto/GetQuizResponse.java +++ b/src/main/java/com/mangkyu/employment/interview/app/quiz/dto/GetQuizResponse.java @@ -19,7 +19,7 @@ public class GetQuizResponse { private final String title; @JsonInclude(JsonInclude.Include.NON_NULL) - private final EnumMapperValue category; + private final String category; private final List quizLevelList; private final long createdAt; diff --git a/src/main/java/com/mangkyu/employment/interview/app/quiz/service/QuizService.java b/src/main/java/com/mangkyu/employment/interview/app/quiz/service/QuizService.java index 0843ad9..67cc846 100644 --- a/src/main/java/com/mangkyu/employment/interview/app/quiz/service/QuizService.java +++ b/src/main/java/com/mangkyu/employment/interview/app/quiz/service/QuizService.java @@ -56,7 +56,7 @@ public class QuizService { final Page quizPage = quizRepository.findByQuizCategoryIsAndIsEnableTrue(getQuizRequest.getCategory(), pageRequest); final List quizResponseList = quizPage.getContent().stream() - .map(v -> QuizDtoConverter.convert(v, enumMapperFactory.getElement(EnumMapperKey.QUIZ_CATEGORY, v.getQuizCategory()))) + .map(QuizDtoConverter::convert) .collect(Collectors.toList()); return GetQuizResponseHolder.builder() @@ -121,7 +121,7 @@ public class QuizService { final Page quizPage = quizRepository.search(condition, pageRequest); final List quizResponseList = quizPage.getContent().stream() - .map(v -> QuizDtoConverter.convert(v, enumMapperFactory.getElement(EnumMapperKey.QUIZ_CATEGORY, v.getQuizCategory()))) + .map(QuizDtoConverter::convert) .collect(Collectors.toList()); return GetQuizResponseHolder.builder() diff --git a/src/test/java/com/mangkyu/employment/interview/app/quiz/controller/QuizControllerTest.java b/src/test/java/com/mangkyu/employment/interview/app/quiz/controller/QuizControllerTest.java index 5deb38a..7f9d0b4 100644 --- a/src/test/java/com/mangkyu/employment/interview/app/quiz/controller/QuizControllerTest.java +++ b/src/test/java/com/mangkyu/employment/interview/app/quiz/controller/QuizControllerTest.java @@ -51,7 +51,7 @@ class QuizControllerTest { final GetQuizResponse quizResponse = GetQuizResponse.builder() .title("quiz") .quizLevelList(Arrays.asList(QuizLevel.JUNIOR.name(), QuizLevel.SENIOR.name())) - .category(enumMapperValue(QuizCategory.JAVA)) + .category(enumMapperValue(QuizCategory.JAVA).getTitle()) .build(); doReturn(quizResponse).when(quizService).getQuiz(resourceId); @@ -67,7 +67,7 @@ class QuizControllerTest { assertThat(getQuizResult.getResourceId()).isEqualTo(quizResponse.getResourceId()); assertThat(getQuizResult.getTitle()).isEqualTo(quizResponse.getTitle()); - assertThat(getQuizResult.getCategory().getCode()).isEqualTo(quizResponse.getCategory().getCode()); + assertThat(getQuizResult.getCategory()).isEqualTo(quizResponse.getCategory()); assertThat(getQuizResult.getCreatedAt()).isEqualTo(quizResponse.getCreatedAt()); } @@ -83,7 +83,7 @@ class QuizControllerTest { final GetQuizResponse quizResponse = GetQuizResponse.builder() .title("quiz") .quizLevelList(Arrays.asList(QuizLevel.JUNIOR.name(), QuizLevel.SENIOR.name())) - .category(enumMapperValue(QuizCategory.JAVA)) + .category(enumMapperValue(QuizCategory.JAVA).getTitle()) .build(); // when @@ -108,7 +108,7 @@ class QuizControllerTest { final GetQuizResponse quizResponse = GetQuizResponse.builder() .title("quiz") .quizLevelList(Arrays.asList(QuizLevel.JUNIOR.name(), QuizLevel.SENIOR.name())) - .category(enumMapperValue(QuizCategory.JAVA)) + .category(enumMapperValue(QuizCategory.JAVA).getTitle()) .build(); final Pageable pageable = PageRequest.of(page, size); @@ -198,7 +198,7 @@ class QuizControllerTest { final GetQuizResponse quizResponse = GetQuizResponse.builder() .title("quiz") .quizLevelList(Arrays.asList(QuizLevel.JUNIOR.name(), QuizLevel.SENIOR.name())) - .category(enumMapperValue(QuizCategory.JAVA)) + .category(enumMapperValue(QuizCategory.JAVA).getTitle()) .build(); // when @@ -222,7 +222,7 @@ class QuizControllerTest { final GetQuizResponse quizResponse = GetQuizResponse.builder() .title("quiz") .quizLevelList(Arrays.asList(QuizLevel.JUNIOR.name(), QuizLevel.SENIOR.name())) - .category(enumMapperValue(QuizCategory.JAVA)) + .category(enumMapperValue(QuizCategory.JAVA).getTitle()) .build(); final Pageable pageable = PageRequest.of(page, size); diff --git a/src/test/java/com/mangkyu/employment/interview/app/quiz/converter/QuizDtoConverterTest.java b/src/test/java/com/mangkyu/employment/interview/app/quiz/converter/QuizDtoConverterTest.java index 66d17b2..c7eb6d9 100644 --- a/src/test/java/com/mangkyu/employment/interview/app/quiz/converter/QuizDtoConverterTest.java +++ b/src/test/java/com/mangkyu/employment/interview/app/quiz/converter/QuizDtoConverterTest.java @@ -8,7 +8,6 @@ import com.mangkyu.employment.interview.app.quiz.entity.Quiz; import com.mangkyu.employment.interview.enums.common.EnumMapperType; import com.mangkyu.employment.interview.enums.common.EnumMapperValue; import com.mangkyu.employment.interview.testutils.EntityCreationUtils; -import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.Test; import java.sql.Timestamp; @@ -66,7 +65,7 @@ class QuizDtoConverterTest { assertThat(result.getTitle()).isEqualTo(quiz.getTitle()); assertThat(result.getQuizLevelList().size()).isEqualTo(quiz.getQuizLevel().size()); assertThat(result.getCreatedAt()).isEqualTo(Timestamp.valueOf(quiz.getCreatedAt()).getTime()); - assertThat(result.getCategory().getCode()).isEqualTo(enumMapperValue(quiz.getQuizCategory()).getCode()); + assertThat(result.getCategory()).isEqualTo(quiz.getQuizCategory().getTitle()); assertThat(result.getAnswerResourceId()).isEqualTo(answer.getResourceId()); } @@ -83,7 +82,7 @@ class QuizDtoConverterTest { assertThat(result.getTitle()).isEqualTo(quiz.getTitle()); assertThat(result.getQuizLevelList().size()).isEqualTo(quiz.getQuizLevel().size()); assertThat(result.getCreatedAt()).isEqualTo(Timestamp.valueOf(quiz.getCreatedAt()).getTime()); - assertThat(result.getCategory().getCode()).isEqualTo(enumMapperValue(quiz.getQuizCategory()).getCode()); + assertThat(result.getCategory()).isEqualTo(quiz.getQuizCategory().getTitle()); assertThat(result.getAnswerResourceId()).isNull(); } @@ -102,7 +101,7 @@ class QuizDtoConverterTest { assertThat(result.getTitle()).isEqualTo(quiz.getTitle()); assertThat(result.getQuizLevelList().size()).isEqualTo(quiz.getQuizLevel().size()); assertThat(result.getCreatedAt()).isEqualTo(Timestamp.valueOf(quiz.getCreatedAt()).getTime()); - assertThat(result.getCategory()).isNull(); + assertThat(result.getCategory()).isEqualTo(quiz.getQuizCategory().getTitle()); assertThat(result.getAnswerResourceId()).isEqualTo(answer.getResourceId()); } @@ -119,7 +118,7 @@ class QuizDtoConverterTest { assertThat(result.getTitle()).isEqualTo(quiz.getTitle()); assertThat(result.getQuizLevelList().size()).isEqualTo(quiz.getQuizLevel().size()); assertThat(result.getCreatedAt()).isEqualTo(Timestamp.valueOf(quiz.getCreatedAt()).getTime()); - assertThat(result.getCategory()).isNull(); + assertThat(result.getCategory()).isEqualTo(quiz.getQuizCategory().getTitle()); assertThat(result.getAnswerResourceId()).isNull(); } diff --git a/src/test/java/com/mangkyu/employment/interview/app/quiz/service/QuizServiceTest.java b/src/test/java/com/mangkyu/employment/interview/app/quiz/service/QuizServiceTest.java index c19d46e..a65bcf8 100644 --- a/src/test/java/com/mangkyu/employment/interview/app/quiz/service/QuizServiceTest.java +++ b/src/test/java/com/mangkyu/employment/interview/app/quiz/service/QuizServiceTest.java @@ -1,7 +1,5 @@ package com.mangkyu.employment.interview.app.quiz.service; -import com.mangkyu.employment.interview.erros.errorcode.CommonErrorCode; -import com.mangkyu.employment.interview.erros.exception.RestApiException; import com.mangkyu.employment.interview.app.quiz.dto.*; import com.mangkyu.employment.interview.app.quiz.entity.Quiz; import com.mangkyu.employment.interview.app.quiz.repository.QuizRepository; @@ -13,6 +11,8 @@ import com.mangkyu.employment.interview.enums.common.EnumMapperValue; import com.mangkyu.employment.interview.enums.factory.EnumMapperFactory; import com.mangkyu.employment.interview.enums.value.QuizCategory; import com.mangkyu.employment.interview.enums.value.QuizLevel; +import com.mangkyu.employment.interview.erros.errorcode.CommonErrorCode; +import com.mangkyu.employment.interview.erros.exception.RestApiException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -139,7 +139,7 @@ class QuizServiceTest { // then assertThat(result.getResourceId()).isEqualTo(quiz.getResourceId()); assertThat(result.getTitle()).isEqualTo(quiz.getTitle()); - assertThat(result.getCategory()).isEqualTo(enumMapperFactory.getElement(EnumMapperKey.QUIZ_CATEGORY, quiz.getQuizCategory())); + assertThat(result.getCategory()).isEqualTo(quiz.getQuizCategory().getTitle()); assertThat(result.getQuizLevelList().size()).isEqualTo(quiz.getQuizLevel().size()); assertThat(result.getCreatedAt()).isEqualTo(Timestamp.valueOf(quiz.getCreatedAt()).getTime()); }