feat(notifications): Add more curly variables for partially available…

… notification * feat: Add more curly variables for partially available notification * test: Fix newly added test
Ombi-app · Sep 7, 2022 · 66aa101 · 66aa101
1 parent 29fb614
commit 66aa101
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 1 deletion.
diff --git a/src/Ombi.Notifications.Tests/NotificationMessageCurlysTests.cs b/src/Ombi.Notifications.Tests/NotificationMessageCurlysTests.cs
@@ -292,6 +292,8 @@ public void TvNotificationPartialAvailablilityTests()
 
             notificationOptions.Substitutes.Add("Season", "1");
             notificationOptions.Substitutes.Add("Episodes", "1, 2");
+            notificationOptions.Substitutes.Add("EpisodesCount", "2");
+            notificationOptions.Substitutes.Add("SeasonEpisodes", "1x1, 1x2");
             var req = F.Build<ChildRequests>()
                 .With(x => x.RequestType, RequestType.TvShow)
                 .With(x => x.Available, true)
@@ -324,6 +326,8 @@ public void TvNotificationPartialAvailablilityTests()
             Assert.That("name", Is.EqualTo(sut.ApplicationName));
             Assert.That(sut.PartiallyAvailableEpisodeNumbers, Is.EqualTo("1, 2"));
             Assert.That(sut.PartiallyAvailableSeasonNumber, Is.EqualTo("1"));
+            Assert.That(sut.PartiallyAvailableEpisodeCount, Is.EqualTo("2"));
+            Assert.That(sut.PartiallyAvailableEpisodesList, Is.EqualTo("1x1, 1x2"));
         }
 
         [Test]

diff --git a/src/Ombi.Notifications/NotificationMessageCurlys.cs b/src/Ombi.Notifications/NotificationMessageCurlys.cs
@@ -186,6 +186,14 @@ private void LoadCommon(BaseRequest req, CustomizationSettings s, UserNotificati
                 {
                     PartiallyAvailableEpisodeNumbers = epNumber;
                 }
+                if (opts.Substitutes.TryGetValue("EpisodesCount", out var epCount))
+                {
+                    PartiallyAvailableEpisodeCount = epCount;
+                }
+                if (opts.Substitutes.TryGetValue("SeasonEpisodes", out var sEpisodes))
+                {
+                    PartiallyAvailableEpisodesList = sEpisodes;
+                }
             }
         }
 
@@ -295,6 +303,8 @@ private void CalculateRequestStatus(BaseRequest req)
         public string ProviderId { get; set; }
         public string PartiallyAvailableEpisodeNumbers { get; set; }
         public string PartiallyAvailableSeasonNumber { get; set; }
+        public string PartiallyAvailableEpisodeCount { get; set; }
+        public string PartiallyAvailableEpisodesList { get; set; }
 
         // System Defined
         private string LongDate => DateTime.Now.ToString("D");
@@ -336,6 +346,8 @@ private void CalculateRequestStatus(BaseRequest req)
             { nameof(ProviderId), ProviderId },
             { nameof(PartiallyAvailableEpisodeNumbers), PartiallyAvailableEpisodeNumbers },
             { nameof(PartiallyAvailableSeasonNumber), PartiallyAvailableSeasonNumber },
+            { nameof(PartiallyAvailableEpisodesList), PartiallyAvailableEpisodesList },
+            { nameof(PartiallyAvailableEpisodeCount), PartiallyAvailableEpisodeCount },
         };
     }
 }
diff --git a/src/Ombi.Schedule/Jobs/ArrAvailabilityChecker.cs b/src/Ombi.Schedule/Jobs/ArrAvailabilityChecker.cs
@@ -212,6 +212,8 @@ await _hub.Clients.Clients(NotificationHub.AdminConnectionIds)
                     };
                     notification.Substitutes.Add("Season", availableEpisode.First().SeasonNumber.ToString());
                     notification.Substitutes.Add("Episodes", string.Join(", ", availableEpisode.Select(x => x.EpisodeNumber)));
+                    notification.Substitutes.Add("EpisodesCount", $"{availableEpisode.Count}");
+                    notification.Substitutes.Add("SeasonEpisodes", string.Join(", ", availableEpisode.Select(x => $"{x.SeasonNumber}x{x.EpisodeNumber}" )));
                     await _notification.Notify(notification);
                 }
             }

diff --git a/src/Ombi.Schedule/Jobs/Emby/EmbyAvaliabilityChecker.cs b/src/Ombi.Schedule/Jobs/Emby/EmbyAvaliabilityChecker.cs
@@ -227,6 +227,8 @@ private async Task ProcessTv()
                     };
                     notification.Substitutes.Add("Season", availableEpisode.First().SeasonNumber.ToString());
                     notification.Substitutes.Add("Episodes", string.Join(", ", availableEpisode.Select(x => x.EpisodeNumber)));
+                    notification.Substitutes.Add("EpisodesCount", $"{availableEpisode.Count}");
+                    notification.Substitutes.Add("SeasonEpisodes", string.Join(", ", availableEpisode.Select(x => $"{x.SeasonNumber}x{x.EpisodeNumber}" )));
                     await _notificationService.Notify(notification);
                 }
             }

diff --git a/src/Ombi.Schedule/Jobs/Jellyfin/JellyfinAvaliabilityChecker.cs b/src/Ombi.Schedule/Jobs/Jellyfin/JellyfinAvaliabilityChecker.cs
@@ -253,6 +253,8 @@ private async Task ProcessTv()
                     };
                     notification.Substitutes.Add("Season", availableEpisode.First().SeasonNumber.ToString());
                     notification.Substitutes.Add("Episodes", string.Join(", ", availableEpisode.Select(x => x.EpisodeNumber)));
+                    notification.Substitutes.Add("EpisodesCount", $"{availableEpisode.Count}");
+                    notification.Substitutes.Add("SeasonEpisodes", string.Join(", ", availableEpisode.Select(x => $"{x.SeasonNumber}x{x.EpisodeNumber}" )));
                     await _notificationService.Notify(notification);
                 }
             }

diff --git a/src/Ombi.Schedule/Jobs/Plex/PlexAvailabilityChecker.cs b/src/Ombi.Schedule/Jobs/Plex/PlexAvailabilityChecker.cs
@@ -174,6 +174,8 @@ private async Task ProcessTv(List<ChildRequests> tv)
                     };
                     notification.Substitutes.Add("Season", availableEpisode.First().SeasonNumber.ToString());
                     notification.Substitutes.Add("Episodes", string.Join(", " ,availableEpisode.Select(x => x.EpisodeNumber)));
+                    notification.Substitutes.Add("EpisodesCount", $"{availableEpisode.Count}");
+                    notification.Substitutes.Add("SeasonEpisodes", string.Join(", ", availableEpisode.Select(x => $"{x.SeasonNumber}x{x.EpisodeNumber}" )));
                     await _notificationService.Notify(notification);
                 }
             }

diff --git a/src/Ombi.Store/Context/OmbiContext.cs b/src/Ombi.Store/Context/OmbiContext.cs
@@ -213,7 +213,7 @@ public void Seed()
                             notificationToAdd = new NotificationTemplates
                             {
                                 NotificationType = notificationType,
-                                Message = "Your TV request for {Title} is now partially available! Season {PartiallyAvailableSeasonNumber} Episodes {PartiallyAvailableEpisodeNumbers}!",
+                                Message = "Your TV request for {Title} is now partially available! Episodes {PartiallyAvailableEpisodesList}!",
                                 Subject = "{ApplicationName}: Partially Available Request!",
                                 Agent = agent,
                                 Enabled = true,