Fixed #56 The level property type changes to a string

realLiangshiwei · realLiangshiwei · commit 388763d5a3f4 · 2019-12-05T13:57:00.000+08:00
diff --git a/LogDashboard.sln b/LogDashboard.sln
@@ -36,7 +36,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "aspnetcore2.2", "test\aspne
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UseAuthorization", "samples\UseAuthorization\UseAuthorization.csproj", "{18ECBB64-4939-4C0B-B00D-D9382AB4F6DC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySqlDatabase", "samples\MySqlDatabase\MySqlDatabase.csproj", "{EB0A1237-E9B8-4138-A8CE-DBD6C41771FC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MySqlDatabase", "samples\MySqlDatabase\MySqlDatabase.csproj", "{EB0A1237-E9B8-4138-A8CE-DBD6C41771FC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/CustomLogModel/NLog.config b/samples/CustomLogModel/NLog.config
@@ -25,7 +25,7 @@
   </targets>
 
   <rules>
-    <logger name="*" minlevel="Error" writeTo="file" />
+    <logger name="*" minlevel="Debug" writeTo="File" />
     <!-- add your logging rules here -->
 
     <!--
diff --git a/samples/DatabaseSource/Startup.cs b/samples/DatabaseSource/Startup.cs
@@ -62,6 +62,8 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             app.UseStaticFiles();
             app.UseCookiePolicy();
 
+            app.UseRouting();
+
             app.UseLogDashboard();
 
             app.UseEndpoints(routes =>
diff --git a/samples/DatabaseSource/appsettings.json b/samples/DatabaseSource/appsettings.json
@@ -1,6 +1,6 @@
 {
   "ConnectionStrings": {
-    "DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=log;Trusted_Connection=True;MultipleActiveResultSets=true"
+    "DefaultConnection": "Server=.;Database=log;Trusted_Connection=True;MultipleActiveResultSets=true"
   },
   "Logging": {
     "LogLevel": {
diff --git a/samples/MySqlDatabase/Startup.cs b/samples/MySqlDatabase/Startup.cs
@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using MySql.Data.MySqlClient;
 
 namespace MySqlDatabase
@@ -41,6 +42,12 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
 
             app.Run(async (context) =>
             {
+                var log = app.ApplicationServices.GetService<ILogger<Startup>>();
+                log.LogInformation("info message");
+                log.LogDebug("debug message");
+                log.LogError("error message");
+                log.LogTrace("trace message");
+                log.LogWarning("warn message");
                 await context.Response.WriteAsync("Hello World!");
             });
 
diff --git a/src/LogDashboard/Handle/DashboardHandle.cs b/src/LogDashboard/Handle/DashboardHandle.cs
@@ -98,7 +98,7 @@ private async Task<PagedResultModel<T>> GetPageResult(SearchLogInput input)
 
             expression = expression.AndIf(input.EndTime != null, () => { return x => x.LongDate <= input.EndTime.Value; });
 
-            expression = expression.AndIf(input.Level.HasValue, () => { return x => x.Level == input.Level; });
+            expression = expression.AndIf(!string.IsNullOrWhiteSpace(input.Level), () => { return x => x.Level == input.Level; });
 
             expression = expression.AndIf(!string.IsNullOrWhiteSpace(input.Message), () => { return x => x.Message.Contains(input.Message); });
 
diff --git a/src/LogDashboard/Handle/LogChart/DayLogChart.cs b/src/LogDashboard/Handle/LogChart/DayLogChart.cs
@@ -31,18 +31,18 @@ public async Task<GetLogChartsOutput> GetCharts<T>(IRepository<T> repository) wh
                 {
                     var startTime = date.AddHours(i);
                     output.All[i] = await repository.CountAsync(x => x.LongDate >= startTime && x.LongDate <= startTime.AddMinutes(59).AddSeconds(59));
-                    output.Error[i] = await CountAsync(LogLevel.ERROR, repository, startTime, i);
-                    output.Info[i] = await CountAsync(LogLevel.INFO, repository, startTime, i);
-                    output.Debug[i] = await CountAsync(LogLevel.DEBUG, repository, startTime, i);
-                    output.Fatal[i] = await CountAsync(LogLevel.FATAL, repository, startTime, i);
-                    output.Trace[i] = await CountAsync(LogLevel.TRACE, repository, startTime, i);
-                    output.Warn[i] = await CountAsync(LogLevel.WARN, repository, startTime, i);
+                    output.Error[i] = await CountAsync(LogLevelConst.Error, repository, startTime, i);
+                    output.Info[i] = await CountAsync(LogLevelConst.Info, repository, startTime, i);
+                    output.Debug[i] = await CountAsync(LogLevelConst.Debug, repository, startTime, i);
+                    output.Fatal[i] = await CountAsync(LogLevelConst.Fatal, repository, startTime, i);
+                    output.Trace[i] = await CountAsync(LogLevelConst.Trace, repository, startTime, i);
+                    output.Warn[i] = await CountAsync(LogLevelConst.Warn, repository, startTime, i);
                 }
             }
             return output;
         }
 
-        private async Task<int> CountAsync<T>(LogLevel level, IRepository<T> repository, DateTime startTime, int i) where T : class, ILogModel
+        private async Task<int> CountAsync<T>(string level, IRepository<T> repository, DateTime startTime, int i) where T : class, ILogModel
         {
             return await repository.CountAsync(x => x.LongDate >= startTime && x.LongDate <= startTime.AddMinutes(59).AddSeconds(59) && x.Level == level);
         }
diff --git a/src/LogDashboard/Handle/LogChart/HourChart.cs b/src/LogDashboard/Handle/LogChart/HourChart.cs
@@ -28,18 +28,18 @@ public async Task<GetLogChartsOutput> GetCharts<T>(IRepository<T> repository) wh
                 else
                 {
                     output.All[i / 10] = await repository.CountAsync(x => x.LongDate >= hourTime.AddMinutes(i) && x.LongDate <= hourTime.AddMinutes(i + 9).AddSeconds(59));
-                    output.Error[i / 10] = await CountAsync(LogLevel.ERROR, repository, hourTime, i);
-                    output.Info[i / 10] = await CountAsync(LogLevel.INFO, repository, hourTime, i);
-                    output.Debug[i / 10] = await CountAsync(LogLevel.DEBUG, repository, hourTime, i);
-                    output.Fatal[i / 10] = await CountAsync(LogLevel.FATAL, repository, hourTime, i);
-                    output.Trace[i / 10] = await CountAsync(LogLevel.TRACE, repository, hourTime, i);
-                    output.Warn[i / 10] = await CountAsync(LogLevel.WARN, repository, hourTime, i);
+                    output.Error[i / 10] = await CountAsync(LogLevelConst.Error, repository, hourTime, i);
+                    output.Info[i / 10] = await CountAsync(LogLevelConst.Info, repository, hourTime, i);
+                    output.Debug[i / 10] = await CountAsync(LogLevelConst.Debug, repository, hourTime, i);
+                    output.Fatal[i / 10] = await CountAsync(LogLevelConst.Fatal, repository, hourTime, i);
+                    output.Trace[i / 10] = await CountAsync(LogLevelConst.Trace, repository, hourTime, i);
+                    output.Warn[i / 10] = await CountAsync(LogLevelConst.Warn, repository, hourTime, i);
                 }
             }
             return output;
         }
 
-        private async Task<int> CountAsync<T>(LogLevel level, IRepository<T> repository, DateTime hourTime, int i) where T : class, ILogModel
+        private async Task<int> CountAsync<T>(string level, IRepository<T> repository, DateTime hourTime, int i) where T : class, ILogModel
         {
             return await repository.CountAsync(x => x.LongDate >= hourTime.AddMinutes(i) && x.LongDate <= hourTime.AddMinutes(i + 9).AddSeconds(59) && x.Level == level);
         }
diff --git a/src/LogDashboard/Handle/LogChart/MonthLogChart.cs b/src/LogDashboard/Handle/LogChart/MonthLogChart.cs
@@ -30,18 +30,18 @@ public async Task<GetLogChartsOutput> GetCharts<T>(IRepository<T> repository) wh
                 {
                     var dayTime = date.AddDays(i);
                     output.All[i] = await repository.CountAsync(x => x.LongDate >= dayTime && x.LongDate <= dayTime.AddHours(23).AddMinutes(59).AddSeconds(59));
-                    output.Error[i] = await CountAsync(LogLevel.ERROR, repository, dayTime);
-                    output.Info[i] = await CountAsync(LogLevel.INFO, repository, dayTime);
-                    output.Debug[i] = await CountAsync(LogLevel.DEBUG, repository, dayTime);
-                    output.Fatal[i] = await CountAsync(LogLevel.FATAL, repository, dayTime);
-                    output.Trace[i] = await CountAsync(LogLevel.TRACE, repository, dayTime);
-                    output.Warn[i] = await CountAsync(LogLevel.WARN, repository, dayTime);
+                    output.Error[i] = await CountAsync(LogLevelConst.Error, repository, dayTime);
+                    output.Info[i] = await CountAsync(LogLevelConst.Info, repository, dayTime);
+                    output.Debug[i] = await CountAsync(LogLevelConst.Debug, repository, dayTime);
+                    output.Fatal[i] = await CountAsync(LogLevelConst.Fatal, repository, dayTime);
+                    output.Trace[i] = await CountAsync(LogLevelConst.Trace, repository, dayTime);
+                    output.Warn[i] = await CountAsync(LogLevelConst.Warn, repository, dayTime);
                 }
             }
             return output;
         }
 
-        private async Task<int> CountAsync<T>(LogLevel level, IRepository<T> repository, DateTime dayTime) where T : class, ILogModel
+        private async Task<int> CountAsync<T>(string level, IRepository<T> repository, DateTime dayTime) where T : class, ILogModel
         {
             return await repository.CountAsync(x => x.LongDate >= dayTime && x.LongDate <= dayTime.AddHours(23).AddMinutes(59).AddSeconds(59) && x.Level == level);
         }
diff --git a/src/LogDashboard/Handle/LogChart/WeekLogChart.cs b/src/LogDashboard/Handle/LogChart/WeekLogChart.cs
@@ -31,19 +31,19 @@ public async Task<GetLogChartsOutput> GetCharts<T>(IRepository<T> repository) wh
                     var day = now.AddDays(0 - (dayOfWeek - i));
                     var weeHours = now.AddDays(i - dayOfWeek).Date.AddHours(23).AddMinutes(59).AddSeconds(59);
                     output.All[i] = await repository.CountAsync(x => x.LongDate >= day.Date && x.LongDate <= weeHours);
-                    output.Error[i] = await CountAsync(LogLevel.ERROR, repository, day, weeHours);
-                    output.Info[i] = await CountAsync(LogLevel.INFO, repository, day, weeHours);
-                    output.Debug[i] = await CountAsync(LogLevel.DEBUG, repository, day, weeHours);
-                    output.Fatal[i] = await CountAsync(LogLevel.FATAL, repository, day, weeHours);
-                    output.Trace[i] = await CountAsync(LogLevel.TRACE, repository, day, weeHours);
-                    output.Warn[i] = await CountAsync(LogLevel.WARN, repository, day, weeHours);
+                    output.Error[i] = await CountAsync(LogLevelConst.Error, repository, day, weeHours);
+                    output.Info[i] = await CountAsync(LogLevelConst.Info, repository, day, weeHours);
+                    output.Debug[i] = await CountAsync(LogLevelConst.Debug, repository, day, weeHours);
+                    output.Fatal[i] = await CountAsync(LogLevelConst.Fatal, repository, day, weeHours);
+                    output.Trace[i] = await CountAsync(LogLevelConst.Trace, repository, day, weeHours);
+                    output.Warn[i] = await CountAsync(LogLevelConst.Warn, repository, day, weeHours);
                 }
             }
 
             return output;
         }
 
