From 9deafaec9bae3779e4d86787a80dcc4e7fc3f927 Mon Sep 17 00:00:00 2001
From: Chris Cameron <chris.cameron@wedoresi.com>
Date: Mon, 1 Jun 2020 11:35:41 -0400
Subject: [PATCH] feat: JSON conversion improvements for log items

---
 ICD.Common.Utils/Services/Logging/LogItem.cs | 24 +++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/ICD.Common.Utils/Services/Logging/LogItem.cs b/ICD.Common.Utils/Services/Logging/LogItem.cs
index 0d217a1..c4f9784 100644
--- a/ICD.Common.Utils/Services/Logging/LogItem.cs
+++ b/ICD.Common.Utils/Services/Logging/LogItem.cs
@@ -1,5 +1,6 @@
 using System;
-using ICD.Common.Properties;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace ICD.Common.Utils.Services.Logging
 {
@@ -17,12 +18,12 @@ namespace ICD.Common.Utils.Services.Logging
 		/// <summary>
 		/// Gets the log time in UTC.
 		/// </summary>
-		[PublicAPI]
 		public DateTime Timestamp { get { return m_Timestamp; } }
 
 		/// <summary>
 		/// Get/Set for severity level.
 		/// </summary>
+		[JsonConverter(typeof(StringEnumConverter))]
 		public eSeverity Severity { get { return m_Severity; } }
 
 		/// <summary>
@@ -40,10 +41,22 @@ namespace ICD.Common.Utils.Services.Logging
 		/// <param name="severity">Severity Level, between 0 and 7</param>
 		/// <param name="message">Error message text</param>
 		public LogItem(eSeverity severity, string message)
+			: this(IcdEnvironment.GetUtcTime(), severity, message)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new LogItem object with the specified values.
+		/// </summary>
+		/// <param name="timestamp"></param>
+		/// <param name="severity">Severity Level, between 0 and 7</param>
+		/// <param name="message">Error message text</param>
+		[JsonConstructor]
+		public LogItem(DateTime timestamp, eSeverity severity, string message)
 		{
 			m_Severity = severity;
 			m_Message = message;
-			m_Timestamp = IcdEnvironment.GetUtcTime();
+			m_Timestamp = timestamp;
 		}
 
 		#endregion
@@ -72,6 +85,11 @@ namespace ICD.Common.Utils.Services.Logging
 			return !a1.Equals(a2);
 		}
 
+		/// <summary>
+		/// Returns true if this instance is equal to the given object.
+		/// </summary>
+		/// <param name="other"></param>
+		/// <returns></returns>
 		public bool Equals(LogItem other)
 		{
 			return m_Severity == other.m_Severity &&