Only retrieve forms once instead of for every item (#330)

* Only retrieve forms once instead of for every item

* Add Blink to FormRepository retrieval methods

* Clear blink cache on save/delete

* Add test coverage

---------

Co-authored-by: Ryan Mitchell <[email protected]>

Author: dnwjn

src/Forms/Form.php

@@ -6,6 +6,7 @@
 use Statamic\Contracts\Forms\Form as Contract;
 use Statamic\Events\FormDeleted;
 use Statamic\Events\FormSaved;
+use Statamic\Facades\Blink;
 use Statamic\Forms\Form as FileEntry;
 
 class Form extends FileEntry
@@ -60,6 +61,9 @@ public function save()
 
         $this->model($model->fresh());
 
+        Blink::forget("eloquent-forms-{$this->handle()}");
+        Blink::forget('eloquent-forms');
+
         FormSaved::dispatch($this);
     }
 
@@ -68,6 +72,9 @@ public function delete()
         $this->submissions()->each->delete();
         $this->model()->delete();
 
+        Blink::forget("eloquent-forms-{$this->handle()}");
+        Blink::forget('eloquent-forms');
+
         FormDeleted::dispatch($this);
     }
 }

src/Forms/FormRepository.php

@@ -3,27 +3,32 @@
 namespace Statamic\Eloquent\Forms;
 
 use Statamic\Contracts\Forms\Form as FormContract;
+use Statamic\Facades\Blink;
 use Statamic\Forms\FormRepository as StacheRepository;
 
 class FormRepository extends StacheRepository
 {
     public function find($handle)
     {
-        $model = app('statamic.eloquent.forms.model')::whereHandle($handle)->first();
+        return Blink::once("eloquent-forms-{$handle}", function () use ($handle) {
+            $model = app('statamic.eloquent.forms.model')::whereHandle($handle)->first();
 
-        if (! $model) {
-            return;
-        }
+            if (! $model) {
+                return;
+            }
 
-        return app(FormContract::class)->fromModel($model);
+            return app(FormContract::class)->fromModel($model);
+        });
     }
 
     public function all()
     {
-        return app('statamic.eloquent.forms.model')::all()
-            ->map(function ($form) {
-                return app(FormContract::class)::fromModel($form);
-            });
+        return Blink::once('eloquent-forms', function () {
+            return app('statamic.eloquent.forms.model')::all()
+                ->map(function ($form) {
+                    return app(FormContract::class)::fromModel($form);
+                });
+        });
     }
 
     public function make($handle = null)

tests/Forms/FormTest.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace Tests\Forms;
+
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades;
+use Tests\TestCase;
+
+class FormTest extends TestCase
+{
+    #[Test]
+    public function finding_a_form_sets_the_blink_cache()
+    {
+        Facades\Form::make('test')->title('Test form')->save();
+
+        $form = Facades\Form::find('test');
+
+        $this->assertSame(Facades\Blink::get('eloquent-forms-test'), $form);
+    }
+
+    #[Test]
+    public function getting_all_forms_sets_the_blink_cache()
+    {
+        $form = tap(Facades\Form::make('test')->title('Test form'))->save();
+
+        Facades\Form::all();
+
+        $this->assertCount(1, Facades\Blink::get('eloquent-forms'));
+        $this->assertSame($form->handle(), Facades\Blink::get('eloquent-forms')->first()->handle());
+    }
+
+    #[Test]
+    public function saving_a_form_removes_the_blink_cache()
+    {
+        Facades\Form::make('test')->title('Test form')->save();
+
+        $form = Facades\Form::find('test');
+        Facades\Form::all(); // to set up eloquent-forms blink
+
+        $this->assertSame(Facades\Blink::get('eloquent-forms-test'), $form);
+        $this->assertCount(1, Facades\Blink::get('eloquent-forms'));
+
+        $form->save();
+
+        $this->assertNull(Facades\Blink::get('eloquent-forms-test'));
+        $this->assertNull(Facades\Blink::get('eloquent-forms'));
+    }
+
+    #[Test]
+    public function deleting_a_form_removes_the_blink_cache()
+    {
+        Facades\Form::make('test')->title('Test form')->save();
+
+        $form = Facades\Form::find('test');
+        Facades\Form::all(); // to set up eloquent-forms blink
+
+        $this->assertSame(Facades\Blink::get('eloquent-forms-test'), $form);
+        $this->assertCount(1, Facades\Blink::get('eloquent-forms'));
+
+        $form->delete();
+
+        $this->assertNull(Facades\Blink::get('eloquent-forms-test'));
+        $this->assertNull(Facades\Blink::get('eloquent-forms'));
+    }
+}