From 1e87f2010491b0f3fdda70d2b19d9afd94438df7 Mon Sep 17 00:00:00 2001
From: sephrat <34862846+sephrat@users.noreply.github.com>
Date: Sat, 15 Apr 2023 21:53:49 +0200
Subject: [PATCH] fix(discover): Fix denied requests displayed as approved
 (#4901)

---
 src/Ombi.Core/Models/Requests/RecentlyRequestedModel.cs   | 1 +
 src/Ombi.Core/Services/RecentlyRequestedService.cs        | 3 +++
 .../components/detailed-card/detailed-card.component.ts   | 8 +++++++-
 .../ClientApp/src/app/interfaces/IRecentlyRequested.ts    | 3 ++-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Ombi.Core/Models/Requests/RecentlyRequestedModel.cs b/src/Ombi.Core/Models/Requests/RecentlyRequestedModel.cs
index 4296c2cc1..daab65e71 100644
--- a/src/Ombi.Core/Models/Requests/RecentlyRequestedModel.cs
+++ b/src/Ombi.Core/Models/Requests/RecentlyRequestedModel.cs
@@ -16,6 +16,7 @@ namespace Ombi.Core.Models.Requests
         public string Overview { get; set; }
         public DateTime ReleaseDate { get; set; }
         public bool Approved { get; set; }
+        public bool Denied { get; set; }
         public string MediaId { get; set; }
 
         public string PosterPath { get; set; }
diff --git a/src/Ombi.Core/Services/RecentlyRequestedService.cs b/src/Ombi.Core/Services/RecentlyRequestedService.cs
index 6628dd8b8..26d873c4d 100644
--- a/src/Ombi.Core/Services/RecentlyRequestedService.cs
+++ b/src/Ombi.Core/Services/RecentlyRequestedService.cs
@@ -88,6 +88,7 @@ namespace Ombi.Core.Services
                     Title = item.Title,
                     Type = RequestType.Movie,
                     Approved = item.Approved,
+                    Denied = item.Denied ?? false,
                     UserId = item.RequestedUserId,
                     Username = item.RequestedUser.UserAlias,
                     MediaId = item.TheMovieDbId.ToString(),
@@ -108,6 +109,7 @@ namespace Ombi.Core.Services
                     Available = item.Available,
                     Overview = item.ArtistName,
                     Approved = item.Approved,
+                    Denied = item.Denied ?? false,
                     ReleaseDate = item.ReleaseDate,
                     RequestDate = item.RequestedDate,
                     Title = item.Title,
@@ -135,6 +137,7 @@ namespace Ombi.Core.Services
                     Overview = item.ParentRequest.Overview,
                     ReleaseDate = item.ParentRequest.ReleaseDate,
                     Approved = item.Approved,
+                    Denied = item.Denied ?? false,
                     RequestDate = item.RequestedDate,
                     TvPartiallyAvailable = partialAvailability,
                     Title = item.ParentRequest.Title,
diff --git a/src/Ombi/ClientApp/src/app/components/detailed-card/detailed-card.component.ts b/src/Ombi/ClientApp/src/app/components/detailed-card/detailed-card.component.ts
index 0892bc9b2..1a66516fd 100644
--- a/src/Ombi/ClientApp/src/app/components/detailed-card/detailed-card.component.ts
+++ b/src/Ombi/ClientApp/src/app/components/detailed-card/detailed-card.component.ts
@@ -41,6 +41,9 @@ export class DetailedCardComponent implements OnInit, OnDestroy {
   }
 
   public getStatus(request: IRecentlyRequested) {
+    if (request.denied) {
+      return "Common.Denied";
+    }
     if (request.available) {
       return "Common.Available";
     }
@@ -63,6 +66,9 @@ export class DetailedCardComponent implements OnInit, OnDestroy {
   }
 
   public getClass(request: IRecentlyRequested) {
+    if (request.denied) {
+      return "danger";
+    }
     if (request.available || request.tvPartiallyAvailable) {
       return "success";
     }
@@ -113,7 +119,7 @@ export class DetailedCardComponent implements OnInit, OnDestroy {
       this.setBackgroundStyle(this.request.background);
       return;
     }
-    
+
     // Set background style while image path is loading.
     this.setBackgroundStyle(null);
     switch (this.request.type) {
diff --git a/src/Ombi/ClientApp/src/app/interfaces/IRecentlyRequested.ts b/src/Ombi/ClientApp/src/app/interfaces/IRecentlyRequested.ts
index 9cd5dc76e..49acf39c5 100644
--- a/src/Ombi/ClientApp/src/app/interfaces/IRecentlyRequested.ts
+++ b/src/Ombi/ClientApp/src/app/interfaces/IRecentlyRequested.ts
@@ -11,9 +11,10 @@ export interface IRecentlyRequested {
     overview: string;
     releaseDate: Date;
     approved: boolean;
+    denied: boolean;
     mediaId: string;
     type: RequestType;
 
     posterPath: string;
     background: string;
-}
\ No newline at end of file
+}