Rename model class name.

mo-esmp · mo-esmp · commit bbc9b31c67bd · 2025-08-01T08:18:47.000+02:00
diff --git a/src/Serilog.Ui.Core/AggregateDataProvider.cs b/src/Serilog.Ui.Core/AggregateDataProvider.cs
@@ -68,7 +68,7 @@ public AggregateDataProvider(IEnumerable<IDataProvider> dataProviders)
         => SelectedDataProvider.FetchDataAsync(queryParams, cancellationToken);
 
     /// <inheritdoc />
-    public Task<DashboardModel> FetchDashboardAsync(CancellationToken cancellationToken = default)
+    public Task<LogStatisticModel> FetchDashboardAsync(CancellationToken cancellationToken = default)
         => SelectedDataProvider.FetchDashboardAsync(cancellationToken);
 
     /// <summary>
diff --git a/src/Serilog.Ui.Core/IDataProvider.cs b/src/Serilog.Ui.Core/IDataProvider.cs
@@ -24,5 +24,5 @@ public interface IDataProvider
     /// <summary>
     ///     Fetches dashboard statistics asynchronous.
     /// </summary>
-    Task<DashboardModel> FetchDashboardAsync(CancellationToken cancellationToken = default);
+    Task<LogStatisticModel> FetchDashboardAsync(CancellationToken cancellationToken = default);
 }
diff --git a/src/Serilog.Ui.Core/Models/LogStatisticModel.cs b/src/Serilog.Ui.Core/Models/LogStatisticModel.cs
@@ -5,7 +5,7 @@ namespace Serilog.Ui.Core.Models;
 /// <summary>
 ///     Represents dashboard statistics for log data visualization.
 /// </summary>
