Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions src/Worker/Worker.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,10 @@ public function process(
$this->logger->info('Processing message #{message}.', ['message' => $messageId]);
}

$handler = $this->handlerResolver->resolve($message->getType());

$request = new ConsumeRequest($message, $queueName);
$finishHandler = new ConsumeFinalHandler($handler->handle(...));
try {
$handler = $this->handlerResolver->resolve($message->getType());
$finishHandler = new ConsumeFinalHandler($handler->handle(...));
return $this->consumeMiddlewareDispatcher->dispatch($request, $finishHandler)->getMessage();
} catch (Throwable $exception) {
$request = new FailureHandlingRequest($request->getMessage(), $exception, $request->getQueueName(), $retryProducer);
Expand Down
30 changes: 30 additions & 0 deletions tests/Unit/WorkerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use Yiisoft\Test\Support\Container\SimpleContainer;
use Yiisoft\Test\Support\Log\SimpleLogger;
use Yiisoft\Queue\Exception\MessageFailureException;
use Yiisoft\Queue\Message\Handler\HandlerNotFoundException;
use Yiisoft\Queue\Message\Handler\HandlerResolver;
use Yiisoft\Queue\Message\GenericMessage;
use Yiisoft\Queue\Message\MessageInterface;
Expand Down Expand Up @@ -108,6 +109,35 @@ public function testMessageFailureIsHandledSuccessfully(): void
self::assertSame($finalMessage, $result);
}

public function testUnresolvableHandlerIsHandledByFailurePipeline(): void
{
$message = new GenericMessage('unsupported', null);
$queueName = 'test-queue';
$handlerResolver = new HandlerResolver([], new SimpleContainer());

$finalMessage = new GenericMessage('final', null);
/** @var FailureMiddlewareInterface&MockObject $failureMiddleware */
$failureMiddleware = $this->createMock(FailureMiddlewareInterface::class);
$failureMiddleware
->expects(self::once())
->method('processFailure')
->with(self::callback(
static fn(FailureHandlingRequest $request): bool => $request->getException() instanceof HandlerNotFoundException,
))
->willReturn(new FailureHandlingRequest($finalMessage, new RuntimeException('unused'), $queueName));

/** @var FailureMiddlewareFactoryInterface&MockObject $failureMiddlewareFactory */
$failureMiddlewareFactory = $this->createMock(FailureMiddlewareFactoryInterface::class);
$failureMiddlewareFactory->method('createFailureMiddleware')->willReturn($failureMiddleware);
$failureDispatcher = new FailureMiddlewareDispatcher($failureMiddlewareFactory, [$queueName => ['simple']]);

$worker = $this->createWorkerByParams($handlerResolver, failureMiddlewareDispatcher: $failureDispatcher);

$result = $worker->process($message, $queueName);

self::assertSame($finalMessage, $result);
}

private function createHandlerResolver(MessageInterface $message, callable $handler): HandlerResolver
{
$container = new SimpleContainer();
Expand Down
Loading