Merge branch 'development'

Author: Throyer

docker-compose.yml

@@ -7,7 +7,7 @@ services:
     container_name: postgres-container
     command: ["postgres", "-c", "log_statement=all", "-c", "log_destination=stderr"]
     ports:
-      - 5432:5432
+      - "5432:5432"
     environment:
       - POSTGRES_USER=root
       - POSTGRES_PASSWORD=root
@@ -26,8 +26,8 @@ services:
     depends_on:
       - postgresql
     ports:
-      - 8080:8080
-      - 8000:8000
+      - "8080:8080"
+      - "8000:8000"
     environment:
       DB_URL: "postgresql:5432/common_app"
       DB_USERNAME: "root"

src/main/java/com/github/throyer/common/springboot/controllers/api/UsersController.java

@@ -81,9 +81,10 @@ public ResponseEntity<UserDetails> show(@PathVariable Long id) {
     @PostMapping
     @ResponseStatus(CREATED)
     public ResponseEntity<UserDetails> save(
-        @Validated @RequestBody CreateUserProps body
+        @Validated @RequestBody CreateUserProps props
     ) {
-        var user = createService.create(body);
+        props.validate();
+        var user = createService.create(props);
         return created(user, "api/users");
     }
 

src/main/java/com/github/throyer/common/springboot/controllers/app/RecoveryController.java

@@ -1,6 +1,6 @@
 package com.github.throyer.common.springboot.controllers.app;
 
-import static com.github.throyer.common.springboot.utils.Responses.validate;
+import static com.github.throyer.common.springboot.utils.Responses.validateAndUpdateModel;
 
 import com.github.throyer.common.springboot.domain.recovery.service.RecoveryConfirmService;
 import com.github.throyer.common.springboot.domain.recovery.service.RecoveryService;
@@ -49,7 +49,7 @@ public String index(
         Model model
     ) {
 
-        if (validate(model, recovery, "recovery", result)) {
+        if (validateAndUpdateModel(model, recovery, "recovery", result)) {
             return "app/recovery/index";
         }
 
@@ -70,7 +70,7 @@ public String confirm(
         Model model
     ) {
 
-        if (validate(model, codes, "recovery", result)) {
+        if (validateAndUpdateModel(model, codes, "recovery", result)) {
             return "app/recovery/confirm";
         }
 
@@ -97,7 +97,7 @@ public String update(
     ) {
         update.validate(result);
 
-        if (validate(model, update, "update", result)) {
+        if (validateAndUpdateModel(model, update, "update", result)) {
             return "app/recovery/update";
         }
 

src/main/java/com/github/throyer/common/springboot/controllers/app/RegisterController.java

@@ -1,7 +1,7 @@
 package com.github.throyer.common.springboot.controllers.app;
 
 import static com.github.throyer.common.springboot.domain.shared.Type.SUCCESS;
-import static com.github.throyer.common.springboot.utils.Responses.validate;
+import static com.github.throyer.common.springboot.utils.Responses.validateAndUpdateModel;
 
 import com.github.throyer.common.springboot.domain.user.model.CreateUserProps;
 import com.github.throyer.common.springboot.domain.user.service.CreateUserService;
@@ -38,8 +38,10 @@ public String create(
         RedirectAttributes redirect,
         Model model
     ) {
-        
-        if (validate(model, props, "user", result)) {
+
+        props.validate(result);
+
+        if (validateAndUpdateModel(model, props, "user", result)) {
             return "app/register/index";
         }
 

src/main/java/com/github/throyer/common/springboot/domain/user/entity/User.java

@@ -1,53 +1,46 @@
 package com.github.throyer.common.springboot.domain.user.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.throyer.common.springboot.domain.management.entity.Auditable;
+import com.github.throyer.common.springboot.domain.management.model.Addressable;
+import com.github.throyer.common.springboot.domain.role.entity.Role;
+import com.github.throyer.common.springboot.domain.session.model.Authorized;
+import com.github.throyer.common.springboot.domain.user.model.CreateUserProps;
+import com.github.throyer.common.springboot.domain.user.model.UpdateUserProps;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.Hibernate;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.*;
+import java.io.Serial;
 import java.io.Serializable;
 import java.security.Principal;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.PrePersist;
-import javax.persistence.Table;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonProperty.Access;
-import com.github.throyer.common.springboot.domain.user.model.CreateUserProps;
-
-import com.github.throyer.common.springboot.domain.session.model.Authorized;
-import com.github.throyer.common.springboot.domain.user.model.UpdateUserProps;
-import com.github.throyer.common.springboot.domain.management.entity.Auditable;
-import com.github.throyer.common.springboot.domain.role.entity.Role;
-import com.github.throyer.common.springboot.domain.management.model.Addressable;
+import static com.fasterxml.jackson.annotation.JsonProperty.Access.WRITE_ONLY;
 import static com.github.throyer.common.springboot.domain.management.repository.Queries.NON_DELETED_CLAUSE;
 import static com.github.throyer.common.springboot.utils.Constants.SECURITY.PASSWORD_ENCODER;
+import static com.github.throyer.common.springboot.utils.JsonUtils.toJson;
+import static java.util.Optional.ofNullable;
+import static javax.persistence.CascadeType.DETACH;
+import static javax.persistence.FetchType.LAZY;
+import static javax.persistence.GenerationType.IDENTITY;
 
-import lombok.Data;
-
-import org.hibernate.annotations.Where;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-
-@Data
 @Entity
+@Getter
+@Setter
 @Table(name = "user")
 @Where(clause = NON_DELETED_CLAUSE)
 public class User extends Auditable implements Serializable, Addressable {
-
-    public static final Integer PASSWORD_STRENGTH = 10;
-
+    @Serial
     private static final long serialVersionUID = -8080540494839892473L;
 
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = IDENTITY)
     private Long id;
 
     @Column(name = "name", nullable = false)
@@ -60,11 +53,11 @@ public class User extends Auditable implements Serializable, Addressable {
     @Column(name = "deleted_email")
     private String deletedEmail;
 
-    @JsonProperty(access = Access.WRITE_ONLY)
+    @JsonProperty(access = WRITE_ONLY)
     @Column(name = "password", nullable = false)
     private String password;
 
-    @ManyToMany(cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
+    @ManyToMany(cascade = DETACH, fetch = LAZY)
     @JoinTable(name = "user_role",
         joinColumns = {
             @JoinColumn(name = "user_id")},
@@ -110,38 +103,16 @@ public String getEmail() {
         return email;
     }
 
-    public void merge(UpdateUserProps dto) {
-        setName(dto.getName());
-        setEmail(dto.getEmail());
+    public void merge(UpdateUserProps props) {
+        this.name = props.getName();
+        this.email = props.getEmail();
     }
 
     public void updatePassword(String newPassword) {
-        this.password = new BCryptPasswordEncoder(PASSWORD_STRENGTH)
+        this.password = PASSWORD_ENCODER
             .encode(newPassword);
     }
 
-    @Override
-    public int hashCode() {
-        int hash = 7;
-        hash = 97 * hash + Objects.hashCode(this.id);
-        return hash;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final User other = (User) obj;
-        return Objects.equals(this.id, other.id);
-    }
-
     public boolean isPrincipal(Principal principal) {
         if (Objects.nonNull(principal) && principal instanceof Authorized authorized) {
             return getId().equals(authorized.getId());
@@ -167,6 +138,22 @@ private void created() {
 
     @Override
     public String toString() {
-        return Objects.nonNull(getName()) ? name : "null";
+        return toJson(Map.of(
+            "name", ofNullable(this.name).orElse(""),
+            "email", ofNullable(this.email).orElse("")
+        ));
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
+        User user = (User) o;
+        return id != null && Objects.equals(id, user.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return getClass().hashCode();
     }
 }

src/main/java/com/github/throyer/common/springboot/domain/user/model/CreateUserProps.java

@@ -12,6 +12,7 @@
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.validation.BindingResult;
 
 @Data
 @NoArgsConstructor
@@ -34,6 +35,10 @@ public CreateUserProps(String name, String email, String password) {
         setPassword(password);
     }
 
+    public void validate(BindingResult result) {
+        validateEmailUniqueness(this, result);
+    }
+
     public void validate() {
         validateEmailUniqueness(this);
     }

src/main/java/com/github/throyer/common/springboot/domain/user/model/UserDetails.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import java.util.List;
 
+import com.github.throyer.common.springboot.domain.role.entity.Role;
 import com.github.throyer.common.springboot.domain.user.entity.User;
 import com.github.throyer.common.springboot.domain.management.model.Entity;
 import static java.util.Optional.ofNullable;
@@ -22,7 +23,7 @@ public UserDetails(User user) {
 
         this.roles = user.getRoles()
             .stream()
-                .map(role -> role.getAuthority())
+                .map(Role::getAuthority)
                     .toList();
     }
 

src/main/java/com/github/throyer/common/springboot/domain/user/service/CreateUserService.java

@@ -20,15 +20,13 @@ public class CreateUserService {
     @Autowired
     RoleRepository roleRepository;
 
-    public UserDetails create(CreateUserProps data) {
-
-        data.validate();
+    public UserDetails create(CreateUserProps props) {
 
         var roles = roleRepository.findOptionalByInitials("USER")
-                .map(role -> List.of(role))
+                .map(List::of)
                     .orElseGet(() -> List.of());
 
-        var user = userRepository.save(new User(data, roles));
+        var user = userRepository.save(new User(props, roles));
 
         return new UserDetails(user);
     }

src/main/java/com/github/throyer/common/springboot/utils/Responses.java

@@ -104,7 +104,7 @@ public static final ResponseStatusException InternalServerError(String reason) {
         return new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, reason);
     }
 
-    public static final <P> Boolean validate(Model model, P props, String propertyName, BindingResult result) {
+    public static final <P> Boolean validateAndUpdateModel(Model model, P props, String propertyName, BindingResult result) {
         if (result.hasErrors()) {
             model.addAttribute(propertyName, props);
             Toasts.add(model, result);            

src/test/java/com/github/throyer/common/springboot/controllers/SessionsTests.java

@@ -49,8 +49,8 @@ public void should_sigh_in_with_correct_password() throws Exception {
 
         var body = """
             {
-                \"email\": \"%s\",
-                \"password\": \"%s\"
+                "email": "%s",
+                "password": "%s"
             }
         """;