Episode 28 Complete

app/Activity.php

@@ -31,4 +31,14 @@ public function subject()
     {
         return $this->morphTo();
     }
+
+    /**
+     * Get the user who triggered the activity.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function user()
+    {
+        return $this->belongsTo(User::class);
+    }
 }

app/RecordsActivity.php

@@ -62,6 +62,7 @@ protected static function recordableEvents()
     public function recordActivity($description)
     {
         $this->activity()->create([
+            'user_id' => ($this->project ?? $this)->owner->id,
             'description' => $description,
             'changes' => $this->activityChanges(),
             'project_id' => class_basename($this) === 'Project' ? $this->id : $this->project_id

database/migrations/2019_01_24_143508_create_activities_table.php

@@ -15,12 +15,14 @@ public function up()
     {
         Schema::create('activities', function (Blueprint $table) {
             $table->increments('id');
+            $table->unsignedInteger('user_id');
             $table->unsignedInteger('project_id');
             $table->nullableMorphs('subject');
             $table->string('description');
             $table->text('changes')->nullable();
             $table->timestamps();
 
+            $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
             $table->foreign('project_id')->references('id')->on('projects')->onDelete('cascade');
         });
     }

resources/views/projects/activity/completed_task.blade.php

@@ -1 +1 @@
-You completed "{{ $activity->subject->body }}"
+{{ $activity->user->name }} completed "{{ $activity->subject->body }}"

resources/views/projects/activity/created_project.blade.php

@@ -1 +1 @@
-You created the project
+{{ $activity->user->name }} created the project

resources/views/projects/activity/created_task.blade.php

@@ -1 +1 @@
-You created "{{ $activity->subject->body }}"
+{{ $activity->user->name }} created "{{ $activity->subject->body }}"

resources/views/projects/activity/incompleted_task.blade.php

@@ -1 +1 @@
-You incompleted "{{ $activity->subject->body }}"
+{{ $activity->user->name }} incompleted "{{ $activity->subject->body }}"

resources/views/projects/activity/updated_project.blade.php

@@ -1 +1,5 @@
-You updated the project
+@if (count($activity->changes['after']) == 1)
+    {{ $activity->user->name }} updated the {{ key($activity->changes['after']) }} of the project
+@else
+    {{ $activity->user->name }} updated the project
+@endif

tests/Unit/ActivityTest.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Tests\Unit;
+
+use App\Activity;
+use App\Project;
+use App\User;
+use Facades\Tests\Setup\ProjectFactory;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class ActivityTest extends TestCase
+{
+    use RefreshDatabase;
+
+    /** @test */
+    function it_has_a_user()
+    {
+        $user = $this->signIn();
+
+        $project = ProjectFactory::ownedBy($user)->create();
+
+        $this->assertEquals($user->id, $project->activity->first()->user->id);
+    }
+}