Bug 32923: Some fixes in ERM specs

Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/api/v1/swagger/paths/erm_agreements.yaml b/api/v1/swagger/paths/erm_agreements.yaml
index 495914b..37233bd 100644 (file)
--- a/api/v1/swagger/paths/erm_agreements.yaml
+++ b/api/v1/swagger/paths/erm_agreements.yaml
@@ -181,8 +181,10 @@
             - agreement_relationships
             - agreement_relationships.agreement
             - agreement_relationships.related_agreement
+            - agreement_packages
+            - agreement_packages.package
             - documents
-            - packages
+            - vendor
         collectionFormat: csv
     responses:
       200:

diff --git a/api/v1/swagger/paths/erm_eholdings_packages.yaml b/api/v1/swagger/paths/erm_eholdings_packages.yaml
index 702e720..a326dc5 100644 (file)
--- a/api/v1/swagger/paths/erm_eholdings_packages.yaml
+++ b/api/v1/swagger/paths/erm_eholdings_packages.yaml
@@ -69,8 +69,9 @@
         items:
           type: string
           enum:
-            - vendors
+            - vendor.name
             - resources+count
+            - resources
         collectionFormat: csv
     responses:
       200:
@@ -180,8 +181,10 @@
         items:
           type: string
           enum:
-            - agreements
-            - resources
+            - package_agreements
+            - package_agreements.agreement
+            - resources+count
+            - vendor
         collectionFormat: csv
     responses:
       200:

diff --git a/api/v1/swagger/paths/erm_eholdings_packages_resources.yaml b/api/v1/swagger/paths/erm_eholdings_packages_resources.yaml
index 7ade1c7..696f495 100644 (file)
--- a/api/v1/swagger/paths/erm_eholdings_packages_resources.yaml
+++ b/api/v1/swagger/paths/erm_eholdings_packages_resources.yaml
@@ -50,7 +50,7 @@
         items:
           type: string
           enum:
-            - title.publication_title
+            - title
         collectionFormat: csv
     responses:
       200:

diff --git a/api/v1/swagger/paths/erm_licenses.yaml b/api/v1/swagger/paths/erm_licenses.yaml
index d9f3efb..0abc7cf 100644 (file)
--- a/api/v1/swagger/paths/erm_licenses.yaml
+++ b/api/v1/swagger/paths/erm_licenses.yaml
@@ -160,6 +160,7 @@
           enum:
             - user_roles
             - user_roles.patron
+            - vendor
             - documents
         collectionFormat: csv
     responses:

diff --git a/t/db_dependent/api/v1/erm_eholdings_packages.t b/t/db_dependent/api/v1/erm_eholdings_packages.t
index ecb4dc9..090ba87 100755 (executable)
--- a/t/db_dependent/api/v1/erm_eholdings_packages.t
+++ b/t/db_dependent/api/v1/erm_eholdings_packages.t
@@ -182,8 +182,8 @@ subtest 'get() tests' => sub {
     # Return one EHoldings package with embed
     $t->get_ok( "//$userid:$password@/api/v1/erm/eholdings/local/packages/"
           . $ehpackage->package_id =>
-          { 'x-koha-embed' => 'resources,resources.package' } )->status_is(200)
-      ->json_is( { %{ $ehpackage->to_api }, resources => [] } );
+          { 'x-koha-embed' => 'resources+count' } )->status_is(200)
+      ->json_is( { %{ $ehpackage->to_api }, resources_count => 0 } );
 
     # Unauthorized access
     $t->get_ok(