Nick Clemens
ad1d734e54
AddPatronsToList already took a borrowernumber parameter, however, it
did not check if those were valid numbers. This patch expands the search
to apply to cardnumber or borrowernumbers in the subroutine.
Template and script are adjusted to allow choosing borrowernumbers or cardnumbers
To test:
1 - Apply patch
2 - Browse to Tools->Patron lists
3 - Create a list, or choose Actions->Add patrons for an existing list
4 - Click 'Add multiple patrons'
5 - Cardnumbers is preselected
6 - Enter a list of cardnumbers, ensure you test:
Cardnumber already in list
Cardnumber not in list
Non-existent cardnumber
7 - Patrons should be added/errors reported correctly
8 - Repeat with borowernumbers
Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
120 lines
3.9 KiB
Perl
Executable file
120 lines
3.9 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use Modern::Perl;
|
|
|
|
use Test::More tests => 11;
|
|
use t::lib::TestBuilder;
|
|
use t::lib::Mocks;
|
|
|
|
use Koha::Database;
|
|
use Koha::List::Patron
|
|
qw( AddPatronList AddPatronsToList DelPatronList DelPatronsFromList GetPatronLists ModPatronList );
|
|
|
|
my $schema = Koha::Database->schema;
|
|
$schema->storage->txn_begin;
|
|
|
|
my $builder = t::lib::TestBuilder->new;
|
|
|
|
t::lib::Mocks::mock_userenv();
|
|
|
|
# Create 10 sample borrowers
|
|
my @borrowers = ();
|
|
foreach (1..10) {
|
|
push @borrowers, $builder->build({ source => 'Borrower' });
|
|
}
|
|
|
|
my $owner = $borrowers[0]->{borrowernumber};
|
|
my $owner2 = $borrowers[1]->{borrowernumber};
|
|
|
|
my @lists = GetPatronLists( { owner => $owner } );
|
|
my $list_count_original = @lists;
|
|
|
|
my $list1 = AddPatronList( { name => 'Test List 1', owner => $owner } );
|
|
is( $list1->name(), 'Test List 1', 'AddPatronList works' );
|
|
|
|
my $list2 = AddPatronList( { name => 'Test List 2', owner => $owner } );
|
|
|
|
ModPatronList(
|
|
{
|
|
patron_list_id => $list2->patron_list_id(),
|
|
name => 'Test List 3',
|
|
owner => $owner
|
|
}
|
|
);
|
|
$list2->discard_changes();
|
|
is( $list2->name(), 'Test List 3', 'ModPatronList works' );
|
|
|
|
AddPatronsToList(
|
|
{ list => $list1, cardnumbers => [ map { $_->{cardnumber} } @borrowers ] }
|
|
);
|
|
is(
|
|
scalar @borrowers,
|
|
$list1->patron_list_patrons()->search_related('borrowernumber')->all(),
|
|
'AddPatronsToList works for cardnumbers'
|
|
);
|
|
|
|
AddPatronsToList(
|
|
{
|
|
list => $list2,
|
|
borrowernumbers => [ map { $_->{borrowernumber} } @borrowers ]
|
|
}
|
|
);
|
|
is(
|
|
scalar @borrowers,
|
|
$list2->patron_list_patrons()->search_related('borrowernumber')->all(),
|
|
'AddPatronsToList works for borrowernumbers'
|
|
);
|
|
|
|
my $deleted_patron = $builder->build_object({ class => 'Koha::Patrons' });
|
|
$deleted_patron->delete;
|
|
my @result = AddPatronsToList({list => $list2,borrowernumbers => [ $deleted_patron->borrowernumber ]});
|
|
is( scalar @result, 0,'Invalid borrowernumber not added');
|
|
@result = AddPatronsToList({list => $list2,cardnumbers => [ $deleted_patron->cardnumber ]});
|
|
is( scalar @result, 0,'Invalid cardnumber not added');
|
|
|
|
my @ids =
|
|
$list1->patron_list_patrons()->get_column('patron_list_patron_id')->all();
|
|
DelPatronsFromList(
|
|
{
|
|
list => $list1,
|
|
patron_list_patrons => \@ids,
|
|
}
|
|
);
|
|
$list1->discard_changes();
|
|
is( $list1->patron_list_patrons()->count(), 0, 'DelPatronsFromList works.' );
|
|
|
|
@lists = GetPatronLists( { owner => $owner } );
|
|
is( scalar @lists, $list_count_original + 2, 'GetPatronLists works' );
|
|
|
|
my $list3 = AddPatronList( { name => 'Test List 3', owner => $owner2, shared => 0 } );
|
|
@lists = GetPatronLists( { owner => $owner } );
|
|
is( scalar @lists, $list_count_original + 2, 'GetPatronLists does not return non-shared list' );
|
|
|
|
my $list4 = AddPatronList( { name => 'Test List 4', owner => $owner2, shared => 1 } );
|
|
@lists = GetPatronLists( { owner => $owner } );
|
|
is( scalar @lists, $list_count_original + 3, 'GetPatronLists does return shared list' );
|
|
|
|
DelPatronList( { patron_list_id => $list1->patron_list_id(), owner => $owner } );
|
|
DelPatronList( { patron_list_id => $list2->patron_list_id(), owner => $owner } );
|
|
|
|
@lists =
|
|
GetPatronLists( { patron_list_id => $list1->patron_list_id(), owner => $owner } );
|
|
is( scalar @lists, 0, 'DelPatronList works' );
|
|
|
|
$schema->storage->txn_rollback;
|
|
|