diff --git a/json-api/db/src/badges.rs b/json-api/db/src/badges.rs index 799f5af..8577d90 100644 --- a/json-api/db/src/badges.rs +++ b/json-api/db/src/badges.rs @@ -37,12 +37,12 @@ async fn get(pool: &Pool, id: u64) -> SqlResult> { let q = "SELECT name, color, permissions FROM badges WHERE id = :id"; let row: Option<(String, u32, u64)> = conn.exec_first(q, params!{ "id" => id}).await?; match row { - Some(row) => { + Some((name, color, perms)) => { let b = Badge { id, - name: row.0, - color: row.1, - perms: row.2, + name, + color, + perms }; Ok(Some(b)) }, diff --git a/json-api/src/badges.rs b/json-api/src/badges.rs index 7ab8a89..f892b9f 100644 --- a/json-api/src/badges.rs +++ b/json-api/src/badges.rs @@ -100,7 +100,9 @@ pub async fn update_name(p: &Pool, response: &mut Response, params: HashMa set_json_body(response, json!({"badge-update": payload})); } }, - Ok(false) => {}, + Ok(false) => { + *response.status_mut() = StatusCode::NOT_FOUND; + }, Err(e) => { eprintln!("[HTTP][ERROR] /badges/update/name {}", e); *response.status_mut() = StatusCode::INTERNAL_SERVER_ERROR; @@ -115,9 +117,8 @@ pub async fn update_name(p: &Pool, response: &mut Response, params: HashMa pub async fn delete(p: &Pool, response: &mut Response, params: HashMap) { if let Some(id) = qs_param!(params, "badge_id", u64) { match db::badges::delete(p, id).await { - Ok(id) => { + Ok(_id) => { // TODO: add rtc notification here - println!("TODO remove me at some point {}", id); }, Err(e) => { eprintln!("[HTTP][ERROR] /badge/delete {}", e);