Improve error handling

src/rpc/get_area.rs

@@ -1,5 +1,5 @@
 use super::model::RpcArea;
-use crate::{admin, area::Area, Result};
+use crate::{admin, area::Area, Error, Result};
 use deadpool_sqlite::Pool;
 use jsonrpc_v2::{Data, Params};
 use serde::Deserialize;
@@ -15,11 +15,14 @@ pub struct Args {
 
 pub async fn run(Params(args): Params<Args>, pool: Data<Arc<Pool>>) -> Result<RpcArea> {
     admin::service::check_rpc(&args.password, NAME, &pool).await?;
+    let cloned_id = args.id.clone();
     let area = pool
         .get()
         .await?
-        .interact(move |conn| Area::select_by_id_or_alias(&args.id, conn))
-        .await??
-        .unwrap();
-    Ok(area.into())
+        .interact(move |conn| Area::select_by_id_or_alias(&cloned_id, conn))
+        .await??;
+    area.map(|it| it.into()).ok_or(Error::HttpNotFound(format!(
+        "There is no area with id or alias = {}",
+        args.id
+    )))
 }