Hard-delete Care remote Queue adapter (Phase 5).
Deploy Ladill Care / deploy (push) Failing after 1m13s
Deploy Ladill Care / deploy (push) Failing after 1m13s
Care Queue Engine is the only path; remove QueueClient, driver config, and remote HTTP tests. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -11,19 +11,15 @@ use App\Models\Patient;
|
||||
use App\Models\Practitioner;
|
||||
use App\Models\Prescription;
|
||||
use App\Services\Care\Workflow\WorkflowQueueGate;
|
||||
use App\Services\Queue\QueueClient;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Http\Client\RequestException;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
/**
|
||||
* Bridges Care workflow entities to service-queue tickets (native Care Queue
|
||||
* Engine by default; optional legacy Ladill Queue HTTP when driver=remote).
|
||||
* Bridges Care workflow entities to Care Queue Engine tickets.
|
||||
*/
|
||||
class CareQueueBridge
|
||||
{
|
||||
public function __construct(
|
||||
protected QueueClient $queue,
|
||||
protected CareQueueEngine $engine,
|
||||
protected CareQueueProvisioner $provisioner,
|
||||
protected PlanService $plans,
|
||||
@@ -31,21 +27,10 @@ class CareQueueBridge
|
||||
protected WorkflowQueueGate $workflowGate,
|
||||
) {}
|
||||
|
||||
public function usesNative(): bool
|
||||
{
|
||||
return config('care.queue.driver', 'native') === 'native';
|
||||
}
|
||||
|
||||
public function isEnabled(Organization $organization): bool
|
||||
{
|
||||
$enabled = $this->plans->canUseQueueIntegration($organization)
|
||||
return $this->plans->canUseQueueIntegration($organization)
|
||||
&& (bool) data_get($organization->settings, 'queue_integration_enabled');
|
||||
|
||||
if (! $enabled) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return $this->usesNative() || $this->queue->configured();
|
||||
}
|
||||
|
||||
public function contextForAppointment(Organization $organization, Appointment $appointment): string
|
||||
@@ -380,25 +365,11 @@ class CareQueueBridge
|
||||
protected function attemptCallNext(Organization $organization, array $resources): ?array
|
||||
{
|
||||
try {
|
||||
if ($this->usesNative()) {
|
||||
return $this->engine->callNext(
|
||||
$organization,
|
||||
(string) $resources['queue_uuid'],
|
||||
(string) $resources['counter_uuid'],
|
||||
);
|
||||
}
|
||||
|
||||
return $this->queue->callNext(
|
||||
(string) $organization->owner_ref,
|
||||
return $this->engine->callNext(
|
||||
$organization,
|
||||
(string) $resources['queue_uuid'],
|
||||
(string) $resources['counter_uuid'],
|
||||
);
|
||||
} catch (RequestException $e) {
|
||||
Log::warning('care.queue_call_next_failed', [
|
||||
'message' => $e->getMessage(),
|
||||
]);
|
||||
|
||||
return null;
|
||||
} catch (\Throwable $e) {
|
||||
Log::warning('care.queue_call_next_failed', [
|
||||
'message' => $e->getMessage(),
|
||||
@@ -583,7 +554,6 @@ class CareQueueBridge
|
||||
return null;
|
||||
}
|
||||
|
||||
$owner = (string) $organization->owner_ref;
|
||||
$payload = [
|
||||
'service_queue_id' => $resources['queue_uuid'],
|
||||
'customer_name' => $patient?->fullName(),
|
||||
@@ -597,11 +567,7 @@ class CareQueueBridge
|
||||
}
|
||||
|
||||
try {
|
||||
if ($this->usesNative()) {
|
||||
return $this->engine->issueTicket($organization, $payload);
|
||||
}
|
||||
|
||||
return $this->queue->issueTicket($owner, $payload);
|
||||
return $this->engine->issueTicket($organization, $payload);
|
||||
} catch (\Throwable $e) {
|
||||
Log::warning('care.queue_issue_failed', [
|
||||
'context' => $context,
|
||||
@@ -650,15 +616,9 @@ class CareQueueBridge
|
||||
}
|
||||
|
||||
try {
|
||||
if ($this->usesNative()) {
|
||||
$ticket = $this->engine->ticketAction($organization, $uuid, [
|
||||
'action' => $action,
|
||||
]);
|
||||
} else {
|
||||
$ticket = $this->queue->ticketAction((string) $organization->owner_ref, $uuid, [
|
||||
'action' => $action,
|
||||
]);
|
||||
}
|
||||
$ticket = $this->engine->ticketAction($organization, $uuid, [
|
||||
'action' => $action,
|
||||
]);
|
||||
$this->applyTicket($entity, $ticket);
|
||||
|
||||
return $ticket;
|
||||
|
||||
Reference in New Issue
Block a user