github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-22 14:13:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Expose played state according to hide requests setting

Browse source
This commit is contained in:
sephrat 2023-03-11 17:27:11 +01:00
commit 5e28f52d23
1 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/Ombi.Core/Engine/MovieRequestEngine.cs
View file

@ -255,7 +255,7 @@ namespace Ombi.Core.Engine
var requests = await (OrderMovies(allRequests, orderFilter.OrderType)).Skip(position).Take(count) var requests = await (OrderMovies(allRequests, orderFilter.OrderType)).Skip(position).Take(count)
.ToListAsync(); .ToListAsync();
await FillAdditionalFields(shouldHide.UserId, requests); await FillAdditionalFields(shouldHide, requests);
return new RequestsViewModel<MovieRequests> return new RequestsViewModel<MovieRequests>
{ {
Collection = requests, Collection = requests,
@ -299,7 +299,7 @@ namespace Ombi.Core.Engine
var total = requests.Count(); var total = requests.Count();
requests = requests.Skip(position).Take(count).ToList(); requests = requests.Skip(position).Take(count).ToList();
await FillAdditionalFields(shouldHide.UserId, requests); await FillAdditionalFields(shouldHide, requests);
return new RequestsViewModel<MovieRequests> return new RequestsViewModel<MovieRequests>
{ {
Collection = requests, Collection = requests,
@ -384,7 +384,7 @@ namespace Ombi.Core.Engine
// TODO fix this so we execute this on the server // TODO fix this so we execute this on the server
requests = requests.Skip(position).Take(count).ToList(); requests = requests.Skip(position).Take(count).ToList();
await FillAdditionalFields(shouldHide.UserId, requests); await FillAdditionalFields(shouldHide, requests);
return new RequestsViewModel<MovieRequests> return new RequestsViewModel<MovieRequests>
{ {
Collection = requests, Collection = requests,
@ -427,7 +427,7 @@ namespace Ombi.Core.Engine
var total = requests.Count(); var total = requests.Count();
requests = requests.Skip(position).Take(count).ToList(); requests = requests.Skip(position).Take(count).ToList();
await FillAdditionalFields(shouldHide.UserId, requests); await FillAdditionalFields(shouldHide, requests);
return new RequestsViewModel<MovieRequests> return new RequestsViewModel<MovieRequests>
{ {
Collection = requests, Collection = requests,
@ -509,22 +509,24 @@ namespace Ombi.Core.Engine
allRequests = await MovieRepository.GetWithUser().ToListAsync(); allRequests = await MovieRepository.GetWithUser().ToListAsync();
} }
await FillAdditionalFields(shouldHide.UserId, allRequests); await FillAdditionalFields(shouldHide, allRequests);
return allRequests; return allRequests;
} }
public async Task<MovieRequests> GetRequest(int requestId) public async Task<MovieRequests> GetRequest(int requestId)
{ {
var shouldHide = await HideFromOtherUsers();
// TODO: this query should return the request only if the user is allowed to see it (see shouldHide implementations)
var request = await MovieRepository.GetWithUser().Where(x => x.Id == requestId).FirstOrDefaultAsync(); var request = await MovieRepository.GetWithUser().Where(x => x.Id == requestId).FirstOrDefaultAsync();
await FillAdditionalFields((await GetUser()).Id, new List<MovieRequests> { request }); await FillAdditionalFields(shouldHide, new List<MovieRequests> { request });
return request; return request;
} }
private async Task FillAdditionalFields(string UserId, List<MovieRequests> requests) private async Task FillAdditionalFields(HideResult shouldHide, List<MovieRequests> requests)
{ {
await CheckForSubscription(UserId, requests); await CheckForSubscription(shouldHide.UserId, requests);
await CheckForPlayed(requests); await CheckForPlayed(shouldHide, requests);
} }
private async Task CheckForSubscription(string UserId, List<MovieRequests> movieRequests) private async Task CheckForSubscription(string UserId, List<MovieRequests> movieRequests)
@ -552,7 +554,7 @@ namespace Ombi.Core.Engine
} }
} }
private async Task CheckForPlayed(List<MovieRequests> movieRequests) private async Task CheckForPlayed(HideResult shouldHide, List<MovieRequests> movieRequests)
{ {
var theMovieDbIds = movieRequests.Select(x => x.TheMovieDbId); var theMovieDbIds = movieRequests.Select(x => x.TheMovieDbId);
var plays = await _userPlayedMovieRepository.GetAll().Where(x => var plays = await _userPlayedMovieRepository.GetAll().Where(x =>
@ -561,9 +563,13 @@ namespace Ombi.Core.Engine
foreach (var request in movieRequests) foreach (var request in movieRequests)
{ {
request.WatchedByRequestedUser = plays.Exists(x => x.TheMovieDbId == request.TheMovieDbId && x.UserId == request.RequestedUserId); request.WatchedByRequestedUser = plays.Exists(x => x.TheMovieDbId == request.TheMovieDbId && x.UserId == request.RequestedUserId);
if (!shouldHide.Hide)
{
request.PlayedByUsersCount = plays.Count(x => x.TheMovieDbId == request.TheMovieDbId); request.PlayedByUsersCount = plays.Count(x => x.TheMovieDbId == request.TheMovieDbId);
} }
} }
}
/// <summary> /// <summary>
/// Searches the movie request. /// Searches the movie request.
@ -584,7 +590,7 @@ namespace Ombi.Core.Engine
} }
var results = allRequests.Where(x => x.Title.Contains(search, CompareOptions.IgnoreCase)).ToList(); var results = allRequests.Where(x => x.Title.Contains(search, CompareOptions.IgnoreCase)).ToList();
await FillAdditionalFields(shouldHide.UserId, results); await FillAdditionalFields(shouldHide, results);
return results; return results;
} }