refactor v2

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

@@ -0,0 +1,38 @@
+package com.iconplus.smartproc.model.entity;
+
+import com.iconplus.smartproc.helper.base.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Type;
+
+import javax.persistence.*;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@Table(name = "bidang")
+public class Bidang extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    @Column(name = "bidang")
+    private String bidang;
+
+    @Column(name = "keterangan")
+    private String keterangan;
+
+    @Column(name = "is_active")
+    @Type(type = "org.hibernate.type.NumericBooleanType")
+    private Boolean isActive;
+
+    @Column(name = "is_delete")
+    @Type(type = "org.hibernate.type.NumericBooleanType")
+    private Boolean isDelete;
+}

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

@@ -0,0 +1,38 @@
+package com.iconplus.smartproc.model.entity;
+
+import com.iconplus.smartproc.helper.base.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Type;
+
+import javax.persistence.*;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@Table(name = "instansi")
+public class Instansi extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    @Column(name = "instansi")
+    private String instansi;
+
+    @Column(name = "keterangan")
+    private String keterangan;
+
+    @Column(name = "is_active")
+    @Type(type = "org.hibernate.type.NumericBooleanType")
+    private Boolean isActive;
+
+    @Column(name = "is_delete")
+    @Type(type = "org.hibernate.type.NumericBooleanType")
+    private Boolean isDelete;
+}

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

@@ -19,7 +19,7 @@ public class JenisAnggaran extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
-    private long id;
+    private Long id;
 
     @Column(name = "jenis_anggaran")
     private String jenisAnggaran;
@@ -27,8 +27,12 @@ public class JenisAnggaran extends BaseEntity {
     @Column(name = "keterangan")
     private String keterangan;
 
-    @Column(name = "deleted")
+    @Column(name = "is_active")
     @Type(type = "org.hibernate.type.NumericBooleanType")
-    private Boolean deleted;
+    private Boolean isActive;
+
+    @Column(name = "is_delete")
+    @Type(type = "org.hibernate.type.NumericBooleanType")
+    private Boolean isDelete;
 
 }

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

@@ -1,8 +1,10 @@
 package com.iconplus.smartproc.model.entity;
 
 import com.iconplus.smartproc.helper.base.BaseEntity;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
@@ -11,11 +13,13 @@ import javax.persistence.*;
 @Table(name = "jenis_kontrak")
 @Data
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class JenisKontrak extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
-    private long id;
+    private Long id;
 
     @Column(name = "jenis_kontrak")
     private String jenisKontrak;
@@ -23,8 +27,12 @@ public class JenisKontrak extends BaseEntity {
     @Column(name = "keterangan")
 	private String keterangan;
 
-    @Column(name = "deleted")
+    @Column(name = "is_active")
     @Type(type = "org.hibernate.type.NumericBooleanType")
-    private Boolean deleted;
+    private Boolean isActive;
+
+    @Column(name = "is_delete")
+    @Type(type = "org.hibernate.type.NumericBooleanType")
+    private Boolean isDelete;
 
 }

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

@@ -1,8 +1,10 @@
 package com.iconplus.smartproc.model.entity;
 
 import com.iconplus.smartproc.helper.base.BaseEntity;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
@@ -11,6 +13,8 @@ import javax.persistence.*;
 @Table(name = "jenis_pengadaan")
 @Data
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class JenisPengadaan extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -23,8 +27,12 @@ public class JenisPengadaan extends BaseEntity {
     @Column(name = "keterangan")
     private String keterangan;
 
-    @Column(name = "deleted")
+    @Column(name = "is_active")
     @Type(type = "org.hibernate.type.NumericBooleanType")
-    private Boolean deleted;
+    private Boolean isActive;
+
+    @Column(name = "is_delete")
+    @Type(type = "org.hibernate.type.NumericBooleanType")
+    private Boolean isDelete;
 
 }

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

@@ -1,8 +1,10 @@
 package com.iconplus.smartproc.model.entity;
 
 import com.iconplus.smartproc.helper.base.BaseEntity;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
