backdev/no-copy
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

NCBACK-162
Test Workflow / test (push) Has been cancelled
Details

Browse Source
This commit is contained in:
backdev
2026-06-01 14:49:36 +07:00
parent b107b805fc
commit 184f3a730c
9 changed files with 95 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ru/soune/nocopy/service/user/UserService.java
+6 -9
View File
@@ -21,7 +21,6 @@ import ru.soune.nocopy.exception.CompanyAlreadyExist;
import ru.soune.nocopy.exception.InvalidUserEmail;
import ru.soune.nocopy.exception.NotValidationPasswordException;
import ru.soune.nocopy.exception.UserNotFoundException;
import ru.soune.nocopy.repository.AuthTokenRepository;
import ru.soune.nocopy.repository.CompanyRepository;
import ru.soune.nocopy.repository.UserRepository;
import ru.soune.nocopy.service.file.FileStatsService;
@@ -44,7 +43,7 @@ public class UserService {
private final TariffInfoService tariffInfoService;
private final AuthTokenRepository authTokenRepository;
private final UserService userService;
@Transactional
public User changePassword(User user, ChangePasswordRequest request) {
@@ -99,7 +98,7 @@ public class UserService {
}
@Transactional
public User createUser(RegRequest registerRequest, boolean verified) {
public User createUser(RegRequest registerRequest, boolean verified, Long createrId) {
User user = new User();
user.setFullName(registerRequest.getFullName());
user.setEmail(registerRequest.getEmail());
@@ -118,7 +117,7 @@ public class UserService {
} else if (accountType == AccountType.B2C && registerRequest.getCompanyName() == null) {
createIndividualAccount(user);
} else {
createIndividualCompanyAccount(registerRequest, user);
createIndividualCompanyAccount(user, createrId);
}
if (registerRequest.getPhone() != null) {
@@ -167,11 +166,9 @@ public class UserService {
}
private void createIndividualCompanyAccount(RegRequest request, User user) {
String authToken = request.getAuthToken();
Long userIdByToken = authTokenRepository.findUserIdByToken(authToken);
User companyUser = userRepository.findById(userIdByToken)
.orElseThrow(() -> new EntityNotFoundException("Not found token: " + authToken));
private void createIndividualCompanyAccount(User user, Long companyUserId) {
User companyUser = userService.getUserById(companyUserId).orElseThrow(() ->
new EntityNotFoundException("Not found user id: " + companyUserId));
Company company = companyUser.getCompany();
if (company == null) {