From 527244948c9ae0c0b5cf27bce3ec3e54e81e52ab Mon Sep 17 00:00:00 2001 From: isaacclad Date: Sun, 5 Jul 2026 22:06:03 +0000 Subject: [PATCH] Sync Care queue integration flag with Ladill Queue on enable. Provision alone left care_enabled false on Queue; settings re-save and service queue pages now recover when integration is out of sync. Co-authored-by: Cursor --- .../Controllers/Care/ServiceQueueController.php | 11 ++++++++++- app/Http/Controllers/Care/SettingsController.php | 2 +- app/Services/Queue/QueueClient.php | 16 ++++++++++++++-- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Care/ServiceQueueController.php b/app/Http/Controllers/Care/ServiceQueueController.php index 5ec573e..19dcb74 100644 --- a/app/Http/Controllers/Care/ServiceQueueController.php +++ b/app/Http/Controllers/Care/ServiceQueueController.php @@ -29,7 +29,16 @@ class ServiceQueueController extends Controller try { $counters = $queue->counters($owner); } catch (RequestException $e) { - return redirect()->route('care.settings')->with('error', 'Could not reach Ladill Queue. Check API keys and enable integration in Queue settings.'); + if ($queue->configured() && $e->response?->status() === 403) { + try { + $queue->syncIntegration($owner, true); + $counters = $queue->counters($owner); + } catch (RequestException) { + return redirect()->route('care.settings')->with('error', 'Ladill Queue integration is not enabled. Save settings with Queue integration checked, and enable Care in Queue settings.'); + } + } else { + return redirect()->route('care.settings')->with('error', 'Could not reach Ladill Queue. Check API keys and enable integration in Queue settings.'); + } } return view('care.service-queues.index', compact('counters', 'organization')); diff --git a/app/Http/Controllers/Care/SettingsController.php b/app/Http/Controllers/Care/SettingsController.php index 48635d9..2cb48b0 100644 --- a/app/Http/Controllers/Care/SettingsController.php +++ b/app/Http/Controllers/Care/SettingsController.php @@ -63,7 +63,7 @@ class SettingsController extends Controller $hadQueue = (bool) data_get($settings, 'queue_integration_enabled', false); $settings['queue_integration_enabled'] = $wantsQueue; - if ($wantsQueue && ! $hadQueue && $queue->configured()) { + if ($wantsQueue && $queue->configured()) { $branch = Branch::owned($owner)->where('organization_id', $organization->id)->orderBy('name')->first(); try { $queue->enable($owner, $organization->name, $branch?->name); diff --git a/app/Services/Queue/QueueClient.php b/app/Services/Queue/QueueClient.php index 84a0719..0a274bd 100644 --- a/app/Services/Queue/QueueClient.php +++ b/app/Services/Queue/QueueClient.php @@ -46,11 +46,23 @@ class QueueClient */ public function enable(string $owner, string $organizationName, ?string $branchName = null): array { - $response = $this->http($owner)->post($this->base().'/integrations/provision', array_filter([ + $this->http($owner)->post($this->base().'/integrations/provision', array_filter([ 'organization_name' => $organizationName, 'branch_name' => $branchName, 'industry' => 'healthcare', - ])); + ]))->throw(); + + return $this->syncIntegration($owner, true); + } + + /** + * @return array + */ + public function syncIntegration(string $owner, bool $enabled = true): array + { + $response = $this->http($owner)->patch($this->base().'/integrations', [ + 'care_enabled' => $enabled, + ]); $response->throw(); return (array) ($response->json('data') ?? []);