fix telepon and init lupas

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

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

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

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)

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