Merge pull request #4162 from craftcms/nathaniel/com-479-5x-resaving-products-queue-job-for-46k-products-but-there

[5.x] Improve adding of pricing catalog jobs on product and purchasable save

Author: nfourtythree

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Release Notes for Craft Commerce
 
+## Unreleased
+
+- Fixed a bug where duplicate pricing catalog jobs were being queued. ([#4136](https://github.com/craftcms/commerce/issues/4136))
+- Deprecated `craft\commerce\services\CatalogPricing::afterSavePurchasableHandler()`.
+
 ## 5.4.9 - 2025-10-29
 
 - Fixed a bug where line items could display values in the wrong currency on Edit Order pages. ([#4147](https://github.com/craftcms/commerce/issues/4147))

src/Plugin.php

@@ -847,7 +847,6 @@ function(DefineBehaviorsEvent $event) {
         });
 
         Event::on(Purchasable::class, Elements::EVENT_BEFORE_RESTORE_ELEMENT, [$this->getPurchasables(), 'beforeRestorePurchasableHandler']);
-        Event::on(Purchasable::class, Purchasable::EVENT_AFTER_SAVE, [$this->getCatalogPricing(), 'afterSavePurchasableHandler']);
 
         Event::on(Elements::class, Elements::EVENT_AUTHORIZE_VIEW, [$this->getStoreSettings(), 'authorizeStoreLocationView']);
         Event::on(Elements::class, Elements::EVENT_AUTHORIZE_SAVE, [$this->getStoreSettings(), 'authorizeStoreLocationEdit']);

src/base/Purchasable.php

@@ -1218,10 +1218,12 @@ public function afterPropagate(bool $isNew): void
     {
         parent::afterPropagate($isNew);
 
-        Plugin::getInstance()->getCatalogPricing()->createCatalogPricingJob([
-            'purchasableIds' => [$this->getCanonicalId()],
-            'storeId' => $this->getStoreId(),
-        ]);
+        if (!$this->getIsDraft() && !$this->getIsRevision()) {
+            Plugin::getInstance()->getCatalogPricing()->createCatalogPricingJob([
+                'purchasableIds' => [$this->getCanonicalId()],
+                'storeId' => $this->getStoreId(),
+            ]);
+        }
     }
 
     /**

src/elements/Product.php

@@ -2041,10 +2041,12 @@ public function afterPropagate(bool $isNew): void
         parent::afterPropagate($isNew);
 
         // @TODO improve performance by collating all purchasable IDs updated during request
-        Plugin::getInstance()->getCatalogPricing()->createCatalogPricingJob([
-            'purchasableIds' => $this->getVariants()->pluck('id')->all(),
-            'storeId' => $this->storeId,
-        ]);
+        if (!$this->getIsDraft()) {
+            Plugin::getInstance()->getCatalogPricing()->createCatalogPricingJob([
+                'purchasableIds' => $this->getVariants()->pluck('id')->all(),
+                'storeId' => $this->storeId,
+            ]);
+        }
 
         // Save a new revision?
         if ($this->_shouldSaveRevision()) {

src/services/CatalogPricing.php

@@ -477,14 +477,16 @@ private function _createCatalogPricesQuery(int $storeId, ?CatalogPricingConditio
      * @return void
      * @throws InvalidConfigException
      * @since 5.0.0
+     * @deprecated in 5.5.0
      */
     public function afterSavePurchasableHandler(ModelEvent $event): void
     {
-        if (!$event->sender instanceof Purchasable || $event->sender->propagating) {
+        $purchasable = $event->sender;
+        if (!$purchasable instanceof Purchasable || $purchasable->propagating || $purchasable->getIsDraft() || $purchasable->getIsRevision()) {
             return;
         }
 
-        $this->createCatalogPricingJob(['purchasableIds' => [$event->sender->id]]);
+        $this->createCatalogPricingJob(['purchasableIds' => [$purchasable->id], 'storeId' => $purchasable->storeId]);
     }
 
     /**