From 701aec8443e99268f12ad0a3f54c48cee16b9d7d Mon Sep 17 00:00:00 2001
From: Josef Moravec <josef.moravec@gmail.com>
Date: Wed, 13 Mar 2019 16:03:09 +0000
Subject: [PATCH] Bug 13895: Adapt naming according to voted RFC

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit a142369b309068ed2ba5d34f033f4e047483401d)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 Koha/REST/V1/Checkout.pm                 | 4 ++--
 api/v1/swagger/definitions/checkout.json | 6 +++++-
 api/v1/swagger/parameters.json           | 4 ++--
 api/v1/swagger/parameters/checkout.json  | 2 +-
 api/v1/swagger/paths/checkouts.json      | 4 ++--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Koha/REST/V1/Checkout.pm b/Koha/REST/V1/Checkout.pm
index 3dba36c316..e228216a96 100644
--- a/Koha/REST/V1/Checkout.pm
+++ b/Koha/REST/V1/Checkout.pm
@@ -186,7 +186,7 @@ our $to_api_mapping = {
     branchcode      => 'library_id',
     returndate      => 'checkin_date',
     lastreneweddate => 'last_renewed_date',
-    issuedate       => 'checked_out_date',
+    issuedate       => 'checkout_date',
     notedate        => 'note_date',
 };
 
@@ -202,7 +202,7 @@ our $to_model_mapping = {
     library_id        => 'branchcode',
     checkin_date      => 'returndate',
     last_renewed_date => 'lastreneweddate',
-    checked_out_date  => 'issuedate',
+    checkout_date     => 'issuedate',
     note_date         => 'notedate',
 };
 
diff --git a/api/v1/swagger/definitions/checkout.json b/api/v1/swagger/definitions/checkout.json
index e540a55583..83cbe1a447 100644
--- a/api/v1/swagger/definitions/checkout.json
+++ b/api/v1/swagger/definitions/checkout.json
@@ -39,11 +39,15 @@
       "type": "boolean",
       "description": "Auto renewal"
     },
+    "auto_renew_error": {
+      "type": ["string", "null"],
+      "description": "Auto renewal error"
+    },
     "timestamp": {
       "type": "string",
       "description": "Last update time"
     },
-    "checked_out_date": {
+    "checkout_date": {
       "type": "string",
       "format": "date-time",
       "description": "Date the item was issued"
diff --git a/api/v1/swagger/parameters.json b/api/v1/swagger/parameters.json
index 0df77a78e8..11ce57cd9a 100644
--- a/api/v1/swagger/parameters.json
+++ b/api/v1/swagger/parameters.json
@@ -17,8 +17,8 @@
   "vendoridPathParam": {
     "$ref": "parameters/vendor.json#/vendoridPathParam"
   },
-  "checkoutIdPathParam": {
-    "$ref": "parameters/checkout.json#/checkoutIdPathParam"
+  "checkout_id_pp": {
+    "$ref": "parameters/checkout.json#/checkout_id_pp"
   },
   "match": {
     "name": "_match",
diff --git a/api/v1/swagger/parameters/checkout.json b/api/v1/swagger/parameters/checkout.json
index 8dfa3d2985..2bdb20ab84 100644
--- a/api/v1/swagger/parameters/checkout.json
+++ b/api/v1/swagger/parameters/checkout.json
@@ -1,5 +1,5 @@
 {
-  "checkoutIdPathParam": {
+  "checkout_id_pp": {
     "name": "checkout_id",
     "in": "path",
     "description": "Internal checkout identifier",
diff --git a/api/v1/swagger/paths/checkouts.json b/api/v1/swagger/paths/checkouts.json
index 134aee55ad..1729826a4f 100644
--- a/api/v1/swagger/paths/checkouts.json
+++ b/api/v1/swagger/paths/checkouts.json
@@ -39,7 +39,7 @@
       "operationId": "getCheckout",
       "tags": ["patrons", "checkouts"],
       "parameters": [{
-        "$ref": "../parameters.json#/checkoutIdPathParam"
+        "$ref": "../parameters.json#/checkout_id_pp"
       }],
       "produces": ["application/json"],
       "responses": {
@@ -69,7 +69,7 @@
       "operationId": "renewCheckout",
       "tags": ["patrons", "checkouts"],
       "parameters": [{
-        "$ref": "../parameters.json#/checkoutIdPathParam"
+        "$ref": "../parameters.json#/checkout_id_pp"
       }],
       "produces": ["application/json"],
       "responses": {
-- 
2.39.5