From 364154ac635ddeefb2ce5359bf76d6e30b3fc951 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Tue, 19 Sep 2023 16:50:09 +0700 Subject: [PATCH] Update mapping harga dan kelas Clean code --- .../dao/HargaNettoProdukByKelasDao.java | 6 ++--- .../entities/HargaNettoProdukByKelas.java | 22 ++++++++---------- .../vo/HargaNettoProdukByKelasVO.java | 23 ------------------- 3 files changed, 12 insertions(+), 39 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/HargaNettoProdukByKelasDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/HargaNettoProdukByKelasDao.java index d0f42ed7..eed9a174 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/HargaNettoProdukByKelasDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/HargaNettoProdukByKelasDao.java @@ -1,16 +1,14 @@ package com.jasamedika.medifirst2000.dao; import com.jasamedika.medifirst2000.entities.HargaNettoProdukByKelas; +import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; import java.util.List; import java.util.Map; -@Repository("HargaNettoProdukByKelasDao") -public interface HargaNettoProdukByKelasDao extends PagingAndSortingRepository { +public interface HargaNettoProdukByKelasDao extends JpaRepository { @Query("select model from HargaNettoProdukByKelas model where model.produk.id=:produkId and model.kelas.id=:kelasId " + "and model.asalProduk.id=:asalProdukId and model.jenisTarif.id=:jenisTarifId") List findProdByKelas(@Param("produkId") Integer produkId, diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/HargaNettoProdukByKelas.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/HargaNettoProdukByKelas.java index 3d325a54..5995f103 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/HargaNettoProdukByKelas.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/HargaNettoProdukByKelas.java @@ -9,6 +9,9 @@ import javax.persistence.*; import javax.validation.constraints.NotNull; import java.util.Date; +import static javax.persistence.FetchType.LAZY; +import static javax.persistence.GenerationType.SEQUENCE; + /** * class HargaNettoProdukByKelas * @@ -56,49 +59,44 @@ public class HargaNettoProdukByKelas extends BaseMaster { @Caption(value = "Harga Satuan") private Double hargaSatuan; - @ManyToOne + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectAsalProdukFk") @NotNull(message = "Kd Asal Produk tidak boleh kosong") - @Caption(value = "Object Asal Produk") private AsalProduk asalProduk; @Column(name = "ObjectAsalProdukFk", insertable = false, updatable = false) private Integer asalProdukId; - @ManyToOne + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectJenisTarifFk") @NotNull(message = "Kd Jenis Tarif tidak boleh kosong") - @Caption(value = "Object Jenis Tarif") private JenisTarif jenisTarif; @Column(name = "ObjectJenisTarifFk", insertable = false, updatable = false, nullable = false) private Integer jenisTarifId; - @ManyToOne + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectKelasFk") @NotNull(message = "Kd Kelas tidak boleh kosong") - @Caption(value = "Object Kelas") private Kelas kelas; @Column(name = "ObjectKelasFk", insertable = false, updatable = false, nullable = false) private Integer kelasId; - @ManyToOne + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectMataUangFk") - @Caption(value = "Object Mata Uang") private MataUang mataUang; @Column(name = "ObjectMataUangFk", insertable = false, updatable = false, nullable = false) private Integer mataUangId; - @ManyToOne + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectProdukFk") @NotNull(message = "Kd Produk tidak boleh kosong") - @Caption(value = "Object Produk") private Produk produk; @@ -128,8 +126,8 @@ public class HargaNettoProdukByKelas extends BaseMaster { private Date tglKadaluarsaLast; @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.harganettoprodukbykelas_m_id_seq") - @javax.persistence.SequenceGenerator(name = "public.harganettoprodukbykelas_m_id_seq", sequenceName = "public.harganettoprodukbykelas_m_id_seq", allocationSize = 1) + @GeneratedValue(strategy = SEQUENCE, generator = "public.harganettoprodukbykelas_m_id_seq") + @SequenceGenerator(name = "public.harganettoprodukbykelas_m_id_seq", sequenceName = "public.harganettoprodukbykelas_m_id_seq", allocationSize = 1) @Column(name = "id") protected Integer id; } \ No newline at end of file diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/HargaNettoProdukByKelasVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/HargaNettoProdukByKelasVO.java index edc280e6..f5546752 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/HargaNettoProdukByKelasVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/HargaNettoProdukByKelasVO.java @@ -5,10 +5,6 @@ import com.jasamedika.medifirst2000.helper.Caption; import lombok.Getter; import lombok.Setter; -import javax.persistence.Column; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.validation.constraints.NotNull; import java.util.Date; /** @@ -34,48 +30,29 @@ public class HargaNettoProdukByKelasVO extends BaseMasterVO { @Caption(value = "Harga Satuan") private Double hargaSatuan; - @ManyToOne - @JoinColumn(name = "ObjectAsalProdukFk") - @NotNull(message = "Object Asal ProdukVO Harus Diisi") @Caption(value = "Object Asal Produk") private AsalProdukVO asalProduk; - @Column(name = "ObjectAsalProdukFk", insertable = false, updatable = false) private Integer asalProdukId; - @ManyToOne - @JoinColumn(name = "ObjectJenisTarifFk") - @NotNull(message = "Object Jenis Tarif Harus Diisi") @Caption(value = "Object Jenis Tarif") private JenisTarifVO jenisTarif; - @Column(name = "ObjectJenisTarifFk", insertable = false, updatable = false) private Integer jenisTarifId; - @ManyToOne - @JoinColumn(name = "ObjectKelasFk") - @NotNull(message = "Object KelasVO Harus Diisi") @Caption(value = "Object Kelas") private KelasVO kelas; - @Column(name = "ObjectKelasFk", insertable = false, updatable = false) private Integer kelasId; - @ManyToOne - @JoinColumn(name = "ObjectMataUangFk") @Caption(value = "Object Mata Uang") private MataUangVO mataUang; - @Column(name = "ObjectMataUangFk", insertable = false, updatable = false) private Integer mataUangId; - @ManyToOne - @JoinColumn(name = "ObjectProdukFk") - @NotNull(message = "Object ProdukVO Harus Diisi") @Caption(value = "Object Produk") private ProdukVO produk; - @Column(name = "ObjectProdukFk", insertable = false, updatable = false) private Integer produkId; @Caption(value = "Persen Discount")