Notifications categories (#125)

* Added enum

* Changed event handlers

* Changed enum

* Changed enum, renamed NotificationsService.cs

* Added new model

* Changed NotificationsDomain.cs and UserDataDto.cs

* Changed NotificationsController.cs

* Changed model

* Fixed formatting

* Updated api

* Changed

* Minor changes

* Added filterState

* Changed handlers

* Changed Profile.tsx

* Changed

* Added filterState changing

* Changed NotificationViewModel

* Added date and time convertion

* Added getAll function, checkboxes, minor fixes

* Added Accordion and checkAll

* Changed default of showOnlyUnread

* Removed user name and mail from Profile page

* Renamed options

* Renamed Profile.tsx and profile page

* Removed Accordion

* Changed margins

* Changed margins

* Removed INotificationsService.cs

* Removed filter

* Amended Notifications.tsx

* Update hwproj.front/src/components/Notifications.tsx

Co-authored-by: Alex Berezhnykh <[email protected]>

* Update hwproj.front/src/components/Notifications.tsx

Co-authored-by: Alex Berezhnykh <[email protected]>

* Renamed isCheckAll

* Added profile page

* Moved methods

* Fixed markAsSeen

* cleanup

Co-authored-by: Alex Berezhnykh <[email protected]>

Author: ElenaBakova

HwProj.APIGateway/HwProj.APIGateway.API/Controllers/AccountController.cs

@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using HwProj.AuthService.Client;
 using HwProj.Models.ApiGateway;
-using HwProj.Models.AuthService;
 using HwProj.Models.AuthService.DTO;
 using HwProj.Models.AuthService.ViewModels;
 using HwProj.Models.NotificationsService;

HwProj.APIGateway/HwProj.APIGateway.API/Controllers/NotificationsController.cs

@@ -19,7 +19,7 @@ public NotificationsController(INotificationsServiceClient client)
         }
 
         [HttpGet("get")]
-        [ProducesResponseType(typeof(NotificationViewModel[]), (int)HttpStatusCode.OK)]
+        [ProducesResponseType(typeof(CategorizedNotifications[]), (int) HttpStatusCode.OK)]
         public async Task<IActionResult> Get()
         {
             var userId = Request.GetUserId();
@@ -35,4 +35,4 @@ public async Task<IActionResult> MarkAsSeen([FromBody] long[] notificationIds)
             return Ok();
         }
     }
-}
+}

HwProj.Common/HwProj.Models/ApiGateway/UserDataDto.cs

@@ -6,6 +6,6 @@ namespace HwProj.Models.ApiGateway
     public class UserDataDto
     {
         public AccountDataDto UserData { get; set; }
-        public NotificationViewModel[] Notifications { get; set; }
+        public CategorizedNotifications[] Notifications { get; set; }
     }
 }

HwProj.Common/HwProj.Models/NotificationsService/CategorizedNotifications.cs

@@ -0,0 +1,9 @@
+namespace HwProj.Models.NotificationsService
+{
+    public class CategorizedNotifications
+    {
+        public CategoryState Category { get; set; }
+        public NotificationViewModel[] SeenNotifications { get; set; }
+        public NotificationViewModel[] NotSeenNotifications { get; set; }
+    }
+}

HwProj.Common/HwProj.Models/NotificationsService/Notification.cs

@@ -12,9 +12,9 @@ public class Notification : IEntity<long>
 
         //навесить индекс
         public string Owner { get; set; }
-        public string Category { get; set; }
+        public CategoryState Category { get; set; }
         public string Body { get; set; }
         public bool HasSeen { get; set; }
-        public DateTime Date { get; set; }
+        public DateTime Date { get ; set; }
     }
 }

HwProj.Common/HwProj.Models/NotificationsService/NotificationCategoryState.cs

@@ -0,0 +1,10 @@
+namespace HwProj.Models.NotificationsService
+{
+    public enum CategoryState
+    {
+        None,
+        Profile,
+        Courses, 
+        Homeworks
+    }
+}

HwProj.Common/HwProj.Models/NotificationsService/NotificationFilter.cs

@@ -5,7 +5,7 @@ namespace HwProj.Models.NotificationsService
     public class NotificationFilter
     {
         public string Sender { get; set; }
-        public string Category { get; set; }
+        public CategoryState Category { get; set; }
         public int? MaxCount { get; set; }
         public int? Offset { get; set; }
         public int? LastNotificationsId { get; set; }

HwProj.Common/HwProj.Models/NotificationsService/NotificationViewModel.cs

@@ -1,12 +1,19 @@
-namespace HwProj.Models.NotificationsService
+using System;
+using System.Globalization;
+
+namespace HwProj.Models.NotificationsService
 {
     public class NotificationViewModel
     {
         public long Id { get; set; }
         public string Sender { get; set; }
         public string Owner { get; set; }
-        public string Category { get; set; }
+        public CategoryState Category { get; set; }
         public string Body { get; set; }
+
         public bool HasSeen { get; set; }
+
+        // dd.mm.yy hh:mm
+        public DateTime Date { get; set; }
     }
 }

HwProj.NotificationsService/HwProj.NotificationsService.API/Controllers/NotificationsController.cs

@@ -1,6 +1,8 @@
 using System.Net;
 using System.Threading.Tasks;
+using AutoMapper;
 using HwProj.Models.NotificationsService;
+using HwProj.NotificationsService.API.Repositories;
 using HwProj.NotificationsService.API.Services;
 using Microsoft.AspNetCore.Mvc;
 
@@ -10,25 +12,29 @@ namespace HwProj.NotificationsService.API.Controllers
     [ApiController]
     public class NotificationsController : ControllerBase
     {
-        private readonly INotificationsService _notificationsService;
+        private readonly INotificationsRepository _repository;
+        private readonly IMapper _mapper;
 
-        public NotificationsController(INotificationsService notificationsService)
+        public NotificationsController(INotificationsRepository repository, IMapper mapper)
         {
-            _notificationsService = notificationsService;
+            _repository = repository;
+            _mapper = mapper;
         }
 
         [HttpPost("get/{userId}")]
-        [ProducesResponseType(typeof(NotificationViewModel[]), (int)HttpStatusCode.OK)]
-        public async Task<IActionResult> Get(string userId, [FromBody] NotificationFilter filter)
+        [ProducesResponseType(typeof(CategorizedNotifications[]), (int)HttpStatusCode.OK)]
+        public async Task<IActionResult> Get(string userId)
         {
-            var notifications = await _notificationsService.GetAsync(userId, filter);
-            return Ok(notifications ?? new NotificationViewModel[] { });
+            var notifications = await _repository.GetAllByUserAsync(userId);
+            var notificationViewModels = _mapper.Map<NotificationViewModel[]>(notifications);
+            var groupedNotifications = NotificationsDomain.Group(notificationViewModels);
+            return Ok(groupedNotifications);
         }
 
         [HttpPut("markAsSeen/{userId}")]
         public async Task<IActionResult> MarkNotifications([FromBody] long[] notificationIds, string userId)
         {
-            await _notificationsService.MarkAsSeenAsync(userId, notificationIds);
+            await _repository.MarkAsSeenAsync(userId, notificationIds);
             return Ok();
         }
     }

HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/InviteLecturerEventHandler.cs

@@ -25,7 +25,7 @@ public async Task HandleAsync(InviteLecturerEvent @event)
             {
                 Sender = "AuthService",
                 Body = "Вас добавили в список лекторов.",
-                Category = "AuthService",
+                Category = CategoryState.Courses,
                 Date = DateTime.UtcNow,
                 Owner = @event.UserId
             };