-        private async Task<int> CountAsync<T>(LogLevel level, IRepository<T> repository, DateTime day, DateTime weeHours) where T : class, ILogModel
+        private async Task<int> CountAsync<T>(string level, IRepository<T> repository, DateTime day, DateTime weeHours) where T : class, ILogModel
         {
             return await repository.CountAsync(x => x.LongDate >= day.Date && x.LongDate <= weeHours && x.Level == level);
         }
diff --git a/src/LogDashboard/Models/ILogModel.cs b/src/LogDashboard/Models/ILogModel.cs
@@ -8,7 +8,7 @@ public interface ILogModel
 
         DateTime LongDate { get; set; }
 
-        LogLevel Level { get; set; }
+        string Level { get; set; }
 
         string Logger { get; set; }
 
diff --git a/src/LogDashboard/Models/LogLevel.cs b/src/LogDashboard/Models/LogLevel.cs
@@ -1,17 +1,13 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace LogDashboard.Models
+﻿namespace LogDashboard.Models
 {
-    public enum LogLevel
+    public class LogLevelConst
     {
-        DEBUG = 1,
-        INFO = 2,
-        TRACE = 3,
-        WARN = 4,
-        ERROR = 5,
-        FATAL = 6
+        public const string Info = "INFO";
+        public const string Error = "ERROR";
+        public const string Debug = "DEBUG";
+        public const string Trace = "TRACE";
+        public const string Warn = "WARN";
+        public const string Fatal = "FATAL";
     }
 
 }
