🐛 Wrong action count for specific user statistics

Drogecode · Sep 27, 2024 · 46a06bf · 46a06bf
1 parent 140256f
commit 46a06bf
Show file tree

Hide file tree

Showing 19 changed files with 268 additions and 125 deletions.
diff --git a/src/Client/Pages/Dashboard/Components/StatisticsActionsAll.razor.cs b/src/Client/Pages/Dashboard/Components/StatisticsActionsAll.razor.cs
@@ -55,7 +55,7 @@ public async Task UpdateAnalyzeYearChartAll()
         _renderChart = false;
         await Task.Delay(1); // Will not update without this delay
         StateHasChanged();
-        var analyzeData = await ReportActionRepository.AnalyzeYearChartsAll(SelectedUsers, _selectedPrio, _cls.Token);
+        var analyzeData = await ReportActionRepository.AnalyzeYearChartsAll(SelectedUsers, _selectedPrio, AllYears ? null : 5, _cls.Token);
         if (analyzeData is null) return;
         _elapsedMilliseconds = analyzeData.ElapsedMilliseconds;
         _data = StatisticsTab.DrawLineChartAll(analyzeData, AllYears);

diff --git a/src/Client/Pages/Dashboard/Components/StatisticsTab.razor.cs b/src/Client/Pages/Dashboard/Components/StatisticsTab.razor.cs
@@ -65,8 +65,8 @@ public List<ChartYear> DrawLineChartAll(AnalyzeYearChartAllResponse? analyzeData
         var yearCount = 0;
         foreach (var year in analyzeData.Years.OrderByDescending(x => x.Year))
         {
-            if (!allYears && yearCount >= 5)
-                break;
+            /*if (!allYears && yearCount >= 5)
+                break;*/
             if (year.Year <= 2021)
             {
                 _showHistoricalIncorrectWarning = true;

diff --git a/src/Client/Repositories/ReportActionRepository.cs b/src/Client/Repositories/ReportActionRepository.cs
@@ -33,14 +33,15 @@ public async Task<MultipleReportActionsResponse> GetLastActions(IEnumerable<Drog
         return result;
     }
 
-    public async Task<AnalyzeYearChartAllResponse?> AnalyzeYearChartsAll(IEnumerable<DrogeUser> users, IEnumerable<string?> prio, CancellationToken clt)
+    public async Task<AnalyzeYearChartAllResponse?> AnalyzeYearChartsAll(IEnumerable<DrogeUser> users, IEnumerable<string?>? prio, int? years, CancellationToken clt)
     {
         try
         {
             var request = new AnalyzeActionRequest()
             {
                 Users = users.Select(x => (Guid?)x.Id).ToList(),
-                Prio = prio
+                Prio = prio,
+                Years = years
             };
             var result = await _reportActionClient.AnalyzeYearChartsAllAsync(request, clt);
             return result;

diff --git a/src/Server/Controllers/ReportTrainingController.cs b/src/Server/Controllers/ReportTrainingController.cs
@@ -93,7 +93,7 @@ public async Task<ActionResult<AnalyzeYearChartAllResponse>> AnalyzeYearChartsAl
             if (request.Users.Count > 5)
                 return new AnalyzeYearChartAllResponse() { Message = "To many users" };
 
-            var result = await _reportTrainingService.AnalyzeYearChartsAll(request.Users, customerId, timeZone, clt);
+            var result = await _reportTrainingService.AnalyzeYearChartsAll(request, customerId, timeZone, clt);
             return result;
         }
         catch (Exception ex)

diff --git a/src/Server/Database/DataContext.cs b/src/Server/Database/DataContext.cs
@@ -6,7 +6,7 @@
 
 namespace Drogecode.Knrm.Oefenrooster.Server.Database
 {
-    public class DataContext : DbContext, IDataProtectionKeyContext
+    public class DataContext(DbContextOptions<DataContext> context) : DbContext(context), IDataProtectionKeyContext
     {
         // To persist key's
         public DbSet<DataProtectionKey> DataProtectionKeys { get; set; } = null!;
@@ -43,10 +43,6 @@ public class DataContext : DbContext, IDataProtectionKeyContext
         public DbSet<DbLinkExchange> LinkExchanges{ get; set; }
 
 
-        public DataContext(DbContextOptions<DataContext> context) : base(context)
-        {
-        }
-
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             // Audit

diff --git a/src/Server/Program.cs b/src/Server/Program.cs
@@ -86,7 +86,10 @@
         new[] { "application/octet-stream" });
 });
 
-builder.Services.AddDbContextPool<DataContext>(options => options.UseNpgsql(dbConnectionString));
+builder.Services.AddDbContextPool<DataContext>(options =>
+{
+    options.UseNpgsql(dbConnectionString);
+});
 builder.Services.AddApplicationInsightsTelemetry(new ApplicationInsightsServiceOptions
 {
     ConnectionString = builder.Configuration["APPLICATIONINSIGHTS_CONNECTION_STRING"],

diff --git a/src/Server/Services/Interfaces/IReportTrainingService.cs b/src/Server/Services/Interfaces/IReportTrainingService.cs
@@ -6,5 +6,5 @@ namespace Drogecode.Knrm.Oefenrooster.Server.Services.Interfaces;
 public interface IReportTrainingService
 {
     Task<MultipleReportTrainingsResponse> GetListTrainingUser(List<Guid?> users, Guid userId, int count, int skip, Guid customerId, CancellationToken clt);
-    Task<AnalyzeYearChartAllResponse> AnalyzeYearChartsAll(List<Guid?> users, Guid customerId, string timeZone, CancellationToken clt);
+    Task<AnalyzeYearChartAllResponse> AnalyzeYearChartsAll(AnalyzeTrainingRequest trainingRequest, Guid customerId, string timeZone, CancellationToken clt);
 }
diff --git a/src/Server/Services/ReportActionService.cs b/src/Server/Services/ReportActionService.cs
@@ -40,19 +40,32 @@ public async Task<AnalyzeYearChartAllResponse> AnalyzeYearChartsAll(AnalyzeActio
                         && (actionRequest.Prio == null || !actionRequest.Prio.Any() || actionRequest.Prio.Contains(x.Prio))
                         && x.Users!.Count(y => actionRequest.Users!.Contains(y.DrogeCodeId)) == actionRequest.Users!.Count)
             .Select(x => new { x.Start, x.Number })
-            .OrderBy(x => x.Start)
+            .OrderByDescending(x => x.Start)
             .ToListAsync(clt);
         var result = new AnalyzeYearChartAllResponse { TotalCount = allReports.Count() };
         var skipped = 0;
+        List<int> years = new();
         foreach (var report in allReports)
         {
-            if (report.Number is not null && (report.Number % 1) != 0 && allReports.Select(x => x.Start.Year == report.Start.Year && x.Number?.FloatingEquals((int)report.Number, 0.1) == true).Any())
+            if (report.Number is not null && (report.Number % 1) != 0 && allReports.Count(x => x.Start.Year == report.Start.Year && x.Number?.FloatingEquals((int)report.Number, 0.1) == true) >= 2)
             {
                 skipped++;
                 continue;
             }
+
             var zone = TimeZoneInfo.FindSystemTimeZoneById(timeZone);
             var start = TimeZoneInfo.ConvertTimeFromUtc(report.Start, zone);
+
+            if (!years.Contains(start.Year)) // Could not find a way to check this in the db request.
+            {
+                if (years.Count >= actionRequest.Years)
+                {
+                    break;
+                }
+
+                years.Add(start.Year);
+            }
+
             if (result.Years.All(x => x.Year != start.Year))
             {
                 result.Years.Add(new AnalyzeYearDetails() { Year = start.Year });

diff --git a/src/Server/Services/ReportTrainingService.cs b/src/Server/Services/ReportTrainingService.cs
@@ -31,16 +31,27 @@ public async Task<MultipleReportTrainingsResponse> GetListTrainingUser(List<Guid
     }
 
 
-    public async Task<AnalyzeYearChartAllResponse> AnalyzeYearChartsAll(List<Guid?> users, Guid customerId, string timeZone, CancellationToken clt)
+    public async Task<AnalyzeYearChartAllResponse> AnalyzeYearChartsAll(AnalyzeTrainingRequest trainingRequest, Guid customerId, string timeZone, CancellationToken clt)
     {
         var sw = Stopwatch.StartNew();
         var allReports = _database.ReportTrainings
-            .Where(x => x.CustomerId == customerId && x.Users.Count(y => users.Contains(y.DrogeCodeId)) == users.Count)
+            .Where(x => x.CustomerId == customerId && x.Users!.Count(y => trainingRequest.Users!.Contains(y.DrogeCodeId)) == trainingRequest.Users!.Count)
             .Select(x => new { x.Start });
         var result = new AnalyzeYearChartAllResponse { TotalCount = allReports.Count() };
+        List<int> years = new();
         foreach (var report in allReports)
         {
             var start = report.Start.ToDateTimeTimeZone(timeZone).ToDateTime();
+
+            if (!years.Contains(start.Year)) // Could not find a way to check this in the db request.
+            {
+                if (years.Count >= trainingRequest.Years)
+                {
+                    break;
+                }
+
+                years.Add(start.Year);
+            }
             if (result.Years.All(x => x.Year != start.Year))
             {
                 result.Years.Add(new AnalyzeYearDetails() { Year = start.Year });

diff --git a/src/Server/Services/ScheduleService.cs b/src/Server/Services/ScheduleService.cs
@@ -560,7 +560,6 @@ public async Task<ScheduleForAllResponse> ScheduleForAllAsync(Guid userId, Guid
             else if (vehicle.IsDefault)
             {
                 vehiclePrev = vehicle;
-                //break;
             }
         }
 

diff --git a/src/Shared/Models/ReportAction/AnalyzeActionRequest.cs b/src/Shared/Models/ReportAction/AnalyzeActionRequest.cs
@@ -4,4 +4,5 @@ public class AnalyzeActionRequest
 {
     public List<Guid?>? Users { get; set; }
     public IEnumerable<string?>? Prio { get; set; }
+    public int? Years { get; set; }
 }
diff --git a/src/Shared/Models/ReportTraining/AnalyzeTrainingRequest.cs b/src/Shared/Models/ReportTraining/AnalyzeTrainingRequest.cs
@@ -3,4 +3,5 @@
 public class AnalyzeTrainingRequest
 {
     public List<Guid?>? Users { get; set; }
+    public int? Years { get; set; }
 }
diff --git a/tests/Drogecode.Knrm.Oefenrooster.TestServer/Seeds/SeedCustomer.cs b/tests/Drogecode.Knrm.Oefenrooster.TestServer/Seeds/SeedCustomer.cs
@@ -0,0 +1,18 @@
+using Drogecode.Knrm.Oefenrooster.Server.Database.Models;
+
+namespace Drogecode.Knrm.Oefenrooster.TestServer.Seeds;
+
+public class SeedCustomer
+{
+    public static void Seed(DataContext dataContext, Guid defaultCustomerId)
+    {
+        dataContext.Customers.Add(new DbCustomers
+        {
+            Id = defaultCustomerId,
+            Name = "xUnit customer",
+            TimeZone = "Europe/Amsterdam",
+            Created = DateTime.UtcNow
+        });
+        dataContext.SaveChanges();
+    }
+}
diff --git a/tests/Drogecode.Knrm.Oefenrooster.TestServer/Seeds/SeedReportAction.cs b/tests/Drogecode.Knrm.Oefenrooster.TestServer/Seeds/SeedReportAction.cs
@@ -0,0 +1,65 @@
+using Drogecode.Knrm.Oefenrooster.Server.Database.Models;
+using Drogecode.Knrm.Oefenrooster.Shared.Helpers;
+
+namespace Drogecode.Knrm.Oefenrooster.TestServer.Seeds;
+
+public static class SeedReportAction
+{
+    public static void Seed(DataContext dataContext, Guid defaultCustomerId)
+    {
+        SeedForYear(dataContext, defaultCustomerId, 2022);
+        SeedForYear(dataContext, defaultCustomerId, 2020);
+        SeedForYear(dataContext, defaultCustomerId, 2019);
+        SeedForYear(dataContext, defaultCustomerId, 2018);
+        SeedForYear(dataContext, defaultCustomerId, 2016);
+        SeedForYear(dataContext, defaultCustomerId, 2012);
+        SeedForYear(dataContext, defaultCustomerId, 2004);
+        dataContext.SaveChanges();
+    }
+
+    private static void SeedForYear(DataContext dataContext, Guid defaultCustomerId, int year)
+    {
+        var start = new DateTime(year, 3, 8, 8, 5, 41);
+        dataContext.ReportActions.Add(new DbReportAction
+        {
+            Id = Guid.NewGuid(),
+            CustomerId = defaultCustomerId,
+            Description = "xUnit Description A",
+            Start = start,
+            Commencement = start.AddMinutes(5),
+            Departure = start.AddMinutes(15),
+            End = start.AddMinutes(121),
+            Boat = "xUnit boat",
+            Prio = "Prio 69",
+            Users = new List<DbReportUser>{new DbReportUser{DrogeCodeId = DefaultSettingsHelper.IdTaco}},
+        });
+        start = start.AddDays(1);
+        dataContext.ReportActions.Add(new DbReportAction
+        {
+            Id = Guid.NewGuid(),
+            CustomerId = defaultCustomerId,
+            Description = "xUnit Description B",
+            Start = start,
+            Commencement = start.AddMinutes(5),
+            Departure = start.AddMinutes(15),
+            End = start.AddMinutes(121),
+            Boat = "xUnit boat",
+            Prio = "Prio 1",
+            Users = new List<DbReportUser>{new DbReportUser{DrogeCodeId = DefaultSettingsHelper.IdTaco}},
+        });
+        start = start.AddMonths(1);
+        dataContext.ReportActions.Add(new DbReportAction
+        {
+            Id = Guid.NewGuid(),
+            CustomerId = defaultCustomerId,
+            Description = "xUnit Description C",
+            Start = start,
+            Commencement = start.AddMinutes(5),
+            Departure = start.AddMinutes(15),
+            End = start.AddMinutes(121),
+            Boat = "xUnit boat",
+            Prio = "Prio 1",
+            Users = new List<DbReportUser>{new DbReportUser{DrogeCodeId = DefaultSettingsHelper.IdTaco}},
+        });
+    }
+}
diff --git a/tests/Drogecode.Knrm.Oefenrooster.TestServer/Seeds/SeedReportTraining.cs b/tests/Drogecode.Knrm.Oefenrooster.TestServer/Seeds/SeedReportTraining.cs
@@ -0,0 +1,59 @@
+using Drogecode.Knrm.Oefenrooster.Server.Database.Models;
+using Drogecode.Knrm.Oefenrooster.Shared.Helpers;
+
+namespace Drogecode.Knrm.Oefenrooster.TestServer.Seeds;
+
+public static class SeedReportTraining
+{
+    public static void Seed(DataContext dataContext, Guid defaultCustomerId)
+    {
+        SeedForYear(dataContext, defaultCustomerId, 2022);
+        SeedForYear(dataContext, defaultCustomerId, 2020);
+        SeedForYear(dataContext, defaultCustomerId, 2019);
+        SeedForYear(dataContext, defaultCustomerId, 2018);
+        SeedForYear(dataContext, defaultCustomerId, 2016);
+        SeedForYear(dataContext, defaultCustomerId, 2012);
+        SeedForYear(dataContext, defaultCustomerId, 2004);
+        dataContext.SaveChanges();
+    }
+
+    private static void SeedForYear(DataContext dataContext, Guid defaultCustomerId, int year)
+    {
+        var start = new DateTime(year, 3, 8, 8, 5, 41);
+        dataContext.ReportTrainings.Add(new DbReportTraining
+        {
+            Id = Guid.NewGuid(),
+            CustomerId = defaultCustomerId,
+            Description = "xUnit Description A",
+            Start = start,
+            Commencement = start.AddMinutes(5),
+            End = start.AddMinutes(121),
+            Boat = "xUnit boat",
+            Users = new List<DbReportUser> { new DbReportUser { DrogeCodeId = DefaultSettingsHelper.IdTaco } },
+        });
+        start = start.AddDays(1);
+        dataContext.ReportTrainings.Add(new DbReportTraining
+        {
+            Id = Guid.NewGuid(),
+            CustomerId = defaultCustomerId,
+            Description = "xUnit Description B",
+            Start = start,
+            Commencement = start.AddMinutes(5),
+            End = start.AddMinutes(121),
+            Boat = "xUnit boat",
+            Users = new List<DbReportUser> { new DbReportUser { DrogeCodeId = DefaultSettingsHelper.IdTaco } },
+        });
+        start = start.AddMonths(1);
+        dataContext.ReportTrainings.Add(new DbReportTraining
+        {
+            Id = Guid.NewGuid(),
+            CustomerId = defaultCustomerId,
+            Description = "xUnit Description C",
+            Start = start,
+            Commencement = start.AddMinutes(5),
+            End = start.AddMinutes(121),
+            Boat = "xUnit boat",
+            Users = new List<DbReportUser> { new DbReportUser { DrogeCodeId = DefaultSettingsHelper.IdTaco } },
+        });
+    }
+}