[bug] Cannot determine payment method when funding/deleting (#337)

- Use payment method object type to determine payment method type
EasyPost · Apr 10, 2024 · e0e0cda · e0e0cda
1 parent 5e875bb
commit e0e0cda
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Next Release
 
+- Fix payment method funding and deletion failures due to undetermined payment method type
 - Adds `refund` function in Insurance service for requesting a refund for a standalone insurance
 
 ## v7.1.0 (2024-01-08)

diff --git a/lib/EasyPost/Service/BillingService.php b/lib/EasyPost/Service/BillingService.php
@@ -82,9 +82,10 @@ private function getPaymentInfo(string $priority = 'primary'): array
 
         if ($paymentMethodToUse != null && $paymentMethods->$paymentMethodToUse->id != null) {
             $paymentMethodId = $paymentMethods->$paymentMethodToUse->id;
-            if (strpos($paymentMethodId, 'card_') === 0) {
+            $paymentMethodObjectType = $paymentMethods->$paymentMethodToUse->object;
+            if ($paymentMethodObjectType == 'CreditCard') {
                 $endpoint = '/credit_cards';
-            } else if (strpos($paymentMethodId, 'bank_') === 0) {
+            } else if ($paymentMethodObjectType == 'BankAccount') {
                 $endpoint = '/bank_accounts';
             } else {
                 throw new PaymentException(Constants::INVALID_PAYMENT_METHOD_ERROR);

diff --git a/test/EasyPost/BillingTest.php b/test/EasyPost/BillingTest.php
@@ -65,7 +65,7 @@ public static function setUpBeforeClass(): void
                 ),
                 new MockRequestResponseInfo(
                     200,
-                    '{"id": "summary_123", "primary_payment_method": {"id": "card_123", "last4": "1234"}, "secondary_payment_method": {"id": "bank_123", "bank_name": "Mock Bank"}}' // phpcs:ignore
+                    '{"id": "summary_123", "primary_payment_method": {"id": "pm_123", "object": "CreditCard", "last4": "1234"}, "secondary_payment_method": {"id": "pm_123", "object": "BankAccount", "bank_name": "Mock Bank"}}' // phpcs:ignore
                 )
             ),
         );
@@ -272,4 +272,45 @@ public function testGetPaymentMethodByPriorityPaymentMethodNoId(): void
             $this->assertTrue(true);
         }
     }
+
+    /**
+     * Test determining the payment method type by object type
+     */
+    public function testGetPaymentMethodInfoByObjectType(): void
+    {
+        $mockingUtility = new MockingUtility(
+            new MockRequest(
+                new MockRequestMatchRule(
+                    'get',
+                    '/v2\\/payment_methods$/'
+                ),
+                new MockRequestResponseInfo(
+                    200,
+                    '{"id": "summary_123", "primary_payment_method": {"id": "pm_123", "object": "CreditCard", "last4": "1234"}, "secondary_payment_method": {"id": "pm_123", "object": "BankAccount", "bank_name": "Mock Bank"}}' // phpcs:ignore
+                )
+            ),
+            new MockRequest(
+                new MockRequestMatchRule(
+                    'delete',
+                    '/v2\\/credit_cards\\/pm_123$/'
+                ),
+                new MockRequestResponseInfo(
+                    200,
+                    '{}'
+                )
+            ),
+        );
+        $client = self::getClient($mockingUtility);
+
+        // getPaymentInfo is private, but we can test it by attempting to delete a payment method
+        // only a delete request to /v2/credit_cards/pm_123 is mocked
+        // if the delete function works, it's because it found the correct payment method type
+        try {
+            $client->billing->deletePaymentMethod('primary');
+
+            $this->assertTrue(true);
+        } catch (\Exception $exception) {
+            $this->fail('Exception thrown when we expected no error');
+        }
+    }
 }