fix fatal error when attempting to cancel a cancelled Stripe subscrip…

…tion
trynoice · Sep 8, 2022 · d5ed79f · d5ed79f
1 parent 50254ac
commit d5ed79f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/com/trynoice/api/subscription/SubscriptionService.java b/src/main/java/com/trynoice/api/subscription/SubscriptionService.java
@@ -570,7 +570,7 @@ private void handleStripeCheckoutSessionEvent(@NonNull Session session) throws W
             try {
                 stripeApi.refundSubscription(session.getSubscription());
             } catch (StripeException e) {
-                throw new RuntimeException("failed to cancel stripe subscription", e);
+                throw new RuntimeException("failed to refund stripe subscription", e);
             }
         } else {
             copySubscriptionDetailsFromStripeObject(subscription);

diff --git a/src/main/java/com/trynoice/api/subscription/upstream/StripeApi.java b/src/main/java/com/trynoice/api/subscription/upstream/StripeApi.java
@@ -159,7 +159,9 @@ public void refundSubscription(@NonNull String id) throws StripeException {
             }
         }
 
-        subscription.cancel();
+        if (!"canceled".equals(subscription.getStatus())) {
+            subscription.cancel();
+        }
     }
 
     /**