Attachment #171435 for bug #33200

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




    return @results;
}

=head2 _FilterHoldsForIndependentBranches

  @reserves = &_FilterHoldsForIndependentBranches( @reserves );

Check transfers is allowed from system preference and remove the reserves made from other branches

C<&_FilterHoldsForIndependentBranches> returns :
C<@results> is an array of references-to-hash whose keys are mostly
fields from the reserves table of the Koha database, plus

=cut

sub _FilterHoldsForIndependentBranches {
    my ( @reserves) = @_;
    if ( C4::Context->preference("IndependentBranchesTransfers") && !C4::Context->IsSuperLibrarian() && scalar @reserves) {
        my @results;





use Modern::Perl;

use Test::More tests => 81;
use Test::MockModule;
use Test::Warn;




t::lib::Mocks::mock_preference('ReservesNeedReturns', 1);
t::lib::Mocks::mock_preference( 'IndependentBranchesTransfers', 0 );

# 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);

($status, $reserve, $all_reserves) = CheckReserves( $item );
is($status, "Reserved", "CheckReserves Test 2");

# Set the preference 'IndependentBranchesTransfers' is set to 'yes'
# the userenv branch and the branche code are not the same holds should be filtered
t::lib::Mocks::mock_preference( 'IndependentBranchesTransfers', 1 );
($status, $reserve, $all_reserves) = CheckReserves( $item );
is( $status, "", 'Reserves is filtered');

# Set the userenv branchcode to be the same to the item branchcode.
t::lib::Mocks::mock_userenv({ branchcode => $branchcode });
($status, $reserve, $all_reserves) = CheckReserves( $item );
is( $status, "Reserved", 'Reserves should not be filtered');

t::lib::Mocks::mock_userenv({ branchcode => $branch_1 });
t::lib::Mocks::mock_preference( 'IndependentBranchesTransfers', 0 );
my $ReservesControlBranch = C4::Context->preference('ReservesControlBranch');
t::lib::Mocks::mock_preference( 'ReservesControlBranch', 'ItemHomeLibrary' );
ok(
	$item->homebranch eq Koha::Policy::Holds->holds_control_library( $item, $patron	),
    "Koha::Policy::Holds->holds_control_library returns item home branch when set to ItemHomeLibrary"
);
t::lib::Mocks::mock_preference( 'ReservesControlBranch', 'PatronLibrary' );
ok(
	$patron->branchcode eq Koha::Policy::Holds->holds_control_library( $item, $patron ),
    "Koha::Policy::Holds->holds_control_library returns patron home branch when set to PatronLibrary"
);
t::lib::Mocks::mock_preference( 'ReservesControlBranch', $ReservesControlBranch );

###
### Regression test for bug 10272
###
- 

Return to bug 33200

Lines 1780-1798 sub _Findgroupreserve { Link Here

(-)a/C4/Reserves.pm (-4 / +4 lines)
1780	return @results;	1780	return @results;
1781	}	1781	}
1782		1782
1783	=head2 _Removereserve	1783	=head2 _FilterHoldsForIndependentBranches
1784		1784
1785	@reserves = &_Removereserve( @reserves );	1785	@reserves = &_FilterHoldsForIndependentBranches( @reserves );
1786		1786
1787	Check transfers is allowed from system preference and remove the reserves made from other branches	1787	Check transfers is allowed from system preference and remove the reserves made from other branches
1788		1788
1789	C<&_Removereserve> returns :	1789	C<&_FilterHoldsForIndependentBranches> returns :
1790	C<@results> is an array of references-to-hash whose keys are mostly	1790	C<@results> is an array of references-to-hash whose keys are mostly
1791	fields from the reserves table of the Koha database, plus	1791	fields from the reserves table of the Koha database, plus
1792		1792
1793	=cut	1793	=cut
1794		1794
1795	sub _Removereserve {	1795	sub _FilterHoldsForIndependentBranches {
1796	my ( @reserves) = @_;	1796	my ( @reserves) = @_;
1797	if ( C4::Context->preference("IndependentBranchesTransfers") && !C4::Context->IsSuperLibrarian() && scalar @reserves) {	1797	if ( C4::Context->preference("IndependentBranchesTransfers") && !C4::Context->IsSuperLibrarian() && scalar @reserves) {
1798	my @results;	1798	my @results;

Lines 17-23 Link Here

(-)a/t/db_dependent/Reserves.t (-2 / +28 lines)
17		17
18	use Modern::Perl;	18	use Modern::Perl;
19		19
20	use Test::More tests => 77;	20	use Test::More tests => 81;
21	use Test::MockModule;	21	use Test::MockModule;
22	use Test::Warn;	22	use Test::Warn;
23		23
Lines 62-67 my $frameworkcode = q//; Link Here
62		62
63		63
64	t::lib::Mocks::mock_preference('ReservesNeedReturns', 1);	64	t::lib::Mocks::mock_preference('ReservesNeedReturns', 1);
		65	t::lib::Mocks::mock_preference( 'IndependentBranchesTransfers', 0 );
65		66
66	# Somewhat arbitrary field chosen for age restriction unit tests. Must be added to db before the framework is cached	67	# Somewhat arbitrary field chosen for age restriction unit tests. Must be added to db before the framework is cached
67	$dbh->do("update marc_subfield_structure set kohafield='biblioitems.agerestriction' where tagfield='521' and tagsubfield='a' and frameworkcode=?", undef, $frameworkcode);	68	$dbh->do("update marc_subfield_structure set kohafield='biblioitems.agerestriction' where tagfield='521' and tagsubfield='a' and frameworkcode=?", undef, $frameworkcode);
Lines 128-133 ok(exists($reserve->{reserve_id}), 'CheckReserves() include reserve_id in its re Link Here
128	($status, $reserve, $all_reserves) = CheckReserves( $item );	129	($status, $reserve, $all_reserves) = CheckReserves( $item );
129	is($status, "Reserved", "CheckReserves Test 2");	130	is($status, "Reserved", "CheckReserves Test 2");
130		131
		132	# Set the preference 'IndependentBranchesTransfers' is set to 'yes'
		133	# the userenv branch and the branche code are not the same holds should be filtered
		134	t::lib::Mocks::mock_preference( 'IndependentBranchesTransfers', 1 );
		135	($status, $reserve, $all_reserves) = CheckReserves( $item );
		136	is( $status, "", 'Reserves is filtered');
		137
		138	# Set the userenv branchcode to be the same to the item branchcode.
		139	t::lib::Mocks::mock_userenv({ branchcode => $branchcode });
		140	($status, $reserve, $all_reserves) = CheckReserves( $item );
		141	is( $status, "Reserved", 'Reserves should not be filtered');
		142
		143	t::lib::Mocks::mock_userenv({ branchcode => $branch_1 });
		144	t::lib::Mocks::mock_preference( 'IndependentBranchesTransfers', 0 );
		145	my $ReservesControlBranch = C4::Context->preference('ReservesControlBranch');
		146	t::lib::Mocks::mock_preference( 'ReservesControlBranch', 'ItemHomeLibrary' );
		147	ok(
		148	$item->homebranch eq Koha::Policy::Holds->holds_control_library( $item, $patron ),
		149	"Koha::Policy::Holds->holds_control_library returns item home branch when set to ItemHomeLibrary"
		150	);
		151	t::lib::Mocks::mock_preference( 'ReservesControlBranch', 'PatronLibrary' );
		152	ok(
		153	$patron->branchcode eq Koha::Policy::Holds->holds_control_library( $item, $patron ),
		154	"Koha::Policy::Holds->holds_control_library returns patron home branch when set to PatronLibrary"
		155	);
		156	t::lib::Mocks::mock_preference( 'ReservesControlBranch', $ReservesControlBranch );
		157
131	###	158	###
132	### Regression test for bug 10272	159	### Regression test for bug 10272
133	###	160	###
134	-