feat: rename Add and Delete

Author: ikesnowy

src/Cnblogs.Architecture.Ddd.Domain.Abstractions/IUnitOfWork.cs

@@ -3,6 +3,8 @@
 /// <summary>
 ///     定义 UnitOfWork。
 /// </summary>
+/// <typeparam name="TEntity">实体类型。</typeparam>
+/// <typeparam name="TKey">主键类型。</typeparam>
 public interface IUnitOfWork<TEntity, TKey>
     where TEntity : EntityBase, IAggregateRoot
     where TKey : IComparable<TKey>
@@ -12,15 +14,15 @@ public interface IUnitOfWork<TEntity, TKey>
     /// </summary>
     /// <param name="key">主键。</param>
     /// <returns>获取到的实体。</returns>
-    Task<TEntity?> FindAsync(TKey key);
+    Task<TEntity?> GetAsync(TKey key);
 
     /// <summary>
     ///     添加实体，调用 <see cref="SaveEntitiesAsync"/> 或 <see cref="SaveChangesAsync"/> 后才会写入数据库。
     /// </summary>
     /// <param name="entity">要添加实体。</param>
     /// <typeparam name="TEntity">实体类型。</typeparam>
     /// <returns>被添加的实体。</returns>
-    TEntity Insert(TEntity entity);
+    TEntity Add(TEntity entity);
 
     /// <summary>
     ///     更新实体，调用 <see cref="SaveEntitiesAsync"/> 或 <see cref="SaveChangesAsync"/> 后才会写入数据库。
@@ -36,7 +38,7 @@ public interface IUnitOfWork<TEntity, TKey>
     /// <param name="entity">要删除的实体。</param>
     /// <typeparam name="TEntity">实体类型。</typeparam>
     /// <returns></returns>
-    TEntity Remove(TEntity entity);
+    TEntity Delete(TEntity entity);
 
     /// <summary>
     ///     提交所有更改（但不发布领域事件）。

src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/BaseRepository.cs

@@ -101,13 +101,7 @@ public async Task<TEntity> DeleteAsync(TEntity entity)
     }
 
     /// <inheritdoc />
-    public Task<TEntity?> FindAsync(TKey key)
-    {
-        return GetAsync(key);
-    }
-
-    /// <inheritdoc />
-    public TEntity Insert(TEntity entity)
+    public TEntity Add(TEntity entity)
     {
         Context.Add(entity);
         return entity;
@@ -121,7 +115,7 @@ public TEntity Update(TEntity entity)
     }
 
     /// <inheritdoc />
-    public TEntity Remove(TEntity entity)
+    public TEntity Delete(TEntity entity)
     {
         Context.Remove(entity);
         return entity;

src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/MongoBaseRepository.cs

@@ -151,13 +151,7 @@ private async Task DispatchDomainEventsAsync(IReadOnlyCollection<IDomainEvent>?
     private static void EnsureBeforeUpdateCalled(TEntity entity) => entity.BeforeUpdate();
 
     /// <inheritdoc />
-    public Task<TEntity?> FindAsync(TKey key)
-    {
-        return GetAsync(key);
-    }
-
-    /// <inheritdoc />
-    public TEntity Insert(TEntity entity)
+    public TEntity Add(TEntity entity)
     {
         if (_toDelete != null && _toDelete.ContainsKey(entity.Id))
         {
@@ -206,7 +200,7 @@ public TEntity Update(TEntity entity)
     }
 
     /// <inheritdoc />
-    public TEntity Remove(TEntity entity)
+    public TEntity Delete(TEntity entity)
     {
         if (_toAdd != null && _toAdd.ContainsKey(entity.Id))
         {

test/Cnblogs.Architecture.UnitTests/Infrastructure/MongoDb/MongoBaseRepositoryTests.cs

@@ -133,7 +133,7 @@ public async Task Uow_Insert_CommitAsync()
 
         // Act
         var uow = repository.UnitOfWork;
-        uow.Insert(blog);
+        uow.Add(blog);
         var response = await uow.SaveEntitiesAsync();
 
         // Assert
@@ -164,8 +164,8 @@ public async Task Uow_InsertThenRemove_NoChangeAsync()
 
         // Act
         var uow = repository.UnitOfWork;
-        uow.Insert(blog);
-        uow.Remove(blog);
+        uow.Add(blog);
+        uow.Delete(blog);
         var response = await uow.SaveEntitiesAsync();
 
         // Assert
@@ -193,8 +193,8 @@ public async Task Uow_DeleteThenInsert_UpdateAsync()
 
         // Act
         var uow = repository.UnitOfWork;
-        uow.Remove(blog);
-        uow.Insert(blog);
+        uow.Delete(blog);
+        uow.Add(blog);
         var response = await uow.SaveEntitiesAsync();
 
         // Assert
@@ -222,7 +222,7 @@ public void Uow_DeleteThenUpdate_Throw()
 
         // Act
         var uow = repository.UnitOfWork;
-        uow.Remove(blog);
+        uow.Delete(blog);
         var act = () => uow.Update(blog);
 
         // Assert
@@ -240,7 +240,7 @@ public void Uow_UpdateThenInsert_Throw()
         // Act
         var uow = repository.UnitOfWork;
         uow.Update(blog);
-        var act = () => uow.Insert(blog);
+        var act = () => uow.Add(blog);
 
         // Assert
         act.Should().ThrowExactly<InvalidOperationException>();
@@ -256,7 +256,7 @@ public async Task Uow_DeleteWithDomainEvent_CommitAsync()
 
         // Act
         var uow = repository.UnitOfWork;
-        uow.Remove(blog);
+        uow.Delete(blog);
         var response = await uow.SaveEntitiesAsync();
 
         // Assert