7928e21a21
- Remove duplicate departments/designations/employees handlers from users service (already in employees service) - Fix all 9 profession admin handlers to use correct DB schema (display_name, bio, location, custom_data) - Fix companies admin handler to match CompanyProfile DB model with all fields - Fix customers admin handler to match Requirement model with preferred_date - Fix missing serde_json imports and type annotations in admin handlers - Add #[allow(dead_code)] for intentionally unused structs/fields - Add test infrastructure: auth crypto tests (2 passing), test directory structure - Zero compilation warnings across all services
81 lines
2.4 KiB
Rust
81 lines
2.4 KiB
Rust
use contracts::ProfessionState;
|
|
use db::models::makeup_artist::MakeupArtistProfile;
|
|
use axum::{extract::{Path, State}, http::StatusCode, response::IntoResponse, routing::get, Json, Router};
|
|
use serde::Serialize;
|
|
use uuid::Uuid;
|
|
|
|
#[derive(Serialize)]
|
|
pub struct AdminMakeupArtistList {
|
|
pub id: Uuid,
|
|
pub user_id: Uuid,
|
|
pub display_name: Option<String>,
|
|
pub bio: Option<String>,
|
|
pub location: Option<String>,
|
|
pub status: String,
|
|
pub created_at: chrono::DateTime<chrono::Utc>,
|
|
pub updated_at: chrono::DateTime<chrono::Utc>,
|
|
}
|
|
|
|
impl From<MakeupArtistProfile> for AdminMakeupArtistList {
|
|
fn from(p: MakeupArtistProfile) -> Self {
|
|
Self {
|
|
id: p.id,
|
|
user_id: p.user_id,
|
|
display_name: p.display_name,
|
|
bio: p.bio,
|
|
location: p.location,
|
|
status: p.status,
|
|
created_at: p.created_at,
|
|
updated_at: p.updated_at,
|
|
}
|
|
}
|
|
}
|
|
|
|
pub fn router() -> Router<ProfessionState> {
|
|
Router::new()
|
|
.route("/", get(list_makeup_artists))
|
|
.route("/{id}", get(get_makeup_artist))
|
|
}
|
|
|
|
async fn list_makeup_artists(
|
|
State(state): State<ProfessionState>,
|
|
) -> Result<impl IntoResponse, (StatusCode, String)> {
|
|
let artists = sqlx::query_as!(
|
|
MakeupArtistProfile,
|
|
r#"
|
|
SELECT id, user_id, display_name, bio, location, custom_data, status, created_at, updated_at
|
|
FROM makeup_artist_profiles
|
|
ORDER BY created_at DESC
|
|
LIMIT 100
|
|
"#
|
|
)
|
|
.fetch_all(&state.pool)
|
|
.await
|
|
.map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, format!("DB error: {e}")))?;
|
|
|
|
let list: Vec<AdminMakeupArtistList> = artists.into_iter().map(|p| p.into()).collect();
|
|
Ok(Json(list))
|
|
}
|
|
|
|
async fn get_makeup_artist(
|
|
State(state): State<ProfessionState>,
|
|
Path(id): Path<Uuid>,
|
|
) -> Result<impl IntoResponse, (StatusCode, String)> {
|
|
let artist = sqlx::query_as!(
|
|
MakeupArtistProfile,
|
|
r#"
|
|
SELECT id, user_id, display_name, bio, location, custom_data, status, created_at, updated_at
|
|
FROM makeup_artist_profiles
|
|
WHERE id = $1
|
|
"#,
|
|
id
|
|
)
|
|
.fetch_optional(&state.pool)
|
|
.await
|
|
.map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, format!("DB error: {e}")))?;
|
|
|
|
match artist {
|
|
Some(a) => Ok(Json(AdminMakeupArtistList::from(a))),
|
|
None => Err((StatusCode::NOT_FOUND, "Makeup Artist not found".to_string())),
|
|
}
|
|
}
|