Bugzilla – Attachment 133983 Details for
Bug 30275
Checkout renewals should be stored in their own table
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30275: (follow-up) Rebase fixes
Bug-30275-follow-up-Rebase-fixes.patch (text/plain), 5.75 KB, created by
Owen Leonard
on 2022-04-26 17:03:14 UTC
(
hide
)
Description:
Bug 30275: (follow-up) Rebase fixes
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2022-04-26 17:03:14 UTC
Size:
5.75 KB
patch
obsolete
>From c1eeb1f7f23a68eaf01137a85e0ddb5922fca04d Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Tue, 26 Apr 2022 15:33:53 +0100 >Subject: [PATCH] Bug 30275: (follow-up) Rebase fixes > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >--- > api/v1/swagger/definitions/renewal.yaml | 5 +++- > api/v1/swagger/definitions/renewals.yaml | 2 +- > api/v1/swagger/paths/checkouts.yaml | 37 +++++++++++++++--------- > api/v1/swagger/swagger.yaml | 6 ++++ > 4 files changed, 35 insertions(+), 15 deletions(-) > >diff --git a/api/v1/swagger/definitions/renewal.yaml b/api/v1/swagger/definitions/renewal.yaml >index 97d50ea7f6..95e6d94816 100644 >--- a/api/v1/swagger/definitions/renewal.yaml >+++ b/api/v1/swagger/definitions/renewal.yaml >@@ -13,7 +13,10 @@ properties: > - "null" > description: "Interface from which the renewal took place (values can be: api, cron, commandline, intranet, opac and sip)" > renewer_id: >- $ref: ../x-primitives.yaml#/patron_id >+ type: >+ - integer >+ - "null" >+ description: internally assigned for the user that processed the renewal > renewal_date: > type: string > format: date-time >diff --git a/api/v1/swagger/definitions/renewals.yaml b/api/v1/swagger/definitions/renewals.yaml >index 5b2bff0270..3183b6e755 100644 >--- a/api/v1/swagger/definitions/renewals.yaml >+++ b/api/v1/swagger/definitions/renewals.yaml >@@ -1,5 +1,5 @@ > --- > type: array > items: >- $ref: renewal.yaml >+ $ref: "renewal.yaml" > additionalProperties: false >diff --git a/api/v1/swagger/paths/checkouts.yaml b/api/v1/swagger/paths/checkouts.yaml >index 80751e52ba..ebcb610c02 100644 >--- a/api/v1/swagger/paths/checkouts.yaml >+++ b/api/v1/swagger/paths/checkouts.yaml >@@ -80,6 +80,7 @@ > type: string > enum: > - issuer >+ - renewals > collectionFormat: csv > produces: > - application/json >@@ -160,34 +161,34 @@ > - checkouts > summary: Renew a checkout > parameters: >- - $ref: ../parameters.yaml#/checkout_id_pp >- - $ref: ../parameters.yaml#/seen_pp >+ - $ref: "../swagger.yaml#/parameters/checkout_id_pp" >+ - $ref: "../swagger.yaml#/parameters/seen_pp" > produces: > - application/json > responses: > "201": > description: Updated borrower's checkout > schema: >- $ref: ../definitions.yaml#/checkout >+ $ref: "../swagger.yaml#/definitions/checkout" > "403": > description: Cannot renew checkout > schema: >- $ref: ../definitions.yaml#/error >+ $ref: "../swagger.yaml#/definitions/error" > "404": > description: Checkout not found > schema: >- $ref: ../definitions.yaml#/error >+ $ref: "../swagger.yaml#/definitions/error" > "500": > description: | > Internal server error. Possible `error_code` attribute values: > > * `internal_server_error` > schema: >- $ref: ../definitions.yaml#/error >+ $ref: "../swagger.yaml#/definitions/error" > "503": > description: Under maintenance > schema: >- $ref: ../definitions.yaml#/error >+ $ref: "../swagger.yaml#/definitions/error" > x-koha-authorization: > permissions: > circulate: circulate_remaining_permissions >@@ -198,33 +199,43 @@ > - checkouts > summary: List renewals for a checkout > parameters: >- - $ref: ../parameters.yaml#/checkout_id_pp >+ - $ref: "../swagger.yaml#/parameters/checkout_id_pp" >+ - name: x-koha-embed >+ in: header >+ required: false >+ description: Embed list sent as a request header >+ type: array >+ items: >+ type: string >+ enum: >+ - renewer >+ collectionFormat: csv > produces: > - application/json > responses: > "200": > description: List of checkouts renewals > schema: >- $ref: ../definitions.yaml#/renewals >+ $ref: "../swagger.yaml#/definitions/renewals" > "403": > description: Access forbidden > schema: >- $ref: ../definitions.yaml#/error >+ $ref: "../swagger.yaml#/definitions/error" > "404": > description: Checkout not found > schema: >- $ref: ../definitions.yaml#/error >+ $ref: "../swagger.yaml#/definitions/error" > "500": > description: | > Internal server error. Possible `error_code` attribute values: > > * `internal_server_error` > schema: >- $ref: ../definitions.yaml#/error >+ $ref: "../swagger.yaml#/definitions/error" > "503": > description: Under maintenance > schema: >- $ref: ../definitions.yaml#/error >+ $ref: "../swagger.yaml#/definitions/error" > x-koha-authorization: > permissions: > circulate: circulate_remaining_permissions >diff --git a/api/v1/swagger/swagger.yaml b/api/v1/swagger/swagger.yaml >index 7ffd64d52a..a767438af4 100644 >--- a/api/v1/swagger/swagger.yaml >+++ b/api/v1/swagger/swagger.yaml >@@ -54,6 +54,10 @@ definitions: > $ref: ./definitions/patron_extended_attribute.yaml > quote: > $ref: ./definitions/quote.yaml >+ renewal: >+ $ref: ./definitions/renewal.yaml >+ renewals: >+ $ref: ./definitions/renewals.yaml > return_claim: > $ref: ./definitions/return_claim.yaml > smtp_server: >@@ -109,6 +113,8 @@ paths: > $ref: "./paths/checkouts.yaml#/~1checkouts~1{checkout_id}" > "/checkouts/{checkout_id}/allows_renewal": > $ref: "./paths/checkouts.yaml#/~1checkouts~1{checkout_id}~1allows_renewal" >+ "/checkouts/{checkout_id}/renewals": >+ $ref: "./paths/checkouts.yaml#/~1checkouts~1{checkout_id}~1renewals" > "/checkouts/{checkout_id}/renewal": > $ref: "./paths/checkouts.yaml#/~1checkouts~1{checkout_id}~1renewal" > /circulation-rules/kinds: >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 30275
:
131593
|
131594
|
131595
|
131596
|
131597
|
131598
|
131599
|
131600
|
131601
|
131602
|
131603
|
131604
|
131605
|
131606
|
131607
|
131608
|
131609
|
131610
|
131611
|
131612
|
131613
|
131614
|
131615
|
131616
|
131879
|
131880
|
131881
|
131882
|
131883
|
131884
|
131885
|
131886
|
131887
|
131888
|
131889
|
131890
|
131897
|
131898
|
131899
|
131900
|
131901
|
131902
|
131903
|
131904
|
131905
|
131906
|
131907
|
131908
|
131909
|
131910
|
133908
|
133909
|
133910
|
133911
|
133912
|
133913
|
133914
|
133915
|
133916
|
133917
|
133918
|
133919
|
133920
|
133921
|
133922
|
133929
|
133930
|
133931
|
133932
|
133933
|
133934
|
133935
|
133936
|
133937
|
133938
|
133939
|
133940
|
133941
|
133942
|
133943
|
133944
|
133969
|
133970
|
133971
|
133972
|
133973
|
133974
|
133975
|
133976
|
133977
|
133978
|
133979
|
133980
|
133981
|
133982
|
133983
|
133984
|
134177
|
134178
|
134179
|
134180
|
134181
|
134182
|
134183
|
134184
|
134185
|
134186
|
134187
|
134188
|
134189
|
134190
|
134191
|
134192
|
134193
|
134210
|
134228
|
134229
|
134230
|
134231
|
134232
|
134233
|
134234
|
134235
|
134236
|
134237
|
134238
|
134239
|
134240
|
134241
|
134242
|
134243
|
134244
|
134245
|
134246
|
134247
|
134248
|
134470
|
134471
|
134472
|
134473
|
134869
|
134870
|
134871
|
134872
|
134873
|
134874
|
134875
|
134876
|
134877
|
134878
|
134879
|
134880
|
134881
|
134882
|
134883
|
134884
|
134885
|
134886
|
134887
|
134888
|
134889
|
135123
|
135124
|
135125
|
135126
|
135127
|
135128
|
135129
|
135130
|
135131
|
135132
|
135133
|
135134
|
135135
|
135136
|
135137
|
135138
|
135139
|
135140
|
135141
|
135142
|
135143
|
137146
|
137147
|
137148
|
137149
|
137150
|
137151
|
137152
|
137153
|
137154
|
137155
|
137156
|
137157
|
137158
|
137159
|
137160
|
137161
|
137162
|
137163
|
137164
|
137165
|
137166
|
137217
|
137598