Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Series/season history loading 

Closes #5286
This commit is contained in:
Mark McDowall 2022-12-09 20:40:51 -08:00
parent b3959e3162
commit be02d0ebf7
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Sonarr.Api.V3/History/HistoryController.cs
View File

@ -7,6 +7,7 @@ using NzbDrone.Core.Datastore;
using NzbDrone.Core.DecisionEngine.Specifications; using NzbDrone.Core.DecisionEngine.Specifications;
using NzbDrone.Core.Download; using NzbDrone.Core.Download;
using NzbDrone.Core.History; using NzbDrone.Core.History;
using NzbDrone.Core.Tv;
using Sonarr.Api.V3.Episodes; using Sonarr.Api.V3.Episodes;
using Sonarr.Api.V3.Series; using Sonarr.Api.V3.Series;
using Sonarr.Http; using Sonarr.Http;
@ -21,16 +22,19 @@ namespace Sonarr.Api.V3.History
private readonly ICustomFormatCalculationService _formatCalculator; private readonly ICustomFormatCalculationService _formatCalculator;
private readonly IUpgradableSpecification _upgradableSpecification; private readonly IUpgradableSpecification _upgradableSpecification;
private readonly IFailedDownloadService _failedDownloadService; private readonly IFailedDownloadService _failedDownloadService;
private readonly ISeriesService _seriesService;
public HistoryController(IHistoryService historyService, public HistoryController(IHistoryService historyService,
ICustomFormatCalculationService formatCalculator, ICustomFormatCalculationService formatCalculator,
IUpgradableSpecification upgradableSpecification, IUpgradableSpecification upgradableSpecification,
IFailedDownloadService failedDownloadService) IFailedDownloadService failedDownloadService,
ISeriesService seriesService)
{ {
_historyService = historyService; _historyService = historyService;
_formatCalculator = formatCalculator; _formatCalculator = formatCalculator;
_upgradableSpecification = upgradableSpecification; _upgradableSpecification = upgradableSpecification;
_failedDownloadService = failedDownloadService; _failedDownloadService = failedDownloadService;
_seriesService = seriesService;
} }
protected HistoryResource MapToResource(EpisodeHistory model, bool includeSeries, bool includeEpisode) protected HistoryResource MapToResource(EpisodeHistory model, bool includeSeries, bool includeEpisode)
@ -98,12 +102,24 @@ namespace Sonarr.Api.V3.History
[Produces("application/json")] [Produces("application/json")]
public List<HistoryResource> GetSeriesHistory(int seriesId, int? seasonNumber, EpisodeHistoryEventType? eventType = null, bool includeSeries = false, bool includeEpisode = false) public List<HistoryResource> GetSeriesHistory(int seriesId, int? seasonNumber, EpisodeHistoryEventType? eventType = null, bool includeSeries = false, bool includeEpisode = false)
{ {
var series = _seriesService.GetSeries(seriesId);
if (seasonNumber.HasValue) if (seasonNumber.HasValue)
{ {
return _historyService.GetBySeason(seriesId, seasonNumber.Value, eventType).Select(h => MapToResource(h, includeSeries, includeEpisode)).ToList(); return _historyService.GetBySeason(seriesId, seasonNumber.Value, eventType).Select(h =>
{
h.Series = series;
return MapToResource(h, includeSeries, includeEpisode);
}).ToList();
} }
return _historyService.GetBySeries(seriesId, eventType).Select(h => MapToResource(h, includeSeries, includeEpisode)).ToList(); return _historyService.GetBySeries(seriesId, eventType).Select(h =>
{
h.Series = series;
return MapToResource(h, includeSeries, includeEpisode);
}).ToList();
} }
[HttpPost("failed/{id}")] [HttpPost("failed/{id}")]