-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Updates PHP version, refactor models, add event emission and ot…
…her adjustments.
- Loading branch information
1 parent
fa9ca6a
commit 787f2cf
Showing
11 changed files
with
232 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <?php | ||
|
|
||
| namespace Test\Integration; | ||
|
|
||
| use CheapDelivery\Dependencies; | ||
| use DI\Container; | ||
| use PHPUnit\Framework\TestCase; | ||
| use Psr\Container\ContainerInterface; | ||
|
|
||
| abstract class IntegrationTestCapabilities extends TestCase | ||
| { | ||
| protected static ContainerInterface $container; | ||
|
|
||
| public static function setUpBeforeClass(): void | ||
| { | ||
| self::$container = new Container(Dependencies::definitions()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <?php | ||
|
|
||
| namespace Test\Integration\Query\Shipment\Factories; | ||
|
|
||
| use DateInterval; | ||
| use DateTime; | ||
|
|
||
| final class IsoDate extends DateTime | ||
| { | ||
| public static function now(): IsoDate | ||
| { | ||
| return new IsoDate('now'); | ||
| } | ||
|
|
||
| public function subtract(string $duration): IsoDate | ||
| { | ||
| $this->sub(new DateInterval($duration)); | ||
| return $this; | ||
| } | ||
|
|
||
| public function toString(): string | ||
| { | ||
| return $this->format('c'); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| <?php | ||
|
|
||
| namespace Test\Integration\Query\Shipment; | ||
|
|
||
| use Doctrine\DBAL\Connection; | ||
| use Psr\Container\ContainerInterface; | ||
|
|
||
| final readonly class QueryAdapter | ||
| { | ||
| private const INSERT_SHIPMENT = ' | ||
| INSERT INTO shipment (id, cost, carrier_name, created_at) | ||
| VALUES (UUID_TO_BIN(:id), :cost, :carrierName, :createdAt);'; | ||
|
|
||
| protected Connection $connection; | ||
|
|
||
| public function __construct(ContainerInterface $container) | ||
| { | ||
| $this->connection = $container->get(Connection::class); | ||
| $this->connection->beginTransaction(); | ||
| } | ||
|
|
||
| public function saveShipments(array $shipments): void | ||
| { | ||
| foreach ($shipments as $shipment) { | ||
| $this->connection->executeStatement(self::INSERT_SHIPMENT, [ | ||
| 'id' => $shipment['id'], | ||
| 'cost' => $shipment['cost'], | ||
| 'createdAt' => $shipment['createdAt'], | ||
| 'carrierName' => $shipment['carrier']['name'] | ||
| ]); | ||
| } | ||
| } | ||
|
|
||
| public function rollBack(): void | ||
| { | ||
| $this->connection->rollBack(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| <?php | ||
|
|
||
| namespace Test\Integration\Query\Shipment; | ||
|
|
||
| use CheapDelivery\Query\Shipment\Resource; | ||
| use Psr\Http\Message\ServerRequestInterface; | ||
| use Test\Integration\IntegrationTestCapabilities; | ||
| use Test\Integration\Query\Shipment\Factories\IsoDate; | ||
|
|
||
| final class ResourceTest extends IntegrationTestCapabilities | ||
| { | ||
| private Resource $resource; | ||
|
|
||
| private QueryAdapter $query; | ||
|
|
||
| protected function setUp(): void | ||
| { | ||
| $this->query = new QueryAdapter(self::$container); | ||
| $this->resource = self::$container->get(Resource::class); | ||
| } | ||
|
|
||
| protected function tearDown(): void | ||
| { | ||
| $this->query->rollBack(); | ||
| } | ||
|
|
||
| public function testFindShipmentsWithoutFilters(): void | ||
| { | ||
| /** @Given I have some shipments */ | ||
| $shipments = [ | ||
| [ | ||
| 'id' => '03ec1cfc-5546-45ae-925d-eb36211965d9', | ||
| 'cost' => floatval(rand(100, 150)), | ||
| 'carrier' => [ | ||
| 'name' => 'DHL' | ||
| ], | ||
| 'createdAt' => IsoDate::now()->toString() | ||
| ], | ||
| [ | ||
| 'id' => '9a33a5f5-3d4b-4777-afa7-fbdadd9620d3', | ||
| 'cost' => floatval(rand(100, 150)), | ||
| 'carrier' => [ | ||
| 'name' => 'FedEx' | ||
| ], | ||
| 'createdAt' => IsoDate::now()->subtract(duration: 'PT10M')->toString() | ||
| ] | ||
| ]; | ||
|
|
||
| /** @And these shipments are persisted */ | ||
| $this->query->saveShipments(shipments: $shipments); | ||
|
|
||
| /** @And I have a request to fetch the persisted shipments without filters */ | ||
| $request = $this->requestWith(parameters: []); | ||
|
|
||
| /** @When I make the request */ | ||
| $response = $this->resource->handle(request: $request); | ||
|
|
||
| /** @Then the shipments should be returned */ | ||
| $actual = json_decode($response->getBody()->__toString(), true); | ||
|
|
||
| self::assertCount(2, $actual); | ||
| self::assertEquals($shipments, $actual); | ||
| } | ||
|
|
||
| public function testFindShipmentsWithFilters(): void | ||
| { | ||
| /** @Given I have some shipments */ | ||
| $shipments = [ | ||
| [ | ||
| 'id' => 'ca83b7f1-4d54-4447-85a1-6cfb59122899', | ||
| 'cost' => floatval(rand(100, 150)), | ||
| 'carrier' => [ | ||
| 'name' => 'DHL' | ||
| ], | ||
| 'createdAt' => IsoDate::now()->toString() | ||
| ], | ||
| [ | ||
| 'id' => '73440f3c-2d29-42dd-9094-130d04e98712', | ||
| 'cost' => floatval(rand(100, 150)), | ||
| 'carrier' => [ | ||
| 'name' => 'FedEx' | ||
| ], | ||
| 'createdAt' => IsoDate::now()->toString() | ||
| ] | ||
| ]; | ||
|
|
||
| /** @And these shipments are persisted */ | ||
| $this->query->saveShipments(shipments: $shipments); | ||
|
|
||
| /** @And I have a request to fetch the persisted shipments with filters */ | ||
| $request = $this->requestWith(parameters: ['carrierName' => 'DHL']); | ||
|
|
||
| /** @When I make the request */ | ||
| $response = $this->resource->handle(request: $request); | ||
|
|
||
| /** @Then the shipments should be returned */ | ||
| $actual = json_decode($response->getBody()->__toString(), true); | ||
|
|
||
| self::assertCount(1, $actual); | ||
| self::assertEquals($shipments[0]['id'], $actual[0]['id']); | ||
| self::assertEquals($shipments[0]['cost'], $actual[0]['cost']); | ||
| self::assertEquals($shipments[0]['carrier'], $actual[0]['carrier']); | ||
| self::assertEquals($shipments[0]['createdAt'], $actual[0]['createdAt']); | ||
| } | ||
|
|
||
| private function requestWith(array $parameters): ServerRequestInterface | ||
| { | ||
| $request = $this->getMockBuilder(ServerRequestInterface::class) | ||
| ->disableOriginalConstructor() | ||
| ->getMock(); | ||
|
|
||
| $request->expects(self::once()) | ||
| ->method('getQueryParams') | ||
| ->willReturn($parameters); | ||
|
|
||
| return $request; | ||
| } | ||
| } |