@@ -11,11 +13,13 @@ import javax.persistence.*;
 @Table(name = "lokasi")
 @Data
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class Lokasi extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
-    private long id;
+    private Long id;
 
     @Column(name = "lokasi")
     private String lokasi;
@@ -23,8 +27,12 @@ public class Lokasi extends BaseEntity {
     @Column(name = "keterangan")
     private String keterangan;
 
-    @Column(name = "deleted")
+    @Column(name = "is_active")
     @Type(type = "org.hibernate.type.NumericBooleanType")
-    private Boolean deleted;
+    private Boolean isActive;
+
+    @Column(name = "is_delete")
+    @Type(type = "org.hibernate.type.NumericBooleanType")
+    private Boolean isDelete;
 
 }

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

@@ -1,8 +1,10 @@
 package com.iconplus.smartproc.model.entity;
 
 import com.iconplus.smartproc.helper.base.BaseEntity;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
@@ -11,6 +13,8 @@ import javax.persistence.*;
 @Table(name = "metode_pengadaan")
 @Data
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class MetodePengadaan extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -23,8 +27,8 @@ public class MetodePengadaan extends BaseEntity {
     @Column(name = "keterangan")
     private String keterangan;
 
-    @Column(name = "deleted")
+    @Column(name = "is_active")
     @Type(type = "org.hibernate.type.NumericBooleanType")
-    private Boolean deleted;
+    private Boolean isDelete;
 
 }

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

@@ -2,8 +2,10 @@ package com.iconplus.smartproc.model.entity;
 
 
 import com.iconplus.smartproc.helper.base.BaseEntity;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
@@ -12,6 +14,8 @@ import javax.persistence.*;
 @Table(name = "metode_penyampaian")
 @Data
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class MetodePenyampaian extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -24,8 +28,12 @@ public class MetodePenyampaian extends BaseEntity {
     @Column(name = "keterangan")
     private String keterangan;
 
-    @Column(name = "deleted")
+    @Column(name = "is_active")
     @Type(type = "org.hibernate.type.NumericBooleanType")
-    private Boolean deleted;
+    private Boolean isActive;
+
+    @Column(name = "is_delete")
+    @Type(type = "org.hibernate.type.NumericBooleanType")
+    private Boolean isDelete;
 
 }

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

@@ -1,21 +1,25 @@
 package com.iconplus.smartproc.model.entity;
 
 import com.iconplus.smartproc.helper.base.BaseEntity;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
 
-@Entity
-@Table(name = "roles")
 @Data
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@Table(name = "roles")
 public class Roles extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
-    private long id;
+    private Long id;
 
     @Column(name = "role")
     private String role;
@@ -27,8 +31,8 @@ public class Roles extends BaseEntity {
     @Type(type = "org.hibernate.type.NumericBooleanType")
     private Boolean isActive;
 
-    @Column(name = "deleted")
+    @Column(name = "is_delete")
     @Type(type = "org.hibernate.type.NumericBooleanType")
-    private Boolean deleted;
+    private Boolean isDelete;
 
 }

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

@@ -1,8 +1,10 @@
 package com.iconplus.smartproc.model.entity;
 
 import com.iconplus.smartproc.helper.base.BaseEntity;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
@@ -11,6 +13,8 @@ import javax.persistence.*;
 @Table(name = "strategi_pengadaan")
 @Data
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class StrategiPengadaan extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -23,8 +27,12 @@ public class StrategiPengadaan extends BaseEntity {
     @Column(name = "keterangan")
     private String keterangan;
 
-    @Column(name = "deleted")
+    @Column(name = "is_active")
     @Type(type = "org.hibernate.type.NumericBooleanType")
-    private Boolean deleted;
+    private Boolean isActive;
+
+    @Column(name = "is_delete")
+    @Type(type = "org.hibernate.type.NumericBooleanType")
+    private Boolean isDelete;
 
 }

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

@@ -1,8 +1,10 @@
 package com.iconplus.smartproc.model.entity;
 
 import com.iconplus.smartproc.helper.base.BaseEntity;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
