From bab3a7a3d9f5ddcd2dc1205df744c0a40f33177a Mon Sep 17 00:00:00 2001
From: dirgantarasiahaan <siahaandirgantara@gmail.com>
Date: Mon, 29 May 2023 15:29:38 +0700
Subject: [PATCH] refactor approve status

---
 src/main/java/com/iconplus/smartproc/model/entity/Drp.java   | 5 ++---
 .../java/com/iconplus/smartproc/model/entity/DrpDokumen.java | 3 ---
 .../iconplus/smartproc/model/entity/DrpPengadaanDokumen.java | 3 ---
 .../com/iconplus/smartproc/model/projection/DrpView.java     | 4 ++--
 .../com/iconplus/smartproc/model/request/DrpRequest.java     | 2 +-
 .../com/iconplus/smartproc/model/response/DrpResponse.java   | 2 +-
 .../com/iconplus/smartproc/repository/DrpRepository.java     | 2 +-
 .../com/iconplus/smartproc/service/drp/GetDrpService.java    | 2 +-
 .../iconplus/smartproc/service/drp/GetListDrpService.java    | 2 +-
 .../smartproc/service/drp/PostCreateDrpPengadaanService.java | 1 -
 .../iconplus/smartproc/service/drp/PostCreateDrpService.java | 4 +---
 11 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/iconplus/smartproc/model/entity/Drp.java b/src/main/java/com/iconplus/smartproc/model/entity/Drp.java
