Changeset 6729ba5 for src/main/java/it/finki

Timestamp:

01/15/21 16:39:45 (4 years ago)

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

81c9e25

Parents:

ed3f5c4

Message:

finished work edit

Location:

src/main/java/it/finki/tinki

Files:

• model/dto/edit/work/InternshipEditDTO.java (added)
• model/dto/edit/work/WorkEditDTO.java (added)
• model/dto/response/work/WorkResponseDTO.java (modified) (2 diffs)
• service/impl/WorkServiceImpl.java (modified) (1 diff)
• web/controller/WorkEditController.java (modified) (2 diffs)

src/main/java/it/finki/tinki/model/dto/response/work/WorkResponseDTO.java

@@ -13 +13 @@
     String accountEmail;
     String accountName;
+    Long accountId;
     AccountType accountType;
     String error;
@@ -28 +29 @@
         this.description = description;
         this.salary = salary;
+        this.accountId = account.getId();
         this.accountEmail = account.getEmail();
         this.accountName = account.getName();

src/main/java/it/finki/tinki/service/impl/WorkServiceImpl.java

@@ -131 +131 @@
         j.setDescription(description);
         j.setSalary(salary);
+        j.setOpenSpots(openSpots);
 
         return this.internshipRepository.save(j);

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

@@ -4 +4 @@
 import it.finki.tinki.model.Work.Job;
 import it.finki.tinki.model.Work.Project;
+import it.finki.tinki.model.dto.edit.work.InternshipEditDTO;
+import it.finki.tinki.model.dto.edit.work.WorkEditDTO;
 import it.finki.tinki.model.dto.register.work.InternshipRegisterDTO;
 import it.finki.tinki.model.dto.register.work.JobRegisterDTO;
@@ -29 +31 @@
 
     @PostMapping("/job/{id}")
-    public Map<String, String> editJob(@PathVariable Long id,
-                                       @RequestBody JobRegisterDTO body){
+    public JobResponseDTO editJob(@PathVariable Long id,
+                                  @RequestBody WorkEditDTO body){
 
-        Map<String, String> response = new HashMap<>();
+        Job j = this.workService.getJobById(id);
 
-        if(body.getAccountId().equals(this.workService.getJobById(id).getAccount().getId())) {
+        if(body.getAccountId().equals(j.getAccount().getId())) {
             Job k = this.workService.editJob(id, body.getTitle(), body.getDescription(), body.getSalary());
             if(k!=null){
-                response.put("success", "Job edited successfully!");
-                return response;
+                return new JobResponseDTO(k);
             }
         }
 
-        response.put("error", "Internship edit failed!");
-        return response;
+        return new JobResponseDTO();
     }
 
     @PostMapping("/internship/{id}")
-    public Map<String, String> editInternship(@PathVariable Long id,
-                                                @RequestBody InternshipRegisterDTO body){
+    public InternshipResponseDTO editInternship(@PathVariable Long id,
+                                                @RequestBody InternshipEditDTO body){
 
-        Map<String, String> response = new HashMap<>();
+        Internship i = this.workService.getInternshipById(id);
 
-        if(body.getAccountId().equals(this.workService.getInternshipById(id).getAccount().getId())){
+        if(body.getAccountId().equals(i.getAccount().getId())){
             Internship k = this.workService.editInternship(id, body.getTitle(), body.getDescription(), body.getSalary(), body.getOpenSpots());
             if(k!=null){
-                response.put("success", "Internship edited successfully!");
-                return response;
+                return new InternshipResponseDTO(k);
             }
         }
 
-        response.put("error", "Internship edit failed!");
-        return response;
+        return new InternshipResponseDTO();
     }
 
     @PostMapping("/project/{id}")
-    public Map<String, String> editProject(@PathVariable Long id,
-                                          @RequestBody ProjectRegisterDTO body){
+    public ProjectResponseDTO editProject(@PathVariable Long id,
+                                          @RequestBody WorkEditDTO body){
 
-        Map<String, String> response = new HashMap<>();
+        Project p = this.workService.getProjectById(id);
 
-        if(body.getAccountId().equals(this.workService.getProjectById(id).getAccount().getId())) {
+        if(body.getAccountId().equals(p.getAccount().getId())) {
             Project k = this.workService.editProject(id, body.getTitle(), body.getDescription(), body.getSalary());
             if(k!=null){
-                response.put("success", "Project edited successfully!");
-                return response;
+                return new ProjectResponseDTO(k);
             }
         }
 
-        response.put("error", "Project edit failed!");
-        return response;
+        return new ProjectResponseDTO();
     }
 }