refactor penamaan table
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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())
|
||||
|
||||
@@ -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())
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user