users worden nu beter geresolved

app/Http/Controllers/DynamicInvitationController.php

@@ -118,7 +118,7 @@ class DynamicInvitationController extends Controller
             // Log to Dynamic chat activity log!
             $dynamic->chat->messages()->create([
                 'user_id' => null,
-                'content' => "<user:{$request->user()->id}> joined the Dynamic as a ".strtoupper($invitation->role),
+                'content' => "<user:{$request->user()->uuid}> joined the Dynamic as a ".strtoupper($invitation->role),
                 'subject_id' => $request->user()->id,
                 'subject_type' => User::class,
             ]);

app/Http/Controllers/MutationController.php

@@ -19,30 +19,10 @@ class MutationController extends Controller
 {
     use AuthorizesRequests;
 
-    /**
-     * Display a listing of the resource.
-     */
-    public function index()
-    {
-        //
-    }
-
-    /**
-     * Show the form for creating a new resource.
-     */
-    public function create()
-    {
-        //
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     */
     public function store(StoreMutationRequest $request, Dynamic $dynamic, Ledger $ledger)
     {
         $this->authorize('create', [Mutation::class, $ledger]);
 
-        // If the user is an owner, default status to 'approved'. Otherwise default to 'pending'.
         $status = $request->user()->can('update', $ledger) ? 'approved' : 'pending';
 
         $mutation = DB::transaction(function () use ($request, $ledger, $status) {
@@ -70,7 +50,6 @@ class MutationController extends Controller
                 }
             }
 
-            // Only increment score if the status is approved!
             if ($status === 'approved') {
                 $ledger->increment('score', $request->validated('amount'));
             }
@@ -78,48 +57,26 @@ class MutationController extends Controller
             return $mutation;
         });
 
-        // Notify all other participants
         $recipients = $dynamic->participants()->where('users.id', '!=', $request->user()->id)->get();
         $message = $status === 'approved'
             ? "{$request->user()->name} added a new entry: \"{$mutation->description}\"."
             : "{$request->user()->name} suggested a new entry: \"{$mutation->description}\".";
 
-        Notification::send($recipients, new NewActivityNotification([
-            'content' => $message,
-            'url' => route('dynamics.ledgers.show', [$dynamic, $ledger]),
-        ]));
+        if ($recipients->isNotEmpty()) {
+            Notification::send($recipients, new NewActivityNotification([
+                'content' => $message,
+                'url' => route('dynamics.ledgers.show', [$dynamic, $ledger]),
+            ]));
+        }
 
         return redirect()->route('dynamics.ledgers.show', [$dynamic, $ledger]);
     }
 
