AndriDiki/smartproc-be
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor penamaan table

Browse Source
This commit is contained in:
dirgantarasiahaan 2023-06-06 16:31:09 +07:00
parent a2c1320c27
commit 831696cc05
33 changed files with 318 additions and 410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/main/java/com/iconplus/smartproc/controller/RksDaftarIsiController.java
View File

@ -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());
}

4
src/main/java/com/iconplus/smartproc/controller/RksTemplateController.java
View File

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

36
src/main/java/com/iconplus/smartproc/model/entity/RksIsi.java → src/main/java/com/iconplus/smartproc/model/entity/RksDaftar.java
View File

@ -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")

26
src/main/java/com/iconplus/smartproc/model/entity/RksDaftarIsi.java
View File

@ -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")

4
src/main/java/com/iconplus/smartproc/model/entity/RksTemplate.java
View File

@ -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")

4
src/main/java/com/iconplus/smartproc/model/projection/RksTemplateView.java
View File

@ -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);

20
src/main/java/com/iconplus/smartproc/model/request/RksDaftarIsiRequest.java
View File

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

24
src/main/java/com/iconplus/smartproc/model/request/RksDaftarRequest.java Normal file
View File

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

38
src/main/java/com/iconplus/smartproc/model/request/RksIsiRequest.java
View File

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

2
src/main/java/com/iconplus/smartproc/model/request/RksTemplateRequest.java
View File

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

2
src/main/java/com/iconplus/smartproc/model/response/ListRksDaftarIsiResponse.java
View File

@ -15,6 +15,6 @@ import java.util.List;
@NoArgsConstructor
public class ListRksDaftarIsiResponse extends BaseResponse {
private List<RksDaftarIsiResponse> data;
private List<RksDaftarResponse> data;
private Pagination pagination;
}

2
src/main/java/com/iconplus/smartproc/model/response/ListRksIsiResponse.java
View File

@ -15,6 +15,6 @@ import java.util.List;
@NoArgsConstructor
public class ListRksIsiResponse extends BaseResponse {
private List<RksIsiResponse> data;
private List<RksDaftarIsiResponse> data;
private Pagination pagination;
}

15
src/main/java/com/iconplus/smartproc/model/response/RksDaftarIsiResponse.java
View File

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

22
src/main/java/com/iconplus/smartproc/model/response/RksDaftarResponse.java Normal file
View File

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

27
src/main/java/com/iconplus/smartproc/model/response/RksIsiResponse.java
View File

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

2
src/main/java/com/iconplus/smartproc/model/response/RksTemplateResponse.java
View File

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

28
src/main/java/com/iconplus/smartproc/repository/RksDaftarIsiRepository.java
View File

@ -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<RksDaftarIsi, Long> {
@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<RksDaftarIsiView> getListRksDaftarIsi(Pageable pageable);
Optional<RksDaftarIsi> findByKodeTemplateAndIsDeleteFalse(String kodeTemplate);
Page<RksDaftarIsi> findByRksDaftarIdAndIsDeleteFalse(Long rksDaftarIsiId, Pageable pageable);
Optional<RksDaftarIsi> findByIdAndIsDeleteFalse(Long id);
@Query(value = "SELECT rdi " +
"FROM RksDaftarIsi rdi " +
"WHERE rdi.isDelete = false " +
"AND rdi.parentId = 0")
List<RksDaftarIsi> 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);
}

31
src/main/java/com/iconplus/smartproc/repository/RksDaftarRepository.java Normal file
View File

@ -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<RksDaftar, Long> {
@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<RksDaftarIsiView> getListRksDaftarIsi(Pageable pageable);
Optional<RksDaftar> findByKodeTemplateAndIsDeleteFalse(String kodeTemplate);
Optional<RksDaftar> findByIdAndIsDeleteFalse(Long id);
}

41
src/main/java/com/iconplus/smartproc/repository/RksIsiRepository.java
View File

