Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clear event predicates after GetEventsRecords method. #22056

Open
wants to merge 2 commits into
base: rel-9.0
Choose a base branch
from
Open

Clear event predicates after GetEventsRecords method. #22056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5aaf555
Clear event predicates after `GetEventsRecords` method.
maliming Feb 1, 2025
2fb1d15
Update DomainEvents_Tests.cs
maliming Feb 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWork.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,15 +139,16 @@ public virtual async Task CompleteAsync(CancellationToken cancellationToken = de
_isCompleting = true;
await SaveChangesAsync(cancellationToken);

DistributedEvents.AddRange(GetEventsRecords(DistributedEventWithPredicates));
LocalEvents.AddRange(GetEventsRecords(LocalEventWithPredicates));
LocalEventWithPredicates.Clear();
DistributedEvents.AddRange(GetEventsRecords(DistributedEventWithPredicates));
DistributedEventWithPredicates.Clear();

while (LocalEvents.Any() || DistributedEvents.Any())
{
if (LocalEvents.Any())
{
var localEventsToBePublished = LocalEvents.OrderBy(e => e.EventOrder).ToArray();
LocalEventWithPredicates.Clear();
LocalEvents.Clear();
await UnitOfWorkEventPublisher.PublishLocalEventsAsync(
localEventsToBePublished
Expand All @@ -157,7 +158,6 @@ await UnitOfWorkEventPublisher.PublishLocalEventsAsync(
if (DistributedEvents.Any())
{
var distributedEventsToBePublished = DistributedEvents.OrderBy(e => e.EventOrder).ToArray();
DistributedEventWithPredicates.Clear();
DistributedEvents.Clear();
await UnitOfWorkEventPublisher.PublishDistributedEventsAsync(
distributedEventsToBePublished
Expand All @@ -167,7 +167,9 @@ await UnitOfWorkEventPublisher.PublishDistributedEventsAsync(
await SaveChangesAsync(cancellationToken);

LocalEvents.AddRange(GetEventsRecords(LocalEventWithPredicates));
LocalEventWithPredicates.Clear();
DistributedEvents.AddRange(GetEventsRecords(DistributedEventWithPredicates));
DistributedEventWithPredicates.Clear();
}

await CommitTransactionsAsync(cancellationToken);
Expand Down
58 changes: 58 additions & 0 deletions framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/DomainEvents_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,15 @@ public abstract class DomainEvents_Tests<TStartupModule> : TestAppTestBase<TStar
protected readonly IRepository<AppEntityWithNavigations, Guid> AppEntityWithNavigationsRepository;
protected readonly ILocalEventBus LocalEventBus;
protected readonly IDistributedEventBus DistributedEventBus;
protected readonly IUnitOfWorkManager UnitOfWorkManager;

protected DomainEvents_Tests()
{
PersonRepository = GetRequiredService<IRepository<Person, Guid>>();
AppEntityWithNavigationsRepository = GetRequiredService<IRepository<AppEntityWithNavigations, Guid>>();
LocalEventBus = GetRequiredService<ILocalEventBus>();
DistributedEventBus = GetRequiredService<IDistributedEventBus>();
UnitOfWorkManager = GetRequiredService<IUnitOfWorkManager>();
}

[Fact]
Expand Down Expand Up @@ -176,6 +178,52 @@ await WithUnitOfWorkAsync(async () =>
isDistributedEventTriggered.ShouldBeTrue();
}

[Fact]
public async Task Should_Trigger_Event_That_Publish_In_Event_Handler()
{
//Arrange
var event1Triggered = false;
var event2Triggered = false;
var event3Triggered = false;
var event4Triggered = false;

LocalEventBus.Subscribe<MyCustomEventData>(async data =>
{
event1Triggered = true;
await DistributedEventBus.PublishAsync(new MyCustomEventData3 { Value = "42" });
});

DistributedEventBus.Subscribe<MyCustomEventData2>(async data =>
{
event2Triggered = true;
await LocalEventBus.PublishAsync(new MyCustomEventData4 { Value = "42" });
});

LocalEventBus.Subscribe<MyCustomEventData3>(async data =>
{
event3Triggered = true;
});

DistributedEventBus.Subscribe<MyCustomEventData4>(async data =>
{
event4Triggered = true;
});

//Act
using (var uow = UnitOfWorkManager.Begin(requiresNew: true))
{
await LocalEventBus.PublishAsync(new MyCustomEventData { Value = "42" });
await DistributedEventBus.PublishAsync(new MyCustomEventData2 { Value = "42" });
await uow.CompleteAsync();
}

//Assert
event1Triggered.ShouldBeTrue();
event2Triggered.ShouldBeTrue();
event3Triggered.ShouldBeTrue();
event4Triggered.ShouldBeTrue();
}

private class MyCustomEventData
{
public string Value { get; set; }
Expand All @@ -185,6 +233,16 @@ private class MyCustomEventData2
{
public string Value { get; set; }
}

private class MyCustomEventData3
{
public string Value { get; set; }
}

private class MyCustomEventData4
{
public string Value { get; set; }
}
}

public abstract class AbpEntityChangeOptions_DomainEvents_Tests<TStartupModule> : TestAppTestBase<TStartupModule>
Expand Down
Loading