update: BankAccount Service and test

Author: bajoski34

src/EventHandlers/AccountEventHandler.php

@@ -91,7 +91,8 @@ public function onTimeout($transactionReference, $data): void
      * */
     public function onAuthorization(\stdClass $response, ?array $resource = null): array
     {
-        $mode = $response->meta->authorization->mode;
+
+        $mode = $response->data->meta->authorization->mode;
 
         if (property_exists($response, 'data')) {
             $transactionId = $response->data->id;
@@ -109,7 +110,7 @@ public function onAuthorization(\stdClass $response, ?array $resource = null): a
             break;
         case 'redirect':
             $data['dev_instruction'] = 'Redirect the user to the auth link for validation';
-            $data['url'] = $response->meta->authorization->redirect;
+            $data['url'] = $response->data->meta->authorization->redirect;
             break;
         case 'avs':
             throw new \Exception('AVS is currently not available via the SDK. please call the endpoint directly.');
@@ -120,7 +121,7 @@ public function onAuthorization(\stdClass $response, ?array $resource = null): a
             if (property_exists($response->data, 'processor_response')) {
                 $data['instruction'] = $response->data->processor_response;
             } else {
-                $data['instruction'] = $response->meta->authorization->validate_instructions;
+                $data['instruction'] = $response->data->meta->authorization->validate_instructions;
             }
 
             $data['validate'] = true;

src/Service/AccountPayment.php

@@ -10,6 +10,7 @@
 use Flutterwave\EventHandlers\AccountEventHandler;
 use Flutterwave\Entities\Payload;
 use Flutterwave\Traits\Group\Charge;
+use Flutterwave\Util\Currency;
 use GuzzleHttp\Exception\GuzzleException;
 use InvalidArgumentException;
 use Psr\Http\Client\ClientExceptionInterface;
@@ -20,13 +21,14 @@ class AccountPayment extends Service implements Payment
     use Charge;
 
     public const ENDPOINT = 'charge';
-    public const DEBIT_NG = 'debit_ng_account';
-    public const DEBIT_UK = 'debit_uk_account';
+    public const DEBIT_NG = 'mono';
+    public const DEBIT_UK = 'account-ach-uk';
     public const TYPE = 'account';
     protected array $accounts = [
-        'NG' => self::DEBIT_NG,
-        'UK' => self::DEBIT_UK,
-    ];
+        Currency::NGN => self::DEBIT_NG,
+        Currency::GBP => self::DEBIT_UK,
+        Currency::EUR => self::DEBIT_UK
+     ];
     protected string $country = 'NG';
     private AccountEventHandler $eventHandler;
 
@@ -55,6 +57,12 @@ public function setCountry(string $country): void
      */
     public function initiate(Payload $payload): array
     {
+        if($payload->has('currency') && !key_exists($payload->get('currency'), $this->accounts)) {
+            $msg = 'Account Service: The Currency passed is not supported. kindy pass NGN, GBP or EUR.';
+            $this->logger->info($msg);
+            throw new InvalidArgumentException($msg);
+        }
+
         if ($this->checkPayloadIsValid($payload, 'account_details')) {
             return $this->charge($payload);
         }
@@ -73,14 +81,17 @@ public function charge(Payload $payload): array
     {
         $this->logger->notice('Account Service::Charging Account ...');
 
-        $this->checkSpecialCasesParams($payload);
+        if($payload->has('currency') &&   $payload->get('currency') === Currency::NGN ) {
+            $this->checkSpecialCasesParams($payload);
+        }
+
         $payload = $payload->toArray(self::TYPE);
 
         //request payload
         $body = $payload;
 
         //check which country was passed.
-        $account = $this->accounts[$payload['country']];
+        $account = $this->accounts[$payload['currency']];
 
         unset($body['country']);
         unset($body['address']);

src/Service/AchPayment.php

@@ -10,6 +10,7 @@
 use Flutterwave\EventHandlers\AchEventHandler;
 use Flutterwave\Entities\Payload;
 use Flutterwave\Traits\Group\Charge;
+use Flutterwave\Util\Currency;
 use GuzzleHttp\Exception\GuzzleException;
 use stdClass;
 
@@ -18,12 +19,11 @@ class AchPayment extends Service implements Payment
     use Charge;
 
     public const TYPE = 'ach_payment';
-    public const USD = 'USD';
-    public const ZAR = 'ZAR';
+
     protected string $country = 'US';
     protected array $currency = [
-        self::USD => 'US',
-        self::ZAR => 'ZA',
+        Currency::USD => 'US',
+        Currency::ZAR => 'ZA',
     ];
     private AchEventHandler $eventHandler;
 

src/Util/Currency.php

@@ -19,4 +19,5 @@ class Currency
     public const XAF = 'XAF';
     public const XOF = 'XOF';
     public const EGP = 'EGP';
+    public const GBP = 'GBP';
 }

tests/Unit/Service/AccountTest.php

@@ -15,7 +15,7 @@ protected function setUp(): void
         Flutterwave::bootstrap();
     }
 
-    public function testAuthModeReturn()
+    public function testNgnAuthModeReturn()
     {
         //currently returning "Sorry, we could not connect to your bank";
 
@@ -41,11 +41,8 @@ public function testAuthModeReturn()
 
         $data['customer'] = $customerObj;
         $payload  = $accountpayment->payload->create($data);
-        $this->expectException(\Exception::class);
         $result = $accountpayment->initiate($payload);
-
-        //check mode returned is either OTP or Redirect
-//        $this->assertTrue($result['mode'] === AuthMode::OTP || $result['mode'] === AuthMode::REDIRECT );
+        $this->assertTrue( $result['mode'] === AuthMode::REDIRECT );
     }
 
     public function testInvalidParam()
@@ -69,4 +66,32 @@ public function testInvalidParam()
         $this->expectException(\InvalidArgumentException::class);
         $result = $accountpayment->initiate($payload);
     }
+
+    public function testUKBankAccountAuthMode() {
+        $data = [
+            "amount" => 2000,
+            "currency" => Currency::NGN,
+            "tx_ref" => uniqid().time(),
+            "additionalData" => [
+                "account_details" => [
+                    "account_bank" => "044",
+                    "account_number" => "0690000034",
+                    "country" => "UK" //or EU
+                ]
+            ],
+        ];
+
+        $accountpayment = \Flutterwave\Flutterwave::create("account");
+        $customerObj = $accountpayment->customer->create([
+            "full_name" => "Jake Jesulayomi Ola",
+            "email" => "[email protected]",
+            "phone" => "+2349067985861"
+        ]);
+
+        $data['customer'] = $customerObj;
+        $payload  = $accountpayment->payload->create($data);
+        $result = $accountpayment->initiate($payload);
+
+        $this->assertTrue( $result['mode'] === AuthMode::REDIRECT );
+    }
 }