Refactor of base classes and interfaces

src/Domain/Common/Base/AuditableEntity.cs

@@ -0,0 +1,9 @@
+namespace SSW.CleanArchitecture.Domain.Common.Base;
+
+public abstract class AuditableEntity
+{
+ public DateTimeOffset CreatedAt { get; set; }
+ public string? CreatedBy { get; set; }
+ public DateTimeOffset? UpdatedAt { get; set; }
+ public string? UpdatedBy { get; set; }
+}

src/Domain/Common/Base/BaseEntity.cs

@@ -0,0 +1,20 @@
+using SSW.CleanArchitecture.Domain.Common.Interfaces;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace SSW.CleanArchitecture.Domain.Common.Base;
+
+public abstract class BaseEntity<TId> : AuditableEntity, IDomainEvents
+{
+ private readonly List<DomainEvent> _domainEvents = new();
+
+ public TId Id { get; set; } = default!;
+
+ [NotMapped]
+ public IReadOnlyList<DomainEvent> DomainEvents => _domainEvents.AsReadOnly();
+
+ public void AddDomainEvent(DomainEvent domainEvent) => _domainEvents.Add(domainEvent);
+
+ public void RemoveDomainEvent(DomainEvent domainEvent) => _domainEvents.Remove(domainEvent);
+
+ public void ClearDomainEvents() => _domainEvents.Clear();
+}

src/Domain/Common/Base/DomainEvent.cs

@@ -0,0 +1,5 @@
+using MediatR;
+
+namespace SSW.CleanArchitecture.Domain.Common.Base;
+
+public record DomainEvent : INotification;

src/Domain/Common/AuditableEntity.cs → src/Domain/Common/Interfaces/IAuditableEntity.cs

@@ -1,6 +1,6 @@
-namespace SSW.CleanArchitecture.Domain.Common;
+namespace SSW.CleanArchitecture.Domain.Common.Interfaces;
 
-public abstract class AuditableEntity
+public interface IAuditableEntity
 {
  public DateTimeOffset CreatedAt { get; set; }
  public string? CreatedBy { get; set; } // TODO: String as userId? (https://github.com/SSWConsulting/SSW.CleanArchitecture/issues/76)

src/Domain/Common/Interfaces/IDomainEvents.cs

@@ -0,0 +1,14 @@
+using SSW.CleanArchitecture.Domain.Common.Base;
+
+namespace SSW.CleanArchitecture.Domain.Common.Interfaces;
+
+public interface IDomainEvents
+{
+ IReadOnlyList<DomainEvent> DomainEvents { get; }
+
+ void AddDomainEvent(DomainEvent domainEvent);
+
+ void RemoveDomainEvent(DomainEvent domainEvent);
+
+ void ClearDomainEvents();
+}

src/Domain/Entities/TodoItem.cs

@@ -1,4 +1,4 @@
-using SSW.CleanArchitecture.Domain.Common;
+using SSW.CleanArchitecture.Domain.Common.Base;
 using SSW.CleanArchitecture.Domain.Enum;
 
 namespace SSW.CleanArchitecture.Domain.Entities;

src/Domain/Events/TodoItemCreatedEvent.cs

@@ -1,6 +1,6 @@
-using SSW.CleanArchitecture.Domain.Common;
+using SSW.CleanArchitecture.Domain.Common.Base;
 using SSW.CleanArchitecture.Domain.Entities;
 
 namespace SSW.CleanArchitecture.Domain.Events;
 
-public record TodoItemCreatedEvent(TodoItem Item) : BaseEvent;
+public record TodoItemCreatedEvent(TodoItem Item) : DomainEvent;

src/Infrastructure/Persistence/Interceptors/DispatchDomainEventsInterceptor.cs

@@ -1,7 +1,7 @@
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
-using SSW.CleanArchitecture.Domain.Common;
+using SSW.CleanArchitecture.Domain.Common.Interfaces;
 
 namespace SSW.CleanArchitecture.Infrastructure.Persistence.Interceptors;
 

src/Infrastructure/Persistence/Interceptors/EntitySaveChangesInterceptor.cs

@@ -2,7 +2,7 @@
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using SSW.CleanArchitecture.Application.Common.Interfaces;
-using SSW.CleanArchitecture.Domain.Common;
+using SSW.CleanArchitecture.Domain.Common.Interfaces;
 
 namespace SSW.CleanArchitecture.Infrastructure.Persistence.Interceptors;
 
@@ -36,7 +36,7 @@ public void UpdateEntities(DbContext? context)
  if (context is null)
  return;
 
- foreach (var entry in context.ChangeTracker.Entries<AuditableEntity>())
+ foreach (var entry in context.ChangeTracker.Entries<IAuditableEntity>())
  if (entry.State is EntityState.Added)
  {
  entry.Entity.CreatedAt = _dateTime.Now;

tests/Architecture.Tests/DatabaseEntitiesTest.cs

@@ -1,7 +1,7 @@
 using FluentAssertions;
 using Microsoft.EntityFrameworkCore;
 using NetArchTest.Rules;
-using SSW.CleanArchitecture.Domain.Common;
+using SSW.CleanArchitecture.Domain.Common.Base;
 using SSW.CleanArchitecture.Infrastructure;
 
 namespace SSW.CleanArchitecture.Architecture.UnitTests;