tests(cha-648) fix unit tests

Author: Rafael Marinho

stream_chat/async_chat/client.py

@@ -959,13 +959,15 @@ async def get_user_locations(self, user_id: str, **options: Any) -> StreamRespon
 
     async def update_user_location(
         self,
+        user_id: str,
         message_id: str,
         options: Optional[SharedLocationsOptions] = None,
     ) -> StreamResponse:
         data = {"message_id": message_id}
         if options is not None:
             data.update(cast(dict, options))
-        return await self.put("users/live_locations", data=data)
+        params = {"user_id": user_id, **options}
+        return await self.put("users/live_locations", data=data, params=params)
 
     async def close(self) -> None:
         await self.session.close()

stream_chat/base/client.py

@@ -1517,7 +1517,7 @@ def get_user_locations(
 
     @abc.abstractmethod
     def update_user_location(
-        self, message_id: str, options: Optional[SharedLocationsOptions] = None
+        self, user_id: str, message_id: str, options: Optional[SharedLocationsOptions] = None
     ) -> Union[StreamResponse, Awaitable[StreamResponse]]:
         """
         Update the location of a user.

stream_chat/client.py

@@ -906,10 +906,12 @@ def get_user_locations(self, user_id: str, **options: Any) -> StreamResponse:
 
     def update_user_location(
         self,
+        user_id: str,
         message_id: str,
         options: Optional[SharedLocationsOptions] = None,
     ) -> StreamResponse:
         data = {"message_id": message_id}
         if options is not None:
             data.update(cast(dict, options))
-        return self.put("users/live_locations", data=data)
+        params = {"user_id": user_id, **options}
+        return self.put("users/live_locations", data=data, params=params)

stream_chat/tests/async_chat/test_live_locations.py

@@ -1,3 +1,4 @@
+import datetime
 from typing import Dict
 
 import pytest
@@ -7,15 +8,28 @@
 
 @pytest.mark.incremental
 class TestLiveLocations:
-    async def test_get_user_locations(self, client: StreamChatAsync, random_user: Dict):
-        # First create a message to attach location to
-        channel = client.channel("messaging", str(random_user["id"]))
-        channel.create(random_user["id"])
+    @pytest.fixture(autouse=True)
+    @pytest.mark.asyncio
+    async def setup_channel_for_shared_locations(self, channel):
+        await channel.update_partial(
+            {"config_overrides": {"shared_locations": True}},
+        )
+        yield
+        await channel.update_partial(
+            {"config_overrides": {"shared_locations": False}},
+        )
 
+    async def test_get_user_locations(
+        self, client: StreamChatAsync, channel, random_user: Dict
+    ):
         # Create a message to attach location to
+        now = datetime.datetime.now(datetime.timezone.utc)
+        one_hour_later = now + datetime.timedelta(hours=1)
         shared_location = {
+            "created_by_device_id": "test_device_id",
             "latitude": 37.7749,
             "longitude": -122.4194,
+            "end_at": one_hour_later.isoformat(),
         }
 
         channel.send_message(
@@ -30,26 +44,36 @@ async def test_get_user_locations(self, client: StreamChatAsync, random_user: Di
         assert isinstance(response["active_live_locations"], list)
 
     async def test_update_user_location(
-        self, client: StreamChatAsync, random_user: Dict
+        self, client: StreamChatAsync, channel, random_user: Dict
     ):
-        # First create a message to attach location to
-        channel = client.channel("messaging", str(random_user["id"]))
-        await channel.create(random_user["id"])
+        # Create a message to attach location to
+        now = datetime.datetime.now(datetime.timezone.utc)
+        one_hour_later = now + datetime.timedelta(hours=1)
+        shared_location = {
+            "created_by_device_id": "test_device_id",
+            "latitude": 37.7749,
+            "longitude": -122.4194,
+            "end_at": one_hour_later.isoformat(),
+        }
+
         msg = await channel.send_message(
-            {"text": "Message with location"}, random_user["id"]
+            {"text": "Message with location", "shared_location": shared_location},
+            random_user["id"],
         )
         message_id = msg["message"]["id"]
 
         # Update user location
         location_data = {
+            "created_by_device_id": "test_device_id",
             "latitude": 37.7749,
             "longitude": -122.4194,
         }
-        response = await client.update_user_location(message_id, location_data)
+        response = await client.update_user_location(
+            random_user["id"], message_id, location_data
+        )
 
-        assert "shared_location" in response
-        assert response["shared_location"]["latitude"] == location_data["latitude"]
-        assert response["shared_location"]["longitude"] == location_data["longitude"]
+        assert response["latitude"] == location_data["latitude"]
+        assert response["longitude"] == location_data["longitude"]
 
         # Get user locations to verify
         locations_response = await client.get_user_locations(random_user["id"])
@@ -58,9 +82,3 @@ async def test_update_user_location(
         location = locations_response["active_live_locations"][0]
         assert location["latitude"] == location_data["latitude"]
         assert location["longitude"] == location_data["longitude"]
-
-        # Cleanup
-        try:
-            await channel.delete()
-        except Exception:
-            pass

stream_chat/tests/test_live_locations.py

@@ -8,11 +8,17 @@
 
 @pytest.mark.incremental
 class TestLiveLocations:
-    def test_get_user_locations(self, client: StreamChat, random_user: Dict):
-        # First create a message to attach location to
-        channel = client.channel("messaging", str(random_user["id"]))
-        channel.create(random_user["id"])
+    @pytest.fixture(autouse=True)
+    def setup_channel_for_shared_locations(self, channel):
+        channel.update_partial(
+            {"config_overrides": {"shared_locations": True}},
+        )
+        yield
+        channel.update_partial(
+            {"config_overrides": {"shared_locations": False}},
+        )
 
+    def test_get_user_locations(self, client: StreamChat, channel, random_user: Dict):
         # Create a message to attach location to
         now = datetime.datetime.now(datetime.timezone.utc)
         one_hour_later = now + datetime.timedelta(hours=1)
@@ -34,11 +40,7 @@ def test_get_user_locations(self, client: StreamChat, random_user: Dict):
         assert "active_live_locations" in response
         assert isinstance(response["active_live_locations"], list)
 
-    def test_update_user_location(self, client: StreamChat, random_user: Dict):
-        # First create a message to attach location to
-        channel = client.channel("messaging", str(random_user["id"]))
-        channel.create(random_user["id"])
-
+    def test_update_user_location(self, client: StreamChat, channel, random_user: Dict):
         # Create a message to attach location to
         now = datetime.datetime.now(datetime.timezone.utc)
         one_hour_later = now + datetime.timedelta(hours=1)
@@ -57,14 +59,16 @@ def test_update_user_location(self, client: StreamChat, random_user: Dict):
 
         # Update user location
         location_data = {
+            "created_by_device_id": "test_device_id",
             "latitude": 37.7749,
             "longitude": -122.4194,
         }
-        response = client.update_user_location(message_id, location_data)
+        response = client.update_user_location(
+            random_user["id"], message_id, location_data
+        )
 
-        assert "shared_location" in response
-        assert response["shared_location"]["latitude"] == location_data["latitude"]
-        assert response["shared_location"]["longitude"] == location_data["longitude"]
+        assert response["latitude"] == location_data["latitude"]
+        assert response["longitude"] == location_data["longitude"]
 
         # Get user locations to verify
         locations_response = client.get_user_locations(random_user["id"])
@@ -73,9 +77,3 @@ def test_update_user_location(self, client: StreamChat, random_user: Dict):
         location = locations_response["active_live_locations"][0]
         assert location["latitude"] == location_data["latitude"]
         assert location["longitude"] == location_data["longitude"]
-
-        # Cleanup
-        try:
-            channel.delete()
-        except Exception:
-            pass