@@ -11,6 +13,8 @@ import javax.persistence.*;
 @Table(name = "sumber_dana")
 @Data
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class SumberDana extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -23,8 +27,12 @@ public class SumberDana extends BaseEntity {
     @Column(name = "keterangan")
     private String keterangan;
 
-    @Column(name = "deleted")
+    @Column(name = "is_active")
     @Type(type = "org.hibernate.type.NumericBooleanType")
-    private Boolean deleted;
+    private Boolean isActive;
+
+    @Column(name = "is_delete")
+    @Type(type = "org.hibernate.type.NumericBooleanType")
+    private Boolean isDelete;
 
 }

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

@@ -1,8 +1,10 @@
 package com.iconplus.smartproc.model.entity;
 
 import com.iconplus.smartproc.helper.base.BaseEntity;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
@@ -11,6 +13,8 @@ import javax.persistence.*;
 @Table(name = "supply_positioning_matrix")
 @Data
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class SupplyPositioningMatrix extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -23,8 +27,12 @@ public class SupplyPositioningMatrix extends BaseEntity {
     @Column(name = "keterangan")
 	private String keterangan;
 
-    @Column(name = "deleted")
+    @Column(name = "is_active")
     @Type(type = "org.hibernate.type.NumericBooleanType")
-    private Boolean deleted;
+    private Boolean isActive;
+
+    @Column(name = "is_delete")
+    @Type(type = "org.hibernate.type.NumericBooleanType")
+    private Boolean isDelete;
 
 }

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

@@ -45,7 +45,7 @@ public class TokenManagement extends BaseEntity {
     @Column(name = "expired_time")
     private Timestamp expiredTime;
 
-    @Column(name = "deleted")
+    @Column(name = "is_delete")
     @Type(type = "org.hibernate.type.NumericBooleanType")
-    private Boolean deleted;
+    private Boolean isDelete;
 }

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

@@ -1,8 +1,10 @@
 package com.iconplus.smartproc.model.entity;
 
 import com.iconplus.smartproc.helper.base.BaseEntity;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
@@ -11,6 +13,8 @@ import javax.persistence.*;
 @Table(name = "unit_inisiator")
 @Data
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class UnitInisiator extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -23,8 +27,12 @@ public class UnitInisiator extends BaseEntity {
     @Column(name = "keterangan")
     private String keterangan;
 
-    @Column(name = "deleted")
+    @Column(name = "is_active")
     @Type(type = "org.hibernate.type.NumericBooleanType")
-    private Boolean deleted;
+    private Boolean isActive;
+
+    @Column(name = "is_delete")
+    @Type(type = "org.hibernate.type.NumericBooleanType")
+    private Boolean isDelete;
 
 }

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

@@ -1,27 +1,31 @@
 package com.iconplus.smartproc.model.entity;
 
 import com.iconplus.smartproc.helper.base.BaseEntity;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
 
-@Entity
-@Table(name = "users")
 @Data
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@Table(name = "users")
 public class Users extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
-    private long id;
+    private Long id;
 
     @Column(name = "username")
     private String username;
 
-    @Column(name = "fullname")
-    private String fullname;
+    @Column(name = "nama")
+    private String nama;
 
     @Column(name = "email")
     private String email;
