v v20190511.1 beta

Roadie.Api.Library/Models/Releases/ReleaseList.cs

@@ -6,11 +6,14 @@ using Roadie.Library.Models.Users;
 using Roadie.Library.Utility;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
 using System.Text;
 
 namespace Roadie.Library.Models.Releases
 {
     [Serializable]
+    [DebuggerDisplay("DatabaseId [{ DatabaseId }] Name [{ ReleaseName }] IsValid [{ IsValid }]")]
     public class ReleaseList : EntityInfoModelBase
     {
         public DataToken Release { get; set; }
@@ -21,6 +24,16 @@ namespace Roadie.Library.Models.Releases
         public short? Rating { get; set; }
         public decimal? Rank { get; set; }
 
+        [JsonIgnore]
+        [AdaptIgnore]
+        public string ReleaseName
+        {
+            get
+            {
+                return this.Release?.Text;
+            }
+        }
+
         public string ReleaseDate
         {
             get
@@ -67,7 +80,14 @@ namespace Roadie.Library.Models.Releases
         {
             get
             {
-                return this.Id != Guid.Empty;
+                var shouldBeMediaCount = this.MediaCount ?? 0;
+                var hasMediaCount = this.Media == null || !this.Media.Any() ? 0 : this.Media.Count();
+                var artistName = this.Artist?.Text;
+                var releaseName = this.Release?.Text;
+                return this.Id != Guid.Empty &&
+                       shouldBeMediaCount == hasMediaCount &&
+                       !string.IsNullOrEmpty(artistName) &&
+                       !string.IsNullOrEmpty(releaseName);
             }
         }
 

Roadie.Api.Library/Models/Releases/ReleaseMediaList.cs

@@ -1,5 +1,7 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 
 namespace Roadie.Library.Models.Releases

Roadie.Api.Library/Models/TrackList.cs

@@ -12,9 +12,27 @@ using System.Text;
 namespace Roadie.Library.Models
 {
     [Serializable]
-    [DebuggerDisplay("Trackid [{ Track.Value }], Track Name [{ Track.Text }}")]
+    [DebuggerDisplay("Trackid [{ TrackId }], Track Name [{ TrackName }}")]
     public class TrackList : EntityInfoModelBase
     {
+        [JsonIgnore]
+        public string TrackId
+        {
+            get
+            {
+                return this.Track?.Value;
+            }
+        }
+
+        [JsonIgnore]
+        public string TrackName
+        {
+            get
+            {
+                return this.Track?.Text;
+            }
+        }
+
         public int? MediaNumber { get; set; }
         public int? TrackNumber { get; set; }
         public DataToken Track { get; set; }

Roadie.Api.Services/ReleaseService.cs

@@ -430,6 +430,8 @@ namespace Roadie.Api.Services
                         release.Media = this.DbContext.ReleaseMedias
                                             .Include(x => x.Tracks)
                                             .Where(x => x.ReleaseId == release.DatabaseId)
+                                            .ToArray()
+                                            .AsQueryable()
                                             .ProjectToType<ReleaseMediaList>()
                                             .OrderBy(x => x.MediaNumber)
                                             .ToArray();
@@ -442,7 +444,7 @@ namespace Roadie.Api.Services
                                                      select new { trackId = t.RoadieId, ut }).ToArray();
                         foreach (var userRatingForRelease in userRatingsForRelease)
                         {
-                            var mediaTrack = release.Media.SelectMany(x => x.Tracks).FirstOrDefault(x => x.Id == userRatingForRelease.trackId);
+                            var mediaTrack = release.Media?.SelectMany(x => x.Tracks).FirstOrDefault(x => x.Id == userRatingForRelease.trackId);
                             if (mediaTrack != null)
                             {
                                 mediaTrack.UserRating = new UserTrack

Roadie.Api/Controllers/ReleaseController.cs

@@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
 using Roadie.Api.Services;
 using Roadie.Library.Caching;
 using Roadie.Library.Data;