test: record topic parsing for webhook

Signed-off-by: Daniel Bluhm <[email protected]>

Author: dbluhm

aries_cloudagent/admin/server.py

@@ -40,7 +40,7 @@
 LOGGER = logging.getLogger(__name__)
 
 EVENT_PATTERN_WEBHOOK = re.compile("^acapy::webhook::(.*)$")
-EVENT_PATTERN_RECORD = re.compile("^acapy::record::(.*)$")
+EVENT_PATTERN_RECORD = re.compile("^acapy::record::([^:]*)(?:::.*)?$")
 
 EVENT_WEBHOOK_MAPPING = {
     "acapy::basicmessage::received": "basicmessages",
@@ -450,8 +450,8 @@ def sort_dict(raw: dict) -> dict:
 
         event_bus = self.context.inject(EventBus, required=False)
         if event_bus:
-            event_bus.subscribe(EVENT_PATTERN_WEBHOOK, self.__on_webhook_event)
-            event_bus.subscribe(EVENT_PATTERN_RECORD, self.__on_record_event)
+            event_bus.subscribe(EVENT_PATTERN_WEBHOOK, self._on_webhook_event)
+            event_bus.subscribe(EVENT_PATTERN_RECORD, self._on_record_event)
 
             for event_topic, webhook_topic in EVENT_WEBHOOK_MAPPING.items():
                 event_bus.subscribe(
@@ -788,13 +788,13 @@ async def websocket_handler(self, request):
 
         return ws
 
-    async def __on_webhook_event(self, profile: Profile, event: Event):
+    async def _on_webhook_event(self, profile: Profile, event: Event):
         match = EVENT_PATTERN_WEBHOOK.search(event.topic)
         webhook_topic = match.group(1) if match else None
         if webhook_topic:
             await self.send_webhook(profile, webhook_topic, event.payload)
 
-    async def __on_record_event(self, profile: Profile, event: Event):
+    async def _on_record_event(self, profile: Profile, event: Event):
         match = EVENT_PATTERN_RECORD.search(event.topic)
         webhook_topic = match.group(1) if match else None
         if webhook_topic:

aries_cloudagent/admin/tests/test_admin_server.py

@@ -1,7 +1,9 @@
+from aries_cloudagent.core.event_bus import Event
 import json
 
 from aiohttp import ClientSession, DummyCookieJar, TCPConnector, web
 from aiohttp.test_utils import unused_port
+import pytest
 
 from asynctest import TestCase as AsyncTestCase
 from asynctest import mock as async_mock
@@ -434,3 +436,25 @@ async def test_server_health_state(self):
         ) as response:
             assert response.status == 503
         await server.stop()
+
+
+@pytest.fixture
+async def server():
+    test_class = TestAdminServer()
+    await test_class.setUp()
+    yield test_class.get_admin_server()
+    await test_class.tearDown()
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "event_topic, webhook_topic",
+    [("acapy::record::topic", "topic"), ("acapy::record::topic::state", "topic")],
+)
+async def test_on_record_event(server, event_topic, webhook_topic):
+    profile = InMemoryProfile.test_profile()
+    with async_mock.patch.object(
+        server, "send_webhook", async_mock.CoroutineMock()
+    ) as mock_send_webhook:
+        await server._on_record_event(profile, Event(event_topic, None))
+        mock_send_webhook.assert_called_once_with(profile, webhook_topic, None)