Skip to content

[GOOWOO-370] Product Feed showing now synced products #3303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jamesmorrison wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[GOOWOO-370] Product Feed showing now synced products #3303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/DB/ProductFeedQueryHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use Automattic\WooCommerce\GoogleListingsAndAds\Product\ProductRepository;
use Automattic\WooCommerce\GoogleListingsAndAds\Product\ProductSyncer;
use Automattic\WooCommerce\GoogleListingsAndAds\Value\ChannelVisibility;
use Automattic\WooCommerce\GoogleListingsAndAds\Value\MCStatus;
use WP_Query;
use WP_REST_Request;
use wpdb;
Expand Down Expand Up @@ -97,7 +98,8 @@ public function get( WP_REST_Request $request ): array {
foreach ( $this->product_repository->find( $args, $limit, $offset ) as $product ) {
$id = $product->get_id();
$errors = $product_helper->get_validation_errors( $product );
$mc_status = $product_helper->get_mc_status( $product ) ?: $product_helper->get_sync_status( $product );
$mc_status = $product_helper->get_mc_status( $product )
?? ( $product_helper->is_product_synced( $product ) ? MCStatus::PENDING : MCStatus::NOT_SYNCED );

// If the refresh_status_data_job is scheduled, we don't know the status yet as it is being refreshed.
if ( $refresh_status_data_job && $refresh_status_data_job->is_scheduled() ) {
Expand Down
8 changes: 2 additions & 6 deletions src/Product/ProductHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,10 +382,7 @@ public function get_wc_product_by_wp_post( int $product_id ): ?WP_Post {
* @return bool
*/
public function is_product_synced( WC_Product $product ): bool {
$synced_at = $this->meta_handler->get_synced_at( $product );
$google_ids = $this->meta_handler->get_google_ids( $product );

return ! empty( $synced_at ) && ! empty( $google_ids );
return SyncStatus::SYNCED === $this->meta_handler->get_sync_status( $product );
}

/**
Expand Down Expand Up @@ -642,8 +639,7 @@ public function get_sync_status( WC_Product $wc_product ): ?string {
*/
public function get_mc_status( WC_Product $wc_product ): ?string {
try {
// If the mc_status is not set, return NOT_SYNCED.
return $this->meta_handler->get_mc_status( $this->maybe_swap_for_parent( $wc_product ) ) ?: MCStatus::NOT_SYNCED;
return $this->meta_handler->get_mc_status( $this->maybe_swap_for_parent( $wc_product ) ) ?: null;
} catch ( InvalidValue $exception ) {
do_action(
'woocommerce_gla_debug_message',
Expand Down
7 changes: 7 additions & 0 deletions src/Product/ProductRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use Automattic\WooCommerce\GoogleListingsAndAds\Infrastructure\Service;
use Automattic\WooCommerce\GoogleListingsAndAds\PluginHelper;
use Automattic\WooCommerce\GoogleListingsAndAds\Value\ChannelVisibility;
use Automattic\WooCommerce\GoogleListingsAndAds\Value\SyncStatus;
use WC_Product;

defined( 'ABSPATH' ) || exit;
Expand Down Expand Up @@ -153,10 +154,16 @@ public function find_synced_product_ids( array $args = [], int $limit = -1, int
*/
protected function get_synced_products_meta_query(): array {
return [
'relation' => 'OR',
[
'key' => ProductMetaHandler::KEY_GOOGLE_IDS,
'compare' => 'EXISTS',
],
[
'key' => ProductMetaHandler::KEY_SYNC_STATUS,
'value' => SyncStatus::SYNCED,
'compare' => '=',
],
];
}

Expand Down
34 changes: 24 additions & 10 deletions tests/Unit/Product/ProductHelperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,29 +608,30 @@ public function test_is_product_synced( string $callback ) {
}

/**
* Pull-synced products (via mark_as_notified) have no google_ids but sync_status = synced.
* is_product_synced() must return true for them.
*
* @param string $callback
*
* @dataProvider return_test_product_callbacks
*/
public function test_is_product_synced_return_false_if_no_google_id( string $callback ) {
public function test_is_product_synced_return_true_for_pull_synced_product( string $callback ) {
$product = call_user_func( $callback );
$this->product_helper->mark_as_synced( $product, $this->generate_google_product_mock() );
$this->product_meta->delete_google_ids( $product );
$is_product_synced = $this->product_helper->is_product_synced( $product );
$this->assertFalse( $is_product_synced );
$this->product_helper->mark_as_notified( $product );
$this->assertEmpty( $this->product_meta->get_google_ids( $product ) );
$this->assertTrue( $this->product_helper->is_product_synced( $product ) );
}

/**
* A product with no sync_status set must not be considered synced.
*
* @param string $callback
*
* @dataProvider return_test_product_callbacks
*/
public function test_is_product_synced_return_false_if_no_synced_at( string $callback ) {
public function test_is_product_synced_return_false_when_not_synced( string $callback ) {
$product = call_user_func( $callback );
$this->product_helper->mark_as_synced( $product, $this->generate_google_product_mock() );
$this->product_meta->delete_synced_at( $product );
$is_product_synced = $this->product_helper->is_product_synced( $product );
$this->assertFalse( $is_product_synced );
$this->assertFalse( $this->product_helper->is_product_synced( $product ) );
}

/**
Expand Down Expand Up @@ -989,6 +990,19 @@ public function test_get_mc_status( string $callback ) {
$this->assertEquals( MCStatus::APPROVED, $this->product_helper->get_mc_status( $product ) );
}

/**
* When no mc_status meta is stored, get_mc_status() must return null so the
* fallback in ProductFeedQueryHelper can read sync_status instead.
*
* @param string $callback
*
* @dataProvider return_test_product_callbacks
*/
public function test_get_mc_status_returns_null_when_not_set( string $callback ) {
$product = call_user_func( $callback );
$this->assertNull( $this->product_helper->get_mc_status( $product ) );
}

public function test_get_mc_status_variation_product() {
$parent = WC_Helper_Product::create_variation_product();
$variation = $this->wc->get_product( $parent->get_children()[0] );
Expand Down
15 changes: 15 additions & 0 deletions tests/Unit/Product/ProductRepositoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,21 @@ public function test_find_synced_products() {
);
}

public function test_find_synced_products_includes_pull_synced() {
$product_1 = WC_Helper_Product::create_simple_product();
$this->product_helper->mark_as_notified( $product_1 );

WC_Helper_Product::create_simple_product();

$result_ids = array_map( [ __CLASS__, 'get_product_id' ], $this->product_repository->find_synced_products() );
$this->assertEquals( [ $product_1->get_id() ], $result_ids );

$this->assertEquals(
[ $product_1->get_id() ],
$this->product_repository->find_synced_product_ids()
);
}

public function test_find_sync_ready_products() {
// create some products that are not sync ready

Expand Down
Loading