-public class DashboardModel
+public class LogStatisticModel
 {
     /// <summary>
     ///     Gets or sets the total count of logs.
diff --git a/src/Serilog.Ui.ElasticSearchProvider/ElasticSearchDbDataProvider.cs b/src/Serilog.Ui.ElasticSearchProvider/ElasticSearchDbDataProvider.cs
@@ -27,7 +27,7 @@ public class ElasticSearchDbDataProvider(IElasticClient client, ElasticSearchDbO
     public Task<(IEnumerable<LogModel>, int)> FetchDataAsync(FetchLogsQuery queryParams,
         CancellationToken cancellationToken = default) => GetLogsAsync(queryParams, cancellationToken);
 
-    public Task<DashboardModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>
+    public Task<LogStatisticModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>
         throw new NotImplementedException();
 
     public string Name => _options.ProviderName;
diff --git a/src/Serilog.Ui.MongoDbProvider/MongoDbDataProvider.cs b/src/Serilog.Ui.MongoDbProvider/MongoDbDataProvider.cs
@@ -38,7 +38,7 @@ public MongoDbDataProvider(IMongoClient client, MongoDbOptions options)
         return (logsTask, logCountTask);
     }
 
-    public Task<DashboardModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>
+    public Task<LogStatisticModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>
         throw new NotImplementedException();
 
     public string Name => _options.ProviderName;
diff --git a/src/Serilog.Ui.MsSqlServerProvider/SqlServerDataProvider.cs b/src/Serilog.Ui.MsSqlServerProvider/SqlServerDataProvider.cs
@@ -38,7 +38,7 @@ public class SqlServerDataProvider<T>(SqlServerDbOptions options, SqlServerQuery
         return (await logsTask, await logCountTask);
     }
 
-    public Task<DashboardModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>
+    public Task<LogStatisticModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>
         throw new NotImplementedException();
 
     private async Task<IEnumerable<LogModel>> GetLogsAsync(FetchLogsQuery queryParams)
diff --git a/src/Serilog.Ui.MySqlProvider/Shared/DataProvider.cs b/src/Serilog.Ui.MySqlProvider/Shared/DataProvider.cs
@@ -28,7 +28,7 @@ public abstract class DataProvider<T>(MySqlDbOptions options, MySqlQueryBuilder<
         return (await logsTask, await logCountTask);
     }
 
-    public Task<DashboardModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>
+    public Task<LogStatisticModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>
         throw new NotImplementedException();
 
     private async Task<IEnumerable<LogModel>> GetLogsAsync(FetchLogsQuery queryParams)
diff --git a/src/Serilog.Ui.PostgreSqlProvider/PostgresDataProvider.cs b/src/Serilog.Ui.PostgreSqlProvider/PostgresDataProvider.cs
@@ -39,7 +39,7 @@ public class PostgresDataProvider<T>(PostgreSqlDbOptions options, PostgresQueryB
     }
 
     /// <inheritdoc />
-    public async Task<DashboardModel> FetchDashboardAsync(CancellationToken cancellationToken = default)
+    public async Task<LogStatisticModel> FetchDashboardAsync(CancellationToken cancellationToken = default)
     {
         DateTime today = DateTime.Today;
         DateTime tomorrow = today.AddDays(1);
@@ -72,7 +72,7 @@ public async Task<DashboardModel> FetchDashboardAsync(CancellationToken cancella
         int todayErrorLogs = await connection.QueryFirstOrDefaultAsync<int>(todayErrorQuery,
             new { ErrorLevel = LogLevelConverter.GetLevelValue("Error"), StartDate = today, EndDate = tomorrow });
 
-        DashboardModel model = new()
+        LogStatisticModel model = new()
         {
             TotalLogs = totalLogs,
             LogsByLevel = logsByLevel,
diff --git a/src/Serilog.Ui.RavenDbProvider/RavenDbDataProvider.cs b/src/Serilog.Ui.RavenDbProvider/RavenDbDataProvider.cs
@@ -33,7 +33,7 @@ public class RavenDbDataProvider(IDocumentStore documentStore, RavenDbOptions op
         return (await logsTask, await logCountTask);
     }
 
-    public Task<DashboardModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>
+    public Task<LogStatisticModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>
         throw new NotImplementedException();
 
     private async Task<IEnumerable<LogModel>> GetLogsAsync(FetchLogsQuery queryParams,
diff --git a/src/Serilog.Ui.SqliteDataProvider/SqliteDataProvider.cs b/src/Serilog.Ui.SqliteDataProvider/SqliteDataProvider.cs
@@ -30,7 +30,7 @@ public class SqliteDataProvider(SqliteDbOptions options, SqliteQueryBuilder quer
         return (await logsTask, await logCountTask);
     }
 
-    public Task<DashboardModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>
+    public Task<LogStatisticModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>
         throw new NotImplementedException();
 
     public string Name => _options.GetProviderName(SqliteProviderName);
diff --git a/tests/Serilog.Ui.PostgreSqlProvider.Tests/DataProvider/DataProviderDashboardTests.cs b/tests/Serilog.Ui.PostgreSqlProvider.Tests/DataProvider/DataProviderDashboardTests.cs
@@ -35,40 +35,40 @@ public async Task It_fetches_dashboard_data_successfully()
         };
 
         // Act
-        DashboardModel dashboard = await _provider.FetchDashboardAsync();
+        LogStatisticModel logStatistic = await _provider.FetchDashboardAsync();
 
         // Assert
-        dashboard.Should().NotBeNull();
-        dashboard.TotalLogs.Should().BeGreaterThanOrEqualTo(27);
-        dashboard.LogsByLevel.Should().NotBeNull().And.NotBeEmpty();
-        dashboard.LogsByLevel.Should().BeEquivalentTo(expectedLogsByLevel);
-        dashboard.TodayLogs.Should().BeGreaterThanOrEqualTo(27);
-        dashboard.TodayErrorLogs.Should().BeGreaterThanOrEqualTo(2);
+        logStatistic.Should().NotBeNull();
+        logStatistic.TotalLogs.Should().BeGreaterThanOrEqualTo(27);
+        logStatistic.LogsByLevel.Should().NotBeNull().And.NotBeEmpty();
+        logStatistic.LogsByLevel.Should().BeEquivalentTo(expectedLogsByLevel);
+        logStatistic.TodayLogs.Should().BeGreaterThanOrEqualTo(27);
+        logStatistic.TodayErrorLogs.Should().BeGreaterThanOrEqualTo(2);
     }
 
     [Fact]
     public async Task It_returns_correct_total_logs_count()
     {
         // Act
-        DashboardModel dashboard = await _provider.FetchDashboardAsync();
+        LogStatisticModel logStatistic = await _provider.FetchDashboardAsync();
 
         // Assert
-        dashboard.TotalLogs.Should().Be(_logCollector.DataSet.Count);
+        logStatistic.TotalLogs.Should().Be(_logCollector.DataSet.Count);
     }
 
     [Fact]
     public async Task It_returns_correct_logs_by_level_count()
     {
         // Act
-        DashboardModel dashboard = await _provider.FetchDashboardAsync();
+        LogStatisticModel logStatistic = await _provider.FetchDashboardAsync();
 
         // Assert
-        dashboard.LogsByLevel.Should().NotBeNull();
+        logStatistic.LogsByLevel.Should().NotBeNull();
 
         foreach (KeyValuePair<string, int> expectedLevel in _logCollector.CountByLevel)
         {
-            dashboard.LogsByLevel.Should().ContainKey(expectedLevel.Key);
-            dashboard.LogsByLevel[expectedLevel.Key].Should().Be(expectedLevel.Value);
+            logStatistic.LogsByLevel.Should().ContainKey(expectedLevel.Key);
+            logStatistic.LogsByLevel[expectedLevel.Key].Should().Be(expectedLevel.Value);
         }
     }
 
@@ -83,10 +83,10 @@ public async Task It_returns_today_logs_count_when_logs_exist_today()
             .Count(log => log.Timestamp >= today && log.Timestamp < tomorrow);
 
         // Act
-        DashboardModel dashboard = await _provider.FetchDashboardAsync();
+        LogStatisticModel logStatistic = await _provider.FetchDashboardAsync();
 
         // Assert
-        dashboard.TodayLogs.Should().Be(expectedTodayLogs);
+        logStatistic.TodayLogs.Should().Be(expectedTodayLogs);
     }
 
     [Fact]
@@ -97,37 +97,37 @@ public async Task It_handles_empty_database_gracefully()
         // For now, we'll test that the method doesn't throw and returns valid structure
 
         // Act
-        DashboardModel dashboard = await _provider.FetchDashboardAsync();
+        LogStatisticModel logStatistic = await _provider.FetchDashboardAsync();
 
         // Assert
-        dashboard.Should().NotBeNull();
-        dashboard.LogsByLevel.Should().NotBeNull();
-        dashboard.TotalLogs.Should().BeGreaterThanOrEqualTo(0);
-        dashboard.TodayLogs.Should().BeGreaterThanOrEqualTo(0);
+        logStatistic.Should().NotBeNull();
+        logStatistic.LogsByLevel.Should().NotBeNull();
+        logStatistic.TotalLogs.Should().BeGreaterThanOrEqualTo(0);
+        logStatistic.TodayLogs.Should().BeGreaterThanOrEqualTo(0);
     }
 
     [Fact]
     public async Task It_includes_all_expected_log_levels()
     {
         // Act
-        DashboardModel dashboard = await _provider.FetchDashboardAsync();
+        LogStatisticModel logStatistic = await _provider.FetchDashboardAsync();
 
         // Assert
         List<string?> availableLevels = _logCollector.DataSet.Select(log => log.Level).Distinct().ToList();
 
         foreach (string? level in availableLevels)
         {
-            dashboard.LogsByLevel.Should().ContainKey(level!);
-            dashboard.LogsByLevel[level!].Should().BeGreaterThan(0);
+            logStatistic.LogsByLevel.Should().ContainKey(level!);
+            logStatistic.LogsByLevel[level!].Should().BeGreaterThan(0);
         }
     }
 
     [Fact]
     public async Task It_calculates_dashboard_metrics_consistently()
     {
         // Act - Call multiple times to ensure consistency
-        DashboardModel dashboard1 = await _provider.FetchDashboardAsync();
-        DashboardModel dashboard2 = await _provider.FetchDashboardAsync();
+        LogStatisticModel dashboard1 = await _provider.FetchDashboardAsync();
+        LogStatisticModel dashboard2 = await _provider.FetchDashboardAsync();
 
         // Assert - Results should be identical
         dashboard1.TotalLogs.Should().Be(dashboard2.TotalLogs);
@@ -142,7 +142,7 @@ public async Task It_uses_correct_date_boundaries_for_today_logs()
         DateTime today = DateTime.Today;
 
         // Act
-        DashboardModel dashboard = await _provider.FetchDashboardAsync();
+        LogStatisticModel logStatistic = await _provider.FetchDashboardAsync();
 
         // Assert
         // The TodayLogs count should match manual calculation using same date boundaries
@@ -151,7 +151,7 @@ public async Task It_uses_correct_date_boundaries_for_today_logs()
 
         // Note: This might not be exact due to time zone handling and precise time boundaries
         // but should be in the same ballpark
-        dashboard.TodayLogs.Should().BeGreaterThanOrEqualTo(0);
+        logStatistic.TodayLogs.Should().BeGreaterThanOrEqualTo(0);
     }
 
     public override Task It_throws_when_skip_is_zero() => throw new NotImplementedException();
@@ -168,22 +168,22 @@ public class DataProviderDashboardWithColsTests(PostgresAdditionalColsTestProvid
     public async Task It_fetches_dashboard_data_with_additional_columns()
     {
         // Act
-        DashboardModel dashboard = await _provider.FetchDashboardAsync();
+        LogStatisticModel logStatistic = await _provider.FetchDashboardAsync();
 
         // Assert
-        dashboard.Should().NotBeNull();
-        dashboard.TotalLogs.Should().BeGreaterThan(0);
-        dashboard.LogsByLevel.Should().NotBeNull().And.NotBeEmpty();
-        dashboard.TodayLogs.Should().BeGreaterThanOrEqualTo(0);
+        logStatistic.Should().NotBeNull();
+        logStatistic.TotalLogs.Should().BeGreaterThan(0);
+        logStatistic.LogsByLevel.Should().NotBeNull().And.NotBeEmpty();
+        logStatistic.TodayLogs.Should().BeGreaterThanOrEqualTo(0);
     }
 
     [Fact]
     public async Task It_returns_correct_total_logs_count_with_additional_columns()
     {
         // Act
-        DashboardModel dashboard = await _provider.FetchDashboardAsync();
+        LogStatisticModel logStatistic = await _provider.FetchDashboardAsync();
 
         // Assert
-        dashboard.TotalLogs.Should().Be(_logCollector.DataSet.Count);
+        logStatistic.TotalLogs.Should().Be(_logCollector.DataSet.Count);
     }
 }
diff --git a/tests/Serilog.Ui.Web.Tests/Endpoints/SerilogUiEndpointsTest.cs b/tests/Serilog.Ui.Web.Tests/Endpoints/SerilogUiEndpointsTest.cs
@@ -150,7 +150,7 @@ private class FakeProvider : IDataProvider
             return Task.FromResult<(IEnumerable<LogModel>, int)>((modelArray, 100));
         }
 
