Refactor RPC

Author: bubelov

src/rpc/handler.rs

@@ -432,7 +432,7 @@ pub async fn handle(
         ),
         RpcMethod::SetAreaTag => RpcResponse::from(
             req.id.clone(),
-            super::set_area_tag::run(params(req.params)?, &user.unwrap(), &pool, &conf).await?,
+            super::set_area_tag::run(params(req.params)?, &pool).await?,
         ),
         RpcMethod::RemoveAreaTag => RpcResponse::from(
             req.id.clone(),

src/rpc/mod.rs

@@ -22,7 +22,6 @@ pub mod handler;
 pub mod import;
 pub mod invoice;
 pub mod matrix;
-pub mod model;
 pub mod paywall_add_element_comment;
 pub mod paywall_boost_element;
 pub mod paywall_get_add_element_comment_quote;

src/rpc/model.rs

@@ -1,12 +1,12 @@
-use super::model::RpcArea;
 use crate::{
-    db::{conf::schema::Conf, user::schema::User},
-    service::{self, discord},
+    db::area::schema::Area,
+    service::{self},
     Result,
 };
 use deadpool_sqlite::Pool;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 use serde_json::{Map, Value};
+use time::OffsetDateTime;
 
 #[derive(Deserialize)]
 pub struct Params {
@@ -15,22 +15,35 @@ pub struct Params {
     pub value: Value,
 }
 
-pub async fn run(params: Params, user: &User, pool: &Pool, conf: &Conf) -> Result<RpcArea> {
+#[derive(Debug, Eq, PartialEq, Serialize)]
+pub struct Res {
+    pub id: i64,
+    pub tags: Map<String, Value>,
+    #[serde(with = "time::serde::rfc3339")]
+    pub created_at: OffsetDateTime,
+    #[serde(with = "time::serde::rfc3339")]
+    pub updated_at: OffsetDateTime,
+    #[serde(with = "time::serde::rfc3339::option")]
+    pub deleted_at: Option<OffsetDateTime>,
+}
+
+impl From<Area> for Res {
+    fn from(val: Area) -> Self {
+        Res {
+            id: val.id,
+            tags: val.tags,
+            created_at: val.created_at,
+            updated_at: val.updated_at,
+            deleted_at: val.deleted_at,
+        }
+    }
+}
+
+pub async fn run(params: Params, pool: &Pool) -> Result<Res> {
     let patch_set = Map::from_iter([(params.name.clone(), params.value.clone())].into_iter());
-    let area = service::area::patch_tags(&params.id, patch_set, pool).await?;
-    discord::send(
-        format!(
-            "{} set tag {} = {} for area {} ({})",
-            user.name,
-            params.name,
-            serde_json::to_string(&params.value)?,
-            area.name(),
-            area.id,
-        ),
-        discord::Channel::Api,
-        conf,
-    );
-    Ok(area.into())
+    service::area::patch_tags(&params.id, patch_set, pool)
+        .await
+        .map(Into::into)
 }
 
 #[cfg(test)]