Merge pull request #4 from one2tek/2.x

Added users table to logs db (with migrations)
one2tek · Feb 10, 2021 · 42b8d5e · 42b8d5e
2 parents d24120c + 66f4746
commit 42b8d5e
Show file tree

Hide file tree

Showing 5 changed files with 140 additions and 11 deletions.
diff --git a/migrations/create_logs_table.php.stub b/migrations/create_logs_table.php.stub
@@ -11,21 +11,25 @@ class CreateLogsTable extends Migration
      */
     public function up()
     {
-        Schema::connection(config('laralog.database_connection'))->create(config('laralog.table_name'), function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->string('event_type')->nullable();
-            $table->nullableMorphs('subject', 'subject');
-            $table->nullableMorphs('causer', 'causer');
-            $table->json('properties')->nullable();
-            $table->timestamps();
-        });
+        if(!Schema::connection(config('laralog.database_connection'))->hasTable(config('laralog.table_name'))){
+            Schema::connection(config('laralog.database_connection'))->create(config('laralog.table_name'), function (Blueprint $table) {
+                $table->bigIncrements('id');
+                $table->string('event_type')->nullable();
+                $table->nullableMorphs('subject', 'subject');
+                $table->nullableMorphs('causer', 'causer');
+                $table->json('properties')->nullable();
+                $table->timestamps();
+            });
+        }
     }
 
     /**
      * Reverse the migrations.
      */
     public function down()
     {
-        Schema::connection(config('laralog.database_connection'))->dropIfExists(config('laralog.table_name'));
+        if(Schema::connection(config('laralog.database_connection'))->hasTable(config('laralog.table_name'))){
+            Schema::connection(config('laralog.database_connection'))->dropIfExists(config('laralog.table_name'));
+        }
     }
 }
diff --git a/migrations/create_users_table_on_logs_db.php.stub b/migrations/create_users_table_on_logs_db.php.stub
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateUsersTableOnLogsDb extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        if(!Schema::connection(config('laralog.database_connection'))->hasTable('users')){
+            Schema::connection(config('laralog.database_connection'))->create('users', function (Blueprint $table) {
+                $table->bigIncrements('id');
+                $table->string('name',191);
+                $table->string('role',20);
+                $table->timestamps();
+            });
+        }
+    }
+
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down()
+    {
+        if(Schema::connection(config('laralog.database_connection'))->hasTable('users')){
+            Schema::connection(config('laralog.database_connection'))->dropIfExists('users');
+        }
+    }
+}
diff --git a/migrations/drop_morph_from_logs_table.php.stub b/migrations/drop_morph_from_logs_table.php.stub
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class DropMorphFromLogsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        Schema::connection(config('laralog.database_connection'))->table(config('laralog.table_name'), function (Blueprint $table) {
+            if(Schema::hasColumn(config('laralog.table_name'),'causer_type')){
+                $table->dropColumn('causer_type');
+                $table->dropColumn('causer_id');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down()
+    {
+        Schema::connection(config('laralog.database_connection'))->table(config('laralog.table_name'), function (Blueprint $table) {
+            if(!Schema::hasColumn(config('laralog.table_name'),'causer_type')){
+                $table->nullableMorphs('causer', 'causer')->after('subject_id');
+            }
+        });
+    }
+}
diff --git a/migrations/logs_table_causer_id_add.php.stub b/migrations/logs_table_causer_id_add.php.stub
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class LogsTableCauserIdAdd extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        Schema::connection(config('laralog.database_connection'))->table(config('laralog.table_name'), function (Blueprint $table) {
+            if(!Schema::hasColumn(config('laralog.table_name'),'causer_id')){
+                $table->bigInteger('causer_id')->unsigned()->nullable()->after('subject_id');
+                $table->foreign('causer_id')->references('id')->on('users');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down()
+    {
+        Schema::connection(config('laralog.database_connection'))->table(config('laralog.table_name'), function (Blueprint $table) {
+            if(Schema::hasColumn(config('laralog.table_name'),'causer_id')){
+                $table->dropForeign(['causer_id']);
+                $table->dropColumn('causer_id');
+            }
+        });
+    }
+}
diff --git a/src/Providers/LaraLogServiceProvider.php b/src/Providers/LaraLogServiceProvider.php
@@ -29,13 +29,37 @@ public function boot()
         $this->publishes([
             __DIR__. '/../../config/laralog.php' => config_path('laralog.php'),
         ]);
-
-        if (! class_exists('CreateLogsTable')) {
+        
+        if (!class_exists('CreateLogsTable')) {
             $timestamp = date('Y_m_d_His', time());
 
             $this->publishes([
                 __DIR__.'/../../migrations/create_logs_table.php.stub' => database_path("/migrations/{$timestamp}_create_logs_table.php"),
             ], 'migrations');
         }
+
+        if (!class_exists('CreateUsersTableOnLogsDb')) {
+            $timestamp = date('Y_m_d_His', time());
+
+            $this->publishes([
+                __DIR__.'/../../migrations/create_users_table_on_logs_db.php.stub' => database_path("/migrations/{$timestamp}_create_users_table_on_logs_db.php")
+            ], 'migrations');
+        }
+
+        if(!class_exists('DropMorphFromLogsTable')){
+            $timestamp = date('Y_m_d_His', time());
+
+            $this->publishes([
+                __DIR__.'/../../migrations/drop_morph_from_logs_table.php.stub' => database_path("/migrations/{$timestamp}_drop_morph_from_logs_table.php")
+            ], 'migrations');
+        }
+
+        if(!class_exists('LogsTableCauserIdAdd')){
+            $timestamp = date('Y_m_d_His', time());
+
+            $this->publishes([
+                __DIR__.'/../../migrations/logs_table_causer_id_add.php.stub' => database_path("/migrations/{$timestamp}_logs_table_causer_id_add.php")
+            ], 'migrations');
+        }
     }
 }