Outbox

phongnguyend · phongnguyend · commit e9cac86bb020 · 2025-10-04T21:29:31.000+07:00
diff --git a/src/Monolith/ClassifiedAds.Application/EventLogs/Commands/PublishEventsCommand.cs b/src/Monolith/ClassifiedAds.Application/EventLogs/Commands/PublishEventsCommand.cs
@@ -19,31 +19,31 @@ public class PublishEventsCommandHandler : ICommandHandler<PublishEventsCommand>
 {
     private readonly ILogger<PublishEventsCommandHandler> _logger;
     private readonly IDateTimeProvider _dateTimeProvider;
-    private readonly IRepository<OutboxEvent, Guid> _outboxEventRepository;
+    private readonly IRepository<OutboxMessage, Guid> _outboxMessageRepository;
     private readonly IMessageBus _messageBus;
 
     public PublishEventsCommandHandler(ILogger<PublishEventsCommandHandler> logger,
         IDateTimeProvider dateTimeProvider,
-        IRepository<OutboxEvent, Guid> outboxEventRepository,
+        IRepository<OutboxMessage, Guid> outboxMessageRepository,
         IMessageBus messageBus)
     {
         _logger = logger;
         _dateTimeProvider = dateTimeProvider;
-        _outboxEventRepository = outboxEventRepository;
+        _outboxMessageRepository = outboxMessageRepository;
         _messageBus = messageBus;
     }
 
     public async Task HandleAsync(PublishEventsCommand command, CancellationToken cancellationToken = default)
     {
-        var events = _outboxEventRepository.GetQueryableSet()
+        var events = _outboxMessageRepository.GetQueryableSet()
             .Where(x => !x.Published)
             .OrderBy(x => x.CreatedDateTime)
             .Take(50)
             .ToList();
 
         foreach (var eventLog in events)
         {
-            var outbox = new PublishingOutBoxEvent
+            var outbox = new PublishingOutboxMessage
             {
                 Id = eventLog.Id.ToString(),
                 EventType = eventLog.EventType,
@@ -55,7 +55,7 @@ public async Task HandleAsync(PublishEventsCommand command, CancellationToken ca
             await _messageBus.SendAsync(outbox, cancellationToken);
             eventLog.Published = true;
             eventLog.UpdatedDateTime = _dateTimeProvider.OffsetNow;
-            await _outboxEventRepository.UnitOfWork.SaveChangesAsync(cancellationToken);
+            await _outboxMessageRepository.UnitOfWork.SaveChangesAsync(cancellationToken);
         }
 
         command.SentEventsCount = events.Count;
diff --git a/src/Monolith/ClassifiedAds.Application/FileEntries/EventHandlers/FileEntryCreatedEventHandler.cs b/src/Monolith/ClassifiedAds.Application/FileEntries/EventHandlers/FileEntryCreatedEventHandler.cs
@@ -5,7 +5,6 @@
 using ClassifiedAds.Domain.Identity;
 using ClassifiedAds.Domain.Repositories;
 using System;
-using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -15,15 +14,15 @@ public class FileEntryCreatedEventHandler : IDomainEventHandler<EntityCreatedEve
 {
     private readonly ICrudService<AuditLogEntry> _auditSerivce;
     private readonly ICurrentUser _currentUser;
-    private readonly IRepository<OutboxEvent, Guid> _outboxEventRepository;
+    private readonly IRepository<OutboxMessage, Guid> _outboxMessageRepository;
 
     public FileEntryCreatedEventHandler(ICrudService<AuditLogEntry> auditSerivce,
         ICurrentUser currentUser,
-        IRepository<OutboxEvent, Guid> outboxEventRepository)
+        IRepository<OutboxMessage, Guid> outboxMessageRepository)
     {
         _auditSerivce = auditSerivce;
         _currentUser = currentUser;
-        _outboxEventRepository = outboxEventRepository;
+        _outboxMessageRepository = outboxMessageRepository;
     }
 
     public async Task HandleAsync(EntityCreatedEvent<FileEntry> domainEvent, CancellationToken cancellationToken = default)
@@ -37,16 +36,15 @@ await _auditSerivce.AddOrUpdateAsync(new AuditLogEntry
             Log = domainEvent.Entity.AsJsonString(),
         }, cancellationToken);
 
-        await _outboxEventRepository.AddOrUpdateAsync(new OutboxEvent
+        await _outboxMessageRepository.AddOrUpdateAsync(new OutboxMessage
         {
             EventType = EventTypeConstants.FileEntryCreated,
             TriggeredById = _currentUser.UserId,
             CreatedDateTime = domainEvent.EventDateTime,
             ObjectId = domainEvent.Entity.Id.ToString(),
             Payload = domainEvent.Entity.AsJsonString(),
-            ActivityId = Activity.Current.Id,
         }, cancellationToken);
 
-        await _outboxEventRepository.UnitOfWork.SaveChangesAsync(cancellationToken);
+        await _outboxMessageRepository.UnitOfWork.SaveChangesAsync(cancellationToken);
     }
 }
diff --git a/src/Monolith/ClassifiedAds.Application/FileEntries/EventHandlers/FileEntryDeletedEventHandler.cs b/src/Monolith/ClassifiedAds.Application/FileEntries/EventHandlers/FileEntryDeletedEventHandler.cs
@@ -5,7 +5,6 @@
 using ClassifiedAds.Domain.Identity;
 using ClassifiedAds.Domain.Repositories;
 using System;
-using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -15,15 +14,15 @@ public class FileEntryDeletedEventHandler : IDomainEventHandler<EntityDeletedEve
 {
     private readonly ICrudService<AuditLogEntry> _auditSerivce;
     private readonly ICurrentUser _currentUser;
-    private readonly IRepository<OutboxEvent, Guid> _outboxEventRepository;
+    private readonly IRepository<OutboxMessage, Guid> _outboxMessageRepository;
 
     public FileEntryDeletedEventHandler(ICrudService<AuditLogEntry> auditSerivce,
         ICurrentUser currentUser,
-        IRepository<OutboxEvent, Guid> outboxEventRepository)
+        IRepository<OutboxMessage, Guid> outboxMessageRepository)
     {
         _auditSerivce = auditSerivce;
         _currentUser = currentUser;
-        _outboxEventRepository = outboxEventRepository;
+        _outboxMessageRepository = outboxMessageRepository;
     }
 
     public async Task HandleAsync(EntityDeletedEvent<FileEntry> domainEvent, CancellationToken cancellationToken = default)
@@ -37,16 +36,15 @@ await _auditSerivce.AddOrUpdateAsync(new AuditLogEntry
             Log = domainEvent.Entity.AsJsonString(),
         }, cancellationToken);
 
-        await _outboxEventRepository.AddOrUpdateAsync(new OutboxEvent
+        await _outboxMessageRepository.AddOrUpdateAsync(new OutboxMessage
         {
             EventType = EventTypeConstants.FileEntryDeleted,
             TriggeredById = _currentUser.UserId,
             CreatedDateTime = domainEvent.EventDateTime,
             ObjectId = domainEvent.Entity.Id.ToString(),
             Payload = domainEvent.Entity.AsJsonString(),
-            ActivityId = Activity.Current.Id,
         }, cancellationToken);
 
-        await _outboxEventRepository.UnitOfWork.SaveChangesAsync(cancellationToken);
+        await _outboxMessageRepository.UnitOfWork.SaveChangesAsync(cancellationToken);
     }
 }
diff --git a/src/Monolith/ClassifiedAds.Application/FileEntries/EventHandlers/FileEntryUpdatedEventHandler.cs b/src/Monolith/ClassifiedAds.Application/FileEntries/EventHandlers/FileEntryUpdatedEventHandler.cs
@@ -5,7 +5,6 @@
 using ClassifiedAds.Domain.Identity;
 using ClassifiedAds.Domain.Repositories;
 using System;
-using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -15,15 +14,15 @@ public class FileEntryUpdatedEventHandler : IDomainEventHandler<EntityUpdatedEve
 {
     private readonly ICrudService<AuditLogEntry> _auditSerivce;
     private readonly ICurrentUser _currentUser;
-    private readonly IRepository<OutboxEvent, Guid> _outboxEventRepository;
+    private readonly IRepository<OutboxMessage, Guid> _outboxMessageRepository;
 
     public FileEntryUpdatedEventHandler(ICrudService<AuditLogEntry> auditSerivce,
         ICurrentUser currentUser,
-        IRepository<OutboxEvent, Guid> outboxEventRepository)
+        IRepository<OutboxMessage, Guid> outboxMessageRepository)
     {
         _auditSerivce = auditSerivce;
         _currentUser = currentUser;
-        _outboxEventRepository = outboxEventRepository;
+        _outboxMessageRepository = outboxMessageRepository;
     }
 
     public async Task HandleAsync(EntityUpdatedEvent<FileEntry> domainEvent, CancellationToken cancellationToken = default)
