Changeset 5f9d25a for src/main/java/it/finki/tinki/web/controller/AccountEditController.java

Timestamp:

01/11/21 18:57:03 (3 years ago)

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

8f1f460

Parents:

fc8421e

Message:

refactoring controllers

File:

• src/main/java/it/finki/tinki/web/controller/AccountEditController.java (modified) (2 diffs)

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

@@ -13 +13 @@
 import it.finki.tinki.model.enumerator.AccountType;
 import it.finki.tinki.service.AccountService;
+import it.finki.tinki.service.BuilderService;
 import it.finki.tinki.service.SkillService;
 import org.springframework.web.bind.annotation.*;
@@ -26 +27 @@
     AccountService accountService;
     SkillService skillService;
+    BuilderService builderService;
 
-    public AccountEditController(AccountService accountService, SkillService skillService) {
+    public AccountEditController(AccountService accountService, SkillService skillService, BuilderService builderService) {
         this.accountService = accountService;
         this.skillService = skillService;
+        this.builderService = builderService;
     }
 
-    @PostMapping(path = "/user/{id}/{email}")
+    @PostMapping(path = "/user/{id}")
     public UserResponseDTO editUser(@PathVariable(name = "id") Long id,
-                                    @PathVariable(name = "email") String email,
                                     @RequestBody UserRegisterDTO body){
 
-        Optional<?> a = this.accountService.findByIdAndEmail(id, email, AccountType.USER);
+        Optional<?> a = this.accountService.findByIdAndEmail(id, body.getEmail(), AccountType.USER);
 
         if(a.isPresent()){
             List<Skill> retained = this.skillService.returnSkillsBasedOnId(body.getRetainedSkills());
             List<Skill> toLearn = this.skillService.returnSkillsBasedOnId(body.getSkillsToLearn());
-
             User u = this.accountService.editUser(id, body.getEmail(), body.getName(), body.getSurname(), retained, toLearn);
-
-            UserResponseDTO userResponseDTO = new UserResponseDTO();
-
-            userResponseDTO.setId(u.getId());
-            userResponseDTO.setEmail(u.getEmail());
-            userResponseDTO.setType(AccountType.USER);
-            userResponseDTO.setError(null);
-            userResponseDTO.setName(u.getName());
-            userResponseDTO.setSurname(u.getSurname());
-            userResponseDTO.setRetained(u.getRetainedSkills());
-            userResponseDTO.setToLearn(u.getSkillsToLearn());
-
-            return userResponseDTO;
+            return this.builderService.buildUserResponseDTO(u);
         }
 
-        return null;
+        return new UserResponseDTO();
     }
 
-    @PostMapping(path = "/company/{id}/{email}")
+    @PostMapping(path = "/company/{id}")
     public CompanyResponseDTO editCompany(@PathVariable(name = "id") Long id,
-                                          @PathVariable(name = "email") String email,
                                           @RequestBody CompanyRegisterDTO body){
 
-        Optional<?> a = this.accountService.findByIdAndEmail(id, email, AccountType.COMPANY);
+        Optional<?> a = this.accountService.findByIdAndEmail(id, body.getEmail(), AccountType.COMPANY);
 
         if(a.isPresent()){
             Company c = this.accountService.editCompany(id, body.getEmail(), body.getName(), body.getCountry(), body.getCity(), body.getStreet());
-
-            CompanyResponseDTO companyResponseDTO = new CompanyResponseDTO();
-
-            companyResponseDTO.setId(c.getId());
-            companyResponseDTO.setEmail(c.getEmail());
-            companyResponseDTO.setError(null);
-            companyResponseDTO.setType(AccountType.COMPANY);
-            companyResponseDTO.setName(c.getName());
-            companyResponseDTO.setAddress(c.getAddress());
-
-            return companyResponseDTO;
+            return this.builderService.buildCompanyResponseDTO(c);
         }
 
-        return null;
+        return new CompanyResponseDTO();
     }
 
-    @PostMapping(path = "/team/{id}/{email}")
+    @PostMapping(path = "/team/{id}")
     public TeamResponseDTO editTeam(@PathVariable(name = "id") Long id,
-                                    @PathVariable(name = "email") String email,
                                     @RequestBody TeamRegisterDTO body){
 
-        Optional<?> a = this.accountService.findByIdAndEmail(id, email, AccountType.TEAM);
+        Optional<?> a = this.accountService.findByIdAndEmail(id, body.getEmail(), AccountType.TEAM);
 
         if(a.isPresent()){
             Team t = this.accountService.editTeam(id, body.getEmail(), body.getName(), body.getMembers());
-
-            TeamResponseDTO teamResponseDTO = new TeamResponseDTO();
-
-            teamResponseDTO.setId(t.getId());
-            teamResponseDTO.setEmail(t.getEmail());
-            teamResponseDTO.setError(null);
-            teamResponseDTO.setType(AccountType.TEAM);
-            teamResponseDTO.setName(t.getName());
-            teamResponseDTO.setMembers(t.getMembers());
-
-            return teamResponseDTO;
+            return this.builderService.buildTeamResponseDTO(t);
         }
 
-        return null;
+        return new TeamResponseDTO();
     }
 }