Merge branch '4.x' into develop

# Conflicts: # CHANGELOG.md # composer.json
putyourlightson · Jul 24, 2024 · fd03b44 · fd03b44
2 parents ffb811b + 0858211
commit fd03b44
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 9 deletions.
diff --git a/src/services/GenerateCacheService.php b/src/services/GenerateCacheService.php
@@ -229,12 +229,7 @@ public function addElement(ElementInterface $element): void
         $this->generateData->addElement($element);
 
         // Add eager-loaded fields since they will be accessed directly on the element
-        $fieldHandles = array_keys(CustomFieldBehavior::$fieldHandles);
-        foreach ($fieldHandles as $handle) {
-            if ($element->hasEagerLoadedElements($handle)) {
-                $this->generateData->addElementTrackField($element, $handle);
-            }
-        }
+        $this->addEagerLoadedFields($element);
 
         // Replace the custom field behavior with our own (only once)
         $customFields = $element->getBehavior('customFields');
@@ -630,6 +625,31 @@ public function saveOutput(string $output, SiteUriModel $siteUri, int $duration
         }
     }
 
+    /**
+     * Adds eager-loaded fields to an element recursively.
+     * https://github.com/putyourlightson/craft-blitz/issues/657
+     *
+     * @since 4.21.0
+     */
+    private function addEagerLoadedFields(ElementInterface $element): void
+    {
+        $fieldHandles = array_keys(CustomFieldBehavior::$fieldHandles);
+
+        foreach ($fieldHandles as $handle) {
+            if ($element->hasEagerLoadedElements($handle)) {
+                $this->generateData->addElementTrackField($element, $handle);
+                $eagerLoadedElements = $element->getEagerLoadedElements($handle);
+
+                foreach ($eagerLoadedElements as $eagerLoadedElement) {
+                    $this->addEagerLoadedFields($eagerLoadedElement);
+                }
+            }
+        }
+    }
+
+    /**
+     * Returns whether elements of a given type should be tracked.
+     */
     private function shouldTrackElementsOfType(string $elementType): bool
     {
         // Don’t proceed if element tracking is disabled
@@ -645,6 +665,9 @@ private function shouldTrackElementsOfType(string $elementType): bool
         return true;
     }
 
