From c01df528eb77b4936715814dd52a5121962ceac2 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 23 Mar 2018 09:38:15 -0400 Subject: [PATCH] Bug 16117: Give methods better names --- C4/Circulation.pm | 4 ++-- Koha/Statistics.pm | 18 +++++++++--------- circ/circulation.pl | 2 +- t/db_dependent/Stats.t | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index eb13547419..30ae411b30 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -672,7 +672,7 @@ sub CanBookBeIssued { my $item = GetItem(undef, $barcode ); # MANDATORY CHECKS - unless item exists, nothing else matters unless ( $item && $item->{barcode} ) { - Koha::Statistics->invalid_item( { item => $barcode } ); + Koha::Statistics->log_invalid_item( { item => $barcode } ); $issuingimpossible{UNKNOWN_BARCODE} = 1; } return ( \%issuingimpossible, \%needsconfirmation ) if %issuingimpossible; @@ -1806,7 +1806,7 @@ sub AddReturn { # get information on item my $item = GetItem( undef, $barcode ); unless ($item) { - Koha::Statistics->invalid_item( { item => $barcode } ); + Koha::Statistics->log_invalid_item( { item => $barcode } ); return ( 0, { BadBarcode => $barcode } ); # no barcode means no item or borrower. bail out. } diff --git a/Koha/Statistics.pm b/Koha/Statistics.pm index b2abfce964..6783b4a907 100644 --- a/Koha/Statistics.pm +++ b/Koha/Statistics.pm @@ -35,13 +35,13 @@ Koha::Statistics - Koha Statistic Object set class =head2 Class Methods -=head3 invalid_patron +=head3 log_invalid_patron -Koha::Statistics->invalid_patron( { patron => $cardnumber } ); +Koha::Statistics->log_invalid_patron( { patron => $cardnumber } ); =cut -sub invalid_patron { +sub log_invalid_patron { return unless C4::Context->preference('LogInvalidPatrons'); my ( $class, $params ) = @_; @@ -49,7 +49,7 @@ sub invalid_patron { my $patron = $params->{patron}; croak('Invalid patron passed in!') unless $patron; - return $class->_invalid_value( + return $class->_log_invalid_value( { type => 'patron', value => $patron @@ -57,13 +57,13 @@ sub invalid_patron { ); } -=head3 invalid_item +=head3 log_invalid_item -Koha::Statistics->invalid_item( { item => $barcode } ); +Koha::Statistics->log_invalid_item( { item => $barcode } ); =cut -sub invalid_item { +sub log_invalid_item { return unless C4::Context->preference('LogInvalidItems'); my ( $class, $params ) = @_; @@ -71,7 +71,7 @@ sub invalid_item { my $item = $params->{item}; croak('Invalid item passed in!') unless $item; - return $class->_invalid_value( + return $class->_log_invalid_value( { type => 'item', value => $item @@ -85,7 +85,7 @@ Koha::Statistics->invalid_value( { type => 'patron', value => $patron } ); =cut -sub _invalid_value { +sub _log_invalid_value { my ( $class, $params ) = @_; my $type = $params->{type}; diff --git a/circ/circulation.pl b/circ/circulation.pl index 4c2ccadc82..aa1f6e4075 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -267,7 +267,7 @@ if ($findborrower) { } elsif ( @$borrowers ) { $template->param( borrowers => $borrowers ); } else { - Koha::Statistics->invalid_patron( { patron => $findborrower } ); + Koha::Statistics->log_invalid_patron( { patron => $findborrower } ); $query->param( 'findborrower', '' ); $message = "'$findborrower'"; } diff --git a/t/db_dependent/Stats.t b/t/db_dependent/Stats.t index b2b43fe531..5b32aebd88 100644 --- a/t/db_dependent/Stats.t +++ b/t/db_dependent/Stats.t @@ -184,28 +184,28 @@ $context->mock( }; } ); -# Test Koha::Statistic->invalid_patron +# Test Koha::Statistic->log_invalid_patron $dbh->do(q{DELETE FROM statistics}); t::lib::Mocks::mock_preference( "LogInvalidPatrons", 0 ); -Koha::Statistics->invalid_patron( { patron => 'InvalidCardnumber' } ); +Koha::Statistics->log_invalid_patron( { patron => 'InvalidCardnumber' } ); is( Koha::Statistics->search()->count(), 0, 'No stat line added if system preference LogInvalidPatrons is disabled' ); t::lib::Mocks::mock_preference( "LogInvalidPatrons", 1 ); -Koha::Statistics->invalid_patron( { patron => 'InvalidCardnumber' } ); +Koha::Statistics->log_invalid_patron( { patron => 'InvalidCardnumber' } ); my $stat = Koha::Statistics->search()->next(); is( $stat->type, 'invalid_patron', 'Type set to invalid_patron' ); is( $stat->associatedborrower, '-1', 'Associated library id set correctly' ); is( $stat->other, 'InvalidCardnumber', 'Invalid cardnumber is set correctly' ); is( $stat->branch, $branchcode, 'Branchcode is set correctly' ); -# Test Koha::Statistic->invalid_item +# Test Koha::Statistic->log_invalid_item $dbh->do(q{DELETE FROM statistics}); t::lib::Mocks::mock_preference( "LogInvalidItems", 0 ); -Koha::Statistics->invalid_item( { item => 'InvalidBarcode' } ); +Koha::Statistics->log_invalid_item( { item => 'InvalidBarcode' } ); is( Koha::Statistics->search()->count(), 0, 'No stat line added if system preference LogInvalidItems is disabled' ); t::lib::Mocks::mock_preference( "LogInvalidItems", 1 ); -Koha::Statistics->invalid_item( { item => 'InvalidBarcode' } ); +Koha::Statistics->log_invalid_item( { item => 'InvalidBarcode' } ); $stat = Koha::Statistics->search()->next(); is( $stat->type, 'invalid_item', 'Type set to invalid_item' ); is( $stat->associatedborrower, '-1', 'Associated library id set correctly' ); -- 2.17.1 (Apple Git-112)