gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 29844: Some more uncaught cases 

Some more cases found using

$ git grep '\->search(' | grep -v -e '\->as_list' -e '\->get_column' \
      | grep '@'

and then manually looking at them.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Tomas Cohen Arazi 2022-01-11 09:42:00 -03:00 committed by Fridolin Somers
parent e53667105d
commit 571a13f667
12 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C4/Items.pm
View File

@ -636,7 +636,7 @@ sub GetItemsForInventory {
'+select' => [ 'marc_subfield_structures.kohafield', 'marc_subfield_structures.frameworkcode', 'me.authorised_value', 'me.lib' ],
'+as' => [ 'kohafield', 'frameworkcode', 'authorised_value', 'lib' ],
}
);
)->as_list;
my $avmapping = { map { $_->get_column('kohafield') . ',' . $_->get_column('frameworkcode') . ',' . $_->get_column('authorised_value') => $_->get_column('lib') } @avs };

2
Koha/ItemType.pm
View File

@ -80,7 +80,7 @@ sub translated_descriptions {
{ entity => 'itemtypes',
code => $self->itemtype,
}
);
)->as_list;
return [ map {
{
lang => $_->lang,

2
Koha/Patron/HouseboundProfile.pm
View File

@ -51,7 +51,7 @@ Returns an arrayref of all visits associated this houseboundProfile.
sub housebound_visits {
my ( $self ) = @_;
my @visits = Koha::Patron::HouseboundVisits
->special_search({ borrowernumber => $self->borrowernumber });
->special_search({ borrowernumber => $self->borrowernumber })->as_list;
return \@visits;
}

4
reports/guided_reports.pl
View File

@ -749,7 +749,7 @@ elsif ($phase eq 'Run this report'){
}
}
elsif ( $authorised_value eq "biblio_framework" ) {
my @frameworks = Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] });
my @frameworks = Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] })->as_list;
my $default_source = '';
push @authorised_values,$default_source;
$authorised_lib{$default_source} = 'Default';
@ -769,7 +769,7 @@ elsif ($phase eq 'Run this report'){
}
}
elsif ( $authorised_value eq "categorycode" ) {
my @patron_categories = Koha::Patron::Categories->search({}, { order_by => ['description']});
my @patron_categories = Koha::Patron::Categories->search({}, { order_by => ['description']})->as_list;
%authorised_lib = map { $_->categorycode => $_->description } @patron_categories;
push @authorised_values, $_->categorycode for @patron_categories;
}

10
t/db_dependent/Acquisition.t
View File

@ -911,12 +911,12 @@ subtest 'Acquisition logging' => sub {
Koha::ActionLogs->delete;
my $basketno = NewBasket( $booksellerid, 1 );
my @create_logs = Koha::ActionLogs->search({ module =>'ACQUISITIONS', action => 'ADD_BASKET', object => $basketno });
my @create_logs = Koha::ActionLogs->search({ module =>'ACQUISITIONS', action => 'ADD_BASKET', object => $basketno })->as_list;
is (scalar @create_logs, 1, 'Basket creation is logged');
Koha::ActionLogs->delete;
C4::Acquisition::ReopenBasket($basketno);
my @reopen_logs = Koha::ActionLogs->search({ module =>'ACQUISITIONS', action => 'REOPEN_BASKET', object => $basketno });
my @reopen_logs = Koha::ActionLogs->search({ module =>'ACQUISITIONS', action => 'REOPEN_BASKET', object => $basketno })->as_list;
is (scalar @reopen_logs, 1, 'Basket reopen is logged');
Koha::ActionLogs->delete;
@ -924,17 +924,17 @@ subtest 'Acquisition logging' => sub {
basketno => $basketno,
booksellerid => $booksellerid
});
my @mod_logs = Koha::ActionLogs->search({ module =>'ACQUISITIONS', action => 'MODIFY_BASKET', object => $basketno });
my @mod_logs = Koha::ActionLogs->search({ module =>'ACQUISITIONS', action => 'MODIFY_BASKET', object => $basketno })->as_list;
is (scalar @mod_logs, 1, 'Basket modify is logged');
Koha::ActionLogs->delete;
C4::Acquisition::ModBasketHeader($basketno,"Test","","","",$booksellerid);
my @mod_header_logs = Koha::ActionLogs->search({ module =>'ACQUISITIONS', action => 'MODIFY_BASKET_HEADER', object => $basketno });
my @mod_header_logs = Koha::ActionLogs->search({ module =>'ACQUISITIONS', action => 'MODIFY_BASKET_HEADER', object => $basketno })->as_list;
is (scalar @mod_header_logs, 1, 'Basket header modify is logged');
Koha::ActionLogs->delete;
C4::Acquisition::ModBasketUsers($basketno,(1));
my @mod_users_logs = Koha::ActionLogs->search({ module =>'ACQUISITIONS', action => 'MODIFY_BASKET_USERS', object => $basketno });
my @mod_users_logs = Koha::ActionLogs->search({ module =>'ACQUISITIONS', action => 'MODIFY_BASKET_USERS', object => $basketno })->as_list;
is (scalar @mod_users_logs, 1, 'Basket users modify is logged');
t::lib::Mocks::mock_preference('AcquisitionLog', 0);

