Split bot and service

service/src/db/messages/mod.rs

@@ -1,3 +1,5 @@
 mod model;
+mod routes;
 
 pub use model::*;
+pub use routes::init_routes;

service/src/db/messages/model.rs

@@ -1,10 +1,11 @@
 use diesel::prelude::*;
+use serde::{Deserialize, Serialize};
 
-use crate::db::schema::messages;
+use crate::{db::schema::messages::{self}, error_handler::ServiceError};
 
-#[derive(Queryable, Selectable)]
+#[derive(Queryable, Selectable, Serialize, Deserialize)]
 #[diesel(table_name = messages)]
-pub struct MessageDB {
+pub struct QueryMessage {
   pub id: String,
   pub guild_id: i64,
   pub channel_id: i64,
@@ -17,17 +18,132 @@ pub struct MessageDB {
   pub response_tags: Vec<String>,
 }
 
-#[derive(Insertable)]
+pub struct QueryFilters {
+  pub by_id: Option<String>,
+  pub by_guild_id: Option<i64>,
+  pub by_channel_id: Option<i64>,
+  pub by_user_id: Option<i64>,
+  pub by_model: Option<String>,
+  pub by_request: Option<String>,
+  pub by_response: Option<String>,
+  pub by_request_tags: Option<Vec<String>>,
+  pub by_response_tags: Option<Vec<String>>
+}
+
+impl Default for QueryFilters {
+  fn default() -> Self {
+    QueryFilters {
+      by_id: None,
+      by_guild_id: None,
+      by_channel_id: None,
+      by_user_id: None,
+      by_model: None,
+      by_request: None,
+      by_response: None,
+      by_request_tags: None,
+      by_response_tags: None
+    }
+  }
+}
+
+impl QueryMessage {
+  pub fn get_all(filters: &QueryFilters, limit: i32, page: i32) -> Result<Vec<Self>, ServiceError> {
+    let mut conn = crate::db::connection()?;
+    let mut query = messages::table.limit(limit as i64).order(messages::created.asc()).into_boxed();
+    // Limit query to page and limit
+    let offset = (page - 1) * limit;
+    query = query.offset(offset as i64);
+    // Apply filters
+    if let Some(id) = &filters.by_id {
+      query = query.filter(messages::id.eq(id));
+    }
+    if let Some(guild_id) = &filters.by_guild_id {
+      query = query.filter(messages::guild_id.eq(guild_id));
+    }
+    if let Some(channel_id) = &filters.by_channel_id {
+      query = query.filter(messages::channel_id.eq(channel_id));
+    }
+    if let Some(user_id) = &filters.by_user_id {
+      query = query.filter(messages::user_id.eq(user_id));
+    }
+    if let Some(model) = &filters.by_model {
+      query = query.filter(messages::model.eq(model));
+    }
+    if let Some(request) = &filters.by_request {
+      query = query.filter(messages::request.eq(request));
+    }
+    if let Some(response) = &filters.by_response {
+      query = query.filter(messages::response.eq(response));
+    }
+    if let Some(request_tags) = &filters.by_request_tags {
+      query = query.filter(messages::request_tags.eq(request_tags));
+    }
+    if let Some(response_tags) = &filters.by_response_tags {
+      query = query.filter(messages::response_tags.eq(response_tags));
+    }
+    // Execute query
+    let messages = query.load::<Self>(&mut conn)?;
+    Ok(messages)
+  }
+
+  pub fn get_count(fitlers: &QueryFilters) -> Result<i64, ServiceError> {
+    let mut conn = crate::db::connection()?;
+    let mut query = messages::table.into_boxed();
+    // Apply filters
+    if let Some(id) = &fitlers.by_id {
+      query = query.filter(messages::id.eq(id));
+    }
+    if let Some(guild_id) = &fitlers.by_guild_id {
+      query = query.filter(messages::guild_id.eq(guild_id));
+    }
+    if let Some(channel_id) = &fitlers.by_channel_id {
+      query = query.filter(messages::channel_id.eq(channel_id));
+    }
+    if let Some(user_id) = &fitlers.by_user_id {
+      query = query.filter(messages::user_id.eq(user_id));
+    }
+    if let Some(model) = &fitlers.by_model {
+      query = query.filter(messages::model.eq(model));
+    }
+    if let Some(request) = &fitlers.by_request {
+      query = query.filter(messages::request.eq(request));
+    }
+    if let Some(response) = &fitlers.by_response {
+      query = query.filter(messages::response.eq(response));
+    }
+    if let Some(request_tags) = &fitlers.by_request_tags {
+      query = query.filter(messages::request_tags.eq(request_tags));
+    }
+    if let Some(response_tags) = &fitlers.by_response_tags {
+      query = query.filter(messages::response_tags.eq(response_tags));
+    }
+    // Execute query
+    let count = query.count().get_result::<i64>(&mut conn)?;
+    Ok(count)
+  }
+}
+
+#[derive(Insertable, AsChangeset, Serialize, Deserialize)]
 #[diesel(table_name = messages)]
-pub struct NewMessageDB<'a> {
-  pub id: &'a str,
+pub struct InsertMessage {
+  pub id: String,
   pub guild_id: i64,
   pub channel_id: i64,
   pub user_id: i64,
   pub created: i64,
-  pub model: &'a str,
-  pub request: &'a str,
-  pub response: &'a str,
-  pub request_tags: Vec<&'a str>,
-  pub response_tags: Vec<&'a str>,
+  pub model: String,
+  pub request: String,
+  pub response: String,
+  pub request_tags: Vec<String>,
+  pub response_tags: Vec<String>,
+}
+
+impl InsertMessage {
+  pub fn insert(message: Self) -> Result<QueryMessage, ServiceError> {
+    let mut conn = crate::db::connection()?;
+    let message = diesel::insert_into(messages::table)
+      .values(message)
+      .get_result(&mut conn)?;
+    Ok(message)
+  }
 }

service/src/db/messages/routes.rs

@@ -0,0 +1,79 @@
+use actix_web::{get, post, web, HttpResponse, HttpRequest, ResponseError};
+use log::error;
+use serde::{Serialize, Deserialize};
+
+use crate::{db::{messages::{QueryMessage, QueryFilters, InsertMessage}, GetResponse, Metadata}, error_handler::ServiceError};
+
+#[derive(Serialize, Deserialize)]
+struct GetAllParams {
+  id: Option<String>,
+  guild_id: Option<i64>,
+  channel_id: Option<i64>,
+  user_id: Option<i64>,
+  model: Option<String>,
+  request: Option<String>,
+  response: Option<String>,
+  request_tags: Option<Vec<String>>,
+  response_tags: Option<Vec<String>>,
+  limit: Option<i32>,
+  page: Option<i32>,
+}
+
+#[get("/messages")]
+async fn get_all(req: HttpRequest) -> HttpResponse {
+  let params = match web::Query::<GetAllParams>::from_query(req.query_string()) {
+    Ok(params) => params,
+    Err(err) => return ResponseError::error_response(&ServiceError {
+      status: 422,
+      message: err.to_string()
+    })
+  };
+  let mut filters = QueryFilters::default();
+  filters.by_id = params.id.clone();
+  filters.by_guild_id = params.guild_id;
+  filters.by_channel_id = params.channel_id;
+  filters.by_user_id = params.user_id;
+  filters.by_model = params.model.clone();
+  filters.by_request = params.request.clone();
+  filters.by_response = params.response.clone();
+  filters.by_request_tags = params.request_tags.clone();
+  filters.by_response_tags = params.response_tags.clone();
+  let limit = params.limit.unwrap_or(100);
+  let total_count = QueryMessage::get_count(&filters).unwrap();
+  let max_page = std::cmp::max((total_count as f64 / limit as f64).ceil() as i32, 1);
+  let page = std::cmp::min(std::cmp::max(params.page.unwrap_or(1), 1), max_page);
+  
+  match QueryMessage::get_all(&filters, limit, page) {
+    Ok(messages) => {
+      HttpResponse::Ok().json(GetResponse {
+        data: messages,
+        metadata: Some(Metadata {
+          total: total_count as i32,
+          limit,
+          page,
+          pages: max_page
+        })
+      })
+    },
+    Err(err) => {
+      error!("{:?}", err.message);
+      ResponseError::error_response(&err)
+    }
+  }
+}
+
+#[post("/messages")]
+async fn create(message: web::Json<InsertMessage>) -> HttpResponse {
+  match InsertMessage::insert(message.into_inner()) {
+    Ok(message) => HttpResponse::Created().json(message),
+    Err(err) => {
+      error!("{:?}", err.message);
+      ResponseError::error_response(&err)
+    }
+  }
+}
+
+pub fn init_routes(config: &mut web::ServiceConfig) {
+  config.service(get_all);
+  config.service(create);
+}

service/src/db/spells/routes.rs

@@ -74,7 +74,7 @@ async fn get_all(req: HttpRequest) -> HttpResponse {
   // Limit must be between 1 and 100
   let limit = std::cmp::min(std::cmp::max(params.limit.unwrap_or(20), 1), 100);
   let total_count = QuerySpell::get_count(&filters).unwrap();
-  let max_page = std::cmp::max(1, (total_count as f64 / limit as f64).ceil() as i32);
+  let max_page = std::cmp::max((total_count as f64 / limit as f64).ceil() as i32, 1);
   // Page must be between 1 and max_page
   let page = std::cmp::min(std::cmp::max(params.page.unwrap_or(1), 1), max_page);