projects / koha.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Bug 20167: Regression test
[koha.git] / t / db_dependent / api / v1 / holds.t
diff --git a/t/db_dependent/api/v1/holds.t b/t/db_dependent/api/v1/holds.t
index d1f7978..b3e3678 100644 (file)
--- a/t/db_dependent/api/v1/holds.t
+++ b/t/db_dependent/api/v1/holds.t
@@ -17,7 +17,7 @@
 
 use Modern::Perl;
 
-use Test::More tests => 4;
+use Test::More tests => 5;
 use Test::Mojo;
 use t::lib::TestBuilder;
 use t::lib::Mocks;
@@ -26,8 +26,10 @@ use DateTime;
 
 use C4::Context;
 use C4::Reserves;
+use C4::Items;
 
 use Koha::Database;
+use Koha::DateUtils;
 use Koha::Biblios;
 use Koha::Biblioitems;
 use Koha::Items;
@@ -48,6 +50,7 @@ my $tx;
 
 my $categorycode = $builder->build({ source => 'Category' })->{categorycode};
 my $branchcode = $builder->build({ source => 'Branch' })->{branchcode};
+my $itemtype = $builder->build({ source => 'Itemtype' })->{itemtype};
 
 # User without any permissions
 my $nopermission = $builder->build({
@@ -65,58 +68,71 @@ $session_nopermission->param('ip', '127.0.0.1');
 $session_nopermission->param('lasttime', time());
 $session_nopermission->flush;
 
-my $borrower = Koha::Patron->new;
-$borrower->categorycode( $categorycode );
-$borrower->branchcode( $branchcode );
-$borrower->surname("Test Surname");
-$borrower->flags(80); #borrowers and reserveforothers flags
-$borrower->userid($nopermission->{ userid }."z");
-$borrower->store;
-my $borrowernumber = $borrower->borrowernumber;
-
-my $borrower2 = Koha::Patron->new;
-$borrower2->categorycode( $categorycode );
-$borrower2->branchcode( $branchcode );
-$borrower2->surname("Test Surname 2");
-$borrower2->userid($nopermission->{ userid }."x");
-$borrower2->flags(16); # borrowers flag
-$borrower2->store;
-my $borrowernumber2 = $borrower2->borrowernumber;
-
-my $borrower3 = Koha::Patron->new;
-$borrower3->categorycode( $categorycode );
-$borrower3->branchcode( $branchcode );
-$borrower3->surname("Test Surname 2");
-$borrower3->userid($nopermission->{ userid }."y");
-$borrower3->flags(64); # reserveforothers flag
-$borrower3->store;
-my $borrowernumber3 = $borrower3->borrowernumber;
+my $patron_1 = $builder->build_object(
+    {
+        class => 'Koha::Patrons',
+        value => {
+            categorycode => $categorycode,
+            branchcode   => $branchcode,
+            surname      => 'Test Surname',
+            flags        => 80, #borrowers and reserveforothers flags
+        }
+    }
+);
+
+my $patron_2 = $builder->build_object(
+    {
+        class => 'Koha::Patrons',
+        value => {
+            categorycode => $categorycode,
+            branchcode   => $branchcode,
+            surname      => 'Test Surname 2',
+            flags        => 16, # borrowers flag
+        }
+    }
+);
+
+my $patron_3 = $builder->build_object(
+    {
+        class => 'Koha::Patrons',
+        value => {
+            categorycode => $categorycode,
+            branchcode   => $branchcode,
+            surname      => 'Test Surname 3',
+            flags        => 64, # reserveforothers flag
+        }
+    }
+);
 
 # Get sessions
 my $session = C4::Auth::get_session('');
-$session->param('number', $borrower->borrowernumber);
-$session->param('id', $borrower->userid);
+$session->param('number', $patron_1->borrowernumber);
+$session->param('id', $patron_1->userid);
 $session->param('ip', '127.0.0.1');
 $session->param('lasttime', time());
 $session->flush;
 my $session2 = C4::Auth::get_session('');
-$session2->param('number', $borrower2->borrowernumber);
-$session2->param('id', $borrower2->userid);
+$session2->param('number', $patron_2->borrowernumber);
+$session2->param('id', $patron_2->userid);
 $session2->param('ip', '127.0.0.1');
 $session2->param('lasttime', time());
 $session2->flush;
 my $session3 = C4::Auth::get_session('');
-$session3->param('number', $borrower3->borrowernumber);
-$session3->param('id', $borrower3->userid);
+$session3->param('number', $patron_3->borrowernumber);
+$session3->param('id', $patron_3->userid);
 $session3->param('ip', '127.0.0.1');
 $session3->param('lasttime', time());
 $session3->flush;
 
 my $biblionumber = create_biblio('RESTful Web APIs');
-my $itemnumber = create_item($biblionumber, 'TEST000001');
+my $item = create_item($biblionumber, 'TEST000001');
+my $itemnumber = $item->{itemnumber};
+$item->{itype} = $itemtype;
+C4::Items::ModItem($item, $biblionumber, $itemnumber);
 
 my $biblionumber2 = create_biblio('RESTful Web APIs');
-my $itemnumber2 = create_item($biblionumber2, 'TEST000002');
+my $item2 = create_item($biblionumber2, 'TEST000002');
+my $itemnumber2 = $item2->{itemnumber};
 
 my $dbh = C4::Context->dbh;
 $dbh->do('DELETE FROM reserves');
@@ -126,18 +142,18 @@ $dbh->do('DELETE FROM issuingrules');
         VALUES (?, ?, ?, ?)
     }, {}, '*', '*', '*', 1);
 
