github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-16 02:02:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: fixed stats controller (#4742)

Browse source
This commit is contained in:
Jamie 2022-08-23 20:35:20 +01:00 • committed by GitHub
parent c222f1a945
commit 47ea64b5a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/Ombi.Core/Engine/UserStatsEngine.cs
View file

@ -25,28 +25,29 @@ namespace Ombi.Core.Engine
{ {
// get all movie requests // get all movie requests
var movies = _movieRequest.GetWithUser(); var movies = _movieRequest.GetWithUser();
var filteredMovies = movies.Where(x => x.RequestedDate >= request.From && x.RequestedDate <= request.To); var filteredMovies = await movies.Where(x => x.RequestedDate >= request.From && x.RequestedDate <= request.To).ToListAsync();
var tv = _tvRequest.GetLite(); var tv = _tvRequest.GetLite();
var children = tv.SelectMany(x => var children = await tv.SelectMany(x =>
x.ChildRequests.Where(c => c.RequestedDate >= request.From && c.RequestedDate <= request.To)); x.ChildRequests.Where(c => c.RequestedDate >= request.From && c.RequestedDate <= request.To)).ToListAsync();
var userMovie = filteredMovies.GroupBy(x => x.RequestedUserId).OrderBy(x => x.Key).FirstOrDefault();
var userTv = children.GroupBy(x => x.RequestedUserId).OrderBy(x => x.Key).FirstOrDefault();
var userMovie = filteredMovies.GroupBy(x => x.RequestedUserId).OrderBy(x => x.Key).FirstOrDefaultAsync();
var userTv = children.GroupBy(x => x.RequestedUserId).OrderBy(x => x.Key).FirstOrDefaultAsync();
var moviesCount = filteredMovies.CountAsync(); var moviesCount = filteredMovies.Count;
var childrenCount = children.CountAsync(); var childrenCount = children.Count;
var availableMovies = var availableMovies =
filteredMovies.Select(x => x.MarkedAsAvailable >= request.From && x.MarkedAsAvailable <= request.To).CountAsync(); filteredMovies.Select(x => x.MarkedAsAvailable >= request.From && x.MarkedAsAvailable <= request.To).Count();
var availableChildren = children.Where(c => c.MarkedAsAvailable >= request.From && c.MarkedAsAvailable <= request.To).CountAsync(); var availableChildren = children.Where(c => c.MarkedAsAvailable >= request.From && c.MarkedAsAvailable <= request.To).Count();
return new UserStatsSummary return new UserStatsSummary
{ {
TotalMovieRequests = await moviesCount, TotalMovieRequests = moviesCount,
TotalTvRequests = await childrenCount, TotalTvRequests = childrenCount,
CompletedRequestsTv = await availableChildren, CompletedRequestsTv = availableChildren,
CompletedRequestsMovies = await availableMovies, CompletedRequestsMovies = availableMovies,
MostRequestedUserMovie = (await userMovie).FirstOrDefault()?.RequestedUser ?? new OmbiUser(), MostRequestedUserMovie = userMovie.FirstOrDefault()?.RequestedUser ?? new OmbiUser(),
MostRequestedUserTv = (await userTv).FirstOrDefault()?.RequestedUser ?? new OmbiUser(), MostRequestedUserTv = userTv.FirstOrDefault()?.RequestedUser ?? new OmbiUser(),
}; };
} }
} }

2
src/Ombi/Controllers/V1/StatsController.cs
View file

@ -21,7 +21,7 @@ namespace Ombi.Controllers.V1
private readonly IUserStatsEngine _statsEngine; private readonly IUserStatsEngine _statsEngine;
[HttpGet] [HttpGet]
public async Task<UserStatsSummary> GetUserStats(SummaryRequest req) public async Task<UserStatsSummary> GetUserStats([FromQuery]SummaryRequest req)
{ {
return await _statsEngine.GetSummary(req); return await _statsEngine.GetSummary(req);
} }