From fa6e8da3cbd6de31c868b1e1c90e9b8056929f94 Mon Sep 17 00:00:00 2001 From: pavithrak27 Date: Wed, 24 Jun 2026 21:28:38 +0530 Subject: [PATCH] ocr sposer ocr --- .../Api/EmployerAuthController.php | 3 + .../Api/EmployerProfileController.php | 30 ++++++- .../Controllers/Api/SponsorAuthController.php | 81 ++++++++++++++++++- .../Controllers/Api/SponsorController.php | 28 +++++++ app/Models/EmployerProfile.php | 2 + app/Models/Sponsor.php | 5 ++ app/Services/OcrDocumentService.php | 2 +- ...6_add_license_number_to_sponsors_table.php | 28 +++++++ ...838_add_license_data_to_sponsors_table.php | 28 +++++++ ..._add_emirates_id_nationality_to_tables.php | 34 ++++++++ ...11842_add_emirates_id_gender_to_tables.php | 34 ++++++++ public/swagger.json | 74 ++++++++++++++--- 12 files changed, 328 insertions(+), 21 deletions(-) create mode 100644 database/migrations/2026_06_24_203706_add_license_number_to_sponsors_table.php create mode 100644 database/migrations/2026_06_24_203838_add_license_data_to_sponsors_table.php create mode 100644 database/migrations/2026_06_24_211116_add_emirates_id_nationality_to_tables.php create mode 100644 database/migrations/2026_06_24_211842_add_emirates_id_gender_to_tables.php diff --git a/app/Http/Controllers/Api/EmployerAuthController.php b/app/Http/Controllers/Api/EmployerAuthController.php index 43ff95a..cc22750 100644 --- a/app/Http/Controllers/Api/EmployerAuthController.php +++ b/app/Http/Controllers/Api/EmployerAuthController.php @@ -234,6 +234,7 @@ public function register(Request $request) $emiratesIdName = $emiratesIdInput['name'] ?? null; $emiratesIdDob = $emiratesIdInput['date_of_birth'] ?? $emiratesIdInput['date of birth'] ?? $emiratesIdInput['dob'] ?? null; $emiratesIdNationality = $emiratesIdInput['nationality'] ?? null; + $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; @@ -269,6 +270,8 @@ public function register(Request $request) 'emirates_id_employer' => $emiratesIdEmployer, 'emirates_id_issue_place' => $emiratesIdIssuePlace, 'emirates_id_occupation' => $emiratesIdOccupation, + 'emirates_id_nationality' => $emiratesIdNationality, + 'emirates_id_gender' => $emiratesIdGender, 'address' => $request->address, ]); diff --git a/app/Http/Controllers/Api/EmployerProfileController.php b/app/Http/Controllers/Api/EmployerProfileController.php index 92230df..87227ff 100644 --- a/app/Http/Controllers/Api/EmployerProfileController.php +++ b/app/Http/Controllers/Api/EmployerProfileController.php @@ -39,11 +39,22 @@ public function getProfile(Request $request) 'email' => $employer->email, 'company_name' => $profile->company_name, 'phone' => $profile->phone, + 'country' => $profile->country, 'language' => $profile->language ?? 'English', 'notifications' => (bool)($profile->notifications ?? true), 'verification_status' => $profile->verification_status ?? 'approved', - 'emirates_id_number' => $profile->emirates_id_number, - 'emirates_id_expiry' => $profile->emirates_id_expiry, + 'emirates_id' => [ + 'emirates_id_number' => $profile->emirates_id_number, + 'name' => $profile->emirates_id_name, + 'date_of_birth' => $profile->emirates_id_dob, + 'issue_date' => $profile->emirates_id_issue_date, + 'expiry_date' => $profile->emirates_id_expiry, + 'employer' => $profile->emirates_id_employer, + 'issue_place' => $profile->emirates_id_issue_place, + 'occupation' => $profile->emirates_id_occupation, + 'nationality' => $profile->emirates_id_nationality, + 'gender' => $profile->emirates_id_gender, + ], ]; return response()->json([ @@ -170,11 +181,22 @@ public function updateProfile(Request $request) 'email' => $employer->email, 'company_name' => $profile->company_name, 'phone' => $profile->phone, + 'country' => $profile->country, 'language' => $profile->language, 'notifications' => (bool)$profile->notifications, 'verification_status' => $profile->verification_status ?? 'approved', - 'emirates_id_number' => $profile->emirates_id_number, - 'emirates_id_expiry' => $profile->emirates_id_expiry, + 'emirates_id' => [ + 'emirates_id_number' => $profile->emirates_id_number, + 'name' => $profile->emirates_id_name, + 'date_of_birth' => $profile->emirates_id_dob, + 'issue_date' => $profile->emirates_id_issue_date, + 'expiry_date' => $profile->emirates_id_expiry, + 'employer' => $profile->emirates_id_employer, + 'issue_place' => $profile->emirates_id_issue_place, + 'occupation' => $profile->emirates_id_occupation, + 'nationality' => $profile->emirates_id_nationality, + 'gender' => $profile->emirates_id_gender, + ], ]; return response()->json([ diff --git a/app/Http/Controllers/Api/SponsorAuthController.php b/app/Http/Controllers/Api/SponsorAuthController.php index 831c8b7..4fb57f7 100644 --- a/app/Http/Controllers/Api/SponsorAuthController.php +++ b/app/Http/Controllers/Api/SponsorAuthController.php @@ -59,8 +59,13 @@ public function register(Request $request) $licenseExpiry = $request->license_expiry; $licenseInput = $request->input('license'); + $licenseNumber = null; if (is_array($licenseInput)) { - $licenseExpiry = $licenseExpiry ?? ($licenseInput['expiry_date'] ?? $licenseInput['license_expiry'] ?? null); + $rawExpiry = $licenseInput['expiry_date'] ?? $licenseInput['license_expiry'] ?? null; + if ($rawExpiry) { + $licenseExpiry = $licenseExpiry ?? \App\Services\OcrDocumentService::normaliseDate($rawExpiry); + } + $licenseNumber = $licenseInput['license_number'] ?? $licenseInput['license_no'] ?? $licenseInput['document_number'] ?? null; } $emiratesIdInput = $request->input('emirates_id'); @@ -80,6 +85,7 @@ public function register(Request $request) $emiratesIdName = $emiratesIdInput['name'] ?? null; $emiratesIdDob = $emiratesIdInput['date_of_birth'] ?? $emiratesIdInput['date of birth'] ?? $emiratesIdInput['dob'] ?? null; $emiratesIdNationality = $emiratesIdInput['nationality'] ?? null; + $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; @@ -92,7 +98,7 @@ public function register(Request $request) $apiToken = Str::random(80); $sponsor = DB::transaction(function () use ( - $request, $email, $licensePath, $emiratesIdPath, $emiratesId, $apiToken, $licenseExpiry, + $request, $email, $licensePath, $emiratesIdPath, $emiratesId, $apiToken, $licenseExpiry, $licenseNumber, $licenseInput, $emiratesIdExpiry, $emiratesIdName, $emiratesIdDob, $emiratesIdIssueDate, $emiratesIdEmployer, $emiratesIdIssuePlace, $emiratesIdOccupation ) { @@ -110,6 +116,8 @@ public function register(Request $request) 'emirates_id_file' => $emiratesIdPath, 'emirates_id' => $emiratesId, 'license_expiry' => $licenseExpiry, + 'license_number' => $licenseNumber, + 'license_data' => $licenseInput, 'status' => 'active', 'is_verified' => false, 'subscription_status' => 'none', @@ -122,6 +130,8 @@ public function register(Request $request) 'emirates_id_employer' => $emiratesIdEmployer, 'emirates_id_issue_place' => $emiratesIdIssuePlace, 'emirates_id_occupation' => $emiratesIdOccupation, + 'emirates_id_nationality' => $emiratesIdNationality, + 'emirates_id_gender' => $emiratesIdGender, ]); }); @@ -137,7 +147,38 @@ public function register(Request $request) 'success' => true, 'message' => 'Sponsor account registered successfully. Your license is pending admin review.', 'data' => [ - 'sponsor' => $sponsor->makeHidden(['password', 'api_token']), + 'sponsor' => [ + 'id' => $sponsor->id, + 'full_name' => $sponsor->full_name, + 'organization_name' => $sponsor->organization_name, + 'mobile' => $sponsor->mobile, + 'email' => $sponsor->email, + 'nationality' => $sponsor->nationality, + 'city' => $sponsor->city, + 'address' => $sponsor->address, + 'country_code' => $sponsor->country_code, + 'is_verified' => $sponsor->is_verified, + 'status' => $sponsor->status, + 'license_file' => $sponsor->license_file ? asset($sponsor->license_file) : null, + 'emirates_id_file' => $sponsor->emirates_id_file ? asset($sponsor->emirates_id_file) : null, + 'license_expiry' => $sponsor->license_expiry ? $sponsor->license_expiry->toDateString() : null, + 'license_number' => $sponsor->license_number, + 'license' => $sponsor->license_data, + 'validity' => $sponsor->license_expiry ? ($sponsor->license_expiry->isFuture() ? 'Valid' : 'Expired') : 'Pending Review', + 'joined_at' => $sponsor->created_at->toIso8601String(), + 'emirates_id' => [ + 'emirates_id_number' => $sponsor->emirates_id, + 'name' => $sponsor->emirates_id_name, + 'date_of_birth' => $sponsor->emirates_id_dob, + 'issue_date' => $sponsor->emirates_id_issue_date, + 'expiry_date' => $sponsor->emirates_id_expiry, + '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, + ], + ], 'token' => $apiToken, ] ], 201); @@ -213,7 +254,36 @@ public function login(Request $request) 'success' => true, 'message' => 'Login successful.', 'data' => [ - 'sponsor' => $sponsor->makeHidden(['password', 'api_token']), + 'sponsor' => [ + 'id' => $sponsor->id, + 'full_name' => $sponsor->full_name, + 'organization_name' => $sponsor->organization_name, + 'mobile' => $sponsor->mobile, + 'email' => $sponsor->email, + 'nationality' => $sponsor->nationality, + 'city' => $sponsor->city, + 'address' => $sponsor->address, + 'country_code' => $sponsor->country_code, + 'is_verified' => $sponsor->is_verified, + 'status' => $sponsor->status, + 'license_file' => $sponsor->license_file ? asset($sponsor->license_file) : null, + 'emirates_id_file' => $sponsor->emirates_id_file ? asset($sponsor->emirates_id_file) : null, + 'license_expiry' => $sponsor->license_expiry ? $sponsor->license_expiry->toDateString() : null, + 'license_number' => $sponsor->license_number, + 'license' => $sponsor->license_data, + 'validity' => $sponsor->license_expiry ? ($sponsor->license_expiry->isFuture() ? 'Valid' : 'Expired') : 'Pending Review', + 'joined_at' => $sponsor->created_at->toIso8601String(), + 'emirates_id' => [ + 'emirates_id_number' => $sponsor->emirates_id, + 'name' => $sponsor->emirates_id_name, + 'date_of_birth' => $sponsor->emirates_id_dob, + 'issue_date' => $sponsor->emirates_id_issue_date, + 'expiry_date' => $sponsor->emirates_id_expiry, + 'employer' => $sponsor->emirates_id_employer, + 'issue_place' => $sponsor->emirates_id_issue_place, + 'occupation' => $sponsor->emirates_id_occupation, + ], + ], 'token' => $apiToken, ] ], 200); @@ -257,10 +327,13 @@ public function uploadLicense(Request $request) $licenseFile = $request->file('license_file'); $ocrLicense = \App\Services\OcrDocumentService::extractSponsorLicenseData($licenseFile); $extractedExpiry = $ocrLicense['expiry_date']; + $extractedNumber = $ocrLicense['license_number']; $sponsor->update([ 'license_file' => null, 'license_expiry' => $extractedExpiry, + 'license_number' => $extractedNumber, + 'license_data' => $ocrLicense, ]); return response()->json([ diff --git a/app/Http/Controllers/Api/SponsorController.php b/app/Http/Controllers/Api/SponsorController.php index 79db18b..27c5f85 100644 --- a/app/Http/Controllers/Api/SponsorController.php +++ b/app/Http/Controllers/Api/SponsorController.php @@ -66,8 +66,22 @@ public function getDashboard(Request $request) 'license_file' => $sponsor->license_file ? asset($sponsor->license_file) : null, 'emirates_id_file' => $sponsor->emirates_id_file ? asset($sponsor->emirates_id_file) : null, 'license_expiry' => $sponsor->license_expiry ? $sponsor->license_expiry->toDateString() : null, + 'license_number' => $sponsor->license_number, + 'license' => $sponsor->license_data, 'validity' => $sponsor->license_expiry ? ($sponsor->license_expiry->isFuture() ? 'Valid' : 'Expired') : 'Pending Review', 'joined_at' => $sponsor->created_at->toIso8601String(), + 'emirates_id' => [ + 'emirates_id_number' => $sponsor->emirates_id, + 'name' => $sponsor->emirates_id_name, + 'date_of_birth' => $sponsor->emirates_id_dob, + 'issue_date' => $sponsor->emirates_id_issue_date, + 'expiry_date' => $sponsor->emirates_id_expiry, + '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, + ], ], 'recent_charity_events' => $recentEvents, 'total_events' => Announcement::where(function ($q) use ($sponsorId) { @@ -320,8 +334,22 @@ public function getProfile(Request $request) 'license_file' => $sponsor->license_file ? asset($sponsor->license_file) : null, 'emirates_id_file' => $sponsor->emirates_id_file ? asset($sponsor->emirates_id_file) : null, 'license_expiry' => $sponsor->license_expiry ? $sponsor->license_expiry->toDateString() : null, + 'license_number' => $sponsor->license_number, + 'license' => $sponsor->license_data, 'validity' => $sponsor->license_expiry ? ($sponsor->license_expiry->isFuture() ? 'Valid' : 'Expired') : 'Pending Review', 'joined_at' => $sponsor->created_at->toIso8601String(), + 'emirates_id' => [ + 'emirates_id_number' => $sponsor->emirates_id, + 'name' => $sponsor->emirates_id_name, + 'date_of_birth' => $sponsor->emirates_id_dob, + 'issue_date' => $sponsor->emirates_id_issue_date, + 'expiry_date' => $sponsor->emirates_id_expiry, + '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, + ], ] ] ], 200); diff --git a/app/Models/EmployerProfile.php b/app/Models/EmployerProfile.php index 06bbaf1..89bfce4 100644 --- a/app/Models/EmployerProfile.php +++ b/app/Models/EmployerProfile.php @@ -29,6 +29,8 @@ class EmployerProfile extends Model 'emirates_id_employer', 'emirates_id_issue_place', 'emirates_id_occupation', + 'emirates_id_nationality', + 'emirates_id_gender', 'address', 'property_type', 'profile_photo_url', diff --git a/app/Models/Sponsor.php b/app/Models/Sponsor.php index e624722..53090ff 100644 --- a/app/Models/Sponsor.php +++ b/app/Models/Sponsor.php @@ -43,6 +43,10 @@ class Sponsor extends Authenticatable 'emirates_id_employer', 'emirates_id_issue_place', 'emirates_id_occupation', + 'emirates_id_nationality', + 'emirates_id_gender', + 'license_number', + 'license_data', ]; protected $hidden = [ @@ -57,6 +61,7 @@ class Sponsor extends Authenticatable 'subscription_end_date' => 'datetime', 'last_login_at' => 'datetime', 'license_expiry' => 'datetime', + 'license_data' => 'array', ]; public function hasActiveSubscription(): bool diff --git a/app/Services/OcrDocumentService.php b/app/Services/OcrDocumentService.php index de9eba3..6268d37 100644 --- a/app/Services/OcrDocumentService.php +++ b/app/Services/OcrDocumentService.php @@ -162,7 +162,7 @@ public static function extractPassportData(UploadedFile $file): array * "2023-04-11" → "2023-04-11" (pass-through) * "11 APR 2023" → "2023-04-11" */ - private static function normaliseDate(string $raw): string + public static function normaliseDate(string $raw): string { $raw = trim($raw); if (empty($raw)) { diff --git a/database/migrations/2026_06_24_203706_add_license_number_to_sponsors_table.php b/database/migrations/2026_06_24_203706_add_license_number_to_sponsors_table.php new file mode 100644 index 0000000..8586508 --- /dev/null +++ b/database/migrations/2026_06_24_203706_add_license_number_to_sponsors_table.php @@ -0,0 +1,28 @@ +string('license_number')->nullable()->after('license_expiry'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('sponsors', function (Blueprint $table) { + $table->dropColumn('license_number'); + }); + } +}; diff --git a/database/migrations/2026_06_24_203838_add_license_data_to_sponsors_table.php b/database/migrations/2026_06_24_203838_add_license_data_to_sponsors_table.php new file mode 100644 index 0000000..e5d9325 --- /dev/null +++ b/database/migrations/2026_06_24_203838_add_license_data_to_sponsors_table.php @@ -0,0 +1,28 @@ +json('license_data')->nullable()->after('license_number'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('sponsors', function (Blueprint $table) { + $table->dropColumn('license_data'); + }); + } +}; diff --git a/database/migrations/2026_06_24_211116_add_emirates_id_nationality_to_tables.php b/database/migrations/2026_06_24_211116_add_emirates_id_nationality_to_tables.php new file mode 100644 index 0000000..d8828d3 --- /dev/null +++ b/database/migrations/2026_06_24_211116_add_emirates_id_nationality_to_tables.php @@ -0,0 +1,34 @@ +string('emirates_id_nationality')->nullable()->after('emirates_id_name'); + }); + Schema::table('employer_profiles', function (Blueprint $table) { + $table->string('emirates_id_nationality')->nullable()->after('emirates_id_name'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('sponsors', function (Blueprint $table) { + $table->dropColumn('emirates_id_nationality'); + }); + Schema::table('employer_profiles', function (Blueprint $table) { + $table->dropColumn('emirates_id_nationality'); + }); + } +}; diff --git a/database/migrations/2026_06_24_211842_add_emirates_id_gender_to_tables.php b/database/migrations/2026_06_24_211842_add_emirates_id_gender_to_tables.php new file mode 100644 index 0000000..f3c17f6 --- /dev/null +++ b/database/migrations/2026_06_24_211842_add_emirates_id_gender_to_tables.php @@ -0,0 +1,34 @@ +string('emirates_id_gender')->nullable()->after('emirates_id_nationality'); + }); + Schema::table('employer_profiles', function (Blueprint $table) { + $table->string('emirates_id_gender')->nullable()->after('emirates_id_nationality'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('sponsors', function (Blueprint $table) { + $table->dropColumn('emirates_id_gender'); + }); + Schema::table('employer_profiles', function (Blueprint $table) { + $table->dropColumn('emirates_id_gender'); + }); + } +}; diff --git a/public/swagger.json b/public/swagger.json index 01413da..2b7fd62 100644 --- a/public/swagger.json +++ b/public/swagger.json @@ -1,4 +1,4 @@ -{ +{ "openapi": "3.0.0", "info": { "title": "Migrant Mobile API", @@ -63,17 +63,30 @@ "type": "object", "description": "Optional JSON object containing extracted organization/trade license details.", "properties": { - "license_number": { - "type": "string", - "example": "123456" - }, - "organization_name": { - "type": "string", - "example": "Al-Rashidi Charitable Foundation" - }, - "expiry_date": { - "type": "string", - "example": "2028-06-12" + "document_type": { "type": "string", "example": "dubai_commercial_license" }, + "country": { "type": "string", "example": "United Arab Emirates" }, + "authority": { "type": "string", "example": "Dubai Economy and Tourism" }, + "license_no": { "type": "string", "example": "1426961" }, + "company_name": { "type": "string", "example": "NEST CLIMATE TECHNICAL SERVICES L.L.C" }, + "business_name": { "type": "string", "example": "NEST CLIMATE TECHNICAL SERVICES L.L.C" }, + "license_category": { "type": "string", "example": "Dep. of Economic Development" }, + "legal_type": { "type": "string", "example": "Limited Liability Company(LLC)" }, + "issue_date": { "type": "string", "example": "22/10/2024" }, + "expiry_date": { "type": "string", "example": "21/10/2026" }, + "main_license_no": { "type": "string", "example": "1426961" }, + "register_no": { "type": "string", "example": "2436760" }, + "dcci_no": { "type": "string", "example": "570232" }, + "members": { + "type": "array", + "items": { + "type": "object", + "properties": { + "person_no": { "type": "string", "example": "1709285" }, + "name": { "type": "string", "example": "SEYED ABDUL RAHMAN SHERIF NISAR" }, + "nationality": { "type": "string", "example": "India" }, + "role": { "type": "string", "example": "Manager" } + } + } } } }, @@ -93,6 +106,10 @@ "type": "string", "example": "NPL" }, + "gender": { + "type": "string", + "example": "Male" + }, "date_of_birth": { "type": "string", "example": "1988-03-22" @@ -5277,6 +5294,39 @@ "type": "string", "example": "fcm_token_example" }, + "license": { + "type": "object", + "properties": { + "document_type": { "type": "string", "example": "dubai_commercial_license" }, + "country": { "type": "string", "example": "United Arab Emirates" }, + "authority": { "type": "string", "example": "Dubai Economy and Tourism" }, + "license_no": { "type": "string", "example": "1426961" }, + "company_name": { "type": "string", "example": "NEST CLIMATE TECHNICAL SERVICES L.L.C" }, + "business_name": { "type": "string", "example": "NEST CLIMATE TECHNICAL SERVICES L.L.C" }, + "license_category": { "type": "string", "example": "Dep. of Economic Development" }, + "legal_type": { "type": "string", "example": "Limited Liability Company(LLC)" }, + "issue_date": { "type": "string", "example": "22/10/2024" }, + "expiry_date": { "type": "string", "example": "21/10/2026" }, + "main_license_no": { "type": "string", "example": "1426961" }, + "register_no": { "type": "string", "example": "2436760" }, + "dcci_no": { "type": "string", "example": "570232" } + } + }, + "emirates_id": { + "type": "object", + "properties": { + "emirates_id_number": { "type": "string", "example": "784-1988-5310327-2" }, + "name": { "type": "string", "example": "KRISHNA PRASAD" }, + "date_of_birth": { "type": "string", "example": "1988-03-22" }, + "issue_date": { "type": "string", "example": "2023-04-11" }, + "expiry_date": { "type": "string", "example": "2028-04-11" }, + "employer": { "type": "string", "example": "Federal Authority" }, + "issue_place": { "type": "string", "example": "Abu Dhabi" }, + "occupation": { "type": "string", "example": "Manager" }, + "nationality": { "type": "string", "example": "NPL" }, + "gender": { "type": "string", "example": "Male" } + } + }, "created_at": { "type": "string", "format": "date-time" -- 2.43.0