Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 12 additions & 63 deletions app/Http/Controllers/CityController.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,77 +3,26 @@
namespace App\Http\Controllers;

use App\City;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;

class CityController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
* List cities for a country (profile city dropdown).
*/
public function index()
public function index(Request $request): JsonResponse
{
//
}

/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
//
}

/**
* Store a newly created resource in storage.
*
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
//
}

/**
* Display the specified resource.
*
* @return \Illuminate\Http\Response
*/
public function show(City $city)
{
//
}

/**
* Show the form for editing the specified resource.
*
* @return \Illuminate\Http\Response
*/
public function edit(City $city)
{
//
}
$validated = $request->validate([
'country_iso' => 'required|string|size:2',
]);

/**
* Update the specified resource in storage.
*
* @return \Illuminate\Http\Response
*/
public function update(Request $request, City $city)
{
//
}
$cities = City::query()
->where('country_iso', strtoupper($validated['country_iso']))
->select(['id', 'city', 'country_iso'])
->orderBy('city')
->get();

/**
* Remove the specified resource from storage.
*
* @return \Illuminate\Http\Response
*/
public function destroy(City $city)
{
//
return response()->json($cities);
}
}
17 changes: 10 additions & 7 deletions app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,18 @@ function ($view) {

$activeCountries = Country::query()->orderBy('name')->get();

// Fix: filter cities to supported countries only (was using all 252 countries → 26k rows).
// Using $supportedCountries reduces the result set from ~26,500 to ~5,500 rows,
// cutting profile page load time by ~70%.
$cities = City::query()
->whereIn('country_iso', $supportedCountries)
// Preload cities for the signed-in user's country only. Other countries are
// loaded on demand via /api/cities (cityFilter JS). Do not reuse
// $supportedCountries here — that list is for community hub copy and omits
// countries like Albania that still need a working city dropdown.
$countryIso = optional(auth()->user())->country_iso;
$cities = $countryIso
? City::query()
->where('country_iso', $countryIso)
->select(['id', 'city', 'country_iso'])
->orderBy('country_iso')
->orderBy('city')
->get();
->get()
: collect();

$view->with('cities', $cities);
$view->with('active_countries', $activeCountries);
Expand Down
94 changes: 52 additions & 42 deletions public/js/ext/functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -2154,59 +2154,69 @@ var SEMICOLON = SEMICOLON || {};
var $country = $('#id_country');
var $city = $('#id_city');
if (!$country.length || !$city.length) return;

if (!$city.data('originalHtml')) {
$city.data('originalHtml', $city.html());

var citiesUrl = $city.data('cities-url') || '/api/cities';
var cache = {};
var requestSeq = 0;

function emptyOption() {
return $('<option></option>').attr('value', '');
}

function getAllOptions() {
var html = $city.data('originalHtml') || '';
var $tmp = $('<select>' + html + '</select>');
return $tmp.find('option');

function fillCities(cities, prev) {
$city.empty().append(emptyOption());
$.each(cities, function (_, row) {
$city.append(
$('<option></option>')
.attr('value', row.id)
.attr('data-country', row.country_iso || '')
.text(row.city)
);
});
if (prev && $city.find('option[value="' + prev + '"]').length) {
$city.val(prev);
} else {
$city.val('');
}
}

function applyCityFilter() {
var iso = ($country.val() || '').toUpperCase();
var prev = $city.val();
var $all = getAllOptions();

if (!iso) {
$city.html($all.clone());
if ($city.find('option[value="'+ prev +'"]').length) $city.val(prev);
$city.empty().append(emptyOption());
return;
}

var $empty = $all.first().clone();
var $filtered = $all.filter(function (i, opt) {
if (i === 0) return false;
var dc = (opt.getAttribute('data-country') || '').toUpperCase();
return dc === iso;
});

$city.empty().append($empty).append($filtered.clone());

if ($city.find('option[value="'+ prev +'"]').length) {
$city.val(prev);
} else {
$city.val(''); // reset

if (cache[iso]) {
fillCities(cache[iso], prev);
return;
}

var seq = ++requestSeq;
$.getJSON(citiesUrl, { country_iso: iso })
.done(function (cities) {
if (seq !== requestSeq) return;
cache[iso] = cities || [];
fillCities(cache[iso], prev);
})
.fail(function () {
if (seq !== requestSeq) return;
// Keep any server-rendered options for the current country.
var $kept = $city.find('option').filter(function () {
var dc = ($(this).attr('data-country') || '').toUpperCase();
return !this.value || dc === iso;
});
$city.empty().append(emptyOption()).append($kept.filter('[value!=""]'));
if (prev && $city.find('option[value="' + prev + '"]').length) {
$city.val(prev);
} else {
$city.val('');
}
});
}

(function autoSelectCountryFromCity() {
if ($country.val()) return;
var $sel = getAllOptions().filter(function(i, opt){
return opt.value && opt.selected;
}).first();
if ($sel.length) {
var dc = ($sel.attr('data-country') || '').toUpperCase();
if (dc) {
var $opt = $country.find('option[value="'+ dc +'"]');
if ($opt.length) $country.val(dc);
}
}
})();

// bind & run

$country.off('change.cityfilter').on('change.cityfilter', applyCityFilter);
applyCityFilter();
},
Expand Down
1 change: 1 addition & 0 deletions resources/views/profile.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ class="border-2 border-solid border-dark-blue-200 w-full rounded-full h-12 px-4
@endif
<select id="id_city"
name="city_id"
data-cities-url="{{ url('/api/cities') }}"
class="border-2 border-solid border-dark-blue-200 w-full rounded-full h-12 px-4 appearance-none text-slate-600 mb-3">
<option value=""></option>
@foreach ($cities as $city)
Expand Down
2 changes: 2 additions & 0 deletions routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
use App\Http\Controllers\BulkUserChangesController;
use App\Http\Controllers\ResourcesImportController;
use App\Http\Controllers\CertificateController;
use App\Http\Controllers\CityController;
use App\Http\Controllers\Codeweek4AllController;
use App\Http\Controllers\CodingAtHomeController;
use App\Http\Controllers\ContactFormController;
Expand Down Expand Up @@ -566,6 +567,7 @@
[Api\UserAvatarController::class, 'delete']
)->middleware('auth');

Route::get('api/cities', [CityController::class, 'index'])->name('api.cities');
Route::get('api/event/list', [Api\EventsController::class, 'list'])->name('event_list');
Route::get('api/event/detail', [Api\EventsController::class, 'detail'])->name(
'event_list'
Expand Down
73 changes: 73 additions & 0 deletions tests/Feature/CitiesApiTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
<?php

namespace Tests\Feature;

use App\City;
use App\Country;
use App\User;
use Illuminate\Foundation\Testing\DatabaseMigrations;
use PHPUnit\Framework\Attributes\Test;
use Tests\TestCase;

final class CitiesApiTest extends TestCase
{
use DatabaseMigrations;

#[Test]
public function it_lists_cities_for_a_country_including_albania(): void
{
Country::factory()->create(['iso' => 'AL', 'name' => 'Albania']);
Country::factory()->create(['iso' => 'BE', 'name' => 'Belgium']);

$tirana = City::factory()->create([
'city' => 'Tirana',
'country_iso' => 'AL',
]);
City::factory()->create([
'city' => 'Brussels',
'country_iso' => 'BE',
]);

$this->getJson('/api/cities?country_iso=AL')
->assertOk()
->assertJsonCount(1)
->assertJsonFragment([
'id' => $tirana->id,
'city' => 'Tirana',
'country_iso' => 'AL',
]);
}

#[Test]
public function profile_preloads_cities_for_the_users_country_even_outside_hub_list(): void
{
$this->seed('RolesAndPermissionsSeeder');

Country::factory()->create(['iso' => 'AL', 'name' => 'Albania']);
$tirana = City::factory()->create([
'city' => 'Tirana',
'country_iso' => 'AL',
]);

$user = User::factory()->create([
'country_iso' => 'AL',
'city_id' => null,
'email_verified_at' => now(),
]);

$this->signIn($user);

$this->get('/profile')
->assertOk()
->assertSee('Tirana', false)
->assertSee((string) $tirana->id, false)
->assertSee('/api/cities', false);
}

#[Test]
public function cities_api_requires_country_iso(): void
{
$this->getJson('/api/cities')
->assertStatus(422);
}
}
Loading