Refactor user controller tests

Author: VictorGotsenko

src/main/java/hexlet/code/config/SecurityConfig.java

@@ -22,6 +22,7 @@
 
 
 @Configuration
+//@EnableMethodSecurity(prePostEnabled = true)
 @EnableMethodSecurity
 @EnableWebSecurity
 public class SecurityConfig {

src/main/java/hexlet/code/controller/UserController.java

@@ -28,9 +28,9 @@
 @RequestMapping("/api/users")
 @AllArgsConstructor
 public class UserController {
-    private static final String ONLY_OWNER_BY_ID = """
-                @userRepository.findById(#id).get().getEmail() == authentication.getName()
-            """;
+//    private static final String ONLY_OWNER_BY_ID = """
+//                @userRepository.findById(#id).get().getEmail() == authentication.getName()
+//            """;
 
 
     private final UserRepository userRepository;
@@ -72,7 +72,7 @@ public UserDTO create(@Valid @RequestBody UserCreateDTO dto) {
      * @param dto
      * @return UserDTO
      */
-    @PreAuthorize(ONLY_OWNER_BY_ID)
+    @PreAuthorize("@userRepository.findById(#id).get().getEmail() == authentication.getName()")
     @PutMapping(path = "/{id}")
     @ResponseStatus(HttpStatus.OK)
     public UserDTO update(@PathVariable("id") Long id, @Valid @RequestBody UserUpdateDTO dto) {
@@ -82,7 +82,8 @@ public UserDTO update(@PathVariable("id") Long id, @Valid @RequestBody UserUpdat
     /**
      * @param id
      */
-    @PreAuthorize(ONLY_OWNER_BY_ID)
+   // @PreAuthorize(ONLY_OWNER_BY_ID)
+    @PreAuthorize("@userRepository.findById(#id).get().getEmail() == authentication.getName()")
     @DeleteMapping(path = "/{id}")
     @ResponseStatus(HttpStatus.NO_CONTENT)
     public void delete(@PathVariable long id) {

src/main/java/hexlet/code/dto/user/UserDTO.java

@@ -12,85 +12,85 @@ public class UserDTO {
     private String lastName;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
+//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
     private LocalDateTime createdAt;
 
     /**
-     *
      * @return id
      */
     public Long getId() {
         return id;
     }
 
     /**
-     *
      * @param id
      */
     public void setId(Long id) {
         this.id = id;
     }
 
     /**
-     *
      * @return email
      */
     public String getEmail() {
         return email;
     }
 
     /**
-     *
      * @param email
      */
     public void setEmail(String email) {
         this.email = email;
     }
 
     /**
-     *
      * @return firstName
      */
     public String getFirstName() {
         return firstName;
     }
 
     /**
-     *
      * @param firstName
      */
     public void setFirstName(String firstName) {
         this.firstName = firstName;
     }
 
     /**
-     *
      * @return String
      */
     public String getLastName() {
         return lastName;
     }
 
     /**
-     *
      * @param lastName
      */
     public void setLastName(String lastName) {
         this.lastName = lastName;
     }
 
     /**
-     *
      * @return createdAt
      */
     public LocalDateTime getCreatedAt() {
         return createdAt;
     }
 
     /**
-     *
      * @param createdAt
      */
     public void setCreatedAt(LocalDateTime createdAt) {
         this.createdAt = createdAt;
     }
+
+    /**
+     * For test, then createdAt is String Shape pattern = "yyyy-MM-dd".
+     *
+     * @param createdAt
+     */
+    public void setCreatedAt(String createdAt) {
+        this.createdAt = LocalDateTime.parse(createdAt + "T00:00");
+    }
 }

src/main/java/hexlet/code/mapper/UserMapper.java

@@ -35,7 +35,7 @@ public abstract class UserMapper {
     @Mapping(target = "passwordDigest", source = "password")
     public abstract User map(UserCreateDTO dto);
 
-    public abstract UserDTO map(User user);
+    public abstract UserDTO map(User model);
 
     @Mapping(target = "passwordDigest", source = "password")
     public abstract void update(UserUpdateDTO dto, @MappingTarget User user);