Added a smaller and simplier way of getting TV Request info

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

@@ -10,6 +10,7 @@ namespace Ombi.Core.Engine.Interfaces
     {
 
         Task RemoveTvRequest(int requestId);
+        Task<TvRequests> GetTvRequest(int requestId);
         Task<RequestEngineResult> RequestTvShow(TvRequestViewModel tv);
         Task<RequestEngineResult> DenyChildRequest(int requestId);
         Task<IEnumerable<TvRequests>> SearchTvRequest(string search);
@@ -20,5 +21,6 @@ namespace Ombi.Core.Engine.Interfaces
         Task<ChildRequests> UpdateChildRequest(ChildRequests request);
         Task RemoveTvChild(int requestId);
         Task<RequestEngineResult> ApproveChildRequest(int id);
+        Task<IEnumerable<TvRequests>> GetRequestsLite();
     }
 }

src/Ombi.Core/Engine/TvRequestEngine.cs

@@ -218,6 +218,45 @@ namespace Ombi.Core.Engine
             return allRequests;
         }
 
+
+        public async Task<IEnumerable<TvRequests>> GetRequestsLite()
+        {
+            var shouldHide = await HideFromOtherUsers();
+            List<TvRequests> allRequests;
+            if (shouldHide.Hide)
+            {
+                allRequests = await TvRepository.GetLite(shouldHide.UserId).ToListAsync();
+
+                FilterChildren(allRequests, shouldHide);
+            }
+            else
+            {
+                allRequests = await TvRepository.GetLite().ToListAsync();
+            }
+
+            allRequests.ForEach(async r => { await CheckForSubscription(shouldHide, r); });
+            return allRequests;
+        }
+
+        public async Task<TvRequests> GetTvRequest(int requestId)
+        {
+            var shouldHide = await HideFromOtherUsers();
+            TvRequests request;
+            if (shouldHide.Hide)
+            {
+                request = await TvRepository.Get(shouldHide.UserId).Where(x => x.Id == requestId).FirstOrDefaultAsync();
+
+                FilterChildren(request, shouldHide);
+            }
+            else
+            {
+                request = await TvRepository.Get().Where(x => x.Id == requestId).FirstOrDefaultAsync();
+            }
+
+            await CheckForSubscription(shouldHide, request);
+            return request;
+        }
+
         private static void FilterChildren(IEnumerable<TvRequests> allRequests, HideResult shouldHide)
         {
             // Filter out children
@@ -225,16 +264,27 @@ namespace Ombi.Core.Engine
             {
                 for (var j = 0; j < t.ChildRequests.Count; j++)
                 {
-                    var child = t.ChildRequests[j];
+                    FilterChildren(t, shouldHide);
-                    if (child.RequestedUserId != shouldHide.UserId)
-                    {
-                        t.ChildRequests.RemoveAt(j);
-                        j--;
-                    }
                 }
             }
         }
 
+        private static void FilterChildren(TvRequests t, HideResult shouldHide)
+        {
+            // Filter out children
+
+            for (var j = 0; j < t.ChildRequests.Count; j++)
+            {
+                var child = t.ChildRequests[j];
+                if (child.RequestedUserId != shouldHide.UserId)
+                {
+                    t.ChildRequests.RemoveAt(j);
+                    j--;
+                }
+            }
+
+        }
+
         public async Task<IEnumerable<ChildRequests>> GetAllChldren(int tvId)
         {
             var shouldHide = await HideFromOtherUsers();
@@ -470,7 +520,7 @@ namespace Ombi.Core.Engine
         {
             foreach (var tv in x.ChildRequests)
             {
-               await CheckForSubscription(shouldHide, tv);
+                await CheckForSubscription(shouldHide, tv);
             }
         }
 

src/Ombi.Schedule.Tests/PlexAvailabilityCheckerTests.cs

@@ -26,7 +26,7 @@ namespace Ombi.Schedule.Tests
             _tv = new Mock<ITvRequestRepository>();
             _movie = new Mock<IMovieRequestRepository>();
             _notify = new Mock<INotificationService>();
-            Checker = new PlexAvailabilityChecker(_repo.Object, _tv.Object, _movie.Object, _notify.Object, new Mock<IBackgroundJobClient>().Object);
+            Checker = new PlexAvailabilityChecker(_repo.Object, _tv.Object, _movie.Object, _notify.Object, new Mock<IBackgroundJobClient>().Object, null);
         }
 
 

src/Ombi.Store/Repository/Requests/ITvRequestRepository.cs

@@ -14,7 +14,9 @@ namespace Ombi.Store.Repository.Requests
         Task Delete(TvRequests request);
         Task DeleteChild(ChildRequests request);
         IQueryable<TvRequests> Get();
+        IQueryable<TvRequests> GetLite();
         IQueryable<TvRequests> Get(string userId);
+        IQueryable<TvRequests> GetLite(string userId);
         Task<TvRequests> GetRequestAsync(int tvDbId);
         TvRequests GetRequest(int tvDbId);
         Task Update(TvRequests request);

src/Ombi.Store/Repository/Requests/TvRequestRepository.cs

@@ -60,6 +60,24 @@ namespace Ombi.Store.Repository.Requests
                 .Where(x => x.ChildRequests.Any(a => a.RequestedUserId == userId))
                 .AsQueryable();
         }
+
+        public IQueryable<TvRequests> GetLite(string userId)
+        {
+            return Db.TvRequests
+                .Include(x => x.ChildRequests)
+                .ThenInclude(x => x.RequestedUser)
+                .Where(x => x.ChildRequests.Any(a => a.RequestedUserId == userId))
+                .AsQueryable();
+        }
+
+        public IQueryable<TvRequests> GetLite()
+        {
+            return Db.TvRequests
+                .Include(x => x.ChildRequests)
+                .ThenInclude(x => x.RequestedUser)
+                .AsQueryable();
+        }
+
         public IQueryable<ChildRequests> GetChild()
         {
             return Db.ChildRequests

src/Ombi/Controllers/RequestController.cs

@@ -204,6 +204,27 @@ namespace Ombi.Controllers
             return await TvRequestEngine.GetRequests();
         }
 
+        /// <summary>
+        /// Gets the tv requests without the whole object graph (Does not include seasons/episodes).
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("tvlite")]
+        public async Task<IEnumerable<TvRequests>> GetTvRequestsLite()
+        {
+            return await TvRequestEngine.GetRequestsLite();
+        }
+
+        /// <summary>
+        /// Returns the full request object for the specified requestId
+        /// </summary>
+        /// <param name="requestId"></param>
+        /// <returns></returns>
+        [HttpGet("tv/{requestId:int}")]
+        public async Task<TvRequests> GetTvRequest(int requestId)
+        {
+            return await TvRequestEngine.GetTvRequest(requestId);
+        }
+
         /// <summary>
         /// Requests a tv show/episode/season.
         /// </summary>

src/Ombi/appsettings.json

@@ -10,7 +10,6 @@
   },
   "ApplicationSettings": {
     "Verison": "{{VERSIONNUMBER}}",
-    "OmbiService": "https://ombiservice.azurewebsites.net/",
     "Branch": "{{BRANCH}}",
     "FriendlyVersion": "v3.0.0"
   },