From ed018a8bea89f4a19dbfca2e21eb7207df2db332 Mon Sep 17 00:00:00 2001 From: LukePulverenti Luke Pulverenti luke pulverenti Date: Fri, 17 Aug 2012 13:37:26 -0400 Subject: Moved some logic into domain entities, which is possible now that we're embracing DTO's --- MediaBrowser.Api/HttpHandlers/GenresHandler.cs | 5 ++++- MediaBrowser.Api/HttpHandlers/ItemListHandler.cs | 17 ++++++++++------- MediaBrowser.Api/HttpHandlers/StudiosHandler.cs | 7 +++++-- MediaBrowser.Api/HttpHandlers/YearsHandler.cs | 5 ++++- 4 files changed, 23 insertions(+), 11 deletions(-) (limited to 'MediaBrowser.Api/HttpHandlers') diff --git a/MediaBrowser.Api/HttpHandlers/GenresHandler.cs b/MediaBrowser.Api/HttpHandlers/GenresHandler.cs index 902871fa11..dd20d2e426 100644 --- a/MediaBrowser.Api/HttpHandlers/GenresHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/GenresHandler.cs @@ -1,9 +1,11 @@ using System; using System.Collections.Generic; +using System.Linq; using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; using MediaBrowser.Model.DTO; using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Users; namespace MediaBrowser.Api.HttpHandlers { @@ -13,8 +15,9 @@ namespace MediaBrowser.Api.HttpHandlers { Folder parent = ApiService.GetItemById(QueryString["id"]) as Folder; Guid userId = Guid.Parse(QueryString["userid"]); + User user = Kernel.Instance.Users.First(u => u.Id == userId); - return Kernel.Instance.GetAllGenres(parent, userId); + return Kernel.Instance.GetAllGenres(parent, user); } } } diff --git a/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs b/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs index b3d85687fe..b4c13540c8 100644 --- a/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs @@ -5,6 +5,7 @@ using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; using MediaBrowser.Model.DTO; using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Users; namespace MediaBrowser.Api.HttpHandlers { @@ -24,34 +25,36 @@ namespace MediaBrowser.Api.HttpHandlers get { Folder parent = ApiService.GetItemById(ItemId) as Folder; + + User user = Kernel.Instance.Users.First(u => u.Id == UserId); if (ListType.Equals("inprogressitems", StringComparison.OrdinalIgnoreCase)) { - return Kernel.Instance.GetInProgressItems(parent, UserId); + return parent.GetInProgressItems(user); } else if (ListType.Equals("recentlyaddeditems", StringComparison.OrdinalIgnoreCase)) { - return Kernel.Instance.GetRecentlyAddedItems(parent, UserId); + return parent.GetRecentlyAddedItems(user); } else if (ListType.Equals("recentlyaddedunplayeditems", StringComparison.OrdinalIgnoreCase)) { - return Kernel.Instance.GetRecentlyAddedUnplayedItems(parent, UserId); + return parent.GetRecentlyAddedUnplayedItems(user); } else if (ListType.Equals("itemswithgenre", StringComparison.OrdinalIgnoreCase)) { - return Kernel.Instance.GetItemsWithGenre(parent, QueryString["name"], UserId); + return parent.GetItemsWithGenre(QueryString["name"], user); } else if (ListType.Equals("itemswithyear", StringComparison.OrdinalIgnoreCase)) { - return Kernel.Instance.GetItemsWithYear(parent, int.Parse(QueryString["year"]), UserId); + return parent.GetItemsWithYear(int.Parse(QueryString["year"]), user); } else if (ListType.Equals("itemswithstudio", StringComparison.OrdinalIgnoreCase)) { - return Kernel.Instance.GetItemsWithStudio(parent, QueryString["name"], UserId); + return parent.GetItemsWithStudio(QueryString["name"], user); } else if (ListType.Equals("itemswithperson", StringComparison.OrdinalIgnoreCase)) { - return Kernel.Instance.GetItemsWithPerson(parent, QueryString["name"], UserId); + return parent.GetItemsWithPerson(QueryString["name"], null, user); } throw new InvalidOperationException(); diff --git a/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs b/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs index b33988b3ec..ffd69006d3 100644 --- a/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs @@ -1,9 +1,11 @@ using System; using System.Collections.Generic; +using System.Linq; using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; using MediaBrowser.Model.DTO; using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Users; namespace MediaBrowser.Api.HttpHandlers { @@ -13,8 +15,9 @@ namespace MediaBrowser.Api.HttpHandlers { Folder parent = ApiService.GetItemById(QueryString["id"]) as Folder; Guid userId = Guid.Parse(QueryString["userid"]); - - return Kernel.Instance.GetAllStudios(parent, userId); + User user = Kernel.Instance.Users.First(u => u.Id == userId); + + return Kernel.Instance.GetAllStudios(parent, user); } } } diff --git a/MediaBrowser.Api/HttpHandlers/YearsHandler.cs b/MediaBrowser.Api/HttpHandlers/YearsHandler.cs index 8a58a2a19d..801244b0da 100644 --- a/MediaBrowser.Api/HttpHandlers/YearsHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/YearsHandler.cs @@ -1,9 +1,11 @@ using System; using System.Collections.Generic; +using System.Linq; using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; using MediaBrowser.Model.DTO; using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Users; namespace MediaBrowser.Api.HttpHandlers { @@ -13,8 +15,9 @@ namespace MediaBrowser.Api.HttpHandlers { Folder parent = ApiService.GetItemById(QueryString["id"]) as Folder; Guid userId = Guid.Parse(QueryString["userid"]); + User user = Kernel.Instance.Users.First(u => u.Id == userId); - return Kernel.Instance.GetAllYears(parent, userId); + return Kernel.Instance.GetAllYears(parent, user); } } } -- cgit v1.2.3