dev add
Test Workflow / test (push) Successful in 4s

This commit is contained in:
vladp
2026-02-04 11:47:43 +07:00
parent 06a6196a26
commit 7a809e6b8c
11 changed files with 152 additions and 17 deletions
@@ -7,15 +7,24 @@ import ru.soune.nocopy.entity.file.FileEntity;
import ru.soune.nocopy.entity.file.FileStatus;
import ru.soune.nocopy.entity.file.FileType;
import ru.soune.nocopy.entity.file.ProtectionStatus;
import ru.soune.nocopy.entity.user.User;
import ru.soune.nocopy.repository.FileEntityRepository;
import ru.soune.nocopy.repository.UserRepository;
import ru.soune.nocopy.service.CompanyService;
import java.util.ArrayList;
import java.util.List;
@Service
@RequiredArgsConstructor
public class FileStatsService {
private final FileEntityRepository fileEntityRepository;
private final CompanyService companyService;
private final UserRepository userRepository;
public FileInfoUserResponse getUserFileStats(Long userId) {
List<FileEntity> userFiles = fileEntityRepository.findByUserId(userId);
return calculateStats(userFiles);
@@ -49,6 +58,47 @@ public class FileStatsService {
.build();
}
public Long calculateUserFileSize(Long userId) {
List<FileEntity> userFiles = fileEntityRepository.findByUserId(userId);
return calculateTotalSize(userFiles);
}
public Long calculateCompanyFileSize(Long userId) {
User user = userRepository.findById(userId).orElseThrow();
List<User> companyUsers = companyService.getCompanyUsers(user.getCompany().getId());
List<FileEntity> userFiles = new ArrayList<>();
for (User companyUser : companyUsers) {
userFiles.addAll(fileEntityRepository.findByUserId(companyUser.getId()));
}
return calculateTotalSize(userFiles);
}
public Integer filesUserCount(Long userId) {
List<FileEntity> userFiles = fileEntityRepository.findByUserId(userId);
return calculateTotalCount(userFiles);
}
public Integer filesCompanyCount(Long userId) {
User user = userRepository.findById(userId).orElseThrow();
List<User> companyUsers = companyService.getCompanyUsers(user.getCompany().getId());
List<FileEntity> userFiles = new ArrayList<>();
for (User companyUser : companyUsers) {
userFiles.addAll(fileEntityRepository.findByUserId(companyUser.getId()));
}
return calculateTotalCount(userFiles);
}
private Long protectedUserFiles(List<FileEntity> files) {
return files.stream().filter(file -> file.getProtectionStatus() == ProtectionStatus.PROTECTED).count();
}
@@ -24,6 +24,7 @@ import ru.soune.nocopy.service.FileSimilarityService;
import ru.soune.nocopy.service.ImageHashService;
import ru.soune.nocopy.service.file.FileEntityService;
import ru.soune.nocopy.service.file.FileUploadService;
import ru.soune.nocopy.service.tariff.TariffInfoService;
import ru.soune.nocopy.util.FileUtil;
import java.io.*;
@@ -79,6 +80,8 @@ public class FileUploadServiceImpl implements FileUploadService {
private final FileUtil fileUtil;
private final TariffInfoService tariffInfoService;
@PostConstruct
public void init() {
try {
@@ -325,6 +328,9 @@ public class FileUploadServiceImpl implements FileUploadService {
completeFileProcessingAsync(session, status);
if (status != FileStatus.TEMP) {
tariffInfoService.writeOffTokens(session.getUserId());
}
} else {
sessionRepository.save(session);
}
@@ -158,7 +158,6 @@ public class AuthService {
tariffInfoService.addTariffInfo(companyTariff);
user.setCompany(company);
user.setPersonalTariffInfo(companyTariff);
user.grantPermission(Permission.COMPANY_ADMIN_PERMISSIONS);
}
@@ -12,4 +12,6 @@ public class TariffConstants {
public static final Integer START_TOKENS = 200;
public static final Integer PRO_TOKENS = 300;
public static final Integer ENTERPRISE_TOKENS = 400;
public static final Integer TOKEN_VALUE = 3;
}
@@ -8,9 +8,11 @@ import ru.soune.nocopy.entity.tarif.Tariff;
import ru.soune.nocopy.entity.tarif.TariffInfo;
import ru.soune.nocopy.entity.tarif.TariffStatus;
import ru.soune.nocopy.entity.tarif.TariffType;
import ru.soune.nocopy.entity.user.User;
import ru.soune.nocopy.exception.TariffNotFoundException;
import ru.soune.nocopy.repository.TariffInfoRepository;
import ru.soune.nocopy.repository.TariffRepository;
import ru.soune.nocopy.repository.UserRepository;
import java.time.LocalDateTime;
import java.util.List;
@@ -24,20 +26,47 @@ public class TariffInfoService {
private TariffRepository tariffRepository;
public TariffInfo createTariffInfo(LocalDateTime startTariff, LocalDateTime endTariff, TariffStatus tariffStatus) {
private UserRepository userRepository;
public TariffInfo createTariffInfo(LocalDateTime startTariff, LocalDateTime endTariff, TariffStatus tariffStatus,
Integer tokens) {
TariffInfo tariffInfo = new TariffInfo();
tariffInfo.setStartTariff(startTariff);
tariffInfo.setStatus(tariffStatus);
tariffInfo.setEndTariff(endTariff);
tariffInfo.setTokens(tokens);
return tariffInfoRepository.save(tariffInfo);
}
@Transactional
public void writeOffTokens(long userId) {
User user = userRepository.findById(userId).orElseThrow();
TariffInfo activeTariffInfo;
if (user.getCompany() == null) {
activeTariffInfo = user.getPersonalTariffInfo();
} else {
activeTariffInfo = user.getCompany().getTariffInfo();
}
Integer tokens = activeTariffInfo.getTokens();
if (tokens > 0 && (tokens - TariffConstants.TOKEN_VALUE) > 0) {
activeTariffInfo.setTokens(activeTariffInfo.getTokens() - TariffConstants.TOKEN_VALUE);
tariffInfoRepository.save(activeTariffInfo);
} else {
throw new TariffNotFoundException("User not have tokens for protect");
}
}
public TariffInfo createTariffInfo(TariffType tariffType) {
Tariff tariff = tariffRepository.findByType(tariffType.toString()).orElseThrow();
TariffInfo tariffInfo = createTariffInfo(LocalDateTime.now(), LocalDateTime.now().plusDays(30),
TariffStatus.ACTIVE);
TariffStatus.ACTIVE, tariff.getTokens());
tariffInfo.setTariff(tariff);
return tariffInfoRepository.save(tariffInfo);
@@ -71,7 +100,9 @@ public class TariffInfoService {
public TariffInfoDTO updateTariffInfo(String id, TariffInfoDTO tariffInfoDTO) {
TariffInfo tariffInfo = tariffInfoRepository.findById(id)
.orElseThrow(() -> new TariffNotFoundException("Tariff not found"));
updateTariffInfoFromDTO(tariffInfo, tariffInfoDTO);
return convertToInfoDTO(tariffInfoRepository.save(tariffInfo));
}
@@ -87,8 +118,9 @@ public class TariffInfoService {
tariffInfo.getStartTariff(),
tariffInfo.getEndTariff(),
tariffInfo.getTariff() != null ? tariffInfo.getTariff().getId() : null,
tariffInfo.getTariff() != null ? tariffInfo.getTariff().getName() : null
);
tariffInfo.getTariff() != null ? tariffInfo.getTariff().getName() : null, tariffInfo.getTokens(),
tariffInfo.getTariff().getDiskSize(), 0L, 0,
tariffInfo.getTariff().getMaxFilesCount());
}
private void updateTariffInfoFromDTO(TariffInfo tariffInfo, TariffInfoDTO dto) {