Ready for release

New endpoint to upload song with metadata and cover art as separate entities

Authorization/Handlers/HasScopeHandler.cs

@@ -11,21 +11,21 @@ namespace Icarus.Authorization.Handlers
     public class HasScopeHandler : AuthorizationHandler<HasScopeRequirement>
     {
         protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, HasScopeRequirement requirement)
-	{
+        {
-	    if (!context.User.HasClaim(c => c.Type == "scope" && c.Issuer == requirement.Issuer))
+            if (!context.User.HasClaim(c => c.Type == "scope" && c.Issuer == requirement.Issuer))
-	    {
+            {
-	        return Task.CompletedTask;
+                return Task.CompletedTask;
-	    }
+            }
 
-	    var scopes = context.User.FindFirst(c =>
+            var scopes = context.User.FindFirst(c =>
-	        c.Type == "scope" && c.Issuer == requirement.Issuer).Value.Split(' ');
+                c.Type == "scope" && c.Issuer == requirement.Issuer).Value.Split(' ');
 
-	    if (scopes.Any(s => s == requirement.Scope))
+            if (scopes.Any(s => s == requirement.Scope))
-	    {
+            {
-	        context.Succeed(requirement);
+                context.Succeed(requirement);
-	    }
+            }
 
-	    return Task.CompletedTask;
+            return Task.CompletedTask;
-	}
+        }
     }
 }

Authorization/HasScopeRequirement.cs

@@ -7,13 +7,13 @@ namespace Icarus.Authorization
     public class HasScopeRequirement : IAuthorizationRequirement
     {
         public string Issuer { get; }
-	public string Scope { get; }
+        public string Scope { get; }
 
 
-	public HasScopeRequirement(string scope, string issuer)
+        public HasScopeRequirement(string scope, string issuer)
-	{
+        {
-	    Scope = scope ?? throw new ArgumentNullException(nameof(scope));
+            Scope = scope ?? throw new ArgumentNullException(nameof(scope));
-	    Issuer = issuer ?? throw new ArgumentNullException(nameof(issuer));
+            Issuer = issuer ?? throw new ArgumentNullException(nameof(issuer));
-	}
+        }
     }
 }

Controllers/Managers/AlbumManager.cs

@@ -1,6 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Configuration;
+using System.Linq;
+
+using Microsoft.Extensions.Configuration;
 
 using Icarus.Controllers.Utilities;
 using Icarus.Models;
@@ -11,6 +14,7 @@ namespace Icarus.Controllers.Managers
     public class AlbumManager : BaseManager
     {
     	#region Fields
+		private AlbumContext _albumContext;
     	#endregion
 
 
@@ -19,10 +23,133 @@ namespace Icarus.Controllers.Managers
 
 
     	#region Constructors
+		public AlbumManager(IConfiguration config)
+		{
+			_config = config;
+			_connectionString = _config.GetConnectionString("DefaultConnection");
+			_albumContext = new AlbumContext(_connectionString);
+		}
     	#endregion
 
 
     	#region Methods
+        public void SaveAlbumToDatabase(ref Song song)
+        {
+            _logger.Info("Starting process to save the album record of the song to the database");
+
+            var album = new Album();
+
+            album.Title = song.AlbumTitle;
+            album.AlbumArtist = song.Artist;
+            album.Year = song.Year.Value;
+            var albumTitle = song.AlbumTitle;
+            var albumArtist = song.Artist;
+
+            var albumRetrieved = _albumContext.Albums.FirstOrDefault(alb => alb.Title.Equals(albumTitle) && alb.AlbumArtist.Equals(albumArtist));
+
+            if (albumRetrieved == null)
+            {
+                album.SongCount = 1;
+                _albumContext.Add(album);
+                _albumContext.SaveChanges();
+
+                Console.WriteLine($"Album Id {album.AlbumID}");
+            }
+            else
+            {
+                album.AlbumID = albumRetrieved.AlbumID;
+            }
+
+            song.AlbumID = album.AlbumID;
+        }
+
+
+		public void DeleteAlbumFromDatabase(Song song)
+		{
+            var album = _albumContext.Albums.FirstOrDefault(alb => alb.Title.Equals(song.AlbumTitle));
+
+            if (album == null)
+            {
+                _logger.Info("Cannot delete the album record because it does not exist");
+                return;
+            }
+
+			DeleteAlbumFromDb(album);
+        }
+
+
+		public Album UpdateAlbumInDatabase(Song oldSong, Song newSong)
+		{
+            var albumRecord = _albumContext.Albums.FirstOrDefault(alb => alb.Title.Equals(oldSong.AlbumTitle));
+            var oldAlbumTitle = oldSong.AlbumTitle;
+            var oldAlbumArtist = oldSong.Artist;
+            var newAlbumTitle = newSong.AlbumTitle;
+            var newAlbumArtist = newSong.Artist;
+
+            var info = string.Empty;
+
+            if (string.IsNullOrEmpty(newAlbumArtist))
+                newAlbumArtist = oldAlbumArtist;
+            if (string.IsNullOrEmpty(newAlbumTitle))
+                newAlbumTitle = oldAlbumTitle;
+
+            if ((string.IsNullOrEmpty(newAlbumTitle) && string.IsNullOrEmpty(newAlbumArtist) || 
+                        oldAlbumTitle.Equals(newAlbumTitle) && oldAlbumArtist.Equals(newAlbumArtist)))
+            {
+                _logger.Info("No change to the song's album");
+                return albumRecord;
+            }
+
+            info = "Change to the song's album";
+            _logger.Info(info);
+
+            var existingAlbumRecord = _albumContext.Albums.FirstOrDefault(alb => alb.Title.Equals(oldSong.AlbumTitle));
+            if (existingAlbumRecord == null)
+            {
+                _logger.Info("Creating new album record");
+
+                var newAlbumRecord = new Album
+                {
+                    Title = newAlbumTitle,
+                    AlbumArtist = newAlbumArtist,
+                    Year = newSong.Year.Value
+                };
+
+                _albumContext.Add(newAlbumRecord);
+				_albumContext.SaveChanges();
+
+                return newAlbumRecord;
+            }
+            else
+            {
+                _logger.Info("Updating existing album record");
+
+            	existingAlbumRecord = _albumContext.Albums.FirstOrDefault(alb => alb.Title.Equals(newSong.AlbumTitle));
+                existingAlbumRecord.AlbumArtist = newAlbumArtist;
+
+                _albumContext.Update(existingAlbumRecord);
+                _albumContext.SaveChanges();
+
+                return existingAlbumRecord;
+            }
+        }
+
+		private void DeleteAlbumFromDb(Album album)
+		{
+			if (SongsInAlbum(album) <= 1)
+			{
+                _albumContext.Remove(album);
+                _albumContext.SaveChanges();
+			}
+		}
+
+		private int SongsInAlbum(Album album)
+		{
+			var sngContext = new SongContext(_connectionString);
+			var songs = sngContext.Songs.Where(sng => sng.AlbumID == album.AlbumID).ToList();
+
+			return songs.Count;
+		}
     	#endregion
     }
 }

Controllers/Managers/ArtistManager.cs

@@ -1,6 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Configuration;
+using System.Linq;
+
+using Microsoft.Extensions.Configuration;
 
 using Icarus.Controllers.Utilities;
 using Icarus.Models;
@@ -11,6 +14,7 @@ namespace Icarus.Controllers.Managers
     public class ArtistManager : BaseManager
     {
     	#region Fields
+		private ArtistContext _artistContext;
     	#endregion
 
 
@@ -19,10 +23,115 @@ namespace Icarus.Controllers.Managers
 
 
     	#region Constructors
+		public ArtistManager(IConfiguration config)
+		{
+			_config = config;
+			_connectionString = _config.GetConnectionString("DefaultConnection");
+			_artistContext = new ArtistContext(_connectionString);
+		}
     	#endregion
 
 
     	#region Methods
+        public void SaveArtistToDatabase(ref Song song)
+        {
+            _logger.Info("Starting process to save the artist record of the song to the database");
+
+            var artist = new Artist();
+
+            artist.Name = song.Artist;
+            artist.SongCount = 1;
+            var artistTitle = artist.Name;
+
+            var artistRetrieved = _artistContext.Artists.FirstOrDefault(art => art.Name.Equals(artistTitle));
+
+            if (artistRetrieved == null)
+            {
+                artist.SongCount = 1;
+                _artistContext.Add(artist);
+                _artistContext.SaveChanges();
+            }
+            else
+            {
+                artist.ArtistID = artistRetrieved.ArtistID;
+            }
+
+            song.ArtistID = artist.ArtistID;
+        }
+
+        public Artist UpdateArtistInDatabase(Song oldSongRecord, Song newSongRecord)
+        {
+            var oldArtistRecord = _artistContext.Artists.FirstOrDefault(art => art.Name.Equals(oldSongRecord.AlbumTitle));
+            var oldArtistName = oldArtistRecord.Name;
+            var newArtistName = newSongRecord.Artist;
+
+            if (string.IsNullOrEmpty(newArtistName) || oldArtistName.Equals(newArtistName))
+            {
+                _logger.Info("No change to the song's Artist");
+                return oldArtistRecord;
+            }
+
+            _logger.Info("Change to the song's record found");
+
+            if (oldArtistRecord.SongCount <= 1)
+            {
+                _logger.Info("Deleting artist record that no longer has any songs");
+
+                _artistContext.Remove(oldArtistRecord);
+                _artistContext.SaveChanges();
+            }
+
+            if (!(_artistContext.Artists.FirstOrDefault(art => art.Name.Equals(oldSongRecord.AlbumTitle)) != null))
+            {
+                _logger.Info("Creating new artist record");
+
+                var newArtistRecord = new Artist
+                {
+                    Name = newArtistName
+                };
+
+                _artistContext.Add(newArtistRecord);
+                _artistContext.SaveChanges();
+                
+                return newArtistRecord;
+            }
+            else
+            {
+                _logger.Info("Updating existing artist record");
+
+                var existingArtistRecord = _artistContext.Artists.FirstOrDefault(art => art.Name.Equals(newSongRecord.AlbumTitle));
+
+                _artistContext.Update(existingArtistRecord);
+                _artistContext.SaveChanges();
+
+                return existingArtistRecord;
+            }
+        }
+
+        public void DeleteArtistFromDatabase(Song song)
+        {
+            if (!(_artistContext.Artists.FirstOrDefault(art => art.Name.Equals(song.Artist)) != null))
+            {
+                _logger.Info("Cannot delete the artist record because it does not exist");
+                return;
+            }
+
+            var artist = _artistContext.Artists.FirstOrDefault(art => art.Name.Equals(song.Artist));
+
+            if (SongsOfArtist(artist) <= 1)
+            {
+                _artistContext.Remove(artist);
+                _artistContext.SaveChanges();
+            }
+        }
+
+		private int SongsOfArtist(Artist artist)
+		{
+			var sngContext = new SongContext(_connectionString);
+			var songs = sngContext.Songs.Where(sng => sng.ArtistID == artist.ArtistID).ToList();
+
+			return songs.Count;
+		}
     	#endregion
     }
 }

Controllers/Managers/BaseManagers.cs

@@ -1,5 +1,6 @@
 using System;
 
+using Microsoft.Extensions.Configuration;
 using NLog;
 
 namespace Icarus.Controllers.Managers
@@ -8,6 +9,8 @@ namespace Icarus.Controllers.Managers
     {
     	#region Fields
     	protected static Logger _logger = NLog.Web.NLogBuilder.ConfigureNLog("nlog.config").GetCurrentClassLogger();
+        protected IConfiguration _config;
+        protected string _connectionString;
     	#endregion
     }
 }

Controllers/Managers/CoverArtManager.cs

@@ -1,10 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.IO;
 
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
+
 using Icarus.Constants;
 using Icarus.Controllers.Utilities;
-using Icarus.Database.Repositories;
+using Icarus.Database.Contexts;
 using Icarus.Models;
 using Icarus.Types;
 
