♻️ Remove redundant ReferenceTransactionStatus cache and rely on cached seller status

Author: danieldudzic

modules/ppcp-api-client/services.php

@@ -300,8 +300,7 @@
 		);
 	},
 	'api.reference-transaction-status'               => static fn ( ContainerInterface $container ): ReferenceTransactionStatus => new ReferenceTransactionStatus(
-		$container->get( 'api.endpoint.partners' ),
-		$container->get( 'api.reference-transaction-status-cache' )
+		$container->get( 'api.endpoint.partners' )
 	),
 	'api.endpoint.catalog-products'                  => static function ( ContainerInterface $container ): CatalogProducts {
 		return new CatalogProducts(
@@ -866,9 +865,6 @@ static function ( ContainerInterface $container ): PurchaseUnitSanitizer {
 	'api.user-id-token-cache'                        => static function ( ContainerInterface $container ): Cache {
 		return new Cache( 'ppcp-id-token-cache' );
 	},
-	'api.reference-transaction-status-cache'         => static function ( ContainerInterface $container ): Cache {
-		return new Cache( 'ppcp-reference-transaction-status-cache' );
-	},
 	'api.user-id-token'                              => static function ( ContainerInterface $container ): UserIdToken {
 		return new UserIdToken(
 			$container->get( 'api.host' ),

modules/ppcp-api-client/src/Helper/ReferenceTransactionStatus.php

@@ -19,15 +19,10 @@
  */
 class ReferenceTransactionStatus {
 
-	public const CACHE_KEY = 'ppcp_reference_transaction_enabled';
-
-
 	protected PartnersEndpoint $partners_endpoint;
-	protected Cache $cache;
 
-	public function __construct( PartnersEndpoint $partners_endpoint, Cache $cache ) {
+	public function __construct( PartnersEndpoint $partners_endpoint ) {
 		$this->partners_endpoint = $partners_endpoint;
-		$this->cache             = $cache;
 	}
 
 	/**
@@ -39,29 +34,19 @@ public function __construct( PartnersEndpoint $partners_endpoint, Cache $cache )
 	 * @return bool True if reference transactions are enabled, false otherwise.
 	 */
 	public function reference_transaction_enabled(): bool {
-		if ( $this->cache->has( self::CACHE_KEY ) ) {
-			$cached = $this->cache->get( self::CACHE_KEY );
-			if ( is_string( $cached ) || is_bool( $cached ) ) {
-				return wc_string_to_bool( $cached );
-			}
-		}
-
 		try {
 			foreach ( $this->partners_endpoint->seller_status()->capabilities() as $capability ) {
 				if (
 					$capability->name() === 'PAYPAL_WALLET_VAULTING_ADVANCED' &&
 					$capability->status() === 'ACTIVE'
 				) {
-					$this->cache->set( self::CACHE_KEY, wc_bool_to_string( true ), MONTH_IN_SECONDS );
 					return true;
 				}
 			}
 		} catch ( RuntimeException $exception ) {
-			$this->cache->set( self::CACHE_KEY, wc_bool_to_string( false ), HOUR_IN_SECONDS );
 			return false;
 		}
 
-		$this->cache->set( self::CACHE_KEY, wc_bool_to_string( false ), HOUR_IN_SECONDS );
 		return false;
 	}
 }

modules/ppcp-wc-gateway/src/WCGatewayModule.php

@@ -19,7 +19,6 @@
 use WooCommerce\PayPalCommerce\ApiClient\Entity\Capture;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\OrderStatus;
 use WooCommerce\PayPalCommerce\ApiClient\Helper\ReferenceTransactionStatus;
-use WooCommerce\PayPalCommerce\ApiClient\Helper\Cache;
 use WooCommerce\PayPalCommerce\ApiClient\Helper\DccApplies;
 use WooCommerce\PayPalCommerce\LocalAlternativePaymentMethods\LocalApmProductStatus;
 use WooCommerce\PayPalCommerce\Settings\Data\Definition\FeaturesDefinition;
@@ -450,12 +449,6 @@ static function () use ( $c ): void {
 					$pwc_product_status->clear();
 				}
 
-				$reference_transaction_status_cache = $c->get( 'api.reference-transaction-status-cache' );
-				assert( $reference_transaction_status_cache instanceof Cache );
-				// Clear Reference Transaction status.
-				if ( $reference_transaction_status_cache->has( ReferenceTransactionStatus::CACHE_KEY ) ) {
-					$reference_transaction_status_cache->delete( ReferenceTransactionStatus::CACHE_KEY );
-				}
 			}
 		);
 

tests/PHPUnit/ApiClient/Helper/ReferenceTransactionStatusTest.php

@@ -0,0 +1,73 @@
+<?php
+declare(strict_types=1);
+
+namespace WooCommerce\PayPalCommerce\ApiClient\Helper;
+
+use Mockery;
+use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PartnersEndpoint;
+use WooCommerce\PayPalCommerce\ApiClient\Entity\SellerStatus;
+use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException;
+use WooCommerce\PayPalCommerce\TestCase;
+
+class ReferenceTransactionStatusTest extends TestCase
+{
+	public function testReferenceTransactionEnabledReturnsTrueWhenCapabilityIsActive(): void
+	{
+		$active_capability = new class() {
+			public function name(): string
+			{
+				return 'PAYPAL_WALLET_VAULTING_ADVANCED';
+			}
+
+			public function status(): string
+			{
+				return 'ACTIVE';
+			}
+		};
+
+		$seller_status = Mockery::mock(SellerStatus::class);
+		$seller_status->shouldReceive('capabilities')->once()->andReturn([$active_capability]);
+
+		$partners_endpoint = Mockery::mock(PartnersEndpoint::class);
+		$partners_endpoint->shouldReceive('seller_status')->once()->andReturn($seller_status);
+
+		$testee = new ReferenceTransactionStatus($partners_endpoint);
+
+		$this->assertTrue($testee->reference_transaction_enabled());
+	}
+
+	public function testReferenceTransactionEnabledReturnsFalseWhenCapabilityIsMissing(): void
+	{
+		$inactive_capability = new class() {
+			public function name(): string
+			{
+				return 'PAYPAL_WALLET_VAULTING_ADVANCED';
+			}
+
+			public function status(): string
+			{
+				return 'INACTIVE';
+			}
+		};
+
+		$seller_status = Mockery::mock(SellerStatus::class);
+		$seller_status->shouldReceive('capabilities')->once()->andReturn([$inactive_capability]);
+
+		$partners_endpoint = Mockery::mock(PartnersEndpoint::class);
+		$partners_endpoint->shouldReceive('seller_status')->once()->andReturn($seller_status);
+
+		$testee = new ReferenceTransactionStatus($partners_endpoint);
+
+		$this->assertFalse($testee->reference_transaction_enabled());
+	}
+
+	public function testReferenceTransactionEnabledReturnsFalseWhenSellerStatusFails(): void
+	{
+		$partners_endpoint = Mockery::mock(PartnersEndpoint::class);
+		$partners_endpoint->shouldReceive('seller_status')->once()->andThrow(new RuntimeException('failed'));
+
+		$testee = new ReferenceTransactionStatus($partners_endpoint);
+
+		$this->assertFalse($testee->reference_transaction_enabled());
+	}
+}