* Run code cleanup * Run dotnet format * Start manual fixes * Manual fixing of warnings * Fix nullability in columnalias * Fix tests * Fix up after merge * Start updating after review * Update editorconfig to contain new static & const rules * Fix up editorconfig to not contain duplicate rules * Fix up static member names * Fix up according to review * Update src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.DistributedCache.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Repositories.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Repositories.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Examine/ContentIndexPopulator.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Examine/ContentIndexPopulator.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Examine/ContentValueSetValidator.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Examine/ContentValueSetValidator.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Examine/ContentValueSetValidator.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Examine/ExamineUmbracoIndexingHandler.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Examine/PublishedContentIndexPopulator.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Extensions/InstanceIdentifiableExtensions.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/HostedServices/RecurringHostedServiceBase.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/HostedServices/ReportSiteTask.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Macros/MacroTagParser.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Macros/MacroTagParser.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Macros/MacroTagParser.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Migrations/Expressions/Alter/Table/IAlterTableColumnOptionBuilder.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Migrations/Upgrade/V_10_0_0/AddMemberPropertiesAsColumns.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/ModelsBuilder/Building/TextBuilder.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/ModelsBuilder/Building/TextBuilder.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/ModelsBuilder/Building/TextBuilder.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/ModelsBuilder/Building/TextBuilder.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/ModelsBuilder/Building/TextBuilder.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/ModelsBuilder/Building/TextBuilder.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/ModelsBuilder/Building/TextBuilder.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Persistence/Dtos/ExternalLoginDto.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Persistence/Mappers/AccessMapper.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Persistence/Mappers/AuditEntryMapper.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Persistence/Mappers/MediaMapper.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Persistence/Mappers/MemberMapper.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Persistence/Mappers/PropertyGroupMapper.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Persistence/Mappers/PropertyGroupMapper.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Persistence/Mappers/PropertyTypeMapper.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Persistence/Mappers/PropertyTypeMapper.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Persistence/Mappers/RelationTypeMapper.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Persistence/Mappers/RelationTypeMapper.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Persistence/NPocoMapperCollectionBuilder.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Persistence/Querying/ExpressionVisitorBase.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ExternalLoginRepository.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Fix [..] to substring * Fix after merge with 10/dev * Fox ContentValueSetValidator.cs * Update LoggerConfigExtensions Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk> Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
164 lines
7.6 KiB
C#
164 lines
7.6 KiB
C#
// Copyright (c) Umbraco.
|
|
// See LICENSE for more details.
|
|
|
|
using System.Globalization;
|
|
using Umbraco.Cms.Core.Models;
|
|
using Umbraco.Cms.Core.Notifications;
|
|
using Umbraco.Cms.Core.Scoping;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Extensions;
|
|
using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
|
|
|
|
namespace Umbraco.Cms.Core.Events;
|
|
|
|
// TODO: lots of duplicate code in this one, refactor
|
|
public sealed class RelateOnTrashNotificationHandler :
|
|
INotificationHandler<ContentMovedNotification>,
|
|
INotificationHandler<ContentMovedToRecycleBinNotification>,
|
|
INotificationHandler<MediaMovedNotification>,
|
|
INotificationHandler<MediaMovedToRecycleBinNotification>
|
|
{
|
|
private readonly IAuditService _auditService;
|
|
private readonly IEntityService _entityService;
|
|
private readonly IRelationService _relationService;
|
|
private readonly IScopeProvider _scopeProvider;
|
|
private readonly ILocalizedTextService _textService;
|
|
|
|
public RelateOnTrashNotificationHandler(
|
|
IRelationService relationService,
|
|
IEntityService entityService,
|
|
ILocalizedTextService textService,
|
|
IAuditService auditService,
|
|
IScopeProvider scopeProvider)
|
|
{
|
|
_relationService = relationService;
|
|
_entityService = entityService;
|
|
_textService = textService;
|
|
_auditService = auditService;
|
|
_scopeProvider = scopeProvider;
|
|
}
|
|
|
|
public void Handle(ContentMovedNotification notification)
|
|
{
|
|
foreach (MoveEventInfo<IContent> item in notification.MoveInfoCollection.Where(x =>
|
|
x.OriginalPath.Contains(Constants.System.RecycleBinContentString)))
|
|
{
|
|
const string relationTypeAlias = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias;
|
|
IEnumerable<IRelation> relations = _relationService.GetByChildId(item.Entity.Id);
|
|
|
|
foreach (IRelation relation in
|
|
relations.Where(x => x.RelationType.Alias.InvariantEquals(relationTypeAlias)))
|
|
{
|
|
_relationService.Delete(relation);
|
|
}
|
|
}
|
|
}
|
|
|
|
public void Handle(ContentMovedToRecycleBinNotification notification)
|
|
{
|
|
using (IScope scope = _scopeProvider.CreateScope())
|
|
{
|
|
const string relationTypeAlias = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias;
|
|
IRelationType? relationType = _relationService.GetRelationTypeByAlias(relationTypeAlias);
|
|
|
|
// check that the relation-type exists, if not, then recreate it
|
|
if (relationType == null)
|
|
{
|
|
Guid documentObjectType = Constants.ObjectTypes.Document;
|
|
const string relationTypeName = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteName;
|
|
|
|
relationType = new RelationType(relationTypeName, relationTypeAlias, false, documentObjectType, documentObjectType, false);
|
|
_relationService.Save(relationType);
|
|
}
|
|
|
|
foreach (MoveEventInfo<IContent> item in notification.MoveInfoCollection)
|
|
{
|
|
IList<string> originalPath = item.OriginalPath.ToDelimitedList();
|
|
var originalParentId = originalPath.Count > 2
|
|
? int.Parse(originalPath[originalPath.Count - 2], CultureInfo.InvariantCulture)
|
|
: Constants.System.Root;
|
|
|
|
// before we can create this relation, we need to ensure that the original parent still exists which
|
|
// may not be the case if the encompassing transaction also deleted it when this item was moved to the bin
|
|
if (_entityService.Exists(originalParentId))
|
|
{
|
|
// Add a relation for the item being deleted, so that we can know the original parent for if we need to restore later
|
|
IRelation relation =
|
|
_relationService.GetByParentAndChildId(originalParentId, item.Entity.Id, relationType) ??
|
|
new Relation(originalParentId, item.Entity.Id, relationType);
|
|
_relationService.Save(relation);
|
|
|
|
_auditService.Add(
|
|
AuditType.Delete,
|
|
item.Entity.WriterId,
|
|
item.Entity.Id,
|
|
UmbracoObjectTypes.Document.GetName(),
|
|
string.Format(_textService.Localize("recycleBin", "contentTrashed"), item.Entity.Id, originalParentId));
|
|
}
|
|
}
|
|
|
|
scope.Complete();
|
|
}
|
|
}
|
|
|
|
public void Handle(MediaMovedNotification notification)
|
|
{
|
|
foreach (MoveEventInfo<IMedia> item in notification.MoveInfoCollection.Where(x =>
|
|
x.OriginalPath.Contains(Constants.System.RecycleBinMediaString)))
|
|
{
|
|
const string relationTypeAlias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias;
|
|
IEnumerable<IRelation> relations = _relationService.GetByChildId(item.Entity.Id);
|
|
foreach (IRelation relation in
|
|
relations.Where(x => x.RelationType.Alias.InvariantEquals(relationTypeAlias)))
|
|
{
|
|
_relationService.Delete(relation);
|
|
}
|
|
}
|
|
}
|
|
|
|
public void Handle(MediaMovedToRecycleBinNotification notification)
|
|
{
|
|
using (IScope scope = _scopeProvider.CreateScope())
|
|
{
|
|
const string relationTypeAlias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias;
|
|
IRelationType? relationType = _relationService.GetRelationTypeByAlias(relationTypeAlias);
|
|
|
|
// check that the relation-type exists, if not, then recreate it
|
|
if (relationType == null)
|
|
{
|
|
Guid documentObjectType = Constants.ObjectTypes.Document;
|
|
const string relationTypeName = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteName;
|
|
relationType = new RelationType(relationTypeName, relationTypeAlias, false, documentObjectType, documentObjectType, false);
|
|
_relationService.Save(relationType);
|
|
}
|
|
|
|
foreach (MoveEventInfo<IMedia> item in notification.MoveInfoCollection)
|
|
{
|
|
IList<string> originalPath = item.OriginalPath.ToDelimitedList();
|
|
var originalParentId = originalPath.Count > 2
|
|
? int.Parse(originalPath[originalPath.Count - 2], CultureInfo.InvariantCulture)
|
|
: Constants.System.Root;
|
|
|
|
// before we can create this relation, we need to ensure that the original parent still exists which
|
|
// may not be the case if the encompassing transaction also deleted it when this item was moved to the bin
|
|
if (_entityService.Exists(originalParentId))
|
|
{
|
|
// Add a relation for the item being deleted, so that we can know the original parent for if we need to restore later
|
|
IRelation relation =
|
|
_relationService.GetByParentAndChildId(originalParentId, item.Entity.Id, relationType) ??
|
|
new Relation(originalParentId, item.Entity.Id, relationType);
|
|
_relationService.Save(relation);
|
|
_auditService.Add(
|
|
AuditType.Delete,
|
|
item.Entity.CreatorId,
|
|
item.Entity.Id,
|
|
UmbracoObjectTypes.Media.GetName(),
|
|
string.Format(_textService.Localize("recycleBin", "mediaTrashed"), item.Entity.Id, originalParentId));
|
|
}
|
|
}
|
|
|
|
scope.Complete();
|
|
}
|
|
}
|
|
}
|