+    /**
+     * Returns whether element queries of a given type should be tracked.
+     */
     private function shouldTrackElementQueriesOfType(string $elementType): bool
     {
         // Don’t proceed if element query tracking is disabled

diff --git a/tests/TESTS.md b/tests/TESTS.md
@@ -108,6 +108,8 @@ _Tests the saving of cached values, element cache records and element query reco
 ![Pass](https://raw.githubusercontent.com/putyourlightson/craft-generate-test-spec/main/icons/pass.svg) Element cache record is saved with custom fields.  
 ![Pass](https://raw.githubusercontent.com/putyourlightson/craft-generate-test-spec/main/icons/pass.svg) Element cache record is saved with custom fields with renamed handles.  
 ![Pass](https://raw.githubusercontent.com/putyourlightson/craft-generate-test-spec/main/icons/pass.svg) Element cache record is saved with eager-loaded custom fields.  
+![Pass](https://raw.githubusercontent.com/putyourlightson/craft-generate-test-spec/main/icons/pass.svg) Element cache record is saved with nested eager-loaded custom fields.  
+![Pass](https://raw.githubusercontent.com/putyourlightson/craft-generate-test-spec/main/icons/pass.svg) Element cache record is saved with eager-loaded matrix fields.  
 ![Pass](https://raw.githubusercontent.com/putyourlightson/craft-generate-test-spec/main/icons/pass.svg) Element cache record is saved with eager-loaded custom fields in variable.  
 ![Pass](https://raw.githubusercontent.com/putyourlightson/craft-generate-test-spec/main/icons/pass.svg) Element cache record is saved for preloaded single.  
 ![Pass](https://raw.githubusercontent.com/putyourlightson/craft-generate-test-spec/main/icons/pass.svg) Element cache record is saved with eager-loaded custom fields for preloaded single.  

diff --git a/tests/pest/Feature/GenerateCacheTest.php b/tests/pest/Feature/GenerateCacheTest.php
@@ -132,6 +132,7 @@
 });
 
 test('Element cache record is saved with eager-loaded custom fields', function() {
+    createEntry();
     $entry = Entry::find()->with(['relatedTo'])->one();
     Blitz::$plugin->generateCache->addElement($entry);
     Blitz::$plugin->generateCache->save(createOutput(), createSiteUri());
@@ -142,6 +143,45 @@
         ->toHaveRecordCount(1, ['elementId' => $entry->id]);
 });
 
+test('Element cache record is saved with nested eager-loaded custom fields', function() {
+    $childEntry = createEntryWithRelationship();
+    $entry = createEntryWithRelationship([$childEntry]);
+    Craft::$app->elements->eagerLoadElements(Entry::class, [$entry], ['relatedTo.relatedTo']);
+    Blitz::$plugin->generateCache->addElement($entry);
+    Blitz::$plugin->generateCache->save(createOutput(), createSiteUri());
+
+    expect(ElementCacheRecord::class)
+        ->toHaveRecordCount(1, ['elementId' => $entry->id])
+        ->toHaveRecordCount(1, ['elementId' => $childEntry->id])
+        ->and(ElementFieldCacheRecord::class)
+        ->toHaveRecordCount(1, ['elementId' => $entry->id])
+        ->toHaveRecordCount(1, ['elementId' => $childEntry->id]);
+});
+
+test('Element cache record is saved with eager-loaded matrix fields', function() {
+    $childEntry = createEntryWithRelationship();
+    $entry = createEntry(customFields: [
+        'matrix' => [
+            [
+                'type' => 'test',
+                'fields' => [
+                    'relatedTo' => [$childEntry->id],
+                ],
+            ],
+        ],
+    ]);
+    Craft::$app->elements->eagerLoadElements(Entry::class, [$entry], ['matrix.test:relatedTo.relatedTo']);
+    Blitz::$plugin->generateCache->addElement($entry);
+    Blitz::$plugin->generateCache->save(createOutput(), createSiteUri());
+
+    expect(ElementCacheRecord::class)
+        ->toHaveRecordCount(1, ['elementId' => $entry->id])
+        ->toHaveRecordCount(1, ['elementId' => $childEntry->id])
+        ->and(ElementFieldCacheRecord::class)
+        ->toHaveRecordCount(1, ['elementId' => $entry->id])
+        ->toHaveRecordCount(1, ['elementId' => $childEntry->id]);
+});
+
 test('Element cache record is saved with eager-loaded custom fields in variable', function() {
     $entry = createEntryWithRelationship();
     Craft::$app->elements->eagerLoadElements(Entry::class, [$entry], ['relatedTo']);
@@ -207,8 +247,8 @@
 });
 
 test('Element cache records are saved respecting the criteria for eager-loaded relation field queries', function() {
-    $qualifyingEntry = createEntry(params: ['plainText' => '1']);
-    $nonQualifyingEntry = createEntry(params: ['plainText' => '2']);
+    $qualifyingEntry = createEntry(customFields: ['plainText' => '1']);
+    $nonQualifyingEntry = createEntry(customFields: ['plainText' => '2']);
     $entry = createEntryWithRelationship([$qualifyingEntry, $nonQualifyingEntry]);
 
     Blitz::$plugin->generateCache->reset();

diff --git a/tests/pest/Helpers.php b/tests/pest/Helpers.php
@@ -57,15 +57,19 @@ function createSiteUri(int $siteId = 1, string $uri = 'page'): SiteUriModel
     ]);
 }
 
-function createEntry(bool $enabled = true, array $params = [], bool $batchMode = false): Entry
+function createEntry(bool $enabled = true, array $params = [], array $customFields = [], bool $batchMode = false): Entry
 {
     $originalBatchMode = Blitz::$plugin->refreshCache->batchMode;
     Blitz::$plugin->refreshCache->batchMode = $batchMode;
 
+    /** @var Entry $entryFactory */
     $entryFactory = EntryFactory::factory();
     foreach ($params as $key => $value) {
         $entryFactory->$key($value);
     }
+    foreach ($customFields as $key => $value) {
+        $entryFactory->$key($value);
+    }
 
     /** @var Entry $entry */
     $entry = $entryFactory->section(App::env('TEST_CHANNEL_SECTION_HANDLE'))