fix telepon and init lupas
This commit is contained in:
@@ -3,10 +3,14 @@ package com.iconplus.smartproc.service.drp;
|
||||
import com.iconplus.smartproc.exception.BusinessException;
|
||||
import com.iconplus.smartproc.helper.service.BaseService;
|
||||
import com.iconplus.smartproc.model.entity.DrpDokumen;
|
||||
import com.iconplus.smartproc.model.entity.DrpPengadaanDokumen;
|
||||
import com.iconplus.smartproc.model.request.DrpRequest;
|
||||
import com.iconplus.smartproc.model.response.DrpDokumenResponse;
|
||||
import com.iconplus.smartproc.model.response.DrpPengadaanDokumenResponse;
|
||||
import com.iconplus.smartproc.model.response.DrpPengadaanResponse;
|
||||
import com.iconplus.smartproc.model.response.DrpResponse;
|
||||
import com.iconplus.smartproc.repository.DrpDokumenRepository;
|
||||
import com.iconplus.smartproc.repository.DrpPengadaanDokumenRepository;
|
||||
import com.iconplus.smartproc.repository.DrpRepository;
|
||||
import com.iconplus.smartproc.util.Constants;
|
||||
import org.springframework.stereotype.Service;
|
||||
@@ -19,11 +23,14 @@ public class GetDrpService implements BaseService<DrpRequest, DrpResponse> {
|
||||
|
||||
private final DrpRepository drpRepository;
|
||||
private final DrpDokumenRepository drpDokumenRepository;
|
||||
private final DrpPengadaanDokumenRepository drpPengadaanDokumenRepository;
|
||||
|
||||
public GetDrpService(DrpRepository drpRepository,
|
||||
DrpDokumenRepository drpDokumenRepository) {
|
||||
DrpDokumenRepository drpDokumenRepository,
|
||||
DrpPengadaanDokumenRepository drpPengadaanDokumenRepository) {
|
||||
this.drpRepository = drpRepository;
|
||||
this.drpDokumenRepository = drpDokumenRepository;
|
||||
this.drpPengadaanDokumenRepository = drpPengadaanDokumenRepository;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -33,8 +40,41 @@ public class GetDrpService implements BaseService<DrpRequest, DrpResponse> {
|
||||
Constants.ERR_TTL_10001,
|
||||
String.format(Constants.ERR_MSG_10001, "DRP", input.getId())));
|
||||
|
||||
var drpDokumenList = drpDokumenRepository.findByDrpIdAndIsDeleteFalse(input.getId());
|
||||
List<DrpDokumenResponse> drpDokumenResponseList = new ArrayList<>();
|
||||
setDrpDokumen(input, drpDokumenResponseList);
|
||||
|
||||
List<DrpPengadaanDokumenResponse> drpPengadaanDokumenResponseList = new ArrayList<>();
|
||||
setDrpPengadaanDokumen(input, drpPengadaanDokumenResponseList);
|
||||
|
||||
|
||||
return DrpResponse.builder()
|
||||
.id(drp.getId())
|
||||
.tahun(drp.getTahun())
|
||||
.approveStatus(drp.getApproveStatus())
|
||||
.approveDate(drp.getApproveDate())
|
||||
.isActive(drp.getIsActive())
|
||||
.isDelete(drp.getIsDelete())
|
||||
.dataDrpDokumen(drpDokumenResponseList)
|
||||
.dataDrpPengadaanDokumen(drpPengadaanDokumenResponseList)
|
||||
.build();
|
||||
}
|
||||
|
||||
private void setDrpPengadaanDokumen(DrpRequest input, List<DrpPengadaanDokumenResponse> drpPengadaanDokumenResponseList) {
|
||||
var drpPengadaanDokumenList = drpPengadaanDokumenRepository.findByDrpIdAndIsDeleteFalse(input.getId());
|
||||
|
||||
for (DrpPengadaanDokumen drpPengadaanDokumen : drpPengadaanDokumenList) {
|
||||
DrpPengadaanDokumenResponse drpPengadaanDokumenResponse = DrpPengadaanDokumenResponse.builder()
|
||||
.id(drpPengadaanDokumen.getId())
|
||||
.drpId(drpPengadaanDokumen.getDrpId())
|
||||
.jenisDokumenId(drpPengadaanDokumen.getJenisDokumenId())
|
||||
.filename(drpPengadaanDokumen.getFilename())
|
||||
.build();
|
||||
drpPengadaanDokumenResponseList.add(drpPengadaanDokumenResponse);
|
||||
}
|
||||
}
|
||||
|
||||
private void setDrpDokumen(DrpRequest input, List<DrpDokumenResponse> drpDokumenResponseList) {
|
||||
var drpDokumenList = drpDokumenRepository.findByDrpIdAndIsDeleteFalse(input.getId());
|
||||
|
||||
for (DrpDokumen drpDokumen : drpDokumenList) {
|
||||
DrpDokumenResponse drpDokumenResponse = DrpDokumenResponse.builder()
|
||||
@@ -45,15 +85,5 @@ public class GetDrpService implements BaseService<DrpRequest, DrpResponse> {
|
||||
.build();
|
||||
drpDokumenResponseList.add(drpDokumenResponse);
|
||||
}
|
||||
|
||||
return DrpResponse.builder()
|
||||
.id(drp.getId())
|
||||
.tahun(drp.getTahun())
|
||||
.approveStatus(drp.getApproveStatus())
|
||||
.approveDate(drp.getApproveDate())
|
||||
.isActive(drp.getIsActive())
|
||||
.isDelete(drp.getIsDelete())
|
||||
.data(drpDokumenResponseList)
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
@@ -0,0 +1,23 @@
|
||||
package com.iconplus.smartproc.service.drp;
|
||||
|
||||
import com.iconplus.smartproc.helper.service.BaseService;
|
||||
import com.iconplus.smartproc.model.request.DrpPengadaanRequest;
|
||||
import com.iconplus.smartproc.model.response.DrpPengadaanResponse;
|
||||
import com.iconplus.smartproc.repository.DrpPengadaanRepository;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
public class GetListDrpPengadaanService implements BaseService<DrpPengadaanRequest, DrpPengadaanResponse> {
|
||||
|
||||
private final DrpPengadaanRepository drpPengadaanRepository;
|
||||
|
||||
public GetListDrpPengadaanService(DrpPengadaanRepository drpPengadaanRepository) {
|
||||
this.drpPengadaanRepository = drpPengadaanRepository;
|
||||
}
|
||||
|
||||
@Override
|
||||
public DrpPengadaanResponse execute(DrpPengadaanRequest input) {
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
@@ -38,12 +38,7 @@ public class PostCreateDrpService implements BaseService<DrpRequest, DrpResponse
|
||||
@Override
|
||||
public DrpResponse execute(DrpRequest input) {
|
||||
|
||||
Optional<Drp> drpOptional = drpRepository.findByTahunAndIsDeleteFalse(input.getTahun());
|
||||
if (drpOptional.isPresent()) {
|
||||
throw new BusinessException(Constants.ERR_CODE_10010,
|
||||
Constants.ERR_TTL_10010,
|
||||
Constants.ERR_MSG_10010);
|
||||
}
|
||||
validateTahunDrp(input);
|
||||
|
||||
Drp drp = Drp.builder()
|
||||
.tahun(input.getTahun())
|
||||
@@ -90,4 +85,13 @@ public class PostCreateDrpService implements BaseService<DrpRequest, DrpResponse
|
||||
.id(drpSaved.getId())
|
||||
.build();
|
||||
}
|
||||
|
||||
public void validateTahunDrp(DrpRequest input) {
|
||||
Optional<Drp> drpOptional = drpRepository.findByTahunAndIsDeleteFalse(input.getTahun());
|
||||
if (drpOptional.isPresent()) {
|
||||
throw new BusinessException(Constants.ERR_CODE_10010,
|
||||
Constants.ERR_TTL_10010,
|
||||
Constants.ERR_MSG_10010);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user