use Modern::Perl;
-use Test::More tests => 65;
+use Test::More tests => 58;
+use Test::MockModule;
+use Test::Warn;
+
+use t::lib::Mocks;
+use t::lib::TestBuilder;
use MARC::Record;
use DateTime::Duration;
-use C4::Branch;
use C4::Biblio;
+use C4::Circulation;
use C4::Items;
use C4::Members;
-use C4::Circulation;
-use Koha::Holds;
-use t::lib::Mocks;
-
+use C4::Reserves;
+use Koha::Caches;
use Koha::DateUtils;
+use Koha::Holds;
+use Koha::Libraries;
+use Koha::Notice::Templates;
+use Koha::Patrons;
+use Koha::Patron::Categories;
-use Data::Dumper;
BEGIN {
- use_ok('C4::Reserves');
+ require_ok('C4::Reserves');
}
-# a very minimal mack of userenv for use by the test of DelItemCheck
-*C4::Context::userenv = sub {
- return {};
-};
-
+# Start transaction
+my $database = Koha::Database->new();
+my $schema = $database->schema();
+$schema->storage->txn_begin();
my $dbh = C4::Context->dbh;
-# Start transaction
-$dbh->{AutoCommit} = 0;
-$dbh->{RaiseError} = 1;
+my $builder = t::lib::TestBuilder->new;
-# Somewhat arbitrary field chosen for age restriction unit tests. Must be added to db before the framework is cached
-$dbh->do("update marc_subfield_structure set kohafield='biblioitems.agerestriction' where tagfield='521' and tagsubfield='a'");
+my $frameworkcode = q||;
-# Setup Test------------------------
-
-# Add branches if not existing
-foreach my $addbra ('CPL', 'FPL', 'RPL') {
- $dbh->do("INSERT INTO branches (branchcode,branchname) VALUES (?,?)", undef, ($addbra,"$addbra branch")) unless GetBranchName($addbra);
-}
-
-# Add categories if not existing
-foreach my $addcat ('S', 'PT') {
- $dbh->do("INSERT INTO categories (categorycode,hidelostitems,category_type) VALUES (?,?,?)",undef,($addcat, 0, $addcat eq 'S'? 'S': 'A')) unless GetBorrowercategory($addcat);
-}
+# Somewhat arbitrary field chosen for age restriction unit tests. Must be added to db before the framework is cached
+$dbh->do("update marc_subfield_structure set kohafield='biblioitems.agerestriction' where tagfield='521' and tagsubfield='a' and frameworkcode=?", undef, $frameworkcode);
+my $cache = Koha::Caches->get_instance;
+$cache->clear_from_cache("MarcStructure-0-$frameworkcode");
+$cache->clear_from_cache("MarcStructure-1-$frameworkcode");
+$cache->clear_from_cache("default_value_for_mod_marc-$frameworkcode");
+$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
+
+## Setup Test
+# Add branches
+my $branch_1 = $builder->build({ source => 'Branch' })->{ branchcode };
+my $branch_2 = $builder->build({ source => 'Branch' })->{ branchcode };
+my $branch_3 = $builder->build({ source => 'Branch' })->{ branchcode };
+# Add categories
+my $category_1 = $builder->build({ source => 'Category' })->{ categorycode };
+my $category_2 = $builder->build({ source => 'Category' })->{ categorycode };
+# Add an item type
+my $itemtype = $builder->build(
+ { source => 'Itemtype', value => { notforloan => undef } } )->{itemtype};
+
+C4::Context->set_userenv(
+ undef, undef, undef, undef, undef, undef, $branch_1
+);
# Create a helper biblio
my $bib = MARC::Record->new();
MARC::Field->new('245', '', '', a => $title),
);
}
-my ($bibnum, $bibitemnum);
-($bibnum, $title, $bibitemnum) = AddBiblio($bib, '');
+my ( $bibnum ) = AddBiblio($bib, $frameworkcode);
# Create a helper 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,
+ itype => $itemtype
+ },
+ $bibnum
+);
+
# Modify item; setting barcode.
my $testbarcode = '97531';
my %data = (
firstname => 'my firstname',
surname => 'my surname',
- categorycode => 'S',
- branchcode => 'CPL',
+ categorycode => $category_1,
+ branchcode => $branch_1,
);
+Koha::Patron::Categories->find($category_1)->set({ enrolmentfee => 0})->store;
my $borrowernumber = AddMember(%data);
-my $borrower = GetMember( borrowernumber => $borrowernumber );
+my $borrower = Koha::Patrons->find( $borrowernumber )->unblessed;
my $biblionumber = $bibnum;
my $barcode = $testbarcode;
my $checkitem = undef;
my $found = undef;
-my @branches = GetBranchesLoop();
-my $branch = $branches[0][0]{value};
+my $branchcode = Koha::Libraries->search->next->branchcode;
-AddReserve($branch, $borrowernumber, $biblionumber,
+AddReserve($branchcode, $borrowernumber, $biblionumber,
$bibitems, $priority, $resdate, $expdate, $notes,
$title, $checkitem, $found);
is($status, "Reserved", "CheckReserves Test 3");
my $ReservesControlBranch = C4::Context->preference('ReservesControlBranch');
-C4::Context->set_preference( 'ReservesControlBranch', 'ItemHomeLibrary' );
+t::lib::Mocks::mock_preference( 'ReservesControlBranch', 'ItemHomeLibrary' );
ok(
'ItemHomeLib' eq GetReservesControlBranch(
{ homebranch => 'ItemHomeLib' },
{ branchcode => 'PatronHomeLib' }
), "GetReservesControlBranch returns item home branch when set to ItemHomeLibrary"
);
-C4::Context->set_preference( 'ReservesControlBranch', 'PatronLibrary' );
+t::lib::Mocks::mock_preference( 'ReservesControlBranch', 'PatronLibrary' );
ok(
'PatronHomeLib' eq GetReservesControlBranch(
{ homebranch => 'ItemHomeLib' },
{ branchcode => 'PatronHomeLib' }
), "GetReservesControlBranch returns patron home branch when set to PatronLibrary"
);
-C4::Context->set_preference( 'ReservesControlBranch', $ReservesControlBranch );
+t::lib::Mocks::mock_preference( 'ReservesControlBranch', $ReservesControlBranch );
###
### Regression test for bug 10272
###
my %requesters = ();
-$requesters{'CPL'} = AddMember(
- branchcode => 'CPL',
- categorycode => 'PT',
- surname => 'borrower from CPL',
+$requesters{$branch_1} = AddMember(
+ branchcode => $branch_1,
+ categorycode => $category_2,
+ surname => "borrower from $branch_1",
);
-$requesters{'FPL'} = AddMember(
- branchcode => 'FPL',
- categorycode => 'PT',
- surname => 'borrower from FPL',
+for my $i ( 2 .. 5 ) {
+ $requesters{"CPL$i"} = AddMember(
+ branchcode => $branch_1,
+ categorycode => $category_2,
+ surname => "borrower $i from $branch_1",
+ );
+}
+$requesters{$branch_2} = AddMember(
+ branchcode => $branch_2,
+ categorycode => $category_2,
+ surname => "borrower from $branch_2",
);
-$requesters{'RPL'} = AddMember(
- branchcode => 'RPL',
- categorycode => 'PT',
- surname => 'borrower from RPL',
+$requesters{$branch_3} = AddMember(
+ branchcode => $branch_3,
+ categorycode => $category_2,
+ surname => "borrower from $branch_3",
);
-# Configure rules so that CPL allows only CPL patrons
-# to request its items, while FPL will allow its items
+# Configure rules so that $branch_1 allows only $branch_1 patrons
+# to request its items, while $branch_2 will allow its items
# to fill holds from anywhere.
$dbh->do('DELETE FROM issuingrules');
q{INSERT INTO default_branch_circ_rules (branchcode, maxissueqty, holdallowed, returnbranch)
VALUES (?, ?, ?, ?)},
{},
- 'CPL', 10, 1, 'homebranch',
+ $branch_1, 10, 1, 'homebranch',
);
# ... while FPL allows anybody to request its items
q{INSERT INTO default_branch_circ_rules (branchcode, maxissueqty, holdallowed, returnbranch)
VALUES (?, ?, ?, ?)},
{},
- 'FPL', 10, 2, 'homebranch',
+ $branch_2, 10, 2, 'homebranch',
);
# helper biblio for the bug 10272 regression test
);
# create one item belonging to FPL and one belonging to CPL
-my ($bibnum2, $bibitemnum2) = AddBiblio($bib, '');
+my ( $bibnum2 ) = AddBiblio($bib, $frameworkcode);
my ($itemnum_cpl, $itemnum_fpl);
-(undef, undef, $itemnum_cpl) = AddItem({
- homebranch => 'CPL',
- holdingbranch => 'CPL',
- barcode => 'bug10272_CPL'
- } , $bibnum2);
-(undef, undef, $itemnum_fpl) = AddItem({
- homebranch => 'FPL',
- holdingbranch => 'FPL',
- barcode => 'bug10272_FPL'
- } , $bibnum2);
+( 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
+);
+
# 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('RPL', $requesters{'RPL'}, $bibnum2,
+AddReserve($branch_3, $requesters{$branch_3}, $bibnum2,
$bibitems, 1, $resdate, $expdate, $notes,
$title, $checkitem, $found);
-AddReserve('FPL', $requesters{'FPL'}, $bibnum2,
+AddReserve($branch_2, $requesters{$branch_2}, $bibnum2,
$bibitems, 2, $resdate, $expdate, $notes,
$title, $checkitem, $found);
-AddReserve('CPL', $requesters{'CPL'}, $bibnum2,
+AddReserve($branch_1, $requesters{$branch_1}, $bibnum2,
$bibitems, 3, $resdate, $expdate, $notes,
$title, $checkitem, $found);
-ModReserveAffect($itemnum_cpl, $requesters{'RPL'}, 0);
+ModReserveAffect($itemnum_cpl, $requesters{$branch_3}, 0);
# Now it should have different priorities.
-my $title_reserves = GetReservesFromBiblionumber({biblionumber => $bibnum2});
-# Sort by reserve number in case the database gives us oddly ordered results
-my @reserves = sort { $a->{reserve_id} <=> $b->{reserve_id} } @$title_reserves;
-is($reserves[0]{priority}, 0, 'Item is correctly waiting');
-is($reserves[1]{priority}, 1, 'Item is correctly priority 1');
-is($reserves[2]{priority}, 2, 'Item is correctly priority 2');
-
-@reserves = Koha::Holds->search({ borrowernumber => $requesters{'RPL'} })->waiting();
+my $biblio = Koha::Biblios->find( $bibnum2 );
+my $holds = $biblio->holds({}, { order_by => 'reserve_id' });;
+is($holds->next->priority, 0, 'Item is correctly waiting');
+is($holds->next->priority, 1, 'Item is correctly priority 1');
+is($holds->next->priority, 2, 'Item is correctly priority 2');
+
+my @reserves = Koha::Holds->search({ borrowernumber => $requesters{$branch_3} })->waiting();
is( @reserves, 1, 'GetWaiting got only the waiting reserve' );
-is( $reserves[0]->borrowernumber(), $requesters{'RPL'}, 'GetWaiting got the reserve for the correct borrower' );
+is( $reserves[0]->borrowernumber(), $requesters{$branch_3}, 'GetWaiting got the reserve for the correct borrower' );
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum2));
-AddReserve('RPL', $requesters{'RPL'}, $bibnum2,
+AddReserve($branch_3, $requesters{$branch_3}, $bibnum2,
$bibitems, 1, $resdate, $expdate, $notes,
$title, $checkitem, $found);
-AddReserve('FPL', $requesters{'FPL'}, $bibnum2,
+AddReserve($branch_2, $requesters{$branch_2}, $bibnum2,
$bibitems, 2, $resdate, $expdate, $notes,
$title, $checkitem, $found);
-AddReserve('CPL', $requesters{'CPL'}, $bibnum2,
+AddReserve($branch_1, $requesters{$branch_1}, $bibnum2,
$bibitems, 3, $resdate, $expdate, $notes,
$title, $checkitem, $found);
# Ensure that the item's home library controls hold policy lookup
-C4::Context->set_preference( 'ReservesControlBranch', 'ItemHomeLibrary' );
+t::lib::Mocks::mock_preference( 'ReservesControlBranch', 'ItemHomeLibrary' );
my $messages;
# Return the CPL item at FPL. The hold that should be triggered is
# the one placed by the CPL patron, as the other two patron's hold
# requests cannot be filled by that item per policy.
-(undef, $messages, undef, undef) = AddReturn('bug10272_CPL', 'FPL');
+(undef, $messages, undef, undef) = AddReturn('bug10272_CPL', $branch_2);
is( $messages->{ResFound}->{borrowernumber},
- $requesters{'CPL'},
+ $requesters{$branch_1},
'restrictive library\'s items only fill requests by own patrons (bug 10272)');
# Return the FPL item at FPL. The hold that should be triggered is
# the one placed by the RPL patron, as that patron is first in line
# and RPL imposes no restrictions on whose holds its items can fill.
-(undef, $messages, undef, undef) = AddReturn('bug10272_FPL', 'FPL');
-is( $messages->{ResFound}->{borrowernumber},
- $requesters{'RPL'},
- 'for generous library, its items fill first hold request in line (bug 10272)');
-
-my $reserves = GetReservesFromBiblionumber({biblionumber => $biblionumber});
-isa_ok($reserves, 'ARRAY');
-is(scalar @$reserves, 1, "Only one reserves for this biblio");
-my $reserve_id = $reserves->[0]->{reserve_id};
-
-$reserve = GetReserve($reserve_id);
-isa_ok($reserve, 'HASH', "GetReserve return");
-is($reserve->{biblionumber}, $biblionumber);
-$reserve = CancelReserve({reserve_id => $reserve_id});
-isa_ok($reserve, 'HASH', "CancelReserve return");
-is($reserve->{biblionumber}, $biblionumber);
+# Ensure that the preference 'LocalHoldsPriority' is not set (Bug 15244):
+t::lib::Mocks::mock_preference( 'LocalHoldsPriority', '' );
-$reserve = GetReserve($reserve_id);
-is($reserve, undef, "GetReserve returns undef after deletion");
-
-$reserve = CancelReserve({reserve_id => $reserve_id});
-is($reserve, undef, "CancelReserve return undef if reserve does not exist");
+(undef, $messages, undef, undef) = AddReturn('bug10272_FPL', $branch_2);
+is( $messages->{ResFound}->{borrowernumber},
+ $requesters{$branch_3},
+ 'for generous library, its items fill first hold request in line (bug 10272)');
+$biblio = Koha::Biblios->find( $biblionumber );
+$holds = $biblio->holds;
+is($holds->count, 1, "Only one reserves for this biblio");
+my $reserve_id = $holds->next->reserve_id;
# 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)
$resdate= undef; #defaults to today in AddReserve
$expdate= undef; #no expdate
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum));
-AddReserve('CPL', $requesters{'CPL'}, $bibnum,
+AddReserve($branch_1, $requesters{$branch_1}, $bibnum,
$bibitems, 1, $resdate, $expdate, $notes,
$title, $checkitem, $found);
($status)=CheckReserves($itemnumber,undef,undef);
# Test 9761b: Add a reserve with future date, CheckReserve should not return it
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum));
-C4::Context->set_preference('AllowHoldDateInFuture', 1);
+t::lib::Mocks::mock_preference('AllowHoldDateInFuture', 1);
$resdate= dt_from_string();
$resdate->add_duration(DateTime::Duration->new(days => 4));
$resdate=output_pref($resdate);
$expdate= undef; #no expdate
-AddReserve('CPL', $requesters{'CPL'}, $bibnum,
+AddReserve($branch_1, $requesters{$branch_1}, $bibnum,
$bibitems, 1, $resdate, $expdate, $notes,
$title, $checkitem, $found);
($status)=CheckReserves($itemnumber,undef,undef);
# Test 9761d: Check ResFound message of AddReturn for future hold
# Note that AddReturn is in Circulation.pm, but this test really pertains to reserves; AddReturn uses the ConfirmFutureHolds pref when calling CheckReserves
# In this test we do not need an issued item; it is just a 'checkin'
-C4::Context->set_preference('ConfirmFutureHolds', 0);
-(my $doreturn, $messages)= AddReturn('97531','CPL');
+t::lib::Mocks::mock_preference('ConfirmFutureHolds', 0);
+(my $doreturn, $messages)= AddReturn('97531',$branch_1);
is($messages->{ResFound}//'', '', 'AddReturn does not care about future reserve when ConfirmFutureHolds is off');
-C4::Context->set_preference('ConfirmFutureHolds', 3);
-($doreturn, $messages)= AddReturn('97531','CPL');
+t::lib::Mocks::mock_preference('ConfirmFutureHolds', 3);
+($doreturn, $messages)= AddReturn('97531',$branch_1);
is(exists $messages->{ResFound}?1:0, 0, 'AddReturn ignores future reserve beyond ConfirmFutureHolds days');
-C4::Context->set_preference('ConfirmFutureHolds', 7);
-($doreturn, $messages)= AddReturn('97531','CPL');
+t::lib::Mocks::mock_preference('ConfirmFutureHolds', 7);
+($doreturn, $messages)= AddReturn('97531',$branch_1);
is(exists $messages->{ResFound}?1:0, 1, 'AddReturn considers future reserve within ConfirmFutureHolds days');
# End of tests for bug 9761 (ConfirmFutureHolds)
# test marking a hold as captured
my $hold_notice_count = count_hold_print_messages();
-ModReserveAffect($itemnumber, $requesters{'CPL'}, 0);
+ModReserveAffect($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{'CPL'}, 0);
+ModReserveAffect($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);
is(
- DelItemCheck($dbh, $bibnum, $itemnumber),
+ DelItemCheck( $bibnum, $itemnumber),
'book_reserved',
'item that is captured to fill a hold cannot be deleted',
);
-my $letter = ReserveSlip('CPL', $requesters{'CPL'}, $bibnum);
+my $letter = ReserveSlip($branch_1, $requesters{$branch_1}, $bibnum);
ok(defined($letter), 'can successfully generate hold slip (bug 10949)');
-# Tests for bug 9788: Does GetReservesFromItemnumber return a future wait?
-# 9788a: GetReservesFromItemnumber does not return future next available hold
+# Tests for bug 9788: Does Koha::Item->current_holds return a future wait?
+# 9788a: current_holds does not return future next available hold
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum));
-C4::Context->set_preference('ConfirmFutureHolds', 2);
-C4::Context->set_preference('AllowHoldDateInFuture', 1);
+t::lib::Mocks::mock_preference('ConfirmFutureHolds', 2);
+t::lib::Mocks::mock_preference('AllowHoldDateInFuture', 1);
$resdate= dt_from_string();
$resdate->add_duration(DateTime::Duration->new(days => 2));
$resdate=output_pref($resdate);
-AddReserve('CPL', $requesters{'CPL'}, $bibnum,
+AddReserve($branch_1, $requesters{$branch_1}, $bibnum,
$bibitems, 1, $resdate, $expdate, $notes,
$title, $checkitem, $found);
-my @results= GetReservesFromItemnumber($itemnumber);
-is(defined $results[3]?1:0, 0, 'GetReservesFromItemnumber does not return a future next available hold');
-# 9788b: GetReservesFromItemnumber does not return future item level hold
+my $item = Koha::Items->find( $itemnumber );
+$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('CPL', $requesters{'CPL'}, $bibnum,
+AddReserve($branch_1, $requesters{$branch_1}, $bibnum,
$bibitems, 1, $resdate, $expdate, $notes,
$title, $itemnumber, $found); #item level hold
-@results= GetReservesFromItemnumber($itemnumber);
-is(defined $results[3]?1:0, 0, 'GetReservesFromItemnumber does not return a future item level hold');
-# 9788c: GetReservesFromItemnumber returns future wait (confirmed future hold)
-ModReserveAffect( $itemnumber, $requesters{'CPL'} , 0); #confirm hold
-@results= GetReservesFromItemnumber($itemnumber);
-is(defined $results[3]?1:0, 1, 'GetReservesFromItemnumber returns a future wait (confirmed future 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
+$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
+$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum));
# Tests for CalculatePriority (bug 8918)
my $p = C4::Reserves::CalculatePriority($bibnum2);
is($p, 4, 'CalculatePriority should now return priority 4');
$resdate=undef;
-AddReserve('CPL', $requesters{'CPL'}, $bibnum2,
+AddReserve($branch_1, $requesters{'CPL2'}, $bibnum2,
$bibitems, $p, $resdate, $expdate, $notes,
$title, $checkitem, $found);
$p = C4::Reserves::CalculatePriority($bibnum2);
$p = C4::Reserves::CalculatePriority($bibnum);
is($p, 1, 'CalculatePriority should now return priority 1');
#add a new reserve and confirm it to waiting
-AddReserve('CPL', $requesters{'CPL'}, $bibnum,
+AddReserve($branch_1, $requesters{$branch_1}, $bibnum,
$bibitems, $p, $resdate, $expdate, $notes,
$title, $itemnumber, $found);
$p = C4::Reserves::CalculatePriority($bibnum);
is($p, 2, 'CalculatePriority should now return priority 2');
-ModReserveAffect( $itemnumber, $requesters{'CPL'} , 0);
+ModReserveAffect( $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('CPL', $requesters{'CPL'}, $bibnum,
+AddReserve($branch_1, $requesters{'CPL2'}, $bibnum,
$bibitems, $p, $resdate, $expdate, $notes,
$title, $checkitem, $found);
$p = C4::Reserves::CalculatePriority($bibnum);
is($p, 2, 'CalculatePriority should now return priority 2');
#add another future hold
-C4::Context->set_preference('AllowHoldDateInFuture', 1);
+t::lib::Mocks::mock_preference('AllowHoldDateInFuture', 1);
$resdate= dt_from_string();
$resdate->add_duration(DateTime::Duration->new(days => 1));
-AddReserve('CPL', $requesters{'CPL'}, $bibnum,
+AddReserve($branch_1, $requesters{'CPL3'}, $bibnum,
$bibitems, $p, output_pref($resdate), $expdate, $notes,
$title, $checkitem, $found);
$p = C4::Reserves::CalculatePriority($bibnum);
# Tests for cancel reserves by users from OPAC.
$dbh->do('DELETE FROM reserves', undef, ($bibnum));
-AddReserve('CPL', $requesters{'CPL'}, $item_bibnum,
+AddReserve($branch_1, $requesters{$branch_1}, $item_bibnum,
$bibitems, 1, undef, $expdate, $notes,
$title, $checkitem, '');
my (undef, $canres, undef) = CheckReserves($itemnumber);
'CanReserveBeCanceledFromOpac should return undef if called without borrowernumber'
);
-my $cancancel = CanReserveBeCanceledFromOpac($canres->{reserve_id}, $requesters{'CPL'});
+my $cancancel = CanReserveBeCanceledFromOpac($canres->{reserve_id}, $requesters{$branch_1});
is($cancancel, 1, 'Can user cancel its own reserve');
-$cancancel = CanReserveBeCanceledFromOpac($canres->{reserve_id}, $requesters{'FPL'});
+$cancancel = CanReserveBeCanceledFromOpac($canres->{reserve_id}, $requesters{$branch_2});
is($cancancel, 0, 'Other user cant cancel reserve');
-ModReserveAffect($itemnumber, $requesters{'CPL'}, 1);
-$cancancel = CanReserveBeCanceledFromOpac($canres->{reserve_id}, $requesters{'CPL'});
+ModReserveAffect($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('CPL', $requesters{'CPL'}, $item_bibnum,
+AddReserve($branch_1, $requesters{$branch_1}, $item_bibnum,
$bibitems, 1, undef, $expdate, $notes,
$title, $checkitem, '');
(undef, $canres, undef) = CheckReserves($itemnumber);
-ModReserveAffect($itemnumber, $requesters{'CPL'}, 0);
-$cancancel = CanReserveBeCanceledFromOpac($canres->{reserve_id}, $requesters{'CPL'});
+ModReserveAffect($itemnumber, $requesters{$branch_1}, 0);
+$cancancel = CanReserveBeCanceledFromOpac($canres->{reserve_id}, $requesters{$branch_1});
is($cancancel, 0, 'Reserve in waiting status cant be canceled');
# End of tests for bug 12876
####### Testing Bug 13113 - Prevent juvenile/children from reserving ageRestricted material >>>
####
-C4::Context->set_preference( 'AgeRestrictionMarker', 'FSK|PEGI|Age|K' );
+t::lib::Mocks::mock_preference( 'AgeRestrictionMarker', 'FSK|PEGI|Age|K' );
#Reserving an not-agerestricted Biblio by a Borrower with no dateofbirth is tested previously.
#Set the ageRestriction for the Biblio
-my $record = GetMarcBiblio( $bibnum );
+my $record = GetMarcBiblio({ biblionumber => $bibnum });
my ( $ageres_tagid, $ageres_subfieldid ) = GetMarcFromKohaField( "biblioitems.agerestriction" );
$record->append_fields( MARC::Field->new($ageres_tagid, '', '', $ageres_subfieldid => 'PEGI 16') );
-C4::Biblio::ModBiblio( $record, $bibnum, '' );
+C4::Biblio::ModBiblio( $record, $bibnum, $frameworkcode );
is( C4::Reserves::CanBookBeReserved($borrowernumber, $biblionumber) , 'OK', "Reserving an ageRestricted Biblio without a borrower dateofbirth succeeds" );
-#Set the dateofbirth for the Borrower making him "too young".
-my $now = DateTime->now();
-C4::Members::SetAge( $borrower, '0015-00-00' );
+#Set the dateofbirth for the Borrower making them "too young".
+$borrower->{dateofbirth} = DateTime->now->add( years => -15 );
C4::Members::ModMember( borrowernumber => $borrowernumber, dateofbirth => $borrower->{dateofbirth} );
is( C4::Reserves::CanBookBeReserved($borrowernumber, $biblionumber) , 'ageRestricted', "Reserving a 'PEGI 16' Biblio by a 15 year old borrower fails");
-#Set the dateofbirth for the Borrower making him "too old".
-C4::Members::SetAge( $borrower, '0030-00-00' );
+#Set the dateofbirth for the Borrower making them "too old".
+$borrower->{dateofbirth} = DateTime->now->add( years => -30 );
C4::Members::ModMember( borrowernumber => $borrowernumber, dateofbirth => $borrower->{dateofbirth} );
is( C4::Reserves::CanBookBeReserved($borrowernumber, $biblionumber) , 'OK', "Reserving a 'PEGI 16' Biblio by a 30 year old borrower succeeds");
####### EO Bug 13113 <<<
####
-my $item = GetItem($itemnumber);
+$item = GetItem($itemnumber);
ok( C4::Reserves::IsAvailableForItemLevelRequest($item, $borrower), "Reserving a book on item level" );
my $itype = C4::Reserves::_get_itype($item);
my $categorycode = $borrower->{categorycode};
my $holdingbranch = $item->{holdingbranch};
-my $rule = C4::Circulation::GetIssuingRule($categorycode, $itype, $holdingbranch);
+my $issuing_rule = Koha::IssuingRules->get_effective_issuing_rule(
+ {
+ categorycode => $categorycode,
+ itemtype => $itype,
+ branchcode => $holdingbranch
+ }
+);
$dbh->do(
"UPDATE issuingrules SET onshelfholds = 1 WHERE categorycode = ? AND itemtype= ? and branchcode = ?",
undef,
- $rule->{categorycode}, $rule->{itemtype}, $rule->{branchcode}
+ $issuing_rule->categorycode, $issuing_rule->itemtype, $issuing_rule->branchcode
);
ok( C4::Reserves::OnShelfHoldsAllowed($item, $borrower), "OnShelfHoldsAllowed() allowed" );
$dbh->do(
"UPDATE issuingrules SET onshelfholds = 0 WHERE categorycode = ? AND itemtype= ? and branchcode = ?",
undef,
- $rule->{categorycode}, $rule->{itemtype}, $rule->{branchcode}
+ $issuing_rule->categorycode, $issuing_rule->itemtype, $issuing_rule->branchcode
);
ok( !C4::Reserves::OnShelfHoldsAllowed($item, $borrower), "OnShelfHoldsAllowed() disallowed" );
-# Tests for bug 14464
-
-$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum));
-my ( undef, undef, $bz14464_fines ) = GetMemberIssuesAndFines( $borrowernumber );
-ok( !$bz14464_fines, 'Bug 14464 - No fines at beginning' );
-
-# First, test cancelling a reserve when there's no charge configured.
-t::lib::Mocks::mock_preference('ExpireReservesMaxPickUpDelayCharge', 0);
-
-my $bz14464_reserve = AddReserve(
- 'CPL',
- $borrowernumber,
- $bibnum,
- undef,
- '1',
- undef,
- undef,
- '',
- $title,
- $itemnumber,
- 'W'
-);
-
-ok( $bz14464_reserve, 'Bug 14464 - 1st reserve correctly created' );
-
-CancelReserve({ reserve_id => $bz14464_reserve, charge_cancel_fee => 1 });
-
-( undef, undef, $bz14464_fines ) = GetMemberIssuesAndFines( $borrowernumber );
-ok( !$bz14464_fines, 'Bug 14464 - No fines after cancelling reserve with no charge configured' );
-
-# Then, test cancelling a reserve when there's no charge desired.
-t::lib::Mocks::mock_preference('ExpireReservesMaxPickUpDelayCharge', 42);
-
-$bz14464_reserve = AddReserve(
- 'CPL',
- $borrowernumber,
- $bibnum,
- undef,
- '1',
- undef,
- undef,
- '',
- $title,
- $itemnumber,
- 'W'
-);
-
-ok( $bz14464_reserve, 'Bug 14464 - 2nd reserve correctly created' );
-
-CancelReserve({ reserve_id => $bz14464_reserve });
-
-( undef, undef, $bz14464_fines ) = GetMemberIssuesAndFines( $borrowernumber );
-ok( !$bz14464_fines, 'Bug 14464 - No fines after cancelling reserve with no charge desired' );
-
-# Finally, test cancelling a reserve when there's a charge desired and configured.
-$bz14464_reserve = AddReserve(
- 'CPL',
- $borrowernumber,
- $bibnum,
- undef,
- '1',
- undef,
- undef,
- '',
- $title,
- $itemnumber,
- 'W'
-);
-
-ok( $bz14464_reserve, 'Bug 14464 - 1st reserve correctly created' );
-
-CancelReserve({ reserve_id => $bz14464_reserve, charge_cancel_fee => 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 );
+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 );
+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 );
+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 );
+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 );
+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 );
+is( $status, 'Reserved', 'MoveReserve did not fill future hold of 3 days');
+$dbh->do('DELETE FROM reserves', undef, ($bibnum));
-( undef, undef, $bz14464_fines ) = GetMemberIssuesAndFines( $borrowernumber );
-is( int( $bz14464_fines ), 42, 'Bug 14464 - Fine applied after cancelling reserve with charge desired and configured' );
+$cache->clear_from_cache("MarcStructure-0-$frameworkcode");
+$cache->clear_from_cache("MarcStructure-1-$frameworkcode");
+$cache->clear_from_cache("default_value_for_mod_marc-$frameworkcode");
+$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
+
+subtest '_koha_notify_reserve() tests' => sub {
+
+ plan tests => 2;
+
+ my $wants_hold_and_email = {
+ wants_digest => '0',
+ transports => {
+ sms => 'HOLD',
+ email => 'HOLD',
+ },
+ letter_code => 'HOLD'
+ };
+
+ my $mp = Test::MockModule->new( 'C4::Members::Messaging' );
+
+ $mp->mock("GetMessagingPreferences",$wants_hold_and_email);
+
+ $dbh->do('DELETE FROM letter');
+
+ my $email_hold_notice = $builder->build({
+ source => 'Letter',
+ value => {
+ message_transport_type => 'email',
+ branchcode => '',
+ code => 'HOLD',
+ module => 'reserves',
+ lang => 'default',
+ }
+ });
+
+ my $sms_hold_notice = $builder->build({
+ source => 'Letter',
+ value => {
+ message_transport_type => 'sms',
+ branchcode => '',
+ code => 'HOLD',
+ module => 'reserves',
+ lang=>'default',
+ }
+ });
+
+ my $hold_borrower = $builder->build({
+ source => 'Borrower',
+ value => {
+ smsalertnumber=>'5555555555',
+ email=>'a@b.com',
+ }
+ })->{borrowernumber};
+
+ my $hold = $builder->build({
+ source => 'Reserve',
+ value => {
+ borrowernumber=>$hold_borrower
+ }
+ });
+
+ ModReserveAffect($hold->{itemnumber}, $hold->{borrowernumber}, 0);
+ my $sms_message_address = $schema->resultset('MessageQueue')->search({
+ letter_code => 'HOLD',
+ message_transport_type => 'sms',
+ borrowernumber => $hold_borrower,
+ })->next()->to_address();
+ is($sms_message_address, undef ,"We should not populate the sms message with the sms number, sending will do so");
+
+ my $email_message_address = $schema->resultset('MessageQueue')->search({
+ letter_code => 'HOLD',
+ message_transport_type => 'email',
+ borrowernumber => $hold_borrower,
+ })->next()->to_address();
+ is($email_message_address, undef ,"We should not populate the hold message with the email address, sending will do so");
-$dbh->rollback;
+};
sub count_hold_print_messages {
my $message_count = $dbh->selectall_arrayref(q{
});
return $message_count->[0]->[0];
}
+
+# we reached the finish
+$schema->storage->txn_rollback();
projects / koha.git / blobdiff