1 files changed, 8 insertions, 22 deletions
diff --git a/src/api/search_results.rs b/src/api/search_results.rs
index 6456ff9..9ccb013 100644
--- a/src/api/search_results.rs
+++ b/src/api/search_results.rs
@@ -1,11 +1,12 @@
-use crate::database::{Album, Artist, Song};
+use crate::database::album::Album;
+use crate::database::artist::Artist;
+use crate::database::song::Song;
 use crate::AppState;
 use actix_web::{get, web, HttpResponse};
 use serde::Deserialize;
 
 #[derive(Deserialize)]
 struct SearchQueryOptions {
-    id: Option<String>,
     name: Option<String>,
 }
 
@@ -14,23 +15,6 @@ pub async fn search_results(
     app_state: web::Data<AppState>,
     get_args: web::Query<SearchQueryOptions>,
 ) -> 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<Option<Artist>, sqlx::Error>,
-            sqlx::Result<Option<Album>, sqlx::Error>,
-            sqlx::Result<Option<Song>, 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<Vec<Artist>, sqlx::Error>,
         sqlx::Result<Vec<Album>, sqlx::Error>,
@@ -42,9 +26,11 @@ pub async fn search_results(
                 .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),
+        _ => (
+            Err(sqlx::Error::RowNotFound),
+            Err(sqlx::Error::RowNotFound),
+            Err(sqlx::Error::RowNotFound)
+        ),
     };
 
     return HttpResponse::Ok().json((