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