Added four new endpoints to change the availability for TV shows and Movies #1601

src/Ombi.Core/Engine/Interfaces/IRequestEngine.cs

@@ -14,5 +14,8 @@ namespace Ombi.Core.Engine.Interfaces
         Task<IEnumerable<T>> GetRequests(int count, int position);
         Task<IEnumerable<T>> GetRequests();
         Task<bool> UserHasRequest(string userId);
+
+        Task<RequestEngineResult> MarkUnavailable(int modelId);
+        Task<RequestEngineResult> MarkAvailable(int modelId);
     }
 }

src/Ombi.Core/Engine/Interfaces/ITvRequestEngine.cs

@@ -11,7 +11,6 @@ namespace Ombi.Core.Engine.Interfaces
         Task RemoveTvRequest(int requestId);
         Task<RequestEngineResult> RequestTvShow(SearchTvShowViewModel tv);
         Task<RequestEngineResult> DenyChildRequest(int requestId);
-        Task<ChildRequests> ChangeAvailability(ChildRequests request);
         Task<IEnumerable<TvRequests>> SearchTvRequest(string search);
         Task<IEnumerable<TreeNode<TvRequests, List<ChildRequests>>>> SearchTvRequestTree(string search);
         Task<TvRequests> UpdateTvRequest(TvRequests request);

src/Ombi.Core/Engine/MovieRequestEngine.cs

@@ -9,7 +9,6 @@ using System.Globalization;
 using System.Linq;
 using System.Security.Principal;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Ombi.Core.Authentication;
@@ -48,7 +47,7 @@ namespace Ombi.Core.Engine
             {
                 return new RequestEngineResult
                 {
-                    RequestAdded = false,
+                    Result = false,
                     Message = "There was an issue adding this movie!",
                     ErrorMessage = $"TheMovieDb didn't have any information for ID {model.Id}"
                 };
@@ -87,7 +86,7 @@ namespace Ombi.Core.Engine
             if (requestModel.Approved) // The rules have auto approved this
             {
                 var requestEngineResult = await AddMovieRequest(requestModel, fullMovieName);
-                if (requestEngineResult.RequestAdded)
+                if (requestEngineResult.Result)
                 {
                     var result = await ApproveMovie(requestModel);
                     if (result.IsError)
@@ -97,7 +96,7 @@ namespace Ombi.Core.Engine
                         {
                             Message = result.Message,
                             ErrorMessage = result.Message,
-                            RequestAdded = false
+                            Result = false
                         };
                     }
 
@@ -203,7 +202,7 @@ namespace Ombi.Core.Engine
                 {
                     return new RequestEngineResult
                     {
-                        RequestAdded = true
+                        Result = true
                     };
                 }
                 if (!result.Success)
@@ -213,7 +212,7 @@ namespace Ombi.Core.Engine
                     {
                         Message = result.Message,
                         ErrorMessage = result.Message,
-                        RequestAdded = false
+                        Result = false
                     };
                 }
                 // If there are no providers then it's successful but movie has not been sent
@@ -221,7 +220,7 @@ namespace Ombi.Core.Engine
 
             return new RequestEngineResult
             {
-                RequestAdded = true
+                Result = true
             };
         }
 
@@ -267,6 +266,47 @@ namespace Ombi.Core.Engine
             return await MovieRepository.GetAll().AnyAsync(x => x.RequestedUserId == userId);
         }
 
