feat: add DIplomacyUpdated event

Author: Tjaitil

app/Events/DiplomacyUpdated.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Events;
+
+use App\Http\Resources\DiplomacyResource;
+use App\Models\Diplomacy;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class DiplomacyUpdated implements ShouldBroadcast
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    /**
+     * @var array<string, float>
+     */
+    public array $Diplomacy;
+
+    public int $userId;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(Diplomacy $Diplomacy, int $userId)
+    {
+        $this->Diplomacy = (new DiplomacyResource($Diplomacy))->resolve();
+        $this->userId = $userId;
+    }
+
+    /**
+     * Get the channels the event should broadcast on.
+     *
+     * @return array<int, \Illuminate\Broadcasting\Channel>
+     */
+    public function broadcastOn(): array
+    {
+        return [
+            new PrivateChannel('game-state.'.$this->userId),
+        ];
+    }
+}

app/Services/DiplomacyService.php

@@ -3,6 +3,7 @@
 namespace App\Services;
 
 use App\Enums\GameLocations;
+use App\Events\DiplomacyUpdated;
 use App\Models\CityRelation;
 use App\Models\Diplomacy;
 use Exception;
@@ -50,6 +51,8 @@ public function setNewDiplomacy(string $current_location, int $percentage, int $
             }
         }
         $Diplomacy->save();
+
+        event(new DiplomacyUpdated($Diplomacy, $userId));
     }
 
     /**

resources/js/bootstrap.ts

@@ -20,6 +20,8 @@ import Pusher from 'pusher-js';
 import { useInventoryStore } from './ui/stores/InventoryStore';
 import type { InventoryItem } from '@/types/InventoryItem';
 import { useSkillsStore } from './ui/stores/SkillsStore';
+import { useDiplomacyStore } from './ui/stores/DiplomacyStore';
+import type { DiplomacyResource } from '@/types/Diplomacy';
 
 window.Pusher = Pusher;
 
@@ -39,4 +41,7 @@ echo
   })
   .listen('SkillsUpdated', () => {
     useSkillsStore().setHandleXpGainedEvent(true);
+  })
+  .listen('DiplomacyUpdated', (e: { Diplomacy: DiplomacyResource }) => {
+    useDiplomacyStore().setDiplomacyData(e.Diplomacy);
   });

resources/js/ui/components/sidebar/DiplomacyTab.vue

@@ -25,17 +25,17 @@
 
 <script setup lang="ts">
 import type { DiplomacyResource } from '@/types/Diplomacy';
-import { jsUcWords } from '@/utilities/uppercase';
 import { formatLocationName } from '@/utilities/formatters';
-import { computed, ref } from 'vue';
+import { computed, watch } from 'vue';
+import { useDiplomacyStore } from '@/ui/stores/DiplomacyStore';
 
 interface Props {
   initData: DiplomacyResource;
 }
 
-const { initData: data } = defineProps<Props>();
+const props = defineProps<Props>();
 
-const diplomacyData = ref<Props['initData']>(data);
+const diplomacyStore = useDiplomacyStore();
 
 const diplomacyClass = (diplomacy: number) => {
   if (typeof diplomacy !== 'number') return '';
@@ -44,13 +44,25 @@ const diplomacyClass = (diplomacy: number) => {
   return '';
 };
 
+watch(
+  () => props.initData,
+  value => {
+    diplomacyStore.setDiplomacyData(value);
+  },
+  { immediate: true }
+);
+
+const diplomacyData = computed(() => {
+  return diplomacyStore.diplomacyData ?? props.initData;
+});
+
 const computedDiplomacyClasses = computed(() => {
   return {
-    hirtam: diplomacyClass(data.hirtam),
-    pvitul: diplomacyClass(data.pvitul),
-    khanz: diplomacyClass(data.khanz),
-    ter: diplomacyClass(data.ter),
-    fansal_plains: diplomacyClass(data.fansal_plains),
+    hirtam: diplomacyClass(diplomacyData.value.hirtam),
+    pvitul: diplomacyClass(diplomacyData.value.pvitul),
+    khanz: diplomacyClass(diplomacyData.value.khanz),
+    ter: diplomacyClass(diplomacyData.value.ter),
+    fansal_plains: diplomacyClass(diplomacyData.value.fansal_plains),
   };
 });
 </script>

resources/js/ui/stores/DiplomacyStore.ts

@@ -0,0 +1,18 @@
+import type { DiplomacyResource } from '@/types/Diplomacy';
+import { defineStore } from 'pinia';
+import { ref } from 'vue';
+
+export const useDiplomacyStore = defineStore('diplomacy', () => {
+
+  const diplomacyData = ref<DiplomacyResource>();
+
+  const setDiplomacyData = (data: DiplomacyResource) => {
+    diplomacyData.value = data;
+  };
+
+
+  return {
+    diplomacyData,
+    setDiplomacyData, 
+  }
+});

tests/feature/Events/DiplomacyUpdatedTest.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace Tests\Feature\Events;
+
+use App\Enums\GameLocations;
+use App\Events\DiplomacyUpdated;
+use App\Http\Resources\DiplomacyResource;
+use App\Models\CityRelation;
+use App\Models\Diplomacy;
+use App\Services\DiplomacyService;
+use Illuminate\Support\Facades\Event;
+use Tests\TestCase;
+
+class DiplomacyUpdatedTest extends TestCase
+{
+    public function test_set_new_diplomacy_broadcasts_updated_diplomacy(): void
+    {
+        Event::fake([DiplomacyUpdated::class]);
+        $this->actingAs($this->TestUser);
+
+        $location = GameLocations::HIRTAM_LOCATION->value;
+
+        $CityRelation = CityRelation::where('city', $location)->first();
+        if (! $CityRelation instanceof CityRelation) {
+            $CityRelation = new CityRelation();
+            $CityRelation->city = $location;
+        }
+
+        $CityRelation->hirtam = 1;
+        $CityRelation->pvitul = 1.1;
+        $CityRelation->khanz = 0.9;
+        $CityRelation->ter = 1;
+        $CityRelation->fansal_plains = 1.1;
+        $CityRelation->save();
+
+        $Diplomacy = Diplomacy::where('user_id', $this->TestUser->id)->first();
+        if (! $Diplomacy instanceof Diplomacy) {
+            $Diplomacy = Diplomacy::factory()->create([
+                'user_id' => $this->TestUser->id,
+                'username' => $this->TestUser->username,
+            ]);
+        }
+
+        $Diplomacy->hirtam = 1;
+        $Diplomacy->pvitul = 1;
+        $Diplomacy->khanz = 1;
+        $Diplomacy->ter = 1;
+        $Diplomacy->fansal_plains = 1;
+        $Diplomacy->save();
+
+        $service = app(DiplomacyService::class);
+        $service->setNewDiplomacy($location, 10, $this->TestUser->id);
+
+        $updatedDiplomacy = Diplomacy::where('user_id', $this->TestUser->id)->firstOrFail();
+        $expectedPayload = (new DiplomacyResource($updatedDiplomacy))->resolve();
+
+        Event::assertDispatched(DiplomacyUpdated::class, function (DiplomacyUpdated $event) use ($expectedPayload) {
+            return $event->userId === $this->TestUser->id
+                && $event->Diplomacy === $expectedPayload;
+        });
+    }
+}