Report* форматирование

AsbCloudApp/Data/Progress/ProgressDto.cs

@@ -1,5 +1,5 @@
-namespace AsbCloudApp.Data.Progress
+namespace AsbCloudApp.Data.Progress;
-{
+
 /// <summary>
 /// DTO прогресса
 /// </summary>
@@ -16,4 +16,3 @@
     public string? Operation { get; set; }
 
 }
-}

AsbCloudApp/Data/Progress/ProgressExceptionDto.cs

@@ -0,0 +1,29 @@
+using System;
+
+namespace AsbCloudApp.Data.Progress;
+
+/// <summary>
+/// DTO прогресса с ошибкой
+/// </summary>
+public class ProgressExceptionDto
+{
+    /// <summary>
+    /// прогресс 0 - 100%
+    /// </summary>
+    public float Progress { get; set; }
+
+    /// <summary>
+    /// название текущей операции генерации
+    /// </summary>
+    public string? Operation { get; set; }
+
+    /// <summary>
+    /// Отображаемый текст ошибки
+    /// </summary>
+    public string Message { get; set; } = null!;
+
+    /// <summary>
+    /// Инфо об исключении
+    /// </summary>
+    public Exception Exception { get; set; } = null!;
+}

AsbCloudApp/Data/Progress/ReportProgressDto.cs

@@ -1,5 +1,5 @@
-namespace AsbCloudApp.Data.Progress
+namespace AsbCloudApp.Data.Progress;
-{
+
 /// <summary>
 /// DTO завершенного прогресса генерации рапорта-диаграммы
 /// </summary>
@@ -10,4 +10,3 @@
     /// </summary>
     public FileInfoDto file { get; set; }
 }
-}

AsbCloudApp/Data/Progress/ReportProgressFinalDto.cs

@@ -1,5 +1,5 @@
-namespace AsbCloudApp.Data.Progress
+namespace AsbCloudApp.Data.Progress;
-{
+
 /// <summary>
 /// DTO прогресса генерации рапорта-диаграммы
 /// </summary>
@@ -15,4 +15,3 @@
     /// </summary>
     public int TotalPages { get; set; }
 }
-}

AsbCloudInfrastructure/Background/WorkToCreateReport.cs

@@ -6,17 +6,17 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Background
+namespace AsbCloudInfrastructure.Background;
-{
+
 /// <summary>
 /// Класс для создания отчета
 /// </summary>
 internal class WorkToCreateReport : Work
 {
-        private int idWell;
+    private readonly int idWell;
-        private int idUser;
+    private readonly int idUser;
-        private ReportParametersRequest request;
+    private readonly ReportParametersRequest request;
-        private Action<object, string> progressHandler;
+    private readonly Action<object, string> progressHandler;
 
     public WorkToCreateReport(int idWell, int idUser, ReportParametersRequest request, Action<object, string> progressHandler) : base("")
     {
@@ -28,16 +28,14 @@ namespace AsbCloudInfrastructure.Background
         Id = $"create report by wellid:{idWell} for userid:{idUser} requested at {DateTime.Now}";
     }
 
-
     protected override async Task Action(string id, IServiceProvider services, Action<string, double?> onProgress, CancellationToken token)
     {
         var reportService = services.GetRequiredService<IReportService>();
-            Action<ProgressDto, string> handler = (state, workId) =>
+        void handler(ProgressDto state, string workId)
         {
-                onProgress?.Invoke(state.Operation ?? string.Empty, state.Progress);
+            onProgress(state.Operation ?? string.Empty, state.Progress);
-                progressHandler?.Invoke(state, workId);
+            progressHandler(state, workId);
-            };
+        }
         await reportService.CreateReportAsync(Id, idWell, idUser, request, handler, token);
     }
 }
-}

AsbCloudInfrastructure/Services/ReportService.cs

@@ -41,7 +41,8 @@ public class ReportService : IReportService
     {
         var work = new WorkToCreateReport(idWell, idUser, request, progressHandler);
 
-        work.OnErrorAsync = (message, exception, token) => Task.Run(() => progressHandler.Invoke(new
+        work.OnErrorAsync = (message, exception, token) => Task.Run(() => {
+            var state = new ProgressExceptionDto
             {
                 Operation = "error",
                 Progress = 100f,
@@ -49,8 +50,9 @@ public class ReportService : IReportService
                     ? exception.Message
                     : message,
                 Exception = exception,
-        }, work.Id)
+            };
-            , token);
+            progressHandler.Invoke(state, work.Id);
+            }, token);
 
         backgroundWorkerService.Enqueue(work);
 
@@ -116,7 +118,6 @@ public class ReportService : IReportService
         return dtos;
     }
 
-
     public async Task CreateReportAsync(
         string workId,
         int idWell,