refactoring

app/Observers/Company.php

@@ -1,64 +0,0 @@
-<?php
-
-namespace App\Observers;
-
-use App\Models\Common\Company as Model;
-use Artisan;
-
-class Company
-{
-    /**
-     * Listen to the created event.
-     *
-     * @param  Model  $company
-     * @return void
-     */
-    public function created(Model $company)
-    {
-        // Create seeds
-        Artisan::call('company:seed', [
-            'company' => $company->id
-        ]);
-
-        // Check if user is logged in
-        if (!auth()->check()) {
-            return;
-        }
-
-        // Attach company to user
-        user()->companies()->attach($company->id);
-    }
-
-    /**
-     * Listen to the deleted event.
-     *
-     * @param  Model  $company
-     * @return void
-     */
-    public function deleted(Model $company)
-    {
-        $tables = [
-            'accounts', 'bill_histories', 'bill_items', 'bill_statuses', 'bills', 'categories', 'contacts',
-            'currencies', 'invoice_histories', 'invoice_items', 'invoice_statuses', 'invoices', 'items', 'recurring',
-            'settings', 'taxes', 'transactions', 'transfers',
-        ];
-
-        foreach ($tables as $table) {
-            $this->deleteItems($company, $table);
-        }
-    }
-
-    /**
-     * Delete items in batch.
-     *
-     * @param  Model  $company
-     * @param  $table
-     * @return void
-     */
-    protected function deleteItems($company, $table)
-    {
-        foreach ($company->$table as $item) {
-            $item->delete();
-        }
-    }
-}

app/Observers/Transaction.php

@@ -2,12 +2,15 @@
 
 namespace App\Observers;
 
+use App\Jobs\Expense\CreateBillHistory;
+use App\Jobs\Income\CreateInvoiceHistory;
 use App\Models\Banking\Transaction as Model;
-use App\Models\Income\InvoiceHistory;
-use App\Models\Expense\BillHistory;
+use App\Traits\Jobs;
 
 class Transaction
 {
+    use Jobs;
+
     /**
      * Listen to the deleted event.
      *
@@ -16,64 +19,41 @@ class Transaction
      */
     public function deleted(Model $transaction)
     {
-        if (!empty($transaction->document_id)) {
-            if ($transaction->type == 'income') {
-                $this->updateInvoice($transaction);
-            } else {
-                $this->updateBill($transaction);
-            }
+        if (empty($transaction->document_id)) {
+            return;
         }
+
+        $function = ($transaction->type == 'income') ? 'updateInvoice' : 'updateBill';
+
+        $this->$function($transaction);
     }
 
     protected function updateInvoice($transaction)
     {
         $invoice = $transaction->invoice;
 
-        if ($invoice->transactions->count() > 1) {
-            $invoice->invoice_status_code = 'partial';
-        } else {
-            $invoice->invoice_status_code = 'sent';
-        }
+        $invoice->invoice_status_code = ($invoice->transactions->count() > 1) ? 'partial' : 'sent';
 
         $invoice->save();
 
-        $desc_amount = money((float) $transaction->amount, (string) $transaction->currency_code, true)->format();
-
-        $description = $desc_amount . ' ' . trans_choice('general.payments', 1);
-
-        // Add invoice history
-        InvoiceHistory::create([
-            'company_id' => $invoice->company_id,
-            'invoice_id' => $invoice->id,
-            'status_code' => $invoice->invoice_status_code,
-            'notify' => 0,
-            'description' => trans('messages.success.deleted', ['type' => $description]),
-        ]);
+        $this->dispatch(new CreateInvoiceHistory($invoice, 0, $this->getDescription($transaction)));
     }
 
     protected function updateBill($transaction)
     {
         $bill = $transaction->bill;
 
-        if ($bill->transactions->count() > 1) {
-            $bill->bill_status_code = 'partial';
-        } else {
-            $bill->bill_status_code = 'received';
-        }
+        $bill->bill_status_code = ($bill->transactions->count() > 1) ? 'partial' : 'received';
 
         $bill->save();
 
-        $desc_amount = money((float) $transaction->amount, (string) $transaction->currency_code, true)->format();
-
-        $description = $desc_amount . ' ' . trans_choice('general.payments', 1);
-
-        // Add bill history
-        BillHistory::create([
-            'company_id' => $bill->company_id,
-            'bill_id' => $bill->id,
-            'status_code' => $bill->bill_status_code,
-            'notify' => 0,
-            'description' => trans('messages.success.deleted', ['type' => $description]),
-        ]);
+        $this->dispatch(new CreateBillHistory($bill, 0, $this->getDescription($transaction)));
     }
-}
+
+    protected function getDescription($transaction)
+    {
+        $amount = money((double) $transaction->amount, (string) $transaction->currency_code, true)->format();
+
+        return trans('messages.success.deleted', ['type' => $amount . ' ' . trans_choice('general.payments', 1)]);
+    }
+}

app/Observers/User.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace App\Observers;
-
-use App\Models\Auth\User as Model;
-
-class User
-{
-    /**
-     * Listen to the deleted event.
-     *
-     * @param  Model  $user
-     * @return void
-     */
-    public function deleted(Model $user)
-    {
-        $tables = [
-            'dashboards',
-        ];
-
-        foreach ($tables as $table) {
-            $this->deleteItems($user, $table);
-        }
-    }
-
-    /**
-     * Delete items in batch.
-     *
-     * @param  Model  $user
-     * @param  $table
-     * @return void
-     */
-    protected function deleteItems($user, $table)
-    {
-        foreach ($user->$table as $item) {
-            $item->delete();
-        }
-    }
-}