From f9e903b43b3adf437f9607f5e4350e0dd5639370 Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Fri, 29 Jul 2022 11:44:29 +0800
Subject: [PATCH] Improve

---
 .../Entities/Events/IEntityChangeEventHelper.cs      |  3 ---
 .../Entities/Events/NullEntityChangeEventHelper.cs   | 12 ------------
 .../Volo/Abp/EntityFrameworkCore/AbpDbContext.cs     |  4 ----
 .../Repositories/MemoryDb/MemoryDbRepository.cs      |  3 ---
 .../Domain/Repositories/MongoDB/MongoDbRepository.cs |  3 ---
 5 files changed, 25 deletions(-)

diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/IEntityChangeEventHelper.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/IEntityChangeEventHelper.cs
index db580a0682..aa63c7e3c9 100644
--- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/IEntityChangeEventHelper.cs
+++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/IEntityChangeEventHelper.cs
@@ -5,12 +5,9 @@ namespace Volo.Abp.Domain.Entities.Events;
 /// </summary>
 public interface IEntityChangeEventHelper
 {
-    void PublishEntityCreatingEvent(object entity);
     void PublishEntityCreatedEvent(object entity);
 
-    void PublishEntityUpdatingEvent(object entity);
     void PublishEntityUpdatedEvent(object entity);
 
-    void PublishEntityDeletingEvent(object entity);
     void PublishEntityDeletedEvent(object entity);
 }
diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/NullEntityChangeEventHelper.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/NullEntityChangeEventHelper.cs
index d428f84d6f..4d849f2f27 100644
--- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/NullEntityChangeEventHelper.cs
+++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/NullEntityChangeEventHelper.cs
@@ -14,26 +14,14 @@ public class NullEntityChangeEventHelper : IEntityChangeEventHelper
     {
     }
 
-    public void PublishEntityCreatingEvent(object entity)
-    {
-    }
-
     public void PublishEntityCreatedEvent(object entity)
     {
     }
 
-    public void PublishEntityUpdatingEvent(object entity)
-    {
-    }
-
     public void PublishEntityUpdatedEvent(object entity)
     {
     }
 
-    public void PublishEntityDeletingEvent(object entity)
-    {
-    }
-
     public void PublishEntityDeletedEvent(object entity)
     {
     }
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
index 3a8a24bf62..fd998510af 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
@@ -292,7 +292,6 @@ public abstract class AbpDbContext<TDbContext> : DbContext, IAbpEfCoreDbContext,
         {
             case EntityState.Added:
                 ApplyAbpConceptsForAddedEntity(entry);
-                EntityChangeEventHelper.PublishEntityCreatingEvent(entry.Entity);
                 EntityChangeEventHelper.PublishEntityCreatedEvent(entry.Entity);
                 break;
             case EntityState.Modified:
@@ -301,12 +300,10 @@ public abstract class AbpDbContext<TDbContext> : DbContext, IAbpEfCoreDbContext,
                 {
                     if (entry.Entity is ISoftDelete && entry.Entity.As<ISoftDelete>().IsDeleted)
                     {
-                        EntityChangeEventHelper.PublishEntityDeletingEvent(entry.Entity);
                         EntityChangeEventHelper.PublishEntityDeletedEvent(entry.Entity);
                     }
                     else
                     {
-                        EntityChangeEventHelper.PublishEntityUpdatingEvent(entry.Entity);
                         EntityChangeEventHelper.PublishEntityUpdatedEvent(entry.Entity);
                     }
                 }
@@ -314,7 +311,6 @@ public abstract class AbpDbContext<TDbContext> : DbContext, IAbpEfCoreDbContext,
                 break;
             case EntityState.Deleted:
                 ApplyAbpConceptsForDeletedEntity(entry);
-                EntityChangeEventHelper.PublishEntityDeletingEvent(entry.Entity);
                 EntityChangeEventHelper.PublishEntityDeletedEvent(entry.Entity);
                 break;
         }
diff --git a/framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/MemoryDbRepository.cs b/framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/MemoryDbRepository.cs
index 2bcfc1bad7..61bb9745e2 100644
--- a/framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/MemoryDbRepository.cs
+++ b/framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/MemoryDbRepository.cs
@@ -159,19 +159,16 @@ public class MemoryDbRepository<TMemoryDbContext, TEntity> : RepositoryBase<TEnt
 
     protected virtual void TriggerEntityCreateEvents(TEntity entity)
     {
-        EntityChangeEventHelper.PublishEntityCreatingEvent(entity);
         EntityChangeEventHelper.PublishEntityCreatedEvent(entity);
     }
 
     protected virtual void TriggerEntityUpdateEvents(TEntity entity)
     {
-        EntityChangeEventHelper.PublishEntityUpdatingEvent(entity);
         EntityChangeEventHelper.PublishEntityUpdatedEvent(entity);
     }
 
     protected virtual void TriggerEntityDeleteEvents(TEntity entity)
     {
-        EntityChangeEventHelper.PublishEntityDeletingEvent(entity);
         EntityChangeEventHelper.PublishEntityDeletedEvent(entity);
     }
 
diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs
index 25f6ce2f3f..e128c8dee8 100644
--- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs
+++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs
@@ -597,13 +597,11 @@ public class MongoDbRepository<TMongoDbContext, TEntity>
 
     private void TriggerEntityCreateEvents(TEntity entity)
     {
-        EntityChangeEventHelper.PublishEntityCreatingEvent(entity);
         EntityChangeEventHelper.PublishEntityCreatedEvent(entity);
     }
 
     protected virtual void TriggerEntityUpdateEvents(TEntity entity)
     {
-        EntityChangeEventHelper.PublishEntityUpdatingEvent(entity);
         EntityChangeEventHelper.PublishEntityUpdatedEvent(entity);
     }
 
@@ -616,7 +614,6 @@ public class MongoDbRepository<TMongoDbContext, TEntity>
 
     protected virtual void TriggerEntityDeleteEvents(TEntity entity)
     {
-        EntityChangeEventHelper.PublishEntityDeletingEvent(entity);
         EntityChangeEventHelper.PublishEntityDeletedEvent(entity);
     }