From f64d546672d6e86052ba0be284131e12cc005124 Mon Sep 17 00:00:00 2001
From: Mohit Panjwani <mohit.panjvani@gmail.com>
Date: Wed, 13 May 2020 11:12:33 +0530
Subject: [PATCH] refactor 310 update listener

---
 app/Listeners/Updates/v3/Version310.php       | 19 ++---------
 app/Space/Updater.php                         |  3 +-
 ...2_154129_add_user_id_to_expenses_table.php | 33 +++++++++++++++++++
 routes/web.php                                |  2 +-
 4 files changed, 38 insertions(+), 19 deletions(-)
 create mode 100644 database/migrations/2020_05_12_154129_add_user_id_to_expenses_table.php

diff --git a/app/Listeners/Updates/v3/Version310.php b/app/Listeners/Updates/v3/Version310.php
index 2945bede..e07adebe 100644
--- a/app/Listeners/Updates/v3/Version310.php
+++ b/app/Listeners/Updates/v3/Version310.php
@@ -10,25 +10,17 @@ use Crater\Events\UpdateFinished;
 use Crater\Setting;
 use Crater\Currency;
 use Schema;
+use Artisan;
 
 class Version310 extends Listener
 {
     const VERSION = '3.1.0';
 
-    /**
-     * Create the event listener.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        //
-    }
 
     /**
      * Handle the event.
      *
-     * @param  object  $event
+     * @param UpdateFinished $event
      * @return void
      */
     public function handle(UpdateFinished $event)
@@ -52,12 +44,7 @@ class Version310 extends Listener
             ]
         );
 
-        if (!Schema::hasColumn('expenses', 'user_id')) {
-            Schema::table('expenses', function (Blueprint $table) {
-                $table->integer('user_id')->unsigned()->nullable();
-                $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
-            });
-        }
+        Artisan::call('migrate', ['--force' => true]);
 
         // Update Crater app version
         Setting::setSetting('version', static::VERSION);
diff --git a/app/Space/Updater.php b/app/Space/Updater.php
index 6acb8f6a..bd411cfc 100644
--- a/app/Space/Updater.php
+++ b/app/Space/Updater.php
@@ -14,7 +14,7 @@ class Updater
 {
     use SiteApi;
 
-    public static function update($installed, $version)
+    public static function update($version)
     {
         $data = null;
         $path = null;
@@ -26,7 +26,6 @@ class Updater
             $url = 'https://craterapp.com/downloads/file/'.$version.'?type=update';
         }
 
-
         $response = static::getRemote($url, ['timeout' => 100, 'track_redirects' => true]);
 
         // Exception
diff --git a/database/migrations/2020_05_12_154129_add_user_id_to_expenses_table.php b/database/migrations/2020_05_12_154129_add_user_id_to_expenses_table.php
new file mode 100644
index 00000000..130994c1
--- /dev/null
+++ b/database/migrations/2020_05_12_154129_add_user_id_to_expenses_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddUserIdToExpensesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('expenses', function (Blueprint $table) {
+            $table->integer('user_id')->unsigned()->nullable();
+            $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('expenses', function (Blueprint $table) {
+            $table->dropColumn('paid');
+        });
+    }
+}
diff --git a/routes/web.php b/routes/web.php
index c6e2fd4b..dc35b654 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -88,7 +88,7 @@ Route::get('/expenses/{id}/receipt/{hash}', [
     'uses' => 'ExpensesController@downloadReceipt'
 ]);
 
-// Setup for instalation of app
+// Setup for installation of app
 // ----------------------------------------------
 Route::get('/on-boarding', function () {
     return view('app');