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

Fixing CreateMemember and CreateContent to raise events and logging only when we persist the objs not when we only create them

Browse Source
This commit is contained in:
Elitsa Marinovska
2021-02-01 16:07:42 +01:00
parent 6df67cd93e
commit 5cd28c8711
4 changed files with 140 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/Umbraco.Infrastructure/Services/Implement/MemberService.cs
View File

@@ -120,10 +120,7 @@ namespace Umbraco.Infrastructure.Services.Implement
throw new ArgumentException("No member type with that alias.", nameof(memberTypeAlias));
}
var member = new Member(name, email.ToLower().Trim(), username, memberType);
using IScope scope = ScopeProvider.CreateScope();
CreateMember(scope, member, 0, false);
scope.Complete();
var member = new Member(name, email.ToLower().Trim(), username, memberType, 0);
return member;
}
@@ -143,12 +140,7 @@ namespace Umbraco.Infrastructure.Services.Implement
{
if (memberType == null) throw new ArgumentNullException(nameof(memberType));
var member = new Member(name, email.ToLower().Trim(), username, memberType);
using (var scope = ScopeProvider.CreateScope())
{
CreateMember(scope, member, 0, false);
scope.Complete();
}
var member = new Member(name, email.ToLower().Trim(), username, memberType, 0);
return member;
}
@@ -225,8 +217,18 @@ namespace Umbraco.Infrastructure.Services.Implement
if (memberType == null)
throw new ArgumentException("No member type with that alias.", nameof(memberTypeAlias)); // causes rollback // causes rollback
var member = new Member(name, email.ToLower().Trim(), username, passwordValue, memberType, isApproved);
CreateMember(scope, member, -1, true);
var member = new Member(name, email.ToLower().Trim(), username, passwordValue, memberType, isApproved, -1);
var saveEventArgs = new SaveEventArgs<IMember>(member);
if (!scope.Events.DispatchCancelable(Saving, this, saveEventArgs))
{
_memberRepository.Save(member);
saveEventArgs.CanCancel = false;
scope.Events.Dispatch(Saved, this, saveEventArgs);
Audit(AuditType.New, member.CreatorId, member.Id, $"Member '{member.Name}' was created with Id {member.Id}");
}
scope.Complete();
return member;
@@ -297,41 +299,24 @@ namespace Umbraco.Infrastructure.Services.Implement
if (vrfy == null || vrfy.Id != memberType.Id)
throw new ArgumentException($"Member type with alias {memberType.Alias} does not exist or is a different member type."); // causes rollback
var member = new Member(name, email.ToLower().Trim(), username, passwordValue, memberType, isApproved);
var member = new Member(name, email.ToLower().Trim(), username, passwordValue, memberType, isApproved, -1);
var saveEventArgs = new SaveEventArgs<IMember>(member);
if (!scope.Events.DispatchCancelable(Saving, this, saveEventArgs))
{
_memberRepository.Save(member);
saveEventArgs.CanCancel = false;
scope.Events.Dispatch(Saved, this, saveEventArgs);
Audit(AuditType.New, member.CreatorId, member.Id, $"Member '{member.Name}' was created with Id {member.Id}");
}
CreateMember(scope, member, -1, true);
scope.Complete();
return member;
}
}
private void CreateMember(IScope scope, Member member, int userId, bool withIdentity)
{
member.CreatorId = userId;
if (withIdentity)
{
// if saving is cancelled, media remains without an identity
var saveEventArgs = new SaveEventArgs<IMember>(member);
if (scope.Events.DispatchCancelable(Saving, this, saveEventArgs))
{
return;
}
_memberRepository.Save(member);
saveEventArgs.CanCancel = false;
scope.Events.Dispatch(Saved, this, saveEventArgs);
}
if (withIdentity == false)
{
return;
}
Audit(AuditType.New, member.CreatorId, member.Id, $"Member '{member.Name}' was created with Id {member.Id}");
}
#endregion
#region Get, Has, Is, Exists...