Add error delivery report

Author: HawkiesZA

src/vumi2/applications/turn_channels_api/messages.py

@@ -87,8 +87,7 @@ def turn_event_from_ev(event: Event, outbound: Message) -> dict:
     if event.event_type == EventType.DELIVERY_REPORT:
         ev["status"]["status"] = {
             DeliveryStatus.PENDING: "sent",
-            # TODO: Turn doesn't accept a failed status. Log the failure for now?
-            DeliveryStatus.FAILED: "sent",
+            DeliveryStatus.FAILED: "failed",
             DeliveryStatus.DELIVERED: "delivered",
             None: None,
         }[event.delivery_status]

tests/applications/test_turn_channels_api.py

@@ -495,6 +495,64 @@ async def test_forward_dr(worker_factory, http_server):
     assert req.body_json["status"]["id"] == "m-21"
 
 
+async def test_forward_dr_delivered(worker_factory, http_server):
+    """
+    A 'delivered' delivery report event referencing an outbound message we know
+    about is forwarded over HTTP.
+    """
+    outbound = mkmsg("hello", from_addr="+1234")
+    ev = mkev(
+        "m-21",
+        EventType.DELIVERY_REPORT,
+        delivery_status=DeliveryStatus.DELIVERED,
+        sent_message_id=outbound.message_id,
+    )
+
+    config = mk_config(http_server)
+
+    async with worker_factory.with_cleanup(TurnChannelsApi, config) as tca_worker:
+        await tca_worker.setup()
+        await tca_worker.message_cache.store_outbound(outbound)
+        with fail_after(2):
+            async with handle_event(tca_worker, ev):
+                req = await http_server.receive_req()
+                await http_server.send_rsp(RspInfo())
+
+    assert req.path == "statuses"
+    assert req.headers["Content-Type"] == "application/json"
+    assert req.body_json["status"]["status"] == "delivered"
+    assert req.body_json["status"]["id"] == "m-21"
+
+
+async def test_forward_dr_failed(worker_factory, http_server):
+    """
+    A 'failed'delivery report event referencing an outbound message we know
+    about is forwarded over HTTP.
+    """
+    outbound = mkmsg("hello", from_addr="+1234")
+    ev = mkev(
+        "m-21",
+        EventType.DELIVERY_REPORT,
+        delivery_status=DeliveryStatus.FAILED,
+        sent_message_id=outbound.message_id,
+    )
+
+    config = mk_config(http_server)
+
+    async with worker_factory.with_cleanup(TurnChannelsApi, config) as tca_worker:
+        await tca_worker.setup()
+        await tca_worker.message_cache.store_outbound(outbound)
+        with fail_after(2):
+            async with handle_event(tca_worker, ev):
+                req = await http_server.receive_req()
+                await http_server.send_rsp(RspInfo())
+
+    assert req.path == "statuses"
+    assert req.headers["Content-Type"] == "application/json"
+    assert req.body_json["status"]["status"] == "failed"
+    assert req.body_json["status"]["id"] == "m-21"
+
+
 async def test_send_outbound(worker_factory, http_server, tca_ro):
     """
     An outbound message received over HTTP is forwarded over AMQP.