Changeset bd38a55

Timestamp:

01/08/21 21:27:43 (3 years ago)

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

bd46dbb

Parents:

14b648e

Message:

bugfix

Location:

src/main/java/it/finki/tinki

Files:

• model/dto/CompanyResponseDTO.java (modified) (2 diffs)
• model/dto/TeamResponseDTO.java (modified) (2 diffs)
• web/controller/AccountEditController.java (moved) (moved from src/main/java/it/finki/tinki/web/controller/EditController.java ) (4 diffs)
• web/controller/WorkEditController.java (added)

src/main/java/it/finki/tinki/model/dto/CompanyResponseDTO.java

@@ -2 +2 @@
 
 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 +12 @@
     private List<JobResponseDTO> jobs;
     private List<InternshipResponseDTO> internships;
+
+    public CompanyResponseDTO(){
+        this.jobs = new ArrayList<>();
+        this.internships = new ArrayList<>();
+    }
 }

src/main/java/it/finki/tinki/model/dto/TeamResponseDTO.java

@@ -3 +3 @@
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
@@ -10 +11 @@
     private List<JobResponseDTO> jobs;
     private List<ProjectResponseDTO> projects;
+
+    public TeamResponseDTO(){
+        this.jobs = new ArrayList<>();
+        this.projects = new ArrayList<>();
+    }
 }

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

@@ -19 +19 @@
 
 @RestController
-@RequestMapping(path = "/api/edit")
-public class EditController {
+@RequestMapping(path = "/api/edit/account")
+public class AccountEditController {
 
     AccountService accountService;
     SkillService skillService;
 
-    public EditController(AccountService accountService, SkillService skillService) {
+    public AccountEditController(AccountService accountService, SkillService skillService) {
         this.accountService = accountService;
         this.skillService = skillService;
@@ -41 +41 @@
             List<Skill> toLearn = this.skillService.returnSkillsBasedOnId(body.getSkillsToLearn());
 
-            User u = (User) this.accountService.editUser(id, body.getEmail(), body.getName(), body.getSurname(), retained, toLearn);
+            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());
@@ -69 +71 @@
             CompanyResponseDTO companyResponseDTO = new CompanyResponseDTO();
 
+            companyResponseDTO.setId(c.getId());
             companyResponseDTO.setEmail(c.getEmail());
+            companyResponseDTO.setType(AccountType.COMPANY);
             companyResponseDTO.setName(c.getName());
             companyResponseDTO.setAddress(c.getAddress());
@@ -91 +95 @@
             TeamResponseDTO teamResponseDTO = new TeamResponseDTO();
 
+            teamResponseDTO.setId(t.getId());
             teamResponseDTO.setEmail(t.getEmail());
+            teamResponseDTO.setType(AccountType.TEAM);
             teamResponseDTO.setName(t.getName());
             teamResponseDTO.setMembers(t.getMembers());