+        public async Task<RequestEngineResult> MarkUnavailable(int modelId)
+        {
+            var request = await MovieRepository.Find(modelId);
+            if (request == null)
+            {
+                return new RequestEngineResult
+                {
+                    ErrorMessage = "Request does not exist"
+                };
+            }
+            request.Available = false;
+            await MovieRepository.Update(request);
+
+            return new RequestEngineResult
+            {
+                Message = "Request is now unavailable",
+                Result = true
+            };
+        }
+
+        public async Task<RequestEngineResult> MarkAvailable(int modelId)
+        {
+            var request = await MovieRepository.Find(modelId);
+            if (request == null)
+            {
+                return new RequestEngineResult
+                {
+                    ErrorMessage = "Request does not exist"
+                };
+            }
+            request.Available = true;
+            NotificationHelper.Notify(request, NotificationType.RequestAvailable);
+            await MovieRepository.Update(request);
+
+            return new RequestEngineResult
+            {
+                Message = "Request is now available",
+                Result = true
+            };
+        }
+
         private async Task<RequestEngineResult> AddMovieRequest(MovieRequests model, string movieName)
         {
             await MovieRepository.Add(model);
@@ -277,7 +317,7 @@ namespace Ombi.Core.Engine
                 NotificationHelper.NewRequest(model);
             }
 
-            return new RequestEngineResult { RequestAdded = true, Message = $"{movieName} has been successfully added!" };
+            return new RequestEngineResult { Result = true, Message = $"{movieName} has been successfully added!" };
         }
 
         public async Task<IEnumerable<MovieRequests>> GetApprovedRequests()

src/Ombi.Core/Engine/RequestEngineResult.cs

@@ -2,7 +2,7 @@
 {
     public class RequestEngineResult
     {
-        public bool RequestAdded { get; set; }
+        public bool Result { get; set; }
         public string Message { get; set; }
         public bool IsError => !string.IsNullOrEmpty(ErrorMessage);
         public string ErrorMessage { get; set; }

src/Ombi.Core/Engine/TvRequestEngine.cs

@@ -111,7 +111,7 @@ namespace Ombi.Core.Engine
                     // Looks like we have removed them all! They were all duplicates...
                     return new RequestEngineResult
                     {
-                        RequestAdded = false,
+                        Result = false,
                         ErrorMessage = "This has already been requested"
                     };
                 }
@@ -201,7 +201,7 @@ namespace Ombi.Core.Engine
             }
             return new RequestEngineResult
             {
-                RequestAdded = true
+                Result = true
             };
         }
 
@@ -220,19 +220,10 @@ namespace Ombi.Core.Engine
             NotificationHelper.Notify(request, NotificationType.RequestDeclined);
             return new RequestEngineResult
             {
-                RequestAdded = true
+                Result = true
             };
         }
 
-        public async Task<ChildRequests> ChangeAvailability(ChildRequests request)
-        {
-            if (request.Available)
-            {
-                NotificationHelper.Notify(request, NotificationType.RequestAvailable);
-            }
-            return await UpdateChildRequest(request);
-        }
-
         public async Task<ChildRequests> UpdateChildRequest(ChildRequests request)
         {
             await Audit.Record(AuditType.Updated, AuditArea.TvRequest, $"Updated Request {request.Title}", Username);
@@ -272,6 +263,46 @@ namespace Ombi.Core.Engine
             return await TvRepository.GetChild().AnyAsync(x => x.RequestedUserId == userId);
         }
 
+        public async Task<RequestEngineResult> MarkUnavailable(int modelId)
+        {
+            var request = await TvRepository.GetChild().FirstOrDefaultAsync(x => x.Id == modelId);
+            if (request == null)
+            {
+                return new RequestEngineResult
+                {
+                    ErrorMessage = "Child Request does not exist"
+                };
+            }
+            request.Available = false;
+            await TvRepository.UpdateChild(request);
+            NotificationHelper.Notify(request, NotificationType.RequestAvailable);
+            return new RequestEngineResult
+            {
+                Result = true,
+                Message = "Request is now unavailable",
+            };
+        }
+
+        public async Task<RequestEngineResult> MarkAvailable(int modelId)
+        {
+            var request = await TvRepository.GetChild().FirstOrDefaultAsync(x => x.Id == modelId);
+            if (request == null)
+            {
+                return new RequestEngineResult
+                {
+                    ErrorMessage = "Child Request does not exist"
+                };
+            }
+            request.Available = true;
+            await TvRepository.UpdateChild(request);
+            NotificationHelper.Notify(request, NotificationType.RequestAvailable);
+            return new RequestEngineResult
+            {
+                Result = true,
+                Message = "Request is now available",
+            };
+        }
+
         private async Task<RequestEngineResult> AddExistingRequest(ChildRequests newRequest, TvRequests existingRequest)
         {
             // Add the child
@@ -339,7 +370,7 @@ namespace Ombi.Core.Engine
                 var result = await TvSender.Send(model);
                 if (result.Success)
                 {
-                    return new RequestEngineResult {RequestAdded = true};
+                    return new RequestEngineResult {Result = true};
                 }
                 return new RequestEngineResult
                 {
@@ -347,7 +378,7 @@ namespace Ombi.Core.Engine
                 };
             }
 
