Improve error handling

src/area/v2.rs

@@ -98,7 +98,7 @@ pub async fn get_by_url_alias(
         .await?
         .interact(move |conn| Area::select_by_alias(&cloned_url_alias, conn))
         .await??;
-    area.ok_or(Error::HttpNotFound(format!(
+    area.ok_or(Error::NotFound(format!(
         "Area with url_alias = {url_alias} doesn't exist"
     )))
     .map(|it| it.into())

src/area/v3.rs

@@ -74,9 +74,7 @@ pub async fn get_by_id(id: Path<String>, pool: Data<Arc<Pool>>) -> Result<Json<G
         .await?
         .interact(move |conn| Area::select_by_id_or_alias(&id_clone, conn))
         .await??
-        .ok_or(Error::HttpNotFound(format!(
-            "Area with id {id} doesn't exist"
-        )))
+        .ok_or(Error::NotFound(format!("Area with id {id} doesn't exist")))
         .map(|it| it.into())
 }
 

src/area_element/v3.rs

@@ -76,7 +76,7 @@ pub async fn get_by_id(id: Path<i64>, pool: Data<Arc<Pool>>) -> Result<Json<GetI
         .await?
         .interact(move |conn| AreaElement::select_by_id(id_clone, conn))
         .await??
-        .ok_or(Error::HttpNotFound(format!(
+        .ok_or(Error::NotFound(format!(
             "Area-element mapping with id {id} doesn't exist"
         )))
         .map(|it| it.into())

src/element/v2.rs

@@ -104,7 +104,7 @@ pub async fn get_by_id(id: Path<String>, pool: Data<Arc<Pool>>) -> Result<Json<G
         .interact(move |conn| Element::select_by_osm_type_and_id(&r#type, id, conn))
         .await??
         .map(|it| it.into())
-        .ok_or(Error::HttpNotFound(format!(
+        .ok_or(Error::NotFound(format!(
             "Element with id {id} doesn't exist"
         )))
 }

src/element/v3.rs

@@ -83,7 +83,7 @@ pub async fn get_by_id(id: Path<String>, pool: Data<Arc<Pool>>) -> Result<Json<G
         .await?
         .interact(move |conn| Element::select_by_id_or_osm_id(&id_clone, conn))
         .await??
-        .ok_or(Error::HttpNotFound(format!(
+        .ok_or(Error::NotFound(format!(
             "Element with id {id} doesn't exist"
         )))
         .map(|it| it.into())

src/element_comment/v3.rs

@@ -89,7 +89,7 @@ pub async fn get_by_id(id: Path<i64>, pool: Data<Arc<Pool>>) -> Result<Json<GetI
         .await?
         .interact(move |conn| ElementComment::select_by_id(id_clone, conn))
         .await??
-        .ok_or(Error::HttpNotFound(format!(
+        .ok_or(Error::NotFound(format!(
             "Element comment with id {id} doesn't exist"
         )))
         .map(|it| it.into())

src/error.rs

@@ -6,6 +6,7 @@ use std::fmt::{Display, Formatter};
 
 #[derive(Debug)]
 pub enum Error {
+    NotFound(String),
     IO(std::io::Error),
     Rusqlite(rusqlite::Error),
     Reqwest(reqwest::Error),
@@ -19,7 +20,6 @@ pub enum Error {
     DeadpoolBuild(deadpool_sqlite::BuildError),
     HttpBadRequest(String),
     HttpUnauthorized(String),
-    HttpNotFound(String),
     HttpConflict(String),
     Generic(String),
     Parse(time::error::Parse),
@@ -29,6 +29,7 @@ pub enum Error {
 impl Display for Error {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
+            Error::NotFound(err) => write!(f, "{}", err),
             Error::IO(err) => err.fmt(f),
             Error::Rusqlite(err) => err.fmt(f),
             Error::Reqwest(err) => err.fmt(f),
@@ -41,7 +42,6 @@ impl Display for Error {
             Error::DeadpoolConfig(err) => err.fmt(f),
             Error::DeadpoolBuild(err) => err.fmt(f),
             Error::HttpBadRequest(err) => write!(f, "{}", err),
-            Error::HttpNotFound(err) => write!(f, "{}", err),
             Error::HttpConflict(err) => write!(f, "{}", err),
             Error::HttpUnauthorized(err) => write!(f, "{}", err),
             Error::Generic(err) => write!(f, "{}", err),
@@ -157,7 +157,7 @@ impl ResponseError for Error {
         match self {
             Error::HttpBadRequest(_) => StatusCode::BAD_REQUEST,
             Error::HttpUnauthorized(_) => StatusCode::UNAUTHORIZED,
-            Error::HttpNotFound(_) => StatusCode::NOT_FOUND,
+            Error::NotFound(_) => StatusCode::NOT_FOUND,
             Error::HttpConflict(_) => StatusCode::CONFLICT,
             _ => StatusCode::INTERNAL_SERVER_ERROR,
         }

src/event/v2.rs

@@ -108,7 +108,7 @@ pub async fn get_by_id(id: Path<i64>, pool: Data<Arc<Pool>>) -> Result<Json<GetI
         .interact(move |conn| Event::select_by_id(id, conn))
         .await??
         .map(|it| it.into())
-        .ok_or(Error::HttpNotFound(format!(
+        .ok_or(Error::NotFound(format!(
             "Event with id = {id} doesn't exist"
         )))
 }

src/event/v3.rs

@@ -118,7 +118,7 @@ pub async fn get_by_id(id: Path<i64>, pool: Data<Arc<Pool>>) -> Result<Json<GetI
         .interact(move |conn| Event::select_by_id(id, conn))
         .await??
         .map(|it| it.into())
-        .ok_or(Error::HttpNotFound(format!(
+        .ok_or(Error::NotFound(format!(
             "Event with id = {id} doesn't exist"
         )))
 }

src/report/v2.rs

@@ -114,7 +114,7 @@ pub async fn get_by_id(id: Path<i64>, pool: Data<Arc<Pool>>) -> Result<Json<GetI
         .interact(move |conn| Report::select_by_id(id, conn))
         .await??
         .map(|it| it.into())
-        .ok_or(Error::HttpNotFound(format!(
+        .ok_or(Error::NotFound(format!(
             "Report with id = {id} doesn't exist"
         )))
 }

src/report/v3.rs

@@ -91,7 +91,7 @@ pub async fn get_by_id(id: Path<i64>, pool: Data<Arc<Pool>>) -> Result<Json<GetI
         .interact(move |conn| Report::select_by_id(id, conn))
         .await??
         .map(|it| it.into())
-        .ok_or(Error::HttpNotFound(format!(
+        .ok_or(Error::NotFound(format!(
             "Report with id = {id} doesn't exist"
         )))
 }

src/user/v2.rs

@@ -98,7 +98,7 @@ pub async fn get_by_id(id: Path<i64>, pool: Data<Arc<Pool>>) -> Result<Json<GetI
         .interact(move |conn| User::select_by_id(id, conn))
         .await??
         .map(|it| it.into())
-        .ok_or(Error::HttpNotFound(format!(
+        .ok_or(Error::NotFound(format!(
             "User with id = {id} doesn't exist"
         )))
 }

src/user/v3.rs

@@ -84,7 +84,7 @@ pub async fn get_by_id(id: Path<i64>, pool: Data<Arc<Pool>>) -> Result<Json<GetI
         .interact(move |conn| User::select_by_id(id, conn))
         .await??
         .map(|it| it.into())
-        .ok_or(Error::HttpNotFound(format!(
+        .ok_or(Error::NotFound(format!(
             "User with id = {id} doesn't exist"
         )))
 }