1 files changed, 33 insertions, 26 deletions

diff --git a/src/api/artist.rs b/src/api/artist.rs
index 81ae773..155f982 100644
--- a/src/api/artist.rs
+++ b/src/api/artist.rs
@@ -1,8 +1,10 @@
+use crate::api::{get_response_from_query, Response};
 use crate::database::{Artist, ArtistPost, ArtistPut, Delete};
 use crate::AppState;
 use actix_web::{delete, get, post, put, web, HttpResponse};
 use serde::Deserialize;
 
+/* Possible arguments ( /artist?arg=value ) */
 #[derive(Deserialize)]
 struct ArtistQueryOptions {
     id: Option<String>,
@@ -14,20 +16,23 @@ pub async fn get_artist(
     app_state: web::Data<AppState>,
     get_args: web::Query<ArtistQueryOptions>,
 ) -> HttpResponse {
-    let default = String::from("");
+    /* Avoid lifespan issues */
+    let default = String::default();
 
+    /* Handle individual result for search-by-id */
     if get_args.id.is_some() {
         let id: &str = get_args.id.as_ref().unwrap_or(&default);
-        let search_attempt: sqlx::Result<Option<Artist>> =
+        let query_result: sqlx::Result<Option<Artist>> =
             app_state.database.select_artist_by_id(id).await;
 
-        return match search_attempt {
+        return match query_result {
             Ok(song_list) => HttpResponse::Ok().json(song_list),
             Err(e) => HttpResponse::Ok().body(format!("{}", e)),
         };
     }
 
-    let search_attempt: sqlx::Result<Vec<Artist>, sqlx::Error> = match true {
+    /* Handle N results */
+    let query_result: sqlx::Result<Vec<Artist>, sqlx::Error> = match true {
         _ if get_args.name.is_some() => {
             let name: &str = &get_args.name.as_ref().unwrap_or(&default);
             app_state.database.select_artists_by_name(name).await
@@ -35,7 +40,7 @@ pub async fn get_artist(
         _ => app_state.database.select_artists().await,
     };
 
-    match search_attempt {
+    match query_result {
         Ok(artist_list) => HttpResponse::Ok().json(artist_list),
         Err(e) => HttpResponse::Ok().body(format!("{}", e)),
     }
@@ -44,35 +49,35 @@ pub async fn get_artist(
 #[post("/artist")]
 pub async fn post_artist(
     app_state: web::Data<AppState>,
-    post_data: web::Json<ArtistPost>,
+    request_data: web::Json<ArtistPost>,
 ) -> HttpResponse {
-    match app_state
-        .database
-        .create_artist(post_data.into_inner())
-        .await
-    {
-        Ok(_) => HttpResponse::Ok().body("Post succeeded\n"),
-        Err(e) => HttpResponse::Ok().body(format!("{}", e)),
-    }
+    get_response_from_query(
+        app_state
+            .database
+            .create_artist(request_data.into_inner())
+            .await,
+        "POST".to_string(),
+    )
 }
 
 #[put("/artist")]
 pub async fn put_artist(
     app_state: web::Data<AppState>,
-    post_data: web::Json<ArtistPut>,
+    request_data: web::Json<ArtistPut>,
 ) -> HttpResponse {
-    match app_state.database.edit_artist(post_data.into_inner()).await {
-        Ok(_) => HttpResponse::Ok().body("Put succeeded\n"),
-        Err(e) => HttpResponse::Ok().body(format!("{}", e)),
-    }
+    get_response_from_query(
+        app_state.database.edit_artist(request_data.into_inner()).await,
+        "PUT".to_string(),
+    )
 }
 
 #[delete("/artist")]
 pub async fn delete_artist(
     app_state: web::Data<AppState>,
-    post_data: web::Json<Delete>,
+    request_data: web::Json<Delete>,
 ) -> HttpResponse {
-    let id: i32 = post_data
+    /* Check if ID is valid (return -1 if invalid) */
+    let id: i32 = request_data
         .into_inner()
         .id
         .unwrap_or(String::default())
@@ -80,11 +85,13 @@ pub async fn delete_artist(
         .unwrap_or(-1);
 
     if id == -1 {
-        return HttpResponse::Ok().body("Invalid id value, code not executed\n");
+        return HttpResponse::BadRequest().json(Response {
+            message: "Invalid id value, code not executed\n".to_owned(),
+        });
     }
 
-    match app_state.database.delete_artist(id).await {
-        Ok(_) => HttpResponse::Ok().body("Deletion succeeded\n\n"),
-        Err(e) => HttpResponse::Ok().body(format!("There was an issue in the request:\n{}", e)),
-    }
+    get_response_from_query(
+        app_state.database.delete_artist(id).await,
+        "DELETE".to_string(),
+    )
 }