Apply tag fixes to API controller

cachethq · Jun 18, 2018 · a09206c · a09206c
1 parent e4fba51
commit a09206c
Showing 1 changed file with 20 additions and 17 deletions.
diff --git a/app/Http/Controllers/Api/ComponentController.php b/app/Http/Controllers/Api/ComponentController.php
@@ -14,6 +14,8 @@
 use CachetHQ\Cachet\Bus\Commands\Component\CreateComponentCommand;
 use CachetHQ\Cachet\Bus\Commands\Component\RemoveComponentCommand;
 use CachetHQ\Cachet\Bus\Commands\Component\UpdateComponentCommand;
+use CachetHQ\Cachet\Bus\Commands\Tag\ApplyTagCommand;
+use CachetHQ\Cachet\Bus\Commands\Tag\CreateTagCommand;
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\Tag;
 use GrahamCampbell\Binput\Facades\Binput;
@@ -85,17 +87,16 @@ public function store()
         }
 
         if (Binput::has('tags')) {
-            // The component was added successfully, so now let's deal with the tags.
-            $tags = preg_split('/ ?, ?/', Binput::get('tags'));
-
-            // For every tag, do we need to create it?
-            $componentTags = array_map(function ($taggable) use ($component) {
-                return Tag::firstOrCreate([
-                    'name' => $taggable,
-                ])->id;
-            }, $tags);
+            $component->tags()->delete();
 
-            $component->tags()->sync($componentTags);
+            // The component was added successfully, so now let's deal with the tags.
+            Collection::make(preg_split('/ ?, ?/', $tags))->map(function ($tag) {
+                return trim($tag);
+            })->map(function ($tag) {
+                return dispatch(new CreateTagCommand($tag));
+            })->each(function ($tag) use ($component) {
+                dispatch(new ApplyTagCommand($component, $tag));
+            });
         }
 
         return $this->item($component);
@@ -128,14 +129,16 @@ public function update(Component $component)
         }
 
         if (Binput::has('tags')) {
-            $tags = preg_split('/ ?, ?/', Binput::get('tags'));
+            $component->tags()->delete();
 
-            // For every tag, do we need to create it?
-            $componentTags = array_map(function ($taggable) use ($component) {
-                return Tag::firstOrCreate(['name' => $taggable])->id;
-            }, $tags);
-
-            $component->tags()->sync($componentTags);
+            // The component was added successfully, so now let's deal with the tags.
+            Collection::make(preg_split('/ ?, ?/', $tags))->map(function ($tag) {
+                return trim($tag);
+            })->map(function ($tag) {
+                return dispatch(new CreateTagCommand($tag));
+            })->each(function ($tag) use ($component) {
+                dispatch(new ApplyTagCommand($component, $tag));
+            });
         }
 
         return $this->item($component);