github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-19 21:03:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

#96 modify notifications interface/service to accept a non-type specific settings object.

Browse source
This commit is contained in:
Drewster727 2016-03-28 13:27:10 -05:00
commit 45208e528f
6 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PlexRequests.Services/Interfaces/INotification.cs
View file

@ -37,6 +37,6 @@ namespace PlexRequests.Services.Interfaces
Task NotifyAsync(NotificationModel model); Task NotifyAsync(NotificationModel model);
Task NotifyAsync(NotificationModel model, EmailNotificationSettings settings); Task NotifyAsync(NotificationModel model, Settings settings);
} }
} }

2
PlexRequests.Services/Interfaces/INotificationService.cs
View file

@ -34,7 +34,7 @@ namespace PlexRequests.Services.Interfaces
public interface INotificationService public interface INotificationService
{ {
Task Publish(NotificationModel model); Task Publish(NotificationModel model);
Task Publish(NotificationModel model, EmailNotificationSettings settings); Task Publish(NotificationModel model, Settings settings);
void Subscribe(INotification notification); void Subscribe(INotification notification);
void UnSubscribe(INotification notification); void UnSubscribe(INotification notification);

12
PlexRequests.Services/Notification/EmailMessageNotification.cs
View file

@ -54,11 +54,13 @@ namespace PlexRequests.Services.Notification
await NotifyAsync(model, configuration); await NotifyAsync(model, configuration);
} }
public async Task NotifyAsync(NotificationModel model, EmailNotificationSettings settings) public async Task NotifyAsync(NotificationModel model, Settings settings)
{ {
if (settings == null) await NotifyAsync(model); if (settings == null) await NotifyAsync(model);
if (!ValidateConfiguration(settings)) var emailSettings = (EmailNotificationSettings)settings;
if (!ValidateConfiguration(emailSettings))
{ {
return; return;
} }
@ -66,10 +68,10 @@ namespace PlexRequests.Services.Notification
switch (model.NotificationType) switch (model.NotificationType)
{ {
case NotificationType.NewRequest: case NotificationType.NewRequest:
await EmailNewRequest(model, settings); await EmailNewRequest(model, emailSettings);
break; break;
case NotificationType.Issue: case NotificationType.Issue:
await EmailIssue(model, settings); await EmailIssue(model, emailSettings);
break; break;
case NotificationType.RequestAvailable: case NotificationType.RequestAvailable:
throw new NotImplementedException(); throw new NotImplementedException();
@ -81,7 +83,7 @@ namespace PlexRequests.Services.Notification
throw new NotImplementedException(); throw new NotImplementedException();
case NotificationType.Test: case NotificationType.Test:
await EmailTest(model, settings); await EmailTest(model, emailSettings);
break; break;
default: default:

4
PlexRequests.Services/Notification/NotificationService.cs
View file

@ -48,7 +48,7 @@ namespace PlexRequests.Services.Notification
await Task.WhenAll(notificationTasks).ConfigureAwait(false); await Task.WhenAll(notificationTasks).ConfigureAwait(false);
} }
public async Task Publish(NotificationModel model, EmailNotificationSettings settings) public async Task Publish(NotificationModel model, Settings settings)
{ {
var notificationTasks = Observers.Values.Select(notification => NotifyAsync(notification, model, settings)); var notificationTasks = Observers.Values.Select(notification => NotifyAsync(notification, model, settings));
@ -72,7 +72,7 @@ namespace PlexRequests.Services.Notification
} }
private static async Task NotifyAsync(INotification notification, NotificationModel model, EmailNotificationSettings settings) private static async Task NotifyAsync(INotification notification, NotificationModel model, Settings settings)
{ {
try try
{ {

2
PlexRequests.Services/Notification/PushbulletNotification.cs
View file

@ -129,7 +129,7 @@ namespace PlexRequests.Services.Notification
} }
} }
public Task NotifyAsync(NotificationModel model, EmailNotificationSettings settings) public Task NotifyAsync(NotificationModel model, Settings settings)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }

2
PlexRequests.Services/Notification/PushoverNotification.cs
View file

@ -127,7 +127,7 @@ namespace PlexRequests.Services.Notification
} }
} }
public Task NotifyAsync(NotificationModel model, EmailNotificationSettings settings) public Task NotifyAsync(NotificationModel model, Settings settings)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }