From 318ae45389acacbcedece1695e300bf95fc1b99f Mon Sep 17 00:00:00 2001 From: "weronika.labaj" Date: Tue, 21 Jul 2015 15:18:03 +0200 Subject: [PATCH 1/3] Return null instead of DateTime.MinValue for messages list. --- src/ServiceControl/CompositeViews/Messages/MessagesView.cs | 2 +- .../CompositeViews/Messages/MessagesViewTransformer.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ServiceControl/CompositeViews/Messages/MessagesView.cs b/src/ServiceControl/CompositeViews/Messages/MessagesView.cs index 1922c2666b..ce7634489a 100644 --- a/src/ServiceControl/CompositeViews/Messages/MessagesView.cs +++ b/src/ServiceControl/CompositeViews/Messages/MessagesView.cs @@ -13,7 +13,7 @@ public class MessagesView public string MessageType { get; set; } public EndpointDetails SendingEndpoint { get; set; } public EndpointDetails ReceivingEndpoint { get; set; } - public DateTime TimeSent { get; set; } + public DateTime? TimeSent { get; set; } public DateTime ProcessedAt { get; set; } public TimeSpan CriticalTime { get; set; } public TimeSpan ProcessingTime { get; set; } diff --git a/src/ServiceControl/CompositeViews/Messages/MessagesViewTransformer.cs b/src/ServiceControl/CompositeViews/Messages/MessagesViewTransformer.cs index 3f81da072e..522b1987d9 100644 --- a/src/ServiceControl/CompositeViews/Messages/MessagesViewTransformer.cs +++ b/src/ServiceControl/CompositeViews/Messages/MessagesViewTransformer.cs @@ -48,7 +48,7 @@ public MessagesViewTransformer() MessageType = metadata["MessageType"], SendingEndpoint = metadata["SendingEndpoint"], ReceivingEndpoint = metadata["ReceivingEndpoint"], - TimeSent = (DateTime) metadata["TimeSent"], + TimeSent = (DateTime?) metadata["TimeSent"], ProcessedAt = processedAt, CriticalTime = (TimeSpan) metadata["CriticalTime"], ProcessingTime = (TimeSpan) metadata["ProcessingTime"], From 600ac42879df867477201e733a4876f65252d6f1 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 29 Jul 2015 14:07:32 +0200 Subject: [PATCH 2/3] Allow nullable values for TimeSent in failed messages. --- .../CompositeViews/Messages/MessagesViewIndex.cs | 2 +- src/ServiceControl/MessageFailures/Api/FailedMessageView.cs | 2 +- .../MessageFailures/Api/FailedMessageViewIndex.cs | 4 ++-- .../MessageFailures/Api/FailedMessageViewTransformer.cs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ServiceControl/CompositeViews/Messages/MessagesViewIndex.cs b/src/ServiceControl/CompositeViews/Messages/MessagesViewIndex.cs index 3b5f76af3c..3eb3c52885 100644 --- a/src/ServiceControl/CompositeViews/Messages/MessagesViewIndex.cs +++ b/src/ServiceControl/CompositeViews/Messages/MessagesViewIndex.cs @@ -24,7 +24,7 @@ public class SortAndFilterOptions public TimeSpan? DeliveryTime { get; set; } public string ConversationId { get; set; } public string[] Query { get; set; } - public DateTime TimeSent { get; set; } + public DateTime? TimeSent { get; set; } } public MessagesViewIndex() diff --git a/src/ServiceControl/MessageFailures/Api/FailedMessageView.cs b/src/ServiceControl/MessageFailures/Api/FailedMessageView.cs index 9e083d939e..170a321e4f 100644 --- a/src/ServiceControl/MessageFailures/Api/FailedMessageView.cs +++ b/src/ServiceControl/MessageFailures/Api/FailedMessageView.cs @@ -7,7 +7,7 @@ public class FailedMessageView { public string Id { get; set; } public string MessageType { get; set; } - public DateTime TimeSent { get; set; } + public DateTime? TimeSent { get; set; } public bool IsSystemMessage { get; set; } public ExceptionDetails Exception { get; set; } public string MessageId { get; set; } diff --git a/src/ServiceControl/MessageFailures/Api/FailedMessageViewIndex.cs b/src/ServiceControl/MessageFailures/Api/FailedMessageViewIndex.cs index 070a6b5303..76ebc37efa 100644 --- a/src/ServiceControl/MessageFailures/Api/FailedMessageViewIndex.cs +++ b/src/ServiceControl/MessageFailures/Api/FailedMessageViewIndex.cs @@ -11,7 +11,7 @@ public class FailedMessageViewIndex : AbstractIndexCreationTask public class SortAndFilterOptions { public string MessageId { get; set; } - public DateTime TimeSent { get; set; } + public DateTime? TimeSent { get; set; } public string MessageType { get; set; } public FailedMessageStatus Status { get; set; } public string ReceivingEndpointName { get; set; } @@ -26,7 +26,7 @@ public FailedMessageViewIndex() MessageId = metadata["MessageId"], MessageType = metadata["MessageType"], message.Status, - TimeSent = (DateTime)metadata["TimeSent"], + TimeSent = (DateTime?)metadata["TimeSent"], ReceivingEndpointName = ((EndpointDetails)metadata["ReceivingEndpoint"]).Name, }; diff --git a/src/ServiceControl/MessageFailures/Api/FailedMessageViewTransformer.cs b/src/ServiceControl/MessageFailures/Api/FailedMessageViewTransformer.cs index 9a939fce38..4b80a0e4c8 100644 --- a/src/ServiceControl/MessageFailures/Api/FailedMessageViewTransformer.cs +++ b/src/ServiceControl/MessageFailures/Api/FailedMessageViewTransformer.cs @@ -17,7 +17,7 @@ public FailedMessageViewTransformer() IsSystemMessage = (bool)rec.MessageMetadata["IsSystemMessage"], SendingEndpoint = rec.MessageMetadata["SendingEndpoint"], ReceivingEndpoint = rec.MessageMetadata["ReceivingEndpoint"], - TimeSent = (DateTime)rec.MessageMetadata["TimeSent"], + TimeSent = (DateTime?)rec.MessageMetadata["TimeSent"], MessageId = rec.MessageMetadata["MessageId"], rec.FailureDetails.Exception, NumberOfProcessingAttempts = failure.ProcessingAttempts.Count(), From 84dde512246ded6b67b9a5e00d5bbcc2e9579780 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 4 Aug 2015 10:05:40 +0200 Subject: [PATCH 3/3] Fix failing test. --- .../CompositeViews/FailedMessageTest.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ServiceControl.UnitTests/CompositeViews/FailedMessageTest.cs b/src/ServiceControl.UnitTests/CompositeViews/FailedMessageTest.cs index f795a7e195..4daf3b2228 100644 --- a/src/ServiceControl.UnitTests/CompositeViews/FailedMessageTest.cs +++ b/src/ServiceControl.UnitTests/CompositeViews/FailedMessageTest.cs @@ -13,7 +13,7 @@ public class FailedMessagesTests { [Test] - public void Should_allow_errors_with_no_metadata() + public void Should_not_provide_defaults_for_missing_metadata() { using (var session = documentStore.OpenSession()) { @@ -54,7 +54,10 @@ public void Should_allow_errors_with_no_metadata() Console.Out.WriteLine("Checking result"); Assert.AreEqual(1, results.Count); - Assert.AreEqual(DateTime.MinValue,results.First().TimeSent); + Assert.AreEqual(null, results.First().TimeSent); + Assert.AreEqual(null, results.First().MessageType); + Assert.AreEqual(null, results.First().ReceivingEndpoint); + Assert.AreEqual(null, results.First().SendingEndpoint); } }