Skip to content

[Messenger] Doctrine Connection find and findAll now correctly decode headers #31966

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

Merged
merged 1 commit into from
Jun 26, 2019
Merged

[Messenger] Doctrine Connection find and findAll now correctly decode headers #31966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
86 changes: 86 additions & 0 deletions src/Symfony/Component/Messenger/Tests/Transport/Doctrine/ConnectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,4 +230,90 @@ public function testItThrowsAnExceptionIfAnExtraOptionsInDefinedInDSN()
{
Connection::buildConfiguration('doctrine://default?new_option=woops');
}

public function testFind()
{
$queryBuilder = $this->getQueryBuilderMock();
$driverConnection = $this->getDBALConnectionMock();
$schemaSynchronizer = $this->getSchemaSynchronizerMock();
$id = 1;
$stmt = $this->getStatementMock([
'id' => $id,
'body' => '{"message":"Hi"}',
'headers' => \json_encode(['type' => DummyMessage::class]),
]);

$driverConnection
->method('createQueryBuilder')
->willReturn($queryBuilder);
$queryBuilder
->method('where')
->willReturn($queryBuilder);
$queryBuilder
->method('getSQL')
->willReturn('');
$queryBuilder
->method('getParameters')
->willReturn([]);
$driverConnection
->method('prepare')
->willReturn($stmt);

$connection = new Connection([], $driverConnection, $schemaSynchronizer);
$doctrineEnvelope = $connection->find($id);
$this->assertEquals(1, $doctrineEnvelope['id']);
$this->assertEquals('{"message":"Hi"}', $doctrineEnvelope['body']);
$this->assertEquals(['type' => DummyMessage::class], $doctrineEnvelope['headers']);
}

public function testFindAll()
{
$queryBuilder = $this->getQueryBuilderMock();
$driverConnection = $this->getDBALConnectionMock();
$schemaSynchronizer = $this->getSchemaSynchronizerMock();
$message1 = [
'id' => 1,
'body' => '{"message":"Hi"}',
'headers' => \json_encode(['type' => DummyMessage::class]),
];
$message2 = [
'id' => 2,
'body' => '{"message":"Hi again"}',
'headers' => \json_encode(['type' => DummyMessage::class]),
];

$stmt = $this->getMockBuilder(Statement::class)
->disableOriginalConstructor()
->getMock();
$stmt->expects($this->once())
->method('fetchAll')
->willReturn([$message1, $message2]);

$driverConnection
->method('createQueryBuilder')
->willReturn($queryBuilder);
$queryBuilder
->method('where')
->willReturn($queryBuilder);
$queryBuilder
->method('getSQL')
->willReturn('');
$queryBuilder
->method('getParameters')
->willReturn([]);
$driverConnection
->method('prepare')
->willReturn($stmt);

$connection = new Connection([], $driverConnection, $schemaSynchronizer);
$doctrineEnvelopes = $connection->findAll();

$this->assertEquals(1, $doctrineEnvelopes[0]['id']);
$this->assertEquals('{"message":"Hi"}', $doctrineEnvelopes[0]['body']);
$this->assertEquals(['type' => DummyMessage::class], $doctrineEnvelopes[0]['headers']);

$this->assertEquals(2, $doctrineEnvelopes[1]['id']);
$this->assertEquals('{"message":"Hi again"}', $doctrineEnvelopes[1]['body']);
$this->assertEquals(['type' => DummyMessage::class], $doctrineEnvelopes[1]['headers']);
}
}
17 changes: 14 additions & 3 deletions src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public function get(): ?array
return null;
}

$doctrineEnvelope['headers'] = \json_decode($doctrineEnvelope['headers'], true);
$doctrineEnvelope = $this->decodeEnvelopeHeaders($doctrineEnvelope);

$queryBuilder = $this->driverConnection->createQueryBuilder()
->update($this->configuration['table_name'])
Expand Down Expand Up @@ -238,7 +238,11 @@ public function findAll(int $limit = null): array
$queryBuilder->setMaxResults($limit);
}

return $this->executeQuery($queryBuilder->getSQL(), $queryBuilder->getParameters())->fetchAll();
$data = $this->executeQuery($queryBuilder->getSQL(), $queryBuilder->getParameters())->fetchAll();

return \array_map(function ($doctrineEnvelope) {
return $this->decodeEnvelopeHeaders($doctrineEnvelope);
}, $data);
}

public function find($id): ?array
Expand All @@ -254,7 +258,7 @@ public function find($id): ?array
'id' => $id,
])->fetch();

return false === $data ? null : $data;
return false === $data ? null : $this->decodeEnvelopeHeaders($data);
}

private function createAvailableMessagesQueryBuilder(): QueryBuilder
Expand Down Expand Up @@ -332,4 +336,11 @@ public static function formatDateTime(\DateTimeInterface $dateTime)
{
return $dateTime->format('Y-m-d\TH:i:s');
}

private function decodeEnvelopeHeaders(array $doctrineEnvelope): array
{
$doctrineEnvelope['headers'] = \json_decode($doctrineEnvelope['headers'], true);

return $doctrineEnvelope;
}
}