From c93f666056ea3d3e2d1e25ea411764c80d9dad4c Mon Sep 17 00:00:00 2001 From: dirgantarasiahaan Date: Sun, 28 May 2023 17:36:28 +0700 Subject: [PATCH] fix decrypt password --- .../smartproc/configuration/JwtTokenUtil.java | 1 - .../controller/MetodePengadaanController.java | 2 - .../helper/context/ApiContextFactory.java | 1 - .../smartproc/model/entity/Menus.java | 1 - .../smartproc/model/entity/Permission.java | 1 - .../model/projection/TokenManagementView.java | 1 - .../repository/BidangRepository.java | 3 +- .../smartproc/repository/RolesRepository.java | 1 - .../smartproc/service/CommonService.java | 44 ++++++++++++---- .../authentication/ForgotPasswordService.java | 40 +++++++++++--- .../service/authentication/LoginService.java | 12 +++-- .../service/authentication/LogoutService.java | 19 ++++--- .../PostCheckAccessTokenService.java | 1 - .../TokenManagementService.java | 29 ++++++++--- .../service/bidang/DeleteBidangService.java | 6 ++- .../service/bidang/GetBidangService.java | 7 ++- .../service/bidang/GetListBidangService.java | 1 - .../bidang/PostCreateBidangService.java | 16 +++++- .../bidang/PutUpdateBidangService.java | 7 ++- .../instansi/DeleteInstansiService.java | 5 +- .../instansi/GetInstansiByIdService.java | 5 +- .../instansi/GetListInstansiService.java | 1 - .../instansi/PostCreateInstansiService.java | 7 ++- .../instansi/PutUpdateInstansiService.java | 5 +- .../service/jabatan/DeleteJabatanService.java | 6 ++- .../service/jabatan/GetJabatanService.java | 5 +- .../jabatan/GetListJabatanService.java | 2 - .../jabatan/PostCreateJabatanService.java | 7 ++- .../jabatan/PutUpdateJabatanService.java | 5 +- .../DeleteJenisAnggaranService.java | 2 +- .../GetJenisAnggaranByIdService.java | 2 +- .../PostCreateJenisAnggaranService.java | 4 +- .../PutUpdateJenisAnggaranService.java | 2 +- .../DeleteJenisKontrakService.java | 2 +- .../GetJenisKontrakByIdService.java | 2 +- .../PostCreateJenisKontrakService.java | 2 +- .../PutUpdateJenisKontrakService.java | 5 +- .../DeleteJenisPengadaanService.java | 7 ++- .../GetJenisPengadaanService.java | 7 ++- .../PostCreateJenisPengadaanService.java | 7 ++- .../PutUpdateJenisPengadaanService.java | 7 ++- .../service/lokasi/DeleteLokasiService.java | 2 +- .../service/lokasi/GetLokasiByIdService.java | 2 +- .../lokasi/PostCreateLokasiService.java | 2 +- .../lokasi/PutUpdateLokasiService.java | 2 +- .../manajemenuser/DeleteUserService.java | 7 ++- .../manajemenuser/GetUserByIdService.java | 7 ++- .../manajemenuser/PostCreateUserService.java | 16 +++++- .../manajemenuser/PutUpdateUserService.java | 7 ++- .../DeleteMetodePengadaanService.java | 2 +- .../GetMetodePengadaanByIdService.java | 2 +- .../PostCreateMetodePengadaanService.java | 2 +- .../PutUpdateMetodePengadaanService.java | 5 +- .../DeleteMetodePenyampaianService.java | 2 +- .../GetMetodePenyampaianByIdService.java | 2 +- .../PostCreateMetodePenyampaianService.java | 2 +- .../PutUpdateMetodePenyampaianService.java | 5 +- .../DeleteStrategiPengadaanService.java | 2 +- .../GetStrategiPengadaanByIdService.java | 2 +- .../PostCreateStrategiPengadaanService.java | 2 +- .../PutUpdateStrategiPengadaanService.java | 5 +- .../sumberdana/DeleteSumberDanaService.java | 8 ++- .../sumberdana/GetListSumberDanaService.java | 1 - .../sumberdana/GetSumberDanaService.java | 8 ++- .../PostCreateSumberDanaService.java | 7 ++- .../sumberdana/PutSumberDanaService.java | 8 ++- .../DeleteSupplyPositioningMatrixService.java | 2 +- ...GetSupplyPositioningMatrixByIdService.java | 2 +- ...tCreateSupplyPositioningMatrixService.java | 2 +- ...tUpdateSupplyPositioningMatrixService.java | 5 +- .../DeleteUnitInisiatorService.java | 8 ++- .../GetUnitInisiatorService.java | 8 ++- .../PostCreateUnitInisiatorService.java | 7 ++- .../PutUpdateUnitInisiatorService.java | 8 ++- .../iconplus/smartproc/util/Constants.java | 36 ++++++++++++- .../smartproc/util/EncryptDecryptUtils.java | 52 +++++++++++++++++++ src/main/resources/application-local.yml | 4 ++ 77 files changed, 405 insertions(+), 129 deletions(-) create mode 100644 src/main/java/com/iconplus/smartproc/util/EncryptDecryptUtils.java diff --git a/src/main/java/com/iconplus/smartproc/configuration/JwtTokenUtil.java b/src/main/java/com/iconplus/smartproc/configuration/JwtTokenUtil.java index 76efbfd..c1b06a3 100644 --- a/src/main/java/com/iconplus/smartproc/configuration/JwtTokenUtil.java +++ b/src/main/java/com/iconplus/smartproc/configuration/JwtTokenUtil.java @@ -2,7 +2,6 @@ package com.iconplus.smartproc.configuration; import com.iconplus.smartproc.model.token.TokenContent; import io.jsonwebtoken.*; -import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/src/main/java/com/iconplus/smartproc/controller/MetodePengadaanController.java b/src/main/java/com/iconplus/smartproc/controller/MetodePengadaanController.java index dbff546..8be516a 100644 --- a/src/main/java/com/iconplus/smartproc/controller/MetodePengadaanController.java +++ b/src/main/java/com/iconplus/smartproc/controller/MetodePengadaanController.java @@ -5,9 +5,7 @@ import com.iconplus.smartproc.helper.model.EmptyResponse; import com.iconplus.smartproc.model.request.MetodePengadaanRequest; import com.iconplus.smartproc.model.response.GetListMetodePengadaanResponse; import com.iconplus.smartproc.model.response.MetodePengadaanResponse; -import com.iconplus.smartproc.repository.MetodePengadaanRepository; import com.iconplus.smartproc.service.metodepengadaan.*; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/iconplus/smartproc/helper/context/ApiContextFactory.java b/src/main/java/com/iconplus/smartproc/helper/context/ApiContextFactory.java index ede7786..1585470 100644 --- a/src/main/java/com/iconplus/smartproc/helper/context/ApiContextFactory.java +++ b/src/main/java/com/iconplus/smartproc/helper/context/ApiContextFactory.java @@ -1,6 +1,5 @@ package com.iconplus.smartproc.helper.context; -import brave.internal.Platform; import com.iconplus.smartproc.helper.service.TokenUtils; import lombok.extern.log4j.Log4j2; import org.springframework.http.HttpHeaders; diff --git a/src/main/java/com/iconplus/smartproc/model/entity/Menus.java b/src/main/java/com/iconplus/smartproc/model/entity/Menus.java index 9001e39..5ae714b 100644 --- a/src/main/java/com/iconplus/smartproc/model/entity/Menus.java +++ b/src/main/java/com/iconplus/smartproc/model/entity/Menus.java @@ -5,7 +5,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.hibernate.annotations.GeneratorType; import org.hibernate.annotations.Type; import javax.persistence.*; diff --git a/src/main/java/com/iconplus/smartproc/model/entity/Permission.java b/src/main/java/com/iconplus/smartproc/model/entity/Permission.java index 01fac6e..60612d8 100644 --- a/src/main/java/com/iconplus/smartproc/model/entity/Permission.java +++ b/src/main/java/com/iconplus/smartproc/model/entity/Permission.java @@ -5,7 +5,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; import javax.persistence.*; diff --git a/src/main/java/com/iconplus/smartproc/model/projection/TokenManagementView.java b/src/main/java/com/iconplus/smartproc/model/projection/TokenManagementView.java index 5bf6c24..ace9aff 100644 --- a/src/main/java/com/iconplus/smartproc/model/projection/TokenManagementView.java +++ b/src/main/java/com/iconplus/smartproc/model/projection/TokenManagementView.java @@ -1,6 +1,5 @@ package com.iconplus.smartproc.model.projection; -import java.sql.Clob; public interface TokenManagementView { diff --git a/src/main/java/com/iconplus/smartproc/repository/BidangRepository.java b/src/main/java/com/iconplus/smartproc/repository/BidangRepository.java index 4c6f278..66bb769 100644 --- a/src/main/java/com/iconplus/smartproc/repository/BidangRepository.java +++ b/src/main/java/com/iconplus/smartproc/repository/BidangRepository.java @@ -8,7 +8,6 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; -import java.util.List; import java.util.Optional; @Repository @@ -28,4 +27,6 @@ public interface BidangRepository extends JpaRepository getListBidang(String search, Pageable pageable); Optional findByIdAndIsDeleteFalse(Long id); + + Optional findByBidangAndIsDeleteFalse(String bidang); } diff --git a/src/main/java/com/iconplus/smartproc/repository/RolesRepository.java b/src/main/java/com/iconplus/smartproc/repository/RolesRepository.java index 5cf54e5..1260c04 100644 --- a/src/main/java/com/iconplus/smartproc/repository/RolesRepository.java +++ b/src/main/java/com/iconplus/smartproc/repository/RolesRepository.java @@ -9,7 +9,6 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; -import java.util.List; import java.util.Optional; @Repository diff --git a/src/main/java/com/iconplus/smartproc/service/CommonService.java b/src/main/java/com/iconplus/smartproc/service/CommonService.java index 2746885..1d3d8e9 100644 --- a/src/main/java/com/iconplus/smartproc/service/CommonService.java +++ b/src/main/java/com/iconplus/smartproc/service/CommonService.java @@ -4,7 +4,11 @@ import com.iconplus.smartproc.exception.BusinessException; import com.iconplus.smartproc.model.entity.TokenManagement; import com.iconplus.smartproc.model.request.UsersRequest; import com.iconplus.smartproc.repository.*; +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.stereotype.Service; import java.sql.Timestamp; @@ -13,18 +17,18 @@ import java.time.Instant; @Service public class CommonService { - private UsersRepository usersRepository; + @Value("${config.password.privateKey}") + private String privateKey; + private RolesRepository rolesRepository; private BidangRepository bidangRepository; private InstansiRepository instansiRepository; private TokenManagementRepository tokenManagementRepository; - public CommonService(UsersRepository usersRepository, - RolesRepository rolesRepository, - BidangRepository bidangRepository, - InstansiRepository instansiRepository, - TokenManagementRepository tokenManagementRepository) { - this.usersRepository = usersRepository; + public CommonService(RolesRepository rolesRepository, + BidangRepository bidangRepository, + InstansiRepository instansiRepository, + TokenManagementRepository tokenManagementRepository) { this.rolesRepository = rolesRepository; this.bidangRepository = bidangRepository; this.instansiRepository = instansiRepository; @@ -35,17 +39,26 @@ public class CommonService { var roles= rolesRepository.findByIdAndIsDeleteFalse(input.getRoleId()); if (roles.isEmpty()) { - throw new BusinessException("err", "err", "err"); + throw new BusinessException(HttpStatus.CONFLICT, + Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "Role", input.getId())); } var bidang= bidangRepository.findByIdAndIsDeleteFalse(input.getBidangId()); if (bidang.isEmpty()) { - throw new BusinessException("err", "err", "err"); + throw new BusinessException(HttpStatus.CONFLICT, + Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "Bidang", input.getId())); } var instansi= instansiRepository.findByIdAndIsDeleteFalse(input.getInstansiId()); if (instansi.isEmpty()) { - throw new BusinessException("err", "err", "err"); + throw new BusinessException(HttpStatus.CONFLICT, + Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "Instansi", input.getId())); } } @@ -81,4 +94,15 @@ public class CommonService { .build()); } } + + public String getPassword(String password) { + try { + return EncryptDecryptUtils.decrypt(password, privateKey); + } catch (Exception ex) { + throw new BusinessException(Constants.ERR_CODE_10010, + Constants.ERR_TTL_10010, + Constants.ERR_MSG_10010); + } + + } } diff --git a/src/main/java/com/iconplus/smartproc/service/authentication/ForgotPasswordService.java b/src/main/java/com/iconplus/smartproc/service/authentication/ForgotPasswordService.java index 070de1f..a4b6d8a 100644 --- a/src/main/java/com/iconplus/smartproc/service/authentication/ForgotPasswordService.java +++ b/src/main/java/com/iconplus/smartproc/service/authentication/ForgotPasswordService.java @@ -6,7 +6,11 @@ import com.iconplus.smartproc.helper.model.EmptyResponse; import com.iconplus.smartproc.helper.service.BaseService; import com.iconplus.smartproc.model.request.ForgotPasswordRequest; import com.iconplus.smartproc.repository.UsersRepository; +import com.iconplus.smartproc.service.CommonService; +import com.iconplus.smartproc.util.Constants; import org.apache.commons.lang3.StringUtils; +import org.springframework.http.HttpStatus; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; @Service @@ -14,25 +18,47 @@ public class ForgotPasswordService implements BaseService new BusinessException("err", "err", "err")); + var users = usersRepository.findByIdAndIsDeleteFalse(id) + .orElseThrow(() -> new BusinessException(Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "User", id))); - if (!StringUtils.equalsIgnoreCase(input.getCurrentPassword(), users.getPassword()) || - StringUtils.equalsIgnoreCase(input.getNewPassword(), users.getPassword()) || - !StringUtils.equalsIgnoreCase(input.getConfirmationPassword(), input.getNewPassword())) { - throw new BusinessException("err", "err", "err"); + String password = commonService.getPassword(input.getCurrentPassword()); + BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder(); + boolean isValidCurrentPassword = bCryptPasswordEncoder.matches(password, users.getPassword()); + + if (!isValidCurrentPassword) { + throw new BusinessException(HttpStatus.CONFLICT, + Constants.ERR_CODE_10009, + Constants.ERR_TTL_10009, + Constants.ERR_MSG_10009); } - users.setPassword(input.getNewPassword()); + String newPassword = commonService.getPassword(input.getNewPassword()); + String confirmationPassword = commonService.getPassword(input.getNewPassword()); + + + if (!StringUtils.equalsIgnoreCase(newPassword, confirmationPassword)) { + throw new BusinessException(HttpStatus.CONFLICT, + Constants.ERR_CODE_10007, + Constants.ERR_TTL_10007, + Constants.ERR_MSG_10007); + } + + users.setPassword(bCryptPasswordEncoder.encode(newPassword)); usersRepository.save(users); return new EmptyResponse(); diff --git a/src/main/java/com/iconplus/smartproc/service/authentication/LoginService.java b/src/main/java/com/iconplus/smartproc/service/authentication/LoginService.java index ba447df..3052f47 100644 --- a/src/main/java/com/iconplus/smartproc/service/authentication/LoginService.java +++ b/src/main/java/com/iconplus/smartproc/service/authentication/LoginService.java @@ -14,6 +14,7 @@ import lombok.extern.slf4j.Slf4j; 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; import org.springframework.transaction.annotation.Transactional; @@ -54,7 +55,11 @@ public class LoginService implements BaseService { Constants.ERR_TTL_10003, String.format(Constants.ERR_MSG_10003, input.getEmail()))); - if (!StringUtils.equalsIgnoreCase(input.getPassword(), userRoleView.getPassword())) { + String password = commonService.getPassword(input.getPassword()); + BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder(); + boolean isValidPassword = bCryptPasswordEncoder.matches(password, userRoleView.getPassword()); + + if (!isValidPassword) { throw new BusinessException(HttpStatus.CONFLICT, Constants.ERR_CODE_10004, Constants.ERR_TTL_10004, @@ -84,7 +89,9 @@ public class LoginService implements BaseService { if (StringUtils.isBlank(accessToken) || StringUtils.isBlank(refreshToken)) { log.error("token null"); - throw new BusinessException("err", "err", "err"); + throw new BusinessException(Constants.ERR_CODE_10008, + Constants.ERR_TTL_10008, + Constants.ERR_MSG_10008); } commonService.saveUserToken(TokenManagement.builder() @@ -93,7 +100,6 @@ public class LoginService implements BaseService { .refreshToken(refreshToken) .build(), accessTokenExp); - return LoginResponse.builder() .accessToken(accessToken) .validity(accessTokenExp * 60) diff --git a/src/main/java/com/iconplus/smartproc/service/authentication/LogoutService.java b/src/main/java/com/iconplus/smartproc/service/authentication/LogoutService.java index 823b5a5..d062620 100644 --- a/src/main/java/com/iconplus/smartproc/service/authentication/LogoutService.java +++ b/src/main/java/com/iconplus/smartproc/service/authentication/LogoutService.java @@ -7,18 +7,17 @@ import com.iconplus.smartproc.helper.model.EmptyResponse; import com.iconplus.smartproc.helper.service.BaseService; import com.iconplus.smartproc.model.entity.TokenManagement; import com.iconplus.smartproc.repository.TokenManagementRepository; -import com.iconplus.smartproc.repository.UsersRepository; -import org.springframework.beans.factory.annotation.Autowired; +import com.iconplus.smartproc.util.Constants; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; -import java.util.List; - @Service public class LogoutService implements BaseService { private ApiContext apiContext; private TokenManagementRepository tokenManagementRepository; - private LogoutService(ApiContext apiContext, + + public LogoutService(ApiContext apiContext, TokenManagementRepository tokenManagementRepository) { this.apiContext = apiContext; this.tokenManagementRepository = tokenManagementRepository; @@ -35,10 +34,10 @@ public class LogoutService implements BaseService { } private TokenManagement getTokenManagement(String accessToken) { - var tokenManagement = tokenManagementRepository.findByAccessTokenAndIsDeleteFalse(accessToken); - if (tokenManagement.isEmpty()) { - throw new BusinessException("err", "err", "err"); - } - return tokenManagement.get(); + return tokenManagementRepository.findByAccessTokenAndIsDeleteFalse(accessToken) + .orElseThrow(() -> new BusinessException(HttpStatus.CONFLICT, + Constants.ERR_CODE_40038, + Constants.ERR_TITLE_40038, + Constants.ERR_MESSAGE_40038)); } } diff --git a/src/main/java/com/iconplus/smartproc/service/authentication/PostCheckAccessTokenService.java b/src/main/java/com/iconplus/smartproc/service/authentication/PostCheckAccessTokenService.java index 85c9d5e..5ccad2e 100644 --- a/src/main/java/com/iconplus/smartproc/service/authentication/PostCheckAccessTokenService.java +++ b/src/main/java/com/iconplus/smartproc/service/authentication/PostCheckAccessTokenService.java @@ -6,7 +6,6 @@ import com.iconplus.smartproc.model.projection.TokenManagementView; import com.iconplus.smartproc.model.request.PostAccessTokenRequest; import com.iconplus.smartproc.model.response.PostAccessTokenResponse; import com.iconplus.smartproc.repository.TokenManagementRepository; -import com.iconplus.smartproc.util.CommonUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/iconplus/smartproc/service/authentication/TokenManagementService.java b/src/main/java/com/iconplus/smartproc/service/authentication/TokenManagementService.java index 1518953..32d5ab3 100644 --- a/src/main/java/com/iconplus/smartproc/service/authentication/TokenManagementService.java +++ b/src/main/java/com/iconplus/smartproc/service/authentication/TokenManagementService.java @@ -11,7 +11,9 @@ import com.iconplus.smartproc.model.token.TokenContent; import com.iconplus.smartproc.repository.TokenManagementRepository; import com.iconplus.smartproc.repository.UsersRepository; import com.iconplus.smartproc.service.CommonService; +import com.iconplus.smartproc.util.Constants; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @@ -49,21 +51,24 @@ public class TokenManagementService implements BaseService verifyRefreshToken(c, userId)) .orElseThrow(() -> { log.error("failed validate token to existing db"); return new BusinessException( - HttpStatus.UNAUTHORIZED, "err", "err", - "err"); + HttpStatus.UNAUTHORIZED, + Constants.ERR_CODE_80007, + Constants.TITLE_INVALID_NEXT_STEP, + Constants.REFRESH_TOKEN_NOT_VALID); }); var userRoleView = usersRepository.getUserByIdAndDeletedFase(userId).orElseThrow(() -> new BusinessException("err", "err", "err")); @@ -83,6 +88,14 @@ public class TokenManagementService implements BaseService new BusinessException("err", "err", "err")); + var bidang = bidangRepository.findByIdAndIsDeleteFalse(input.getId()) + .orElseThrow(() -> new BusinessException(Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "Bidang", input.getId()))); bidang.setIsDelete(true); bidangRepository.save(bidang); diff --git a/src/main/java/com/iconplus/smartproc/service/bidang/GetBidangService.java b/src/main/java/com/iconplus/smartproc/service/bidang/GetBidangService.java index 26ce5c0..5af72d6 100644 --- a/src/main/java/com/iconplus/smartproc/service/bidang/GetBidangService.java +++ b/src/main/java/com/iconplus/smartproc/service/bidang/GetBidangService.java @@ -5,6 +5,7 @@ import com.iconplus.smartproc.helper.service.BaseService; import com.iconplus.smartproc.model.request.BidangRequest; import com.iconplus.smartproc.model.response.BidangResponse; import com.iconplus.smartproc.repository.BidangRepository; +import com.iconplus.smartproc.util.Constants; import org.springframework.stereotype.Service; @Service @@ -19,7 +20,11 @@ public class GetBidangService implements BaseService new BusinessException("err", "err", "err")); + var bidang = bidangRepository.findByIdAndIsDeleteFalse(input.getId()) + .orElseThrow(() -> new BusinessException(Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "Bidang", input.getId()))); + return BidangResponse.builder() .id(bidang.getId()) .instansiId(bidang.getInstansiId()) diff --git a/src/main/java/com/iconplus/smartproc/service/bidang/GetListBidangService.java b/src/main/java/com/iconplus/smartproc/service/bidang/GetListBidangService.java index 57135b8..e6bfa26 100644 --- a/src/main/java/com/iconplus/smartproc/service/bidang/GetListBidangService.java +++ b/src/main/java/com/iconplus/smartproc/service/bidang/GetListBidangService.java @@ -4,7 +4,6 @@ import com.iconplus.smartproc.helper.model.Pagination; import com.iconplus.smartproc.helper.service.BaseService; import com.iconplus.smartproc.model.projection.BidangView; import com.iconplus.smartproc.model.request.BidangRequest; -import com.iconplus.smartproc.model.request.InstansiRequest; import com.iconplus.smartproc.model.response.BidangResponse; import com.iconplus.smartproc.model.response.GetListBidangResponse; import com.iconplus.smartproc.repository.BidangRepository; diff --git a/src/main/java/com/iconplus/smartproc/service/bidang/PostCreateBidangService.java b/src/main/java/com/iconplus/smartproc/service/bidang/PostCreateBidangService.java index b68b4ee..a4a7409 100644 --- a/src/main/java/com/iconplus/smartproc/service/bidang/PostCreateBidangService.java +++ b/src/main/java/com/iconplus/smartproc/service/bidang/PostCreateBidangService.java @@ -1,10 +1,13 @@ package com.iconplus.smartproc.service.bidang; +import com.iconplus.smartproc.exception.BusinessException; import com.iconplus.smartproc.helper.service.BaseService; import com.iconplus.smartproc.model.entity.Bidang; import com.iconplus.smartproc.model.request.BidangRequest; import com.iconplus.smartproc.model.response.BidangResponse; import com.iconplus.smartproc.repository.BidangRepository; +import com.iconplus.smartproc.util.Constants; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @Service @@ -18,7 +21,16 @@ public class PostCreateBidangService implements BaseService new BusinessException("err", "err", "err")); + var bidang = bidangRepository.findByIdAndIsDeleteFalse(input.getId()) + .orElseThrow(() -> new BusinessException(Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "Bidang", input.getId()))); + bidang.setInstansiId(input.getInstansiId()); bidang.setBidang(input.getBidang()); bidang.setKeterangan(input.getKeterangan()); diff --git a/src/main/java/com/iconplus/smartproc/service/instansi/DeleteInstansiService.java b/src/main/java/com/iconplus/smartproc/service/instansi/DeleteInstansiService.java index 4ddb038..d88373a 100644 --- a/src/main/java/com/iconplus/smartproc/service/instansi/DeleteInstansiService.java +++ b/src/main/java/com/iconplus/smartproc/service/instansi/DeleteInstansiService.java @@ -5,6 +5,7 @@ import com.iconplus.smartproc.helper.model.EmptyResponse; import com.iconplus.smartproc.helper.service.BaseService; import com.iconplus.smartproc.model.request.InstansiRequest; import com.iconplus.smartproc.repository.InstansiRepository; +import com.iconplus.smartproc.util.Constants; import org.springframework.stereotype.Service; @Service @@ -20,7 +21,9 @@ public class DeleteInstansiService implements BaseService new BusinessException("err", "err", "err")); + .orElseThrow(() -> new BusinessException(Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "instansi", input.getId()))); instansi.setIsDelete(true); instansiRepository.save(instansi); diff --git a/src/main/java/com/iconplus/smartproc/service/instansi/GetInstansiByIdService.java b/src/main/java/com/iconplus/smartproc/service/instansi/GetInstansiByIdService.java index d98dc2a..33631ce 100644 --- a/src/main/java/com/iconplus/smartproc/service/instansi/GetInstansiByIdService.java +++ b/src/main/java/com/iconplus/smartproc/service/instansi/GetInstansiByIdService.java @@ -5,6 +5,7 @@ import com.iconplus.smartproc.helper.service.BaseService; import com.iconplus.smartproc.model.request.InstansiRequest; import com.iconplus.smartproc.model.response.InstansiResponse; import com.iconplus.smartproc.repository.InstansiRepository; +import com.iconplus.smartproc.util.Constants; import org.springframework.stereotype.Service; @Service @@ -20,7 +21,9 @@ public class GetInstansiByIdService implements BaseService new BusinessException("err", "err", "err")); + .orElseThrow(() -> new BusinessException(Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "instansi", input.getId()))); return InstansiResponse.builder() .id(instansi.getId()) diff --git a/src/main/java/com/iconplus/smartproc/service/instansi/GetListInstansiService.java b/src/main/java/com/iconplus/smartproc/service/instansi/GetListInstansiService.java index 93f0c8b..0cdf8c3 100644 --- a/src/main/java/com/iconplus/smartproc/service/instansi/GetListInstansiService.java +++ b/src/main/java/com/iconplus/smartproc/service/instansi/GetListInstansiService.java @@ -4,7 +4,6 @@ import com.iconplus.smartproc.helper.model.Pagination; import com.iconplus.smartproc.helper.service.BaseService; import com.iconplus.smartproc.model.projection.InstansiView; import com.iconplus.smartproc.model.request.InstansiRequest; -import com.iconplus.smartproc.model.request.UsersRequest; import com.iconplus.smartproc.model.response.GetListInstansiResponse; import com.iconplus.smartproc.model.response.InstansiResponse; import com.iconplus.smartproc.repository.InstansiRepository; diff --git a/src/main/java/com/iconplus/smartproc/service/instansi/PostCreateInstansiService.java b/src/main/java/com/iconplus/smartproc/service/instansi/PostCreateInstansiService.java index d5c22d2..a91d8d2 100644 --- a/src/main/java/com/iconplus/smartproc/service/instansi/PostCreateInstansiService.java +++ b/src/main/java/com/iconplus/smartproc/service/instansi/PostCreateInstansiService.java @@ -6,6 +6,8 @@ import com.iconplus.smartproc.model.entity.Instansi; import com.iconplus.smartproc.model.request.InstansiRequest; import com.iconplus.smartproc.model.response.InstansiResponse; import com.iconplus.smartproc.repository.InstansiRepository; +import com.iconplus.smartproc.util.Constants; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @Service @@ -22,7 +24,10 @@ public class PostCreateInstansiService implements BaseService new BusinessException("err", "err", "err")); + .orElseThrow(() -> new BusinessException(Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "instansi", input.getId()))); instansi.setInstansi(input.getInstansi()); instansi.setAlamat(input.getAlamat()); diff --git a/src/main/java/com/iconplus/smartproc/service/jabatan/DeleteJabatanService.java b/src/main/java/com/iconplus/smartproc/service/jabatan/DeleteJabatanService.java index 29d34ef..4e375b5 100644 --- a/src/main/java/com/iconplus/smartproc/service/jabatan/DeleteJabatanService.java +++ b/src/main/java/com/iconplus/smartproc/service/jabatan/DeleteJabatanService.java @@ -5,6 +5,7 @@ import com.iconplus.smartproc.helper.model.EmptyResponse; import com.iconplus.smartproc.helper.service.BaseService; import com.iconplus.smartproc.model.request.JabatanRequest; import com.iconplus.smartproc.repository.JabatanRepository; +import com.iconplus.smartproc.util.Constants; import org.springframework.stereotype.Service; @Service @@ -17,7 +18,10 @@ public class DeleteJabatanService implements BaseService new BusinessException("err", "err", "err")); + .orElseThrow(() -> new BusinessException(Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "Jabatan", input.getId()))); + jabatan.setIsDelete(true); jabatanRepository.save(jabatan); return new EmptyResponse(); diff --git a/src/main/java/com/iconplus/smartproc/service/jabatan/GetJabatanService.java b/src/main/java/com/iconplus/smartproc/service/jabatan/GetJabatanService.java index cb36032..0871fc9 100644 --- a/src/main/java/com/iconplus/smartproc/service/jabatan/GetJabatanService.java +++ b/src/main/java/com/iconplus/smartproc/service/jabatan/GetJabatanService.java @@ -5,6 +5,7 @@ import com.iconplus.smartproc.helper.service.BaseService; import com.iconplus.smartproc.model.request.JabatanRequest; import com.iconplus.smartproc.model.response.JabatanResponse; import com.iconplus.smartproc.repository.JabatanRepository; +import com.iconplus.smartproc.util.Constants; import org.springframework.stereotype.Service; @Service @@ -19,7 +20,9 @@ public class GetJabatanService implements BaseService new BusinessException("err", "err", "err")); + .orElseThrow(() -> new BusinessException(Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "Jabatan", input.getId()))); return JabatanResponse.builder() .id(jabatan.getId()) diff --git a/src/main/java/com/iconplus/smartproc/service/jabatan/GetListJabatanService.java b/src/main/java/com/iconplus/smartproc/service/jabatan/GetListJabatanService.java index 504d564..1e7c072 100644 --- a/src/main/java/com/iconplus/smartproc/service/jabatan/GetListJabatanService.java +++ b/src/main/java/com/iconplus/smartproc/service/jabatan/GetListJabatanService.java @@ -2,10 +2,8 @@ package com.iconplus.smartproc.service.jabatan; import com.iconplus.smartproc.helper.model.Pagination; import com.iconplus.smartproc.helper.service.BaseService; -import com.iconplus.smartproc.model.entity.Jabatan; import com.iconplus.smartproc.model.projection.JabatanView; import com.iconplus.smartproc.model.request.JabatanRequest; -import com.iconplus.smartproc.model.request.JenisAnggaranRequest; import com.iconplus.smartproc.model.response.GetListJabatanResponse; import com.iconplus.smartproc.model.response.JabatanResponse; import com.iconplus.smartproc.repository.JabatanRepository; diff --git a/src/main/java/com/iconplus/smartproc/service/jabatan/PostCreateJabatanService.java b/src/main/java/com/iconplus/smartproc/service/jabatan/PostCreateJabatanService.java index 42c438f..cef7bb7 100644 --- a/src/main/java/com/iconplus/smartproc/service/jabatan/PostCreateJabatanService.java +++ b/src/main/java/com/iconplus/smartproc/service/jabatan/PostCreateJabatanService.java @@ -6,6 +6,8 @@ import com.iconplus.smartproc.model.entity.Jabatan; import com.iconplus.smartproc.model.request.JabatanRequest; import com.iconplus.smartproc.model.response.JabatanResponse; import com.iconplus.smartproc.repository.JabatanRepository; +import com.iconplus.smartproc.util.Constants; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @Service @@ -21,7 +23,10 @@ public class PostCreateJabatanService implements BaseService new BusinessException("err", "err", "err")); + .orElseThrow(() -> new BusinessException(Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "Jabatan", input.getId()))); jabatan.setJabatan(input.getJabatan()); jabatan.setKeterangan(input.getKeterangan()); diff --git a/src/main/java/com/iconplus/smartproc/service/jenisanggaran/DeleteJenisAnggaranService.java b/src/main/java/com/iconplus/smartproc/service/jenisanggaran/DeleteJenisAnggaranService.java index 3a13142..39de6a3 100644 --- a/src/main/java/com/iconplus/smartproc/service/jenisanggaran/DeleteJenisAnggaranService.java +++ b/src/main/java/com/iconplus/smartproc/service/jenisanggaran/DeleteJenisAnggaranService.java @@ -28,7 +28,7 @@ public class DeleteJenisAnggaranService implements BaseService new BusinessException(HttpStatus.CONFLICT, Constants.ERR_CODE_10001, Constants.ERR_TTL_10001, - String.format(Constants.ERR_MSG_10001, input.getId()))); + String.format(Constants.ERR_MSG_10001, "Jenis Anggaran", input.getId()))); jenisAnggaran.setIsDelete(true); jenisAnggaranRepository.save(jenisAnggaran); diff --git a/src/main/java/com/iconplus/smartproc/service/jenisanggaran/GetJenisAnggaranByIdService.java b/src/main/java/com/iconplus/smartproc/service/jenisanggaran/GetJenisAnggaranByIdService.java index 25a5125..daf3c7f 100644 --- a/src/main/java/com/iconplus/smartproc/service/jenisanggaran/GetJenisAnggaranByIdService.java +++ b/src/main/java/com/iconplus/smartproc/service/jenisanggaran/GetJenisAnggaranByIdService.java @@ -26,7 +26,7 @@ public class GetJenisAnggaranByIdService implements BaseService { @@ -31,7 +29,7 @@ public class PostCreateJenisAnggaranService implements BaseService new BusinessException(HttpStatus.CONFLICT, Constants.ERR_CODE_10001, Constants.ERR_TTL_10001, - String.format(Constants.ERR_MSG_10001, input.getId()))); + String.format(Constants.ERR_MSG_10001, "Jenis Anggaran", input.getId()))); jenisAnggaran.setJenisAnggaran(input.getJenisAnggaran()); jenisAnggaran.setKeterangan(input.getKeterangan()); diff --git a/src/main/java/com/iconplus/smartproc/service/jeniskontrak/DeleteJenisKontrakService.java b/src/main/java/com/iconplus/smartproc/service/jeniskontrak/DeleteJenisKontrakService.java index ed98e81..da4a80e 100644 --- a/src/main/java/com/iconplus/smartproc/service/jeniskontrak/DeleteJenisKontrakService.java +++ b/src/main/java/com/iconplus/smartproc/service/jeniskontrak/DeleteJenisKontrakService.java @@ -28,7 +28,7 @@ public class DeleteJenisKontrakService implements BaseService new BusinessException(HttpStatus.CONFLICT, Constants.ERR_CODE_10001, Constants.ERR_TTL_10001, - String.format(Constants.ERR_MSG_10001, input.getId()))); + String.format(Constants.ERR_MSG_10001, "Jenis Kontrak", input.getId()))); jenisKontrak.setIsDelete(true); jenisKontrakRepository.save(jenisKontrak); diff --git a/src/main/java/com/iconplus/smartproc/service/jeniskontrak/GetJenisKontrakByIdService.java b/src/main/java/com/iconplus/smartproc/service/jeniskontrak/GetJenisKontrakByIdService.java index e9b3ac6..c514c89 100644 --- a/src/main/java/com/iconplus/smartproc/service/jeniskontrak/GetJenisKontrakByIdService.java +++ b/src/main/java/com/iconplus/smartproc/service/jeniskontrak/GetJenisKontrakByIdService.java @@ -26,7 +26,7 @@ public class GetJenisKontrakByIdService implements BaseService new BusinessException(HttpStatus.CONFLICT, Constants.ERR_CODE_10001, Constants.ERR_TTL_10001, - String.format(Constants.ERR_MSG_10001, input.getId()))); + String.format(Constants.ERR_MSG_10001, "Jenis Kontrak", input.getId()))); jenisKontrak.setJenisKontrak(input.getJenisKontrak()); jenisKontrak.setKeterangan(input.getKeterangan()); diff --git a/src/main/java/com/iconplus/smartproc/service/jenispengadaan/DeleteJenisPengadaanService.java b/src/main/java/com/iconplus/smartproc/service/jenispengadaan/DeleteJenisPengadaanService.java index db71fe9..09b224b 100644 --- a/src/main/java/com/iconplus/smartproc/service/jenispengadaan/DeleteJenisPengadaanService.java +++ b/src/main/java/com/iconplus/smartproc/service/jenispengadaan/DeleteJenisPengadaanService.java @@ -5,6 +5,8 @@ import com.iconplus.smartproc.helper.model.EmptyResponse; import com.iconplus.smartproc.helper.service.BaseService; import com.iconplus.smartproc.model.request.JenisPengadaanRequest; import com.iconplus.smartproc.repository.JenisPengadaanRepository; +import com.iconplus.smartproc.util.Constants; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @Service @@ -18,7 +20,10 @@ public class DeleteJenisPengadaanService implements BaseService new BusinessException("err", "err", "err")); + .orElseThrow(() -> new BusinessException(HttpStatus.CONFLICT, + Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "Jenis Pengadaan", input.getId()))); jenisPengadaan.setIsDelete(true); jenisPengadaanRepository.save(jenisPengadaan); return new EmptyResponse(); diff --git a/src/main/java/com/iconplus/smartproc/service/jenispengadaan/GetJenisPengadaanService.java b/src/main/java/com/iconplus/smartproc/service/jenispengadaan/GetJenisPengadaanService.java index 8e13017..489b1a8 100644 --- a/src/main/java/com/iconplus/smartproc/service/jenispengadaan/GetJenisPengadaanService.java +++ b/src/main/java/com/iconplus/smartproc/service/jenispengadaan/GetJenisPengadaanService.java @@ -5,6 +5,8 @@ import com.iconplus.smartproc.helper.service.BaseService; import com.iconplus.smartproc.model.request.JenisPengadaanRequest; import com.iconplus.smartproc.model.response.JenisPengadaanResponse; import com.iconplus.smartproc.repository.JenisPengadaanRepository; +import com.iconplus.smartproc.util.Constants; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @Service @@ -19,7 +21,10 @@ public class GetJenisPengadaanService implements BaseService new BusinessException("err", "err", "err")); + .orElseThrow(() -> new BusinessException(HttpStatus.CONFLICT, + Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "Jenis Pengadaan", input.getId()))); return JenisPengadaanResponse.builder() .id(jenisPengadaan.getId()) diff --git a/src/main/java/com/iconplus/smartproc/service/jenispengadaan/PostCreateJenisPengadaanService.java b/src/main/java/com/iconplus/smartproc/service/jenispengadaan/PostCreateJenisPengadaanService.java index 20b272e..ac89700 100644 --- a/src/main/java/com/iconplus/smartproc/service/jenispengadaan/PostCreateJenisPengadaanService.java +++ b/src/main/java/com/iconplus/smartproc/service/jenispengadaan/PostCreateJenisPengadaanService.java @@ -6,6 +6,8 @@ import com.iconplus.smartproc.model.entity.JenisPengadaan; import com.iconplus.smartproc.model.request.JenisPengadaanRequest; import com.iconplus.smartproc.model.response.JenisPengadaanResponse; import com.iconplus.smartproc.repository.JenisPengadaanRepository; +import com.iconplus.smartproc.util.Constants; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @Service @@ -20,7 +22,10 @@ public class PostCreateJenisPengadaanService implements BaseService new BusinessException("err", "err", "err")); + .orElseThrow(() -> new BusinessException(HttpStatus.CONFLICT, + Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "Jenis Pengadaan", input.getId()))); jenisPengadaan.setJenisPengadaan(input.getJenisPengadaan()); jenisPengadaan.setKeterangan(input.getKeterangan()); jenisPengadaan.setIsActive(input.getIsActive()); diff --git a/src/main/java/com/iconplus/smartproc/service/lokasi/DeleteLokasiService.java b/src/main/java/com/iconplus/smartproc/service/lokasi/DeleteLokasiService.java index 5d5d64d..00ae541 100644 --- a/src/main/java/com/iconplus/smartproc/service/lokasi/DeleteLokasiService.java +++ b/src/main/java/com/iconplus/smartproc/service/lokasi/DeleteLokasiService.java @@ -28,7 +28,7 @@ public class DeleteLokasiService implements BaseService new BusinessException(HttpStatus.CONFLICT, Constants.ERR_CODE_10001, Constants.ERR_TTL_10001, - String.format(Constants.ERR_MSG_10001, input.getId()))); + String.format(Constants.ERR_MSG_10001, "Lokasi", input.getId()))); lokasi.setIsDelete(true); lokasiRepository.save(lokasi); diff --git a/src/main/java/com/iconplus/smartproc/service/lokasi/GetLokasiByIdService.java b/src/main/java/com/iconplus/smartproc/service/lokasi/GetLokasiByIdService.java index 8a83ef4..f9266bc 100644 --- a/src/main/java/com/iconplus/smartproc/service/lokasi/GetLokasiByIdService.java +++ b/src/main/java/com/iconplus/smartproc/service/lokasi/GetLokasiByIdService.java @@ -26,7 +26,7 @@ public class GetLokasiByIdService implements BaseService new BusinessException(HttpStatus.CONFLICT, Constants.ERR_CODE_10001, Constants.ERR_TTL_10001, - String.format(Constants.ERR_MSG_10001, input.getId()))); + String.format(Constants.ERR_MSG_10001, "Lokasi", input.getId()))); lokasi.setLokasi(input.getLokasi()); lokasi.setKeterangan(input.getKeterangan()); diff --git a/src/main/java/com/iconplus/smartproc/service/manajemenuser/DeleteUserService.java b/src/main/java/com/iconplus/smartproc/service/manajemenuser/DeleteUserService.java index 9c2d58b..9b5b02f 100644 --- a/src/main/java/com/iconplus/smartproc/service/manajemenuser/DeleteUserService.java +++ b/src/main/java/com/iconplus/smartproc/service/manajemenuser/DeleteUserService.java @@ -5,6 +5,8 @@ import com.iconplus.smartproc.helper.model.EmptyResponse; import com.iconplus.smartproc.helper.service.BaseService; import com.iconplus.smartproc.model.request.UsersRequest; import com.iconplus.smartproc.repository.UsersRepository; +import com.iconplus.smartproc.util.Constants; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @Service @@ -20,7 +22,10 @@ public class DeleteUserService implements BaseService new BusinessException("err", "err", "err")); + .orElseThrow(() -> new BusinessException(HttpStatus.CONFLICT, + Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "User", input.getId()))); users.setIsDelete(true); usersRepository.save(users); diff --git a/src/main/java/com/iconplus/smartproc/service/manajemenuser/GetUserByIdService.java b/src/main/java/com/iconplus/smartproc/service/manajemenuser/GetUserByIdService.java index 0bc229b..a5375a7 100644 --- a/src/main/java/com/iconplus/smartproc/service/manajemenuser/GetUserByIdService.java +++ b/src/main/java/com/iconplus/smartproc/service/manajemenuser/GetUserByIdService.java @@ -5,6 +5,8 @@ import com.iconplus.smartproc.helper.service.BaseService; import com.iconplus.smartproc.model.request.UsersRequest; import com.iconplus.smartproc.model.response.UsersResponse; import com.iconplus.smartproc.repository.UsersRepository; +import com.iconplus.smartproc.util.Constants; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @Service @@ -20,7 +22,10 @@ public class GetUserByIdService implements BaseService new BusinessException("err", "err", "err")); + .orElseThrow(() -> new BusinessException(HttpStatus.CONFLICT, + Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "User", input.getId()))); return UsersResponse.builder() .id(userRoleView.getId()) diff --git a/src/main/java/com/iconplus/smartproc/service/manajemenuser/PostCreateUserService.java b/src/main/java/com/iconplus/smartproc/service/manajemenuser/PostCreateUserService.java index fcfa668..8bc8239 100644 --- a/src/main/java/com/iconplus/smartproc/service/manajemenuser/PostCreateUserService.java +++ b/src/main/java/com/iconplus/smartproc/service/manajemenuser/PostCreateUserService.java @@ -8,6 +8,10 @@ import com.iconplus.smartproc.model.request.UsersRequest; 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.springframework.http.HttpStatus; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; @Service @@ -27,10 +31,20 @@ public class PostCreateUserService implements BaseService new BusinessException("err", "err", "err")); + .orElseThrow(() -> new BusinessException(HttpStatus.CONFLICT, + Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "User", input.getId()))); commonService.validateUserRequst(input); diff --git a/src/main/java/com/iconplus/smartproc/service/metodepengadaan/DeleteMetodePengadaanService.java b/src/main/java/com/iconplus/smartproc/service/metodepengadaan/DeleteMetodePengadaanService.java index 41c6f1d..5e18d43 100644 --- a/src/main/java/com/iconplus/smartproc/service/metodepengadaan/DeleteMetodePengadaanService.java +++ b/src/main/java/com/iconplus/smartproc/service/metodepengadaan/DeleteMetodePengadaanService.java @@ -28,7 +28,7 @@ public class DeleteMetodePengadaanService implements BaseService new BusinessException(HttpStatus.CONFLICT, Constants.ERR_CODE_10001, Constants.ERR_TTL_10001, - String.format(Constants.ERR_MSG_10001, input.getId()))); + String.format(Constants.ERR_MSG_10001, "Metode Pengadaan", input.getId()))); metodePengadaan.setIsDelete(true); metodePengadaanRepository.save(metodePengadaan); diff --git a/src/main/java/com/iconplus/smartproc/service/metodepengadaan/GetMetodePengadaanByIdService.java b/src/main/java/com/iconplus/smartproc/service/metodepengadaan/GetMetodePengadaanByIdService.java index 6977d75..4213983 100644 --- a/src/main/java/com/iconplus/smartproc/service/metodepengadaan/GetMetodePengadaanByIdService.java +++ b/src/main/java/com/iconplus/smartproc/service/metodepengadaan/GetMetodePengadaanByIdService.java @@ -26,7 +26,7 @@ public class GetMetodePengadaanByIdService implements BaseService { @@ -30,7 +27,7 @@ public class PutUpdateMetodePengadaanService implements BaseService new BusinessException(HttpStatus.CONFLICT, Constants.ERR_CODE_10001, Constants.ERR_TTL_10001, - String.format(Constants.ERR_MSG_10001, input.getId()))); + String.format(Constants.ERR_MSG_10001, "Metode Pengadaan", input.getId()))); metodePengadaan.setMetodePengadaan(input.getMetodePengadaan()); metodePengadaan.setKeterangan(input.getKeterangan()); diff --git a/src/main/java/com/iconplus/smartproc/service/metodepenyampaian/DeleteMetodePenyampaianService.java b/src/main/java/com/iconplus/smartproc/service/metodepenyampaian/DeleteMetodePenyampaianService.java index b615274..6c7ff06 100644 --- a/src/main/java/com/iconplus/smartproc/service/metodepenyampaian/DeleteMetodePenyampaianService.java +++ b/src/main/java/com/iconplus/smartproc/service/metodepenyampaian/DeleteMetodePenyampaianService.java @@ -28,7 +28,7 @@ public class DeleteMetodePenyampaianService implements BaseService new BusinessException(HttpStatus.CONFLICT, Constants.ERR_CODE_10001, Constants.ERR_TTL_10001, - String.format(Constants.ERR_MSG_10001, input.getId()))); + String.format(Constants.ERR_MSG_10001, "Metode Penyampaian", input.getId()))); metodePenyampaian.setIsDelete(true); metodePenyampaianRepository.save(metodePenyampaian); diff --git a/src/main/java/com/iconplus/smartproc/service/metodepenyampaian/GetMetodePenyampaianByIdService.java b/src/main/java/com/iconplus/smartproc/service/metodepenyampaian/GetMetodePenyampaianByIdService.java index 694afdb..2612420 100644 --- a/src/main/java/com/iconplus/smartproc/service/metodepenyampaian/GetMetodePenyampaianByIdService.java +++ b/src/main/java/com/iconplus/smartproc/service/metodepenyampaian/GetMetodePenyampaianByIdService.java @@ -25,7 +25,7 @@ public class GetMetodePenyampaianByIdService implements BaseService { @@ -30,7 +27,7 @@ public class PutUpdateMetodePenyampaianService implements BaseService new BusinessException(HttpStatus.CONFLICT, Constants.ERR_CODE_10001, Constants.ERR_TTL_10001, - String.format(Constants.ERR_MSG_10001, input.getId()))); + String.format(Constants.ERR_MSG_10001, "Metode Penyampaian", input.getId()))); metodePenyampaian.setMetodePenyampaian(input.getMetodePenyampaian()); metodePenyampaian.setKeterangan(input.getKeterangan()); diff --git a/src/main/java/com/iconplus/smartproc/service/strategipengadaan/DeleteStrategiPengadaanService.java b/src/main/java/com/iconplus/smartproc/service/strategipengadaan/DeleteStrategiPengadaanService.java index c117292..d3ecff0 100644 --- a/src/main/java/com/iconplus/smartproc/service/strategipengadaan/DeleteStrategiPengadaanService.java +++ b/src/main/java/com/iconplus/smartproc/service/strategipengadaan/DeleteStrategiPengadaanService.java @@ -28,7 +28,7 @@ public class DeleteStrategiPengadaanService implements BaseService new BusinessException(HttpStatus.CONFLICT, Constants.ERR_CODE_10001, Constants.ERR_TTL_10001, - String.format(Constants.ERR_MSG_10001, input.getId()))); + String.format(Constants.ERR_MSG_10001, "Strategi Pengadaan", input.getId()))); strategiPengadaan.setIsDelete(true); strategiPengadaanRepository.save(strategiPengadaan); diff --git a/src/main/java/com/iconplus/smartproc/service/strategipengadaan/GetStrategiPengadaanByIdService.java b/src/main/java/com/iconplus/smartproc/service/strategipengadaan/GetStrategiPengadaanByIdService.java index 05fcba0..ad5401b 100644 --- a/src/main/java/com/iconplus/smartproc/service/strategipengadaan/GetStrategiPengadaanByIdService.java +++ b/src/main/java/com/iconplus/smartproc/service/strategipengadaan/GetStrategiPengadaanByIdService.java @@ -25,7 +25,7 @@ public class GetStrategiPengadaanByIdService implements BaseService { @@ -30,7 +27,7 @@ public class PutUpdateStrategiPengadaanService implements BaseService new BusinessException(HttpStatus.CONFLICT, Constants.ERR_CODE_10001, Constants.ERR_TTL_10001, - String.format(Constants.ERR_MSG_10001, input.getId()))); + String.format(Constants.ERR_MSG_10001, "Strategi Pengadaan", input.getId()))); strategiPengadaan.setStrategiPengadaan(input.getStrategiPengadaan()); strategiPengadaan.setKeterangan(input.getKeterangan()); diff --git a/src/main/java/com/iconplus/smartproc/service/sumberdana/DeleteSumberDanaService.java b/src/main/java/com/iconplus/smartproc/service/sumberdana/DeleteSumberDanaService.java index 2707b3c..32f23a2 100644 --- a/src/main/java/com/iconplus/smartproc/service/sumberdana/DeleteSumberDanaService.java +++ b/src/main/java/com/iconplus/smartproc/service/sumberdana/DeleteSumberDanaService.java @@ -5,6 +5,8 @@ import com.iconplus.smartproc.helper.model.EmptyResponse; import com.iconplus.smartproc.helper.service.BaseService; import com.iconplus.smartproc.model.request.SumberDanaRequest; import com.iconplus.smartproc.repository.SumberDanaRepository; +import com.iconplus.smartproc.util.Constants; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @Service @@ -18,7 +20,11 @@ public class DeleteSumberDanaService implements BaseService new BusinessException("err", "err", "err")); + var sumberDana = sumberDanaRepository.findByIdAndIsDeleteFalse(input.getId()) + .orElseThrow(() -> new BusinessException(HttpStatus.CONFLICT, + Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "Sumber Dana", input.getId()))); sumberDana.setIsDelete(true); sumberDanaRepository.save(sumberDana); return new EmptyResponse(); diff --git a/src/main/java/com/iconplus/smartproc/service/sumberdana/GetListSumberDanaService.java b/src/main/java/com/iconplus/smartproc/service/sumberdana/GetListSumberDanaService.java index c9afe2c..d920456 100644 --- a/src/main/java/com/iconplus/smartproc/service/sumberdana/GetListSumberDanaService.java +++ b/src/main/java/com/iconplus/smartproc/service/sumberdana/GetListSumberDanaService.java @@ -3,7 +3,6 @@ package com.iconplus.smartproc.service.sumberdana; import com.iconplus.smartproc.helper.model.Pagination; import com.iconplus.smartproc.helper.service.BaseService; import com.iconplus.smartproc.model.projection.SumberDanaView; -import com.iconplus.smartproc.model.request.RolesRequest; import com.iconplus.smartproc.model.request.SumberDanaRequest; import com.iconplus.smartproc.model.response.GetListSumberDanaResponse; import com.iconplus.smartproc.model.response.SumberDanaResponse; diff --git a/src/main/java/com/iconplus/smartproc/service/sumberdana/GetSumberDanaService.java b/src/main/java/com/iconplus/smartproc/service/sumberdana/GetSumberDanaService.java index 6c30c19..b7d6fde 100644 --- a/src/main/java/com/iconplus/smartproc/service/sumberdana/GetSumberDanaService.java +++ b/src/main/java/com/iconplus/smartproc/service/sumberdana/GetSumberDanaService.java @@ -5,6 +5,8 @@ import com.iconplus.smartproc.helper.service.BaseService; import com.iconplus.smartproc.model.request.SumberDanaRequest; import com.iconplus.smartproc.model.response.SumberDanaResponse; import com.iconplus.smartproc.repository.SumberDanaRepository; +import com.iconplus.smartproc.util.Constants; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @Service @@ -19,7 +21,11 @@ public class GetSumberDanaService implements BaseService new BusinessException("err", "err", "err")); + var sumberDana = sumberDanaRepository.findByIdAndIsDeleteFalse(input.getId()) + .orElseThrow(() -> new BusinessException(HttpStatus.CONFLICT, + Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "Sumber Dana", input.getId()))); return SumberDanaResponse.builder() .id(sumberDana.getId()) .sumberDana(sumberDana.getSumberDana()) diff --git a/src/main/java/com/iconplus/smartproc/service/sumberdana/PostCreateSumberDanaService.java b/src/main/java/com/iconplus/smartproc/service/sumberdana/PostCreateSumberDanaService.java index d898f90..b6dccb0 100644 --- a/src/main/java/com/iconplus/smartproc/service/sumberdana/PostCreateSumberDanaService.java +++ b/src/main/java/com/iconplus/smartproc/service/sumberdana/PostCreateSumberDanaService.java @@ -6,6 +6,8 @@ import com.iconplus.smartproc.model.entity.SumberDana; import com.iconplus.smartproc.model.request.SumberDanaRequest; import com.iconplus.smartproc.model.response.SumberDanaResponse; import com.iconplus.smartproc.repository.SumberDanaRepository; +import com.iconplus.smartproc.util.Constants; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @Service @@ -22,7 +24,10 @@ public class PostCreateSumberDanaService implements BaseService new BusinessException("err", "err", "err")); + var sumberDana = sumberDanaRepository.findByIdAndIsDeleteFalse(input.getId()) + .orElseThrow(() -> new BusinessException(HttpStatus.CONFLICT, + Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "Sumber Dana", input.getId()))); sumberDana.setSumberDana(input.getSumberDana()); sumberDana.setKeterangan(input.getKeterangan()); sumberDana.setIsActive(input.getIsActive()); diff --git a/src/main/java/com/iconplus/smartproc/service/supplypositioningmatrix/DeleteSupplyPositioningMatrixService.java b/src/main/java/com/iconplus/smartproc/service/supplypositioningmatrix/DeleteSupplyPositioningMatrixService.java index b6f8df8..d6fc391 100644 --- a/src/main/java/com/iconplus/smartproc/service/supplypositioningmatrix/DeleteSupplyPositioningMatrixService.java +++ b/src/main/java/com/iconplus/smartproc/service/supplypositioningmatrix/DeleteSupplyPositioningMatrixService.java @@ -28,7 +28,7 @@ public class DeleteSupplyPositioningMatrixService implements BaseService new BusinessException(HttpStatus.CONFLICT, Constants.ERR_CODE_10001, Constants.ERR_TTL_10001, - String.format(Constants.ERR_MSG_10001, input.getId()))); + String.format(Constants.ERR_MSG_10001, "Supply Posotioning Matrix", input.getId()))); supplyPositioningMatrix.setIsDelete(true); supplyPositioningMatrixRepository.save(supplyPositioningMatrix); diff --git a/src/main/java/com/iconplus/smartproc/service/supplypositioningmatrix/GetSupplyPositioningMatrixByIdService.java b/src/main/java/com/iconplus/smartproc/service/supplypositioningmatrix/GetSupplyPositioningMatrixByIdService.java index 65a8982..722c23a 100644 --- a/src/main/java/com/iconplus/smartproc/service/supplypositioningmatrix/GetSupplyPositioningMatrixByIdService.java +++ b/src/main/java/com/iconplus/smartproc/service/supplypositioningmatrix/GetSupplyPositioningMatrixByIdService.java @@ -25,7 +25,7 @@ public class GetSupplyPositioningMatrixByIdService implements BaseService { @@ -30,7 +27,7 @@ public class PutUpdateSupplyPositioningMatrixService implements BaseService new BusinessException(HttpStatus.CONFLICT, Constants.ERR_CODE_10001, Constants.ERR_TTL_10001, - String.format(Constants.ERR_MSG_10001, input.getId()))); + String.format(Constants.ERR_MSG_10001, "Supply Positioning Matrix", input.getId()))); supplyPositioningMatrix.setSupplyPositioningMatrix(input.getSupplyPositioningMatrix()); supplyPositioningMatrix.setKeterangan(input.getKeterangan()); diff --git a/src/main/java/com/iconplus/smartproc/service/unitinisiator/DeleteUnitInisiatorService.java b/src/main/java/com/iconplus/smartproc/service/unitinisiator/DeleteUnitInisiatorService.java index 2e7ca43..a82fe85 100644 --- a/src/main/java/com/iconplus/smartproc/service/unitinisiator/DeleteUnitInisiatorService.java +++ b/src/main/java/com/iconplus/smartproc/service/unitinisiator/DeleteUnitInisiatorService.java @@ -5,6 +5,8 @@ import com.iconplus.smartproc.helper.model.EmptyResponse; import com.iconplus.smartproc.helper.service.BaseService; import com.iconplus.smartproc.model.request.UnitInisiatorRequest; import com.iconplus.smartproc.repository.UnitInisiatorRepository; +import com.iconplus.smartproc.util.Constants; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @Service @@ -19,7 +21,11 @@ public class DeleteUnitInisiatorService implements BaseService new BusinessException("err", "err", "err")); + var unitInisiator = unitInisiatorRepository.findByIdAndIsDeleteFalse(input.getId()) + .orElseThrow(() -> new BusinessException(HttpStatus.CONFLICT, + Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "Unit Inisiator", input.getId()))); unitInisiator.setIsDelete(true); unitInisiatorRepository.save(unitInisiator); return new EmptyResponse(); diff --git a/src/main/java/com/iconplus/smartproc/service/unitinisiator/GetUnitInisiatorService.java b/src/main/java/com/iconplus/smartproc/service/unitinisiator/GetUnitInisiatorService.java index 6259640..33083a5 100644 --- a/src/main/java/com/iconplus/smartproc/service/unitinisiator/GetUnitInisiatorService.java +++ b/src/main/java/com/iconplus/smartproc/service/unitinisiator/GetUnitInisiatorService.java @@ -5,6 +5,8 @@ import com.iconplus.smartproc.helper.service.BaseService; import com.iconplus.smartproc.model.request.UnitInisiatorRequest; import com.iconplus.smartproc.model.response.UnitInisiatorResponse; import com.iconplus.smartproc.repository.UnitInisiatorRepository; +import com.iconplus.smartproc.util.Constants; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @Service @@ -19,7 +21,11 @@ public class GetUnitInisiatorService implements BaseService new BusinessException("err", "err", "err")); + var unitInisiator = unitInisiatorRepository.findByIdAndIsDeleteFalse(input.getId()) + .orElseThrow(() -> new BusinessException(HttpStatus.CONFLICT, + Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "Unit Inisiator", input.getId()))); return UnitInisiatorResponse.builder() .id(unitInisiator.getId()) .unitInisiator(unitInisiator.getUnitInisiator()) diff --git a/src/main/java/com/iconplus/smartproc/service/unitinisiator/PostCreateUnitInisiatorService.java b/src/main/java/com/iconplus/smartproc/service/unitinisiator/PostCreateUnitInisiatorService.java index 3ef252e..9acc3b0 100644 --- a/src/main/java/com/iconplus/smartproc/service/unitinisiator/PostCreateUnitInisiatorService.java +++ b/src/main/java/com/iconplus/smartproc/service/unitinisiator/PostCreateUnitInisiatorService.java @@ -6,6 +6,8 @@ import com.iconplus.smartproc.model.entity.UnitInisiator; import com.iconplus.smartproc.model.request.UnitInisiatorRequest; import com.iconplus.smartproc.model.response.UnitInisiatorResponse; import com.iconplus.smartproc.repository.UnitInisiatorRepository; +import com.iconplus.smartproc.util.Constants; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @Service @@ -21,7 +23,10 @@ public class PostCreateUnitInisiatorService implements BaseService new BusinessException("err", "err", "err")); + var unitInisiator = unitInisiatorRepository.findByIdAndIsDeleteFalse(input.getId()) + .orElseThrow(() -> new BusinessException(HttpStatus.CONFLICT, + Constants.ERR_CODE_10001, + Constants.ERR_TTL_10001, + String.format(Constants.ERR_MSG_10001, "Unit Inisiator", input.getId()))); unitInisiator.setUnitInisiator(input.getUnitInisiator()); unitInisiator.setKeterangan(input.getKeterangan()); unitInisiator.setIsActive(input.getIsActive()); diff --git a/src/main/java/com/iconplus/smartproc/util/Constants.java b/src/main/java/com/iconplus/smartproc/util/Constants.java index e013a2f..8852b23 100644 --- a/src/main/java/com/iconplus/smartproc/util/Constants.java +++ b/src/main/java/com/iconplus/smartproc/util/Constants.java @@ -6,11 +6,11 @@ public class Constants { public static final String ERR_CODE_10001 = "10001"; public static final String ERR_TTL_10001 = "Data tidak ditemukan"; - public static final String ERR_MSG_10001 = "Jenis Anggaran dengan id : %s tidak ditemukan"; + public static final String ERR_MSG_10001 = "%s dengan id : %s tidak ditemukan"; public static final String ERR_CODE_10002 = "10002"; public static final String ERR_TTL_10002 = "Data tersedia"; - public static final String ERR_MSG_10002 = "Jenis Anggaran : %s sudah tersedia"; + public static final String ERR_MSG_10002 = "%s : %s sudah tersedia"; public static final String ERR_CODE_10003 = "10003"; public static final String ERR_TTL_10003 = "Data tidak tersedia"; @@ -28,6 +28,22 @@ public class Constants { public static final String ERR_TTL_10006 = "Data tersedia"; public static final String ERR_MSG_10006 = "Role : %s sudah tersedia"; + public static final String ERR_CODE_10007 = "10007"; + public static final String ERR_TTL_10007 = "Proses Gagal"; + public static final String ERR_MSG_10007 = "Silahkan periksa kembali password baru yg anda input"; + + public static final String ERR_CODE_10008 = "10008"; + public static final String ERR_TTL_10008 = "Proses Gagal"; + public static final String ERR_MSG_10008 = "Gagal generate token"; + + public static final String ERR_CODE_10009 = "10009"; + public static final String ERR_TTL_10009 = "Proses Gagal"; + public static final String ERR_MSG_10009 = "Periksa kembali password sekrang anda"; + + public static final String ERR_CODE_10010 = "10010"; + public static final String ERR_TTL_10010 = "Proses Gagal"; + public static final String ERR_MSG_10010 = "Gagal decrypt password, masukkan password yg ter-encrypt"; + public static final String ERR_CODE_40041 = "40041"; public static final String ERR_TTL_40041 = "Terjadi Gangguan"; public static final String ERR_MSG_40041 = "Masalah Koneksi System"; @@ -35,6 +51,22 @@ public class Constants { public static final String ERR_CODE_40051 = "40051"; public static final String ERR_CODE_80007 = "80007"; public static final String TITLE_INVALID_NEXT_STEP = "Proses tidak dapat dilanjutkan"; + public static final String REFRESH_TOKEN_EXPIRED = "Refresh token expired"; + public static final String REFRESH_TOKEN_NOT_VALID = "Refresh token tidak valid"; + public static final String ERR_CODE_40042 = "40042"; + public static final String ERR_TTL_40042 = "Terjadi gangguan"; + public static final String ERR_MSG_40042 = "Proses generate token gagal dengan response: null"; + + public static final String ERR_CODE_40038 = "40038"; + public static final String ERR_TITLE_40038 = "Data Sedang Tidak Tersedia"; + public static final String ERR_MESSAGE_40038 = "Data User Tidak Ditemukan."; + + public static final String ERR_CODE_80000 = "80000"; + public static final String N0_SUCH_ALGORITHM_EXCEPTION = "NoSuchAlgorithmException : "; + public static final String N0_SUCH_PADDING_EXCEPTION = "NoSuchPaddingException : "; + public static final String INVALID_KEY_EXCEPTION = "InvalidKeyException : "; + public static final String ILEGAL_BLOCK_SIZE_EXCEPTION = "IllegalBlockSizeException : "; + public static final String BAD_PADDING_EXCEPTION = "BadPaddingException : "; } diff --git a/src/main/java/com/iconplus/smartproc/util/EncryptDecryptUtils.java b/src/main/java/com/iconplus/smartproc/util/EncryptDecryptUtils.java new file mode 100644 index 0000000..182e137 --- /dev/null +++ b/src/main/java/com/iconplus/smartproc/util/EncryptDecryptUtils.java @@ -0,0 +1,52 @@ +package com.iconplus.smartproc.util; + +import com.iconplus.smartproc.exception.TechnicalException; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.crypto.BadPaddingException; +import javax.crypto.Cipher; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.NoSuchPaddingException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.PrivateKey; +import java.util.Base64; + +public class EncryptDecryptUtils { + + private static final Logger log = LogManager.getLogger(EncryptDecryptUtils.class); + + private EncryptDecryptUtils() { + } + + public static String decrypt(String data, String base64PrivateKey) { + return decryptChipper(Base64.getDecoder().decode(data.getBytes()), RSAUtil.getPrivateKey(base64PrivateKey)); + } + + private static String decryptChipper(byte[] data, PrivateKey privateKey) { + var result = ""; + try { + var cipher = Cipher.getInstance("RSA/ECB/OAEPWithSHA-256AndMGF1Padding"); + cipher.init(2, privateKey); + result = new String(cipher.doFinal(data)); + } catch (NoSuchAlgorithmException var3) { + log.error("NoSuchAlgorithmException : {}", var3.getMessage()); + throw new TechnicalException(Constants.ERR_CODE_80000, Constants.N0_SUCH_ALGORITHM_EXCEPTION + var3.getMessage()); + } catch (NoSuchPaddingException var4) { + log.error("NoSuchPaddingException : {}", var4.getMessage()); + throw new TechnicalException(Constants.ERR_CODE_80000, Constants.N0_SUCH_PADDING_EXCEPTION + var4.getMessage()); + } catch (InvalidKeyException var5) { + log.error("InvalidKeyException : {}", var5.getMessage()); + throw new TechnicalException(Constants.ERR_CODE_80000, Constants.INVALID_KEY_EXCEPTION + var5.getMessage()); + } catch (IllegalBlockSizeException var6) { + log.error("IllegalBlockSizeException : {}", var6.getMessage()); + throw new TechnicalException(Constants.ERR_CODE_80000, Constants.ILEGAL_BLOCK_SIZE_EXCEPTION + var6.getMessage()); + } catch (BadPaddingException var7) { + log.error("BadPaddingException : {}", var7.getMessage()); + throw new TechnicalException(Constants.ERR_CODE_80000, Constants.BAD_PADDING_EXCEPTION + var7.getMessage()); + } + return result; + } + +} diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 69e2bf7..d5893e8 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -6,6 +6,10 @@ jwt: access-token: 480 refresh-token: 720 +config: + password: + privateKey: MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCRyUePQWkg+IH5dAvQ/+YlVR1htFdhL2+NJtWWXNW15mBUOEr+yvJsOYAzY9KfxmVqRRr1uQEAaaKjNpxwNEnHkMn8LzSEhRxCd4Mqpa5jquCdPfMqGO3cwdkrQjZVfm3tCBYd2HkOeL8PTwlbBORucf6qHPxZvjGVXQeiRAHTlgHTR1647T1+vlDDcaOBJIrwcD566hqOCKMxtE+5F4DieSYEuHJMyvJf/WH2+LxbP2t4Z6IV0tksQKtwyZstEXd3yIL8chKoFh2p3KO8aFfMa7X0aiDVC3z+o2Hh8+YHQt7cSl+NGRxasuqLbY3twZEC9qAIkkDOpBUp7lLZ9NVHAgMBAAECggEACd0GXGjehf6KPKhfTEqj9Y6mqD+dUdP1xiUEemHZi68EgW41lLuCX1Qcml18mJbBscjvJATaTn7XJBfDycuf2kKvh8Jh2T1wRgbz9uSywceD3t+cHhMFtNPgr46RQoOFSG4toONOfW4p7w034tKX6ekIg9XmNOQrUqGyrIXRYdFADB68HaLxlgS0zKrkhp14+wH/krihfS3H7Z+wBVozWSgyHCVbov68l764w3UWZYEEe2mFl31HqhD5KEo8QXODWuemUTROaXKF/iOsPEMC8Qz4Jdqme+iAlV4b2LNaSTEP/NG/kFIE443RlyFo9YfVNw7/osgAksXAPdOZd8qt8QKBgQDYHLX2HVaGj9zvAlqSKjf6VuuxgdRUYW4rqQjm97YmAJNp4udjKLUgD7yDuImYh/E/IWjDxf1Hf3fTjcc98iPMsvP3lkXxdOxMLLlnMv0Ewxof8gATQndU/w+/XuuAZ9cy3vtheo59i4rFpik8XFAH6kPk/gWI9DAE/IbXuOSNUwKBgQCssaxMwfrB9nwQ9eDXv2z+Ce4sZbtZEJYD3a29OGshLw8AH//z/BxPzZRTFy63IfmmIyYSGaC7ZdkrakLhlBXrhi/P0wafp7xEsONb8uNYWDDWoDewH75GX/SPhx7bX0GSeiX6X5XAUg97j0xlfYllIieMLCw4rLU+97ge5xalvQKBgQDXJjYtEGYczsqYFBLRI0DZdIFvFZ6qZtkElGMtdf0b9kTMDL5pZJR1l9UImcY6WVRekkc3aDvQW2GS9rodvJvRZXMm0K9PRCUfbQMjb4qfnBC9LvLOOcSNlOQ7lCcGjdqbZYyELjv/VtXQEa1Jz2lJh/sR1abzAo9v12vzBbpbywKBgQCkdEZKimeLknivhhbqHgdjHH3NlcuFk3/oipBLI5ERdsjoK5EI/crQTEu1nNwF1brx9YLptbIVA3Z+G6E5RFZjhdO+K42hOJDXMUQyaekKVmGb4dNmS7RdPD+e9uPxsJK3NM850RDApuTLm7j65UOUJaRXnjE2f3HSVwDlnNc6WQKBgQCccgyIJx5HnxdkYYFJBnuwo1aDNo2TOqiy9wPXHzxuR8TsvqmbbYoxT0kJkqOjkbQII08nLyHJ3KL7XK3dCEGmdRArHjo0PCLMzKqBZdhtfxN413HxmwXIF5zM6mhS4g8XrDyNW7EhLp/putnpmE6XI9VnEFx/LxAd8nJ9tUd39A== + spring: datasource: driver-class-name: org.postgresql.Driver