Merge branch 'master' into master-web

src/main/java/com/mangkyu/employment/interview/app/answer/dto/AddAnswerRequest.java

@@ -23,6 +23,6 @@ public class AddAnswerRequest {
 
     @NotBlank
     @Size(max = AnswerConstants.MAX_ANSWER_SIZE)
-    private final String desc;
+    private final String description;
 
 }

src/main/java/com/mangkyu/employment/interview/app/answer/dto/GetAnswerResponse.java

@@ -11,7 +11,7 @@ public class GetAnswerResponse {
 
     private final String resourceId;
     private final String quizResourceId;
-    private final String desc;
+    private final String description;
     private final long createdAt;
 
 }

src/main/java/com/mangkyu/employment/interview/app/answer/entity/Answer.java

@@ -26,6 +26,6 @@ public class Answer extends BaseEntity {
 
     @Lob
     @Column(length = AnswerConstants.MAX_ANSWER_SIZE)
-    private String desc;
+    private String description;
 
 }

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

@@ -20,7 +20,7 @@ public final class QuizDtoConverter {
         return GetAnswerResponse.builder()
                 .resourceId(answer.getResourceId())
                 .quizResourceId(answer.getQuiz().getResourceId())
-                .desc(answer.getDesc())
+                .description(answer.getDescription())
                 .createdAt(Timestamp.valueOf(answer.getCreatedAt()).getTime())
                 .build();
     }
@@ -56,7 +56,7 @@ public final class QuizDtoConverter {
         return Answer.builder()
                 .resourceId(addAnswerRequest.getResourceId())
                 .quiz(quiz)
-                .desc(addAnswerRequest.getDesc()).build();
+                .description(addAnswerRequest.getDescription()).build();
     }
 
     private static String getAnswerResourceId(final Quiz quiz) {

src/test/java/com/mangkyu/employment/interview/app/answer/controller/AnswerControllerTest.java

@@ -51,7 +51,7 @@ class AnswerControllerTest {
         final GetAnswerResponse getAnswerResponse = GetAnswerResponse.builder()
                 .resourceId(resourceId)
                 .quizResourceId(UUID.randomUUID().toString())
-                .desc("설명")
+                .description("설명")
                 .createdAt(System.currentTimeMillis())
                 .build();
 
@@ -68,7 +68,7 @@ class AnswerControllerTest {
         final GetAnswerResponse getAnswerResult = new Gson().fromJson(stringResponse, GetAnswerResponse.class);
 
         assertThat(getAnswerResult.getResourceId()).isEqualTo(getAnswerResponse.getResourceId());
-        assertThat(getAnswerResult.getDesc()).isEqualTo(getAnswerResponse.getDesc());
+        assertThat(getAnswerResult.getDescription()).isEqualTo(getAnswerResponse.getDescription());
         assertThat(getAnswerResult.getCreatedAt()).isEqualTo(getAnswerResponse.getCreatedAt());
     }
 
@@ -80,7 +80,7 @@ class AnswerControllerTest {
 
         final AddAnswerRequest addAnswerRequest = AddAnswerRequest.builder()
                 .quizResourceId(quizResourceId)
-                .desc(desc)
+                .description(desc)
                 .build();
 
         // when
@@ -101,7 +101,7 @@ class AnswerControllerTest {
 
         final AddAnswerRequest addAnswerRequest = AddAnswerRequest.builder()
                 .quizResourceId(UUID.randomUUID().toString())
-                .desc("desc")
+                .description("desc")
                 .build();
 
 

src/test/java/com/mangkyu/employment/interview/app/answer/repository/AnswerRepositoryTest.java

@@ -39,7 +39,7 @@ class AnswerRepositoryTest {
         final Answer result = answerRepository.save(answer);
 
         assertThat(result.getResourceId()).isEqualTo(answer.getResourceId());
-        assertThat(result.getDesc()).isEqualTo(answer.getDesc());
+        assertThat(result.getDescription()).isEqualTo(answer.getDescription());
         assertThat(result.getQuiz()).isEqualTo(quiz);
     }
 
@@ -59,7 +59,7 @@ class AnswerRepositoryTest {
         final Optional<Quiz> optionalQuizResult = quizRepository.findById(savedQuiz.getId());
 
         assertThat(result.isPresent()).isTrue();
-        assertThat(result.get().getDesc()).isEqualTo(answer.getDesc());
+        assertThat(result.get().getDescription()).isEqualTo(answer.getDescription());
         assertThat(optionalQuizResult.isPresent()).isTrue();
         assertThat(optionalQuizResult.get().getAnswer()).isNotNull();
         assertThat(optionalQuizResult.get().getAnswer().getResourceId()).isEqualTo(saveAnswer.getResourceId());

src/test/java/com/mangkyu/employment/interview/app/answer/service/AnswerServiceTest.java

@@ -38,7 +38,7 @@ class AnswerServiceTest {
         // given
         final AddAnswerRequest addAnswerRequest = AddAnswerRequest.builder()
                 .quizResourceId(UUID.randomUUID().toString())
-                .desc("desc")
+                .description("desc")
                 .build();
         final Quiz quiz = EntityCreationUtils.quiz();
 
@@ -74,7 +74,7 @@ class AnswerServiceTest {
         final GetAnswerResponse result = answerService.getAnswer(answer.getResourceId());
 
         // then
-        assertThat(result.getDesc()).isEqualTo(answer.getDesc());
+        assertThat(result.getDescription()).isEqualTo(answer.getDescription());
     }
 
 }

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

@@ -22,7 +22,7 @@ class QuizDtoConverterTest {
         // given
         final AddAnswerRequest addAnswerRequest = AddAnswerRequest.builder()
                 .quizResourceId(UUID.randomUUID().toString())
-                .desc("desc")
+                .description("desc")
                 .build();
         final Quiz quiz = EntityCreationUtils.quiz();
 
@@ -31,7 +31,7 @@ class QuizDtoConverterTest {
 
         // then
         assertThat(result.getQuiz()).isEqualTo(quiz);
-        assertThat(result.getDesc()).isEqualTo(addAnswerRequest.getDesc());
+        assertThat(result.getDescription()).isEqualTo(addAnswerRequest.getDescription());
     }
 
     @Test
@@ -47,7 +47,7 @@ class QuizDtoConverterTest {
         assertThat(result.getResourceId()).isEqualTo(answer.getResourceId());
         assertThat(result.getQuizResourceId()).isEqualTo(answer.getQuiz().getResourceId());
         assertThat(result.getCreatedAt()).isEqualTo(Timestamp.valueOf(answer.getCreatedAt()).getTime());
-        assertThat(result.getDesc()).isEqualTo(answer.getDesc());
+        assertThat(result.getDescription()).isEqualTo(answer.getDescription());
     }
 
     @Test

src/test/java/com/mangkyu/employment/interview/testutils/EntityCreationUtils.java

@@ -76,7 +76,7 @@ public final class EntityCreationUtils {
         final Answer answer = Answer.builder()
                 .resourceId(UUID.randomUUID().toString())
                 .quiz(quiz)
-                .desc("desc")
+                .description("desc")
                 .build();
 
         ReflectionTestUtils.setField(answer, "createdAt", LocalDateTime.now());