-        public Task<DashboardModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>
+        public Task<LogStatisticModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>
             throw new NotImplementedException();
     }
 
@@ -174,7 +174,7 @@ private class FakeSecondProvider : IDataProvider
             return Task.FromResult<(IEnumerable<LogModel>, int)>((modelArray, 50));
         }
 
-        public Task<DashboardModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>
+        public Task<LogStatisticModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>
             throw new NotImplementedException();
     }
 
@@ -183,7 +183,7 @@ private class BrokenProvider : IDataProvider
         public Task<(IEnumerable<LogModel>, int)> FetchDataAsync(FetchLogsQuery queryParams,
             CancellationToken cancellationToken = default) => throw new NotImplementedException();
 
-        public Task<DashboardModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>
+        public Task<LogStatisticModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>
             throw new NotImplementedException();
 
         public string Name { get; } = "BrokenProvider";
diff --git a/tests/Serilog.Ui.Web.Tests/Utilities/InMemoryDataProvider/InMemoryDataProvider.cs b/tests/Serilog.Ui.Web.Tests/Utilities/InMemoryDataProvider/InMemoryDataProvider.cs
@@ -43,6 +43,6 @@ public class SerilogInMemoryDataProvider : IDataProvider
         return Task.FromResult((logs as IEnumerable<LogModel>, logs.Count));
     }
 
