From f54cc0683a96c50ad3b8f072bd37d485b894f672 Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Tue, 24 Nov 2020 14:25:09 +0100
Subject: [PATCH] Fix/rerun (#598)

* Fix for rerun rules.

* Tests fixed
---
 .../Squidex.Domain.Apps.Entities/Rules/RuleDomainObject.cs    | 2 +-
 .../Rules/Runner/RuleRunnerGrain.cs                           | 2 +-
 .../Rules/RuleDomainObjectTests.cs                            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/src/Squidex.Domain.Apps.Entities/Rules/RuleDomainObject.cs b/backend/src/Squidex.Domain.Apps.Entities/Rules/RuleDomainObject.cs
index 9f326d967..9477e9e11 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Rules/RuleDomainObject.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Rules/RuleDomainObject.cs
@@ -114,7 +114,7 @@ namespace Squidex.Domain.Apps.Entities.Rules
 
             var @event = SimpleMapper.Map(command, new RuleManuallyTriggered { RuleId = Snapshot.Id, AppId = Snapshot.AppId });
 
-            await ruleEnqueuer.EnqueueAsync(Snapshot.RuleDef, Snapshot.UniqueId, Envelope.Create(@event));
+            await ruleEnqueuer.EnqueueAsync(Snapshot.RuleDef, Snapshot.Id, Envelope.Create(@event));
 
             return null;
         }
diff --git a/backend/src/Squidex.Domain.Apps.Entities/Rules/Runner/RuleRunnerGrain.cs b/backend/src/Squidex.Domain.Apps.Entities/Rules/Runner/RuleRunnerGrain.cs
index a17ffe1e0..1ee8d8aae 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Rules/Runner/RuleRunnerGrain.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Rules/Runner/RuleRunnerGrain.cs
@@ -179,7 +179,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.Runner
                     }
 
                     await state.WriteAsync();
-                }, $"\\-{Key}", job.Position, ct);
+                }, $"^([a-z]+)\\-{Key}", job.Position, ct);
             }
             catch (OperationCanceledException)
             {
diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleDomainObjectTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleDomainObjectTests.cs
index e2b024395..5c7fa6bef 100644
--- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleDomainObjectTests.cs
+++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleDomainObjectTests.cs
@@ -164,8 +164,8 @@ namespace Squidex.Domain.Apps.Entities.Rules
 
             Assert.Null(result);
 
-            A.CallTo(() => ruleEnqueuer.EnqueueAsync(sut.Snapshot.RuleDef, sut.UniqueId,
-                A<Envelope<IEvent>>.That.Matches(x => x.Payload is RuleManuallyTriggered)))
+            A.CallTo(() => ruleEnqueuer.EnqueueAsync(sut.Snapshot.RuleDef, sut.Snapshot.Id,
+                    A<Envelope<IEvent>>.That.Matches(x => x.Payload is RuleManuallyTriggered)))
                 .MustHaveHappened();
         }