Delayed Notifications

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,22 @@
-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.Claims
+                .FirstOrDefault(claim => claim.Type.ToString() == "_id")
+                ?.Value;;
 
             if (userId == null)
             {
@@ -22,25 +25,22 @@ 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>();
                 }
             }
 
             await next();
         }
     }
-}
+}

HwProj.APIGateway/HwProj.APIGateway.API/HwProj.APIGateway.API.csproj

@@ -10,6 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Hangfire" Version="1.8.6" />
+    <PackageReference Include="Hangfire.AspNetCore" Version="1.8.6" />
+    <PackageReference Include="Hangfire.Core" Version="1.8.6" />
+    <PackageReference Include="Hangfire.Dashboard.Authorization" Version="3.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.All" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.3" />
@@ -20,6 +24,7 @@
     <ProjectReference Include="..\..\HwProj.AuthService\HwProj.AuthService.Client\HwProj.AuthService.Client.csproj" />
     <ProjectReference Include="..\..\HwProj.Common\HwProj.Utils\HwProj.Utils.csproj" />
     <ProjectReference Include="..\..\HwProj.CoursesService\HwProj.CoursesService.Client\HwProj.CoursesService.Client.csproj" />
+    <ProjectReference Include="..\..\HwProj.NotificationsService\HwProj.NotificationsService.API\HwProj.NotificationsService.API.csproj" />
     <ProjectReference Include="..\..\HwProj.NotificationsService\HwProj.NotificationsService.Client\HwProj.NotificationsService.Client.csproj" />
     <ProjectReference Include="..\..\HwProj.SolutionsService\HwProj.SolutionsService.Client\HwProj.SolutionsService.Client.csproj" />
   </ItemGroup>

HwProj.APIGateway/HwProj.APIGateway.API/Startup.cs

@@ -1,4 +1,6 @@
-using HwProj.AuthService.Client;
+using Hangfire;
+using Hangfire.SqlServer;
+using HwProj.AuthService.Client;
 using HwProj.CoursesService.Client;
 using HwProj.NotificationsService.Client;
 using HwProj.SolutionsService.Client;
@@ -25,8 +27,15 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.ConfigureHwProjServices("API Gateway");
 
-            const string authenticationProviderKey = "GatewayKey";
+            services.AddHangfire(configuration => configuration
+                .SetDataCompatibilityLevel(CompatibilityLevel.Version_180)
+                .UseSimpleAssemblyNameTypeSerializer()
+                .UseRecommendedSerializerSettings()
+                .UseSqlServerStorage(Configuration.GetConnectionString("HangfireConnection")));
+
 
+            const string authenticationProviderKey = "GatewayKey";
+
             services.AddAuthentication()
                 .AddJwtBearer(authenticationProviderKey, x =>
                 {
@@ -54,6 +63,11 @@ public void ConfigureServices(IServiceCollection services)
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
             app.ConfigureHwProj(env, "API Gateway");
+
+            if (env.IsDevelopment())
+            {
+                app.UseHangfireDashboard("/jobs");
+            }
         }
     }
-}
+}

HwProj.APIGateway/HwProj.APIGateway.API/appsettings.json

@@ -4,5 +4,9 @@
     "Courses": "http://localhost:5002",
     "Notifications": "http://localhost:5006",
     "Solutions": "http://localhost:5007"
+  },
+
+  "ConnectionStrings": {
+    "HangfireConnection": "Server=(localdb)\\mssqllocaldb;Database=HangfireDB;Trusted_Connection=True;"
   }
 }

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]
@@ -57,4 +69,4 @@ public void InitializeDeadline()
             }
         }
     }
-}
+}

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

@@ -0,0 +1,14 @@
+using HwProj.EventBus.Client;
+
+namespace HwProj.Models.Events.CourseEvents
+{
+    public class DeleteTaskEvent : Event
+    {
+        public long TaskId { get; set; }
+
+        public DeleteTaskEvent(long taskId)
+        {
+            TaskId = taskId;
+        }
+    }
+}

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

@@ -1,6 +1,6 @@
 using HwProj.EventBus.Client;
 