diff --git a/src/LogDashboard/Models/LogModel.cs b/src/LogDashboard/Models/LogModel.cs
@@ -10,7 +10,7 @@ public class LogModel : ILogModel
 
         public DateTime LongDate { get; set; }
 
-        public LogLevel Level { get; set; }
+        public string Level { get; set; }
 
         public string Message { get; set; }
 
diff --git a/src/LogDashboard/Models/SearchlogInput.cs b/src/LogDashboard/Models/SearchlogInput.cs
@@ -14,7 +14,7 @@ public class SearchLogInput
 
         public bool ToDay { get; set; }
 
-        public LogLevel? Level { get; set; }
+        public string Level { get; set; }
 
         public bool Hour { get; set; }
 
diff --git a/src/LogDashboard/Repository/Dapper/DapperRepository.cs b/src/LogDashboard/Repository/Dapper/DapperRepository.cs
@@ -81,7 +81,6 @@ public async Task<IEnumerable<T>> GetPageListAsync(int page, int size, Expressio
                 appendSql.Append(")");
             }
 
-            var qc = await _conn.GetListAsync<T>(predicate?.ToPredicateGroup());
             return await _conn.GetPageAsync<T>(predicate?.ToPredicateGroup(), sorts, page == 0 ? page : page - 1, size, appendSql.ToString().TrimEnd(','));
 
         }
