Fixed the multiple notifications (I think)

src/Ombi.Schedule/Jobs/Plex/Models/AvailabilityModel.cs

@@ -0,0 +1,10 @@
+using Ombi.Store.Entities;
+
+namespace Ombi.Schedule.Jobs.Plex.Models
+{
+    public class AvailabilityModel
+    {
+        public int Id { get; set; }
+        public string RequestedUser { get; set; }
+    }
+}

src/Ombi.Schedule/Jobs/Plex/PlexAvailabilityChecker.cs

@@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging;
 using Ombi.Core.Notifications;
 using Ombi.Helpers;
 using Ombi.Notifications.Models;
+using Ombi.Schedule.Jobs.Plex.Models;
 using Ombi.Store.Entities;
 using Ombi.Store.Entities.Requests;
 using Ombi.Store.Repository;
@@ -99,6 +100,7 @@ namespace Ombi.Schedule.Jobs.Plex
 
                 }
 
+                var availableEpisode = new List<AvailabilityModel>();
                 foreach (var season in child.SeasonRequests)
                 {
                     foreach (var episode in season.Episodes)
@@ -113,19 +115,28 @@ namespace Ombi.Schedule.Jobs.Plex
 
                         if (foundEp != null)
                         {
+                            availableEpisode.Add(new AvailabilityModel
+                            {
+                                Id = episode.Id
+                            });
                             episode.Available = true;
                         }
                     }
                 }
 