index 6747558..9ff9137 100644
--- a/src/main/java/com/iconplus/smartproc/model/entity/Drp.java
+++ b/src/main/java/com/iconplus/smartproc/model/entity/Drp.java
@@ -27,9 +27,8 @@ public class Drp extends BaseEntity {
     @Column(name = "tahun")
     private Integer tahun;
 
-    @Column(name = "is_approve")
-    @Type(type = "org.hibernate.type.NumericBooleanType")
-    private Boolean isApprove;
+    @Column(name = "approve_status")
+    private String approveStatus;
 
     @Column(name = "approve_date")
     private Timestamp approveDate;
diff --git a/src/main/java/com/iconplus/smartproc/model/entity/DrpDokumen.java b/src/main/java/com/iconplus/smartproc/model/entity/DrpDokumen.java
index 0939e3c..430ed7d 100644
--- a/src/main/java/com/iconplus/smartproc/model/entity/DrpDokumen.java
+++ b/src/main/java/com/iconplus/smartproc/model/entity/DrpDokumen.java
@@ -34,9 +34,6 @@ public class DrpDokumen extends BaseEntity {
     @Column(name = "keterangan")
     private String keterangan;
 
-    @Column(name = "file")
-    private byte[] file;
-
     @Column(name = "is_active")
     @Type(type = "org.hibernate.type.NumericBooleanType")
     private Boolean isActive;
diff --git a/src/main/java/com/iconplus/smartproc/model/entity/DrpPengadaanDokumen.java b/src/main/java/com/iconplus/smartproc/model/entity/DrpPengadaanDokumen.java
index 6a42483..e89344d 100644
--- a/src/main/java/com/iconplus/smartproc/model/entity/DrpPengadaanDokumen.java
+++ b/src/main/java/com/iconplus/smartproc/model/entity/DrpPengadaanDokumen.java
@@ -31,9 +31,6 @@ public class DrpPengadaanDokumen extends BaseEntity {
     @Column(name = "filename")
     private String filename;
 
-    @Column(name = "file")
-    private byte[] file;
-
     @Column(name = "keterangan")
     private String keterangan;
 
diff --git a/src/main/java/com/iconplus/smartproc/model/projection/DrpView.java b/src/main/java/com/iconplus/smartproc/model/projection/DrpView.java
index 16bbaa5..fe0c8af 100644
--- a/src/main/java/com/iconplus/smartproc/model/projection/DrpView.java
+++ b/src/main/java/com/iconplus/smartproc/model/projection/DrpView.java
@@ -10,8 +10,8 @@ public interface DrpView {
     Integer getTahun();
     void setTahun(Integer tahun);
 
-    Boolean getIsApprove();
-    void setIsApprove(Boolean isApprove);
+    String getApproveStatus();
+    void setApproveStatus(String isApprove);
 
     Timestamp getApproveDate();
     void setApproveDate(Timestamp approveDate);
diff --git a/src/main/java/com/iconplus/smartproc/model/request/DrpRequest.java b/src/main/java/com/iconplus/smartproc/model/request/DrpRequest.java
index 8f50e6e..6183365 100644
--- a/src/main/java/com/iconplus/smartproc/model/request/DrpRequest.java
+++ b/src/main/java/com/iconplus/smartproc/model/request/DrpRequest.java
@@ -17,7 +17,7 @@ import java.util.List;
 public class DrpRequest extends BaseRequest {
     private Long id;
     private Integer tahun;
-    private Boolean isApprove;
+    private String approveStatus;
     private Timestamp approveDate;
     private Boolean isActive;
 
diff --git a/src/main/java/com/iconplus/smartproc/model/response/DrpResponse.java b/src/main/java/com/iconplus/smartproc/model/response/DrpResponse.java
index 2fd73b8..3f95e38 100644
--- a/src/main/java/com/iconplus/smartproc/model/response/DrpResponse.java
+++ b/src/main/java/com/iconplus/smartproc/model/response/DrpResponse.java
@@ -16,7 +16,7 @@ import java.util.List;
 public class DrpResponse extends BaseResponse {
     private Long id;
     private Integer tahun;
-    private Boolean isApprove;
+    private String approveStatus;
     private Timestamp approveDate;
     private Boolean isActive;
     private Boolean isDelete;
diff --git a/src/main/java/com/iconplus/smartproc/repository/DrpRepository.java b/src/main/java/com/iconplus/smartproc/repository/DrpRepository.java
index 8efc757..3922fa9 100644
--- a/src/main/java/com/iconplus/smartproc/repository/DrpRepository.java
+++ b/src/main/java/com/iconplus/smartproc/repository/DrpRepository.java
@@ -21,7 +21,7 @@ public interface DrpRepository extends JpaRepository<Drp, Long> {
 
     @Query(value = "SELECT d.id as id, " +
             "d.tahun as tahun, " +
-            "d.isApprove as isApprove, " +
+            "d.approveStatus as approveStatus, " +
             "d.approveDate as approveDate, " +
             "d.isActive as isActive, " +
             "d.isDelete as isDelete " +
diff --git a/src/main/java/com/iconplus/smartproc/service/drp/GetDrpService.java b/src/main/java/com/iconplus/smartproc/service/drp/GetDrpService.java
index fc540e0..f7976d7 100644
--- a/src/main/java/com/iconplus/smartproc/service/drp/GetDrpService.java
+++ b/src/main/java/com/iconplus/smartproc/service/drp/GetDrpService.java
@@ -49,7 +49,7 @@ public class GetDrpService implements BaseService<DrpRequest, DrpResponse> {
         return DrpResponse.builder()
                 .id(drp.getId())
                 .tahun(drp.getTahun())
-                .isApprove(drp.getIsApprove())
+                .approveStatus(drp.getApproveStatus())
                 .approveDate(drp.getApproveDate())
                 .isActive(drp.getIsActive())
                 .isDelete(drp.getIsDelete())
diff --git a/src/main/java/com/iconplus/smartproc/service/drp/GetListDrpService.java b/src/main/java/com/iconplus/smartproc/service/drp/GetListDrpService.java
index 3581ffd..04e8990 100644
--- a/src/main/java/com/iconplus/smartproc/service/drp/GetListDrpService.java
+++ b/src/main/java/com/iconplus/smartproc/service/drp/GetListDrpService.java
@@ -31,7 +31,7 @@ public class GetListDrpService implements BaseService<DrpRequest, GetListDrpResp
             DrpResponse drpResponse = DrpResponse.builder()
                     .id(drpView.getId())
                     .tahun(drpView.getTahun())
-                    .isApprove(drpView.getIsApprove())
+                    .approveStatus(drpView.getApproveStatus())
                     .approveDate(drpView.getApproveDate())
                     .isActive(drpView.getIsActive())
                     .isDelete(drpView.getIsDelete())
diff --git a/src/main/java/com/iconplus/smartproc/service/drp/PostCreateDrpPengadaanService.java b/src/main/java/com/iconplus/smartproc/service/drp/PostCreateDrpPengadaanService.java
index 5fb3611..24d2d5c 100644
--- a/src/main/java/com/iconplus/smartproc/service/drp/PostCreateDrpPengadaanService.java
+++ b/src/main/java/com/iconplus/smartproc/service/drp/PostCreateDrpPengadaanService.java
@@ -57,7 +57,6 @@ public class PostCreateDrpPengadaanService implements BaseService<DrpPengadaanRe
                         .drpId(input.getDrpId())
                         .jenisDokumenId(drpPengadaanDokumenRequest.getJenisDokumenId())
                         .filename(drpPengadaanDokumenRequest.getFilename())
-                        .file(drpPengadaanDokumenRequest.getFile())
                         .keterangan(drpPengadaanDokumenRequest.getKeterangan())
                         .isDelete(false)
                         .build();
diff --git a/src/main/java/com/iconplus/smartproc/service/drp/PostCreateDrpService.java b/src/main/java/com/iconplus/smartproc/service/drp/PostCreateDrpService.java
index b256976..cf64a50 100644
--- a/src/main/java/com/iconplus/smartproc/service/drp/PostCreateDrpService.java
+++ b/src/main/java/com/iconplus/smartproc/service/drp/PostCreateDrpService.java
@@ -47,7 +47,7 @@ public class PostCreateDrpService implements BaseService<DrpRequest, DrpResponse
 
         Drp drp = Drp.builder()
                 .tahun(input.getTahun())
-                .isApprove(false)
+                .approveStatus(input.getApproveStatus())
                 .isActive(input.getIsActive())
                 .isDelete(false)
                 .build();
@@ -61,7 +61,6 @@ public class PostCreateDrpService implements BaseService<DrpRequest, DrpResponse
                         .drpId(drpSaved.getId())
                         .jenisDokumenId(drpDokumenRequest.getJenisDokumenId())
                         .filename(drpDokumenRequest.getFilename())
-                        .file(drpDokumenRequest.getFile())
                         .keterangan(drpDokumenRequest.getKeterangan())
                         .isDelete(false)
                         .build();
@@ -77,7 +76,6 @@ public class PostCreateDrpService implements BaseService<DrpRequest, DrpResponse
                         .drpId(drpSaved.getId())
                         .jenisDokumenId(drpPengadaanDokumenRequest.getJenisDokumenId())
                         .filename(drpPengadaanDokumenRequest.getFilename())
-                        .file(drpPengadaanDokumenRequest.getFile())
                         .keterangan(drpPengadaanDokumenRequest.getKeterangan())
                         .isDelete(false)
                         .build();