diff --git a/apps/customers/src/admin.rs b/apps/customers/src/admin.rs index 294882f..68247f5 100644 --- a/apps/customers/src/admin.rs +++ b/apps/customers/src/admin.rs @@ -42,10 +42,10 @@ async fn list_leads( ) -> Result { let requirements = sqlx::query_as::<_, Requirement>( r#" - SELECT id, customer_id, profession_key, title, description, location, budget, - preferred_date, extra_data_json, status, rejection_reason, request_count, accepted_count, + SELECT id, created_by_user_id, profession_key, title, description, location, budget_inr, + required_date, extra_data_json, status, rejection_reason, request_count, accepted_count, expires_at, approved_at, approved_by, created_at, updated_at - FROM requirements + FROM leads ORDER BY created_at DESC LIMIT 100 "#, diff --git a/apps/users/src/handlers/pricing.rs b/apps/users/src/handlers/pricing.rs index 5e7f996..fd6882c 100644 --- a/apps/users/src/handlers/pricing.rs +++ b/apps/users/src/handlers/pricing.rs @@ -113,12 +113,20 @@ struct ExistingPackageRow { #[derive(Deserialize)] struct PackageQuery { role: Option, + #[serde(rename = "roleKey", alias = "role_key")] + role_key: Option, } async fn public_list_packages( State(state): State, Query(params): Query, ) -> impl IntoResponse { + let requested_role = params + .role + .or(params.role_key) + .map(|r| r.trim().to_uppercase()) + .filter(|r| !r.is_empty() && r != "PROFESSIONAL"); + let rows = sqlx::query_as::<_, PackageRow>( r#" SELECT id, name, role_key, package_type, tracecoins_amount, price_inr, description, is_active @@ -128,7 +136,7 @@ async fn public_list_packages( ORDER BY role_key, price_inr "#, ) - .bind(params.role) + .bind(requested_role) .fetch_all(&state.pool) .await;