2
t/db_dependent/Koha/Acquisition/Basket.t
View File

@ -425,7 +425,7 @@ subtest 'close() tests' => sub {
'Koha::Exceptions::Acquisition::Basket::AlreadyClosed',
'Trying to close an already closed basket throws an exception';
my @close_logs = Koha::ActionLogs->search({ module =>'ACQUISITIONS', action => 'CLOSE_BASKET', object => $basket->id });
my @close_logs = Koha::ActionLogs->search({ module =>'ACQUISITIONS', action => 'CLOSE_BASKET', object => $basket->id })->as_list;
is (scalar @close_logs, 1, 'Basket closure is logged');
$schema->storage->txn_rollback;

2
t/db_dependent/Patron/HouseboundProfiles.t
View File

@ -41,7 +41,7 @@ is(
);
my @profiles = Koha::Patron::HouseboundProfiles
->search({ day => $profile->{day} });
->search({ day => $profile->{day} })->as_list;
my $found_profile = shift @profiles;
is(
$found_profile->borrowernumber,

2
t/db_dependent/Patron/HouseboundRoles.t
View File

@ -42,7 +42,7 @@ is(
);
my @roles = Koha::Patron::HouseboundRoles
->search({ borrowernumber_id => $role->{borrowernumber_id} });
->search({ borrowernumber_id => $role->{borrowernumber_id} })->as_list;
my $found_role = shift @roles;
is(
$found_role->borrowernumber_id,

6
t/db_dependent/Patron/HouseboundVisits.t
View File

@ -45,7 +45,7 @@ is(
# Does it work implicitly?
my @visits = Koha::Patron::HouseboundVisits
->special_search({ borrowernumber => $visit->{borrowernumber} });
->special_search({ borrowernumber => $visit->{borrowernumber} })->as_list;
my $found_visit = shift @visits;
is(
$found_visit->borrowernumber,
@ -55,7 +55,7 @@ is(
# Does it work Explicitly?
@visits = Koha::Patron::HouseboundVisits
->special_search({ 'me.borrowernumber' => $visit->{borrowernumber} });
->special_search({ 'me.borrowernumber' => $visit->{borrowernumber} })->as_list;
$found_visit = shift @visits;
is(
$found_visit->borrowernumber,
@ -65,7 +65,7 @@ is(
# Does it work without prefetcing?
@visits = Koha::Patron::HouseboundVisits
->special_search({ borrowernumber => $visit->{borrowernumber} }, { prefetch => [] });
->special_search({ borrowernumber => $visit->{borrowernumber} }, { prefetch => [] })->as_list;
$found_visit = shift @visits;
is(
$found_visit->borrowernumber,

15
t/db_dependent/Patron/Relationships.t
View File

@ -17,7 +17,7 @@
use Modern::Perl;
use Test::More tests => 59;
use Test::More tests => 54;
use C4::Context;
@ -90,7 +90,7 @@ Koha::Patron::Relationship->new({ guarantor_id => $chelsea->id, guarantee_id =>
my @gr;
@gr = $kyle->guarantee_relationships();
@gr = $kyle->guarantee_relationships()->as_list;
is( @gr, 2, 'Found 2 guarantee relationships for father' );
is( $gr[0]->guarantor_id, $kyle->id, 'Guarantor matches for first relationship' );
is( $gr[0]->guarantee_id, $daria->id, 'Guarantee matches for first relationship' );
@ -108,7 +108,7 @@ is( $gr[1]->guarantee->id, $kylie->id, 'Koha::Patron returned is the correct gua
is( ref($gr[1]->guarantor), 'Koha::Patron', 'Method guarantor returns a Koha::Patron' );
is( $gr[1]->guarantor->id, $kyle->id, 'Koha::Patron returned is the correct guarantor' );
@gr = $chelsea->guarantee_relationships();
@gr = $chelsea->guarantee_relationships()->as_list;
is( @gr, 2, 'Found 2 guarantee relationships for mother' );
is( $gr[0]->guarantor_id, $chelsea->id, 'Guarantor matches for first relationship' );
is( $gr[0]->guarantee_id, $daria->id, 'Guarantee matches for first relationship' );
@ -126,7 +126,7 @@ is( $gr[1]->guarantee->id, $kylie->id, 'Koha::Patron returned is the correct gua
is( ref($gr[1]->guarantor), 'Koha::Patron', 'Method guarantor returns a Koha::Patron' );
is( $gr[1]->guarantor->id, $chelsea->id, 'Koha::Patron returned is the correct guarantor' );
@gr = $daria->guarantor_relationships();
@gr = $daria->guarantor_relationships()->as_list;
is( @gr, 2, 'Found 4 guarantor relationships for child' );
is( $gr[0]->guarantor_id, $kyle->id, 'Guarantor matches for first relationship' );
is( $gr[0]->guarantee_id, $daria->id, 'Guarantee matches for first relationship' );
@ -144,13 +144,6 @@ is( $gr[1]->guarantee->id, $daria->id, 'Koha::Patron returned is the correct gua
is( ref($gr[1]->guarantor), 'Koha::Patron', 'Method guarantor returns a Koha::Patron' );
is( $gr[1]->guarantor->id, $chelsea->id, 'Koha::Patron returned is the correct guarantor' );
my @siblings = $daria->siblings;
is( @siblings, 1, 'Method siblings called in list context returns list' );
is( ref($siblings[0]), 'Koha::Patron', 'List contains a Koha::Patron' );
is( $siblings[0]->firstname, 'Kylie', 'Sibling from list first name matches correctly' );
is( $siblings[0]->surname, 'Hall', 'Sibling from list surname matches correctly' );
is( $siblings[0]->id, $kylie->id, 'Sibling from list patron id matches correctly' );
my $siblings = $daria->siblings;
my $sibling = $siblings->next();
is( ref($siblings), 'Koha::Patrons', 'Calling siblings in scalar context results in a Koha::Patrons object' );

4
t/db_dependent/Template/Plugin/Categories.t
View File

@ -36,11 +36,11 @@ my $nb_categories = Koha::Patron::Categories->count;
# Create sample categories
my $category_1 = $builder->build( { source => 'Category' } );
my @categories = Koha::Template::Plugin::Categories->new->all;
my @categories = Koha::Template::Plugin::Categories->new->all->as_list;
is( scalar(@categories), 1 + $nb_categories, '->all returns all defined categories' );
my $category_2 = $builder->build( { source => 'Category' } );
@categories = Koha::Template::Plugin::Categories->new->all;
@categories = Koha::Template::Plugin::Categories->new->all->as_list;
is( scalar(@categories), 2 + $nb_categories, '->all returns all defined categories' );
is( Koha::Template::Plugin::Categories->GetName(

2
t/db_dependent/Utils/Datatables_Virtualshelves.t
View File

@ -38,7 +38,7 @@ my $dbh = C4::Context->dbh;
$dbh->do(q|DELETE FROM virtualshelves|);
# Pick a categorycode from the DB
my @categories = Koha::Patron::Categories->search_with_library_limits;
my @categories = Koha::Patron::Categories->search_with_library_limits->as_list;
my $categorycode = $categories[0]->categorycode;
my $branchcode = "ABC";
my $branch_data = {