add /api/users/{id}

Signed-off-by: Kirill Mokevnin <[email protected]>

Author: mokevnin

src/main/java/io/hexlet/blog/controller/api/UsersController.java

@@ -3,13 +3,20 @@
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
 import io.hexlet.blog.dto.UserDTO;
-import io.hexlet.blog.mapper.UserMapperImpl;
+import io.hexlet.blog.dto.UserUpdateDTO;
+import io.hexlet.blog.exception.ResourceNotFoundException;
+import io.hexlet.blog.mapper.UserMapper;
 import io.hexlet.blog.repository.UserRepository;
 import lombok.AllArgsConstructor;
 
@@ -21,7 +28,7 @@ public class UsersController {
     private final UserRepository repository;
 
     @Autowired
-    private UserMapperImpl userMapper;
+    private UserMapper userMapper;
 
     @GetMapping("/users")
     ResponseEntity<List<UserDTO>> index() {
@@ -33,4 +40,15 @@ ResponseEntity<List<UserDTO>> index() {
                 .header("X-Total-Count", String.valueOf(users.size()))
                 .body(result);
     }
+
+    @PutMapping("/users/{id}")
+    @ResponseStatus(HttpStatus.OK)
+    UserDTO update(@RequestBody UserUpdateDTO userData, @PathVariable Long id) {
+        var user = repository.findById(id)
+                .orElseThrow(() -> new ResourceNotFoundException("Not Found"));
+        userMapper.update(userData, user);
+        repository.save(user);
+        var userDTO = userMapper.map(user);
+        return userDTO;
+    }
 }

src/main/java/io/hexlet/blog/dto/UserUpdateDTO.java

@@ -0,0 +1,14 @@
+package io.hexlet.blog.dto;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class UserUpdateDTO {
+    @NotNull
+    private String firstName;
+    // private String lastName;
+}
+

src/main/java/io/hexlet/blog/mapper/UserMapper.java

@@ -10,6 +10,7 @@
 import org.mapstruct.ReportingPolicy;
 
 import io.hexlet.blog.dto.UserDTO;
+import io.hexlet.blog.dto.UserUpdateDTO;
 import io.hexlet.blog.model.User;
 
 @Mapper(
@@ -20,8 +21,9 @@
 )
 public abstract class UserMapper {
     public abstract User map(UserDTO model);
+    public abstract User map(UserUpdateDTO model);
 
     public abstract UserDTO map(User model);
 
-    public abstract void update(UserDTO update, @MappingTarget User destination);
+    public abstract void update(UserUpdateDTO update, @MappingTarget User destination);
 }

src/test/java/io/hexlet/blog/controller/api/UsersControllerTest.java

@@ -1,25 +1,86 @@
 package io.hexlet.blog.controller.api;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.jwt;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+import java.util.HashMap;
+
+import org.instancio.Instancio;
+import org.instancio.Select;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
+import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.JwtRequestPostProcessor;
 import org.springframework.test.web.servlet.MockMvc;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.hexlet.blog.model.User;
+import io.hexlet.blog.repository.UserRepository;
+import io.hexlet.blog.util.ModelGenerator;
+import net.datafaker.Faker;
+
 @SpringBootTest
 @AutoConfigureMockMvc
 public class UsersControllerTest {
 
     @Autowired
     private MockMvc mockMvc;
 
+    @Autowired
+    private Faker faker;
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Autowired
+    private ModelGenerator modelGenerator;
+
+    @Autowired
+    private ObjectMapper om;
+
+    private JwtRequestPostProcessor token;
+
+    @BeforeEach
+    public void setUp() {
+        token = jwt().jwt(builder -> builder.subject("[email protected]"));
+        var testUser = Instancio.of(modelGenerator.getUserModel())
+                .create();
+        userRepository.save(testUser);
+    }
+
     @Test
     public void testIndex() throws Exception {
         mockMvc.perform(get("/api/users").with(jwt()))
                 .andExpect(status().isOk());
     }
+
+    @Test
+    public void testUpdate() throws Exception {
+        var user = Instancio.of(User.class)
+                .ignore(Select.field(User::getId))
+                .supply(Select.field(User::getEmail), () -> faker.internet().emailAddress())
+                .create();
+        userRepository.save(user);
+
+        var data = new HashMap<>();
+        data.put("firstName", "Mike");
+
+        var request = put("/api/users/" + user.getId())
+                .with(token)
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(om.writeValueAsString(data));
+
+        mockMvc.perform(request)
+                 .andExpect(status().isOk());
+
+        user = userRepository.findById(user.getId()).get();
+        assertThat(user.getFirstName()).isEqualTo(("Mike"));
+    }
 }

src/test/java/io/hexlet/blog/util/ModelGenerator.java

@@ -31,8 +31,7 @@ private void init() {
 
         userModel = Instancio.of(User.class)
                 .ignore(Select.field(Post::getId))
-                .supply(Select.field(Post::getName), () -> faker.gameOfThrones().house())
-                .supply(Select.field(Post::getBody), () -> faker.gameOfThrones().quote())
+                .supply(Select.field(User::getEmail), () -> faker.internet().emailAddress())
                 .toModel();
     }
 }