fix: correct confluent middlewares order

airtai · Nov 29, 2024 · eb3ff01 · eb3ff01
1 parent bc2bf8c
commit eb3ff01
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 7 deletions.
diff --git a/faststream/confluent/broker/broker.py b/faststream/confluent/broker/broker.py
@@ -544,7 +544,7 @@ async def publish_batch(
         correlation_id = correlation_id or gen_cor_id()
 
         call: AsyncFunc = self._producer.publish_batch
-        for m in self._middlewares:
+        for m in self._middlewares[::-1]:
             call = partial(m(None).publish_scope, call)
 
         await call(

diff --git a/tests/brokers/base/middlewares.py b/tests/brokers/base/middlewares.py
@@ -99,10 +99,22 @@ async def handler(msg):
         mock.exit_inner.assert_called_once()
         mock.exit_outer.assert_called_once()
 
-        assert [c.args[0] for c in mock.sub.call_args_list] == ["outer", "inner"]
-        assert [c.args[0] for c in mock.pub.call_args_list] == ["outer", "inner"]
-        assert [c.args[0] for c in mock.enter.call_args_list] == ["outer", "inner"]
-        assert [c.args[0] for c in mock.exit.call_args_list] == ["inner", "outer"]
+        assert [c.args[0] for c in mock.sub.call_args_list] == [
+            "outer",
+            "inner",
+        ], mock.sub.call_args_list
+        assert [c.args[0] for c in mock.pub.call_args_list] == [
+            "outer",
+            "inner",
+        ], mock.pub.call_args_list
+        assert [c.args[0] for c in mock.enter.call_args_list] == [
+            "outer",
+            "inner",
+        ], mock.enter.call_args_list
+        assert [c.args[0] for c in mock.exit.call_args_list] == [
+            "inner",
+            "outer",
+        ], mock.exit.call_args_list
 
     async def test_publisher_middleware_order(
         self, event: asyncio.Event, queue: str, mock: Mock, raw_broker
@@ -261,7 +273,11 @@ async def handler(msg):
         mock.consume_middle.assert_called_once()
         mock.consume_outer.assert_called_once()
 
-        assert [c.args[0] for c in mock.call_args_list] == ["outer", "middle", "inner"]
+        assert [c.args[0] for c in mock.call_args_list] == [
+            "outer",
+            "middle",
+            "inner",
+        ], mock.call_args_list
 
     async def test_consume_with_middleware_order(
         self, event: asyncio.Event, queue: str, mock: Mock, raw_broker
@@ -312,7 +328,11 @@ async def handler(msg):
         mock.consume_outer.assert_called_once()
 
         assert event.is_set()
-        assert [c.args[0] for c in mock.call_args_list] == ["outer", "middle", "inner"]
+        assert [c.args[0] for c in mock.call_args_list] == [
+            "outer",
+            "middle",
+            "inner",
+        ], mock.call_args_list
 
 
 @pytest.mark.asyncio