Add lazy load

Author: Throyer

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

@@ -10,6 +10,7 @@
 import com.github.throyer.common.springboot.api.domain.services.user.dto.CreateUser;
 import com.github.throyer.common.springboot.api.domain.services.user.dto.SearchUser;
 import com.github.throyer.common.springboot.api.domain.services.user.dto.UpdateUser;
+import com.github.throyer.common.springboot.api.domain.services.user.dto.UserDetails;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
@@ -48,25 +49,25 @@ public class UsersController {
 
     @GetMapping
     @PreAuthorize("hasAnyAuthority('ADM')")
-    public ResponseEntity<Page<User>> index(Pagination pagination, Sort sort, SearchUser search) {
+    public ResponseEntity<Page<UserDetails>> index(Pagination pagination, Sort sort, SearchUser search) {
         return findService.find(pagination, sort, search);
     }
 
     @GetMapping("/{id}")
     @PreAuthorize("hasAnyAuthority('ADM', 'USER')")
-    public ResponseEntity<User> show(@PathVariable Long id) {
+    public ResponseEntity<UserDetails> show(@PathVariable Long id) {
         return findService.find(id);
     }
 
     @ResponseStatus(HttpStatus.CREATED)
     @PostMapping
-    public ResponseEntity<User> save(@Validated @RequestBody CreateUser body) {
+    public ResponseEntity<UserDetails> save(@Validated @RequestBody CreateUser body) {
         return createService.create(body);
     }
 
     @PutMapping("/{id}")
     @PreAuthorize("hasAnyAuthority('ADM', 'USER')")
-    public ResponseEntity<User> update(
+    public ResponseEntity<UserDetails> update(
         @PathVariable Long id,
         @RequestBody @Validated UpdateUser body
     ) {

src/main/java/com/github/throyer/common/springboot/api/domain/models/entity/BasicEntity.java

@@ -14,9 +14,10 @@
 import javax.persistence.PreUpdate;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.github.throyer.common.springboot.api.domain.models.shared.Entity;
 
 @MappedSuperclass
-public abstract class BasicEntity {
+public abstract class BasicEntity implements Entity {
 
     public static final String NON_DELETED_CLAUSE = "deleted_at IS NULL";
 
@@ -29,6 +30,7 @@ public abstract class BasicEntity {
 
     public static final String SET_DELETED_SQL = SET_ALL_DELETED_SQL + "WHERE id = ?1";
 
+    @Override
     public abstract Long getId();
 
     @JsonIgnore

src/main/java/com/github/throyer/common/springboot/api/domain/models/entity/Recovery.java

@@ -11,8 +11,10 @@
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
-@Entity(name = "recovery")
+@Entity
+@Table(name = "recovery")
 public class Recovery {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/com/github/throyer/common/springboot/api/domain/models/entity/RefreshToken.java

@@ -10,8 +10,10 @@
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
-@Entity(name = "refresh_token")
+@Entity
+@Table(name = "refresh_token")
 public class RefreshToken {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/com/github/throyer/common/springboot/api/domain/models/entity/Role.java

@@ -7,13 +7,15 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Table;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import org.hibernate.annotations.Where;
 import org.springframework.security.core.GrantedAuthority;
 
-@Entity(name = "role")
+@Entity
+@Table(name = "role")
 @Where(clause = BasicEntity.NON_DELETED_CLAUSE)
 public class Role extends BasicEntity implements GrantedAuthority {
 

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

@@ -8,13 +8,15 @@
 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;
@@ -27,7 +29,8 @@
 import org.hibernate.annotations.Where;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
-@Entity(name = "user")
+@Entity
+@Table(name = "user")
 @Where(clause = BasicEntity.NON_DELETED_CLAUSE)
 public class User extends BasicEntity implements Serializable, HasEmail {
 
@@ -72,7 +75,7 @@ public class User extends BasicEntity implements Serializable, HasEmail {
     private String password;
 
     @SortableProperty(name = "role", column = "roles_name")
-    @ManyToMany(cascade = CascadeType.DETACH)
+    @ManyToMany(cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
     @JoinTable(name = "user_role",
         joinColumns = {
             @JoinColumn(name = "user_id")},

src/main/java/com/github/throyer/common/springboot/api/domain/models/shared/Entity.java

@@ -0,0 +1,5 @@
+package com.github.throyer.common.springboot.api.domain.models.shared;
+
+public interface Entity {
+    Long getId();
+}

src/main/java/com/github/throyer/common/springboot/api/domain/repositories/RefreshTokenRepository.java

@@ -18,7 +18,7 @@ public interface RefreshTokenRepository extends JpaRepository<RefreshToken, Long
     @Modifying
     @Query("""
         UPDATE
-            refresh_token
+            RefreshToken
         SET
             available = 0
         WHERE

src/main/java/com/github/throyer/common/springboot/api/domain/repositories/UserRepository.java

@@ -38,5 +38,12 @@ default void deleteAll(Iterable<? extends User> entities) {
 
     public Optional<User> findOptionalByIdAndDeletedAtIsNull(Long id);
 
+    @Query("""
+        SELECT user FROM User user
+        JOIN FETCH user.roles
+        WHERE user.id = ?1
+    """)
+    public Optional<User> findOptionalByIdAndDeletedAtIsNullFetchRoles(Long id);
+
     public Optional<User> findOptionalByEmail(String email);
 }

src/main/java/com/github/throyer/common/springboot/api/domain/services/security/dto/TokenResponse.java

@@ -1,13 +1,13 @@
 package com.github.throyer.common.springboot.api.domain.services.security.dto;
 
 import java.time.LocalDateTime;
-import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.throyer.common.springboot.api.domain.models.entity.RefreshToken;
 import com.github.throyer.common.springboot.api.domain.models.entity.User;
+import com.github.throyer.common.springboot.api.domain.services.user.dto.UserDetails;
 
 public class TokenResponse {    
     private final UserDetails user;
@@ -52,37 +52,4 @@ public LocalDateTime getExpiresIn() {
     public String getTokenType() {
         return type;
     }
-
-    public class UserDetails {
-        private final Long id;
-        private final String name;
-        private final String email;
-        private final List<String> roles;
-
-        public UserDetails(User user) {
-            this.id = user.getId();
-            this.name = user.getName();
-            this.email = user.getEmail();
-            this.roles = user.getRoles()
-                .stream()
-                    .map(role -> role.getAuthority())
-                        .toList();
-        }
-
-        public Long getId() {
-            return id;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public String getEmail() {
-            return email;
-        }
-
-        public List<String> getRoles() {
-            return roles;
-        }
-    }
 }