diff --git a/src/main/java/com/iconplus/smartproc/controller/RksDaftarIsiController.java b/src/main/java/com/iconplus/smartproc/controller/RksDaftarIsiController.java index cb92d34..8f5f457 100644 --- a/src/main/java/com/iconplus/smartproc/controller/RksDaftarIsiController.java +++ b/src/main/java/com/iconplus/smartproc/controller/RksDaftarIsiController.java @@ -1,8 +1,8 @@ package com.iconplus.smartproc.controller; import com.iconplus.smartproc.helper.model.EmptyResponse; +import com.iconplus.smartproc.model.request.RksDaftarRequest; import com.iconplus.smartproc.model.request.RksDaftarIsiRequest; -import com.iconplus.smartproc.model.request.RksIsiRequest; import com.iconplus.smartproc.model.response.*; import com.iconplus.smartproc.service.rksdaftarisi.*; import org.springframework.data.domain.PageRequest; @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*; @CrossOrigin(origins = "${fe.server}", allowCredentials = "true") @RestController -@RequestMapping("/api/rks/daftar-isi") +@RequestMapping("/api/rks/daftar") public class RksDaftarIsiController { private final GetListRksDaftarIsiService getListRksDaftarIsiService; @@ -49,29 +49,29 @@ public class RksDaftarIsiController { @RequestParam(name = "size", defaultValue = "5") Integer size){ Pageable pageable = PageRequest.of((page - 1), size); - RksDaftarIsiRequest rksDaftarIsiRequest = RksDaftarIsiRequest.builder() + RksDaftarRequest rksDaftarRequest = RksDaftarRequest.builder() .pageable(pageable) .build(); - return getListRksDaftarIsiService.execute(rksDaftarIsiRequest); + return getListRksDaftarIsiService.execute(rksDaftarRequest); } @PostMapping() - public RksDaftarIsiResponse createRksDaftarIsi(@RequestBody RksDaftarIsiRequest rksDaftarIsiRequest) { - return postCreateRksDaftarIsiService.execute(rksDaftarIsiRequest); + public RksDaftarResponse createRksDaftarIsi(@RequestBody RksDaftarRequest rksDaftarRequest) { + return postCreateRksDaftarIsiService.execute(rksDaftarRequest); } @PutMapping("/{id}") - public RksDaftarIsiResponse editRksDaftarIsi(@PathVariable(name = "id") Long id, - @RequestBody RksDaftarIsiRequest rksDaftarIsiRequest) { - rksDaftarIsiRequest.setId(id); - return putUpdateRksDaftarIsiService.execute(rksDaftarIsiRequest); + public RksDaftarResponse editRksDaftarIsi(@PathVariable(name = "id") Long id, + @RequestBody RksDaftarRequest rksDaftarRequest) { + rksDaftarRequest.setId(id); + return putUpdateRksDaftarIsiService.execute(rksDaftarRequest); } @DeleteMapping("/{id}") public EmptyResponse deleteRksDaftarIsi(@PathVariable(name = "id") Long id) { - return deleteRksDaftarIsiService.execute(RksDaftarIsiRequest.builder() + return deleteRksDaftarIsiService.execute(RksDaftarRequest.builder() .id(id) .build()); @@ -84,37 +84,37 @@ public class RksDaftarIsiController { @RequestParam(name = "size", defaultValue = "5") Integer size) { Pageable pageable = PageRequest.of((page - 1), size); - RksIsiRequest rksIsiRequest = RksIsiRequest.builder() - .rksDaftarIsiId(id) + RksDaftarIsiRequest rksDaftarIsiRequest = RksDaftarIsiRequest.builder() + .rksDaftarId(id) .pageable(pageable) .build(); - return getListRksIsiService.execute(rksIsiRequest); + return getListRksIsiService.execute(rksDaftarIsiRequest); } @GetMapping("/{id}/parent") public ListRksIsiResponse getParentRksIsi(@PathVariable(name = "id") Long id) { - return getListRksParentService.execute(RksIsiRequest.builder() - .rksDaftarIsiId(id) + return getListRksParentService.execute(RksDaftarIsiRequest.builder() + .rksDaftarId(id) .build()); } @PostMapping("/{id}/isi") - public RksIsiResponse createRksIsi(@PathVariable(name = "id") Long id, - @RequestBody RksIsiRequest rksIsiRequest) { - rksIsiRequest.setRksDaftarIsiId(id); - return postCreateRksIsiService.execute(rksIsiRequest); + public RksDaftarIsiResponse createRksIsi(@PathVariable(name = "id") Long id, + @RequestBody RksDaftarIsiRequest rksDaftarIsiRequest) { + rksDaftarIsiRequest.setRksDaftarId(id); + return postCreateRksIsiService.execute(rksDaftarIsiRequest); } @PutMapping("/isi/{id}") - public RksIsiResponse editRksIsi(@PathVariable(name = "id") Long id, - @RequestBody RksIsiRequest rksIsiRequest) { - rksIsiRequest.setId(id); - return putEditRksIsiService.execute(rksIsiRequest); + public RksDaftarIsiResponse editRksIsi(@PathVariable(name = "id") Long id, + @RequestBody RksDaftarIsiRequest rksDaftarIsiRequest) { + rksDaftarIsiRequest.setId(id); + return putEditRksIsiService.execute(rksDaftarIsiRequest); } @DeleteMapping("/isi/{id}") public EmptyResponse deleteRksIsi(@PathVariable(name = "id") Long id) { - return deleteRksIsiService.execute(RksIsiRequest.builder() + return deleteRksIsiService.execute(RksDaftarIsiRequest.builder() .id(id) .build()); } diff --git a/src/main/java/com/iconplus/smartproc/controller/RksTemplateController.java b/src/main/java/com/iconplus/smartproc/controller/RksTemplateController.java index 71973d6..6a81061 100644 --- a/src/main/java/com/iconplus/smartproc/controller/RksTemplateController.java +++ b/src/main/java/com/iconplus/smartproc/controller/RksTemplateController.java @@ -1,10 +1,8 @@ package com.iconplus.smartproc.controller; import com.iconplus.smartproc.helper.model.EmptyResponse; -import com.iconplus.smartproc.model.request.RksDaftarIsiRequest; import com.iconplus.smartproc.model.request.RksTemplateRequest; import com.iconplus.smartproc.model.response.ListRksTemplateResponse; -import com.iconplus.smartproc.model.response.RksDaftarIsiResponse; import com.iconplus.smartproc.model.response.RksTemplateResponse; import com.iconplus.smartproc.service.rkstemplate.DeleteRksTemplateService; import com.iconplus.smartproc.service.rkstemplate.GetListRksTemplateService; @@ -53,7 +51,7 @@ public class RksTemplateController { @PutMapping("/{id}") public RksTemplateResponse editRksTemplate(@PathVariable(name = "id") Long id, - @RequestBody RksTemplateRequest rksTemplateRequest) { + @RequestBody RksTemplateRequest rksTemplateRequest) { rksTemplateRequest.setId(id); return putUpdateRksTemplateService.execute(rksTemplateRequest); } diff --git a/src/main/java/com/iconplus/smartproc/model/entity/RksIsi.java b/src/main/java/com/iconplus/smartproc/model/entity/RksDaftar.java similarity index 51% rename from src/main/java/com/iconplus/smartproc/model/entity/RksIsi.java rename to src/main/java/com/iconplus/smartproc/model/entity/RksDaftar.java index 5c1b935..4cc01c0 100644 --- a/src/main/java/com/iconplus/smartproc/model/entity/RksIsi.java +++ b/src/main/java/com/iconplus/smartproc/model/entity/RksDaftar.java @@ -14,41 +14,25 @@ import javax.persistence.*; @AllArgsConstructor @NoArgsConstructor @Entity -@Table(name = "rks_isi") -public class RksIsi extends BaseEntity { +@Table(name = "rks_daftar") +public class RksDaftar extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") private Long id; - @Column(name = "rks_daftar_isi_id") - private Long rksDaftarIsiId; + @Column(name = "kode_template") + private String kodeTemplate; - @Column(name = "nomor") - private String nomor; + @Column(name = "nama_template") + private String namaTemplate; - @Column(name = "parent_id") - private Integer parentId; + @Column(name = "metode_pengadaan_id") + private Long metodePengadaanId; - @Column(name = "nama") - private String nama; - - @Column(name = "bab") - private String bab; - - @Column(name = "kelompok") - private String kelompok; - - @Column(name = "sub_bab") - private String subBab; - - @Column(name = "urutan") - private String urutan; - - @Column(name = "is_kontrak") - @Type(type = "org.hibernate.type.NumericBooleanType") - private Boolean isKontrak; + @Column(name = "versi") + private String versi; @Column(name = "is_active") @Type(type = "org.hibernate.type.NumericBooleanType") diff --git a/src/main/java/com/iconplus/smartproc/model/entity/RksDaftarIsi.java b/src/main/java/com/iconplus/smartproc/model/entity/RksDaftarIsi.java index 8741fe1..453938a 100644 --- a/src/main/java/com/iconplus/smartproc/model/entity/RksDaftarIsi.java +++ b/src/main/java/com/iconplus/smartproc/model/entity/RksDaftarIsi.java @@ -22,17 +22,27 @@ public class RksDaftarIsi extends BaseEntity { @Column(name = "id") private Long id; - @Column(name = "kode_template") - private String kodeTemplate; + @Column(name = "rks_daftar_id") + private Long rksDaftarId; - @Column(name = "nama_template") - private String namaTemplate; + @Column(name = "nomor") + private String nomor; - @Column(name = "metode_pengadaan_id") - private Long metodePengadaanId; + @Column(name = "parent_id") + private Integer parentId; - @Column(name = "versi") - private String versi; + @Column(name = "title") + private String title; + + @Column(name = "level") + private Integer level; + + @Column(name = "urutan") + private String urutan; + + @Column(name = "is_kontrak") + @Type(type = "org.hibernate.type.NumericBooleanType") + private Boolean isKontrak; @Column(name = "is_active") @Type(type = "org.hibernate.type.NumericBooleanType") diff --git a/src/main/java/com/iconplus/smartproc/model/entity/RksTemplate.java b/src/main/java/com/iconplus/smartproc/model/entity/RksTemplate.java index ffd9031..47cc29d 100644 --- a/src/main/java/com/iconplus/smartproc/model/entity/RksTemplate.java +++ b/src/main/java/com/iconplus/smartproc/model/entity/RksTemplate.java @@ -34,8 +34,8 @@ public class RksTemplate extends BaseEntity { @Column(name = "versi") private String versi; - @Column(name = "rks_daftar_isi_id") - private Long rksDaftarIsiId; + @Column(name = "rks_daftar_id") + private Long rksDaftarId; @Column(name = "is_active") @Type(type = "org.hibernate.type.NumericBooleanType") diff --git a/src/main/java/com/iconplus/smartproc/model/projection/RksTemplateView.java b/src/main/java/com/iconplus/smartproc/model/projection/RksTemplateView.java index ab3ce5e..6b51be5 100644 --- a/src/main/java/com/iconplus/smartproc/model/projection/RksTemplateView.java +++ b/src/main/java/com/iconplus/smartproc/model/projection/RksTemplateView.java @@ -20,8 +20,8 @@ public interface RksTemplateView { String getVersi(); void setVersi(String versi); - Long getRksDaftarIsiId(); - void setRksDaftarIsiId(Long rksDaftarIsiId); + Long getRksDaftarId(); + void setRksDaftarId(Long rksDaftarId); String getDaftarIsi(); void setDaftarIsi(String daftarIsi); diff --git a/src/main/java/com/iconplus/smartproc/model/request/RksDaftarIsiRequest.java b/src/main/java/com/iconplus/smartproc/model/request/RksDaftarIsiRequest.java index c8b4d4a..a240a4b 100644 --- a/src/main/java/com/iconplus/smartproc/model/request/RksDaftarIsiRequest.java +++ b/src/main/java/com/iconplus/smartproc/model/request/RksDaftarIsiRequest.java @@ -5,8 +5,14 @@ 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; + @Data @Builder @AllArgsConstructor @@ -14,10 +20,16 @@ import org.springframework.data.domain.Pageable; public class RksDaftarIsiRequest extends BaseRequest { private Long id; - private String kodeTemplate; - private String namaTemplate; - private Long metodePengadaanId; - private String versi; + private Long rksDaftarId; + private String nomor; + private Integer parentId; + private String parent; + private String title; + private Integer level; + private String urutan; + private Boolean isKontrak; + private Boolean isActive; + private Boolean isDelete; private transient Pageable pageable; diff --git a/src/main/java/com/iconplus/smartproc/model/request/RksDaftarRequest.java b/src/main/java/com/iconplus/smartproc/model/request/RksDaftarRequest.java new file mode 100644 index 0000000..60caf4f --- /dev/null +++ b/src/main/java/com/iconplus/smartproc/model/request/RksDaftarRequest.java @@ -0,0 +1,24 @@ +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 RksDaftarRequest extends BaseRequest { + + private Long id; + private String kodeTemplate; + private String namaTemplate; + private Long metodePengadaanId; + private String versi; + + private transient Pageable pageable; + +} diff --git a/src/main/java/com/iconplus/smartproc/model/request/RksIsiRequest.java b/src/main/java/com/iconplus/smartproc/model/request/RksIsiRequest.java deleted file mode 100644 index 2928cb4..0000000 --- a/src/main/java/com/iconplus/smartproc/model/request/RksIsiRequest.java +++ /dev/null @@ -1,38 +0,0 @@ -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.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; - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class RksIsiRequest extends BaseRequest { - - private Long id; - private Long rksDaftarIsiId; - private String nomor; - private Integer parentId; - private String parent; - private String nama; - private String bab; - private String subBab; - private String kelompok; - private String urutan; - private Boolean isKontrak; - private Boolean isActive; - private Boolean isDelete; - - private transient Pageable pageable; - -} diff --git a/src/main/java/com/iconplus/smartproc/model/request/RksTemplateRequest.java b/src/main/java/com/iconplus/smartproc/model/request/RksTemplateRequest.java index 0fdfcab..5b4781f 100644 --- a/src/main/java/com/iconplus/smartproc/model/request/RksTemplateRequest.java +++ b/src/main/java/com/iconplus/smartproc/model/request/RksTemplateRequest.java @@ -18,7 +18,7 @@ public class RksTemplateRequest extends BaseRequest { private String namaTemplate; private Long metodePengadaanId; private String versi; - private Long rksDaftarIsiId; + private Long rksDaftarId; private Boolean isActive; private Boolean isDelete; diff --git a/src/main/java/com/iconplus/smartproc/model/response/ListRksDaftarIsiResponse.java b/src/main/java/com/iconplus/smartproc/model/response/ListRksDaftarIsiResponse.java index d41d1a0..d71aa19 100644 --- a/src/main/java/com/iconplus/smartproc/model/response/ListRksDaftarIsiResponse.java +++ b/src/main/java/com/iconplus/smartproc/model/response/ListRksDaftarIsiResponse.java @@ -15,6 +15,6 @@ import java.util.List; @NoArgsConstructor public class ListRksDaftarIsiResponse extends BaseResponse { - private List data; + private List data; private Pagination pagination; } diff --git a/src/main/java/com/iconplus/smartproc/model/response/ListRksIsiResponse.java b/src/main/java/com/iconplus/smartproc/model/response/ListRksIsiResponse.java index fbd17d3..b36b3ff 100644 --- a/src/main/java/com/iconplus/smartproc/model/response/ListRksIsiResponse.java +++ b/src/main/java/com/iconplus/smartproc/model/response/ListRksIsiResponse.java @@ -15,6 +15,6 @@ import java.util.List; @NoArgsConstructor public class ListRksIsiResponse extends BaseResponse { - private List data; + private List data; private Pagination pagination; } diff --git a/src/main/java/com/iconplus/smartproc/model/response/RksDaftarIsiResponse.java b/src/main/java/com/iconplus/smartproc/model/response/RksDaftarIsiResponse.java index 755a1c3..2abc931 100644 --- a/src/main/java/com/iconplus/smartproc/model/response/RksDaftarIsiResponse.java +++ b/src/main/java/com/iconplus/smartproc/model/response/RksDaftarIsiResponse.java @@ -11,12 +11,13 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor public class RksDaftarIsiResponse extends BaseResponse { - private Long id; - private String kodeTemplate; - private String namaTemplate; - private Long metodePengadaanId; - private String metodePengadaan; - private String versi; - + private Long rksDaftarId; + private String nomor; + private Integer parentId; + private String title; + private String urutan; + private Boolean isKontrak; + private Boolean isActive; + private Boolean isDelete; } diff --git a/src/main/java/com/iconplus/smartproc/model/response/RksDaftarResponse.java b/src/main/java/com/iconplus/smartproc/model/response/RksDaftarResponse.java new file mode 100644 index 0000000..a91ffc6 --- /dev/null +++ b/src/main/java/com/iconplus/smartproc/model/response/RksDaftarResponse.java @@ -0,0 +1,22 @@ +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 RksDaftarResponse extends BaseResponse { + + private Long id; + private String kodeTemplate; + private String namaTemplate; + private Long metodePengadaanId; + private String metodePengadaan; + private String versi; + +} diff --git a/src/main/java/com/iconplus/smartproc/model/response/RksIsiResponse.java b/src/main/java/com/iconplus/smartproc/model/response/RksIsiResponse.java deleted file mode 100644 index db9182f..0000000 --- a/src/main/java/com/iconplus/smartproc/model/response/RksIsiResponse.java +++ /dev/null @@ -1,27 +0,0 @@ -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 RksIsiResponse extends BaseResponse { - private Long id; - private Long rksDaftarIsiId; - private String nomor; - private Integer parentId; - private String parent; - private String nama; - private String bab; - private String subBab; - private String kelompok; - private String urutan; - private Boolean isKontrak; - private Boolean isActive; - private Boolean isDelete; -} diff --git a/src/main/java/com/iconplus/smartproc/model/response/RksTemplateResponse.java b/src/main/java/com/iconplus/smartproc/model/response/RksTemplateResponse.java index 3a90fd1..6fe2c67 100644 --- a/src/main/java/com/iconplus/smartproc/model/response/RksTemplateResponse.java +++ b/src/main/java/com/iconplus/smartproc/model/response/RksTemplateResponse.java @@ -18,7 +18,7 @@ public class RksTemplateResponse extends BaseResponse { private Long metodePengadaanId; private String metodePengadaan; private String versi; - private Long rksDaftarIsiId; + private Long rksDaftarId; private String daftarIsi; private Boolean isActive; private Boolean isDelete; diff --git a/src/main/java/com/iconplus/smartproc/repository/RksDaftarIsiRepository.java b/src/main/java/com/iconplus/smartproc/repository/RksDaftarIsiRepository.java index 66c5e43..1127d68 100644 --- a/src/main/java/com/iconplus/smartproc/repository/RksDaftarIsiRepository.java +++ b/src/main/java/com/iconplus/smartproc/repository/RksDaftarIsiRepository.java @@ -1,12 +1,12 @@ package com.iconplus.smartproc.repository; import com.iconplus.smartproc.model.entity.RksDaftarIsi; -import com.iconplus.smartproc.model.entity.RksIsi; -import com.iconplus.smartproc.model.projection.RksDaftarIsiView; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; import java.util.List; @@ -15,19 +15,19 @@ import java.util.Optional; @Repository public interface RksDaftarIsiRepository extends JpaRepository { - @Query(value = "SELECT rki.id as id, " + - "rki.kodeTemplate as kodeTemplate, " + - "rki.namaTemplate as namaTemplate, " + - "rki.metodePengadaanId as metodePengadaanId, " + - "mp.metodePengadaan as metodePengadaan " + - "FROM RksDaftarIsi rki " + - "JOIN MetodePengadaan mp ON mp.id = rki.metodePengadaanId " + - "WHERE rki.isDelete = false " + - "ORDER BY rki.kodeTemplate") - Page getListRksDaftarIsi(Pageable pageable); - - Optional findByKodeTemplateAndIsDeleteFalse(String kodeTemplate); + Page findByRksDaftarIdAndIsDeleteFalse(Long rksDaftarIsiId, Pageable pageable); Optional findByIdAndIsDeleteFalse(Long id); + @Query(value = "SELECT rdi " + + "FROM RksDaftarIsi rdi " + + "WHERE rdi.isDelete = false " + + "AND rdi.parentId = 0") + List findByParentRksDaftarIsi(Long rksDaftarIsiId); + + @Modifying + @Query(value = "UPDATE rks_daftar_isi " + + "SET is_delete = 1 " + + "WHERE rks_daftar_id = :rksDaftarId", nativeQuery = true) + void deleteRksIsi(@Param("rksDaftarId") Long rksDaftarId); } diff --git a/src/main/java/com/iconplus/smartproc/repository/RksDaftarRepository.java b/src/main/java/com/iconplus/smartproc/repository/RksDaftarRepository.java new file mode 100644 index 0000000..40da0dc --- /dev/null +++ b/src/main/java/com/iconplus/smartproc/repository/RksDaftarRepository.java @@ -0,0 +1,31 @@ +package com.iconplus.smartproc.repository; + +import com.iconplus.smartproc.model.entity.RksDaftar; +import com.iconplus.smartproc.model.projection.RksDaftarIsiView; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +@Repository +public interface RksDaftarRepository extends JpaRepository { + + @Query(value = "SELECT rd.id as id, " + + "rd.kodeTemplate as kodeTemplate, " + + "rd.namaTemplate as namaTemplate, " + + "rd.metodePengadaanId as metodePengadaanId, " + + "mp.metodePengadaan as metodePengadaan " + + "FROM RksDaftar rd " + + "JOIN MetodePengadaan mp ON mp.id = rd.metodePengadaanId " + + "WHERE rd.isDelete = false " + + "ORDER BY rd.kodeTemplate") + Page getListRksDaftarIsi(Pageable pageable); + + Optional findByKodeTemplateAndIsDeleteFalse(String kodeTemplate); + + Optional findByIdAndIsDeleteFalse(Long id); + +} diff --git a/src/main/java/com/iconplus/smartproc/repository/RksIsiRepository.java b/src/main/java/com/iconplus/smartproc/repository/RksIsiRepository.java deleted file mode 100644 index f0c02b2..0000000 --- a/src/main/java/com/iconplus/smartproc/repository/RksIsiRepository.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.iconplus.smartproc.repository; - -import com.iconplus.smartproc.model.entity.RksIsi; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -@Repository -public interface RksIsiRepository extends JpaRepository { - - Page findByRksDaftarIsiIdAndIsDeleteFalse(Long rksDaftarIsiId, Pageable pageable); - - Optional findByRksDaftarIsiIdAndNamaAndIsDeleteFalse(Long rksDaftarIsiId, String nama); - - Optional findByRksDaftarIsiIdAndBabAndIsDeleteFalse(Long rksDaftarIsiId, String bab); - - Optional findByRksDaftarIsiIdAndSubBabAndIsDeleteFalse(Long rksDaftarIsiId, String subBab); - - Optional findByRksDaftarIsiIdAndKelompokAndIsDeleteFalse(Long rksDaftarIsiId, String kelompok); - - Optional findByIdAndIsDeleteFalse(Long id); - - @Query(value = "SELECT ri " + - "FROM RksIsi ri " + - "WHERE ri.isDelete = false " + - "AND ri.parentId = 0") - List findByParentRksDaftarIsi(Long rksDaftarIsiId); - - @Modifying - @Query(value = "UPDATE rks_isi " + - "SET is_delete = 1 " + - "WHERE rks_daftar_isi_id = :rksDaftarIsiId", nativeQuery = true) - void deleteRksIsi(@Param("rksDaftarIsiId") Long rksDaftarIsiId); -} diff --git a/src/main/java/com/iconplus/smartproc/repository/RksTemplateRepository.java b/src/main/java/com/iconplus/smartproc/repository/RksTemplateRepository.java index 41c811c..e79d600 100644 --- a/src/main/java/com/iconplus/smartproc/repository/RksTemplateRepository.java +++ b/src/main/java/com/iconplus/smartproc/repository/RksTemplateRepository.java @@ -23,11 +23,11 @@ public interface RksTemplateRepository extends JpaRepository "rt.metodePengadaanId as metodePengadaanId, " + "m.metodePengadaan as metodePengadaan, " + "rt.versi as versi, " + - "rt.rksDaftarIsiId as rksDaftarIsiId, " + - "rdi.namaTemplate as daftarIsi, " + + "rt.rksDaftarId as rksDaftarId, " + + "rd.namaTemplate as daftarIsi, " + "rt.isActive as isActive " + "FROM RksTemplate as rt " + - "JOIN RksDaftarIsi rdi ON rdi.id = rt.rksDaftarIsiId " + + "JOIN RksDaftar rd ON rd.id = rt.rksDaftarId " + "JOIN MetodePengadaan m ON m.id = rt.metodePengadaanId " + "WHERE rt.isDelete = 0") Page getListRksTemplate(Pageable pageable); diff --git a/src/main/java/com/iconplus/smartproc/service/manajemenuser/PutUpdateUserService.java b/src/main/java/com/iconplus/smartproc/service/manajemenuser/PutUpdateUserService.java index 4691d37..0697180 100644 --- a/src/main/java/com/iconplus/smartproc/service/manajemenuser/PutUpdateUserService.java +++ b/src/main/java/com/iconplus/smartproc/service/manajemenuser/PutUpdateUserService.java @@ -40,7 +40,6 @@ public class PutUpdateUserService implements BaseService { +public class DeleteRksDaftarIsiService implements BaseService { + private final RksDaftarRepository rksDaftarRepository; private final RksDaftarIsiRepository rksDaftarIsiRepository; - private final RksIsiRepository rksIsiRepository; - public DeleteRksDaftarIsiService(RksDaftarIsiRepository rksDaftarIsiRepository, - RksIsiRepository rksIsiRepository) { + public DeleteRksDaftarIsiService(RksDaftarRepository rksDaftarRepository, + RksDaftarIsiRepository rksDaftarIsiRepository) { + this.rksDaftarRepository = rksDaftarRepository; this.rksDaftarIsiRepository = rksDaftarIsiRepository; - this.rksIsiRepository = rksIsiRepository; } @Transactional @Override - public EmptyResponse execute(RksDaftarIsiRequest input) { + public EmptyResponse execute(RksDaftarRequest input) { - var rksDaftarIsi= rksDaftarIsiRepository.findByIdAndIsDeleteFalse(input.getId()) + var rksDaftarIsi= rksDaftarRepository.findByIdAndIsDeleteFalse(input.getId()) .orElseThrow(() -> new BusinessException(Constants.ERR_CODE_10001, Constants.ERR_TTL_10001, String.format(Constants.ERR_MSG_10001, "RKS Daftar Isi", input.getId()))); rksDaftarIsi.setIsDelete(true); - rksDaftarIsiRepository.save(rksDaftarIsi); - rksIsiRepository.deleteRksIsi(rksDaftarIsi.getId()); + rksDaftarRepository.save(rksDaftarIsi); + rksDaftarIsiRepository.deleteRksIsi(rksDaftarIsi.getId()); return new EmptyResponse(); } diff --git a/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/DeleteRksIsiService.java b/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/DeleteRksIsiService.java index 4a569bc..857b0d5 100644 --- a/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/DeleteRksIsiService.java +++ b/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/DeleteRksIsiService.java @@ -3,23 +3,23 @@ package com.iconplus.smartproc.service.rksdaftarisi; import com.iconplus.smartproc.exception.BusinessException; import com.iconplus.smartproc.helper.model.EmptyResponse; import com.iconplus.smartproc.helper.service.BaseService; -import com.iconplus.smartproc.model.request.RksIsiRequest; -import com.iconplus.smartproc.repository.RksIsiRepository; +import com.iconplus.smartproc.model.request.RksDaftarIsiRequest; +import com.iconplus.smartproc.repository.RksDaftarIsiRepository; import com.iconplus.smartproc.util.Constants; import org.springframework.stereotype.Service; @Service -public class DeleteRksIsiService implements BaseService { +public class DeleteRksIsiService implements BaseService { - private final RksIsiRepository rksIsiRepository; - public DeleteRksIsiService(RksIsiRepository rksIsiRepository) { - this.rksIsiRepository = rksIsiRepository; + private final RksDaftarIsiRepository rksDaftarIsiRepository; + public DeleteRksIsiService(RksDaftarIsiRepository rksDaftarIsiRepository) { + this.rksDaftarIsiRepository = rksDaftarIsiRepository; } @Override - public EmptyResponse execute(RksIsiRequest input) { + public EmptyResponse execute(RksDaftarIsiRequest input) { - var rksIsi = rksIsiRepository.findByIdAndIsDeleteFalse(input.getId()) + var rksIsi = rksDaftarIsiRepository.findByIdAndIsDeleteFalse(input.getId()) .orElseThrow(() -> new BusinessException( Constants.ERR_CODE_10001, Constants.ERR_TTL_10001, @@ -27,7 +27,7 @@ public class DeleteRksIsiService implements BaseService { +public class GetListRksDaftarIsiService implements BaseService { - private final RksDaftarIsiRepository rksDaftarIsiRepository; - public GetListRksDaftarIsiService(RksDaftarIsiRepository rksDaftarIsiRepository) { - this.rksDaftarIsiRepository = rksDaftarIsiRepository; + private final RksDaftarRepository rksDaftarRepository; + public GetListRksDaftarIsiService(RksDaftarRepository rksDaftarRepository) { + this.rksDaftarRepository = rksDaftarRepository; } @Override - public ListRksDaftarIsiResponse execute(RksDaftarIsiRequest input) { + public ListRksDaftarIsiResponse execute(RksDaftarRequest input) { - List rksDaftarIsiResponseList = new ArrayList<>(); - var rksDaftarIsiViews= rksDaftarIsiRepository.getListRksDaftarIsi(input.getPageable()); + List rksDaftarResponseList = new ArrayList<>(); + var rksDaftarIsiViews= rksDaftarRepository.getListRksDaftarIsi(input.getPageable()); for (RksDaftarIsiView rksDaftarIsiView : rksDaftarIsiViews) { - RksDaftarIsiResponse rksDaftarIsiResponse = RksDaftarIsiResponse.builder() + RksDaftarResponse rksDaftarResponse = RksDaftarResponse.builder() .id(rksDaftarIsiView.getId()) .kodeTemplate(rksDaftarIsiView.getKodeTemplate()) .namaTemplate(rksDaftarIsiView.getNamaTemplate()) @@ -34,11 +34,11 @@ public class GetListRksDaftarIsiService implements BaseService { +public class GetListRksIsiService implements BaseService { - private final RksIsiRepository rksIsiRepository; + private final RksDaftarIsiRepository rksDaftarIsiRepository; - public GetListRksIsiService(RksIsiRepository rksIsiRepository) { - this.rksIsiRepository = rksIsiRepository; + public GetListRksIsiService(RksDaftarIsiRepository rksDaftarIsiRepository) { + this.rksDaftarIsiRepository = rksDaftarIsiRepository; } @Override - public ListRksIsiResponse execute(RksIsiRequest input) { + public ListRksIsiResponse execute(RksDaftarIsiRequest input) { - List rksIsiResponseList = new ArrayList<>(); - var rksIsis = rksIsiRepository.findByRksDaftarIsiIdAndIsDeleteFalse(input.getRksDaftarIsiId(), input.getPageable()); - for (RksIsi rksIsi : rksIsis) { - RksIsiResponse rksIsiResponse = RksIsiResponse.builder() - .id(rksIsi.getId()) - .rksDaftarIsiId(rksIsi.getRksDaftarIsiId()) - .nomor(rksIsi.getNomor()) - .parentId(rksIsi.getParentId()) - .nama(rksIsi.getNama()) - .bab(rksIsi.getBab()) - .subBab(rksIsi.getSubBab()) - .urutan(rksIsi.getUrutan()) - .kelompok(rksIsi.getKelompok()) - .isKontrak(rksIsi.getIsKontrak()) + List rksDaftarIsiResponseList = new ArrayList<>(); + var rksIsis = rksDaftarIsiRepository.findByRksDaftarIdAndIsDeleteFalse(input.getRksDaftarId(), input.getPageable()); + for (RksDaftarIsi rksDaftarIsi : rksIsis) { + RksDaftarIsiResponse rksDaftarIsiResponse = RksDaftarIsiResponse.builder() + .id(rksDaftarIsi.getId()) + .rksDaftarId(rksDaftarIsi.getRksDaftarId()) + .nomor(rksDaftarIsi.getNomor()) + .parentId(rksDaftarIsi.getParentId()) + .title(rksDaftarIsi.getTitle()) + .urutan(rksDaftarIsi.getUrutan()) + .isKontrak(rksDaftarIsi.getIsKontrak()) .build(); - rksIsiResponseList.add(rksIsiResponse); + rksDaftarIsiResponseList.add(rksDaftarIsiResponse); } return ListRksIsiResponse.builder() - .data(rksIsiResponseList) + .data(rksDaftarIsiResponseList) .pagination(Pagination.builder() .pageSize(input.getPageable().getPageSize()) .currentPage(input.getPageable().getPageNumber()) diff --git a/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/GetListRksParentService.java b/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/GetListRksParentService.java index 610241d..b975268 100644 --- a/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/GetListRksParentService.java +++ b/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/GetListRksParentService.java @@ -1,41 +1,40 @@ package com.iconplus.smartproc.service.rksdaftarisi; import com.iconplus.smartproc.helper.service.BaseService; -import com.iconplus.smartproc.model.entity.RksIsi; -import com.iconplus.smartproc.model.request.RksIsiRequest; +import com.iconplus.smartproc.model.entity.RksDaftarIsi; +import com.iconplus.smartproc.model.request.RksDaftarIsiRequest; import com.iconplus.smartproc.model.response.ListRksIsiResponse; -import com.iconplus.smartproc.model.response.RksIsiResponse; +import com.iconplus.smartproc.model.response.RksDaftarIsiResponse; import com.iconplus.smartproc.repository.RksDaftarIsiRepository; -import com.iconplus.smartproc.repository.RksIsiRepository; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; @Service -public class GetListRksParentService implements BaseService { +public class GetListRksParentService implements BaseService { - private final RksIsiRepository rksIsiRepository; - public GetListRksParentService(RksIsiRepository rksIsiRepository) { - this.rksIsiRepository = rksIsiRepository; + private final RksDaftarIsiRepository rksDaftarIsiRepository; + public GetListRksParentService(RksDaftarIsiRepository rksDaftarIsiRepository) { + this.rksDaftarIsiRepository = rksDaftarIsiRepository; } @Override - public ListRksIsiResponse execute(RksIsiRequest input) { + public ListRksIsiResponse execute(RksDaftarIsiRequest input) { - List rksIsiResponseList = new ArrayList<>(); - var rksIsiList = rksIsiRepository.findByParentRksDaftarIsi(input.getRksDaftarIsiId()); + List rksDaftarIsiResponseList = new ArrayList<>(); + var rksIsiList = rksDaftarIsiRepository.findByParentRksDaftarIsi(input.getRksDaftarId()); - for (RksIsi rksIsi : rksIsiList) { - RksIsiResponse rksIsiResponse = RksIsiResponse.builder() - .id(rksIsi.getId()) - .parent(rksIsi.getNama()) + for (RksDaftarIsi rksDaftarIsi : rksIsiList) { + RksDaftarIsiResponse rksDaftarIsiResponse = RksDaftarIsiResponse.builder() + .id(rksDaftarIsi.getId()) + .title(rksDaftarIsi.getTitle()) .build(); - rksIsiResponseList.add(rksIsiResponse); + rksDaftarIsiResponseList.add(rksDaftarIsiResponse); } return ListRksIsiResponse.builder() - .data(rksIsiResponseList) + .data(rksDaftarIsiResponseList) .build(); } } diff --git a/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/PostCreateRksDaftarIsiService.java b/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/PostCreateRksDaftarIsiService.java index 9ce43f1..266a3c6 100644 --- a/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/PostCreateRksDaftarIsiService.java +++ b/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/PostCreateRksDaftarIsiService.java @@ -2,25 +2,25 @@ package com.iconplus.smartproc.service.rksdaftarisi; import com.iconplus.smartproc.exception.BusinessException; import com.iconplus.smartproc.helper.service.BaseService; -import com.iconplus.smartproc.model.entity.RksDaftarIsi; -import com.iconplus.smartproc.model.request.RksDaftarIsiRequest; -import com.iconplus.smartproc.model.response.RksDaftarIsiResponse; -import com.iconplus.smartproc.repository.RksDaftarIsiRepository; +import com.iconplus.smartproc.model.entity.RksDaftar; +import com.iconplus.smartproc.model.request.RksDaftarRequest; +import com.iconplus.smartproc.model.response.RksDaftarResponse; +import com.iconplus.smartproc.repository.RksDaftarRepository; import com.iconplus.smartproc.util.Constants; import org.springframework.stereotype.Service; @Service -public class PostCreateRksDaftarIsiService implements BaseService { +public class PostCreateRksDaftarIsiService implements BaseService { - private final RksDaftarIsiRepository rksDaftarIsiRepository; - public PostCreateRksDaftarIsiService(RksDaftarIsiRepository rksDaftarIsiRepository) { - this.rksDaftarIsiRepository = rksDaftarIsiRepository; + private final RksDaftarRepository rksDaftarRepository; + public PostCreateRksDaftarIsiService(RksDaftarRepository rksDaftarRepository) { + this.rksDaftarRepository = rksDaftarRepository; } @Override - public RksDaftarIsiResponse execute(RksDaftarIsiRequest input) { + public RksDaftarResponse execute(RksDaftarRequest input) { - var rksDaftarIsiOptional = rksDaftarIsiRepository.findByKodeTemplateAndIsDeleteFalse(input.getKodeTemplate()); + var rksDaftarIsiOptional = rksDaftarRepository.findByKodeTemplateAndIsDeleteFalse(input.getKodeTemplate()); if (rksDaftarIsiOptional.isPresent()) { throw new BusinessException(Constants.ERR_CODE_10002, Constants.ERR_TTL_10002, @@ -28,7 +28,7 @@ public class PostCreateRksDaftarIsiService implements BaseService { +public class PostCreateRksIsiService implements BaseService { - private final RksIsiRepository rksIsiRepository; - public PostCreateRksIsiService(RksIsiRepository rksIsiRepository) { - this.rksIsiRepository = rksIsiRepository; + private final RksDaftarIsiRepository rksDaftarIsiRepository; + public PostCreateRksIsiService(RksDaftarIsiRepository rksDaftarIsiRepository) { + this.rksDaftarIsiRepository = rksDaftarIsiRepository; } @Override - public RksIsiResponse execute(RksIsiRequest input) { + public RksDaftarIsiResponse execute(RksDaftarIsiRequest input) { - RksIsi rksIsi = RksIsi.builder().build(); - validasiRequest(input, rksIsi); + RksDaftarIsi rksDaftarIsi = RksDaftarIsi.builder() + .rksDaftarId(input.getRksDaftarId()) + .nomor(input.getNomor()) + .parentId(ObjectUtils.isEmpty(input.getParentId()) ? 0 : input.getParentId()) + .title(input.getTitle()) + .level(input.getLevel()) + .urutan(input.getUrutan()) + .isKontrak(input.getIsKontrak()) + .isActive(input.getIsActive()) + .isDelete(false) + .build(); - rksIsi.setRksDaftarIsiId(input.getRksDaftarIsiId()); - rksIsi.setNomor(input.getNomor()); - rksIsi.setUrutan(input.getUrutan()); - rksIsi.setIsKontrak(input.getIsKontrak()); - rksIsi.setIsDelete(false); - var result = rksIsiRepository.save(rksIsi); + var result = rksDaftarIsiRepository.save(rksDaftarIsi); - return RksIsiResponse.builder() + return RksDaftarIsiResponse.builder() .id(result.getId()) .build(); } - - private void validasiRequest(RksIsiRequest input, RksIsi rksIsi) { - if (StringUtils.isNotBlank(input.getNama())) { - var optionalRksIsi = rksIsiRepository.findByRksDaftarIsiIdAndNamaAndIsDeleteFalse(input.getRksDaftarIsiId(), input.getNama()); - if (optionalRksIsi.isPresent()) { - throw new BusinessException( - Constants.ERR_CODE_10002, - Constants.ERR_TTL_10002, - String.format(Constants.ERR_MSG_10002, "Nama Buku", input.getNama())); - } - rksIsi.setNama(input.getNama()); - rksIsi.setParentId(0); - return; - } - - if (StringUtils.isNotBlank(input.getBab())) { - var optionalRksIsi = rksIsiRepository.findByRksDaftarIsiIdAndBabAndIsDeleteFalse(input.getRksDaftarIsiId(), input.getBab()); - if (optionalRksIsi.isPresent()) { - throw new BusinessException( - Constants.ERR_CODE_10002, - Constants.ERR_TTL_10002, - String.format(Constants.ERR_MSG_10002, "Bab", input.getBab())); - } - rksIsi.setParentId(input.getParentId()); - rksIsi.setBab(input.getBab()); - return; - } - - if (StringUtils.isNotBlank(input.getSubBab())) { - - var optionalRksIsi = rksIsiRepository.findByRksDaftarIsiIdAndSubBabAndIsDeleteFalse(input.getRksDaftarIsiId(), input.getSubBab()); - if (optionalRksIsi.isPresent()) { - throw new BusinessException( - Constants.ERR_CODE_10002, - Constants.ERR_TTL_10002, - String.format(Constants.ERR_MSG_10002, "Sub Bab", input.getSubBab())); - } - rksIsi.setParentId(input.getParentId()); - rksIsi.setSubBab(input.getSubBab()); - return; - } - - if (StringUtils.isNotBlank(input.getKelompok())) { - - var optionalRksIsi = rksIsiRepository.findByRksDaftarIsiIdAndKelompokAndIsDeleteFalse(input.getRksDaftarIsiId(), input.getKelompok()); - if (optionalRksIsi.isPresent()) { - throw new BusinessException( - Constants.ERR_CODE_10002, - Constants.ERR_TTL_10002, - String.format(Constants.ERR_MSG_10002, "Sub Bab", input.getKelompok())); - } - rksIsi.setParentId(input.getParentId()); - rksIsi.setKelompok(input.getKelompok()); - } - } } diff --git a/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/PutEditRksIsiService.java b/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/PutEditRksIsiService.java index 38a01a7..98e4cb6 100644 --- a/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/PutEditRksIsiService.java +++ b/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/PutEditRksIsiService.java @@ -2,46 +2,36 @@ package com.iconplus.smartproc.service.rksdaftarisi; import com.iconplus.smartproc.exception.BusinessException; import com.iconplus.smartproc.helper.service.BaseService; -import com.iconplus.smartproc.model.request.RksIsiRequest; -import com.iconplus.smartproc.model.response.RksIsiResponse; -import com.iconplus.smartproc.repository.RksIsiRepository; +import com.iconplus.smartproc.model.request.RksDaftarIsiRequest; +import com.iconplus.smartproc.model.response.RksDaftarIsiResponse; +import com.iconplus.smartproc.repository.RksDaftarIsiRepository; import com.iconplus.smartproc.util.Constants; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @Service -public class PutEditRksIsiService implements BaseService { +public class PutEditRksIsiService implements BaseService { - private final RksIsiRepository rksIsiRepository; - public PutEditRksIsiService(RksIsiRepository rksIsiRepository) { - this.rksIsiRepository = rksIsiRepository; + private final RksDaftarIsiRepository rksDaftarIsiRepository; + public PutEditRksIsiService(RksDaftarIsiRepository rksDaftarIsiRepository) { + this.rksDaftarIsiRepository = rksDaftarIsiRepository; } @Override - public RksIsiResponse execute(RksIsiRequest input) { + public RksDaftarIsiResponse execute(RksDaftarIsiRequest input) { - var rksIsi = rksIsiRepository.findByIdAndIsDeleteFalse(input.getId()) + var rksIsi = rksDaftarIsiRepository.findByIdAndIsDeleteFalse(input.getId()) .orElseThrow(() -> new BusinessException( Constants.ERR_CODE_10001, Constants.ERR_TTL_10001, String.format(Constants.ERR_MSG_10001, "RKS Isi", input.getId()) )); - if (StringUtils.isNotBlank(input.getNama())) { - rksIsi.setNama(input.getNama()); - } else if (StringUtils.isNotBlank(input.getBab())) { - rksIsi.setBab(input.getBab()); - } else if (StringUtils.isNotBlank(input.getSubBab())) { - rksIsi.setSubBab(input.getSubBab()); - } else { - rksIsi.setKelompok(input.getKelompok()); - } - + rksIsi.setTitle(input.getTitle()); rksIsi.setUrutan(input.getUrutan()); rksIsi.setIsKontrak(input.getIsKontrak()); - rksIsiRepository.save(rksIsi); + rksDaftarIsiRepository.save(rksIsi); - return RksIsiResponse.builder() + return RksDaftarIsiResponse.builder() .id(rksIsi.getId()) .build(); } diff --git a/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/PutUpdateRksDaftarIsiService.java b/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/PutUpdateRksDaftarIsiService.java index b6ed2fc..6c8ca06 100644 --- a/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/PutUpdateRksDaftarIsiService.java +++ b/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/PutUpdateRksDaftarIsiService.java @@ -2,24 +2,24 @@ package com.iconplus.smartproc.service.rksdaftarisi; import com.iconplus.smartproc.exception.BusinessException; import com.iconplus.smartproc.helper.service.BaseService; -import com.iconplus.smartproc.model.request.RksDaftarIsiRequest; -import com.iconplus.smartproc.model.response.RksDaftarIsiResponse; -import com.iconplus.smartproc.repository.RksDaftarIsiRepository; +import com.iconplus.smartproc.model.request.RksDaftarRequest; +import com.iconplus.smartproc.model.response.RksDaftarResponse; +import com.iconplus.smartproc.repository.RksDaftarRepository; import com.iconplus.smartproc.util.Constants; import org.springframework.stereotype.Service; @Service -public class PutUpdateRksDaftarIsiService implements BaseService { +public class PutUpdateRksDaftarIsiService implements BaseService { - private final RksDaftarIsiRepository rksDaftarIsiRepository; - public PutUpdateRksDaftarIsiService(RksDaftarIsiRepository rksDaftarIsiRepository) { - this.rksDaftarIsiRepository = rksDaftarIsiRepository; + private final RksDaftarRepository rksDaftarRepository; + public PutUpdateRksDaftarIsiService(RksDaftarRepository rksDaftarRepository) { + this.rksDaftarRepository = rksDaftarRepository; } @Override - public RksDaftarIsiResponse execute(RksDaftarIsiRequest input) { + public RksDaftarResponse execute(RksDaftarRequest input) { - var rksDaftarIsi= rksDaftarIsiRepository.findByIdAndIsDeleteFalse(input.getId()) + var rksDaftarIsi= rksDaftarRepository.findByIdAndIsDeleteFalse(input.getId()) .orElseThrow(() -> new BusinessException(Constants.ERR_CODE_10001, Constants.ERR_TTL_10001, String.format(Constants.ERR_MSG_10001, "RKS Daftar Isi", input.getId()))); @@ -29,9 +29,9 @@ public class PutUpdateRksDaftarIsiService implements BaseService