Add events before and after handling bulk imports

src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentHandlerBase.cs

@@ -147,15 +147,5 @@ public virtual Task GetContentItemAspectAsync(ContentItemAspectContext context)
         {
             return Task.CompletedTask;
         }
-
-        public Task BeforeImportAsync(IEnumerable<ImportContentContext> contentItems)
-        {
-            return Task.CompletedTask;
-        }
-
-        public Task AfterImportAsync(IEnumerable<ImportContentContext> contentItems)
-        {
-            return Task.CompletedTask;
-        }
     }
 }

src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/IBulkContentHandler.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace OrchardCore.ContentManagement.Handlers;
+public interface IBulkContentHandler
+{
+    Task ImportingAsync(IEnumerable<ImportContentContext> contentItems);
+    Task ImportedAsync(IEnumerable<ImportContentContext> contentItems);
+}

src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/IContentHandler.cs

@@ -14,9 +14,7 @@ public interface IContentHandler
         Task LoadingAsync(LoadContentContext context);
         Task LoadedAsync(LoadContentContext context);
         Task ImportingAsync(ImportContentContext context);
-        Task BeforeImportAsync(IEnumerable<ImportContentContext> contentItems);
         Task ImportedAsync(ImportContentContext context);
-        Task AfterImportAsync(IEnumerable<ImportContentContext> contentItems);
         Task UpdatingAsync(UpdateContentContext context);
         Task UpdatedAsync(UpdateContentContext context);
         Task ValidatingAsync(ValidateContentContext context);

src/OrchardCore/OrchardCore.ContentManagement/DefaultContentManager.cs

@@ -35,6 +35,7 @@ public DefaultContentManager(
             IContentDefinitionManager contentDefinitionManager,
             IContentManagerSession contentManagerSession,
             IEnumerable<IContentHandler> handlers,
+            IEnumerable<IBulkContentHandler> bulkContentHandlers,
             ISession session,
             IContentItemIdGenerator idGenerator,
             ILogger<DefaultContentManager> logger,
@@ -43,13 +44,16 @@ public DefaultContentManager(
             _contentDefinitionManager = contentDefinitionManager;
             Handlers = handlers;
             ReversedHandlers = handlers.Reverse().ToArray();
+            BulkContentHandlers = bulkContentHandlers;
             _session = session;
             _idGenerator = idGenerator;
             _contentManagerSession = contentManagerSession;
             _logger = logger;
             _clock = clock;
         }
 
+        public IEnumerable<IBulkContentHandler> BulkContentHandlers { get; private set; }
+
         public IEnumerable<IContentHandler> Handlers { get; private set; }
         public IEnumerable<IContentHandler> ReversedHandlers { get; private set; }
 
@@ -648,7 +652,7 @@ public Task<ContentValidateResult> UpdateContentItemVersionAsync(ContentItem upd
         public async Task ImportAsync(IEnumerable<ContentItem> contentItems)
         {
             var contentList = contentItems.Select(x => new ImportContentContext(x)).ToList();
-            await ReversedHandlers.InvokeAsync((handler, list) => handler.BeforeImportAsync(list), contentList, _logger);
+            await BulkContentHandlers.InvokeAsync((handler, list) => handler.ImportingAsync(list), contentList, _logger);
 
             var skip = 0;
 
@@ -779,9 +783,7 @@ public async Task ImportAsync(IEnumerable<ContentItem> contentItems)
                 batchedContentItems = contentItems.Skip(skip).Take(ImportBatchSize);
             }
 
-            await ReversedHandlers.InvokeAsync((handler, list) => handler.AfterImportAsync(list), contentList, _logger);
-
-
+            await BulkContentHandlers.InvokeAsync((handler, list) => handler.ImportedAsync(list), contentList, _logger);
         }
 
         public async Task UpdateAsync(ContentItem contentItem)