Changeset 31fc5c8

Timestamp:

01/08/21 16:32:00 (3 years ago)

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

14b648e

Parents:

277b400

Message:

finalized register logic

Location:

src/main/java/it/finki/tinki

Files:

• model/dto/CompanyRegisterDTO.java (added)
• model/dto/TeamRegisterDTO.java (added)
• web/controller/RegisterController.java (modified) (3 diffs)

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

@@ -3 +3 @@
 import it.finki.tinki.model.Skill;
 import it.finki.tinki.model.Users.Account;
+import it.finki.tinki.model.dto.CompanyRegisterDTO;
+import it.finki.tinki.model.dto.TeamRegisterDTO;
 import it.finki.tinki.model.dto.UserRegisterDTO;
 import it.finki.tinki.service.AccountService;
@@ -50 +52 @@
     }
 
-    //TODO: ADD TEAM AND COMPANY REGISTER TDO --------------------------------------v
+    @RequestMapping(path = "/team", method = RequestMethod.POST)
+    private Map<String, String> registerTeam(@RequestBody TeamRegisterDTO body){
 
-    @RequestMapping(path = "/team", method = RequestMethod.POST)
-    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);
+        Account k = this.accountService.registerTeam(body.getEmail(), body.getPassword(), body.getName(), body.getMembers());
 
         Map<String, String> response = new HashMap<>();
@@ -72 +69 @@
 
     @RequestMapping(path = "/company", method = RequestMethod.POST)
-    private Map<String, String> registeCompany(@RequestBody String email,
-                                               @RequestBody String password,
-                                               @RequestBody String name,
-                                               @RequestBody String country,
-                                               @RequestBody String city,
-                                               @RequestBody String street){
+    private Map<String, String> registeCompany(@RequestBody CompanyRegisterDTO body){
 
-        Account k = this.accountService.registerCompany(email, password, name, country, city, street);
+        Account k = this.accountService.registerCompany(body.getEmail(),
+                body.getPassword(), body.getName(), body.getCountry(), body.getCity(), body.getStreet());
 
         Map<String, String> response = new HashMap<>();