Notifications Service: .NET 8

HwProj.Common/HwProj.Repositories.Net8/CrudRepository.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Z.EntityFramework.Plus;
+
+namespace HwProj.Repositories.Net8;
+
+public class CrudRepository<TEntity, TKey>(DbContext context) : ICrudRepository<TEntity, TKey>
+    where TEntity : class, IEntity<TKey>
+    where TKey : IEquatable<TKey>
+{
+    protected DbContext Context => context;
+
+    public async Task<TKey> AddAsync(TEntity item)
+    {
+        await context.AddAsync(item);
+        await context.SaveChangesAsync();
+        return item.Id;
+    }
+
+    public async Task<List<TKey>> AddRangeAsync(IEnumerable<TEntity> items)
+    {
+        items = items.ToList();
+        await context.AddRangeAsync(items);
+        await context.SaveChangesAsync();
+        return items.Select(item => item.Id).ToList();
+    }
+
+    public async Task DeleteAsync(TKey id)
+    {
+        await context.Set<TEntity>()
+                .Where(entity => entity.Id.Equals(id))
+                .DeleteAsync()
+            ;
+    }
+
+    public async Task UpdateAsync(TKey id, Expression<Func<TEntity, TEntity>> updateFactory)
+    {
+        await context.Set<TEntity>()
+                .Where(entity => entity.Id.Equals(id))
+                .UpdateAsync(updateFactory)
+            ;
+    }
+
+    public IQueryable<TEntity> GetAll()
+    {
+        return context.Set<TEntity>().AsNoTracking();
+    }
+
+    public IQueryable<TEntity> FindAll(Expression<Func<TEntity, bool>> predicate)
+    {
+        return context.Set<TEntity>().AsNoTracking().Where(predicate);
+    }
+
+    public async Task<TEntity> GetAsync(TKey id)
+    {
+        return await context.FindAsync<TEntity>(id);
+    }
+
+    public async Task<TEntity> FindAsync(Expression<Func<TEntity, bool>> predicate)
+    {
+        return await context.Set<TEntity>().AsNoTracking().FirstOrDefaultAsync(predicate);
+    }
+}

HwProj.Common/HwProj.Repositories.Net8/HwProj.Repositories.Net8.csproj

@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <LangVersion>12</LangVersion>
+        <Nullable>disable</Nullable>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.9" />
+        <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="9.104.0" />
+    </ItemGroup>
+</Project>

HwProj.Common/HwProj.Repositories.Net8/ICrudRepository.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+
+namespace HwProj.Repositories.Net8;
+
+public interface ICrudRepository<TEntity, TKey>
+    where TEntity : IEntity<TKey>
+    where TKey : IEquatable<TKey>
+{
+    Task<TKey> AddAsync(TEntity item);
+    Task<List<TKey>> AddRangeAsync(IEnumerable<TEntity> items);
+    Task DeleteAsync(TKey id);
+    Task UpdateAsync(TKey id, Expression<Func<TEntity, TEntity>> updateFactory);
+    IQueryable<TEntity> GetAll();
+    IQueryable<TEntity> FindAll(Expression<Func<TEntity, bool>> predicate);
+    Task<TEntity> GetAsync(TKey id);
+    Task<TEntity> FindAsync(Expression<Func<TEntity, bool>> predicate);
+}

HwProj.Common/HwProj.Repositories.Net8/IEntity.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace HwProj.Repositories.Net8;
+
+public interface IEntity<TKey>
+    where TKey : IEquatable<TKey>
+{
+    TKey Id { get; set; }
+}

HwProj.CoursesService/HwProj.CoursesService.API/Dockerfile

@@ -11,6 +11,7 @@ COPY ["HwProj.Common/HwProj.Repositories/", "HwProj.Common/HwProj.Repositories/"
 COPY ["HwProj.AuthService/HwProj.AuthService.Client/", "HwProj.AuthService/HwProj.AuthService.Client/"]
 COPY ["HwProj.ContentService/HwProj.ContentService.Client/", "HwProj.ContentService/HwProj.ContentService.Client/"]
 COPY ["HwProj.Common/HwProj.HttpUtils/", "HwProj.Common/HwProj.HttpUtils/"]
+COPY ["HwProj.NotificationsService/HwProj.NotificationService.Events/", "HwProj.NotificationsService/HwProj.NotificationService.Events/"]
 
 WORKDIR "/src/HwProj.CoursesService/HwProj.CoursesService.API"
 RUN dotnet publish "HwProj.CoursesService.API.csproj" -c Release -o /app/publish

HwProj.CoursesService/HwProj.CoursesService.API/HwProj.CoursesService.API.csproj

@@ -26,6 +26,7 @@
     <ProjectReference Include="..\..\HwProj.AuthService\HwProj.AuthService.Client\HwProj.AuthService.Client.csproj" />
     <ProjectReference Include="..\..\HwProj.Common\HwProj.Repositories\HwProj.Repositories.csproj" />
     <ProjectReference Include="..\..\HwProj.Common\HwProj.Utils\HwProj.Utils.csproj" />
+    <ProjectReference Include="..\..\HwProj.NotificationsService\HwProj.NotificationService.Events\HwProj.NotificationService.Events.csproj" />
   </ItemGroup>
   <ProjectExtensions><VisualStudio><UserProperties properties_4launchsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
 </Project>

HwProj.CoursesService/HwProj.CoursesService.API/Services/CoursesService.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Transactions;
 using System.Threading.Tasks;
-using HwProj.CoursesService.API.Events;
 using HwProj.CoursesService.API.Models;
 using HwProj.CoursesService.API.Repositories;
 using HwProj.CoursesService.API.Repositories.Groups;
@@ -14,6 +13,7 @@
 using HwProj.CoursesService.API.Domains;
 using HwProj.Models.CoursesService.DTO;
 using HwProj.Models.Roles;
+using HwProj.NotificationService.Events.CoursesService;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Internal;
 

HwProj.CoursesService/HwProj.CoursesService.API/Services/HomeworksService.cs

@@ -4,10 +4,10 @@
 using HwProj.CoursesService.API.Models;
 using HwProj.CoursesService.API.Repositories;
 using HwProj.EventBus.Client.Interfaces;
-using HwProj.CoursesService.API.Events;
 using HwProj.CoursesService.API.Domains;
 using HwProj.Models;
 using HwProj.Models.CoursesService.ViewModels;
+using HwProj.NotificationService.Events.CoursesService;
 
 namespace HwProj.CoursesService.API.Services
 {

HwProj.CoursesService/HwProj.CoursesService.API/Services/TasksService.cs

@@ -1,12 +1,12 @@
 using System;
 using System.Threading.Tasks;
-using HwProj.CoursesService.API.Events;
 using HwProj.CoursesService.API.Models;
 using HwProj.CoursesService.API.Repositories;
 using HwProj.EventBus.Client.Interfaces;
 using HwProj.CoursesService.API.Domains;
 using System.Linq;
 using HwProj.Models;
+using HwProj.NotificationService.Events.CoursesService;
 
 namespace HwProj.CoursesService.API.Services
 {

HwProj.CoursesService/HwProj.CoursesService.API/Events/LecturerAcceptToCourseEvent.cs → HwProj.NotificationsService/HwProj.NotificationService.Events/CoursesService/LecturerAcceptToCourseEvent.cs

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

HwProj.CoursesService/HwProj.CoursesService.API/Events/LecturerInvitedToCourseEvent.cs → HwProj.NotificationsService/HwProj.NotificationService.Events/CoursesService/LecturerInvitedToCourseEvent.cs

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

HwProj.CoursesService/HwProj.CoursesService.API/Events/LecturerRejectToCourseEvent.cs → HwProj.NotificationsService/HwProj.NotificationService.Events/CoursesService/LecturerRejectToCourseEvent.cs

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

HwProj.CoursesService/HwProj.CoursesService.API/Events/NewCourseMateEvent.cs → HwProj.NotificationsService/HwProj.NotificationService.Events/CoursesService/NewCourseMateEvent.cs

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

HwProj.CoursesService/HwProj.CoursesService.API/Events/NewHomeworkEvent.cs → HwProj.NotificationsService/HwProj.NotificationService.Events/CoursesService/NewHomeworkEvent.cs

@@ -1,7 +1,7 @@
 using System;
 using HwProj.EventBus.Client;
 
-namespace HwProj.CoursesService.API.Events
+namespace HwProj.NotificationService.Events.CoursesService
 {
     public class NewHomeworkEvent : Event
     {

HwProj.CoursesService/HwProj.CoursesService.API/Events/NewHomeworkTaskEvent.cs → HwProj.NotificationsService/HwProj.NotificationService.Events/CoursesService/NewHomeworkTaskEvent.cs

@@ -1,7 +1,7 @@
 using System;
 using HwProj.EventBus.Client;
 
-namespace HwProj.CoursesService.API.Events
+namespace HwProj.NotificationService.Events.CoursesService
 {
     public class NewHomeworkTaskEvent : Event
     {

HwProj.CoursesService/HwProj.CoursesService.API/Events/UpdateHomeworkEvent.cs → HwProj.NotificationsService/HwProj.NotificationService.Events/CoursesService/UpdateHomeworkEvent.cs

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

HwProj.CoursesService/HwProj.CoursesService.API/Events/UpdateSolutionMaxRatingEvent.cs → HwProj.NotificationsService/HwProj.NotificationService.Events/CoursesService/UpdateSolutionMaxRatingEvent.cs

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

HwProj.CoursesService/HwProj.CoursesService.API/Events/UpdateTaskMaxRatingEvent.cs → HwProj.NotificationsService/HwProj.NotificationService.Events/CoursesService/UpdateTaskMaxRatingEvent.cs

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

HwProj.NotificationsService/HwProj.NotificationService.Events/HwProj.NotificationService.Events.csproj

@@ -5,6 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+      <ProjectReference Include="..\..\HwProj.Common\HwProj.Models\HwProj.Models.csproj" />
       <ProjectReference Include="..\..\HwProj.EventBus\HwProj.EventBus.Client\HwProj.EventBus.Client.csproj" />
     </ItemGroup>
 

HwProj.SolutionsService/HwProj.SolutionsService.API/Events/RateEvent.cs → HwProj.NotificationsService/HwProj.NotificationService.Events/SolutionsService/RateEvent.cs

@@ -2,7 +2,7 @@
 using HwProj.Models.CoursesService.ViewModels;
 using HwProj.Models.SolutionsService;
 
-namespace HwProj.SolutionsService.API.Events
+namespace HwProj.NotificationService.Events.SolutionsService
 {
     public class RateEvent : Event
     {

HwProj.SolutionsService/HwProj.SolutionsService.API/Events/StudentPassTaskEvent.cs → HwProj.NotificationsService/HwProj.NotificationService.Events/SolutionsService/StudentPassTaskEvent.cs

@@ -3,7 +3,7 @@
 using HwProj.Models.CoursesService.ViewModels;
 using HwProj.Models.SolutionsService;
 
-namespace HwProj.SolutionsService.API.Events
+namespace HwProj.NotificationService.Events.SolutionsService
 {
     public class StudentPassTaskEvent : Event
     {

HwProj.NotificationsService/HwProj.NotificationsService.API/AutomapperProfile.cs

@@ -1,5 +1,6 @@
 using AutoMapper;
 using HwProj.Models.NotificationsService;
+using HwProj.NotificationsService.API.Models;
 
 namespace HwProj.NotificationsService.API
 {

HwProj.NotificationsService/HwProj.NotificationsService.API/Controllers/NotificationSettingsController.cs

@@ -1,6 +1,5 @@
 using System.Threading.Tasks;
 using HwProj.Models.NotificationsService;
-using HwProj.NotificationsService.API.Repositories;
 using HwProj.NotificationsService.API.Services;
 using Microsoft.AspNetCore.Mvc;
 

HwProj.NotificationsService/HwProj.NotificationsService.API/Dockerfile

@@ -1,15 +1,15 @@
-FROM mcr.microsoft.com/dotnet/core/sdk:2.2-stretch AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src
 
 COPY ["Directory.Build.props", "Directory.Build.props"]
 
 COPY ["HwProj.NotificationsService/HwProj.NotificationsService.API/", "HwProj.NotificationsService/HwProj.NotificationsService.API/"]
 COPY ["HwProj.NotificationsService/HwProj.NotificationService.Events/", "HwProj.NotificationsService/HwProj.NotificationService.Events/"]
-COPY ["HwProj.Common/HwProj.Utils/", "HwProj.Common/HwProj.Utils/"]
+COPY ["HwProj.Common/HwProj.Common.Net8/", "HwProj.Common/HwProj.Common.Net8/"]
 COPY ["HwProj.EventBus/HwProj.EventBus.Client/", "HwProj.EventBus/HwProj.EventBus.Client/"]
 COPY ["HwProj.Common/HwProj.Models/", "HwProj.Common/HwProj.Models/"]
 COPY ["HwProj.Common/HwProj.Repositories/", "HwProj.Common/HwProj.Repositories/"]
-COPY ["HwProj.SolutionsService/HwProj.SolutionsService.API/", "HwProj.SolutionsService/HwProj.SolutionsService.API/"]
+COPY ["HwProj.Common/HwProj.Repositories.Net8/", "HwProj.Common/HwProj.Repositories.Net8/"]
 COPY ["HwProj.SolutionsService/HwProj.SolutionsService.Client/", "HwProj.SolutionsService/HwProj.SolutionsService.Client/"]
 COPY ["HwProj.Common/HwProj.Exceptions/", "HwProj.Common/HwProj.Exceptions/"]
 COPY ["HwProj.Common/HwProj.HttpUtils/", "HwProj.Common/HwProj.HttpUtils/"]
@@ -22,7 +22,7 @@ COPY ["HwProj.CoursesService/HwProj.CoursesService.API/", "HwProj.CoursesService
 WORKDIR "/src/HwProj.NotificationsService/HwProj.NotificationsService.API"
 RUN dotnet publish "HwProj.NotificationsService.API.csproj" -c Release -o /app/publish
 
-FROM mcr.microsoft.com/dotnet/core/aspnet:2.2-stretch-slim AS final
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS final
 WORKDIR /app
 
 COPY --from=build /app/publish .

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

@@ -1,8 +1,6 @@
 using System;
 using System.Threading.Tasks;
-using HwProj.AuthService.Client;
 using HwProj.EventBus.Client.Interfaces;
-using HwProj.Models.NotificationsService;
 using HwProj.NotificationService.Events.AuthService;
 using HwProj.NotificationsService.API.Models;
 using HwProj.NotificationsService.API.Repositories;

HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/LecturerAcceptToCourseEventHandler.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Threading.Tasks;
 using HwProj.AuthService.Client;
-using HwProj.CoursesService.API.Events;
 using HwProj.EventBus.Client.Interfaces;
-using HwProj.Models.NotificationsService;
+using HwProj.NotificationService.Events.CoursesService;
+using HwProj.NotificationsService.API.Models;
 using HwProj.NotificationsService.API.Repositories;
 using HwProj.NotificationsService.API.Services;
 using Microsoft.Extensions.Configuration;

HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/LecturerInvitedToCourseEventHandler.cs

@@ -1,8 +1,7 @@
 using System;
 using System.Threading.Tasks;
-using HwProj.CoursesService.API.Events;
 using HwProj.EventBus.Client.Interfaces;
-using HwProj.Models.NotificationsService;
+using HwProj.NotificationService.Events.CoursesService;
 using HwProj.NotificationsService.API.Models;
 using HwProj.NotificationsService.API.Repositories;
 using HwProj.NotificationsService.API.Services;

HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/LecturerRejectToCourseEventHandler.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Threading.Tasks;
 using HwProj.AuthService.Client;
-using HwProj.CoursesService.API.Events;
 using HwProj.EventBus.Client.Interfaces;
-using HwProj.Models.NotificationsService;
+using HwProj.NotificationService.Events.CoursesService;
+using HwProj.NotificationsService.API.Models;
 using HwProj.NotificationsService.API.Repositories;
 using HwProj.NotificationsService.API.Services;
 using Microsoft.Extensions.Configuration;

HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/NewCourseMateHandler.cs

@@ -1,9 +1,8 @@
 using System;
 using System.Threading.Tasks;
 using HwProj.AuthService.Client;
-using HwProj.CoursesService.API.Events;
 using HwProj.EventBus.Client.Interfaces;
-using HwProj.Models.NotificationsService;
+using HwProj.NotificationService.Events.CoursesService;
 using HwProj.NotificationsService.API.Models;
 using HwProj.NotificationsService.API.Repositories;
 using HwProj.NotificationsService.API.Services;

HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/NewHomeworkEventHandler.cs

@@ -2,9 +2,9 @@
 using System.Threading.Tasks;
 using HwProj.AuthService.Client;
 using HwProj.EventBus.Client.Interfaces;
-using HwProj.Models.NotificationsService;
+using HwProj.NotificationService.Events.CoursesService;
+using HwProj.NotificationsService.API.Models;
 using HwProj.NotificationsService.API.Repositories;
-using HwProj.CoursesService.API.Events;
 using HwProj.NotificationsService.API.Services;
 using Microsoft.Extensions.Configuration;
 

HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/NewHomeworkTaskEventHandler.cs

@@ -2,9 +2,9 @@
 using System.Threading.Tasks;
 using HwProj.AuthService.Client;
 using HwProj.EventBus.Client.Interfaces;
-using HwProj.Models.NotificationsService;
+using HwProj.NotificationService.Events.CoursesService;
+using HwProj.NotificationsService.API.Models;
 using HwProj.NotificationsService.API.Repositories;
-using HwProj.CoursesService.API.Events;
 using HwProj.NotificationsService.API.Services;
 using Microsoft.Extensions.Configuration;