@@ -43,8 +43,6 @@ public class UserService {
|
|||||||
|
|
||||||
private final TariffInfoService tariffInfoService;
|
private final TariffInfoService tariffInfoService;
|
||||||
|
|
||||||
private final UserService userService;
|
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
public User changePassword(User user, ChangePasswordRequest request) {
|
public User changePassword(User user, ChangePasswordRequest request) {
|
||||||
if (!passwordEncoder.matches(request.getCurrentPassword(), user.getPassword())) {
|
if (!passwordEncoder.matches(request.getCurrentPassword(), user.getPassword())) {
|
||||||
@@ -167,7 +165,7 @@ public class UserService {
|
|||||||
|
|
||||||
|
|
||||||
private void createIndividualCompanyAccount(User user, Long companyUserId) {
|
private void createIndividualCompanyAccount(User user, Long companyUserId) {
|
||||||
User companyUser = userService.getUserById(companyUserId).orElseThrow(() ->
|
User companyUser = getUserById(companyUserId).orElseThrow(() ->
|
||||||
new EntityNotFoundException("Not found user id: " + companyUserId));
|
new EntityNotFoundException("Not found user id: " + companyUserId));
|
||||||
|
|
||||||
Company company = companyUser.getCompany();
|
Company company = companyUser.getCompany();
|
||||||
|
|||||||
Reference in New Issue
Block a user