Follow makeModelFromContract() approach in Entries import (#163)

Author: ryanmitchell

src/Commands/ImportEntries.php

@@ -7,6 +7,7 @@
 use Statamic\Contracts\Entries\CollectionRepository as CollectionRepositoryContract;
 use Statamic\Contracts\Entries\Entry as EntryContract;
 use Statamic\Contracts\Entries\EntryRepository as EntryRepositoryContract;
+use Statamic\Eloquent\Entries\Entry as EloquentEntry;
 use Statamic\Facades\Entry;
 use Statamic\Stache\Repositories\CollectionRepository;
 use Statamic\Stache\Repositories\EntryRepository;
@@ -67,7 +68,9 @@ private function importEntries()
 
         $this->withProgressBar($entriesWithoutOrigin, function ($entry) {
             $lastModified = $entry->fileLastModified();
-            $entry->toModel()->fill(['created_at' => $lastModified, 'updated_at' => $lastModified])->save();
+            $entry = EloquentEntry::makeModelFromContract($entry)
+                ->fill(['created_at' => $lastModified, 'updated_at' => $lastModified])
+                ->save();
         });
 
         if ($entriesWithOrigin->count() > 0) {
@@ -76,7 +79,9 @@ private function importEntries()
 
             $this->withProgressBar($entriesWithOrigin, function ($entry) {
                 $lastModified = $entry->fileLastModified();
-                $entry->toModel()->fill(['created_at' => $lastModified, 'updated_at' => $lastModified])->save();
+                EloquentEntry::makeModelFromContract($entry)
+                    ->fill(['created_at' => $lastModified, 'updated_at' => $lastModified])
+                    ->save();
             });
         }
 

src/Entries/Entry.php

@@ -38,27 +38,32 @@ public static function fromModel(Model $model)
     }
 
     public function toModel()
+    {
+        return self::makeModelFromContract($this);
+    }
+
+    public static function makeModelFromContract(EntryContract $source)
     {
         $class = app('statamic.eloquent.entries.model');
 
-        $data = $this->data();
+        $data = $source->data();
 
         $attributes = [
-            'origin_id'  => $this->origin()?->id(),
-            'site'       => $this->locale(),
-            'slug'       => $this->slug(),
-            'uri'        => $this->uri(),
-            'date'       => $this->hasDate() ? $this->date() : null,
-            'collection' => $this->collectionHandle(),
-            'blueprint'  => $this->blueprint ?? $this->blueprint()->handle(),
+            'origin_id'  => $source->origin()?->id(),
+            'site'       => $source->locale(),
+            'slug'       => $source->slug(),
+            'uri'        => $source->uri(),
+            'date'       => $source->hasDate() ? $source->date() : null,
+            'collection' => $source->collectionHandle(),
+            'blueprint'  => $source->blueprint ?? $source->blueprint()->handle(),
             'data'       => $data->except(EntryQueryBuilder::COLUMNS),
-            'published'  => $this->published(),
-            'status'     => $this->status(),
-            'updated_at' => $this->lastModified(),
-            'order'      => $this->order(),
+            'published'  => $source->published(),
+            'status'     => $source->status(),
+            'updated_at' => $source->lastModified(),
+            'order'      => $source->order(),
         ];
 
-        if ($id = $this->id()) {
+        if ($id = $source->id()) {
             $attributes['id'] = $id;
         }