From 9e9d01c1332db5130a271db9882cb37418dc3f9b Mon Sep 17 00:00:00 2001 From: Santo Cariotti Date: Tue, 16 Mar 2021 13:00:38 +0100 Subject: feat: get all emails --- src/email/mod.rs | 2 ++ src/email/models.rs | 38 ++++++++++++++++++++++++++++++++++++++ src/email/routes.rs | 26 ++++++++++++++++++++++++++ src/main.rs | 2 ++ 4 files changed, 68 insertions(+) create mode 100644 src/email/mod.rs create mode 100644 src/email/models.rs create mode 100644 src/email/routes.rs (limited to 'src') diff --git a/src/email/mod.rs b/src/email/mod.rs new file mode 100644 index 0000000..a0e1883 --- /dev/null +++ b/src/email/mod.rs @@ -0,0 +1,2 @@ +pub mod models; +pub mod routes; diff --git a/src/email/models.rs b/src/email/models.rs new file mode 100644 index 0000000..477092d --- /dev/null +++ b/src/email/models.rs @@ -0,0 +1,38 @@ +use crate::db::get_client; +use crate::errors::AppError; + +use deadpool_postgres::Pool; +use serde::{Deserialize, Serialize}; +use tokio_pg_mapper::FromTokioPostgresRow; +use tokio_pg_mapper_derive::PostgresMapper; + +#[derive(Serialize, Deserialize, PostgresMapper)] +#[pg_mapper(table = "email")] +/// Emails model +pub struct Email { + pub email: String, + pub hash_md5: String, +} + +// Struct used to creare a new email +#[derive(Serialize, Deserialize)] +pub struct EmailData { + pub email: String, +} + +impl Email { + /// Find all emails, returns email and its MD5 hash + pub async fn find_all(pool: Pool) -> Result, AppError> { + let client = get_client(pool.clone()).await.unwrap(); + let statement = client.prepare("SELECT * FROM email").await?; + + let emails = client + .query(&statement, &[]) + .await? + .iter() + .map(|row| Email::from_row_ref(row).unwrap()) + .collect::>(); + + Ok(emails) + } +} diff --git a/src/email/routes.rs b/src/email/routes.rs new file mode 100644 index 0000000..06b74fb --- /dev/null +++ b/src/email/routes.rs @@ -0,0 +1,26 @@ +use crate::config::AppState; +use crate::email::models::Email; +use crate::errors::AppErrorResponse; +use actix_web::{web, HttpResponse, Responder}; +use slog::info; + +/// Endpoint used for retrieve all emails +async fn index(state: web::Data) -> impl Responder { + let result = Email::find_all(state.pool.clone()).await; + info!(state.log, "GET /email/"); + + match result { + Ok(emails) => HttpResponse::Ok().json(emails), + _ => HttpResponse::BadRequest().json(AppErrorResponse { + detail: "Error trying to read all emails from database" + .to_string(), + }), + } +} + +pub fn config(cfg: &mut web::ServiceConfig) { + cfg.service( + web::scope("/email") + .service(web::resource("{_:/?}").route(web::get().to(index))), + ); +} diff --git a/src/main.rs b/src/main.rs index 2c5532a..63f48fa 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,6 +3,7 @@ mod db; mod errors; mod helpers; +mod email; mod repository; use actix_web::{middleware, App, HttpServer}; @@ -35,6 +36,7 @@ async fn main() -> std::io::Result<()> { }) .wrap(middleware::Logger::default()) .configure(repository::routes::config) + .configure(email::routes::config) }) .bind(format!("{}:{}", config.server.host, config.server.port))? .run() -- cgit v1.2.3-18-g5258 From 517107f718d3474128028f1e72fce1a62150bd5d Mon Sep 17 00:00:00 2001 From: Santo Cariotti Date: Tue, 16 Mar 2021 13:51:34 +0100 Subject: chore: add doc for create repo endpoint --- src/repository/routes.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/repository/routes.rs b/src/repository/routes.rs index a0f4db5..abf77b6 100644 --- a/src/repository/routes.rs +++ b/src/repository/routes.rs @@ -80,6 +80,7 @@ async fn delete_repo( .map_err(|e| e) } +/// Endpoint used for create new repository async fn create_repo( req: HttpRequest, payload: web::Json, -- cgit v1.2.3-18-g5258 From 2689fe31f9f86ba190faea99635e62f624e3e02d Mon Sep 17 00:00:00 2001 From: Santo Cariotti Date: Tue, 16 Mar 2021 13:53:13 +0100 Subject: chore: better use of query_opt --- src/repository/models.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/repository/models.rs b/src/repository/models.rs index 1cbf3bb..e3d8456 100644 --- a/src/repository/models.rs +++ b/src/repository/models.rs @@ -180,12 +180,9 @@ impl Repository { }; let repo = client - .query(&statement, &[&uuid, &repo_name, &user_ip]) + .query_opt(&statement, &[&uuid, &repo_name, &user_ip]) .await? - .iter() - .map(|row| Repository::from_row_ref(row).unwrap()) - .collect::>() - .pop(); + .map(|row| Repository::from_row_ref(&row).unwrap()); match repo { Some(repo) => Ok(repo), -- cgit v1.2.3-18-g5258 From 651b9487c1467a5be5aa44726a6b4d1f606dcc70 Mon Sep 17 00:00:00 2001 From: Santo Cariotti Date: Tue, 16 Mar 2021 14:17:45 +0100 Subject: feat: create and search email --- src/email/models.rs | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++- src/email/routes.rs | 55 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 126 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/email/models.rs b/src/email/models.rs index 477092d..ed46026 100644 --- a/src/email/models.rs +++ b/src/email/models.rs @@ -1,11 +1,14 @@ use crate::db::get_client; -use crate::errors::AppError; +use crate::errors::{AppError, AppErrorType}; use deadpool_postgres::Pool; use serde::{Deserialize, Serialize}; use tokio_pg_mapper::FromTokioPostgresRow; use tokio_pg_mapper_derive::PostgresMapper; +use hex; +use md5::{Digest, Md5}; + #[derive(Serialize, Deserialize, PostgresMapper)] #[pg_mapper(table = "email")] /// Emails model @@ -35,4 +38,74 @@ impl Email { Ok(emails) } + + /// Search an email + pub async fn search( + pool: Pool, + email: &String, + ) -> Result { + let client = get_client(pool.clone()).await.unwrap(); + + let statement = + client.prepare("SELECT * FROM email WHERE email=$1").await?; + + let email = client + .query_opt(&statement, &[&email]) + .await? + .map(|row| Email::from_row_ref(&row).unwrap()); + + match email { + Some(email) => Ok(email), + None => Err(AppError { + error_type: AppErrorType::NotFoundError, + cause: None, + message: Some("Email not found".to_string()), + }), + } + } + + /// Create new email + pub async fn create( + pool: Pool, + data: &EmailData, + ) -> Result { + // Search an email that matches with that string, because if it's + // exists, the server cannot create a clone + match Email::search(pool.clone(), &data.email).await { + Ok(_) => { + return Err(AppError { + message: Some("Email already exists".to_string()), + cause: Some("".to_string()), + error_type: AppErrorType::AuthorizationError, + }); + } + Err(_) => {} + }; + + let client = get_client(pool.clone()).await.unwrap(); + + let mut hasher = Md5::new(); + hasher.update(&data.email.as_bytes()); + let hash_final = hasher.finalize(); + + let digest = hex::encode(&hash_final.as_slice()); + + let statement = client + .prepare("INSERT INTO email VALUES ($1, $2) RETURNING *") + .await?; + + let email = client + .query_opt(&statement, &[&data.email, &digest]) + .await? + .map(|row| Email::from_row_ref(&row).unwrap()); + + match email { + Some(email) => Ok(email), + None => Err(AppError { + message: Some("Error creating a new email".to_string()), + cause: Some("Unknown error".to_string()), + error_type: AppErrorType::DbError, + }), + } + } } diff --git a/src/email/routes.rs b/src/email/routes.rs index 06b74fb..14299eb 100644 --- a/src/email/routes.rs +++ b/src/email/routes.rs @@ -1,7 +1,9 @@ +use std::collections::HashMap; + use crate::config::AppState; -use crate::email::models::Email; +use crate::email::models::{Email, EmailData}; use crate::errors::AppErrorResponse; -use actix_web::{web, HttpResponse, Responder}; +use actix_web::{web, HttpRequest, HttpResponse, Responder}; use slog::info; /// Endpoint used for retrieve all emails @@ -18,9 +20,56 @@ async fn index(state: web::Data) -> impl Responder { } } +// Endpoint used for create new email +async fn create_email( + payload: web::Json, + state: web::Data, +) -> impl Responder { + info!(state.log, "POST /email/"); + let result = Email::create(state.pool.clone(), &payload).await; + + result + .map(|email| HttpResponse::Created().json(email)) + .map_err(|e| e) +} + +// Endpoint used for email search +async fn search_email( + req: HttpRequest, + state: web::Data, +) -> impl Responder { + let query = + web::Query::>::from_query(req.query_string()) + .unwrap(); + let email = match query.get("q") { + Some(x) => x, + None => { + return HttpResponse::NotFound().json(AppErrorResponse { + detail: "No email found".to_string(), + }); + } + }; + let result = Email::search(state.pool.clone(), email).await; + info!(state.log, "GET /email/search?q={}", email); + + match result { + Ok(email) => HttpResponse::Ok().json(email), + _ => HttpResponse::NotFound().json(AppErrorResponse { + detail: "No email found".to_string(), + }), + } +} pub fn config(cfg: &mut web::ServiceConfig) { cfg.service( web::scope("/email") - .service(web::resource("{_:/?}").route(web::get().to(index))), + .service( + web::resource("{_:/?}") + .route(web::get().to(index)) + .route(web::post().to(create_email)), + ) + .service( + web::resource("/search{_:/?}") + .route(web::get().to(search_email)), + ), ); } -- cgit v1.2.3-18-g5258