@ -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<RksIsi, Long> {
Page<RksIsi> findByRksDaftarIsiIdAndIsDeleteFalse(Long rksDaftarIsiId, Pageable pageable);
Optional<RksIsi> findByRksDaftarIsiIdAndNamaAndIsDeleteFalse(Long rksDaftarIsiId, String nama);
Optional<RksIsi> findByRksDaftarIsiIdAndBabAndIsDeleteFalse(Long rksDaftarIsiId, String bab);
Optional<RksIsi> findByRksDaftarIsiIdAndSubBabAndIsDeleteFalse(Long rksDaftarIsiId, String subBab);
Optional<RksIsi> findByRksDaftarIsiIdAndKelompokAndIsDeleteFalse(Long rksDaftarIsiId, String kelompok);
Optional<RksIsi> findByIdAndIsDeleteFalse(Long id);
@Query(value = "SELECT ri " +
"FROM RksIsi ri " +
"WHERE ri.isDelete = false " +
"AND ri.parentId = 0")
List<RksIsi> 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);
}

6
src/main/java/com/iconplus/smartproc/repository/RksTemplateRepository.java
View File

@ -23,11 +23,11 @@ public interface RksTemplateRepository extends JpaRepository<RksTemplate, Long>
"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<RksTemplateView> getListRksTemplate(Pageable pageable);

1
src/main/java/com/iconplus/smartproc/service/manajemenuser/PutUpdateUserService.java
View File

@ -40,7 +40,6 @@ public class PutUpdateUserService implements BaseService<UsersRequest, UsersResp
users.setRoleId(input.getRoleId());
users.setEmail(input.getEmail());
users.setTelepon(input.getTelepon());
users.setPassword(input.getPassword());
users.setIsActive(input.getIsActive());
users.setIsDelete(false);
var result = usersRepository.save(users);

22
src/main/java/com/iconplus/smartproc/service/rksdaftarisi/DeleteRksDaftarIsiService.java
View File

@ -3,37 +3,37 @@ 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.RksDaftarIsiRequest;
import com.iconplus.smartproc.model.request.RksDaftarRequest;
import com.iconplus.smartproc.repository.RksDaftarRepository;
import com.iconplus.smartproc.repository.RksDaftarIsiRepository;
import com.iconplus.smartproc.repository.RksIsiRepository;
import com.iconplus.smartproc.util.Constants;
import org.springframework.stereotype.Service;
import javax.transaction.Transactional;
@Service
public class DeleteRksDaftarIsiService implements BaseService<RksDaftarIsiRequest, EmptyResponse> {
public class DeleteRksDaftarIsiService implements BaseService<RksDaftarRequest, EmptyResponse> {
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();
}

18
src/main/java/com/iconplus/smartproc/service/rksdaftarisi/DeleteRksIsiService.java
View File

@ -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<RksIsiRequest, EmptyResponse> {
public class DeleteRksIsiService implements BaseService<RksDaftarIsiRequest, EmptyResponse> {
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<RksIsiRequest, EmptyResp
));
rksIsi.setIsDelete(true);
rksIsiRepository.save(rksIsi);
rksDaftarIsiRepository.save(rksIsi);
return new EmptyResponse();
}
}

26
src/main/java/com/iconplus/smartproc/service/rksdaftarisi/GetListRksDaftarIsiService.java
View File

