From 0e36cbb9fb25ebe020f779f32bbb300a2e76150c Mon Sep 17 00:00:00 2001 From: Pedro Amorim Date: Fri, 28 Oct 2022 22:16:34 +0000 Subject: [PATCH] Bug 32030: Add users to licenses - REST API Spec Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi --- api/v1/swagger/definitions/erm_agreement.yaml | 2 +- api/v1/swagger/definitions/erm_license.yaml | 5 +++++ .../{erm_agreement_user_role.yaml => erm_user_role.yaml} | 9 ++++++++- api/v1/swagger/paths/erm_licenses.yaml | 3 +++ 4 files changed, 17 insertions(+), 2 deletions(-) rename api/v1/swagger/definitions/{erm_agreement_user_role.yaml => erm_user_role.yaml} (70%) diff --git a/api/v1/swagger/definitions/erm_agreement.yaml b/api/v1/swagger/definitions/erm_agreement.yaml index f2c3f4917b..e8fc871d34 100644 --- a/api/v1/swagger/definitions/erm_agreement.yaml +++ b/api/v1/swagger/definitions/erm_agreement.yaml @@ -48,7 +48,7 @@ properties: type: array description: role for users items: - $ref: erm_agreement_user_role.yaml + $ref: erm_user_role.yaml agreement_relationships: type: array description: agreement relationships diff --git a/api/v1/swagger/definitions/erm_license.yaml b/api/v1/swagger/definitions/erm_license.yaml index f17f92d548..5a2d43cad8 100644 --- a/api/v1/swagger/definitions/erm_license.yaml +++ b/api/v1/swagger/definitions/erm_license.yaml @@ -36,6 +36,11 @@ properties: - "null" format: date description: End of the license + user_roles: + type: array + description: role for users + items: + $ref: erm_user_role.yaml documents: type: array description: documents diff --git a/api/v1/swagger/definitions/erm_agreement_user_role.yaml b/api/v1/swagger/definitions/erm_user_role.yaml similarity index 70% rename from api/v1/swagger/definitions/erm_agreement_user_role.yaml rename to api/v1/swagger/definitions/erm_user_role.yaml index 68c3cb33d5..7256542ce0 100644 --- a/api/v1/swagger/definitions/erm_agreement_user_role.yaml +++ b/api/v1/swagger/definitions/erm_user_role.yaml @@ -2,8 +2,15 @@ type: object properties: agreement_id: - type: integer + type: + - integer + - "null" description: Internal agreement identifier + license_id: + type: + - integer + - "null" + description: Internal license identifier user_id: type: integer description: Internal patron identifier diff --git a/api/v1/swagger/paths/erm_licenses.yaml b/api/v1/swagger/paths/erm_licenses.yaml index 13b003ddb0..bb32fb93f3 100644 --- a/api/v1/swagger/paths/erm_licenses.yaml +++ b/api/v1/swagger/paths/erm_licenses.yaml @@ -182,6 +182,8 @@ permissions: erm: 1 x-koha-embed: + - user_roles + - user_roles.patron - documents put: x-mojo-to: ERM::Licenses#update @@ -242,6 +244,7 @@ permissions: erm: 1 x-koha-embed: + - user_roles - documents delete: x-mojo-to: ERM::Licenses#delete -- 2.39.2