Add log property type.

Author: mo-esmp

src/Serilog.Ui.Core/Models/LogModel.cs

@@ -15,5 +15,7 @@ public class LogModel
         public virtual string Exception { get; set; }
 
         public virtual string Properties { get; set; }
+
+        public virtual string PropertyType { get; set; }
     }
 }

src/Serilog.Ui.MsSqlServerProvider/SqlServerDataProvider.cs

@@ -60,7 +60,7 @@ private async Task<IEnumerable<LogModel>> GetLogsAsync(int page, int count, stri
 
             using (IDbConnection connection = new SqlConnection(_options.ConnectionString))
             {
-                return await connection.QueryAsync<LogModel>(queryBuilder.ToString(),
+                return await connection.QueryAsync<SqlServerLogModel>(queryBuilder.ToString(),
                     new
                     {
                         Offset = page,

src/Serilog.Ui.MsSqlServerProvider/SqlServerLogModel.cs

@@ -0,0 +1,9 @@
+using Serilog.Ui.Core;
+
+namespace Serilog.Ui.MsSqlServerProvider
+{
+    internal class SqlServerLogModel : LogModel
+    {
+        public override string PropertyType => "xml";
+    }
+}

src/Serilog.Ui.PostgreSqlProvider/PostgreDataProvider.cs

@@ -35,7 +35,7 @@ public PostgresDataProvider(RelationalDbOptions options)
         private async Task<IEnumerable<LogModel>> GetLogsAsync(int page, int count, string level, string searchCriteria)
         {
             var queryBuilder = new StringBuilder();
-            queryBuilder.Append("SELECT message, message_template, level, timestamp, exception, log_event FROM ");
+            queryBuilder.Append("SELECT message, message_template, level, timestamp, exception, log_event AS \"Properties\" FROM ");
             queryBuilder.Append(_options.Schema);
             queryBuilder.Append(".");
             queryBuilder.Append(_options.TableName);
@@ -58,14 +58,20 @@ private async Task<IEnumerable<LogModel>> GetLogsAsync(int page, int count, stri
             queryBuilder.Append(" ORDER BY timestamp DESC LIMIT @Count OFFSET @Offset ");
 
             using IDbConnection connection = new NpgsqlConnection(_options.ConnectionString);
-            return await connection.QueryAsync<PostgresLogModel>(queryBuilder.ToString(),
+            var logs = await connection.QueryAsync<PostgresLogModel>(queryBuilder.ToString(),
                 new
                 {
-                    Offset = page,
+                    Offset = page * count,
                     Count = count,
                     Level = LogLevelConverter.GetLevelValue(level),
                     Search = searchCriteria != null ? "%" + searchCriteria + "%" : null
                 });
+
+            var index = 1;
+            foreach (var log in logs)
+                log.Id = (page * count) + index++;
+
+            return logs;
         }
 
         public async Task<int> CountLogsAsync(string level, string searchCriteria)

src/Serilog.Ui.PostgreSqlProvider/PostgreLogModel.cs

@@ -11,5 +11,7 @@ public override string Level
             get => _level;
             set => _level = LogLevelConverter.GetLevelName(value);
         }
+
+        public override string PropertyType => "json";
     }
 }