From 47d49e7b4278084371e43b5b4f471a543c50f16f Mon Sep 17 00:00:00 2001 From: Tomasz Janicki Date: Fri, 11 Aug 2023 09:20:24 +0200 Subject: [PATCH] fixes --- Consumer/RealTime/Models/HeartBeatTimes.cs | 4 ++-- Consumer/RealTime/Services/RealTimeWebSocketClient.cs | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Consumer/RealTime/Models/HeartBeatTimes.cs b/Consumer/RealTime/Models/HeartBeatTimes.cs index b09b844..ebdb22d 100644 --- a/Consumer/RealTime/Models/HeartBeatTimes.cs +++ b/Consumer/RealTime/Models/HeartBeatTimes.cs @@ -23,9 +23,9 @@ public void Clear() End = null; } - public override string ToString() => + public override string ToString() => $"Start: {GetText(Start)}, End: {GetText(End)}"; - private static string GetText(DateTime? value) => + private static string GetText(DateTime? value) => value is null ? "null" : value.Value.ToString("O"); } \ No newline at end of file diff --git a/Consumer/RealTime/Services/RealTimeWebSocketClient.cs b/Consumer/RealTime/Services/RealTimeWebSocketClient.cs index 603a1de..9838baf 100644 --- a/Consumer/RealTime/Services/RealTimeWebSocketClient.cs +++ b/Consumer/RealTime/Services/RealTimeWebSocketClient.cs @@ -126,7 +126,7 @@ private async Task MonitorHandler(WebSocketState state, CancellationToken cancel { return response.AsT1; } - _argument = new Argument(response.AsT0, _argument.ClientWebSocketWrapper, _defaultAdvice); + _argument = _argument.CreateWithClientIdAndAdvice(response.AsT0, _defaultAdvice); await SendHeartbeat(_argument, tokenSources.LinkedTokenSourceToken).ConfigureAwait(false); } else @@ -174,7 +174,7 @@ private async Task HeartBeatHandler(HeartbeatResponse response, CancellationToke if (result.IsT0) { _logger.LogDebug("Get successful heartbeat results."); - _argument = new Argument(_argument!.ClientId, _argument.ClientWebSocketWrapper, result.AsT0); + _argument = _argument!.CreateWithAdvice(result.AsT0); _heartBeatTimes.SetEnd(); await SendHeartbeat(_argument, cancellationToken).ConfigureAwait(false); _fullReconnect = false; @@ -370,5 +370,11 @@ public Argument(string clientId, IClientWebSocketWrapper clientWebSocketWrapper, public IClientWebSocketWrapper ClientWebSocketWrapper { get; } public Advice Advice { get; } + + public Argument CreateWithAdvice(Advice advice) => + new(ClientId, ClientWebSocketWrapper, advice); + + public Argument CreateWithClientIdAndAdvice(string clientId, Advice advice) => + new(clientId, ClientWebSocketWrapper, advice); } } \ No newline at end of file