Merge pull request #5 from one2tek/2.x

Removed dropMorph and AddForeignKey migration
one2tek · Feb 11, 2021 · eb6eda9 · eb6eda9
2 parents 42b8d5e + 4ed8e05
commit eb6eda9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 88 deletions.
diff --git a/migrations/create_logs_table.php.stub b/migrations/create_logs_table.php.stub
@@ -16,7 +16,8 @@ class CreateLogsTable extends Migration
                 $table->bigIncrements('id');
                 $table->string('event_type')->nullable();
                 $table->nullableMorphs('subject', 'subject');
-                $table->nullableMorphs('causer', 'causer');
+                $table->bigInteger('causer_id')->unsigned()->nullable();
+                $table->foreign('causer_id')->references('id')->on('users');
                 $table->json('properties')->nullable();
                 $table->timestamps();
             });

diff --git a/migrations/drop_morph_from_logs_table.php.stub b/migrations/drop_morph_from_logs_table.php.stub
diff --git a/migrations/logs_table_causer_id_add.php.stub b/migrations/logs_table_causer_id_add.php.stub
diff --git a/src/Providers/LaraLogServiceProvider.php b/src/Providers/LaraLogServiceProvider.php
@@ -29,14 +29,6 @@ public function boot()
         $this->publishes([
             __DIR__. '/../../config/laralog.php' => config_path('laralog.php'),
         ]);
-
-        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());
@@ -45,20 +37,12 @@ public function boot()
                 __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());
+
+        if (!class_exists('CreateLogsTable')) {
+            $timestamp = date('Y_m_d_His', time() + 60);
 
             $this->publishes([
-                __DIR__.'/../../migrations/logs_table_causer_id_add.php.stub' => database_path("/migrations/{$timestamp}_logs_table_causer_id_add.php")
+                __DIR__.'/../../migrations/create_logs_table.php.stub' => database_path("/migrations/{$timestamp}_create_logs_table.php"),
             ], 'migrations');
         }
     }