Updated

Author: Bastian Gruber

ch_04/final/src/main.rs

@@ -1,13 +1,12 @@
 use parking_lot::RwLock;
-use std::{sync::Arc, collections::HashMap};
 use serde::{Deserialize, Serialize};
+use std::{collections::HashMap, sync::Arc};
 use warp::{
-    http::Method, 
-    Filter,
     filters::{body::BodyDeserializeError, cors::CorsForbidden},
+    http::Method,
     http::StatusCode,
     reject::Reject,
-    Rejection, Reply,
+    Filter, Rejection, Reply,
 };
 
 #[derive(Deserialize, Serialize, Debug, Clone)]
@@ -20,12 +19,14 @@ struct Question {
 #[derive(Deserialize, Serialize, Debug, Clone, PartialEq, Eq, Hash)]
 struct QuestionId(String);
 
+#[derive(Deserialize, Serialize, Debug, Clone, PartialEq, Eq, Hash)]
+struct AnswerId(String);
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 struct Answer {
-    id: String,
+    id: AnswerId,
     content: String,
-    question_id: String,
+    question_id: QuestionId,
 }
 
 #[derive(Debug)]
@@ -34,11 +35,10 @@ struct Pagination {
     end: usize,
 }
 
-
 #[derive(Clone)]
 struct Store {
     questions: Arc<RwLock<HashMap<QuestionId, Question>>>,
-    answers: Arc<RwLock<HashMap<String, Answer>>>,
+    answers: Arc<RwLock<HashMap<AnswerId, Answer>>>,
 }
 
 impl Store {
@@ -75,7 +75,6 @@ impl std::fmt::Display for Error {
 impl Reject for Error {}
 
 async fn return_error(r: Rejection) -> Result<impl Reply, Rejection> {
-    println!("{:?}", r);
     if let Some(error) = r.find::<Error>() {
         Ok(warp::reply::with_status(
             error.to_string(),
@@ -99,7 +98,6 @@ async fn return_error(r: Rejection) -> Result<impl Reply, Rejection> {
     }
 }
 
-
 fn extract_pagination(params: HashMap<String, String>) -> Result<Pagination, Error> {
     if params.contains_key("start") && params.contains_key("end") {
         return Ok(Pagination {
@@ -141,7 +139,7 @@ async fn add_question(
     store
         .questions
         .write()
-        .insert(question.clone().id, question);
+        .insert(question.id.clone(), question);
 
     Ok(warp::reply::with_status("Question added", StatusCode::OK))
 }
@@ -159,10 +157,7 @@ async fn update_question(
     Ok(warp::reply::with_status("Question updated", StatusCode::OK))
 }
 
-async fn delete_question(
-    id: String,
-    store: Store,
-) -> Result<impl warp::Reply, warp::Rejection> {
+async fn delete_question(id: String, store: Store) -> Result<impl warp::Reply, warp::Rejection> {
     match store.questions.write().remove(&QuestionId(id)) {
         Some(_) => return Ok(warp::reply::with_status("Question deleted", StatusCode::OK)),
         None => return Err(warp::reject::custom(Error::QuestionNotFound)),
@@ -174,12 +169,12 @@ async fn add_answer(
     params: HashMap<String, String>,
 ) -> Result<impl warp::Reply, warp::Rejection> {
     let answer = Answer {
-        id: "CI001".to_string(),
+        id: AnswerId("1".to_string()),
         content: params.get("content").unwrap().to_string(),
-        question_id: params.get("questionId").unwrap().to_string(),
+        question_id: QuestionId(params.get("questionId").unwrap().to_string()),
     };
 
-    store.answers.write().insert(answer.clone().id, answer);
+    store.answers.write().insert(answer.id.clone(), answer);
 
     Ok(warp::reply::with_status("Answer added", StatusCode::OK))
 }