yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor RedirectTrackingHandler to remove duplicate code

Browse Source
This commit is contained in:
Kenn Jacobsen
2021-03-04 11:58:45 +01:00
parent 27c5c1b461
commit 500ca7b31e
1 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Umbraco.Infrastructure/Routing/RedirectTrackingHandler.cs
View File

@@ -47,44 +47,28 @@ namespace Umbraco.Cms.Core.Routing
_requestCache = requestCache;
}
public void Handle(PublishingNotification<IContent> notification)
public void Handle(PublishingNotification<IContent> notification) => StoreOldRoutes(notification.PublishedEntities);
public void Handle(PublishedNotification<IContent> notification) => CreateRedirectsForOldRoutes();
public void Handle(MovingNotification<IContent> notification) => StoreOldRoutes(notification.MoveInfoCollection.Select(m => m.Entity));
public void Handle(MovedNotification<IContent> notification) => CreateRedirectsForOldRoutes();
private void StoreOldRoutes(IEnumerable<IContent> entities)
{
// don't let the notification handlers kick in if Redirect Tracking is turned off in the config
if (_webRoutingSettings.CurrentValue.DisableRedirectUrlTracking)
return;
var oldRoutes = GetOldRoutes();
foreach (var entity in notification.PublishedEntities)
foreach (var entity in entities)
{
StoreOldRoute(entity, oldRoutes);
}
}
public void Handle(PublishedNotification<IContent> notification)
{
// don't let the notification handlers kick in if Redirect Tracking is turned off in the config
if (_webRoutingSettings.CurrentValue.DisableRedirectUrlTracking)
return;
var oldRoutes = GetOldRoutes();
CreateRedirects(oldRoutes);
}
public void Handle(MovingNotification<IContent> notification)
{
// don't let the notification handlers kick in if Redirect Tracking is turned off in the config
if (_webRoutingSettings.CurrentValue.DisableRedirectUrlTracking)
return;
var oldRoutes = GetOldRoutes();
foreach (var info in notification.MoveInfoCollection)
{
StoreOldRoute(info.Entity, oldRoutes);
}
}
// TODO refactor (this is duplicate code, see published notification handling above)
public void Handle(MovedNotification<IContent> notification)
private void CreateRedirectsForOldRoutes()
{
// don't let the notification handlers kick in if Redirect Tracking is turned off in the config
if (_webRoutingSettings.CurrentValue.DisableRedirectUrlTracking)