Attachment #31631 for bug #12803

View | Details | Raw Unified | Return to bug 12803
Collapse All | Expand All

Lines 67-79 sub TransportCostMatrix { Link Here

(-)a/C4/HoldsQueue.pm (-4 / +16 lines)
67	my $dbh = C4::Context->dbh;	67	my $dbh = C4::Context->dbh;
68	my $transport_costs = $dbh->selectall_arrayref("SELECT * FROM transport_cost",{ Slice => {} });	68	my $transport_costs = $dbh->selectall_arrayref("SELECT * FROM transport_cost",{ Slice => {} });
69		69
		70	my $today = dt_from_string();
		71	my $calendars;
70	my %transport_cost_matrix;	72	my %transport_cost_matrix;
71	foreach (@$transport_costs) {	73	foreach (@$transport_costs) {
72	my $from = $_->{frombranch};	74	my $from = $_->{frombranch};
73	my $to = $_->{tobranch};	75	my $to = $_->{tobranch};
74	my $cost = $_->{cost};	76	my $cost = $_->{cost};
75	my $disabled = $_->{disable_transfer};	77	my $disabled = $_->{disable_transfer};
76	$transport_cost_matrix{$to}{$from} = { cost => $cost, disable_transfer => $disabled };	78	$transport_cost_matrix{$to}{$from} = {
		79	cost => $cost,
		80	disable_transfer => $disabled
		81	};
		82
		83	if ( C4::Context->preference("HoldsQueueSkipClosed") ) {
		84	$calendars->{$from} \|\|= C4::Calendar->new( branchcode => $from );
		85	$transport_cost_matrix{$to}{$from}{disable_transfer} \|\|=
		86	$calendars->{$from}->isHoliday( $today->day(), $today->month(), $today->year() );
		87	}
		88
77	}	89	}
78	return \%transport_cost_matrix;	90	return \%transport_cost_matrix;
79	}	91	}





use Modern::Perl;

use Test::More tests => 23;
use Data::Dumper;

use C4::Context;


#Set up the stage
# Sysprefs and cost matrix
C4::Context->set_preference('HoldsQueueSkipClosed', 0);
$dbh->do("UPDATE systempreferences SET value = ? WHERE variable = 'StaticHoldsQueueWeight'", undef,
         join( ',', @other_branches, $borrower_branchcode, $least_cost_branch_code));
$dbh->do("UPDATE systempreferences SET value = '0' WHERE variable = 'RandomizeHoldsQueueWeight'");

ok( $holds_queue->[0]->{cardnumber} eq 'CARDNUMBER1', "Holds queue filling 1st correct hold for default holds policy 'from home library'");
ok( $holds_queue->[1]->{cardnumber} eq 'CARDNUMBER2', "Holds queue filling 2nd correct hold for default holds policy 'from home library'");

$dbh->do("DELETE FROM default_circ_rules");
$dbh->do("INSERT INTO default_circ_rules ( holdallowed ) VALUES ( 2 )");
C4::HoldsQueue::CreateQueue();
$holds_queue = $dbh->selectall_arrayref("SELECT * FROM tmp_holdsqueue", { Slice => {} });
ok( @$holds_queue == 3, "Holds queue filling correct number for holds for default holds policy 'from any library'" );
#warn "HOLDS QUEUE: " . Data::Dumper::Dumper( $holds_queue );

# Test skipping hold picks for closed libraries.
# At this point in the test, we have 2 rows in the holds queue
# 1 of which is coming from MPL. Let's enable HoldsQueueSkipClosed
# and make today a holiday for MPL. When we run it again we should only
# have 1 row in the holds queue
C4::Context->set_preference('HoldsQueueSkipClosed', 1);
my $today = dt_from_string();
C4::Calendar->new( branchcode => 'MPL' )->insert_single_holiday(
    day         => $today->day(),

);
C4::HoldsQueue::CreateQueue();
$holds_queue = $dbh->selectall_arrayref("SELECT * FROM tmp_holdsqueue", { Slice => {} });
ok( @$holds_queue == 1, "Holds not filled with items from closed libraries" );
C4::Context->set_preference('HoldsQueueSkipClosed', 0);

$dbh->do("DELETE FROM default_circ_rules");
$dbh->do("INSERT INTO default_circ_rules ( holdallowed ) VALUES ( 2 )");
C4::HoldsQueue::CreateQueue();
$holds_queue = $dbh->selectall_arrayref("SELECT * FROM tmp_holdsqueue", { Slice => {} });
ok( @$holds_queue == 3, "Holds queue filling correct number for holds for default holds policy 'from any library'" );
#warn "HOLDS QUEUE: " . Data::Dumper::Dumper( $holds_queue );

# Test skipping hold picks for closed libraries without transport cost matrix
# At this point in the test, we have 3 rows in the holds queue
# one of which is coming from MPL. Let's enable HoldsQueueSkipClosed
# and use our previously created holiday for MPL. 
# When we run it again we should only have 2 rows in the holds queue
C4::Context->set_preference( 'HoldsQueueSkipClosed', 1 );
C4::HoldsQueue::CreateQueue();
$holds_queue = $dbh->selectall_arrayref("SELECT * FROM tmp_holdsqueue", { Slice => {} });
ok( @$holds_queue == 2, "Holds not filled with items from closed libraries" );

# Cleanup
- 

Return to bug 12803

Lines 8-14 Link Here

