refactor: 🔥 Remove the delayed country check

During onboarding we can now directly fetch the
merchant country without requiring a separate
request. We still keep the retry logic as a
fallback if the back-off triggers for some reason
and to populate the country for already onboarded
merchants.

Author: stracker-phil

modules/ppcp-settings/src/Service/MerchantDataResolver.php

@@ -73,29 +73,6 @@ public function ensure_country_resolved(): void {
 		$this->schedule_retry( 1 );
 	}
 
-	/**
-	 * Connect-time entry point. The connecting request holds a login-bearer API
-	 * client that cannot call seller_status(), so defer the first attempt to a
-	 * fresh, fully-connected request via an immediate async action.
-	 */
-	public function schedule_after_connect(): void {
-		if ( ! $this->needs_resolution() ) {
-			return;
-		}
-
-		if ( ! function_exists( 'as_enqueue_async_action' ) || ! function_exists( 'as_next_scheduled_action' ) ) {
-			return;
-		}
-
-		$args = array( 'attempt' => 1 );
-
-		if ( as_next_scheduled_action( self::RETRY_HOOK, $args ) ) {
-			return;
-		}
-
-		as_enqueue_async_action( self::RETRY_HOOK, $args );
-	}
-
 	/**
 	 * ActionScheduler retry handler.
 	 *

modules/ppcp-settings/src/SettingsModule.php

@@ -374,7 +374,7 @@ static function () use ( $container ): void {
 
 				$country_resolver = $container->get( 'settings.service.merchant-data-resolver' );
 				assert( $country_resolver instanceof MerchantDataResolver );
-				$country_resolver->schedule_after_connect();
+				$country_resolver->ensure_country_resolved();
 
 				$onboarding_profile = $container->get( 'settings.data.onboarding' );
 				assert( $onboarding_profile instanceof OnboardingProfile );

tests/PHPUnit/Settings/Service/MerchantDataResolverTest.php

@@ -288,71 +288,4 @@ public function test_ensure_country_resolved_does_not_duplicate_pending_retry():
 		$resolver = $this->create_resolver();
 		$this->assertNull( $resolver->ensure_country_resolved() );
 	}
-
-	/**
-	 * GIVEN a merchant that is not connected to PayPal
-	 * WHEN schedule_after_connect() runs
-	 * THEN no async action is enqueued
-	 */
-	public function test_schedule_after_connect_does_nothing_when_merchant_is_not_connected(): void {
-		$this->general_settings->shouldReceive( 'is_merchant_connected' )->andReturn( false );
-		$this->general_settings->shouldNotReceive( 'get_merchant_data' );
-
-		expect( 'as_enqueue_async_action' )->never();
-
-		$resolver = $this->create_resolver();
-		$this->assertNull( $resolver->schedule_after_connect() );
-	}
-
-	/**
-	 * GIVEN a connected merchant whose country is already known
-	 * WHEN schedule_after_connect() runs
-	 * THEN no async action is enqueued
-	 */
-	public function test_schedule_after_connect_does_nothing_when_country_already_known(): void {
-		$this->general_settings->shouldReceive( 'is_merchant_connected' )->andReturn( true );
-		$this->general_settings->shouldReceive( 'get_merchant_data' )
-			->andReturn( $this->merchant_data( 'DE' ) );
-
-		expect( 'as_enqueue_async_action' )->never();
-
-		$resolver = $this->create_resolver();
-		$this->assertNull( $resolver->schedule_after_connect() );
-	}
-
-	/**
-	 * GIVEN a connected merchant with an unresolved country and no pending retry
-	 * WHEN schedule_after_connect() runs
-	 * THEN an immediate async action is enqueued for attempt 1
-	 */
-	public function test_schedule_after_connect_enqueues_async_first_attempt_when_country_is_empty(): void {
-		$this->general_settings->shouldReceive( 'is_merchant_connected' )->andReturn( true );
-		$this->general_settings->shouldReceive( 'get_merchant_data' )
-			->andReturn( $this->merchant_data( '' ) );
-
-		expect( 'as_enqueue_async_action' )->once()->with(
-			MerchantDataResolver::RETRY_HOOK,
-			array( 'attempt' => 1 )
-		);
-
-		$resolver = $this->create_resolver();
-		$this->assertNull( $resolver->schedule_after_connect() );
-	}
-
-	/**
-	 * GIVEN a connected merchant with an unresolved country and a retry already pending
-	 * WHEN schedule_after_connect() runs
-	 * THEN no duplicate async action is enqueued
-	 */
-	public function test_schedule_after_connect_does_not_enqueue_when_retry_already_pending(): void {
-		$this->general_settings->shouldReceive( 'is_merchant_connected' )->andReturn( true );
-		$this->general_settings->shouldReceive( 'get_merchant_data' )
-			->andReturn( $this->merchant_data( '' ) );
-
-		when( 'as_next_scheduled_action' )->justReturn( true );
-		expect( 'as_enqueue_async_action' )->never();
-
-		$resolver = $this->create_resolver();
-		$this->assertNull( $resolver->schedule_after_connect() );
-	}
 }