Bug 18395: (bug 14610 followup) Remove article requests methods from Koha::Patrons

There is something very wrong with the new subroutines, they have been added to both Koha::Patron and Koha::Patrons:

% git grep 'sub article_request' Koha/Patron*.pm
Koha/Patron.pm:sub article_requests {
Koha/Patron.pm:sub article_requests_current {
Koha/Patron.pm:sub article_requests_finished {
Koha/Patrons.pm:sub article_requests {
Koha/Patrons.pm:sub article_requests_current {
Koha/Patrons.pm:sub article_requests_finished {

The ones in Koha::Patrons are wrong

Test plan:
  prove t/db_dependent/ArticleRequests.t
should still return green

Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/Koha/Patrons.pm b/Koha/Patrons.pm
index 6548f02..b8aebeb 100644 (file)
--- a/Koha/Patrons.pm
+++ b/Koha/Patrons.pm
@@ -115,73 +115,6 @@ sub guarantor {
     return Koha::Patrons->find( $self->guarantorid() );
 }
 
-=head3 article_requests
-
-my @requests = $borrower->article_requests();
-my $requests = $borrower->article_requests();
-
-Returns either a list of ArticleRequests objects,
-or an ArtitleRequests object, depending on the
-calling context.
-
-=cut
-
-sub article_requests {
-    my ( $self ) = @_;
-
-    $self->{_article_requests} ||= Koha::ArticleRequests->search({ borrowernumber => $self->borrowernumber() });
-
-    return $self->{_article_requests};
-}
-
-=head3 article_requests_current
-
-my @requests = $patron->article_requests_current
-
-Returns the article requests associated with this patron that are incomplete
-
-=cut
-
-sub article_requests_current {
-    my ( $self ) = @_;
-
-    $self->{_article_requests_current} ||= Koha::ArticleRequests->search(
-        {
-            borrowernumber => $self->id(),
-            -or          => [
-                { status => Koha::ArticleRequest::Status::Pending },
-                { status => Koha::ArticleRequest::Status::Processing }
-            ]
-        }
-    );
-
-    return $self->{_article_requests_current};
-}
-
-=head3 article_requests_finished
-
-my @requests = $biblio->article_requests_finished
-
-Returns the article requests associated with this patron that are completed
-
-=cut
-
-sub article_requests_finished {
-    my ( $self, $borrower ) = @_;
-
-    $self->{_article_requests_finished} ||= Koha::ArticleRequests->search(
-        {
-            borrowernumber => $self->id(),
-            -or          => [
-                { status => Koha::ArticleRequest::Status::Completed },
-                { status => Koha::ArticleRequest::Status::Canceled }
-            ]
-        }
-    );
-
-    return $self->{_article_requests_finished};
-}
-
 =head3 search_patrons_to_anonymise
 
     my $patrons = Koha::Patrons->search_patrons_to_anonymise( { before => $older_than_date, [ library => $library ] } );