@@ -37,16 +36,15 @@ await _auditSerivce.AddOrUpdateAsync(new AuditLogEntry
             Log = domainEvent.Entity.AsJsonString(),
         }, cancellationToken);
 
-        await _outboxEventRepository.AddOrUpdateAsync(new OutboxEvent
+        await _outboxMessageRepository.AddOrUpdateAsync(new OutboxMessage
         {
             EventType = EventTypeConstants.FileEntryUpdated,
             TriggeredById = _currentUser.UserId,
             CreatedDateTime = domainEvent.EventDateTime,
             ObjectId = domainEvent.Entity.Id.ToString(),
             Payload = domainEvent.Entity.AsJsonString(),
-            ActivityId = Activity.Current.Id,
         }, cancellationToken);
 
-        await _outboxEventRepository.UnitOfWork.SaveChangesAsync(cancellationToken);
+        await _outboxMessageRepository.UnitOfWork.SaveChangesAsync(cancellationToken);
     }
 }
diff --git a/src/Monolith/ClassifiedAds.Application/Products/EventHandlers/ProductCreatedEventHandler.cs b/src/Monolith/ClassifiedAds.Application/Products/EventHandlers/ProductCreatedEventHandler.cs
@@ -5,7 +5,6 @@
 using ClassifiedAds.Domain.Identity;
 using ClassifiedAds.Domain.Repositories;
 using System;
-using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -15,15 +14,15 @@ public class ProductCreatedEventHandler : IDomainEventHandler<EntityCreatedEvent
 {
     private readonly ICrudService<AuditLogEntry> _auditSerivce;
     private readonly ICurrentUser _currentUser;
-    private readonly IRepository<OutboxEvent, Guid> _outboxEventRepository;
+    private readonly IRepository<OutboxMessage, Guid> _outboxMessageRepository;
 
     public ProductCreatedEventHandler(ICrudService<AuditLogEntry> auditSerivce,
         ICurrentUser currentUser,
-        IRepository<OutboxEvent, Guid> outboxEventRepository)
+        IRepository<OutboxMessage, Guid> outboxMessageRepository)
     {
         _auditSerivce = auditSerivce;
         _currentUser = currentUser;
-        _outboxEventRepository = outboxEventRepository;
+        _outboxMessageRepository = outboxMessageRepository;
     }
 
     public async Task HandleAsync(EntityCreatedEvent<Product> domainEvent, CancellationToken cancellationToken = default)
@@ -37,16 +36,15 @@ await _auditSerivce.AddOrUpdateAsync(new AuditLogEntry
             Log = domainEvent.Entity.AsJsonString(),
         }, cancellationToken);
 
-        await _outboxEventRepository.AddOrUpdateAsync(new OutboxEvent
+        await _outboxMessageRepository.AddOrUpdateAsync(new OutboxMessage
         {
             EventType = EventTypeConstants.ProductCreated,
             TriggeredById = _currentUser.UserId,
             CreatedDateTime = domainEvent.EventDateTime,
             ObjectId = domainEvent.Entity.Id.ToString(),
             Payload = domainEvent.Entity.AsJsonString(),
-            ActivityId = Activity.Current.Id,
         }, cancellationToken);
 
-        await _outboxEventRepository.UnitOfWork.SaveChangesAsync(cancellationToken);
+        await _outboxMessageRepository.UnitOfWork.SaveChangesAsync(cancellationToken);
     }
 }
