Browse Source

Fix/rerun (#598)

* Fix for rerun rules.

* Tests fixed
pull/602/head
Sebastian Stehle 5 years ago
committed by GitHub
parent
commit
f54cc0683a
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      backend/src/Squidex.Domain.Apps.Entities/Rules/RuleDomainObject.cs
  2. 2
      backend/src/Squidex.Domain.Apps.Entities/Rules/Runner/RuleRunnerGrain.cs
  3. 4
      backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleDomainObjectTests.cs

2
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 }); 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; return null;
} }

2
backend/src/Squidex.Domain.Apps.Entities/Rules/Runner/RuleRunnerGrain.cs

@ -179,7 +179,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.Runner
} }
await state.WriteAsync(); await state.WriteAsync();
}, $"\\-{Key}", job.Position, ct); }, $"^([a-z]+)\\-{Key}", job.Position, ct);
} }
catch (OperationCanceledException) catch (OperationCanceledException)
{ {

4
backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleDomainObjectTests.cs

@ -164,8 +164,8 @@ namespace Squidex.Domain.Apps.Entities.Rules
Assert.Null(result); Assert.Null(result);
A.CallTo(() => ruleEnqueuer.EnqueueAsync(sut.Snapshot.RuleDef, sut.UniqueId, A.CallTo(() => ruleEnqueuer.EnqueueAsync(sut.Snapshot.RuleDef, sut.Snapshot.Id,
A<Envelope<IEvent>>.That.Matches(x => x.Payload is RuleManuallyTriggered))) A<Envelope<IEvent>>.That.Matches(x => x.Payload is RuleManuallyTriggered)))
.MustHaveHappened(); .MustHaveHappened();
} }

Loading…
Cancel
Save