Merge pull request #13 from kevmarsden/update-taxonomy-import

Update term/taxonomy import

Author: jackmcdade

src/Helpers/Migrator.php

@@ -98,11 +98,7 @@ private function createTaxonomies()
             $taxonomy = Taxonomy::findByHandle($taxonomy_slug);
 
             if (! $taxonomy) {
-                $taxonomy = Taxonomy::make($taxonomy_slug);
-            }
-
-            foreach ($taxonomy_data as $key => $value) {
-                $taxonomy->set($key, $value);
+                $taxonomy = Taxonomy::make($taxonomy_slug)->title($taxonomy_data['title']);
             }
 
             $taxonomy->save();
@@ -118,20 +114,18 @@ private function createTaxonomyTerms()
     {
         foreach (Arr::get($this->migration, 'terms', []) as $taxonomy_slug => $terms) {
             foreach ($terms as $term_slug => $term_data) {
+
                 // Skip if this term was not checked in the summary.
                 if (! $this->summary['taxonomies'][$taxonomy_slug]['terms'][$term_slug]['_checked']) {
                     continue;
                 }
 
-                $term = Term::findBySlug($term_slug, $taxonomy_slug);
-
-                if (! $term) {
-                    $term = Term::make($term_slug)->taxonomy($taxonomy_slug);
+                // Skip term creation if this term already exists.
+                if ($this->summary['taxonomies'][$taxonomy_slug]['terms'][$term_slug]['exists'] === true) {
+                    continue;
                 }
 
-                foreach ($term_data as $key => $value) {
-                    $term->set($key, $value);
-                }
+                $term = Term::make()->taxonomy($taxonomy_slug)->slug($term_slug)->set('title', $term_data['title']);
 
                 $term->save();
             }

src/Helpers/WpImporter.php

@@ -5,6 +5,7 @@
 use Exception;
 use Statamic\Facades\Entry;
 use Statamic\Facades\Term;
+use Statamic\Facades\Taxonomy;
 use Statamic\Support\Arr;
 
 class WpImporter
@@ -59,9 +60,12 @@ public function summary($prepared)
             $taxonomy_terms = [];
 
             foreach ($terms as $slug => $term) {
+
+                $exists = Taxonomy::find($slug) ? true : false;
+
                 $taxonomy_terms[$slug] = [
                     'slug' => $slug,
-                    'exists' => (bool) Term::query()->where('taxonomy', $taxonomy)->where('slug', $slug)->first(),
+                    'exists' => $exists,
                     '_checked' => true,
                 ];
             }