+                //TODO Partial avilability notifications here
+                foreach(var c in availableEpisode)
+                {
+                    await _tvRepo.MarkEpisodeAsAvailable(c.Id);
+                }
+                
                 // Check to see if all of the episodes in all seasons are available for this request
                 var allAvailable = child.SeasonRequests.All(x => x.Episodes.All(c => c.Available));
                 if (allAvailable)
                 {
                     _log.LogInformation("[PAC] - Child request {0} is now available, sending notification", $"{child.Title} - {child.Id}");
                     // We have ful-fulled this request!
-                    child.Available = true;
-                    child.MarkedAsAvailable = DateTime.Now;
+                    await _tvRepo.MarkChildAsAvailable(child.Id);
                     await _notificationService.Publish(new NotificationOptions
                     {
                         DateTime = DateTime.Now,
@@ -144,9 +155,15 @@ namespace Ombi.Schedule.Jobs.Plex
         {
             // Get all non available
             var movies = _movieRepo.GetAll().Include(x => x.RequestedUser).Where(x => !x.Available);
+            var itemsForAvailbility = new List<AvailabilityModel>();
 
             foreach (var movie in movies)
             {
+                if (movie.Available)
+                {
+                    return;
+                }
+
                 PlexServerContent item = null;
                 if (movie.ImdbId.HasValue())
                 {
@@ -164,24 +181,29 @@ namespace Ombi.Schedule.Jobs.Plex
                     // We don't yet have this
                     continue;
                 }
+                
+                _log.LogInformation("[PAC] - Movie request {0} is now available, sending notification", $"{movie.Title} - {movie.Id}");
+                itemsForAvailbility.Add(new AvailabilityModel
+                {
+                    Id = movie.Id,
+                    RequestedUser = movie.RequestedUser != null ? movie.RequestedUser.Email : string.Empty
+                });
+            }
 
-                movie.Available = true;
-                movie.MarkedAsAvailable = DateTime.Now;
-                item.RequestId = movie.Id;
+            foreach (var i in itemsForAvailbility)
+            {
+                await _movieRepo.MarkAsAvailable(i.Id);
 
-                _log.LogInformation("[PAC] - Movie request {0} is now available, sending notification", $"{movie.Title} - {movie.Id}");
                 await _notificationService.Publish(new NotificationOptions
                 {
                     DateTime = DateTime.Now,
                     NotificationType = NotificationType.RequestAvailable,
-                    RequestId = movie.Id,
+                    RequestId = i.Id,
                     RequestType = RequestType.Movie,
-                    Recipient = movie.RequestedUser != null ? movie.RequestedUser.Email : string.Empty
+                    Recipient = i.RequestedUser
                 });
-
             }
 
-            await _movieRepo.Save();
             await _repo.SaveChangesAsync();
         }
 

src/Ombi.Store/Context/IOmbiContext.cs

@@ -6,6 +6,7 @@ using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Ombi.Store.Entities;
 using Ombi.Store.Entities.Requests;
+using Ombi.Store.Repository.Requests;
 
 namespace Ombi.Store.Context
 {
@@ -27,6 +28,7 @@ namespace Ombi.Store.Context
         DbSet<AlbumRequest> AlbumRequests { get; set; }
         DbSet<TvRequests> TvRequests { get; set; }
         DbSet<ChildRequests> ChildRequests { get; set; }
+        DbSet<EpisodeRequests> EpisodeRequests { get; set; }
         DbSet<Issues> Issues { get; set; }
         DbSet<IssueCategory> IssueCategories { get; set; }
         DbSet<Tokens> Tokens { get; set; }

src/Ombi.Store/Context/OmbiContext.cs

@@ -7,6 +7,7 @@ using Microsoft.EntityFrameworkCore;
 using Ombi.Helpers;
 using Ombi.Store.Entities;
 using Ombi.Store.Entities.Requests;
+using Ombi.Store.Repository.Requests;
 
 namespace Ombi.Store.Context
 {
@@ -38,6 +39,7 @@ namespace Ombi.Store.Context
         public DbSet<AlbumRequest> AlbumRequests { get; set; }
         public DbSet<TvRequests> TvRequests { get; set; }
         public DbSet<ChildRequests> ChildRequests { get; set; }
+        public DbSet<EpisodeRequests> EpisodeRequests { get; set; }
 
         public DbSet<Issues> Issues { get; set; }
         public DbSet<IssueCategory> IssueCategories { get; set; }

src/Ombi.Store/Repository/Requests/IMovieRequestRepository.cs

@@ -10,6 +10,7 @@ namespace Ombi.Store.Repository.Requests
         MovieRequests GetRequest(int theMovieDbId);
         Task Update(MovieRequests request);
         Task Save();
+        Task MarkAsAvailable(int id);
         IQueryable<MovieRequests> GetWithUser();
         IQueryable<MovieRequests> GetWithUser(string userId);
         IQueryable<MovieRequests> GetAll(string userId);

src/Ombi.Store/Repository/Requests/ITvRequestRepository.cs

@@ -23,6 +23,8 @@ namespace Ombi.Store.Repository.Requests
         Task UpdateChild(ChildRequests request);
         IQueryable<ChildRequests> GetChild();
         IQueryable<ChildRequests> GetChild(string userId);
+        Task MarkEpisodeAsAvailable(int id);
+        Task MarkChildAsAvailable(int id);
         Task Save();
         Task DeleteChildRange(IEnumerable<ChildRequests> request);
     }

src/Ombi.Store/Repository/Requests/MovieRequestRepository.cs

@@ -54,6 +54,14 @@ namespace Ombi.Store.Repository.Requests
                 .AsQueryable();
         }
 
+        public async Task MarkAsAvailable(int id)
+        {
+            var movieRequest = new MovieRequests{ Id = id, Available = true, MarkedAsAvailable = DateTime.UtcNow};
+            var attached = Db.MovieRequests.Attach(movieRequest);
+            attached.Property(x => x.Available).IsModified = true;
+            attached.Property(x => x.MarkedAsAvailable).IsModified = true;
+            await Db.SaveChangesAsync();
+        }
 
         public IQueryable<MovieRequests> GetWithUser(string userId)
         {

src/Ombi.Store/Repository/Requests/TvRequestRepository.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
@@ -100,6 +101,23 @@ namespace Ombi.Store.Repository.Requests
                 .AsQueryable();
         }
 
+        public async Task MarkChildAsAvailable(int id)
+        {
+            var request = new ChildRequests { Id = id, Available = true, MarkedAsAvailable = DateTime.UtcNow };
+            var attached = Db.ChildRequests.Attach(request);
+            attached.Property(x => x.Available).IsModified = true;
+            attached.Property(x => x.MarkedAsAvailable).IsModified = true;
+            await Db.SaveChangesAsync();
+        }
+
+        public async Task MarkEpisodeAsAvailable(int id)
+        {
+            var request = new EpisodeRequests { Id = id, Available = true };
+            var attached = Db.EpisodeRequests.Attach(request);
+            attached.Property(x => x.Available).IsModified = true;
+            await Db.SaveChangesAsync();
+        }
+
         public async Task Save()
         {
             await InternalSaveChanges();
@@ -141,10 +159,10 @@ namespace Ombi.Store.Repository.Requests
         public async Task Update(TvRequests request)
         {
             Db.Update(request);
-            
+
             await InternalSaveChanges();
         }
-        
+
         public async Task UpdateChild(ChildRequests request)
         {
             Db.Update(request);