From 27f94d8f9bc7f8e64d8c40f06e6138c258b4aa58 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Thu, 25 Jul 2024 14:20:09 -0300 Subject: [PATCH] Bug 37480: Make addroutingmember use Koha::Subscription::Routinglists This patch rewriteis the method so it relies on Koha::Object-based classes instead of the old way. To test: 1. Run: $ ktd --shell k$ prove t/db_dependent/Serials.t => SUCCESS: Tests pass! 2. Apply this patch 3. Repeat 1 => SUCCESS: Tests pass! 4. Run: $ git grep addroutingmember => SUCCESS: It is only called on a single .pl file which doesn't care about the return value. Neither the tests care. 5. Sign off :-D Signed-off-by: David Nind Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer --- C4/Serials.pm | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/C4/Serials.pm b/C4/Serials.pm index c8097ab6d4..4421bf35b0 100644 --- a/C4/Serials.pm +++ b/C4/Serials.pm @@ -46,6 +46,7 @@ use Koha::DateUtils qw( dt_from_string ); use Koha::Serial; use Koha::SharedContent; use Koha::Subscription::Histories; +use Koha::Subscription::Routinglists; use Koha::Subscriptions; use Koha::Suggestions; use Koha::TemplateUtils qw( process_tt ); @@ -2017,21 +2018,18 @@ of either 1 or highest current rank + 1 sub addroutingmember { my ( $borrowernumber, $subscriptionid ) = @_; - return unless ($borrowernumber and $subscriptionid); + return unless ( $borrowernumber and $subscriptionid ); - my $rank; - my $dbh = C4::Context->dbh; - my $sth = $dbh->prepare( "SELECT max(ranking) `rank` FROM subscriptionroutinglist WHERE subscriptionid = ?" ); - $sth->execute($subscriptionid); - while ( my $line = $sth->fetchrow_hashref ) { - if ( defined $line->{rank} && $line->{rank} > 0 ) { - $rank = $line->{rank} + 1; - } else { - $rank = 1; + my $max_ranking = Koha::Subscription::Routinglists->search( { subscriptionid => $subscriptionid } ) + ->_resultset->get_column('ranking')->max; + + return Koha::Subscription::Routinglist->new( + { + subscriptionid => $subscriptionid, + borrowernumber => $borrowernumber, + ranking => defined $max_ranking ? $max_ranking + 1 : 1, } - } - $sth = $dbh->prepare( "INSERT INTO subscriptionroutinglist (subscriptionid,borrowernumber,ranking) VALUES (?,?,?)" ); - $sth->execute( $subscriptionid, $borrowernumber, $rank ); + )->store(); } =head2 reorder_members -- 2.39.5