diff --git a/src/LogDashboard/Repository/File/FileUnitOfWork.cs b/src/LogDashboard/Repository/File/FileUnitOfWork.cs
@@ -153,10 +153,10 @@ private async Task ReadLogs(List<(string Path, DateTime LastWriteTime)> logFiles
                             LongDate = DateTime.Parse(line.TryGetValue(0)),
                             Logger = line.TryGetValue(2),
                             Message = line.TryGetValue(3),
-                            Exception = line.TryGetValue(4)
+                            Exception = line.TryGetValue(4),
+                            Level = line.TryGetValue(1)?.ToUpper().FormatLevel()
                         };
-                        Enum.TryParse(line.TryGetValue(1)?.ToUpper()?.FormatLevel(), out LogLevel level);
-                        item.Level = level;
+
                         var lineEnd = Math.Min(_options.CustomPropertyInfos.Count, line.Length - 5);
                         if (line.Length - 5 != _options.CustomPropertyInfos.Count && logFile == logFiles.Last() && logLine == logLines.Last())
                         {
@@ -197,7 +197,7 @@ public T CreateWarnItem(int id, string message)
                 Id = id,
                 Logger = LogDashboardConsts.Root,
                 LongDate = DateTime.Now,
-                Level = LogLevel.WARN,
+                Level = LogLevelConst.Warn,
                 Message = message
             };
         }
