Fix #15.

Author: mo-esmp

src/Serilog.Ui.MongoDbProvider/MongoDbDataProvider.cs

@@ -17,6 +17,7 @@ public MongoDbDataProvider(IMongoClient client, MongoDbOptions options)
             if (options is null) throw new ArgumentNullException(nameof(options));
 
             _collection = client.GetDatabase(options.DatabaseName).GetCollection<MongoDbLogModel>(options.CollectionName);
+            var s = _collection.CollectionNamespace;
         }
 
         public async Task<(IEnumerable<LogModel>, int)> FetchDataAsync(
@@ -27,12 +28,12 @@ public MongoDbDataProvider(IMongoClient client, MongoDbOptions options)
             DateTime? startDate = null,
             DateTime? endDate = null)
         {
-            var logsTask = GetLogsAsync(page - 1, count, level, searchCriteria, startDate, endDate);
-            var logCountTask = CountLogsAsync(level, searchCriteria, startDate, endDate);
+            var logsTask = await GetLogsAsync(page - 1, count, level, searchCriteria, startDate, endDate);
+            var logCountTask = await CountLogsAsync(level, searchCriteria, startDate, endDate);
 
-            await Task.WhenAll(logsTask, logCountTask);
+            //await Task.WhenAll(logsTask, logCountTask);
 
-            return (await logsTask, await logCountTask);
+            return (logsTask, logCountTask);
         }
 
         private async Task<IEnumerable<LogModel>> GetLogsAsync(
@@ -46,7 +47,8 @@ private async Task<IEnumerable<LogModel>> GetLogsAsync(
             var builder = Builders<MongoDbLogModel>.Filter.Empty;
             GenerateWhereClause(ref builder, level, searchCriteria, startDate, endDate);
 
-            var logs = await _collection.Find(builder)
+            var logs = await _collection
+                .Find(builder)
                 .Skip(count * page)
                 .Limit(count)
                 .SortByDescending(entry => entry.Timestamp)

src/Serilog.Ui.MongoDbProvider/MongoDbLogModel.cs

@@ -1,6 +1,9 @@
-using System;
-using MongoDB.Bson.Serialization.Attributes;
+using MongoDB.Bson.Serialization.Attributes;
+using Newtonsoft.Json;
 using Serilog.Ui.Core;
+using System;
+using System.Collections.Generic;
+using System.Dynamic;
 
 namespace Serilog.Ui.MongoDbProvider
 {
@@ -15,9 +18,12 @@ public class MongoDbLogModel
         public string RenderedMessage { get; set; }
 
         [BsonDateTimeOptions(Kind = DateTimeKind.Local)]
-        public DateTime Timestamp { get; set; }
+        public DateTime? Timestamp { get; set; }
 
-        public string Exception { get; set; }
+        [BsonDateTimeOptions(Kind = DateTimeKind.Local)]
+        public DateTime UtcTimeStamp { get; set; }
+
+        public dynamic Exception { get; set; }
 
         public object Properties { get; set; }
 
@@ -28,11 +34,30 @@ internal LogModel ToLogModel()
                 RowNo = Id,
                 Level = Level,
                 Message = RenderedMessage,
-                Timestamp = Timestamp,
-                Exception = Exception,
+                Timestamp = Timestamp ?? UtcTimeStamp,
+                Exception = GetException(Exception),
                 Properties = Newtonsoft.Json.JsonConvert.SerializeObject(Properties),
                 PropertyType = "json"
             };
         }
+
+        private object GetException(dynamic exception)
+        {
+            if (exception == null || IsPropertyExist(Exception, "_csharpnull"))
+                return null;
+
+            if (exception is string)
+                return exception;
+
+            return Newtonsoft.Json.JsonConvert.SerializeObject(Exception, Formatting.Indented);
+        }
+
+        private bool IsPropertyExist(dynamic obj, string name)
+        {
+            if (obj is ExpandoObject)
+                return ((IDictionary<string, object>)obj).ContainsKey(name);
+
+            return obj?.GetType()?.GetProperty(name) != null;
+        }
     }
 }

src/Serilog.Ui.MongoDbProvider/Serilog.Ui.MongoDbProvider.csproj

@@ -1,16 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.0</Version>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>netstandard2.0</TargetFramework>
+		<Version>2.1.0</Version>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MongoDB.Driver" Version="2.11.5" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="MongoDB.Driver" Version="2.11.5" />
+		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+		<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Serilog.Ui.Core\Serilog.Ui.Core.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\Serilog.Ui.Core\Serilog.Ui.Core.csproj" />
+	</ItemGroup>
 </Project>