dev add additional info user

2026-03-25 12:46:33 +07:00
parent 46cf252699
commit c1782cf59b
11 changed files with 142 additions and 12 deletions
@@ -10,6 +10,7 @@ import ru.soune.nocopy.dto.MessageCode;
 import ru.soune.nocopy.dto.tarriff.TariffDTO;
 import ru.soune.nocopy.dto.tarriff.TariffRequest;
 import ru.soune.nocopy.dto.tarriff.TariffResponse;
+import ru.soune.nocopy.entity.tarif.TariffTimeTerm;
 import ru.soune.nocopy.entity.user.AuthToken;
 import ru.soune.nocopy.entity.user.User;
 import ru.soune.nocopy.repository.AuthTokenRepository;
@@ -64,7 +65,7 @@ public class TariffHandler implements RequestHandler {
    private BaseResponse handleAddTariff(BaseRequest request, TariffRequest tariffRequest) {
        tariffService.addTariff(tariffRequest.getName(), tariffRequest.getPrice(), tariffRequest.getType(),
                tariffRequest.getTokens(), tariffRequest.getDiskSize(), tariffRequest.getMaxUsers(),
-                tariffRequest.getMaxFilesCount());
+                tariffRequest.getMaxFilesCount(), tariffRequest.getTariffTerm());

        TariffResponse tariffResponse = TariffResponse.builder()
                .tariffName(tariffRequest.getName())
@@ -122,7 +123,8 @@ public class TariffHandler implements RequestHandler {
    private BaseResponse handleGetTariffs(BaseRequest request, TariffRequest tariffRequest) {
        AuthToken authToken = authTokenRepository.findByToken(tariffRequest.getUserToken()).orElseThrow();
        User user = authToken.getUser();
-        List<TariffDTO> allTariffs = tariffService.getTariffByAccountType(user);
+        List<TariffDTO> allTariffs = tariffService.getTariffByAccountTypeAndTariffTerm(user,
+                TariffTimeTerm.valueOf(tariffRequest.getTariffTerm().toUpperCase()));

        return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
                MessageCode.SUCCESS.getDescription(),