From 9b46d012dc2b398aa64956f44e696537e9c8bc59 Mon Sep 17 00:00:00 2001
From: MangKyu <whalsrb1226@naver.com>
Date: Wed, 5 Jan 2022 17:11:54 +0900
Subject: [PATCH] Bugfix of test and AddUser APIs

---
 .../interview/app/user/dto/AddUserRequest.java         |  3 +++
 .../app/answer/controller/AnswerControllerTest.java    |  6 +++---
 .../interview/app/user/service/UserServiceTest.java    | 10 ++--------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/mangkyu/employment/interview/app/user/dto/AddUserRequest.java b/src/main/java/com/mangkyu/employment/interview/app/user/dto/AddUserRequest.java
index c89f92d..e55c648 100644
--- a/src/main/java/com/mangkyu/employment/interview/app/user/dto/AddUserRequest.java
+++ b/src/main/java/com/mangkyu/employment/interview/app/user/dto/AddUserRequest.java
@@ -14,6 +14,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.Set;
+import java.util.UUID;
 
 import static com.mangkyu.employment.interview.app.quiz.constants.QuizConstants.*;
 
@@ -23,6 +24,8 @@ import static com.mangkyu.employment.interview.app.quiz.constants.QuizConstants.
 @NoArgsConstructor(force = true)
 public class AddUserRequest {
 
+    private final String resourceId = String.valueOf(UUID.randomUUID());
+
     @Email
     @NotBlank
     private final String email;
diff --git a/src/test/java/com/mangkyu/employment/interview/app/answer/controller/AnswerControllerTest.java b/src/test/java/com/mangkyu/employment/interview/app/answer/controller/AnswerControllerTest.java
index b5511c8..d4fc62a 100644
--- a/src/test/java/com/mangkyu/employment/interview/app/answer/controller/AnswerControllerTest.java
+++ b/src/test/java/com/mangkyu/employment/interview/app/answer/controller/AnswerControllerTest.java
@@ -85,7 +85,7 @@ class AnswerControllerTest {
 
         // when
         final ResultActions result = mockMvc.perform(
-                MockMvcRequestBuilders.post(url)
+                MockMvcRequestBuilders.put(url)
                         .content(new Gson().toJson(addAnswerRequest))
                         .contentType(MediaType.APPLICATION_JSON)
         );
@@ -107,13 +107,13 @@ class AnswerControllerTest {
 
         // when
         final ResultActions result = mockMvc.perform(
-                MockMvcRequestBuilders.post(url)
+                MockMvcRequestBuilders.put(url)
                         .content(new Gson().toJson(addAnswerRequest))
                         .contentType(MediaType.APPLICATION_JSON)
         );
 
         // then
-        result.andExpect(status().isCreated());
+        result.andExpect(status().isNoContent());
     }
 
     private static Stream<Arguments> provideParameters() {
diff --git a/src/test/java/com/mangkyu/employment/interview/app/user/service/UserServiceTest.java b/src/test/java/com/mangkyu/employment/interview/app/user/service/UserServiceTest.java
index c1d2084..cafee37 100644
--- a/src/test/java/com/mangkyu/employment/interview/app/user/service/UserServiceTest.java
+++ b/src/test/java/com/mangkyu/employment/interview/app/user/service/UserServiceTest.java
@@ -3,6 +3,7 @@ package com.mangkyu.employment.interview.app.user.service;
 import com.mangkyu.employment.interview.app.user.dto.AddUserRequest;
 import com.mangkyu.employment.interview.app.user.entity.User;
 import com.mangkyu.employment.interview.app.user.repository.UserRepository;
+import com.mangkyu.employment.interview.config.modelmapper.ModelMapperConfig;
 import com.mangkyu.employment.interview.enums.value.QuizDay;
 import com.mangkyu.employment.interview.enums.value.QuizLevel;
 import org.junit.jupiter.api.BeforeEach;
@@ -32,17 +33,10 @@ class UserServiceTest {
     @Mock
     private UserRepository userRepository;
     @Spy
-    private ModelMapper modelMapper;
+    private ModelMapper modelMapper = new ModelMapperConfig().modelMapper();
 
     private final QuizDay quizDay = QuizDay.MONDAY;
 
-    @BeforeEach
-    public void init() {
-        modelMapper.getConfiguration()
-                .setFieldAccessLevel(Configuration.AccessLevel.PRIVATE)
-                .setFieldMatchingEnabled(true);
-    }
-
     @Test
     public void addUserSuccess() {
         // given