Fix unittests on connection and message service

Author: catalinsymphony

symphony/bdk/core/service/connection/connection_service.py

@@ -1,3 +1,5 @@
+from typing import List
+
 from symphony.bdk.core.auth.auth_session import AuthSession
 from symphony.bdk.core.config.model.bdk_retry_config import BdkRetryConfig
 from symphony.bdk.core.retry import retry
@@ -42,8 +44,8 @@ async def get_connection(self, user_id: int) -> UserConnection:
 
     @retry
     async def list_connections(
-        self, status: ConnectionStatus = ConnectionStatus.ALL, user_ids: [int] = None
-    ) -> [UserConnection]:
+        self, status: ConnectionStatus = ConnectionStatus.ALL, user_ids: List[int] = None
+    ) -> List[UserConnection]:
         """
         List all connection statuses of the requesting user with external or specified users.
         See: `List Connections <https://developers.symphony.com/restapi/reference/list-connections>`_
@@ -64,7 +66,7 @@ async def list_connections(
             params["user_ids"] = ",".join(map(str, user_ids))
 
         user_connection_list = await self._connection_api.v1_connection_list_get(**params)
-        return user_connection_list.value
+        return user_connection_list
 
     @retry
     async def create_connection(self, user_id: int) -> UserConnection:

symphony/bdk/core/service/message/message_service.py

@@ -16,7 +16,6 @@
 from symphony.bdk.gen.agent_model.v4_message_blast_response import (
     V4MessageBlastResponse,
 )
-from symphony.bdk.gen.agent_model.v4_message_import_list import V4MessageImportList
 from symphony.bdk.gen.pod_api.default_api import DefaultApi
 from symphony.bdk.gen.pod_api.message_api import MessageApi
 from symphony.bdk.gen.pod_api.message_suppression_api import MessageSuppressionApi
@@ -201,7 +200,7 @@ async def get_attachment_types(self) -> List[str]:
         """
         params = {"session_token": await self._auth_session.session_token}
         type_list = await self._pod_api.v1_files_allowed_types_get(**params)