(-)a/t/db_dependent/HoldsQueue.t (-13 / +24 lines)
8		8
9	use Modern::Perl;	9	use Modern::Perl;
10		10
11	use Test::More tests => 22;	11	use Test::More tests => 23;
12	use Data::Dumper;	12	use Data::Dumper;
13		13
14	use C4::Context;	14	use C4::Context;
Lines 53-58 my $itemtype = grep { $_->{notforloan} == 1 } @item_types Link Here
53		53
54	#Set up the stage	54	#Set up the stage
55	# Sysprefs and cost matrix	55	# Sysprefs and cost matrix
		56	C4::Context->set_preference('HoldsQueueSkipClosed', 0);
56	$dbh->do("UPDATE systempreferences SET value = ? WHERE variable = 'StaticHoldsQueueWeight'", undef,	57	$dbh->do("UPDATE systempreferences SET value = ? WHERE variable = 'StaticHoldsQueueWeight'", undef,
57	join( ',', @other_branches, $borrower_branchcode, $least_cost_branch_code));	58	join( ',', @other_branches, $borrower_branchcode, $least_cost_branch_code));
58	$dbh->do("UPDATE systempreferences SET value = '0' WHERE variable = 'RandomizeHoldsQueueWeight'");	59	$dbh->do("UPDATE systempreferences SET value = '0' WHERE variable = 'RandomizeHoldsQueueWeight'");
Lines 289-307 ok( @$holds_queue == 2, "Holds queue filling correct number for default holds po Link Here
289	ok( $holds_queue->[0]->{cardnumber} eq 'CARDNUMBER1', "Holds queue filling 1st correct hold for default holds policy 'from home library'");	290	ok( $holds_queue->[0]->{cardnumber} eq 'CARDNUMBER1', "Holds queue filling 1st correct hold for default holds policy 'from home library'");
290	ok( $holds_queue->[1]->{cardnumber} eq 'CARDNUMBER2', "Holds queue filling 2nd correct hold for default holds policy 'from home library'");	291	ok( $holds_queue->[1]->{cardnumber} eq 'CARDNUMBER2', "Holds queue filling 2nd correct hold for default holds policy 'from home library'");
291		292
292	$dbh->do("DELETE FROM default_circ_rules");
293	$dbh->do("INSERT INTO default_circ_rules ( holdallowed ) VALUES ( 2 )");
294	C4::HoldsQueue::CreateQueue();
295	$holds_queue = $dbh->selectall_arrayref("SELECT * FROM tmp_holdsqueue", { Slice => {} });
296	ok( @$holds_queue == 3, "Holds queue filling correct number for holds for default holds policy 'from any library'" );
297	#warn "HOLDS QUEUE: " . Data::Dumper::Dumper( $holds_queue );
298
299	# Test skipping hold picks for closed libraries.	293	# Test skipping hold picks for closed libraries.
300	# At this point in the test, we have 3 rows in the holds queue	294	# At this point in the test, we have 2 rows in the holds queue
301	# one of which is coming from MPL. Let's enable HoldsQueueSkipClosed	295	# 1 of which is coming from MPL. Let's enable HoldsQueueSkipClosed
302	# and make today a holiday for MPL. When we run it again we should only	296	# and make today a holiday for MPL. When we run it again we should only
303	# have 2 rows in the holds queue	297	# have 1 row in the holds queue
304	C4::Context->set_preference( 'HoldsQueueSkipClosed', 1 );	298	C4::Context->set_preference('HoldsQueueSkipClosed', 1);
305	my $today = dt_from_string();	299	my $today = dt_from_string();
306	C4::Calendar->new( branchcode => 'MPL' )->insert_single_holiday(	300	C4::Calendar->new( branchcode => 'MPL' )->insert_single_holiday(
307	day => $today->day(),	301	day => $today->day(),
Lines 312-317 C4::Calendar->new( branchcode => 'MPL' )->insert_single_holiday( Link Here
312	);	306	);
313	C4::HoldsQueue::CreateQueue();	307	C4::HoldsQueue::CreateQueue();
314	$holds_queue = $dbh->selectall_arrayref("SELECT * FROM tmp_holdsqueue", { Slice => {} });	308	$holds_queue = $dbh->selectall_arrayref("SELECT * FROM tmp_holdsqueue", { Slice => {} });
		309	ok( @$holds_queue == 1, "Holds not filled with items from closed libraries" );
		310	C4::Context->set_preference('HoldsQueueSkipClosed', 0);
		311
		312	$dbh->do("DELETE FROM default_circ_rules");
		313	$dbh->do("INSERT INTO default_circ_rules ( holdallowed ) VALUES ( 2 )");
		314	C4::HoldsQueue::CreateQueue();
		315	$holds_queue = $dbh->selectall_arrayref("SELECT * FROM tmp_holdsqueue", { Slice => {} });
		316	ok( @$holds_queue == 3, "Holds queue filling correct number for holds for default holds policy 'from any library'" );
		317	#warn "HOLDS QUEUE: " . Data::Dumper::Dumper( $holds_queue );
		318
		319	# Test skipping hold picks for closed libraries without transport cost matrix
		320	# At this point in the test, we have 3 rows in the holds queue
		321	# one of which is coming from MPL. Let's enable HoldsQueueSkipClosed
		322	# and use our previously created holiday for MPL.
		323	# When we run it again we should only have 2 rows in the holds queue
		324	C4::Context->set_preference( 'HoldsQueueSkipClosed', 1 );
		325	C4::HoldsQueue::CreateQueue();
		326	$holds_queue = $dbh->selectall_arrayref("SELECT * FROM tmp_holdsqueue", { Slice => {} });
315	ok( @$holds_queue == 2, "Holds not filled with items from closed libraries" );	327	ok( @$holds_queue == 2, "Holds not filled with items from closed libraries" );
316		328
317	# Cleanup	329	# Cleanup
318	-