Move resave to job

Author: lukeholder

CHANGELOG-WIP.md

@@ -37,6 +37,7 @@
 - Added `craft\commerce\models\Email::$renderSiteId`.
 - Added `craft\commerce\models\Email::getRenderSite()`.
 - Added `craft\commerce\models\Pdf::$linkExpiry`.
+- Added `craft\commerce\queue\jobs\ResaveProductVariants`.
 - Added `craft\commerce\records\Email::$renderSiteId`.
 - Added `craft\commerce\records\Order::$dateFirstPaid`.
 - Added `craft\commerce\services\CatalogPricingRules::hasCatalogPricingRules()`.

src/elements/Product.php

@@ -1665,17 +1665,32 @@ public function afterSave(bool $isNew): void
 
             $this->id = $record->id;
 
-            if ($this->getIsCanonical() && isset($this->typeId) && $productType->isStructure) {
+            if ($this->getIsCanonical() &&
+                isset($this->typeId) &&
+                $productType->isStructure
+            ) {
                 // Has the parent changed?
                 if ($this->hasNewParent()) {
                     $this->_placeInStructure($isNew, $productType);
                 }
 
-                // Update the product’s descendants, who may be using this product’s URI in their own URIs
+                // Update the product's descendants, who may be using this product's URI in their own URIs
                 if (!$isNew) {
                     Craft::$app->getElements()->updateDescendantSlugsAndUris($this, true, true);
                 }
             }
+
+            // Queue job to resave variants if the variant title format references the product
+            if ($this->getIsCanonical() &&
+                isset($this->typeId) &&
+                !$productType->hasVariantTitleField &&
+                $productType->variantTitleFormat &&
+                StringHelper::containsAny($productType->variantTitleFormat, ['product.', 'owner.', 'primaryOwner.'])
+            ) {
+                Craft::$app->getQueue()->push(new \craft\commerce\queue\jobs\ResaveProductVariants([
+                    'productId' => $this->id,
+                ]));
+            }
         }
 
         parent::afterSave($isNew);
@@ -1868,15 +1883,6 @@ public function getFieldLayout(): ?FieldLayout
      */
     public function beforeSave(bool $isNew): bool
     {
-        $productType = $this->getType();
-
-        if (!$productType->hasVariantTitleField &&
-            $productType->variantTitleFormat &&
-            StringHelper::containsAny($productType->variantTitleFormat, ['product.', 'owner.', 'primaryOwner.'])
-        ) {
-            $this->setDirtyAttributes(['allVariants'], true);
-        }
-
         // Make sure the entry has at least one revision if the section has versioning enabled
         if ($this->_shouldSaveRevision()) {
             $hasRevisions = self::find()
@@ -1900,6 +1906,7 @@ public function beforeSave(bool $isNew): bool
             }
         }
 
+        $productType = $this->getType();
         // Set the structure ID for Element::attributes() and afterSave()
         if ($productType->isStructure) {
             $this->structureId = $productType->structureId;

src/queue/jobs/ResaveProductVariants.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * @link https://craftcms.com/
+ * @copyright Copyright (c) Pixel & Tonic, Inc.
+ * @license https://craftcms.github.io/license/
+ */
+
+namespace craft\commerce\queue\jobs;
+
+use craft\commerce\elements\Product;
+use craft\commerce\elements\Variant;
+use craft\queue\BaseJob;
+
+/**
+ * Resave Product Variants queue job
+ *
+ * @author Pixel & Tonic, Inc. <[email protected]>
+ * @since 5.5.0
+ */
+class ResaveProductVariants extends BaseJob
+{
+    /**
+     * @var int The product ID whose variants should be resaved
+     */
+    public int $productId;
+
+    /**
+     * @inheritdoc
+     */
+    public function execute($queue): void
+    {
+        $product = Product::find()
+            ->id($this->productId)
+            ->one();
+
+        if (!$product) {
+            return;
+        }
+
+        $variants = Variant::find()
+            ->productId($this->productId)
+            ->status(null)
+            ->all();
+
+        $total = count($variants);
+
+        foreach ($variants as $i => $variant) {
+            $this->setProgress($queue, $i / $total);
+            \Craft::$app->getElements()->saveElement($variant);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function defaultDescription(): ?string
+    {
+        $product = Product::find()
+            ->id($this->productId)
+            ->one();
+
+        if ($product) {
+            return 'Resaving variants for product: ' . $product->title;
+        }
+
+        return 'Resaving product variants';
+    }
+}