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

Добавлен idTransportType для расчета количества непрочтенных уведомлений

Browse Source
This commit is contained in:
Olga Nemt 2023-07-31 17:55:49 +05:00
parent cbca56ca28
commit b75dbd365b
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AsbCloudApp/Repositories/INotificationRepository.cs
View File

@ -35,8 +35,8 @@ public interface INotificationRepository : ICrudRepository<NotificationDto>
/// Получение количества непрочтенных уведомлений /// Получение количества непрочтенных уведомлений
/// </summary> /// </summary>
/// <param name="idUser"></param> /// <param name="idUser"></param>
/// <param name="idTransportType"></param>
/// <param name="cancellationToken"></param> /// <param name="cancellationToken"></param>
/// <returns></returns> /// <returns></returns>
Task<int> GetUnreadCountAsync(int idUser, Task<int> GetUnreadCountAsync(int idUser, int idTransportType, CancellationToken cancellationToken);
CancellationToken cancellationToken);
} }

3
AsbCloudInfrastructure/Repository/NotificationRepository.cs
View File

@ -72,11 +72,12 @@ public class NotificationRepository : CrudRepositoryBase<NotificationDto, Notifi
return dbContext.SaveChangesAsync(cancellationToken); return dbContext.SaveChangesAsync(cancellationToken);
} }
public async Task<int> GetUnreadCountAsync(int idUser, CancellationToken cancellationToken) public async Task<int> GetUnreadCountAsync(int idUser, int idTransportType, CancellationToken cancellationToken)
{ {
var count = await dbContext.Notifications var count = await dbContext.Notifications
.Where(n => n.ReadDate == null) .Where(n => n.ReadDate == null)
.Where(n => n.IdUser == idUser) .Where(n => n.IdUser == idUser)
.Where(n => n.IdTransportType == idTransportType)
.CountAsync(cancellationToken); .CountAsync(cancellationToken);
return count; return count;

5
AsbCloudWebApi/Controllers/NotificationController.cs
View File

@ -128,19 +128,20 @@ public class NotificationController : ControllerBase
/// <summary> /// <summary>
/// Получение количества непрочитанных уведомлений /// Получение количества непрочитанных уведомлений
/// </summary> /// </summary>
/// <param name="idTransportType"></param>
/// <param name="cancellationToken"></param> /// <param name="cancellationToken"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
[Route("unreadNotificationCount")] [Route("unreadNotificationCount")]
[ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)] [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
public async Task<IActionResult> GetUnreadCountAsync(CancellationToken cancellationToken) public async Task<IActionResult> GetUnreadCountAsync([FromQuery] int idTransportType, CancellationToken cancellationToken)
{ {
int? idUser = User.GetUserId(); int? idUser = User.GetUserId();
if (!idUser.HasValue) if (!idUser.HasValue)
return Forbid(); return Forbid();
var result = await notificationRepository.GetUnreadCountAsync(idUser.Value, cancellationToken); var result = await notificationRepository.GetUnreadCountAsync(idUser.Value, idTransportType, cancellationToken);
return Ok(result); return Ok(result);
} }