diff --git a/src/Monolith/ClassifiedAds.Application/Products/EventHandlers/ProductDeletedEventHandler.cs b/src/Monolith/ClassifiedAds.Application/Products/EventHandlers/ProductDeletedEventHandler.cs
@@ -5,7 +5,6 @@
 using ClassifiedAds.Domain.Identity;
 using ClassifiedAds.Domain.Repositories;
 using System;
-using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -15,15 +14,15 @@ public class ProductDeletedEventHandler : IDomainEventHandler<EntityDeletedEvent
 {
     private readonly ICrudService<AuditLogEntry> _auditSerivce;
     private readonly ICurrentUser _currentUser;
-    private readonly IRepository<OutboxEvent, Guid> _outboxEventRepository;
+    private readonly IRepository<OutboxMessage, Guid> _outboxMessageRepository;
 
     public ProductDeletedEventHandler(ICrudService<AuditLogEntry> auditSerivce,
         ICurrentUser currentUser,
-        IRepository<OutboxEvent, Guid> outboxEventRepository)
+        IRepository<OutboxMessage, Guid> outboxMessageRepository)
     {
         _auditSerivce = auditSerivce;
         _currentUser = currentUser;
-        _outboxEventRepository = outboxEventRepository;
+        _outboxMessageRepository = outboxMessageRepository;
     }
 
     public async Task HandleAsync(EntityDeletedEvent<Product> domainEvent, CancellationToken cancellationToken = default)
@@ -37,16 +36,15 @@ await _auditSerivce.AddOrUpdateAsync(new AuditLogEntry
             Log = domainEvent.Entity.AsJsonString(),
         }, cancellationToken);
 
-        await _outboxEventRepository.AddOrUpdateAsync(new OutboxEvent
+        await _outboxMessageRepository.AddOrUpdateAsync(new OutboxMessage
         {
             EventType = EventTypeConstants.ProductDeleted,
             TriggeredById = _currentUser.UserId,
             CreatedDateTime = domainEvent.EventDateTime,
             ObjectId = domainEvent.Entity.Id.ToString(),
             Payload = domainEvent.Entity.AsJsonString(),
-            ActivityId = Activity.Current.Id,
         }, cancellationToken);
 
-        await _outboxEventRepository.UnitOfWork.SaveChangesAsync(cancellationToken);
+        await _outboxMessageRepository.UnitOfWork.SaveChangesAsync(cancellationToken);
     }
 }
diff --git a/src/Monolith/ClassifiedAds.Application/Products/EventHandlers/ProductUpdatedEventHandler.cs b/src/Monolith/ClassifiedAds.Application/Products/EventHandlers/ProductUpdatedEventHandler.cs
@@ -5,7 +5,6 @@
 using ClassifiedAds.Domain.Identity;
 using ClassifiedAds.Domain.Repositories;
 using System;
-using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -15,15 +14,15 @@ public class ProductUpdatedEventHandler : IDomainEventHandler<EntityUpdatedEvent
 {
     private readonly ICrudService<AuditLogEntry> _auditSerivce;
     private readonly ICurrentUser _currentUser;
-    private readonly IRepository<OutboxEvent, Guid> _outboxEventRepository;
+    private readonly IRepository<OutboxMessage, Guid> _outboxMessageRepository;
 
     public ProductUpdatedEventHandler(ICrudService<AuditLogEntry> auditSerivce,
         ICurrentUser currentUser,
-        IRepository<OutboxEvent, Guid> outboxEventRepository)
+        IRepository<OutboxMessage, Guid> outboxMessageRepository)
     {
         _auditSerivce = auditSerivce;
         _currentUser = currentUser;
-        _outboxEventRepository = outboxEventRepository;
+        _outboxMessageRepository = outboxMessageRepository;
     }
 
     public async Task HandleAsync(EntityUpdatedEvent<Product> domainEvent, CancellationToken cancellationToken = default)
