Update

- Fixed : fix #96

Author: Blair2004

app/Events/ExpenseAfterRefreshEvent.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Events;
+
+use App\Jobs\ComputeDashboardExpensesJob;
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PresenceChannel;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class ExpenseAfterRefreshEvent
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public $event;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct( $event )
+    {
+        $this->event    =   $event;
+    }
+
+    /**
+     * Get the channels the event should broadcast on.
+     *
+     * @return \Illuminate\Broadcasting\Channel|array
+     */
+    public function broadcastOn()
+    {
+        return new PrivateChannel('channel-name');
+    }
+}

app/Events/ExpenseBeforeRefreshEvent.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Events;
+
+use App\Models\DashboardDay;
+use App\Services\DateService;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class ExpenseBeforeRefreshEvent
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public $dashboardDay;
+    public $date;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct( DashboardDay $dashboardDay, DateService $date )
+    {
+        $this->dashboardDay     =   $dashboardDay;
+        $this->date             =   $date;
+    }
+
+    /**
+     * Get the channels the event should broadcast on.
+     *
+     * @return \Illuminate\Broadcasting\Channel|array
+     */
+    public function broadcastOn()
+    {
+        return new PrivateChannel('channel-name');
+    }
+}

app/Jobs/ComputeDashboardExpensesJob.php

@@ -3,6 +3,8 @@
 namespace App\Jobs;
 
 use App\Events\ExpenseAfterCreateEvent;
+use App\Events\ExpenseAfterRefreshEvent;
+use App\Events\ExpenseBeforeRefreshEvent;
 use App\Events\ExpenseHistoryAfterCreatedEvent;
 use App\Events\ExpenseHistoryBeforeDeleteEvent;
 use App\Models\DashboardDay;
@@ -82,14 +84,11 @@ public function handle()
              * the day the expense has been created
              */
             $reports->each( function( $dashboardDay ) use ( &$now ) {
-                RefreshExpenseJob::dispatch( $dashboardDay )
-                    ->delay( $now );
-    
+                event( new ExpenseBeforeRefreshEvent( $dashboardDay, $now ) );
                 $now->addMinute();
             });
 
-            AfterExpenseComputedJob::dispatch( $this->event )
-                ->delay( $now->addSecond( 10 ) );
+            event( new ExpenseAfterRefreshEvent( $this->event, $now->addSeconds(10 ) ) );
         }
     }
 }

app/Listeners/ExpensesEventSubscriber.php

@@ -3,9 +3,13 @@
 namespace App\Listeners;
 
 use App\Events\ExpenseAfterCreateEvent;
+use App\Events\ExpenseAfterRefreshEvent;
+use App\Events\ExpenseBeforeRefreshEvent;
 use App\Events\ExpenseHistoryAfterCreatedEvent;
 use App\Events\ExpenseHistoryBeforeDeleteEvent;
+use App\Jobs\AfterExpenseComputedJob;
 use App\Jobs\ComputeDashboardExpensesJob;
+use App\Jobs\RefreshExpenseJob;
 use App\Services\ExpenseService;
 
 class ExpensesEventSubscriber
@@ -56,5 +60,25 @@ function( $event ) {
             ExpenseHistoryBeforeDeleteEvent::class,
             fn( $event ) => ComputeDashboardExpensesJob::dispatch( $event )
         );
+
+        /**
+         * Will dispatch event for refreshing expenses
+         * for a specific date
+         */
+        $event->listen(
+            ExpenseBeforeRefreshEvent::class,
+            fn( $event ) => RefreshExpenseJob::dispatch( $event->dashboardDay )->delay( $event->date )
+        );
+
+        /**
+         * Once all expenses has been refreshed
+         * this job will delete an expense history in
+         * case the event was made from a deletion action.
+         */
+        $event->listen(
+            ExpenseAfterRefreshEvent::class,
+            fn( $event ) => AfterExpenseComputedJob::dispatch( $event->event )
+                ->delay( $event->date )
+        );
     }
 }

app/Services/Setup.php

@@ -120,9 +120,6 @@ public function runMigration( Request $request )
         Artisan::call( 'config:cache' );
         Artisan::call( 'migrate --path=/database/migrations/default' );
         Artisan::call( 'migrate --path=/database/migrations/v1_0' );
-        Artisan::call( 'migrate --path=/database/migrations/v1_1' );
-        Artisan::call( 'migrate --path=/database/migrations/v1_2' );
-        Artisan::call( 'migrate --path=/database/migrations/v1_3' );
         Artisan::call( 'vendor:publish --provider="Laravel\Sanctum\SanctumServiceProvider"' );
 
         /**

database/migrations/default/2017_12_29_174613_create_options_table.php renamed to database/migrations/v1_0/2017_12_29_174613_create_options_table.php

@@ -15,7 +15,9 @@ class Dec8AddColumnsToExpensesHistory extends Migration
     public function up()
     {
         Schema::table('nexopos_expenses_history', function (Blueprint $table) {
-            $table->string( 'status' )->default( ExpenseHistory::STATUS_ACTIVE );
+            if ( ! Schema::hasColumn( 'nexopos_expenses_history', 'status' ) ) {
+                $table->string( 'status' )->default( ExpenseHistory::STATUS_ACTIVE );
+            }
         });
     }