kg333
/
tenebrous-dicebot
forked from projectmoon/tenebrous-dicebot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Return key not found error if value not found for user.

This commit is contained in:
projectmoon 2021-05-18 15:37:20 +00:00
parent 257f3a066c
commit 5e899cd962
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/db/sqlite/variables.rs
View File

@ -53,14 +53,11 @@ impl Variables for Database {
room_id, room_id,
variable_name variable_name
) )
.fetch_one(&self.conn) .fetch_optional(&self.conn)
.await?; .await?;
// .map_err(|e| match e {
// sqlx::Error::RowNotFound => Err(DataError::KeyDoesNotExist(variable_name.clone())),
// _ => Err(e.into()),
// })?;
Ok(row.value) row.map(|r| r.value)
.ok_or_else(|| DataError::KeyDoesNotExist(variable_name.to_string()))
} }
async fn set_user_variable( async fn set_user_variable(
@ -144,8 +141,11 @@ mod tests {
let value = db.get_user_variable("myuser", "myroom", "myvariable").await; let value = db.get_user_variable("myuser", "myroom", "myvariable").await;
println!("{:?}", value);
assert!(value.is_err()); assert!(value.is_err());
assert!(matches!(
value.err().unwrap(),
DataError::KeyDoesNotExist(_)
));
} }
#[tokio::test(flavor = "multi_thread", worker_threads = 1)] #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
@ -161,7 +161,10 @@ mod tests {
.get_user_variable("myuser2", "myroom", "myvariable") .get_user_variable("myuser2", "myroom", "myvariable")
.await; .await;
println!("{:?}", value);
assert!(value.is_err()); assert!(value.is_err());
assert!(matches!(
value.err().unwrap(),
DataError::KeyDoesNotExist(_)
));
} }
} }