@ -3,30 +3,30 @@ package com.iconplus.smartproc.service.rksdaftarisi;
import com.iconplus.smartproc.helper.model.Pagination;
import com.iconplus.smartproc.helper.service.BaseService;
import com.iconplus.smartproc.model.projection.RksDaftarIsiView;
import com.iconplus.smartproc.model.request.RksDaftarIsiRequest;
import com.iconplus.smartproc.model.request.RksDaftarRequest;
import com.iconplus.smartproc.model.response.ListRksDaftarIsiResponse;
import com.iconplus.smartproc.model.response.RksDaftarIsiResponse;
import com.iconplus.smartproc.repository.RksDaftarIsiRepository;
import com.iconplus.smartproc.model.response.RksDaftarResponse;
import com.iconplus.smartproc.repository.RksDaftarRepository;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
@Service
public class GetListRksDaftarIsiService implements BaseService<RksDaftarIsiRequest, ListRksDaftarIsiResponse> {
public class GetListRksDaftarIsiService implements BaseService<RksDaftarRequest, ListRksDaftarIsiResponse> {
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<RksDaftarIsiResponse> rksDaftarIsiResponseList = new ArrayList<>();
var rksDaftarIsiViews= rksDaftarIsiRepository.getListRksDaftarIsi(input.getPageable());
List<RksDaftarResponse> 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<RksDaftarIsiReque
.metodePengadaan(rksDaftarIsiView.getMetodePengadaan())
.versi(rksDaftarIsiView.getVersi())
.build();
rksDaftarIsiResponseList.add(rksDaftarIsiResponse);
rksDaftarResponseList.add(rksDaftarResponse);
}
return ListRksDaftarIsiResponse.builder()
.data(rksDaftarIsiResponseList)
.data(rksDaftarResponseList)
.pagination(Pagination.builder()
.pageSize(input.getPageable().getPageSize())
.currentPage(input.getPageable().getPageNumber())

47
src/main/java/com/iconplus/smartproc/service/rksdaftarisi/GetListRksIsiService.java
View File

@ -2,48 +2,45 @@ package com.iconplus.smartproc.service.rksdaftarisi;
import com.iconplus.smartproc.helper.model.Pagination;
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.repository.RksIsiRepository;
import com.iconplus.smartproc.model.response.RksDaftarIsiResponse;
import com.iconplus.smartproc.repository.RksDaftarIsiRepository;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
@Service
public class GetListRksIsiService implements BaseService<RksIsiRequest, ListRksIsiResponse> {
public class GetListRksIsiService implements BaseService<RksDaftarIsiRequest, ListRksIsiResponse> {
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<RksIsiResponse> 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<RksDaftarIsiResponse> 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())

33
src/main/java/com/iconplus/smartproc/service/rksdaftarisi/GetListRksParentService.java
View File

@ -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<RksIsiRequest, ListRksIsiResponse> {
public class GetListRksParentService implements BaseService<RksDaftarIsiRequest, ListRksIsiResponse> {
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<RksIsiResponse> rksIsiResponseList = new ArrayList<>();
var rksIsiList = rksIsiRepository.findByParentRksDaftarIsi(input.getRksDaftarIsiId());
List<RksDaftarIsiResponse> 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();
}
}

26
src/main/java/com/iconplus/smartproc/service/rksdaftarisi/PostCreateRksDaftarIsiService.java
View File

@ -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<RksDaftarIsiRequest, RksDaftarIsiResponse> {
public class PostCreateRksDaftarIsiService implements BaseService<RksDaftarRequest, RksDaftarResponse> {
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<RksDaftarIsiRe
}
RksDaftarIsi rksDaftarIsi = RksDaftarIsi.builder()
RksDaftar rksDaftar = RksDaftar.builder()
.kodeTemplate(input.getKodeTemplate())
.namaTemplate(input.getNamaTemplate())
.metodePengadaanId(input.getMetodePengadaanId())
@ -36,8 +36,8 @@ public class PostCreateRksDaftarIsiService implements BaseService<RksDaftarIsiRe
.isDelete(false)
.build();
var result = rksDaftarIsiRepository.save(rksDaftarIsi);
return RksDaftarIsiResponse.builder()
var result = rksDaftarRepository.save(rksDaftar);
return RksDaftarResponse.builder()
.id(result.getId())
.build();
}

99
src/main/java/com/iconplus/smartproc/service/rksdaftarisi/PostCreateRksIsiService.java
View File

@ -1,93 +1,40 @@
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.RksIsi;
import com.iconplus.smartproc.model.request.RksIsiRequest;
import com.iconplus.smartproc.model.response.RksIsiResponse;
import com.iconplus.smartproc.repository.RksIsiRepository;
import com.iconplus.smartproc.util.Constants;
import org.apache.commons.lang3.StringUtils;
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 org.apache.commons.lang3.ObjectUtils;
import org.springframework.stereotype.Service;
@Service
public class PostCreateRksIsiService implements BaseService<RksIsiRequest, RksIsiResponse> {
public class PostCreateRksIsiService implements BaseService<RksDaftarIsiRequest, RksDaftarIsiResponse> {
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());
}
}
}

34
src/main/java/com/iconplus/smartproc/service/rksdaftarisi/PutEditRksIsiService.java
View File

@ -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<RksIsiRequest, RksIsiResponse> {
public class PutEditRksIsiService implements BaseService<RksDaftarIsiRequest, RksDaftarIsiResponse> {
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();
}

22
src/main/java/com/iconplus/smartproc/service/rksdaftarisi/PutUpdateRksDaftarIsiService.java
View File

@ -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<RksDaftarIsiRequest, RksDaftarIsiResponse> {
public class PutUpdateRksDaftarIsiService implements BaseService<RksDaftarRequest, RksDaftarResponse> {
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<RksDaftarIsiReq
rksDaftarIsi.setMetodePengadaanId(input.getMetodePengadaanId());
rksDaftarIsi.setVersi(input.getVersi());
rksDaftarIsiRepository.save(rksDaftarIsi);
rksDaftarRepository.save(rksDaftarIsi);
return RksDaftarIsiResponse.builder()
return RksDaftarResponse.builder()
.id(rksDaftarIsi.getId())
.build();
}

2
src/main/java/com/iconplus/smartproc/service/rkstemplate/GetListRksTemplateService.java
View File

@ -34,7 +34,7 @@ public class GetListRksTemplateService implements BaseService<RksTemplateRequest
.metodePengadaanId(rksTemplateView.getMetodePengadaanId())
.metodePengadaan(rksTemplateView.getMetodePengadaan())
.versi(rksTemplateView.getVersi())
.rksDaftarIsiId(rksTemplateView.getRksDaftarIsiId())
.rksDaftarId(rksTemplateView.getRksDaftarId())
.daftarIsi(rksTemplateView.getDaftarIsi())
.isActive(rksTemplateView.getIsActive())
.build();

2
src/main/java/com/iconplus/smartproc/service/rkstemplate/PostCreateRksTemplateService.java
View File

@ -32,7 +32,7 @@ public class PostCreateRksTemplateService implements BaseService<RksTemplateRequ
.kodeTemplate(input.getKodeTemplate())
.namaTemplate(input.getNamaTemplate())
.metodePengadaanId(input.getMetodePengadaanId())
.rksDaftarIsiId(input.getRksDaftarIsiId())
.rksDaftarId(input.getRksDaftarId())
.versi(input.getVersi())
.isActive(BooleanUtils.isTrue(input.getIsActive()))
.isDelete(false)

12
src/main/java/com/iconplus/smartproc/service/rkstemplate/PutUpdateRksTemplateService.java
View File

@ -26,12 +26,12 @@ public class PutUpdateRksTemplateService implements BaseService<RksTemplateReque
String.format(Constants.ERR_MSG_10001, "RKS Template", input.getId())
));
rksTemplate.setKodeTemplate(rksTemplate.getKodeTemplate());
rksTemplate.setNamaTemplate(rksTemplate.getNamaTemplate());
rksTemplate.setRksDaftarIsiId(rksTemplate.getRksDaftarIsiId());
rksTemplate.setMetodePengadaanId(rksTemplate.getMetodePengadaanId());
rksTemplate.setVersi(rksTemplate.getVersi());
rksTemplate.setIsActive(rksTemplate.getIsActive());
rksTemplate.setKodeTemplate(input.getKodeTemplate());
rksTemplate.setNamaTemplate(input.getNamaTemplate());
rksTemplate.setRksDaftarId(input.getRksDaftarId());
rksTemplate.setMetodePengadaanId(input.getMetodePengadaanId());
rksTemplate.setVersi(input.getVersi());
rksTemplate.setIsActive(input.getIsActive());
rksTemplateRepository.save(rksTemplate);