Index: src/main/java/it/finki/tinki/model/dto/CompanyResponseDTO.java =================================================================== --- src/main/java/it/finki/tinki/model/dto/CompanyResponseDTO.java (revision 14b648eee678e5e87dfe65cf778d6af63f0956bf) +++ src/main/java/it/finki/tinki/model/dto/CompanyResponseDTO.java (revision bd38a558842ebb2aea2de48a93cbe9522759b8ad) @@ -2,8 +2,7 @@ import it.finki.tinki.model.Address; -import it.finki.tinki.model.Jobs.Internship; -import it.finki.tinki.model.Jobs.Job; import lombok.Data; +import java.util.ArrayList; import java.util.List; @@ -13,3 +12,8 @@ private List jobs; private List internships; + + public CompanyResponseDTO(){ + this.jobs = new ArrayList<>(); + this.internships = new ArrayList<>(); + } } Index: src/main/java/it/finki/tinki/model/dto/TeamResponseDTO.java =================================================================== --- src/main/java/it/finki/tinki/model/dto/TeamResponseDTO.java (revision 14b648eee678e5e87dfe65cf778d6af63f0956bf) +++ src/main/java/it/finki/tinki/model/dto/TeamResponseDTO.java (revision bd38a558842ebb2aea2de48a93cbe9522759b8ad) @@ -3,4 +3,5 @@ import lombok.Data; +import java.util.ArrayList; import java.util.List; @@ -10,3 +11,8 @@ private List jobs; private List projects; + + public TeamResponseDTO(){ + this.jobs = new ArrayList<>(); + this.projects = new ArrayList<>(); + } } Index: src/main/java/it/finki/tinki/web/controller/AccountEditController.java =================================================================== --- src/main/java/it/finki/tinki/web/controller/AccountEditController.java (revision bd38a558842ebb2aea2de48a93cbe9522759b8ad) +++ src/main/java/it/finki/tinki/web/controller/AccountEditController.java (revision bd38a558842ebb2aea2de48a93cbe9522759b8ad) @@ -0,0 +1,108 @@ +package it.finki.tinki.web.controller; + +import it.finki.tinki.model.Skill; +import it.finki.tinki.model.Users.Account; +import it.finki.tinki.model.Users.Company; +import it.finki.tinki.model.Users.Team; +import it.finki.tinki.model.Users.User; +import it.finki.tinki.model.dto.*; +import it.finki.tinki.model.enumerator.AccountType; +import it.finki.tinki.service.AccountService; +import it.finki.tinki.service.SkillService; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Optional; + +@RestController +@RequestMapping(path = "/api/edit/account") +public class AccountEditController { + + AccountService accountService; + SkillService skillService; + + public AccountEditController(AccountService accountService, SkillService skillService) { + this.accountService = accountService; + this.skillService = skillService; + } + + @RequestMapping(path = "/user/{id}/{email}") + 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); + + if(a.isPresent()){ + List retained = this.skillService.returnSkillsBasedOnId(body.getRetainedSkills()); + List 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.setName(u.getName()); + userResponseDTO.setSurname(u.getSurname()); + userResponseDTO.setRetained(u.getRetainedSkills()); + userResponseDTO.setToLearn(u.getSkillsToLearn()); + + return userResponseDTO; + } + + return null; + } + + @RequestMapping(path = "/company/{id}/{email}") + 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); + + 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.setType(AccountType.COMPANY); + companyResponseDTO.setName(c.getName()); + companyResponseDTO.setAddress(c.getAddress()); + + return companyResponseDTO; + } + + return null; + } + + @RequestMapping(path = "/team/{id}/{email}") + 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); + + 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.setType(AccountType.TEAM); + teamResponseDTO.setName(t.getName()); + teamResponseDTO.setMembers(t.getMembers()); + + return teamResponseDTO; + } + + return null; + } +} Index: c/main/java/it/finki/tinki/web/controller/EditController.java =================================================================== --- src/main/java/it/finki/tinki/web/controller/EditController.java (revision 14b648eee678e5e87dfe65cf778d6af63f0956bf) +++ (revision ) @@ -1,102 +1,0 @@ -package it.finki.tinki.web.controller; - -import it.finki.tinki.model.Skill; -import it.finki.tinki.model.Users.Account; -import it.finki.tinki.model.Users.Company; -import it.finki.tinki.model.Users.Team; -import it.finki.tinki.model.Users.User; -import it.finki.tinki.model.dto.*; -import it.finki.tinki.model.enumerator.AccountType; -import it.finki.tinki.service.AccountService; -import it.finki.tinki.service.SkillService; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; -import java.util.Optional; - -@RestController -@RequestMapping(path = "/api/edit") -public class EditController { - - AccountService accountService; - SkillService skillService; - - public EditController(AccountService accountService, SkillService skillService) { - this.accountService = accountService; - this.skillService = skillService; - } - - @RequestMapping(path = "/user/{id}/{email}") - 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); - - if(a.isPresent()){ - List retained = this.skillService.returnSkillsBasedOnId(body.getRetainedSkills()); - List toLearn = this.skillService.returnSkillsBasedOnId(body.getSkillsToLearn()); - - User u = (User) this.accountService.editUser(id, body.getEmail(), body.getName(), body.getSurname(), retained, toLearn); - - UserResponseDTO userResponseDTO = new UserResponseDTO(); - - userResponseDTO.setEmail(u.getEmail()); - userResponseDTO.setName(u.getName()); - userResponseDTO.setSurname(u.getSurname()); - userResponseDTO.setRetained(u.getRetainedSkills()); - userResponseDTO.setToLearn(u.getSkillsToLearn()); - - return userResponseDTO; - } - - return null; - } - - @RequestMapping(path = "/company/{id}/{email}") - 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); - - if(a.isPresent()){ - Company c = this.accountService.editCompany(id, body.getEmail(), body.getName(), body.getCountry(), body.getCity(), body.getStreet()); - - CompanyResponseDTO companyResponseDTO = new CompanyResponseDTO(); - - companyResponseDTO.setEmail(c.getEmail()); - companyResponseDTO.setName(c.getName()); - companyResponseDTO.setAddress(c.getAddress()); - - return companyResponseDTO; - } - - return null; - } - - @RequestMapping(path = "/team/{id}/{email}") - 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); - - if(a.isPresent()){ - Team t = this.accountService.editTeam(id, body.getEmail(), body.getName(), body.getMembers()); - - TeamResponseDTO teamResponseDTO = new TeamResponseDTO(); - - teamResponseDTO.setEmail(t.getEmail()); - teamResponseDTO.setName(t.getName()); - teamResponseDTO.setMembers(t.getMembers()); - - return teamResponseDTO; - } - - return null; - } -} Index: src/main/java/it/finki/tinki/web/controller/WorkEditController.java =================================================================== --- src/main/java/it/finki/tinki/web/controller/WorkEditController.java (revision bd38a558842ebb2aea2de48a93cbe9522759b8ad) +++ src/main/java/it/finki/tinki/web/controller/WorkEditController.java (revision bd38a558842ebb2aea2de48a93cbe9522759b8ad) @@ -0,0 +1,10 @@ +package it.finki.tinki.web.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping(path = "/api/edit/work") +public class WorkEditController { + +}