-    public Task<DashboardModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>
+    public Task<LogStatisticModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>
         throw new NotImplementedException();
 }

Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,5 @@ public interface IDataProvider`
`24`	`24`	`/// <summary>`
`25`	`25`	`/// Fetches dashboard statistics asynchronous.`
`26`	`26`	`/// </summary>`
`27`		`- Task<DashboardModel> FetchDashboardAsync(CancellationToken cancellationToken = default);`
	`27`	`+ Task<LogStatisticModel> FetchDashboardAsync(CancellationToken cancellationToken = default);`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace Serilog.Ui.Core.Models;`
`5`	`5`	`/// <summary>`
`6`	`6`	`/// Represents dashboard statistics for log data visualization.`
`7`	`7`	`/// </summary>`
`8`		`-public class DashboardModel`
	`8`	`+public class LogStatisticModel`
`9`	`9`	`{`
`10`	`10`	`/// <summary>`
`11`	`11`	`/// Gets or sets the total count of logs.`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public MongoDbDataProvider(IMongoClient client, MongoDbOptions options)`
`38`	`38`	`return (logsTask, logCountTask);`
`39`	`39`	`}`
`40`	`40`
`41`		`- public Task<DashboardModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>`
	`41`	`+ public Task<LogStatisticModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>`
`42`	`42`	`throw new NotImplementedException();`
`43`	`43`
`44`	`44`	`public string Name => _options.ProviderName;`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public class SqlServerDataProvider<T>(SqlServerDbOptions options, SqlServerQuery`
`38`	`38`	`return (await logsTask, await logCountTask);`
`39`	`39`	`}`
`40`	`40`
`41`		`- public Task<DashboardModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>`
	`41`	`+ public Task<LogStatisticModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>`
