From 6a7a49fb3804d0d27bbaee08b6feb26b4973b4bc Mon Sep 17 00:00:00 2001 From: niliara-edu Date: Wed, 22 Jan 2025 14:10:08 +0100 Subject: prepare for api --- src/routes/album.rs | 94 ------------------------------------------- src/routes/artist.rs | 90 ----------------------------------------- src/routes/search_results.rs | 55 ------------------------- src/routes/song.rs | 96 -------------------------------------------- 4 files changed, 335 deletions(-) delete mode 100644 src/routes/album.rs delete mode 100644 src/routes/artist.rs delete mode 100644 src/routes/search_results.rs delete mode 100644 src/routes/song.rs (limited to 'src/routes') diff --git a/src/routes/album.rs b/src/routes/album.rs deleted file mode 100644 index ab82e2e..0000000 --- a/src/routes/album.rs +++ /dev/null @@ -1,94 +0,0 @@ -use crate::database::{Album, AlbumPost, AlbumPut, Delete}; -use crate::AppState; -use actix_web::{delete, get, post, put, web, HttpResponse}; -use serde::Deserialize; - -#[derive(Deserialize)] -struct AlbumQueryOptions { - id: Option, - name: Option, - artist: Option, -} - -#[get("/album")] -pub async fn get_album( - app_state: web::Data, - get_args: web::Query, -) -> HttpResponse { - let default = String::from(""); - - if get_args.id.is_some() { - let id: &str = get_args.id.as_ref().unwrap_or(&default); - let search_attempt: sqlx::Result> = - app_state.database.select_album_by_id(id).await; - - return match search_attempt { - Ok(song_list) => HttpResponse::Ok().json(song_list), - Err(e) => HttpResponse::Ok().body(format!("{}", e)), - }; - } - let search_attempt: sqlx::Result, 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_albums_by_name(name).await - } - _ if get_args.artist.is_some() => { - let artist: &str = &get_args.artist.as_ref().unwrap_or(&default); - app_state.database.select_albums_by_artist(artist).await - } - _ => app_state.database.select_albums().await, - }; - - match search_attempt { - Ok(album_list) => HttpResponse::Ok().json(album_list), - Err(e) => HttpResponse::Ok().body(format!("{}", e)), - } -} - -#[post("/album")] -pub async fn post_album( - app_state: web::Data, - post_data: web::Json, -) -> HttpResponse { - match app_state - .database - .create_album(post_data.into_inner()) - .await - { - Ok(_) => HttpResponse::Ok().body("Post succeeded\n"), - Err(e) => HttpResponse::Ok().body(format!("{}", e)), - } -} - -#[put("/album")] -pub async fn put_album( - app_state: web::Data, - post_data: web::Json, -) -> HttpResponse { - match app_state.database.edit_album(post_data.into_inner()).await { - Ok(_) => HttpResponse::Ok().body("Put succeeded\n"), - Err(e) => HttpResponse::Ok().body(format!("{}", e)), - } -} - -#[delete("/album")] -pub async fn delete_album( - app_state: web::Data, - post_data: web::Json, -) -> HttpResponse { - let id: i32 = post_data - .into_inner() - .id - .unwrap_or(String::default()) - .parse::() - .unwrap_or(-1); - - if id == -1 { - return HttpResponse::Ok().body("Invalid id value, code not executed\n"); - } - - match app_state.database.delete_album(id).await { - Ok(_) => HttpResponse::Ok().body("Deletion succeeded\n"), - Err(e) => HttpResponse::Ok().body(format!("There was an issue in the request:\n{}", e)), - } -} diff --git a/src/routes/artist.rs b/src/routes/artist.rs deleted file mode 100644 index 81ae773..0000000 --- a/src/routes/artist.rs +++ /dev/null @@ -1,90 +0,0 @@ -use crate::database::{Artist, ArtistPost, ArtistPut, Delete}; -use crate::AppState; -use actix_web::{delete, get, post, put, web, HttpResponse}; -use serde::Deserialize; - -#[derive(Deserialize)] -struct ArtistQueryOptions { - id: Option, - name: Option, -} - -#[get("/artist")] -pub async fn get_artist( - app_state: web::Data, - get_args: web::Query, -) -> HttpResponse { - let default = String::from(""); - - if get_args.id.is_some() { - let id: &str = get_args.id.as_ref().unwrap_or(&default); - let search_attempt: sqlx::Result> = - app_state.database.select_artist_by_id(id).await; - - return match search_attempt { - Ok(song_list) => HttpResponse::Ok().json(song_list), - Err(e) => HttpResponse::Ok().body(format!("{}", e)), - }; - } - - let search_attempt: sqlx::Result, 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 - } - _ => app_state.database.select_artists().await, - }; - - match search_attempt { - Ok(artist_list) => HttpResponse::Ok().json(artist_list), - Err(e) => HttpResponse::Ok().body(format!("{}", e)), - } -} - -#[post("/artist")] -pub async fn post_artist( - app_state: web::Data, - post_data: web::Json, -) -> 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)), - } -} - -#[put("/artist")] -pub async fn put_artist( - app_state: web::Data, - post_data: web::Json, -) -> 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)), - } -} - -#[delete("/artist")] -pub async fn delete_artist( - app_state: web::Data, - post_data: web::Json, -) -> HttpResponse { - let id: i32 = post_data - .into_inner() - .id - .unwrap_or(String::default()) - .parse::() - .unwrap_or(-1); - - if id == -1 { - return HttpResponse::Ok().body("Invalid id value, code not executed\n"); - } - - 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)), - } -} diff --git a/src/routes/search_results.rs b/src/routes/search_results.rs deleted file mode 100644 index 3056aef..0000000 --- a/src/routes/search_results.rs +++ /dev/null @@ -1,55 +0,0 @@ -use crate::database::{Album, Artist, Song}; -use crate::AppState; -use actix_web::{get, web, HttpResponse}; -use serde::Deserialize; - -#[derive(Deserialize)] -struct SearchQueryOptions { - id: Option, - name: Option, -} - -#[get("/searchResults")] -pub async fn search_results( - app_state: web::Data, - get_args: web::Query, -) -> HttpResponse { - let default: String = String::from(""); - - if get_args.id.is_some() { - let id: &str = get_args.id.as_ref().unwrap_or(&default); - let search_attempt: ( - sqlx::Result, sqlx::Error>, - sqlx::Result, sqlx::Error>, - sqlx::Result, sqlx::Error>, - ) = { app_state.database.search_results_by_id(id).await }; - - return HttpResponse::Ok().json(( - search_attempt.0.unwrap_or(None), - search_attempt.1.unwrap_or(None), - search_attempt.2.unwrap_or(None), - )); - }; - - let search_attempt: ( - sqlx::Result, sqlx::Error>, - sqlx::Result, sqlx::Error>, - sqlx::Result, sqlx::Error>, - ) = match true { - _ if get_args.name.is_some() => { - app_state - .database - .search_results_by_name(&get_args.name.clone().unwrap()) - .await - } - _ => app_state.database.search_results().await, // Err(sqlx::Error::RowNotFound), - // Err(sqlx::Error::RowNotFound), - // Err(sqlx::Error::RowNotFound), - }; - - return HttpResponse::Ok().json(( - search_attempt.0.unwrap_or(Vec::new()), - search_attempt.1.unwrap_or(Vec::new()), - search_attempt.2.unwrap_or(Vec::new()), - )); -} diff --git a/src/routes/song.rs b/src/routes/song.rs deleted file mode 100644 index 850c759..0000000 --- a/src/routes/song.rs +++ /dev/null @@ -1,96 +0,0 @@ -use crate::database::{Delete, Song, SongPost, SongPut}; -use crate::AppState; -use actix_web::{delete, get, post, put, web, HttpResponse}; -use serde::Deserialize; - -#[derive(Deserialize)] -struct SongQueryOptions { - id: Option, - name: Option, - artist: Option, - album: Option, -} - -#[get("/song")] -pub async fn get_song( - app_state: web::Data, - get_args: web::Query, -) -> HttpResponse { - let default = String::from(""); - - if get_args.id.is_some() { - let id: &str = get_args.id.as_ref().unwrap_or(&default); - let search_attempt: sqlx::Result> = - app_state.database.select_song_by_id(id).await; - - return match search_attempt { - Ok(song_list) => HttpResponse::Ok().json(song_list), - Err(e) => HttpResponse::Ok().body(format!("{}", e)), - }; - } - - let search_attempt: sqlx::Result> = match true { - _ if get_args.name.is_some() => { - let name: &str = get_args.name.as_ref().unwrap_or(&default); - app_state.database.select_songs_by_name(name).await - } - _ if get_args.album.is_some() => { - let album: &str = get_args.album.as_ref().unwrap_or(&default); - app_state.database.select_songs_by_album(album).await - } - _ if get_args.artist.is_some() => { - let artist: &str = get_args.artist.as_ref().unwrap_or(&default); - app_state.database.select_songs_by_artist(artist).await - } - _ => app_state.database.select_songs().await, - }; - - match search_attempt { - Ok(song_list) => HttpResponse::Ok().json(song_list), - Err(e) => HttpResponse::Ok().body(format!("{}", e)), - } -} - -#[post("/song")] -pub async fn post_song( - app_state: web::Data, - post_data: web::Json, -) -> HttpResponse { - match app_state.database.create_song(post_data.into_inner()).await { - Ok(_) => HttpResponse::Ok().body("Post succeeded\n"), - Err(e) => HttpResponse::Ok().body(format!("{}", e)), - } -} - -#[put("/song")] -pub async fn put_song( - app_state: web::Data, - post_data: web::Json, -) -> HttpResponse { - match app_state.database.edit_song(post_data.into_inner()).await { - Ok(_) => HttpResponse::Ok().body("Put succeeded\n"), - Err(e) => HttpResponse::Ok().body(format!("{}", e)), - } -} - -#[delete("/song")] -pub async fn delete_song( - app_state: web::Data, - post_data: web::Json, -) -> HttpResponse { - let id: i32 = post_data - .into_inner() - .id - .unwrap_or(String::default()) - .parse::() - .unwrap_or(-1); - - if id == -1 { - return HttpResponse::Ok().body("Invalid id value, code not executed\n"); - } - - match app_state.database.delete_song(id).await { - Ok(_) => HttpResponse::Ok().body("Deletion succeeded\n"), - Err(e) => HttpResponse::Ok().body(format!("There was an issue in the request:\n{}", e)), - } -} -- cgit v1.2.3