Fix a bug in get

Author: Cadair

matrix.py

@@ -18,7 +18,7 @@ def __init__(self, config, opsdroid=None):
         self.room = config.get("default_room", "main")
         self._event_type = "opsdroid.database"
         self._single_state_key = config.get("single_state_key", True)
-        _LOGGER.debug("Loaded matrix database connector")
+        _LOGGER.debug("Loaded matrix database connector.")
 
     async def connect(self):
         """Connect to the database."""
@@ -66,12 +66,14 @@ async def get(self, key):
         room = self.room or "main"
         room_id = room if room.startswith("!") else self.connector.room_ids[room]
 
-        _LOGGER.debug(f"Getting {key} from matrix room {room_id}")
+        state_key = "" if self._single_state_key is True else self._single_state_key or key
+
+        _LOGGER.debug(f"Getting {key} from matrix room {room_id} with state_key={state_key}.")
 
         try:
-            data = await self.get_state_event(room_id, key)
+            data = await self.get_state_event(room_id, state_key)
         except MatrixRequestError as e:
-            _LOGGER.info(f"Failed to get state event with state_key={key}: {e}")
+            _LOGGER.info(f"Failed to get state event with state_key={state_key}: {e}")
             data = None
 
         if not data:
@@ -92,6 +94,7 @@ async def get_state_event(self, room_id, key):
         if key:
             url += f"/{key}"
         try:
+            _LOGGER.debug(f"Making request to {url}.")
             return await self.connector.connection._send("GET", quote(url))
         except MatrixRequestError as e:
             if e.code != 404:

test_database.py

@@ -241,13 +241,15 @@ async def test_default_update_single_state_key(patched_send, opsdroid_matrix):
 
 
 @pytest.mark.asyncio
-async def test_get(patched_send, opsdroid_matrix):
+async def test_get_single_state_key(patched_send, opsdroid_matrix):
     patched_send.return_value = {"twim": {"hello": "world"}}
 
     db = DatabaseMatrix({"single_state_key": True}, opsdroid=opsdroid_matrix)
 
     data = await db.get("twim")
 
+    patched_send.assert_called_once_with("GET", "/rooms/%21notaroomid/state/opsdroid.database")
+
     assert data == {"hello": "world"}
 
 
@@ -259,6 +261,8 @@ async def test_get(patched_send, opsdroid_matrix):
 
     data = await db.get("twim")
 
+    patched_send.assert_called_once_with("GET", "/rooms/%21notaroomid/state/opsdroid.database/twim")
+
     assert data == {"hello": "world"}