From c6498e735a93080faf4af609fabf00fa8477609b Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Tue, 3 Apr 2018 08:24:56 +0200 Subject: [PATCH] Bug 20510: Remove unused sub TotalPaid from C4::Stats Test plan: 0) Do not apply the patch 1) Run git grep TotalPaid and confirm it is only defined and then used once in a test 2) Apply the patch 3) git grep TotalPaid should return nothing 4) prove t/db_dependent/Stats.t should be green --- C4/Stats.pm | 46 ---------------------------------------------- t/db_dependent/Stats.t | 11 ++--------- 2 files changed, 2 insertions(+), 55 deletions(-) diff --git a/C4/Stats.pm b/C4/Stats.pm index 4b1b82a..0437818 100644 --- a/C4/Stats.pm +++ b/C4/Stats.pm @@ -32,7 +32,6 @@ BEGIN { @ISA = qw(Exporter); @EXPORT = qw( &UpdateStats - &TotalPaid ); } @@ -143,51 +142,6 @@ sub UpdateStats { ); } -=head2 TotalPaid - - @total = &TotalPaid ( $time, [$time2], [$spreadsheet ]); - -Returns an array containing the payments and writeoffs made between two dates -C<$time> and C<$time2>, or on a specific one, or from C<$time> onwards. - -C<$time> param is mandatory. -If C<$time> eq 'today', returns are limited to the current day -If C<$time2> eq '', results are returned from C<$time> onwards. -If C<$time2> is undef, returns are limited to C<$time> -C<$spreadsheet> param is optional and controls the sorting of the results. - -Returns undef if no param is given - -=cut - -sub TotalPaid { - my ( $time, $time2, $spreadsheet ) = @_; - return () unless (defined $time); - $time2 = $time unless $time2; - my $dbh = C4::Context->dbh; - my $query = "SELECT * FROM statistics - LEFT JOIN borrowers ON statistics.borrowernumber= borrowers.borrowernumber - WHERE (statistics.type='payment' OR statistics.type='writeoff') "; - if ( $time eq 'today' ) { -# FIXME wrong condition. Now() will not get all the payments of the day but of a specific timestamp - $query .= " AND datetime = now()"; - } else { - $query .= " AND datetime > '$time'"; # FIXME: use placeholders - } - if ( $time2 ne '' ) { - $query .= " AND datetime < '$time2'"; # FIXME: use placeholders - } -# FIXME if $time2 is undef, query will be "AND datetime > $time AND AND datetime < $time" -# Operators should probably be <= and >= - if ($spreadsheet) { - $query .= " ORDER BY branch, type"; - } - $debug and warn "TotalPaid query: $query"; - my $sth = $dbh->prepare($query); - $sth->execute(); - return @{$sth->fetchall_arrayref({})}; -} - 1; __END__ diff --git a/t/db_dependent/Stats.t b/t/db_dependent/Stats.t index 7675a16..4ec1bce 100644 --- a/t/db_dependent/Stats.t +++ b/t/db_dependent/Stats.t @@ -3,16 +3,14 @@ use Modern::Perl; use C4::Stats; -use Test::More tests => 20; +use Test::More tests => 19; BEGIN { use_ok('C4::Stats'); } can_ok( 'C4::Stats', - qw(UpdateStats - TotalPaid - ) + qw(UpdateStats) ); #Start transaction @@ -164,11 +162,6 @@ $line = ${ $sth->fetchall_arrayref( {} ) }[0]; is( $line->{location}, undef, "UpdateStats sets location to NULL if undef is passed in." ); -# -# Test TotalPaid -# - -is (TotalPaid (),undef,"TotalPaid returns undef if no params are given"); # More tests to write! #End transaction -- 2.1.4