Changeset 4a15c9c

Timestamp:

01/06/21 21:42:22 (3 years ago)

Author:

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

Branches:

master

Children:

9d4220d

Parents:

721cb87

Message:

added user registration

Location:

src/main/java/it/finki/tinki

Files:

• controller/RegisterController.java (modified) (2 diffs)
• model/exception/SkillNotFoundException.java (added)
• repository/SkillRepository.java (modified) (1 diff)
• service/SkillService.java (added)
• service/impl/AccountServiceImpl.java (modified) (1 diff)
• service/impl/SkillServiceImpl.java (added)

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

@@ -1 +1 @@
 package it.finki.tinki.controller;
 
-import it.finki.tinki.repository.AddressRepository;
-import it.finki.tinki.repository.CompanyRepository;
-import it.finki.tinki.repository.TeamRepository;
-import it.finki.tinki.repository.UserRepository;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import it.finki.tinki.model.Skill;
+import it.finki.tinki.model.Users.Account;
+import it.finki.tinki.model.Users.User;
+import it.finki.tinki.service.AccountService;
+import it.finki.tinki.service.SkillService;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @RestController
@@ -14 +19 @@
 public class RegisterController {
 
+    AccountService accountService;
+    SkillService skillService;
 
+    public RegisterController(AccountService accountService, SkillService skillService) {
+        this.accountService = accountService;
+        this.skillService = skillService;
+    }
+
+    @RequestMapping(path = "/user", method = RequestMethod.POST)
+    private Map<String, String> registerUser(@RequestParam String email,
+                                                @RequestParam String password,
+                                                @RequestParam String name,
+                                                @RequestParam String surname,
+                                                @RequestParam List<Integer> retainedSkills,
+                                                @RequestParam List<Integer> skillsToLearn){
+
+        List<Skill> retained = this.skillService.returnSkillsBasedOnId(retainedSkills);
+        List<Skill> toLearn = this.skillService.returnSkillsBasedOnId(skillsToLearn);
+
+        Account k = this.accountService.registerUser(email, password, name, surname, retained, toLearn);
+
+        Map<String, String> response = new HashMap<>();
+
+        if(k!=null){
+            response.put("error", "There was an error when trying to register user.");
+        }else{
+            response.put("success", "Registration completed successfully.");
+        }
+
+        return response;
+    }
 
 

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

@@ -5 +5 @@
 import org.springframework.stereotype.Repository;
 
+import java.util.Optional;
+
 @Repository
 public interface SkillRepository extends JpaRepository<Skill, Long> {
+    Optional<Skill> findById(Long id);
 }

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

@@ -40 +40 @@
 
         if(type.equals(AccountType.USER)){
-            User u1 = userRepository.findByEmailAndPassword(email, password);
+            User u1 = this.userRepository.findByEmailAndPassword(email, password);
             return u1;
         }
         else if(type.equals(AccountType.TEAM)){
-            Team t1 = teamRepository.findByEmailAndPassword(email, password);
+            Team t1 = this.teamRepository.findByEmailAndPassword(email, password);
             return t1;
         }
         else if(type.equals(AccountType.COMPANY)){
-            Company c1 = companyRepository.findByEmailAndPassword(email, password);
+            Company c1 = this.companyRepository.findByEmailAndPassword(email, password);
             return c1;
         }