-my $reserve_id = C4::Reserves::AddReserve($branchcode, $borrowernumber,
+my $reserve_id = C4::Reserves::AddReserve($branchcode, $patron_1->borrowernumber,
     $biblionumber, undef, 1, undef, undef, undef, '', $itemnumber);
 
 # Add another reserve to be able to change first reserve's rank
-my $reserve_id2 = C4::Reserves::AddReserve($branchcode, $borrowernumber2,
+my $reserve_id2 = C4::Reserves::AddReserve($branchcode, $patron_2->borrowernumber,
     $biblionumber, undef, 2, undef, undef, undef, '', $itemnumber);
 
 my $suspend_until = DateTime->now->add(days => 10)->ymd;
 my $expirationdate = DateTime->now->add(days => 10)->ymd;
 
 my $post_data = {
-    borrowernumber => int($borrowernumber),
+    borrowernumber => int($patron_1->borrowernumber),
     biblionumber => int($biblionumber),
     itemnumber => int($itemnumber),
     branchcode => $branchcode,
@@ -164,11 +180,11 @@ subtest "Test endpoints without authentication" => sub {
 subtest "Test endpoints without permission" => sub {
     plan tests => 10;
 
-    $tx = $t->ua->build_tx(GET => "/api/v1/holds?borrowernumber=$borrowernumber");
+    $tx = $t->ua->build_tx(GET => "/api/v1/holds?borrowernumber=" . $patron_1->borrowernumber);
     $tx->req->cookies({name => 'CGISESSID', value => $session_nopermission->id});
     $t->request_ok($tx) # no permission
       ->status_is(403);
-    $tx = $t->ua->build_tx(GET => "/api/v1/holds?borrowernumber=$borrowernumber");
+    $tx = $t->ua->build_tx(GET => "/api/v1/holds?borrowernumber=" . $patron_1->borrowernumber);
     $tx->req->cookies({name => 'CGISESSID', value => $session3->id});
     $t->request_ok($tx) # reserveforothers permission
       ->status_is(403);
@@ -186,7 +202,7 @@ subtest "Test endpoints without permission" => sub {
       ->status_is(403);
 };
 subtest "Test endpoints without permission, but accessing own object" => sub {
-    plan tests => 15;
+    plan tests => 16;
 
     my $borrno_tmp = $post_data->{'borrowernumber'};
     $post_data->{'borrowernumber'} = int $nopermission->{'borrowernumber'};
@@ -210,11 +226,18 @@ subtest "Test endpoints without permission, but accessing own object" => sub {
     my $reserve_id3 = Koha::Holds->find({ borrowernumber => $nopermission->{borrowernumber} })->reserve_id;
     $tx = $t->ua->build_tx(PUT => "/api/v1/holds/$reserve_id3" => json => $put_data);
     $tx->req->cookies({name => 'CGISESSID', value => $session_nopermission->id});
-    $t->request_ok($tx) # create hold to myself
-      ->status_is(200)
-      ->json_is('/reserve_id', $reserve_id3)
-      ->json_is('/suspend_until', $suspend_until . ' 00:00:00')
-      ->json_is('/priority', 2);
+    $t->request_ok($tx)    # create hold to myself
+      ->status_is(200)->json_is( '/reserve_id', $reserve_id3 )->json_is(
+        '/suspend_until',
+        output_pref(
+            {
+                dateformat => 'rfc3339',
+                dt => dt_from_string( $suspend_until . ' 00:00:00', 'sql' )
+            }
+        )
+      )
+      ->json_is( '/priority',   2 )
+      ->json_is( '/itemnumber', $itemnumber );
 };
 
 subtest "Test endpoints with permission" => sub {
@@ -238,11 +261,17 @@ subtest "Test endpoints with permission" => sub {
 
     $tx = $t->ua->build_tx(PUT => "/api/v1/holds/$reserve_id" => json => $put_data);
     $tx->req->cookies({name => 'CGISESSID', value => $session3->id});
-    $t->request_ok($tx)
-      ->status_is(200)
-      ->json_is('/reserve_id', $reserve_id)
-      ->json_is('/suspend_until', $suspend_until . ' 00:00:00')
-      ->json_is('/priority', 2);
+    $t->request_ok($tx)->status_is(200)->json_is( '/reserve_id', $reserve_id )
+      ->json_is(
+        '/suspend_until',
+        output_pref(
+            {
+                dateformat => 'rfc3339',
+                dt => dt_from_string( $suspend_until . ' 00:00:00', 'sql' )
+            }
+        )
+      )
+      ->json_is( '/priority', 2 );
 
     $tx = $t->ua->build_tx(DELETE => "/api/v1/holds/$reserve_id");
     $tx->req->cookies({name => 'CGISESSID', value => $session3->id});
@@ -261,13 +290,13 @@ subtest "Test endpoints with permission" => sub {
       ->status_is(404)
       ->json_has('/error');
 
-    $tx = $t->ua->build_tx(GET => "/api/v1/holds?borrowernumber=".$borrower->borrowernumber);
+    $tx = $t->ua->build_tx(GET => "/api/v1/holds?borrowernumber=" . $patron_1->borrowernumber);
     $tx->req->cookies({name => 'CGISESSID', value => $session2->id}); # get with borrowers flag
     $t->request_ok($tx)
       ->status_is(200)
       ->json_is([]);
 
-    my $inexisting_borrowernumber = $borrowernumber2*2;
+    my $inexisting_borrowernumber = $patron_2->borrowernumber * 2;
     $tx = $t->ua->build_tx(GET => "/api/v1/holds?borrowernumber=$inexisting_borrowernumber");
     $tx->req->cookies({name => 'CGISESSID', value => $session->id});
     $t->request_ok($tx)
@@ -286,7 +315,7 @@ subtest "Test endpoints with permission" => sub {
       ->json_has('/reserve_id');
     $reserve_id = $t->tx->res->json->{reserve_id};
 
-    $tx = $t->ua->build_tx(GET => "/api/v1/holds?borrowernumber=$borrowernumber");
+    $tx = $t->ua->build_tx(GET => "/api/v1/holds?borrowernumber=" . $patron_1->borrowernumber);
     $tx->req->cookies({name => 'CGISESSID', value => $session->id});
     $t->request_ok($tx)
       ->status_is(200)
@@ -309,6 +338,38 @@ subtest "Test endpoints with permission" => sub {
       ->json_like('/error', qr/tooManyReserves/);
 };
 
+
+subtest 'Reserves with itemtype' => sub {
+    plan tests => 9;
+
+    my $post_data = {
+        borrowernumber => int($patron_1->borrowernumber),
+        biblionumber => int($biblionumber),
+        branchcode => $branchcode,
+        itemtype => $itemtype,
+    };
+
+    $tx = $t->ua->build_tx(DELETE => "/api/v1/holds/$reserve_id");
+    $tx->req->cookies({name => 'CGISESSID', value => $session3->id});
+    $t->request_ok($tx)
+      ->status_is(200);
+
+    $tx = $t->ua->build_tx(POST => "/api/v1/holds" => json => $post_data);
+    $tx->req->cookies({name => 'CGISESSID', value => $session3->id});
+    $t->request_ok($tx)
+      ->status_is(201)
+      ->json_has('/reserve_id');
+
+    $reserve_id = $t->tx->res->json->{reserve_id};
+
+    $tx = $t->ua->build_tx(GET => "/api/v1/holds?borrowernumber=" . $patron_1->borrowernumber);
+    $tx->req->cookies({name => 'CGISESSID', value => $session->id});
+    $t->request_ok($tx)
+      ->status_is(200)
+      ->json_is('/0/reserve_id', $reserve_id)
+      ->json_is('/0/itemtype', $itemtype);
+};
+
 $schema->storage->txn_rollback;
 
 sub create_biblio {
@@ -335,5 +396,5 @@ sub create_item {
         }
     );
 
-    return $item->{itemnumber};
+    return $item;
 }
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git