@@ -14,36 +18,37 @@ namespace Icarus.Controllers.Managers
     {
         #region Fields
         private string _rootCoverArtPath;
+        private CoverArtContext _coverArtContext;
         private byte[] _stockCoverArt = null;
         #endregion
 
 
         #region Constructors
-        public CoverArtManager(string rootPath)
+        public CoverArtManager(IConfiguration config)
         {
-            _rootCoverArtPath = rootPath;
+            _config = config;
+            _connectionString = _config.GetConnectionString("DefaultConnection");
+            _rootCoverArtPath = _config.GetValue<string>("CoverArtPath");
             Initialize();
         }
         #endregion
 
 
         #region Methods
-        public void SaveCoverArtToDatabase(ref Song song, ref CoverArt coverArt, 
+        public void SaveCoverArtToDatabase(ref Song song, ref CoverArt coverArt)
-                CoverArtRepository coverArtRepository)
         {
             _logger.Info("Saving cover art record to the database");
-            coverArtRepository.SaveCoverArt(coverArt);
+            _coverArtContext.Add(coverArt);
+            _coverArtContext.SaveChanges();
 
-            coverArt = coverArtRepository.GetCoverArt(CoverArtField.SongTitle,
+            song.CoverArtID = coverArt.CoverArtID;
-                    coverArt);
-
-            song.CoverArtId = coverArt.CoverArtId;
         }
-        public void DeleteCoverArtFromDatabase(CoverArt coverArt, 
+        public void DeleteCoverArtFromDatabase(CoverArt coverArt)
-                CoverArtRepository coverArtRepository)
         {
             _logger.Info("Attempting to delete cover art from the database");
-            coverArtRepository.DeleteCoverArt(coverArt);
+
+            _coverArtContext.Remove(coverArt);
+            _coverArtContext.SaveChanges();
         }
         public void DeleteCoverArt(CoverArt coverArt)
         {
@@ -75,14 +80,19 @@ namespace Icarus.Controllers.Managers
             try
             {
                 var dirMgr = new DirectoryManager(_rootCoverArtPath);
+                var defaultExtension = ".png";
                 dirMgr.CreateDirectory(song);
-                var imagePath = dirMgr.SongDirectory + song.Title + ".png";
+
                 var coverArt = new CoverArt
                 {
-                    SongTitle = song.Title,
+                    SongTitle = song.Title
-                    ImagePath = imagePath
                 };
 
+                var segment = coverArt.GenerateFilename(0);
+                var imagePath = dirMgr.SongDirectory + segment + defaultExtension;
+
+                coverArt.ImagePath = imagePath;
+
                 var metaData = new MetadataRetriever();
                 var imgBytes = metaData.RetrieveCoverArtBytes(song);
                 
@@ -94,7 +104,7 @@ namespace Icarus.Controllers.Managers
                 else
                 {
                     _logger.Info("Song has no cover art, applying stock cover art");
-                    coverArt.ImagePath = _rootCoverArtPath + "CoverArt.png";
+                    coverArt.ImagePath = _rootCoverArtPath + $"{segment}{defaultExtension}";
                     metaData.UpdateCoverArt(song, coverArt);
                     File.WriteAllBytes(coverArt.ImagePath, _stockCoverArt);
                 }
@@ -110,8 +120,43 @@ namespace Icarus.Controllers.Managers
             return null;
         }
 
+        public CoverArt SaveCoverArt(IFormFile data, Song song)
+        {
+            var cover = new CoverArt { SongTitle = song.Title };
+
+            try
+            {
+                var dirMgr = new DirectoryManager(_rootCoverArtPath);
+                var defaultExtension = ".png";
+                dirMgr.CreateDirectory(song);
+
+                var segment = cover.GenerateFilename(0);
+                var imagePath = dirMgr.SongDirectory + segment + defaultExtension;
+
+                cover.ImagePath = imagePath;
+
+                using (var fileStream = new FileStream(imagePath, FileMode.Create))
+                {
+                    data.CopyTo(fileStream);
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.Error(ex.Message, "An error occurred");
+            }
+
+            return cover;
+        }
+
+        public CoverArt GetCoverArt(Song song)
+        {
+            return _coverArtContext.CoverArtImages.FirstOrDefault(cov => cov.SongTitle.Equals(song.Title));
+        }
+
         private void Initialize()
         {
+            _coverArtContext = new CoverArtContext(_connectionString);
+
             if (System.IO.File.Exists(DirectoryPaths.CoverArtPath))
                 _stockCoverArt = File.ReadAllBytes(DirectoryPaths.CoverArtPath);
 

Controllers/Managers/DirectoryManager.cs

@@ -9,10 +9,10 @@ using Icarus.Types;
 
 namespace Icarus.Controllers.Managers
 {
+    // NOTE: Do not use metadata for the song's metadata
     public class DirectoryManager : BaseManager
     {
         #region Fields
-        private IConfiguration _config;
         private Song _song;
         private string _rootSongDirectory;
         private string _songDirectory;
@@ -50,24 +50,7 @@ namespace Icarus.Controllers.Managers
         #region Methods
         public void CreateDirectory()
         {
-            try
+            CreateDirectory(_song);
-            {
-                _songDirectory = AlbumDirectory();
-
-                if (!Directory.Exists(_songDirectory))
-                {
-                    Directory.CreateDirectory(_songDirectory);
-                    Console.WriteLine("The directory has been created");
-                }
-
-
-                Console.WriteLine($"The song will be saved in the following" +
-                  $" directory: {_songDirectory}");
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine($"An error occurred {ex.Message}");
-            }
         }
         public void CreateDirectory(Song song)
         {
@@ -158,6 +141,7 @@ namespace Icarus.Controllers.Managers
 
             return artistPath;
         }
+
         public string GenerateSongPath(Song song)
         {
             _logger.Info("Generating song path");
@@ -208,34 +192,41 @@ namespace Icarus.Controllers.Managers
 
         private string AlbumDirectory()
         {
-            string directory = _rootSongDirectory;
+            return AlbumDirectory(_song);
-            directory += $@"{_song.Artist}/{_song.AlbumTitle}/";
-
-            return directory;
         }
         private string AlbumDirectory(Song song)
         {
-            var directory = _rootSongDirectory;
+            var directory = ArtistDirectory(song);
-            directory += $@"{song.Artist}/{song.AlbumTitle}/";
+            var segment = SerializeValue(song.AlbumTitle);
+            directory += $@"{segment}/";
             Console.WriteLine($"Album directory {directory}");
 
             return directory;
         }
         private string ArtistDirectory()
         {
-            var directory = _rootSongDirectory;
+            return ArtistDirectory(_song);
-            directory += $@"{_song.Artist}/";
-
-            return directory;
         }
         private string ArtistDirectory(Song song)
         {
             var directory = _rootSongDirectory;
-            directory += $@"{song.Artist}/";
+            var segment = SerializeValue(song.Artist);
+            directory += $@"{segment}/";
             Console.WriteLine($"Artist directory {directory}");
 
             return directory;
         }
+
+        private string SerializeValue(string value)
+        {
+            const int length = 15;
+            const string chars = "ABCDEF0123456789";
+            var random = new Random();
+            var output = new string(Enumerable.Repeat(chars, length).Select(s =>
+                s[random.Next(s.Length)]).ToArray());
+
+            return output;
+        }
         #endregion
     }
 }

Controllers/Managers/GenreManager.cs

@@ -1,6 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Configuration;
+using System.Linq;
+
+using Microsoft.Extensions.Configuration;
 
 using Icarus.Controllers.Utilities;
 using Icarus.Models;
@@ -11,6 +14,7 @@ namespace Icarus.Controllers.Managers
     public class GenreManager : BaseManager
     {
     	#region Fields
+		private GenreContext _genreContext;
     	#endregion
 
 
@@ -19,10 +23,115 @@ namespace Icarus.Controllers.Managers
 
 
     	#region Constructors
+		public GenreManager(IConfiguration config)
+		{
+			_config = config;
+			_connectionString = _config.GetConnectionString("DefaultConnection");
+			_genreContext = new GenreContext(_connectionString);
+		}
     	#endregion
 
 
     	#region Methods
+        public void SaveGenreToDatabase(ref Song song)
+        {
+            _logger.Info("Starting process to save the genre record of the song to the database");
+
+            var genre = new Genre
+            {
+                GenreName = song.Genre,
+                SongCount = 1
+            };
+
+            var genreName = song.Genre;
+            var genreRetrieved = _genreContext.Genres.FirstOrDefault(gnr => gnr.GenreName.Equals(genreName));
+
+            if (genreRetrieved == null)
+            {
+                _genreContext.Add(genre);
+                _genreContext.SaveChanges();
+            }
+            else
+            {
+                genre.GenreID = genreRetrieved.GenreID;
+            }
+
+            song.GenreID = genre.GenreID;
+        }
+
+        public Genre UpdateGenreInDatabase(Song oldSongRecord, Song newSongRecord)
+        {
+            var oldGenreRecord = _genreContext.Genres.FirstOrDefault(gnr => gnr.GenreName.Equals(oldSongRecord.Genre));
+            var oldGenreName = oldGenreRecord.GenreName;
+            var newGenreName = newSongRecord.Genre;
+
+            if (string.IsNullOrEmpty(newGenreName) || oldGenreName.Equals(newGenreName))
+            {
+                _logger.Info("No change to the song's Genre");
+                return oldGenreRecord;
+            }
+
+            _logger.Info("Change to the song's genre found");
+
+            if (oldGenreRecord.SongCount <= 1)
+            {
+                _logger.Info("Deleting genre record");
+
+                _genreContext.Remove(oldGenreRecord);
+                _genreContext.SaveChanges();
+            }
+
+            if (!(_genreContext.Genres.FirstOrDefault(gnr => gnr.GenreName.Equals(oldSongRecord.Genre)) != null))
+            {
+                _logger.Info("Creating new genre record");
+
+                var newGenreRecord = new Genre
+                {
+                    GenreName = newGenreName
+                };
+
+                _genreContext.Add(newGenreRecord);
+                _genreContext.SaveChanges();
+
+                return newGenreRecord;
+            }
+            else
+            {
+                _logger.Info("Updating existing genre record");
+
+                var existingGenreRecord = _genreContext.Genres.FirstOrDefault(gnr => gnr.GenreName.Equals(oldGenreRecord.GenreName));
+
+                _genreContext.Update(existingGenreRecord);
+                _genreContext.SaveChanges();
+
+                return existingGenreRecord;
+            }
+        }
+
+        public void DeleteGenreFromDatabase(Song song)
+        {
+            if (!(_genreContext.Genres.FirstOrDefault(gnr => gnr.GenreName.Equals(song.Genre)) != null))
+            {
+                _logger.Info("Cannot delete the genre record because it does not exist");
+                return;
+            }
+
+            var genre = _genreContext.Genres.FirstOrDefault(gnr => gnr.GenreName.Equals(song.Genre));
+
+            if (SongsInGenre(genre) <= 1)
+            {
+                _genreContext.Remove(genre);
+                _genreContext.SaveChanges();
+            }
+        }
+
+		private int SongsInGenre(Genre genre)
+		{
+			var sngContext = new SongContext(_connectionString);
+			var songs = sngContext.Songs.Where(sng => sng.GenreID == genre.GenreID).ToList();
+
+			return songs.Count;
+		}
     	#endregion
     }
 }

Controllers/Managers/TokenManager.cs

@@ -13,7 +13,6 @@ namespace Icarus.Controllers.Managers
     public class TokenManager : BaseManager
     {
         #region Fields
-        private IConfiguration _config;
         private string _clientId;
         private string _clientSecret;
         private string _audience;
@@ -64,7 +63,7 @@ namespace Icarus.Controllers.Managers
 
             return new LoginResult
             {
-                UserId = user.Id, Username = user.Username, Token = tokenResult.AccessToken,
+                UserID = user.UserID, Username = user.Username, Token = tokenResult.AccessToken,
                 TokenType = tokenResult.TokenType, Expiration = tokenResult.Expiration,
                 Message = "Successfully retrieved token"
             };

Controllers/Managers/YearManager.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-
-using Icarus.Controllers.Utilities;
-using Icarus.Models;
-using Icarus.Database.Contexts;
-
-namespace Icarus.Controllers.Managers
-{
-    public class YearManager : BaseManager
-    {
-    	#region Fields
-    	#endregion
-
-
-    	#region Properties
-    	#endregion
-
-
-    	#region Constructors
-    	#endregion
-
-
-    	#region Methods
-    	#endregion
-    }
-}

Controllers/Utilities/MetadataRetriever.cs

@@ -46,18 +46,17 @@ namespace Icarus.Controllers.Utilities
         public static void PrintMetadata(Song song)
         {
             Console.WriteLine("\n\nMetadata of the song:");
-            Console.WriteLine($"Id: {song.Id}");
+            Console.WriteLine($"ID: {song.SongID}");
             Console.WriteLine($"Title: {song.Title}");
             Console.WriteLine($"Artist: {song.Artist}");
             Console.WriteLine($"Album: {song.AlbumTitle}");
             Console.WriteLine($"Genre: {song.Genre}");
             Console.WriteLine($"Year: {song.Year}");
             Console.WriteLine($"Duration: {song.Duration}");
-            Console.WriteLine($"AlbumId: {song.AlbumId}");
+            Console.WriteLine($"AlbumID: {song.AlbumID}");
-            Console.WriteLine($"ArtistId: {song.ArtistId}");
+            Console.WriteLine($"ArtistID: {song.ArtistID}");
-            Console.WriteLine($"GenreId: {song.GenreId}");
+            Console.WriteLine($"GenreID: {song.GenreID}");
-            Console.WriteLine($"YearId: {song.YearId}");
+            Console.WriteLine($"Song Path: {song.SongPath()}");
-            Console.WriteLine($"Song Path: {song.SongPath}");
             Console.WriteLine($"Filename: {song.Filename}");
             Console.WriteLine("\n");
 
@@ -82,13 +81,21 @@ namespace Icarus.Controllers.Utilities
                 _genre = string.Join("", fileTag.Tag.Genres);
                 _year = (int)fileTag.Tag.Year;
                 _duration = (int)fileTag.Properties.Duration.TotalSeconds;
+                var albumArtist = string.Join("", fileTag.Tag.AlbumArtists);
+                var track = (int)fileTag.Tag.Track;
+                var disc = (int)fileTag.Tag.Disc;
 
                 song.Title = _title;
                 song.Artist = _artist;
                 song.AlbumTitle = _album;
+                song.AlbumArtist = albumArtist;
                 song.Genre = _genre;
                 song.Year = _year;
                 song.Duration = _duration;
+                song.Track = track;
+                song.Disc = disc;
+                song.TrackCount = (int)fileTag.Tag.TrackCount;
+                song.DiscCount = (int)fileTag.Tag.DiscCount;
             }
             catch (Exception ex)
             {
@@ -101,12 +108,21 @@ namespace Icarus.Controllers.Utilities
             return song;
         }
 
+        public int RetrieveSongDuration(string filepath)
+        {
+            var duration = 0;
+            var fileTag = TagLib.File.Create(filepath);
+            duration = (int)fileTag.Properties.Duration.TotalSeconds;
+
+            return duration;
+        }
+
         public byte[] RetrieveCoverArtBytes(Song song)
         {
             try
             {
                 Console.WriteLine("Fetching image");
-                var tag = TagLib.File.Create(song.SongPath);
+                var tag = TagLib.File.Create(song.SongPath());
                 byte[] imgBytes = tag.Tag.Pictures[0].Data.Data;
             
                 return imgBytes;
@@ -120,28 +136,7 @@ namespace Icarus.Controllers.Utilities
             return null;
         }
 
-        public void UpdateMetadata(Song song)
+        
-        {
-            try
-            {
-                Console.WriteLine("Updating song metadata"); 
-                _logger.Info("Updating song metadata");
-                var filePath = song.SongPath;
-                TagLib.File fileTag = TagLib.File.Create(filePath);
-                fileTag.Tag.Title = song.Title;
-                fileTag.Tag.Genres = new []{song.Genre};
-                fileTag.Save();
-                Console.WriteLine("Song metadata updated");
-                _logger.Info("Song metadata updated");
-
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                Console.WriteLine($"An error occurred: \n{msg}");
-                _logger.Error(msg, "An error occurred");
-            }
-        }
         public void UpdateMetadata(Song updatedSong, Song oldSong)
         {
             try
@@ -163,7 +158,7 @@ namespace Icarus.Controllers.Utilities
         {
             Console.WriteLine("Updating song's cover art");
 
-            var tag = TagLib.File.Create(song.SongPath);
+            var tag = TagLib.File.Create(song.SongPath());
             var pics = tag.Tag.Pictures;
             Array.Resize(ref pics, 1);
 
@@ -178,13 +173,19 @@ namespace Icarus.Controllers.Utilities
 
         private void PerformUpdate(Song updatedSong, SortedDictionary<string, bool> checkedValues)
         {
-            var filePath = updatedSong.SongPath;
+            var filePath = updatedSong.SongPath();
             var title = updatedSong.Title;
             var artist = updatedSong.Artist;
             var album = updatedSong.AlbumTitle;
             var genre = updatedSong.Genre;
             var year = updatedSong.Year;
+            var albumArtist = updatedSong.AlbumArtist;
+            var track = updatedSong.Track;
+            var trackCount = updatedSong.TrackCount;
+            var disc = updatedSong.Disc;
+            var discCount = updatedSong.DiscCount;
             TagLib.File fileTag = TagLib.File.Create(filePath);
+
             try
             {
                 Console.WriteLine($"Updating metadata of {title}");
@@ -194,7 +195,6 @@ namespace Icarus.Controllers.Utilities
                 {
                     bool result = checkedValues[key];
 
-
                     if (!result)
                         switch (key.ToLower())
                         {
@@ -218,6 +218,26 @@ namespace Icarus.Controllers.Utilities
                                 _updatedSong.Year = year;
                                 fileTag.Tag.Year = (uint)year;
                                 break;
+                            case "albumartist":
+                                _updatedSong.AlbumArtist = albumArtist;
+                                fileTag.Tag.AlbumArtists = new []{albumArtist};
+                                break;
+                            case "track":
+                                _updatedSong.Track = track;
+                                fileTag.Tag.Track = (uint)(track);
+                                break;
+                            case "trackcount":
+                                _updatedSong.TrackCount = trackCount;
+                                fileTag.Tag.TrackCount = (uint)(trackCount);
+                                break;
+                            case "disc":
+                                _updatedSong.Disc = disc;
+                                fileTag.Tag.Disc = (uint)(disc);
+                                break;
+                            case "disccount":
+                                _updatedSong.DiscCount = discCount;
+                                fileTag.Tag.DiscCount = (uint)(discCount);
+                                break;
                         }
                 }
 
@@ -235,18 +255,7 @@ namespace Icarus.Controllers.Utilities
         }
         private void InitializeUpdatedSong(Song song)
         {
-            _updatedSong = new Song
+            _updatedSong = song;
-            {
-                Id = song.Id,
-                Title = song.Title,
-                AlbumTitle = song.AlbumTitle,
-                Artist = song.Artist,
-                Genre = song.Genre,
-                Year = song.Year,
-                Duration = song.Duration,
-                Filename = song.Filename,
-                SongPath = song.SongPath
-            };
         }
         private void PrintMetadata()
         {
@@ -271,7 +280,7 @@ namespace Icarus.Controllers.Utilities
             Console.WriteLine($"\n\n{message}");
             Console.WriteLine($"Title: {song.Title}");
             Console.WriteLine($"Artist: {song.Artist}");
-            Console.WriteLine($"Album: {song.Album}");
+            Console.WriteLine($"Album: {song.AlbumTitle}");
             Console.WriteLine($"Genre: {song.Genre}");
             Console.WriteLine($"Year: {song.Year}");
             Console.WriteLine($"Duration: {song.Duration}\n\n");
@@ -290,19 +299,20 @@ namespace Icarus.Controllers.Utilities
             var songValues = new SortedDictionary<string, bool>();
             Console.WriteLine("Checking for null data");
             _logger.Info("Checking for null data");
+
             try
             {
                 songValues["Title"] = String.IsNullOrEmpty(song.Title);
                 songValues["Artists"] = String.IsNullOrEmpty(song.Artist);
                 songValues["Album"] = String.IsNullOrEmpty(song.AlbumTitle);
                 songValues["Genre"] = String.IsNullOrEmpty(song.Genre);
+                songValues["AlbumArtist"] = String.IsNullOrEmpty(song.AlbumArtist);
 
-                if (song.Year == null)
+                songValues["Year"] = CheckIntField(song.Year);
-                    songValues["Year"] = true;
+                songValues["Track"] = CheckIntField(song.Track);
-                else if (song.Year==0)
+                songValues["TrackCount"] = CheckIntField(song.TrackCount);
-                    songValues["Year"] = true;
+                songValues["Disc"] = CheckIntField(song.Disc);
-                else
+                songValues["DiscCount"] = CheckIntField(song.Disc);
-                    songValues["Year"] = false;
 
                 Console.WriteLine("Checking for null data completed");
                 _logger.Info("Checking for null data completed");
@@ -316,6 +326,20 @@ namespace Icarus.Controllers.Utilities
 
             return songValues;
         }    
+
+        private bool CheckIntField(int? value)
+        {
+            if (value == null)
+            {
+                return true;
+            }
+            else if (value == 0)
+            {
+                return true;
+            }
+
+            return false;
+        }
         #endregion
     }
 }

Controllers/Utilities/SongCompression.cs

@@ -13,18 +13,18 @@ namespace Icarus.Controllers.Utilities
     public class SongCompression
     {
         #region Fields
-	string _compressedSongFilename;
+        string _compressedSongFilename;
-	string _tempDirectory;
+        string _tempDirectory;
         byte[] _uncompressedSong;
         #endregion
 
 
         #region Propterties
-	public string CompressedSongFilename
+        public string CompressedSongFilename
-	{
+        {
-	    get => _compressedSongFilename;
+            get => _compressedSongFilename;
-	    set => _compressedSongFilename = value;
+            set => _compressedSongFilename = value;
-	}
+        }
         #endregion
 
 
@@ -32,10 +32,10 @@ namespace Icarus.Controllers.Utilities
         public SongCompression()
         {
         }
-	public SongCompression(string tempDirectory)
+        public SongCompression(string tempDirectory)
-	{
+        {
-	    _tempDirectory = tempDirectory;
+            _tempDirectory = tempDirectory;
-	}
+        }
         public SongCompression(byte[] uncompressedSong)
         {
             _uncompressedSong = uncompressedSong;
@@ -44,60 +44,61 @@ namespace Icarus.Controllers.Utilities
 
 
         #region Methods
-	public async Task<SongData> RetrieveCompressedSong(Song song)
+        public async Task<SongData> RetrieveCompressedSong(Song song)
-	{
+        {
-	    SongData songData = new SongData();
+            SongData songData = new SongData();
-	    try
+            try
-	    {
+            {
-	       var archivePath = RetrieveCompressesSongPath(song);
+                var archivePath = RetrieveCompressesSongPath(song);
-	       Console.WriteLine($"Compressed song saved to: {archivePath}");
+                Console.WriteLine($"Compressed song saved to: {archivePath}");
-	       
+                
-	       songData.Data = System.IO.File.ReadAllBytes(archivePath);
+                songData.Data = await System.IO.File.ReadAllBytesAsync(archivePath);
-	    }
+            }
-	    catch(Exception ex)
+            catch(Exception ex)
-	    {
+            {
-	        var exMsg = ex.Message;
+                var exMsg = ex.Message;
-		Console.WriteLine($"An error ocurred: \n{exMsg}");
+                Console.WriteLine($"An error ocurred: \n{exMsg}");
-	    }
+            }
 
-	    return songData;
+            return songData;
-	}
+        }
 
-	public string RetrieveCompressesSongPath(Song songDetails)
+        public string RetrieveCompressesSongPath(Song songDetails)
-	{
+        {
-	    string tmpZipFilePath = _tempDirectory + songDetails.Filename;
+            string tmpZipFilePath = _tempDirectory + songDetails.Filename;
 
-	    try
+            try
-	    {
+            {
-	        using (ZipFile zip = new ZipFile())
+                using (ZipFile zip = new ZipFile())
-		{
+                {
-		    zip.AddFile(songDetails.SongPath);
+                    zip.AddFile(songDetails.SongPath());
-		    zip.Save(tmpZipFilePath);
+                    zip.Save(tmpZipFilePath);
-		}
+                }
-		Console.WriteLine("Successfully compressed");
-		}
-	    catch (Exception ex)
-	    {
-	        var exMsg = ex.Message;
-		Console.WriteLine("An error ocurred");
-		Console.WriteLine(exMsg);
-	    }
 
-	    if (songDetails.Filename.Contains(".mp3"))
+                Console.WriteLine("Successfully compressed");
-	    {
+            }
-	        _compressedSongFilename = StripMP3Extension(songDetails.Filename);
+            catch (Exception ex)
-	    }
+            {
+                var exMsg = ex.Message;
+                Console.WriteLine("An error ocurred");
+                Console.WriteLine(exMsg);
+            }
 
-	    return tmpZipFilePath;
+            if (songDetails.Filename.Contains(".mp3"))
-	}
+            {
+                _compressedSongFilename = StripMP3Extension(songDetails.Filename);
+            }
 
-	// Method not being used
+            return tmpZipFilePath;
+        }
+
+        // Method not being used
         public byte[] CompressedSong(byte[] uncompressedSong)
         {
             byte[] compressedSong = null;
             try
             {
-		Console.WriteLine("Song has been successfully compressed");
+                Console.WriteLine("Song has been successfully compressed");
             }
             catch (Exception ex)
             {
@@ -110,20 +111,20 @@ namespace Icarus.Controllers.Utilities
         }
 
 
-	string StripMP3Extension(string filename)
+        string StripMP3Extension(string filename)
-	{
+        {
-	    Console.WriteLine($"Before: {filename}");
+            Console.WriteLine($"Before: {filename}");
-	    int filenameLength = filename.Length;
+            int filenameLength = filename.Length;
-	    Console.WriteLine($"Filename length {filenameLength}");
+            Console.WriteLine($"Filename length {filenameLength}");
-	    var endIndex = filenameLength - 1;
+            var endIndex = filenameLength - 1;
-	    var startIndex = endIndex - 3;
+            var startIndex = endIndex - 3;
-	    Console.WriteLine($"Starting index {startIndex} and ending index {endIndex}");
+            Console.WriteLine($"Starting index {startIndex} and ending index {endIndex}");
-	    var stripped = filename.Remove(startIndex, 4);
+            var stripped = filename.Remove(startIndex, 4);
-	    stripped += ".zip";
+            stripped += ".zip";
-	    Console.WriteLine($"After {stripped}");
+            Console.WriteLine($"After {stripped}");
 
-	    return stripped;
+            return stripped;
-	}
+        }
         #endregion
     }
 }

Controllers/v1/AlbumController.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Configuration;
+using System.Linq;
 
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -8,7 +9,8 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 
 using Icarus.Models;
-using Icarus.Database.Repositories;
+using Icarus.Database.Contexts;
+// using Icarus.Database.Repositories;
 
 namespace Icarus.Controllers.V1
 {
@@ -18,6 +20,8 @@ namespace Icarus.Controllers.V1
     {
         #region Fields
         private readonly ILogger<AlbumController> _logger;
+        private string _connectionString;
+        private IConfiguration _config;
         #endregion
 
 
@@ -26,9 +30,11 @@ namespace Icarus.Controllers.V1
 
 
         #region Constructors
-        public AlbumController(ILogger<AlbumController> logger)
+        public AlbumController(ILogger<AlbumController> logger, IConfiguration config)
         {
             _logger = logger;
+            _config = config;
+            _connectionString = _config.GetConnectionString("DefaultConnection");
         }
         #endregion
 
@@ -40,10 +46,9 @@ namespace Icarus.Controllers.V1
         {
             List<Album> albums = new List<Album>();
 
-            AlbumRepository albumStoreContext = HttpContext.RequestServices
+            var albumContext = new AlbumContext(_connectionString);
-                .GetService(typeof(AlbumRepository)) as AlbumRepository;
 
-            albums = albumStoreContext.GetAlbums();
+            albums = albumContext.Albums.ToList();
 
             if (albums.Count > 0)
                 return Ok(albums);
@@ -57,15 +62,14 @@ namespace Icarus.Controllers.V1
         {
             Album album = new Album
             {
-                AlbumId = id
+                AlbumID = id
             };
 
-            AlbumRepository albumStoreContext = HttpContext.RequestServices
+            var albumContext = new AlbumContext(_connectionString);
-                .GetService(typeof(AlbumRepository)) as AlbumRepository;
 
-            if (albumStoreContext.DoesAlbumExist(album))
+            if (albumContext.DoesRecordExist(album))
             {
-                album = albumStoreContext.GetAlbum(album);
+                album = albumContext.RetrieveRecord(album);
 
                 return Ok(album);
             }

Controllers/v1/ArtistController.cs

@@ -9,7 +9,7 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 
 using Icarus.Models;
-using Icarus.Database.Repositories;
+using Icarus.Database.Contexts;
 
 namespace Icarus.Controllers.V1
 {
@@ -19,6 +19,8 @@ namespace Icarus.Controllers.V1
     {
         #region Fields
         private readonly ILogger<ArtistController> _logger;
+        private string _connectionString;
+        private IConfiguration _config;
         #endregion
 
 
@@ -27,9 +29,11 @@ namespace Icarus.Controllers.V1
 
 
         #region Constructors
-        public ArtistController(ILogger<ArtistController> logger)
+        public ArtistController(ILogger<ArtistController> logger, IConfiguration config)
         {
             _logger = logger;
+            _config = config;
+            _connectionString = _config.GetConnectionString("DefaultConnection");
         }
         #endregion
 
@@ -39,10 +43,9 @@ namespace Icarus.Controllers.V1
         [Authorize("read:artists")]
         public IActionResult Get()
         {
-            ArtistRepository artistStoreContext = HttpContext.RequestServices
+            var artistContext = new ArtistContext(_connectionString);
-                .GetService(typeof(ArtistRepository)) as ArtistRepository;
 
-            var artists = artistStoreContext.GetArtists();
+            var artists = artistContext.Artists.ToList();
 
             if (artists.Count > 0)
                 return Ok(artists);
@@ -56,15 +59,14 @@ namespace Icarus.Controllers.V1
         {
             Artist artist = new Artist
             {
-                ArtistId = id
+                ArtistID = id
             };
             
-            ArtistRepository artistStoreContext = HttpContext.RequestServices
+            var artistContext = new ArtistContext(_connectionString);
-                .GetService(typeof(ArtistRepository)) as ArtistRepository;
 
-            if (artistStoreContext.DoesArtistExist(artist))
+            if (artistContext.DoesRecordExist(artist))
             {
-                artist = artistStoreContext.GetArtist(artist);
+                artist = artistContext.RetrieveRecord(artist);
 
                 return Ok(artist);
             }

Controllers/v1/CoverArtController.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
 
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -8,7 +10,7 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 
 using Icarus.Controllers.Managers;
-using Icarus.Database.Repositories;
+using Icarus.Database.Contexts;
 using Icarus.Models;
 
 namespace Icarus.Controllers.V1
@@ -19,35 +21,54 @@ namespace Icarus.Controllers.V1
     {
         #region Fields
         private readonly ILogger<CoverArtController> _logger;
+        private string _connectionString;
+        private IConfiguration _config;
         #endregion
 
 
         #region Constructors
-        public CoverArtController(ILogger<CoverArtController> logger)
+        public CoverArtController(ILogger<CoverArtController> logger, IConfiguration config)
         {
             _logger = logger;
+            _config = config;
+            _connectionString = _config.GetConnectionString("DefaultConnection");
         }
         #endregion
 
 
         #region HTTP Routes
+        public IActionResult Get()
+        {
+            var coverArtContext = new CoverArtContext(_connectionString);
+
+            var coverArtRecords = coverArtContext.CoverArtImages.ToList();
+
+            if (coverArtRecords == null)
+            {
+                _logger.LogInformation("No cover art records");
+                return NotFound();
+            }
+            else
+            {
+                _logger.LogInformation("Found cover art records");
+                return Ok(coverArtRecords);
+            }
+        }
+
         [HttpGet("{id}")]
         [Authorize("download:cover_art")]
-        public IActionResult Get(int id)
+        public async Task<IActionResult> Get(int id)
         {
-            var coverArt = new CoverArt { CoverArtId = id };
+            var coverArt = new CoverArt { CoverArtID = id };
 
-            var coverArtRepository = HttpContext
+            var coverArtContext = new CoverArtContext(_connectionString);
-                .RequestServices
-                .GetService(
-                        typeof(CoverArtRepository)) as CoverArtRepository;
 
-            coverArt = coverArtRepository.GetCoverArt(coverArt);
+            coverArt = coverArtContext.RetrieveRecord(coverArt);
 
             if (coverArt != null)
             {
                 _logger.LogInformation("Found cover art record");
-                var coverArtBytes = System.IO.File.ReadAllBytes(
+                var coverArtBytes = await System.IO.File.ReadAllBytesAsync(
                         coverArt.ImagePath);
 
                 return File(coverArtBytes, "application/x-msdownload", 

Controllers/v1/GenreController.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -7,7 +8,7 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 
 using Icarus.Models;
-using Icarus.Database.Repositories;
+using Icarus.Database.Contexts;
 
 namespace Icarus.Controllers.V1
 {
@@ -17,6 +18,8 @@ namespace Icarus.Controllers.V1
     {
         #region Fields
         private readonly ILogger<GenreController> _logger;
+        private string _connectionString;
+        private IConfiguration _config;
         #endregion
 
 
@@ -25,9 +28,11 @@ namespace Icarus.Controllers.V1
 
 
         #region Constructors
-        public GenreController(ILogger<GenreController> logger)
+        public GenreController(ILogger<GenreController> logger, IConfiguration config)
         {
             _logger = logger;
+            _config = config;
+            _connectionString = _config.GetConnectionString("DefaultConnection");
         }
         #endregion
 
@@ -39,10 +44,9 @@ namespace Icarus.Controllers.V1
         {
             var genres = new List<Genre>();
 
-            var genreStore = HttpContext.RequestServices
+            var genreStore = new GenreContext(_connectionString);
-                .GetService(typeof(GenreRepository)) as GenreRepository;
 
-            genres = genreStore.GetGenres();
+            genres = genreStore.Genres.ToList();
 
             if (genres.Count > 0)
                 return Ok(genres);
@@ -56,15 +60,14 @@ namespace Icarus.Controllers.V1
         {
             var genre = new Genre
             {
-                GenreId = id
+                GenreID = id
             };
 
-            var genreStore = HttpContext.RequestServices
+            var genreStore = new GenreContext(_connectionString);
-                .GetService(typeof(GenreRepository)) as GenreRepository;
 
-            if (genreStore.DoesGenreExist(genre))
+            if (genreStore.DoesRecordExist(genre))
             {
-                genre =  genreStore.GetGenre(genre);
+                genre =  genreStore.RetrieveRecord(genre);
 
                 return Ok(genre);
             }

Controllers/v1/LoginController.cs

@@ -11,7 +11,7 @@ using Microsoft.Extensions.Logging;
 using Icarus.Controllers.Managers;
 using Icarus.Controllers.Utilities;
 using Icarus.Models;
-using Icarus.Database.Repositories;
+using Icarus.Database.Contexts;
 
 namespace Icarus.Controllers.V1
 {
@@ -20,6 +20,7 @@ namespace Icarus.Controllers.V1
     public class LoginController : ControllerBase
     {
         #region Fields
+        private string _connectionString;
         private IConfiguration _config;
         private ILogger<LoginController> _logger;
         #endregion
@@ -32,8 +33,9 @@ namespace Icarus.Controllers.V1
         #region Contructors
         public LoginController(IConfiguration config, ILogger<LoginController> logger)
         {
-            _config = config;
             _logger = logger;
+            _config = config;
+            _connectionString = _config.GetConnectionString("DefaultConnection");
         }
         #endregion
 
@@ -41,8 +43,7 @@ namespace Icarus.Controllers.V1
         #region HTTP endpoints
         public IActionResult Post([FromBody] User user)
         {
-            UserRepository context = HttpContext.RequestServices
+            var context = new UserContext(_connectionString);
-                .GetService(typeof(UserRepository)) as UserRepository;
 
             _logger.LogInformation("Starting process of validating credentials");
             
@@ -54,9 +55,9 @@ namespace Icarus.Controllers.V1
                 Username = user.Username
             };
 
-            if (context.DoesUserExist(user))
+            if (context.Users.FirstOrDefault(usr => usr.Username.Equals(user.Username)) != null)
             {
-                user = context.RetrieveUser(user);
+                user = context.Users.FirstOrDefault(usr => usr.Username.Equals(user.Username));
 
                 var validatePass = new PasswordEncryption();
                 var validated = validatePass.VerifyPassword(user, password);

Controllers/v1/RegisterController.cs

@@ -10,7 +10,7 @@ using Microsoft.Extensions.Configuration;
 using Icarus.Controllers.Managers;
 using Icarus.Controllers.Utilities;
 using Icarus.Models;
-using Icarus.Database.Repositories;
+using Icarus.Database.Contexts;
 
 namespace Icarus.Controllers.V1
 {
@@ -19,6 +19,7 @@ namespace Icarus.Controllers.V1
     public class RegisterController : ControllerBase
     {
         #region Fields
+        private string _connectionString;
         private IConfiguration _config;
         #endregion
 
@@ -31,6 +32,7 @@ namespace Icarus.Controllers.V1
         public RegisterController(IConfiguration config)
         {
             _config = config;
+            _connectionString = _config.GetConnectionString("DefaultConnection");
         }
         #endregion
 
@@ -40,18 +42,31 @@ namespace Icarus.Controllers.V1
             PasswordEncryption pe = new PasswordEncryption();
             user.Password = pe.HashPassword(user);
             user.EmailVerified = false;
+            user.Status = "Registered";
+            user.DateCreated = DateTime.Now;
 
-            UserRepository context = HttpContext.RequestServices
+            UserContext context = null;
-                .GetService(typeof(UserRepository)) as UserRepository;
 
-            context.SaveUser(user);
+            try
+            {
+                context = new UserContext(_config.GetConnectionString("DefaultConnection"));
+                context.Add(user);
+                context.SaveChanges();
+            }
+            catch (Exception ex)
+            {
+                var msg = ex.Message;
+                var stackTrace = ex.StackTrace;
+
+                Console.WriteLine($"An error occurred: {msg}");
+            }
 
             var registerResult = new RegisterResult
             {
                 Username = user.Username
             };
 
-            if (context.DoesUserExist(user))
+            if (context.Users.FirstOrDefault(sng => sng.Username.Equals(user.Username)) != null)
             {
                 registerResult.Message = "Successful registration";
                 registerResult.SuccessfullyRegistered = true;

Controllers/v1/SongCompressedDataControllers.cs

@@ -13,7 +13,7 @@ using Microsoft.Extensions.Configuration;
 using Icarus.Controllers.Managers;
 using Icarus.Controllers.Utilities;
 using Icarus.Models;
-using Icarus.Database.Repositories;
+using Icarus.Database.Contexts;
 
 namespace Icarus.Controllers.V1
 {
@@ -22,6 +22,7 @@ namespace Icarus.Controllers.V1
     public class SongCompressedDataController : ControllerBase
     {
         #region Fields
+        private string _connectionString;
         private IConfiguration _config;
         private string _songTempDir;
         private string _archiveDir;
@@ -35,9 +36,10 @@ namespace Icarus.Controllers.V1
         #region Constructor
         public SongCompressedDataController(IConfiguration config)
         {
-            _config = config;
             _songTempDir = _config.GetValue<string>("TemporaryMusicPath");
             _archiveDir = _config.GetValue<string>("ArchivePath");
+            _config = config;
+            _connectionString = _config.GetConnectionString("DefaultConnection");
         }
         #endregion
 
@@ -47,15 +49,14 @@ namespace Icarus.Controllers.V1
         [Authorize("download:songs")]
         public async Task<IActionResult> Get(int id)
         {
-            SongRepository context = HttpContext.RequestServices
+            var context = new SongContext(_connectionString);
-                .GetService(typeof(SongRepository)) as SongRepository;
 
             SongCompression cmp = new SongCompression(_archiveDir);
         
             Console.WriteLine($"Archive directory root: {_archiveDir}");
 
             Console.WriteLine("Starting process of retrieving comrpessed song");
-            SongData song = await cmp.RetrieveCompressedSong(context.GetSong(id));
+            SongData song = await cmp.RetrieveCompressedSong(context.RetrieveRecord(new Song{ SongID = id }));
 
             return File(song.Data, "application/x-msdownload", cmp.CompressedSongFilename);
         }

Controllers/v1/SongController.cs

@@ -12,7 +12,7 @@ using Microsoft.Extensions.Logging;
 using Icarus.Controllers.Managers;
 using Icarus.Controllers.Utilities;
 using Icarus.Models;
-using Icarus.Database.Repositories;
+using Icarus.Database.Contexts;
 
 namespace Icarus.Controllers.V1
 {
@@ -22,6 +22,7 @@ namespace Icarus.Controllers.V1
     {
         #region Fields
         private readonly ILogger<SongController> _logger;
+        private string _connectionString;
         private IConfiguration _config;
         private SongManager _songMgr;
         #endregion
@@ -35,6 +36,7 @@ namespace Icarus.Controllers.V1
         public SongController(IConfiguration config, ILogger<SongController> logger)
         {
             _config = config;
+            _connectionString = _config.GetConnectionString("DefaultConnection");
             _logger = logger;
             _songMgr = new SongManager(config);
         }
@@ -49,10 +51,9 @@ namespace Icarus.Controllers.V1
             Console.WriteLine("Attemtping to retrieve songs");
             _logger.LogInformation("Attempting to retrieve songs");
             
-            SongRepository context = HttpContext.RequestServices
+            var context = new SongContext(_connectionString);
-                .GetService(typeof(SongRepository)) as SongRepository;
 
-            songs = context.GetAllSongs();
+            songs = context.Songs.ToList();
 
             if (songs.Count > 0)
                 return Ok(songs);
@@ -64,15 +65,14 @@ namespace Icarus.Controllers.V1
         [Authorize("read:song_details")]
         public IActionResult Get(int id)
         {
-            SongRepository context = HttpContext.RequestServices
+            var context = new SongContext(_connectionString);
-                .GetService(typeof(SongRepository)) as SongRepository;
             
-            Song song = new Song { Id = id };
+            Song song = new Song { SongID = id };
-            song = context.GetSong(song);
+            song = context.RetrieveRecord(song);
 
             Console.WriteLine("Here");
 
-            if (song.Id != 0)
+            if (song.SongID != 0)
                 return Ok(song);
             else
                 return NotFound();
@@ -82,33 +82,21 @@ namespace Icarus.Controllers.V1
         [HttpPut("{id}")]
         public IActionResult Put(int id, [FromBody] Song song)
         {
-            SongRepository context = HttpContext.RequestServices
+            var context = new SongContext(_connectionString);
-                .GetService(typeof(SongRepository)) as SongRepository;
 
-            ArtistRepository artistStore = HttpContext.RequestServices
+            song.SongID = id;
-                .GetService(typeof(ArtistRepository)) as ArtistRepository;
-
-            AlbumRepository albumStore = HttpContext.RequestServices
-                .GetService(typeof(AlbumRepository)) as AlbumRepository;
-            
-            GenreRepository genreStore = HttpContext.RequestServices
-                .GetService(typeof(GenreRepository)) as GenreRepository;
-
-            YearRepository yearStore = HttpContext.RequestServices
-                .GetService(typeof(YearRepository)) as YearRepository;
-
-            song.Id = id;
             Console.WriteLine("Retrieving filepath of song");
             _logger.LogInformation("Retrieving filepath of song");
 
-            if (!context.DoesSongExist(song))
+            if (!_songMgr.DoesSongExist(song))
+            {
                 return NotFound(new SongResult
                 {
-                        Message = "Song does not exist"
+                    Message = "Song does not exist"
                 });
+            }
 
-            var songRes = _songMgr.UpdateSong(song, context, albumStore, artistStore, genreStore, 
+            var songRes = _songMgr.UpdateSong(song);
-                yearStore);
 
             return Ok(songRes);
         }

Controllers/v1/SongDataController.cs

@@ -10,11 +10,11 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
 
 using Icarus.Controllers.Managers;
 using Icarus.Models;
 using Icarus.Database.Contexts;
-using Icarus.Database.Repositories;
 
 namespace Icarus.Controllers.V1
 {
@@ -23,12 +23,7 @@ namespace Icarus.Controllers.V1
     public class SongDataController : ControllerBase
     {
         #region Fields
-        private SongRepository _songRepository;
+        private string _connectionString;
-        private AlbumRepository _albumRepository;
-        private ArtistRepository _artistRepository;
-        private GenreRepository _genreRepository;
-        private YearRepository _yearRepository;
-        private CoverArtRepository _coverArtRepository;
         private IConfiguration _config;
         private ILogger<SongDataController> _logger;
         private SongManager _songMgr;
@@ -44,94 +39,110 @@ namespace Icarus.Controllers.V1
         public SongDataController(IConfiguration config, ILogger<SongDataController> logger)
         {
             _config = config;
+            _connectionString = _config.GetConnectionString("DefaultConnection");
             _logger = logger;
             _songTempDir = _config.GetValue<string>("TemporaryMusicPath");
             _songMgr = new SongManager(config, _songTempDir);
         }
         #endregion
 
-        private void Initialize()
-        {
-            _songRepository = HttpContext
-                .RequestServices
-                .GetService
-                (typeof(SongRepository)) as SongRepository;
-
-            _albumRepository = HttpContext
-                .RequestServices
-                .GetService(typeof(AlbumRepository)) as AlbumRepository;
-
-            _artistRepository = HttpContext
-                .RequestServices
-                .GetService(typeof(ArtistRepository)) as ArtistRepository;
-
-            _genreRepository = HttpContext
-                .RequestServices
-                .GetService(typeof(GenreRepository)) as GenreRepository;
-
-            _yearRepository = HttpContext
-                .RequestServices
-                .GetService(typeof(YearRepository)) as YearRepository;
-
-            _coverArtRepository = HttpContext
-                .RequestServices
-                .GetService(typeof(CoverArtRepository)) as CoverArtRepository;
-        }
 
 
-        [HttpGet("{id}")]
+        [HttpGet("download/{id}")]
         [Route("private-scoped")]
         [Authorize("download:songs")]
         public async Task<IActionResult> Get(int id)
         {
-            Initialize();
+            var songContext = new SongContext(_connectionString);
-            var songMetaData = _songRepository.GetSong(id); 
+            var songMetaData = songContext.RetrieveRecord(new Song { SongID = id});
             
-            SongData song = await _songMgr.RetrieveSong(songMetaData);
+            var song = await _songMgr.RetrieveSong(songMetaData);
             
             return File(song.Data, "application/x-msdownload", songMetaData.Filename);
         }
 
-        [HttpPost]
+        // Assumes that the song already has metadata such as
+        // Title
+        // Artist
+        // Album
+        // Genre
+        // Year
+        // Track
+        // Track count
+        // Disc
+        // Disc count
+        // Cover art
+        //
+        [HttpPost("upload"), DisableRequestSizeLimit]
+        [Route("private-scoped")]
         [Authorize("upload:songs")]
-        public async Task Post([FromForm(Name = "file")] List<IFormFile> songData)
+        public async Task<IActionResult> Post([FromForm(Name = "file")] List<IFormFile> songData)
         {
             try
             {
-                Initialize();
-
                 Console.WriteLine("Uploading song...");
                 _logger.LogInformation("Uploading song...");
 
                 var uploads = _songTempDir;
                 Console.WriteLine($"Song Root Path {uploads}");
                 _logger.LogInformation($"Song root path {uploads}");
+
                 foreach (var sng in songData)
                     if (sng.Length > 0) {
                         Console.WriteLine($"Song filename {sng.FileName}");
                         _logger.LogInformation($"Song filename {sng.FileName}");
 
-                        await _songMgr.SaveSongToFileSystem(sng, _songRepository,
+                        await _songMgr.SaveSongToFileSystem(sng);
-                            	_albumRepository, _artistRepository,
-                            	_genreRepository, _yearRepository, _coverArtRepository);
                     }
+
+                return Ok();
             }
             catch (Exception ex)
             {
                 var msg = ex.Message;
                 _logger.LogError(msg, "An error occurred");
             }
+
+            return NotFound();
         }
 
-        [HttpDelete("{id}")]
+        // The client is expected to send the file, metadata, and cover art separately.
+        // Any metadata already on the file will be overwritten with values from the metadata
+        // as well as the cover art
+        //
+        [HttpPost("upload/with/data")]
+        [Route("private-scoped")]
+        [Authorize("upload:songs")]
+        public async Task<IActionResult> Post ([FromForm] UploadSongWithDataForm up)
+        {
+            try
+            {
+                if (up.SongData.Length > 0 && up.CoverArtData.Length > 0 && !string.IsNullOrEmpty(up.SongFile))
+                {
+                    var song = Newtonsoft.Json.JsonConvert.DeserializeObject<Song>(up.SongFile);
+                    _logger.LogInformation($"Song title: {song.Title}");
+
+                    await _songMgr.SaveSongToFileSystem(up.SongData, up.CoverArtData, song);
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex.Message, "An error occurred");
+            }
+
+            return Ok();
+        }
+
+        [HttpDelete("delete/{id}")]
         [Authorize("delete:songs")]
         public IActionResult Delete(int id)
         {
-            Initialize();
+            var songContext = new SongContext(_connectionString);
 
-            var songMetaData = new Song{ Id = id };
+            var songMetaData = new Song{ SongID = id };
-            Console.WriteLine($"Id {songMetaData.Id}");
+            Console.WriteLine($"Id {songMetaData.SongID}");
-            songMetaData = _songRepository.GetSong(songMetaData);
+
+            songMetaData = songContext.RetrieveRecord(songMetaData);
 
             if (string.IsNullOrEmpty(songMetaData.Title))
             {
@@ -142,13 +153,22 @@ namespace Icarus.Controllers.V1
             {
                 _logger.LogInformation("Starting process of deleting song from the filesystem and database");
 
-                _songMgr.DeleteSong(songMetaData, _songRepository, 
+                _songMgr.DeleteSong(songMetaData);
-                        _albumRepository, _artistRepository,
-                        _genreRepository, _yearRepository, 
-                        _coverArtRepository);
 
                 return Ok();
             }
+
         }
+
+            public class UploadSongWithDataForm
+            {
+                [FromForm(Name = "file")]
+                public IFormFile SongData { get; set; }
+                // TODO: Think about making this optional and if it is not provided, use the stock cover art
+                [FromForm(Name = "cover")]
+                public IFormFile CoverArtData { get; set; }
+                [FromForm(Name = "metadata")]
+                public string SongFile { get; set; }
+            }
     }
 }

Controllers/v1/SongStreamController.cs

@@ -9,10 +9,11 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 
 using Icarus.Models;
-using Icarus.Database.Repositories;
+using Icarus.Database.Contexts;
 
 namespace Icarus.Controllers.V1
 {
@@ -22,6 +23,8 @@ namespace Icarus.Controllers.V1
     {
         #region Fields
         private ILogger<SongStreamController> _logger;
+        private string _connectionString;
+        private IConfiguration _config;
         #endregion
 
 
@@ -30,9 +33,11 @@ namespace Icarus.Controllers.V1
 
 
         #region Constructor
-        public SongStreamController(ILogger<SongStreamController> logger)
+        public SongStreamController(ILogger<SongStreamController> logger, IConfiguration config)
         {
             _logger = logger;
+            _config = config;
+            _connectionString = _config.GetConnectionString("DefaultConnection");
         }
         #endregion
 
@@ -42,22 +47,22 @@ namespace Icarus.Controllers.V1
         [Authorize("stream:songs")]
         public async Task<IActionResult> Get(int id)
         {
-            var songStore= HttpContext.RequestServices
+            var context = new SongContext(_config.GetConnectionString("DefaultConnection"));
-                .GetService(typeof(SongRepository)) as SongRepository;
 
-            var song = songStore.GetSong(new Song { Id = id });
+            var song = context.Songs.FirstOrDefault(sng => sng.SongID == id);
 
-            var mem =  new MemoryStream();
+            var stream = new FileStream(song.SongPath(), FileMode.Open, FileAccess.Read);
-
+            stream.Position = 0;
-            using (var stream = new FileStream(song.SongPath, FileMode.Open, FileAccess.Read))
+            var filename = $"{song.Title}.mp3";
-                await stream.CopyToAsync(mem);
-
-            mem.Position = 0;
 
             _logger.LogInformation("Starting to stream song...>");
             Console.WriteLine("Starting to streamsong...");
 
-            return File(mem, "application/octet-stream", Path.GetFileName(song.SongPath));
+            var file = await Task.Run(() => {
+                return File(stream, "application/octet-stream", filename);
+            });
+
+            return file;
         }
         #endregion
     }

Controllers/v1/YearController.cs

@@ -1,76 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-
-using Icarus.Models;
-using Icarus.Database.Repositories;
-
-namespace Icarus.Controller.V1
-{
-    [Route("api/v1/year")]
-    [ApiController]
-    public class YearController : ControllerBase
-    {
-        #region Fields
-        private readonly ILogger<YearController> _logger;
-        #endregion
-
-
-        #region Properties
-        #endregion
-
-
-        #region Constructors
-        public YearController(ILogger<YearController> logger)
-        {
-            _logger = logger;
-        }
-        #endregion
-
-
-        #region HTTP Routes
-        [HttpGet]
-        [Authorize("read:year")]
-        public IActionResult Get()
-        {
-            var yearValues = new List<Year>();
-
-            var yearStore = HttpContext.RequestServices
-                .GetService(typeof(YearRepository)) as YearRepository;
-
-            yearValues = yearStore.GetSongYears();
-
-            if (yearValues.Count > 0)
-                return Ok(yearValues);
-            else
-                return NotFound(new List<Year>());
-        }
-
-        [HttpGet("{id}")]
-        [Authorize("read:year")]
-        public IActionResult Get(int id)
-        {
-            var year = new Year
-            {
-                YearId = id
-            };
-
-            var yearStore = HttpContext.RequestServices
-                .GetService(typeof(YearRepository)) as YearRepository;
-
-            if (yearStore.DoesYearExist(year))
-            {
-                year = yearStore.GetSongYear(year);
-
-                return Ok(year);
-            }
-            else
-                return NotFound(new Year());
-        }
-        #endregion
-    }
-}

Database/Contexts/AlbumContext.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 using Microsoft.EntityFrameworkCore;
-using MySql.Data;
-using MySql.Data.EntityFrameworkCore.Extensions;
-using MySql.Data.MySqlClient;
 
 using Icarus.Models;
 
@@ -14,12 +12,26 @@ namespace Icarus.Database.Contexts
     {
         public DbSet<Album> Albums { get; set; }
 
-	public AlbumContext(DbContextOptions<AlbumContext> options) : base(options) { }
+        public AlbumContext(DbContextOptions<AlbumContext> options) : base(options) { }
+        public AlbumContext(string connString) : base(new DbContextOptionsBuilder<AlbumContext>()
+                            .UseMySQL(connString).Options)
+        {
+        }                        
 
-	protected override void OnModelCreating(ModelBuilder modelBuilder)
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
-	{
+        {
-	    modelBuilder.Entity<Album>()
+            modelBuilder.Entity<Album>()
-	        .ToTable("Album");
+                .ToTable("Album");
-	}
+        }
+
+        public Album RetrieveRecord(Album album)
+        {
+            return Albums.FirstOrDefault(alb => alb.AlbumID == album.AlbumID);
+        }
+
+        public bool DoesRecordExist(Album album)
+        {
+            return Albums.FirstOrDefault(alb => alb.AlbumID == album.AlbumID) != null ? true : false;
+        }
     }
 }

Database/Contexts/ArtistContext.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 using Microsoft.EntityFrameworkCore;
-using MySql.Data;
-using MySql.Data.EntityFrameworkCore;
-using MySql.Data.MySqlClient;
 
 using Icarus.Models;
 
@@ -14,12 +12,28 @@ namespace Icarus.Database.Contexts
     {
         public DbSet<Artist> Artists { get; set; }
 
-	public ArtistContext(DbContextOptions<ArtistContext> options) : base (options) { }
+		public ArtistContext(DbContextOptions<ArtistContext> options) : base (options) { }
+		public ArtistContext(string connString) : base(new DbContextOptionsBuilder<ArtistContext>()
+							.UseMySQL(connString).Options)
+		{
+		}                        
 
-	protected override void OnModelCreating(ModelBuilder modelBuilder)
+		protected override void OnModelCreating(ModelBuilder modelBuilder)
-	{
+		{
-	    modelBuilder.Entity<Artist>()
+			modelBuilder.Entity<Artist>()
-	        .ToTable("Artist");
+				.ToTable("Artist");
-	}
+		}
+
+		public Artist RetrieveRecord(Artist artist)
+		{
+
+            return Artists.FirstOrDefault(arst => arst.ArtistID == artist.ArtistID);
+		}
+
+
+        public bool DoesRecordExist(Artist artist)
+        {
+            return Artists.FirstOrDefault(arst => arst.ArtistID == artist.ArtistID) != null ? true : false;
+        }
     }
 }

Database/Contexts/CoverArtContext.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 using Microsoft.EntityFrameworkCore;
-using MySql.Data;
-using MySql.Data.EntityFrameworkCore.Extensions;
-using MySql.Data.MySqlClient;
 
 using Icarus.Models;
 
@@ -14,12 +12,26 @@ namespace Icarus.Database.Contexts
     {
         public DbSet<CoverArt> CoverArtImages { get; set; }
 
-	public CoverArtContext(DbContextOptions<CoverArtContext> options) : base(options) { }
+        public CoverArtContext(DbContextOptions<CoverArtContext> options) : base(options) { }
-	
+        public CoverArtContext(string connString) : base(new DbContextOptionsBuilder<CoverArtContext>()
-	protected override void OnModelCreating(ModelBuilder modelBuilder)
+                            .UseMySQL(connString).Options)
-	{
+        {
-	    modelBuilder.Entity<CoverArt>()
+        }                        
-	        .ToTable("CoverArt");
+        
-	}
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            modelBuilder.Entity<CoverArt>()
+                .ToTable("CoverArt");
+        }
+
+        public CoverArt RetrieveRecord(CoverArt cover)
+        {
+            return CoverArtImages.FirstOrDefault(cov => cov.CoverArtID == cover.CoverArtID);
+        }
+
+        public bool DoesRecordExist(CoverArt cover)
+        {
+            return CoverArtImages.FirstOrDefault(cov => cov.CoverArtID == cover.CoverArtID) != null ? true : false;
+        }
     }
 }

Database/Contexts/GenreContext.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 using Microsoft.EntityFrameworkCore;
-using MySql.Data;
-using MySql.Data.EntityFrameworkCore.Extensions;
-using MySql.Data.MySqlClient;
 
 using Icarus.Models;
 
@@ -14,11 +12,26 @@ namespace Icarus.Database.Contexts
     {
         public DbSet<Genre> Genres { get; set; }
         public GenreContext(DbContextOptions<GenreContext> options) : base(options) { }
+        public GenreContext(string connString) : base(new DbContextOptionsBuilder<GenreContext>()
+                            .UseMySQL(connString).Options)
+        {
+        }                        
 
-	protected override void OnModelCreating(ModelBuilder modelBuilder)
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
-	{
+        {
-	    modelBuilder.Entity<Genre>()
+            modelBuilder.Entity<Genre>()
-	         .ToTable("Genre");
+                .ToTable("Genre");
-	}
+        }
+
+
+        public Genre RetrieveRecord(Genre genre)
+        {
+            return Genres.FirstOrDefault(gnr => gnr.GenreID == genre.GenreID);
+        }
+
+        public bool DoesRecordExist(Genre genre)
+        {
+            return Genres.FirstOrDefault(gnr => gnr.GenreID == genre.GenreID) != null ? true : false;
+        }
     }
 }

Database/Contexts/SongContext.cs

@@ -1,10 +1,8 @@
 using System;    
 using System.Collections.Generic;    
+using System.Linq;
 
 using Microsoft.EntityFrameworkCore;
-using MySql.Data;
-using MySql.Data.EntityFrameworkCore.Extensions;
-using MySql.Data.MySqlClient;    
 
 using Icarus.Models;
         
@@ -14,62 +12,78 @@ namespace Icarus.Database.Contexts
     {
         public DbSet<Song> Songs { get; set; }
 
+		public SongContext(string connString) : base(new DbContextOptionsBuilder<SongContext>()
+							.UseMySQL(connString).Options)
+		{
+		}                        
 
-	public SongContext(DbContextOptions<SongContext> options) : base(options) { }
 
-       	protected override void OnModelCreating(ModelBuilder modelBuilder)
+		public SongContext(DbContextOptions<SongContext> options) : base(options) { }
-       	{
-	    modelBuilder.Entity<Song>()
-	        .ToTable("Song");
 
-	    modelBuilder.Entity<Song>()
+		protected override void OnModelCreating(ModelBuilder modelBuilder)
-	        .HasOne(s => s.Album)
+		{
-		.WithMany(al => al.Songs)
+			modelBuilder.Entity<Song>()
-		.HasForeignKey(s => s.AlbumId)
+				.ToTable("Song");
-		.OnDelete(DeleteBehavior.SetNull);
 
-	    modelBuilder.Entity<Song>()
+			/**
-	        .HasOne(sa => sa.SongArtist)
+			modelBuilder.Entity<Song>()
-		.WithMany(ar => ar.Songs)
+				.HasOne(s => s.Album)
-		.HasForeignKey(s => s.ArtistId)
+			.WithMany(al => al.Songs)
-		.OnDelete(DeleteBehavior.SetNull);
+			.HasForeignKey(s => s.AlbumID)
+			.OnDelete(DeleteBehavior.SetNull);
 
-	    modelBuilder.Entity<Song>()
+			modelBuilder.Entity<Song>()
-	        .HasOne(s => s.SongGenre)
+				.HasOne(sa => sa.SongArtist)
-		.WithMany(gnr => gnr.Songs)
+			.WithMany(ar => ar.Songs)
-		.HasForeignKey(s => s.GenreId)
+			.HasForeignKey(s => s.ArtistID)
-		.OnDelete(DeleteBehavior.SetNull);
+			.OnDelete(DeleteBehavior.SetNull);
 
-	    modelBuilder.Entity<Song>()
+			modelBuilder.Entity<Song>()
-	        .HasOne(s => s.SongYear)
+				.HasOne(s => s.SongGenre)
-		.WithMany(yr => yr.Songs)
+			.WithMany(gnr => gnr.Songs)
-		.HasForeignKey(s => s.YearId)
+			.HasForeignKey(s => s.GenreID)
-		.OnDelete(DeleteBehavior.SetNull);
+			.OnDelete(DeleteBehavior.SetNull);
 
-	    modelBuilder.Entity<Song>()
+			modelBuilder.Entity<Song>()
-		 .HasOne(s => s.SongCoverArt)
+				.HasOne(s => s.SongYear)
-		 .WithMany(ca => ca.Songs)
+			.WithMany(yr => yr.Songs)
-		 .HasForeignKey(s => s.CoverArtId)
+			.HasForeignKey(s => s.YearID)
-		 .OnDelete(DeleteBehavior.SetNull);
+			.OnDelete(DeleteBehavior.SetNull);
 
-	    modelBuilder.Entity<Song>()
+			modelBuilder.Entity<Song>()
-	        .Property(s => s.Year)
+				.HasOne(s => s.SongCoverArt)
-		.IsRequired(false);
+				.WithMany(ca => ca.Songs)
-	    modelBuilder.Entity<Song>()
+				.HasForeignKey(s => s.CoverArtID)
-	        .Property(s => s.YearId)
+				.OnDelete(DeleteBehavior.SetNull);
-		.IsRequired(false);
+			*/
-	    modelBuilder.Entity<Song>()
+
-	        .Property(s => s.GenreId)
+			modelBuilder.Entity<Song>()
-		.IsRequired(false);
+				.Property(s => s.Year)
-	    modelBuilder.Entity<Song>()
+			.IsRequired(false);
-	        .Property(s => s.ArtistId)
+			modelBuilder.Entity<Song>()
-		.IsRequired(false);
+				.Property(s => s.GenreID)
-	    modelBuilder.Entity<Song>()
+			.IsRequired(false);
-	        .Property(s => s.AlbumId)
+			modelBuilder.Entity<Song>()
-		.IsRequired(false);
+				.Property(s => s.ArtistID)
-	    modelBuilder.Entity<Song>()
+			.IsRequired(false);
-		.Property(s => s.CoverArtId)
+			modelBuilder.Entity<Song>()
-		.IsRequired(false);
+				.Property(s => s.AlbumID)
-	}
+			.IsRequired(false);
+			modelBuilder.Entity<Song>()
+			.Property(s => s.CoverArtID)
+			.IsRequired(false);
+		}
+
+
+		public Song RetrieveRecord(Song song)
+		{
+            return Songs.FirstOrDefault(sng => sng.SongID == song.SongID);
+		}
+
+
+        public bool DoesRecordExist(Song song)
+        {
+            return Songs.FirstOrDefault(sng => sng.SongID == song.SongID) != null ? true : false;
+        }
     }
 }  

Database/Contexts/UserContext.cs

@@ -1,10 +1,13 @@
 using System;    
 using System.Collections.Generic;    
+using System.Linq;
 
+// using MySql.Data.EntityFrameworkCore;
+// using MySql.Data;
+// using MySql.Data.EntityFrameworkCore.Extensions;
+// using MySql.Data.Entity;
+// using MySql.Data.MySqlClient;    
 using Microsoft.EntityFrameworkCore;
-using MySql.Data;
-using MySql.Data.EntityFrameworkCore.Extensions;
-using MySql.Data.MySqlClient;    
 
 using Icarus.Models;
         
@@ -15,16 +18,31 @@ namespace Icarus.Database.Contexts
         public DbSet<User> Users { get; set; }
 
 
-	public UserContext(DbContextOptions<UserContext> options) : base(options) { }
+        public UserContext(DbContextOptions<UserContext> options) : base(options) { }
+        public UserContext(string connString) : base(new DbContextOptionsBuilder<UserContext>()
+                            .UseMySQL(connString).Options)
+        {
+        }                        
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
-	    modelBuilder.Entity<User>()
-	        .ToTable("User");
             modelBuilder.Entity<User>()
-	        .Property(u => u.LastLogin).IsRequired(false);
+                .ToTable("User");
-	    modelBuilder.Entity<User>()
+            modelBuilder.Entity<User>()
-		.Property(u => u.DateCreated).HasDefaultValue(DateTime.Now);
+                .Property(u => u.LastLogin).IsRequired(false);
+            modelBuilder.Entity<User>()
+                .Property(u => u.DateCreated).HasDefaultValue(DateTime.Now);
+        }
+
+        
+        public User RetrieveRecord(User user)
+        {
+            return Users.FirstOrDefault(usr => usr.UserID == user.UserID);
+        }
+
+        public bool DoesRecordExist(User user)
+        {
+            return Users.FirstOrDefault(usr => usr.UserID == user.UserID) != null ? true : false;
         }
     }
 }  

Database/Contexts/YearContext.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-using Microsoft.EntityFrameworkCore;
-using MySql.Data;
-using MySql.Data.EntityFrameworkCore.Extensions;
-using MySql.Data.MySqlClient;
-
-using Icarus.Models;
-
-namespace Icarus.Database.Contexts
-{
-    public class YearContext : DbContext
-    {
-        public DbSet<Year> YearValues { get; set; }
-
-	public YearContext(DbContextOptions<YearContext> options) : base(options) { }
-
-	protected override void OnModelCreating(ModelBuilder modelBuilder)
-	{
-	    modelBuilder.Entity<Year>()
-	        .ToTable("Year");
-	}
-    }
-}

Database/Repositories/AlbumRepository.cs

@@ -1,385 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-
-using MySql.Data.MySqlClient;
-
-using Icarus.Models;
-
-namespace Icarus.Database.Repositories
-{
-    public class AlbumRepository : BaseRepository
-    {
-	#region Fields
-	#endregion
-
-
-	#region Properties
-	#endregion
-
-
-	#region Constructors
-	public AlbumRepository(string connectionString)
-	{
-	    _connectionString = connectionString;
-	}
-	#endregion
-
-
-	#region Methods
-	public List<Album> GetAlbumWithoutCount()
-	{
-	    var albums = new List<Album>();
-
-	    if (AnyAlbums())
-		try
-	        {
-		    using (MySqlConnection conn = GetConnection())
-		    {
-			conn.Open();
-			var query = "SELECT * FROM Album";
-			using (MySqlCommand cmd = new MySqlCommand(query, conn))
-			    using (var reader = cmd.ExecuteReader())
-				albums = ParseData(reader);
-		    }
-		}
-		catch (Exception ex)
-		{
-		    var msg = ex.Message;
-		    _logger.Error(msg, "An error occurred");
-		}
-
-	    return albums;
-	}
-        public List<Album> GetAlbums()
-        {
-            List<Album> albums = new List<Album>();
-
-            try
-            {
-                using (MySqlConnection conn = GetConnection())
-                {
-                    conn.Open();
-                    var query = "SELECT alb.*,COUNT(*) AS SongCount FROM Album alb " +
-                        "LEFT JOIN Song sng ON alb.AlbumId=sng.AlbumId WHERE " +
-                        "alb.AlbumId=sng.AlbumId GROUP BY alb.AlbumId";
-                    using (MySqlCommand cmd = new MySqlCommand(query, conn))
-                        using (var reader = cmd.ExecuteReader())
-                            albums = ParseData(reader);
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-
-            return albums;
-        }
-
-        public Album GetAlbum(Album album)
-        {
-
-            try
-            {
-                using (MySqlConnection conn = GetConnection())
-                {
-                    conn.Open();
-                    var query = "SELECT alb.*, COUNT(*) AS SongCount FROM Album alb " + 
-                        "LEFT JOIN Song sng ON alb.AlbumId=sng.AlbumId WHERE "+
-                        "alb.AlbumId=@AlbumId LIMIT 1";
-                    using (MySqlCommand cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@AlbumId", album.AlbumId);
-
-                        using (var reader = cmd.ExecuteReader())
-                            album = ParseSingleData(reader);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-
-            return album;
-        }
-        public Album GetAlbum(Song song)
-        {
-            var album = new Album();
-
-            try
-            {
-                using (MySqlConnection conn = GetConnection())
-                {
-                    conn.Open();
-                    var query = "SELECT alb.*, 0 AS SongCount FROM Album alb " +
-                        "WHERE alb.Title=@Title LIMIT 1";
-                    
-                    using (MySqlCommand cmd = new MySqlCommand(query, conn))
-                    {
-                        Console.WriteLine($"Album title {song.AlbumTitle}");
-                        cmd.Parameters.AddWithValue("@Title", song.AlbumTitle);
-
-                        using (var reader = cmd.ExecuteReader())
-                            album = ParseSingleData(reader);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-
-            return album;
-	}
-	public Album GetAlbum(Song song, bool retrieveCount)
-	{
-	    var album = new Album();
-
-	    try
-	    {
-	        using (MySqlConnection conn = GetConnection())
-		{
-		    conn.Open();
-		    var query = string.Empty;
-		    if (retrieveCount)
-		        query = "SELECT alb.*, COUNT(*) AS SongCount FROM Album alb " +
-			    "LEFT JOIN Song sng ON alb.AlbumId=sng.AlbumId WHERE " +
-			    "alb.Title=@Title GROUP BY alb.AlbumId LIMIT 1";
-		    else
-		        query = "SELECT alb.*, 0 AS SongCount FROM Album alb WHERE " +
-			    "alb.Title=@Title LIMIT 1";
-					
-		    using (MySqlCommand cmd = new MySqlCommand(query, conn))
-		    {
-			cmd.Parameters.AddWithValue("@Title", song.AlbumTitle);
-
-			using (var reader = cmd.ExecuteReader())
-			    album = ParseSingleData(reader);
-		    }
-	        }
-	    }
-	    catch (Exception ex)
-	    {
-		var msg = ex.Message;
-	        _logger.Error(msg, "An error occurred");
-	    }
-
-	    return album;
-	}
-
-	public bool DoesAlbumExist(Album album)
-	{
-	    try
-	    {
-	        using (MySqlConnection conn = GetConnection())
-		{
-		    conn.Open();
-
- 		    var query = "SELECT alb.*, 0 AS SongCount FROM Album alb WHERE alb.AlbumId=@AlbumId";
-		    using (MySqlCommand cmd = new MySqlCommand(query, conn))
-		    {
-		        cmd.Parameters.AddWithValue("@AlbumId", album.AlbumId);
-						
-			using (var reader = cmd.ExecuteReader())
-			{
-			    album =  ParseSingleData(reader);
-
-			    if (album.Title != null)
-			    {
-			        _logger.Info($"Album {album.Title} exists");
-			        return true;
-			    }
-			}
-		    }
-		}
-	    }
-	    catch (Exception ex)
-	    {
-	        var msg = ex.Message;
-		_logger.Error(msg, "An error occurred");
-	    }
-	    return false;
-	}
-	public bool DoesAlbumExist(Song song)
-	{
-	    try
-	    {
-	        using (MySqlConnection conn = GetConnection())
-		{
-		    conn.Open();
-
-		    var query = "SELECT alb.*, 0 AS SongCount FROM Album alb WHERE alb.Title=@Title";
-		    using (MySqlCommand cmd = new MySqlCommand(query, conn))
-		    {
-		        cmd.Parameters.AddWithValue("@Title", song.AlbumTitle);
-					
-			using (var reader = cmd.ExecuteReader())
-			{
-			    var album =  ParseSingleData(reader);
-
-			    if (!String.IsNullOrEmpty(album.Title))
-			    {
-			        _logger.Info($"Album {album.Title} exists");
-				return true;
-			    }
-			}
-		    }
-		}
-	    }
-	    catch (Exception ex)
-	    {
-	        var msg = ex.Message;
-	        _logger.Error(msg, "An error occurred");
-	    }
-	    return false;
-	}
-
-	public void SaveAlbum(Album album)
-	{
-	    try
-	    {
-	        using (MySqlConnection conn = GetConnection())
-		{
-		    conn.Open();
-		    var query = "INSERT INTO Album(Title, AlbumArtist)" +
-		        " VALUES (@Title, @AlbumArtist)";
-		    using (MySqlCommand cmd = new MySqlCommand(query, conn))
-		    {
-		        cmd.Parameters.AddWithValue("@Title", album.Title);
-			cmd.Parameters.AddWithValue("@AlbumArtist", album.AlbumArtist);
-
-			cmd.ExecuteNonQuery();
-		    }
-		}
-    	    }
-	    catch (Exception ex)
-	    {
-	        var msg = ex.Message;
-		_logger.Error(msg, "An error occurred");
-	    }
-	}
-	public void UpdateAlbum(Album album)
-	{
-	    try
-	    {
-	        using (MySqlConnection conn = GetConnection())
-		{
-		    conn.Open();
-		    var query = "UPDATE Album SET Title=@Title, AlbumArtist=" +
-		        "@AlbumArtist WHERE AlbumId=@AlbumId";
-
-		    using (MySqlCommand cmd = new MySqlCommand(query, conn))
-		    {
-			cmd.Parameters.AddWithValue("@Title", album.Title);
-			cmd.Parameters.AddWithValue("@AlbumArtist", album.AlbumArtist);
-			cmd.Parameters.AddWithValue("@AlbumId", album.AlbumId);
-
-		        cmd.ExecuteNonQuery();
-	   	    }
-	        }	
-	    }
-	    catch (Exception ex)
-	    {
-			var msg = ex.Message;
-			_logger.Error(msg, "An error occurred");
-	    }
-	}
-	public void DeleteAlbum(Album album)
-	{
-	    try
-	    {
-		using (var conn = GetConnection())
-		{
-		    conn.Open();
-		    var query = "DELETE FROM Album WHERE AlbumId=@AlbumId";
-
-		    using (var cmd = new MySqlCommand(query, conn))
-		    {
-			cmd.Parameters.AddWithValue("@AlbumId", album.AlbumId);
-
-		        cmd.ExecuteNonQuery();
-		    }
-	        }
-	    }
-	    catch (Exception ex)
-	    {
-		var msg = ex.Message;
-	        _logger.Error(msg, "An error occurred");
-	    }
-	}
-
-	private List<Album> ParseData(MySqlDataReader reader)
-	{
-	    List<Album> albums = new List<Album>();
-	    _logger.Info("Retrieving album records");
-
-            while (reader.Read())
-	    {
-	        var id = Convert.ToInt32(reader["AlbumId"]);
-	        var title = reader["Title"].ToString();
-	        var albumArtist = reader["AlbumArtist"].ToString();
-	        var songCount = Convert.ToInt32(reader["SongCount"]);
-	        albums.Add(new Album
-	        {
-		    AlbumId = id,
-		    Title = title,
-		    AlbumArtist = albumArtist,
-	            SongCount = songCount
-	        });
-	    }
-
-	    _logger.Info("Album records retrieved");
-
-	    return albums;
-	}
-	private Album ParseSingleData(MySqlDataReader reader)
-	{
-	    Album album = new Album();
-	    _logger.Info("Retrieving single album record");
-
-	    while (reader.Read())
-	    {
-		var id = Convert.ToInt32(reader["AlbumId"]);
-		var title = reader["Title"].ToString();
-		var albumArtist = reader["AlbumArtist"].ToString();
-		var songCount = Convert.ToInt32(reader["SongCount"]);
-		album = new Album
-		{
-		    AlbumId = id,
-		    Title = title,
-		    AlbumArtist = albumArtist,
-		    SongCount = songCount
-	        };
-	    }
-	    _logger.Info("Single ablum retreived");
-
-	    return album;
-	}
-
-	private bool AnyAlbums()
-	{
-            var albums = new List<Album>();
-
-	    using (var conn = GetConnection())
-	    {
-		conn.Open();
-
-		var query = "SELECT * FROM Album";
-
-		using (var cmd = new MySqlCommand(query, conn))
-		    using (var reader = cmd.ExecuteReader())
-		        albums = ParseData(reader);
-	    }
-
-	    if (albums.Count > 0)
-	        return true;
-
-	    return false;
-	}
-        #endregion
-    }
-}

Database/Repositories/ArtistRepository.cs

@@ -1,355 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-
-using Microsoft.Extensions.Logging;
-using MySql.Data.MySqlClient;
-//using NLog;
-
-using Icarus.Models;
-
-namespace Icarus.Database.Repositories
-{
-    public class ArtistRepository : BaseRepository
-    {
-        #region Fields
-        #endregion
-
-
-        #region Properties
-        #endregion
-
-
-        #region Constructors
-        public ArtistRepository(string connectionString)
-        {
-            _connectionString = connectionString;
-        }
-        #endregion
-
-
-        #region Methods
-        public List<Artist> GetArtists()
-        {
-            List<Artist> artists = new List<Artist>();
-            try
-            {
-                using (MySqlConnection conn = GetConnection())
-                {
-                    conn.Open();
-                    var query = "SELECT art.*, COUNT(*) AS SongCount FROM Artist " + 
-                        "art LEFT JOIN Song sng ON art.ArtistId=sng.ArtistId " +
-                        "GROUP BY art.ArtistId";
-
-                    using (MySqlCommand cmd = new MySqlCommand(query, conn))
-                        using (var reader = cmd.ExecuteReader())
-                            artists = ParseData(reader);
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-
-            return artists;
-        }
-
-        public Artist GetArtist(Artist artist)
-        {
-            try
-            {
-                _logger.Info("Retrieving artist record from the database");
-                using (MySqlConnection conn = GetConnection())
-                {
-                    conn.Open();
-
-                    var query = "SELECT art.*, COUNT(*) AS SongCount FROM Artist " +
-                        "art LEFT JOIN Song sng ON art.ArtistId=sng.ArtistId " +
-                        "WHERE art.ArtistId=@ArtistId";
-
-                    using (MySqlCommand cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@ArtistId", artist.ArtistId);
-
-                        using (var reader = cmd.ExecuteReader())
-                            artist = ParseSingleData(reader);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-
-            return artist;
-        }
-        public Artist GetArtist(Song song)
-        {
-            Artist artist = new Artist();
-            try
-            {
-                _logger.Info("Retrieving artist record from the database");
-                using (MySqlConnection conn = GetConnection())
-                {
-                    conn.Open();
-
-                    var query = "SELECT art.*, 0 AS SongCount FROM Artist " +
-                        "art WHERE art.Name=@Name";
-                    using (MySqlCommand cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@Name", song.Artist);
-
-                        using (var reader = cmd.ExecuteReader())
-                            artist = ParseSingleData(reader);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-
-            return artist;
-        }
-        public Artist GetArtist(Song song, bool retrieveCount)
-        {
-            var artist = new Artist();
-
-            try
-            {
-                _logger.Info("Retrieving artist record from the database");
-                using (MySqlConnection conn = GetConnection())
-                {
-                    conn.Open();
-
-                    var query = string.Empty;
-
-                    if (retrieveCount)
-                        query = "SELECT art.*, COUNT(*) AS SongCount FROM Artist " +
-                            "art LEFT JOIN Song sng ON art.ArtistId=sng.ArtistId " +
-                            "WHERE art.Name=@Name GROUP BY art.ArtistId LIMIT 1";
-                    else
-                        query = "SELECT art.*, 0 AS SongCount FROM Artist art " +
-                            "WHERE art.Name=@Name LIMIT 1";
-
-                    using (MySqlCommand cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@Name", song.Artist);
-
-                        using (var reader = cmd.ExecuteReader())
-                            artist = ParseSingleData(reader);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-
-            return artist;
-        }
-
-        public bool DoesArtistExist(Artist artist)
-        {
-            try
-            {
-                _logger.Info("Checking to see if Artist exists");
-                using (MySqlConnection conn = GetConnection())
-                {
-                    conn.Open();
-
-                    var query = "SELECT art.*, 0 AS SongCount FROM Artist art WHERE art.ArtistId=@ArtistId";
-
-                    using (MySqlCommand cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@ArtistId", artist.ArtistId);
-                        
-                        using (var reader = cmd.ExecuteReader())
-                        {
-                            artist =  ParseSingleData(reader);
-
-                            if (artist.Name != null)
-                            {
-                                _logger.Info($"Artist {artist.Name} exists");
-                                return true;
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-            
-            _logger.Info("Could not successfully retrieve Artist");
-
-            return false;
-        }
-        public bool DoesArtistExist(Song song)
-        {
-            try
-            {
-                _logger.Info("Checking to see if Artist exists");
-                using (MySqlConnection conn = GetConnection())
-                {
-                    conn.Open();
-
-                    var query = "SELECT art.*, 0 AS SongCount FROM Artist art WHERE art.Name=@Name";
-                    using (MySqlCommand cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@Name", song.Artist);
-                        
-                        using (var reader = cmd.ExecuteReader())
-                        {
-                            var artist =  ParseSingleData(reader);
-
-                            if (!String.IsNullOrEmpty(artist.Name))
-                            {
-                                _logger.Info($"Artist {artist.Name} exists");
-                                return true;
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-
-            _logger.Info("Could not successfully retrieve Artist");
-
-            return false;
-        }
-
-
-        public void SaveArtist(Artist artist)
-        {
-            try
-            {
-                _logger.Info("Saving artist record");
-                using (MySqlConnection conn = GetConnection())
-                {
-                    conn.Open();
-                    var query = "INSERT INTO Artist(Name) VALUES(@Name)";
-
-                    using (MySqlCommand cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@Name", artist.Name);
-
-                        cmd.ExecuteNonQuery();
-                    }
-                }
-
-                _logger.Info("Artist record has successfully been saved");
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-        }
-        public void UpdateArtist(Artist artist)
-        {
-            try
-            {
-                _logger.Info("Updating artist record");
-                using (MySqlConnection conn = GetConnection())
-                {
-                    conn.Open();
-                    var query = "UPDATE Artist SET Name=@Name WHERE ArtistId=@ArtistId";
-
-                    using (MySqlCommand cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@Name", artist.Name);
-                        cmd.Parameters.AddWithValue("@ArtistId", artist.ArtistId);
-
-                        cmd.ExecuteNonQuery();
-                    }
-                }
-
-                _logger.Info("Artist record has successfully been saved");
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-        }
-        public void DeleteArtist(Artist artist)
-        {
-            try
-            {
-                _logger.Info("Deleting artist record");
-
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
-
-                    var query = "DELETE FROM Artist WHERE ArtistId=@ArtistId";
-
-                    using (var cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@ArtistId", artist.ArtistId);
-
-                        cmd.ExecuteNonQuery();
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-        }
-
-        private List<Artist> ParseData(MySqlDataReader reader)
-        {
-            List<Artist> artists = new List<Artist>();
-
-            while (reader.Read())
-            {
-                var id = Convert.ToInt32(reader["ArtistId"]);
-                var name = reader["Name"].ToString();
-                var songCount = Convert.ToInt32(reader["SongCount"].ToString());
-                artists.Add(new Artist
-                {
-                    ArtistId = id,
-                    Name = name,
-                    SongCount = songCount
-                });
-            }
-
-            _logger.Info("Artist records retrieved");
-
-            return artists;
-        }
-
-        private Artist ParseSingleData(MySqlDataReader reader)
-        {
-            Artist artist = new Artist();
-
-            while (reader.Read())
-            {
-                var id = Convert.ToInt32(reader["ArtistId"]);
-                var name = reader["Name"].ToString();
-                var songCount = Convert.ToInt32(reader["SongCount"].ToString());
-                artist.ArtistId = id;
-                artist.Name = name;
-                artist.SongCount = songCount;
-            }
-
-            _logger.Info("Single artist record retrieved");
-
-            return artist;
-        }
-        #endregion
-    }
-}

Database/Repositories/BaseRepository.cs

@@ -1,23 +0,0 @@
-using System;
-
-using MySql.Data.MySqlClient;
-using NLog;
-
-namespace Icarus.Database.Repositories
-{
-    public class BaseRepository
-    {
-        #region Fields
-        protected string _connectionString;
-        protected static Logger _logger = NLog.LogManager.GetCurrentClassLogger();
-        #endregion
-
-
-        #region Methods
-        protected MySqlConnection GetConnection()
-        {
-            return new MySqlConnection(_connectionString);
-        }
-        #endregion
-    }
-}

Database/Repositories/CoverArtRepository.cs

@@ -1,255 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-using MySql.Data.MySqlClient;
-
-using Icarus.Models;
-using Icarus.Types;
-
-namespace Icarus.Database.Repositories
-{
-    public class CoverArtRepository : BaseRepository
-    {
-        #region Constructors
-        public CoverArtRepository(string connectionString)
-        {
-            _connectionString = connectionString;
-        }
-        #endregion
-
-
-        #region Methods
-        public CoverArt GetCoverArt(CoverArt cover)
-        {
-            try
-            {
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
-
-                    _logger.Info("Querying cover art record");
-
-                    var query = "SELECT * FROM CoverArt WHERE " +
-                        "CoverArtId=@CoverArtId";
-                    using (var cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters
-                           .AddWithValue("@CoverArtId", cover.CoverArtId);
-
-                        using (var reader = cmd.ExecuteReader())
-                            return ParseSingleData(reader);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-
-            return null;
-        }
-        public CoverArt GetCoverArt(Song song)
-        {
-            try
-            {
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
-
-                    _logger.Info("Querying cover art record");
-
-                    var query = "SELECT cov.* FROM CoverArt cov LEFT JOIN " +
-                        "Song sng ON cov.CoverArtId=sng.CoverArtId WHERE " +
-                        "sng.Id=@SongId";
-                    using (var cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@SongId", song.Id);
-
-                        using (var reader = cmd.ExecuteReader())
-                            return ParseSingleData(reader);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-
-            return null;
-        }
-        public CoverArt GetCoverArt(CoverArtField field, CoverArt cover)
-        {
-            try
-            {
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
-
-                    _logger.Info("Querying cover art record");
-
-                    using (var cmd = new MySqlCommand(BuildQuery(field), conn))
-                    {
-                        switch (field)
-                        {
-                            case CoverArtField.SongTitle:
-                                cmd.Parameters.AddWithValue("@SongTitle",
-                                        cover.SongTitle);
-                                break;
-                            case CoverArtField.ImagePath:
-                                cmd.Parameters.AddWithValue("@ImagePath", 
-                                        cover.ImagePath);
-                                break;
-                        }
-
-                        using (var reader = cmd.ExecuteReader())
-                            return ParseSingleData(reader);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-
-            return null;
-        }
-
-        public bool DoesCoverArtExist(CoverArt cover)
-        {
-            return GetCoverArt(cover) != null ? true : false;
-        }
-        public bool DoesCoverArtExist(Song song)
-        {
-            return GetCoverArt(song) != null ? true : false;
-        }
-
-        public void SaveCoverArt(CoverArt coverArt)
-        {
-            try
-            {
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
-
-                    _logger.Info("Saving cover art record");
-
-                    var query = "INSERT INTO CoverArt(SongTitle, ImagePath) " +
-                        "VALUES(@SongTitle, @ImagePath)";
-                    using (var cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters
-                            .AddWithValue("@SongTitle", coverArt.SongTitle);
-                        cmd.Parameters
-                            .AddWithValue("@ImagePath", coverArt.ImagePath);
-
-                        cmd.ExecuteNonQuery();
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-        }
-        public void DeleteCoverArt(CoverArt cover)
-        {
-            try
-            {
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
-
-                    _logger.Info("Deleting cover art record");
-
-                    var query = "DELETE FROM CoverArt WHERE " +
-                        "CoverArtId=@CoverArtId";
-                    using (var cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters
-                            .AddWithValue("@CoverArtId", cover.CoverArtId);
-
-                        cmd.ExecuteNonQuery();
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-        }
-
-        private List<CoverArt> ParseData(MySqlDataReader reader)
-        {
-            if (reader.HasRows)
-            {
-                var coverArtList = new List<CoverArt>();
-                _logger.Info("Parsing cover art records");
-                while (reader.Read())
-                    coverArtList.Add(new CoverArt
-                    {
-                        CoverArtId = Convert.ToInt32(reader["CoverArtId"]),
-                        SongTitle = reader["SongTitle"].ToString(),
-                        ImagePath = reader["ImagePath"].ToString()
-                    });
-
-                return coverArtList;
-            }
-
-            return null;
-        }
-    
-        private CoverArt ParseSingleData(MySqlDataReader reader)
-        {
-            if (reader.HasRows)
-            {
-                _logger.Info("Parsing single cover art record");
-                reader.Read();
-
-                return new CoverArt
-                {
-                    CoverArtId = Convert.ToInt32(reader["CoverArtId"]),
-                    SongTitle = reader["SongTitle"].ToString(),
-                    ImagePath = reader["ImagePath"].ToString()
-                };
-            }
-
-            return null;
-        }
-
-        private string BuildQuery(CoverArtField field)
-        {
-            switch (field)
-            {
-                case CoverArtField.SongTitle:
-                    return "SELECT * FROM CoverArt WHERE SongTitle=@SongTitle";
-                case CoverArtField.ImagePath:
-                    return "SELECT * FROM CoverArt WHERE ImagePath=" +
-                        "@ImagePath";
-            }
-
-            return null;
-        }
-
-        private bool? AnyCoverArt()
-        {
-            using (var conn = GetConnection())
-            {
-                conn.Open();
-
-                _logger.Info("Checking to see if there are any cover art " + 
-                        "records");
-
-                var query = "SELECT * FROM CoverArt";
-                using (var cmd = new MySqlCommand(query, conn))
-                    using (var reader = cmd.ExecuteReader())
-                        return reader.HasRows;
-            }
-        }
-        #endregion
-    }
-}

Database/Repositories/GenreRepository.cs

@@ -1,447 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-
-using MySql.Data.MySqlClient;
-
-using Icarus.Models;
-
-namespace Icarus.Database.Repositories
-{
-    public class GenreRepository : BaseRepository
-    {
-        #region Fields
-        #endregion
-
-
-        #region Properties
-        #endregion
-
-
-        #region Constructors
-        public GenreRepository(string connectionString)
-        {
-            _connectionString = connectionString;
-        }
-        #endregion
-
-
-        #region Methods
-        public List<Genre> GetGenresWithoutCount()
-        {
-            _logger.Info("Retrieving all genre records without song counts");
-
-            var genres = new List<Genre>();
-
-            if (AnyGenre())
-            {
-
-                try
-                {
-                    using (var conn = GetConnection())
-                    {
-                        conn.Open();
-
-                        var query = "SELECT * FROM Genre";
-
-                        using (var cmd = new MySqlCommand(query, conn))
-                            using (var reader = cmd.ExecuteReader())
-                                genres = ParseData(reader);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    var msg = ex.Message;
-                    _logger.Error(msg, "An error occurred");
-                }
-            }
-
-            return genres;
-        }
-        public List<Genre> GetGenres()
-        {
-            _logger.Info("Retrieving Genre records");
-
-            var genres = new List<Genre>();
-
-            if (AnyGenre())
-            {
-
-                try
-                {
-                    using (var conn = GetConnection())
-                    {
-                        conn.Open();
-
-                        var query = "SELECT gnr.*, COUNT(*) AS SongCount FROM Genre " + 
-                            "gnr LEFT JOIN Song sng ON gnr.GenreId=sng.GenreId " +
-                            "GROUP BY gnr.GenreId";
-
-                        using (var cmd = new MySqlCommand(query, conn))
-                            using (var reader = cmd.ExecuteReader())
-                                genres = ParseData(reader);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    var msg = ex.Message;
-                    _logger.Error(msg, "An error occurred");
-                }
-            }
-
-            return genres;
-        }
-
-        public Genre GetGenre(Genre genre)
-        {
-            _logger.Info("Retrieving Genre record");
-
-            if (DoesGenreExist(genre))
-            {
-                try
-                {
-                    using (var conn = GetConnection())
-                    {
-                        conn.Open();
-
-                        var query = "SELECT gnr.*, COUNT(*) AS SongCount FROM Genre " +
-                            "gnr LEFT JOIN Song sng ON gnr.GenreId=sng.GenreId  " +
-                               "WHERE gnr.GenreId=@GenreId";
-
-                        using (var cmd = new MySqlCommand(query, conn))
-                        {
-                            cmd.Parameters.AddWithValue("@GenreId", genre.GenreId);
-
-                            using (var reader = cmd.ExecuteReader())
-                                genre = ParseSingleData(reader);
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    var msg = ex.Message;
-                    _logger.Error(msg, "An error occurred");
-                }
-            }
-
-            return genre;
-        }
-        public Genre GetGenre(Song song)
-        {
-            _logger.Info("Retrieving Genre record");
-
-            var genre = new Genre();
-
-            if (DoesGenreExist(song))
-            {
-                try
-                {
-                    using (var conn = GetConnection())
-                    {
-                        conn.Open();
-
-                        var query = "SELECT gnr.*, 0 AS SongCount FROM Genre " +
-                            "gnr WHERE gnr.GenreName=@GenreName";
-
-                        using (var cmd = new MySqlCommand(query, conn))
-                        {
-                            cmd.Parameters.AddWithValue("@GenreName", song.Genre);
-                            _logger.Info($"Song genre:\n\n\n {song.Genre}");
-
-                            using (var reader = cmd.ExecuteReader())
-                                genre = ParseSingleData(reader);
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    var msg = ex.Message;
-                    _logger.Error(msg, "An error occurred");
-                }
-            }
-
-            return genre;
-        }
-        public Genre GetGenre(Song song, bool retrieveCount)
-        {
-            _logger.Info("Retrieving Genre record");
-
-            var genre = new Genre();
-
-            if (DoesGenreExist(song))
-            {
-                try
-                {
-                    using (var conn = GetConnection())
-                    {
-                        conn.Open();
-
-                        var query = string.Empty;
-
-                        if (retrieveCount)
-                            query = "SELECT gnr.*, COUNT(*) AS SongCount FROM Genre gnr " +
-                                "LEFT JOIN Song sng ON gnr.GenreId=sng.GenreId " +
-                                "WHERE gnr.GenreName=@GenreName GROUP BY gnr.GenreId " +
-                                "LIMIT 1";
-                        else
-                            query = "SELECT gnr.*, 0 AS SongCount FROM Genre gnr " +
-                                "WHERE gnr.GenreName=@GenreName LIMIT 1";
-
-                        using (var cmd = new MySqlCommand(query, conn))
-                        {
-                            cmd.Parameters.AddWithValue("@GenreName", song.Genre);
-                            _logger.Info($"Song genre:\n\n\n {song.Genre}");
-
-                            using (var reader = cmd.ExecuteReader())
-                                genre = ParseSingleData(reader);
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    var msg = ex.Message;
-                    _logger.Error(msg, "An error occurred");
-                }
-            }
-
-            return genre;
-        }
-
-        public bool DoesGenreExist(Genre genre)
-        {
-            _logger.Info("Checking to see if Genre record exists");
-
-            try
-            {
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
-
-                    var query = "SELECT gnr.*, 0 AS SongCount FROM Genre gnr WHERE " +
-                        "gnr.GenreId=@GenreId";
-
-                    using (var cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@GenreId", genre.GenreId);
-
-                        using (var reader = cmd.ExecuteReader())
-                        {
-                            genre = ParseSingleData(reader);
-                            var genreName = genre.GenreName;
-
-                            if (!string.IsNullOrEmpty(genreName))
-                            {
-                                _logger.Info("Genre exists");
-
-                                return true;
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-
-            _logger.Info("Genre does not exist");
-
-            return false;
-        }
-        public bool DoesGenreExist(Song song)
-        {
-            _logger.Info("Checking to see if Genre record exists");
-
-            try
-            {
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
-
-                    var query = "SELECT gnr.*, 0 AS SongCount FROM Genre gnr WHERE " +
-                        "gnr.GenreName=@GenreName";
-
-                    using (var cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@GenreName", song.Genre);
-
-                        using (var reader = cmd.ExecuteReader())
-                        {
-                            var genre = ParseSingleData(reader);
-                            var genreName = genre.GenreName;
-
-                            if (!string.IsNullOrEmpty(genreName))
-                            {
-                                _logger.Info("Genre exists");
-
-                                return true;
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-
-            _logger.Info("Genre does not exist");
-
-            return false;
-        }
-
-        public void SaveGenre(Genre genre)
-        {
-            _logger.Info("Saving Genre record");
-
-            try
-            {
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
-
-                    var query = "INSERT INTO Genre(GenreName) VALUES(@GenreName)";
-
-                    using (var cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@GenreName", genre.GenreName);
-
-                        cmd.ExecuteNonQuery();
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-        }
-        public void UpdateGenre(Genre genre)
-        {
-            _logger.Info("Updating Genre record");
-
-            try
-            {
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
-
-                    var query = "UPDATE Genre SET GenreName=@GenreName " +
-                        "WHERE GenreId=@GenreId";
-
-                    using (var cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@GenreName", genre.GenreName);
-                        cmd.Parameters.AddWithValue("@GenreId", genre.GenreId);
-
-                        cmd.ExecuteNonQuery();
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-        }
-        public void DeleteGenre(Genre genre)
-        {
-            _logger.Info("Deleting Genre record");
-
-            try
-            {
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
-
-                    var query = "DELETE FROM Genre WHERE GenreId=@GenreId";
-
-                    using (var cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@GenreId", genre.GenreId);
-
-                        cmd.ExecuteNonQuery();
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-        }
-
-        private List<Genre> ParseData(MySqlDataReader reader)
-        {
-            var genres = new List<Genre>();
-            _logger.Info("Retrieving genre records");
-
-            while (reader.Read())
-            {
-                var id = Convert.ToInt32(reader["GenreId"].ToString());
-                var genreName = reader["GenreName"].ToString();
-                var songCount = Convert.ToInt32(reader["SongCount"].ToString());
-
-                genres.Add(new Genre
-                {
-                    GenreId = id,
-                    GenreName = genreName,
-                    SongCount = songCount
-                });
-            }
-
-            _logger.Info("Genre records retrieved");
-
-            return genres;
-        }
-
-        private Genre ParseSingleData(MySqlDataReader reader)
-        {
-            var genre = new Genre();
-            _logger.Info("Retrieving single genre record");
-
-            while (reader.Read())
-            {
-                var id = Convert.ToInt32(reader["GenreId"].ToString());
-                var genreName = reader["GenreName"].ToString();
-                var songCount = Convert.ToInt32(reader["SongCount"].ToString());
-                genre.GenreId = id;
-                genre.GenreName = genreName;
-                genre.SongCount = songCount;
-            }
-
-            _logger.Info("Single genre record retrieved");
-
-            return genre;
-        }
-
-        private bool AnyGenre()
-        {
-            try
-            {
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
-
-                    var query = "SELECT * FROM Genre";
-
-                    using (var cmd = new MySqlCommand(query, conn))
-                        using (var reader = cmd.ExecuteReader())
-                            return reader.HasRows;
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-
-            _logger.Info("No genre records found");
-
-            return false;
-        }
-        #endregion
-    }
-}

Database/Repositories/SongRepository.cs

@@ -1,324 +0,0 @@
-using System;    
-using System.Collections.Generic;    
-
-using MySql.Data.MySqlClient;    
-        
-using Icarus.Models;
-
-namespace Icarus.Database.Repositories
-{    
-    public class SongRepository : BaseRepository
-        {    
-        #region Fields
-        #endregion
-
-
-        #region Properties
-        #endregion
-    
-
-        #region Constructors
-        public SongRepository(string connectionString)    
-        {    
-            _connectionString = connectionString;    
-        }    
-        #endregion
-
-
-        #region Methods
-        public void SaveSong(Song song)
-        {
-            try
-            {
-                _logger.Info("Saving song to the database");
-                using (MySqlConnection conn = GetConnection())
-                {
-                    conn.Open();
-                    string query = "INSERT INTO Song(Title, AlbumTitle, Artist," +
-                        " Year, Genre, Duration, Filename, SongPath, AlbumId, " +
-                        "ArtistId, GenreId, YearId, CoverArtId) VALUES(@Title," +
-                        " @AlbumTitle, @Artist, @Year, @Genre, @Duration, " +
-                        "@Filename, @SongPath, @AlbumId, @ArtistId, @GenreId," +
-                       " @YearId, @CoverArtId)";
-                    using (MySqlCommand cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@Title", song.Title);
-                        cmd.Parameters.AddWithValue("@AlbumTitle", song.AlbumTitle);
-                        cmd.Parameters.AddWithValue("@Artist", song.Artist);
-                        cmd.Parameters.AddWithValue("@Year", song.Year);
-                        cmd.Parameters.AddWithValue("@Genre", song.Genre);
-                        cmd.Parameters.AddWithValue("@Duration", song.Duration);
-                        cmd.Parameters.AddWithValue("@Filename", song.Filename);
-                        cmd.Parameters.AddWithValue("@SongPath", song.SongPath);
-                        cmd.Parameters.AddWithValue("@AlbumId", song.AlbumId);
-                        cmd.Parameters.AddWithValue("@ArtistId", song.ArtistId);
-                        cmd.Parameters.AddWithValue("@GenreId", song.GenreId);
-                        cmd.Parameters.AddWithValue("@YearId", song.YearId);
-                        cmd.Parameters.AddWithValue("@CoverArtId", song.CoverArtId);
-
-                        cmd.ExecuteNonQuery();
-                    }
-                }
-                _logger.Info("Successfully saved song to the database");
-            }
-            catch(Exception ex)
-            {
-                var exMsg = ex.Message;
-                Console.WriteLine($"An error occurred:\n{exMsg}");
-                _logger.Error(exMsg, "An error occurred");
-            }
-        }
-        public void UpdateSong(Song song)
-        {
-            try
-            {
-                using (MySqlConnection conn = GetConnection())
-                {
-                    conn.Open();
-
-                    string query = "UPDATE Song SET Title=@Title, AlbumTitle=@AlbumTitle, " + 
-                        "Artist=@Artist, Year=@Year, Genre=@Genre, Duration=@Duration, " +
-                        "Filename=@Filename, SongPath=@SongPath, AlbumId=@AlbumId, " +
-                        "ArtistId=@ArtistId, GenreId=@GenreId, YearId=@YearId  WHERE Id=@Id";
-
-                    using (MySqlCommand cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@Title", song.Title);
-                        cmd.Parameters.AddWithValue("@AlbumTitle", song.AlbumTitle);
-                        cmd.Parameters.AddWithValue("@Artist", song.Artist);
-                        cmd.Parameters.AddWithValue("@Year", song.Year);
-                        cmd.Parameters.AddWithValue("@Genre", song.Genre);
-                        cmd.Parameters.AddWithValue("@Duration", song.Duration);
-                        cmd.Parameters.AddWithValue("@Filename", song.Filename);
-                        cmd.Parameters.AddWithValue("@SongPath", song.SongPath);
-                        cmd.Parameters.AddWithValue("@Id", song.Id);
-                        cmd.Parameters.AddWithValue("@AlbumId", song.AlbumId);
-                        cmd.Parameters.AddWithValue("@ArtistId", song.ArtistId);
-                        cmd.Parameters.AddWithValue("@GenreId", song.GenreId);
-                        cmd.Parameters.AddWithValue("@YearId", song.YearId);
-
-                        cmd.ExecuteNonQuery();
-                    }
-                }
-                _logger.Info("Updated song");
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                Console.WriteLine("An error occurred in SongRepository:");
-                Console.WriteLine(msg);
-                _logger.Error(msg, "An error occurred");
-            }
-        }
-        public void DeleteSong(Song song)
-        {
-            try
-            {
-                _logger.Info("Deleting song record");
-
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
-
-                    var query = "Delete FROM Song WHERE Id=@Id";
-
-                    using (var cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@Id", song.Id);
-
-                        cmd.ExecuteNonQuery();
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-        }
-        public void DeleteSong(int id)
-        {
-            try
-            {
-                _logger.Info("Deleting song record");
-
-                using (MySqlConnection conn = GetConnection())
-                {
-                    conn.Open();
-                    string query = "DELETE FROM Song WHERE Id=@Id";
-                  
-                    using (MySqlCommand cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@Id", id);
-
-                        cmd.ExecuteNonQuery();
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var exMsg = ex.Message;
-                Console.WriteLine($"An error occurred:\n{exMsg}");
-                _logger.Error(exMsg, "An error occurred");
-            }
-        }
-
-        public List<Song> GetAllSongs()
-        {
-            List<Song> songs = new List<Song>();
-
-            try
-            {
-                _logger.Info("Retrieving songs from the database");
-                using (MySqlConnection conn = GetConnection())
-                {
-                    conn.Open();
-                    var query = "SELECT * FROM Song";
-                    Console.WriteLine("ffff");
-                    MySqlCommand cmd = new MySqlCommand(query, conn);
-                    using (var reader = cmd.ExecuteReader())
-                        songs = ParseData(reader);
-                }
-            }
-            catch (Exception ex)
-            {
-                var exMsg = ex.Message;
-                Console.WriteLine($"An error ocurred:\n{exMsg}");
-                songs.Clear();
-                _logger.Error(exMsg, "An error occurred");
-            }
-
-            return songs;
-        }
-
-        public Song GetSong(Song song)
-        {
-            try
-            {
-                _logger.Info("Retrieving song from database");
-
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
-                    var query = "SELECT * FROM Song WHERE Id=@Id";
-
-                    using (var cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@Id", song.Id);
-
-                        using (var reader = cmd.ExecuteReader())
-                            song = ParseSingleData(reader);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-
-            return song;
-        }
-        public Song GetSong(int id)
-        {
-            Song song = new Song();
-
-            try
-            {
-                _logger.Info("Retrieving song from database");
-                using (MySqlConnection conn = GetConnection())
-                {
-                    conn.Open();
-                    var query = "SELECT * FROM Song WHERE Id=@Id";
-
-                    MySqlCommand cmd = new MySqlCommand(query, conn);
-                    cmd.Parameters.AddWithValue("@Id", id);
-
-                    using (var reader = cmd.ExecuteReader())
-                        song = ParseSingleData(reader);
-                }
-                _logger.Info("Song found");
-            }
-            catch(Exception ex)
-            {
-                var exMsg = ex.Message;
-                Console.WriteLine($"An error ocurred: {exMsg}");
-                _logger.Error(exMsg, "An error occurred");
-            }
-
-            return song;
-        }
-
-        public bool DoesSongExist(Song song)
-        {
-            _logger.Info("Checking to see if the song exists");
-            var songInDatabase = GetSong(song);
-            var title = songInDatabase.Title;
-
-            if (!string.IsNullOrEmpty(title))
-            {
-                _logger.Info("Song exists");
-                return true;
-            }
-
-            _logger.Info("Song does not exists");
-
-            return false;
-        }
-        
-        private List<Song> ParseData(MySqlDataReader reader)
-        {
-
-            List<Song> songs = new List<Song>();
-            while (reader.Read())
-            {
-                songs.Add(new Song
-                {
-                    Id = Convert.ToInt32(reader["Id"]),
-                    Title = reader["Title"].ToString(),
-                    AlbumTitle = reader["AlbumTitle"].ToString(),
-                    Artist = reader["Artist"].ToString(),
-                    Year = Convert.ToInt32(reader["Year"]),
-                    Genre = reader["Genre"].ToString(),
-                    Duration = Convert.ToInt32(reader["Duration"]),
-                    Filename = reader["Filename"].ToString(),
-                    SongPath = reader["SongPath"].ToString(),
-                    AlbumId = Convert.ToInt32(reader["AlbumId"].ToString()),
-                    ArtistId = Convert.ToInt32(reader["ArtistId"].ToString()),
-                    GenreId = Convert.ToInt32(reader["GenreId"].ToString()),
-                    YearId = Convert.ToInt32(reader["YearId"].ToString()),
-                    CoverArtId = Convert.ToInt32(reader["CoverArtId"].ToString())
-                });
-            }
-
-            return songs;
-        }
-
-        private Song ParseSingleData(MySqlDataReader reader)
-        {
-            Song song = new Song();
-
-            while (reader.Read())
-            {
-                song.Id = Convert.ToInt32(reader["Id"]);
-                song.Title = reader["Title"].ToString();
-                song.AlbumTitle = reader["AlbumTitle"].ToString();
-                song.Artist = reader["Artist"].ToString();
-                song.Year = Convert.ToInt32(reader["Year"].ToString());
-                song.Genre = reader["Genre"].ToString();
-                song.Duration = Convert.ToInt32(reader["Duration"]);
-                song.Filename = reader["Filename"].ToString();
-                song.SongPath = reader["SongPath"].ToString();
-                song.AlbumId = Convert.ToInt32(reader["AlbumId"].ToString());
-                song.ArtistId = Convert.ToInt32(reader["ArtistId"].ToString());
-                song.GenreId = Convert.ToInt32(reader["GenreId"].ToString());
-                song.YearId = Convert.ToInt32(reader["YearId"].ToString());
-                song.CoverArtId = Convert.ToInt32(reader["CoverArtId"].ToString());
-            }
-
-            return song;
-        }
-
-        #endregion
-    }    
-}  

Database/Repositories/UserRepository.cs

@@ -1,229 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-
-using MySql.Data.MySqlClient;
-
-using Icarus.Models;
-
-namespace Icarus.Database.Repositories
-{
-    public class UserRepository: BaseRepository
-    {
-        #region Fields
-        #endregion
-
-
-        #region Properties
-        #endregion
-
-
-        #region Constructor
-        public UserRepository(string connectionString)
-        {
-            _connectionString = connectionString;
-        }
-        #endregion
-
-
-        #region Methods
-        public void SaveUser(User user)
-        {
-            try
-            {
-                _logger.Info("Saving user");
-
-                using (MySqlConnection conn = GetConnection())
-                {
-                    conn.Open();
-                    string query = "INSERT INTO User(Username, Password, Nickname, Email" +
-                        ", PhoneNumber, Firstname, Lastname, EmailVerified) " +
-                        "VALUES(@Username, @Password, @Nickname, @Email, @PhoneNumber," +
-                        " @Firstname, @Lastname, @EmailVerified)";
-
-                    using (MySqlCommand cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@Username", user.Username);
-                        cmd.Parameters.AddWithValue("@Password", user.Password);
-                        cmd.Parameters.AddWithValue("@Nickname", user.Nickname);
-                        cmd.Parameters.AddWithValue("@Email", user.Email);
-                        cmd.Parameters.AddWithValue("@PhoneNumber", user.PhoneNumber);
-                        cmd.Parameters.AddWithValue("@Firstname", user.Firstname);
-                        cmd.Parameters.AddWithValue("@Lastname", user.Lastname);
-                        cmd.Parameters.AddWithValue("@EmailVerified", user.EmailVerified);
-
-
-                        cmd.ExecuteNonQuery();
-                    }
-                }
-
-                _logger.Info("Successfully saved user");
-            }
-            catch (Exception ex)
-            {
-                var exMsg = ex.Message;
-                Console.WriteLine($"An error occurred:\n{exMsg}");
-                _logger.Error(exMsg, "An error occurred");
-            }
-        }
-
-        public User RetrieveUser(User user)
-        {
-            try
-            {
-                _logger.Info("Retrieving user");
-
-                using (MySqlConnection conn = GetConnection())
-                {
-                    conn.Open();
-                    var query = "SELECT * FROM User WHERE Username=@Username";
-
-                    using (MySqlCommand cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@Username", user.Username);
-
-                        using (var reader = cmd.ExecuteReader())
-                            user = ParseSingleData(reader);
-                    }
-                }
-
-                _logger.Info("Successfully retrieved user");
-
-                return user;
-            }
-            catch (Exception ex)
-            {
-                var exMsg = ex.Message;
-                Console.WriteLine($"An error occurred:\n{exMsg}");
-                _logger.Error(exMsg, "An error occurred");
-            }
-
-            return null;
-        }
-
-        public bool DoesUserExist(User user)
-        {
-            var username = user.Username;
-            try
-            {
-                _logger.Info($"Checking to see if {user.Username} exists");
-
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
-                    var query = "SELECT * FROM User WHERE Username=@Username";
-
-                    using (var cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@Username", user.Username);
-                        
-                        using (var reader = cmd.ExecuteReader())
-                        {
-                            user = ParseSingleData(reader, true);
-                            username = user.Username;
-
-                            if (!string.IsNullOrEmpty(username))
-                            {
-                                _logger.Info($"The user {username} exists");
-
-                                return true;
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-
-            _logger.Info($"The user {username} does not exists");
-
-            return false;
-        }
-
-        private User ParseSingleData(MySqlDataReader reader)
-        {
-            var user = new User();
-
-            while (reader.Read())
-            {
-                var id = Convert.ToInt32(reader["Id"].ToString());
-                var username = reader["Username"].ToString();
-                var password = reader["Password"].ToString();
-                var nickname = reader["Nickname"].ToString();
-                var email = reader["Email"].ToString();
-                var phoneNumber = reader["PhoneNumber"].ToString();
-                var emailVerified = reader["EmailVerified"].ToString() == "1";
-                var firstname = reader["Firstname"].ToString();
-                var lastname = reader["Lastname"].ToString();
-                var rawLastLogin = reader["LastLogin"].ToString();
-
-                var parsedDateCreated = DateTime.Parse(reader["DateCreated"].ToString());
-
-                var dateCreated = DateTime.Parse(parsedDateCreated.ToString("yyyy-MM-dd HH:mm:ss"));
-
-                if (!string.IsNullOrEmpty(rawLastLogin))
-                {
-                    var parsedLastLogin = DateTime.Parse(rawLastLogin);
-                    var lastLogin = DateTime.Parse(parsedLastLogin.ToString("yyyy-MM-dd HH:mm:ss"));
-                    user.LastLogin = lastLogin;
-                }
-
-                user.Id = id;
-                user.Username = username;
-                user.Password = password;
-                user.Nickname = nickname;
-                user.Email = email;
-                user.PhoneNumber = phoneNumber;
-                user.EmailVerified = emailVerified;
-                user.Firstname = firstname;
-                user.Lastname = lastname;
-                user.DateCreated = dateCreated;
-            }
-
-            return user;
-        }
-        private User ParseSingleData(MySqlDataReader reader, bool ignoreLastLogin)
-        {
-            var user = new User();
-
-            while (reader.Read())
-            {
-                var id = Convert.ToInt32(reader["Id"].ToString());
-                var username = reader["Username"].ToString();
-                var nickname = reader["Nickname"].ToString();
-                var email = reader["Email"].ToString();
-                var phoneNumber = reader["PhoneNumber"].ToString();
-                var emailVerified = reader["EmailVerified"].ToString() == "1";
-                var firstname = reader["Firstname"].ToString();
-                var lastname = reader["Lastname"].ToString();
-
-                var parsedDateCreated = DateTime.Parse(reader["DateCreated"].ToString());
-
-                var dateCreated = DateTime.Parse(parsedDateCreated.ToString("yyyy-MM-dd HH:mm:ss"));
-
-                if (!ignoreLastLogin)
-                {
-                    var parsedLastLogin = DateTime.Parse(reader["LastLogin"].ToString());
-                    var lastLogin = DateTime.Parse(parsedLastLogin.ToString("yyyy-MM-dd HH:mm:ss"));
-                    user.LastLogin = lastLogin;
-                }
-
-                user.Id = id;
-                user.Username = username;
-                user.Nickname = nickname;
-                user.Email = email;
-                user.PhoneNumber = phoneNumber;
-                user.EmailVerified = emailVerified;
-                user.Firstname = firstname;
-                user.Lastname = lastname;
-                user.DateCreated = dateCreated;
-            }
-
-            return user;
-        }
-        #endregion
-    }
-}

Database/Repositories/YearRepository.cs

@@ -1,367 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-
-using MySql.Data.MySqlClient;
-
-using Icarus.Models;
-
-namespace Icarus.Database.Repositories
-{
-    public class YearRepository : BaseRepository
-    {
-        #region Fields
-        #endregion
-
-
-        #region Properties
-        #endregion
-
-
-        #region Constructors
-        public YearRepository(string connectionString)
-        {
-            _connectionString = connectionString;
-        }
-        #endregion
-
-
-        #region Methods
-        public List<Year> GetSongYears()
-        {
-            _logger.Info("Retrieving Year records");
-
-            var yearValues = new List<Year>();
-
-            try
-            {
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
-
-                    var query = "SELECT yr.*, COUNT(*) AS SongCount FROM Year " +
-                        "yr LEFT JOIN Song sng ON yr.YearId=sng.YearId " +
-                        "GROUP BY yr.YearId";
-
-                    using (var cmd = new MySqlCommand(query, conn))
-                        using (var reader = cmd.ExecuteReader())
-                            yearValues = ParseData(reader);
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-
-            return yearValues;
-        }
-
-        public Year GetSongYear(Year year)
-        {
-            _logger.Info("Retrieving Year record");
-
-            try
-            {
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
-
-                    var query = "SELECT yr.*, COUNT(*) AS SongCount FROM Year " +
-                        "yr LEFT JOIN Song sng ON yr.YearId=sng.YearId WHERE " +
-                        "YearId=@YearId GROUP BY yr.YearId";
-
-                    using (var cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@YearId", year.YearId);
-
-                        using (var reader = cmd.ExecuteReader())
-                            year = ParseSingleData(reader);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-
-            return year;
-        }
-        public Year GetSongYear(Song song)
-        {
-            var year = new Year();
-
-            _logger.Info("Retrieving Year record");
-
-            try
-            {
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
-
-                    var query = "SELECT yr.*, 0 AS SongCount FROM Year " +
-                        "yr WHERE yr.YearValue=@YearValue";
-
-                    using(var cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@YearValue", song.Year);
-
-                        using (var reader = cmd.ExecuteReader())
-                            year = ParseSingleData(reader);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-
-            return year;
-        }
-        public Year GetSongYear(Song song, bool retrieveCount)
-        {
-            var year = new Year();
-
-            _logger.Info("Retrieving year record");
-
-            try
-            {
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
-
-                    var query = string.Empty;
-
-                    if (retrieveCount)
-                        query = "SELECT yr.*, COUNT(*) AS SongCount FROM Year yr " +
-                            "LEFT JOIN Song sng ON yr.YearValue=sng.Year WHERE " +
-                            "yr.YearValue=@YearValue GROUP BY yr.YearId LIMIT 1";
-                    else
-                        query = "SELECT yr.*, 0 AS SongCount FROM Year yr " +
-                            "WHERE yr.YearValue=@YearValue LIMIT 1";
-
-                    using(var cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@YearValue", song.Year);
-
-                        using (var reader = cmd.ExecuteReader())
-                            year = ParseSingleData(reader);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-
-            return year;
-        }
-
-        public bool DoesYearExist(Year year)
-        {
-            _logger.Info("Checking to see if Year record exists");
-            
-            try
-            {
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
-
-                    var query = "SELECT yr.*, 0 AS SongCount FROM Year yr WHERE " +
-                        "yr.YearId=@YearId";
-
-                    using (var cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@YearId", year.YearId);
-
-                        using (var reader = cmd.ExecuteReader())
-                        {
-                            year = ParseSingleData(reader);
-
-                            if (year.YearValue > 0)
-                            {
-                                _logger.Info("Year record exists");
-
-                                return true;
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-
-            _logger.Info("Year record does not exist");
-
-            return false;
-        }
-        public bool DoesYearExist(Song song)
-        {
-            _logger.Info("Checking to see if Year record exists");
-            
-            try
-            {
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
-
-                    var query = "SELECT yr.*, 0 AS SongCount FROM Year yr WHERE " +
-                        "yr.YearValue=@YearValue";
-
-                    using (var cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@YearValue", song.Year);
-
-                        using (var reader = cmd.ExecuteReader())
-                        {
-                            var year = ParseSingleData(reader);
-
-                            if (year.YearValue > 0)
-                            {
-                                _logger.Info("Year record exists");
-
-                                return true;
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-
-            _logger.Info("Year record does not exist");
-
-            return false;
-        }
-
-        public void SaveYear(Year year)
-        {
-            _logger.Info("Saving Year record");
-
-            try
-            {
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
-
-                    var query = "INSERT INTO Year(YearValue) VALUES(@YearValue)";
-
-                    using (var cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@YearValue", year.YearValue);
-
-                        cmd.ExecuteNonQuery();
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-        }
-        public void UpdateYear(Year year)
-        {
-            _logger.Info("Deleting Year record");
-
-            try
-            {
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
-
-                    var query = "UPDATE Year SET YearValue=@YearValue WHERE YearId=@YearId";
-
-                    using (var cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@YearId", year.YearId);
-                        cmd.Parameters.AddWithValue("@YearValue", year.YearValue);
-
-                        cmd.ExecuteNonQuery();
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-        }
-        public void DeleteYear(Year year)
-        {
-            _logger.Info("Deleting Year record");
-
-            try
-            {
-                using (var conn = GetConnection())
-                {
-                    conn.Open();
-
-                    var query = "DELETE FROM Year WHERE YearId=@YearId";
-
-                    using (var cmd = new MySqlCommand(query, conn))
-                    {
-                        cmd.Parameters.AddWithValue("@YearId", year.YearId);
-
-                        cmd.ExecuteNonQuery();
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                _logger.Error(msg, "An error occurred");
-            }
-        }
-
-        private List<Year> ParseData(MySqlDataReader reader)
-        {
-            var yearValues = new List<Year>();
-
-            while (reader.Read())
-            {
-                var id = Convert.ToInt32(reader["YearId"].ToString());
-                var year = Convert.ToInt32(reader["YearValue"].ToString());
-                var songCount = Convert.ToInt32(reader["SongCount"].ToString());
-
-                yearValues.Add(new Year
-                {
-                    YearId = id,
-                    YearValue = year,
-                    SongCount = songCount
-                });
-            }
-
-
-            return yearValues;
-        }
-
-        private Year ParseSingleData(MySqlDataReader reader)
-        {
-            var yearValue = new Year();
-
-            while (reader.Read())
-            {
-                var id = Convert.ToInt32(reader["YearId"].ToString());
-                var year = Convert.ToInt32(reader["YearValue"].ToString());
-                var songCount = Convert.ToInt32(reader["SongCount"].ToString());
-
-                yearValue.YearId = id;
-                yearValue.YearValue = year;
-                yearValue.SongCount = songCount;
-            }
-
-            return yearValue;
-        }
-        #endregion
-    }
-}

Icarus.csproj

@@ -1,31 +1,29 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+    <Version>0.1.9</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BCrypt.Net-Next" Version="3.1.3" />
+    <PackageReference Include="BCrypt.Net-Next" Version="4.0.2" />
-    <PackageReference Include="DotNetZip" Version="1.13.3" />
+    <PackageReference Include="DotNetZip" Version="1.15.0" />
-    <PackageReference Include="EntityFramework" Version="6.2.0" />
+    <PackageReference Include="EntityFramework" Version="6.4.4" />
     <PackageReference Include="ID3" Version="0.6.0" />
-    <PackageReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.3">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.8">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="mysql.data" Version="8.0.15" />
+    <PackageReference Include="MySql.EntityFrameworkCore" Version="5.0.8" />
-    <PackageReference Include="MySql.Data.Entity" Version="7.0.7-m61" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="MySql.Data.EntityFrameworkCore" Version="8.0.15" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
-    <PackageReference Include="MySql.Data.EntityFrameworkCore.Design" Version="8.0.15" />
+    <PackageReference Include="RestSharp" Version="106.15.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.8.1" />
-    <PackageReference Include="RestSharp" Version="106.6.9" />
     <PackageReference Include="SevenZip" Version="19.0.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.4.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.15.0" />
     <PackageReference Include="taglib" Version="2.1.0" />
   </ItemGroup>
   <ItemGroup>

Icarus.csproj.user

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ActiveDebugProfile>Icarus</ActiveDebugProfile>
-  </PropertyGroup>
-</Project>

Icarus.sln

@@ -1,34 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26124.0
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Icarus", "Icarus.csproj", "{3BEBAB33-17BF-4183-9664-3D537A684138}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3BEBAB33-17BF-4183-9664-3D537A684138}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3BEBAB33-17BF-4183-9664-3D537A684138}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3BEBAB33-17BF-4183-9664-3D537A684138}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3BEBAB33-17BF-4183-9664-3D537A684138}.Debug|x64.Build.0 = Debug|Any CPU
-		{3BEBAB33-17BF-4183-9664-3D537A684138}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3BEBAB33-17BF-4183-9664-3D537A684138}.Debug|x86.Build.0 = Debug|Any CPU
-		{3BEBAB33-17BF-4183-9664-3D537A684138}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3BEBAB33-17BF-4183-9664-3D537A684138}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3BEBAB33-17BF-4183-9664-3D537A684138}.Release|x64.ActiveCfg = Release|Any CPU
-		{3BEBAB33-17BF-4183-9664-3D537A684138}.Release|x64.Build.0 = Release|Any CPU
-		{3BEBAB33-17BF-4183-9664-3D537A684138}.Release|x86.ActiveCfg = Release|Any CPU
-		{3BEBAB33-17BF-4183-9664-3D537A684138}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-EndGlobal

Icarus.txt

@@ -1,313 +0,0 @@
-2019-05-23 20:25:46.2420 Info Message Template Auto Format enabled
-2019-05-23 20:25:46.2666 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 20:25:46.3926 Info Adding target File Target[allfile]
-2019-05-23 20:25:46.4144 Info Adding target File Target[ownFile-web]
-2019-05-23 20:25:46.4351 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 20:25:46.4703 Info Found 45 configuration items
-2019-05-23 20:26:13.6466 Info Message Template Auto Format enabled
-2019-05-23 20:26:13.6651 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 20:26:13.8165 Info Adding target File Target[allfile]
-2019-05-23 20:26:13.8351 Info Adding target File Target[ownFile-web]
-2019-05-23 20:26:13.8552 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 20:26:13.8939 Info Found 45 configuration items
-2019-05-23 20:33:39.8295 Info Message Template Auto Format enabled
-2019-05-23 20:33:39.8438 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 20:33:39.9198 Info Adding target File Target[allfile]
-2019-05-23 20:33:39.9238 Info Adding target File Target[ownFile-web]
-2019-05-23 20:33:39.9238 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\NLog.config...
-2019-05-23 20:33:39.9871 Info Found 45 configuration items
-2019-05-23 20:33:40.2458 Info Configuration initialized.
-2019-05-23 20:33:40.2602 Info NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 4.5.11.8645. Product version: 4.5.11.
-2019-05-23 20:33:42.2086 Info Shutting down logging...
-2019-05-23 20:33:42.2458 Info Logger has been shut down.
-2019-05-23 20:34:06.6746 Info Message Template Auto Format enabled
-2019-05-23 20:34:06.6896 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 20:34:06.7827 Info Adding target File Target[allfile]
-2019-05-23 20:34:06.7827 Info Adding target File Target[ownFile-web]
-2019-05-23 20:34:06.8010 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\NLog.config...
-2019-05-23 20:34:06.8321 Info Found 45 configuration items
-2019-05-23 20:34:06.8673 Info Configuration initialized.
-2019-05-23 20:34:06.8673 Info NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 4.5.11.8645. Product version: 4.5.11.
-2019-05-23 20:34:07.7083 Info Shutting down logging...
-2019-05-23 20:34:07.7346 Info Logger has been shut down.
-2019-05-23 20:35:03.8649 Info Message Template Auto Format enabled
-2019-05-23 20:35:03.8783 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 20:35:03.9596 Info Adding target File Target[allfile]
-2019-05-23 20:35:03.9596 Info Adding target File Target[ownFile-web]
-2019-05-23 20:35:03.9745 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\NLog.config...
-2019-05-23 20:35:03.9958 Info Found 45 configuration items
-2019-05-23 20:35:04.0200 Info Configuration initialized.
-2019-05-23 20:35:04.0200 Info NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 4.5.11.8645. Product version: 4.5.11.
-2019-05-23 20:35:04.5747 Info Shutting down logging...
-2019-05-23 20:35:04.6042 Info Logger has been shut down.
-2019-05-23 20:35:41.2884 Info Message Template Auto Format enabled
-2019-05-23 20:35:41.3011 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 20:35:41.3629 Info Adding target File Target[allfile]
-2019-05-23 20:35:41.3629 Info Adding target File Target[ownFile-web]
-2019-05-23 20:35:41.3755 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\NLog.config...
-2019-05-23 20:35:41.3973 Info Found 45 configuration items
-2019-05-23 20:35:41.4257 Info Configuration initialized.
-2019-05-23 20:35:41.4257 Info NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 4.5.11.8645. Product version: 4.5.11.
-2019-05-23 20:35:42.0181 Info Shutting down logging...
-2019-05-23 20:35:42.0437 Info Logger has been shut down.
-2019-05-23 20:36:03.3664 Info Message Template Auto Format enabled
-2019-05-23 20:36:03.3803 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 20:36:03.4469 Info Adding target File Target[allfile]
-2019-05-23 20:36:03.4469 Info Adding target File Target[ownFile-web]
-2019-05-23 20:36:03.4634 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\NLog.config...
-2019-05-23 20:36:03.4897 Info Found 45 configuration items
-2019-05-23 20:36:03.5214 Info Configuration initialized.
-2019-05-23 20:36:03.5214 Info NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 4.5.11.8645. Product version: 4.5.11.
-2019-05-23 20:36:04.0862 Info Shutting down logging...
-2019-05-23 20:36:04.1162 Info Logger has been shut down.
-2019-05-23 20:37:13.4449 Info Message Template Auto Format enabled
-2019-05-23 20:37:13.4578 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 20:37:13.5222 Info Adding target File Target[allfile]
-2019-05-23 20:37:13.5222 Info Adding target File Target[ownFile-web]
-2019-05-23 20:37:13.5349 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\NLog.config...
-2019-05-23 20:37:13.5575 Info Found 45 configuration items
-2019-05-23 20:37:13.5870 Info Configuration initialized.
-2019-05-23 20:37:13.5870 Info NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 4.5.11.8645. Product version: 4.5.11.
-2019-05-23 20:37:14.1141 Info Shutting down logging...
-2019-05-23 20:37:14.1395 Info Logger has been shut down.
-2019-05-23 20:37:38.9373 Info Message Template Auto Format enabled
-2019-05-23 20:37:38.9373 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 20:37:39.0239 Info Adding target File Target[allfile]
-2019-05-23 20:37:39.0239 Info Adding target File Target[ownFile-web]
-2019-05-23 20:37:39.0371 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\NLog.config...
-2019-05-23 20:37:39.0624 Info Found 45 configuration items
-2019-05-23 20:37:39.0916 Info Configuration initialized.
-2019-05-23 20:37:39.0984 Info NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 4.5.11.8645. Product version: 4.5.11.
-2019-05-23 20:37:39.2254 Info Shutting down logging...
-2019-05-23 20:37:39.2461 Info Logger has been shut down.
-2019-05-23 20:38:15.2217 Info Message Template Auto Format enabled
-2019-05-23 20:38:15.2426 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 20:38:15.3307 Info Adding target File Target[allfile]
-2019-05-23 20:38:15.3307 Info Adding target File Target[ownFile-web]
-2019-05-23 20:38:15.3434 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\NLog.config...
-2019-05-23 20:38:15.3733 Info Found 45 configuration items
-2019-05-23 20:38:15.4046 Info Configuration initialized.
-2019-05-23 20:38:15.4103 Info NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 4.5.11.8645. Product version: 4.5.11.
-2019-05-23 20:38:16.3887 Info Shutting down logging...
-2019-05-23 20:38:16.4170 Info Logger has been shut down.
-2019-05-23 20:38:56.3096 Info Message Template Auto Format enabled
-2019-05-23 20:38:56.3228 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 20:38:56.3991 Info Adding target File Target[allfile]
-2019-05-23 20:38:56.3991 Info Adding target File Target[ownFile-web]
-2019-05-23 20:38:56.4137 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\NLog.config...
-2019-05-23 20:38:56.4412 Info Found 45 configuration items
-2019-05-23 20:38:56.4662 Info Configuration initialized.
-2019-05-23 20:38:56.4711 Info NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 4.5.11.8645. Product version: 4.5.11.
-2019-05-23 20:38:57.5659 Info Shutting down logging...
-2019-05-23 20:38:57.5921 Info Logger has been shut down.
-2019-05-23 20:39:33.6137 Info Message Template Auto Format enabled
-2019-05-23 20:39:33.6328 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 20:39:33.7158 Info Adding target File Target[allfile]
-2019-05-23 20:39:33.7209 Info Adding target File Target[ownFile-web]
-2019-05-23 20:39:33.7349 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\NLog.config...
-2019-05-23 20:39:33.7661 Info Found 45 configuration items
-2019-05-23 20:39:33.7984 Info Configuration initialized.
-2019-05-23 20:39:33.7984 Info NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 4.5.11.8645. Product version: 4.5.11.
-2019-05-23 20:39:35.3535 Info Shutting down logging...
-2019-05-23 20:39:35.3853 Info Logger has been shut down.
-2019-05-23 20:41:03.9531 Info Message Template Auto Format enabled
-2019-05-23 20:41:04.0224 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 20:41:04.2489 Info Adding target File Target[allfile]
-2019-05-23 20:41:04.2638 Info Adding target File Target[ownFile-web]
-2019-05-23 20:41:04.2801 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 20:41:04.3178 Info Found 45 configuration items
-2019-05-23 20:42:20.8771 Info Message Template Auto Format enabled
-2019-05-23 20:42:20.8771 Info Found 45 configuration items
-2019-05-23 20:42:20.8771 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 20:42:20.8771 Info Adding target File Target[allfile]
-2019-05-23 20:42:20.8771 Info Adding target File Target[ownFile-web]
-2019-05-23 20:42:20.8771 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 20:42:20.8912 Info Closing old configuration.
-2019-05-23 20:42:20.9264 Info Found 45 configuration items
-2019-05-23 20:44:09.2436 Info Message Template Auto Format enabled
-2019-05-23 20:44:09.2625 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 20:44:09.5033 Info Adding target File Target[allfile]
-2019-05-23 20:44:09.5221 Info Adding target File Target[ownFile-web]
-2019-05-23 20:44:09.5436 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 20:44:09.5955 Info Found 45 configuration items
-2019-05-23 20:44:22.9386 Info Message Template Auto Format enabled
-2019-05-23 20:44:22.9386 Info Found 45 configuration items
-2019-05-23 20:44:22.9386 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 20:44:22.9525 Info Adding target File Target[allfile]
-2019-05-23 20:44:22.9525 Info Adding target File Target[ownFile-web]
-2019-05-23 20:44:22.9525 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 20:44:22.9525 Info Closing old configuration.
-2019-05-23 20:44:22.9920 Info Found 45 configuration items
-2019-05-23 20:45:56.3589 Info Message Template Auto Format enabled
-2019-05-23 20:45:56.3781 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 20:45:56.5714 Info Adding target File Target[allfile]
-2019-05-23 20:45:56.5830 Info Adding target File Target[ownFile-web]
-2019-05-23 20:45:56.5944 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 20:45:56.6232 Info Found 45 configuration items
-2019-05-23 20:46:59.8334 Info Message Template Auto Format enabled
-2019-05-23 20:46:59.8559 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 20:47:00.0588 Info Adding target File Target[allfile]
-2019-05-23 20:47:00.0756 Info Adding target File Target[ownFile-web]
-2019-05-23 20:47:00.1007 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 20:47:00.1455 Info Found 45 configuration items
-2019-05-23 20:48:14.1040 Info Message Template Auto Format enabled
-2019-05-23 20:48:14.1282 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 20:48:14.2899 Info Adding target File Target[allfile]
-2019-05-23 20:48:14.3059 Info Adding target File Target[ownFile-web]
-2019-05-23 20:48:14.3273 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 20:48:14.3764 Info Found 45 configuration items
-2019-05-23 20:49:07.1970 Info Message Template Auto Format enabled
-2019-05-23 20:49:07.2494 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 20:49:07.4433 Info Adding target File Target[allfile]
-2019-05-23 20:49:07.4565 Info Adding target File Target[ownFile-web]
-2019-05-23 20:49:07.4760 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 20:49:07.5338 Info Found 45 configuration items
-2019-05-23 20:49:20.7109 Info Message Template Auto Format enabled
-2019-05-23 20:49:20.7109 Info Found 45 configuration items
-2019-05-23 20:49:20.7109 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 20:49:20.7184 Info Adding target File Target[allfile]
-2019-05-23 20:49:20.7184 Info Adding target File Target[ownFile-web]
-2019-05-23 20:49:20.7184 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 20:49:20.7184 Info Closing old configuration.
-2019-05-23 20:49:20.7514 Info Found 45 configuration items
-2019-05-23 21:24:18.4464 Info Message Template Auto Format enabled
-2019-05-23 21:24:18.4889 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 21:24:18.7399 Info Adding target File Target[allfile]
-2019-05-23 21:24:18.7604 Info Adding target File Target[ownFile-web]
-2019-05-23 21:24:18.7838 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 21:24:18.8238 Info Found 45 configuration items
-2019-05-23 21:25:06.3861 Info Message Template Auto Format enabled
-2019-05-23 21:25:06.3904 Info Found 45 configuration items
-2019-05-23 21:25:06.3904 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 21:25:06.4052 Info Adding target File Target[allfile]
-2019-05-23 21:25:06.4052 Info Adding target File Target[ownFile-web]
-2019-05-23 21:25:06.4052 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 21:25:06.4243 Info Closing old configuration.
-2019-05-23 21:25:06.4727 Info Found 45 configuration items
-2019-05-23 21:26:26.1707 Info Message Template Auto Format enabled
-2019-05-23 21:26:26.1964 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 21:26:26.3688 Info Adding target File Target[allfile]
-2019-05-23 21:26:26.3866 Info Adding target File Target[ownFile-web]
-2019-05-23 21:26:26.4195 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 21:26:26.4805 Info Found 45 configuration items
-2019-05-23 21:27:58.0534 Info Message Template Auto Format enabled
-2019-05-23 21:27:58.0751 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 21:27:58.2630 Info Adding target File Target[allfile]
-2019-05-23 21:27:58.2786 Info Adding target File Target[ownFile-web]
-2019-05-23 21:27:58.2977 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 21:27:58.3440 Info Found 45 configuration items
-2019-05-23 21:28:30.3852 Info Message Template Auto Format enabled
-2019-05-23 21:28:30.3901 Info Found 45 configuration items
-2019-05-23 21:28:30.3901 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 21:28:30.4094 Info Adding target File Target[allfile]
-2019-05-23 21:28:30.4094 Info Adding target File Target[ownFile-web]
-2019-05-23 21:28:30.4094 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 21:28:30.4256 Info Closing old configuration.
-2019-05-23 21:28:30.4744 Info Found 45 configuration items
-2019-05-23 21:28:35.1110 Info Message Template Auto Format enabled
-2019-05-23 21:28:35.1110 Info Found 45 configuration items
-2019-05-23 21:28:35.1110 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 21:28:35.1110 Info Adding target File Target[allfile]
-2019-05-23 21:28:35.1110 Info Adding target File Target[ownFile-web]
-2019-05-23 21:28:35.1110 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 21:28:35.1110 Info Closing old configuration.
-2019-05-23 21:28:35.1110 Info Found 45 configuration items
-2019-05-23 21:33:27.3097 Info Message Template Auto Format enabled
-2019-05-23 21:33:27.3317 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 21:33:27.6071 Info Adding target File Target[allfile]
-2019-05-23 21:33:27.6230 Info Adding target File Target[ownFile-web]
-2019-05-23 21:33:27.6409 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 21:33:27.6860 Info Found 45 configuration items
-2019-05-23 21:34:21.2749 Info Message Template Auto Format enabled
-2019-05-23 21:34:21.2749 Info Found 45 configuration items
-2019-05-23 21:34:21.2822 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 21:34:21.2822 Info Adding target File Target[allfile]
-2019-05-23 21:34:21.2977 Info Adding target File Target[ownFile-web]
-2019-05-23 21:34:21.2977 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 21:34:21.2977 Info Closing old configuration.
-2019-05-23 21:34:21.3496 Info Found 45 configuration items
-2019-05-23 21:34:44.8361 Info Message Template Auto Format enabled
-2019-05-23 21:34:44.8361 Info Found 45 configuration items
-2019-05-23 21:34:44.8361 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 21:34:44.8475 Info Adding target File Target[allfile]
-2019-05-23 21:34:44.8475 Info Adding target File Target[ownFile-web]
-2019-05-23 21:34:44.8475 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 21:34:44.8475 Info Closing old configuration.
-2019-05-23 21:34:49.8402 Info Found 45 configuration items
-2019-05-23 21:36:39.6643 Info Message Template Auto Format enabled
-2019-05-23 21:36:39.6956 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 21:36:39.9527 Info Adding target File Target[allfile]
-2019-05-23 21:36:39.9527 Info Adding target File Target[ownFile-web]
-2019-05-23 21:36:39.9854 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 21:36:40.0214 Info Found 45 configuration items
-2019-05-23 21:37:11.5126 Info Message Template Auto Format enabled
-2019-05-23 21:37:11.5149 Info Found 45 configuration items
-2019-05-23 21:37:11.5149 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 21:37:11.5149 Info Adding target File Target[allfile]
-2019-05-23 21:37:11.5149 Info Adding target File Target[ownFile-web]
-2019-05-23 21:37:11.5149 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 21:37:11.5149 Info Closing old configuration.
-2019-05-23 21:37:11.5688 Info Found 45 configuration items
-2019-05-23 21:37:55.3893 Info Message Template Auto Format enabled
-2019-05-23 21:37:55.3912 Info Found 45 configuration items
-2019-05-23 21:37:55.3912 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 21:37:55.3912 Info Adding target File Target[allfile]
-2019-05-23 21:37:55.4088 Info Adding target File Target[ownFile-web]
-2019-05-23 21:37:55.4088 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 21:37:55.4088 Info Closing old configuration.
-2019-05-23 21:37:55.4088 Info Found 45 configuration items
-2019-05-23 21:44:40.0208 Info Message Template Auto Format enabled
-2019-05-23 21:44:40.0474 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 21:44:40.2073 Info Adding target File Target[allfile]
-2019-05-23 21:44:40.2186 Info Adding target File Target[ownFile-web]
-2019-05-23 21:44:40.2186 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 21:44:40.2868 Info Found 45 configuration items
-2019-05-23 21:45:19.6595 Info Message Template Auto Format enabled
-2019-05-23 21:45:19.6595 Info Found 45 configuration items
-2019-05-23 21:45:19.6595 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 21:45:19.6595 Info Adding target File Target[allfile]
-2019-05-23 21:45:19.6595 Info Adding target File Target[ownFile-web]
-2019-05-23 21:45:19.6595 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 21:45:19.6740 Info Closing old configuration.
-2019-05-23 21:45:19.7116 Info Found 45 configuration items
-2019-05-23 21:51:00.1698 Info Message Template Auto Format enabled
-2019-05-23 21:51:00.1840 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 21:51:00.2721 Info Adding target File Target[allfile]
-2019-05-23 21:51:00.2721 Info Adding target File Target[ownFile-web]
-2019-05-23 21:51:00.2920 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 21:51:00.3152 Info Found 45 configuration items
-2019-05-23 21:51:25.1256 Info Message Template Auto Format enabled
-2019-05-23 21:51:25.1256 Info Found 45 configuration items
-2019-05-23 21:51:25.1256 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 21:51:25.1256 Info Adding target File Target[allfile]
-2019-05-23 21:51:25.1256 Info Adding target File Target[ownFile-web]
-2019-05-23 21:51:25.1256 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 21:51:25.1412 Info Closing old configuration.
-2019-05-23 21:51:25.1648 Info Found 45 configuration items
-2019-05-23 21:51:25.2103 Info Message Template Auto Format enabled
-2019-05-23 21:51:25.2103 Info Found 45 configuration items
-2019-05-23 21:51:25.2103 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 21:51:25.2103 Info Adding target File Target[allfile]
-2019-05-23 21:51:25.2103 Info Adding target File Target[ownFile-web]
-2019-05-23 21:51:25.2103 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 21:51:25.2103 Info Closing old configuration.
-2019-05-23 21:51:25.2182 Info Found 45 configuration items
-2019-05-23 21:53:11.2368 Info Logger closing down...
-2019-05-23 21:53:11.2368 Info Closing old configuration.
-2019-05-23 21:53:11.2368 Info Logger has been closed down.
-2019-05-23 21:53:11.2368 Info Shutting down logging...
-2019-05-23 21:53:11.2555 Info Logger has been shut down.
-2019-05-23 21:54:25.6441 Info Message Template Auto Format enabled
-2019-05-23 21:54:25.6761 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 21:54:25.9546 Info Adding target File Target[allfile]
-2019-05-23 21:54:25.9757 Info Adding target File Target[ownFile-web]
-2019-05-23 21:54:25.9951 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 21:54:26.0361 Info Found 45 configuration items
-2019-05-23 21:54:55.6086 Info Message Template Auto Format enabled
-2019-05-23 21:54:55.6086 Info Found 45 configuration items
-2019-05-23 21:54:55.6086 Info Loading assembly: NLog.Web.AspNetCore
-2019-05-23 21:54:55.6086 Info Adding target File Target[allfile]
-2019-05-23 21:54:55.6086 Info Adding target File Target[ownFile-web]
-2019-05-23 21:54:55.6086 Info Configured from an XML element in C:\Users\user0\Programming\C#\Icarus\bin\Debug\netcoreapp2.2\nlog.config...
-2019-05-23 21:54:55.6280 Info Closing old configuration.
-2019-05-23 21:54:55.6926 Info Found 45 configuration items

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Kun Deng
+Copyright (c) 2021 Kun Deng
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Models/Album.cs

@@ -8,17 +8,21 @@ namespace Icarus.Models
 {
     public class Album
     {
-        [JsonProperty("id")]
+        [JsonProperty("album_id")]
-	public int AlbumId { get; set; }
+        public int AlbumID { get; set; }
-	[JsonProperty("title")]
+        [JsonProperty("title")]
-	public string Title { get; set; }
+        public string Title { get; set; }
-	[JsonProperty("album_artist")]
+        [JsonProperty("album_artist")]
-	public string AlbumArtist { get; set; }
+        [Column("Artist")]
-	[JsonProperty("song_count")]
+        public string AlbumArtist { get; set; }
-	[NotMapped]
+        [JsonProperty("song_count")]
-	public int SongCount { get; set; }
+        [NotMapped]
+        public int SongCount { get; set; }
+        [JsonProperty("year")]
+        public int Year { get; set; }
 
-	[JsonIgnore]
+        [JsonIgnore]
-	public List<Song> Songs { get; set; }
+        [NotMapped]
+        public List<Song> Songs { get; set; }
     }
 }

Models/Artist.cs

@@ -8,15 +8,17 @@ namespace Icarus.Models
 {
     public class Artist
     {
-        [JsonProperty("id")]
+        [JsonProperty("artist_id")]
-	public int ArtistId { get; set; }
+        public int ArtistID { get; set; }
-	[JsonProperty("name")]
+        [JsonProperty("name")]
-	public string Name { get; set; }
+        [Column("Artist")]
-	[JsonProperty("song_count")]
+        public string Name { get; set; }
-	[NotMapped]
+        [JsonProperty("song_count")]
-	public int SongCount { get; set; }
+        [NotMapped]
+        public int SongCount { get; set; }
 
-	[JsonIgnore]
+        [JsonIgnore]
-	public List<Song> Songs { get; set; }
+        [NotMapped]
+        public List<Song> Songs { get; set; }
     }
 }

Models/BaseResult.cs

@@ -7,6 +7,6 @@ namespace Icarus.Models
     public class BaseResult
     {
         [JsonProperty("message")]
-	public string Message { get; set; }
+        public string Message { get; set; }
     }
 }

Models/CoverArt.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
 using System.Text;
 
 using Newtonsoft.Json;
@@ -8,14 +10,34 @@ namespace Icarus.Models
 {
     public class CoverArt
     {
-        [JsonProperty("id")]
+        #region Properties
-        public int CoverArtId { get; set; }
+        [JsonProperty("cover_art_id")]
+        public int CoverArtID { get; set; }
         [JsonProperty("title")]
-	public string SongTitle { get; set; }
+        public string SongTitle { get; set; }
         [JsonIgnore]
-	public string ImagePath { get; set; }
+        public string ImagePath { get; set; }
+        [JsonIgnore]
+        [NotMapped]
+        public int SongID { get; set; }
+        [JsonIgnore]
+        [NotMapped]
+        public List<Song> Songs { get; set; }
+        #endregion
 
-	[JsonIgnore]
+
-	public List<Song> Songs { get; set; }
+        #region Methods
+        public string GenerateFilename(int flag)
+        {
+            const int length = 25;
+            const string chars = "ABCDEF0123456789";
+            var random = new Random();
+            var filename = new string(Enumerable.Repeat(chars, length).Select(s =>
+                s[random.Next(s.Length)]).ToArray());
+            var extension = ".mp3";
+
+            return (flag == 0) ? filename : $"{filename}{extension}";
+        }
+        #endregion
     }
 }

Models/Genre.cs

@@ -8,15 +8,16 @@ namespace Icarus.Models
 {
     public class Genre
     {
-        [JsonProperty("id")]
+        [JsonProperty("genre_id")]
-	public int GenreId { get; set; }
+        public int GenreID { get; set; }
-	[JsonProperty("genre")]
+        [JsonProperty("genre")]
-	public string GenreName { get; set; }
+        [Column("Category")]
-	[JsonProperty("song_count")]
+        public string GenreName { get; set; }
-	[NotMapped]
+        [JsonProperty("song_count")]
-	public int SongCount { get; set; }
+        [NotMapped]
-
+        public int SongCount { get; set; }
-	[JsonIgnore]
+        [JsonIgnore]
-	public List<Song> Songs { get; set; }
+        [NotMapped]
+        public List<Song> Songs { get; set; }
     }
 }

Models/LoginResult.cs

@@ -6,15 +6,15 @@ namespace Icarus.Models
 {
     public class LoginResult : BaseResult
     {
-        [JsonProperty("id")]
+        [JsonProperty("user_id")]
-	public int UserId { get; set; }
+        public int UserID { get; set; }
-	[JsonProperty("username")]
+        [JsonProperty("username")]
-	public string Username { get; set; }
+        public string Username { get; set; }
-	[JsonProperty("token")]
+        [JsonProperty("token")]
-	public string Token { get; set; }
+        public string Token { get; set; }
-	[JsonProperty("token_type")]
+        [JsonProperty("token_type")]
-	public string TokenType { get; set; }
+        public string TokenType { get; set; }
-	[JsonProperty("expiration")]
+        [JsonProperty("expiration")]
-	public int Expiration { get; set; }
+        public int Expiration { get; set; }
     }
 }

Models/RegisterResult.cs

@@ -7,8 +7,8 @@ namespace Icarus.Models
     public class RegisterResult : BaseResult
     {
         [JsonProperty("username")]
-	public string Username { get; set; }
+        public string Username { get; set; }
-	[JsonProperty("successfully_registered")]
+        [JsonProperty("successfully_registered")]
-	public bool SuccessfullyRegistered { get; set; }
+        public bool SuccessfullyRegistered { get; set; }
     }
 }

Models/Song.cs

@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
 
 using Newtonsoft.Json;
 
@@ -7,48 +8,79 @@ namespace Icarus.Models
 {
     public class Song
     {
-        [JsonProperty("id")]
+        #region Properties
-	public int Id { get; set; }
+        [JsonProperty("song_id")]
-	[JsonProperty("title")]
+        public int SongID { get; set; }
-	public string Title { get; set; }
+        [JsonProperty("title")]
-	[JsonProperty("album")]
+        public string Title { get; set; }
-	public string AlbumTitle { get; set; }
+        [JsonProperty("album")]
-	[JsonProperty("artist")]
+        [Column("Album")]
-	public string Artist { get; set; }
+        public string AlbumTitle { get; set; }
-	[JsonProperty("year")]
+        [JsonProperty("artist")]
-	public int? Year { get; set; }
+        public string Artist { get; set; }
-	[JsonProperty("genre")]
+        [JsonProperty("album_artist")]
-	public string Genre { get; set; }
+        public string AlbumArtist { get; set; }
-	[JsonProperty("duration")]
+        [JsonProperty("year")]
-	public int Duration { get; set; }
+        public int? Year { get; set; }
-	[JsonProperty("filename")]
+        [JsonProperty("genre")]
-	public string Filename { get; set; }
+        public string Genre { get; set; }
-	[JsonProperty("song_path")]
+        [JsonProperty("duration")]
-	public string SongPath { get; set; }
+        public int Duration { get; set; }
+        [JsonProperty("filename")]
+        public string Filename { get; set; }
+        [JsonIgnore]
+        public string SongDirectory { get; set; }
+        [JsonProperty("track")]
+        public int Track { get; set; } = 0;
+        [JsonProperty("track_count")]
+        public int TrackCount { get; set; } = 0;
+        [JsonProperty("disc")]
+        public int Disc { get; set; } = 0;
+        [JsonProperty("disc_count")]
+        public int DiscCount { get; set; } = 0;
+        [JsonIgnore]
+        public int? AlbumID { get; set; }
+        [JsonIgnore]
+        public int? ArtistID { get; set; }
+        [JsonIgnore]
+        public int? GenreID { get; set; }
+        [JsonIgnore]
+        public int? CoverArtID { get; set; }
+        [JsonProperty("date_created")]
+        public DateTime DateCreated { get; set; }
+        #endregion
 
-	[JsonIgnore]
-	public Album Album { get; set; }
-	[JsonIgnore]
-	public int? AlbumId { get; set; }
 
-	[JsonIgnore]
+        #region Constructors
-	public Artist SongArtist { get; set; }
+        #endregion
-	[JsonIgnore]
-	public int? ArtistId { get; set; }
 
-	[JsonIgnore]
-	public Genre SongGenre { get; set; }
-	[JsonIgnore]
-	public int? GenreId { get; set; }
 
-	[JsonIgnore]
+        #region Methods
-	public Year SongYear { get; set; }
+        public string SongPath()
-	[JsonIgnore]
+        {
-	public int? YearId { get; set; }
+            var fullPath = SongDirectory;
 
-	[JsonIgnore]
+            if (fullPath[fullPath.Length -1] != '/')
-	public CoverArt SongCoverArt { get; set; }
+            {
-	[JsonIgnore]
+                fullPath += "/";
-	public int? CoverArtId { get; set; }
+            }
+
+            fullPath += Filename;
+
+            return fullPath;
+        }
+
+        public string GenerateFilename(int flag = 0)
+        {
+            const int length = 25;
+            const string chars = "ABCDEF0123456789";
+            var random = new Random();
+            var filename = new string(Enumerable.Repeat(chars, length).Select(s =>
+                s[random.Next(s.Length)]).ToArray());
+            var extension = ".mp3";
+
+            return flag == 0 ? filename : $"{filename}{extension}";
+        }
+        #endregion
     }
 }

Models/SongData.cs

@@ -5,8 +5,8 @@ namespace Icarus.Models
 {
     public class SongData
     {
-        public int Id { get; set; }
+        public int ID { get; set; }
-	public byte[] Data { get; set; }
+        public byte[] Data { get; set; }
-	public int SongId { get; set; }
+        public int SongID { get; set; }
     }
 }

Models/SongResult.cs

@@ -7,8 +7,8 @@ namespace Icarus.Models
     public class SongResult
     {
         [JsonProperty("message")]
-	public string Message { get; set; }
+        public string Message { get; set; }
-	[JsonProperty("song_title")]
+        [JsonProperty("song_title")]
-	public string SongTitle { get; set; }
+        public string SongTitle { get; set; }
     }
 }

Models/User.cs

@@ -1,32 +1,39 @@
 using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 using Newtonsoft.Json;
 
 namespace Icarus.Models
 {
+    [Table("User")]
     public class User
     {
-        [JsonProperty("id")]
+        [JsonProperty("user_id")]
-	public int Id { get; set; }
+        [Column("UserID")]
-	[JsonProperty("username")]
+        [Key]
-	public string Username { get; set; }
+        public int UserID { get; set; }
-	[JsonProperty("nickname")]
+        [JsonProperty("username")]
-	public string Nickname { get; set; }
+        public string Username { get; set; }
-	[JsonProperty("password")]
+        [JsonProperty("password")]
-	public string Password { get; set; }
+        public string Password { get; set; }
-	[JsonProperty("email")]
+        [JsonProperty("email")]
-	public string Email { get; set; }
+        public string Email { get; set; }
-	[JsonProperty("phone_number")]
+        [JsonProperty("phone")]
-	public string PhoneNumber { get; set; }
+        [Column("Phone")]
-	[JsonProperty("first_name")]
+        public string Phone { get; set; }
-	public string Firstname { get; set; }
+        [JsonProperty("firstname")]
-	[JsonProperty("last_name")]
+        public string Firstname { get; set; }
-	public string Lastname { get; set; }
+        [JsonProperty("lastname")]
-	[JsonProperty("email_verified")]
+        public string Lastname { get; set; }
-	public bool EmailVerified { get; set; }
+        [JsonProperty("email_verified")]
+        [NotMapped]
+        public bool EmailVerified { get; set; }
         [JsonProperty("date_created")]
-	public DateTime DateCreated { get; set; }
+        public DateTime DateCreated { get; set; }
-	[JsonProperty("last_login")]
+        [JsonProperty("status")]
-	public DateTime? LastLogin { get; set; }
+        public string Status { get; set; }
+        [JsonProperty("last_login")]
+        public DateTime? LastLogin { get; set; }
     }
 }

Models/Year.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-
-using Newtonsoft.Json;
-
-namespace Icarus.Models
-{
-    public class Year
-    {
-        [JsonProperty("id")]
-	public int YearId { get; set; }
-	[JsonProperty("year")]
-	public int YearValue { get; set; }
-	[JsonProperty("song_count")]
-	[NotMapped]
-	public int SongCount { get; set; }
-
-	[JsonIgnore]
-	public List<Song> Songs { get; set; }
-    }
-}

Program.cs

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using NLog.Web;
 
@@ -16,32 +17,30 @@ namespace Icarus
     {
         public static void Main(string[] args)
         {
-	    var logger = NLog.Web.NLogBuilder.ConfigureNLog("nlog.config").GetCurrentClassLogger();
+            var logger = NLog.Web.NLogBuilder.ConfigureNLog("nlog.config").GetCurrentClassLogger();
 
-	    try
+            try
-	    {
+            {
-	        logger.Debug("init main");
+                logger.Debug("init main");
-            	CreateWebHostBuilder(args).Build().Run();
+
-	    }
+                CreateHostBuilder(args).Build().Run();
-	    catch (Exception ex)
+            }
-	    {
+            catch (Exception ex)
-	        logger.Error(ex, "An error occurred");
+            {
-		throw;
+                logger.Error(ex, "An error occurred");
-	    }
+                throw;
-	    finally
+            }
-	    {
+            finally
-	        NLog.LogManager.Shutdown();
+            {
-	    }
+                NLog.LogManager.Shutdown();
+            }
         }
 
-        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
-	    WebHost.CreateDefaultBuilder(args).UseStartup<Startup>()
+            Host.CreateDefaultBuilder(args)
-	        .UseUrls("http://localhost:5002")
+                .ConfigureWebHostDefaults(webBuilder =>
-		.ConfigureLogging(logging =>
+                {
-		{
+                    webBuilder.UseStartup<Startup>();
-		    logging.ClearProviders();
+                });
-		    logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace);
-		})
-		.UseNLog();
     }
 }

README.md

@@ -14,9 +14,7 @@ One can interface with Icarus the music server either by:
 ## Built With
 
 
-* C#
+* C# [.NET](https://dotnet.microsoft.com/) 6
-* [.NET Core](https://dotnet.microsoft.com/) 2.2
-* .NET Web RESTful API
 * [MySql](https://www.nuget.org/packages/MySql.Data/)
 * [Newtonsoft.Json](https://www.newtonsoft.com/json)
 * [TagLib#](https://github.com/mono/taglib-sharp)

Scripts/MySQL/create_database.sql

@@ -0,0 +1,99 @@
+CREATE DATABASE Icarus;
+
+USE Icarus;
+
+CREATE TABLE CoverArt (
+    CoverArtID INT NOT NULL AUTO_INCREMENT,
+    SongTitle TEXT NOT NULL,
+    ImagePath TEXT NOT NULL,
+
+    PRIMARY KEY (CoverArtID)
+);
+
+CREATE TABLE Album (
+    AlbumID INT NOT NULL AUTO_INCREMENT,
+    Title TEXT NOT NULL,
+    Artist TEXT NOT NULL,
+    Year INT NOT NULL,
+
+    PRIMARY KEY (AlbumID)
+);
+
+CREATE TABLE Artist (
+    ArtistID INT NOT NULL AUTO_INCREMENT,
+    Artist TEXT NOT NULL,
+
+    PRIMARY KEY (ArtistID)
+);
+
+CREATE TABLE Genre (
+    GenreID INT NOT NULL AUTO_INCREMENT,
+    Category TEXT NOT NULL,
+
+    PRIMARY KEY (GenreID)
+);
+
+
+CREATE TABLE Song (
+    SongID INT NOT NULL AUTO_INCREMENT,
+    Title TEXT NOT NULL,
+    Artist TEXT NOT NULL,
+    Album TEXT NOT NULL,
+    AlbumArtist TEXT NOT NULL,
+    Genre TEXT NOT NULL,
+    Year INT NOT NULL,
+    Duration INT NOT NULL,
+    Track INT NOT NULL,
+    TrackCount INT NOT NULL,
+    Disc INT NOT NULL,
+    DiscCount INT NOT NULL,
+    SongDirectory TEXT NOT NULL,
+    Filename TEXT NOT NULL,
+    CoverArtID INT NOT NULL,
+    ArtistID INT NOT NULL,
+    AlbumID INT NOT NULL,
+    GenreID INT NOT NULL,
+    DateCreated DATETIME DEFAULT CURRENT_TIMESTAMP,
+
+    PRIMARY KEY (SongID),
+    CONSTRAINT FK_Song_CoverArtID FOREIGN KEY (CoverArtID) REFERENCES CoverArt (CoverArtID),
+    CONSTRAINT FK_Song_ArtistID FOREIGN KEY (ArtistID) REFERENCES Artist (ArtistID),
+    CONSTRAINT FK_Song_AlbumID FOREIGN KEY (AlbumID) REFERENCES Album (AlbumID),
+    CONSTRAINT FK_Song_GenreID FOREIGN KEY (GenreID) REFERENCES Genre (GenreID)
+);
+
+CREATE TABLE User (
+    UserID INT NOT NULL AUTO_INCREMENT,
+    Firstname TEXT NOT NULL,
+    Lastname TEXT NOT NULL,
+    Email TEXT NOT NULL,
+    Phone TEXT NOT NULL,
+    Username TEXT NOT NULL,
+    Password TEXT NOT NULL,
+    DateCreated DATETIME DEFAULT CURRENT_TIMESTAMP,
+    Status TEXT DEFAULT 'Active',
+    LastLogin DATETIME NULL,
+
+    PRIMARY KEY (UserID)
+);
+
+CREATE TABLE Salt (
+    SaltID INT NOT NULL AUTO_INCREMENT,
+    Salt TEXT NOT NULL,
+    UserID INT NOT NULL,
+
+    PRIMARY KEY (SaltID),
+    CONSTRAINT FK_Salt_UserID FOREIGN KEY (UserID) REFERENCES User (UserID)
+);
+
+CREATE TABLE Token (
+    TokenID INT NOT NULL AUTO_INCREMENT,
+    AccessToken TEXT NOT NULL,
+    TokenType TEXT NOT NULL,
+    Expires DATETIME DEFAULT CURRENT_TIMESTAMP,
+    Issued DATETIME DEFAULT CURRENT_TIMESTAMP,
+    UserID INT NOT NULL,
+
+    PRIMARY KEY (TokenID),
+    CONSTRAINT FK_Token_UserID FOREIGN KEY (UserID) REFERENCES User (UserID)
+);

Scripts/MySQL/delete_all.sql

@@ -2,5 +2,4 @@ delete from Song;
 delete from Album;
 delete from Artist;
 delete from Genre;
-delete from Year;
 delete from CoverArt;

Scripts/MySQL/drop_database.sql

@@ -0,0 +1 @@
+drop database Icarus;

Startup.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.IdentityModel.Tokens.Jwt;
+using System.Security.Claims;
 
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Authorization;
@@ -15,9 +16,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.EntityFrameworkCore;
-using MySql.Data;
+using Microsoft.IdentityModel.Tokens;
-using MySql.Data.EntityFrameworkCore.Extensions;
+using Newtonsoft.Json;
-using MySql.Data.MySqlClient;    
 using NLog;
 using NLog.Web;
 using NLog.Web.AspNetCore;
@@ -25,7 +25,6 @@ using NLog.Web.AspNetCore;
 using Icarus.Authorization;
 using Icarus.Authorization.Handlers;
 using Icarus.Database.Contexts;
-using Icarus.Database.Repositories;
 
 namespace Icarus
 {
@@ -41,66 +40,65 @@ namespace Icarus
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-        services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
+            services.AddControllers();
-        services.AddSingleton<IConfiguration>(Configuration);
 
-        string domain = $"https://{Configuration["Auth0:Domain"]}/";
+            var auth_id = Configuration["Auth0:Domain"];
+            var domain = $"https://{auth_id}/";
+            var audience = Configuration["Auth0:ApiIdentifier"];
 
-        services.AddAuthentication(options =>
+            services
-        {
+                .AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
-            options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
+                .AddJwtBearer(options => 
-        options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
+                {
-        }).AddJwtBearer(options =>
+                    options.Authority = domain;
-        {
+                    options.Audience = audience;
-            options.Authority = domain;
+                });
-        options.Audience = Configuration["Auth0:ApiIdentifier"];
-        });
 
-        services.AddAuthorization(options =>
+            services.AddAuthorization(options =>
-        {
+            {
-            options.AddPolicy("download:songs", policy => 
+                options.AddPolicy("download:songs", policy => 
-            policy.Requirements
+                policy.Requirements
-            .Add(new HasScopeRequirement("download:songs", domain)));
+                .Add(new HasScopeRequirement("download:songs", domain)));
 
-            options.AddPolicy("download:cover_art", policy =>
+                options.AddPolicy("download:cover_art", policy =>
                     policy.Requirements
                     .Add(new HasScopeRequirement("download:cover_art", domain)));
 
-        options.AddPolicy("upload:songs", policy => 
+                options.AddPolicy("upload:songs", policy => 
-            policy.Requirements
+                    policy.Requirements
-            .Add(new HasScopeRequirement("upload:songs", domain)));
+                    .Add(new HasScopeRequirement("upload:songs", domain)));
 
-        options.AddPolicy("delete:songs", policy =>
+                options.AddPolicy("delete:songs", policy =>
-            policy.Requirements
+                    policy.Requirements
-            .Add(new HasScopeRequirement("delete:songs", domain)));
+                    .Add(new HasScopeRequirement("delete:songs", domain)));
 
-        options.AddPolicy("read:song_details", policy => 
+                options.AddPolicy("read:song_details", policy => 
-            policy.Requirements
+                    policy.Requirements
-            .Add(new HasScopeRequirement("read:song_details", domain)));
+                    .Add(new HasScopeRequirement("read:song_details", domain)));
 
-        options.AddPolicy("update:songs", policy =>
+                options.AddPolicy("update:songs", policy =>
-            policy.Requirements
+                    policy.Requirements
-            .Add(new HasScopeRequirement("update:songs", domain)));
+                    .Add(new HasScopeRequirement("update:songs", domain)));
 
-        options.AddPolicy("read:artists", policy =>
+                options.AddPolicy("read:artists", policy =>
-            policy.Requirements
+                    policy.Requirements
-            .Add(new HasScopeRequirement("read:artists", domain)));
+                    .Add(new HasScopeRequirement("read:artists", domain)));
 
-        options.AddPolicy("read:albums", policy =>
+                options.AddPolicy("read:albums", policy =>
-            policy.Requirements
+                    policy.Requirements
-            .Add(new HasScopeRequirement("read:albums", domain)));
+                    .Add(new HasScopeRequirement("read:albums", domain)));
 
-        options.AddPolicy("read:genre", policy =>
+                options.AddPolicy("read:genre", policy =>
-            policy.Requirements
+                    policy.Requirements
-            .Add(new HasScopeRequirement("read:genre", domain)));
+                    .Add(new HasScopeRequirement("read:genre", domain)));
 
-        options.AddPolicy("read:year", policy =>
+                options.AddPolicy("read:year", policy =>
-            policy.Requirements
+                    policy.Requirements
-            .Add(new HasScopeRequirement("read:year", domain)));
+                    .Add(new HasScopeRequirement("read:year", domain)));
 
-        options.AddPolicy("stream:songs", policy =>
+                options.AddPolicy("stream:songs", policy =>
-            policy.Requirements
+                    policy.Requirements
-            .Add(new HasScopeRequirement("stream:songs", domain)));
+                    .Add(new HasScopeRequirement("stream:songs", domain)));
             });
 
 
@@ -108,50 +106,30 @@ namespace Icarus
 
             var connString = Configuration.GetConnectionString("DefaultConnection");
 
-        services.Add(new ServiceDescriptor(typeof(SongRepository), 
-            new SongRepository(Configuration.GetConnectionString("DefaultConnection"))));  
 
-            services.Add(new ServiceDescriptor(typeof(AlbumRepository),
+            services.AddDbContext<SongContext>(options => options.UseMySQL(connString));
-        new AlbumRepository(Configuration.GetConnectionString("DefaultConnection"))));
+            services.AddDbContext<AlbumContext>(options => options.UseMySQL(connString));
+            services.AddDbContext<ArtistContext>(options => options.UseMySQL(connString));
+            services.AddDbContext<UserContext>(options => options.UseMySQL(connString));
+            services.AddDbContext<GenreContext>(options => options.UseMySQL(connString));
+            services.AddDbContext<CoverArtContext>(options => options.UseMySQL(connString));
 
-        services.Add(new ServiceDescriptor(typeof(ArtistRepository),
+            services.AddControllers()
-        new ArtistRepository(Configuration.GetConnectionString("DefaultConnection"))));
+                .AddNewtonsoftJson();
-
-        services.Add(new ServiceDescriptor(typeof(GenreRepository),
-        new GenreRepository(Configuration.GetConnectionString("DefaultConnection"))));
-
-        services.Add(new ServiceDescriptor(typeof(YearRepository),
-        new YearRepository(Configuration.GetConnectionString("DefaultConnection"))));
-
-        services.Add(new ServiceDescriptor(typeof(CoverArtRepository),
-        new CoverArtRepository(Configuration.GetConnectionString("DefaultConnection"))));
-
-        services.Add(new ServiceDescriptor(typeof(UserRepository), 
-        new UserRepository(Configuration.GetConnectionString("DefaultConnection"))));
-
-        services.AddDbContext<SongContext>(options => options.UseMySQL(connString));
-        services.AddDbContext<AlbumContext>(options => options.UseMySQL(connString));
-        services.AddDbContext<ArtistContext>(options => options.UseMySQL(connString));
-        services.AddDbContext<UserContext>(options => options.UseMySQL(connString));
-        services.AddDbContext<GenreContext>(options => options.UseMySQL(connString));
-        services.AddDbContext<YearContext>(options => options.UseMySQL(connString));
-        services.AddDbContext<CoverArtContext>(options => options.UseMySQL(connString));
         }
 
         // Called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
-            if (env.IsDevelopment())
+            // NOTE: Dev-related configuration can be done when env.IsDevelopment() evaluated to true
-                app.UseDeveloperExceptionPage();
-            else
-                // The default HSTS value is 30 days. 
-        // You may want to change this for production scenarios
-                 app.UseHsts();
 
-        app.UseAuthentication();
+            app.UseRouting();
-
+            app.UseAuthentication();
-            app.UseHttpsRedirection();
+            app.UseAuthorization();
-            app.UseMvc();
+            app.UseEndpoints(endpoints =>
+            {
+                endpoints.MapControllers();
+            });
         }
     }
 }