Set User roles to eager

backend/docker-compose.yml

@@ -3,7 +3,7 @@ version: '3'
 services:
   mysql:
     image: mysql:latest
-    platform: linux/amd64
+#    platform: linux/amd64 # uncomment this if using Apple silicon
     hostname: mysql
     restart: always
     environment:

backend/src/main/java/com/karankumar/bookproject/backend/controller/UserController.java

@@ -89,13 +89,13 @@ public void deleteCurrentUser(@RequestBody UserToDeleteDto user) {
 
     @PostMapping("/update-password")
     @ResponseStatus(HttpStatus.OK)
-    public User updatePassword(@RequestParam("currentPassword") String currentPassword,
+    public boolean updatePassword(@RequestParam("currentPassword") String currentPassword,
                                @RequestParam("newPassword") String newPassword) {
         User user = userService.getCurrentUser();
 
         if (passwordEncoder.matches(currentPassword, user.getPassword())) {
             userService.changeUserPassword(user, newPassword);
-            return user;
+            return true;
         } else {
             throw new ResponseStatusException(
                     HttpStatus.UNAUTHORIZED,

backend/src/main/java/com/karankumar/bookproject/backend/model/account/Role.java

@@ -18,7 +18,6 @@ License, or (at your option) any later version.
 package com.karankumar.bookproject.backend.model.account;
 
 import lombok.AccessLevel;
-import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

backend/src/main/java/com/karankumar/bookproject/backend/model/account/User.java

@@ -17,6 +17,7 @@ License, or (at your option) any later version.
 
 package com.karankumar.bookproject.backend.model.account;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -33,6 +34,7 @@ License, or (at your option) any later version.
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
+import javax.persistence.ForeignKey;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -51,6 +53,7 @@ License, or (at your option) any later version.
 @Entity
 @Builder
 @Data
+@JsonIgnoreProperties(value = {"id"})
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor
 @EqualsAndHashCode
@@ -79,11 +82,18 @@ public class User {
     @NotNull
     private boolean active;
 
-    @ManyToMany(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
+    // Fetch type can be eager as there are not many roles
+    @ManyToMany(fetch = FetchType.EAGER, cascade = CascadeType.MERGE)
     @JoinTable(
             name = "user_role",
-            joinColumns = @JoinColumn(name = "user_id"),
-            inverseJoinColumns = @JoinColumn(name = "role_id")
+            joinColumns = @JoinColumn(
+                    name = "user_id", referencedColumnName = "id",
+                    foreignKey = @ForeignKey(name = "user_role_user_id_fk")
+            ),
+            inverseJoinColumns = @JoinColumn(
+                    name = "role_id", referencedColumnName = "id",
+                    foreignKey = @ForeignKey(name = "user_role_role_id_fk")
+            )
     )
     private Set<Role> roles;
 }

backend/src/main/java/com/karankumar/bookproject/backend/service/UserService.java

@@ -47,7 +47,6 @@ License, or (at your option) any later version.
 import java.util.Optional;
 import java.util.Set;
 
-
 @Service
 public class UserService {
     private final UserRepository userRepository;