dev add

src/main/java/ru/soune/nocopy/controller/UserController.java

@@ -9,8 +9,10 @@ import ru.soune.nocopy.dto.MessageCode;
 import ru.soune.nocopy.dto.register.ChangePasswordRequest;
 import ru.soune.nocopy.dto.register.RegAnswer;
 import ru.soune.nocopy.dto.register.RegRequest;
+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.AuthToken;
 import ru.soune.nocopy.entity.user.User;
@@ -20,8 +22,8 @@ import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.mapper.UserMapper;
 import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.UserRepository;
+import ru.soune.nocopy.service.file.FileStatsService;
 import ru.soune.nocopy.service.register.AuthService;
-import ru.soune.nocopy.service.tariff.TariffInfoService;
 import ru.soune.nocopy.service.tariff.TariffService;
 import ru.soune.nocopy.service.user.UserService;
 
@@ -49,12 +51,15 @@ public class UserController {
 
     private final TariffService tariffService;
 
+    private final FileStatsService fileStatsService;
+
     @GetMapping("/all")
     public ResponseEntity<List<UserDTO>> getAllUsers() {
         List<UserDTO> allUsers = userRepository.findAll().stream()
                 .map(u -> new UserDTO(u.getFullName(), u.getCompanyName(), u.getEmail(), u.isActive(),
                         u.getPhone(), u.getGenderType(),
-                        u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType(), tariffService.getAllTariffs(), u.getPersonalTariffInfo()))
+                        u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType(), tariffService.getAllTariffs(),
+                        null))
                 .toList();
 
         return ResponseEntity.ok(allUsers);
@@ -82,9 +87,32 @@ public class UserController {
                 if (user.canManageCompanySettings() || user.canLogin() && user.getCompany() == null) {
                     userDTO.setTariffs(tariffService.getAllTariffs());
 
+                    Long fileOnDisk = user.canManageCompanySettings() ?
+                            fileStatsService.calculateCompanyFileSize(user.getId()):
+                            fileStatsService.calculateUserFileSize(user.getId());
+
+                    Integer filesCount =  user.canManageCompanySettings() ?
+                            fileStatsService.filesCompanyCount(user.getId()):
+                            fileStatsService.filesUserCount(user.getId());
+
                     TariffInfo personalTariffInfo = user.getPersonalTariffInfo();
+                    Tariff tariff = personalTariffInfo.getTariff();
+
+                    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())
+                            .build();
+
+                    userDTO.setTariffInfo(infoDTO);
 
-                    userDTO.setTariffInfo(personalTariffInfo);
                 }
 
                 userDTO.setPhone(user.getPhone());