Handle deferred flow with thin types

teamforage · May 8, 2024 · 0b5672b · 0b5672b
1 parent 404f1fd
commit 0b5672b
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 7 deletions.
diff --git a/...roid/src/main/java/com/joinforage/forage/android/network/data/CapturePaymentRepository.kt b/...roid/src/main/java/com/joinforage/forage/android/network/data/CapturePaymentRepository.kt
@@ -32,11 +32,11 @@ internal class CapturePaymentRepository(
             is ForageApiResponse.Success -> EncryptionKeys.ModelMapper.from(response.data)
             else -> return response
         }
-        val payment = when (val response = paymentService.getPayment(paymentRef)) {
-            is ForageApiResponse.Success -> Payment(response.data)
+        val paymentMethodRef = when (val response = paymentService.getPayment(paymentRef)) {
+            is ForageApiResponse.Success -> Payment.getPaymentMethodRef(response.data)
             else -> return response
         }
-        val paymentMethod = when (val response = paymentMethodService.getPaymentMethod(payment.paymentMethodRef)) {
+        val paymentMethod = when (val response = paymentMethodService.getPaymentMethod(paymentMethodRef)) {
             is ForageApiResponse.Success -> PaymentMethod(response.data)
             else -> return response
         }
@@ -60,7 +60,7 @@ internal class CapturePaymentRepository(
 
         val pollingResponse = pollingService.execute(
             contentId = vaultResponse.contentId,
-            operationDescription = "payment capture of Payment $payment"
+            operationDescription = "payment capture of Payment $paymentRef"
         )
         if (pollingResponse is ForageApiResponse.Failure) {
             return pollingResponse

diff --git a/...src/main/java/com/joinforage/forage/android/network/data/DeferPaymentCaptureRepository.kt b/...src/main/java/com/joinforage/forage/android/network/data/DeferPaymentCaptureRepository.kt
@@ -31,11 +31,11 @@ internal class DeferPaymentCaptureRepository(
             is ForageApiResponse.Success -> EncryptionKeys.ModelMapper.from(response.data)
             else -> return response
         }
-        val payment = when (val response = paymentService.getPayment(paymentRef)) {
-            is ForageApiResponse.Success -> Payment(response.data)
+        val paymentMethodRef = when (val response = paymentService.getPayment(paymentRef)) {
+            is ForageApiResponse.Success -> Payment.getPaymentMethodRef(response.data)
             else -> return response
         }
-        val paymentMethod = when (val response = paymentMethodService.getPaymentMethod(payment.paymentMethodRef)) {
+        val paymentMethod = when (val response = paymentMethodService.getPaymentMethod(paymentMethodRef)) {
             is ForageApiResponse.Success -> PaymentMethod(response.data)
             else -> return response
         }

diff --git a/forage-android/src/main/java/com/joinforage/forage/android/network/model/Payment.kt b/forage-android/src/main/java/com/joinforage/forage/android/network/model/Payment.kt
@@ -138,6 +138,18 @@ data class Payment(
         successDate = jsonObject.getStringOrNull("success_date"),
         updated = jsonObject.getString("updated")
     )
+
+    internal companion object {
+        /**
+         * @djoksimo (2024-05-08) The deferred flows return a "thin" Payment object
+         * where most fields are null or empty.
+         * This utility helps us safely grab the paymentMethodRef
+         * for VaultSubmitter requests without unpacking the "full" Payment object.
+         */
+        internal fun getPaymentMethodRef(jsonString: String): String {
+            return JSONObject(jsonString).getString("payment_method")
+        }
+    }
 }
 
 internal fun JSONArray.toListOfStrings(): List<String> =

diff --git a/forage-android/src/test/java/com/joinforage/forage/android/model/PaymentModelTests.kt b/forage-android/src/test/java/com/joinforage/forage/android/model/PaymentModelTests.kt
@@ -75,6 +75,15 @@ class PaymentModelTests {
                 "balance": null
             }
         """.trimIndent()
+
+        val thinPaymentJsonString = """
+            {
+              "metadata": {},
+              "funding_type": "ebt_snap",
+              "description": "a description",
+              "payment_method": "$paymentMethodRef"
+            }
+        """.trimIndent()
     }
 
     @Test
@@ -179,4 +188,10 @@ class PaymentModelTests {
 
         assertEquals(listOf("refun123", "abcde456", "defg890"), payment.refunds)
     }
+
+    @Test
+    fun `getPaymentMethodRef succeeds`() {
+        val actualPaymentMethodRef = Payment.getPaymentMethodRef(thinPaymentJsonString)
+        assertEquals(paymentMethodRef, actualPaymentMethodRef)
+    }
 }