fix refund issue implementation in stripe api adapter

trynoice · Aug 25, 2022 · a2bdb87 · a2bdb87
1 parent cd0ffc7
commit a2bdb87
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/src/main/java/com/trynoice/api/subscription/upstream/StripeApi.java b/src/main/java/com/trynoice/api/subscription/upstream/StripeApi.java
@@ -6,6 +6,7 @@
 import com.stripe.exception.StripeException;
 import com.stripe.model.Customer;
 import com.stripe.model.Event;
+import com.stripe.model.Invoice;
 import com.stripe.model.Refund;
 import com.stripe.model.Subscription;
 import com.stripe.model.checkout.Session;
@@ -20,6 +21,8 @@
 import lombok.NonNull;
 import lombok.val;
 
+import java.util.Optional;
+
 import static java.util.Objects.requireNonNullElse;
 
 /**
@@ -138,14 +141,21 @@ public void refundSubscription(@NonNull String id) throws StripeException {
                 .build(),
             null);
 
-        try {
-            Refund.create(
-                RefundCreateParams.builder()
-                    .setCharge(subscription.getLatestInvoiceObject().getCharge())
-                    .build());
-        } catch (StripeException e) {
-            if (!"charge_already_refunded".equals(e.getCode())) {
-                throw e;
+        // charge may be null if the latest invoice is for a trial period.
+        val charge = Optional.ofNullable(subscription.getLatestInvoiceObject())
+            .map(Invoice::getCharge)
+            .orElse(null);
+
+        if (charge != null) {
+            try {
+                Refund.create(
+                    RefundCreateParams.builder()
+                        .setCharge(charge)
+                        .build());
+            } catch (StripeException e) {
+                if (!"charge_already_refunded".equals(e.getCode())) {
+                    throw e;
+                }
             }
         }