delete and update refactor

Author: David Silva

src/articles/model.rs

@@ -30,7 +30,26 @@ pub mod article {
     pub content: String,
     pub created_at: String,
   }
-
+  
+  // @todo -> How to unify struct ArticleRequest with ArticleUpdateRequest | If possible unify with ArticleModel, why not?
+  #[derive(Serialize, Deserialize)]
+  pub struct ArticleRequest {
+    pub author: String,
+    pub title: String,
+    pub content: String,
+    pub created_at: String,
+  }
+    
+  #[derive(Serialize, Deserialize)]
+  pub struct ArticleUpdateRequest {
+    #[serde(rename = "_id")]
+    pub _id: String,
+    pub author: String,
+    pub title: String,
+    pub content: String,
+    pub created_at: String,
+  }
+  
   pub async fn _all() -> Result<Vec<ArticleModel>> {
     let database_url = env::var("DATABASE_URL").expect("DATABASE_URL is not set in .env file");
     let db = Client::with_uri_str(&database_url).await?.database(MONGO_DB);
@@ -57,17 +76,7 @@ pub mod article {
 
     Ok(doc)
   }
-
-
-  // @todo -> How to unify struct ArticleRequest with ArticleUpdateRequest
-  #[derive(Serialize, Deserialize)]
-  pub struct ArticleRequest {
-      pub author: String,
-      pub title: String,
-      pub content: String,
-      pub created_at: String,
-  }
-
+  
   pub async fn _create(_article: web::Json<ArticleRequest>) -> Result<ArticleModel> {
     let database_url = env::var("DATABASE_URL").expect("DATABASE_URL is not set in .env file");
     let db = Client::with_uri_str(&database_url).await?.database(MONGO_DB);
@@ -85,25 +94,47 @@ pub mod article {
     Ok(to_save)
   }
 
-  pub async fn _update(_article: bson::Document, query: bson::Document) -> Result<Option<ArticleModel>> {
+  pub async fn _update(_article:  web::Json<ArticleUpdateRequest>) -> Result<()> {
     let database_url = env::var("DATABASE_URL").expect("DATABASE_URL is not set in .env file");
     let db = Client::with_uri_str(&database_url).await?.database(MONGO_DB);
 
-    let doc = ArticleModel::find_one(&db, query, None).await?;
-    println!("{:?}", doc);
+    // This is bad code, how to dont pass all params? -> need improve
+    let to_update = ArticleModel {
+      id: serde::__private::Some(ObjectId::with_string(&_article._id.clone()).unwrap()), //  bad code
+      author: _article.author.clone(),
+      created_at: _article.created_at.clone(),
+      title: _article.title.clone(),
+      content: _article.content.clone(),
+    };
+
+    let document = doc! {
+      "author": _article.author.clone(),
+      "created_at": _article.created_at.clone(),
+      "title": _article.title.clone(),
+      "content": _article.content.clone(),
+    };
+
+    to_update.update(&db, None, doc!{"$set": document}, None).await?;   
 
-    Ok(doc)
+    Ok(()) // it's work but is better return with document
   }
 
-  pub async fn _delete(query: bson::Document) -> Result<Option<ArticleModel>> {
+  pub async fn _delete(query: bson::oid::ObjectId) -> Result<mongodb::results::DeleteResult> {
     let database_url = env::var("DATABASE_URL").expect("DATABASE_URL is not set in .env file");
     let db = Client::with_uri_str(&database_url).await?.database(MONGO_DB);
 
-    let doc = ArticleModel::find_one(&db, query, None).await?;
-    println!("{:?}", doc);
+    // This is bad code, how to dont pass all params? -> need improve
+    let to_delete = ArticleModel {
+      id: serde::__private::Some(query),
+      author: String::from(""),
+      title: String::from(""),
+      content: String::from(""),
+      created_at: String::from(""),
+    };
+    
+    let doc = ArticleModel::delete(&to_delete, &db).await?;
 
     Ok(doc)
   }
-
- 
+  
 }

src/articles/routes.rs

@@ -2,23 +2,11 @@ use actix_web::{get, post, put, delete, web, HttpResponse, Responder};
 use bson::doc;
 use mongodb::{bson};
 use bson::oid::ObjectId;
-use serde::{Deserialize, Serialize};
 
 use crate::articles::{article};
 
-#[derive(Serialize, Deserialize)]
-pub struct ArticleUpdateRequest {
-    #[serde(rename = "_id")]
-    pub _id: String,
-    pub author: String,
-    pub title: String,
-    pub content: String,
-    pub created_at: String,
-}
-
 /**
 * Crud Basic Operations
-* @todo -> refactor remove and update methods
 */
 
 #[get("/articles")]
@@ -54,21 +42,21 @@ pub async fn store(article: web::Json<article::ArticleRequest>) -> impl Responde
 
 #[delete("/articles/{id}")]
 pub async fn remove(id: web::Path<String>) -> impl Responder {
-    let object_id = ObjectId::with_string(&id).unwrap();
-    let deleted = article::_delete(doc! { "_id": object_id }).await;
-    
+    let object_id = match ObjectId::with_string(&id) {
+        Ok(obj) => obj,
+        Err(_) => ObjectId::with_string("").unwrap() // This is bad code -> need improve
+    };
+
+    let deleted = article::_delete(object_id).await;
     match deleted {
         Ok(deleted) => HttpResponse::Ok().json(deleted),
         _ => HttpResponse::InternalServerError().finish()
     }
 }
 
-// @todo -> Conseguir pegar o path junto com o body, só consegui pegar um dos dois
 #[put("/articles/{id}")]
-pub async fn update(article: web::Json<ArticleUpdateRequest>) -> impl Responder {
-    let doc = doc!{"$set": doc! {"author": &article.author, "created_at": &article.created_at, "title": &article.title, "content": &article.content}};
-    let object_id = ObjectId::with_string(&article._id).unwrap();
-    let updated = article::_update(doc, doc! { "_id": object_id }).await;
+pub async fn update(article: web::Json<article::ArticleUpdateRequest>) -> impl Responder {
+    let updated = article::_update(article).await;
 
     match updated {
         Ok(updated) => HttpResponse::Ok().json(updated),