Refactor RPC

Author: bubelov

src/rpc/set_area_icon.rs

@@ -1,10 +1,14 @@
-use super::model::RpcArea;
-use crate::{db, Result};
+use crate::{
+    db::{self, area::schema::Area},
+    Result,
+};
 use base64::prelude::*;
 use deadpool_sqlite::Pool;
-use serde::Deserialize;
+use geojson::JsonObject;
+use serde::{Deserialize, Serialize};
 use serde_json::Map;
 use std::{fs::OpenOptions, io::Write};
+use time::OffsetDateTime;
 
 #[derive(Deserialize)]
 pub struct Params {
@@ -13,7 +17,31 @@ pub struct Params {
     pub icon_ext: String,
 }
 
-pub async fn run(params: Params, pool: &Pool) -> Result<RpcArea> {
+#[derive(Debug, Eq, PartialEq, Serialize)]
+pub struct Res {
+    pub id: i64,
+    pub tags: JsonObject,
+    #[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 area = db::area::queries::select_by_id_or_alias(&params.id, pool).await?;
     let file_name = format!("{}.{}", area.id, params.icon_ext);
     let bytes = BASE64_STANDARD.decode(params.icon_base64)?;