Removing code

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "soaricarus_api"
-version = "0.5.7"
+version = "0.5.4"
 edition = "2024"
 rust-version = "1.95"
 license = "MIT"
@@ -10,26 +10,26 @@ description = "Core API for interacting with soaricarus"
 axum = { version = "0.8.9", features = ["multipart"] }
 axum-extra = { version = "0.12.6", features = ["cookie"] }
 openssl = { version = "0.10.81", features = ["vendored"] }
-serde = { version = "1.0.229", features = ["derive"] }
-serde_json = { version = "1.0.151" }
-tokio = { version = "1.53.1", features = ["full"] }
-tokio-util = { version = "0.7.19", features = ["io"] }
+serde = { version = "1.0.228", features = ["derive"] }
+serde_json = { version = "1.0.150" }
+tokio = { version = "1.52.3", features = ["full"] }
+tokio-util = { version = "0.7.18", features = ["io"] }
 tower = { version = "0.5.3", features = ["full"] }
 tower-http = { version = "0.7.0", features = ["cors", "timeout"] }
 tracing-subscriber = "0.3.23"
-futures = { version = "0.3.34" }
+futures = { version = "0.3.32" }
 mime_guess = { version = "2.0.5" }
-uuid = { version = "1.24.1", features = ["v4", "serde"] }
+uuid = { version = "1.23.5", features = ["v4", "serde"] }
 sqlx = { version = "0.9.0", features = ["postgres", "runtime-tokio", "tls-native-tls", "time", "uuid"] }
-time = { version = "0.3.55", features = ["formatting", "macros", "parsing", "serde"]  }
+time = { version = "0.3.53", features = ["formatting", "macros", "parsing", "serde"]  }
 jsonwebtoken = { version = "10.3.0", features = ["rust_crypto"] }
 josekit = { version = "0.10.3" }
 utoipa = { version = "5.5.0", features = ["axum_extras"] }
 utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] }
-simeta = { git = "ssh://git@git.kundeng.us/phoenix/simeta.git", tag = "v0.6.2" }
-simodels = { git = "ssh://git@git.kundeng.us/phoenix/simodels.git", tag = "v0.11.5-main-94d97cb81d-111" }
-sienvy = { git = "ssh://git@git.kundeng.us/phoenix/sienvy.git", tag = "v0.8.1" }
-labyrinth = { git = "ssh://git@git.kundeng.us/phoenix/labyrinth.git", tag = "v0.0.5" }
+simeta = { git = "ssh://git@git.kundeng.us/phoenix/simeta.git", tag = "v0.6.1-main-b690995806-680" }
+simodels = { git = "ssh://git@git.kundeng.us/phoenix/simodels.git", tag = "v0.11.3-main-fe9d101bd0-111" }
+sienvy = { git = "ssh://git@git.kundeng.us/phoenix/sienvy.git", tag = "v0.8.0-main-d06c8fdf49-006" }
+labyrinth = { git = "ssh://git@git.kundeng.us/phoenix/labyrinth.git", tag = "v0.0.4" }
 
 [dev-dependencies]
 common-multipart-rfc7578 = { version = "0.7.0" }

migrations/20250420185217_init_migration.sql

@@ -63,7 +63,6 @@ CREATE TABLE IF NOT EXISTS "song" (
     date_created timestamptz DEFAULT now(),
     filename TEXT NOT NULL,
     directory TEXT NOT NULL,
-    file_key TEXT NOT NULL,
     user_id UUID NULL
     -- TODO: Add coverart id later. This will allow multiple songs to be linked to a single cover art
 );
@@ -74,6 +73,5 @@ CREATE TABLE IF NOT EXISTS "coverart" (
     directory TEXT NOT NULL,
     filename TEXT NOT NULL,
     file_type TEXT NOT NULL,
-    file_key TEXT NOT NULL,
     song_id UUID NOT NULL
 );

src/callers/coverart.rs

@@ -99,7 +99,7 @@ pub mod endpoint {
                             raw_data: data,
                             ..Default::default()
                         };