@@ -30,10 +34,10 @@ public class Users extends BaseEntity {
     private String password;
 
     @Column(name = "instansi_id")
-    private String instansiId;
+    private Long instansiId;
 
     @Column(name = "bidang_id")
-    private String bidangId;
+    private Long bidangId;
 
     @Column(name = "jabatan")
     private String jabatan;
@@ -45,7 +49,7 @@ public class Users extends BaseEntity {
     @Type(type = "org.hibernate.type.NumericBooleanType")
     private Boolean isActive;
 
-    @Column(name = "deleted")
+    @Column(name = "is_delete")
     @Type(type = "org.hibernate.type.NumericBooleanType")
-    private Boolean deleted;
+    private Boolean isDelete;
 }

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

@@ -5,10 +5,12 @@ public interface JenisAnggaranView {
     Long getId();
     String getJenisAnggaran();
     String getKeterangan();
-    Boolean getDeleted();
+    String getIsActive();
+    Boolean getIsDelete();
 
     void setId(Long id);
     void setJenisAnggaran(String jenisAnggaran);
     void setKeterangan(String keterangan);
-    void setDeleted(Boolean deleted);
+    void setIsActive(Boolean isActive);
+    void setIsDelete(Boolean isDelete);
 }

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

@@ -0,0 +1,16 @@
+package com.iconplus.smartproc.model.projection;
+
+public interface RolesView {
+
+    Long getId();
+    String getRole();
+    String getKeterangan();
+    Boolean getIsActive();
+    Boolean getIsDelete();
+
+    void setId(Long id);
+    void setRole(String role);
+    void setKeterangan(String keterangan);
+    void setIsActive(Boolean isActive);
+    void setIsDelete(Boolean isDelete);
+}

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

@@ -4,16 +4,32 @@ public interface UserRoleView {
 
     Long getId();
     String getUsername();
+    String getNama();
+    String getEmail();
+    Long getInstansiId();
+    String getInstansi();
+    Long getBidangId();
+    String getBidang();
+    String getJabatan();
+    Boolean getIsActive();
     String getPassword();
     Long getRoleId();
     String getRole();
-    Boolean getDeleted();
+    Boolean getIsDelete();
 
     void setId(Long id);
     void setUsername(String username);
+    void setNama(String nama);
+    void setEmail(String email);
+    void setInstatnsi(String instansi);
+    void setBidang(String bidang);
+    void setJabatan(String Jabatan);
+    void setInstatnsiId(Long instansiId);
+    void setBidangId(Long bidangId);
+    void setIsActive(Boolean isActive);
     void setPassword(String password);
     void setRoleId(Long roleId);
     void setRole(String role);
-    void setDeleted(Boolean deleted);
+    void setIsDelete(Boolean isDelete);
 
 }

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

@@ -13,7 +13,7 @@ public class JenisAnggaranRequest extends BaseRequest {
     private String jenisAnggaran;
     private String keterangan;
     private Boolean isActive;
-    private Boolean deleted;
+    private Boolean isDelete;
     private String search;
     private transient Pageable pageable;
 }

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

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.data.domain.Pageable;
 
 @Data
 @Builder
@@ -16,6 +17,8 @@ public class RolesRequest extends BaseRequest {
     private String role;
     private String keterangan;
     private Boolean isActive;
-    private Boolean deleted;
+    private Boolean isDelete;
+    private String search;
+    private transient Pageable pageable;
 
 }

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

@@ -0,0 +1,27 @@
+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;
+import org.springframework.data.domain.Pageable;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class UsersRequest extends BaseRequest {
+
+    private Long id;
+    private String username;
+    private String instansi;
+    private String bidang;
+    private String nama;
+    private String jabatan;
+    private String role;
+    private String email;
+    private Boolean isActive;
+    private String search;
+    private transient Pageable pageable;
+}

src/main/java/com/iconplus/smartproc/model/response/GetRolesResponse.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 GetRolesResponse extends BaseResponse {
+
+    private List<RolesResponse> data;
+    private Pagination pagination;
+}

src/main/java/com/iconplus/smartproc/model/response/GetUsersResponse.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 GetUsersResponse extends BaseResponse {
+
+    private List<UsersResponse> data;
+    private Pagination pagination;
+}

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

@@ -16,6 +16,6 @@ public class JenisAnggaranResponse extends BaseResponse {
     private String jenisAnggaran;
     private String keterangan;
     private Boolean isActive;
-    private Boolean deleted;
+    private Boolean isDelete;
 
 }

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

@@ -16,6 +16,6 @@ public class RolesResponse extends BaseResponse {
     private String role;
     private String keterangan;
     private Boolean isActive;
-    private Boolean deleted;
+    private Boolean isDelete;
 
 }

src/main/java/com/iconplus/smartproc/model/response/UsersResponse.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 UsersResponse extends BaseResponse {
+    private Long id;
+    private String instansi;
+    private String bidang;
+    private String nama;
+    private String jabatan;
+    private String role;
+    private String email;
+    private Boolean isActive;
+    private Boolean isDelete;
+}