From 76e31b4db5c3fae73689e6514bd0153376a230eb Mon Sep 17 00:00:00 2001
From: kdeng00 <kundeng94@gmail.com>
Date: Tue, 11 Jun 2024 20:17:05 -0400
Subject: [PATCH] Fixed bugs with song management

---
 Controllers/Managers/CoverArtManager.cs | 1 +
 Controllers/Managers/SongManager.cs     | 2 +-
 Controllers/v1/SongDataController.cs    | 2 +-
 Models/CoverArt.cs                      | 6 ------
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Controllers/Managers/CoverArtManager.cs b/Controllers/Managers/CoverArtManager.cs
index a4e2441..33e093d 100644
--- a/Controllers/Managers/CoverArtManager.cs
+++ b/Controllers/Managers/CoverArtManager.cs
@@ -47,6 +47,7 @@ public class CoverArtManager : BaseManager
     {
         _logger.Info("Attempting to delete cover art from the database");
 
+        _coverArtContext.Attach(coverArt);
         _coverArtContext.Remove(coverArt);
         _coverArtContext.SaveChanges();
     }
diff --git a/Controllers/Managers/SongManager.cs b/Controllers/Managers/SongManager.cs
index dafb215..6797ef8 100644
--- a/Controllers/Managers/SongManager.cs
+++ b/Controllers/Managers/SongManager.cs
@@ -158,8 +158,8 @@ public class SongManager : BaseManager
             var coverArt = coverMgr.GetCoverArt(song);
             coverMgr.DeleteCoverArt(coverArt);
 
-            coverMgr.DeleteCoverArtFromDatabase(coverArt);
             DeleteSongFromDatabase(song);
+            coverMgr.DeleteCoverArtFromDatabase(coverArt);
         }
         catch (Exception ex)
         {
diff --git a/Controllers/v1/SongDataController.cs b/Controllers/v1/SongDataController.cs
index 6c24b94..5ae5529 100644
--- a/Controllers/v1/SongDataController.cs
+++ b/Controllers/v1/SongDataController.cs
@@ -148,7 +148,7 @@ public class SongDataController : BaseController
 
             _songMgr.DeleteSong(songMetaData);
 
-            return Ok();
+            return Ok(songMetaData);
         }
 
     }
diff --git a/Models/CoverArt.cs b/Models/CoverArt.cs
index fd54089..4bf423f 100644
--- a/Models/CoverArt.cs
+++ b/Models/CoverArt.cs
@@ -17,12 +17,6 @@ public class CoverArt
     public string SongTitle { get; set; }
     [JsonIgnore]
     public string ImagePath { get; set; }
-    [JsonIgnore]
-    [NotMapped]
-    public int SongID { get; set; }
-    [JsonIgnore]
-    [NotMapped]
-    public List<Song> Songs { get; set; }
     #endregion