-namespace HwProj.CoursesService.API.Events
+namespace HwProj.Models.Events.CourseEvents
 {
     public class LecturerAcceptToCourseEvent : Event
     {

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

@@ -1,6 +1,6 @@
 using HwProj.EventBus.Client;
 
-namespace HwProj.CoursesService.API.Events
+namespace HwProj.Models.Events.CourseEvents
 {
     public class LecturerInvitedToCourseEvent : Event
     {

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

@@ -1,6 +1,6 @@
 using HwProj.EventBus.Client;
 
-namespace HwProj.CoursesService.API.Events
+namespace HwProj.Models.Events.CourseEvents
 {
     public class LecturerRejectToCourseEvent : Event
     {
@@ -9,4 +9,4 @@ public class LecturerRejectToCourseEvent : Event
         public string MentorIds { get; set; }
         public string StudentId { get; set; }
     }
-}
+}

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
     {

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

@@ -1,7 +1,7 @@
 using HwProj.EventBus.Client;
 using HwProj.Models.CoursesService.ViewModels;
 
-namespace HwProj.CoursesService.API.Events
+namespace HwProj.Models.Events.CourseEvents
 {
     public class NewHomeworkEvent : Event
     {
@@ -14,4 +14,4 @@ public NewHomeworkEvent(string homework, CourseDTO course)
             Course = course;
         }
     }
-}
+}

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

@@ -0,0 +1,23 @@
+using System;
+using HwProj.EventBus.Client;
+using HwProj.Models.CoursesService.ViewModels;
+
+namespace HwProj.Models.Events.CourseEvents
+{
+    public class NewTaskEvent : Event
+    {
+        public long TaskId { get; set; }
+
+        public HomeworkTaskDTO Task { get; set; }
+
+        public CourseDTO Course { get; set; }
+
+
+        public NewTaskEvent(long taskId, HomeworkTaskDTO task, CourseDTO course)
+        {
+            TaskId = taskId;
+            Task = task;
+            Course = course;
+        }
+    }
+}

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

@@ -1,7 +1,7 @@
 using HwProj.EventBus.Client;
 using HwProj.Models.CoursesService.ViewModels;
 
-namespace HwProj.CoursesService.API.Events
+namespace HwProj.Models.Events.CourseEvents
 {
     public class UpdateHomeworkEvent : Event
     {

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

@@ -1,6 +1,6 @@
 using HwProj.EventBus.Client;
 
-namespace HwProj.CoursesService.API.Events
+namespace HwProj.Models.Events.CourseEvents
 {
     public class UpdateSolutionMaxRatingEvent : Event
     {

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

@@ -0,0 +1,26 @@
+using System;
+using HwProj.EventBus.Client;
+using HwProj.Models.CoursesService.ViewModels;
+
+namespace HwProj.Models.Events.CourseEvents
+{
+    public class UpdateTaskEvent : Event
+    {
+        public long TaskId { get; set; }
+
+        public HomeworkTaskDTO PreviousEvent { get; set; }
+
+        public HomeworkTaskDTO NewEvent { get; set; }
+
+        public CourseDTO Course { get; set; }
+
+
+        public UpdateTaskEvent(long taskId, HomeworkTaskDTO previousEvent, HomeworkTaskDTO newEvent, CourseDTO course)
+        {
+            TaskId = taskId;
+            PreviousEvent = previousEvent;
+            NewEvent = newEvent;
+            Course = course;
+        }
+    }
+}

HwProj.Common/HwProj.Models/HwProj.Models.csproj

@@ -10,15 +10,17 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.3" />
     <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="2.2.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\HwProj.EventBus\HwProj.EventBus.Client\HwProj.EventBus.Client.csproj" />
     <ProjectReference Include="..\HwProj.Repositories\HwProj.Repositories.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <Folder Include="CoursesService" />
+    <Folder Include="Events\" />
   </ItemGroup>
 
 </Project>

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

@@ -5,6 +5,7 @@ public enum CategoryState
         None,
         Profile,
         Courses, 
-        Homeworks
+        Homeworks,
+        Tasks
     }
 }