Changeset bd46dbb for src/main/java/it/finki/tinki/web

Timestamp:

01/08/21 23:47:41 (3 years ago)

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

297bd16

Parents:

bd38a55

Message:

refactoring and response dto

Location:

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

Files:

• AccountEditController.java (modified) (7 diffs)
• LoginController.java (modified) (2 diffs)
• RegisterController.java (modified) (1 diff)
• WorkEditController.java (deleted)
• WorkRegisterController.java (added)

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

@@ -2 +2 @@
 
 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.dto.register.account.CompanyRegisterDTO;
+import it.finki.tinki.model.dto.register.account.TeamRegisterDTO;
+import it.finki.tinki.model.dto.register.account.UserRegisterDTO;
+import it.finki.tinki.model.dto.response.account.CompanyResponseDTO;
+import it.finki.tinki.model.dto.response.account.TeamResponseDTO;
+import it.finki.tinki.model.dto.response.account.UserResponseDTO;
 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 org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -30 +31 @@
     }
 
-    @RequestMapping(path = "/user/{id}/{email}")
+    @PostMapping(path = "/user/{id}/{email}")
     public UserResponseDTO editUser(@PathVariable(name = "id") Long id,
                                     @PathVariable(name = "email") String email,
@@ -48 +49 @@
             userResponseDTO.setEmail(u.getEmail());
             userResponseDTO.setType(AccountType.USER);
+            userResponseDTO.setError(null);
             userResponseDTO.setName(u.getName());
             userResponseDTO.setSurname(u.getSurname());
@@ -59 +61 @@
     }
 
-    @RequestMapping(path = "/company/{id}/{email}")
+    @PostMapping(path = "/company/{id}/{email}")
     public CompanyResponseDTO editCompany(@PathVariable(name = "id") Long id,
                                           @PathVariable(name = "email") String email,
@@ -73 +75 @@
             companyResponseDTO.setId(c.getId());
             companyResponseDTO.setEmail(c.getEmail());
+            companyResponseDTO.setError(null);
             companyResponseDTO.setType(AccountType.COMPANY);
             companyResponseDTO.setName(c.getName());
@@ -83 +86 @@
     }
 
-    @RequestMapping(path = "/team/{id}/{email}")
+    @PostMapping(path = "/team/{id}/{email}")
     public TeamResponseDTO editTeam(@PathVariable(name = "id") Long id,
                                     @PathVariable(name = "email") String email,
@@ -97 +100 @@
             teamResponseDTO.setId(t.getId());
             teamResponseDTO.setEmail(t.getEmail());
+            teamResponseDTO.setError(null);
             teamResponseDTO.setType(AccountType.TEAM);
             teamResponseDTO.setName(t.getName());

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

@@ -1 +1 @@
 package it.finki.tinki.web.controller;
 
-import it.finki.tinki.model.Jobs.Internship;
-import it.finki.tinki.model.Jobs.Job;
-import it.finki.tinki.model.Jobs.Project;
+import it.finki.tinki.model.Work.Internship;
+import it.finki.tinki.model.Work.Job;
+import it.finki.tinki.model.Work.Project;
 import it.finki.tinki.model.Users.Account;
 import it.finki.tinki.model.Users.Company;
@@ -9 +9 @@
 import it.finki.tinki.model.Users.User;
 import it.finki.tinki.model.dto.*;
+import it.finki.tinki.model.dto.response.account.LoginResponseDTO;
+import it.finki.tinki.model.dto.response.account.CompanyResponseDTO;
+import it.finki.tinki.model.dto.response.account.TeamResponseDTO;
+import it.finki.tinki.model.dto.response.account.UserResponseDTO;
+import it.finki.tinki.model.dto.response.work.InternshipResponseDTO;
+import it.finki.tinki.model.dto.response.work.JobResponseDTO;
+import it.finki.tinki.model.dto.response.work.ProjectResponseDTO;
 import it.finki.tinki.model.enumerator.AccountType;
 import it.finki.tinki.service.AccountService;

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.model.dto.register.account.CompanyRegisterDTO;
+import it.finki.tinki.model.dto.register.account.TeamRegisterDTO;
+import it.finki.tinki.model.dto.register.account.UserRegisterDTO;
 import it.finki.tinki.service.AccountService;
 import it.finki.tinki.service.MatchmakerService;