@@ -37,16 +36,15 @@ await _auditSerivce.AddOrUpdateAsync(new AuditLogEntry
             Log = domainEvent.Entity.AsJsonString(),
         }, cancellationToken);
 
-        await _outboxEventRepository.AddOrUpdateAsync(new OutboxEvent
+        await _outboxMessageRepository.AddOrUpdateAsync(new OutboxMessage
         {
             EventType = EventTypeConstants.ProductUpdated,
             TriggeredById = _currentUser.UserId,
             CreatedDateTime = domainEvent.EventDateTime,
             ObjectId = domainEvent.Entity.Id.ToString(),
             Payload = domainEvent.Entity.AsJsonString(),
-            ActivityId = Activity.Current.Id
         }, cancellationToken);
 
-        await _outboxEventRepository.UnitOfWork.SaveChangesAsync(cancellationToken);
+        await _outboxMessageRepository.UnitOfWork.SaveChangesAsync(cancellationToken);
     }
 }
diff --git a/src/Monolith/ClassifiedAds.Background/OutBoxEventPublishers/FileEntryOutboxMessagePublisher.cs b/src/Monolith/ClassifiedAds.Background/OutBoxEventPublishers/FileEntryOutboxMessagePublisher.cs
@@ -7,9 +7,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace ClassifiedAds.Background.OutBoxEventPublishers;
+namespace ClassifiedAds.Background.OutboxMessagePublishers;
 
-public class FileEntryOutBoxEventPublisher : IOutBoxEventPublisher
+public class FileEntryOutboxMessagePublisher : IOutboxMessagePublisher
 {
     private readonly IMessageBus _messageBus;
 
@@ -23,12 +23,12 @@ public static string CanHandleEventSource()
         return typeof(PublishEventsCommand).Assembly.GetName().Name;
     }
 
-    public FileEntryOutBoxEventPublisher(IMessageBus messageBus)
+    public FileEntryOutboxMessagePublisher(IMessageBus messageBus)
     {
         _messageBus = messageBus;
     }
 