-    /**
-     * Display the specified resource.
-     */
-    public function show(Dynamic $dynamic, Ledger $ledger, Mutation $mutation)
-    {
-        $this->authorize('view', $mutation);
-
-        return $mutation;
-    }
-
-    /**
-     * Show the form for editing the specified resource.
-     */
-    public function edit(Dynamic $dynamic, Ledger $ledger, Mutation $mutation)
-    {
-        //
-    }
-
-    /**
-     * Update the specified resource in storage.
-     */
     public function update(Request $request, Dynamic $dynamic, Ledger $ledger, Mutation $mutation)
     {
         $this->authorize('update', $mutation);
 
-        $request->validate([
-            'status' => ['required', 'string', 'in:approved,rejected'],
-        ]);
+        $request->validate(['status' => ['required', 'string', 'in:approved,rejected']]);
 
         $oldStatus = $mutation->status;
         $newStatus = $request->input('status');
@@ -127,7 +84,6 @@ class MutationController extends Controller
         DB::transaction(function () use ($mutation, $ledger, $oldStatus, $newStatus) {
             $mutation->update(['status' => $newStatus]);
 
-            // Adjust the ledger score if status transitions to approved or from approved!
             if ($oldStatus !== 'approved' && $newStatus === 'approved') {
                 $ledger->increment('score', $mutation->amount);
             } elseif ($oldStatus === 'approved' && $newStatus !== 'approved') {
@@ -135,41 +91,17 @@ class MutationController extends Controller
             }
         });
 
-        // Log to Mutation and Dynamic chats
         $user = $request->user();
         $statusText = strtoupper($newStatus);
 
-        $mutationMsg = $mutation->chat->messages()->create([
-            'user_id' => null,
-            'content' => "Suggestion was {$statusText} by <user:{$user->id}>.",
-            'subject_id' => $mutation->id,
-            'subject_type' => Mutation::class,
-        ]);
-        broadcast(new MessageSent($mutationMsg));
-
-        if ($newStatus === 'approved') {
-            $dynamicMsg = $dynamic->chat->messages()->create([
-                'user_id' => null,
-                'content' => "<user:{$user->id}> APPROVED the suggestion \"{$mutation->description}\" for ".($mutation->amount >= 0 ? '+' : '')."{$mutation->amount} points on \"{$ledger->name}\" ledger.",
-                'subject_id' => $mutation->id,
-                'subject_type' => Mutation::class,
-            ]);
-        } else {
-            $dynamicMsg = $dynamic->chat->messages()->create([
-                'user_id' => null,
-                'content' => "<user:{$user->id}> REJECTED the suggestion \"{$mutation->description}\" on \"{$ledger->name}\" ledger.",
-                'subject_id' => $mutation->id,
-                'subject_type' => Mutation::class,
-            ]);
+        // Notify the suggester
+        $suggester = $mutation->user;
+        if ($suggester && $suggester->id !== $user->id) {
+            Notification::send($suggester, new NewActivityNotification([
+                'content' => "Your suggestion \"{$mutation->description}\" was {$statusText} by {$user->name}.",
+                'url' => route('dynamics.ledgers.show', [$dynamic, $ledger]),
+            ]));
         }
-        broadcast(new MessageSent($dynamicMsg));
-
-        // Notify all other participants
-        $recipients = $dynamic->participants()->where('users.id', '!=', $request->user()->id)->get();
-        Notification::send($recipients, new NewActivityNotification([
-            'content' => "{$user->name} {$statusText} the suggestion: \"{$mutation->description}\".",
-            'url' => route('dynamics.ledgers.show', [$dynamic, $ledger]),
-        ]));
 
         return redirect()->back();
     }
@@ -178,23 +110,21 @@ class MutationController extends Controller
     {
         $this->authorize('void', $mutation);
 
-        $mutation->update(['status' => 'voided']);
+        DB::transaction(function() use ($mutation, $ledger) {
+            if ($mutation->status === 'approved') {
+                $ledger->decrement('score', $mutation->amount);
+            }
+            $mutation->update(['status' => 'voided']);
+        });
 
-        // Notify all other participants
         $recipients = $dynamic->participants()->where('users.id', '!=', $request->user()->id)->get();
-        Notification::send($recipients, new NewActivityNotification([
-            'content' => "{$request->user()->name} voided an entry: \"{$mutation->description}\".",
-            'url' => route('dynamics.ledgers.show', [$dynamic, $ledger]),
-        ]));
+        if ($recipients->isNotEmpty()) {
+            Notification::send($recipients, new NewActivityNotification([
+                'content' => "{$request->user()->name} voided an entry: \"{$mutation->description}\".",
+                'url' => route('dynamics.ledgers.show', [$dynamic, $ledger]),
+            ]));
+        }
 
         return redirect()->route('dynamics.ledgers.show', [$dynamic, $ledger]);
     }
-
-    /**
-     * Remove the specified resource from storage.
-     */
-    public function destroy(Dynamic $dynamic, Ledger $ledger, Mutation $mutation)
-    {
-        //
-    }
 }

app/Models/Mutation.php

@@ -70,8 +70,8 @@ class Mutation extends Model
             $mutationMsg = $mutation->chat->messages()->create([
                 'user_id' => null,
                 'content' => $status === 'approved'
-                    ? "Entry was created by <user:{$user->id}>."
-                    : "Suggestion was created by <user:{$user->id}>.",
+                    ? "Entry was created by <user:{$user->uuid}>."
+                    : "Suggestion was created by <user:{$user->uuid}>.",
                 'subject_id' => $mutation->id,
                 'subject_type' => Mutation::class,
             ]);
