Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add events before and after handling bulk imports #11532

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Generic;
using System.Threading.Tasks;

namespace OrchardCore.ContentManagement.Handlers
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
using System.Collections.Generic;
using System.Threading.Tasks;

namespace OrchardCore.ContentManagement.Handlers;
public interface IBulkContentHandler
hyzx86 marked this conversation as resolved.
Show resolved Hide resolved
hyzx86 marked this conversation as resolved.
Show resolved Hide resolved
Piedone marked this conversation as resolved.
Show resolved Hide resolved
{
Task ImportingAsync(IEnumerable<ImportContentContext> contentItems);
Task ImportedAsync(IEnumerable<ImportContentContext> contentItems);
}
hyzx86 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Generic;
using System.Threading.Tasks;

namespace OrchardCore.ContentManagement.Handlers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public DefaultContentManager(
IContentDefinitionManager contentDefinitionManager,
IContentManagerSession contentManagerSession,
IEnumerable<IContentHandler> handlers,
IEnumerable<IBulkContentHandler> bulkContentHandlers,
ISession session,
IContentItemIdGenerator idGenerator,
ILogger<DefaultContentManager> logger,
Expand All @@ -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; }

Expand Down Expand Up @@ -647,6 +651,9 @@ public Task<ContentValidateResult> UpdateContentItemVersionAsync(ContentItem upd

public async Task ImportAsync(IEnumerable<ContentItem> contentItems)
{
var contentList = contentItems.Select(x => new ImportContentContext(x)).ToList();
await BulkContentHandlers.InvokeAsync((handler, list) => handler.ImportingAsync(list), contentList, _logger);

var skip = 0;

var importedVersionIds = new HashSet<string>();
Expand Down Expand Up @@ -775,6 +782,8 @@ public async Task ImportAsync(IEnumerable<ContentItem> contentItems)
skip += ImportBatchSize;
batchedContentItems = contentItems.Skip(skip).Take(ImportBatchSize);
}

await BulkContentHandlers.InvokeAsync((handler, list) => handler.ImportedAsync(list), contentList, _logger);
}

public async Task UpdateAsync(ContentItem contentItem)
Expand Down