Changeset 7edede9

Timestamp:

01/06/21 18:18:24 (3 years ago)

Author:

i-ina <76742075+i-ina@…>

Branches:

master

Children:

504c3ef

Parents:

a222a43

Message:

added user register

Files:

• client_app/src/repository/register_repo.js (modified) (3 diffs)
• src/main/java/it/finki/tinki/controller/LoginController.java (moved) (moved from src/main/java/it/finki/tinki/controller/TestController.java ) (1 diff)
• src/main/java/it/finki/tinki/controller/RegisterController.java (added)
• src/main/java/it/finki/tinki/model/exception/InvalidArgumentsException.java (added)
• src/main/java/it/finki/tinki/model/exception/UserExistsException.java (added)
• src/main/java/it/finki/tinki/repository/UserRepository.java (modified) (1 diff)
• src/main/java/it/finki/tinki/service/impl/AccountServiceImpl.java (modified) (5 diffs)

client_app/src/repository/register_repo.js

@@ -3 +3 @@
 const UserRegister = {
     userRegister: (email ,password ,name , surname, skillsRetained, skillsToLearn) => {
-        return axios.post("/user/register", {
+        return axios.post("/register/user", {
             "email": email,
             "password": password,
@@ -14 +14 @@
     },
     teamRegister:(email ,password,name) => {
-        return axios.post("/team/register",{
+        return axios.post("/register/team",{
             "email": email,
             "password": password,
@@ -21 +21 @@
     },
     companyRegister:(email ,password,name, country ,city, street) => {
-        return axios.post("/company/register",{
+        return axios.post("/register/company",{
             "email": email,
             "password": password,

src/main/java/it/finki/tinki/controller/LoginController.java

@@ -11 +11 @@
 @CrossOrigin(origins = "http://localhost:3000")
 @RequestMapping("/api")
-public class TestController {
+public class LoginController {
 
     AccountService accountService;
 
-    public TestController(AccountService accountService) {
+    public LoginController(AccountService accountService) {
         this.accountService = accountService;
     }

src/main/java/it/finki/tinki/repository/UserRepository.java

@@ -5 +5 @@
 import org.springframework.stereotype.Repository;
 
+import java.util.Optional;
+
 @Repository
 public interface UserRepository extends JpaRepository<User, Long> {
     User findByEmailAndPassword(String email, String password);
+    Optional<User> findByEmail(String email);
 }

src/main/java/it/finki/tinki/service/impl/AccountServiceImpl.java

@@ -1 +1 @@
 package it.finki.tinki.service.impl;
 
+import it.finki.tinki.model.Address;
+import it.finki.tinki.model.Skill;
 import it.finki.tinki.model.Users.Account;
 import it.finki.tinki.model.Users.Company;
@@ -6 +8 @@
 import it.finki.tinki.model.Users.User;
 import it.finki.tinki.model.enumerator.AccountType;
+import it.finki.tinki.model.exception.InvalidArgumentsException;
+import it.finki.tinki.model.exception.UserExistsException;
+import it.finki.tinki.repository.AddressRepository;
 import it.finki.tinki.repository.CompanyRepository;
 import it.finki.tinki.repository.TeamRepository;
@@ -13 +18 @@
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
@@ -18 +24 @@
 public class AccountServiceImpl implements AccountService {
 
+    AddressRepository addressRepository;
     UserRepository userRepository;
     TeamRepository teamRepository;
     CompanyRepository companyRepository;
 
-    public AccountServiceImpl(UserRepository userRepository, TeamRepository teamRepository, CompanyRepository companyRepository) {
+    public AccountServiceImpl(AddressRepository addressRepository, UserRepository userRepository, TeamRepository teamRepository, CompanyRepository companyRepository) {
+        this.addressRepository = addressRepository;
         this.userRepository = userRepository;
         this.teamRepository = teamRepository;
@@ -33 +41 @@
         if(type.equals(AccountType.USER)){
             User u1 = userRepository.findByEmailAndPassword(email, password);
-            if(u1!=null){
-                return u1;
-            }
+            return u1;
         }
         else if(type.equals(AccountType.TEAM)){
             Team t1 = teamRepository.findByEmailAndPassword(email, password);
-            if(t1!=null){
-                return t1;
-            }
+            return t1;
         }
         else if(type.equals(AccountType.COMPANY)){
             Company c1 = companyRepository.findByEmailAndPassword(email, password);
-            if(c1!=null){
-                return c1;
-            }
+            return c1;
         }
 
         return null;
     }
+
+    public Account registerUser(String email, String password, String name, String surname, List<Skill> retainedSkills, List<Skill> skillsToLearn){
+        if(email==null || email.isEmpty() || password==null || password.isEmpty() || name==null || name.isEmpty() || surname==null || surname.isEmpty()){
+            throw new InvalidArgumentsException();
+        }
+
+        if(this.userRepository.findByEmail(email).isPresent()){
+            throw new UserExistsException();
+        }
+
+        User u = new User(email, password, name, AccountType.USER, surname, retainedSkills, skillsToLearn);
+        return this.userRepository.save(u);
+    }
 }