From 6203b9d8bf3f5cc7bd9986775344155dbea05bdf Mon Sep 17 00:00:00 2001 From: dirgantarasiahaan Date: Thu, 1 Jun 2023 15:11:48 +0700 Subject: [PATCH] add constant status --- .../controller/ApprovalDrpController.java | 24 ++++++++++++++++++- .../model/request/DrpApprovalRequest.java | 2 ++ .../response/GetListDrpApprovalResponse.java | 20 ++++++++++++++++ .../approval/GetListApprovalDrpServie.java | 22 +++++++++++++---- .../service/drp/PostCreateDrpService.java | 8 ++----- .../drp/PostCreateTahunDrpService.java | 1 + .../iconplus/smartproc/util/Constants.java | 6 +++++ 7 files changed, 71 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/iconplus/smartproc/model/response/GetListDrpApprovalResponse.java diff --git a/src/main/java/com/iconplus/smartproc/controller/ApprovalDrpController.java b/src/main/java/com/iconplus/smartproc/controller/ApprovalDrpController.java index 5f7186f..1ad61c3 100644 --- a/src/main/java/com/iconplus/smartproc/controller/ApprovalDrpController.java +++ b/src/main/java/com/iconplus/smartproc/controller/ApprovalDrpController.java @@ -1,12 +1,17 @@ package com.iconplus.smartproc.controller; import com.iconplus.smartproc.helper.model.EmptyRequest; +import com.iconplus.smartproc.model.request.BidangRequest; import com.iconplus.smartproc.model.request.DrpApprovalRequest; import com.iconplus.smartproc.model.response.DrpApprovalResponse; +import com.iconplus.smartproc.model.response.GetListDrpApprovalResponse; import com.iconplus.smartproc.model.response.GetListUserApprovalResponse; +import com.iconplus.smartproc.service.approval.GetListApprovalDrpServie; import com.iconplus.smartproc.service.approval.GetListUserDirekturKomiteService; import com.iconplus.smartproc.service.approval.GetListUserVpService; import com.iconplus.smartproc.service.approval.PostCreateDrpApprovalService; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; import org.springframework.web.bind.annotation.*; @CrossOrigin(origins = "${fe.server}", allowCredentials = "true") @@ -17,12 +22,15 @@ public class ApprovalDrpController { private GetListUserVpService getListUserVpService; private GetListUserDirekturKomiteService getListUserDirekturKomiteService; private PostCreateDrpApprovalService postCreateDrpApprovalService; + private GetListApprovalDrpServie getListApprovalDrpServie; public ApprovalDrpController(GetListUserVpService getListUserVpService, GetListUserDirekturKomiteService getListUserDirekturKomiteService, - PostCreateDrpApprovalService postCreateDrpApprovalService) { + PostCreateDrpApprovalService postCreateDrpApprovalService, + GetListApprovalDrpServie getListApprovalDrpServie) { this.getListUserVpService = getListUserVpService; this.getListUserDirekturKomiteService = getListUserDirekturKomiteService; this.postCreateDrpApprovalService = postCreateDrpApprovalService; + this.getListApprovalDrpServie = getListApprovalDrpServie; } @GetMapping("/vp") @@ -39,4 +47,18 @@ public class ApprovalDrpController { public DrpApprovalResponse createDrpApproval(@RequestBody DrpApprovalRequest drpApprovalRequest) { return postCreateDrpApprovalService.execute(drpApprovalRequest); } + + @GetMapping + public GetListDrpApprovalResponse getListDrpApprovalResponse(@RequestParam(name = "search", required = false) String search, + @RequestParam(name = "page", defaultValue = "1") Integer page, + @RequestParam(name = "size", defaultValue = "5") Integer size) { + + Pageable pageable = PageRequest.of((page - 1), size); + DrpApprovalRequest drpApprovalRequest = DrpApprovalRequest.builder() + .search(search) + .pageable(pageable) + .build(); + return getListApprovalDrpServie.execute(drpApprovalRequest); + + } } diff --git a/src/main/java/com/iconplus/smartproc/model/request/DrpApprovalRequest.java b/src/main/java/com/iconplus/smartproc/model/request/DrpApprovalRequest.java index 53df50e..036c7cc 100644 --- a/src/main/java/com/iconplus/smartproc/model/request/DrpApprovalRequest.java +++ b/src/main/java/com/iconplus/smartproc/model/request/DrpApprovalRequest.java @@ -20,5 +20,7 @@ public class DrpApprovalRequest extends BaseRequest { private Long approverKomite3Id; private Long approverKomite4Id; private Long approverDirekturId; + + private String search; private transient Pageable pageable; } diff --git a/src/main/java/com/iconplus/smartproc/model/response/GetListDrpApprovalResponse.java b/src/main/java/com/iconplus/smartproc/model/response/GetListDrpApprovalResponse.java new file mode 100644 index 0000000..b388ae9 --- /dev/null +++ b/src/main/java/com/iconplus/smartproc/model/response/GetListDrpApprovalResponse.java @@ -0,0 +1,20 @@ +package com.iconplus.smartproc.model.response; + +import com.iconplus.smartproc.helper.base.BaseResponse; +import com.iconplus.smartproc.helper.model.Pagination; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class GetListDrpApprovalResponse extends BaseResponse { + + private List data; + private Pagination pagination; +} diff --git a/src/main/java/com/iconplus/smartproc/service/approval/GetListApprovalDrpServie.java b/src/main/java/com/iconplus/smartproc/service/approval/GetListApprovalDrpServie.java index 112dab2..756e07c 100644 --- a/src/main/java/com/iconplus/smartproc/service/approval/GetListApprovalDrpServie.java +++ b/src/main/java/com/iconplus/smartproc/service/approval/GetListApprovalDrpServie.java @@ -1,21 +1,22 @@ package com.iconplus.smartproc.service.approval; +import com.iconplus.smartproc.helper.model.Pagination; import com.iconplus.smartproc.helper.service.BaseService; import com.iconplus.smartproc.model.projection.DrpApprovalView; import com.iconplus.smartproc.model.request.DrpApprovalRequest; import com.iconplus.smartproc.model.response.DrpApprovalResponse; +import com.iconplus.smartproc.model.response.GetListDrpApprovalResponse; import com.iconplus.smartproc.repository.DrpApprovalRepository; import com.iconplus.smartproc.repository.DrpRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.io.IOException; import java.util.ArrayList; import java.util.List; @Service @Slf4j -public class GetListApprovalDrpServie implements BaseService { +public class GetListApprovalDrpServie implements BaseService { private final DrpRepository drpRepository; private final DrpApprovalRepository drpApprovalRepository; @@ -28,7 +29,7 @@ public class GetListApprovalDrpServie implements BaseService drpApprovalResponseList = new ArrayList<>(); var drpApprovalViews = drpRepository.getListApprovalDrp(input.getPageable()); @@ -37,6 +38,7 @@ public class GetListApprovalDrpServie implements BaseService drpDokumenList = new ArrayList<>(); if (ObjectUtils.isNotEmpty(input.getDataDrpDokumen())) { for (DrpDokumenRequest drpDokumenRequest : input.getDataDrpDokumen()) { DrpDokumen drpDokumen = DrpDokumen.builder() - .drpId(drpSaved.getId()) + .drpId(drp.getId()) .jenisDokumenId(drpDokumenRequest.getJenisDokumenId()) .filename(drpDokumenRequest.getFilename()) .keterangan(drpDokumenRequest.getKeterangan()) @@ -58,7 +54,7 @@ public class PostCreateDrpService implements BaseService