use Modern::Perl;
-use Test::More tests => 58;
+use Test::More tests => 62;
use Test::MockModule;
use Test::Warn;
use Koha::Caches;
use Koha::DateUtils;
use Koha::Holds;
+use Koha::Items;
use Koha::Libraries;
use Koha::Notice::Templates;
use Koha::Patrons;
use Koha::Patron::Categories;
+use Koha::CirculationRules;
BEGIN {
require_ok('C4::Reserves');
my $schema = $database->schema();
$schema->storage->txn_begin();
my $dbh = C4::Context->dbh;
+$dbh->do('DELETE FROM circulation_rules');
my $builder = t::lib::TestBuilder->new;
t::lib::Mocks::mock_userenv({ branchcode => $branch_1 });
-# Create a helper biblio
-my $bib = MARC::Record->new();
-my $title = 'Silence in the library';
-if( C4::Context->preference('marcflavour') eq 'UNIMARC' ) {
- $bib->append_fields(
- MARC::Field->new('600', '', '1', a => 'Moffat, Steven'),
- MARC::Field->new('200', '', '', a => $title),
- );
-}
-else {
- $bib->append_fields(
- MARC::Field->new('100', '', '', a => 'Moffat, Steven'),
- MARC::Field->new('245', '', '', a => $title),
- );
-}
-my ( $bibnum ) = AddBiblio($bib, $frameworkcode);
+my $bibnum = $builder->build_sample_biblio({frameworkcode => $frameworkcode})->biblionumber;
# Create a helper item instance for testing
-my ( $item_bibnum, $item_bibitemnum, $itemnumber ) = AddItem(
- { homebranch => $branch_1,
- holdingbranch => $branch_1,
- itype => $itemtype
- },
- $bibnum
-);
+my $item = $builder->build_sample_item({ biblionumber => $bibnum, library => $branch_1, itype => $itemtype });
+
+my $biblio_with_no_item = $builder->build({
+ source => 'Biblio'
+});
# Modify item; setting barcode.
my $testbarcode = '97531';
-ModItem({ barcode => $testbarcode }, $bibnum, $itemnumber);
+$item->barcode($testbarcode)->store; # FIXME We should not hardcode a barcode! Also, what's the purpose of this?
# Create a borrower
my %data = (
);
Koha::Patron::Categories->find($category_1)->set({ enrolmentfee => 0})->store;
my $borrowernumber = Koha::Patron->new(\%data)->store->borrowernumber;
-my $borrower = Koha::Patrons->find( $borrowernumber )->unblessed;
+my $patron = Koha::Patrons->find( $borrowernumber );
+my $borrower = $patron->unblessed;
my $biblionumber = $bibnum;
my $barcode = $testbarcode;
-my $bibitems = '';
-my $priority = '1';
-my $resdate = undef;
-my $expdate = undef;
-my $notes = '';
-my $checkitem = undef;
-my $found = undef;
-
my $branchcode = Koha::Libraries->search->next->branchcode;
-AddReserve($branchcode, $borrowernumber, $biblionumber,
- $bibitems, $priority, $resdate, $expdate, $notes,
- $title, $checkitem, $found);
+AddReserve(
+ {
+ branchcode => $branchcode,
+ borrowernumber => $borrowernumber,
+ biblionumber => $biblionumber,
+ priority => 1,
+ }
+);
-my ($status, $reserve, $all_reserves) = CheckReserves($itemnumber, $barcode);
+my ($status, $reserve, $all_reserves) = CheckReserves($item->itemnumber, $barcode);
is($status, "Reserved", "CheckReserves Test 1");
ok(exists($reserve->{reserve_id}), 'CheckReserves() include reserve_id in its response');
-($status, $reserve, $all_reserves) = CheckReserves($itemnumber);
+($status, $reserve, $all_reserves) = CheckReserves($item->itemnumber);
is($status, "Reserved", "CheckReserves Test 2");
($status, $reserve, $all_reserves) = CheckReserves(undef, $barcode);
# to request its items, while $branch_2 will allow its items
# to fill holds from anywhere.
-$dbh->do('DELETE FROM issuingrules');
-$dbh->do('DELETE FROM branch_item_rules');
-$dbh->do('DELETE FROM branch_borrower_circ_rules');
-$dbh->do('DELETE FROM default_borrower_circ_rules');
-$dbh->do('DELETE FROM default_branch_item_rules');
-$dbh->do('DELETE FROM default_branch_circ_rules');
-$dbh->do('DELETE FROM default_circ_rules');
-$dbh->do(
- q{INSERT INTO issuingrules (categorycode, branchcode, itemtype, reservesallowed)
- VALUES (?, ?, ?, ?)},
- {},
- '*', '*', '*', 25
+$dbh->do('DELETE FROM circulation_rules');
+Koha::CirculationRules->set_rules(
+ {
+ branchcode => undef,
+ categorycode => undef,
+ itemtype => undef,
+ rules => {
+ reservesallowed => 25,
+ holds_per_record => 1,
+ }
+ }
);
# CPL allows only its own patrons to request its items
-$dbh->do(
- q{INSERT INTO default_branch_circ_rules (branchcode, maxissueqty, holdallowed, returnbranch)
- VALUES (?, ?, ?, ?)},
- {},
- $branch_1, 10, 1, 'homebranch',
+Koha::CirculationRules->set_rules(
+ {
+ branchcode => $branch_1,
+ itemtype => undef,
+ rules => {
+ holdallowed => 1,
+ returnbranch => 'homebranch',
+ }
+ }
);
# ... while FPL allows anybody to request its items
-$dbh->do(
- q{INSERT INTO default_branch_circ_rules (branchcode, maxissueqty, holdallowed, returnbranch)
- VALUES (?, ?, ?, ?)},
- {},
- $branch_2, 10, 2, 'homebranch',
+Koha::CirculationRules->set_rules(
+ {
+ branchcode => $branch_2,
+ itemtype => undef,
+ rules => {
+ holdallowed => 2,
+ returnbranch => 'homebranch',
+ }
+ }
);
-# helper biblio for the bug 10272 regression test
-my $bib2 = MARC::Record->new();
-$bib2->append_fields(
- MARC::Field->new('100', ' ', ' ', a => 'Moffat, Steven'),
- MARC::Field->new('245', ' ', ' ', a => $title),
-);
+my $bibnum2 = $builder->build_sample_biblio({frameworkcode => $frameworkcode})->biblionumber;
-# create one item belonging to FPL and one belonging to CPL
-my ( $bibnum2 ) = AddBiblio($bib, $frameworkcode);
my ($itemnum_cpl, $itemnum_fpl);
-( undef, undef, $itemnum_cpl ) = AddItem(
- { homebranch => $branch_1,
- holdingbranch => $branch_1,
- barcode => 'bug10272_CPL',
- itype => $itemtype
- },
- $bibnum2
-);
-( undef, undef, $itemnum_fpl ) = AddItem(
- { homebranch => $branch_2,
- holdingbranch => $branch_2,
- barcode => 'bug10272_FPL',
- itype => $itemtype
- },
- $bibnum2
-);
-
+$itemnum_cpl = $builder->build_sample_item(
+ {
+ biblionumber => $bibnum2,
+ library => $branch_1,
+ barcode => 'bug10272_CPL',
+ itype => $itemtype
+ }
+)->itemnumber;
+$itemnum_fpl = $builder->build_sample_item(
+ {
+ biblionumber => $bibnum2,
+ library => $branch_2,
+ barcode => 'bug10272_FPL',
+ itype => $itemtype
+ }
+)->itemnumber;
# Ensure that priorities are numbered correcly when a hold is moved to waiting
# (bug 11947)
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum2));
-AddReserve($branch_3, $requesters{$branch_3}, $bibnum2,
- $bibitems, 1, $resdate, $expdate, $notes,
- $title, $checkitem, $found);
-AddReserve($branch_2, $requesters{$branch_2}, $bibnum2,
- $bibitems, 2, $resdate, $expdate, $notes,
- $title, $checkitem, $found);
-AddReserve($branch_1, $requesters{$branch_1}, $bibnum2,
- $bibitems, 3, $resdate, $expdate, $notes,
- $title, $checkitem, $found);
+AddReserve(
+ {
+ branchcode => $branch_3,
+ borrowernumber => $requesters{$branch_3},
+ biblionumber => $bibnum2,
+ priority => 1,
+ }
+);
+AddReserve(
+ {
+ branchcode => $branch_2,
+ borrowernumber => $requesters{$branch_2},
+ biblionumber => $bibnum2,
+ priority => 2,
+ }
+);
+AddReserve(
+ {
+ branchcode => $branch_1,
+ borrowernumber => $requesters{$branch_1},
+ biblionumber => $bibnum2,
+ priority => 3,
+ }
+);
ModReserveAffect($itemnum_cpl, $requesters{$branch_3}, 0);
# Now it should have different priorities.
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum2));
-AddReserve($branch_3, $requesters{$branch_3}, $bibnum2,
- $bibitems, 1, $resdate, $expdate, $notes,
- $title, $checkitem, $found);
-AddReserve($branch_2, $requesters{$branch_2}, $bibnum2,
- $bibitems, 2, $resdate, $expdate, $notes,
- $title, $checkitem, $found);
-AddReserve($branch_1, $requesters{$branch_1}, $bibnum2,
- $bibitems, 3, $resdate, $expdate, $notes,
- $title, $checkitem, $found);
+AddReserve(
+ {
+ branchcode => $branch_3,
+ borrowernumber => $requesters{$branch_3},
+ biblionumber => $bibnum2,
+ priority => 1,
+ }
+);
+AddReserve(
+ {
+ branchcode => $branch_2,
+ borrowernumber => $requesters{$branch_2},
+ biblionumber => $bibnum2,
+ priority => 2,
+ }
+);
+
+AddReserve(
+ {
+ branchcode => $branch_1,
+ borrowernumber => $requesters{$branch_1},
+ biblionumber => $bibnum2,
+ priority => 3,
+ }
+);
# Ensure that the item's home library controls hold policy lookup
t::lib::Mocks::mock_preference( 'ReservesControlBranch', 'ItemHomeLibrary' );
# Tests for bug 9761 (ConfirmFutureHolds): new CheckReserves lookahead parameter, and corresponding change in AddReturn
# Note that CheckReserve uses its lookahead parameter and does not check ConfirmFutureHolds pref (it should be passed if needed like AddReturn does)
# Test 9761a: Add a reserve without date, CheckReserve should return it
-$resdate= undef; #defaults to today in AddReserve
-$expdate= undef; #no expdate
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum));
-AddReserve($branch_1, $requesters{$branch_1}, $bibnum,
- $bibitems, 1, $resdate, $expdate, $notes,
- $title, $checkitem, $found);
-($status)=CheckReserves($itemnumber,undef,undef);
+AddReserve(
+ {
+ branchcode => $branch_1,
+ borrowernumber => $requesters{$branch_1},
+ biblionumber => $bibnum,
+ priority => 1,
+ }
+);
+($status)=CheckReserves($item->itemnumber,undef,undef);
is( $status, 'Reserved', 'CheckReserves returns reserve without lookahead');
-($status)=CheckReserves($itemnumber,undef,7);
+($status)=CheckReserves($item->itemnumber,undef,7);
is( $status, 'Reserved', 'CheckReserves also returns reserve with lookahead');
# Test 9761b: Add a reserve with future date, CheckReserve should not return it
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum));
t::lib::Mocks::mock_preference('AllowHoldDateInFuture', 1);
-$resdate= dt_from_string();
+my $resdate= dt_from_string();
$resdate->add_duration(DateTime::Duration->new(days => 4));
$resdate=output_pref($resdate);
-$expdate= undef; #no expdate
-AddReserve($branch_1, $requesters{$branch_1}, $bibnum,
- $bibitems, 1, $resdate, $expdate, $notes,
- $title, $checkitem, $found);
-($status)=CheckReserves($itemnumber,undef,undef);
+AddReserve(
+ {
+ branchcode => $branch_1,
+ borrowernumber => $requesters{$branch_1},
+ biblionumber => $bibnum,
+ priority => 1,
+ reservation_date => $resdate,
+ }
+);
+($status)=CheckReserves($item->itemnumber,undef,undef);
is( $status, '', 'CheckReserves returns no future reserve without lookahead');
# Test 9761c: Add a reserve with future date, CheckReserve should return it if lookahead is high enough
-($status)=CheckReserves($itemnumber,undef,3);
+($status)=CheckReserves($item->itemnumber,undef,3);
is( $status, '', 'CheckReserves returns no future reserve with insufficient lookahead');
-($status)=CheckReserves($itemnumber,undef,4);
+($status)=CheckReserves($item->itemnumber,undef,4);
is( $status, 'Reserved', 'CheckReserves returns future reserve with sufficient lookahead');
# Test 9761d: Check ResFound message of AddReturn for future hold
# test marking a hold as captured
my $hold_notice_count = count_hold_print_messages();
-ModReserveAffect($itemnumber, $requesters{$branch_1}, 0);
+ModReserveAffect($item->itemnumber, $requesters{$branch_1}, 0);
my $new_count = count_hold_print_messages();
is($new_count, $hold_notice_count + 1, 'patron notified when item set to waiting');
# test that duplicate notices aren't generated
-ModReserveAffect($itemnumber, $requesters{$branch_1}, 0);
+ModReserveAffect($item->itemnumber, $requesters{$branch_1}, 0);
$new_count = count_hold_print_messages();
is($new_count, $hold_notice_count + 1, 'patron not notified a second time (bug 11445)');
# avoiding the not_same_branch error
t::lib::Mocks::mock_preference('IndependentBranches', 0);
+$item = Koha::Items->find($item->itemnumber);
is(
- DelItemCheck( $bibnum, $itemnumber),
+ $item->safe_delete,
'book_reserved',
'item that is captured to fill a hold cannot be deleted',
);
$resdate= dt_from_string();
$resdate->add_duration(DateTime::Duration->new(days => 2));
$resdate=output_pref($resdate);
-AddReserve($branch_1, $requesters{$branch_1}, $bibnum,
- $bibitems, 1, $resdate, $expdate, $notes,
- $title, $checkitem, $found);
-my $item = Koha::Items->find( $itemnumber );
+AddReserve(
+ {
+ branchcode => $branch_1,
+ borrowernumber => $requesters{$branch_1},
+ biblionumber => $bibnum,
+ priority => 1,
+ reservation_date => $resdate,
+ }
+);
+
$holds = $item->current_holds;
my $dtf = Koha::Database->new->schema->storage->datetime_parser;
my $future_holds = $holds->search({ reservedate => { '>' => $dtf->format_date( dt_from_string ) } } );
is( $future_holds->count, 0, 'current_holds does not return a future next available hold');
# 9788b: current_holds does not return future item level hold
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum));
-AddReserve($branch_1, $requesters{$branch_1}, $bibnum,
- $bibitems, 1, $resdate, $expdate, $notes,
- $title, $itemnumber, $found); #item level hold
+AddReserve(
+ {
+ branchcode => $branch_1,
+ borrowernumber => $requesters{$branch_1},
+ biblionumber => $bibnum,
+ priority => 1,
+ reservation_date => $resdate,
+ itemnumber => $item->itemnumber,
+ }
+); #item level hold
$future_holds = $holds->search({ reservedate => { '>' => $dtf->format_date( dt_from_string ) } } );
is( $future_holds->count, 0, 'current_holds does not return a future item level hold' );
# 9788c: current_holds returns future wait (confirmed future hold)
-ModReserveAffect( $itemnumber, $requesters{$branch_1} , 0); #confirm hold
+ModReserveAffect( $item->itemnumber, $requesters{$branch_1} , 0); #confirm hold
$future_holds = $holds->search({ reservedate => { '>' => $dtf->format_date( dt_from_string ) } } );
is( $future_holds->count, 1, 'current_holds returns a future wait (confirmed future hold)' );
# End of tests for bug 9788
# Tests for CalculatePriority (bug 8918)
my $p = C4::Reserves::CalculatePriority($bibnum2);
is($p, 4, 'CalculatePriority should now return priority 4');
-$resdate=undef;
-AddReserve($branch_1, $requesters{'CPL2'}, $bibnum2,
- $bibitems, $p, $resdate, $expdate, $notes,
- $title, $checkitem, $found);
+AddReserve(
+ {
+ branchcode => $branch_1,
+ borrowernumber => $requesters{'CPL2'},
+ biblionumber => $bibnum2,
+ priority => $p,
+ }
+);
$p = C4::Reserves::CalculatePriority($bibnum2);
is($p, 5, 'CalculatePriority should now return priority 5');
#some tests on bibnum
$p = C4::Reserves::CalculatePriority($bibnum);
is($p, 1, 'CalculatePriority should now return priority 1');
#add a new reserve and confirm it to waiting
-AddReserve($branch_1, $requesters{$branch_1}, $bibnum,
- $bibitems, $p, $resdate, $expdate, $notes,
- $title, $itemnumber, $found);
+AddReserve(
+ {
+ branchcode => $branch_1,
+ borrowernumber => $requesters{$branch_1},
+ biblionumber => $bibnum,
+ priority => $p,
+ itemnumber => $item->itemnumber,
+ }
+);
$p = C4::Reserves::CalculatePriority($bibnum);
is($p, 2, 'CalculatePriority should now return priority 2');
-ModReserveAffect( $itemnumber, $requesters{$branch_1} , 0);
+ModReserveAffect( $item->itemnumber, $requesters{$branch_1} , 0);
$p = C4::Reserves::CalculatePriority($bibnum);
is($p, 1, 'CalculatePriority should now return priority 1');
#add another biblio hold, no resdate
-AddReserve($branch_1, $requesters{'CPL2'}, $bibnum,
- $bibitems, $p, $resdate, $expdate, $notes,
- $title, $checkitem, $found);
+AddReserve(
+ {
+ branchcode => $branch_1,
+ borrowernumber => $requesters{'CPL2'},
+ biblionumber => $bibnum,
+ priority => $p,
+ }
+);
$p = C4::Reserves::CalculatePriority($bibnum);
is($p, 2, 'CalculatePriority should now return priority 2');
#add another future hold
t::lib::Mocks::mock_preference('AllowHoldDateInFuture', 1);
$resdate= dt_from_string();
$resdate->add_duration(DateTime::Duration->new(days => 1));
-AddReserve($branch_1, $requesters{'CPL3'}, $bibnum,
- $bibitems, $p, output_pref($resdate), $expdate, $notes,
- $title, $checkitem, $found);
+AddReserve(
+ {
+ branchcode => $branch_1,
+ borrowernumber => $requesters{'CPL2'},
+ biblionumber => $bibnum,
+ priority => $p,
+ reservation_date => output_pref($resdate),
+ }
+);
$p = C4::Reserves::CalculatePriority($bibnum);
is($p, 2, 'CalculatePriority should now still return priority 2');
#calc priority with future resdate
# Tests for cancel reserves by users from OPAC.
$dbh->do('DELETE FROM reserves', undef, ($bibnum));
-AddReserve($branch_1, $requesters{$branch_1}, $item_bibnum,
- $bibitems, 1, undef, $expdate, $notes,
- $title, $checkitem, '');
-my (undef, $canres, undef) = CheckReserves($itemnumber);
+AddReserve(
+ {
+ branchcode => $branch_1,
+ borrowernumber => $requesters{$branch_1},
+ biblionumber => $bibnum,
+ priority => 1,
+ }
+);
+my (undef, $canres, undef) = CheckReserves($item->itemnumber);
is( CanReserveBeCanceledFromOpac(), undef,
'CanReserveBeCanceledFromOpac should return undef if called without any parameter'
$cancancel = CanReserveBeCanceledFromOpac($canres->{reserve_id}, $requesters{$branch_2});
is($cancancel, 0, 'Other user cant cancel reserve');
-ModReserveAffect($itemnumber, $requesters{$branch_1}, 1);
+ModReserveAffect($item->itemnumber, $requesters{$branch_1}, 1);
$cancancel = CanReserveBeCanceledFromOpac($canres->{reserve_id}, $requesters{$branch_1});
is($cancancel, 0, 'Reserve in transfer status cant be canceled');
$dbh->do('DELETE FROM reserves', undef, ($bibnum));
-AddReserve($branch_1, $requesters{$branch_1}, $item_bibnum,
- $bibitems, 1, undef, $expdate, $notes,
- $title, $checkitem, '');
-(undef, $canres, undef) = CheckReserves($itemnumber);
+AddReserve(
+ {
+ branchcode => $branch_1,
+ borrowernumber => $requesters{$branch_1},
+ biblionumber => $bibnum,
+ priority => 1,
+ }
+);
+(undef, $canres, undef) = CheckReserves($item->itemnumber);
-ModReserveAffect($itemnumber, $requesters{$branch_1}, 0);
+ModReserveAffect($item->itemnumber, $requesters{$branch_1}, 0);
$cancancel = CanReserveBeCanceledFromOpac($canres->{reserve_id}, $requesters{$branch_1});
is($cancancel, 0, 'Reserve in waiting status cant be canceled');
Koha::Patrons->find( $borrowernumber )->set({ dateofbirth => $borrower->{dateofbirth} })->store;
is( C4::Reserves::CanBookBeReserved($borrowernumber, $biblionumber)->{status} , 'OK', "Reserving a 'PEGI 16' Biblio by a 30 year old borrower succeeds");
+
+is( C4::Reserves::CanBookBeReserved($borrowernumber, $biblio_with_no_item->{biblionumber})->{status} , '', "Biblio with no item. Status is empty");
####
####### EO Bug 13113 <<<
####
-$item = GetItem($itemnumber);
-
-ok( C4::Reserves::IsAvailableForItemLevelRequest($item, $borrower), "Reserving a book on item level" );
+ok( C4::Reserves::IsAvailableForItemLevelRequest($item, $patron), "Reserving a book on item level" );
+
+my $pickup_branch = $builder->build({ source => 'Branch' })->{ branchcode };
+t::lib::Mocks::mock_preference( 'UseBranchTransferLimits', '1' );
+t::lib::Mocks::mock_preference( 'BranchTransferLimitsType', 'itemtype' );
+my $limit = Koha::Item::Transfer::Limit->new(
+ {
+ toBranch => $pickup_branch,
+ fromBranch => $item->holdingbranch,
+ itemtype => $item->effective_itemtype,
+ }
+)->store();
+is( C4::Reserves::IsAvailableForItemLevelRequest($item, $patron, $pickup_branch), 0, "Item level request not available due to transfer limit" );
+t::lib::Mocks::mock_preference( 'UseBranchTransferLimits', '0' );
+
+my $categorycode = $borrower->{categorycode};
+my $holdingbranch = $item->{holdingbranch};
+Koha::CirculationRules->set_rules(
+ {
+ categorycode => $categorycode,
+ itemtype => $item->effective_itemtype,
+ branchcode => $holdingbranch,
+ rules => {
+ onshelfholds => 1,
+ }
+ }
+);
# tests for MoveReserve in relation to ConfirmFutureHolds (BZ 14526)
# hold from A pos 1, today, no fut holds: MoveReserve should fill it
$dbh->do('DELETE FROM reserves', undef, ($bibnum));
t::lib::Mocks::mock_preference('ConfirmFutureHolds', 0);
t::lib::Mocks::mock_preference('AllowHoldDateInFuture', 1);
-AddReserve($branch_1, $borrowernumber, $item_bibnum,
- $bibitems, 1, undef, $expdate, $notes, $title, $checkitem, '');
-MoveReserve( $itemnumber, $borrowernumber );
-($status)=CheckReserves( $itemnumber );
+AddReserve(
+ {
+ branchcode => $branch_1,
+ borrowernumber => $borrowernumber,
+ biblionumber => $bibnum,
+ priority => 1,
+ }
+);
+MoveReserve( $item->itemnumber, $borrowernumber );
+($status)=CheckReserves( $item->itemnumber );
is( $status, '', 'MoveReserve filled hold');
# hold from A waiting, today, no fut holds: MoveReserve should fill it
-AddReserve($branch_1, $borrowernumber, $item_bibnum,
- $bibitems, 1, undef, $expdate, $notes, $title, $checkitem, 'W');
-MoveReserve( $itemnumber, $borrowernumber );
-($status)=CheckReserves( $itemnumber );
+AddReserve(
+ {
+ branchcode => $branch_1,
+ borrowernumber => $borrowernumber,
+ biblionumber => $bibnum,
+ priority => 1,
+ found => 'W',
+ }
+);
+MoveReserve( $item->itemnumber, $borrowernumber );
+($status)=CheckReserves( $item->itemnumber );
is( $status, '', 'MoveReserve filled waiting hold');
# hold from A pos 1, tomorrow, no fut holds: not filled
$resdate= dt_from_string();
$resdate->add_duration(DateTime::Duration->new(days => 1));
$resdate=output_pref($resdate);
-AddReserve($branch_1, $borrowernumber, $item_bibnum,
- $bibitems, 1, $resdate, $expdate, $notes, $title, $checkitem, '');
-MoveReserve( $itemnumber, $borrowernumber );
-($status)=CheckReserves( $itemnumber, undef, 1 );
+AddReserve(
+ {
+ branchcode => $branch_1,
+ borrowernumber => $borrowernumber,
+ biblionumber => $bibnum,
+ priority => 1,
+ reservation_date => $resdate,
+ }
+);
+MoveReserve( $item->itemnumber, $borrowernumber );
+($status)=CheckReserves( $item->itemnumber, undef, 1 );
is( $status, 'Reserved', 'MoveReserve did not fill future hold');
$dbh->do('DELETE FROM reserves', undef, ($bibnum));
# hold from A pos 1, tomorrow, fut holds=2: MoveReserve should fill it
t::lib::Mocks::mock_preference('ConfirmFutureHolds', 2);
-AddReserve($branch_1, $borrowernumber, $item_bibnum,
- $bibitems, 1, $resdate, $expdate, $notes, $title, $checkitem, '');
-MoveReserve( $itemnumber, $borrowernumber );
-($status)=CheckReserves( $itemnumber, undef, 2 );
+AddReserve(
+ {
+ branchcode => $branch_1,
+ borrowernumber => $borrowernumber,
+ biblionumber => $bibnum,
+ priority => 1,
+ reservation_date => $resdate,
+ }
+);
+MoveReserve( $item->itemnumber, $borrowernumber );
+($status)=CheckReserves( $item->itemnumber, undef, 2 );
is( $status, '', 'MoveReserve filled future hold now');
# hold from A waiting, tomorrow, fut holds=2: MoveReserve should fill it
-AddReserve($branch_1, $borrowernumber, $item_bibnum,
- $bibitems, 1, $resdate, $expdate, $notes, $title, $checkitem, 'W');
-MoveReserve( $itemnumber, $borrowernumber );
-($status)=CheckReserves( $itemnumber, undef, 2 );
+AddReserve(
+ {
+ branchcode => $branch_1,
+ borrowernumber => $borrowernumber,
+ biblionumber => $bibnum,
+ priority => 1,
+ reservation_date => $resdate,
+ }
+);
+MoveReserve( $item->itemnumber, $borrowernumber );
+($status)=CheckReserves( $item->itemnumber, undef, 2 );
is( $status, '', 'MoveReserve filled future waiting hold now');
# hold from A pos 1, today+3, fut holds=2: MoveReserve should not fill it
$resdate= dt_from_string();
$resdate->add_duration(DateTime::Duration->new(days => 3));
$resdate=output_pref($resdate);
-AddReserve($branch_1, $borrowernumber, $item_bibnum,
- $bibitems, 1, $resdate, $expdate, $notes, $title, $checkitem, '');
-MoveReserve( $itemnumber, $borrowernumber );
-($status)=CheckReserves( $itemnumber, undef, 3 );
+AddReserve(
+ {
+ branchcode => $branch_1,
+ borrowernumber => $borrowernumber,
+ biblionumber => $bibnum,
+ priority => 1,
+ reservation_date => $resdate,
+ }
+);
+MoveReserve( $item->itemnumber, $borrowernumber );
+($status)=CheckReserves( $item->itemnumber, undef, 3 );
is( $status, 'Reserved', 'MoveReserve did not fill future hold of 3 days');
$dbh->do('DELETE FROM reserves', undef, ($bibnum));
})->{borrowernumber};
C4::Reserves::AddReserve(
- $item->{homebranch}, $hold_borrower,
- $item->{biblionumber} );
+ {
+ branchcode => $item->homebranch,
+ borrowernumber => $hold_borrower,
+ biblionumber => $item->biblionumber,
+ }
+ );
- ModReserveAffect($item->{itemnumber}, $hold_borrower, 0);
+ ModReserveAffect($item->itemnumber, $hold_borrower, 0);
my $sms_message_address = $schema->resultset('MessageQueue')->search({
letter_code => 'HOLD',
message_transport_type => 'sms',
};
subtest 'ReservesNeedReturns' => sub {
- plan tests => 4;
+ plan tests => 18;
- my $biblioitem = $builder->build_object( { class => 'Koha::Biblioitems' } );
my $library = $builder->build_object( { class => 'Koha::Libraries' } );
- my $itemtype = $builder->build_object( { class => 'Koha::ItemTypes', value => { rentalcharge => 0 } } );
my $item_info = {
- biblionumber => $biblioitem->biblionumber,
- biblioitemnumber => $biblioitem->biblioitemnumber,
homebranch => $library->branchcode,
holdingbranch => $library->branchcode,
- itype => $itemtype->itemtype,
};
- my $item = $builder->build_object( { class => 'Koha::Items', value => $item_info } );
+ my $item = $builder->build_sample_item($item_info);
my $patron = $builder->build_object(
{
class => 'Koha::Patrons',
value => { branchcode => $library->branchcode, }
}
);
+ my $patron_2 = $builder->build_object(
+ {
+ class => 'Koha::Patrons',
+ value => { branchcode => $library->branchcode, }
+ }
+ );
my $priority = 1;
- my ( $hold_id, $hold );
- t::lib::Mocks::mock_preference('ReservesNeedReturns', 0); # '0' means 'Automatically mark a hold as found and waiting'
- $hold_id = C4::Reserves::AddReserve(
- $library->branchcode, $patron->borrowernumber,
- $item->biblionumber, '',
- $priority, undef,
- undef, '',
- "title for fee", $item->itemnumber,
- );
- $hold = Koha::Holds->find($hold_id);
- is( $hold->priority, 0, 'If ReservesNeedReturns is 0, priority must have been set to 0' );
- is( $hold->found, 'W', 'If ReservesNeedReturns is 0, found must have been set waiting' );
-
- $hold->delete; # cleanup
-
- t::lib::Mocks::mock_preference('ReservesNeedReturns', 1); # '0' means "Don't automatically mark a hold as found and waiting"
- $hold_id = C4::Reserves::AddReserve(
- $library->branchcode, $patron->borrowernumber,
- $item->biblionumber, '',
- $priority, undef,
- undef, '',
- "title for fee", $item->itemnumber,
- );
- $hold = Koha::Holds->find($hold_id);
+ t::lib::Mocks::mock_preference('ReservesNeedReturns', 1); # Test with feature disabled
+ my $hold = place_item_hold( $patron, $item, $library, $priority );
is( $hold->priority, $priority, 'If ReservesNeedReturns is 1, priority must not have been set to changed' );
is( $hold->found, undef, 'If ReservesNeedReturns is 1, found must not have been set waiting' );
+ $hold->delete;
+
+ t::lib::Mocks::mock_preference('ReservesNeedReturns', 0); # '0' means 'Automatically mark a hold as found and waiting'
+ $hold = place_item_hold( $patron, $item, $library, $priority );
+ is( $hold->priority, 0, 'If ReservesNeedReturns is 0 and no other status, priority must have been set to 0' );
+ is( $hold->found, 'W', 'If ReservesNeedReturns is 0 and no other status, found must have been set waiting' );
+ $hold->delete;
+
+ $item->onloan('2010-01-01')->store;
+ $hold = place_item_hold( $patron, $item, $library, $priority );
+ is( $hold->priority, 1, 'If ReservesNeedReturns is 0 but item onloan priority must be set to 1' );
+ $hold->delete;
+
+ t::lib::Mocks::mock_preference('AllowHoldsOnDamagedItems', 0); # '0' means damaged holds not allowed
+ $item->onloan(undef)->damaged(1)->store;
+ $hold = place_item_hold( $patron, $item, $library, $priority );
+ is( $hold->priority, 1, 'If ReservesNeedReturns is 0 but item damaged and not allowed holds on damaged items priority must be set to 1' );
+ $hold->delete;
+ t::lib::Mocks::mock_preference('AllowHoldsOnDamagedItems', 1); # '0' means damaged holds not allowed
+ $hold = place_item_hold( $patron, $item, $library, $priority );
+ is( $hold->priority, 0, 'If ReservesNeedReturns is 0 and damaged holds allowed, priority must have been set to 0' );
+ is( $hold->found, 'W', 'If ReservesNeedReturns is 0 and damaged holds allowed, found must have been set waiting' );
+ $hold->delete;
+
+ my $hold_1 = place_item_hold( $patron, $item, $library, $priority );
+ is( $hold_1->found, 'W', 'First hold on item is set to waiting with ReservesNeedReturns set to 0' );
+ is( $hold_1->priority, 0, 'First hold on item is set to waiting with ReservesNeedReturns set to 0' );
+ $hold = place_item_hold( $patron_2, $item, $library, $priority );
+ is( $hold->priority, 1, 'If ReservesNeedReturns is 0 but item already on hold priority must be set to 1' );
+ $hold->delete;
+ $hold_1->delete;
+
+ my $transfer = $builder->build_object({
+ class => "Koha::Item::Transfers",
+ value => {
+ itemnumber => $item->itemnumber,
+ datearrived => undef,
+ }
+ });
+ $item->damaged(0)->store;
+ $hold = place_item_hold( $patron, $item, $library, $priority );
+ is( $hold->found, undef, 'If ReservesNeedReturns is 0 but item in transit the hold must not be set to waiting' );
+ is( $hold->priority, 1, 'If ReservesNeedReturns is 0 but item in transit the hold must not be set to waiting' );
+ $hold->delete;
+ $transfer->delete;
+
+ $hold = place_item_hold( $patron, $item, $library, $priority );
+ is( $hold->priority, 0, 'If ReservesNeedReturns is 0 and no other status, priority must have been set to 0' );
+ is( $hold->found, 'W', 'If ReservesNeedReturns is 0 and no other status, found must have been set waiting' );
+ $hold_1 = place_item_hold( $patron, $item, $library, $priority );
+ is( $hold_1->priority, 1, 'If ReservesNeedReturns is 0 but item has a hold priority is 1' );
+ $hold_1->suspend(1)->store; # We suspend the hold
+ $hold->delete; # Delete the waiting hold
+ $hold = place_item_hold( $patron, $item, $library, $priority );
+ is( $hold->priority, 0, 'If ReservesNeedReturns is 0 and other hold(s) suspended, priority must have been set to 0' );
+ is( $hold->found, 'W', 'If ReservesNeedReturns is 0 and other hold(s) suspended, found must have been set waiting' );
+
+
+
+
+ t::lib::Mocks::mock_preference('ReservesNeedReturns', 1); # Don't affect other tests
};
subtest 'ChargeReserveFee tests' => sub {
is( ref($line), 'Koha::Account::Line' , 'Returns a Koha::Account::Line object');
ok( $line->is_debit, 'Generates a debit line' );
- is( $line->accounttype, 'Res' , 'generates Res accounttype');
+ is( $line->debit_type_code, 'RESERVE' , 'generates RESERVE debit_type');
is( $line->borrowernumber, $patron->id , 'generated line belongs to the passed patron');
is( $line->amount, $fee , 'amount set correctly');
is( $line->amountoutstanding, $fee , 'amountoutstanding set correctly');
- is( $line->description, "Reserve Charge - $title" , 'Hardcoded description is generated');
+ is( $line->description, "$title" , 'description is title of reserved item');
is( $line->branchcode, $library->id , "Library id is picked from userenv and stored correctly" );
};
+subtest 'reserves.item_level_hold' => sub {
+ plan tests => 2;
+
+ my $item = $builder->build_sample_item;
+ my $patron = $builder->build_object(
+ {
+ class => 'Koha::Patrons',
+ value => { branchcode => $item->homebranch }
+ }
+ );
+
+ subtest 'item level hold' => sub {
+ plan tests => 2;
+ my $reserve_id = AddReserve(
+ {
+ branchcode => $item->homebranch,
+ borrowernumber => $patron->borrowernumber,
+ biblionumber => $item->biblionumber,
+ priority => 1,
+ itemnumber => $item->itemnumber,
+ }
+ );
+
+ my $hold = Koha::Holds->find($reserve_id);
+ is( $hold->item_level_hold, 1, 'item_level_hold should be set when AddReserve is called with a specific item' );
+
+ # Mark it waiting
+ ModReserveAffect( $item->itemnumber, $patron->borrowernumber, 1 );
+
+ # Revert the waiting status
+ C4::Reserves::RevertWaitingStatus(
+ { itemnumber => $item->itemnumber } );
+
+ $hold = Koha::Holds->find($reserve_id);
+
+ is( $hold->itemnumber, $item->itemnumber, 'Itemnumber should not be removed when the waiting status is revert' );
+
+ $hold->delete; # cleanup
+ };
+
+ subtest 'biblio level hold' => sub {
+ plan tests => 3;
+ my $reserve_id = AddReserve(
+ {
+ branchcode => $item->homebranch,
+ borrowernumber => $patron->borrowernumber,
+ biblionumber => $item->biblionumber,
+ priority => 1,
+ }
+ );
+
+ my $hold = Koha::Holds->find($reserve_id);
+ is( $hold->item_level_hold, 0, 'item_level_hold should not be set when AddReserve is called without a specific item' );
+
+ # Mark it waiting
+ ModReserveAffect( $item->itemnumber, $patron->borrowernumber, 1 );
+
+ $hold = Koha::Holds->find($reserve_id);
+ is( $hold->itemnumber, $item->itemnumber, 'Itemnumber should be set on hold confirmation' );
+
+ # Revert the waiting status
+ C4::Reserves::RevertWaitingStatus( { itemnumber => $item->itemnumber } );
+
+ $hold = Koha::Holds->find($reserve_id);
+ is( $hold->itemnumber, undef, 'Itemnumber should be removed when the waiting status is revert' );
+
+ $hold->delete;
+ };
+
+};
+
+subtest 'MoveReserve additional test' => sub {
+
+ plan tests => 4;
+
+ # Create the items and patrons we need
+ my $biblio = $builder->build_sample_biblio();
+ my $itype = $builder->build_object({ class => "Koha::ItemTypes", value => { notforloan => 0 } });
+ my $item_1 = $builder->build_sample_item({ biblionumber => $biblio->biblionumber,notforloan => 0, itype => $itype->itemtype });
+ my $item_2 = $builder->build_sample_item({ biblionumber => $biblio->biblionumber, notforloan => 0, itype => $itype->itemtype });
+ my $patron_1 = $builder->build_object({ class => "Koha::Patrons" });
+ my $patron_2 = $builder->build_object({ class => "Koha::Patrons" });
+
+ # Place a hold on the title for both patrons
+ my $reserve_1 = AddReserve(
+ {
+ branchcode => $item_1->homebranch,
+ borrowernumber => $patron_1->borrowernumber,
+ biblionumber => $biblio->biblionumber,
+ priority => 1,
+ itemnumber => $item_1->itemnumber,
+ }
+ );
+ my $reserve_2 = AddReserve(
+ {
+ branchcode => $item_2->homebranch,
+ borrowernumber => $patron_2->borrowernumber,
+ biblionumber => $biblio->biblionumber,
+ priority => 1,
+ itemnumber => $item_1->itemnumber,
+ }
+ );
+ is($patron_1->holds->next()->reserve_id, $reserve_1, "The 1st patron has a hold");
+ is($patron_2->holds->next()->reserve_id, $reserve_2, "The 2nd patron has a hold");
+
+ # Fake the holds queue
+ $dbh->do(q{INSERT INTO hold_fill_targets VALUES (?, ?, ?, ?, ?)},undef,($patron_1->borrowernumber,$biblio->biblionumber,$item_1->itemnumber,$item_1->homebranch,0));
+
+ # The 2nd hold should be filed even if the item is preselected for the first hold
+ MoveReserve($item_1->itemnumber,$patron_2->borrowernumber);
+ is($patron_2->holds->count, 0, "The 2nd patrons no longer has a hold");
+ is($patron_2->old_holds->next()->reserve_id, $reserve_2, "The 2nd patrons hold was filled and moved to old holds");
+
+};
+
sub count_hold_print_messages {
my $message_count = $dbh->selectall_arrayref(q{
SELECT COUNT(*)
return $message_count->[0]->[0];
}
+sub place_item_hold {
+ my ($patron,$item,$library,$priority) = @_;
+
+ my $hold_id = C4::Reserves::AddReserve(
+ {
+ branchcode => $library->branchcode,
+ borrowernumber => $patron->borrowernumber,
+ biblionumber => $item->biblionumber,
+ priority => $priority,
+ title => "title for fee",
+ itemnumber => $item->itemnumber,
+ }
+ );
+
+ my $hold = Koha::Holds->find($hold_id);
+ return $hold;
+}
+
# we reached the finish
$schema->storage->txn_rollback();