This commit is contained in:
@@ -5,13 +5,17 @@ import org.springframework.security.crypto.password.PasswordEncoder;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import ru.soune.nocopy.dto.register.ChangePasswordRequest;
|
||||
import ru.soune.nocopy.dto.tarriff.TariffInfoDTO;
|
||||
import ru.soune.nocopy.dto.user.UserDTO;
|
||||
import ru.soune.nocopy.dto.user.UserRequest;
|
||||
import ru.soune.nocopy.entity.tarif.Tariff;
|
||||
import ru.soune.nocopy.entity.tarif.TariffInfo;
|
||||
import ru.soune.nocopy.entity.user.User;
|
||||
import ru.soune.nocopy.exception.InvalidUserEmail;
|
||||
import ru.soune.nocopy.exception.NotValidationPasswordException;
|
||||
import ru.soune.nocopy.exception.UserNotFoundException;
|
||||
import ru.soune.nocopy.repository.UserRepository;
|
||||
import ru.soune.nocopy.service.file.FileStatsService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
@@ -24,6 +28,8 @@ public class UserService {
|
||||
|
||||
private final PasswordEncoder passwordEncoder;
|
||||
|
||||
private final FileStatsService fileStatsService;
|
||||
|
||||
@Transactional
|
||||
public User changePassword(User user, ChangePasswordRequest request) {
|
||||
if (!passwordEncoder.matches(request.getCurrentPassword(), user.getPassword())) {
|
||||
@@ -47,6 +53,13 @@ public class UserService {
|
||||
return mapToDTO(updatedUser);
|
||||
}
|
||||
|
||||
public UserDTO getUserInfo(Long userId) {
|
||||
User user = userRepository.findById(userId)
|
||||
.orElseThrow(() -> new UserNotFoundException("User not found with id: " + userId));
|
||||
|
||||
return mapToDTO(user);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public List<String> getUsersCompanyEmails(String company) {
|
||||
return userRepository.emailsByCompany(company);
|
||||
@@ -86,15 +99,42 @@ public class UserService {
|
||||
}
|
||||
|
||||
private UserDTO mapToDTO(User user) {
|
||||
TariffInfo personalTariffInfo = user.getPersonalTariffInfo();
|
||||
Tariff tariff = personalTariffInfo.getTariff();
|
||||
Long fileOnDisk = user.canManageCompanySettings() ?
|
||||
fileStatsService.calculateCompanyFileSize(user.getId()):
|
||||
fileStatsService.calculateUserFileSize(user.getId());
|
||||
|
||||
Integer filesCount = user.canManageCompanySettings() ?
|
||||
fileStatsService.filesCompanyCount(user.getId()):
|
||||
fileStatsService.filesUserCount(user.getId());
|
||||
|
||||
TariffInfoDTO infoDTO = TariffInfoDTO.builder().tokens(personalTariffInfo.getTokens())
|
||||
.id(personalTariffInfo.getId())
|
||||
.tariffName(tariff.getName())
|
||||
.status(personalTariffInfo.getStatus().name())
|
||||
.tariffId(tariff.getId())
|
||||
.currentFileCounts(filesCount)
|
||||
.maxFileCounts(tariff.getMaxFilesCount())
|
||||
.currentFileOnDisk(fileOnDisk)
|
||||
.maxFileOnDisk(tariff.getDiskSize())
|
||||
.startTariff(personalTariffInfo.getStartTariff())
|
||||
.endTariff(personalTariffInfo.getEndTariff())
|
||||
.tokens(personalTariffInfo.getTokens() + personalTariffInfo.getBoughtTokens())
|
||||
.build();
|
||||
|
||||
return UserDTO.builder()
|
||||
.fullName(user.getFullName())
|
||||
.email(user.getEmail())
|
||||
.company(user.getCompanyName())
|
||||
.email(user.getEmail())
|
||||
.active(user.isActive())
|
||||
.phone(user.getPhone())
|
||||
.genderType(user.getGenderType())
|
||||
.birthday(user.getBirthday())
|
||||
.subscriptionType(user.getSubscriptionType())
|
||||
.createdAt(user.getCreatedAt())
|
||||
.subscriptionType(user.getSubscriptionType())
|
||||
.tariffInfo(infoDTO)
|
||||
.verifiedStatus(user.getVerificationStatus())
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user