From 69532a5ba9f32a5b1228ab0ed19a7bc573be76b3 Mon Sep 17 00:00:00 2001
From: Rafal Makagon <rmakagon@gog.com>
Date: Wed, 27 Nov 2019 13:10:43 +0100
Subject: [PATCH] fix richpresence parameter name

---
 src/galaxy/api/plugin.py    | 14 +++++++-------
 tests/test_user_presence.py | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/galaxy/api/plugin.py b/src/galaxy/api/plugin.py
index d37aa8e..b9cfecd 100644
--- a/src/galaxy/api/plugin.py
+++ b/src/galaxy/api/plugin.py
@@ -971,11 +971,11 @@ class Plugin:
     def os_compatibility_import_complete(self) -> None:
         """Override this method to handle operations after OS compatibility import is finished (like updating cache)."""
 
-    async def _start_user_presence_import(self, user_ids: List[str]) -> None:
+    async def _start_user_presence_import(self, user_id_list: List[str]) -> None:
         if self._user_presence_import_in_progress:
             raise ImportInProgress()
 
-        context = await self.prepare_user_presence_context(user_ids)
+        context = await self.prepare_user_presence_context(user_id_list)
 
         async def import_user_presence(user_id, context_) -> None:
             try:
@@ -986,11 +986,11 @@ class Plugin:
                 logger.exception("Unexpected exception raised in import_user_presence")
                 self._user_presence_import_failure(user_id, UnknownError())
 
-        async def import_user_presence_set(user_ids_, context_) -> None:
+        async def import_user_presence_set(user_id_list_, context_) -> None:
             try:
                 await asyncio.gather(*[
                     import_user_presence(user_id, context_)
-                    for user_id in user_ids_
+                    for user_id in user_id_list_
                 ])
             finally:
                 self._user_presence_import_finished()
@@ -998,18 +998,18 @@ class Plugin:
                 self.user_presence_import_complete()
 
         self._external_task_manager.create_task(
-            import_user_presence_set(user_ids, context),
+            import_user_presence_set(user_id_list, context),
             "user presence import",
             handle_exceptions=False
         )
         self._user_presence_import_in_progress = True
 
-    async def prepare_user_presence_context(self, user_ids: List[str]) -> Any:
+    async def prepare_user_presence_context(self, user_id_list: List[str]) -> Any:
         """Override this method to prepare context for get_user_presence.
         This allows for optimizations like batch requests to platform API.
         Default implementation returns None.
 
-        :param user_ids: the ids of the users for whom presence information is imported
+        :param user_id_list: the ids of the users for whom presence information is imported
         :return: context
         """
         return None
diff --git a/tests/test_user_presence.py b/tests/test_user_presence.py
index 1e52aa6..796c01f 100644
--- a/tests/test_user_presence.py
+++ b/tests/test_user_presence.py
@@ -12,13 +12,13 @@ from tests import create_message, get_messages
 @pytest.mark.asyncio
 async def test_get_user_presence_success(plugin, read, write):
     context = "abc"
-    user_ids = ["666", "13", "42", "69", "22"]
+    user_id_list = ["666", "13", "42", "69", "22"]
     plugin.prepare_user_presence_context.return_value = async_return_value(context)
     request = {
         "jsonrpc": "2.0",
         "id": "11",
         "method": "start_user_presence_import",
-        "params": {"user_ids": user_ids}
+        "params": {"user_id_list": user_id_list}
     }
     read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)]
     plugin.get_user_presence.side_effect = [
@@ -60,7 +60,7 @@ async def test_get_user_presence_success(plugin, read, write):
     ]
     await plugin.run()
     plugin.get_user_presence.assert_has_calls([
-        call(user_id, context) for user_id in user_ids
+        call(user_id, context) for user_id in user_id_list
     ])
     plugin.user_presence_import_complete.assert_called_once_with()
 
@@ -151,7 +151,7 @@ async def test_get_user_presence_error(exception, code, message, plugin, read, w
         "jsonrpc": "2.0",
         "id": request_id,
         "method": "start_user_presence_import",
-        "params": {"user_ids": [user_id]}
+        "params": {"user_id_list": [user_id]}
     }
     read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)]
     plugin.get_user_presence.side_effect = exception
@@ -192,7 +192,7 @@ async def test_prepare_get_user_presence_context_error(plugin, read, write):
         "jsonrpc": "2.0",
         "id": request_id,
         "method": "start_user_presence_import",
-        "params": {"user_ids": ["6"]}
+        "params": {"user_id_list": ["6"]}
     }
     read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)]
     await plugin.run()
@@ -218,7 +218,7 @@ async def test_import_already_in_progress_error(plugin, read, write):
             "id": "3",
             "method": "start_user_presence_import",
             "params": {
-                "user_ids": ["42"]
+                "user_id_list": ["42"]
             }
         },
         {
@@ -226,7 +226,7 @@ async def test_import_already_in_progress_error(plugin, read, write):
             "id": "4",
             "method": "start_user_presence_import",
             "params": {
-                "user_ids": ["666"]
+                "user_id_list": ["666"]
             }
         }
     ]