From 6c57dfc71248a5b664c38049ec5be8c29d25a6d7 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 20 Dec 2016 12:15:10 +0100 Subject: [PATCH] Bug 16966: The method should return a Koha::Patrons object Content-Type: text/plain; charset=utf-8 Signed-off-by: Marcel de Rooy --- Koha/Patrons.pm | 2 +- t/db_dependent/Koha/Patrons.t | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Koha/Patrons.pm b/Koha/Patrons.pm index 60e1a2c..8430d16 100644 --- a/Koha/Patrons.pm +++ b/Koha/Patrons.pm @@ -199,7 +199,7 @@ sub search_patrons_to_anonymise { : undef; my $dtf = Koha::Database->new->schema->storage->datetime_parser; - my $rs = $class->search( + my $rs = $class->_resultset->search( { returndate => { '<' => $dtf->format_datetime($older_than_date), }, 'old_issues.borrowernumber' => { 'not' => undef }, privacy => { '<>' => 0 }, # Keep forever diff --git a/t/db_dependent/Koha/Patrons.t b/t/db_dependent/Koha/Patrons.t index 2de5877..04f4565 100644 --- a/t/db_dependent/Koha/Patrons.t +++ b/t/db_dependent/Koha/Patrons.t @@ -19,7 +19,7 @@ use Modern::Perl; -use Test::More tests => 20; +use Test::More tests => 21; use Test::Warn; use DateTime; @@ -688,7 +688,7 @@ subtest 'search_patrons_to_anonymise & anonymise_issue_history' => sub { t::lib::Mocks::mock_preference( 'AnonymousPatron', $anonymous->{borrowernumber} ); subtest 'patron privacy is 1 (default)' => sub { - plan tests => 3; + plan tests => 4; t::lib::Mocks::mock_preference('IndependentBranches', 0); my $patron = $builder->build( @@ -715,6 +715,10 @@ subtest 'search_patrons_to_anonymise & anonymise_issue_history' => sub { my ( $returned, undef, undef ) = C4::Circulation::AddReturn( $item->{barcode}, undef, undef, undef, '2010-10-10' ); is( $returned, 1, 'The item should have been returned' ); + + my $patron_to_anonymise = Koha::Patrons->search_patrons_to_anonymise( '2010-10-11' )->search( { 'me.borrowernumber' => $patron->{borrowernumber} } )->next; + is( ref($patron_to_anonymise), 'Koha::Patron', 'search_patrons_to_anonymise should return Koha::Patrons' ); + my $rows_affected = Koha::Patrons->search_patrons_to_anonymise( '2010-10-11')->anonymise_issue_history('2010-10-11'); ok( $rows_affected > 0, 'AnonymiseIssueHistory should affect at least 1 row' ); -- 2.1.4