Refactor area model

src/area/model.rs

@@ -1,7 +1,6 @@
 use crate::{Error, Result};
 use geojson::{GeoJson, Geometry};
 use rusqlite::{named_params, Connection, OptionalExtension, Row};
-use serde::Serialize;
 use serde_json::{Map, Value};
 use std::{
     thread::sleep,
@@ -10,15 +9,12 @@ use std::{
 use time::{format_description::well_known::Rfc3339, OffsetDateTime};
 use tracing::{debug, error, info};
 
-#[derive(Debug, Eq, PartialEq, Serialize)]
+#[derive(Debug, Eq, PartialEq)]
 pub struct Area {
     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>,
 }
 

src/rpc/add_area.rs

@@ -1,6 +1,7 @@
+use super::model::RpcArea;
+use crate::auth::Token;
 use crate::Result;
 use crate::{area, discord};
-use crate::{area::Area, auth::Token};
 use deadpool_sqlite::Pool;
 use jsonrpc_v2::{Data, Params};
 use serde::Deserialize;
@@ -14,7 +15,7 @@ pub struct Args {
     pub tags: Map<String, Value>,
 }
 
-pub async fn run(Params(args): Params<Args>, pool: Data<Arc<Pool>>) -> Result<Area> {
+pub async fn run(Params(args): Params<Args>, pool: Data<Arc<Pool>>) -> Result<RpcArea> {
     let token = pool
         .get()
         .await?
@@ -34,5 +35,5 @@ pub async fn run(Params(args): Params<Args>, pool: Data<Arc<Pool>>) -> Result<Ar
     );
     info!(log_message);
     discord::send_message_to_channel(&log_message, discord::CHANNEL_API).await;
-    Ok(area)
+    Ok(area.into())
 }

src/rpc/get_area.rs

@@ -1,3 +1,4 @@
+use super::model::RpcArea;
 use crate::{area::Area, auth::Token, Result};
 use deadpool_sqlite::Pool;
 use jsonrpc_v2::{Data, Params};
@@ -10,7 +11,7 @@ pub struct Args {
     pub id: String,
 }
 
-pub async fn run(Params(args): Params<Args>, pool: Data<Arc<Pool>>) -> Result<Area> {
+pub async fn run(Params(args): Params<Args>, pool: Data<Arc<Pool>>) -> Result<RpcArea> {
     pool.get()
         .await?
         .interact(move |conn| Token::select_by_secret(&args.token, conn))
@@ -22,5 +23,5 @@ pub async fn run(Params(args): Params<Args>, pool: Data<Arc<Pool>>) -> Result<Ar
         .interact(move |conn| Area::select_by_id_or_alias(&args.id, conn))
         .await??
         .unwrap();
-    Ok(area)
+    Ok(area.into())
 }

src/rpc/mod.rs

@@ -8,6 +8,7 @@ pub mod get_element;
 pub mod get_most_commented_countries;
 pub mod get_trending_communities;
 pub mod get_trending_countries;
+pub mod model;
 pub mod remove_area;
 pub mod remove_area_tag;
 pub mod remove_element_tag;

src/rpc/model.rs

@@ -0,0 +1,28 @@
+use crate::area::Area;
+use serde::Serialize;
+use serde_json::{Map, Value};
+use time::OffsetDateTime;
+
+#[derive(Debug, Eq, PartialEq, Serialize)]
+pub struct RpcArea {
+    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 Into<RpcArea> for Area {
+    fn into(self) -> RpcArea {
+        RpcArea {
+            id: self.id,
+            tags: self.tags,
+            created_at: self.created_at,
+            updated_at: self.updated_at,
+            deleted_at: self.deleted_at,
+        }
+    }
+}

src/rpc/remove_area.rs

@@ -1,4 +1,4 @@
-use crate::area::Area;
+use super::model::RpcArea;
 use crate::Result;
 use crate::{area, auth::Token, discord};
 use deadpool_sqlite::Pool;
@@ -13,7 +13,7 @@ pub struct Args {
     pub id: String,
 }
 
-pub async fn run(Params(args): Params<Args>, pool: Data<Arc<Pool>>) -> Result<Area> {
+pub async fn run(Params(args): Params<Args>, pool: Data<Arc<Pool>>) -> Result<RpcArea> {
     let token = pool
         .get()
         .await?
@@ -33,5 +33,5 @@ pub async fn run(Params(args): Params<Args>, pool: Data<Arc<Pool>>) -> Result<Ar
     );
     info!(log_message);
     discord::send_message_to_channel(&log_message, discord::CHANNEL_API).await;
-    Ok(area)
+    Ok(area.into())
 }

src/rpc/remove_area_tag.rs

@@ -1,5 +1,6 @@
+use super::model::RpcArea;
 use crate::{
-    area::{self, Area},
+    area::{self},
     auth::Token,
     discord, Result,
 };
@@ -16,7 +17,7 @@ pub struct Args {
     pub tag: String,
 }
 
-pub async fn run(Params(args): Params<Args>, pool: Data<Arc<Pool>>) -> Result<Area> {
+pub async fn run(Params(args): Params<Args>, pool: Data<Arc<Pool>>) -> Result<RpcArea> {
     let token = pool
         .get()
         .await?
@@ -38,5 +39,5 @@ pub async fn run(Params(args): Params<Args>, pool: Data<Arc<Pool>>) -> Result<Ar
     );
     info!(log_message);
     discord::send_message_to_channel(&log_message, discord::CHANNEL_API).await;
-    Ok(area)
+    Ok(area.into())
 }

src/rpc/set_area_tag.rs

@@ -1,5 +1,6 @@
+use super::model::RpcArea;
 use crate::{
-    area::{self, Area},
+    area::{self},
     auth::Token,
     discord, Result,
 };
@@ -18,7 +19,7 @@ pub struct Args {
     pub value: Value,
 }
 
-pub async fn run(Params(args): Params<Args>, pool: Data<Arc<Pool>>) -> Result<Area> {
+pub async fn run(Params(args): Params<Args>, pool: Data<Arc<Pool>>) -> Result<RpcArea> {
     let token = pool
         .get()
         .await?
@@ -42,5 +43,5 @@ pub async fn run(Params(args): Params<Args>, pool: Data<Arc<Pool>>) -> Result<Ar
     );
     info!(log_message);
     discord::send_message_to_channel(&log_message, discord::CHANNEL_API).await;
-    Ok(area)
+    Ok(area.into())
 }