Changeset 5f9d25a for src/main/java/it/finki/tinki/web/controller/WorkEditController.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/WorkEditController.java (modified) (1 diff)

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

@@ -25 +25 @@
     }
 
-    @PostMapping("/job/{userId}/{id}")
-    public JobResponseDTO editJob(@PathVariable Long userId,
-                                  @PathVariable Long id,
+    @PostMapping("/job/{id}")
+    public JobResponseDTO editJob(@PathVariable Long id,
                                   @RequestBody JobRegisterDTO body){
 
-        if(userId.equals(this.workService.getJobById(id).getAccount().getId())) {
+        if(body.getAccountId().equals(this.workService.getJobById(id).getAccount().getId())) {
             Job k = this.workService.editJob(id, body.getTitle(), body.getDescription(), body.getSalary());
-
             return new JobResponseDTO(k);
         }
-
         return null;
     }
 
-    @PostMapping("/internship/{userId}/{id}")
-    public InternshipResponseDTO editInternship(@PathVariable Long userId,
-                                                @PathVariable Long id,
+    @PostMapping("/internship/{id}")
+    public InternshipResponseDTO editInternship(@PathVariable Long id,
                                                 @RequestBody InternshipRegisterDTO body){
 
-        if(userId.equals(this.workService.getJobById(id).getAccount().getId())){
+        if(body.getAccountId().equals(this.workService.getJobById(id).getAccount().getId())){
             Internship k = this.workService.editInternship(id, body.getTitle(), body.getDescription(), body.getSalary(), body.getOpenSpots());
-
             return new InternshipResponseDTO(k);
         }
-
         return null;
     }
 
-    @PostMapping("/project/{userId}/{id}")
-    public ProjectResponseDTO editProject(@PathVariable Long userId,
-                                          @PathVariable Long id,
+    @PostMapping("/project/{id}")
+    public ProjectResponseDTO editProject(@PathVariable Long id,
                                           @RequestBody ProjectRegisterDTO body){
 
-        if(userId.equals(this.workService.getJobById(id).getAccount().getId())) {
+        if(body.getAccountId().equals(this.workService.getJobById(id).getAccount().getId())) {
             Project k = this.workService.editProject(id, body.getTitle(), body.getDescription(), body.getSalary());
-
             return new ProjectResponseDTO(k);
         }
-
         return null;
     }