add constant status

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);
+
+    }
 }

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;
 }

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<DrpApprovalResponse> data;
+    private Pagination pagination;
+}

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<DrpApprovalRequest, DrpApprovalResponse> {
+public class GetListApprovalDrpServie implements BaseService<DrpApprovalRequest, GetListDrpApprovalResponse> {
 
     private final DrpRepository drpRepository;
     private final DrpApprovalRepository drpApprovalRepository;
@@ -28,7 +29,7 @@ public class GetListApprovalDrpServie implements BaseService<DrpApprovalRequest,
     }
 
     @Override
-    public DrpApprovalResponse execute(DrpApprovalRequest input) throws IOException {
+    public GetListDrpApprovalResponse execute(DrpApprovalRequest input) {
 
         List<DrpApprovalResponse> drpApprovalResponseList = new ArrayList<>();
         var drpApprovalViews = drpRepository.getListApprovalDrp(input.getPageable());
@@ -37,6 +38,7 @@ public class GetListApprovalDrpServie implements BaseService<DrpApprovalRequest,
                     .id(drpApprovalView.getId())
                     .drpId(drpApprovalView.getDrpId())
                     .tahun(drpApprovalView.getTahun())
+                    .approveStatus(drpApprovalView.getApproveStatus())
                     .approverVpDate(drpApprovalView.getApproverVpDate())
                     .approverKomite1Date(drpApprovalView.getApproverKomite1Date())
                     .approverKomite2Date(drpApprovalView.getApproverKomite2Date())
@@ -44,9 +46,19 @@ public class GetListApprovalDrpServie implements BaseService<DrpApprovalRequest,
                     .approverKomite4Date(drpApprovalView.getApproverKomite4Date())
                     .approverDirekturDate(drpApprovalView.getApproverDirekturDate())
                     .build();
+            drpApprovalResponseList.add(drpApprovalResponse);
         }
-        return null;
-
 
+        return GetListDrpApprovalResponse.builder()
+                .data(drpApprovalResponseList)
+                .pagination(Pagination.builder()
+                        .pageSize(input.getPageable().getPageSize())
+                        .currentPage(input.getPageable().getPageNumber())
+                        .totalPages(drpApprovalViews.getTotalPages())
+                        .totalRecords(drpApprovalViews.getTotalElements())
+                        .isFirstPage(drpApprovalViews.isFirst())
+                        .isLastPage(drpApprovalViews.isLast())
+                        .build())
+                .build();
     }
 }

src/main/java/com/iconplus/smartproc/service/drp/PostCreateDrpService.java

@@ -35,16 +35,12 @@ public class PostCreateDrpService implements BaseService<DrpRequest, DrpResponse
                         Constants.ERR_TTL_10001,
                         String.format(Constants.ERR_MSG_10001, "DRP", input.getId())));
 
-        drp.setApproveStatus(input.getApproveStatus());
-        drp.setIsActive(input.getIsActive());
-
-        var drpSaved = drpRepository.save(drp);
 
         List<DrpDokumen> 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<DrpRequest, DrpResponse
         drpDokumenRepository.saveAll(drpDokumenList);
 
         return DrpResponse.builder()
-                .id(drpSaved.getId())
+                .id(drp.getId())
                 .build();
     }
 }

src/main/java/com/iconplus/smartproc/service/drp/PostCreateTahunDrpService.java

@@ -25,6 +25,7 @@ public class PostCreateTahunDrpService implements BaseService<DrpRequest, DrpRes
 
         Drp drp = Drp.builder()
                 .tahun(input.getTahun())
+                .approveStatus(Constants.STATUS_PENYUSUNAN)
                 .isDelete(false)
                 .build();
 

src/main/java/com/iconplus/smartproc/util/Constants.java

@@ -79,4 +79,10 @@ public class Constants {
     public static final String JABATAN_VP = "%VP%";
     public static final String JABATAN_DIREKTUR_KOMITE = "%DIR%";
 
+    public static final String STATUS_PENYUSUNAN = "Penyusunan";
+    public static final String STATUS_APPROVAL_VP = "Approval VP";
+    public static final String STATUS_REKOMENDASI_KOMITE = "Rekomendasi Komite";
+    public static final String STATUS_APPROVAL_DIRUT = "Approval DIRUT";
+    public static final String STATUS_APPROVED = "Approved";
+    public static final String STATUS_REVISI_DRP = "Revisi DRP";
 }