From c3dc2354b87e59d50f9d161cd0ddabfec9ff6a72 Mon Sep 17 00:00:00 2001 From: "dante.barbosa" Date: Mon, 11 Mar 2024 17:52:07 -0300 Subject: [PATCH 1/3] #610355 Removing method that remove master state --- src/Take.Blip.Builder/InputExpirationHandler.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Take.Blip.Builder/InputExpirationHandler.cs b/src/Take.Blip.Builder/InputExpirationHandler.cs index f0e5caac..9ad7d0d5 100644 --- a/src/Take.Blip.Builder/InputExpirationHandler.cs +++ b/src/Take.Blip.Builder/InputExpirationHandler.cs @@ -219,8 +219,7 @@ private async Task ValidateInputExirationCountAsync(State state, Message m { var inputExpirationCount = await _inputExpirationCount.IncrementAsync(message); if (inputExpirationCount > _configuration.MaximumInputExpirationLoop) - { - await _stateManager.ResetUserState(context, cancellationToken); + { await _inputExpirationCount.TryRemoveAsync(message); _logger.Warning("[{Source}] [FlowConstruction] Max input expiration transitions of {MaximumInputExpirationLoop} was reached", nameof(InputExpirationHandler), _configuration.MaximumInputExpirationLoop); From 54ecb2c66b669ae080c796667d16daddd72df2a7 Mon Sep 17 00:00:00 2001 From: "dante.barbosa" Date: Tue, 12 Mar 2024 14:55:37 -0300 Subject: [PATCH 2/3] #610355 Removing unecessary dependency and adjust unit tests --- .../InputExpirationHandlerTests.cs | 1 - src/Take.Blip.Builder/InputExpirationHandler.cs | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Take.Blip.Builder.UnitTests/InputExpirationHandlerTests.cs b/src/Take.Blip.Builder.UnitTests/InputExpirationHandlerTests.cs index eba79910..d9b9cf49 100644 --- a/src/Take.Blip.Builder.UnitTests/InputExpirationHandlerTests.cs +++ b/src/Take.Blip.Builder.UnitTests/InputExpirationHandlerTests.cs @@ -216,7 +216,6 @@ await Scheduler Arg.Any(), Arg.Any(), Arg.Is(c => !c.IsCancellationRequested)); - await _stateManager.Received(1).ResetUserState(null, default(CancellationToken)); await _inputExpirationCount.Received(1).TryRemoveAsync(Message); } diff --git a/src/Take.Blip.Builder/InputExpirationHandler.cs b/src/Take.Blip.Builder/InputExpirationHandler.cs index 9ad7d0d5..87437898 100644 --- a/src/Take.Blip.Builder/InputExpirationHandler.cs +++ b/src/Take.Blip.Builder/InputExpirationHandler.cs @@ -31,7 +31,6 @@ public class InputExpirationHandler : IInputMessageHandler private readonly ILogger _logger; private readonly IInputExpirationCount _inputExpirationCount; private readonly IConfiguration _configuration; - private readonly IStateManager _stateManager; /// /// Constructor @@ -43,8 +42,6 @@ public InputExpirationHandler(ISchedulerExtension schedulerExtension, ILogger lo _logger = logger; _inputExpirationCount = inputExpirationCount; _configuration = configuration; - _stateManager = stateManager; - } /// @@ -219,7 +216,7 @@ private async Task ValidateInputExirationCountAsync(State state, Message m { var inputExpirationCount = await _inputExpirationCount.IncrementAsync(message); if (inputExpirationCount > _configuration.MaximumInputExpirationLoop) - { + { await _inputExpirationCount.TryRemoveAsync(message); _logger.Warning("[{Source}] [FlowConstruction] Max input expiration transitions of {MaximumInputExpirationLoop} was reached", nameof(InputExpirationHandler), _configuration.MaximumInputExpirationLoop); From 20347b07982c342b62a91f240ca5fad46121eb2a Mon Sep 17 00:00:00 2001 From: "dante.barbosa" Date: Tue, 12 Mar 2024 17:45:23 -0300 Subject: [PATCH 3/3] #610355 Remove unecessary dependencies --- .../InputExpirationHandlerTests.cs | 4 +--- src/Take.Blip.Builder/InputExpirationHandler.cs | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Take.Blip.Builder.UnitTests/InputExpirationHandlerTests.cs b/src/Take.Blip.Builder.UnitTests/InputExpirationHandlerTests.cs index d9b9cf49..bf184ac2 100644 --- a/src/Take.Blip.Builder.UnitTests/InputExpirationHandlerTests.cs +++ b/src/Take.Blip.Builder.UnitTests/InputExpirationHandlerTests.cs @@ -30,7 +30,6 @@ public class InputExpirationHandlerTests private readonly ILogger Logger; private readonly IInputExpirationCount _inputExpirationCount; private readonly IConfiguration _configuration; - private readonly IStateManager _stateManager; public InputExpirationHandlerTests() { @@ -51,8 +50,7 @@ public InputExpirationHandlerTests() Logger = Substitute.For(); _inputExpirationCount = Substitute.For(); _configuration = Substitute.For(); - _stateManager = Substitute.For(); - InputHandler = new InputExpirationHandler(Scheduler, Logger, _inputExpirationCount, _stateManager, _configuration); + InputHandler = new InputExpirationHandler(Scheduler, Logger, _inputExpirationCount, _configuration); } [Fact] diff --git a/src/Take.Blip.Builder/InputExpirationHandler.cs b/src/Take.Blip.Builder/InputExpirationHandler.cs index 87437898..c9ae9ab7 100644 --- a/src/Take.Blip.Builder/InputExpirationHandler.cs +++ b/src/Take.Blip.Builder/InputExpirationHandler.cs @@ -8,8 +8,6 @@ using Take.Blip.Builder.Diagnostics; using Take.Blip.Builder.Hosting; using Take.Blip.Builder.Models; -using Take.Blip.Builder.Storage; -using Take.Blip.Client; using Take.Blip.Client.Content; using Take.Blip.Client.Extensions.Scheduler; using Takenet.Iris.Messaging.Resources; @@ -36,7 +34,7 @@ public class InputExpirationHandler : IInputMessageHandler /// Constructor /// /// - public InputExpirationHandler(ISchedulerExtension schedulerExtension, ILogger logger, IInputExpirationCount inputExpirationCount, IStateManager stateManager, IConfiguration configuration) + public InputExpirationHandler(ISchedulerExtension schedulerExtension, ILogger logger, IInputExpirationCount inputExpirationCount, IConfiguration configuration) { _schedulerExtension = schedulerExtension; _logger = logger;