`42`	`42`	`throw new NotImplementedException();`
`43`	`43`
`44`	`44`	`private async Task<IEnumerable<LogModel>> GetLogsAsync(FetchLogsQuery queryParams)`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public abstract class DataProvider<T>(MySqlDbOptions options, MySqlQueryBuilder<`
`28`	`28`	`return (await logsTask, await logCountTask);`
`29`	`29`	`}`
`30`	`30`
`31`		`- public Task<DashboardModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>`
	`31`	`+ public Task<LogStatisticModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>`
`32`	`32`	`throw new NotImplementedException();`
`33`	`33`
`34`	`34`	`private async Task<IEnumerable<LogModel>> GetLogsAsync(FetchLogsQuery queryParams)`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public class PostgresDataProvider<T>(PostgreSqlDbOptions options, PostgresQueryB`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`/// <inheritdoc />`
`42`		`- public async Task<DashboardModel> FetchDashboardAsync(CancellationToken cancellationToken = default)`
	`42`	`+ public async Task<LogStatisticModel> FetchDashboardAsync(CancellationToken cancellationToken = default)`
`43`	`43`	`{`
`44`	`44`	`DateTime today = DateTime.Today;`
`45`	`45`	`DateTime tomorrow = today.AddDays(1);`
`@@ -72,7 +72,7 @@ public async Task<DashboardModel> FetchDashboardAsync(CancellationToken cancella`
`72`	`72`	`int todayErrorLogs = await connection.QueryFirstOrDefaultAsync<int>(todayErrorQuery,`
`73`	`73`	`new { ErrorLevel = LogLevelConverter.GetLevelValue("Error"), StartDate = today, EndDate = tomorrow });`
`74`	`74`
`75`		`- DashboardModel model = new()`
	`75`	`+ LogStatisticModel model = new()`
`76`	`76`	`{`
`77`	`77`	`TotalLogs = totalLogs,`
`78`	`78`	`LogsByLevel = logsByLevel,`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public class RavenDbDataProvider(IDocumentStore documentStore, RavenDbOptions op`
`33`	`33`	`return (await logsTask, await logCountTask);`
`34`	`34`	`}`
`35`	`35`
`36`		`- public Task<DashboardModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>`
	`36`	`+ public Task<LogStatisticModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>`
`37`	`37`	`throw new NotImplementedException();`
`38`	`38`
`39`	`39`	`private async Task<IEnumerable<LogModel>> GetLogsAsync(FetchLogsQuery queryParams,`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public class SqliteDataProvider(SqliteDbOptions options, SqliteQueryBuilder quer`
`30`	`30`	`return (await logsTask, await logCountTask);`
`31`	`31`	`}`
`32`	`32`
`33`		`- public Task<DashboardModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>`
	`33`	`+ public Task<LogStatisticModel> FetchDashboardAsync(CancellationToken cancellationToken = default) =>`
`34`	`34`	`throw new NotImplementedException();`
`35`	`35`
`36`	`36`	`public string Name => _options.GetProviderName(SqliteProviderName);`