Changeset b31afbd

Timestamp:

01/08/21 03:13:23 (3 years ago)

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

336d09e

Parents:

b24fe9b

Message:

fixed some bugs and finalized user registration

Location:

src/main

Files:

• java/it/finki/tinki/bootstrap/DataHolder.java (modified) (3 diffs)
• java/it/finki/tinki/model/Users/Account.java (modified) (2 diffs)
• java/it/finki/tinki/model/Users/User.java (modified) (1 diff)
• java/it/finki/tinki/model/dto/UserRegisterDTO.java (added)
• java/it/finki/tinki/service/impl/MatchmakerServiceImpl.java (modified) (1 diff)
• java/it/finki/tinki/web/controller/RegisterController.java (modified) (4 diffs)
• resources/application.properties (modified) (1 diff)

src/main/java/it/finki/tinki/bootstrap/DataHolder.java

@@ -71 +71 @@
         List<Skill> l2 = new ArrayList<>();
         l2.add(skillRepository.getOne(3L));
-        l2.add(skillRepository.getOne(0L));
+        l2.add(skillRepository.getOne(10L));
         l2.add(skillRepository.getOne(1L));
         l2.add(skillRepository.getOne(2L));
@@ -82 +82 @@
         List<Skill> l3 = new ArrayList<>();
         l3.add(skillRepository.getOne(3L));
-        l3.add(skillRepository.getOne(0L));
+        l3.add(skillRepository.getOne(10L));
         l3.add(skillRepository.getOne(5L));
         l3.add(skillRepository.getOne(6L));
@@ -105 +105 @@
         Account m = this.accountService.registerTeam("asdf", "asd", "TeamRocket", 3);
 
+        Job z = this.workService.insertJob("asdfq", "asdfqw", m.getId() ,5000, smalls, AccountType.TEAM);
+        Job n = this.workService.insertJob("asdfq", "asdfqw", c.getId() ,5000, sm2, AccountType.COMPANY);
         Job j = this.workService.insertJob("Asdf", "Asdfa", c.getId() ,5000, ids, AccountType.COMPANY);
         Job k = this.workService.insertJob("Asdf", "Asdfa", m.getId() ,5000, ids, AccountType.TEAM);
-        Job z = this.workService.insertJob("asdfq", "asdfqw", m.getId() ,5000, smalls, AccountType.TEAM);
-        Job n = this.workService.insertJob("asdfq", "asdfqw", c.getId() ,5000, sm2, AccountType.COMPANY);
 
-        Account u = this.accountService.registerUser("asdf", "asdf", "Zoki", "Poki", lista, lista);
+        Account u = this.accountService.registerUser("asdf", "asdfq", "Zoki", "Poki", lista, lista);
 
     }

src/main/java/it/finki/tinki/model/Users/Account.java

@@ -1 +1 @@
 package it.finki.tinki.model.Users;
 
+import com.sun.istack.NotNull;
 import it.finki.tinki.model.enumerator.AccountType;
 import lombok.Data;
@@ -16 +17 @@
 
     @Column(unique = true)
+    @NotNull
     String email;
 
+    @NotNull
     String password;
 
+    @NotNull
     String name;
 

src/main/java/it/finki/tinki/model/Users/User.java

@@ -29 +29 @@
         this.skillsToLearn = skillsToLearn;
     }
+
+    public String toString(){
+        return "";
+    }
 }

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

@@ -61 +61 @@
         if(matches.size()!=0) {
             matches.forEach(match -> {
+                System.out.println(match.getCoefficient());
                 jobs.add((Job) match.getEmbeddedMatchId().getWork());
             });

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

@@ -8 +8 @@
 import it.finki.tinki.model.Users.Account;
 import it.finki.tinki.model.Users.User;
+import it.finki.tinki.model.dto.UserRegisterDTO;
 import it.finki.tinki.service.AccountService;
 import it.finki.tinki.service.MatchmakerService;
@@ -36 +37 @@
 
     @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<Long> retainedSkills,
-                                             @RequestParam List<Long> skillsToLearn){
+    private Map<String, String> registerUser(@RequestBody UserRegisterDTO body){
 
-        List<Skill> retained = this.skillService.returnSkillsBasedOnId(retainedSkills);
-        List<Skill> toLearn = this.skillService.returnSkillsBasedOnId(skillsToLearn);
+        List<Skill> retained = this.skillService.returnSkillsBasedOnId(body.getRetainedSkills());
+        List<Skill> toLearn = this.skillService.returnSkillsBasedOnId(body.getSkillsToLearn());
 
-        Account k = this.accountService.registerUser(email, password, name, surname, retained, toLearn);
+        Account k = this.accountService.registerUser(body.getEmail(), body.getPassword(), body.getName(), body.getSurname(), retained, toLearn);
 
         Map<String, String> response = new HashMap<>();
@@ -60 +56 @@
 
     @RequestMapping(path = "/team", method = RequestMethod.POST)
-    private Map<String, String> registerTeam(@RequestParam String email,
-                                             @RequestParam String password,
-                                             @RequestParam String name,
-                                             @RequestParam int members){
+    private Map<String, String> registerTeam(@RequestBody String email,
+                                             @RequestBody String password,
+                                             @RequestBody String name,
+                                             @RequestBody int members){
 
         Account k = this.accountService.registerTeam(email, password, name, members);
@@ -79 +75 @@
 
     @RequestMapping(path = "/company", method = RequestMethod.POST)
-    private Map<String, String> registeCompany(@RequestParam String email,
-                                               @RequestParam String password,
-                                               @RequestParam String name,
-                                               @RequestParam String country,
-                                               @RequestParam String city,
-                                               @RequestParam String street){
+    private Map<String, String> registeCompany(@RequestBody String email,
+                                               @RequestBody String password,
+                                               @RequestBody String name,
+                                               @RequestBody String country,
+                                               @RequestBody String city,
+                                               @RequestBody String street){
 
         Account k = this.accountService.registerCompany(email, password, name, country, city, street);

src/main/resources/application.properties

@@ -17 +17 @@
 
 logging.level.org.hibernate.type=trace
-spring.jpa.hibernate.ddl-auto=update
+spring.jpa.hibernate.ddl-auto=create