on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

Исправил отправку уведомлений + небольшой рефакторинг

Browse Source
This commit is contained in:
Степанов Дмитрий Александрович 2023-07-11 19:07:57 +05:00
parent 2232061f95
commit a7e5c577cf
13 changed files with 273 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
AsbCloudApp/Services/Notifications/INotificationSender.cs Normal file
View File

@ -0,0 +1,35 @@
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using AsbCloudApp.Data;
namespace AsbCloudApp.Services.Notifications;
/// <summary>
/// Интерфейс для отправителя уведомлений
/// </summary>
public interface INotificationSender
{
/// <summary>
/// Способ отправки уведомлений
/// </summary>
NotificationTransport NotificationTransport { get; }
/// <summary>
/// Отправка одного уведомлений
/// </summary>
/// <param name="notification"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
Task SendAsync(NotificationDto notification,
CancellationToken cancellationToken);
/// <summary>
/// Отправка нескольких уведомлений
/// </summary>
/// <param name="notifications"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
Task SendRangeAsync(IEnumerable<NotificationDto> notifications,
CancellationToken cancellationToken);
}

16
AsbCloudApp/Services/Notifications/INotificationSenderManager.cs Normal file
View File

@ -0,0 +1,16 @@
using AsbCloudApp.Data;
namespace AsbCloudApp.Services.Notifications;
/// <summary>
/// Ñåðâèñ äëÿ ðàáîòû ñ îòïðàâèòåëÿìè óâåäîìëåíèé
/// </summary>
public interface INotificationSenderManager
{
/// <summary>
/// Ìåòîä ïîëó÷åíèÿ íóæíîãî îòïðàâèòåëÿ óâåäîìëåíèé
/// </summary>
/// <param name="notificationTransport"></param>
/// <returns></returns>
INotificationSender? GetOrDefault(NotificationTransport notificationTransport);
}

23
AsbCloudApp/Services/INotificationService.cs → AsbCloudApp/Services/Notifications/INotificationService.cs
View File

@ -1,8 +1,9 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using AsbCloudApp.Data;
namespace AsbCloudApp.Services;
namespace AsbCloudApp.Services.Notifications;
/// <summary>
/// Интерфейс для работы с уведомлениями
@ -10,26 +11,26 @@ namespace AsbCloudApp.Services;
public interface INotificationService
{
/// <summary>
/// Метод отправки нового уведомления
/// Отправка нового уведомления
/// </summary>
/// <param name="idUser"></param>
/// <param name="idNotificationTransport"></param>
/// <param name="idNotificationCategory"></param>
/// <param name="title"></param>
/// <param name="subject"></param>
/// <param name="message"></param>
/// <param name="timeToLife"></param>
/// <param name="notificationTransport"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
Task SendNotificationAsync(int idUser,
int idNotificationTransport,
Task NotifyAsync(int idUser,
int idNotificationCategory,
string title,
string subject,
string message,
TimeSpan timeToLife,
NotificationTransport notificationTransport,
CancellationToken cancellationToken);
/// <summary>
/// Метод обновления уведомления
/// Обновление уведомления
/// </summary>
/// <param name="idNotification"></param>
/// <param name="isRead"></param>
@ -40,13 +41,13 @@ public interface INotificationService
CancellationToken cancellationToken);
/// <summary>
/// Метод отправки уведомлений, которые не были отправлены
/// Отправка уведомлений, которые не были отправлены
/// </summary>
/// <param name="idUser"></param>
/// <param name="idNotificationTransport"></param>
/// <param name="notificationTransport"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
Task ResendNotificationAsync(int idUser,
int idNotificationTransport,
NotificationTransport notificationTransport,
CancellationToken cancellationToken);
}

5
AsbCloudInfrastructure/DependencyInjection.cs
View File

