fix telepon and init lupas

src/main/java/com/iconplus/smartproc/model/entity/DrpPengadaan.java

@@ -9,6 +9,7 @@ import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
 import java.math.BigDecimal;
+import java.sql.Date;
 import java.sql.Timestamp;
 
 @Data
@@ -63,10 +64,10 @@ public class DrpPengadaan extends BaseEntity {
     private Long strategiPengadaanId;
 
     @Column(name = "rencana_tanggal")
-    private Timestamp rencanaTanggal;
+    private Date rencanaTanggal;
 
     @Column(name = "target_tanggal")
-    private Timestamp targetTanggal;
+    private Date targetTanggal;
 
     @Column(name = "hpe")
     private BigDecimal hpe;

src/main/java/com/iconplus/smartproc/model/entity/Users.java

@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
+import java.sql.Timestamp;
 
 @Data
 @Builder
@@ -30,6 +31,9 @@ public class Users extends BaseEntity {
     @Column(name = "email")
     private String email;
 
+    @Column(name = "telepon")
+    private String telepon;
+
     @Column(name = "password")
     private String password;
 
@@ -45,6 +49,12 @@ public class Users extends BaseEntity {
     @Column(name = "role_id")
     private Long roleId;
 
+    @Column(name = "remember_id")
+    private String rememberId;
+
+    @Column(name = "expired_time")
+    private Timestamp expiredTime;
+
     @Column(name = "is_active")
     @Type(type = "org.hibernate.type.NumericBooleanType")
     private Boolean isActive;

src/main/java/com/iconplus/smartproc/model/projection/DrpPengadaanView.java

@@ -0,0 +1,64 @@
+package com.iconplus.smartproc.model.projection;
+
+import java.math.BigDecimal;
+import java.sql.Date;
+
+public interface DrpPengadaanView {
+
+    Long getId();
+    void setId(Long id);
+
+    Long getDrpId();
+    void setDrpId(Long drpId);
+
+    String getNomor();
+    void setNomor(String nomor);
+
+    String getNamaPengadaan();
+    void setNamaPengadaan(String namaPengadaan);
+
+    Long getLokasiId();
+    void setLokasiId(Long lokasiId);
+
+    Long getJenisPengadaanId();
+    void setJenisPengadaanId(Long jenisPengadaanId);
+
+    Long getUnitInisiatorId();
+    void setUnitInisiatorId(Long unitInisiatorId);
+
+    BigDecimal getHpe();
+    void setHpe(BigDecimal hpe);
+
+    BigDecimal getPagu();
+    void setPagu(BigDecimal pagu);
+
+    Long getSumberDanaId();
+    void setSumberDanaId(Long sumberDanaId);
+
+    Long getMetodePengadaanId();
+    void setMetodePengadaanId(Long metodePengadaanId);
+
+    Long getSupplyPositioningMatrix();
+    void setSupplyPositioningMatrix(Long supplyPositioningMatrix);
+
+    Long getMetodePenyampaianId();
+    void setMetodePenyampaianId(Long metodePenyampaianId);
+
+    Long getJenisKontrakId();
+    void setJenisKontrakId(Long jenisKontrakId);
+
+    Long getStrategiPengadaanId();
+    void setStrategiPengadaanId(Long strategiPengadaanId);
+
+    Date getRencanaTanggal();
+    void setRencanaTanggal(Date rencanaTanggal);
+
+    Date getTargetTanggal();
+    void setTargetTanggal(Date targetTanggal);
+
+    Boolean getIsActive();
+    void setIsActive(Boolean isActive);
+
+    Boolean getIsDelete();
+    void setIsDelete(Boolean isDelete);
+}

src/main/java/com/iconplus/smartproc/model/projection/UserRoleView.java

@@ -17,6 +17,7 @@ public interface UserRoleView {
     Long getRoleId();
     String getRole();
     Boolean getIsDelete();
+    String getTelepon();
 
     void setId(Long id);
     void setUsername(String username);
@@ -33,5 +34,6 @@ public interface UserRoleView {
     void setRoleId(Long roleId);
     void setRole(String role);
     void setIsDelete(Boolean isDelete);
+    void setTelepon(String telepon);
 
 }

src/main/java/com/iconplus/smartproc/model/request/DrpDokumenRequest.java

@@ -14,7 +14,6 @@ public class DrpDokumenRequest extends BaseRequest {
 
     private Long jenisDokumenId;
     private String filename;
-    private byte[] file;
     private String keterangan;
     private Boolean isDelete;
 }

src/main/java/com/iconplus/smartproc/model/request/DrpPengadaanDokumenRequest.java

@@ -19,7 +19,6 @@ public class DrpPengadaanDokumenRequest extends BaseRequest {
     private Long drpId;
     private Long jenisDokumenId;
     private String filename;
-    private byte[] file;
     private String keterangan;
     private Boolean isDelete;
 }

src/main/java/com/iconplus/smartproc/model/request/DrpPengadaanRequest.java

@@ -5,14 +5,10 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.Type;
 import org.springframework.data.domain.Pageable;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import java.math.BigDecimal;
+import java.sql.Date;
 import java.sql.Timestamp;
 import java.util.List;
 
@@ -36,8 +32,8 @@ public class DrpPengadaanRequest extends BaseRequest {
     private Long metodePenyampaianId;
     private Long jenisKontrakId;
     private Long strategiPengadaanId;
-    private Timestamp rencanaTanggal;
-    private Timestamp targetTanggal;
+    private Date rencanaTanggal;
+    private Date targetTanggal;
     private BigDecimal hpe;
     private Boolean isActive;
     private Boolean isDelete;

src/main/java/com/iconplus/smartproc/model/request/ForgotPasswordRequest.java

@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class ForgotPasswordRequest extends BaseRequest {
-    private String email;
+    private String rememberId;
     private String newPassword;
     private String confirmationPassword;
 }

src/main/java/com/iconplus/smartproc/model/request/InitForgotPasswordRequest.java

@@ -0,0 +1,16 @@
+package com.iconplus.smartproc.model.request;
+
+import com.iconplus.smartproc.helper.base.BaseRequest;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class InitForgotPasswordRequest extends BaseRequest {
+
+    private String email;
+}

src/main/java/com/iconplus/smartproc/model/request/UsersRequest.java

@@ -26,6 +26,7 @@ public class UsersRequest extends BaseRequest {
     private Long roleId;
     private String role;
     private String email;
+    private String telepon;
     private Boolean isActive;
     private String search;
     private transient Pageable pageable;

src/main/java/com/iconplus/smartproc/model/response/DrpPengadaanDokumenResponse.java

@@ -0,0 +1,23 @@
+package com.iconplus.smartproc.model.response;
+
+import com.iconplus.smartproc.helper.base.BaseResponse;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DrpPengadaanDokumenResponse extends BaseResponse {
+
+    private Long id;
+    private Long drpId;
+    private Long jenisDokumenId;
+    private String filename;
+    private String keterangan;
+    private Boolean isDelete;
+
+}

src/main/java/com/iconplus/smartproc/model/response/DrpPengadaanResponse.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
+import java.sql.Date;
 import java.sql.Timestamp;
 
 @Data
@@ -29,8 +30,8 @@ public class DrpPengadaanResponse extends BaseResponse {
     private Long metodePenyampaianId;
     private Long jenisKontrakId;
     private Long strategiPengadaanId;
-    private Timestamp rencanaTanggal;
-    private Timestamp targetTanggal;
+    private Date rencanaTanggal;
+    private Date targetTanggal;
     private BigDecimal hpe;
     private Boolean isActive;
     private Boolean isDelete;

src/main/java/com/iconplus/smartproc/model/response/DrpResponse.java

@@ -21,5 +21,7 @@ public class DrpResponse extends BaseResponse {
     private Boolean isActive;
     private Boolean isDelete;
 
-    private List<DrpDokumenResponse> data;
+    private List<DrpDokumenResponse> dataDrpDokumen;
+
+    private List<DrpPengadaanDokumenResponse> dataDrpPengadaanDokumen;
 }

src/main/java/com/iconplus/smartproc/model/response/InitForgotPasswordResponse.java

@@ -0,0 +1,17 @@
+package com.iconplus.smartproc.model.response;
+
+import com.iconplus.smartproc.helper.base.BaseResponse;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class InitForgotPasswordResponse extends BaseResponse {
+
+    private String rememberId;
+
+}

src/main/java/com/iconplus/smartproc/model/response/UsersResponse.java

@@ -28,6 +28,7 @@ public class UsersResponse extends BaseResponse {
     private String role;
 
     private String email;
+    private String telepon;
     private Boolean isActive;
     private Boolean isDelete;
 }