diff --git a/src/main/java/ru/soune/nocopy/controller/PaymentController.java b/src/main/java/ru/soune/nocopy/controller/PaymentController.java index 0330b80..1c29804 100644 --- a/src/main/java/ru/soune/nocopy/controller/PaymentController.java +++ b/src/main/java/ru/soune/nocopy/controller/PaymentController.java @@ -2,6 +2,7 @@ package ru.soune.nocopy.controller; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import ru.soune.nocopy.entity.payment.Payment; @@ -20,13 +21,24 @@ public class PaymentController { private final PaymentService paymentService; @PostMapping("/create") - public ResponseEntity createPayment(@RequestParam String email, @RequestParam Long tariffId, - @RequestParam String operationType, @RequestParam String operationUuid) { + public ResponseEntity createPayment(@RequestParam String email, @RequestParam Long tariffId, + @RequestParam String operationType, @RequestParam String operationUuid) { try { Payment payment = paymentService.createPayment(email, tariffId, operationType, operationUuid); + return ResponseEntity.ok(payment); - } catch (TariffNotFoundException | UserNotFoundException e) { - return ResponseEntity.notFound().build(); + } catch (TariffNotFoundException e) { + return ResponseEntity + .status(HttpStatus.NOT_FOUND) + .body(Map.of("error", "Tariff not found", "message", e.getMessage())); + } catch (UserNotFoundException e) { + return ResponseEntity + .status(HttpStatus.NOT_FOUND) + .body(Map.of("error", "User not found", "message", e.getMessage())); + } catch (Exception e) { + return ResponseEntity + .status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(Map.of("error", "Internal server error", "message", e.getMessage())); } } diff --git a/src/main/java/ru/soune/nocopy/entity/tarif/TariffType.java b/src/main/java/ru/soune/nocopy/entity/tarif/TariffType.java index 43ae949..6507b51 100644 --- a/src/main/java/ru/soune/nocopy/entity/tarif/TariffType.java +++ b/src/main/java/ru/soune/nocopy/entity/tarif/TariffType.java @@ -2,5 +2,5 @@ package ru.soune.nocopy.entity.tarif; public enum TariffType { - START, BASIC, PRO, ENTERPRISE, DEMO, BUISNES, CORPORAT, STUDIO, FREE; + START, BASIC, PRO, ENTERPRISE, DEMO, BUISNES, CORPORAT, STUDIO, FREE, TOKEN_100, TOKEN_500, TOKEN_1000, TOKEN_5000; } \ No newline at end of file diff --git a/src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java b/src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java index 3c15c4d..e8e4c7d 100644 --- a/src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java +++ b/src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java @@ -62,6 +62,7 @@ public class ImageFoundRequestHandler implements RequestHandler { String searchResponseYandex; String searchResponseGoogle; List allUniqueImages; + //TODO отдавать любой полученный результат,даже если по таймауту падают try { searchResponseYandex = searchImageService.searchReverseByPublicUrl(fileEntity, "yandex_reverse_image", "visual_matches"); diff --git a/src/main/java/ru/soune/nocopy/handler/TariffHandler.java b/src/main/java/ru/soune/nocopy/handler/TariffHandler.java index 50ea527..89d24f0 100644 --- a/src/main/java/ru/soune/nocopy/handler/TariffHandler.java +++ b/src/main/java/ru/soune/nocopy/handler/TariffHandler.java @@ -44,6 +44,8 @@ public class TariffHandler implements RequestHandler { return handleUpdateTariff(request, tariffRequest); case "get" : return handleGetTariffs(request, tariffRequest); + case "tariffs_by_type" : + return handleGetTariffsByType(request, tariffRequest); } } catch (Exception e) { @@ -126,4 +128,12 @@ public class TariffHandler implements RequestHandler { MessageCode.SUCCESS.getDescription(), Map.of("tariffs", allTariffs)); } + + private BaseResponse handleGetTariffsByType(BaseRequest request, TariffRequest tariffRequest) { + List allTariffs = tariffService.getTariffByType(tariffRequest.getType()); + + return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(), + MessageCode.SUCCESS.getDescription(), + Map.of("token_tariffs", allTariffs)); + } } diff --git a/src/main/java/ru/soune/nocopy/service/payment/PaymentService.java b/src/main/java/ru/soune/nocopy/service/payment/PaymentService.java index d12af9a..163a7c8 100644 --- a/src/main/java/ru/soune/nocopy/service/payment/PaymentService.java +++ b/src/main/java/ru/soune/nocopy/service/payment/PaymentService.java @@ -15,6 +15,7 @@ import ru.soune.nocopy.exception.PaymentNotFoundException; import ru.soune.nocopy.exception.TariffNotFoundException; import ru.soune.nocopy.exception.UserNotFoundException; import ru.soune.nocopy.repository.PaymentRepository; +import ru.soune.nocopy.repository.TariffInfoRepository; import ru.soune.nocopy.repository.TariffRepository; import ru.soune.nocopy.repository.UserRepository; import ru.soune.nocopy.service.tariff.TariffInfoService; @@ -33,6 +34,8 @@ public class PaymentService { private final TariffRepository tariffRepository; + private final TariffInfoRepository tariffInfoRepository; + private final TariffInfoService tariffInfoService; @Transactional @@ -59,13 +62,10 @@ public class PaymentService { @Transactional public void handlePaymentNotification(Map notification) { - log.info("INFO FROM YOKASSA:" + notification.toString()); - - String eventType = (String) notification.get("event"); Map object = (Map) notification.get("object"); String paymentUuid = (String) object.get("id"); - log.info("METADATA:" + (String) object.get("metadata")); + Payment payment = paymentRepository.findByPaymentUuid(paymentUuid) .orElseThrow(() -> new RuntimeException("Payment not found")); @@ -73,7 +73,6 @@ public class PaymentService { payment.setStatus(PaymentStatus.SUCCEEDED); payment.setCancellationReason(null); activateTariffForUser(payment.getUser(), payment.getTariff()); - } else if ("payment.canceled".equals(eventType)) { payment.setStatus(PaymentStatus.CANCELED); @@ -116,13 +115,23 @@ public class PaymentService { } private void activateTariffForUser(User user, Tariff tariff) { - TariffInfo tariffInfo = new TariffInfo(); - tariffInfo.setStatus(TariffStatus.ACTIVE); - tariffInfo.setStartTariff(LocalDateTime.now()); - tariffInfo.setEndTariff(LocalDateTime.now().plusMonths(1)); - tariffInfo.setTokens(tariff.getTokens()); - tariffInfo.setTariff(tariff); + String type = tariff.getType(); - tariffInfoService.linkUserTariffInfo(user, tariffInfoService.addTariffInfo(tariffInfo)); + if (type.equals("token")) { + TariffInfo activeTariffInfo = user.getActiveTariffInfo(); + Integer tokens = activeTariffInfo.getTokens() + tariff.getTokens(); + activeTariffInfo.setTokens(tokens); + + tariffInfoRepository.save(activeTariffInfo); + } else { + TariffInfo tariffInfo = new TariffInfo(); + tariffInfo.setStatus(TariffStatus.ACTIVE); + tariffInfo.setStartTariff(LocalDateTime.now()); + tariffInfo.setEndTariff(LocalDateTime.now().plusMonths(1)); + tariffInfo.setTokens(tariff.getTokens()); + tariffInfo.setTariff(tariff); + + tariffInfoService.linkUserTariffInfo(user, tariffInfoService.addTariffInfo(tariffInfo)); + } } } diff --git a/src/main/java/ru/soune/nocopy/service/search/SearchImageService.java b/src/main/java/ru/soune/nocopy/service/search/SearchImageService.java index 925d1e8..aaf510d 100644 --- a/src/main/java/ru/soune/nocopy/service/search/SearchImageService.java +++ b/src/main/java/ru/soune/nocopy/service/search/SearchImageService.java @@ -34,8 +34,8 @@ public class SearchImageService { this.httpClient = new OkHttpClient.Builder() .connectTimeout(30, TimeUnit.SECONDS) .writeTimeout(30, TimeUnit.SECONDS) - .readTimeout(120, TimeUnit.SECONDS) - .callTimeout(180, TimeUnit.SECONDS) + .readTimeout(45, TimeUnit.SECONDS) + .callTimeout(90, TimeUnit.SECONDS) .retryOnConnectionFailure(true) .build(); diff --git a/src/main/java/ru/soune/nocopy/service/tariff/TariffInitializationService.java b/src/main/java/ru/soune/nocopy/service/tariff/TariffInitializationService.java index 0e037fa..1f5464c 100644 --- a/src/main/java/ru/soune/nocopy/service/tariff/TariffInitializationService.java +++ b/src/main/java/ru/soune/nocopy/service/tariff/TariffInitializationService.java @@ -180,6 +180,46 @@ public class TariffInitializationService { tariff.setMaxUsers(10L); tariff.setTariffAccountType("b2b"); break; + + case TOKEN_100: + tariff.setName("token_100"); + tariff.setPrice(299); + tariff.setTokens(100); + tariff.setMaxFilesCount(0); + tariff.setDiskSize(0L); + tariff.setMaxUsers(0L); + tariff.setTariffAccountType("token"); + break; + + case TOKEN_500: + tariff.setName("token_500"); + tariff.setPrice(1299); + tariff.setTokens(500); + tariff.setMaxFilesCount(0); + tariff.setDiskSize(0L); + tariff.setMaxUsers(0L); + tariff.setTariffAccountType("token"); + break; + + case TOKEN_1000: + tariff.setName("token_1000"); + tariff.setPrice(2399); + tariff.setTokens(1000); + tariff.setMaxFilesCount(0); + tariff.setDiskSize(0L); + tariff.setMaxUsers(0L); + tariff.setTariffAccountType("token"); + break; + + case TOKEN_5000: + tariff.setName("token_5000"); + tariff.setPrice(9999); + tariff.setTokens(5000); + tariff.setMaxFilesCount(0); + tariff.setDiskSize(0L); + tariff.setMaxUsers(0L); + tariff.setTariffAccountType("token"); + break; } tariffRepository.save(tariff); diff --git a/src/main/java/ru/soune/nocopy/service/tariff/TariffService.java b/src/main/java/ru/soune/nocopy/service/tariff/TariffService.java index 5c6561e..2149b08 100644 --- a/src/main/java/ru/soune/nocopy/service/tariff/TariffService.java +++ b/src/main/java/ru/soune/nocopy/service/tariff/TariffService.java @@ -42,6 +42,13 @@ public class TariffService { .collect(Collectors.toList()); } + public List getTariffByType(String type) { + return tariffRepository.findByTariffAccountType(type) + .stream() + .map(this::convertToDTO) + .collect(Collectors.toList()); + } + public List getAllTariffs() { return tariffRepository.findAllByOrderByPriceAsc() .stream()