@ -23,6 +23,8 @@ using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using System;
using AsbCloudApp.Services.Notifications;
using AsbCloudInfrastructure.Services.Notifications;
namespace AsbCloudInfrastructure
{
@ -145,8 +147,7 @@ namespace AsbCloudInfrastructure
services.AddTransient<INotificationService, NotificationService>();
services.AddTransient<INotificationRepository, NotificationRepository>();
services.AddSingleton<INotificationSendingQueueService, NotificationSendingQueueService>();
// admin crud services:
services.AddTransient<ICrudRepository<TelemetryDto>, CrudCacheRepositoryBase<TelemetryDto, Telemetry>>(s =>
new CrudCacheRepositoryBase<TelemetryDto, Telemetry>(

21
AsbCloudInfrastructure/Services/Notifications/NotificationSenderManager.cs Normal file
View File

@ -0,0 +1,21 @@
using System.Collections.Generic;
using System.Linq;
using AsbCloudApp.Data;
using AsbCloudApp.Services.Notifications;
namespace AsbCloudInfrastructure.Services.Notifications;
public class NotificationSenderManager : INotificationSenderManager
{
private readonly IEnumerable<INotificationSender> notificationSenders;
public NotificationSenderManager(IEnumerable<INotificationSender> notificationSenders)
{
this.notificationSenders = notificationSenders;
}
public INotificationSender? GetOrDefault(NotificationTransport notificationTransport)
{
return notificationSenders.FirstOrDefault(x => x.NotificationTransport == notificationTransport);
}
}

82
AsbCloudInfrastructure/Services/Notifications/NotificationService.cs Normal file
View File

@ -0,0 +1,82 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using AsbCloudApp.Data;
using AsbCloudApp.Exceptions;
using AsbCloudApp.Repositories;
using AsbCloudApp.Services.Notifications;
namespace AsbCloudInfrastructure.Services.Notifications;
public class NotificationService : INotificationService
{
private readonly INotificationSenderManager notificationSenderManager;
private readonly INotificationRepository notificationRepository;
public NotificationService(INotificationSenderManager notificationSenderManager,
INotificationRepository notificationRepository)
{
this.notificationSenderManager = notificationSenderManager;
this.notificationRepository = notificationRepository;
}
public async Task NotifyAsync(int idUser,
int idNotificationCategory,
string title,
string message,
TimeSpan timeToLife,
NotificationTransport notificationTransport,
CancellationToken cancellationToken)
{
NotificationDto notification = new()
{
IdUser = idUser,
IdNotificationCategory = idNotificationCategory,
Title = title,
Message = message,
TimeToLife = timeToLife,
NotificationTransport = notificationTransport,
NotificationState = NotificationState.Registered
};
await notificationRepository.InsertAsync(notification,
cancellationToken);
var notificationSender = notificationSenderManager.GetOrDefault(notificationTransport);
if(notificationSender is null)
throw new ArgumentInvalidException("Метод отправки уведомления не найден", nameof(notificationTransport));
await notificationSender.SendAsync(notification, cancellationToken);
}
public async Task UpdateNotificationAsync(int idNotification,
bool isRead,
CancellationToken cancellationToken)
{
var notification = await notificationRepository.GetOrDefaultAsync(idNotification,
cancellationToken) ?? throw new ArgumentInvalidException("Уведомление не найдено",
nameof(idNotification));
notification.NotificationState = isRead ? NotificationState.Read : NotificationState.Sent;
await notificationRepository.UpdateAsync(notification,
cancellationToken);
}
public async Task ResendNotificationAsync(int idUser,
NotificationTransport notificationTransport,
CancellationToken cancellationToken)
{
var notifications = await notificationRepository.GetUnsentNotificationsAsync(idUser,
notificationTransport,
cancellationToken);
var notificationSender = notificationSenderManager.GetOrDefault(notificationTransport);
if(notificationSender is null)
throw new ArgumentInvalidException("Отправитель уведомления не найден", nameof(notificationTransport));
await notificationSender.SendRangeAsync(notifications, cancellationToken);
}
}

41
AsbCloudWebApi/Controllers/NotificationController.cs
View File

@ -4,7 +4,8 @@ using System.Threading;
using System.Threading.Tasks;
using AsbCloudApp.Data;
using AsbCloudApp.Repositories;
using AsbCloudApp.Services;
using AsbCloudApp.Requests;
using AsbCloudApp.Services.Notifications;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
@ -29,39 +30,39 @@ public class NotificationController : ControllerBase
}
/// <summary>
/// Метод отправки уведомления
/// Отправка уведомления
/// </summary>
/// <param name="idUser">Id пользователя</param>
/// <param name="idNotificationTransport">Id способа отправки уведомления</param>
/// <param name="idNotificationCategory">Id категории уведомления</param>
/// <param name="title">Заголовок уведомления</param>
/// <param name="subject">Сообщение уведомления</param>
/// <param name="message">Сообщение уведомления</param>
/// <param name="timeToLife">Время жизни уведомления</param>
/// <param name="notificationTransport">Способ отправки уведомления</param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
[HttpPost]
[Route("send")]
public async Task<IActionResult> SendAsync([Required] int idUser,
[Required] int idNotificationTransport,
[Required] int idNotificationCategory,
[Required] string title,
[Required] string subject,
[Required] string message,
[Required] TimeSpan timeToLife,
[Required] NotificationTransport notificationTransport,
CancellationToken cancellationToken)
{
await notificationService.SendNotificationAsync(idUser,
idNotificationTransport,
await notificationService.NotifyAsync(idUser,
idNotificationCategory,
title,
subject,
message,
timeToLife,
notificationTransport,
cancellationToken);
return Ok();
}
/// <summary>
/// Метод обновления уведомления
/// Обновление уведомления
/// </summary>
/// <param name="idNotification">Id уведомления</param>
/// <param name="isRead">Прочитано ли уведомление</param>
@ -79,21 +80,17 @@ public class NotificationController : ControllerBase
return Ok();
}
/// <summary>
/// Метод получения уведомлений по параметрам
/// Получение списка уведомлений
/// </summary>
/// <param name="skip">Кол-во пропускаемых записей</param>
/// <param name="take">Кол-во выбираемых записей</param>
/// <param name="idNotificationTransport">Id способа доставки уведомления</param>
/// <param name="request">Параметры запроса</param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
[HttpGet]
[Route("getList")]
[ProducesResponseType(typeof(PaginationContainer<NotificationDto>), (int)System.Net.HttpStatusCode.OK)]
public async Task<IActionResult> GetListAsync(int? skip,
int? take,
[Required] int idNotificationTransport,
public async Task<IActionResult> GetListAsync([FromQuery] NotificationRequest request,
CancellationToken cancellationToken)
{
int? idUser = User.GetUserId();
@ -101,17 +98,15 @@ public class NotificationController : ControllerBase
if (!idUser.HasValue)
return Forbid();
var result = await notificationRepository.GetNotificationsAsync(skip,
take,
idUser.Value,
idNotificationTransport,
var result = await notificationRepository.GetNotificationsAsync(idUser.Value,
request,
cancellationToken);
return Ok(result);
}
/// <summary>
/// Метод удаления уведомления
/// Удаление уведомления
/// </summary>
/// <param name="idNotification">Id уведомления</param>
/// <param name="cancellationToken"></param>

9
AsbCloudWebApi/DependencyInjection.cs
View File

@ -9,6 +9,9 @@ using System.Collections.Generic;
using System.IO;
using System.Reflection;
using System.Threading.Tasks;
using AsbCloudApp.Services.Notifications;
using AsbCloudInfrastructure.Services.Notifications;
using AsbCloudWebApi.SignalR.Services;
using Microsoft.OpenApi.Any;
namespace AsbCloudWebApi
@ -105,5 +108,11 @@ namespace AsbCloudWebApi
};
});
}
public static void AddNotificationSenders(this IServiceCollection services)
{
services.AddScoped<INotificationSenderManager, NotificationSenderManager>();
services.AddTransient<INotificationSender, SignalRNotificationSender>();
}
}
}