diff --git a/src/LogDashboard/Views/Dashboard/Home.cshtml b/src/LogDashboard/Views/Dashboard/Home.cshtml
@@ -132,7 +132,7 @@
                         <tr class="row mx-0">
                             <td class="col-1"><a href="javascript:void(0);" onclick="logInfo('@item.Id.ToString()')">@item.Id.ToString()</a></td>
                             <td class="col-3">@item.Logger</td>
-                            <td class="col-1"><button class="btn btn-outline-@item.Level.ToString()">@item.Level.ToString()</button></td>
+                            <td class="col-1"><button class="btn btn-outline-@item.Level.ToUpper()">@item.Level.ToUpper()</button></td>
                             <td class="col-4" onclick="$(this).next().show();$(this).css('display', 'none');">
                                 @{
                                     var message = item.Message;
diff --git a/src/LogDashboard/Views/Dashboard/Home.generated.cs b/src/LogDashboard/Views/Dashboard/Home.generated.cs
@@ -281,7 +281,7 @@ public override void Execute()
 
             
             #line 135 "..\..\Views\Dashboard\Home.cshtml"
-                                                                        Write(item.Level.ToString());
+                                                                        Write(item.Level.ToUpper());
 
             
             #line default
@@ -291,7 +291,7 @@ public override void Execute()
 
             
             #line 135 "..\..\Views\Dashboard\Home.cshtml"
-                                                                                                Write(item.Level.ToString());
+                                                                                               Write(item.Level.ToUpper());
 
             
             #line default
diff --git a/src/LogDashboard/Views/Dashboard/LogInfo.cshtml b/src/LogDashboard/Views/Dashboard/LogInfo.cshtml
@@ -42,7 +42,7 @@
                             </tr>
                             <tr>
                                 <td>级别</td>
-                                <td class="text-nowrap"><button class="btn btn-outline-@log.Level.ToString()">@log.Level.ToString()</button></td>
+                                <td class="text-nowrap"><button class="btn btn-outline-@log.Level.ToUpper()">@log.Level.ToUpper()</button></td>
                             </tr>
                             <tr>
                                 <td>Logger</td>
diff --git a/src/LogDashboard/Views/Dashboard/LogInfo.generated.cs b/src/LogDashboard/Views/Dashboard/LogInfo.generated.cs
@@ -136,7 +136,7 @@ public override void Execute()
 
             
             #line 45 "..\..\Views\Dashboard\LogInfo.cshtml"
-                                                                                  Write(log.Level.ToString());
+                                                                                  Write(log.Level.ToUpper());
 
             
             #line default
@@ -146,7 +146,7 @@ public override void Execute()
 
             
             #line 45 "..\..\Views\Dashboard\LogInfo.cshtml"
-                                                                                                         Write(log.Level.ToString());
+                                                                                                        Write(log.Level.ToUpper());
 
             
             #line default
diff --git a/src/LogDashboard/Views/Dashboard/LogList.cshtml b/src/LogDashboard/Views/Dashboard/LogList.cshtml
@@ -25,7 +25,7 @@
                 <tr class="row mx-0">
                     <td class="col-1"><a href="javascript:void(0);" onclick="logInfo('@item.Id.ToString()')">@item.Id.ToString()</a></td>
                     <td class="col-3">@item.Logger</td>
-                    <td class="col-1"><button class="btn btn-outline-@item.Level.ToString()">@item.Level.ToString()</button></td>
+                    <td class="col-1"><button class="btn btn-outline-@item.Level.ToUpper()">@item.Level.ToUpper()</button></td>
                     <td class="col-4" onclick="$(this).next().show(); $(this).css('display','none');">
                         @{
                             var message = item.Message;
diff --git a/src/LogDashboard/Views/Dashboard/LogList.generated.cs b/src/LogDashboard/Views/Dashboard/LogList.generated.cs
@@ -112,7 +112,7 @@ public override void Execute()
 
             
             #line 28 "..\..\Views\Dashboard\LogList.cshtml"
-                                                                Write(item.Level.ToString());
+                                                                Write(item.Level.ToUpper());
 
             
             #line default
@@ -122,7 +122,7 @@ public override void Execute()
 
             
             #line 28 "..\..\Views\Dashboard\LogList.cshtml"
-                                                                                        Write(item.Level.ToString());
+                                                                                        Write(item.Level.ToUpper());
 
             
             #line default
diff --git a/src/LogDashboard/Views/Dashboard/TraceLogList.cshtml b/src/LogDashboard/Views/Dashboard/TraceLogList.cshtml
@@ -23,7 +23,7 @@
                 <td class="col-1"><a href="javascript:void(0);" onclick="logInfo('@item.Id.ToString()')">@item.Id.ToString()</a></td>
                 <td class="col-3"><span>@item.Logger</span></td>
                 @{
-                        if (item.Level== LogLevel.ERROR)
+                        if (item.Level== LogLevelConst.Error)
                         {
                             <div class="modal fade" id="@item.Id.ToString()">
                                 <div class="modal-dialog modal-lg" role="document">
@@ -34,11 +34,11 @@
                                     </div>
                                 </div>
                             </div>
-                            <td class="col-1"><button class="btn btn-outline-@item.Level.ToString()" onclick='$("#@item.Id.ToString()").modal();'>@item.Level.ToString()</button></td>
+                            <td class="col-1"><button class="btn btn-outline-@item.Level.ToUpper()" onclick='$("#@item.Id.ToString()").modal();'>@item.Level.ToUpper()</button></td>
                         }
                         else
                         {
-                            <td class="col-1"><button class="btn btn-outline-@item.Level.ToString()">@item.Level.ToString()</button></td>
+                            <td class="col-1"><button class="btn btn-outline-@item.Level.ToUpper()">@item.Level.ToUpper()</button></td>
                         }
                 }
                 <td class="col-4">
diff --git a/src/LogDashboard/Views/Dashboard/TraceLogList.generated.cs b/src/LogDashboard/Views/Dashboard/TraceLogList.generated.cs

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"ConnectionStrings": {`
`3`		`- "DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=log;Trusted_Connection=True;MultipleActiveResultSets=true"`
	`3`	`+ "DefaultConnection": "Server=.;Database=log;Trusted_Connection=True;MultipleActiveResultSets=true"`
`4`	`4`	`},`
`5`	`5`	`"Logging": {`
`6`	`6`	`"LogLevel": {`
Original file line number	Diff line number	Diff line change
`@@ -31,18 +31,18 @@ public async Task<GetLogChartsOutput> GetCharts<T>(IRepository<T> repository) wh`
`31`	`31`	`{`
`32`	`32`	`var startTime = date.AddHours(i);`
`33`	`33`	`output.All[i] = await repository.CountAsync(x => x.LongDate >= startTime && x.LongDate <= startTime.AddMinutes(59).AddSeconds(59));`
`34`		`- output.Error[i] = await CountAsync(LogLevel.ERROR, repository, startTime, i);`
`35`		`- output.Info[i] = await CountAsync(LogLevel.INFO, repository, startTime, i);`
`36`		`- output.Debug[i] = await CountAsync(LogLevel.DEBUG, repository, startTime, i);`
`37`		`- output.Fatal[i] = await CountAsync(LogLevel.FATAL, repository, startTime, i);`
`38`		`- output.Trace[i] = await CountAsync(LogLevel.TRACE, repository, startTime, i);`
`39`		`- output.Warn[i] = await CountAsync(LogLevel.WARN, repository, startTime, i);`
	`34`	`+ output.Error[i] = await CountAsync(LogLevelConst.Error, repository, startTime, i);`
	`35`	`+ output.Info[i] = await CountAsync(LogLevelConst.Info, repository, startTime, i);`
	`36`	`+ output.Debug[i] = await CountAsync(LogLevelConst.Debug, repository, startTime, i);`
	`37`	`+ output.Fatal[i] = await CountAsync(LogLevelConst.Fatal, repository, startTime, i);`
	`38`	`+ output.Trace[i] = await CountAsync(LogLevelConst.Trace, repository, startTime, i);`
	`39`	`+ output.Warn[i] = await CountAsync(LogLevelConst.Warn, repository, startTime, i);`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`return output;`
`43`	`43`	`}`
`44`	`44`
`45`		`- private async Task<int> CountAsync<T>(LogLevel level, IRepository<T> repository, DateTime startTime, int i) where T : class, ILogModel`
	`45`	`+ private async Task<int> CountAsync<T>(string level, IRepository<T> repository, DateTime startTime, int i) where T : class, ILogModel`
`46`	`46`	`{`
`47`	`47`	`return await repository.CountAsync(x => x.LongDate >= startTime && x.LongDate <= startTime.AddMinutes(59).AddSeconds(59) && x.Level == level);`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,18 +28,18 @@ public async Task<GetLogChartsOutput> GetCharts<T>(IRepository<T> repository) wh`
`28`	`28`	`else`
`29`	`29`	`{`
`30`	`30`	`output.All[i / 10] = await repository.CountAsync(x => x.LongDate >= hourTime.AddMinutes(i) && x.LongDate <= hourTime.AddMinutes(i + 9).AddSeconds(59));`
`31`		`- output.Error[i / 10] = await CountAsync(LogLevel.ERROR, repository, hourTime, i);`
`32`		`- output.Info[i / 10] = await CountAsync(LogLevel.INFO, repository, hourTime, i);`
`33`		`- output.Debug[i / 10] = await CountAsync(LogLevel.DEBUG, repository, hourTime, i);`
`34`		`- output.Fatal[i / 10] = await CountAsync(LogLevel.FATAL, repository, hourTime, i);`
`35`		`- output.Trace[i / 10] = await CountAsync(LogLevel.TRACE, repository, hourTime, i);`
`36`		`- output.Warn[i / 10] = await CountAsync(LogLevel.WARN, repository, hourTime, i);`
	`31`	`+ output.Error[i / 10] = await CountAsync(LogLevelConst.Error, repository, hourTime, i);`
	`32`	`+ output.Info[i / 10] = await CountAsync(LogLevelConst.Info, repository, hourTime, i);`
	`33`	`+ output.Debug[i / 10] = await CountAsync(LogLevelConst.Debug, repository, hourTime, i);`
	`34`	`+ output.Fatal[i / 10] = await CountAsync(LogLevelConst.Fatal, repository, hourTime, i);`
	`35`	`+ output.Trace[i / 10] = await CountAsync(LogLevelConst.Trace, repository, hourTime, i);`
	`36`	`+ output.Warn[i / 10] = await CountAsync(LogLevelConst.Warn, repository, hourTime, i);`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`return output;`
`40`	`40`	`}`
`41`	`41`
`42`		`- private async Task<int> CountAsync<T>(LogLevel level, IRepository<T> repository, DateTime hourTime, int i) where T : class, ILogModel`
	`42`	`+ private async Task<int> CountAsync<T>(string level, IRepository<T> repository, DateTime hourTime, int i) where T : class, ILogModel`
`43`	`43`	`{`
`44`	`44`	`return await repository.CountAsync(x => x.LongDate >= hourTime.AddMinutes(i) && x.LongDate <= hourTime.AddMinutes(i + 9).AddSeconds(59) && x.Level == level);`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,18 +30,18 @@ public async Task<GetLogChartsOutput> GetCharts<T>(IRepository<T> repository) wh`
`30`	`30`	`{`
`31`	`31`	`var dayTime = date.AddDays(i);`
`32`	`32`	`output.All[i] = await repository.CountAsync(x => x.LongDate >= dayTime && x.LongDate <= dayTime.AddHours(23).AddMinutes(59).AddSeconds(59));`
`33`		`- output.Error[i] = await CountAsync(LogLevel.ERROR, repository, dayTime);`
`34`		`- output.Info[i] = await CountAsync(LogLevel.INFO, repository, dayTime);`
`35`		`- output.Debug[i] = await CountAsync(LogLevel.DEBUG, repository, dayTime);`
`36`		`- output.Fatal[i] = await CountAsync(LogLevel.FATAL, repository, dayTime);`
`37`		`- output.Trace[i] = await CountAsync(LogLevel.TRACE, repository, dayTime);`
`38`		`- output.Warn[i] = await CountAsync(LogLevel.WARN, repository, dayTime);`
	`33`	`+ output.Error[i] = await CountAsync(LogLevelConst.Error, repository, dayTime);`
	`34`	`+ output.Info[i] = await CountAsync(LogLevelConst.Info, repository, dayTime);`
	`35`	`+ output.Debug[i] = await CountAsync(LogLevelConst.Debug, repository, dayTime);`
	`36`	`+ output.Fatal[i] = await CountAsync(LogLevelConst.Fatal, repository, dayTime);`
	`37`	`+ output.Trace[i] = await CountAsync(LogLevelConst.Trace, repository, dayTime);`
	`38`	`+ output.Warn[i] = await CountAsync(LogLevelConst.Warn, repository, dayTime);`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`return output;`
`42`	`42`	`}`
`43`	`43`
`44`		`- private async Task<int> CountAsync<T>(LogLevel level, IRepository<T> repository, DateTime dayTime) where T : class, ILogModel`
	`44`	`+ private async Task<int> CountAsync<T>(string level, IRepository<T> repository, DateTime dayTime) where T : class, ILogModel`
`45`	`45`	`{`
`46`	`46`	`return await repository.CountAsync(x => x.LongDate >= dayTime && x.LongDate <= dayTime.AddHours(23).AddMinutes(59).AddSeconds(59) && x.Level == level);`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,19 +31,19 @@ public async Task<GetLogChartsOutput> GetCharts<T>(IRepository<T> repository) wh`
`31`	`31`	`var day = now.AddDays(0 - (dayOfWeek - i));`
`32`	`32`	`var weeHours = now.AddDays(i - dayOfWeek).Date.AddHours(23).AddMinutes(59).AddSeconds(59);`
`33`	`33`	`output.All[i] = await repository.CountAsync(x => x.LongDate >= day.Date && x.LongDate <= weeHours);`
`34`		`- output.Error[i] = await CountAsync(LogLevel.ERROR, repository, day, weeHours);`
`35`		`- output.Info[i] = await CountAsync(LogLevel.INFO, repository, day, weeHours);`
`36`		`- output.Debug[i] = await CountAsync(LogLevel.DEBUG, repository, day, weeHours);`
`37`		`- output.Fatal[i] = await CountAsync(LogLevel.FATAL, repository, day, weeHours);`
`38`		`- output.Trace[i] = await CountAsync(LogLevel.TRACE, repository, day, weeHours);`
`39`		`- output.Warn[i] = await CountAsync(LogLevel.WARN, repository, day, weeHours);`
	`34`	`+ output.Error[i] = await CountAsync(LogLevelConst.Error, repository, day, weeHours);`
	`35`	`+ output.Info[i] = await CountAsync(LogLevelConst.Info, repository, day, weeHours);`
	`36`	`+ output.Debug[i] = await CountAsync(LogLevelConst.Debug, repository, day, weeHours);`
	`37`	`+ output.Fatal[i] = await CountAsync(LogLevelConst.Fatal, repository, day, weeHours);`
	`38`	`+ output.Trace[i] = await CountAsync(LogLevelConst.Trace, repository, day, weeHours);`
	`39`	`+ output.Warn[i] = await CountAsync(LogLevelConst.Warn, repository, day, weeHours);`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`return output;`
`44`	`44`	`}`
`45`	`45`
`46`		`- private async Task<int> CountAsync<T>(LogLevel level, IRepository<T> repository, DateTime day, DateTime weeHours) where T : class, ILogModel`
	`46`	`+ private async Task<int> CountAsync<T>(string level, IRepository<T> repository, DateTime day, DateTime weeHours) where T : class, ILogModel`
`47`	`47`	`{`
`48`	`48`	`return await repository.CountAsync(x => x.LongDate >= day.Date && x.LongDate <= weeHours && x.Level == level);`
`49`	`49`	`}`