-    public async Task HandleAsync(PublishingOutBoxEvent outbox, CancellationToken cancellationToken = default)
+    public async Task HandleAsync(PublishingOutboxMessage outbox, CancellationToken cancellationToken = default)
     {
         if (outbox.EventType == EventTypeConstants.FileEntryCreated)
         {
diff --git a/src/Monolith/ClassifiedAds.Background/Program.cs b/src/Monolith/ClassifiedAds.Background/Program.cs
@@ -61,7 +61,7 @@
     services.AddMessageBusReceiver<WebhookConsumer, FileUploadedEvent>(appSettings.Messaging);
     services.AddMessageBusReceiver<WebhookConsumer, FileDeletedEvent>(appSettings.Messaging);
     services.AddMessageBusConsumers(Assembly.GetExecutingAssembly());
-    services.AddOutboxEventPublishers(Assembly.GetExecutingAssembly());
+    services.AddOutboxMessagePublishers(Assembly.GetExecutingAssembly());
 
     services.AddNotificationServices(appSettings.Notification);
 
diff --git a/src/Monolith/ClassifiedAds.Domain/Entities/OutboxMessage.cs b/src/Monolith/ClassifiedAds.Domain/Entities/OutboxMessage.cs
@@ -2,15 +2,15 @@
 
 namespace ClassifiedAds.Domain.Entities;
 
-public class OutboxEvent : OutboxEventBase, IAggregateRoot
+public class OutboxMessage : OutboxMessageBase, IAggregateRoot
 {
 }
 
-public class ArchivedOutboxEvent : OutboxEventBase, IAggregateRoot
+public class ArchivedOutboxMessage : OutboxMessageBase, IAggregateRoot
 {
 }
 
-public abstract class OutboxEventBase : Entity<Guid>
+public abstract class OutboxMessageBase : Entity<Guid>
 {
     public string EventType { get; set; }
 
diff --git a/src/Monolith/ClassifiedAds.Domain/Infrastructure/Messaging/IMessageBus.cs b/src/Monolith/ClassifiedAds.Domain/Infrastructure/Messaging/IMessageBus.cs
@@ -15,7 +15,7 @@ Task ReceiveAsync<TConsumer, T>(Func<T, MetaData, CancellationToken, Task> actio
     Task ReceiveAsync<TConsumer, T>(CancellationToken cancellationToken = default)
         where T : IMessageBusMessage;
 
-    Task SendAsync(PublishingOutBoxEvent outbox, CancellationToken cancellationToken = default);
+    Task SendAsync(PublishingOutboxMessage outbox, CancellationToken cancellationToken = default);
 }
 
 public interface IMessageBusMessage
diff --git a/src/Monolith/ClassifiedAds.Domain/Infrastructure/Messaging/IOutboxMessagePublisher.cs b/src/Monolith/ClassifiedAds.Domain/Infrastructure/Messaging/IOutboxMessagePublisher.cs
diff --git a/src/Monolith/ClassifiedAds.Domain/Infrastructure/Messaging/MessageBus.cs b/src/Monolith/ClassifiedAds.Domain/Infrastructure/Messaging/MessageBus.cs
diff --git a/src/Monolith/ClassifiedAds.Persistence/AdsDbContext.cs b/src/Monolith/ClassifiedAds.Persistence/AdsDbContext.cs
diff --git a/src/Monolith/ClassifiedAds.Persistence/MappingConfigurations/OutboxMessageConfiguration.cs b/src/Monolith/ClassifiedAds.Persistence/MappingConfigurations/OutboxMessageConfiguration.cs

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@`
`7`	`7`	`using System.Threading;`
`8`	`8`	`using System.Threading.Tasks;`
`9`	`9`
`10`		`-namespace ClassifiedAds.Background.OutBoxEventPublishers;`
	`10`	`+namespace ClassifiedAds.Background.OutboxMessagePublishers;`
`11`	`11`
`12`		`-public class FileEntryOutBoxEventPublisher : IOutBoxEventPublisher`
	`12`	`+public class FileEntryOutboxMessagePublisher : IOutboxMessagePublisher`
`13`	`13`	`{`
`14`	`14`	`private readonly IMessageBus _messageBus;`
`15`	`15`
`@@ -23,12 +23,12 @@ public static string CanHandleEventSource()`
`23`	`23`	`return typeof(PublishEventsCommand).Assembly.GetName().Name;`
`24`	`24`	`}`
`25`	`25`
`26`		`- public FileEntryOutBoxEventPublisher(IMessageBus messageBus)`
	`26`	`+ public FileEntryOutboxMessagePublisher(IMessageBus messageBus)`
`27`	`27`	`{`
`28`	`28`	`_messageBus = messageBus;`
`29`	`29`	`}`
`30`	`30`
`31`		`- public async Task HandleAsync(PublishingOutBoxEvent outbox, CancellationToken cancellationToken = default)`
	`31`	`+ public async Task HandleAsync(PublishingOutboxMessage outbox, CancellationToken cancellationToken = default)`
`32`	`32`	`{`
`33`	`33`	`if (outbox.EventType == EventTypeConstants.FileEntryCreated)`
`34`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,15 +2,15 @@`
`2`	`2`
`3`	`3`	`namespace ClassifiedAds.Domain.Entities;`
`4`	`4`
`5`		`-public class OutboxEvent : OutboxEventBase, IAggregateRoot`
	`5`	`+public class OutboxMessage : OutboxMessageBase, IAggregateRoot`
`6`	`6`	`{`
`7`	`7`	`}`
`8`	`8`
`9`		`-public class ArchivedOutboxEvent : OutboxEventBase, IAggregateRoot`
	`9`	`+public class ArchivedOutboxMessage : OutboxMessageBase, IAggregateRoot`
`10`	`10`	`{`
`11`	`11`	`}`
`12`	`12`
`13`		`-public abstract class OutboxEventBase : Entity<Guid>`
	`13`	`+public abstract class OutboxMessageBase : Entity<Guid>`
`14`	`14`	`{`
`15`	`15`	`public string EventType { get; set; }`
`16`	`16`