@@ -45,7 +45,9 @@ public async Task<QueryResult<SagaHistory>> QuerySagaHistoryById(Guid input, Can
4545 public async Task < QueryResult < IList < MessagesView > > > GetMessages ( bool includeSystemMessages , PagingInfo pagingInfo , SortInfo sortInfo , DateTimeRange timeSentRange , CancellationToken cancellationToken )
4646 {
4747 var matched = messageViews
48- . Where ( w => ! w . IsSystemMessage || includeSystemMessages )
48+ . Where ( w => ( ! w . IsSystemMessage || includeSystemMessages ) &&
49+ ( timeSentRange == null || ! timeSentRange . From . HasValue || w . TimeSent >= timeSentRange . From . Value ) &&
50+ ( timeSentRange == null || ! timeSentRange . To . HasValue || w . TimeSent <= timeSentRange . To . Value ) )
4951 . ToList ( ) ;
5052
5153 return await Task . FromResult ( new QueryResult < IList < MessagesView > > ( matched , new QueryStatsInfo ( string . Empty , matched . Count ) ) ) ;
@@ -56,7 +58,9 @@ public async Task<QueryResult<IList<MessagesView>>> QueryMessages(string keyword
5658 var messages = GetMessageIdsMatchingQuery ( keyword ) ;
5759
5860 var matched = messageViews
59- . Where ( w => messages . Contains ( w . MessageId ) )
61+ . Where ( w => messages . Contains ( w . MessageId ) &&
62+ ( timeSentRange == null || ! timeSentRange . From . HasValue || w . TimeSent >= timeSentRange . From . Value ) &&
63+ ( timeSentRange == null || ! timeSentRange . To . HasValue || w . TimeSent <= timeSentRange . To . Value ) )
6064 . ToList ( ) ;
6165 return await Task . FromResult ( new QueryResult < IList < MessagesView > > ( matched , new QueryStatsInfo ( string . Empty , matched . Count ( ) ) ) ) ;
6266 }
@@ -65,13 +69,19 @@ public async Task<QueryResult<IList<MessagesView>>> QueryMessagesByReceivingEndp
6569 {
6670 var messages = GetMessageIdsMatchingQuery ( keyword ) ;
6771
68- var matched = messageViews . Where ( w => w . ReceivingEndpoint . Name == endpoint && messages . Contains ( w . MessageId ) ) . ToList ( ) ;
72+ var matched = messageViews . Where ( w => w . ReceivingEndpoint . Name == endpoint && messages . Contains ( w . MessageId ) &&
73+ ( timeSentRange == null || ! timeSentRange . From . HasValue || w . TimeSent >= timeSentRange . From . Value ) &&
74+ ( timeSentRange == null || ! timeSentRange . To . HasValue || w . TimeSent <= timeSentRange . To . Value ) )
75+ . ToList ( ) ;
6976 return await Task . FromResult ( new QueryResult < IList < MessagesView > > ( matched , new QueryStatsInfo ( string . Empty , matched . Count ) ) ) ;
7077 }
7178
7279 public async Task < QueryResult < IList < MessagesView > > > QueryMessagesByReceivingEndpoint ( bool includeSystemMessages , string endpointName , PagingInfo pagingInfo , SortInfo sortInfo , DateTimeRange timeSentRange , CancellationToken cancellationToken )
7380 {
74- var matched = messageViews . Where ( w => w . ReceivingEndpoint . Name == endpointName ) . ToList ( ) ;
81+ var matched = messageViews . Where ( w => w . ReceivingEndpoint . Name == endpointName &&
82+ ( timeSentRange == null || ! timeSentRange . From . HasValue || w . TimeSent >= timeSentRange . From . Value ) &&
83+ ( timeSentRange == null || ! timeSentRange . To . HasValue || w . TimeSent <= timeSentRange . To . Value ) )
84+ . ToList ( ) ;
7585 return await Task . FromResult ( new QueryResult < IList < MessagesView > > ( matched , new QueryStatsInfo ( string . Empty , matched . Count ) ) ) ;
7686 }
7787
0 commit comments