From 9670738a5299f0cccc3a31603db23b82b9e87b54 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 9 Mar 2021 08:43:32 +0000 Subject: [PATCH] Fixed an error with the retry queue when the request has been removed --- .../Jobs/Ombi/ResendFailedRequests.cs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/Ombi.Schedule/Jobs/Ombi/ResendFailedRequests.cs b/src/Ombi.Schedule/Jobs/Ombi/ResendFailedRequests.cs index 0072ec010..3a9a75835 100644 --- a/src/Ombi.Schedule/Jobs/Ombi/ResendFailedRequests.cs +++ b/src/Ombi.Schedule/Jobs/Ombi/ResendFailedRequests.cs @@ -43,6 +43,12 @@ namespace Ombi.Schedule.Jobs.Ombi if (request.Type == RequestType.Movie) { var movieRequest = await _movieRequestRepository.GetAll().FirstOrDefaultAsync(x => x.Id == request.RequestId); + if (movieRequest == null) + { + await _requestQueue.Delete(request); + await _requestQueue.SaveChangesAsync(); + continue; + } var result = await _movieSender.Send(movieRequest); if (result.Success) { @@ -53,6 +59,12 @@ namespace Ombi.Schedule.Jobs.Ombi if (request.Type == RequestType.TvShow) { var tvRequest = await _tvRequestRepository.GetChild().FirstOrDefaultAsync(x => x.Id == request.RequestId); + if (tvRequest == null) + { + await _requestQueue.Delete(request); + await _requestQueue.SaveChangesAsync(); + continue; + } var result = await _tvSender.Send(tvRequest); if (result.Success) { @@ -63,6 +75,12 @@ namespace Ombi.Schedule.Jobs.Ombi if (request.Type == RequestType.Album) { var musicRequest = await _musicRequestRepository.GetAll().FirstOrDefaultAsync(x => x.Id == request.RequestId); + if (musicRequest == null) + { + await _requestQueue.Delete(request); + await _requestQueue.SaveChangesAsync(); + continue; + } var result = await _musicSender.Send(musicRequest); if (result.Success) {