- Refactored code using PrimaryAlias to use PrimaryAliasId in cases where only the alias Id was needed, avoiding full navigation property loading. This change addresses issues where lazy-loading Person.PrimaryAlias caused exceptions (e.g., Person.Logic.cs:line 1003) tied to missing context during alias access.

Author: nairdo

Rock/Data/DbContext.cs

@@ -336,13 +336,13 @@ public virtual SaveChangesResult SaveChanges( SaveChangesArgs args )
 
             SaveErrorMessages = new List<string>();
 
-            // Try to get the current person alias and id
-            PersonAlias personAlias = GetCurrentPersonAlias();
+            // Try to get the current person alias id
+            var  personAliasId = GetCurrentPersonAliasId();
 
             bool enableAuditing = GlobalAttributesCache.Value( "EnableAuditing" ).AsBoolean();
 
             // Evaluate the current context for items that have changes
-            var updatedItems = RockPreSave( this, personAlias, enableAuditing );
+            var updatedItems = RockPreSave( this, personAliasId, enableAuditing );
 
             // If update was not cancelled by triggered workflow
             if ( updatedItems != null )
@@ -364,7 +364,7 @@ public virtual SaveChangesResult SaveChanges( SaveChangesArgs args )
                 // If any items changed process audit and triggers
                 if ( updatedItems.Any() )
                 {
-                    RockPostSave( updatedItems, personAlias, enableAuditing );
+                    RockPostSave( updatedItems, enableAuditing );
 
                     if ( args.IsAchievementsEnabled )
                     {
@@ -428,7 +428,9 @@ private int SaveChangesInternal()
         /// <summary>
         /// Gets the current person alias.
         /// </summary>
-        /// <returns></returns>
+        /// <returns>The primary alias</returns>
+        [Obsolete( "Use GetCurrentPersonAliasId() instead." )]
+        [RockObsolete( "18.0" )]
         internal PersonAlias GetCurrentPersonAlias()
         {
             if ( HttpContext.Current != null && HttpContext.Current.Items.Contains( "CurrentPerson" ) )
@@ -448,21 +450,52 @@ internal PersonAlias GetCurrentPersonAlias()
             return null;
         }
 
+        /// <summary>
+        /// Gets the current person alias Id.
+        /// </summary>
+        /// <returns>The Id of the current person's primary alias.</returns>
+        internal int? GetCurrentPersonAliasId()
+        {
+            if ( HttpContext.Current != null && HttpContext.Current.Items.Contains( "CurrentPerson" ) )
+            {
+                var currentPerson = HttpContext.Current.Items["CurrentPerson"] as Person;
+                if ( currentPerson != null && currentPerson.PrimaryAliasId != null )
+                {
+                    return currentPerson.PrimaryAliasId;
+                }
+            }
+
+            if ( Net.RockRequestContextAccessor.Current != null )
+            {
+                return Net.RockRequestContextAccessor.Current.CurrentPerson?.PrimaryAliasId;
+            }
+
+            return null;
+        }
+
         /// <summary>
         /// Updates the Created/Modified data for any model being created or modified
         /// </summary>
         /// <param name="dbContext">The database context.</param>
         /// <param name="personAlias">The person alias.</param>
         /// <param name="enableAuditing">if set to <c>true</c> [enable auditing].</param>
         /// <returns></returns>
+        [Obsolete( "Use RockPreSave( DbContext dbContext, int? PersonAliasId, bool enableAuditing ) instead." )]
+        [RockObsolete( "18.0" )]
         protected virtual List<ContextItem> RockPreSave( DbContext dbContext, PersonAlias personAlias, bool enableAuditing = false )
         {
-            int? personAliasId = null;
-            if ( personAlias != null )
-            {
-                personAliasId = personAlias.Id;
-            }
+            return RockPreSave( dbContext, personAlias?.Id, enableAuditing );
+        }
 
+        /// <summary>
+        /// Updates the Created/Modified data for any model being created or modified
+        /// </summary>
+        /// <param name="dbContext">The database context.</param>
+        /// <param name="personAliasId">The person alias Id.</param>
+        /// <param name="enableAuditing">if set to <c>true</c> [enable auditing].</param>
+        /// <returns></returns>
+        protected virtual List<ContextItem> RockPreSave( DbContext dbContext, int? personAliasId, bool enableAuditing = false )
+        {
             // This triggers the change detection, so it must be called before
             // we check for the implied relationship changes.
             var entries = dbContext.ChangeTracker.Entries().ToList();
@@ -540,7 +573,7 @@ c.Entity is IEntity &&
                         // instead of passing "true" the trigger model and UI would support a
                         // on-value-changed checkbox (or perhaps it should be the default/only behavior)
                         // and its value would be passed in to the onValueChange
-                        if ( !TriggerWorkflows( contextItem, WorkflowTriggerType.PreSave, personAlias ) )
+                        if ( !TriggerWorkflows( contextItem, WorkflowTriggerType.PreSave ) )
                         {
                             // If any workflow has aborted the save operation
                             // then let all the save hooks know the save was
@@ -596,7 +629,7 @@ c.Entity is IEntity &&
                     }
                     else if ( entry.State == EntityState.Deleted )
                     {
-                        if ( !TriggerWorkflows( contextItem, WorkflowTriggerType.PreDelete, personAlias ) )
+                        if ( !TriggerWorkflows( contextItem, WorkflowTriggerType.PreDelete ) )
                         {
                             // Let all the hooks that were called know that
                             // the save was aborted.
@@ -652,9 +685,21 @@ this play vital role in displaying the Who column in history summary.
         /// Creates audit logs and/or triggers workflows for items that were changed
         /// </summary>
         /// <param name="updatedItems">The updated items.</param>
-        /// <param name="personAlias">The person alias.</param>
+        /// <param name="personAlias">The person alias (NOT USED; hasn't been used in years).</param>
         /// <param name="enableAuditing">if set to <c>true</c> [enable auditing].</param>
+        [Obsolete( "Use RockPostSave( List<ContextItem> updatedItems, bool enableAuditing = false ) instead." )]
+        [RockObsolete( "18.0" )]
         protected virtual void RockPostSave( List<ContextItem> updatedItems, PersonAlias personAlias, bool enableAuditing = false )
+        {
+            RockPostSave( updatedItems, enableAuditing );
+        }
+
+        /// <summary>
+        /// Creates audit logs and/or triggers workflows for items that were changed
+        /// </summary>
+        /// <param name="updatedItems">The updated items.</param>
+        /// <param name="enableAuditing">if set to <c>true</c> [enable auditing].</param>
+        protected virtual void RockPostSave( List<ContextItem> updatedItems, bool enableAuditing = false )
         {
             // Triggers when the post-save actions have completed.
             var tcsPostSave = new TaskCompletionSource<bool>();
@@ -699,17 +744,17 @@ protected virtual void RockPostSave( List<ContextItem> updatedItems, PersonAlias
 
                     if ( item.State == EntityContextState.Detached || item.State == EntityContextState.Deleted )
                     {
-                        TriggerWorkflows( item, WorkflowTriggerType.PostDelete, personAlias );
+                        TriggerWorkflows( item, WorkflowTriggerType.PostDelete );
                     }
                     else
                     {
                         if ( item.PreSaveState == EntityContextState.Added )
                         {
-                            TriggerWorkflows( item, WorkflowTriggerType.PostAdd, personAlias );
+                            TriggerWorkflows( item, WorkflowTriggerType.PostAdd );
                         }
 
-                        TriggerWorkflows( item, WorkflowTriggerType.ImmediatePostSave, personAlias );
-                        TriggerWorkflows( item, WorkflowTriggerType.PostSave, personAlias );
+                        TriggerWorkflows( item, WorkflowTriggerType.ImmediatePostSave );
+                        TriggerWorkflows( item, WorkflowTriggerType.PostSave );
                     }
 
                     if ( item.Entity is IEntity entity )
@@ -1075,7 +1120,7 @@ public virtual void BulkInsertWithConditionalCacheUse<T>( IEnumerable<T> records
 
             // ensure CreatedDateTime and ModifiedDateTime is set
             var currentDateTime = RockDateTime.Now;
-            var currentPersonAliasId = this.GetCurrentPersonAlias()?.Id;
+            var currentPersonAliasId = this.GetCurrentPersonAliasId();
 
             foreach ( var record in records )
             {
@@ -1146,8 +1191,8 @@ public virtual void BulkInsert<T>( IEnumerable<T> records ) where T : class
         public virtual int BulkUpdate<T>( IQueryable<T> queryable, Expression<Func<T, T>> updateFactory ) where T : class
         {
             var currentDateTime = RockDateTime.Now;
-            PersonAlias currentPersonAlias = this.GetCurrentPersonAlias();
-            var rockExpressionVisitor = new RockBulkUpdateExpressionVisitor( currentDateTime, currentPersonAlias );
+            var currentPersonAliasId = this.GetCurrentPersonAliasId();
+            var rockExpressionVisitor = new RockBulkUpdateExpressionVisitor( currentDateTime, currentPersonAliasId );
             var updatedExpression = rockExpressionVisitor.Visit( updateFactory ) as Expression<Func<T, T>> ?? updateFactory;
             int recordsUpdated = queryable.Update( updatedExpression, batchUpdateBuilder =>
             {
@@ -1192,9 +1237,8 @@ public virtual int BulkDelete<T>( IQueryable<T> queryable, int? batchSize = null
         /// </summary>
         /// <param name="item">The item.</param>
         /// <param name="triggerType">Type of the trigger.</param>
-        /// <param name="personAlias">The person alias.</param>
         /// <returns></returns>
-        private bool TriggerWorkflows( ContextItem item, WorkflowTriggerType triggerType, PersonAlias personAlias )
+        private bool TriggerWorkflows( ContextItem item, WorkflowTriggerType triggerType  )
         {
             IEntity entity = item.Entity;
             Dictionary<string, PropertyInfo> properties = null;

Rock/Data/RockBulkUpdateExpressionVisitor.cs

@@ -31,16 +31,29 @@ internal class RockBulkUpdateExpressionVisitor : ExpressionVisitor
     {
         private DateTime _currentDateTime;
         private PersonAlias _currentPersonAlias;
+        private int? _currentPersonAliasId;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RockBulkUpdateExpressionVisitor"/> class.
         /// </summary>
         /// <param name="currentDateTime">The current date time.</param>
         /// <param name="currentPersonAlias">The current person alias.</param>
+        [Obsolete( "Use RockBulkUpdateExpressionVisitor( DateTime currentDateTime, int? currentPersonAliasId ) instead" )]
+        [RockObsolete( "18.0" )]
         public RockBulkUpdateExpressionVisitor( DateTime currentDateTime, PersonAlias currentPersonAlias )
         {
             _currentDateTime = currentDateTime;
             _currentPersonAlias = currentPersonAlias;
+            if ( currentPersonAlias != null )
+            {
+                _currentPersonAliasId = currentPersonAlias.Id;
+            }
+        }
+
+        public RockBulkUpdateExpressionVisitor( DateTime currentDateTime, int? currentPersonAliasId )
+        {
+            _currentDateTime = currentDateTime;
+            _currentPersonAliasId = currentPersonAliasId;
         }
 
         /// <summary>
@@ -64,9 +77,9 @@ protected override Expression VisitMemberInit( MemberInitExpression node )
                     }
 
                     MemberInfo modifiedByPersonAliasIdMemberInfo = typeof( Rock.Data.IModel ).GetMember( "ModifiedByPersonAliasId" ).FirstOrDefault();
-                    if ( modifiedByPersonAliasIdMemberInfo != null && _currentPersonAlias != null )
+                    if ( modifiedByPersonAliasIdMemberInfo != null && ( _currentPersonAliasId.HasValue || _currentPersonAlias != null ) )
                     {
-                        currentBindings.Add( Expression.Bind( modifiedByPersonAliasIdMemberInfo, Expression.Constant( _currentPersonAlias.Id ) ) );
+                        currentBindings.Add( Expression.Bind( modifiedByPersonAliasIdMemberInfo, Expression.Constant( _currentPersonAliasId.Value ) ) );
                     }
 
                     node = node.Update( node.NewExpression, currentBindings );

Rock/Model/CMS/PersonalLinkSectionOrder/PersonalLinkSectionOrder.Logic.cs

@@ -39,7 +39,7 @@ public partial class PersonalLinkSectionOrder
         /// <param name="dbContext">The database context.</param>
         public void UpdateCache( EntityState entityState, Data.DbContext dbContext )
         {
-            var currentPersonAliasId = dbContext.GetCurrentPersonAlias()?.Id;
+            var currentPersonAliasId = dbContext.GetCurrentPersonAliasId();
             if ( this.PersonAliasId == currentPersonAliasId )
             {
                 // If the current person is the one modifying this (it probably is), update the Session

Rock/Model/CRM/PersonSearchKey/PersonSearchKey.Logic.cs

@@ -113,7 +113,7 @@ protected override void BuildHistoryItems( Data.DbContext dbContext, DbEntityEnt
                 caption,
                 typeof( PersonSearchKey ),
                 Id,
-                dbContext.GetCurrentPersonAlias()?.Id,
+                dbContext.GetCurrentPersonAliasId(),
                 dbContext.SourceOfChange );
         }
 

Rock/Model/CRM/UserLogin/UserLogin.SaveHook.cs

@@ -110,7 +110,7 @@ protected override void PreSave()
                                     var isUserNameSensitive = ( entityType?.Guid == Rock.SystemGuid.EntityType.AUTHENTICATION_PIN.AsGuid() ) ? true : false;
 
                                     // Get the current person to correctly ascribe the deletion / modification.
-                                    var currentPersonAliasId = DbContext.GetCurrentPersonAlias()?.Id;
+                                    var currentPersonAliasId = DbContext.GetCurrentPersonAliasId();
                                     if ( !isUserNameSensitive )
                                     {
                                         HistoryChanges.AddChange( History.HistoryVerb.Delete, History.HistoryChangeType.Record, "User Login" ).SetOldValue( userLogin.UserName );

Rock/Model/Connection/ConnectionRequest/ConnectionRequest.SaveHook.cs

@@ -61,9 +61,6 @@ internal class SaveHook : EntitySaveHook<ConnectionRequest>
             /// </summary>
             protected override void PreSave()
             {
-                // Get the current person's alias ID from the current context.
-                var currentPersonAliasId = DbContext.GetCurrentPersonAlias()?.Id;
-
                 HistoryChangeList = new History.HistoryChangeList();
                 PersonHistoryChangeList = new History.HistoryChangeList();
                 var connectionRequest = this.Entity as ConnectionRequest;
@@ -154,7 +151,7 @@ protected override void PreSave()
             protected override void PostSave()
             {
                 // Get the current person's alias ID from the current context.
-                var currentPersonAliasId = DbContext.GetCurrentPersonAlias()?.Id;
+                var currentPersonAliasId = DbContext.GetCurrentPersonAliasId();
                 var connectionRequest = this.Entity as ConnectionRequest;
 
                 // Create and send the change notification message now that the connection request has been saved.

Rock/Model/Core/AttributeMatrixItem/AttributeMatrixItem.Logic.cs

@@ -149,7 +149,7 @@ protected override void BuildHistoryItems( Data.DbContext dbContext, DbEntityEnt
                 matrixAttributeCache.Name,
                 typeof( Attribute ),
                 matrixAttributeCache.Id,
-                dbContext.GetCurrentPersonAlias()?.Id,
+                dbContext.GetCurrentPersonAliasId(),
                 dbContext.SourceOfChange );
         }
 

Rock/Model/Core/AttributeValue/AttributeValue.Logic.cs

@@ -426,7 +426,7 @@ protected override void BuildHistoryItems( Data.DbContext dbContext, DbEntityEnt
                 caption,
                 typeof( Attribute ),
                 AttributeId,
-                dbContext.GetCurrentPersonAlias()?.Id,
+                dbContext.GetCurrentPersonAliasId(),
                 dbContext.SourceOfChange );
         }
 

Rock/Model/Core/Auth/Auth.SaveHook.cs

@@ -45,11 +45,7 @@ protected override void PreSave()
                     authAuditLog.Action = auth.Action;
                     authAuditLog.ChangeDateTime = RockDateTime.Now;
                     authAuditLog.SpecialRole = auth.SpecialRole;
-                    var currentPersonAlias = rockContext.GetCurrentPersonAlias();
-                    if ( currentPersonAlias != null )
-                    {
-                        authAuditLog.ChangeByPersonAliasId = currentPersonAlias.Id;
-                    }
+                    authAuditLog.ChangeByPersonAliasId = rockContext.GetCurrentPersonAliasId();
 
                     authAuditLogService.Add( authAuditLog );
 

Rock/Model/Finance/FinancialPersonSavedAccount/FinancialPersonSavedAccount.Logic.cs

@@ -173,7 +173,7 @@ protected override void BuildHistoryItems( Data.DbContext dbContext, DbEntityEnt
                 GetNameForHistory( originalModel?.FinancialPaymentDetail ?? FinancialPaymentDetail ),
                 typeof( FinancialPersonSavedAccount ),
                 Id,
-                dbContext.GetCurrentPersonAlias()?.Id,
+                dbContext.GetCurrentPersonAliasId(),
                 dbContext.SourceOfChange );
         }