fix(payouts): handle failures in payout flow decoder (#1241)

Author: kashif-m

src/Types/PaymentMethodCollectTypes.res

@@ -344,57 +344,62 @@ let sortByCustomOrder = (arr: array<'a>, getKey: 'a => string, customOrder: arra
   })
 }
 
-let decodePayoutDynamicFields = (json: JSON.t, defaultDynamicPmdFields): option<
-  payoutDynamicFields,
-> =>
+let decodePayoutDynamicFields = (json: JSON.t, defaultDynamicPmdFields): payoutDynamicFields =>
   json
   ->JSON.Decode.object
-  ->Option.map(obj => {
-    let (address, pmd) =
-      obj
-      ->Js.Dict.entries
-      ->Array.reduce(([], []), ((addressFields, payoutMethodDataFields), (key, value)) => {
-        switch JSON.Decode.object(value) {
-        | Some(fieldObj) => {
-            let getString = key => fieldObj->Dict.get(key)->Option.flatMap(JSON.Decode.string)
-            let fieldType = getFieldOptions(fieldObj)
-            switch (getString("required_field"), getString("display_name"), getString("value")) {
-            | (Some(pmdMap), Some(displayName), value) =>
-              switch decodeFieldType(key, fieldType) {
-              | Some(BillingAddress(fieldType)) =>
-                let addressField: dynamicFieldForAddress = {
-                  pmdMap,
-                  displayName,
-                  fieldType,
-                  value,
-                }
-                ([addressField, ...addressFields], payoutMethodDataFields)
-              | Some(PayoutMethodData(fieldType)) =>
-                let payoutMethodDataField = {
-                  pmdMap,
-                  displayName,
-                  fieldType,
-                  value,
+  ->Option.mapOr(
+    // Fallback for null/invalid JSON - always return valid defaults
+    {
+      address: None,
+      payoutMethodData: defaultDynamicPmdFields,
+    },
+    obj => {
+      let (address, pmd) =
+        obj
+        ->Js.Dict.entries
+        ->Array.reduce(([], []), ((addressFields, payoutMethodDataFields), (key, value)) => {
+          switch JSON.Decode.object(value) {
+          | Some(fieldObj) => {
+              let getString = key => fieldObj->Dict.get(key)->Option.flatMap(JSON.Decode.string)
+              let fieldType = getFieldOptions(fieldObj)
+              switch (getString("required_field"), getString("display_name"), getString("value")) {
+              | (Some(pmdMap), Some(displayName), value) =>
+                switch decodeFieldType(key, fieldType) {
+                | Some(BillingAddress(fieldType)) =>
+                  let addressField: dynamicFieldForAddress = {
+                    pmdMap,
+                    displayName,
+                    fieldType,
+                    value,
+                  }
+                  ([addressField, ...addressFields], payoutMethodDataFields)
+                | Some(PayoutMethodData(fieldType)) =>
+                  let payoutMethodDataField = {
+                    pmdMap,
+                    displayName,
+                    fieldType,
+                    value,
+                  }
+                  (addressFields, [payoutMethodDataField, ...payoutMethodDataFields])
+                | None => (addressFields, payoutMethodDataFields)
                 }
-                (addressFields, [payoutMethodDataField, ...payoutMethodDataFields])
-              | None => (addressFields, payoutMethodDataFields)
+              | _ => (addressFields, payoutMethodDataFields)
               }
-            | _ => (addressFields, payoutMethodDataFields)
             }
+          | None => (addressFields, payoutMethodDataFields)
           }
-        | None => (addressFields, payoutMethodDataFields)
-        }
-      })
-
-    {
-      address: address->Array.length > 0
-        ? Some(sortByCustomOrder(address, item => item.pmdMap, customAddressOrder))
-        : None,
-      payoutMethodData: pmd->Array.length > 0
-        ? sortByCustomOrder(pmd, item => item.pmdMap, customPmdOrder)
-        : defaultDynamicPmdFields,
-    }
-  })
+        })
+
+      {
+        address: address->Array.length > 0
+          ? Some(sortByCustomOrder(address, item => item.pmdMap, customAddressOrder))
+          : None,
+        payoutMethodData: pmd->Array.length > 0
+          ? sortByCustomOrder(pmd, item => item.pmdMap, customPmdOrder)
+          : defaultDynamicPmdFields,
+      }
+    },
+  )
 
 let decodePaymentMethodTypeWithRequiredFields = (
   json: JSON.t,
@@ -408,12 +413,12 @@ let decodePaymentMethodTypeWithRequiredFields = (
     ->Dict.get("payment_method_types_info")
     ->Option.flatMap(JSON.Decode.array)
     ->Option.map(pmtInfoArr =>
-      pmtInfoArr->Array.reduce(
-        ([], []),
-        ((pmta, pmtr), pmtInfo) =>
+      pmtInfoArr
+      ->Belt.Array.keepMap(
+        pmtInfo =>
           pmtInfo
           ->JSON.Decode.object
-          ->Option.map(
+          ->Option.flatMap(
             obj => {
               let paymentMethodType =
                 obj->Dict.get("payment_method_type")->Option.flatMap(JSON.Decode.string)
@@ -431,47 +436,47 @@ let decodePaymentMethodTypeWithRequiredFields = (
                 ->decodeWallet
                 ->Option.map(wallet => Wallet(wallet))
               | _ => None
-              }
-              ->Option.map(
+              }->Option.map(
                 pmt => {
                   let payoutDynamicFields =
                     obj
                     ->Dict.get("required_fields")
-                    ->Option.flatMap(
+                    ->Option.map(
                       json => json->decodePayoutDynamicFields(defaultDynamicPmdFields(~pmt)),
                     )
                     ->Option.getOr({
                       address: None,
                       payoutMethodData: defaultDynamicPmdFields(~pmt),
                     })
-                  switch pmt {
-                  | Card(card) => {
-                      pmta->Array.push(Card(card))
-                      let pmtwr: paymentMethodTypeWithDynamicFields = Card(
-                        card,
-                        payoutDynamicFields,
-                      )
-                      pmtr->Array.push(pmtwr)
-                      (pmta, pmtr)
-                    }
-                  | BankTransfer(transfer) => {
-                      pmta->Array.push(BankTransfer(transfer))
-                      pmtr->Array.push(BankTransfer(transfer, payoutDynamicFields))
-                      (pmta, pmtr)
-                    }
-                  | Wallet(wallet) => {
-                      let pmt: paymentMethodType = Wallet(wallet)
-                      pmta->Array.push(pmt)
-                      pmtr->Array.push(Wallet(wallet, payoutDynamicFields))
-                      (pmta, pmtr)
-                    }
-                  }
+                  (pmt, payoutDynamicFields)
                 },
               )
-              ->Option.getOr(([], []))
             },
-          )
-          ->Option.getOr(([], [])),
+          ),
+      )
+      ->Array.reduce(
+        ([], []),
+        ((pmta, pmtr), (pmt, payoutDynamicFields)) => {
+          switch pmt {
+          | Card(card) => {
+              pmta->Array.push(Card(card))
+              let pmtwr: paymentMethodTypeWithDynamicFields = Card(card, payoutDynamicFields)
+              pmtr->Array.push(pmtwr)
+              (pmta, pmtr)
+            }
+          | BankTransfer(transfer) => {
+              pmta->Array.push(BankTransfer(transfer))
+              pmtr->Array.push(BankTransfer(transfer, payoutDynamicFields))
+              (pmta, pmtr)
+            }
+          | Wallet(wallet) => {
+              let pmt: paymentMethodType = Wallet(wallet)
+              pmta->Array.push(pmt)
+              pmtr->Array.push(Wallet(wallet, payoutDynamicFields))
+              (pmta, pmtr)
+            }
+          }
+        },
       )
     )
   })