close #2799 Fixed: Company delete can not delete sub categories

app/Events/Setting/CategoryCreated.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Events\Setting;
+
+use App\Abstracts\Event;
+
+class CategoryCreated extends Event
+{
+    public $category;
+
+    public $request;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param $category
+     * @param $request
+     */
+    public function __construct($category, $request)
+    {
+        $this->category = $category;
+        $this->request  = $request;
+    }
+}

app/Events/Setting/CategoryCreating.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Events\Setting;
+
+use Illuminate\Queue\SerializesModels;
+
+class CategoryCreating
+{
+    use SerializesModels;
+
+    public $request;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param $request
+     */
+    public function __construct($request)
+    {
+        $this->request = $request;
+    }
+}

app/Events/Setting/CategoryDeleted.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Events\Setting;
+
+use App\Abstracts\Event;
+
+class CategoryDeleted extends Event
+{
+    public $category;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param $category
+     */
+    public function __construct($category)
+    {
+        $this->category = $category;
+    }
+}

app/Events/Setting/CategoryDeleting.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Events\Setting;
+
+use App\Abstracts\Event;
+
+class CategoryDeleting extends Event
+{
+    public $category;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param $category
+     */
+    public function __construct($category)
+    {
+        $this->category = $category;
+    }
+}

app/Events/Setting/CategoryUpdated.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Events\Setting;
+
+use App\Abstracts\Event;
+
+class CategoryUpdated extends Event
+{
+    public $category;
+
+    public $request;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param $category
+     * @param $request
+     */
+    public function __construct($category, $request)
+    {
+        $this->category = $category;
+        $this->request  = $request;
+    }
+}

app/Events/Setting/CategoryUpdating.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Events\Setting;
+
+use App\Abstracts\Event;
+
+class CategoryUpdating extends Event
+{
+    public $category;
+
+    public $request;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param $category
+     * @param $request
+     */
+    public function __construct($category, $request)
+    {
+        $this->category = $category;
+        $this->request  = $request;
+    }
+}

app/Jobs/Setting/CreateCategory.php

@@ -3,6 +3,8 @@
 namespace App\Jobs\Setting;
 
 use App\Abstracts\Job;
+use App\Events\Setting\CategoryCreated;
+use App\Events\Setting\CategoryCreating;
 use App\Interfaces\Job\HasOwner;
 use App\Interfaces\Job\HasSource;
 use App\Interfaces\Job\ShouldCreate;
@@ -12,10 +14,14 @@ class CreateCategory extends Job implements HasOwner, HasSource, ShouldCreate
 {
     public function handle(): Category
     {
+        event(new CategoryCreating($this->request));
+
         \DB::transaction(function () {
             $this->model = Category::create($this->request->all());
         });
 
+        event(new CategoryCreated($this->model, $this->request));
+
         return $this->model;
     }
 }

app/Jobs/Setting/DeleteCategory.php

@@ -3,6 +3,8 @@
 namespace App\Jobs\Setting;
 
 use App\Abstracts\Job;
+use App\Events\Setting\CategoryDeleted;
+use App\Events\Setting\CategoryDeleting;
 use App\Exceptions\Settings\LastCategoryDelete;
 use App\Interfaces\Job\ShouldDelete;
 use App\Models\Setting\Category;
@@ -13,10 +15,14 @@ class DeleteCategory extends Job implements ShouldDelete
     {
         $this->authorize();
 
+        event(new CategoryDeleting($this->model));
+
         \DB::transaction(function () {
             $this->model->delete();
         });
 
+        event(new CategoryDeleted($this->model));
+
         return true;
     }
 

app/Jobs/Setting/UpdateCategory.php

@@ -3,6 +3,8 @@
 namespace App\Jobs\Setting;
 
 use App\Abstracts\Job;
+use App\Events\Setting\CategoryUpdated;
+use App\Events\Setting\CategoryUpdating;
 use App\Interfaces\Job\ShouldUpdate;
 use App\Models\Setting\Category;
 
@@ -12,10 +14,14 @@ class UpdateCategory extends Job implements ShouldUpdate
     {
         $this->authorize();
 
+        event(new CategoryUpdating($this->model, $this->request));
+
         \DB::transaction(function () {
             $this->model->update($this->request->all());
         });
 
+        event(new CategoryUpdated($this->model, $this->request));
+
         return $this->model;
     }
 

app/Listeners/Setting/DeleteCategoryDeletedSubCategories.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Listeners\Setting;
+
+use App\Events\Setting\CategoryDeleted as Event;
+use App\Jobs\Setting\DeleteCategory;
+use App\Traits\Jobs;
+
+class DeleteCategoryDeletedSubCategories
+{
+    use Jobs;
+
+    /**
+     * Handle the event.
+     *
+     * @param  $event
+     * @return void
+     */
+    public function handle(Event $event)
+    {
+        $category = $event->category;
+
+        if (empty($category->sub_categories)) {
+            return;
+        }
+
+        foreach ($category->sub_categories as $sub_category) {
+            $this->dispatch(new DeleteCategory($sub_category));
+        }
+    }
+}

app/Observers/Category.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Observers;
-
-use App\Abstracts\Observer;
-use App\Jobs\Setting\DeleteCategory;
-use App\Models\Setting\Category as Model;
-use App\Traits\Jobs;
-
-class Category extends Observer
-{
-    use Jobs;
-
-    /**
-     * Listen to the deleted event.
-     *
-     * @param  Model  $category
-     * @return void
-     */
-    public function deleting(Model $category)
-    {
-        foreach ($category->sub_categories as $sub_category) {
-            $this->dispatch(new DeleteCategory($sub_category));
-        }
-    }
-}

app/Providers/Event.php

@@ -100,6 +100,9 @@ class Event extends Provider
         'App\Events\Banking\TransactionCreated' => [
             'App\Listeners\Banking\IncreaseNextTransactionNumber',
         ],
+        'App\Events\Setting\CategoryDeleted' => [
+            'App\Listeners\Setting\DeleteCategoryDeletedSubCategories',
+        ],
     ];
 
     /**

app/Providers/Observer.php

@@ -3,7 +3,6 @@
 namespace App\Providers;
 
 use App\Models\Banking\Transaction;
-use App\Models\Setting\Category;
 use Illuminate\Support\ServiceProvider as Provider;
 
 class Observer extends Provider
@@ -26,6 +25,5 @@ class Observer extends Provider
     public function boot()
     {
         Transaction::observe('App\Observers\Transaction');
-        Category::observe('App\Observers\Category');
     }
 }