Fix merge conflict.

Author: mo-esmp

src/Serilog.Ui.MongoDbProvider/Extensions/SerilogUiOptionBuilderExtensions.cs

@@ -7,18 +7,18 @@
 namespace Serilog.Ui.MongoDbProvider
 {
     /// <summary>
-    /// SerilogUI option builder extensions.
+    /// MongoDB data provider specific extension methods for <see cref="SerilogUiOptionsBuilder"/>.
     /// </summary>
     public static class SerilogUiOptionBuilderExtensions
     {
         /// <summary>
-        /// Adds MongoDB log data provider.
+        /// Configures the SerilogUi to connect to a MongoDB database.
         /// </summary>
         /// <param name="optionsBuilder">The options builder.</param>
         /// <param name="connectionString">The connection string.</param>
-        /// <param name="collectionName">Name of the collection.</param>
-        /// <exception cref="ArgumentNullException">connectionString</exception>
-        /// <exception cref="ArgumentNullException">collectionName</exception>
+        /// <param name="collectionName">Name of the collection name.</param>
+        /// <exception cref="ArgumentNullException">throw if connectionString is null</exception>
+        /// <exception cref="ArgumentNullException">throw is collectionName is null</exception>
         public static void UseMongoDb(
             this SerilogUiOptionsBuilder optionsBuilder,
             string connectionString,
@@ -44,15 +44,15 @@ string collectionName
         }
 
         /// <summary>
-        /// Adds MongoDB log data provider.
+        /// Configures the SerilogUi to connect to a MongoDB database.
         /// </summary>
         /// <param name="optionsBuilder">The options builder.</param>
-        /// <param name="connectionString">The connection string without database name.</param>
-        /// <param name="databaseName">Name of the database.</param>
-        /// <param name="collectionName">Name of the collection.</param>
-        /// <exception cref="ArgumentNullException">connectionString</exception>
-        /// <exception cref="ArgumentNullException">databaseName</exception>
-        /// <exception cref="ArgumentNullException">collectionName</exception>
+        /// <param name="connectionString">The connection string.</param>
+        /// <param name="databaseName">Name of the data table.</param>
+        /// <param name="collectionName">Name of the collection name.</param>
+        /// <exception cref="ArgumentNullException">throw if connectionString is null</exception>
+        /// <exception cref="ArgumentNullException">throw is databaseName is null</exception>
+        /// <exception cref="ArgumentNullException">throw is collectionName is null</exception>
         public static void UseMongoDb(
             this SerilogUiOptionsBuilder optionsBuilder,
             string connectionString,

src/Serilog.Ui.MongoDbProvider/MongoDbDataProvider.cs

@@ -44,21 +44,29 @@ private async Task<IEnumerable<LogModel>> GetLogsAsync(
             DateTime? startDate,
             DateTime? endDate)
         {
-            var builder = Builders<MongoDbLogModel>.Filter.Empty;
-            GenerateWhereClause(ref builder, level, searchCriteria, startDate, endDate);
-
-            var logs = await _collection
-                .Find(builder)
-                .Skip(count * page)
-                .Limit(count)
-                .SortByDescending(entry => entry.Timestamp)
-                .ToListAsync();
-
-            var index = 1;
-            foreach (var log in logs)
-                log.Id = (page * count) + index++;
-
-            return logs.Select(log => log.ToLogModel()).ToList();
+            try
+            {
+                var builder = Builders<MongoDbLogModel>.Filter.Empty;
+                GenerateWhereClause(ref builder, level, searchCriteria, startDate, endDate);
+
+                var logs = await _collection
+                    .Find(builder)
+                    .Skip(count * page)
+                    .Limit(count)
+                    .SortByDescending(entry => entry.Timestamp)
+                    .ToListAsync();
+
+                var index = 1;
+                foreach (var log in logs)
+                    log.Id = (page * count) + index++;
+
+                return logs.Select(log => log.ToLogModel()).ToList();
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex);
+                throw;
+            }
         }
 
         private async Task<int> CountLogsAsync(string level, string searchCriteria, DateTime? startDate, DateTime? endDate)

src/Serilog.Ui.MongoDbProvider/MongoDbLogModel.cs

@@ -1,4 +1,5 @@
-using MongoDB.Bson.Serialization.Attributes;
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
 using Newtonsoft.Json;
 using Serilog.Ui.Core;
 using System;
@@ -8,6 +9,7 @@
 namespace Serilog.Ui.MongoDbProvider
 {
     [BsonIgnoreExtraElements]
+    [BsonDiscriminator(RootClass = true)]
     public class MongoDbLogModel
     {
         [BsonIgnore]
@@ -23,8 +25,10 @@ public class MongoDbLogModel
         [BsonDateTimeOptions(Kind = DateTimeKind.Local)]
         public DateTime UtcTimeStamp { get; set; }
 
-        public dynamic Exception { get; set; }
+        [BsonElement("Exception")]
+        public BsonDocument Exception { get; set; }
 
+        [BsonElement("Properties")]
         public object Properties { get; set; }
 
         internal LogModel ToLogModel()
@@ -36,20 +40,18 @@ internal LogModel ToLogModel()
                 Message = RenderedMessage,
                 Timestamp = Timestamp ?? UtcTimeStamp,
                 Exception = GetException(Exception),
-                Properties = Newtonsoft.Json.JsonConvert.SerializeObject(Properties),
+                Properties = JsonConvert.SerializeObject(Properties),
                 PropertyType = "json"
             };
         }
 
-        private object GetException(dynamic exception)
+        private string GetException(object exception)
         {
-            if (exception == null || IsPropertyExist(Exception, "_csharpnull"))
+            if (exception == null || IsPropertyExist(exception, "_csharpnull"))
                 return null;
 
-            if (exception is string)
-                return exception;
-
-            return Newtonsoft.Json.JsonConvert.SerializeObject(Exception, Formatting.Indented);
+            var str = exception.ToJson();
+            return str;
         }
 
         private bool IsPropertyExist(dynamic obj, string name)