Lines 32-47
use C4::Circulation;
Link Here
|
32 |
use C4::Items; |
32 |
use C4::Items; |
33 |
|
33 |
|
34 |
use Koha::Database; |
34 |
use Koha::Database; |
|
|
35 |
use Koha::DateUtils; |
35 |
use Koha::Patron; |
36 |
use Koha::Patron; |
36 |
|
37 |
|
37 |
my $schema = Koha::Database->schema; |
38 |
my $schema = Koha::Database->schema; |
38 |
$schema->storage->txn_begin; |
|
|
39 |
my $dbh = C4::Context->dbh; |
40 |
my $builder = t::lib::TestBuilder->new; |
39 |
my $builder = t::lib::TestBuilder->new; |
41 |
$dbh->{RaiseError} = 1; |
40 |
|
|
|
41 |
$schema->storage->txn_begin; |
42 |
|
43 |
t::lib::Mocks::mock_preference( 'SessionStorage', 'tmp' ); |
42 |
|
44 |
|
43 |
$ENV{REMOTE_ADDR} = '127.0.0.1'; |
45 |
$ENV{REMOTE_ADDR} = '127.0.0.1'; |
44 |
my $t = Test::Mojo->new('Koha::REST::V1'); |
46 |
my $t = Test::Mojo->new('Koha::REST::V1'); |
|
|
47 |
my $tx; |
48 |
|
49 |
my $dbh = C4::Context->dbh; |
45 |
|
50 |
|
46 |
$dbh->do('DELETE FROM issues'); |
51 |
$dbh->do('DELETE FROM issues'); |
47 |
$dbh->do('DELETE FROM items'); |
52 |
$dbh->do('DELETE FROM items'); |
Lines 73-86
my $branchcode = $builder->build({ source => 'Branch' })->{ branchcode };
Link Here
|
73 |
my $module = new Test::MockModule('C4::Context'); |
78 |
my $module = new Test::MockModule('C4::Context'); |
74 |
$module->mock('userenv', sub { { branch => $branchcode } }); |
79 |
$module->mock('userenv', sub { { branch => $branchcode } }); |
75 |
|
80 |
|
76 |
my $tx = $t->ua->build_tx(GET => "/api/v1/checkouts?borrowernumber=$borrowernumber"); |
81 |
$tx = $t->ua->build_tx(GET => "/api/v1/checkouts?patron_id=$borrowernumber"); |
77 |
$tx->req->cookies({name => 'CGISESSID', value => $session->id}); |
82 |
$tx->req->cookies({name => 'CGISESSID', value => $session->id}); |
78 |
$t->request_ok($tx) |
83 |
$t->request_ok($tx) |
79 |
->status_is(200) |
84 |
->status_is(200) |
80 |
->json_is([]); |
85 |
->json_is([]); |
81 |
|
86 |
|
82 |
my $notexisting_borrowernumber = $borrowernumber + 1; |
87 |
my $notexisting_borrowernumber = $borrowernumber + 1; |
83 |
$tx = $t->ua->build_tx(GET => "/api/v1/checkouts?borrowernumber=$notexisting_borrowernumber"); |
88 |
$tx = $t->ua->build_tx(GET => "/api/v1/checkouts?patron_id=$notexisting_borrowernumber"); |
84 |
$tx->req->cookies({name => 'CGISESSID', value => $session->id}); |
89 |
$tx->req->cookies({name => 'CGISESSID', value => $session->id}); |
85 |
$t->request_ok($tx) |
90 |
$t->request_ok($tx) |
86 |
->status_is(200) |
91 |
->status_is(200) |
Lines 99-114
my $date_due2 = Koha::DateUtils::dt_from_string( $issue2->date_due );
Link Here
|
99 |
my $issue3 = C4::Circulation::AddIssue($loggedinuser, 'TEST000003', $date_due); |
104 |
my $issue3 = C4::Circulation::AddIssue($loggedinuser, 'TEST000003', $date_due); |
100 |
my $date_due3 = Koha::DateUtils::dt_from_string( $issue3->date_due ); |
105 |
my $date_due3 = Koha::DateUtils::dt_from_string( $issue3->date_due ); |
101 |
|
106 |
|
102 |
$tx = $t->ua->build_tx(GET => "/api/v1/checkouts?borrowernumber=$borrowernumber"); |
107 |
$tx = $t->ua->build_tx(GET => "/api/v1/checkouts?patron_id=$borrowernumber"); |
103 |
$tx->req->cookies({name => 'CGISESSID', value => $session->id}); |
108 |
$tx->req->cookies({name => 'CGISESSID', value => $session->id}); |
104 |
$t->request_ok($tx) |
109 |
$t->request_ok($tx) |
105 |
->status_is(200) |
110 |
->status_is(200) |
106 |
->json_is('/0/borrowernumber' => $borrowernumber) |
111 |
->json_is('/0/patron_id' => $borrowernumber) |
107 |
->json_is('/0/itemnumber' => $itemnumber1) |
112 |
->json_is('/0/item_id' => $itemnumber1) |
108 |
->json_is('/0/date_due' => $date_due1->ymd . ' ' . $date_due1->hms) |
113 |
->json_is('/0/due_date' => output_pref({ dateformat => "rfc3339", dt => $date_due1 }) ) |
109 |
->json_is('/1/borrowernumber' => $borrowernumber) |
114 |
->json_is('/1/patron_id' => $borrowernumber) |
110 |
->json_is('/1/itemnumber' => $itemnumber2) |
115 |
->json_is('/1/item_id' => $itemnumber2) |
111 |
->json_is('/1/date_due' => $date_due2->ymd . ' ' . $date_due2->hms) |
116 |
->json_is('/1/due_date' => output_pref({ dateformat => "rfc3339", dt => $date_due2 }) ) |
112 |
->json_hasnt('/2'); |
117 |
->json_hasnt('/2'); |
113 |
|
118 |
|
114 |
$tx = $t->ua->build_tx(GET => "/api/v1/checkouts/".$issue3->issue_id); |
119 |
$tx = $t->ua->build_tx(GET => "/api/v1/checkouts/".$issue3->issue_id); |
Lines 119-125
$t->request_ok($tx)
Link Here
|
119 |
required_permissions => { circulate => "circulate_remaining_permissions" } |
124 |
required_permissions => { circulate => "circulate_remaining_permissions" } |
120 |
}); |
125 |
}); |
121 |
|
126 |
|
122 |
$tx = $t->ua->build_tx(GET => "/api/v1/checkouts?borrowernumber=".$loggedinuser->{borrowernumber}); |
127 |
$tx = $t->ua->build_tx(GET => "/api/v1/checkouts?patron_id=".$loggedinuser->{borrowernumber}); |
123 |
$tx->req->cookies({name => 'CGISESSID', value => $patron_session->id}); |
128 |
$tx->req->cookies({name => 'CGISESSID', value => $patron_session->id}); |
124 |
$t->request_ok($tx) |
129 |
$t->request_ok($tx) |
125 |
->status_is(403) |
130 |
->status_is(403) |
Lines 127-164
$t->request_ok($tx)
Link Here
|
127 |
required_permissions => { circulate => "circulate_remaining_permissions" } |
132 |
required_permissions => { circulate => "circulate_remaining_permissions" } |
128 |
}); |
133 |
}); |
129 |
|
134 |
|
130 |
$tx = $t->ua->build_tx(GET => "/api/v1/checkouts?borrowernumber=$borrowernumber"); |
135 |
$tx = $t->ua->build_tx(GET => "/api/v1/checkouts?patron_id=$borrowernumber"); |
131 |
$tx->req->cookies({name => 'CGISESSID', value => $patron_session->id}); |
136 |
$tx->req->cookies({name => 'CGISESSID', value => $session->id}); |
132 |
$t->request_ok($tx) |
137 |
$t->request_ok($tx) |
133 |
->status_is(200) |
138 |
->status_is(200) |
134 |
->json_is('/0/borrowernumber' => $borrowernumber) |
139 |
->json_is('/0/patron_id' => $borrowernumber) |
135 |
->json_is('/0/itemnumber' => $itemnumber1) |
140 |
->json_is('/0/item_id' => $itemnumber1) |
136 |
->json_is('/0/date_due' => $date_due1->ymd . ' ' . $date_due1->hms) |
141 |
->json_is('/0/due_date' => output_pref({ dateformat => "rfc3339", dt => $date_due1 }) ) |
137 |
->json_is('/1/borrowernumber' => $borrowernumber) |
142 |
->json_is('/1/patron_id' => $borrowernumber) |
138 |
->json_is('/1/itemnumber' => $itemnumber2) |
143 |
->json_is('/1/item_id' => $itemnumber2) |
139 |
->json_is('/1/date_due' => $date_due2->ymd . ' ' . $date_due2->hms) |
144 |
->json_is('/1/due_date' => output_pref({ dateformat => "rfc3339", dt => $date_due2 }) ) |
140 |
->json_hasnt('/2'); |
145 |
->json_hasnt('/2'); |
141 |
|
146 |
|
142 |
$tx = $t->ua->build_tx(GET => "/api/v1/checkouts/" . $issue1->issue_id); |
147 |
$tx = $t->ua->build_tx(GET => "/api/v1/checkouts/" . $issue1->issue_id); |
143 |
$tx->req->cookies({name => 'CGISESSID', value => $patron_session->id}); |
148 |
$tx->req->cookies({name => 'CGISESSID', value => $session->id}); |
144 |
$t->request_ok($tx) |
149 |
$t->request_ok($tx) |
145 |
->status_is(200) |
150 |
->status_is(200) |
146 |
->json_is('/borrowernumber' => $borrowernumber) |
151 |
->json_is('/patron_id' => $borrowernumber) |
147 |
->json_is('/itemnumber' => $itemnumber1) |
152 |
->json_is('/item_id' => $itemnumber1) |
148 |
->json_is('/date_due' => $date_due1->ymd . ' ' . $date_due1->hms) |
153 |
->json_is('/due_date' => output_pref({ dateformat => "rfc3339", dt => $date_due1 }) ) |
149 |
->json_hasnt('/1'); |
154 |
->json_hasnt('/1'); |
150 |
|
155 |
|
151 |
$tx = $t->ua->build_tx(GET => "/api/v1/checkouts/" . $issue1->issue_id); |
156 |
$tx = $t->ua->build_tx(GET => "/api/v1/checkouts/" . $issue1->issue_id); |
152 |
$tx->req->cookies({name => 'CGISESSID', value => $session->id}); |
157 |
$tx->req->cookies({name => 'CGISESSID', value => $session->id}); |
153 |
$t->request_ok($tx) |
158 |
$t->request_ok($tx) |
154 |
->status_is(200) |
159 |
->status_is(200) |
155 |
->json_is('/date_due' => $date_due1->ymd . ' ' . $date_due1->hms); |
160 |
->json_is('/due_date' => output_pref({ dateformat => "rfc3339", dt => $date_due1 }) ); |
156 |
|
161 |
|
157 |
$tx = $t->ua->build_tx(GET => "/api/v1/checkouts/" . $issue2->issue_id); |
162 |
$tx = $t->ua->build_tx(GET => "/api/v1/checkouts/" . $issue2->issue_id); |
158 |
$tx->req->cookies({name => 'CGISESSID', value => $session->id}); |
163 |
$tx->req->cookies({name => 'CGISESSID', value => $session->id}); |
159 |
$t->request_ok($tx) |
164 |
$t->request_ok($tx) |
160 |
->status_is(200) |
165 |
->status_is(200) |
161 |
->json_is('/date_due' => $date_due2->ymd . ' ' . $date_due2->hms); |
166 |
->json_is('/due_date' => output_pref( { dateformat => "rfc3339", dt => $date_due2 }) ); |
162 |
|
167 |
|
163 |
|
168 |
|
164 |
$dbh->do('DELETE FROM issuingrules'); |
169 |
$dbh->do('DELETE FROM issuingrules'); |
Lines 172-178
$tx = $t->ua->build_tx(PUT => "/api/v1/checkouts/" . $issue1->issue_id);
Link Here
|
172 |
$tx->req->cookies({name => 'CGISESSID', value => $session->id}); |
177 |
$tx->req->cookies({name => 'CGISESSID', value => $session->id}); |
173 |
$t->request_ok($tx) |
178 |
$t->request_ok($tx) |
174 |
->status_is(200) |
179 |
->status_is(200) |
175 |
->json_is('/date_due' => $expected_datedue->ymd . ' ' . $expected_datedue->hms); |
180 |
->json_is('/due_date' => output_pref( { dateformat => "rfc3339", dt => $expected_datedue }) ); |
176 |
|
181 |
|
177 |
$tx = $t->ua->build_tx(PUT => "/api/v1/checkouts/" . $issue3->issue_id); |
182 |
$tx = $t->ua->build_tx(PUT => "/api/v1/checkouts/" . $issue3->issue_id); |
178 |
$tx->req->cookies({name => 'CGISESSID', value => $patron_session->id}); |
183 |
$tx->req->cookies({name => 'CGISESSID', value => $patron_session->id}); |
Lines 187-200
$tx = $t->ua->build_tx(PUT => "/api/v1/checkouts/" . $issue2->issue_id);
Link Here
|
187 |
$tx->req->cookies({name => 'CGISESSID', value => $patron_session->id}); |
192 |
$tx->req->cookies({name => 'CGISESSID', value => $patron_session->id}); |
188 |
$t->request_ok($tx) |
193 |
$t->request_ok($tx) |
189 |
->status_is(403) |
194 |
->status_is(403) |
190 |
->json_is({ error => "Opac Renewal not allowed" }); |
195 |
->json_is({ error => "Opac Renewal not allowed" }); |
191 |
|
196 |
|
192 |
t::lib::Mocks::mock_preference( "OpacRenewalAllowed", 1 ); |
197 |
t::lib::Mocks::mock_preference( "OpacRenewalAllowed", 1 ); |
193 |
$tx = $t->ua->build_tx(PUT => "/api/v1/checkouts/" . $issue2->issue_id); |
198 |
$tx = $t->ua->build_tx(PUT => "/api/v1/checkouts/" . $issue2->issue_id); |
194 |
$tx->req->cookies({name => 'CGISESSID', value => $patron_session->id}); |
199 |
$tx->req->cookies({name => 'CGISESSID', value => $session->id}); |
195 |
$t->request_ok($tx) |
200 |
$t->request_ok($tx) |
196 |
->status_is(200) |
201 |
->status_is(200) |
197 |
->json_is('/date_due' => $expected_datedue->ymd . ' ' . $expected_datedue->hms); |
202 |
->json_is('/due_date' => output_pref({ dateformat => "rfc3339", dt => $expected_datedue}) ); |
198 |
|
203 |
|
199 |
$tx = $t->ua->build_tx(PUT => "/api/v1/checkouts/" . $issue1->issue_id); |
204 |
$tx = $t->ua->build_tx(PUT => "/api/v1/checkouts/" . $issue1->issue_id); |
200 |
$tx->req->cookies({name => 'CGISESSID', value => $session->id}); |
205 |
$tx->req->cookies({name => 'CGISESSID', value => $session->id}); |
201 |
- |
|
|