From 29bf896f211b9a2f923b6726b315d66079519936 Mon Sep 17 00:00:00 2001
From: isaacclad <sense.corporate@gmail.com>
Date: Sun, 5 Jul 2026 22:31:54 +0000
Subject: [PATCH] Fix counter console 404 when routes are cached.

Route model binding fell back to numeric id after route:cache; models now
resolve by uuid so Care and Frontdesk counter consoles work in production.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 app/Models/Concerns/UsesUuidRouteKey.php | 11 +++++
 app/Models/Counter.php                   |  3 +-
 app/Models/Device.php                    |  3 +-
 app/Models/DisplayScreen.php             |  3 +-
 app/Models/QueueAppointment.php          |  3 +-
 app/Models/ServiceQueue.php              |  3 +-
 app/Models/Ticket.php                    |  3 +-
 app/Models/Workflow.php                  |  3 +-
 tests/Feature/CareIntegrationTest.php    | 56 ++++++++++++++++++++++--
 9 files changed, 77 insertions(+), 11 deletions(-)
 create mode 100644 app/Models/Concerns/UsesUuidRouteKey.php

diff --git a/app/Models/Concerns/UsesUuidRouteKey.php b/app/Models/Concerns/UsesUuidRouteKey.php
new file mode 100644
index 0000000..02af6c6
--- /dev/null
+++ b/app/Models/Concerns/UsesUuidRouteKey.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models\Concerns;
+
+trait UsesUuidRouteKey
+{
+    public function getRouteKeyName(): string
+    {
+        return 'uuid';
+    }
+}
diff --git a/app/Models/Counter.php b/app/Models/Counter.php
index f2843ee..605b95d 100644
--- a/app/Models/Counter.php
+++ b/app/Models/Counter.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Models\Concerns\BelongsToOwner;
+use App\Models\Concerns\UsesUuidRouteKey;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
@@ -12,7 +13,7 @@ use Illuminate\Support\Str;
 
 class Counter extends Model
 {
-    use BelongsToOwner, SoftDeletes;
+    use BelongsToOwner, SoftDeletes, UsesUuidRouteKey;
 
     protected $table = 'queue_counters';
 
diff --git a/app/Models/Device.php b/app/Models/Device.php
index 1398b98..393b3d8 100644
--- a/app/Models/Device.php
+++ b/app/Models/Device.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Models\Concerns\BelongsToOwner;
+use App\Models\Concerns\UsesUuidRouteKey;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -10,7 +11,7 @@ use Illuminate\Support\Str;
 
 class Device extends Model
 {
-    use BelongsToOwner, SoftDeletes;
+    use BelongsToOwner, SoftDeletes, UsesUuidRouteKey;
 
     protected $table = 'queue_devices';
 
diff --git a/app/Models/DisplayScreen.php b/app/Models/DisplayScreen.php
index 17403aa..cab0dfc 100644
--- a/app/Models/DisplayScreen.php
+++ b/app/Models/DisplayScreen.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Models\Concerns\BelongsToOwner;
+use App\Models\Concerns\UsesUuidRouteKey;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -10,7 +11,7 @@ use Illuminate\Support\Str;
 
 class DisplayScreen extends Model
 {
-    use BelongsToOwner, SoftDeletes;
+    use BelongsToOwner, SoftDeletes, UsesUuidRouteKey;
 
     protected $table = 'queue_display_screens';
 
diff --git a/app/Models/QueueAppointment.php b/app/Models/QueueAppointment.php
index eb5475b..bbb28c5 100644
--- a/app/Models/QueueAppointment.php
+++ b/app/Models/QueueAppointment.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Models\Concerns\BelongsToOwner;
+use App\Models\Concerns\UsesUuidRouteKey;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -10,7 +11,7 @@ use Illuminate\Support\Str;
 
 class QueueAppointment extends Model
 {
-    use BelongsToOwner, SoftDeletes;
+    use BelongsToOwner, SoftDeletes, UsesUuidRouteKey;
 
     protected $table = 'queue_appointments';
 
diff --git a/app/Models/ServiceQueue.php b/app/Models/ServiceQueue.php
index bd08760..c83e8d4 100644
--- a/app/Models/ServiceQueue.php
+++ b/app/Models/ServiceQueue.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Models\Concerns\BelongsToOwner;
+use App\Models\Concerns\UsesUuidRouteKey;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
@@ -12,7 +13,7 @@ use Illuminate\Support\Str;
 
 class ServiceQueue extends Model
 {
-    use BelongsToOwner, SoftDeletes;
+    use BelongsToOwner, SoftDeletes, UsesUuidRouteKey;
 
     protected $table = 'queue_service_queues';
 
diff --git a/app/Models/Ticket.php b/app/Models/Ticket.php
index 187cfe5..878b9ca 100644
--- a/app/Models/Ticket.php
+++ b/app/Models/Ticket.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Models\Concerns\BelongsToOwner;
+use App\Models\Concerns\UsesUuidRouteKey;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -11,7 +12,7 @@ use Illuminate\Support\Str;
 
 class Ticket extends Model
 {
-    use BelongsToOwner, SoftDeletes;
+    use BelongsToOwner, SoftDeletes, UsesUuidRouteKey;
 
     protected $table = 'queue_tickets';
 
diff --git a/app/Models/Workflow.php b/app/Models/Workflow.php
index 09f2128..fe5eb55 100644
--- a/app/Models/Workflow.php
+++ b/app/Models/Workflow.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Models\Concerns\BelongsToOwner;
+use App\Models\Concerns\UsesUuidRouteKey;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -11,7 +12,7 @@ use Illuminate\Support\Str;
 
 class Workflow extends Model
 {
-    use BelongsToOwner, SoftDeletes;
+    use BelongsToOwner, SoftDeletes, UsesUuidRouteKey;
 
     protected $table = 'queue_workflows';
 
diff --git a/tests/Feature/CareIntegrationTest.php b/tests/Feature/CareIntegrationTest.php
index f380178..4771ef4 100644
--- a/tests/Feature/CareIntegrationTest.php
+++ b/tests/Feature/CareIntegrationTest.php
@@ -2,7 +2,10 @@
 
 namespace Tests\Feature;
 
+use App\Models\Branch;
+use App\Models\Counter;
 use App\Models\Organization;
+use App\Models\ServiceQueue;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
@@ -20,6 +23,17 @@ class CareIntegrationTest extends TestCase
         ];
     }
 
+    protected function provisionCareOrg(string $owner = 'care-owner-uuid'): Organization
+    {
+        $this->postJson('/api/v1/integrations/provision', [
+            'owner' => $owner,
+            'organization_name' => 'Care Clinic',
+            'branch_name' => 'Main',
+        ], $this->careHeaders($owner))->assertSuccessful();
+
+        return Organization::owned($owner)->firstOrFail();
+    }
+
     public function test_provision_enables_care_integration(): void
     {
         $owner = 'care-owner-uuid';
@@ -41,12 +55,46 @@ class CareIntegrationTest extends TestCase
         $owner = 'care-owner-uuid';
         $headers = $this->careHeaders($owner);
 
-        $this->postJson('/api/v1/integrations/provision', [
-            'owner' => $owner,
-            'organization_name' => 'Care Clinic',
-        ], $headers)->assertSuccessful();
+        $this->provisionCareOrg($owner);
 
         $this->getJson('/api/v1/counters?owner='.$owner, $headers)
             ->assertOk();
     }
+
+    public function test_counter_console_resolves_by_uuid(): void
+    {
+        $owner = 'care-owner-uuid';
+        $headers = $this->careHeaders($owner);
+        $organization = $this->provisionCareOrg($owner);
+        $branch = Branch::owned($owner)->where('organization_id', $organization->id)->firstOrFail();
+        $queue = ServiceQueue::create([
+            'owner_ref' => $owner,
+            'organization_id' => $organization->id,
+            'branch_id' => $branch->id,
+            'name' => 'Morning Shift',
+            'prefix' => 'A',
+            'strategy' => 'fifo',
+            'is_active' => true,
+        ]);
+        $counter = Counter::create([
+            'owner_ref' => $owner,
+            'organization_id' => $organization->id,
+            'branch_id' => $branch->id,
+            'name' => 'Counter 1',
+            'code' => 'C001',
+            'status' => 'available',
+            'is_active' => true,
+        ]);
+        $counter->serviceQueues()->sync([$queue->id]);
+
+        $this->getJson('/api/v1/counters/'.$counter->uuid.'/console?owner='.$owner, $headers)
+            ->assertOk()
+            ->assertJsonPath('data.counter.uuid', $counter->uuid);
+    }
+
+    public function test_queue_models_use_uuid_route_key(): void
+    {
+        $this->assertSame('uuid', (new Counter)->getRouteKeyName());
+        $this->assertSame('uuid', (new ServiceQueue)->getRouteKeyName());
+    }
 }