From 10be45172efb42894982fed0b34ac5cc1b729194 Mon Sep 17 00:00:00 2001 From: Mark Gregory Date: Mon, 15 Jun 2026 10:37:44 +0100 Subject: [PATCH] added countries support expanded for ISO 3166 standard merged in new support --- .../Countries/Providers/RouteServiceProvider.php | 2 +- Modules/Helpdesk/Countries/Routes/api.php | 9 +++++++++ .../Helpdesk/Tests/Concerns/BuildsHelpdeskFixtures.php | 8 ++++---- 3 files changed, 14 insertions(+), 5 deletions(-) rename Modules/{ => Helpdesk}/Countries/Providers/RouteServiceProvider.php (92%) create mode 100644 Modules/Helpdesk/Countries/Routes/api.php diff --git a/Modules/Countries/Providers/RouteServiceProvider.php b/Modules/Helpdesk/Countries/Providers/RouteServiceProvider.php similarity index 92% rename from Modules/Countries/Providers/RouteServiceProvider.php rename to Modules/Helpdesk/Countries/Providers/RouteServiceProvider.php index 7a3188a3..d7430090 100644 --- a/Modules/Countries/Providers/RouteServiceProvider.php +++ b/Modules/Helpdesk/Countries/Providers/RouteServiceProvider.php @@ -36,7 +36,7 @@ class RouteServiceProvider extends ServiceProvider $path = dirname(__DIR__).'/Routes/api.php'; if (is_file($path)) { - Route::middleware(['api'])->group($path); + Route::middleware(['api'])->prefix('api/v1')->group($path); } } } diff --git a/Modules/Helpdesk/Countries/Routes/api.php b/Modules/Helpdesk/Countries/Routes/api.php new file mode 100644 index 00000000..a18b2e84 --- /dev/null +++ b/Modules/Helpdesk/Countries/Routes/api.php @@ -0,0 +1,9 @@ +name('api.countries.index'); + Route::get('/countries/{country:alpha2}', [CountryLookupController::class, 'show'])->name('api.countries.show'); +} diff --git a/Modules/Helpdesk/Tests/Concerns/BuildsHelpdeskFixtures.php b/Modules/Helpdesk/Tests/Concerns/BuildsHelpdeskFixtures.php index d7de71f7..84648846 100644 --- a/Modules/Helpdesk/Tests/Concerns/BuildsHelpdeskFixtures.php +++ b/Modules/Helpdesk/Tests/Concerns/BuildsHelpdeskFixtures.php @@ -46,7 +46,7 @@ trait BuildsHelpdeskFixtures return $user; } - protected function status(array $attributes = []): Status + protected function ticketStatus(array $attributes = []): Status { return Status::query()->create(array_merge([ 'name' => 'Open', @@ -59,7 +59,7 @@ trait BuildsHelpdeskFixtures protected function closedStatus(array $attributes = []): Status { - return $this->status(array_merge([ + return $this->ticketStatus(array_merge([ 'name' => 'Closed', 'slug' => fake()->unique()->slug(2), 'color' => 'emerald', @@ -136,7 +136,7 @@ trait BuildsHelpdeskFixtures 'reference' => 'HD-'.now()->format('Y').'-'.str_pad((string) random_int(1, 99999), 5, '0', STR_PAD_LEFT), 'user_id' => $owner->id, 'agent_id' => $agent?->id, - 'status_id' => $this->status()->id, + 'status_id' => $this->ticketStatus()->id, 'priority_id' => $this->priority()->id, 'category_id' => null, 'project_id' => null, @@ -149,7 +149,7 @@ trait BuildsHelpdeskFixtures protected function seedLookupData(): array { - $open = $this->status(['name' => 'Open', 'slug' => 'open']); + $open = $this->ticketStatus(['name' => 'Open', 'slug' => 'open']); $closed = $this->closedStatus(['name' => 'Closed', 'slug' => 'closed']); $normal = $this->priority(['name' => 'Normal', 'slug' => 'normal']); $high = $this->priority(['name' => 'High', 'slug' => 'high', 'color' => 'red', 'sort_order' => 1]);