username => email

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

Author: mokevnin

src/main/java/io/hexlet/blog/component/DataInitializer.java

@@ -32,11 +32,11 @@ public class DataInitializer implements ApplicationRunner {
     public void run(ApplicationArguments args) throws Exception {
         var email = "[email protected]";
         var userData = new User();
-        userData.setUsername(email);
+        userData.setEmail(email);
         userData.setPassword("qwerty");
         userService.createUser(userData);
 
-        var user = userRepository.findByUsername(email).get();
+        var user = userRepository.findByEmail(email).get();
 
         var faker = new Faker();
         IntStream.range(1, 10).forEach(i -> {

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

@@ -7,29 +7,21 @@
 import org.mapstruct.MappingConstants;
 import org.mapstruct.MappingTarget;
 import org.mapstruct.NullValuePropertyMappingStrategy;
+import org.mapstruct.ReportingPolicy;
 
 import io.hexlet.blog.dto.UserDTO;
 import io.hexlet.blog.model.User;
 
 @Mapper(
     uses = { JsonNullableMapper.class, ReferenceMapper.class },
     nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
-    componentModel = MappingConstants.ComponentModel.SPRING
+    componentModel = MappingConstants.ComponentModel.SPRING,
+    unmappedTargetPolicy = ReportingPolicy.IGNORE
 )
 public abstract class UserMapper {
-    @Mapping(target = "id", ignore = true)
-    @Mapping(target = "createdAt", ignore = true)
-    @Mapping(target = "updatedAt", ignore = true)
-    @Mapping(target = "password", ignore = true)
-    @Mapping(target = "authorities", ignore = true)
-    @Mapping(target = "posts", ignore = true)
     public abstract User map(UserDTO model);
 
-    @InheritInverseConfiguration(name = "map")
-    
     public abstract UserDTO map(User model);
 
-    @InheritConfiguration
     public abstract void update(UserDTO update, @MappingTarget User destination);
 }
-

src/main/java/io/hexlet/blog/model/User.java

@@ -19,6 +19,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
+import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -43,8 +44,9 @@ public class User implements UserDetails, BaseEntity {
 
     // EMAIL
     @Column(unique = true)
+    @Email
     @ToString.Include
-    private String username;
+    private String email;
 
     // @NotBlank
     @ToString.Include
@@ -70,7 +72,7 @@ public String getPassword() {
 
     @Override
     public String getUsername() {
-        return username;
+        return email;
     }
 
     @Override

src/main/java/io/hexlet/blog/repository/UserRepository.java

@@ -9,5 +9,5 @@
 
 @Repository
 public interface UserRepository extends JpaRepository<User, Long> {
-    Optional<User> findByUsername(String email);
+    Optional<User> findByEmail(String email);
 }

src/main/java/io/hexlet/blog/service/CustomUserDetailsService.java

@@ -21,15 +21,15 @@ public class CustomUserDetailsService implements UserDetailsManager {
 
     @Override
     public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
-        var user = userRepository.findByUsername(email)
+        var user = userRepository.findByEmail(email)
                 .orElseThrow(() -> new UsernameNotFoundException("User not found"));
         return user;
     }
 
     @Override
     public void createUser(UserDetails userData) {
         var user = new User();
-        user.setUsername(userData.getUsername());
+        user.setEmail(userData.getUsername());
         String hashedPassword = passwordEncoder.encode(userData.getPassword());
         user.setPassword(hashedPassword);
         userRepository.save(user);

src/main/java/io/hexlet/blog/util/UserUtils.java

@@ -20,10 +20,10 @@ public User getCurrentUser() {
             return null;
         }
         var email = authentication.getName();
-        return userRepository.findByUsername(email).get();
+        return userRepository.findByEmail(email).get();
     }
 
     public User getTestUser() {
-        return userRepository.findByUsername("[email protected]").get();
+        return userRepository.findByEmail("[email protected]").get();
     }
 }

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

@@ -7,6 +7,7 @@
 import org.springframework.stereotype.Component;
 
 import io.hexlet.blog.model.Post;
+import io.hexlet.blog.model.User;
 import jakarta.annotation.PostConstruct;
 import lombok.Getter;
 import net.datafaker.Faker;
@@ -15,6 +16,7 @@
 @Component
 public class ModelGenerator {
     private Model<Post> postModel;
+    private Model<User> userModel;
 
     @Autowired
     private Faker faker;
@@ -26,6 +28,12 @@ private void init() {
                 .supply(Select.field(Post::getName), () -> faker.gameOfThrones().house())
                 .supply(Select.field(Post::getBody), () -> faker.gameOfThrones().quote())
                 .toModel();
+
+        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())
+                .toModel();
     }
 }