Added cancel shift endpoint

masoudarvishian · May 10, 2024 · efbc235 · efbc235
1 parent 6b93c79
commit efbc235
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/main/java/com/zenjob/challenge/controller/JobController.java b/src/main/java/com/zenjob/challenge/controller/JobController.java
@@ -38,7 +38,7 @@ public ResponseDto<RequestJobResponse> requestJob(@RequestBody @Valid RequestJob
 
     @DeleteMapping(path = "/{id}/cancel")
     @ResponseStatus(code = HttpStatus.NO_CONTENT)
-    public void cancelJob(@PathVariable("id") UUID jobId, @RequestBody @Valid CancelJobRequestDto dto) {
+    public void cancelJob(@PathVariable("id") UUID jobId, @RequestBody @Valid JobController.CancelJobRequestDto dto) {
         jobService.cancelJob(dto.companyId, jobId);
     }
 

diff --git a/src/main/java/com/zenjob/challenge/controller/ShiftController.java b/src/main/java/com/zenjob/challenge/controller/ShiftController.java
@@ -9,13 +9,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PatchMapping;
-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.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.time.Instant;
@@ -54,6 +48,18 @@ public void bookTalent(@PathVariable("id") UUID shiftId, @RequestBody @Valid Shi
         jobService.bookTalent(shiftId, dto.talent);
     }
 
+    @DeleteMapping(path = "/{id}/cancel")
+    @ResponseStatus(code = HttpStatus.NO_CONTENT)
+    public void cancelShift(@PathVariable("id") UUID shiftId, @RequestBody @Valid ShiftController.CancelShiftRequestDto dto) {
+        jobService.cancelShift(dto.companyId, shiftId);
+    }
+
+    @NoArgsConstructor
+    @Data
+    private static class CancelShiftRequestDto {
+        UUID companyId;
+    }
+
     @NoArgsConstructor
     @Data
     private static class BookTalentRequestDto {