diff --git a/apps/companies/src/handlers/mod.rs b/apps/companies/src/handlers/mod.rs index 75bbd36..8ee10b0 100644 --- a/apps/companies/src/handlers/mod.rs +++ b/apps/companies/src/handlers/mod.rs @@ -258,7 +258,7 @@ async fn submit_job( Ok(updated) => { // Fire email to company user (ignore failures) if let Ok(user) = UserRepository::get_by_id(&state.pool, auth.user_id).await { - let _ = state.mail.send_job_submitted_email(&user.email, user.full_name.as_deref().unwrap_or("User"), &updated.title).await; + let _ = state.mail.send_job_submitted_email(&user.email, user.name.as_deref().unwrap_or("User"), &updated.title).await; } // Create verification case so the request appears in Verification Management first. @@ -367,7 +367,7 @@ async fn update_application_status( Ok(updated) => { // Notify applicant of status change (ignore failures) let applicant_info = sqlx::query_as::<_, (String, String)>( - "SELECT u.full_name, u.email FROM users u WHERE u.id = $1", + "SELECT u.name, u.email FROM users u WHERE u.id = $1", ) .bind(app.applicant_user_id) .fetch_optional(&state.pool) @@ -439,7 +439,7 @@ async fn view_contact( let contact = sqlx::query_as::<_, (Option, String, Option)>( r#" - SELECT u.full_name, u.email, u.phone + SELECT u.name, u.email, u.phone FROM users u WHERE u.id = $1 "#, @@ -449,7 +449,7 @@ async fn view_contact( .await; match contact { - Ok(Some((full_name, email, phone))) => { + Ok(Some((name, email, phone))) => { let new_free = if used_free { free_views - 1 } else { free_views }; let new_purchased = if used_free { purchased_views } else { purchased_views - 1 }; @@ -470,7 +470,7 @@ async fn view_contact( (StatusCode::OK, Json(serde_json::json!({ "application_id": id, - "full_name": full_name, + "name": name, "email": email, "phone": phone, "quota": { diff --git a/apps/cron/src/tasks/jobs.rs b/apps/cron/src/tasks/jobs.rs index f982cea..4a68184 100644 --- a/apps/cron/src/tasks/jobs.rs +++ b/apps/cron/src/tasks/jobs.rs @@ -16,7 +16,7 @@ pub async fn expire_stale_jobs( job_id: Uuid, title: String, email: String, - full_name: String, + name: String, } let records = sqlx::query_as::<_, JobRecord>( @@ -28,7 +28,7 @@ pub async fn expire_stale_jobs( WHERE jobs.company_id = c.id AND jobs.status = 'LIVE' AND jobs.expires_at < $1 - RETURNING jobs.id as job_id, jobs.title, u.email, u.full_name + RETURNING jobs.id as job_id, jobs.title, u.email, u.name "# ) .bind(now) @@ -42,7 +42,7 @@ pub async fn expire_stale_jobs( tracing::info!("Expired {} stale jobs.", records.len()); for rec in records { - let _ = mailer.send_job_expired_email(&rec.email, &rec.full_name, &rec.title).await; + let _ = mailer.send_job_expired_email(&rec.email, &rec.name, &rec.title).await; tracing::info!("Sent expiry email to {} for job {}", rec.email, rec.job_id); } diff --git a/apps/cron/src/tasks/leads.rs b/apps/cron/src/tasks/leads.rs index d0fd10a..451080d 100644 --- a/apps/cron/src/tasks/leads.rs +++ b/apps/cron/src/tasks/leads.rs @@ -15,7 +15,7 @@ pub async fn expire_stale_lead_requests( tracecoins_reserved: i32, user_id: Uuid, email: String, - full_name: String, + name: String, } let records = sqlx::query_as::<_, Record>( @@ -26,7 +26,7 @@ pub async fn expire_stale_lead_requests( lr.tracecoins_reserved, urp.user_id, u.email, - u.full_name + u.name FROM lead_requests lr INNER JOIN user_role_profiles urp ON urp.id = lr.user_role_profile_id INNER JOIN users u ON u.id = urp.user_id @@ -86,7 +86,7 @@ pub async fn expire_stale_lead_requests( tx.commit().await?; - let _ = mailer.send_lead_expired_email(&rec.email, &rec.full_name, rec.tracecoins_reserved).await; + let _ = mailer.send_lead_expired_email(&rec.email, &rec.name, rec.tracecoins_reserved).await; tracing::info!("Expired lead request {} and refunded {} tracecoins to {}", rec.lead_request_id, rec.tracecoins_reserved, rec.email); } diff --git a/apps/cron/src/tasks/requirements.rs b/apps/cron/src/tasks/requirements.rs index 033a55c..526b540 100644 --- a/apps/cron/src/tasks/requirements.rs +++ b/apps/cron/src/tasks/requirements.rs @@ -15,7 +15,7 @@ pub async fn expire_stale_leads( lead_id: Uuid, title: String, email: String, - full_name: String, + name: String, } let records = sqlx::query_as::<_, LeadRecord>( @@ -26,7 +26,7 @@ pub async fn expire_stale_leads( WHERE leads.created_by_user_id = u.id AND leads.status = 'OPEN' AND leads.expires_at < $1 - RETURNING leads.id as lead_id, leads.title, u.email, u.full_name + RETURNING leads.id as lead_id, leads.title, u.email, u.name "# ) .bind(now) @@ -40,7 +40,7 @@ pub async fn expire_stale_leads( tracing::info!("Expired {} stale leads.", records.len()); for rec in records { - let _ = mailer.send_requirement_expired_email(&rec.email, &rec.full_name, &rec.title).await; + let _ = mailer.send_requirement_expired_email(&rec.email, &rec.name, &rec.title).await; tracing::info!("Sent expiry email to {} for lead {}", rec.email, rec.lead_id); } diff --git a/apps/customers/src/handlers.rs b/apps/customers/src/handlers.rs index 61b1972..41bc22b 100644 --- a/apps/customers/src/handlers.rs +++ b/apps/customers/src/handlers.rs @@ -190,7 +190,7 @@ async fn submit_requirement( Ok(updated) => { // Fire email to customer (ignore failures) if let Ok(user) = UserRepository::get_by_id(&state.pool, auth.user_id).await { - let _ = state.mail.send_requirement_submitted_email(&user.email, user.full_name.as_deref().unwrap_or("User"), &updated.title).await; + let _ = state.mail.send_requirement_submitted_email(&user.email, user.name.as_deref().unwrap_or("User"), &updated.title).await; } // Create verification case so this request enters Verification Management first. diff --git a/apps/job_seekers/src/handlers.rs b/apps/job_seekers/src/handlers.rs index 70ac4d6..a3a3197 100644 --- a/apps/job_seekers/src/handlers.rs +++ b/apps/job_seekers/src/handlers.rs @@ -245,17 +245,17 @@ async fn apply_to_job( // Send email notification to company // Get company user details via raw query let company_user = sqlx::query_as::<_, (String, Option)>( - "SELECT u.email, u.full_name FROM users u INNER JOIN companies c ON c.user_id = u.id WHERE c.id = $1" + "SELECT u.email, u.name FROM users u INNER JOIN companies c ON c.user_id = u.id WHERE c.id = $1" ) .bind(job.company_id) .fetch_optional(&state.pool) .await; - if let Ok(Some((email, full_name))) = company_user { + if let Ok(Some((email, name))) = company_user { let seeker_name = seeker.full_name.as_deref().unwrap_or("A candidate"); let _ = state.mail.send_new_application_email( &email, - full_name.as_deref().unwrap_or("Company"), + name.as_deref().unwrap_or("Company"), &job.title, seeker_name ).await; diff --git a/crates/contracts/src/profession_shared.rs b/crates/contracts/src/profession_shared.rs index 4e75df3..13d9e48 100644 --- a/crates/contracts/src/profession_shared.rs +++ b/crates/contracts/src/profession_shared.rs @@ -374,7 +374,7 @@ async fn my_requests( sqlx::query_as::<_, RichLeadReq>( r#" SELECT lr.*, r.title as req_title, r.profession_key as req_profession_key, r.location as req_location, r.budget as req_budget, - CASE WHEN lr.status = 'ACCEPTED' THEN u.full_name ELSE NULL END as customer_name, + CASE WHEN lr.status = 'ACCEPTED' THEN u.name ELSE NULL END as customer_name, CASE WHEN lr.status = 'ACCEPTED' THEN u.email ELSE NULL END as customer_email, CASE WHEN lr.status = 'ACCEPTED' THEN u.phone ELSE NULL END as customer_phone FROM lead_requests lr @@ -390,7 +390,7 @@ async fn my_requests( sqlx::query_as::<_, RichLeadReq>( r#" SELECT lr.*, r.title as req_title, r.profession_key as req_profession_key, r.location as req_location, r.budget as req_budget, - CASE WHEN lr.status = 'ACCEPTED' THEN u.full_name ELSE NULL END as customer_name, + CASE WHEN lr.status = 'ACCEPTED' THEN u.name ELSE NULL END as customer_name, CASE WHEN lr.status = 'ACCEPTED' THEN u.email ELSE NULL END as customer_email, CASE WHEN lr.status = 'ACCEPTED' THEN u.phone ELSE NULL END as customer_phone FROM lead_requests lr @@ -567,7 +567,7 @@ async fn accepted_lead_detail( r.location AS requirement_location, r.profession_key, r.custom_fields, - u.full_name AS customer_name, + u.name AS customer_name, u.email AS customer_email, u.phone AS customer_phone FROM lead_requests lr