show request type in notifications #346 and fix an issue from previous commit for #345

PlexRequests.Store/RequestedModel.cs

@@ -1,90 +1,108 @@
-using System;
-using Dapper.Contrib.Extensions;
-using System.Collections.Generic;
-using System.Linq;
-using Newtonsoft.Json;
-
-namespace PlexRequests.Store
-{
-    [Table("Requested")]
-    public class RequestedModel : Entity
-    {
-        public RequestedModel()
-        {
-            RequestedUsers = new List<string>();
-        }
-
-        // ReSharper disable once IdentifierTypo
-        public int ProviderId { get; set; }
-        public string ImdbId { get; set; }
-        public string TvDbId { get; set; }
-        public string Overview { get; set; }
-        public string Title { get; set; }
-        public string PosterPath { get; set; }
-        public DateTime ReleaseDate { get; set; }
-        public RequestType Type { get; set; }
-        public string Status { get; set; }
-        public bool Approved { get; set; }
-
-        [Obsolete("Use RequestedUsers")]
-        public string RequestedBy { get; set; }
-
-        public DateTime RequestedDate { get; set; }
-        public bool Available { get; set; }
-        public IssueState Issues { get; set; }
-        public string OtherMessage { get; set; }
-        public string AdminNote { get; set; }
-        public int[] SeasonList { get; set; }
-        public int SeasonCount { get; set; }
-        public string SeasonsRequested { get; set; }
-        public string MusicBrainzId { get; set; }
-        public List<string> RequestedUsers { get; set; }
-        public string ArtistName { get; set; }
-        public string ArtistId { get; set; }
-        public int IssueId { get; set; }
-
-        [JsonIgnore]
-        public List<string> AllUsers
-        {
-            get
-            {
-                var u = new List<string>();
-                if (!string.IsNullOrEmpty(RequestedBy))
-                {
-                    u.Add(RequestedBy);
-                }
-
-                if (RequestedUsers.Any())
-                {
-                    u.AddRange(RequestedUsers.Where(requestedUser => requestedUser != RequestedBy));
-                }
-                return u;
-            }
-        }
-
-        [JsonIgnore]
-        public bool CanApprove => !Approved && !Available;
-
-        public bool UserHasRequested(string username)
-        {
-            return AllUsers.Any(x => x.Equals(username, StringComparison.OrdinalIgnoreCase));
-        }
-    }
-
-    public enum RequestType
-    {
-        Movie,
-        TvShow,
-        Album
-    }
-
-    public enum IssueState
-    {
-        None = 99,
-        WrongAudio = 0,
-        NoSubtitles = 1,
-        WrongContent = 2,
-        PlaybackIssues = 3,
-        Other = 4, // Provide a message
-    }
-}
+using System;
+using Dapper.Contrib.Extensions;
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+
+namespace PlexRequests.Store
+{
+    [Table("Requested")]
+    public class RequestedModel : Entity
+    {
+        public RequestedModel()
+        {
+            RequestedUsers = new List<string>();
+        }
+
+        // ReSharper disable once IdentifierTypo
+        public int ProviderId { get; set; }
+        public string ImdbId { get; set; }
+        public string TvDbId { get; set; }
+        public string Overview { get; set; }
+        public string Title { get; set; }
+        public string PosterPath { get; set; }
+        public DateTime ReleaseDate { get; set; }
+        public RequestType Type { get; set; }
+        public string Status { get; set; }
+        public bool Approved { get; set; }
+
+        [Obsolete("Use RequestedUsers")]
+        public string RequestedBy { get; set; }
+
+        public DateTime RequestedDate { get; set; }
+        public bool Available { get; set; }
+        public IssueState Issues { get; set; }
+        public string OtherMessage { get; set; }
+        public string AdminNote { get; set; }
+        public int[] SeasonList { get; set; }
+        public int SeasonCount { get; set; }
+        public string SeasonsRequested { get; set; }
+        public string MusicBrainzId { get; set; }
+        public List<string> RequestedUsers { get; set; }
+        public string ArtistName { get; set; }
+        public string ArtistId { get; set; }
+        public int IssueId { get; set; }
+
+        [JsonIgnore]
+        public List<string> AllUsers
+        {
+            get
+            {
+                var u = new List<string>();
+                if (!string.IsNullOrEmpty(RequestedBy))
+                {
+                    u.Add(RequestedBy);
+                }
+
+                if (RequestedUsers.Any())
+                {
+                    u.AddRange(RequestedUsers.Where(requestedUser => requestedUser != RequestedBy));
+                }
+                return u;
+            }
+        }
+
+        [JsonIgnore]
+        public bool CanApprove => !Approved && !Available;
+
+        public bool UserHasRequested(string username)
+        {
+            return AllUsers.Any(x => x.Equals(username, StringComparison.OrdinalIgnoreCase));
+        }
+    }
+
+    public enum RequestType
+    {
+        Movie,
+        TvShow,
+        Album
+    }
+
+    public static class RequestTypeDisplay
+    {
+        public static string Get(RequestType type)
+        {
+            switch (type)
+            {
+                case RequestType.Movie:
+                    return "Movie";
+                case RequestType.TvShow:
+                    return "TV Show";
+                case RequestType.Album:
+                    return "Album";
+                default:
+                    return string.Empty;
+            }
+        } 
+    }
+
+    public enum IssueState
+    {
+        None = 99,
+        WrongAudio = 0,
+        NoSubtitles = 1,
+        WrongContent = 2,
+        PlaybackIssues = 3,
+        Other = 4, // Provide a message
+    }
+}