diff --git a/src/main/java/ru/soune/nocopy/controller/PaymentController.java b/src/main/java/ru/soune/nocopy/controller/PaymentController.java index 308ef69..47407b5 100644 --- a/src/main/java/ru/soune/nocopy/controller/PaymentController.java +++ b/src/main/java/ru/soune/nocopy/controller/PaymentController.java @@ -58,8 +58,9 @@ public class PaymentController { } } - @PostMapping("/auto-renewal/disable") - public ResponseEntity disableAutoRenewal(@RequestHeader(value = "Authorization", required = false) String tokenHeader) { + @PostMapping("/auto-renewal") + public ResponseEntity disableAutoRenewal(@RequestParam(value = "renewal") Boolean renewal, + @RequestHeader(value = "Authorization", required = false) String tokenHeader) { try { if (tokenHeader == null || tokenHeader.isBlank()) { Map errorData = new HashMap<>(); @@ -68,7 +69,7 @@ public class PaymentController { return ResponseEntity.ok().body(Map.of("error", errorData)); } - paymentService.disableAutoRenewal(authService.useUserAuthToken(tokenHeader)); + paymentService.changeAutoRenewal(authService.useUserAuthToken(tokenHeader), renewal); return ResponseEntity.ok(Map.of("message", "Auto-renewal disabled")); } catch (UserNotFoundException e) { return ResponseEntity.status(HttpStatus.NOT_FOUND) 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 92f9f7a..96c9f74 100644 --- a/src/main/java/ru/soune/nocopy/service/payment/PaymentService.java +++ b/src/main/java/ru/soune/nocopy/service/payment/PaymentService.java @@ -120,12 +120,12 @@ public class PaymentService { } @Transactional - public void disableAutoRenewal(Long userId) { + public void changeAutoRenewal(Long userId, boolean autoRenewal) { User user = userRepository.findById(userId).orElseThrow(); TariffInfo tariffInfo = user.getActiveTariffInfo(); if (tariffInfo != null) { - tariffInfo.setAutoRenewal(false); + tariffInfo.setAutoRenewal(autoRenewal); tariffInfoRepository.save(tariffInfo); } }