Merge branch '6.0/shred-users-with-attrs' into 6.0-trunk

Author: cbrandtbuffalo

lib/RT/User.pm

@@ -3180,7 +3180,6 @@ sub __DependsOn {
         ACL
         Articles
         Attachments
-        Attributes
         CachedGroupMembers
         Classes
         CustomFieldValues
@@ -3215,6 +3214,23 @@ sub __DependsOn {
             push @var_objs, $objs;
         }
     }
+
+    # Attributes of other objects (not owned by this user) that reference this
+    # user in Creator/LastUpdatedBy. The user's own attributes are already
+    # handled as direct DEPENDS_ON dependencies via $self->Attributes, so
+    # exclude them to avoid a duplicate VARIABLE dependency without a resolver.
+    for my $method (qw(Creator LastUpdatedBy)) {
+        my $objs = RT::Attributes->new( $self->CurrentUser );
+        $objs->Limit( FIELD => $method, VALUE => $self->id );
+        $objs->Limit( FIELD => 'ObjectType', OPERATOR => '!=', VALUE => ref $self );
+        push @var_objs, $objs;
+
+        my $other_user_attrs = RT::Attributes->new( $self->CurrentUser );
+        $other_user_attrs->Limit( FIELD => $method,      VALUE    => $self->id );
+        $other_user_attrs->Limit( FIELD => 'ObjectType', VALUE    => ref $self );
+        $other_user_attrs->Limit( FIELD => 'ObjectId',   OPERATOR => '!=', VALUE => $self->id );
+        push @var_objs, $other_user_attrs;
+    }
     $deps->_PushDependencies(
         BaseObject => $self,
         Flags => RT::Shredder::Constants::DEPENDS_ON | RT::Shredder::Constants::VARIABLE,

t/shredder/02user.t

@@ -67,4 +67,22 @@ $test->create_savepoint('aucreate'); # after user create
     cmp_deeply( $test->dump_current_and_savepoint('aucreate'), "current DB equal to savepoint");
 }
 
+{    # Shred a user who has a RecentlyViewedTickets attribute (their own attribute)
+    diag "Shred a user with a RecentlyViewedTickets attribute";
+
+    my $user = RT::User->new( RT->SystemUser );
+    my ( $uid, $msg ) = $user->Create( Name => 'user_with_attr', Privileged => 1, Disabled => 0 );
+    ok( $uid, "created user" ) or diag "error: $msg";
+
+    $user->AddRecentlyViewedTicket($ticket);
+    ok( $user->FirstAttribute('RecentlyViewedTickets'), "user has RecentlyViewedTickets attribute" );
+
+    my $shredder = $test->shredder_new();
+    eval { $shredder->Wipeout( Object => $user ) };
+    is( $@, '', "shredding user with RecentlyViewedTickets attribute does not throw" );
+}
+
+cmp_deeply( $test->dump_current_and_savepoint('aucreate'),
+    "current DB equal to savepoint after shredding user with own attribute" );
+
 done_testing;

t/shredder/03plugin_users.t

@@ -193,4 +193,50 @@ diag "Shred a user who owns 2 tickets";
 }
 cmp_deeply( $test->dump_current_and_savepoint('clean'), "current DB equal to savepoint");
 
+diag "Shred a user who created an attribute on another user, replacing relations";
+{
+    my $user_a = RT::User->new( RT->SystemUser );
+    my ( $uid_a, $msg ) = $user_a->Create( Name => 'user_attr_owner', Privileged => 1, Disabled => 0 );
+    ok( $uid_a, "created user A" ) or diag "error: $msg";
+
+    my $user_b = RT::User->new( RT->SystemUser );
+    my ($uid_b);
+    ( $uid_b, $msg ) = $user_b->Create( Name => 'user_attr_target', Privileged => 1, Disabled => 0 );
+    ok( $uid_b, "created user B" ) or diag "error: $msg";
+
+    # Simulate user_b having an attribute whose Creator is user_a
+    $user_b->SetAttribute( Name => 'SomeAttr', Content => 'value' );
+    my $attr = $user_b->FirstAttribute('SomeAttr');
+    ok( $attr, "attribute created on user B" );
+    $attr->__Set( Field => 'Creator',       Value => $uid_a );
+    $attr->__Set( Field => 'LastUpdatedBy', Value => $uid_a );
+    is( $attr->Creator, $uid_a, "attribute Creator is user A" );
+
+    my $plugin = RT::Shredder::Plugin::Users->new;
+    my ($status);
+    ( $status, $msg ) = $plugin->TestArgs( status => 'any', name => 'user_attr_owner', replace_relations => $uid_b );
+    ok( $status, "plugin arguments ok" ) or diag "error: $msg";
+
+    my $shredder = $test->shredder_new();
+    my @objs;
+    ( $status, @objs ) = $plugin->Run;
+    ok( $status, "plugin ran ok" ) or diag "error: @objs";
+    @objs = RT::Shredder->CastObjectsToRecords( Objects => \@objs );
+
+    ( $status, $msg ) = $plugin->SetResolvers( Shredder => $shredder );
+    ok( $status, "set resolvers" ) or diag "error: $msg";
+
+    $shredder->PutObjects( Objects => \@objs );
+    eval { $shredder->WipeoutAll };
+    is( $@, '', "shredding user who created another user's attribute does not throw" );
+
+    $attr->Load( $attr->id );
+    is( $attr->Creator,       $uid_b, "attribute Creator updated to user B" );
+    is( $attr->LastUpdatedBy, $uid_b, "attribute LastUpdatedBy updated to user B" );
+
+    $shredder->Wipeout( Object => $user_b );
+}
+cmp_deeply( $test->dump_current_and_savepoint('clean'),
+    "current DB equal to savepoint after shredding user who created another's attribute" );
+
 done_testing();