@@ -80,14 +80,14 @@ class Mutation extends Model
             if ($status === 'approved') {
                 $dynamicMsg = $dynamic->chat->messages()->create([
                     'user_id' => null,
-                    'content' => "<user:{$user->id}> added entry \"{$mutation->description}\" for ".($mutation->amount >= 0 ? '+' : '')."{$mutation->amount} points on \"{$ledger->name}\" ledger.",
+                    'content' => "<user:{$user->uuid}> added entry \"{$mutation->description}\" for ".($mutation->amount >= 0 ? '+' : '')."{$mutation->amount} points on \"{$ledger->name}\" ledger.",
                     'subject_id' => $mutation->id,
                     'subject_type' => Mutation::class,
                 ]);
             } else {
                 $dynamicMsg = $dynamic->chat->messages()->create([
                     'user_id' => null,
-                    'content' => "<user:{$user->id}> suggested \"{$mutation->description}\" for ".($mutation->amount >= 0 ? '+' : '')."{$mutation->amount} points on \"{$ledger->name}\" ledger.",
+                    'content' => "<user:{$user->uuid}> suggested \"{$mutation->description}\" for ".($mutation->amount >= 0 ? '+' : '')."{$mutation->amount} points on \"{$ledger->name}\" ledger.",
                     'subject_id' => $mutation->id,
                     'subject_type' => Mutation::class,
                 ]);

app/Notifications/NewActivityNotification.php

@@ -2,8 +2,6 @@
 
 namespace App\Notifications;
 
-use App\Models\Chat;
-use App\Models\Message;
 use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Notification;
 use NotificationChannels\WebPush\WebPushChannel;
@@ -13,47 +11,28 @@ class NewActivityNotification extends Notification
 {
     use Queueable;
 
-    public $activity;
+    public array $activity;
 
-    /**
-     * Create a new notification instance.
-     */
-    public function __construct($activity)
+    public function __construct(array $activity)
     {
         $this->activity = $activity;
     }
 
-    /**
-     * Get the notification's delivery channels.
-     *
-     * @return array<int, string>
-     */
     public function via(object $notifiable): array
     {
-        return ['database', WebPushChannel::class];
+        return [WebPushChannel::class, 'database'];
     }
 
-    /**
-     * Get the web push representation of the notification.
-     */
     public function toWebPush(object $notifiable): WebPushMessage
     {
-
-        $result = (new WebPushMessage)
+        return (new WebPushMessage)
             ->title('New Activity')
             ->icon('/apple-touch-icon.png')
             ->body($this->activity['content'])
             ->action('View', 'view')
             ->data(['url' => $this->activity['url']]);
-
-        return $result;
     }
 
-    /**
-     * Get the array representation of the notification.
-     *
-     * @return array<string, mixed>
-     */
     public function toArray(object $notifiable): array
     {
         return [

app/Services/ActivityService.php

@@ -100,7 +100,7 @@ class ActivityService
 
         $participants = $dynamic->participants()->withPivot('display_name')->get();
         $participantsMap = $participants->reduce(function ($acc, $p) {
-            $acc[$p->id] = $p->pivot->display_name ?? $p->name;
+            $acc[$p->uuid] = $p->pivot->display_name ?? $p->name;
 
             return $acc;
         }, []);
@@ -115,7 +115,7 @@ class ActivityService
             $messageData['url'] = $this->getUrlForMessage($message);
 
             // Resolve <user:id> placeholders to actual names/display names
-            $messageData['content'] = preg_replace_callback('/<user:(\d+)>/', function ($matches) use ($participantsMap) {
+            $messageData['content'] = preg_replace_callback('/<user:([0-9a-f-]+)>/', function ($matches) use ($participantsMap) {
                 $userId = $matches[1];
 
                 return $participantsMap[$userId] ?? "User #{$userId}";