Attachment 106437 Details for Bug 19889 – Bug 19889: Add tests

[patch] Bug 19889: Add tests

Bug-19889-Add-tests.patch (text/plain), 26.33 KB, created by Agustín Moyano on 2020-06-30 17:16:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Agustín Moyano

Created: 2020-06-30 17:16:53 UTC

Size: 26.33 KB

patch

obsolete

>From a6cb9d22d4968792735106aa454655c39482b169 Mon Sep 17 00:00:00 2001
>From: Agustin Moyano <agustinmoyano@theke.io>
>Date: Wed, 10 Jun 2020 16:15:55 -0300
>Subject: [PATCH] Bug 19889: Add tests
>
>Sponsored-by: Cooperative Information Network (CIN)
>---
> t/db_dependent/Holds/LocalHoldsPriority.t | 117 +++++++++++-
> t/db_dependent/HoldsQueue.t               | 211 ++++++++++++++++++----
> 2 files changed, 286 insertions(+), 42 deletions(-)
>
>diff --git a/t/db_dependent/Holds/LocalHoldsPriority.t b/t/db_dependent/Holds/LocalHoldsPriority.t
>index 98ac219976..26c052b6cd 100755
>--- a/t/db_dependent/Holds/LocalHoldsPriority.t
>+++ b/t/db_dependent/Holds/LocalHoldsPriority.t
>@@ -5,10 +5,11 @@ use Modern::Perl;
> use t::lib::Mocks;
> use C4::Context;
> 
>-use Test::More tests => 6;
>+use Test::More tests => 7;
> use MARC::Record;
> 
> use Koha::Patrons;
>+use Koha::Holds;
> use C4::Biblio;
> use C4::Items;
> use Koha::Database;
>@@ -46,17 +47,16 @@ my $itemnumber = Koha::Item->new(
>         biblionumber  => $biblio->biblionumber,
>         homebranch    => $library4->{branchcode},
>         holdingbranch => $library3->{branchcode},
>-        itype         => $itemtype
>+        itype         => $itemtype,
>+        exclude_from_local_holds_priority => 0,
>     },
> )->store->itemnumber;
> 
>-
> my @branchcodes = ( $library1->{branchcode}, $library2->{branchcode}, $library3->{branchcode}, $library4->{branchcode}, $library3->{branchcode}, $library4->{branchcode} );
>-
>-my $patron_category = $builder->build({ source => 'Category' });
>+my $patron_category = $builder->build({ source => 'Category', value => {exclude_from_local_holds_priority => 0} });
> # Create some borrowers
> my @borrowernumbers;
>-foreach ( 1 .. $borrowers_count ) {
>+foreach ( 0 .. $borrowers_count-1 ) {
>     my $borrowernumber = Koha::Patron->new({
>         firstname    => 'my firstname',
>         surname      => 'my surname ' . $_,
>@@ -102,9 +102,110 @@ ok( $reserve->{borrowernumber} eq $borrowernumbers[1], "Received expected result
> t::lib::Mocks::mock_preference( 'LocalHoldsPriorityPatronControl', 'HomeLibrary' );
> t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'holdingbranch' );
> ($status, $reserve, $all_reserves) = CheckReserves($itemnumber);
>-ok( $reserve->{borrowernumber} eq $borrowernumbers[1], "Received expected results with HomeLibrary/holdingbranch" );
>+ok( $reserve->{borrowernumber} eq $borrowernumbers[2], "Received expected results with HomeLibrary/holdingbranch" );
> 
> t::lib::Mocks::mock_preference( 'LocalHoldsPriorityPatronControl', 'HomeLibrary' );
> t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' );
> ($status, $reserve, $all_reserves) = CheckReserves($itemnumber);
>-ok( $reserve->{borrowernumber} eq $borrowernumbers[2], "Received expected results with HomeLibrary/homebranch" );
>+ok( $reserve->{borrowernumber} eq $borrowernumbers[3], "Received expected results with HomeLibrary/homebranch" );
>+
>+$schema->storage->txn_rollback;
>+
>+subtest "exclude from local holds" => sub {
>+    plan tests => 3;
>+
>+    $schema->storage->txn_begin;
>+
>+    t::lib::Mocks::mock_preference( 'LocalHoldsPriority', 1 );
>+    t::lib::Mocks::mock_preference( 'LocalHoldsPriorityPatronControl', 'HomeLibrary' );
>+    t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' );
>+
>+    my $category_ex = $builder->build_object({ class => 'Koha::Patron::Categories', value => {exclude_from_local_holds_priority => 1} });
>+    my $category_nex = $builder->build_object({ class => 'Koha::Patron::Categories', value => {exclude_from_local_holds_priority => 0} });
>+
>+    my $lib1 = $builder->build_object({ class => 'Koha::Libraries' });
>+    my $lib2 = $builder->build_object({ class => 'Koha::Libraries' });
>+
>+    my $item1 = $builder->build_sample_item({exclude_from_local_holds_priority => 0, homebranch => $lib1->branchcode});
>+    my $item2 = $builder->build_sample_item({exclude_from_local_holds_priority => 1, homebranch => $lib1->branchcode});
>+
>+    my $patron_ex_l2 = $builder->build_object({ class => 'Koha::Patrons', value => {branchcode => $lib2->branchcode, categorycode => $category_ex->categorycode}});
>+    my $patron_ex_l1 = $builder->build_object({ class => 'Koha::Patrons', value => {branchcode => $lib1->branchcode, categorycode => $category_ex->categorycode}});
>+    my $patron_nex_l2 = $builder->build_object({ class => 'Koha::Patrons', value => {branchcode => $lib2->branchcode, categorycode => $category_nex->categorycode}});
>+    my $patron_nex_l1 = $builder->build_object({ class => 'Koha::Patrons', value => {branchcode => $lib1->branchcode, categorycode => $category_nex->categorycode}});
>+
>+    AddReserve(
>+        {
>+            branchcode     => $patron_nex_l2->branchcode,
>+            borrowernumber => $patron_nex_l2->borrowernumber,
>+            biblionumber   => $item1->biblionumber,
>+            priority       => 1,
>+        }
>+    );
>+    AddReserve(
>+        {
>+            branchcode     => $patron_ex_l1->branchcode,
>+            borrowernumber => $patron_ex_l1->borrowernumber,
>+            biblionumber   => $item1->biblionumber,
>+            priority       => 2,
>+        }
>+    );
>+    AddReserve(
>+        {
>+            branchcode     => $patron_nex_l1->branchcode,
>+            borrowernumber => $patron_nex_l1->borrowernumber,
>+            biblionumber   => $item1->biblionumber,
>+            priority       => 3,
>+        }
>+    );
>+
>+    my ($status, $reserve, $all_reserves);
>+    ($status, $reserve, $all_reserves) = CheckReserves($item1->itemnumber);
>+    is($reserve->{borrowernumber}, $patron_nex_l1->borrowernumber, "Patron not excluded with local holds priorities is next checkout");
>+
>+    Koha::Holds->delete;
>+
>+    AddReserve(
>+        {
>+            branchcode     => $patron_nex_l2->branchcode,
>+            borrowernumber => $patron_nex_l2->borrowernumber,
>+            biblionumber   => $item1->biblionumber,
>+            priority       => 1,
>+        }
>+    );
>+    AddReserve(
>+        {
>+            branchcode     => $patron_ex_l1->branchcode,
>+            borrowernumber => $patron_ex_l1->borrowernumber,
>+            biblionumber   => $item1->biblionumber,
>+            priority       => 2,
>+        }
>+    );
>+
>+    ($status, $reserve, $all_reserves) = CheckReserves($item1->itemnumber);
>+    is($reserve->{borrowernumber}, $patron_nex_l2->borrowernumber, "Local patron is excluded from priority");
>+
>+    Koha::Holds->delete;
>+
>+    AddReserve(
>+        {
>+            branchcode     => $patron_nex_l2->branchcode,
>+            borrowernumber => $patron_nex_l2->borrowernumber,
>+            biblionumber   => $item2->biblionumber,
>+            priority       => 1,
>+        }
>+    );
>+    AddReserve(
>+        {
>+            branchcode     => $patron_nex_l1->branchcode,
>+            borrowernumber => $patron_nex_l1->borrowernumber,
>+            biblionumber   => $item2->biblionumber,
>+            priority       => 2,
>+        }
>+    );
>+
>+    ($status, $reserve, $all_reserves) = CheckReserves($item2->itemnumber);
>+    is($reserve->{borrowernumber}, $patron_nex_l2->borrowernumber, "Patron from other library is next checkout because item is excluded");
>+
>+    $schema->storage->txn_rollback;
>+};
>\ No newline at end of file
>diff --git a/t/db_dependent/HoldsQueue.t b/t/db_dependent/HoldsQueue.t
>index b9c91f89e6..85cc94aec1 100755
>--- a/t/db_dependent/HoldsQueue.t
>+++ b/t/db_dependent/HoldsQueue.t
>@@ -8,7 +8,7 @@
> 
> use Modern::Perl;
> 
>-use Test::More tests => 53;
>+use Test::More tests => 54;
> use Data::Dumper;
> 
> use C4::Calendar;
>@@ -201,35 +201,40 @@ $library3 = $builder->build({
> });
> @branchcodes = ( $library1->{branchcode}, $library2->{branchcode}, $library3->{branchcode} );
> 
>+my $category = $builder->build({ source => 'Category', value => {exclude_from_local_holds_priority => 0} } );
>+
> my $borrower1 = $builder->build({
>     source => 'Borrower',
>     value => {
>         branchcode => $branchcodes[0],
>+        categorycode => $category->{categorycode},
>     },
> });
> my $borrower2 = $builder->build({
>     source => 'Borrower',
>     value => {
>         branchcode => $branchcodes[1],
>+        categorycode => $category->{categorycode},
>     },
> });
> my $borrower3 = $builder->build({
>     source => 'Borrower',
>     value => {
>         branchcode => $branchcodes[2],
>+        categorycode => $category->{categorycode},
>     },
> });
> 
> $dbh->do(qq{
>     INSERT INTO biblio (
>-        frameworkcode, 
>-        author, 
>-        title, 
>+        frameworkcode,
>+        author,
>+        title,
>         datecreated
>     ) VALUES (
>-        'SER', 
>-        'Koha test', 
>-        '$TITLE', 
>+        'SER',
>+        'Koha test',
>+        '$TITLE',
>         '2011-02-01'
>     )
> });
>@@ -238,10 +243,10 @@ $biblionumber = $dbh->selectrow_array("SELECT biblionumber FROM biblio WHERE tit
> 
> $dbh->do(qq{
>     INSERT INTO biblioitems (
>-        biblionumber, 
>+        biblionumber,
>         itemtype
>     ) VALUES (
>-        $biblionumber, 
>+        $biblionumber,
>         '$itemtype'
>     )
> });
>@@ -250,7 +255,7 @@ $biblioitemnumber = $dbh->selectrow_array("SELECT biblioitemnumber FROM biblioit
> 
> $items_insert_sth = $dbh->prepare(qq{
>     INSERT INTO items (
>-        biblionumber, 
>+        biblionumber,
>         biblioitemnumber,
>         barcode,
>         homebranch,
>@@ -260,7 +265,8 @@ $items_insert_sth = $dbh->prepare(qq{
>         itemlost,
>         withdrawn,
>         onloan,
>-        itype
>+        itype,
>+        exclude_from_local_holds_priority
>     ) VALUES (
>         $biblionumber,
>         $biblioitemnumber,
>@@ -272,7 +278,8 @@ $items_insert_sth = $dbh->prepare(qq{
>         0,
>         0,
>         NULL,
>-        '$itemtype'
>+        '$itemtype',
>+        0
>     )
> });
> # Create 3 items from 2 branches ( branches are for borrowers 1 and 2 respectively )
>@@ -283,7 +290,7 @@ $items_insert_sth->execute( $barcode + 2, $branchcodes[1], $branchcodes[1] );
> 
> $dbh->do("DELETE FROM reserves");
> my $sth = $dbh->prepare(q{
>-    INSERT INTO reserves ( 
>+    INSERT INTO reserves (
>         borrowernumber,
>         biblionumber,
>         branchcode,
>@@ -516,13 +523,13 @@ $biblioitemnumber =
>   or BAIL_OUT("Cannot find newly created biblioitems record");
> 
> $dbh->do("
>-    INSERT INTO items (biblionumber, biblioitemnumber, homebranch, holdingbranch, notforloan, damaged, itemlost, withdrawn, onloan, itype)
>-    VALUES ($biblionumber, $biblioitemnumber, '$library_A', '$library_A', 0, 0, 0, 0, NULL, '$itemtype')
>+    INSERT INTO items (biblionumber, biblioitemnumber, homebranch, holdingbranch, notforloan, damaged, itemlost, withdrawn, onloan, itype, exclude_from_local_holds_priority)
>+    VALUES ($biblionumber, $biblioitemnumber, '$library_A', '$library_A', 0, 0, 0, 0, NULL, '$itemtype', 0)
> ");
> 
> $dbh->do("
>-    INSERT INTO items (biblionumber, biblioitemnumber, homebranch, holdingbranch, notforloan, damaged, itemlost, withdrawn, onloan, itype)
>-    VALUES ($biblionumber, $biblioitemnumber, '$library_B', '$library_B', 0, 0, 0, 0, NULL, '$itemtype')
>+    INSERT INTO items (biblionumber, biblioitemnumber, homebranch, holdingbranch, notforloan, damaged, itemlost, withdrawn, onloan, itype, exclude_from_local_holds_priority)
>+    VALUES ($biblionumber, $biblioitemnumber, '$library_B', '$library_B', 0, 0, 0, 0, NULL, '$itemtype', 0)
> ");
> 
> Koha::CirculationRules->set_rules(
>@@ -587,8 +594,8 @@ $biblioitemnumber =
>   or BAIL_OUT("Cannot find newly created biblioitems record");
> 
> $dbh->do("
>-    INSERT INTO items (biblionumber, biblioitemnumber, homebranch, holdingbranch, notforloan, damaged, itemlost, withdrawn, onloan, itype)
>-    VALUES ($biblionumber, $biblioitemnumber, '$library_A', '$library_A', 0, 0, 0, 0, NULL, '$itemtype')
>+    INSERT INTO items (biblionumber, biblioitemnumber, homebranch, holdingbranch, notforloan, damaged, itemlost, withdrawn, onloan, itype, exclude_from_local_holds_priority)
>+    VALUES ($biblionumber, $biblioitemnumber, '$library_A', '$library_A', 0, 0, 0, 0, NULL, '$itemtype', 0)
> ");
> 
> $reserve_id = AddReserve(
>@@ -632,8 +639,8 @@ $biblioitemnumber =
>   or BAIL_OUT("Cannot find newly created biblioitems record");
> 
> $dbh->do("
>-    INSERT INTO items (biblionumber, biblioitemnumber, homebranch, holdingbranch, notforloan, damaged, itemlost, withdrawn, onloan, itype)
>-    VALUES ($biblionumber, $biblioitemnumber, '$library_A', '$library_B', 0, 0, 0, 0, NULL, '$itemtype')
>+    INSERT INTO items (biblionumber, biblioitemnumber, homebranch, holdingbranch, notforloan, damaged, itemlost, withdrawn, onloan, itype, exclude_from_local_holds_priority)
>+    VALUES ($biblionumber, $biblioitemnumber, '$library_A', '$library_B', 0, 0, 0, 0, NULL, '$itemtype', 0)
> ");
> 
> # With hold_fulfillment_policy = homebranch, hold should only be picked up if pickup branch = homebranch
>@@ -840,8 +847,8 @@ $biblioitemnumber =
>   or BAIL_OUT("Cannot find newly created biblioitems record");
> 
> $dbh->do("
>-    INSERT INTO items (biblionumber, biblioitemnumber, homebranch, holdingbranch, notforloan, damaged, itemlost, withdrawn, onloan, itype)
>-    VALUES ($biblionumber, $biblioitemnumber, '$library_A', '$library_B', 0, 0, 0, 0, NULL, '$right_itemtype')
>+    INSERT INTO items (biblionumber, biblioitemnumber, homebranch, holdingbranch, notforloan, damaged, itemlost, withdrawn, onloan, itype, exclude_from_local_holds_priority)
>+    VALUES ($biblionumber, $biblioitemnumber, '$library_A', '$library_B', 0, 0, 0, 0, NULL, '$right_itemtype', 0)
> ");
> 
> # With hold_fulfillment_policy = homebranch, hold should only be picked up if pickup branch = homebranch
>@@ -916,11 +923,13 @@ subtest "Test Local Holds Priority - Bib level" => sub {
>     t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' );
>     my $branch  = $builder->build_object( { class => 'Koha::Libraries' } );
>     my $branch2 = $builder->build_object( { class => 'Koha::Libraries' } );
>+    my $category = $builder->build_object( { class => 'Koha::Patron::Categories', value => {exclude_from_local_holds_priority => 0} });
>     my $local_patron = $builder->build_object(
>         {
>             class => "Koha::Patrons",
>             value => {
>-                branchcode => $branch->branchcode
>+                branchcode => $branch->branchcode,
>+                categorycode => $category->categorycode
>             }
>         }
>     );
>@@ -928,7 +937,8 @@ subtest "Test Local Holds Priority - Bib level" => sub {
>         {
>             class => "Koha::Patrons",
>             value => {
>-                branchcode => $branch2->branchcode
>+                branchcode => $branch2->branchcode,
>+                categorycode => $category->categorycode
>             }
>         }
>     );
>@@ -937,6 +947,7 @@ subtest "Test Local Holds Priority - Bib level" => sub {
>         {
>             biblionumber  => $biblio->biblionumber,
>             library    => $branch->branchcode,
>+            exclude_from_local_holds_priority => 0,
>         }
>     );
> 
>@@ -978,11 +989,13 @@ subtest "Test Local Holds Priority - Item level" => sub {
>     t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' );
>     my $branch  = $builder->build_object( { class => 'Koha::Libraries' } );
>     my $branch2 = $builder->build_object( { class => 'Koha::Libraries' } );
>+    my $category = $builder->build_object( { class => 'Koha::Patron::Categories', value => {exclude_from_local_holds_priority => 0} });
>     my $local_patron = $builder->build_object(
>         {
>             class => "Koha::Patrons",
>             value => {
>-                branchcode => $branch->branchcode
>+                branchcode => $branch->branchcode,
>+                categorycode => $category->categorycode
>             }
>         }
>     );
>@@ -990,7 +1003,8 @@ subtest "Test Local Holds Priority - Item level" => sub {
>         {
>             class => "Koha::Patrons",
>             value => {
>-                branchcode => $branch2->branchcode
>+                branchcode => $branch2->branchcode,
>+                categorycode => $category->categorycode
>             }
>         }
>     );
>@@ -999,6 +1013,7 @@ subtest "Test Local Holds Priority - Item level" => sub {
>         {
>             biblionumber  => $biblio->biblionumber,
>             library    => $branch->branchcode,
>+            exclude_from_local_holds_priority => 0,
>         }
>     );
> 
>@@ -1043,11 +1058,13 @@ subtest "Test Local Holds Priority - Item level hold over Record level hold (Bug
>     t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' );
>     my $branch  = $builder->build_object( { class => 'Koha::Libraries' } );
>     my $branch2 = $builder->build_object( { class => 'Koha::Libraries' } );
>+    my $category = $builder->build_object( { class => 'Koha::Patron::Categories', value => {exclude_from_local_holds_priority => 0} });
>     my $local_patron = $builder->build_object(
>         {
>             class => "Koha::Patrons",
>             value => {
>-                branchcode => $branch->branchcode
>+                branchcode => $branch->branchcode,
>+                categorycode => $category->categorycode,
>             }
>         }
>     );
>@@ -1055,7 +1072,8 @@ subtest "Test Local Holds Priority - Item level hold over Record level hold (Bug
>         {
>             class => "Koha::Patrons",
>             value => {
>-                branchcode => $branch2->branchcode
>+                branchcode => $branch2->branchcode,
>+                categorycode => $category->categorycode,
>             }
>         }
>     );
>@@ -1064,6 +1082,7 @@ subtest "Test Local Holds Priority - Item level hold over Record level hold (Bug
>         {
>             biblionumber  => $biblio->biblionumber,
>             library    => $branch->branchcode,
>+            exclude_from_local_holds_priority => 0,
>         }
>     );
> 
>@@ -1107,11 +1126,13 @@ subtest "Test Local Holds Priority - Get correct item for item level hold" => su
>     t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' );
>     my $branch  = $builder->build_object( { class => 'Koha::Libraries' } );
>     my $branch2 = $builder->build_object( { class => 'Koha::Libraries' } );
>+    my $category = $builder->build_object( { class => 'Koha::Patron::Categories', value => {exclude_from_local_holds_priority => 0} });
>     my $local_patron = $builder->build_object(
>         {
>             class => "Koha::Patrons",
>             value => {
>-                branchcode => $branch->branchcode
>+                branchcode => $branch->branchcode,
>+                categorycode => $category->categorycode,
>             }
>         }
>     );
>@@ -1119,7 +1140,8 @@ subtest "Test Local Holds Priority - Get correct item for item level hold" => su
>         {
>             class => "Koha::Patrons",
>             value => {
>-                branchcode => $branch2->branchcode
>+                branchcode => $branch2->branchcode,
>+                categorycode => $category->categorycode,
>             }
>         }
>     );
>@@ -1129,18 +1151,21 @@ subtest "Test Local Holds Priority - Get correct item for item level hold" => su
>         {
>             biblionumber  => $biblio->biblionumber,
>             library    => $branch->branchcode,
>+            exclude_from_local_holds_priority => 0,
>         }
>     );
>     my $item2 = $builder->build_sample_item(
>         {
>             biblionumber  => $biblio->biblionumber,
>             library    => $branch->branchcode,
>+            exclude_from_local_holds_priority => 0,
>         }
>     );
>     my $item3 = $builder->build_sample_item(
>         {
>             biblionumber  => $biblio->biblionumber,
>             library    => $branch->branchcode,
>+            exclude_from_local_holds_priority => 0,
>         }
>     );
> 
>@@ -1184,11 +1209,13 @@ subtest "Test Local Holds Priority - Ensure no duplicate requests in holds queue
>     t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' );
>     my $branch  = $builder->build_object( { class => 'Koha::Libraries' } );
>     my $branch2 = $builder->build_object( { class => 'Koha::Libraries' } );
>+    my $category = $builder->build_object( { class => 'Koha::Patron::Categories', value => {exclude_from_local_holds_priority => 0} });
>     my $patron  = $builder->build_object(
>         {
>             class => "Koha::Patrons",
>             value => {
>-                branchcode => $branch->branchcode
>+                branchcode => $branch->branchcode,
>+                categorycode => $category->categorycode,
>             }
>         }
>     );
>@@ -1197,12 +1224,14 @@ subtest "Test Local Holds Priority - Ensure no duplicate requests in holds queue
>         {
>             biblionumber => $biblio->biblionumber,
>             library      => $branch->branchcode,
>+            exclude_from_local_holds_priority => 0,
>         }
>     );
>     my $item2 = $builder->build_sample_item(
>         {
>             biblionumber => $biblio->biblionumber,
>             library      => $branch->branchcode,
>+            exclude_from_local_holds_priority => 0,
>         }
>     );
> 
>@@ -1210,6 +1239,7 @@ subtest "Test Local Holds Priority - Ensure no duplicate requests in holds queue
>         {
>             biblionumber => $biblio->biblionumber,
>             library      => $branch->branchcode,
>+            exclude_from_local_holds_priority => 0,
>         }
>     );
> 
>@@ -1241,11 +1271,13 @@ subtest "Item level holds info is preserved (Bug 25738)" => sub {
>     $dbh->do("DELETE FROM circulation_rules");
> 
>     my $library  = $builder->build_object({ class => 'Koha::Libraries' });
>+    my $category = $builder->build_object( { class => 'Koha::Patron::Categories', value => {exclude_from_local_holds_priority => 0} });
>     my $patron_1 = $builder->build_object(
>         {
>             class => "Koha::Patrons",
>             value => {
>-                branchcode => $library->branchcode
>+                branchcode => $library->branchcode,
>+                categorycode => $category->categorycode
>             }
>         }
>     );
>@@ -1254,7 +1286,8 @@ subtest "Item level holds info is preserved (Bug 25738)" => sub {
>         {
>             class => "Koha::Patrons",
>             value => {
>-                branchcode => $library->branchcode
>+                branchcode => $library->branchcode,
>+                categorycode => $category->categorycode
>             }
>         }
>     );
>@@ -1264,12 +1297,14 @@ subtest "Item level holds info is preserved (Bug 25738)" => sub {
>         {
>             biblionumber => $biblio->biblionumber,
>             library      => $library->branchcode,
>+            exclude_from_local_holds_priority => 0,
>         }
>     );
>     my $item_2 = $builder->build_sample_item(
>         {
>             biblionumber => $biblio->biblionumber,
>             library      => $library->branchcode,
>+            exclude_from_local_holds_priority => 0,
>         }
>     );
> 
>@@ -1317,6 +1352,114 @@ subtest 'Trivial test for UpdateTransportCostMatrix' => sub {
>     is( $schema->resultset('TransportCost')->count, 2, 'UpdateTransportCostMatrix added two records' );
> };
> 
>+subtest 'Excludes from local holds priority' => sub {
>+    plan tests => 5;
>+
>+    Koha::Holds->delete;
>+
>+    t::lib::Mocks::mock_preference( 'LocalHoldsPriority', 1 );
>+    t::lib::Mocks::mock_preference( 'LocalHoldsPriorityPatronControl', 'PickupLibrary' );
>+    t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' );
>+
>+    my $branch  = $builder->build_object( { class => 'Koha::Libraries' } );
>+    my $branch2 = $builder->build_object( { class => 'Koha::Libraries' } );
>+    my $category = $builder->build_object( { class => 'Koha::Patron::Categories', value => {exclude_from_local_holds_priority => 0} });
>+    my $excluded_category = $builder->build_object( { class => 'Koha::Patron::Categories', value => {exclude_from_local_holds_priority => 1} });
>+    my $local_patron_excluded = $builder->build_object(
>+        {
>+            class => "Koha::Patrons",
>+            value => {
>+                branchcode => $branch->branchcode,
>+                categorycode => $excluded_category->categorycode
>+            }
>+        }
>+    );
>+
>+    my $local_patron_not_excluded = $builder->build_object(
>+        {
>+            class => "Koha::Patrons",
>+            value => {
>+                branchcode => $branch->branchcode,
>+                categorycode => $category->categorycode
>+            }
>+        }
>+    );
>+
>+    my $other_patron = $builder->build_object(
>+        {
>+            class => "Koha::Patrons",
>+            value => {
>+                branchcode => $branch2->branchcode,
>+                categorycode => $category->categorycode
>+            }
>+        }
>+    );
>+
>+    my $item1  = $builder->build_sample_item(
>+        {
>+            library      => $branch->branchcode,
>+            exclude_from_local_holds_priority => 0,
>+        }
>+    );
>+
>+    AddReserve(
>+        {
>+            branchcode     => $other_patron->branchcode,
>+            borrowernumber => $other_patron->borrowernumber,
>+            biblionumber   => $item1->biblionumber,
>+            priority       => 1
>+        }
>+    );
>+
>+    AddReserve(
>+        {
>+            branchcode     => $local_patron_excluded->branchcode,
>+            borrowernumber => $local_patron_excluded->borrowernumber,
>+            biblionumber   => $item1->biblionumber,
>+            priority       => 2
>+        }
>+    );
>+
>+    AddReserve(
>+        {
>+            branchcode     => $local_patron_not_excluded->branchcode,
>+            borrowernumber => $local_patron_not_excluded->borrowernumber,
>+            biblionumber   => $item1->biblionumber,
>+            priority       => 3
>+        }
>+    );
>+
>+    C4::HoldsQueue::CreateQueue();
>+
>+    my $queue_rs = $schema->resultset('TmpHoldsqueue');
>+    my $next = $queue_rs->next;
>+    is($next->borrowernumber, $local_patron_not_excluded->borrowernumber, 'Not excluded local patron is queued');
>+
>+    my $item2  = $builder->build_sample_item(
>+        {
>+            biblionumber => $item1->biblionumber,
>+            library      => $branch->branchcode,
>+            exclude_from_local_holds_priority => 1,
>+        }
>+    );
>+    C4::HoldsQueue::CreateQueue();
>+
>+    $queue_rs = $schema->resultset('TmpHoldsqueue');
>+    $next = $queue_rs->next;
>+    is($next->borrowernumber, $local_patron_not_excluded->borrowernumber, 'Not excluded local patron is queued');
>+    $next = $queue_rs->next;
>+    is($next->borrowernumber, $other_patron->borrowernumber, 'Other patron is queued');
>+
>+    $item1->exclude_from_local_holds_priority(1)->store;
>+
>+    C4::HoldsQueue::CreateQueue();
>+
>+    $queue_rs = $schema->resultset('TmpHoldsqueue');
>+    $next = $queue_rs->next;
>+    is($next->borrowernumber, $other_patron->borrowernumber, 'Other patron is queued');
>+    $next = $queue_rs->next;
>+    is($next->borrowernumber, $local_patron_excluded->borrowernumber, 'Excluded local patron is queued');
>+};
> # Cleanup
> $schema->storage->txn_rollback;
> 
>-- 
>2.25.0

Actions: View | Diff | Splinter Review

Attachments on bug 19889: 105715 | 105716 | 105717 | 105718 | 106435 | 106436 | 106437 | 106438 | 106439 | 106440 | 106441 | 106442 | 107180 | 107187 | 107188 | 107189 | 107190 | 107191 | 107192 | 107193 | 107194 | 107195 | 107196 | 107908 | 107909 | 107910 | 107911 | 107912 | 107913 | 107926 | 107927 | 107928 | 107929 | 107930 | 107931 | 107948 | 108213 | 108214 | 108215 | 108216 | 108217 | 108218 | 108219 | 108220 | 108593 | 108594 | 108595 | 108725 | 108726 | 108728 | 109131 | 109132 | 109285 | 109364 | 109419