Fix exporting when using UUIDs (#524)

Author: ryanmitchell

src/Commands/ExportEntries.php

@@ -73,21 +73,21 @@ private function exportEntries()
             return ! $model->origin_id;
         });
 
-        if ($entriesWithOrigin->count() > 0) {
+        if ($entriesWithoutOrigin->count() > 0) {
             $this->info('Exporting origin entries');
         }
 
         $this->withProgressBar($entriesWithoutOrigin, function ($model) {
             $entry = Entry::make()
+                ->collection($model->collection)
                 ->locale($model->site)
                 ->slug($model->slug)
-                ->collection($model->collection)
                 ->data($model->data)
                 ->blueprint($model->blueprint)
                 ->template($model->data['template'] ?? null)
                 ->published($model->published);
 
-            if (in_array(HasUuids::class, class_uses_recursive($model))) {
+            if ($model->getKeyType() == 'string' || in_array(HasUuids::class, class_uses_recursive($model))) {
                 $entry->id($model->getKey());
             }
 
@@ -107,16 +107,21 @@ private function exportEntries()
             $this->info('Exporting localized entries');
 
             $this->withProgressBar($entriesWithOrigin, function ($model) {
+
                 $entry = Entry::make()
+                    ->collection($model->collection)
                     ->origin($model->origin_id)
                     ->locale($model->site)
                     ->slug($model->slug)
-                    ->collection($model->collection)
                     ->data($model->data)
                     ->blueprint($model->data['blueprint'] ?? null)
                     ->template($model->data['template'] ?? null)
                     ->published($model->published);
 
+                if ($model->getKeyType() == 'string' || in_array(HasUuids::class, class_uses_recursive($model))) {
+                    $entry->id($model->getKey());
+                }
+
                 if ($model->date && $entry->collection()->dated()) {
                     $entry->date($model->date);
                 }