10
AsbCloudWebApi/SignalR/ConnectionManager/ConnectionManager.cs
View File

@ -4,22 +4,22 @@ namespace AsbCloudWebApi.SignalR.ConnectionManager;
public class ConnectionManager : IConnectionManager
{
private readonly ConcurrentDictionary<string, string> _connections = new();
private readonly ConcurrentDictionary<int, string> _connections = new();
public void AddConnection(string userId,
public void AddConnection(int userId,
string connectionId)
{
_connections.TryAdd(userId, connectionId);
}
public void RemoveConnection(string userId)
public void RemoveConnection(int userId)
{
_connections.TryRemove(userId, out _);
}
public string? GetConnectionIdByUserId(string userId)
public string? GetConnectionIdByUserId(int userId)
{
_connections.TryGetValue(userId, out string? connectionId);
_connections.TryGetValue(userId, out var connectionId);
return connectionId;
}
}

6
AsbCloudWebApi/SignalR/ConnectionManager/IConnectionManager.cs
View File

@ -2,10 +2,10 @@ namespace AsbCloudWebApi.SignalR.ConnectionManager;
public interface IConnectionManager
{
void AddConnection(string userId,
void AddConnection(int userId,
string connectionId);
void RemoveConnection(string userId);
void RemoveConnection(int userId);
string? GetConnectionIdByUserId(string userId);
string? GetConnectionIdByUserId(int userId);
}

14
AsbCloudWebApi/SignalR/NotificationHub.cs
View File

@ -1,10 +1,9 @@
using System.Threading;
using System.Threading.Tasks;
using AsbCloudApp.Services;
using AsbCloudWebApi.Options.Notifications;
using AsbCloudApp.Data;
using AsbCloudApp.Services.Notifications;
using AsbCloudWebApi.SignalR.ConnectionManager;
using Microsoft.AspNetCore.Authorization;
using Microsoft.Extensions.Options;
namespace AsbCloudWebApi.SignalR;
@ -13,25 +12,22 @@ public class NotificationHub : BaseHub
{
private readonly IConnectionManager connectionManager;
private readonly INotificationService notificationService;
private readonly NotificationsOptionsSignalR notificationsOptionsSignalR;
public NotificationHub(IConnectionManager connectionManager,
INotificationService notificationService,
IOptions<NotificationsOptionsSignalR> notificationsOptionsSignalR)
INotificationService notificationService)
{
this.connectionManager = connectionManager;
this.notificationService = notificationService;
this.notificationsOptionsSignalR = notificationsOptionsSignalR.Value;
}
public async Task OnConnected(int idUser)
{
string connectionId = Context.ConnectionId;
connectionManager.AddConnection(idUser.ToString(), connectionId);
connectionManager.AddConnection(idUser, connectionId);
await notificationService.ResendNotificationAsync(idUser,
notificationsOptionsSignalR.IdTransport,
NotificationTransport.SignalR,
CancellationToken.None);
await base.OnConnectedAsync();

61
AsbCloudWebApi/SignalR/Services/SignalRNotificationSender.cs Normal file
View File

@ -0,0 +1,61 @@
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using AsbCloudApp.Data;
using AsbCloudApp.Repositories;
using AsbCloudApp.Services.Notifications;
using AsbCloudWebApi.SignalR.ConnectionManager;
using Microsoft.AspNetCore.SignalR;
namespace AsbCloudWebApi.SignalR.Services;
public class SignalRNotificationSender : INotificationSender
{
private readonly IConnectionManager connectionManager;
private readonly IHubContext<NotificationHub> notificationHubContext;
private readonly INotificationRepository notificationRepository;
public SignalRNotificationSender(IConnectionManager connectionManager,
IHubContext<NotificationHub> notificationHubContext,
INotificationRepository notificationRepository)
{
this.connectionManager = connectionManager;
this.notificationHubContext = notificationHubContext;
this.notificationRepository = notificationRepository;
}
public NotificationTransport NotificationTransport => NotificationTransport.SignalR;
public async Task SendAsync(NotificationDto notification,
CancellationToken cancellationToken)
{
const string method = "notifications";
var connectionId = connectionManager.GetConnectionIdByUserId(notification.IdUser);
if (!string.IsNullOrWhiteSpace(connectionId))
{
await notificationHubContext.Clients.Client(connectionId)
.SendAsync(method,
notification,
cancellationToken);
notification.SentDate = DateTime.UtcNow;
notification.NotificationState = NotificationState.Sent;
}
await notificationRepository.UpdateAsync(notification,
cancellationToken);
}
public async Task SendRangeAsync(IEnumerable<NotificationDto> notifications,
CancellationToken cancellationToken)
{
foreach (var notification in notifications)
{
await SendAsync(notification,
cancellationToken);
}
}
}

8
AsbCloudWebApi/Startup.cs
View File

@ -1,9 +1,7 @@
using AsbCloudInfrastructure;
using AsbCloudWebApi.Converters;
using AsbCloudWebApi.Middlewares;
using AsbCloudWebApi.Options.Notifications;
using AsbCloudWebApi.SignalR;
using AsbCloudWebApi.SignalR.BackgroundServices;
using AsbCloudWebApi.SignalR.ConnectionManager;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
@ -44,13 +42,13 @@ namespace AsbCloudWebApi
services.AddSwagger();
services.AddInfrastructure(Configuration);
services.AddNotificationSenders();
services.AddJWTAuthentication();
services.AddSignalR()
.Services.AddSingleton<IConnectionManager, ConnectionManager>()
.AddHostedService<SignalRNotificationSender>()
.Configure<NotificationsOptionsSignalR>(Configuration.GetSection("NotificationsOptionsSignalR"));
.Services.AddSingleton<IConnectionManager, ConnectionManager>();
services.AddCors(options =>
{