DateAudit class added

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Model/User.java

@@ -25,7 +25,7 @@ public class User extends DateAudit{
     private Long id;
 
     @NotBlank
-    private String userName;
+    private String username;
 
     @NotBlank
     @NaturalId
@@ -58,8 +58,8 @@ public class User extends DateAudit{
     }
 
 
-    public User(String userName, String email, String password) {
-        this.userName = userName;
+    public User(String username, String email, String password) {
+        this.username = username;
         this.email = email;
         this.password = password;
     }
@@ -73,11 +73,11 @@ public class User extends DateAudit{
     }
 
     public String getUserName() {
-        return userName;
+        return username;
     }
 
     public void setUserName(String userName) {
-        this.userName = userName;
+        this.username = userName;
     }
 
     public String getEmail() {

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Repository/RoleRepository.java

@@ -0,0 +1,13 @@
+package ZipTeamOrange.Repository;
+
+import ZipTeamOrange.Model.Role;
+import ZipTeamOrange.Model.RoleName;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.Optional;
+
+@Repository
+public interface RoleRepository extends JpaRepository<Role, Long> {
+    Optional<Role> findByName(RoleName roleName);
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Repository/UserRepository.java

@@ -2,8 +2,22 @@ package ZipTeamOrange.Repository;
 
 import ZipTeamOrange.Model.User;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
+import java.util.List;
+import java.util.Optional;
 
-public interface UserRepository extends JpaRepository<User, Long>{
 
-}
+@Repository
+public interface UserRepository extends JpaRepository<User, Long> {
+    Optional<User> findByEmail(String email);
+
+    Optional<User> findByUsernameOrEmail(String username, String email);
+
+    List<User> findByIdIn(List<Long> userIds);
+
+    Optional<User> findByUsername(String username);
+
+    Boolean existsByUsername(String username);
+
+    Boolean existsByEmail(String email);}

ZipTeamOrange-server/src/main/resources/data.sql

@@ -0,0 +1,2 @@
+--insert into roles(name) values ('Role_Admin');
+--insert into roles(name) values ('Role_User');