From 8e73d7a5d7a505892b7202a17b19269c1a707fdf Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Wed, 3 Jan 2024 14:15:08 +0100 Subject: [PATCH] Refactor conditionals and class names Adjusted logical conditions in ParameterizedQueryBuilderExtensions and For activity to work as expected. The former's conditional for IsLatestAndPublished now correctly uses 'and' while the latter properly increments currentValue. Renamed BulkCancel Endpoint class in WorkflowInstances to more accurately represent its purpose. --- .../Extensions/ParameterizedQueryBuilderExtensions.cs | 2 +- .../Endpoints/WorkflowInstances/BulkCancel/Endpoint.cs | 2 +- src/modules/Elsa.Workflows.Core/Activities/For.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/Elsa.Dapper/Extensions/ParameterizedQueryBuilderExtensions.cs b/src/modules/Elsa.Dapper/Extensions/ParameterizedQueryBuilderExtensions.cs index faebf3de5e..712a0e7dc0 100644 --- a/src/modules/Elsa.Dapper/Extensions/ParameterizedQueryBuilderExtensions.cs +++ b/src/modules/Elsa.Dapper/Extensions/ParameterizedQueryBuilderExtensions.cs @@ -215,7 +215,7 @@ public static ParameterizedQuery Is(this ParameterizedQuery query, VersionOption if (options.IsLatest) sql.AppendLine("and IsLatest = 1"); if (options.IsPublished) sql.AppendLine("and IsPublished = 1"); if (options.IsLatestOrPublished) sql.AppendLine("and (IsLatest = 1 or IsPublished = 1)"); - if (options.IsLatestAndPublished) sql.AppendLine("and IsLatest = 1 or IsPublished = 1"); + if (options.IsLatestAndPublished) sql.AppendLine("and IsLatest = 1 and IsPublished = 1"); if (options.Version > 0) { sql.AppendLine(query.Dialect.And("Version")); diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/BulkCancel/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/BulkCancel/Endpoint.cs index 84d258dc91..19a2bb69d7 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/BulkCancel/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/BulkCancel/Endpoint.cs @@ -3,7 +3,7 @@ namespace Elsa.Workflows.Api.Endpoints.WorkflowInstances.BulkCancel; -public class Endpoint : ElsaEndpoint +public class BulkCancel : ElsaEndpoint { public override void Configure() { diff --git a/src/modules/Elsa.Workflows.Core/Activities/For.cs b/src/modules/Elsa.Workflows.Core/Activities/For.cs index 5ecabacbe5..98784b7b1e 100644 --- a/src/modules/Elsa.Workflows.Core/Activities/For.cs +++ b/src/modules/Elsa.Workflows.Core/Activities/For.cs @@ -88,7 +88,7 @@ private async ValueTask HandleIteration(ActivityExecutionContext context) var inclusive = context.Get(OuterBoundInclusive); var increment = step >= 0; - currentValue = currentValue == null ? start : (currentValue + step); + currentValue = currentValue == null ? start : currentValue + step; var isBreaking = context.GetIsBreaking();