-        return type_list.value
+        return type_list
 
     async def blast_message(
         self,
@@ -307,8 +306,8 @@ def __init__(
     @retry
     async def list_messages(
         self, stream_id: str, since: int = 0, skip: int = 0, limit: int = 50
-    ) -> [V4Message]:
-        """Get messages from an existing stream. Additionally returns any attachments associated with the message.
+    ) -> List[V4Message]:
+        """Get messages from an existing stream. Additionally, returns any attachments associated with the message.
         See: `Messages <https://developers.symphony.com/restapi/reference/messages-v4>`_
 
         :param stream_id: The stream where to look for messages
@@ -328,10 +327,10 @@ async def list_messages(
             "limit": limit,
         }
         message_list = await self._messages_api.v4_stream_sid_message_get(**params)
-        return message_list.value
+        return message_list
 
     @retry
-    async def import_messages(self, messages: List[V4ImportedMessage]) -> [V4ImportResponse]:
+    async def import_messages(self, messages: List[V4ImportedMessage]) -> List[V4ImportResponse]:
         """Imports a list of messages to Symphony.
         See: `Import Message <https://developers.symphony.com/restapi/reference/import-message-v4>`_
 
@@ -341,12 +340,12 @@ async def import_messages(self, messages: List[V4ImportedMessage]) -> [V4ImportR
 
         """
         params = {
-            "message_list": V4MessageImportList(value=messages),
+            "message_list": messages,
             "session_token": await self._auth_session.session_token,
             "key_manager_token": await self._auth_session.key_manager_token,
         }
         import_response_list = await self._messages_api.v4_message_import_post(**params)
-        return import_response_list.value
+        return import_response_list
 
     async def get_attachment(self, stream_id: str, message_id: str, attachment_id: str) -> str:
         """Downloads the attachment body by the stream ID, message ID and attachment ID.
@@ -434,7 +433,7 @@ async def list_attachments(
         if to is not None:
             params["to"] = to
         attachment_list = await self._streams_api.v1_streams_sid_attachments_get(**params)
-        return attachment_list.value
+        return attachment_list
 
     @retry
     async def list_message_receipts(self, message_id: str) -> MessageReceiptDetailResponse:
@@ -501,7 +500,7 @@ async def search_messages(
             "limit": limit,
         }
         message_list = await self._messages_api.v1_message_search_post(**params)
-        return message_list.value  # endpoint returns empty list when no values found
+        return message_list
 
     async def search_all_messages(
         self,

tests/bdk/gen/rest_test.py

@@ -8,6 +8,6 @@ async def test_system_certs_are_loaded():
     rest_client = rest.RESTClientObject(Configuration())
 
     # Calling an URL with a valid HTTPS cert
-    response = await rest_client.GET("https://google.fr")
+    response = await rest_client.request("GET", "https://google.fr")
 
     assert response.status == 200

tests/core/service/connection/connection_service_test.py

@@ -1,3 +1,4 @@
+from typing import List
 from unittest.mock import AsyncMock, MagicMock
 
 import pytest
@@ -7,7 +8,6 @@
 from symphony.bdk.core.service.connection.model.connection_status import ConnectionStatus
 from symphony.bdk.gen.pod_api.connection_api import ConnectionApi
 from symphony.bdk.gen.pod_model.user_connection import UserConnection
-from symphony.bdk.gen.pod_model.user_connection_list import UserConnectionList
 from symphony.bdk.gen.pod_model.user_connection_request import UserConnectionRequest
 from tests.core.config import minimal_retry_config
 from tests.utils.resource_utils import deserialize_object
@@ -52,7 +52,7 @@ async def test_get_connection(connection_api, connection_service):
 async def test_list_connections(connection_api, connection_service):
     connection_api.v1_connection_list_get = AsyncMock()
     connection_api.v1_connection_list_get.return_value = deserialize_object(
-        UserConnectionList,
+        List[UserConnection],
         "["
         "   {"
         '       "userId": 7078106126503,'

tests/core/service/message/message_service_test.py

@@ -1,4 +1,5 @@
 import json
+from typing import List
 from unittest.mock import AsyncMock, MagicMock
 
 import pytest
@@ -11,11 +12,10 @@
 )
 from symphony.bdk.gen.agent_api.attachments_api import AttachmentsApi
 from symphony.bdk.gen.agent_model.message_search_query import MessageSearchQuery
-from symphony.bdk.gen.agent_model.v4_import_response_list import V4ImportResponseList
+from symphony.bdk.gen.agent_model.v4_import_response import V4ImportResponse
 from symphony.bdk.gen.agent_model.v4_imported_message import V4ImportedMessage
 from symphony.bdk.gen.agent_model.v4_message import V4Message
 from symphony.bdk.gen.agent_model.v4_message_blast_response import V4MessageBlastResponse
-from symphony.bdk.gen.agent_model.v4_message_list import V4MessageList
 from symphony.bdk.gen.api_client import ApiClient, Configuration
 from symphony.bdk.gen.pod_api.default_api import DefaultApi
 from symphony.bdk.gen.pod_api.message_api import MessageApi
@@ -26,8 +26,7 @@
 from symphony.bdk.gen.pod_model.message_receipt_detail_response import MessageReceiptDetailResponse
 from symphony.bdk.gen.pod_model.message_status import MessageStatus
 from symphony.bdk.gen.pod_model.message_suppression_response import MessageSuppressionResponse
-from symphony.bdk.gen.pod_model.stream_attachment_response import StreamAttachmentResponse
-from symphony.bdk.gen.pod_model.string_list import StringList
+from symphony.bdk.gen.pod_model.stream_attachment_item import StreamAttachmentItem
 from tests.core.config import minimal_retry_config
 from tests.utils.resource_utils import deserialize_object, get_deserialized_object_from_resource
 
@@ -67,7 +66,7 @@ def fixture_message_service(mocked_api_client, auth_session):
 @pytest.mark.asyncio
 async def test_list_messages(mocked_api_client, message_service):
     mocked_api_client.call_api.return_value = get_deserialized_object_from_resource(
-        V4MessageList, "message_response/list_messages.json"
+        List[V4Message], "message_response/list_messages.json"
     )
     messages_list = await message_service.list_messages("stream_id")
 
@@ -247,7 +246,7 @@ async def test_blast_complex_message(message_service):
 @pytest.mark.asyncio
 async def test_import_message(mocked_api_client, message_service):
     mocked_api_client.call_api.return_value = deserialize_object(
-        V4ImportResponseList,
+        List[V4ImportResponse],
         "["
         "   {"
         '       "messageId": "FjSY1y3L",  '
@@ -310,7 +309,7 @@ async def test_get_message_status(mocked_api_client, message_service):
 @pytest.mark.asyncio
 async def test_get_attachment_types(mocked_api_client, message_service):
     mocked_api_client.call_api.return_value = deserialize_object(
-        StringList, '[   ".bmp",   ".doc",   ".png",   ".mpeg"]'
+        List[str], '[   ".bmp",   ".doc",   ".png",   ".mpeg"]'
     )
 
     attachment_types = await message_service.get_attachment_types()
@@ -335,7 +334,7 @@ async def test_get_message(mocked_api_client, message_service):
 @pytest.mark.asyncio
 async def test_list_attachments(mocked_api_client, message_service):
     mocked_api_client.call_api.return_value = get_deserialized_object_from_resource(
-        StreamAttachmentResponse, "message_response/list_attachments.json"
+        List[StreamAttachmentItem], "message_response/list_attachments.json"
     )
 
     attachments = await message_service.list_attachments("stream_id")
@@ -376,7 +375,7 @@ async def test_get_message_relationships(mocked_api_client, message_service):
 @pytest.mark.asyncio
 async def test_search_messages_with_hashtag(mocked_api_client, message_service):
     mocked_api_client.call_api.return_value = get_deserialized_object_from_resource(
-        V4MessageList, "message_response/list_messages.json"
+        List[V4Message], "message_response/list_messages.json"
     )
 
     messages = await message_service.search_messages(MessageSearchQuery(hashtag="tag"))
@@ -390,7 +389,7 @@ async def test_search_messages_with_valid_stream_type(
     mocked_api_client, message_service, stream_type
 ):
     mocked_api_client.call_api.return_value = get_deserialized_object_from_resource(
-        V4MessageList, "message_response/list_messages.json"
+        List[V4Message], "message_response/list_messages.json"
     )
 
     messages = await message_service.search_messages(MessageSearchQuery(stream_type=stream_type))
@@ -401,7 +400,7 @@ async def test_search_messages_with_valid_stream_type(
 @pytest.mark.asyncio
 async def test_search_messages_with_invalid_stream_type(mocked_api_client, message_service):
     mocked_api_client.call_api.return_value = get_deserialized_object_from_resource(
-        V4MessageList, "message_response/list_messages.json"
+        List[V4Message], "message_response/list_messages.json"
     )
 
     with pytest.raises(ValueError):
@@ -411,7 +410,7 @@ async def test_search_messages_with_invalid_stream_type(mocked_api_client, messa
 @pytest.mark.asyncio
 async def test_search_messages_with_text_and_sid(mocked_api_client, message_service):
     mocked_api_client.call_api.return_value = get_deserialized_object_from_resource(
-        V4MessageList, "message_response/list_messages.json"
+        List[V4Message], "message_response/list_messages.json"
     )
 
     messages = await message_service.search_messages(
@@ -424,7 +423,7 @@ async def test_search_messages_with_text_and_sid(mocked_api_client, message_serv
 @pytest.mark.asyncio
 async def test_search_messages_with_text_and_no_sid(mocked_api_client, message_service):
     mocked_api_client.call_api.return_value = get_deserialized_object_from_resource(
-        V4MessageList, "message_response/list_messages.json"
+        List[V4Message], "message_response/list_messages.json"
     )
 
     with pytest.raises(ValueError):
@@ -437,7 +436,7 @@ async def test_search_messages_with_stream_type_text_and_sid(
     mocked_api_client, message_service, stream_type
 ):
     mocked_api_client.call_api.return_value = get_deserialized_object_from_resource(
-        V4MessageList, "message_response/list_messages.json"
+        List[V4Message], "message_response/list_messages.json"
     )
 
     messages = await message_service.search_messages(
@@ -453,7 +452,7 @@ async def test_search_messages_with_stream_type_text_and_no_sid(
     mocked_api_client, message_service, stream_type
 ):
     mocked_api_client.call_api.return_value = get_deserialized_object_from_resource(
-        V4MessageList, "message_response/list_messages.json"
+        List[V4Message], "message_response/list_messages.json"
     )
 
     with pytest.raises(ValueError):
@@ -465,8 +464,8 @@ async def test_search_messages_with_stream_type_text_and_no_sid(
 @pytest.mark.asyncio
 async def test_search_all_messages(mocked_api_client, message_service):
     mocked_api_client.call_api.side_effect = [
-        get_deserialized_object_from_resource(V4MessageList, "message_response/list_messages.json"),
-        V4MessageList(value=[]),
+        get_deserialized_object_from_resource(List[V4Message], "message_response/list_messages.json"),
+        [],
     ]
     chunk_size = 1
 

tests/resources/session/get_session.json

@@ -1,9 +1,9 @@
 {
   "id": 7696581394433,
-  "email_address": "admin@symphony.com",
-  "first_name": "Symphony",
-  "last_name": "Admin",
-  "display_name": "Symphony Admin",
+  "emailAddress": "admin@symphony.com",
+  "firstName": "Symphony",
+  "lastName": "Admin",
+  "displayName": "Symphony Admin",
   "title": "Administrator",
   "company": "Acme",
   "username": "admin@symphony.com",