you won't notified for your likes/comments

muhammadmp97 · Sep 18, 2023 · 8c541e5 · 8c541e5
1 parent a2c8c81
commit 8c541e5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/app/Actions/Challenge/CreateCommentAction.php b/app/Actions/Challenge/CreateCommentAction.php
@@ -19,9 +19,11 @@ public function execute(User $user, Challenge $challenge, array $data): Comment
                 'text' => $data['text'],
             ]);
 
-        $challenge
-            ->user
-            ->notify(new ChallengeCommentedNotification($comment));
+        if ($user->isNot($challenge->user)) {
+            $challenge
+                ->user
+                ->notify(new ChallengeCommentedNotification($comment));
+        }
 
         CommentCreated::dispatch($comment);
 

diff --git a/app/Actions/Challenge/LikeChallengeAction.php b/app/Actions/Challenge/LikeChallengeAction.php
@@ -16,8 +16,10 @@ public function execute(User $user, Challenge $challenge): void
                 'user_id' => $user->id,
             ]);
 
-        $challenge
-            ->user
-            ->notify(new ChallengeLikedNotification($user, $challenge));
+        if ($user->isNot($challenge->user)) {
+            $challenge
+                ->user
+                ->notify(new ChallengeLikedNotification($user, $challenge));
+        }
     }
 }
diff --git a/tests/Feature/ChallengeCommentsControllerTest.php b/tests/Feature/ChallengeCommentsControllerTest.php
@@ -78,9 +78,11 @@ public function test_user_leaves_a_comment()
 
         Notification::fake();
 
-        User::factory()->create([
+        $user = User::factory()->create([
             'email' => config('hope.hope_bot_mail'),
         ]);
+
+        $this->signIn($user);
 
         $response = $this->postJson('api/challenges/1/comments', [
             'text' => 'You ****** *****!',

diff --git a/tests/Feature/ChallengeLikesControllerTest.php b/tests/Feature/ChallengeLikesControllerTest.php
@@ -4,6 +4,7 @@
 
 use App\Models\Challenge;
 use App\Models\Country;
+use App\Models\User;
 use App\Notifications\ChallengeLikedNotification;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Notification;
@@ -14,6 +15,7 @@ class ChallengeLikesControllerTest extends TestCase
     use RefreshDatabase;
 
     private $user;
+    private $challenge;
 
     public function setUp(): void
     {
@@ -26,7 +28,9 @@ public function setUp(): void
 
         $this->user = $this->signIn();
 
-        Challenge::factory()->create();
+        $this->challenge = Challenge::factory()->create([
+            'user_id' => (User::factory()->create())->id
+        ]);
     }
 
     public function test_user_gets_like_list()
@@ -60,9 +64,9 @@ public function test_user_likes_a_challenge()
         $this->postJson('api/challenges/1/likes')
             ->assertOk();
 
-        $this->assertEquals(1, Challenge::first()->likes()->count());
+        $this->assertEquals(1, $this->challenge->likes()->count());
 
-        Notification::assertSentTo($this->user, ChallengeLikedNotification::class);
+        Notification::assertSentTo($this->challenge->user, ChallengeLikedNotification::class);
     }
 
     public function test_user_unlikes_a_challenge()