From 0dc116afc8a24a81fe14157e0428d21d5b93b782 Mon Sep 17 00:00:00 2001 From: pavithrak27 Date: Wed, 24 Jun 2026 23:39:54 +0530 Subject: [PATCH] api fixed --- .../Controllers/Api/EmployerAuthController.php | 17 ++++++++++++++++- .../Api/EmployerProfileController.php | 4 ++++ .../Controllers/Api/SponsorAuthController.php | 12 +++++++++++- app/Http/Controllers/Api/SponsorController.php | 5 ++++- app/Models/Sponsor.php | 3 ++- ...gender_to_employer_profiles_and_sponsors.php | 16 ++++++++++++---- 6 files changed, 49 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/Api/EmployerAuthController.php b/app/Http/Controllers/Api/EmployerAuthController.php index 8955fff..8e2e1e6 100644 --- a/app/Http/Controllers/Api/EmployerAuthController.php +++ b/app/Http/Controllers/Api/EmployerAuthController.php @@ -234,6 +234,8 @@ public function register(Request $request) $emiratesIdEmployer = null; $emiratesIdIssuePlace = null; $emiratesIdOccupation = null; + $emiratesIdCardNumber = null; + $emiratesIdGender = null; if (is_array($emiratesIdInput)) { $emiratesIdNumber = $emiratesIdInput['emirates_id_number'] ?? $emiratesIdInput['id_number'] ?? $emiratesIdInput['id number'] ?? $emiratesIdInput['card_number'] ?? null; @@ -247,8 +249,9 @@ public function register(Request $request) $emiratesIdGender = $emiratesIdInput['gender'] ?? $emiratesIdInput['sex'] ?? null; $emiratesIdIssueDate = $emiratesIdInput['issue_date'] ?? $emiratesIdInput['issue date'] ?? null; $emiratesIdEmployer = $emiratesIdInput['employer'] ?? null; - $emiratesIdIssuePlace = $emiratesIdInput['issue_place'] ?? $emiratesIdInput['issue place'] ?? null; + $emiratesIdIssuePlace = $emiratesIdInput['issue_place'] ?? $emiratesIdInput['issue place'] ?? $emiratesIdInput['issuing_place'] ?? null; $emiratesIdOccupation = $emiratesIdInput['occupation'] ?? $emiratesIdInput['occuption'] ?? null; + $emiratesIdCardNumber = $emiratesIdInput['card_number'] ?? null; } // Create inactive User @@ -282,6 +285,7 @@ public function register(Request $request) 'emirates_id_occupation' => $emiratesIdOccupation, 'emirates_id_nationality' => $emiratesIdNationality, 'emirates_id_gender' => $emiratesIdGender, + 'emirates_id_card_number' => $emiratesIdCardNumber, 'address' => $request->address, ]); @@ -302,6 +306,17 @@ public function register(Request $request) 'status' => 'inactive', 'fcm_token' => $request->fcm_token, 'emirates_id' => $emiratesIdNumber, + 'emirates_id_card_number' => $emiratesIdCardNumber, + 'emirates_id_name' => $emiratesIdName, + 'emirates_id_dob' => $emiratesIdDob, + 'emirates_id_issue_date' => $emiratesIdIssueDate, + 'emirates_id_expiry' => $emiratesIdExpiry, + 'emirates_id_employer' => $emiratesIdEmployer, + 'emirates_id_issue_place' => $emiratesIdIssuePlace, + 'emirates_id_occupation' => $emiratesIdOccupation, + 'emirates_id_nationality' => $emiratesIdNationality, + 'emirates_id_gender' => $emiratesIdGender, + 'nationality' => $emiratesIdNationality, 'address' => $request->address, ]); diff --git a/app/Http/Controllers/Api/EmployerProfileController.php b/app/Http/Controllers/Api/EmployerProfileController.php index 1aa0978..2bb4cc5 100644 --- a/app/Http/Controllers/Api/EmployerProfileController.php +++ b/app/Http/Controllers/Api/EmployerProfileController.php @@ -53,6 +53,8 @@ public function getProfile(Request $request) 'occupation' => $profile->emirates_id_occupation, 'nationality' => $profile->emirates_id_nationality, 'gender' => $profile->emirates_id_gender, + 'card_number' => $profile->emirates_id_card_number, + 'country' => 'United Arab Emirates', ], ]; @@ -279,6 +281,8 @@ public function updateProfile(Request $request) 'occupation' => $profile->emirates_id_occupation, 'nationality' => $profile->emirates_id_nationality, 'gender' => $profile->emirates_id_gender, + 'card_number' => $profile->emirates_id_card_number, + 'country' => 'United Arab Emirates', ], ]; diff --git a/app/Http/Controllers/Api/SponsorAuthController.php b/app/Http/Controllers/Api/SponsorAuthController.php index 474df9e..5a7a949 100644 --- a/app/Http/Controllers/Api/SponsorAuthController.php +++ b/app/Http/Controllers/Api/SponsorAuthController.php @@ -85,6 +85,8 @@ public function register(Request $request) $emiratesIdEmployer = null; $emiratesIdIssuePlace = null; $emiratesIdOccupation = null; + $emiratesIdGender = null; + $emiratesIdCardNumber = null; if (is_array($emiratesIdInput)) { $emiratesId = $emiratesIdInput['emirates_id_number'] ?? $emiratesIdInput['id_number'] ?? $emiratesIdInput['id number'] ?? $emiratesIdInput['card_number'] ?? null; @@ -100,6 +102,7 @@ public function register(Request $request) $emiratesIdEmployer = $emiratesIdInput['employer'] ?? null; $emiratesIdIssuePlace = $emiratesIdInput['issue_place'] ?? $emiratesIdInput['issue place'] ?? null; $emiratesIdOccupation = $emiratesIdInput['occupation'] ?? $emiratesIdInput['occuption'] ?? null; + $emiratesIdCardNumber = $emiratesIdInput['card_number'] ?? null; } $emiratesIdPath = null; @@ -110,7 +113,7 @@ public function register(Request $request) $sponsor = DB::transaction(function () use ( $request, $email, $licensePath, $emiratesIdPath, $emiratesId, $apiToken, $licenseExpiry, $licenseNumber, $licenseInput, $emiratesIdExpiry, $emiratesIdName, $emiratesIdDob, $emiratesIdIssueDate, $emiratesIdEmployer, - $emiratesIdIssuePlace, $emiratesIdOccupation, $emiratesIdNationality, $emiratesIdGender + $emiratesIdIssuePlace, $emiratesIdOccupation, $emiratesIdNationality, $emiratesIdGender, $emiratesIdCardNumber ) { return Sponsor::create([ 'full_name' => $request->full_name, @@ -142,6 +145,7 @@ public function register(Request $request) 'emirates_id_occupation' => $emiratesIdOccupation, 'emirates_id_nationality' => $emiratesIdNationality, 'emirates_id_gender' => $emiratesIdGender, + 'emirates_id_card_number' => $emiratesIdCardNumber, ]); }); @@ -187,6 +191,8 @@ public function register(Request $request) 'occupation' => $sponsor->emirates_id_occupation, 'nationality' => $sponsor->emirates_id_nationality, 'gender' => $sponsor->emirates_id_gender, + 'card_number' => $sponsor->emirates_id_card_number, + 'country' => 'United Arab Emirates', ], ], 'token' => $apiToken, @@ -292,6 +298,10 @@ public function login(Request $request) 'employer' => $sponsor->emirates_id_employer, 'issue_place' => $sponsor->emirates_id_issue_place, 'occupation' => $sponsor->emirates_id_occupation, + 'nationality' => $sponsor->emirates_id_nationality, + 'gender' => $sponsor->emirates_id_gender, + 'card_number' => $sponsor->emirates_id_card_number, + 'country' => 'United Arab Emirates', ], ], 'token' => $apiToken, diff --git a/app/Http/Controllers/Api/SponsorController.php b/app/Http/Controllers/Api/SponsorController.php index 43606a7..98462a3 100644 --- a/app/Http/Controllers/Api/SponsorController.php +++ b/app/Http/Controllers/Api/SponsorController.php @@ -349,6 +349,8 @@ public function getProfile(Request $request) 'occupation' => $sponsor->emirates_id_occupation, 'nationality' => $sponsor->emirates_id_nationality, 'gender' => $sponsor->emirates_id_gender, + 'card_number' => $sponsor->emirates_id_card_number, + 'country' => 'United Arab Emirates', ], ] ] @@ -384,7 +386,7 @@ private function buildSponsorResponse(Sponsor $sponsor): array $emiratesIdData = [ 'emirates_id_number' => $sponsor->emirates_id, 'name' => $sponsor->emirates_id_name, - 'nationality' => $sponsor->nationality, + 'nationality' => $sponsor->emirates_id_nationality, 'date_of_birth' => $sponsor->emirates_id_dob, 'expiry_date' => $sponsor->emirates_id_expiry, 'issue_date' => $sponsor->emirates_id_issue_date, @@ -393,6 +395,7 @@ private function buildSponsorResponse(Sponsor $sponsor): array 'occupation' => $sponsor->emirates_id_occupation, 'card_number' => $sponsor->emirates_id_card_number, 'gender' => $sponsor->emirates_id_gender, + 'country' => 'United Arab Emirates', ]; } diff --git a/app/Models/Sponsor.php b/app/Models/Sponsor.php index f5c4913..91c835f 100644 --- a/app/Models/Sponsor.php +++ b/app/Models/Sponsor.php @@ -108,7 +108,7 @@ public function toArray() $emiratesIdData = [ 'emirates_id_number' => $this->emirates_id, 'name' => $this->emirates_id_name, - 'nationality' => $this->nationality, + 'nationality' => $this->emirates_id_nationality, 'date_of_birth' => $this->emirates_id_dob, 'expiry_date' => $this->emirates_id_expiry, 'issue_date' => $this->emirates_id_issue_date, @@ -117,6 +117,7 @@ public function toArray() 'occupation' => $this->emirates_id_occupation, 'card_number' => $this->emirates_id_card_number, 'gender' => $this->emirates_id_gender, + 'country' => 'United Arab Emirates', ]; } diff --git a/database/migrations/2026_06_23_175000_add_card_number_and_gender_to_employer_profiles_and_sponsors.php b/database/migrations/2026_06_23_175000_add_card_number_and_gender_to_employer_profiles_and_sponsors.php index c520317..6d1deb6 100644 --- a/database/migrations/2026_06_23_175000_add_card_number_and_gender_to_employer_profiles_and_sponsors.php +++ b/database/migrations/2026_06_23_175000_add_card_number_and_gender_to_employer_profiles_and_sponsors.php @@ -12,13 +12,21 @@ public function up(): void { Schema::table('employer_profiles', function (Blueprint $table) { - $table->string('emirates_id_card_number')->nullable(); - $table->string('emirates_id_gender')->nullable(); + if (!Schema::hasColumn('employer_profiles', 'emirates_id_card_number')) { + $table->string('emirates_id_card_number')->nullable(); + } + if (!Schema::hasColumn('employer_profiles', 'emirates_id_gender')) { + $table->string('emirates_id_gender')->nullable(); + } }); Schema::table('sponsors', function (Blueprint $table) { - $table->string('emirates_id_card_number')->nullable(); - $table->string('emirates_id_gender')->nullable(); + if (!Schema::hasColumn('sponsors', 'emirates_id_card_number')) { + $table->string('emirates_id_card_number')->nullable(); + } + if (!Schema::hasColumn('sponsors', 'emirates_id_gender')) { + $table->string('emirates_id_gender')->nullable(); + } }); } -- 2.43.0