API Pull - Update metadata for Coupons and Product after being notified.

src/Coupon/CouponHelper.php

@@ -10,6 +10,7 @@
 use Automattic\WooCommerce\GoogleListingsAndAds\Value\ChannelVisibility;
 use Automattic\WooCommerce\GoogleListingsAndAds\Value\NotificationStatus;
 use Automattic\WooCommerce\GoogleListingsAndAds\Value\SyncStatus;
+use Automattic\WooCommerce\GoogleListingsAndAds\Jobs\Notifications\HelperNotificationInterface;
 use WC_Coupon;
 defined( 'ABSPATH' ) || exit();
 
@@ -18,7 +19,7 @@
  *
  * @package Automattic\WooCommerce\GoogleListingsAndAds\Coupon
  */
-class CouponHelper implements Service {
+class CouponHelper implements Service, HelperNotificationInterface {
 
 	use PluginHelper;
 
@@ -57,6 +58,19 @@
 		$this->merchant_center = $merchant_center;
 	}
 
+	/**
+	 * Mark the item as notified.
+	 *
+	 * @param WC_Coupon $coupon
+	 *
+	 * @return void
+	 */
+	public function mark_as_notified( $coupon ): void {
+		$this->meta_handler->update_synced_at( $coupon, time() );
+		$this->meta_handler->update_sync_status( $coupon, SyncStatus::SYNCED );
+		$this->update_empty_visibility( $coupon );
+	}
+
 	/**
 	 * Mark a coupon as synced. This function accepts nullable $google_id,
 	 * which guarantees version compatibility for Alpha, Beta and stable verison promtoion APIs.
@@ -92,7 +106,7 @@
 	 *
 	 * @param WC_Coupon $coupon
 	 */
-	public function mark_as_unsynced( WC_Coupon $coupon ) {
+	public function mark_as_unsynced( $coupon ): void {
 		$this->meta_handler->delete_synced_at( $coupon );
 		$this->meta_handler->update_sync_status( $coupon, SyncStatus::NOT_SYNCED );
 		$this->meta_handler->delete_google_ids( $coupon );
@@ -375,7 +389,7 @@
 	 * @param WC_Coupon $coupon
 	 * @param string    $status
 	 */
-	public function set_notification_status( WC_Coupon $coupon, $status ): void {
+	public function set_notification_status( $coupon, $status ): void {
 		$this->meta_handler->update_notification_status( $coupon, $status );
 	}
 
@@ -387,7 +401,7 @@
 	 *
 	 * @return bool
 	 */
-	public function should_trigger_create_notification( WC_Coupon $coupon ): bool {
+	public function should_trigger_create_notification( $coupon ): bool {
 		return $this->is_ready_to_notify( $coupon ) && ! $this->has_notified_creation( $coupon );
 	}
 
@@ -399,7 +413,7 @@
 	 *
 	 * @return bool
 	 */
-	public function should_trigger_update_notification( WC_Coupon $coupon ): bool {
+	public function should_trigger_update_notification( $coupon ): bool {
 		return $this->is_ready_to_notify( $coupon ) && $this->has_notified_creation( $coupon );
 	}
 
@@ -411,7 +425,7 @@
 	 *
 	 * @return bool
 	 */
-	public function should_trigger_delete_notification( WC_Coupon $coupon ): bool {
+	public function should_trigger_delete_notification( $coupon ): bool {
 		return ! $this->is_ready_to_notify( $coupon ) && $this->has_notified_creation( $coupon );
 	}
 }

src/Jobs/Notifications/AbstractItemNotificationJob.php

@@ -3,9 +3,8 @@
 
 namespace Automattic\WooCommerce\GoogleListingsAndAds\Jobs\Notifications;
 
-use Automattic\WooCommerce\GoogleListingsAndAds\Coupon\CouponHelper;
-use Automattic\WooCommerce\GoogleListingsAndAds\Product\ProductHelper;
 use Automattic\WooCommerce\GoogleListingsAndAds\Value\NotificationStatus;
+use Automattic\WooCommerce\GoogleListingsAndAds\Jobs\Notifications\HelperNotificationInterface;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -38,7 +37,7 @@ protected function process_items( array $args ): void {
 
 		if ( $this->can_process( $item, $topic ) && $this->notifications_service->notify( $topic, $item ) ) {
 			$this->set_status( $item, $this->get_after_notification_status( $topic ) );
-			$this->maybe_mark_as_unsynced( $topic, $item );
+			$this->handle_notified( $topic, $item );
 		}
 	}
 
@@ -91,18 +90,19 @@ protected function can_process( int $item_id, string $topic ): bool {
 	}
 
 	/**
-	 * If there is a valid Item ID and topic is a deletion topic. Mark the item as unsynced.
+	 * Handle the item after the notification.
 	 *
 	 * @param string $topic
 	 * @param int    $item
 	 */
-	protected function maybe_mark_as_unsynced( string $topic, int $item ): void {
-		if ( ! str_contains( $topic, '.delete' ) ) {
-			return;
+	protected function handle_notified( string $topic, int $item ): void {
+		if ( str_contains( $topic, '.delete' ) ) {
+			$this->get_helper()->mark_as_unsynced( $this->get_item( $item ) );
 		}
 
-		$item = $this->get_item( $item );
-		$this->get_helper()->mark_as_unsynced( $item );
+		if ( str_contains( $topic, '.create' ) ) {
+			$this->get_helper()->mark_as_notified( $this->get_item( $item ) );
+		}
 	}
 
 	/**
@@ -116,7 +116,7 @@ abstract protected function get_item( int $item_id );
 	/**
 	 * Get the helper
 	 *
-	 * @return CouponHelper|ProductHelper
+	 * @return HelperNotificationInterface
 	 */
-	abstract public function get_helper();
+	abstract public function get_helper(): HelperNotificationInterface;
 }

src/Jobs/Notifications/CouponNotificationJob.php

@@ -7,6 +7,7 @@
 use Automattic\WooCommerce\GoogleListingsAndAds\API\WP\NotificationsService;
 use Automattic\WooCommerce\GoogleListingsAndAds\Coupon\CouponHelper;
 use Automattic\WooCommerce\GoogleListingsAndAds\Jobs\ActionSchedulerJobMonitor;
+use Automattic\WooCommerce\GoogleListingsAndAds\Jobs\Notifications\HelperNotificationInterface;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -27,16 +28,16 @@ class CouponNotificationJob extends AbstractItemNotificationJob {
 	/**
 	 * Notifications Jobs constructor.
 	 *
-	 * @param ActionSchedulerInterface  $action_scheduler
-	 * @param ActionSchedulerJobMonitor $monitor
-	 * @param NotificationsService      $notifications_service
-	 * @param CouponHelper              $coupon_helper
+	 * @param ActionSchedulerInterface    $action_scheduler
+	 * @param ActionSchedulerJobMonitor   $monitor
+	 * @param NotificationsService        $notifications_service
+	 * @param HelperNotificationInterface $coupon_helper
 	 */
 	public function __construct(
 		ActionSchedulerInterface $action_scheduler,
 		ActionSchedulerJobMonitor $monitor,
 		NotificationsService $notifications_service,
-		CouponHelper $coupon_helper
+		HelperNotificationInterface $coupon_helper
 	) {
 		$this->notifications_service = $notifications_service;
 		$this->helper                = $coupon_helper;
@@ -56,9 +57,9 @@ protected function get_item( int $item_id ) {
 	/**
 	 * Get the Coupon Helper
 	 *
-	 * @return CouponHelper
+	 * @return HelperNotificationInterface
 	 */
-	public function get_helper() {
+	public function get_helper(): HelperNotificationInterface {
 		return $this->helper;
 	}
 

src/Jobs/Notifications/HelperNotificationInterface.php

@@ -0,0 +1,71 @@
+<?php
+declare( strict_types=1 );
+
+namespace Automattic\WooCommerce\GoogleListingsAndAds\Jobs\Notifications;
+
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Interface HelperNotificationInterface
+ *
+ * @since x.x.x
+ * @package Automattic\WooCommerce\GoogleListingsAndAds\Jobs\Notifications
+ */
+interface HelperNotificationInterface {
+
+	/**
+	 * Checks if the item can be processed based on the topic.
+	 *
+	 * @param WC_Product|WC_Coupon $item
+	 *
+	 * @return bool
+	 */
+	public function should_trigger_create_notification( $item ): bool;
+
+
+	/**
+	 * Indicates if the item ready for sending a delete Notification.
+	 *
+	 * @param WC_Product|WC_Coupon $item
+	 *
+	 * @return bool
+	 */
+	public function should_trigger_delete_notification( $item ): bool;
+
+	/**
+	 * Indicates if the item ready for sending an update Notification.
+	 *
+	 * @param WC_Product|WC_Coupon $item
+	 *
+	 * @return bool
+	 */
+	public function should_trigger_update_notification( $item ): bool;
+
+	/**
+	 * Marks the item as unsynced.
+	 *
+	 * @param WC_Product|WC_Coupon $item
+	 *
+	 * @return void
+	 */
+	public function mark_as_unsynced( $item ): void;
+
+	/**
+	 * Set the notification status for an item.
+	 *
+	 * @param WC_Product|WC_Coupon $item
+	 * @param string               $status
+	 *
+	 * @return void
+	 */
+	public function set_notification_status( $item, $status ): void;
+
+	/**
+	 * Marks the item as notified.
+	 *
+	 * @param WC_Product|WC_Coupon $item
+	 *
+	 * @return void
+	 */
+	public function mark_as_notified( $item ): void;
+}

src/Jobs/Notifications/ProductNotificationJob.php

@@ -7,6 +7,7 @@
 use Automattic\WooCommerce\GoogleListingsAndAds\API\WP\NotificationsService;
 use Automattic\WooCommerce\GoogleListingsAndAds\Jobs\ActionSchedulerJobMonitor;
 use Automattic\WooCommerce\GoogleListingsAndAds\Product\ProductHelper;
+use Automattic\WooCommerce\GoogleListingsAndAds\Jobs\Notifications\HelperNotificationInterface;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -27,16 +28,16 @@ class ProductNotificationJob extends AbstractItemNotificationJob {
 	/**
 	 * Notifications Jobs constructor.
 	 *
-	 * @param ActionSchedulerInterface  $action_scheduler
-	 * @param ActionSchedulerJobMonitor $monitor
-	 * @param NotificationsService      $notifications_service
-	 * @param ProductHelper             $helper
+	 * @param ActionSchedulerInterface    $action_scheduler
+	 * @param ActionSchedulerJobMonitor   $monitor
+	 * @param NotificationsService        $notifications_service
+	 * @param HelperNotificationInterface $helper
 	 */
 	public function __construct(
 		ActionSchedulerInterface $action_scheduler,
 		ActionSchedulerJobMonitor $monitor,
 		NotificationsService $notifications_service,
-		ProductHelper $helper
+		HelperNotificationInterface $helper
 	) {
 		$this->notifications_service = $notifications_service;
 		$this->helper                = $helper;
@@ -58,7 +59,7 @@ protected function get_item( int $item_id ) {
 	 *
 	 * @return ProductHelper
 	 */
-	public function get_helper() {
+	public function get_helper(): HelperNotificationInterface {
 		return $this->helper;
 	}
 

src/Product/ProductHelper.php

@@ -14,6 +14,7 @@
 use Automattic\WooCommerce\GoogleListingsAndAds\Value\MCStatus;
 use Automattic\WooCommerce\GoogleListingsAndAds\Value\SyncStatus;
 use Automattic\WooCommerce\GoogleListingsAndAds\Vendor\Google\Service\ShoppingContent\Product as GoogleProduct;
+use Automattic\WooCommerce\GoogleListingsAndAds\Jobs\Notifications\HelperNotificationInterface;
 use WC_Product;
 use WC_Product_Variation;
 use WP_Post;
@@ -25,7 +26,7 @@
  *
  * @package Automattic\WooCommerce\GoogleListingsAndAds\Product
  */
-class ProductHelper implements Service {
+class ProductHelper implements Service, HelperNotificationInterface {
 
 	use PluginHelper;
 
@@ -57,6 +58,31 @@
 		$this->target_audience = $target_audience;
 	}
 
+	/**
+	 * Mark the item as notified.
+	 *
+	 * @param WC_Product $product
+	 *
+	 * @return void
+	 */
+	public function mark_as_notified( $product ): void {
+		$this->meta_handler->delete_failed_delete_attempts( $product );
+		$this->meta_handler->update_synced_at( $product, time() );
+		$this->meta_handler->update_sync_status( $product, SyncStatus::SYNCED );
+		$this->update_empty_visibility( $product );
+
+		// mark the parent product as synced if it's a variation
+		if ( $product instanceof WC_Product_Variation ) {
+			try {
+				$parent_product = $this->get_wc_product( $product->get_parent_id() );
+			} catch ( InvalidValue $exception ) {
+				return;
+			}
+
+			$this->mark_as_notified( $parent_product );
+		}
+	}
+
 	/**
 	 * Mark a product as synced in the local database.
 	 * This function also handles the following cleanup tasks:
@@ -103,7 +129,7 @@
 	/**
 	 * @param WC_Product $product
 	 */
-	public function mark_as_unsynced( WC_Product $product ) {
+	public function mark_as_unsynced( $product ): void {
 		$this->meta_handler->delete_synced_at( $product );
 		if ( ! $this->is_sync_ready( $product ) ) {
 			$this->meta_handler->delete_sync_status( $product );
@@ -390,7 +416,7 @@
 	 *
 	 * @return bool
 	 */
-	public function should_trigger_create_notification( WC_Product $product ): bool {
+	public function should_trigger_create_notification( $product ): bool {
 		return $this->is_ready_to_notify( $product ) && ! $this->has_notified_creation( $product );
 	}
 
@@ -402,7 +428,7 @@
 	 *
 	 * @return bool
 	 */
-	public function should_trigger_update_notification( WC_Product $product ): bool {
+	public function should_trigger_update_notification( $product ): bool {
 		return $this->is_ready_to_notify( $product ) && $this->has_notified_creation( $product );
 	}
 
@@ -414,7 +440,7 @@
 	 *
 	 * @return bool
 	 */
-	public function should_trigger_delete_notification( WC_Product $product ): bool {
+	public function should_trigger_delete_notification( $product ): bool {
 		return ! $this->is_ready_to_notify( $product ) && $this->has_notified_creation( $product );
 	}
 
@@ -447,7 +473,7 @@
 	 * @param WC_Product $product
 	 * @param string     $status
 	 */
-	public function set_notification_status( WC_Product $product, $status ): void {
+	public function set_notification_status( $product, $status ): void {
 		$this->meta_handler->update_notification_status( $product, $status );
 	}