fix: Transaction Service Event Tracker

The Transaction Service no longer requires a separate event handler as it not has the trait of a event handler.

Author: Abraham-Flutterwave

src/Service/Transactions.php

@@ -5,12 +5,13 @@
 namespace Flutterwave\Service;
 
 use Flutterwave\Contract\ConfigInterface;
-use Flutterwave\EventHandlers\TransactionVerificationEventHandler;
+use Flutterwave\EventHandlers\EventTracker;
 use Flutterwave\Traits\ApiOperations\Post;
 use Psr\Http\Client\ClientExceptionInterface;
 
 class Transactions extends Service
 {
+    use EventTracker;
     use Post;
 
     public const ENDPOINT = 'transactions';
@@ -26,14 +27,12 @@ class Transactions extends Service
     private array $payment_type = [
         'card','debit_ng_account','mobilemoney','bank_transfer', 'ach_payment',
     ];
-    private TransactionVerificationEventHandler $eventHandler;
 
     public function __construct(?ConfigInterface $config = null)
     {
         parent::__construct($config);
-        $this->baseUrl = $this->config::BASE_URL;
         $this->end_point = Transactions::ENDPOINT;
-        $this->eventHandler = new TransactionVerificationEventHandler();
+        
     }
 
     /**
@@ -43,13 +42,13 @@ public function verify(string $transactionId): \stdClass
     {
         $this->checkTransactionId($transactionId);
         $this->logger->notice('Transaction Service::Verifying Transaction...' . $transactionId);
-        TransactionVerificationEventHandler::startRecording();
+        self::startRecording();
         $response = $this->request(
             null,
             'GET',
             self::ENDPOINT . "/{$transactionId}/verify",
         );
-        TransactionVerificationEventHandler::setResponseTime();
+        self::setResponseTime();
 
         return $response;
     }
@@ -60,13 +59,13 @@ public function verify(string $transactionId): \stdClass
     public function verifyWithTxref(string $tx_ref): \stdClass
     {
         $this->logger->notice('Transaction Service::Verifying Transaction...' . $tx_ref);
-        TransactionVerificationEventHandler::startRecording();
+        self::startRecording();
         $response = $this->request(
             null,
             'GET',
             self::ENDPOINT . '/verify_by_reference?tx_ref=' . $tx_ref,
         );
-        TransactionVerificationEventHandler::setResponseTime();
+        self::setResponseTime();
         return $response;
     }
 
@@ -77,13 +76,13 @@ public function refund(string $trasanctionId): \stdClass
     {
         $this->checkTransactionId($trasanctionId);
         $this->logger->notice("Transaction Service::Refunding Transaction...{$trasanctionId}");
-        TransactionVerificationEventHandler::startRecording();
+        self::startRecording();
         $response = $this->request(
             null,
             'GET',
             self::ENDPOINT . "/{$trasanctionId}/refund",
         );
-        TransactionVerificationEventHandler::setResponseTime();
+        self::setResponseTime();
         return $response;
     }
 
@@ -93,13 +92,13 @@ public function refund(string $trasanctionId): \stdClass
     public function getAllTransactions(): \stdClass
     {
         $this->logger->notice('Transaction Service::Retrieving all Transaction for Merchant');
-        TransactionVerificationEventHandler::startRecording();
+        self::startRecording();
         $response = $this->request(
             null,
             'GET',
             self::ENDPOINT,
         );
-        TransactionVerificationEventHandler::setResponseTime();
+        self::setResponseTime();
         return $response;
     }
 
@@ -110,13 +109,13 @@ public function getRefundInfo(string $trasanctionId): \stdClass
     {
         $this->checkTransactionId($trasanctionId);
         $this->logger->notice("Transaction Service::Retrieving refund:Transactionid => {$trasanctionId}");
-        TransactionVerificationEventHandler::startRecording();
+        self::startRecording();
         $response = $this->request(
             null,
             'GET',
             "refunds/{$trasanctionId}",
         );
-        TransactionVerificationEventHandler::setResponseTime();
+        self::setResponseTime();
         return $response;
     }
 
@@ -151,13 +150,13 @@ public function getTransactionFee(
 
         $logData = json_encode($data);
         $this->logger->notice("Transaction Service::Retrieving Transaction Fee: Util => {$logData}");
-        TransactionVerificationEventHandler::startRecording();
+        self::startRecording();
         $response = $this->request(
             null,
             'GET',
             self::ENDPOINT . "/fee?{$query}",
         );
-        TransactionVerificationEventHandler::setResponseTime();
+        self::setResponseTime();
         return $response;
     }
 
@@ -168,13 +167,13 @@ public function resendFailedHooks(string $transactionId): \stdClass
     {
         $this->checkTransactionId($transactionId);
         $this->logger->notice("Transaction Service::Resending Transaction Webhook: TransactionId => {$transactionId}");
-        TransactionVerificationEventHandler::startRecording();
+        self::startRecording();
         $response = $this->request(
             null,
-            'GET',
+            'POST',
             self::ENDPOINT . "/{$transactionId}/resend-hook",
         );
-        TransactionVerificationEventHandler::setResponseTime();
+        self::setResponseTime();
         return $response;
     }
 
@@ -187,13 +186,13 @@ public function retrieveTimeline(string $transactionId): \stdClass
         $this->logger->notice(
             "Transaction Service::Retrieving Transaction Timeline: TransactionId => {$transactionId}"
         );
-        TransactionVerificationEventHandler::startRecording();
+        self::startRecording();
         $response = $this->request(
             null,
             'GET',
-            self::ENDPOINT . "/{$transactionId}/timeline",
+            self::ENDPOINT . "/{$transactionId}/events",
         );
-        TransactionVerificationEventHandler::setResponseTime();
+        self::setResponseTime();
         return $response;
     }
 

tests/Unit/Service/TransactionTest.php

@@ -2,9 +2,65 @@
 
 namespace Unit\Service;
 
+use Flutterwave\Service\Transactions;
 use PHPUnit\Framework\TestCase;
 
 class TransactionTest extends TestCase
 {
+    public Transactions $service;
 
+    protected function setUp(): void
+    {
+        $this->service = new Transactions();
+    }
+
+    /**
+     * @depends Unit\Service\MomoTest::testInitiateTanzaniaRedirect
+     */
+    public function testVerifyingTransaction(string $tx_ref)
+    {
+        $result = $this->service->verifyWithTxref($tx_ref);
+        $data = $result->data;
+        $this->assertSame($data->customer->email, "[email protected]");
+        return [ "id" => $data->id, "amount" => $data->amount, "currency" => $data->currency ];
+    }
+
+    /**
+     * @depends testVerifyingTransaction
+     */
+    public function testVerifyingTransactionWithId(array $data)
+    {
+        $tx_id = $data['id'];
+
+        $result = $this->service->verify($tx_id);
+        $data = $result->data;
+        $this->assertSame($data->customer->email, "[email protected]");
+    }
+
+    /**
+     * @depends testVerifyingTransaction
+     */
+    public function testResendingFailedHooks( array $data )
+    {
+        sleep(6);
+        $tx_id = $data['id'];
+        $result = $this->service->resendFailedHooks($tx_id);
+        $this->assertTrue( $result->status === "success" && $result->data === "hook sent");
+    }
+
+    /**
+     * @depends testVerifyingTransaction
+     */
+    public function testRetrievingTimeline( array $data )
+    {
+        $tx_id = $data['id'];
+        $result = $this->service->retrieveTimeline($tx_id);
+        $this->assertTrue( $result->status === "success" && $result->message === "Transaction events fetched");
+    }
+
+    // public function testValidateCharge( string $flw_ref )
+    // {
+    //     $result = $this->service->validate("3310", $flw_ref);
+    //     dd($result);
+    // }
 }