From f8ff638bca9e727b2b771720a5a8271bea6df2fe Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Tue, 8 Aug 2023 21:36:27 +0700 Subject: [PATCH] Update entity produk Clean code --- .../medifirst2000/dao/ProdukDao.java | 64 ++++++-------- .../medifirst2000/entities/Produk.java | 84 +++++++++---------- 2 files changed, 65 insertions(+), 83 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ProdukDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ProdukDao.java index 046027de..ef1e8cdd 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ProdukDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ProdukDao.java @@ -1,8 +1,7 @@ package com.jasamedika.medifirst2000.dao; -import java.util.List; -import java.util.Map; - +import com.jasamedika.medifirst2000.dto.*; +import com.jasamedika.medifirst2000.entities.*; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.Query; @@ -10,19 +9,8 @@ import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import com.jasamedika.medifirst2000.dto.MappingCycleDto; -import com.jasamedika.medifirst2000.dto.MesinDto; -import com.jasamedika.medifirst2000.dto.OrderAmbulanceDto; -import com.jasamedika.medifirst2000.dto.PaketDanNonPaketDto; -import com.jasamedika.medifirst2000.dto.PemakaianRumahDukaDto; -/*import com.jasamedika.medifirst2000.dto.SetAlatDanAlatCssdDto;*/ -import com.jasamedika.medifirst2000.dto.SewaLahanDto; -import com.jasamedika.medifirst2000.entities.DetailJenisProduk; -import com.jasamedika.medifirst2000.entities.Generik; -import com.jasamedika.medifirst2000.entities.JenisProduk; -import com.jasamedika.medifirst2000.entities.KelompokProduk; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.Produk; +import java.util.List; +import java.util.Map; /** * Repository class for Produk @@ -68,13 +56,13 @@ public interface ProdukDao extends PagingAndSortingRepository { String keyWord, Pageable pageable); @Query("SELECT distinct kp FROM KelompokProduk kp,JenisProduk jm ,DetailJenisProduk djp where kp.kdKelompokProduk = jm.kelompokProduk.kdKelompokProduk and djp.jenisProduk.kdJenisProduk = jm.kdJenisProduk and kp.statusEnabled=true and kp.isHavingStok =1") - public List getKelompokProdukHaveStok(); + List getKelompokProdukHaveStok(); @Query("select count(p.id) from Produk p ") - public Integer getCount(); + Integer getCount(); @Query("select NEW com.jasamedika.medifirst2000.entities.Pegawai(p.namaLengkap, p.namaPanggilan, p.nikIntern, p.nipPns, p.noIdentitas,p.npwp,p.id) from SettingDataFixed s,JenisPegawai j,Pegawai p where j.kdJenisPegawai=s.nilaiField and j.id=p.jenisPegawaiId and j.id= (Select cast(s.nilaiField as int) from SettingDataFixed s where s.namaField='KdJenisPegawaiDokter') group by p.id") - public List getAllDokter(); + List getAllDokter(); @Query("select NEW com.jasamedika.medifirst2000.entities.Produk(p.kdProduk,p.namaProduk,p.id) from Produk p where p.detailJenisProduk.id = (Select cast(s.nilaiField as int) from SettingDataFixed s where s.namaField='KdJenisLimbahInProduk')") List findProdukJenisLimbah(); @@ -349,35 +337,35 @@ public interface ProdukDao extends PagingAndSortingRepository { String sortTarifLayanan = " order by pd.namaProduk,kl.namaKelas"; @Query(strQueryTarifLayananBaru + produkTarifLayanan + kelasTarifLayanan + sortTarifLayanan) - public List> findTarifLayananKelasProduk(@Param("idRuangan") Integer idRuangan, - @Param("idProduk") Integer idProduk, @Param("idKelas") Integer idKelas); + List> findTarifLayananKelasProduk(@Param("idRuangan") Integer idRuangan, + @Param("idProduk") Integer idProduk, @Param("idKelas") Integer idKelas); @Query(strQueryTarifLayananBaru + produkTarifLayanan + sortTarifLayanan) - public List> findTarifLayananProduk(@Param("idRuangan") Integer idRuangan, - @Param("idProduk") Integer idProduk); + List> findTarifLayananProduk(@Param("idRuangan") Integer idRuangan, + @Param("idProduk") Integer idProduk); @Query(strQueryTarifLayananBaru + kelasTarifLayanan + sortTarifLayanan) - public List> findTarifLayananKelas(@Param("idRuangan") Integer idRuangan, - @Param("idKelas") Integer idKelas); + List> findTarifLayananKelas(@Param("idRuangan") Integer idRuangan, + @Param("idKelas") Integer idKelas); @Query(strQueryTarifLayananBaru + sortTarifLayanan) - public List> findTarifLayananRuangan(@Param("idRuangan") Integer idRuangan); + List> findTarifLayananRuangan(@Param("idRuangan") Integer idRuangan); @Query(strQueryTarifLayananLama + produkTarifLayanan + kelasTarifLayanan + sortTarifLayanan) - public List> findTarifLayananLamaKelasProduk(@Param("idRuangan") Integer idRuangan, - @Param("idProduk") Integer idProduk, @Param("idKelas") Integer idKelas); + List> findTarifLayananLamaKelasProduk(@Param("idRuangan") Integer idRuangan, + @Param("idProduk") Integer idProduk, @Param("idKelas") Integer idKelas); @Query(strQueryTarifLayananLama + produkTarifLayanan + sortTarifLayanan) - public List> findTarifLayananLamaProduk(@Param("idRuangan") Integer idRuangan, - @Param("idProduk") Integer idProduk); + List> findTarifLayananLamaProduk(@Param("idRuangan") Integer idRuangan, + @Param("idProduk") Integer idProduk); @Query(strQueryTarifLayananLama + kelasTarifLayanan + sortTarifLayanan) - public List> findTarifLayananLamaKelas(@Param("idRuangan") Integer idRuangan, - @Param("idKelas") Integer idKelas); + List> findTarifLayananLamaKelas(@Param("idRuangan") Integer idRuangan, + @Param("idKelas") Integer idKelas); @Query(strQueryTarifLayananLama + sortTarifLayanan) - public List> findTarifLayananLamaRuangan(@Param("idRuangan") Integer idRuangan); + List> findTarifLayananLamaRuangan(@Param("idRuangan") Integer idRuangan); String strQryCekNamaProduk = "select new Map(pd.id as id,pd.namaProduk as namaProduk) " + "from Produk pd where pd.statusEnabled is true " @@ -386,12 +374,12 @@ public interface ProdukDao extends PagingAndSortingRepository { String idProdukLama = " and pd.id <> :idProduk"; @Query(strQryCekNamaProduk) - public List> checkNamaProdukBaru(@Param("patternText") String patternText, - @Param("namaProduk") String namaProduk); + List> checkNamaProdukBaru(@Param("patternText") String patternText, + @Param("namaProduk") String namaProduk); @Query(strQryCekNamaProduk + idProdukLama) - public List> checkNamaProdukLama(@Param("patternText") String patternText, - @Param("idProduk") Integer idProduk, @Param("namaProduk") String namaProduk); + List> checkNamaProdukLama(@Param("patternText") String patternText, + @Param("idProduk") Integer idProduk, @Param("namaProduk") String namaProduk); @Query("select new Map(mpp.statusEnabled as statusEnabled," + "pd.id as idProduk,pd.namaProduk as namaProduk," + "ss.id as idSatuanStandar,ss.satuanStandar as satuanStandar," @@ -403,7 +391,7 @@ public interface ProdukDao extends PagingAndSortingRepository { + "left join djp.jenisProduk jp " + "left join jp.kelompokProduk kp " + "left join mpp.paket pk " + "left join pk.jenisPaket jpk " + "left join pd.satuanStandar ss " + "where pd.id = mpp.produkId " + "and mpp.id = :idMapping") - public Map getMappingPaketToProduk(@Param("idMapping") Integer idMapping); + Map getMappingPaketToProduk(@Param("idMapping") Integer idMapping); @Query("select distinct new Map(prd.id as id, prd.namaProduk as namaProduk) " + "from MapRuanganToProduk mpr, HargaNettoProdukByKelas hnp " + "inner join mpr.produk prd " diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Produk.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Produk.java index 25d4646a..05679f83 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Produk.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Produk.java @@ -1,29 +1,23 @@ package com.jasamedika.medifirst2000.entities; -import java.util.Date; -import java.util.HashSet; -import java.util.Set; - -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; - import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.jasamedika.medifirst2000.base.BaseMasterProduk; import com.jasamedika.medifirst2000.helper.Caption; +import javax.persistence.*; +import java.util.Date; +import java.util.HashSet; +import java.util.Set; + +import static javax.persistence.FetchType.LAZY; + /** * class Produk * * @author Generator */ -@Entity // @Audited +@Entity @Table(name = "Produk_M") @JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" }) public class Produk extends BaseMasterProduk { @@ -78,7 +72,7 @@ public class Produk extends BaseMasterProduk { } @JsonBackReference - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "produk") + @OneToMany(cascade = CascadeType.ALL, fetch = LAZY, mappedBy = "produk") private Set produkDetail = new HashSet(); public Set getProdukDetail() { @@ -89,7 +83,7 @@ public class Produk extends BaseMasterProduk { this.produkDetail = produkDetail; } - @ManyToOne + @ManyToOne(fetch = LAZY) @JoinColumn(name = "BahanSampleFk") @Caption(value = "Bahan Sample") private BahanSample bahanSample; @@ -117,7 +111,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "isProdukIntern", nullable = true) private Byte isProdukIntern; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectAccountFk") @Caption(value = "Object Account") private ChartOfAccount account; @@ -125,7 +119,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "ObjectAccountFk", insertable = false, updatable = false) private Integer accountId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectBahanProdukFk") @Caption(value = "Object Bahan Produk") private BahanProduk bahanProduk; @@ -148,7 +142,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "KdBarcode", nullable = true, length = 50) private String kdBarcode; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" }) @JoinColumn(name = "ObjectBentukProdukFk") @Caption(value = "Object Bentuk Produk") @@ -157,7 +151,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "ObjectBentukProdukFk", insertable = false, updatable = false) private Integer bentukProdukId; - @ManyToOne + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectDepartemenFk") @Caption(value = "Object Departemen") private Departemen departemen; @@ -165,7 +159,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "ObjectDepartemenFk", insertable = false, updatable = false) private Integer departemenId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectDetailGolonganProdukFk") @Caption(value = "Object Detail Golongan Produk") private DetailGolonganProduk detailGolonganProduk; @@ -173,7 +167,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "ObjectDetailGolonganProdukFk", insertable = false, updatable = false) private Integer detailGolonganProdukId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectDetailJenisProdukFk") @Caption(value = "Object Detail Jenis Produk") private DetailJenisProduk detailJenisProduk; @@ -181,7 +175,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "ObjectDetailJenisProdukFk", insertable = false, updatable = false) private Integer detailJenisProdukId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectFungsiProdukFk") @Caption(value = "Object Fungsi Produk") private FungsiProduk fungsiProduk; @@ -189,7 +183,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "ObjectFungsiProdukFk", insertable = false, updatable = false) private Integer fungsiProdukId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectGolonganProdukFk") @Caption(value = "Object Golongan Produk") private GolonganProduk golonganProduk; @@ -197,7 +191,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "ObjectGolonganProdukFk", insertable = false, updatable = false) private Integer golonganProdukId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectGProdukFk") @Caption(value = "Object G Produk") private GeneralProduk gProduk; @@ -205,7 +199,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "ObjectGProdukFk", insertable = false, updatable = false) private Integer gProdukId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectJenisPeriksaPenunjangFk") @Caption(value = "Object JenisPeriksaPenunjang") private JenisPeriksaPenunjang jenisPeriksaPenunjang; @@ -213,7 +207,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "ObjectJenisPeriksaPenunjangFk", insertable = false, updatable = false) private Integer jenisPeriksaPenunjangId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectKategoryProdukFk") @Caption(value = "Object Kategory Produk") private KategoryProduk kategoryProduk; @@ -221,7 +215,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "ObjectKategoryProdukFk", insertable = false, updatable = false) private Integer kategoryProdukId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectLevelProdukFk") @Caption(value = "Object Level Produk") private LevelProduk levelProduk; @@ -261,7 +255,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "KdProdukIntern", nullable = true, length = 15) private String kdProdukIntern; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectProdusenProdukFk") @Caption(value = "Object Produsen Produk") private ProdusenProduk produsenProduk; @@ -269,7 +263,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "ObjectProdusenProdukFk", insertable = false, updatable = false) private Integer produsenProdukId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectSatuanBesarFk") @Caption(value = "Object Satuan Besar") private SatuanBesar satuanBesar; @@ -277,7 +271,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "ObjectSatuanBesarFk", insertable = false, updatable = false) private Integer satuanBesarId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectSatuanKecilFk") @Caption(value = "Object Satuan Kecil") private SatuanKecil satuanKecil; @@ -285,7 +279,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "ObjectSatuanKecilFk", insertable = false, updatable = false) private Integer satuanKecilId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectSatuanStandarFk") @Caption(value = "Object Satuan Standar") private SatuanStandar satuanStandar; @@ -293,7 +287,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "ObjectSatuanStandarFk", insertable = false, updatable = false) private Integer satuanStandarId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectStatusProdukFk") @Caption(value = "Object Status Produk") private StatusProduk statusProduk; @@ -301,7 +295,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "ObjectStatusProdukFk", insertable = false, updatable = false) private Integer statusProdukId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectTypeProdukFk") @Caption(value = "Object Type Produk") private TypeProduk typeProduk; @@ -309,7 +303,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "ObjectTypeProdukFk", insertable = false, updatable = false) private Integer typeProdukId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectUnitLaporanFk") @Caption(value = "Object Unit Laporan") private UnitLaporan unitLaporan; @@ -317,7 +311,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "ObjectUnitLaporanFk", insertable = false, updatable = false) private Integer unitLaporanId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectWarnaProdukFk") @Caption(value = "Object Warna Produk") private WarnaProduk warnaProduk; @@ -325,7 +319,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "ObjectWarnaProdukFk", insertable = false, updatable = false) private Integer warnaProdukId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectKelompokProdukBPJSFk") @Caption(value = "Object KelompokProdukBPJS") private KelompokProdukBPJS kelompokProdukBPJS; @@ -385,7 +379,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "TglProduksi", insertable = false, updatable = false, nullable = true) private Date tglProduksi; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectGenerikFk") @Caption(value = "Object Generik") private Generik generik; @@ -393,7 +387,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "ObjectGenerikFk", insertable = false, updatable = false) private Integer generikId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectSediaanFk") @Caption(value = "Object Sediaan") private Sediaan sediaan; @@ -401,7 +395,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "ObjectSediaanFk", insertable = false, updatable = false) private Integer sediaanId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectDetailObatFk") @Caption(value = "Object Detail Obat") private DetailObat detailObat; @@ -409,7 +403,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "ObjectDetailObatFk", insertable = false, updatable = false) private Integer detailObatId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectStatusBarangFk") @Caption(value = "Object Detail Obat") private StatusBarang statusBarang; @@ -417,7 +411,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "ObjectStatusBarangFk", insertable = false, updatable = false) private Integer statusBarangId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectRekananFk") @Caption(value = "Object Rekanan") private Rekanan rekanan; @@ -425,12 +419,12 @@ public class Produk extends BaseMasterProduk { @Column(name = "ObjectRekananFk", insertable = false, updatable = false) private Integer rekananId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectMerkProdukFk") @Caption(value = "Object Merk Produk") private MerkProduk merkProduk; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "golonganDarahFk") @Caption(value = "Golongan Darah") private GolonganDarah golonganDarah; @@ -438,7 +432,7 @@ public class Produk extends BaseMasterProduk { @Column(name = "GolonganDarahFk", insertable = false, updatable = false, nullable = true) private Integer golonganDarahId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "rhesusFk") @Caption(value = "Rhesus") private Rhesus rhesus;