UserServiceImp postOneUser

Author: zcomert

day-14/api/src/main/java/com/bookstore/api/entities/Role.java

@@ -2,29 +2,25 @@
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.GeneratedValue;
 
-@Data
 @Entity
-@Table(name="roles")
-@NoArgsConstructor
-@AllArgsConstructor
+@Data
+@Table(name = "roles")
 public class Role {
     @Id
-    @GeneratedValue
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "role_id")
     private int id;
-    
+
     @Column(name = "name")
     private String name;
-    
+
     @Column(name = "description")
     private String description;
 }

day-14/api/src/main/java/com/bookstore/api/entities/User.java

@@ -1,5 +1,6 @@
 package com.bookstore.api.entities;
 
+import java.util.HashSet;
 import java.util.Set;
 
 import javax.persistence.CascadeType;
@@ -14,35 +15,31 @@
 import javax.persistence.ManyToMany;
 import javax.persistence.Table;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
-@Data
 @Entity
+@Data
 @Table(name = "users")
-@NoArgsConstructor
-@AllArgsConstructor
 public class User {
+
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "user_id")
-    private int id;
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    int id;
 
     @Column(name = "user_name")
-    private String userName;
+    String userName;
 
     @Column(name = "password")
-    private String password;
+    String password;
 
     @Column(name = "first_name")
-    private String firstName;
+    String firstName;
 
     @Column(name = "last_name")
-    private String lastName;
+    String lastName;
 
     @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-    @JoinTable(name = "user_roles", joinColumns = @JoinColumn(name = "user_id"), inverseJoinColumns = @JoinColumn(name = "role_id"))
-    private Set<Role> roles;
-
+    @JoinTable(name = "users_roles", joinColumns = @JoinColumn(name = "user_id"), inverseJoinColumns = @JoinColumn(name = "role_id"))
+    private Set<Role> roles = new HashSet<>();
 }

day-14/api/src/main/java/com/bookstore/api/entities/UserRole.java

@@ -88,14 +88,14 @@ public ApiResponse<User> getOneUser(int id) {
 
     @Override
     public ApiResponse<User> postOneUser(User user) {
-        // passwordEncode
-        user.setPassword(passwordEncoder.encode(user.getPassword()));
-
-        // Role: varsayılan olarak USER role atayalım.
         Set<Role> roles = new HashSet<>();
         Role role = roleRepository.findByName("USER");
+        if (role == null) {
+            throw new RuntimeException("USER role is not defined.");
+        }
         roles.add(role);
         user.setRoles(roles);
+        user.setPassword(passwordEncoder.encode(user.getPassword()));
         userRepository.save(user);
         return ApiResponse.default_CREATED(user);
     }