For [Adding a new column for events #673]

.gitignore

@@ -2,3 +2,5 @@ build
 composer.lock
 vendor
 .phpunit.result.cache
+./.idea
+./.idea/*

migrations/update_activity_log_table.php.stub

@@ -0,0 +1,26 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdateActivityLogTable extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        Schema::connection(config('activitylog.database_connection'))->table(config('activitylog.table_name'), function (Blueprint $table) {
+            $table->string('event')->nullable()->after('subject_type');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down()
+    {
+        Schema::connection(config('activitylog.database_connection'))->dropIfExists(config('activitylog.table_name'));
+    }
+}

src/ActivityLogger.php

@@ -91,6 +91,17 @@ public function byAnonymous()
         return $this->causedByAnonymous();
     }
 
+    public function event(?string $event)
+    {
+        return $this->setEvent($event);
+    }
+
+    public function setEvent(?string $event)
+    {
+        $this->activity->event = $event;
+        return $this;
+    }
+
     public function withProperties($properties)
     {
         $this->getActivity()->properties = collect($properties);

src/ActivitylogServiceProvider.php

@@ -26,6 +26,14 @@ public function boot()
                 __DIR__.'/../migrations/create_activity_log_table.php.stub' => database_path("/migrations/{$timestamp}_create_activity_log_table.php"),
             ], 'migrations');
         }
+
+        if (!class_exists('UpdateActivityLogTable')) {
+            $timestamp = date('Y_m_d_His', time());
+
+            $this->publishes([
+                __DIR__ . '/../migrations/update_activity_log_table.php.stub' => database_path("/migrations/{$timestamp}_update_activity_log_table.php"),
+            ], 'migrations');
+        }
     }
 
     public function register()

src/Contracts/Activity.php

@@ -7,8 +7,8 @@
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Support\Collection;
 
-interface Activity
-{
+interface Activity {
+
     public function subject(): MorphTo;
 
     public function causer(): MorphTo;
@@ -21,5 +21,8 @@ public function scopeInLog(Builder $query, ...$logNames): Builder;
 
     public function scopeCausedBy(Builder $query, Model $causer): Builder;
 
+    public function scopeForEvent(Builder $query, string $event);
+
     public function scopeForSubject(Builder $query, Model $subject): Builder;
+
 }

src/Models/Activity.php

@@ -85,4 +85,10 @@ public function scopeForSubject(Builder $query, Model $subject): Builder
             ->where('subject_type', $subject->getMorphClass())
             ->where('subject_id', $subject->getKey());
     }
+
+    public function scopeForEvent(Builder $query, string $event)
+    {
+        return $query->where('event', $event);
+    }
+
 }

src/Traits/LogsActivity.php

@@ -40,6 +40,7 @@ protected static function bootLogsActivity()
 
                 $logger = app(ActivityLogger::class)
                     ->useLog($logName)
+                    ->event($eventName)
                     ->performedOn($model)
                     ->withProperties($attrs);
 

tests/ActivityLoggerTest.php

@@ -239,6 +239,18 @@ public function it_can_replace_the_placeholders()
         $this->assertEquals($expectedDescription, $this->getLastActivity()->description);
     }
 
+    /** @test */
+    public function it_can_log_an_activity_with_event()
+    {
+        $article = Article::create(['name' => 'article name']);
+        activity()
+            ->performedOn($article)
+            ->event('create')
+            ->log('test event');
+
+        $this->assertEquals('create', $this->getLastActivity()->event);
+    }
+
     /** @test */
     public function it_will_not_replace_non_placeholders()
     {
@@ -301,6 +313,14 @@ public function it_accepts_null_parameter_for_caused_by()
         $this->markTestAsPassed();
     }
 
+    /** @test */
+    public function it_accepts_null_parameter_for_event()
+    {
+        activity()->event(NULL)->log('Foo');
+
+        $this->markTestAsPassed();
+    }
+
     /** @test */
     public function it_can_log_activity_when_attributes_are_changed_with_tap()
     {

tests/ActivityModelTest.php

@@ -70,6 +70,19 @@ public function it_provides_a_scope_to_get_log_items_for_a_specific_causer()
         $this->assertEquals('Foo', $activities->first()->description);
     }
 
+    /** @test */
+    public function it_provides_a_scope_to_get_log_items_for_a_specific_event()
+    {
+        $subject = Article::first();
+        activity()
+            ->on($subject)
+            ->event('create')
+            ->log('Foo');
+        $activities = Activity::forEvent('create')->get();
+        $this->assertCount(1, $activities);
+        $this->assertEquals('create', $activities->first()->event);
+    }
+
     /** @test */
     public function it_provides_a_scope_to_get_log_items_for_a_specific_subject()
     {