Updated more models

Icarus/Controllers/v1/ArtistController.cs

@@ -46,7 +46,7 @@ public class ArtistController : BaseController
     }
 
     [HttpGet("{id}")]
-    public IActionResult GetArtist(int id)
+    public IActionResult GetArtist(Guid id)
     {
         Artist artist = new Artist { Id = id };
 

Icarus/Database/Contexts/AccessLevelContext.cs

@@ -30,6 +30,14 @@ public class AccessLevelContext : DbContext
     {
         modelBuilder.Entity<Models.AccessLevel>().ToTable("AccessLevel");
 
+        modelBuilder.Entity<Models.AccessLevel>(entity => 
+        {
+            entity.HasKey(e => e.Id);
+
+            entity.Property(e => e.Id)
+                .HasColumnType("binary(16)");
+        });
+
         modelBuilder.Entity<Models.AccessLevel>().Property(m => m.Level).IsRequired(true);
     }
     #endregion

Icarus/Database/Contexts/AlbumContext.cs

@@ -18,6 +18,14 @@ public class AlbumContext : DbContext
     {
         modelBuilder.Entity<Album>()
             .ToTable("Album");
+
+        modelBuilder.Entity<Album>(entity => 
+        {
+            entity.HasKey(e => e.Id);
+
+            entity.Property(e => e.Id)
+                .HasColumnType("binary(16)");
+        });
     }
 
     public Album RetrieveRecord(Album album)

Icarus/Database/Contexts/ArtistContext.cs

@@ -18,6 +18,14 @@ public class ArtistContext : DbContext
     {
         modelBuilder.Entity<Artist>()
             .ToTable("Artist");
+
+        modelBuilder.Entity<Artist>(entity => 
+        {
+            entity.HasKey(e => e.Id);
+
+            entity.Property(e => e.Id)
+                .HasColumnType("binary(16)");
+        });
     }
 
     public Artist RetrieveRecord(Artist artist)

Icarus/Database/Contexts/CoverArtContext.cs

@@ -20,6 +20,13 @@ public class CoverArtContext : DbContext
     {
         modelBuilder.Entity<CoverArt>()
             .ToTable("CoverArt");
+        modelBuilder.Entity<CoverArt>(entity => 
+        {
+            entity.HasKey(e => e.Id);
+
+            entity.Property(e => e.Id)
+                .HasColumnType("binary(16)");
+        });
     }
 
     public CoverArt RetrieveRecord(CoverArt cover)

Icarus/Database/Contexts/GenreContext.cs

@@ -20,6 +20,14 @@ public class GenreContext : DbContext
     {
         modelBuilder.Entity<Genre>()
             .ToTable("Genre");
+
+        modelBuilder.Entity<Genre>(entity => 
+        {
+            entity.HasKey(e => e.Id);
+
+            entity.Property(e => e.Id)
+                .HasColumnType("binary(16)");
+        });
     }
 
 

Icarus/Database/Contexts/SongContext.cs

@@ -21,6 +21,14 @@ public class SongContext : DbContext
         modelBuilder.Entity<Song>()
             .ToTable("Song");
 
+        modelBuilder.Entity<Song>(entity => 
+        {
+            entity.HasKey(e => e.Id);
+
+            entity.Property(e => e.Id)
+                .HasColumnType("binary(16)");
+        });
+
         modelBuilder.Entity<Song>()
             .Property(s => s.Year)
             .IsRequired(false);

Icarus/Database/Contexts/UserContext.cs

@@ -25,12 +25,12 @@ public class UserContext : DbContext
             .ToTable("User");
 
         modelBuilder.Entity<User>(entity =>
-{
-    entity.HasKey(e => e.Id);
+        {
+            entity.HasKey(e => e.Id);
 
-    entity.Property(e => e.Id)
-          .HasColumnType("binary(16)"); // **** Map Guid to BINARY(16) ****
-});
+            entity.Property(e => e.Id)
+                .HasColumnType("binary(16)"); // **** Map Guid to BINARY(16) ****
+        });
         modelBuilder.Entity<User>()
             .Property(u => u.LastLogin).IsRequired(false);
         modelBuilder.Entity<User>()

Models/AccessLevel.cs

@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Icarus.Models;
@@ -6,7 +7,7 @@ public class AccessLevel
 {
     #region Properties
     [Newtonsoft.Json.JsonProperty("id")]
-    public int Id { get; set; }
+    public Guid Id { get; set; }
     [Newtonsoft.Json.JsonProperty("level")]
     public string? Level { get; set; }
     [Newtonsoft.Json.JsonProperty("song_id")]

Models/Album.cs

@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 using Newtonsoft.Json;
@@ -8,7 +9,8 @@ public class Album
 {
     #region Properties
     [JsonProperty("id")]
-    public int Id { get; set; }
+    [Key]
+    public Guid Id { get; set; }
     [JsonProperty("title")]
     public string? Title { get; set; }
     [JsonProperty("album_artist")]

Models/Artist.cs

@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 using Newtonsoft.Json;
@@ -8,7 +9,8 @@ public class Artist
 {
     #region Properties
     [JsonProperty("id")]
-    public int Id { get; set; }
+    [Key]
+    public Guid Id { get; set; }
     [JsonProperty("name")]
     [Column("Artist")]
     public string? Name { get; set; }

Models/CoverArt.cs

@@ -1,3 +1,5 @@
+using System.ComponentModel.DataAnnotations;
+
 using Newtonsoft.Json;
 
 namespace Icarus.Models;
@@ -6,7 +8,8 @@ public class CoverArt
 {
     #region Properties
     [JsonProperty("id")]
-    public int Id { get; set; }
+    [Key]
+    public Guid Id { get; set; }
     [JsonProperty("title")]
     public string? SongTitle { get; set; }
     [JsonIgnore]

Models/CreateFile.cs

@@ -1,6 +1,3 @@
-
-
-
 namespace Icarus.Models;
 
 public enum CreateFileResult

Models/Genre.cs

@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 using Newtonsoft.Json;
@@ -8,7 +9,7 @@ public class Genre
 {
     #region Properties
     [JsonProperty("id")]
-    public int Id { get; set; }
+    public Guid Id { get; set; }
     [JsonProperty("genre")]
     [Column("Category")]
     public string? GenreName { get; set; }

Models/Song.cs

@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 using Newtonsoft.Json;
@@ -8,7 +9,8 @@ public class Song
 {
     #region Properties
     [JsonProperty("id")]
-    public int Id { get; set; }
+    [Key]
+    public Guid Id { get; set; }
     [JsonProperty("title")]
     public string? Title { get; set; }
     [JsonProperty("album")]

Models/SongData.cs

@@ -3,7 +3,7 @@ namespace Icarus.Models;
 public class SongData
 {
     #region Properties
-    public int ID { get; set; }
+    public Guid ID { get; set; }
     public byte[]? Data { get; set; }
     public int SongID { get; set; }
     #endregion