добавлена многпопоточность

MagicCarpetProject/MagicCarpetBusinessLogic/Implementations/SalaryBusinessLogicContract.cs

@@ -74,40 +74,40 @@ public class SalaryBusinessLogicContract(ISalaryStorageContract salaryStorageCon
     }
     private double CalculateSalaryForTravelAgent(List<SaleDataModel> sales, DateTime startDate, DateTime finishDate, TravelAgentPostConfiguration config)
     {
-        var tasks = new List<Task>();
         var calcPercent = 0.0;
+        var dates = new List<DateTime>();
         for (var date = startDate; date < finishDate; date = date.AddDays(1))
         {
-            tasks.Add(Task.Factory.StartNew((object? obj) =>
-            {
-                var dateInTask = (DateTime)obj!;
-                var salesInDay = sales.Where(x => x.SaleDate >= dateInTask && x.SaleDate <= dateInTask.AddDays(1)).ToArray();
-                if (salesInDay.Length > 0)
-                {
-                    lock (_lockObject)
-                    {
-                        calcPercent += (salesInDay.Sum(x => x.Sum) / salesInDay.Length) * config.SalePercent;
-                    }
-                }
-            }, date));
+            dates.Add(date);
         }
-        var calcBonusTask = Task.Run(() =>
+
+        var parallelOptions = new ParallelOptions
         {
-            return sales.Where(x => x.Sum > _salaryConfiguration.ExtraSaleSum).Sum(x => x.Sum) * config.BonusForExtraSales;
+            MaxDegreeOfParallelism = _salaryConfiguration.MaxConcurrentThreads
+        };
+
+        Parallel.ForEach(dates, parallelOptions, date =>
+        {
+            var salesInDay = sales.Where(x => x.SaleDate.Date == date.Date).ToArray();
+            if (salesInDay.Length > 0)
+            {
+                lock (_lockObject)
+                {
+                    calcPercent += (salesInDay.Sum(x => x.Sum) / salesInDay.Length) * config.SalePercent;
+                }
+            }
         });
+
+        double calcBonusTask = 0;
         try
         {
-            Task.WaitAll([Task.WhenAll(tasks), calcBonusTask]);
+            calcBonusTask = sales.Where(x => x.Sum > _salaryConfiguration.ExtraSaleSum).Sum(x => x.Sum) * config.BonusForExtraSales;
         }
-        catch (AggregateException agEx)
+        catch (Exception ex)
         {
-            foreach (var ex in agEx.InnerExceptions)
-            {
-                _logger.LogError(ex, "Error in the travel agnet payroll process");
-            }
-            return 0;
+            _logger.LogError(ex, "Error in bonus calculation");
         }
-        return config.Rate + calcPercent + calcBonusTask.Result;
+        return config.Rate + calcPercent + calcBonusTask;
     }
     private double CalculateSalaryForChief(DateTime startDate, DateTime finishDate, ChiefPostConfiguration config)
     {

MagicCarpetProject/MagicCarpetContracts/Infrastructure/IConfigurationSalary.cs

@@ -9,4 +9,6 @@ namespace MagicCarpetContracts.Infrastructure;
 public interface IConfigurationSalary
 {
     double ExtraSaleSum { get; }
+
+    int MaxConcurrentThreads { get; }
 }

MagicCarpetProject/MagicCarpetWebApi/Infrastructure/ConfigurationSalary.cs

@@ -10,4 +10,6 @@ public class ConfigurationSalary(IConfiguration configuration) : IConfigurationS
     });
 
     public double ExtraSaleSum => _salarySettings.Value.ExtraSaleSum;
+
+    public int MaxConcurrentThreads => _salarySettings.Value.MaxConcurrentThreads;
 }

MagicCarpetProject/MagicCarpetWebApi/Infrastructure/SalarySettings.cs

@@ -3,4 +3,6 @@
 public class SalarySettings
 {
     public double ExtraSaleSum { get; set; }
+
+    public int MaxConcurrentThreads { get; set; }
 }