Fix related media endpoint (#808)

* Fix related media endpoint * Lint * Use list comprehension Co-authored-by: Krystle Salazar <[email protected]> Co-authored-by: Krystle Salazar <[email protected]>
WordPress · Jul 21, 2022 · d7962f1 · d7962f1
1 parent 3c9a120
commit d7962f1
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 2 deletions.
diff --git a/api/catalog/api/controllers/elasticsearch/related.py b/api/catalog/api/controllers/elasticsearch/related.py
@@ -2,6 +2,7 @@
 import logging
 
 from elasticsearch_dsl import Search
+from elasticsearch_dsl.response import Hit
 
 from catalog.api.controllers.elasticsearch.utils import (
     exclude_filtered_providers,
@@ -51,9 +52,16 @@ def related_media(uuid, index, filter_dead):
 
     result_count, _ = get_result_and_page_count(response, results, page_size)
 
+    dumpable_results = (
+        results.to_dict()
+        if isinstance(results, Hit)
+        else [r.to_dict() for r in results]
+    )
+
     logger.debug(
         "finished post processing and returning related "
         f"result_count={result_count} "
-        f"results={json.dumps(results)}"
+        f"results={json.dumps(dumpable_results)}"
     )
+
     return results, result_count
diff --git a/api/catalog/api/controllers/elasticsearch/search.py b/api/catalog/api/controllers/elasticsearch/search.py
@@ -248,7 +248,7 @@ def perform_search(
     dumpable_results = (
         results.to_dict()
         if isinstance(results, Hit)
-        else list(map(lambda r: r.to_dict(), results))
+        else [r.to_dict() for r in results]
     )
 
     logger.debug(

diff --git a/api/test/audio_integration_test.py b/api/test/audio_integration_test.py
@@ -8,6 +8,7 @@
 from test.media_integration import (
     detail,
     license_filter_case_insensitivity,
+    related,
     report,
     search,
     search_all_excluded,
@@ -122,3 +123,7 @@ def test_audio_uuid_validation():
     uuid_validation("audio", "123456789123456789123456789123456789")
     uuid_validation("audio", "12345678-1234-5678-1234-1234567891234")
     uuid_validation("audio", "abcd")
+
+
+def test_image_related(audio_fixture):
+    related(audio_fixture)
diff --git a/api/test/image_integration_test.py b/api/test/image_integration_test.py
@@ -9,6 +9,7 @@
 from test.media_integration import (
     detail,
     license_filter_case_insensitivity,
+    related,
     report,
     search,
     search_all_excluded,
@@ -139,3 +140,7 @@ def test_image_uuid_validation():
     uuid_validation("images", "123456789123456789123456789123456789")
     uuid_validation("images", "12345678-1234-5678-1234-1234567891234")
     uuid_validation("images", "abcd")
+
+
+def test_image_related(image_fixture):
+    related(image_fixture)
diff --git a/api/test/media_integration.py b/api/test/media_integration.py
@@ -169,3 +169,9 @@ def license_filter_case_insensitivity(media_type):
 def uuid_validation(media_type, identifier):
     response = requests.get(f"{API_URL}/v1/{media_type}/{identifier}", verify=False)
     assert response.status_code == 404
+
+
+def related(fixture):
+    related_url = fixture["results"][0]["related_url"]
+    response = requests.get(related_url)
+    assert response.status_code == 200