Attachment 110161 Details for Bug 24718 – Bug 24718: (follow-up) Attempting to fix Koha REST holds

[patch] Bug 24718: (follow-up) Attempting to fix Koha REST holds

Bug-24718-follow-up-Attempting-to-fix-Koha-REST-ho.patch (text/plain), 4.43 KB, created by Nick Clemens (kidclamp) on 2020-09-16 10:16:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2020-09-16 10:16:39 UTC

Size: 4.43 KB

patch

obsolete

>From c7a5253bcac0e9ff84b1072f43e74f508f698ff0 Mon Sep 17 00:00:00 2001
>From: Aleisha Amohia <aleishaamohia@hotmail.com>
>Date: Wed, 16 Sep 2020 13:32:15 +1200
>Subject: [PATCH] Bug 24718: (follow-up) Attempting to fix Koha REST holds
>
>---
> api/v1/swagger/definitions/hold.json |  4 ++--
> api/v1/swagger/paths/holds.json      |  2 +-
> t/db_dependent/api/v1/holds.t        | 14 +++++++-------
> 3 files changed, 10 insertions(+), 10 deletions(-)
>
>diff --git a/api/v1/swagger/definitions/hold.json b/api/v1/swagger/definitions/hold.json
>index 6a018e916f..f8235aa97a 100644
>--- a/api/v1/swagger/definitions/hold.json
>+++ b/api/v1/swagger/definitions/hold.json
>@@ -11,7 +11,7 @@
>     },
>     "hold_date": {
>       "type": ["string", "null"],
>-      "format": "date",
>+      "format": "date-time",
>       "description": "The date the hold was placed"
>     },
>     "biblio_id": {
>@@ -55,7 +55,7 @@
>     },
>     "expiration_date": {
>       "type": ["string", "null"],
>-      "format": "date",
>+      "format": "date-time",
>       "description": "The date the hold expires"
>     },
>     "lowest_priority": {
>diff --git a/api/v1/swagger/paths/holds.json b/api/v1/swagger/paths/holds.json
>index 8137f16a7f..9c3accfd5c 100644
>--- a/api/v1/swagger/paths/holds.json
>+++ b/api/v1/swagger/paths/holds.json
>@@ -198,7 +198,7 @@
>               "expiration_date": {
>                 "description": "Hold end date",
>                 "type": ["string", "null"],
>-                "format": "date"
>+                "format": "date-time"
>               },
>               "notes": {
>                 "description": "Notes related to this hold",
>diff --git a/t/db_dependent/api/v1/holds.t b/t/db_dependent/api/v1/holds.t
>index 750bcd95b4..ea459f6021 100755
>--- a/t/db_dependent/api/v1/holds.t
>+++ b/t/db_dependent/api/v1/holds.t
>@@ -157,7 +157,7 @@ my $post_data = {
>     biblio_id => int($biblio_1->biblionumber),
>     item_id => int($item_1->itemnumber),
>     pickup_library_id => $branchcode,
>-    expiration_date => output_pref({ dt => $expiration_date, dateformat => 'rfc3339', dateonly => 1 }),
>+    expiration_date => output_pref({ dt => $expiration_date, dateformat => 'rfc3339' }),
>     priority => 2,
> };
> my $put_data = {
>@@ -273,7 +273,7 @@ subtest "Test endpoints with permission" => sub {
>     $t->get_ok( "//$userid_1:$password@/api/v1/holds?patron_id=" . $patron_1->borrowernumber )
>       ->status_is(200)
>       ->json_is('/0/hold_id', $reserve_id)
>-      ->json_is('/0/expiration_date', output_pref({ dt => $expiration_date, dateformat => 'rfc3339', dateonly => 1 }))
>+      ->json_is('/0/expiration_date', output_pref({ dt => $expiration_date, dateformat => 'rfc3339' }))
>       ->json_is('/0/pickup_library_id', $branchcode);
> 
>     $t->post_ok( "//$userid_3:$password@/api/v1/holds" => json => $post_data )
>@@ -342,8 +342,8 @@ subtest 'test AllowHoldDateInFuture' => sub {
>         biblio_id => int($biblio_1->biblionumber),
>         item_id => int($item_1->itemnumber),
>         pickup_library_id => $branchcode,
>-        expiration_date => output_pref({ dt => $expiration_date, dateformat => 'rfc3339', dateonly => 1 }),
>-        hold_date => output_pref({ dt => $future_hold_date, dateformat => 'rfc3339', dateonly => 1 }),
>+        expiration_date => output_pref({ dt => $expiration_date, dateformat => 'rfc3339' }),
>+        hold_date => output_pref({ dt => $future_hold_date, dateformat => 'rfc3339' }),
>         priority => 2,
>     };
> 
>@@ -357,7 +357,7 @@ subtest 'test AllowHoldDateInFuture' => sub {
> 
>     $t->post_ok( "//$userid_3:$password@/api/v1/holds" => json => $post_data )
>       ->status_is(201)
>-      ->json_is('/hold_date', output_pref({ dt => $future_hold_date, dateformat => 'rfc3339', dateonly => 1 }));
>+      ->json_is('/hold_date', output_pref({ dt => $future_hold_date, dateformat => 'rfc3339' }));
> };
> 
> subtest 'test AllowHoldPolicyOverride' => sub {
>@@ -425,7 +425,7 @@ subtest 'suspend and resume tests' => sub {
>     my $end_date = output_pref({
>       dt         => dt_from_string( undef ),
>       dateformat => 'rfc3339',
>-      dateonly   => 1
>+      dateonly => 1
>     });
> 
>     $t->post_ok( "//$userid:$password@/api/v1/holds/" . $hold->id . "/suspension" => json => { end_date => $end_date } );
>@@ -438,7 +438,7 @@ subtest 'suspend and resume tests' => sub {
>       output_pref({
>         dt         => dt_from_string( $hold->suspend_until ),
>         dateformat => 'rfc3339',
>-        dateonly   => 1
>+        dateonly => 1
>       }),
>       'Hold suspension has correct end date'
>     );
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 24718: 99540 | 99541 | 99542 | 99543 | 99544 | 99545 | 99548 | 103521 | 103522 | 103549 | 103550 | 103551 | 103552 | 103553 | 103554 | 103555 | 106270 | 106271 | 106272 | 106273 | 106274 | 106275 | 110084 | 110085 | 110086 | 110087 | 110088 | 110089 | 110090 | 110091 | 110098 | 110137 | 110161 | 110303 | 126559 | 126560 | 126561 | 126562 | 126563 | 126564 | 148293 | 148294 | 148295 | 148296 | 148297 | 148298 | 162474 | 162475 | 162476 | 162477 | 162478 | 162479