refactored report and update abstracts

app/Abstracts/Listeners/Report.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Abstracts\Reports;
+namespace App\Abstracts\Listeners;
 
 use App\Events\Common\ReportFilterApplying;
 use App\Events\Common\ReportFilterShowing;
@@ -12,7 +12,7 @@ use App\Models\Setting\Category;
 use App\Traits\Contacts;
 use Date;
 
-abstract class Listener
+abstract class Report
 {
     use Contacts;
 

app/Abstracts/Listeners/Update.php

@@ -1,31 +1,39 @@
 <?php
 
-namespace App\Listeners\Update;
+namespace App\Abstracts\Listeners;
 
-class Listener
+abstract class Update
 {
     const ALIAS = '';
 
     const VERSION = '';
 
     /**
-     * Check if should listen.
+     * Check the fired update based on alias and version.
      *
      * @param  $event
      * @return boolean
      */
-    protected function check($event)
+    public function skipThisUpdate($event)
     {
         // Apply only to the specified alias
         if ($event->alias != static::ALIAS) {
-            return false;
+            return true;
         }
 
         // Do not apply to the same or newer versions
         if (version_compare($event->old, static::VERSION, '>=')) {
+            return true;
+        }
+
         return false;
     }
 
-        return true;
+    /**
+     * @deprecated since 2.0
+     */
+    public function check($event)
+    {
+        return !$this->skipThisUpdate($event);
     }
 }

app/Abstracts/Report.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Abstracts\Reports;
+namespace App\Abstracts;
 
 use App\Exports\Common\Reports as Export;
 use App\Models\Common\Report as Model;

app/Listeners/Common/ExpenseSummaryReport.php

@@ -2,7 +2,7 @@
 
 namespace App\Listeners\Common;
 
-use App\Abstracts\Reports\Listener;
+use App\Abstracts\Listeners\Report as Listener;
 use App\Events\Common\ReportFilterApplying;
 use App\Events\Common\ReportFilterShowing;
 use App\Events\Common\ReportGroupApplying;

app/Listeners/Common/IncomeExpenseSummaryReport.php

@@ -2,7 +2,7 @@
 
 namespace App\Listeners\Common;
 
-use App\Abstracts\Reports\Listener;
+use App\Abstracts\Listeners\Report as Listener;
 use App\Events\Common\ReportFilterApplying;
 use App\Events\Common\ReportFilterShowing;
 use App\Events\Common\ReportGroupApplying;

app/Listeners/Common/IncomeSummaryReport.php

@@ -2,7 +2,7 @@
 
 namespace App\Listeners\Common;
 
-use App\Abstracts\Reports\Listener;
+use App\Abstracts\Listeners\Report as Listener;
 use App\Events\Common\ReportFilterApplying;
 use App\Events\Common\ReportFilterShowing;
 use App\Events\Common\ReportGroupApplying;

app/Listeners/Common/ProfitLossReport.php

@@ -2,7 +2,7 @@
 
 namespace App\Listeners\Common;
 
-use App\Abstracts\Reports\Listener;
+use App\Abstracts\Listeners\Report as Listener;
 
 class ProfitLossReport extends Listener
 {

app/Listeners/Common/TaxSummaryReport.php

@@ -2,7 +2,7 @@
 
 namespace App\Listeners\Common;
 
-use App\Abstracts\Reports\Listener;
+use App\Abstracts\Listeners\Report as Listener;
 
 class TaxSummaryReport extends Listener
 {

app/Listeners/Update/V10/Version106.php

@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V10;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use File;
 
 class Version106 extends Listener

app/Listeners/Update/V10/Version107.php

@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V10;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use DB;
 
 class Version107 extends Listener

app/Listeners/Update/V10/Version108.php

@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V10;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Common\Company;
 use App\Models\Expense\Bill;
 use App\Models\Expense\BillStatus;

app/Listeners/Update/V10/Version109.php

@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V10;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Common\Company;
 use Artisan;
 

app/Listeners/Update/V11/Version110.php

@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V11;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Auth\Role;
 use App\Models\Auth\Permission;
 

app/Listeners/Update/V11/Version112.php

@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V11;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Common\Company;
 use App\Utilities\Installer;
 

app/Listeners/Update/V11/Version113.php

@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V11;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Setting\Currency;
 use Artisan;
 

app/Listeners/Update/V11/Version119.php

@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V11;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Auth\Role;
 use App\Models\Auth\Permission;
 use Illuminate\Support\Facades\Schema;

app/Listeners/Update/V12/Version120.php

@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V12;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Auth\Role;
 use App\Models\Auth\Permission;
 use App\Models\Common\Company;

app/Listeners/Update/V12/Version1210.php

@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V12;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use Artisan;
 
 class Version1210 extends Listener

app/Listeners/Update/V12/Version1211.php

@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V12;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use Artisan;
 
 class Version1211 extends Listener

app/Listeners/Update/V12/Version126.php

@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V12;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Auth\Role;
 use App\Models\Auth\Permission;
 

app/Listeners/Update/V12/Version127.php

@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V12;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Auth\Permission;
 use File;
 use Illuminate\Support\Str;

app/Listeners/Update/V12/Version129.php

@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V12;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use Artisan;
 
 class Version129 extends Listener

app/Listeners/Update/V13/Version130.php

@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V13;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Auth\Role;
 use App\Models\Auth\Permission;
 use Artisan;

app/Listeners/Update/V13/Version1311.php

@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V13;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Auth\Role;
 use App\Models\Auth\Permission;
 use Artisan;

app/Listeners/Update/V13/Version1313.php

@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V13;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Common\Company;
 use App\Utilities\Installer;
 use Artisan;

app/Listeners/Update/V13/Version1316.php

@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V13;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Common\Company;
 use App\Utilities\Overrider;
 use App\Models\Banking\Account;

app/Listeners/Update/V13/Version132.php

@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V13;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Auth\Role;
 use App\Models\Auth\Permission;
 use Artisan;

app/Listeners/Update/V13/Version135.php

@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V13;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use Date;
 
 class Version135 extends Listener

app/Listeners/Update/V13/Version138.php

@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V13;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use Date;
 
 class Version138 extends Listener

app/Listeners/Update/V13/Version139.php

@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V13;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Income\InvoiceItem;
 use App\Models\Income\InvoiceItemTax;
 use App\Models\Setting\Tax;

app/Listeners/Update/V20/Version200.php

@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V20;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use App\Models\Auth\User;
 use App\Models\Auth\Role;
 use App\Models\Auth\Permission;
@@ -32,8 +32,7 @@ class Version200 extends Listener
      */
     public function handle(Event $event)
     {
-        // Check if should listen
+        if ($this->skipThisUpdate($event)) {
-        if (!$this->check($event)) {
             return;
         }
 

app/Listeners/Update/V20/Version201.php

@@ -2,8 +2,8 @@
 
 namespace App\Listeners\Update\V13;
 
+use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
-use App\Listeners\Update\Listener;
 use Artisan;
 
 class Version201 extends Listener
@@ -20,8 +20,7 @@ class Version201 extends Listener
      */
     public function handle(Event $event)
     {
-        // Check if should listen
+        if ($this->skipThisUpdate($event)) {
-        if (!$this->check($event)) {
             return;
         }
 

app/Reports/ExpenseSummary.php

@@ -2,7 +2,7 @@
 
 namespace App\Reports;
 
-use App\Abstracts\Reports\Report;
+use App\Abstracts\Report;
 use App\Models\Banking\Transaction;
 use App\Models\Expense\Bill;
 use App\Utilities\Recurring;

app/Reports/IncomeExpenseSummary.php

@@ -2,7 +2,7 @@
 
 namespace App\Reports;
 
-use App\Abstracts\Reports\Report;
+use App\Abstracts\Report;
 use App\Models\Banking\Transaction;
 use App\Models\Expense\Bill;
 use App\Models\Income\Invoice;

app/Reports/IncomeSummary.php

@@ -2,7 +2,7 @@
 
 namespace App\Reports;
 
-use App\Abstracts\Reports\Report;
+use App\Abstracts\Report;
 use App\Models\Banking\Transaction;
 use App\Models\Income\Invoice;
 use App\Utilities\Recurring;

app/Reports/ProfitLoss.php

@@ -2,7 +2,7 @@
 
 namespace App\Reports;
 
-use App\Abstracts\Reports\Report;
+use App\Abstracts\Report;
 use App\Models\Banking\Transaction;
 use App\Models\Expense\Bill;
 use App\Models\Income\Invoice;

app/Reports/TaxSummary.php

@@ -2,7 +2,7 @@
 
 namespace App\Reports;
 
-use App\Abstracts\Reports\Report;
+use App\Abstracts\Report;
 use App\Models\Banking\Transaction;
 use App\Models\Expense\Bill;
 use App\Models\Income\Invoice;