diff --git a/software/api-server/src/routes/cabinets.rs b/software/api-server/src/routes/cabinets.rs index 119eb70..81dc0fa 100644 --- a/software/api-server/src/routes/cabinets.rs +++ b/software/api-server/src/routes/cabinets.rs @@ -70,7 +70,7 @@ pub async fn list_cabinets( let db = &state.mysql; let rows = sqlx::query_as::<_, CabinetRow>( - r#"SELECT id, project_id, abstract_id, imei, name, status + r#"SELECT id, project_id, abstract_id, imei, iccid, name, address, status FROM cabinets WHERE project_id = ? ORDER BY id"#, ) .bind(project_id) diff --git a/software/api-server/src/routes/organizations.rs b/software/api-server/src/routes/organizations.rs index 8f4d7c9..e12bf34 100644 --- a/software/api-server/src/routes/organizations.rs +++ b/software/api-server/src/routes/organizations.rs @@ -64,7 +64,11 @@ pub struct CabinetRow { pub project_id: Option, pub abstract_id: String, pub imei: String, + #[serde(skip_serializing_if = "Option::is_none")] + pub iccid: Option, pub name: Option, + #[serde(skip_serializing_if = "Option::is_none")] + pub address: Option, pub status: i8, }