Merge branch 'retry-on-unsilence' into 'master'

fix: [#64073] immediately retry events on unsilence

See merge request rammearkitektur/os2mo!2609

Author: Carl Bordum Hansen

backend/mora/graphapi/versions/latest/mutators.py

@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: MPL-2.0
 import asyncio
 import logging
+from datetime import datetime
 from textwrap import dedent
 from typing import Annotated
 from typing import Any
@@ -1930,7 +1931,16 @@ async def event_unsilence(
 
         # coverage: pause
         session: AsyncSession = info.context["session"]
-        await session.execute(update(db.Event).where(*clauses).values(silenced=False))
+        await session.execute(
+            update(db.Event)
+            .where(*clauses)
+            .values(
+                silenced=False,
+                # Update last_tried to override back-off and retry event
+                # immediately.
+                last_tried=datetime(1970, 1, 1),
+            )
+        )
         return True
         # coverage: unpause
 

backend/tests/test_events.py

@@ -600,6 +600,28 @@ def test_event_unsilence(namespace: str, graphapi_post: GraphAPIPost) -> None:
     assert event["subject"] == "alice"
 
 
+@pytest.mark.integration_test
+@pytest.mark.usefixtures("empty_db")
+def test_event_unsilence_resends_immediately(
+    namespace: str, graphapi_post: GraphAPIPost
+) -> None:
+    routing_key = "rk"
+    listener = declare_listener(graphapi_post, namespace, "uk", routing_key)
+    send_event(graphapi_post, namespace, routing_key, "alice")
+
+    event = fetch_event(graphapi_post, listener)
+    assert event is not None
+    assert event["subject"] == "alice"
+
+    unsilence_event(
+        graphapi_post, {"subjects": ["alice"], "listeners": {"uuids": [str(listener)]}}
+    )
+
+    event = fetch_event(graphapi_post, listener)
+    assert event is not None
+    assert event["subject"] == "alice"
+
+
 @pytest.mark.integration_test
 @pytest.mark.usefixtures("empty_db")
 def test_event_deduplication(namespace: str, graphapi_post: GraphAPIPost) -> None: