Merge branch 'main' of github.com:atidev/bugget into optimizations

Author: Victoria Ivanova

.cursor/rules/backend.mdc

@@ -0,0 +1,24 @@
+---
+description: 
+globs: 
+alwaysApply: false
+---
+---
+description: 
+globs: 
+alwaysApply: true
+---
+description: Архитектура и стандарты backend .NET
+globs: backend/**/*.cs
+
+# Your rule content
+
+- Bugget.Entities — DTO, BO, DbModels, Views
+- Bugget.DA — доступ к данным (PostgreSQL, Files, HttpClients)
+- Bugget.BO — бизнес-логика
+- Bugget.Features — сквозные фичи (например, уведомления)
+- Bugget — Web API, Hubs, Controllers
+- Старайся использовать уже существующие сущности, структуры, паттерны
+- Ищи подходящие маппинги, DTO, типы, прежде чем создавать новые
+- Sql код пиши тут devops/migrator/sql/*.sql
+- Sql добавляется только вперед, то есть НЕ ПРАВЬ существующие файлы, создавай новые

backend/Bugget.BO/Bugget.BO.csproj

@@ -7,7 +7,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Bugget.Features\Bugget.Features.csproj" />
+        <ProjectReference Include="..\Bugget.ExternalClients\Bugget.ExternalClients.csproj" />
+        <ProjectReference Include="..\Monade\Monade.csproj" />
+        <ProjectReference Include="..\TaskQueue\TaskQueue.csproj" />
     </ItemGroup>
 
 </Project>

backend/Bugget.BO/Errors/BoErrors.cs

@@ -0,0 +1,11 @@
+using Monade.Errors;
+
+namespace Bugget.BO.Errors;
+
+public static class BoErrors
+{
+    public static readonly NotFoundError BugNotFoundError = new NotFoundError("bug_not_found", "Баг не найден");
+    public static readonly NotFoundError NotFoundError = new NotFoundError("not_found", "Объект не найден");
+    public static readonly NotFoundError ReportNotFoundError = new NotFoundError("report_not_found", "Репорт не найден");
+    public static readonly InternalServerError InternalServerError = new InternalServerError("internal_server_error", "Внутреняя ошибка сервера");
+}

backend/Bugget.BO/Mappers/BugMapper.cs

@@ -48,7 +48,7 @@ public static BugUpdateDbModel ToBugUpdateDbModel(this BugUpdate bug)
         };
     }
 
-    public static BugView ToView(this BugDbModel bug, IReadOnlyDictionary<string, Employee> employeesDict)
+    public static BugView ToView(this BugDbModel bug, IReadOnlyDictionary<string, EmployeeObsolete> employeesDict)
     {
         return new BugView
         {

backend/Bugget.BO/Mappers/CommentMapper.cs

@@ -31,7 +31,7 @@ public static Comment ToComment(this CommentDto comment, int bugId, int reportId
         };
     }
 
-    public static CommentView ToCommentView(this CommentDbModel comment, IReadOnlyDictionary<string, Employee> employeesDict)
+    public static CommentView ToCommentView(this CommentDbModel comment, IReadOnlyDictionary<string, EmployeeObsolete> employeesDict)
     {
         return new CommentView
         {

backend/Bugget.BO/Mappers/ReportMapper.cs

@@ -6,13 +6,14 @@
 using Bugget.Entities.DbModels.Bug;
 using Bugget.Entities.DbModels.Report;
 using Bugget.Entities.DTO.Report;
+using Bugget.Entities.SocketViews;
 using Bugget.Entities.Views;
 
 namespace Bugget.BO.Mappers;
 
 public static class ReportMapper
 {
-    public static ReportView ToView(this ReportDbModel report, IReadOnlyDictionary<string, Employee> employeesDict)
+    public static ReportView ToView(this ReportObsoleteDbModel report, IReadOnlyDictionary<string, EmployeeObsolete> employeesDict)
     {
         return new ReportView
         {
@@ -35,7 +36,7 @@ public static ReportView ToView(this ReportDbModel report, IReadOnlyDictionary<s
         };
     }
 
-    public static SearchReportsView ToView(this SearchReportsDbModel search, IReadOnlyDictionary<string, Employee> employeesDict)
+    public static SearchReportsView ToView(this SearchReportsDbModel search, IReadOnlyDictionary<string, EmployeeObsolete> employeesDict)
     {
         return new SearchReportsView
         {
@@ -52,17 +53,17 @@ public static Report ToReport(this ReportCreateDto report, string userId)
             ResponsibleUserId = report.ResponsibleId,
             CreatorUserId = userId,
             Bugs = report.Bugs.Select(b => new Bug
-                {
-                    Receive = b.Receive,
-                    Expect = b.Expect,
-                    CreatorUserId = userId,
-                })
+            {
+                Receive = b.Receive,
+                Expect = b.Expect,
+                CreatorUserId = userId,
+            })
                 .ToArray(),
             ParticipantsUserIds = new string[] { userId, report.ResponsibleId }.Distinct().ToArray()
         };
     }
 
-    public static ReportUpdate ToReportUpdate(this ReportUpdateDto report, int reportId, string userId)
+    public static ReportUpdate ToReportUpdate(this ReportPatchDto report, int reportId, string userId)
     {
         return new ReportUpdate
         {
@@ -113,7 +114,7 @@ public static SearchReports ToSearchReports(
         string? sort,
         uint skip,
         uint take,
-        IReadOnlyDictionary<string, IReadOnlyCollection<Employee>> employeesByTeam)
+        IReadOnlyDictionary<string, IReadOnlyCollection<EmployeeObsolete>> employeesByTeam)
     {
         List<string> resultUserIds = [];
         if (!string.IsNullOrEmpty(teamId))
@@ -139,4 +140,15 @@ public static SearchReports ToSearchReports(
             Sort = SortOption.Parse(sort)
         };
     }
+
+    public static PatchReportSocketView ToSocketView(this ReportPatchDto patchDto, ReportPatchResultDbModel? result)
+    {
+        return new PatchReportSocketView
+        {
+            Title = patchDto.Title,
+            Status = patchDto.Status,
+            ResponsibleUserId = patchDto.ResponsibleUserId,
+            PastResponsibleUserId = patchDto.ResponsibleUserId == null ? null : result?.PastResponsibleUserId
+        };
+    }
 }

backend/Bugget.BO/Services/EmployeesService.cs

@@ -1,12 +1,14 @@
 using Bugget.DA.Files;
+using Bugget.DA.Interfaces;
 using Bugget.Entities.Adapters;
 using Bugget.Entities.BO;
 using Bugget.Entities.Constants;
 using Bugget.Entities.Views;
+using Bugget.Entities.Views.Users;
 
 namespace Bugget.BO.Services;
 
-public class EmployeesService(EmployeesDataAccess employeesDataAccess)
+public class EmployeesService(EmployeesDataAccess employeesDataAccess, IEmployeesClient employeesClient)
 { 
     public (IEnumerable<EmployeeView>, int) AutocompleteEmployees(
         string userId,
@@ -53,8 +55,14 @@ public class EmployeesService(EmployeesDataAccess employeesDataAccess)
         return (foundedTeams.Skip(skip).Take(take), foundedTeams.Length);
     }
 
-    public IReadOnlyDictionary<string, Employee> DictEmployees()
+    public IReadOnlyDictionary<string, EmployeeObsolete> DictEmployees()
     {
         return employeesDataAccess.DictEmployees();
     }
+
+    public async Task<IEnumerable<UserView>> GetUserViewsAsync(IEnumerable<string> userIds, string? organizationId)
+    {
+        var employees = await employeesClient.GetEmployeesAsync(userIds, organizationId);
+        return employees.Select(e => new UserView { Id = e.Id, Name = e.Name, PhotoUrl = e.PhotoUrl });
+    }
 }

backend/Bugget.BO/Services/ParticipantsService.cs

@@ -0,0 +1,18 @@
+using Bugget.BO.WebSockets;
+using Bugget.DA.Postgres;
+
+namespace Bugget.BO.Services
+{
+    public class ParticipantsService(ParticipantsDbClient participantsDbClient, IReportPageHubClient reportPageHubClient)
+    {
+        public async Task AddParticipantIfNotExistAsync(int reportId, string userId)
+        {
+            var participants = await participantsDbClient.AddParticipantIfNotExistAsync(reportId, userId);
+
+            if (participants != null)
+            {
+                await reportPageHubClient.SendReportParticipantsAsync(reportId, participants);
+            }
+        }
+    }
+}

backend/Bugget.BO/Services/ReportAutoStatusService.cs

@@ -0,0 +1,25 @@
+using Bugget.BO.WebSockets;
+using Bugget.DA.Postgres;
+using Bugget.Entities.BO.ReportBo;
+using Bugget.Entities.DbModels.Report;
+using Bugget.Entities.DTO.Report;
+using Bugget.Entities.SocketViews;
+
+namespace Bugget.BO.Services
+{
+    public class ReportAutoStatusService(ReportsDbClient reportsDbClient, IReportPageHubClient reportPageHubClient)
+    {
+        public async Task CalculateStatusAsync(int reportId, ReportPatchDto patchDto, ReportPatchResultDbModel result)
+        {
+            // если статус backlog и меняется ответственный, то меняем статус на in progress
+            if (result.Status == (int)ReportStatus.Backlog && patchDto.ResponsibleUserId != null)
+            {
+                await reportsDbClient.ChangeStatusAsync(reportId, (int)ReportStatus.InProgress);
+                await reportPageHubClient.SendReportPatchAsync(reportId, new PatchReportSocketView
+                {
+                    Status = (int)ReportStatus.InProgress,
+                });
+            }
+        }
+    }
+}

backend/Bugget.BO/Services/ReportEventsService.cs

@@ -0,0 +1,27 @@
+using Bugget.BO.Mappers;
+using Bugget.BO.WebSockets;
+using Bugget.Entities.DbModels.Report;
+using Bugget.Entities.DTO.Report;
+using Bugget.ExternalClients;
+using Bugget.ExternalClients.Context;
+
+namespace Bugget.BO.Services
+{
+    public class ReportEventsService(
+        IReportPageHubClient reportPageHubClient,
+        ExternalClientsActionService externalClientsActionService,
+        ParticipantsService participantsService,
+        ReportAutoStatusService autoStatusService)
+    {
+        public async Task HandlePatchReportEventAsync(int reportId, string userId, ReportPatchDto patchDto, ReportPatchResultDbModel result)
+        {
+            await Task.WhenAll(
+                reportPageHubClient.SendReportPatchAsync(reportId, patchDto.ToSocketView(result)),
+                externalClientsActionService.ExecuteReportPatchPostActions(new ReportPatchContext(userId, patchDto, result)),
+                participantsService.AddParticipantIfNotExistAsync(reportId, userId),
+                patchDto.ResponsibleUserId != null ? participantsService.AddParticipantIfNotExistAsync(reportId, patchDto.ResponsibleUserId) : Task.CompletedTask,
+                autoStatusService.CalculateStatusAsync(reportId, patchDto, result)
+            );
+        }
+    }
+}