Skip to content

Commit 3680c06

Browse files
committed
Add some bug fixes to message searching
1 parent e0fb8d4 commit 3680c06

4 files changed

Lines changed: 19 additions & 4 deletions

File tree

src/BuslyCLI.Console/Commands/ServiceControl/Message/SearchMessagesCommand.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ protected override async Task<int> ExecuteAsync(CommandContext context, SearchMe
2727
var table = new Table();
2828
table.AddColumn("Id");
2929
table.AddColumn("Message Type");
30+
table.AddColumn("Status");
3031
table.AddColumn("Processing Time");
3132
table.AddColumn("Critical Time");
3233
table.AddColumn("Delivery Time");
@@ -37,10 +38,11 @@ protected override async Task<int> ExecuteAsync(CommandContext context, SearchMe
3738
table.AddRow(
3839
message.Id,
3940
message.MessageType,
41+
message.Status.ToString(),
4042
message.ProcessingTime,
4143
message.CriticalTime.StartsWith("-") ? "00:00:00" : message.ProcessingTime,
4244
message.DeliveryTime.StartsWith("-") ? message.DeliveryTime.Substring(1) : message.DeliveryTime,
43-
message.TimeSent.Value.ToString("u"));
45+
message.TimeSent?.ToString("u") ?? "");
4446
}
4547

4648
console.Write(table);

src/BuslyCLI.Console/Commands/ServiceControl/Message/SearchMessagesSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class SearchMessagesSettings : GlobalCommandSettings
1616
[CommandOption("--page-size <page-size>")]
1717
[DefaultValue(50)]
1818
[Description("The page size to use when searching messages")]
19-
public uint PageSize { get; set; }
19+
public int PageSize { get; set; }
2020

2121
[CommandOption("--from <from>")]
2222
[Description("The start date to search messages from, using ISO-8601 format (YYYY-MM-DDTHH:mm:ssZ)")]

src/BuslyCLI.Console/Infrastructure/ServiceControlClient.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Net;
22
using System.Net.Http.Json;
33
using System.Text.Json;
4+
using System.Text.Json.Serialization;
45
using BuslyCLI.Infrastructure.ServiceControl;
56

67
namespace BuslyCLI.Infrastructure;
@@ -10,6 +11,7 @@ public class ServiceControlClient(HttpClient httpClient)
1011
private static readonly JsonSerializerOptions JsonOptions = new()
1112
{
1213
PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower,
14+
Converters = { new JsonStringEnumConverter(JsonNamingPolicy.SnakeCaseLower) },
1315
};
1416

1517
public async Task<IReadOnlyList<ServiceControlEndpoint>> GetEndpointsAsync(string baseUrl, CancellationToken cancellationToken = default)
@@ -62,7 +64,7 @@ public async Task<IReadOnlyList<ServiceControlMessage>> SearchMessagesAsync(
6264
string endpointName = null,
6365
DateTimeOffset? from = null,
6466
DateTimeOffset? to = null,
65-
uint pageSize = 50,
67+
int pageSize = 50,
6668
string sort = "time_sent",
6769
string direction = "desc",
6870
CancellationToken cancellationToken = default)

src/BuslyCLI.Console/Infrastructure/ServiceControlMessage.cs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,26 @@ public class ServiceControlMessage
1414
public string ProcessingTime { get; set; }
1515
public bool IsSystemMessage { get; set; }
1616
public string ConversationId { get; set; }
17-
public string Status { get; set; }
17+
public MessageStatus Status { get; set; }
1818
public string MessageIntent { get; set; }
1919
public string BodyUrl { get; set; }
2020
public int BodySize { get; set; }
2121
public string InstanceId { get; set; }
2222
public IReadOnlyList<ServiceControlMessageHeader> Headers { get; set; } = [];
2323
}
2424

25+
public enum MessageStatus
26+
{
27+
Failed = 1,
28+
RepeatedFailure = 2,
29+
Successful = 3,
30+
ResolvedSuccessfully = 4,
31+
ArchivedFailure = 5,
32+
RetryIssued = 6
33+
}
34+
2535
public class ServiceControlMessageEndpoint
36+
2637
{
2738
public string Name { get; set; }
2839
public string Host { get; set; }

0 commit comments

Comments
 (0)