-                        let new_file_key = format!("processed/coverart/{filename}");
+                        let new_file_key = format!("processed/song/{filename}");
 
                         match lr.upload(&new_file_key, &data).await {
                             Ok(_resp) => {
@@ -127,9 +127,14 @@ pub mod endpoint {
                                 coverart.title = song.album.clone();
                                 coverart.file_type = file_type.file_type;
                                 coverart.data = data.raw_data;
-                                coverart.file_key = new_file_key;
 
-                                match repo::coverart::create(&pool, &coverart, &payload.song_id)
+                                match coverart.save_to_filesystem() {
+                                    Ok(_) => {
+                                        match repo::coverart::create(
+                                            &pool,
+                                            &coverart,
+                                            &payload.song_id,
+                                        )
                                         .await
                                         {
                                             Ok(id) => {
@@ -144,7 +149,19 @@ pub mod endpoint {
                                             }
                                             Err(err) => {
                                                 response.message = err.to_string();
-                                        (axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
+                                                (
+                                                    axum::http::StatusCode::BAD_REQUEST,
+                                                    axum::Json(response),
+                                                )
+                                            }
+                                        }
+                                    }
+                                    Err(err) => {
+                                        response.message = err.to_string();
+                                        (
+                                            axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                                            axum::Json(response),
+                                        )
                                     }
                                 }
                             }
@@ -232,11 +249,8 @@ pub mod endpoint {
         axum::Extension(pool): axum::Extension<sqlx::PgPool>,
         axum::extract::Path(id): axum::extract::Path<uuid::Uuid>,
     ) -> (axum::http::StatusCode, axum::response::Response) {
-        let lab_config = crate::util::maze::get_config();
-        let lr = labyrinth::Labyrinth { config: lab_config };
-
         match repo::coverart::get_coverart(&pool, &id).await {
-            Ok(coverart) => match lr.download(&coverart.file_key).await {
+            Ok(coverart) => match simodels::coverart::io::to_data(&coverart) {
                 Ok(data) => {
                     let (file_type, img_type) =
                         match simeta::detection::coverart::file_type_from_data(&data) {

src/callers/queue/coverart.rs

@@ -182,7 +182,7 @@ pub mod endpoint {
 
                     let lr = labyrinth::Labyrinth { config: lab_config };
                     let data = labyrinth::Data {
-                        raw_data,
+                        raw_data: raw_data,
                         ..Default::default()
                     };
 

src/callers/song.rs

@@ -159,14 +159,8 @@ pub mod endpoint {
                             }
                         }
 
-                        song.file_key = format!("processed/song/{}", song.filename);
-                        let data_of_song = labyrinth::Data {
-                            raw_data: song.data.clone(),
-                            ..Default::default()
-                        };
-
-                        match lr.upload(&song.file_key, &data_of_song).await {
-                            Ok(_resp) => match repo::song::insert(&pool, &song).await {
+                        match song.save_to_filesystem() {
+                            Ok(_) => match repo::song::insert(&pool, &song).await {
                                 Ok((date_created, id)) => {
                                     song.id = id;
                                     song.date_created = Some(date_created);
@@ -182,7 +176,7 @@ pub mod endpoint {
                                 }
                             },
                             Err(err) => {
-                                eprintln!("Error: {err:?}");
+                                response.message = err.to_string();
                                 (
                                     axum::http::StatusCode::INTERNAL_SERVER_ERROR,
                                     axum::Json(response),
@@ -296,41 +290,17 @@ pub mod endpoint {
         axum::extract::Path(id): axum::extract::Path<uuid::Uuid>,
     ) -> impl IntoResponse {
         match repo::song::get_song(&pool, &id).await {
-            Ok(mut song) => {
-                let lab_config = crate::util::maze::get_config();
-                let lr = labyrinth::Labyrinth { config: lab_config };
-
-                match lr.download(&song.file_key).await {
-                    Ok(data) => {
-                        song.filename = simodels::song::generate_filename(
-                            simodels::types::MusicType::FlacExtension,
-                            true,
-                        )
-                        .unwrap();
-                        // TODO: At some point, directory will no longer be needed with s3
-                        song.directory = sienvy::environment::get_root_directory().value;
-                        song.data = data;
-
-                        match song.save_to_filesystem() {
-                            Ok(_) => {
+            Ok(song) => {
                 let song_path = song.song_path().unwrap();
                 let path = std::path::Path::new(&song_path);
 
                 if !path.starts_with(&song.directory) || !path.exists() {
-                                    return Err((
-                                        axum::http::StatusCode::NOT_FOUND,
-                                        "File not found",
-                                    ));
+                    return Err((axum::http::StatusCode::NOT_FOUND, "File not found"));
                 }
 
                 let file = match tokio::fs::File::open(&path).await {
                     Ok(file) => file,
-                                    Err(_) => {
-                                        return Err((
-                                            axum::http::StatusCode::NOT_FOUND,
-                                            "File not found",
-                                        ));
-                                    }
+                    Err(_) => return Err((axum::http::StatusCode::NOT_FOUND, "File not found")),
                 };
 
                 let file_size = match file.metadata().await {
@@ -352,34 +322,8 @@ pub mod endpoint {
                     .header("content-length", file_size.to_string())
                     .body(axum::body::Body::from_stream(stream))
                     .unwrap();
-                                match song.remove_from_filesystem() {
-                                    Ok(_) => Ok(rep),
-                                    Err(err) => {
-                                        eprintln!("Error: {err:?}");
-                                        Err((
-                                            axum::http::StatusCode::INTERNAL_SERVER_ERROR,
-                                            "Could not read file",
-                                        ))
-                                    }
-                                }
-                            }
-                            Err(err) => {
-                                eprintln!("Error: {err:?}");
-                                Err((
-                                    axum::http::StatusCode::INTERNAL_SERVER_ERROR,
-                                    "Could not find file",
-                                ))
-                            }
-                        }
-                    }
-                    Err(err) => {
-                        eprintln!("Error: {err:?}");
-                        Err((
-                            axum::http::StatusCode::INTERNAL_SERVER_ERROR,
-                            "Could not find file",
-                        ))
-                    }
-                }
+
+                Ok(rep)
             }
             Err(_err) => Err((
                 axum::http::StatusCode::INTERNAL_SERVER_ERROR,
@@ -403,11 +347,8 @@ pub mod endpoint {
         axum::Extension(pool): axum::Extension<sqlx::PgPool>,
         axum::extract::Path(id): axum::extract::Path<uuid::Uuid>,
     ) -> (axum::http::StatusCode, axum::response::Response) {
-        let lab_config = crate::util::maze::get_config();
-        let lr = labyrinth::Labyrinth { config: lab_config };
-
         match repo::song::get_song(&pool, &id).await {
-            Ok(song) => match lr.download(&song.file_key).await {
+            Ok(song) => match simodels::song::io::to_data(&song) {
                 Ok(data) => {
                     let bytes = axum::body::Bytes::from(data);
                     let mut response = bytes.into_response();
@@ -456,8 +397,6 @@ pub mod endpoint {
         axum::Json<super::response::delete_song::Response>,
     ) {
         let mut response = super::response::delete_song::Response::default();
-        let lab_config = crate::util::maze::get_config();
-        let lr = labyrinth::Labyrinth { config: lab_config };
 
         match repo::song::get_song(&pool, &id).await {
             Ok(song) => {
@@ -481,7 +420,7 @@ pub mod endpoint {
                                     match repo::coverart::delete_coverart(&pool, &coverart.id).await
                                     {
                                         Ok(deleted_coverart) => {
-                                            match lr.delete(&song.file_key).await {
+                                            match song.remove_from_filesystem() {
                                                 Ok(_) => match coverart.remove_from_filesystem() {
                                                     Ok(_) => {
                                                         response.message = String::from(
@@ -499,7 +438,7 @@ pub mod endpoint {
                                                     }
                                                 },
                                                 Err(err) => {
-                                                    eprintln!("Error: {err:?}");
+                                                    response.message = err.to_string();
                                                     (axum::http::StatusCode::INTERNAL_SERVER_ERROR, axum::Json(response))
                                                 }
                                             }

src/main.rs

@@ -500,128 +500,10 @@ mod tests {
     }
 
     mod sequence_flow {
-        pub const TEST_SONG_01_FILE_KEY: &str = "processed/song/track01.flac";
-        pub const TEST_SONG_02_FILE_KEY: &str = "processed/song/track02.flac";
-
-        pub const TEST_COVERART_01_FILE_KEY: &str = "processed/coverart/Coverart-1.jpg";
-        pub const TEST_COVERART_02_FILE_KEY: &str = "processed/coverart/Coverart-2.jpg";
-
-        pub struct SongBucket {
-            pub file_key: String,
-            pub path: String,
-        }
-
-        pub struct CoverArtBucket {
-            pub file_key: String,
-            pub path: String,
-        }
-
-        pub async fn upload_test_songs_to_bucket() {
-            let songs = vec![
-                SongBucket {
-                    file_key: TEST_SONG_01_FILE_KEY.to_string(),
-                    path: "tests/I/track01.flac".to_string(),
-                },
-                SongBucket {
-                    file_key: TEST_SONG_02_FILE_KEY.to_string(),
-                    path: "tests/I/track02.flac".to_string(),
-                },
-            ];
-
-            let lab_config = soaricarus_api::util::maze::get_config();
-            let lr = labyrinth::Labyrinth { config: lab_config };
-
-            for song in &songs {
-                let p = std::path::Path::new(&song.path);
-                match tokio::fs::File::open(p).await {
-                    Ok(mut _file) => {
-                        let data = labyrinth::Data {
-                            filepath: song.path.clone(),
-                            ..Default::default()
-                        };
-
-                        match lr.upload(&song.file_key, &data).await {
-                            Ok(_) => {}
-                            Err(err) => {
-                                assert!(false, "Error: {err:?}");
-                            }
-                        }
-                    }
-                    Err(err) => {
-                        assert!(false, "Error: {err:?}");
-                    }
-                };
-            }
-        }
-
-        pub async fn upload_test_coverarts_to_bucket() {
-            let coverarts = vec![
-                CoverArtBucket {
-                    file_key: TEST_COVERART_01_FILE_KEY.to_string(),
-                    path: "tests/I/Coverart-1.jpg".to_string(),
-                },
-                CoverArtBucket {
-                    file_key: TEST_COVERART_02_FILE_KEY.to_string(),
-                    path: "tests/I/Coverart-2.jpg".to_string(),
-                },
-            ];
-
-            let lab_config = soaricarus_api::util::maze::get_config();
-            let lr = labyrinth::Labyrinth { config: lab_config };
-
-            for coverart in &coverarts {
-                let p = std::path::Path::new(&coverart.path);
-                match tokio::fs::File::open(p).await {
-                    Ok(mut _file) => {
-                        let data = labyrinth::Data {
-                            filepath: coverart.path.clone(),
-                            ..Default::default()
-                        };
-
-                        match lr.upload(&coverart.file_key, &data).await {
-                            Ok(_) => {}
-                            Err(err) => {
-                                assert!(false, "Error: {err:?}");
-                            }
-                        }
-                    }
-                    Err(err) => {
-                        assert!(false, "Error: {err:?}");
-                    }
-                };
-            }
-        }
-
-        pub async fn delete_test_songs_from_bucket() {
-            let songs = vec![
-                SongBucket {
-                    file_key: TEST_SONG_01_FILE_KEY.to_string(),
-                    path: "tests/I/track01.flac".to_string(),
-                },
-                SongBucket {
-                    file_key: TEST_SONG_02_FILE_KEY.to_string(),
-                    path: "tests/I/track02.flac".to_string(),
-                },
-            ];
-
-            let lab_config = soaricarus_api::util::maze::get_config();
-            let lr = labyrinth::Labyrinth { config: lab_config };
-
-            for song in &songs {
-                match lr.delete(&song.file_key).await {
-                    Ok(_) => {}
-                    Err(err) => {
-                        assert!(false, "Error: {err:?}");
-                    }
-                }
-            }
-        }
-
         // Flow for queueing song
         pub async fn queue_song_flow(
             app: &axum::Router,
         ) -> Result<(axum::response::Response, uuid::Uuid), axum::http::Error> {
-            upload_test_songs_to_bucket().await;
             match super::request::song_queue_req(&app).await {
                 Ok(response) => {
                     let resp = super::util::get_resp_data::<
@@ -679,7 +561,6 @@ mod tests {
             app: &axum::Router,
             song_queue_id: &uuid::Uuid,
         ) -> Result<axum::response::Response, axum::http::Error> {
-            upload_test_coverarts_to_bucket().await;
             match super::request::upload_coverart_queue_req(&app).await {
                 Ok(response) => {
                     let resp = super::util::get_resp_data::<
@@ -756,6 +637,8 @@ mod tests {
                                 song
                             );
 
+                            eprintln!("Song: {:?}", song);
+
                             match queue_coverart_flow(&app, &song_queue_id).await {
                                 Ok(response) => Ok((response, song_queue_id)),
                                 Err(err) => {
@@ -894,7 +777,6 @@ mod tests {
         };
 
         let _ = db_mgr::drop_database(&tm_pool, &db_name).await;
-        sequence_flow::delete_test_songs_from_bucket().await;
     }
 
     #[tokio::test]

src/repo/coverart.rs

@@ -7,14 +7,13 @@ pub async fn create(
 ) -> Result<uuid::Uuid, sqlx::Error> {
     let result = sqlx::query(
         r#"
-        INSERT INTO "coverart" (title, directory, filename, file_type, file_key, song_id) VALUES($1, $2, $3, $4, $5, $6) RETURNING id;
+        INSERT INTO "coverart" (title, directory, filename, file_type, song_id) VALUES($1, $2, $3, $4, $5) RETURNING id;
         "#,
     )
     .bind(&coverart.title)
     .bind(&coverart.directory)
     .bind(&coverart.filename)
     .bind(&coverart.file_type)
-    .bind(&coverart.file_key)
     .bind(song_id)
     .fetch_one(pool)
     .await
@@ -40,7 +39,7 @@ pub async fn get_coverart(
 ) -> Result<simodels::coverart::CoverArt, sqlx::Error> {
     let result = sqlx::query(
         r#"
-        SELECT id, title, directory, filename, file_type, file_key, song_id FROM "coverart" WHERE id = $1;
+        SELECT id, title, directory, filename, file_type, song_id FROM "coverart" WHERE id = $1;
         "#,
     )
     .bind(id)
@@ -72,10 +71,6 @@ pub async fn get_coverart(
                 .try_get("file_type")
                 .map_err(|_e| sqlx::Error::RowNotFound)
                 .unwrap(),
-            file_key: row
-                .try_get("file_key")
-                .map_err(|_e| sqlx::Error::RowNotFound)
-                .unwrap(),
             song_id: row
                 .try_get("song_id")
                 .map_err(|_e| sqlx::Error::RowNotFound)
@@ -92,7 +87,7 @@ pub async fn get_coverart_with_song_id(
 ) -> Result<simodels::coverart::CoverArt, sqlx::Error> {
     let result = sqlx::query(
         r#"
-        SELECT id, title, directory, filename, file_type, file_key, song_id FROM "coverart" WHERE song_id = $1;
+        SELECT id, title, directory, filename, file_type, song_id FROM "coverart" WHERE song_id = $1;
         "#,
     )
     .bind(song_id)
@@ -124,10 +119,6 @@ pub async fn get_coverart_with_song_id(
                 .try_get("file_type")
                 .map_err(|_e| sqlx::Error::RowNotFound)
                 .unwrap(),
-            file_key: row
-                .try_get("file_key")
-                .map_err(|_e| sqlx::Error::RowNotFound)
-                .unwrap(),
             data: Vec::new(),
             song_id: row
                 .try_get("song_id")
@@ -146,7 +137,7 @@ pub async fn delete_coverart(
         r#"
         DELETE FROM "coverart"
         WHERE id = $1
-        RETURNING id, title, directory, filename, file_type, file_key, song_id
+        RETURNING id, title, directory, filename, file_type, song_id
         "#,
     )
     .bind(id)
@@ -157,15 +148,7 @@ pub async fn delete_coverart(
     });
 
     match result {
-        Ok(row) => parse_row(&row).await,
-        Err(_err) => Err(sqlx::Error::RowNotFound),
-    }
-}
-
-async fn parse_row(
-    row: &sqlx::postgres::PgRow,
-) -> Result<simodels::coverart::CoverArt, sqlx::Error> {
-    Ok(simodels::coverart::CoverArt {
+        Ok(row) => Ok(simodels::coverart::CoverArt {
             id: row
                 .try_get("id")
                 .map_err(|_e| sqlx::Error::RowNotFound)
@@ -186,14 +169,12 @@ async fn parse_row(
                 .try_get("file_type")
                 .map_err(|_e| sqlx::Error::RowNotFound)
                 .unwrap(),
-        file_key: row
-            .try_get("file_key")
-            .map_err(|_e| sqlx::Error::RowNotFound)
-            .unwrap(),
             song_id: row
                 .try_get("song_id")
                 .map_err(|_e| sqlx::Error::RowNotFound)
                 .unwrap(),
             data: Vec::new(),
-    })
+        }),
+        Err(_err) => Err(sqlx::Error::RowNotFound),
+    }
 }

src/repo/queue/coverart.rs

@@ -115,3 +115,80 @@ pub async fn get_coverart_queue_with_song_queue_id(
         Err(_) => Err(sqlx::Error::RowNotFound),
     }
 }
+
+/*
+pub async fn get_coverart_queue_data_with_id(
+    pool: &sqlx::PgPool,
+    id: &uuid::Uuid,
+) -> Result<Vec<u8>, sqlx::Error> {
+    let result = sqlx::query(
+        r#"
+        SELECT data FROM "coverartQueue" WHERE id = $1;
+        "#,
+    )
+    .bind(id)
+    .fetch_one(pool)
+    .await
+    .map_err(|e| {
+        eprintln!("Error querying data: {e:?}");
+    });
+
+    match result {
+        Ok(row) => Ok(row
+            .try_get("data")
+            .map_err(|_e| sqlx::Error::RowNotFound)
+            .unwrap()),
+        Err(_) => Err(sqlx::Error::RowNotFound),
+    }
+}
+
+pub async fn get_coverart_queue_data_with_song_queue_id(
+    pool: &sqlx::PgPool,
+    song_queue_id: &uuid::Uuid,
+) -> Result<Vec<u8>, sqlx::Error> {
+    let result = sqlx::query(
+        r#"
+        SELECT data FROM "coverartQueue" WHERE song_queue_id = $1;
+        "#,
+    )
+    .bind(song_queue_id)
+    .fetch_one(pool)
+    .await
+    .map_err(|e| {
+        eprintln!("Error querying data: {e}");
+    });
+
+    match result {
+        Ok(row) => Ok(row
+            .try_get("data")
+            .map_err(|_e| sqlx::Error::RowNotFound)
+            .unwrap()),
+        Err(_) => Err(sqlx::Error::RowNotFound),
+    }
+}
+
+pub async fn wipe_data(
+    pool: &sqlx::PgPool,
+    coverart_queue_id: &uuid::Uuid,
+) -> Result<uuid::Uuid, sqlx::Error> {
+    let result = sqlx::query(
+        r#"
+        UPDATE "coverartQueue" SET data = NULL WHERE id = $1 RETURNING id;
+        "#,
+    )
+    .bind(coverart_queue_id)
+    .fetch_one(pool)
+    .await
+    .map_err(|e| {
+        eprintln!("Error updating query: {e}");
+    });
+
+    match result {
+        Ok(row) => Ok(row
+            .try_get("id")
+            .map_err(|_e| sqlx::Error::RowNotFound)
+            .unwrap()),
+        Err(_) => Err(sqlx::Error::RowNotFound),
+    }
+}
+*/

src/repo/song.rs

@@ -6,8 +6,8 @@ pub async fn insert(
 ) -> Result<(time::OffsetDateTime, uuid::Uuid), sqlx::Error> {
     let result = sqlx::query(
         r#"
-        INSERT INTO "song" (title, artist, album_artist, album, genre, year, track, disc, track_count, disc_count, duration, audio_type, filename, directory, file_key, user_id) 
-        VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16) RETURNING date_created, id;
+        INSERT INTO "song" (title, artist, album_artist, album, genre, year, track, disc, track_count, disc_count, duration, audio_type, filename, directory, user_id) 
+        VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15) RETURNING date_created, id;
         "#
         )
         .bind(&song.title)
@@ -24,7 +24,6 @@ pub async fn insert(
         .bind(&song.audio_type)
         .bind(&song.filename)
         .bind(&song.directory)
-        .bind(&song.file_key)
         .bind(song.user_id)
         .fetch_one(pool)
         .await
@@ -134,10 +133,6 @@ pub async fn get_song(
                     .try_get("directory")
                     .map_err(|_e| sqlx::Error::RowNotFound)
                     .unwrap(),
-                file_key: row
-                    .try_get("file_key")
-                    .map_err(|_e| sqlx::Error::RowNotFound)
-                    .unwrap(),
                 date_created: Some(date_created_time),
                 user_id: row
                     .try_get("user_id")
@@ -233,10 +228,6 @@ pub async fn get_all_songs(pool: &sqlx::PgPool) -> Result<Vec<simodels::song::So
                         .try_get("directory")
                         .map_err(|_e| sqlx::Error::RowNotFound)
                         .unwrap(),
-                    file_key: row
-                        .try_get("file_key")
-                        .map_err(|_e| sqlx::Error::RowNotFound)
-                        .unwrap(),
                     date_created: Some(date_created_time),
                     user_id: row
                         .try_get("user_id")
@@ -263,7 +254,7 @@ pub async fn delete_song(
         r#"
         DELETE FROM "song"
         WHERE id = $1
-        RETURNING id, title, artist, album, album_artist, genre, year, disc, track, track_count, disc_count, duration, audio_type, date_created, filename, directory, file_key, user_id
+        RETURNING id, title, artist, album, album_artist, genre, year, disc, track, track_count, disc_count, duration, audio_type, date_created, filename, directory, user_id
         "#,
     )
     .bind(id)
@@ -341,10 +332,6 @@ pub async fn delete_song(
                     .try_get("directory")
                     .map_err(|_e| sqlx::Error::RowNotFound)
                     .unwrap(),
-                file_key: row
-                    .try_get("file_key")
-                    .map_err(|_e| sqlx::Error::RowNotFound)
-                    .unwrap(),
                 date_created: Some(date_created_time),
                 user_id: row
                     .try_get("user_id")

test_migrations/20250725213944_init.sql

@@ -61,7 +61,6 @@ CREATE TABLE IF NOT EXISTS "song" (
     date_created timestamptz DEFAULT now(),
     filename TEXT NOT NULL,
     directory TEXT NOT NULL,
-    file_key TEXT NOT NULL,
     user_id UUID NULL
 );
 
@@ -72,6 +71,5 @@ CREATE TABLE IF NOT EXISTS "coverart" (
     directory TEXT NOT NULL,
     filename TEXT NOT NULL,
     file_type TEXT NOT NULL,
-    file_key TEXT NOT NULL,
     song_id UUID NOT NULL
 );

test_migrations/20250725214735_song_queue_processed.sql

@@ -1,11 +1,6 @@
 -- Add migration script here
-INSERT INTO "song" (id, title, artist, album_artist, album, genre, year, track, disc, track_count, disc_count, duration, audio_type, date_created, filename, directory, file_key, user_id) 
-VALUES('44cf7940-34ff-489f-9124-d0ec90a55af9', 'Hypocrite Like The Rest', 'Kuoth', 'Kuoth', 'I', 'Alternative Hip-Hop', 2020, 1, 1, 9, 1, 139, 'flac', '2020-01-01 13:00:00-05', 'track01.flac', 'tests/I', 'processed/song/track01.flac', '47491f9b-725a-4ba4-b9a5-711e1be46670');
+INSERT INTO "song" (id, title, artist, album_artist, album, genre, year, track, disc, track_count, disc_count, duration, audio_type, date_created, filename, directory, user_id) VALUES('44cf7940-34ff-489f-9124-d0ec90a55af9', 'Hypocrite Like The Rest', 'Kuoth', 'Kuoth', 'I', 'Alternative Hip-Hop', 2020, 1, 1, 9, 1, 139, 'flac', '2020-01-01 13:00:00-05', 'track01.flac', 'tests/I', '47491f9b-725a-4ba4-b9a5-711e1be46670');
+INSERT INTO "coverart" (id, title, directory, filename, file_type, song_id) VALUES('996122cd-5ae9-4013-9934-60768d3006ed', 'I', 'tests/I', 'Coverart-1.jpg', 'jpeg', '44cf7940-34ff-489f-9124-d0ec90a55af9');
 
-INSERT INTO "coverart" (id, title, directory, filename, file_type, file_key, song_id) 
-VALUES('996122cd-5ae9-4013-9934-60768d3006ed', 'I', 'tests/I', 'Coverart-1.jpg', 'jpeg', 'processed/coverart/Coverart-1.jpg', '44cf7940-34ff-489f-9124-d0ec90a55af9');
-
-INSERT INTO "song" (id, title, artist, album_artist, album, genre, year, track, disc, track_count, disc_count, duration, audio_type, date_created, filename, directory, file_key, user_id) 
-VALUES('94cf7940-34ff-489f-9124-d0ec90a55af4', 'It''s Too Late', 'Kuoth', 'Kuoth', 'I', 'Alternative Hip-Hop', 2020, 2, 1, 9, 1, 116, 'flac', '2020-01-01 13:01:00-05', 'track02.flac', 'tests/I', 'processed/song/track02.flac', '47491f9b-725a-4ba4-b9a5-711e1be46670');
-INSERT INTO "coverart" (id, title, directory, filename, file_type, file_key, song_id) 
-VALUES('d96122cd-5ae9-4013-9934-60768d3006e9', 'I', 'tests/I', 'Coverart-2.jpg', 'jpeg', 'processed/coverart/Coverart-2.jpg', '94cf7940-34ff-489f-9124-d0ec90a55af4');
+INSERT INTO "song" (id, title, artist, album_artist, album, genre, year, track, disc, track_count, disc_count, duration, audio_type, date_created, filename, directory, user_id) VALUES('94cf7940-34ff-489f-9124-d0ec90a55af4', 'It''s Too Late', 'Kuoth', 'Kuoth', 'I', 'Alternative Hip-Hop', 2020, 2, 1, 9, 1, 116, 'flac', '2020-01-01 13:01:00-05', 'track02.flac', 'tests/I', '47491f9b-725a-4ba4-b9a5-711e1be46670');
+INSERT INTO "coverart" (id, title, directory, filename, file_type, song_id) VALUES('d96122cd-5ae9-4013-9934-60768d3006e9', 'I', 'tests/I', 'Coverart-2.jpg', 'jpeg', '94cf7940-34ff-489f-9124-d0ec90a55af4');