Delayed Notifications

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <CSharpLanguageVersion>preview</CSharpLanguageVersion>
+        <CSharpLanguageVersion>8</CSharpLanguageVersion>
     </PropertyGroup>
 
     <PropertyGroup>

HwProj.APIGateway/HwProj.APIGateway.API/Controllers/CoursesController.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
+using HwProj.APIGateway.API.Filters;
 using HwProj.APIGateway.API.Models;
 using HwProj.AuthService.Client;
 using HwProj.CoursesService.Client;
@@ -34,6 +35,7 @@ public async Task<CoursePreviewView[]> GetAllCourses()
             return result;
         }
 
+        [CourseDataFilter]
         [HttpGet("{courseId}")]
         [ProducesResponseType(typeof(CourseViewModel), (int)HttpStatusCode.OK)]
         public async Task<IActionResult> GetCourseData(long courseId)

HwProj.CoursesService/HwProj.CoursesService.API/Filters/CourseDataFilterAttribute.cs → HwProj.APIGateway/HwProj.APIGateway.API/Filters/CourseDataFilterAttribute.cs

@@ -1,19 +1,20 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using HwProj.Models;
+using HwProj.Models.AuthService.DTO;
 using HwProj.Models.CoursesService.ViewModels;
-using HwProj.Utils.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 
-namespace HwProj.CoursesService.API.Filters
+namespace HwProj.APIGateway.API.Filters
 {
     public class CourseDataFilterAttribute : ResultFilterAttribute
     {
         public override async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
         {
-            var userId = context.HttpContext.Request.GetUserIdFromHeader();
+            var userId = context.HttpContext.User.FindFirst("_id").Value;
 
             if (userId == null)
             {
@@ -22,21 +23,18 @@ public override async Task OnResultExecutionAsync(ResultExecutingContext context
             else
             {
                 var result = context.Result as ObjectResult;
-                if (result?.Value is CourseDTO courseDto && !courseDto.MentorIds.Contains(userId))
+                if (result?.Value is CourseViewModel courseViewModel &&
+                    courseViewModel.Mentors.All(mentor => mentor.UserId != userId))
                 {
                     var currentDate = DateTimeUtils.GetMoscowNow();
-                    foreach (var homework in courseDto.Homeworks)
+                    foreach (var homework in courseViewModel.Homeworks)
                     {
                         homework.Tasks =
                             new List<HomeworkTaskViewModel>(homework.Tasks.Where(t =>
                                 currentDate >= t.PublicationDate));
                     }
 
-                    courseDto.CourseMates = courseDto.CourseMates
-                        .Where(t => t.IsAccepted || t.StudentId == userId)
-                        .ToArray();
-
-                    courseDto.Groups = courseDto.Groups.Where(g => g.StudentsIds.Contains(userId)).ToArray();
+                    courseViewModel.NewStudents = Array.Empty<AccountDataDto>();
                 }
             }
 

HwProj.AuthService/HwProj.AuthService.API/RoleInitializer.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Identity;
 using System.Threading.Tasks;
-using HwProj.AuthService.API.Events;
+using HwProj.Models.Events.AuthEvents;
 using HwProj.EventBus.Client.Interfaces;
 using HwProj.Models.Roles;
 using HwProj.Models.AuthService.ViewModels;

HwProj.AuthService/HwProj.AuthService.API/Services/AccountService.cs

@@ -5,7 +5,7 @@
 using AutoMapper;
 using HwProj.AuthService.API.Extensions;
 using HwProj.Models.Roles;
-using HwProj.AuthService.API.Events;
+using HwProj.Models.Events.AuthEvents;
 using HwProj.EventBus.Client.Interfaces;
 using HwProj.Models.AuthService.DTO;
 using HwProj.Models.AuthService.ViewModels;

HwProj.Common/HwProj.Events/HwProj.Events.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <RootNamespace>HwProj.Events2</RootNamespace>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\..\HwProj.EventBus\HwProj.EventBus.Client\HwProj.EventBus.Client.csproj" />
+      <ProjectReference Include="..\HwProj.Models\HwProj.Models.csproj" />
+    </ItemGroup>
+
+</Project>

HwProj.Common/HwProj.HttpUtils/RequestHeaderBuilder.cs

@@ -7,7 +7,7 @@ public static class RequestHeaderBuilder
     {
         public static void TryAddUserId(this HttpRequestMessage request, IHttpContextAccessor httpContextAccessor)
         {
-            var userId = httpContextAccessor.HttpContext.User.FindFirst("_id");
+            var userId = httpContextAccessor.HttpContext?.User.FindFirst("_id");
             if (userId != null) request.Headers.Add("UserId", userId.Value);
         }
     }

HwProj.Common/HwProj.Models/CoursesService/ViewModels/HomeworkTaskViewModels.cs

@@ -29,6 +29,18 @@ public class HomeworkTaskViewModel
         public bool IsDeferred { get; set; }
     }
 
+
+    public class HomeworkTaskDTO
+    {
+        public long Id { get; set; }
+
+        public string Title { get; set; }
+
+        public DateTime PublicationDate { get; set; }
+
+        public DateTime? DeadlineDate { get; set; }
+    }
+
     public class CreateTaskViewModel
     {
         [Required]

HwProj.Common/HwProj.Models/Events/AuthEvents/AdminRegisterEvent.cs

@@ -0,0 +1,15 @@
+using HwProj.EventBus.Client;
+
+namespace HwProj.Models.Events.AuthEvents
+{
+    public class AdminRegisterEvent : RegisterEvent
+    {
+        public AdminRegisterEvent(string userId, string email, string name, string surname = "", string middleName = "")
+            : base(userId, email, name, surname, middleName)
+        {
+        }
+
+        public override string EventName => "AdminRegisterEvent";
+        public override EventCategory Category => EventCategory.Users;
+    }
+}

HwProj.AuthService/HwProj.AuthService.API/Events/InviteLecturerEvent.cs → HwProj.Common/HwProj.Models/Events/AuthEvents/InviteLecturerEvent.cs

@@ -1,10 +1,12 @@
 using HwProj.EventBus.Client;
 
-namespace HwProj.AuthService.API.Events
+namespace HwProj.Models.Events.AuthEvents
 {
     public class InviteLecturerEvent : Event
     {
         public string UserId { get; set; }
         public string UserEmail { get; set; }
+        public override string EventName => "InviteLecturerEvent";
+        public override EventCategory Category => EventCategory.Users;
     }
 }

HwProj.AuthService/HwProj.AuthService.API/Events/PasswordRecoveryEvent.cs → HwProj.Common/HwProj.Models/Events/AuthEvents/PasswordRecoveryEvent.cs

@@ -1,6 +1,6 @@
 using HwProj.EventBus.Client;
 
-namespace HwProj.AuthService.API.Events
+namespace HwProj.Models.Events.AuthEvents
 {
     public class PasswordRecoveryEvent : Event
     {
@@ -9,5 +9,7 @@ public class PasswordRecoveryEvent : Event
         public string Surname { get; set; }
         public string Email { get; set; }
         public string Token { get; set; }
+        public override string EventName => "PasswordRecoveryEvent";
+        public override EventCategory Category => EventCategory.Users;
     }
 }

HwProj.AuthService/HwProj.AuthService.API/Events/RegisterEvent.cs → HwProj.Common/HwProj.Models/Events/AuthEvents/RegisterEvent.cs

@@ -1,6 +1,6 @@
 using HwProj.EventBus.Client;
 
-namespace HwProj.AuthService.API.Events
+namespace HwProj.Models.Events.AuthEvents
 {
     public abstract class RegisterEvent : Event
     {

HwProj.Common/HwProj.Models/Events/AuthEvents/StudentRegisterEvent.cs

@@ -0,0 +1,16 @@
+using HwProj.EventBus.Client;
+
+namespace HwProj.Models.Events.AuthEvents
+{
+    public class StudentRegisterEvent : RegisterEvent
+    {
+        public StudentRegisterEvent(string userId, string email, string name, string surname = "",
+            string middleName = "")
+            : base(userId, email, name, surname, middleName)
+        {
+        }
+
+        public override string EventName => "StudentRegisterEvent";
+        public override EventCategory Category => EventCategory.Users;
+    }
+}

HwProj.Common/HwProj.Models/Events/CourseEvents/AddOrUpdateEvent.cs

@@ -0,0 +1,19 @@
+using HwProj.EventBus.Client;
+using HwProj.Models.CoursesService.ViewModels;
+
+namespace HwProj.Models.Events.CourseEvents
+{
+    public class AddOrUpdateTaskEvent : Event
+    {
+        public bool IsUpdate { get; set; }
+        public long TaskId { get; set; }
+        public override string EventName => "UpdateTaskEvent";
+        public override EventCategory Category => EventCategory.Tasks;
+
+        public AddOrUpdateTaskEvent(long taskId, bool isUpdate)
+        {
+            TaskId = taskId;
+            IsUpdate = isUpdate;
+        }
+    }
+}

HwProj.Common/HwProj.Models/Events/CourseEvents/DeleteTaskEvent.cs

@@ -0,0 +1,16 @@
+using HwProj.EventBus.Client;
+
+namespace HwProj.Models.Events.CourseEvents
+{
+    public class DeleteTaskEvent : Event
+    {
+        public long TaskId { get; set; }
+        public override string EventName => "DeleteTaskEvent";
+        public override EventCategory Category => EventCategory.Tasks;
+
+        public DeleteTaskEvent(long taskId)
+        {
+            TaskId = taskId;
+        }
+    }
+}

HwProj.CoursesService/HwProj.CoursesService.API/Events/LecturerAcceptToCourseEvent.cs → HwProj.Common/HwProj.Models/Events/CourseEvents/LecturerAcceptToCourseEvent.cs

@@ -1,12 +1,15 @@
 using HwProj.EventBus.Client;
 
-namespace HwProj.CoursesService.API.Events
+namespace HwProj.Models.Events.CourseEvents
 {
     public class LecturerAcceptToCourseEvent : Event
     {
         public long CourseId { get; set; }
         public string CourseName { get; set; }
         public string MentorIds { get; set; }
         public string StudentId { get; set; }
+
+        public override string EventName => "AcceptToCourseEvent";
+        public override EventCategory Category => EventCategory.Courses;
     }
 }

HwProj.CoursesService/HwProj.CoursesService.API/Events/LecturerInvitedToCourseEvent.cs → HwProj.Common/HwProj.Models/Events/CourseEvents/LecturerInvitedToCourseEvent.cs

@@ -1,12 +1,15 @@
 using HwProj.EventBus.Client;
 
-namespace HwProj.CoursesService.API.Events
+namespace HwProj.Models.Events.CourseEvents
 {
     public class LecturerInvitedToCourseEvent : Event
     {
         public long CourseId { get; set; }
         public string CourseName { get; set; }
         public string MentorId { get; set; }
         public string MentorEmail { get; set; }
+
+        public override string EventName => "LecturerInvitedToCourseEvent";
+        public override EventCategory Category => EventCategory.Courses;
     }
 }

HwProj.CoursesService/HwProj.CoursesService.API/Events/LecturerRejectToCourseEvent.cs → HwProj.Common/HwProj.Models/Events/CourseEvents/LecturerRejectToCourseEvent.cs

@@ -1,12 +1,14 @@
 using HwProj.EventBus.Client;
 
-namespace HwProj.CoursesService.API.Events
+namespace HwProj.Models.Events.CourseEvents
 {
     public class LecturerRejectToCourseEvent : Event
     {
         public long CourseId { get; set; }
         public string CourseName { get; set; }
-        public string MentorIds { get; set; }
         public string StudentId { get; set; }
+
+        public override string EventName => "RejectToCourseEvent";
+        public override EventCategory Category => EventCategory.Courses;
     }
 }

HwProj.CoursesService/HwProj.CoursesService.API/Events/NewCourseMateEvent.cs → HwProj.Common/HwProj.Models/Events/CourseEvents/NewCourseMateEvent.cs

@@ -1,6 +1,6 @@
 using HwProj.EventBus.Client;
 
-namespace HwProj.CoursesService.API.Events
+namespace HwProj.Models.Events.CourseEvents
 {
     public class NewCourseMateEvent : Event
     {
@@ -9,5 +9,8 @@ public class NewCourseMateEvent : Event
         public string MentorIds { get; set; }
         public string StudentId { get; set; }
         public bool IsAccepted { get; set; }
+
+        public override string EventName => "NewCourseMateEvent";
+        public override EventCategory Category => EventCategory.Courses;
     }
-}
+}

HwProj.CoursesService/HwProj.CoursesService.API/Events/NewHomeworkEvent.cs → HwProj.Common/HwProj.Models/Events/CourseEvents/NewHomeworkEvent.cs

@@ -1,13 +1,16 @@
 using HwProj.EventBus.Client;
 using HwProj.Models.CoursesService.ViewModels;
 
-namespace HwProj.CoursesService.API.Events
+namespace HwProj.Models.Events.CourseEvents
 {
     public class NewHomeworkEvent : Event
     {
         public string Homework { get; set; }
         public CourseDTO Course { get; set; }
 
+        public override string EventName => "NewHomeworkEvent";
+        public override EventCategory Category => EventCategory.Homeworks;
+
         public NewHomeworkEvent(string homework, CourseDTO course)
         {
             Homework = homework;

HwProj.CoursesService/HwProj.CoursesService.API/Events/UpdateHomeworkEvent.cs → HwProj.Common/HwProj.Models/Events/CourseEvents/UpdateHomeworkEvent.cs

@@ -1,13 +1,16 @@
 using HwProj.EventBus.Client;
 using HwProj.Models.CoursesService.ViewModels;
 
-namespace HwProj.CoursesService.API.Events
+namespace HwProj.Models.Events.CourseEvents
 {
     public class UpdateHomeworkEvent : Event
     {
         public HomeworkViewModel Homework { get; set; }
         public CourseDTO Course { get; set; }
 
+        public override string EventName => "UpdateHomeworkEvent";
+        public override EventCategory Category => EventCategory.Homeworks;
+
         public UpdateHomeworkEvent(HomeworkViewModel homework, CourseDTO course)
         {
             Homework = homework;

HwProj.SolutionsService/HwProj.SolutionsService.API/Events/RateEvent.cs → HwProj.Common/HwProj.Models/Events/SolutionEvents/RateEvent.cs

@@ -2,13 +2,16 @@
 using HwProj.Models.CoursesService.ViewModels;
 using HwProj.Models.SolutionsService;
 
-namespace HwProj.SolutionsService.API.Events
+namespace HwProj.Models.Events.SolutionEvents
 {
     public class RateEvent : Event
     {
         public HomeworkTaskViewModel Task { get; set; }
         public SolutionViewModel Solution { get; set; }
 
+        public override string EventName => "RateEvent";
+        public override EventCategory Category => EventCategory.Solutions;
+
         public RateEvent(HomeworkTaskViewModel task, SolutionViewModel solution)
         {
             Task = task;