mindol1004/MangKyu-erros
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into master-web

Browse Source
This commit is contained in:
MangKyu
2022-02-01 05:08:42 +09:00
parent 8defb45e47 e8aa8df6af
commit 48fbe397a7
6 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/mangkyu/employment/interview/app/quiz/converter/QuizDtoConverter.java
View File

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

2
src/main/java/com/mangkyu/employment/interview/app/quiz/dto/GetQuizResponse.java
View File

@@ -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<String> quizLevelList;
private final long createdAt;

4
src/main/java/com/mangkyu/employment/interview/app/quiz/service/QuizService.java
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(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<Quiz> quizPage = quizRepository.search(condition, pageRequest);
final List<GetQuizResponse> 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()

12
src/test/java/com/mangkyu/employment/interview/app/quiz/controller/QuizControllerTest.java
View File

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

9
src/test/java/com/mangkyu/employment/interview/app/quiz/converter/QuizDtoConverterTest.java
View File

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

6
src/test/java/com/mangkyu/employment/interview/app/quiz/service/QuizServiceTest.java
View File

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