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

fix telepon and init lupas

Browse Source
This commit is contained in:
dirgantarasiahaan
2023-05-29 19:19:25 +07:00
parent bab3a7a3d9
commit 431ad60bdb
32 changed files with 328 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/iconplus/smartproc/service/CommonService.java
View File

@ -42,7 +42,7 @@ public class CommonService {
throw new BusinessException(HttpStatus.CONFLICT,
Constants.ERR_CODE_10001,
Constants.ERR_TTL_10001,
String.format(Constants.ERR_MSG_10001, "Role", input.getId()));
String.format(Constants.ERR_MSG_10001, "Role", input.getRoleId()));
}
var bidang= bidangRepository.findByIdAndIsDeleteFalse(input.getBidangId());
@ -50,7 +50,7 @@ public class CommonService {
throw new BusinessException(HttpStatus.CONFLICT,
Constants.ERR_CODE_10001,
Constants.ERR_TTL_10001,
String.format(Constants.ERR_MSG_10001, "Bidang", input.getId()));
String.format(Constants.ERR_MSG_10001, "Bidang", input.getBidangId()));
}
var instansi= instansiRepository.findByIdAndIsDeleteFalse(input.getInstansiId());
@ -58,7 +58,7 @@ public class CommonService {
throw new BusinessException(HttpStatus.CONFLICT,
Constants.ERR_CODE_10001,
Constants.ERR_TTL_10001,
String.format(Constants.ERR_MSG_10001, "Instansi", input.getId()));
String.format(Constants.ERR_MSG_10001, "Instansi", input.getInstansiId()));
}
}

5
src/main/java/com/iconplus/smartproc/service/authentication/ForgotPasswordService.java
View File

@ -26,15 +26,14 @@ public class ForgotPasswordService implements BaseService<ForgotPasswordRequest,
@Override
public EmptyResponse execute(ForgotPasswordRequest input) {
var users = usersRepository.findByEmailAndIsDeleteFalse(input.getEmail())
var users = usersRepository.getUsersByEmailAndExpiredTime(input.getRememberId())
.orElseThrow(() -> new BusinessException(Constants.ERR_CODE_10001,
Constants.ERR_TTL_10001,
String.format(Constants.ERR_MSG_10001, "User", input.getEmail())));
String.format(Constants.ERR_MSG_10001, "Remember-id", input.getRememberId())));
String newPassword = commonService.getPassword(input.getNewPassword());
String confirmationPassword = commonService.getPassword(input.getConfirmationPassword());
if (!StringUtils.equalsIgnoreCase(newPassword, confirmationPassword)) {
throw new BusinessException(HttpStatus.CONFLICT,
Constants.ERR_CODE_10007,

46
src/main/java/com/iconplus/smartproc/service/authentication/InitForgotPasswordService.java Normal file
View File

@ -0,0 +1,46 @@
package com.iconplus.smartproc.service.authentication;
import com.iconplus.smartproc.exception.BusinessException;
import com.iconplus.smartproc.helper.service.BaseService;
import com.iconplus.smartproc.model.request.InitForgotPasswordRequest;
import com.iconplus.smartproc.model.response.InitForgotPasswordResponse;
import com.iconplus.smartproc.repository.UsersRepository;
import com.iconplus.smartproc.util.Constants;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.sql.Timestamp;
import java.time.Instant;
import java.util.UUID;
@Service
public class InitForgotPasswordService implements BaseService<InitForgotPasswordRequest, InitForgotPasswordResponse> {
@Value("${config.forgot-password.expired-time:1440}")
private Integer expiredTime;
private final UsersRepository usersRepository;
public InitForgotPasswordService(UsersRepository usersRepository) {
this.usersRepository = usersRepository;
}
@Override
public InitForgotPasswordResponse execute(InitForgotPasswordRequest input) {
var users = usersRepository.findByEmailAndIsDeleteFalse(input.getEmail())
.orElseThrow(() -> new BusinessException(Constants.ERR_CODE_10001,
Constants.ERR_TTL_10001,
String.format(Constants.ERR_MSG_10001, "User", input.getEmail())));
var expirationTime = Timestamp.from(Instant.now().plusMillis(expiredTime * (long) 60000));
users.setRememberId(UUID.randomUUID().toString());
users.setExpiredTime(expirationTime);
usersRepository.save(users);
return InitForgotPasswordResponse.builder()
.rememberId(users.getRememberId())
.build();
}
}

54
src/main/java/com/iconplus/smartproc/service/drp/GetDrpService.java
View File

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

23
src/main/java/com/iconplus/smartproc/service/drp/GetListDrpPengadaanService.java Normal file
View File

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

16
src/main/java/com/iconplus/smartproc/service/drp/PostCreateDrpService.java
View File

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

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

@ -44,6 +44,7 @@ public class GetListUserService implements BaseService<UsersRequest, GetUsersRes
.instansiId(userRoleView.getInstansiId())
.instansi(userRoleView.getInstansi())
.email(userRoleView.getEmail())
.telepon(userRoleView.getTelepon())
.isActive(userRoleView.getIsActive())
.build();
usersResponses.add(usersResponse);

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

@ -40,6 +40,7 @@ public class GetUserByIdService implements BaseService<UsersRequest, UsersRespon
.instansiId(userRoleView.getInstansiId())
.instansi(userRoleView.getInstansi())
.email(userRoleView.getEmail())
.telepon(userRoleView.getTelepon())
.isActive(userRoleView.getIsActive())
.build();
}

14
src/main/java/com/iconplus/smartproc/service/manajemenuser/PostCreateUserService.java
View File

@ -9,7 +9,8 @@ import com.iconplus.smartproc.model.response.UsersResponse;
import com.iconplus.smartproc.repository.UsersRepository;
import com.iconplus.smartproc.service.CommonService;
import com.iconplus.smartproc.util.Constants;
import com.iconplus.smartproc.util.EncryptDecryptUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
@ -17,6 +18,9 @@ import org.springframework.stereotype.Service;
@Service
public class PostCreateUserService implements BaseService<UsersRequest, UsersResponse> {
@Value("${config.default-password:plgg123}")
private String defaultPassword;
private UsersRepository usersRepository;
private CommonService commonService;
@ -39,7 +43,12 @@ public class PostCreateUserService implements BaseService<UsersRequest, UsersRes
commonService.validateUserRequst(input);
String password = commonService.getPassword(input.getPassword());
String password = null;
if (StringUtils.isNotBlank(input.getPassword())) {
password = commonService.getPassword(input.getPassword());
} else {
password = defaultPassword;
}
BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
String encryptedPassword = encoder.encode(password);
@ -53,6 +62,7 @@ public class PostCreateUserService implements BaseService<UsersRequest, UsersRes
.jabatanId(input.getJabatanId())
.roleId(input.getRoleId())
.email(input.getEmail())
.telepon(input.getTelepon())
.password(input.getPassword())
.isActive(input.getIsActive())
.isDelete(false)

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

@ -39,6 +39,7 @@ public class PutUpdateUserService implements BaseService<UsersRequest, UsersResp
users.setJabatanId(input.getJabatanId());
users.setRoleId(input.getRoleId());
users.setEmail(input.getEmail());
users.setTelepon(input.getTelepon());
users.setPassword(input.getPassword());
users.setIsActive(input.getIsActive());
users.setIsDelete(false);