- {items.map(item => {
- const isChecked = selected.includes(item);
- return (
-
- );
- })}
+
+ {items.length > 5 && (
+
+ setSearch(e.target.value)}
+ placeholder={placeholder}
+ className="w-full px-3 py-1.5 bg-slate-50/50 border border-slate-200 rounded-lg text-xs font-semibold text-slate-700 focus:ring-2 focus:ring-blue-100 focus:border-[#185FA5] outline-none transition-all placeholder:text-slate-400 placeholder:font-normal"
+ />
+ {search && (
+
+ )}
+
+ )}
+
+ {filteredItems.map(item => {
+ const isChecked = selected.includes(item);
+ return (
+
+ );
+ })}
+ {filteredItems.length === 0 && (
+
No matches found
+ )}
+
);
}
diff --git a/routes/api.php b/routes/api.php
index 9ffce2c..e587d9c 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -28,6 +28,9 @@
Route::get('/workers/config', [WorkerAuthController::class, 'config']);
Route::get('/workers/skills', [WorkerAuthController::class, 'skills']);
Route::get('/nationalities', [WorkerAuthController::class, 'nationalities']);
+Route::get('/preferred-locations', [WorkerAuthController::class, 'preferredLocations']);
+Route::get('/preferred-locations/areas', [WorkerAuthController::class, 'preferredLocationAreas']);
+Route::get('/preferred-locations/{location}/areas', [WorkerAuthController::class, 'preferredLocationAreas']);
Route::post('/workers/send-otp', [WorkerAuthController::class, 'sendOtp']);
Route::post('/workers/verify-otp', [WorkerAuthController::class, 'verifyOtp']);
Route::post('/workers/setup-profile', [WorkerAuthController::class, 'setupProfile']);
diff --git a/tests/Feature/EmployerMessageApiTest.php b/tests/Feature/EmployerMessageApiTest.php
index b78b522..4fd84e0 100644
--- a/tests/Feature/EmployerMessageApiTest.php
+++ b/tests/Feature/EmployerMessageApiTest.php
@@ -298,4 +298,40 @@ public function test_unauthenticated_requests_are_blocked()
$response = $this->getJson('/api/employers/conversations');
$response->assertStatus(401);
}
+
+ /**
+ * Test employer message triggers push notification.
+ */
+ public function test_employer_message_triggers_push_notification()
+ {
+ \Illuminate\Support\Facades\Http::fake([
+ 'https://oauth2.googleapis.com/token' => \Illuminate\Support\Facades\Http::response(['access_token' => 'mocked-fcm-token'], 200),
+ 'https://fcm.googleapis.com/*' => \Illuminate\Support\Facades\Http::response(['name' => 'projects/migrant-fe5a7/messages/mock-id'], 200),
+ ]);
+
+ // Set fcm_token on worker
+ $this->worker->update(['fcm_token' => 'test-device-fcm-token-xyz']);
+
+ // Create conversation
+ $conversation = Conversation::create([
+ 'employer_id' => $this->employer->id,
+ 'worker_id' => $this->worker->id,
+ ]);
+
+ // Reply request
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $this->token,
+ ])->postJson('/api/employers/conversations/' . $conversation->id . '/messages', [
+ 'text' => 'Testing push notifications!'
+ ]);
+
+ $response->assertStatus(201);
+
+ // Assert Http call was made to FCM endpoint
+ \Illuminate\Support\Facades\Http::assertSent(function ($request) {
+ return str_contains($request->url(), 'fcm.googleapis.com') &&
+ $request['message']['token'] === 'test-device-fcm-token-xyz' &&
+ $request['message']['notification']['body'] === 'Testing push notifications!';
+ });
+ }
}
diff --git a/tests/Feature/EmployerWorkerFilterApiTest.php b/tests/Feature/EmployerWorkerFilterApiTest.php
index f0616e1..150a3d4 100644
--- a/tests/Feature/EmployerWorkerFilterApiTest.php
+++ b/tests/Feature/EmployerWorkerFilterApiTest.php
@@ -40,7 +40,7 @@ protected function setUp(): void
]);
// Seed 3 workers with specific filter attributes
- // Worker 1: Dubai, full-time, live-in, India, in_country=true, Residence Visa
+ // Worker 1: Dubai, full-time, live-in, India, in_country=true, Residence Visa, female
$w1 = Worker::create([
'name' => 'Worker India In Dubai',
'email' => 'worker1@example.com',
@@ -56,6 +56,7 @@ protected function setUp(): void
'in_country' => true,
'visa_status' => 'Residence Visa',
'age' => 25,
+ 'gender' => 'female',
'salary' => 1500,
'experience' => '3 Years',
'religion' => 'Christian',
@@ -70,7 +71,7 @@ protected function setUp(): void
'file_path' => 'passports/test1.jpg',
]);
- // Worker 2: Abu Dhabi, part-time, live-out, Philippines, in_country=true, Tourist Visa
+ // Worker 2: Abu Dhabi, part-time, live-out, Philippines, in_country=true, Tourist Visa, female
$w2 = Worker::create([
'name' => 'Worker Philippines In Abu Dhabi',
'email' => 'worker2@example.com',
@@ -86,6 +87,7 @@ protected function setUp(): void
'in_country' => true,
'visa_status' => 'Tourist Visa',
'age' => 28,
+ 'gender' => 'female',
'salary' => 1800,
'experience' => '2 Years',
'religion' => 'Christian',
@@ -100,7 +102,7 @@ protected function setUp(): void
'file_path' => 'passports/test2.jpg',
]);
- // Worker 3: Dubai, full-time, live-out, Kenya, in_country=false, Cancelled Visa
+ // Worker 3: Dubai, full-time, live-out, Kenya, in_country=false, Cancelled Visa, male
$w3 = Worker::create([
'name' => 'Worker Kenya Out Country',
'email' => 'worker3@example.com',
@@ -116,6 +118,7 @@ protected function setUp(): void
'in_country' => false,
'visa_status' => 'Cancelled Visa',
'age' => 30,
+ 'gender' => 'male',
'salary' => 1200,
'experience' => 'None',
'religion' => 'Christian',
@@ -314,5 +317,35 @@ public function test_get_candidates_filters()
$candidates = $response->json('data.candidates');
$this->assertCount(1, $candidates);
$this->assertEquals('Worker Philippines In Abu Dhabi', $candidates[0]['name']);
+
+ // Filter candidates by gender
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $this->token,
+ ])->getJson('/api/employers/candidates?gender=male');
+
+ $response->assertStatus(200);
+ $candidates = $response->json('data.candidates');
+ $this->assertCount(1, $candidates);
+ $this->assertEquals('Worker Kenya Out Country', $candidates[0]['name']);
+ }
+
+ public function test_get_workers_gender_filter()
+ {
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $this->token,
+ ])->getJson('/api/employers/workers?gender=male');
+
+ $response->assertStatus(200);
+ $workers = $response->json('data.workers');
+ $this->assertCount(1, $workers);
+ $this->assertEquals('Worker Kenya Out Country', $workers[0]['name']);
+
+ $response2 = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $this->token,
+ ])->getJson('/api/employers/workers?gender=female');
+
+ $response2->assertStatus(200);
+ $workers2 = $response2->json('data.workers');
+ $this->assertCount(2, $workers2);
}
}
diff --git a/tests/Feature/EmployerWorkerWebFilterTest.php b/tests/Feature/EmployerWorkerWebFilterTest.php
index 1132313..4821330 100644
--- a/tests/Feature/EmployerWorkerWebFilterTest.php
+++ b/tests/Feature/EmployerWorkerWebFilterTest.php
@@ -54,6 +54,7 @@ protected function setUp(): void
'language' => 'EN',
'availability' => 'Immediate',
'bio' => 'Experienced helper',
+ 'gender' => 'female',
]);
WorkerDocument::create([
'worker_id' => $w1->id,
@@ -83,6 +84,7 @@ protected function setUp(): void
'language' => 'TL',
'availability' => 'Immediate',
'bio' => 'Ready to work',
+ 'gender' => 'male',
]);
WorkerDocument::create([
'worker_id' => $w2->id,
@@ -205,4 +207,32 @@ public function test_employer_can_view_candidates_index_and_apply_filters()
$response2->assertStatus(200);
}
+
+ /**
+ * Test web workers index multiple nationality filtering.
+ */
+ public function test_employer_workers_web_multiple_nationality_filtering()
+ {
+ $response = $this->actingAs($this->employer)
+ ->withSession(['user' => $this->employer])
+ ->get(route('employer.workers', ['nationality' => 'India,Philippines']));
+
+ $response->assertStatus(200);
+ $response->assertSee('Worker India Dubai');
+ $response->assertSee('Worker Philippines Abu Dhabi');
+ }
+
+ /**
+ * Test web workers index gender filtering.
+ */
+ public function test_employer_workers_web_gender_filtering()
+ {
+ $response = $this->actingAs($this->employer)
+ ->withSession(['user' => $this->employer])
+ ->get(route('employer.workers', ['gender' => 'female']));
+
+ $response->assertStatus(200);
+ $response->assertSee('Worker India Dubai');
+ $response->assertDontSee('Worker Philippines Abu Dhabi');
+ }
}
diff --git a/tests/Feature/SponsorAuthApiTest.php b/tests/Feature/SponsorAuthApiTest.php
index 03e69cf..cd70b87 100644
--- a/tests/Feature/SponsorAuthApiTest.php
+++ b/tests/Feature/SponsorAuthApiTest.php
@@ -20,15 +20,18 @@ class SponsorAuthApiTest extends TestCase
public function test_sponsor_can_register_with_license()
{
$licenseFile = UploadedFile::fake()->create('license.pdf', 500, 'application/pdf');
+ $emiratesIdFile = UploadedFile::fake()->create('emirates_id.pdf', 500, 'application/pdf');
$response = $this->postJson('/api/sponsors/register', [
'full_name' => 'Test Sponsor Organization',
'mobile' => '+971509990001',
'password' => 'securepassword',
'license_file' => $licenseFile,
+ 'emirates_id_file' => $emiratesIdFile,
'organization_name' => 'Charity Co',
'nationality' => 'Emirati',
'city' => 'Abu Dhabi',
+ 'license_expiry' => '2028-06-12',
]);
$response->assertStatus(201)
@@ -44,6 +47,8 @@ public function test_sponsor_can_register_with_license()
'nationality',
'city',
'license_file',
+ 'emirates_id_file',
+ 'license_expiry',
],
'token',
]
@@ -52,7 +57,11 @@ public function test_sponsor_can_register_with_license()
$this->assertDatabaseHas('sponsors', [
'mobile' => '+971509990001',
'full_name' => 'Test Sponsor Organization',
+ 'license_expiry' => '2028-06-12 00:00:00',
]);
+
+ $sponsor = Sponsor::where('mobile', '+971509990001')->first();
+ $this->assertNotNull($sponsor->emirates_id_file);
}
/**
@@ -325,6 +334,7 @@ public function test_sponsor_dashboard_returns_stats()
'password' => Hash::make('password123'),
'api_token' => 'sponsor_token_xyz',
'status' => 'active',
+ 'license_expiry' => now()->addYear()->toDateString(),
]);
// Create some employers (Users with role = employer)
@@ -391,6 +401,10 @@ public function test_sponsor_dashboard_returns_stats()
->assertJson([
'success' => true,
'data' => [
+ 'sponsor' => [
+ 'license_expiry' => now()->addYear()->toDateString(),
+ 'validity' => 'Valid',
+ ],
'employer_stats' => [
'total' => 2,
'active' => 1,
@@ -401,5 +415,20 @@ public function test_sponsor_dashboard_returns_stats()
],
],
]);
+
+ $profileResponse = $this->withHeaders([
+ 'Authorization' => 'Bearer sponsor_token_xyz',
+ ])->getJson('/api/sponsors/profile');
+
+ $profileResponse->assertStatus(200)
+ ->assertJson([
+ 'success' => true,
+ 'data' => [
+ 'sponsor' => [
+ 'license_expiry' => now()->addYear()->toDateString(),
+ 'validity' => 'Valid',
+ ]
+ ]
+ ]);
}
}
diff --git a/tests/Feature/SponsorAuthWebTest.php b/tests/Feature/SponsorAuthWebTest.php
new file mode 100644
index 0000000..7bf6181
--- /dev/null
+++ b/tests/Feature/SponsorAuthWebTest.php
@@ -0,0 +1,89 @@
+create('emirates_id.pdf', 500, 'application/pdf');
+
+ // Step 1: Registration Form Submission
+ $responseStep1 = $this->post('/employer/register', [
+ 'name' => 'Abdullah Ahmed',
+ 'email' => 'abdullah@example.com',
+ 'phone' => '501234567',
+ 'emirates_id_file' => $emiratesIdFile,
+ ]);
+
+ $responseStep1->assertRedirect(route('employer.verify-email'));
+
+ // Verify session data and file presence
+ $pendingReg = session('pending_employer_registration');
+ $this->assertNotNull($pendingReg);
+ $this->assertEquals('Abdullah Ahmed', $pendingReg['name']);
+ $this->assertNotNull($pendingReg['emirates_id_file']);
+ $this->assertStringContainsString('uploads/licenses/', $pendingReg['emirates_id_file']);
+
+ // Step 2: OTP Verification (using local environment dummy code)
+ $responseStep2 = $this->post('/employer/verify-email', [
+ 'otp' => '000000',
+ ]);
+
+ $responseStep2->assertRedirect(route('employer.register-payment'));
+ $this->assertTrue(session('employer_email_verified'));
+
+ // Step 3: Payment Choice
+ $responseStep3 = $this->post('/employer/register-payment', [
+ 'plan_id' => 'premium',
+ 'amount_aed' => 199.00,
+ 'paytabs_transaction_id' => 'TRAN_ABC_123',
+ ]);
+
+ $responseStep3->assertJson(['message' => 'Payment processed successfully.']);
+
+ // Step 4: Create Password & Create Records
+ $responseStep4 = $this->post('/employer/create-password', [
+ 'password' => 'SecurePass123!',
+ 'password_confirmation' => 'SecurePass123!',
+ ]);
+
+ $responseStep4->assertRedirect(route('employer.dashboard'));
+
+ // Verify Database Records
+ $this->assertDatabaseHas('users', [
+ 'email' => 'abdullah@example.com',
+ 'role' => 'employer',
+ ]);
+
+ $this->assertDatabaseHas('employer_profiles', [
+ 'phone' => '501234567',
+ 'company_name' => 'Abdullah Ahmed Household',
+ ]);
+
+ $this->assertDatabaseHas('sponsors', [
+ 'email' => 'abdullah@example.com',
+ 'mobile' => '501234567',
+ ]);
+
+ // Check Sponsor has the Emirates ID path matching the session stored file
+ $sponsor = Sponsor::where('email', 'abdullah@example.com')->first();
+ $this->assertNotNull($sponsor->emirates_id_file);
+ $this->assertEquals($pendingReg['emirates_id_file'], $sponsor->emirates_id_file);
+ }
+}
diff --git a/tests/Feature/WorkerJourneyApiTest.php b/tests/Feature/WorkerJourneyApiTest.php
index eed1f3c..620fabd 100644
--- a/tests/Feature/WorkerJourneyApiTest.php
+++ b/tests/Feature/WorkerJourneyApiTest.php
@@ -799,4 +799,109 @@ public function test_worker_new_announcements_flow()
$response->assertStatus(200);
$this->assertCount(0, $response->json('data.announcements'));
}
+
+ /**
+ * Test localized preferred locations endpoint.
+ */
+ public function test_get_preferred_locations_localized()
+ {
+ // 1. Get English locations
+ $response = $this->getJson('/api/preferred-locations?lang=en');
+ $response->assertStatus(200)
+ ->assertJson([
+ 'success' => true,
+ 'data' => [
+ 'preferred_locations' => [
+ ['code' => 'dubai', 'name' => 'Dubai'],
+ ['code' => 'abu dhabi', 'name' => 'Abu Dhabi'],
+ ['code' => 'oman', 'name' => 'Oman'],
+ ]
+ ]
+ ]);
+
+ // 2. Get Hindi locations
+ $response = $this->getJson('/api/preferred-locations?lang=hi');
+ $response->assertStatus(200)
+ ->assertJson([
+ 'success' => true,
+ 'data' => [
+ 'preferred_locations' => [
+ ['code' => 'dubai', 'name' => 'दुबई'],
+ ['code' => 'abu dhabi', 'name' => 'अबू धाबी'],
+ ['code' => 'oman', 'name' => 'ओमान'],
+ ]
+ ]
+ ]);
+
+ // 3. Test pagination
+ $response = $this->getJson('/api/preferred-locations?per_page=1&page=2');
+ $response->assertStatus(200)
+ ->assertJson([
+ 'success' => true,
+ 'data' => [
+ 'preferred_locations' => [
+ ['code' => 'abu dhabi', 'name' => 'Abu Dhabi'],
+ ],
+ 'pagination' => [
+ 'total' => 3,
+ 'per_page' => 1,
+ 'current_page' => 2,
+ 'last_page' => 3
+ ]
+ ]
+ ]);
+ }
+
+ /**
+ * Test localized preferred location areas endpoint.
+ */
+ public function test_get_preferred_location_areas_localized()
+ {
+ // 1. Get English areas for Dubai (using path parameter)
+ $response = $this->getJson('/api/preferred-locations/dubai/areas?lang=en');
+ $response->assertStatus(200)
+ ->assertJson([
+ 'success' => true,
+ 'data' => [
+ 'location' => 'dubai',
+ ]
+ ]);
+ $this->assertGreaterThan(5, count($response->json('data.areas')));
+ $this->assertEquals('Dubai Marina', $response->json('data.areas.1.name'));
+
+ // 2. Get Hindi areas for Dubai (using query parameter)
+ $response = $this->getJson('/api/preferred-locations/areas?city=dubai&lang=hi');
+ $response->assertStatus(200)
+ ->assertJson([
+ 'success' => true,
+ 'data' => [
+ 'location' => 'dubai',
+ ]
+ ]);
+ $this->assertEquals('दुबई मरीना', $response->json('data.areas.1.name'));
+
+ // 3. Test pagination
+ $response = $this->getJson('/api/preferred-locations/oman/areas?per_page=2&page=2');
+ $response->assertStatus(200)
+ ->assertJson([
+ 'success' => true,
+ 'data' => [
+ 'location' => 'oman',
+ 'pagination' => [
+ 'total' => 8,
+ 'per_page' => 2,
+ 'current_page' => 2,
+ 'last_page' => 4
+ ]
+ ]
+ ]);
+ $this->assertCount(2, $response->json('data.areas'));
+
+ // 4. Test not found location
+ $response = $this->getJson('/api/preferred-locations/sharjah/areas');
+ $response->assertStatus(404)
+ ->assertJson([
+ 'success' => false,
+ ]);
+ }
}
diff --git a/tests/Feature/WorkerSupportTicketApiTest.php b/tests/Feature/WorkerSupportTicketApiTest.php
new file mode 100644
index 0000000..1a80c44
--- /dev/null
+++ b/tests/Feature/WorkerSupportTicketApiTest.php
@@ -0,0 +1,97 @@
+token = 'worker-test-token-789';
+
+ $category = \App\Models\WorkerCategory::create([
+ 'name' => 'Housemaid',
+ ]);
+
+ $this->worker = Worker::create([
+ 'name' => 'John Worker',
+ 'email' => 'worker@example.com',
+ 'phone' => '+971500000009',
+ 'password' => bcrypt('password'),
+ 'api_token' => $this->token,
+ 'status' => 'Available',
+ 'category_id' => $category->id,
+ 'nationality' => 'Ethiopian',
+ 'age' => 28,
+ 'salary' => 1500.00,
+ 'availability' => 'Immediate',
+ 'experience' => '2 Years',
+ 'religion' => 'Christian',
+ 'bio' => 'Experienced helper.',
+ ]);
+
+ $this->reason = ReportReason::create([
+ 'reason' => 'App crashes when loading data',
+ 'status' => 'active',
+ 'type' => 'support',
+ ]);
+ }
+
+ public function test_worker_can_create_ticket_with_reason_and_voice_note()
+ {
+ Storage::fake('public');
+
+ $voiceFile = UploadedFile::fake()->create('note.mp3', 500, 'audio/mpeg');
+
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $this->token,
+ ])->postJson('/api/workers/tickets', [
+ 'subject' => 'Issue with login',
+ 'description' => 'I cannot log in to the application.',
+ 'priority' => 'high',
+ 'reason_id' => $this->reason->id,
+ 'voice_note' => $voiceFile,
+ ]);
+
+ $response->assertStatus(201)
+ ->assertJsonStructure([
+ 'success',
+ 'message',
+ 'ticket' => [
+ 'id',
+ 'ticket_number',
+ 'subject',
+ 'description',
+ 'reason_id',
+ 'reason_name',
+ 'voice_note_url',
+ 'status',
+ 'priority',
+ 'created_at',
+ ]
+ ]);
+
+ $ticket = SupportTicket::first();
+ $this->assertNotNull($ticket);
+ $this->assertEquals('Issue with login', $ticket->subject);
+ $this->assertEquals($this->reason->id, $ticket->reason_id);
+ $this->assertNotNull($ticket->voice_note_path);
+
+ Storage::disk('public')->assertExists($ticket->voice_note_path);
+ }
+}
diff --git a/vite.config.js b/vite.config.js
index b36d5b9..fa54835 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -23,7 +23,7 @@ export default defineConfig({
port: 5173,
cors: true,
hmr: {
- host: '10.150.39.221',
+ host: '192.168.29.131',
},
watch: {
ignored: ['**/storage/framework/views/**'],