-            return new RequestEngineResult {RequestAdded = true};
+            return new RequestEngineResult {Result = true};
         }
     }
 }

src/Ombi/ClientApp/app/interfaces/IRequestEngineResult.ts

@@ -1,5 +1,5 @@
 export interface IRequestEngineResult {
-    requestAdded: boolean;
+    result: boolean;
     message: string;
     errorMessage: string;
 }

src/Ombi/ClientApp/app/requests/movierequests.component.ts

@@ -71,7 +71,27 @@ export class MovieRequestsComponent implements OnInit {
     public changeAvailability(request: IMovieRequests, available: boolean) {
         request.available = available;
 
-        this.updateRequest(request);
+        if(available) {
+            this.requestService.markMovieAvailable({ id: request.id }).subscribe(x => {
+                if (x.result) {
+                    this.notificationService.success("Request Available",
+                        `${request.title} Is now available`);
+                } else {
+                    this.notificationService.warning("Request Available", x.message ? x.message : x.errorMessage);
+                    request.approved = false;
+                }
+            });
+        } else {
+            this.requestService.markMovieUnavailable({ id: request.id }).subscribe(x => {
+                if (x.result) {
+                    this.notificationService.success("Request Available",
+                        `${request.title} Is now unavailable`);
+                } else {
+                    this.notificationService.warning("Request Available", x.message ? x.message : x.errorMessage);
+                    request.approved = false;
+                }
+            });
+        }
     }
 
     public approve(request: IMovieRequests) {
@@ -119,7 +139,7 @@ export class MovieRequestsComponent implements OnInit {
         this.requestService.approveMovie({ id: request.id })
             .subscribe(x => {
 
-                if (x.requestAdded) {
+                if (x.result) {
                     this.notificationService.success("Request Approved",
                         `Request for ${request.title} has been approved successfully`);
                 } else {

src/Ombi/ClientApp/app/requests/tvrequest-children.component.ts

@@ -25,6 +25,27 @@ export class TvRequestChildrenComponent {
 
     public changeAvailability(request: IChildRequests, available: boolean) {
         request.available = available;
+        if(available) {
+            this.requestService.markTvAvailable({ id: request.id }).subscribe(x => {
+                if (x.result) {
+                    this.notificationService.success("Request Available",
+                        `This request is now available`);
+                } else {
+                    this.notificationService.warning("Request Available", x.message ? x.message : x.errorMessage);
+                    request.approved = false;
+                }
+            });
+        } else {
+            this.requestService.markTvUnavailable({ id: request.id }).subscribe(x => {
+                if (x.result) {
+                    this.notificationService.success("Request Available",
+                    `This request is now unavailable`);
+                } else {
+                    this.notificationService.warning("Request Available", x.message ? x.message : x.errorMessage);
+                    request.approved = false;
+                }
+            });
+        }
     }
 
     public deny(request: IChildRequests) {
@@ -37,7 +58,7 @@ export class TvRequestChildrenComponent {
         });
         this.requestService.denyChild({ id: request.id })
             .subscribe(x => {
-                if (x.requestAdded) {
+                if (x.result) {
                     this.notificationService.success("Request Denied",
                         `Request has been denied successfully`);
                 } else {
@@ -57,7 +78,7 @@ export class TvRequestChildrenComponent {
         });
         this.requestService.approveChild({ id: request.id })
             .subscribe(x => {
-                if (x.requestAdded) {
+                if (x.result) {
                     this.notificationService.success("Request Approved",
                         `Request has been approved successfully`);
                 } else {

src/Ombi/ClientApp/app/search/moviesearch.component.ts

@@ -49,7 +49,7 @@ export class MovieSearchComponent implements OnInit {
         this.movieResults = [];
         this.result = {
             message: "",
-            requestAdded: false,
+            result: false,
             errorMessage: "",
         };
     }
@@ -70,7 +70,7 @@ export class MovieSearchComponent implements OnInit {
                 .subscribe(x => {
                     this.result = x;
 
-                    if (this.result.requestAdded) {
+                    if (this.result.result) {
                         this.notificationService.success("Request Added",
                             `Request for ${searchResult.title} has been added successfully`);
                         searchResult.processed = true;

src/Ombi/ClientApp/app/search/moviesearchgrid.component.ts

@@ -50,7 +50,7 @@ export class MovieSearchGridComponent implements OnInit {
         this.movieResults = [];
         this.result = {
             message: "",
-            requestAdded: false,
+            result: false,
             errorMessage: "",
         };
     }
@@ -71,7 +71,7 @@ export class MovieSearchGridComponent implements OnInit {
                 .subscribe(x => {
                     this.result = x;
 
-                    if (this.result.requestAdded) {
+                    if (this.result.result) {
                         this.notificationService.success("Request Added",
                             `Request for ${searchResult.title} has been added successfully`);
                         searchResult.processed = true;

src/Ombi/ClientApp/app/search/seriesinformation.component.ts

@@ -43,7 +43,7 @@ export class SeriesInformationComponent implements OnInit, OnDestroy {
             .takeUntil(this.subscriptions)
             .subscribe(x => {
                 this.result = x as IRequestEngineResult;
-                if (this.result.requestAdded) {
+                if (this.result.result) {
                     this.notificationService.success("Request Added",
                         `Request for ${this.series.title} has been added successfully`);
 

src/Ombi/ClientApp/app/search/tvsearch.component.ts

@@ -79,7 +79,7 @@ export class TvSearchComponent implements OnInit, OnDestroy {
         this.tvResults = [];
         this.result = {
             message: "",
-            requestAdded: false,
+            result: false,
             errorMessage:"",
         };
     }
@@ -154,7 +154,7 @@ export class TvSearchComponent implements OnInit, OnDestroy {
             .takeUntil(this.subscriptions)
             .subscribe(x => {
                 this.result = x;
-                if (this.result.requestAdded) {
+                if (this.result.result) {
                     this.notificationService.success("Request Added",
                         `Request for ${searchResult.title} has been added successfully`);
                 } else {

src/Ombi/ClientApp/app/services/request.service.ts

@@ -33,6 +33,14 @@ export class RequestService extends ServiceAuthHelpers {
         return this.http.put(`${this.url}Movie/Deny`, JSON.stringify(movie), { headers: this.headers }).map(this.extractData);
     }
 
+    public markMovieAvailable(movie: IMovieUpdateModel): Observable<IRequestEngineResult> {
+        return this.http.post(`${this.url}Movie/available`, JSON.stringify(movie), { headers: this.headers }).map(this.extractData);
+    }
+
+    public markMovieUnavailable(movie: IMovieUpdateModel): Observable<IRequestEngineResult> {
+        return this.http.post(`${this.url}Movie/unavailable`, JSON.stringify(movie), { headers: this.headers }).map(this.extractData);
+    }
+
     public getMovieRequests(count: number, position: number): Observable<IMovieRequests[]> {
         return this.http.get(`${this.url}movie/${count}/${position}`).map(this.extractData);
     }
@@ -75,19 +83,27 @@ export class RequestService extends ServiceAuthHelpers {
     public removeTvRequest(request: ITvRequests) {
         this.http.delete(`${this.url}tv/${request.id}`).map(this.extractData).subscribe();
     }
+    
+    public markTvAvailable(movie: ITvUpdateModel): Observable<IRequestEngineResult> {
+        return this.http.post(`${this.url}tv/available`, JSON.stringify(movie), { headers: this.headers }).map(this.extractData);
+    }
+
+    public markTvUnavailable(movie: ITvUpdateModel): Observable<IRequestEngineResult> {
+        return this.http.post(`${this.url}tv/unavailable`, JSON.stringify(movie), { headers: this.headers }).map(this.extractData);
+    }
 
     public updateTvRequest(request: ITvRequests): Observable<ITvRequests> {
         return this.http.put(`${this.url}tv/`, JSON.stringify(request), { headers: this.headers }).map(this.extractData);
     }
+
     public updateChild(child: IChildRequests): Observable<IChildRequests> {
         return this.http.put(`${this.url}tv/child`, JSON.stringify(child), { headers: this.headers }).map(this.extractData);
     }   
+
     public denyChild(child: ITvUpdateModel): Observable<IRequestEngineResult> {
         return this.http.put(`${this.url}tv/deny`, JSON.stringify(child), { headers: this.headers }).map(this.extractData);
     } 
-    public changeAvailabilityChild(child: IChildRequests): Observable<IChildRequests> {
+
-        return this.http.put(`${this.url}tv/changeavailability`, JSON.stringify(child), { headers: this.headers }).map(this.extractData);
-    }   
     public approveChild(child: ITvUpdateModel): Observable<IRequestEngineResult> {
         return this.http.post(`${this.url}tv/approve`, JSON.stringify(child), { headers: this.headers }).map(this.extractData);
     }

src/Ombi/Controllers/RequestController.cs

@@ -101,6 +101,28 @@ namespace Ombi.Controllers
             return await MovieRequestEngine.ApproveMovieById(model.Id);
         }
 
+        /// <summary>
+        /// Set's the specified Movie as available 
+        /// </summary>
+        /// <param name="model">The Movie's ID</param>
+        /// <returns></returns>
+        [HttpPost("movie/available")]
+        public async Task<RequestEngineResult> MarkMovieAvailable([FromBody] MovieUpdateModel model)
+        {
+            return await MovieRequestEngine.MarkAvailable(model.Id);
+        }
+
+        /// <summary>
+        /// Set's the specified Movie as unavailable 
+        /// </summary>
+        /// <param name="model">The Movie's ID</param>
+        /// <returns></returns>
+        [HttpPost("movie/unavailable")]
+        public async Task<RequestEngineResult> MarkMovieUnAvailable([FromBody] MovieUpdateModel model)
+        {
+            return await MovieRequestEngine.MarkUnavailable(model.Id);
+        }
+
         /// <summary>
         /// Denies the specified movie request.
         /// </summary>
@@ -224,14 +246,25 @@ namespace Ombi.Controllers
         }
 
         /// <summary>
-        /// Changes the availability of the a specific child request
+        /// Set's the specified tv child as available 
         /// </summary>
-        /// <param name="child">The model.</param>
+        /// <param name="model">The Movie's ID</param>
         /// <returns></returns>
-        [HttpPut("tv/changeavailability")]
+        [HttpPost("tv/available")]
-        public async Task<ChildRequests> ChangeAvailability([FromBody] ChildRequests child)
+        public async Task<RequestEngineResult> MarkTvAvailable([FromBody] TvUpdateModel model)
         {
-            return await TvRequestEngine.ChangeAvailability(child);
+            return await TvRequestEngine.MarkAvailable(model.Id);
+        }
+
+        /// <summary>
+        /// Set's the specified tv child as unavailable 
+        /// </summary>
+        /// <param name="model">The Movie's ID</param>
+        /// <returns></returns>
+        [HttpPost("tv/unavailable")]
+        public async Task<RequestEngineResult> MarkTvUnAvailable([FromBody] TvUpdateModel model)
+        {
+            return await TvRequestEngine.MarkUnavailable(model.Id);
         }
 
         /// <summary>