From ac1266bf6e2132a67f5fb5efed32b003c72f2fee Mon Sep 17 00:00:00 2001 From: Jamie Rees Date: Fri, 9 Aug 2019 14:11:09 +0100 Subject: [PATCH] Fixed the api for unavailable requests --- src/Ombi.Core/Engine/Interfaces/ITvRequestEngine.cs | 3 ++- src/Ombi/ClientApp/src/app/services/requestV2.service.ts | 9 +++++++++ src/Ombi/Controllers/V2/RequestsController.cs | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/Ombi.Core/Engine/Interfaces/ITvRequestEngine.cs b/src/Ombi.Core/Engine/Interfaces/ITvRequestEngine.cs index ded696c0f..1747351f4 100644 --- a/src/Ombi.Core/Engine/Interfaces/ITvRequestEngine.cs +++ b/src/Ombi.Core/Engine/Interfaces/ITvRequestEngine.cs @@ -8,7 +8,8 @@ namespace Ombi.Core.Engine.Interfaces { public interface ITvRequestEngine : IRequestEngine { - + Task> GetUnavailableRequests(int count, int position, string sortProperty, + string sortOrder); Task RemoveTvRequest(int requestId); Task GetTvRequest(int requestId); Task RequestTvShow(TvRequestViewModel tv); diff --git a/src/Ombi/ClientApp/src/app/services/requestV2.service.ts b/src/Ombi/ClientApp/src/app/services/requestV2.service.ts index 5142f8974..a7dca2a19 100644 --- a/src/Ombi/ClientApp/src/app/services/requestV2.service.ts +++ b/src/Ombi/ClientApp/src/app/services/requestV2.service.ts @@ -24,4 +24,13 @@ export class RequestServiceV2 extends ServiceHelpers { public updateMovieAdvancedOptions(options: IMovieAdvancedOptions): Observable { return this.http.post(`${this.url}movie/advancedoptions`, options, {headers: this.headers}); } + + public getMovieUnavailableRequests(count: number, position: number, sortProperty: string , order: string): Observable> { + return this.http.get>(`${this.url}movie/unavailable/${count}/${position}/${sortProperty}/${order}`, {headers: this.headers}); + } + + public getTvUnavailableRequests(count: number, position: number, sortProperty: string , order: string): Observable> { + return this.http.get>(`${this.url}tv/unavailable/${count}/${position}/${sortProperty}/${order}`, {headers: this.headers}); + } + } diff --git a/src/Ombi/Controllers/V2/RequestsController.cs b/src/Ombi/Controllers/V2/RequestsController.cs index 082525509..73b4f26af 100644 --- a/src/Ombi/Controllers/V2/RequestsController.cs +++ b/src/Ombi/Controllers/V2/RequestsController.cs @@ -69,10 +69,10 @@ namespace Ombi.Controllers.V2 /// The position. e.g. position 60 for a 2nd page (since we have already got the first 30 items) /// The item to sort on e.g. "requestDate" /// asc or desc - [HttpGet("tv/{count:int}/{position:int}/{sort}/{sortOrder}")] + [HttpGet("tv/unavailable/{count:int}/{position:int}/{sort}/{sortOrder}")] public async Task> GetNotAvailableTvRequests(int count, int position, string sort, string sortOrder) { - return await _tvRequestEngine.GetRequests(count, position, sort, sortOrder); + return await _tvRequestEngine.GetUnavailableRequests(count, position, sort, sortOrder); } [HttpPost("movie/advancedoptions")]