@@ -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<String, Object> notification) {
|
||||
log.info("INFO FROM YOKASSA:" + notification.toString());
|
||||
|
||||
|
||||
String eventType = (String) notification.get("event");
|
||||
Map<String, Object> object = (Map<String, Object>) 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));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user