Ensure computed values are stored in the database so they can be queried (#167)

Author: ryanmitchell

src/Entries/Entry.php

@@ -48,7 +48,9 @@ public static function makeModelFromContract(EntryContract $source)
     {
         $class = app('statamic.eloquent.entries.model');
 
-        $data = $source->data();
+        $data = $source->data()
+            ->merge(method_exists($source, 'computedData') ? $source->computedData() : []);
+
         $date = $source->hasDate() ? $source->date() : null;
 
         $origin = $source->origin();

tests/Entries/EntryTest.php

@@ -8,6 +8,8 @@
 use Statamic\Eloquent\Entries\Entry;
 use Statamic\Eloquent\Entries\EntryModel;
 use Statamic\Facades;
+use Statamic\Facades\Collection as CollectionFacade;
+use Statamic\Facades\Entry as EntryFacade;
 use Tests\TestCase;
 
 class EntryTest extends TestCase
@@ -59,6 +61,70 @@ public function it_saves_to_entry_model()
         $this->assertEquals(collect($model->toArray())->except(['updated_at'])->all(), collect($entry->toModel()->toArray())->except('updated_at')->all());
     }
 
+    /** @test */
+    public function it_stores_computed_values()
+    {
+        $collection = Collection::make('blog')->title('blog')->routes([
+            'en' => '/blog/{slug}',
+        ])->save();
+
+        CollectionFacade::computed('blog', 'shares', function ($entry, $value) {
+            return 150;
+        });
+
+        $model = new EntryModel([
+            'slug' => 'the-slug',
+            'data' => [
+                'foo' => 'bar',
+            ],
+        ]);
+
+        $entry = (new Entry())
+            ->collection('blog')
+            ->slug('the-slug')
+            ->data([
+                'foo' => 'bar',
+            ]);
+
+        $entry->save();
+
+        $this->assertEquals(150, $entry->model()->data['shares']);
+    }
+
+    /** @test */
+    public function it_defers_to_the_live_computed_value_instead_of_the_stored_value()
+    {
+        $collection = Collection::make('blog')->title('blog')->routes([
+            'en' => '/blog/{slug}',
+        ])->save();
+
+        CollectionFacade::computed('blog', 'shares', function ($entry, $value) {
+            return ! isset($value) ? 150 : 100;
+        });
+
+        $model = new EntryModel([
+            'slug' => 'the-slug',
+            'data' => [
+                'foo' => 'bar',
+            ],
+        ]);
+
+        $entry = (new Entry())
+            ->collection('blog')
+            ->slug('the-slug')
+            ->data([
+                'foo' => 'bar',
+            ]);
+
+        $entry->save();
+
+        $this->assertEquals(150, $entry->model()->data['shares']);
+
+        $freshEntry = EntryFacade::query()->where('slug', 'the-slug')->first();
+
+        $this->assertEquals(100, $freshEntry->shares);
+    }
+
     /** @test */
     public function it_propagates_entry_if_configured()
     {