diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/subscriptions/StripeManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/subscriptions/StripeManager.java index dfa146674..baaae8d4f 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/subscriptions/StripeManager.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/subscriptions/StripeManager.java @@ -568,23 +568,11 @@ public class StripeManager implements SubscriptionProcessorManager { @Override public CompletableFuture getReceiptItem(String subscriptionId) { - return getLatestInvoiceForSubscription(subscriptionId) + return getSubscription(subscriptionId) + .thenApply(stripeSubscription -> getSubscription(stripeSubscription).getLatestInvoiceObject()) .thenCompose(invoice -> convertInvoiceToReceipt(invoice, subscriptionId)); } - public CompletableFuture getLatestInvoiceForSubscription(String subscriptionId) { - return CompletableFuture.supplyAsync(() -> { - SubscriptionRetrieveParams params = SubscriptionRetrieveParams.builder() - .addExpand("latest_invoice") - .build(); - try { - return stripeClient.subscriptions().retrieve(subscriptionId, params, commonOptions()).getLatestInvoiceObject(); - } catch (StripeException e) { - throw new CompletionException(e); - } - }, executor); - } - private CompletableFuture convertInvoiceToReceipt(Invoice latestSubscriptionInvoice, String subscriptionId) { if (latestSubscriptionInvoice == null) { throw new WebApplicationException(Status.NO_CONTENT);