use Modern::Perl;
use t::lib::Mocks;
+use t::lib::TestBuilder;
+
use C4::Context;
-use C4::Branch;
-use Test::More tests => 41;
+use Test::More tests => 56;
use MARC::Record;
-use C4::Biblio;
+use Koha::Patrons;
use C4::Items;
-use C4::Members;
+use C4::Biblio;
+use C4::Reserves;
use C4::Calendar;
+use Koha::Database;
use Koha::DateUtils qw( dt_from_string output_pref );
+use Koha::Biblios;
+use Koha::Holds;
+use Koha::Items;
+use Koha::Libraries;
BEGIN {
use FindBin;
use lib $FindBin::Bin;
- use_ok('C4::Reserves');
}
-my $dbh = C4::Context->dbh;
+my $schema = Koha::Database->new->schema;
+$schema->storage->txn_begin;
+
+my $builder = t::lib::TestBuilder->new();
+my $dbh = C4::Context->dbh;
+
+# Create two random branches
+my $branch_1 = $builder->build({ source => 'Branch' })->{ branchcode };
+my $branch_2 = $builder->build({ source => 'Branch' })->{ branchcode };
-# Start transaction
-$dbh->{AutoCommit} = 0;
-$dbh->{RaiseError} = 1;
+my $category = $builder->build({ source => 'Category' });
my $borrowers_count = 5;
$dbh->do('DELETE FROM itemtypes');
+$dbh->do('DELETE FROM reserves');
my $insert_sth = $dbh->prepare('INSERT INTO itemtypes (itemtype) VALUES (?)');
$insert_sth->execute('CAN');
$insert_sth->execute('CANNOT');
$insert_sth->execute('DUMMY');
+$insert_sth->execute('ONLY1');
# Setup Test------------------------
# Create a biblio instance for testing
my ($bibnum, $title, $bibitemnum) = create_helper_biblio('DUMMY');
# Create item instance for testing.
-my ($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem({ homebranch => 'CPL', holdingbranch => 'CPL' } , $bibnum);
+my ($item_bibnum, $item_bibitemnum, $itemnumber)
+ = AddItem({ homebranch => $branch_1, holdingbranch => $branch_1 } , $bibnum);
# Create some borrowers
my @borrowernumbers;
foreach (1..$borrowers_count) {
- my $borrowernumber = AddMember(
+ my $borrowernumber = Koha::Patron->new({
firstname => 'my firstname',
surname => 'my surname ' . $_,
- categorycode => 'S',
- branchcode => 'CPL',
- );
+ categorycode => $category->{categorycode},
+ branchcode => $branch_1,
+ })->store->borrowernumber;
push @borrowernumbers, $borrowernumber;
}
-my $biblionumber = $bibnum;
-
-my @branches = GetBranchesLoop();
-my $branch = $branches[0][0]{value};
+my $biblionumber = $bibnum;
# Create five item level holds
foreach my $borrowernumber ( @borrowernumbers ) {
AddReserve(
- $branch,
+ $branch_1,
$borrowernumber,
$biblionumber,
- my $constraint = 'a',
my $bibitems = q{},
- my $priority,
+ my $priority = C4::Reserves::CalculatePriority( $biblionumber ),
my $resdate,
my $expdate,
my $notes = q{},
);
}
+my $biblio = Koha::Biblios->find( $biblionumber );
+my $holds = $biblio->holds;
+is( $holds->count, $borrowers_count, 'Test GetReserves()' );
+is( $holds->next->priority, 1, "Reserve 1 has a priority of 1" );
+is( $holds->next->priority, 2, "Reserve 2 has a priority of 2" );
+is( $holds->next->priority, 3, "Reserve 3 has a priority of 3" );
+is( $holds->next->priority, 4, "Reserve 4 has a priority of 4" );
+is( $holds->next->priority, 5, "Reserve 5 has a priority of 5" );
+
+my $item = Koha::Items->find( $itemnumber );
+$holds = $item->current_holds;
+my $first_hold = $holds->next;
+my $reservedate = $first_hold->reservedate;
+my $borrowernumber = $first_hold->borrowernumber;
+my $branch_1code = $first_hold->branchcode;
+my $reserve_id = $first_hold->reserve_id;
+is( $reservedate, output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }), "holds_placed_today should return a valid reserve date");
+is( $borrowernumber, $borrowernumbers[0], "holds_placed_today should return a valid borrowernumber");
+is( $branch_1code, $branch_1, "holds_placed_today should return a valid branchcode");
+ok($reserve_id, "Test holds_placed_today()");
+
+my $hold = Koha::Holds->find( $reserve_id );
+ok( $hold, "Koha::Holds found the hold" );
+my $hold_biblio = $hold->biblio();
+ok( $hold_biblio, "Got biblio using biblio() method" );
+ok( $hold_biblio == $hold->biblio(), "biblio method returns stashed biblio" );
+my $hold_item = $hold->item();
+ok( $hold_item, "Got item using item() method" );
+ok( $hold_item == $hold->item(), "item method returns stashed item" );
+my $hold_branch = $hold->branch();
+ok( $hold_branch, "Got branch using branch() method" );
+ok( $hold_branch == $hold->branch(), "branch method returns stashed branch" );
+my $hold_found = $hold->found();
+$hold->set({ found => 'W'})->store();
+is( Koha::Holds->waiting()->count(), 1, "Koha::Holds->waiting returns waiting holds" );
+is( Koha::Holds->unfilled()->count(), 4, "Koha::Holds->unfilled returns unfilled holds" );
+
+my $patron = Koha::Patrons->find( $borrowernumbers[0] );
+$holds = $patron->holds;
+is( $holds->next->borrowernumber, $borrowernumbers[0], "Test Koha::Patron->holds");
+
+
+$holds = $item->current_holds;
+$first_hold = $holds->next;
+$borrowernumber = $first_hold->borrowernumber;
+$branch_1code = $first_hold->branchcode;
+$reserve_id = $first_hold->reserve_id;
-my $reserves = GetReservesFromBiblionumber({ biblionumber => $biblionumber });
-is( scalar(@$reserves), $borrowers_count, "Test GetReserves()" );
-
-
-my ( $reservedate, $borrowernumber, $branchcode, $reserve_id ) = GetReservesFromItemnumber($itemnumber);
-is( $reservedate, output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }), "GetReservesFromItemnumber should return a valid reserve date");
-is( $borrowernumber, $borrowernumbers[0], "GetReservesFromItemnumber should return a valid borrowernumber");
-is( $branchcode, 'CPL', "GetReservesFromItemnumber should return a valid branchcode");
-ok($reserve_id, "Test GetReservesFromItemnumber()");
-
-
-my ( $reserve ) = GetReservesFromBorrowernumber($borrowernumbers[0]);
-ok( $reserve->{'borrowernumber'} eq $borrowernumbers[0], "Test GetReservesFromBorrowernumber()");
-
-
-ok( GetReserveCount( $borrowernumbers[0] ), "Test GetReserveCount()" );
-
-
-CancelReserve({ 'reserve_id' => $reserve_id });
-$reserves = GetReservesFromBiblionumber({ biblionumber => $biblionumber });
-is( scalar(@$reserves), $borrowers_count - 1, "Test CancelReserve()" );
-
-
-( $reservedate, $borrowernumber, $branchcode, $reserve_id ) = GetReservesFromItemnumber($itemnumber);
ModReserve({
reserve_id => $reserve_id,
rank => '4',
- branchcode => $branch,
+ branchcode => $branch_1,
+ itemnumber => $itemnumber,
+ suspend_until => output_pref( { dt => dt_from_string( "2013-01-01", "iso" ), dateonly => 1 } ),
+});
+
+$hold = Koha::Holds->find( $reserve_id );
+ok( $hold->priority eq '4', "Test ModReserve, priority changed correctly" );
+ok( $hold->suspend, "Test ModReserve, suspend hold" );
+is( $hold->suspend_until, '2013-01-01 00:00:00', "Test ModReserve, suspend until date" );
+
+ModReserve({ # call without reserve_id
+ rank => '3',
+ biblionumber => $item_bibnum,
itemnumber => $itemnumber,
- suspend_until => C4::Dates->new("2013-01-01","iso")->output(),
+ borrowernumber => $borrowernumber,
});
-$reserve = GetReserve( $reserve_id );
-ok( $reserve->{'priority'} eq '4', "Test GetReserve(), priority changed correctly" );
-ok( $reserve->{'suspend'}, "Test GetReserve(), suspend hold" );
-ok( $reserve->{'suspend_until'} eq '2013-01-01 00:00:00', "Test GetReserve(), suspend until date" );
+$hold = Koha::Holds->find( $reserve_id );
+ok( $hold->priority eq '3', "Test ModReserve, priority changed correctly" );
ToggleSuspend( $reserve_id );
-$reserve = GetReserve( $reserve_id );
-ok( !$reserve->{'suspend'}, "Test ToggleSuspend(), no date" );
+$hold = Koha::Holds->find( $reserve_id );
+ok( ! $hold->suspend, "Test ToggleSuspend(), no date" );
ToggleSuspend( $reserve_id, '2012-01-01' );
-$reserve = GetReserve( $reserve_id );
-ok( $reserve->{'suspend_until'} eq '2012-01-01 00:00:00', "Test ToggleSuspend(), with date" );
+$hold = Koha::Holds->find( $reserve_id );
+is( $hold->suspend_until, '2012-01-01 00:00:00', "Test ToggleSuspend(), with date" );
AutoUnsuspendReserves();
-$reserve = GetReserve( $reserve_id );
-ok( !$reserve->{'suspend'}, "Test AutoUnsuspendReserves()" );
+$hold = Koha::Holds->find( $reserve_id );
+ok( ! $hold->suspend, "Test AutoUnsuspendReserves()" );
+
+SuspendAll(
+ borrowernumber => $borrowernumber,
+ biblionumber => $biblionumber,
+ suspend => 1,
+ suspend_until => '2012-01-01',
+);
+$hold = Koha::Holds->find( $reserve_id );
+is( $hold->suspend, 1, "Test SuspendAll()" );
+is( $hold->suspend_until, '2012-01-01 00:00:00', "Test SuspendAll(), with date" );
+
+SuspendAll(
+ borrowernumber => $borrowernumber,
+ biblionumber => $biblionumber,
+ suspend => 0,
+);
+$hold = Koha::Holds->find( $reserve_id );
+is( $hold->suspend, 0, "Test resuming with SuspendAll()" );
+is( $hold->suspend_until, undef, "Test resuming with SuspendAll(), should have no suspend until date" );
# Add a new hold for the borrower whose hold we canceled earlier, this time at the bib level
AddReserve(
- $branch,
- $borrowernumber,
+ $branch_1,
+ $borrowernumbers[0],
$biblionumber,
- my $constraint = 'a',
my $bibitems = q{},
my $priority,
my $resdate,
my $checkitem,
my $found,
);
-( $reserve ) = GetReservesFromBorrowernumber($borrowernumber);
-my $reserveid = C4::Reserves::GetReserveId(
- {
- biblionumber => $biblionumber,
- borrowernumber => $borrowernumber
- }
-);
-is( $reserveid, $reserve->{reserve_id}, "Test GetReserveId" );
-ModReserveMinusPriority( $itemnumber, $reserve->{'reserve_id'} );
-( $reserve ) = GetReservesFromBorrowernumber($borrowernumber);
-ok( $reserve->{'itemnumber'} eq $itemnumber, "Test ModReserveMinusPriority()" );
-
-
-my $reserve2 = GetReserveInfo( $reserve->{'reserve_id'} );
-ok( $reserve->{'reserve_id'} eq $reserve2->{'reserve_id'}, "Test GetReserveInfo()" );
-
-
-$reserves = GetReservesFromBiblionumber({ biblionumber => $biblionumber, all_dates => 1 });
-$reserve = $reserves->[1];
-AlterPriority( 'top', $reserve->{'reserve_id'} );
-$reserve = GetReserve( $reserve->{'reserve_id'} );
-ok( $reserve->{'priority'} eq '1', "Test AlterPriority(), move to top" );
-
-AlterPriority( 'down', $reserve->{'reserve_id'} );
-$reserve = GetReserve( $reserve->{'reserve_id'} );
-ok( $reserve->{'priority'} eq '2', "Test AlterPriority(), move down" );
-
-AlterPriority( 'up', $reserve->{'reserve_id'} );
-$reserve = GetReserve( $reserve->{'reserve_id'} );
-ok( $reserve->{'priority'} eq '1', "Test AlterPriority(), move up" );
-
-AlterPriority( 'bottom', $reserve->{'reserve_id'} );
-$reserve = GetReserve( $reserve->{'reserve_id'} );
-ok( $reserve->{'priority'} eq '5', "Test AlterPriority(), move to bottom" );
+$patron = Koha::Patrons->find( $borrowernumber );
+$holds = $patron->holds;
+my $reserveid = Koha::Holds->search({ biblionumber => $bibnum, borrowernumber => $borrowernumbers[0] })->next->reserve_id;
+ModReserveMinusPriority( $itemnumber, $reserveid );
+$holds = $patron->holds;
+is( $holds->next->itemnumber, $itemnumber, "Test ModReserveMinusPriority()" );
+
+$holds = $biblio->holds;
+$hold = $holds->next;
+AlterPriority( 'top', $hold->reserve_id, undef, 2, 1, 6 );
+$hold = Koha::Holds->find( $reserveid );
+is( $hold->priority, '1', "Test AlterPriority(), move to top" );
+
+AlterPriority( 'down', $hold->reserve_id, undef, 2, 1, 6 );
+$hold = Koha::Holds->find( $reserveid );
+is( $hold->priority, '2', "Test AlterPriority(), move down" );
+
+AlterPriority( 'up', $hold->reserve_id, 1, 3, 1, 6 );
+$hold = Koha::Holds->find( $reserveid );
+is( $hold->priority, '1', "Test AlterPriority(), move up" );
+
+AlterPriority( 'bottom', $hold->reserve_id, undef, 2, 1, 6 );
+$hold = Koha::Holds->find( $reserveid );
+is( $hold->priority, '6', "Test AlterPriority(), move to bottom" );
# Regression test for bug 2394
#
my ($foreign_bibnum, $foreign_title, $foreign_bibitemnum) = create_helper_biblio('DUMMY');
my ($foreign_item_bibnum, $foreign_item_bibitemnum, $foreign_itemnumber)
- = AddItem({ homebranch => 'MPL', holdingbranch => 'MPL' } , $foreign_bibnum);
+ = AddItem({ homebranch => $branch_2, holdingbranch => $branch_2 } , $foreign_bibnum);
$dbh->do('DELETE FROM issuingrules');
$dbh->do(
- q{INSERT INTO issuingrules (categorycode, branchcode, itemtype, reservesallowed)
- VALUES (?, ?, ?, ?)},
+ q{INSERT INTO issuingrules (categorycode, branchcode, itemtype, reservesallowed, holds_per_record)
+ VALUES (?, ?, ?, ?, ?)},
{},
- '*', '*', '*', 25
+ '*', '*', '*', 25, 99
);
$dbh->do(
- q{INSERT INTO issuingrules (categorycode, branchcode, itemtype, reservesallowed)
- VALUES (?, ?, ?, ?)},
+ q{INSERT INTO issuingrules (categorycode, branchcode, itemtype, reservesallowed, holds_per_record)
+ VALUES (?, ?, ?, ?, ?)},
{},
- '*', '*', 'CANNOT', 0
+ '*', '*', 'CANNOT', 0, 99
);
# make sure some basic sysprefs are set
-t::lib::Mocks::mock_preference('ReservesControlBranch', 'homebranch');
+t::lib::Mocks::mock_preference('ReservesControlBranch', 'ItemHomeLibrary');
t::lib::Mocks::mock_preference('item-level_itypes', 1);
-# if IndependentBranches is OFF, a CPL patron can reserve an MPL item
+# if IndependentBranches is OFF, a $branch_1 patron can reserve an $branch_2 item
t::lib::Mocks::mock_preference('IndependentBranches', 0);
ok(
- CanItemBeReserved($borrowernumbers[0], $foreign_itemnumber) eq 'OK',
- 'CPL patron allowed to reserve MPL item with IndependentBranches OFF (bug 2394)'
+ CanItemBeReserved($borrowernumbers[0], $foreign_itemnumber)->{status} eq 'OK',
+ '$branch_1 patron allowed to reserve $branch_2 item with IndependentBranches OFF (bug 2394)'
);
-# if IndependentBranches is OFF, a CPL patron cannot reserve an MPL item
+# if IndependentBranches is OFF, a $branch_1 patron cannot reserve an $branch_2 item
t::lib::Mocks::mock_preference('IndependentBranches', 1);
t::lib::Mocks::mock_preference('canreservefromotherbranches', 0);
ok(
- CanItemBeReserved($borrowernumbers[0], $foreign_itemnumber) eq 'cannotReserveFromOtherBranches',
- 'CPL patron NOT allowed to reserve MPL item with IndependentBranches ON ... (bug 2394)'
+ CanItemBeReserved($borrowernumbers[0], $foreign_itemnumber)->{status} eq 'cannotReserveFromOtherBranches',
+ '$branch_1 patron NOT allowed to reserve $branch_2 item with IndependentBranches ON ... (bug 2394)'
);
# ... unless canreservefromotherbranches is ON
t::lib::Mocks::mock_preference('canreservefromotherbranches', 1);
ok(
- CanItemBeReserved($borrowernumbers[0], $foreign_itemnumber) eq 'OK',
+ CanItemBeReserved($borrowernumbers[0], $foreign_itemnumber)->{status} eq 'OK',
'... unless canreservefromotherbranches is ON (bug 2394)'
);
-# Regression test for bug 11336
-($bibnum, $title, $bibitemnum) = create_helper_biblio('DUMMY');
-($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem({ homebranch => 'CPL', holdingbranch => 'CPL' } , $bibnum);
-AddReserve(
- $branch,
- $borrowernumbers[0],
- $bibnum,
- 'a',
- '',
- 1,
-);
+{
+ # Regression test for bug 11336 # Test if ModReserve correctly recalculate the priorities
+ ($bibnum, $title, $bibitemnum) = create_helper_biblio('DUMMY');
+ ($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem({ homebranch => $branch_1, holdingbranch => $branch_1 } , $bibnum);
+ my $reserveid1 = AddReserve($branch_1, $borrowernumbers[0], $bibnum, '', 1);
+ ($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem({ homebranch => $branch_1, holdingbranch => $branch_1 } , $bibnum);
+ my $reserveid2 = AddReserve($branch_1, $borrowernumbers[1], $bibnum, '', 2);
+ ($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem({ homebranch => $branch_1, holdingbranch => $branch_1 } , $bibnum);
+ my $reserveid3 = AddReserve($branch_1, $borrowernumbers[2], $bibnum, '', 3);
+ my $hhh = Koha::Holds->search({ biblionumber => $bibnum });
+ my $hold3 = Koha::Holds->find( $reserveid3 );
+ is( $hold3->priority, 3, "The 3rd hold should have a priority set to 3" );
+ ModReserve({ reserve_id => $reserveid1, rank => 'del' });
+ ModReserve({ reserve_id => $reserveid2, rank => 'del' });
+ is( $hold3->discard_changes->priority, 1, "After ModReserve, the 3rd reserve becomes the first on the waiting list" );
+}
-my $reserveid1 = C4::Reserves::GetReserveId(
- {
- biblionumber => $bibnum,
- borrowernumber => $borrowernumbers[0]
- }
-);
+ModItem({ damaged => 1 }, $item_bibnum, $itemnumber);
+t::lib::Mocks::mock_preference( 'AllowHoldsOnDamagedItems', 1 );
+is( CanItemBeReserved( $borrowernumbers[0], $itemnumber)->{status}, 'OK', "Patron can reserve damaged item with AllowHoldsOnDamagedItems enabled" );
+ok( defined( ( CheckReserves($itemnumber) )[1] ), "Hold can be trapped for damaged item with AllowHoldsOnDamagedItems enabled" );
-($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem({ homebranch => 'CPL', holdingbranch => 'CPL' } , $bibnum);
-AddReserve(
- $branch,
- $borrowernumbers[1],
- $bibnum,
- 'a',
- '',
- 2,
-);
-my $reserveid2 = C4::Reserves::GetReserveId(
+$hold = Koha::Hold->new(
{
- biblionumber => $bibnum,
- borrowernumber => $borrowernumbers[1]
+ borrowernumber => $borrowernumbers[0],
+ itemnumber => $itemnumber,
+ biblionumber => $item_bibnum,
}
-);
-
-CancelReserve({ reserve_id => $reserveid1 });
-
-$reserve2 = GetReserve( $reserveid2 );
-is( $reserve2->{priority}, 1, "After cancelreserve, the 2nd reserve becomes the first on the waiting list" );
-
-($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem({ homebranch => 'CPL', holdingbranch => 'CPL' } , $bibnum);
-AddReserve(
- $branch,
- $borrowernumbers[0],
- $bibnum,
- 'a',
- '',
- 2,
-);
-my $reserveid3 = C4::Reserves::GetReserveId(
- {
- biblionumber => $bibnum,
- borrowernumber => $borrowernumbers[0]
- }
-);
-
-my $reserve3 = GetReserve( $reserveid3 );
-is( $reserve3->{priority}, 2, "New reserve for patron 0, the reserve has a priority = 2" );
-
-ModReserve({ reserve_id => $reserveid2, rank => 'del' });
-$reserve3 = GetReserve( $reserveid3 );
-is( $reserve3->{priority}, 1, "After ModReserve, the 3rd reserve becomes the first on the waiting list" );
-
-ModItem({ damaged => 1 }, $item_bibnum, $itemnumber);
-C4::Context->set_preference( 'AllowHoldsOnDamagedItems', 1 );
-ok( CanItemBeReserved( $borrowernumbers[0], $itemnumber) eq 'OK', "Patron can reserve damaged item with AllowHoldsOnDamagedItems enabled" );
-ok( defined( ( CheckReserves($itemnumber) )[1] ), "Hold can be trapped for damaged item with AllowHoldsOnDamagedItems enabled" );
-C4::Context->set_preference( 'AllowHoldsOnDamagedItems', 0 );
-ok( CanItemBeReserved( $borrowernumbers[0], $itemnumber) eq 'damaged', "Patron cannot reserve damaged item with AllowHoldsOnDamagedItems disabled" );
+)->store();
+is( CanItemBeReserved( $borrowernumbers[0], $itemnumber )->{status},
+ 'itemAlreadyOnHold',
+ "Patron cannot place a second item level hold for a given item" );
+$hold->delete();
+
+t::lib::Mocks::mock_preference( 'AllowHoldsOnDamagedItems', 0 );
+ok( CanItemBeReserved( $borrowernumbers[0], $itemnumber)->{status} eq 'damaged', "Patron cannot reserve damaged item with AllowHoldsOnDamagedItems disabled" );
ok( !defined( ( CheckReserves($itemnumber) )[1] ), "Hold cannot be trapped for damaged item with AllowHoldsOnDamagedItems disabled" );
# Regression test for bug 9532
($bibnum, $title, $bibitemnum) = create_helper_biblio('CANNOT');
-($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem({ homebranch => 'CPL', holdingbranch => 'CPL', itype => 'CANNOT' } , $bibnum);
+($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem({ homebranch => $branch_1, holdingbranch => $branch_1, itype => 'CANNOT' } , $bibnum);
AddReserve(
- $branch,
+ $branch_1,
$borrowernumbers[0],
$bibnum,
- 'a',
'',
1,
);
-ok(
- CanItemBeReserved( $borrowernumbers[0], $itemnumber) eq 'tooManyReserves',
+is(
+ CanItemBeReserved( $borrowernumbers[0], $itemnumber)->{status}, 'tooManyReserves',
"cannot request item if policy that matches on item-level item type forbids it"
);
ModItem({ itype => 'CAN' }, $item_bibnum, $itemnumber);
ok(
- CanItemBeReserved( $borrowernumbers[0], $itemnumber) eq 'OK',
+ CanItemBeReserved( $borrowernumbers[0], $itemnumber)->{status} eq 'OK',
"can request item if policy that matches on item type allows it"
);
t::lib::Mocks::mock_preference('item-level_itypes', 0);
ModItem({ itype => undef }, $item_bibnum, $itemnumber);
ok(
- CanItemBeReserved( $borrowernumbers[0], $itemnumber) eq 'tooManyReserves',
+ CanItemBeReserved( $borrowernumbers[0], $itemnumber)->{status} eq 'tooManyReserves',
"cannot request item if policy that matches on bib-level item type forbids it (bug 9532)"
);
$dbh->do(q{
INSERT INTO branch_item_rules (branchcode, itemtype, holdallowed, returnbranch)
VALUES (?, ?, ?, ?)
-}, {}, 'CPL', 'CANNOT', 0, 'homebranch');
+}, {}, $branch_1, 'CANNOT', 0, 'homebranch');
$dbh->do(q{
INSERT INTO branch_item_rules (branchcode, itemtype, holdallowed, returnbranch)
VALUES (?, ?, ?, ?)
-}, {}, 'CPL', 'CAN', 1, 'homebranch');
+}, {}, $branch_1, 'CAN', 1, 'homebranch');
($bibnum, $title, $bibitemnum) = create_helper_biblio('CANNOT');
($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem(
- { homebranch => 'CPL', holdingbranch => 'CPL', itype => 'CANNOT' } , $bibnum);
-is(CanItemBeReserved($borrowernumbers[0], $itemnumber), 'notReservable',
- "CanItemBeReserved should returns 'notReservable'");
+ { homebranch => $branch_1, holdingbranch => $branch_1, itype => 'CANNOT' } , $bibnum);
+is(CanItemBeReserved($borrowernumbers[0], $itemnumber)->{status}, 'notReservable',
+ "CanItemBeReserved should return 'notReservable'");
($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem(
- { homebranch => 'MPL', holdingbranch => 'CPL', itype => 'CAN' } , $bibnum);
-is(CanItemBeReserved($borrowernumbers[0], $itemnumber),
+ { homebranch => $branch_2, holdingbranch => $branch_1, itype => 'CAN' } , $bibnum);
+is(CanItemBeReserved($borrowernumbers[0], $itemnumber)->{status},
'cannotReserveFromOtherBranches',
- "CanItemBeReserved should returns 'cannotReserveFromOtherBranches'");
+ "CanItemBeReserved should return 'cannotReserveFromOtherBranches'");
($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem(
- { homebranch => 'CPL', holdingbranch => 'CPL', itype => 'CAN' } , $bibnum);
-is(CanItemBeReserved($borrowernumbers[0], $itemnumber), 'OK',
- "CanItemBeReserved should returns 'OK'");
-
-
-# Test CancelExpiredReserves
-C4::Context->set_preference('ExpireReservesMaxPickUpDelay', 1);
-C4::Context->set_preference('ReservesMaxPickUpDelay', 1);
-
-my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) = localtime(time);
-$year += 1900;
-$mon += 1;
-$reserves = $dbh->selectall_arrayref('SELECT * FROM reserves', { Slice => {} });
-$reserve = $reserves->[0];
-my $calendar = C4::Calendar->new(branchcode => $reserve->{branchcode});
-$calendar->insert_single_holiday(
- day => $mday,
- month => $mon,
- year => $year,
- title => 'Test',
- description => 'Test',
+ { homebranch => $branch_1, holdingbranch => $branch_1, itype => 'CAN' } , $bibnum);
+is(CanItemBeReserved($borrowernumbers[0], $itemnumber)->{status}, 'OK',
+ "CanItemBeReserved should return 'OK'");
+
+# Bug 12632
+t::lib::Mocks::mock_preference( 'item-level_itypes', 1 );
+t::lib::Mocks::mock_preference( 'ReservesControlBranch', 'PatronLibrary' );
+
+$dbh->do('DELETE FROM reserves');
+$dbh->do('DELETE FROM issues');
+$dbh->do('DELETE FROM items');
+$dbh->do('DELETE FROM biblio');
+
+( $bibnum, $title, $bibitemnum ) = create_helper_biblio('ONLY1');
+( $item_bibnum, $item_bibitemnum, $itemnumber )
+ = AddItem( { homebranch => $branch_1, holdingbranch => $branch_1 }, $bibnum );
+
+$dbh->do(
+ q{INSERT INTO issuingrules (categorycode, branchcode, itemtype, reservesallowed, holds_per_record)
+ VALUES (?, ?, ?, ?, ?)},
+ {},
+ '*', '*', 'ONLY1', 1, 99
);
-$reserve_id = $reserve->{reserve_id};
-$dbh->do("UPDATE reserves SET waitingdate = DATE_SUB( NOW(), INTERVAL 5 DAY ), found = 'W', priority = 0 WHERE reserve_id = ?", undef, $reserve_id );
-C4::Context->set_preference('ExpireReservesOnHolidays', 0);
-CancelExpiredReserves();
-my $count = $dbh->selectrow_array("SELECT COUNT(*) FROM reserves WHERE reserve_id = ?", undef, $reserve_id );
-is( $count, 1, "Waiting reserve beyond max pickup delay *not* canceled on holiday" );
-C4::Context->set_preference('ExpireReservesOnHolidays', 1);
-CancelExpiredReserves();
-$count = $dbh->selectrow_array("SELECT COUNT(*) FROM reserves WHERE reserve_id = ?", undef, $reserve_id );
-is( $count, 0, "Waiting reserve beyond max pickup delay canceled on holiday" );
-
-# Test expirationdate
-$reserve = $reserves->[1];
-$reserve_id = $reserve->{reserve_id};
-$dbh->do("UPDATE reserves SET expirationdate = DATE_SUB( NOW(), INTERVAL 1 DAY ) WHERE reserve_id = ?", undef, $reserve_id );
-CancelExpiredReserves();
-$count = $dbh->selectrow_array("SELECT COUNT(*) FROM reserves WHERE reserve_id = ?", undef, $reserve_id );
-is( $count, 0, "Reserve with manual expiration date canceled correctly" );
+is( CanItemBeReserved( $borrowernumbers[0], $itemnumber )->{status},
+ 'OK', 'Patron can reserve item with hold limit of 1, no holds placed' );
+
+my $res_id = AddReserve( $branch_1, $borrowernumbers[0], $bibnum, '', 1, );
+
+is( CanItemBeReserved( $borrowernumbers[0], $itemnumber )->{status},
+ 'tooManyReserves', 'Patron cannot reserve item with hold limit of 1, 1 bib level hold placed' );
+
+subtest 'Test max_holds per library/patron category' => sub {
+ plan tests => 6;
+
+ $dbh->do('DELETE FROM reserves');
+ $dbh->do('DELETE FROM issuingrules');
+
+ ( $bibnum, $title, $bibitemnum ) = create_helper_biblio('TEST');
+ ( $item_bibnum, $item_bibitemnum, $itemnumber ) =
+ AddItem( { homebranch => $branch_1, holdingbranch => $branch_1 },
+ $bibnum );
+ $dbh->do(
+ q{
+ INSERT INTO issuingrules (categorycode, branchcode, itemtype, reservesallowed, holds_per_record)
+ VALUES (?, ?, ?, ?, ?)
+ },
+ {},
+ '*', '*', 'TEST', 99, 99
+ );
+ AddReserve( $branch_1, $borrowernumbers[0], $bibnum, '', 1, );
+ AddReserve( $branch_1, $borrowernumbers[0], $bibnum, '', 1, );
+ AddReserve( $branch_1, $borrowernumbers[0], $bibnum, '', 1, );
+
+ my $count =
+ Koha::Holds->search( { borrowernumber => $borrowernumbers[0] } )->count();
+ is( $count, 3, 'Patron now has 3 holds' );
+
+ my $ret = CanItemBeReserved( $borrowernumbers[0], $itemnumber );
+ is( $ret->{status}, 'OK', 'Patron can place hold with no borrower circ rules' );
+
+ my $rule_all = $schema->resultset('DefaultBorrowerCircRule')->new(
+ {
+ categorycode => $category->{categorycode},
+ max_holds => 3,
+ }
+ )->insert();
+
+ my $rule_branch = $schema->resultset('BranchBorrowerCircRule')->new(
+ {
+ branchcode => $branch_1,
+ categorycode => $category->{categorycode},
+ max_holds => 5,
+ }
+ )->insert();
+
+ $ret = CanItemBeReserved( $borrowernumbers[0], $itemnumber );
+ is( $ret->{status}, 'OK', 'Patron can place hold with branch/category rule of 5, category rule of 3' );
+
+ $rule_branch->delete();
+
+ $ret = CanItemBeReserved( $borrowernumbers[0], $itemnumber );
+ is( $ret->{status}, 'tooManyReserves', 'Patron cannot place hold with only a category rule of 3' );
+
+ $rule_all->delete();
+ $rule_branch->max_holds(3);
+ $rule_branch->insert();
+
+ $ret = CanItemBeReserved( $borrowernumbers[0], $itemnumber );
+ is( $ret->{status}, 'tooManyReserves', 'Patron cannot place hold with only a branch/category rule of 3' );
+
+ $rule_branch->max_holds(5);
+ $rule_branch->update();
+ $rule_all->max_holds(5);
+ $rule_all->insert();
+
+ $ret = CanItemBeReserved( $borrowernumbers[0], $itemnumber );
+ is( $ret->{status}, 'OK', 'Patron can place hold with branch/category rule of 5, category rule of 5' );
+};
+
+subtest 'Pickup location availability tests' => sub {
+ plan tests => 3;
+
+ my ( $bibnum, $title, $bibitemnum ) = create_helper_biblio('ONLY1');
+ my ( $item_bibnum, $item_bibitemnum, $itemnumber )
+ = AddItem( { homebranch => $branch_1, holdingbranch => $branch_1 }, $bibnum );
+ #Add a default rule to allow some holds
+ $dbh->do(
+ q{INSERT INTO issuingrules (categorycode, branchcode, itemtype, reservesallowed, holds_per_record)
+ VALUES (?, ?, ?, ?, ?)},
+ {},
+ '*', '*', '*', 25, 99
+ );
+ my $item = Koha::Items->find($itemnumber);
+ my $branch_to = $builder->build({ source => 'Branch' })->{ branchcode };
+ my $library = Koha::Libraries->find($branch_to);
+ my $patron = $builder->build({ source => 'Borrower' })->{ borrowernumber };
+
+ t::lib::Mocks::mock_preference('UseBranchTransferLimits', 1);
+ t::lib::Mocks::mock_preference('BranchTransferLimitsType', 'itemtype');
+ $library->pickup_location('1')->store;
+ is(CanItemBeReserved($patron, $item->itemnumber, $branch_to)->{status},
+ 'OK', 'Library is a pickup location');
+ $library->pickup_location('0')->store;
+ is(CanItemBeReserved($patron, $item->itemnumber, $branch_to)->{status},
+ 'libraryNotPickupLocation', 'Library is not a pickup location');
+ is(CanItemBeReserved($patron, $item->itemnumber, 'nonexistent')->{status},
+ 'libraryNotFound', 'Cannot set unknown library as pickup location');
+};
# Helper method to set up a Biblio.
sub create_helper_biblio {
projects / koha.git / blobdiff