refactor

src/main/java/com/iconplus/smartproc/controller/DrpController.java

@@ -2,8 +2,6 @@ package com.iconplus.smartproc.controller;
 
 import com.iconplus.smartproc.helper.model.EmptyResponse;
 import com.iconplus.smartproc.model.request.DrpDokumenRequest;
-import com.iconplus.smartproc.model.request.DrpPengadaanDokumenRequest;
-import com.iconplus.smartproc.model.request.DrpPengadaanRequest;
 import com.iconplus.smartproc.model.request.DrpRequest;
 import com.iconplus.smartproc.model.response.*;
 import com.iconplus.smartproc.service.drp.*;
@@ -21,44 +19,32 @@ public class DrpController {
 
     private final GetDrpService getDrpService;
     private final GetListDrpService getListDrpService;
-    private final PostCreateDrpService postCreateDrpService;
-    private final PostCreateDrpPengadaanService postCreateDrpPengadaanService;
-    private final GetListDrpPengadaanService getListDrpPengadaanService;
     private final PostDrpUploadDokumenRKAPService postDrpUploadDokumenRKAPService;
-    private final PostDrpUploadDokumenPendukungService postDrpUploadDokumenPendukungService;
     private final PostCreateTahunDrpService postCreateTahunDrpService;
-    private final DeleteDrpPengadaanService deleteDrpPengadaanService;
     private final DeleteDokumenUploadService deleteDokumenUploadService;
-    private final DeleteDokumenPendukungService deleteDokumenPendukungService;
+    private final PostCreateDrpService postCreateDrpService;
+    private final EditUploadDokumenDrpService editUploadDokumenDrpService;
 
     public DrpController(GetDrpService getDrpService,
                          GetListDrpService getListDrpService,
-                         PostCreateDrpService postCreateDrpService,
-                         PostCreateDrpPengadaanService postCreateDrpPengadaanService,
-                         GetListDrpPengadaanService getListDrpPengadaanService,
                          PostDrpUploadDokumenRKAPService postDrpUploadDokumenRKAPService,
                          PostCreateTahunDrpService postCreateTahunDrpService,
-                         PostDrpUploadDokumenPendukungService postDrpUploadDokumenPendukungService,
-                         DeleteDrpPengadaanService deleteDrpPengadaanService,
                          DeleteDokumenUploadService deleteDokumenUploadService,
-                         DeleteDokumenPendukungService deleteDokumenPendukungService) {
+                         PostCreateDrpService postCreateDrpService,
+                         EditUploadDokumenDrpService editUploadDokumenDrpService) {
         this.getDrpService = getDrpService;
         this.getListDrpService = getListDrpService;
-        this.postCreateDrpService = postCreateDrpService;
-        this.postCreateDrpPengadaanService = postCreateDrpPengadaanService;
-        this.getListDrpPengadaanService = getListDrpPengadaanService;
         this.postDrpUploadDokumenRKAPService = postDrpUploadDokumenRKAPService;
-        this.postDrpUploadDokumenPendukungService = postDrpUploadDokumenPendukungService;
         this.postCreateTahunDrpService = postCreateTahunDrpService;
-        this.deleteDrpPengadaanService = deleteDrpPengadaanService;
         this.deleteDokumenUploadService = deleteDokumenUploadService;
-        this.deleteDokumenPendukungService = deleteDokumenPendukungService;
+        this.postCreateDrpService = postCreateDrpService;
+        this.editUploadDokumenDrpService = editUploadDokumenDrpService;
     }
 
     @GetMapping
     public GetListDrpResponse getListDrp(@RequestParam(name = "search", required = false) String search,
-                                              @RequestParam(name = "page", defaultValue = "1") Integer page,
-                                              @RequestParam(name = "size", defaultValue = "5") Integer size){
+                                         @RequestParam(name = "page", defaultValue = "1") Integer page,
+                                         @RequestParam(name = "size", defaultValue = "5") Integer size){
 
         Pageable pageable = PageRequest.of((page - 1), size);
         DrpRequest drpRequest = DrpRequest.builder()
@@ -69,14 +55,25 @@ public class DrpController {
         return getListDrpService.execute(drpRequest);
     }
 
+    @GetMapping("/{id}")
+    public DrpResponse getDrp(@PathVariable Long id) {
+        return getDrpService.execute(DrpRequest.builder()
+                .id(id)
+                .build());
+    }
 
     @PostMapping("/tahun")
     public DrpResponse createTahunDrp(@RequestBody DrpRequest drpRequest) {
         return postCreateTahunDrpService.execute(drpRequest);
     }
 
+    @PostMapping
+    public DrpResponse createDrp(@RequestBody DrpRequest drpRequest) {
+        return postCreateDrpService.execute(drpRequest);
+    }
 
-    @PostMapping("/upload/rkap")
+
+    @PostMapping("/upload/dokumen")
     public DrpDokumenResponse uploadDokumenRkap(@RequestParam(name = "jenisDokumenId") Long jenisDokumenId,
                                                 @RequestParam(name = "keterangan") String keterangan,
                                                 @RequestParam(name = "file") MultipartFile file) throws IOException {
@@ -87,58 +84,22 @@ public class DrpController {
                 .build());
     }
 
-    @PostMapping("/upload/pendukung")
-    public DrpDokumenResponse uploadDokumenPendukung(@RequestParam(name = "jenisDokumenId") Long jenisDokumenId,
-                                                     @RequestParam(name = "keterangan") String keterangan,
-                                                     @RequestParam(name = "file") MultipartFile file) throws IOException {
-        return postDrpUploadDokumenPendukungService.execute(DrpDokumenRequest.builder()
+    @DeleteMapping("/upload/dokumen")
+    public EmptyResponse deleteDokumenRkap(@RequestBody DrpDokumenRequest drpDokumenRequest) {
+        return deleteDokumenUploadService.execute(drpDokumenRequest);
+    }
+
+    @PutMapping("/upload/dokumen")
+    public DrpDokumenResponse editUploadDrpDokumen(@RequestParam(name = "filename") String filename,
+                                                   @RequestParam(name = "jenisDokumenId") Long jenisDokumenId,
+                                                   @RequestParam(name = "keterangan") String keterangan,
+                                                   @RequestParam(name = "file") MultipartFile file) {
+        return editUploadDokumenDrpService.execute(DrpDokumenRequest.builder()
+                .filename(filename)
                 .jenisDokumenId(jenisDokumenId)
                 .keterangan(keterangan)
                 .file(file)
                 .build());
     }
 
-    @PostMapping
-    public DrpResponse createDrp(@RequestBody DrpRequest drpRequest) {
-        return postCreateDrpService.execute(drpRequest);
-    }
-
-    @GetMapping("/{id}")
-    public DrpResponse getDrp(@PathVariable Long id) {
-        return getDrpService.execute(DrpRequest.builder()
-                .id(id)
-                .build());
-    }
-
-    @PostMapping("/pengadaan")
-    public DrpPengadaanResponse createDrpPengadaan(@RequestBody DrpPengadaanRequest drpPengadaanRequest) {
-        return postCreateDrpPengadaanService.execute(drpPengadaanRequest);
-    }
-
-    @GetMapping("/pengadaan")
-    public GetListDrpPengadaanResponse getDrpPengadaan(@RequestParam(name = "page", defaultValue = "1") Integer page,
-                                                       @RequestParam(name = "size", defaultValue = "5") Integer size){
-
-        Pageable pageable = PageRequest.of((page - 1), size);
-        DrpPengadaanRequest drpPengadaanRequest = DrpPengadaanRequest.builder()
-                .pageable(pageable)
-                .build();
-        return getListDrpPengadaanService.execute(drpPengadaanRequest);
-    }
-
-    @DeleteMapping("/{id}")
-    public EmptyResponse deleteDrpPengadaan(@RequestBody DrpPengadaanRequest drpPengadaanRequest) {
-        return deleteDrpPengadaanService.execute(drpPengadaanRequest);
-    }
-
-    @DeleteMapping("/upload/rkap")
-    public EmptyResponse deleteDokumenRkap(@RequestBody DrpDokumenRequest drpDokumenRequest) {
-        return deleteDokumenUploadService.execute(drpDokumenRequest);
-    }
-
-    @DeleteMapping("/upload/pendukung")
-    public EmptyResponse deleteDokumenPendukung(@RequestBody DrpPengadaanDokumenRequest drpPengadaanDokumenRequest) {
-        return deleteDokumenPendukungService.execute(drpPengadaanDokumenRequest);
-    }
-
 }