Return data as json instead of string

Author: subhashb

message_db/client.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import json
 from typing import Any, Dict, List
 from uuid import uuid4
 
@@ -143,12 +144,20 @@ def read(
                 "batch_size": no_of_messages,
             },
         )
-        messages = cursor.fetchall()
+        raw_messages = cursor.fetchall()
 
         conn.commit()
         cursor.close()
         self.connection_pool.release(conn)
 
+        messages = []
+        for message in raw_messages:
+            message["data"] = json.loads(message["data"])
+            message["metadata"] = (
+                json.loads(message["metadata"]) if message["metadata"] else None
+            )
+            messages.append(message)
+
         return messages
 
     def read_stream(
@@ -190,4 +199,9 @@ def read_last_message(self, stream_name) -> Dict[str, Any]:
         cursor.close()
         self.connection_pool.release(conn)
 
+        if message:
+            message["data"] = json.loads(message["data"])
+            message["metadata"] = (
+                json.loads(message["metadata"]) if message["metadata"] else None
+            )
         return message

tests/test_client.py

@@ -1,5 +1,3 @@
-import json
-
 import pytest
 
 from message_db.client import MessageDB
@@ -35,7 +33,7 @@ def test_writing_message_with_metadata(self, client):
         client.write("testStream-123", "Event1", {"foo": "bar"}, {"trace_id": "baz"})
 
         messages = client.read("testStream-123")
-        assert messages[0]["metadata"] == json.dumps({"trace_id": "baz"})
+        assert messages[0]["metadata"] == {"trace_id": "baz"}
 
     def test_that_write_returns_position_of_message_written(self, client):
         position = client.write("testStream-123", "Event1", {"foo": "bar"})
@@ -90,7 +88,7 @@ def test_read_stream_from_store(self, client):
 
         messages = client.read("testStream-123")
         assert messages is not None
-        assert messages[0]["data"] == json.dumps({"foo": "bar"})
+        assert messages[0]["data"] == {"foo": "bar"}
 
     def test_read_multiple_stream_messages_from_store(self, client):
         for i in range(5):
@@ -100,7 +98,7 @@ def test_read_multiple_stream_messages_from_store(self, client):
 
         assert messages is not None
         assert len(messages) == 5
-        assert messages[4]["data"] == json.dumps({"foo4": "bar4"})
+        assert messages[4]["data"] == {"foo4": "bar4"}
 
     def test_read_paginated_stream_messages_from_store(self, client):
         for i in range(5):
@@ -110,15 +108,15 @@ def test_read_paginated_stream_messages_from_store(self, client):
 
         assert messages is not None
         assert len(messages) == 3
-        assert messages[2]["data"] == json.dumps({"foo2": "bar2"})
+        assert messages[2]["data"] == {"foo2": "bar2"}
 
     def test_read_stream_last_message(self, client):
         for i in range(5):
             client.write("testStream-123", "Event1", {"foo": f"bar{i}"})
 
         message = client.read_last_message("testStream-123")
         assert message["position"] == 4
-        assert message["data"] == json.dumps({"foo": "bar4"})
+        assert message["data"] == {"foo": "bar4"}
 
     def test_read_specific_stream_message(self, client):
         for i in range(5):
@@ -129,7 +127,7 @@ def test_read_specific_stream_message(self, client):
         messages = client.read("testStream-456")
 
         assert len(messages) == 5
-        assert messages[4]["data"] == json.dumps({"foo": "baz4"})
+        assert messages[4]["data"] == {"foo": "baz4"}
 
     def test_read_category_messages(self, client):
         for i in range(5):
@@ -138,7 +136,7 @@ def test_read_category_messages(self, client):
         messages = client.read("testStream")
 
         assert len(messages) == 5
-        assert messages[4]["data"] == json.dumps({"foo": "bar4"})
+        assert messages[4]["data"] == {"foo": "bar4"}
 
 
 class TestReadStream:
@@ -153,7 +151,7 @@ def test_read_stream_from_store(self, client):
 
         messages = client.read_stream("testStream-123")
         assert messages is not None
-        assert messages[0]["data"] == json.dumps({"foo": "bar"})
+        assert messages[0]["data"] == {"foo": "bar"}
 
     def test_read_multiple_stream_messages_from_store(self, client):
         for i in range(5):
@@ -163,7 +161,7 @@ def test_read_multiple_stream_messages_from_store(self, client):
 
         assert messages is not None
         assert len(messages) == 5
-        assert messages[4]["data"] == json.dumps({"foo4": "bar4"})
+        assert messages[4]["data"] == {"foo4": "bar4"}
 
     def test_read_paginated_stream_messages_from_store(self, client):
         for i in range(5):
@@ -173,7 +171,7 @@ def test_read_paginated_stream_messages_from_store(self, client):
 
         assert messages is not None
         assert len(messages) == 3
-        assert messages[2]["data"] == json.dumps({"foo2": "bar2"})
+        assert messages[2]["data"] == {"foo2": "bar2"}
 
 
 class TestReadCategory:
@@ -188,7 +186,7 @@ def test_read_category_messages_from_store(self, client):
 
         messages = client.read_category("testStream")
         assert messages is not None
-        assert messages[0]["data"] == json.dumps({"foo": "bar"})
+        assert messages[0]["data"] == {"foo": "bar"}
 
     def test_read_multiple_category_messages_from_store(self, client):
         for i in range(5):
@@ -198,7 +196,7 @@ def test_read_multiple_category_messages_from_store(self, client):
 
         assert messages is not None
         assert len(messages) == 5
-        assert messages[4]["data"] == json.dumps({"foo4": "bar4"})
+        assert messages[4]["data"] == {"foo4": "bar4"}
 
     def test_read_paginated_category_messages_from_store(self, client):
         for i in range(5):
@@ -208,4 +206,4 @@ def test_read_paginated_category_messages_from_store(self, client):
 
         assert messages is not None
         assert len(messages) == 3
-        assert messages[2]["data"] == json.dumps({"foo2": "bar2"})
+        assert messages[2]["data"] == {"foo2": "bar2"}