Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Supporting of M:N relation (many type of messages in many channels) required #224

Merged
merged 5 commits into from
Dec 8, 2024
Merged

Supporting of M:N relation (many type of messages in many channels) required #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1f2cbae
fixed according to issue.
holdmann Nov 8, 2024
0f3c585
Merge branch 'master' into supporing_of_many_channels_many_type_of_me…
samdark Nov 11, 2024
8f21a91
Improve tests
viktorprogger Dec 7, 2024
0a08e2b
Merge remote-tracking branch 'origin/master' into fork/holdmann/suppo…
viktorprogger Dec 7, 2024
db6f787
Merge branch 'master' into supporing_of_many_channels_many_type_of_me…
vjik Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/Middleware/Consume/ConsumeMiddlewareDispatcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
final class ConsumeMiddlewareDispatcher
{
/**
* Contains a middleware pipeline handler.
* Contains a middleware pipeline handlers.
*
* @var MiddlewareConsumeStack|null The middleware stack.
* @var MiddlewareConsumeStack[] The middleware stack divided by message types.
*/
private ?MiddlewareConsumeStack $stack = null;
private array $stack = [];

/**
* @var array[]|callable[]|MiddlewareConsumeInterface[]|string[]
Expand All @@ -37,11 +37,12 @@ public function dispatch(
ConsumeRequest $request,
MessageHandlerConsumeInterface $finishHandler
): ConsumeRequest {
if ($this->stack === null) {
$this->stack = new MiddlewareConsumeStack($this->buildMiddlewares(), $finishHandler);
$handlerName = $request->getMessage()->getHandlerName();
if (!array_key_exists($handlerName, $this->stack)) {
$this->stack[$handlerName] = new MiddlewareConsumeStack($this->buildMiddlewares(), $finishHandler);
}

return $this->stack->handleConsume($request);
return $this->stack[$handlerName]->handleConsume($request);
}

/**
Expand All @@ -68,7 +69,7 @@ public function withMiddlewares(array $middlewareDefinitions): self

// Fixes a memory leak.
unset($instance->stack);
$instance->stack = null;
$instance->stack = [];

return $instance;
}
Expand Down
9 changes: 8 additions & 1 deletion tests/Integration/MessageConsumingTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,19 @@
final class MessageConsumingTest extends TestCase
{
private array $messagesProcessed;
private array $messagesProcessedSecond;

public function testMessagesConsumed(): void
{
$this->messagesProcessed = [];
$this->messagesProcessedSecond = [];

$container = $this->createMock(ContainerInterface::class);
$worker = new Worker(
['test' => fn (MessageInterface $message): mixed => $this->messagesProcessed[] = $message->getData()],
[
'test' => fn (MessageInterface $message): mixed => $this->messagesProcessed[] = $message->getData(),
'test2' => fn (MessageInterface $message): mixed => $this->messagesProcessedSecond[] = $message->getData(),
],
new NullLogger(),
new Injector($container),
$container,
Expand All @@ -38,9 +43,11 @@ public function testMessagesConsumed(): void
$messages = [1, 'foo', 'bar-baz'];
foreach ($messages as $message) {
$worker->process(new Message('test', $message), $this->getQueue());
$worker->process(new Message('test2', $message), $this->getQueue());
}

$this->assertEquals($messages, $this->messagesProcessed);
$this->assertEquals($messages, $this->messagesProcessedSecond);
}

public function testMessagesConsumedByHandlerClass(): void
Expand Down
Loading