Merge branch 'feature/board' of https://github.com/codej99/SpringRestApi into feature/board

Author: codej99

src/main/java/com/rest/api/controller/v1/UserController.java

@@ -51,12 +51,12 @@ public SingleResult<User> findUser() {
     @ApiOperation(value = "회원 수정", notes = "회원정보를 수정한다")
     @PutMapping(value = "/user")
     public SingleResult<User> modify(
-            @ApiParam(value = "회원번호", required = true) @RequestParam long msrl,
             @ApiParam(value = "회원이름", required = true) @RequestParam String name) {
-        User user = User.builder()
-                .msrl(msrl)
-                .name(name)
-                .build();
+
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        String id = authentication.getName();
+        User user = userJpaRepo.findByUid(id).orElseThrow(CUserNotFoundException::new);
+        user.setName(name);
         return responseService.getSingleResult(userJpaRepo.save(user));
     }
 

src/main/java/com/rest/api/entity/User.java

@@ -3,10 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.rest.api.entity.common.CommonDateEntity;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -20,6 +17,7 @@
 @Builder // builder를 사용할수 있게 합니다.
 @Entity // jpa entity임을 알립니다.
 @Getter // user 필드값의 getter를 자동으로 생성합니다.
+@Setter
 @NoArgsConstructor // 인자없는 생성자를 자동으로 생성합니다.
 @AllArgsConstructor // 인자를 모두 갖춘 생성자를 자동으로 생성합니다.
 @Table(name = "user") // 'user' 테이블과 매핑됨을 명시

src/test/java/com/rest/api/controller/v1/UserControllerTest.java

@@ -47,7 +47,7 @@ public class UserControllerTest {
 
     @Before
     public void setUp() throws Exception {
-        userJpaRepo.save(User.builder().uid("happydaddy@naver.com").name("happydaddy").password(passwordEncoder.encode("1234")).roles(Collections.singletonList("ROLE_USER")).build());
+        //userJpaRepo.save(User.builder().uid("happydaddy@naver.com").name("happydaddy").password(passwordEncoder.encode("1234")).roles(Collections.singletonList("ROLE_USER")).build());
         MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
         params.add("id", "happydaddy@naver.com");
         params.add("password", "1234");
@@ -75,8 +75,8 @@ public void invalidToken() throws Exception {
                 .get("/v1/users")
                 .header("X-AUTH-TOKEN", "XXXXXXXXXX"))
                 .andDo(print())
-                .andExpect(status().isOk())
-                .andExpect(forwardedUrl("/exception/entrypoint"));
+                .andExpect(status().is3xxRedirection())
+                .andExpect(redirectedUrl("/exception/entrypoint"));
     }
 
     @Test
@@ -86,8 +86,8 @@ public void accessdenied() throws Exception {
                 .get("/v1/users"))
                 //.header("X-AUTH-TOKEN", token))
                 .andDo(print())
-                .andExpect(status().isOk())
-                .andExpect(forwardedUrl("/exception/accessdenied"));
+                .andExpect(status().is3xxRedirection())
+                .andExpect(redirectedUrl("/exception/accessdenied"));
     }
 
     @Test
@@ -115,15 +115,16 @@ public void findUser() throws Exception {
     @Test
     public void modify() throws Exception {
         MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
-        params.add("msrl", "1");
+        params.add("uid", "happydaddy@naver.com");
         params.add("name", "행복전도사");
         mockMvc.perform(MockMvcRequestBuilders
                 .put("/v1/user")
                 .header("X-AUTH-TOKEN", token)
                 .params(params))
                 .andDo(print())
                 .andExpect(status().isOk())
-                .andExpect(jsonPath("$.success").value(true));
+                .andExpect(jsonPath("$.success").value(true))
+                .andExpect(jsonPath("$.data.name").value("행복전도사"));
     }
 
     @Test