kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 09:02:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

[API] Refactor statistics constraints

Browse source
This commit is contained in:
Grzegorz Sadowski 2024-10-28 14:03:18 +01:00
parent c7a54a169a
commit b146c955a1
No known key found for this signature in database
GPG key ID: EF87FF4E6E3BD364
2 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/Sylius/Bundle/ApiBundle/Controller/GetStatisticsAction.php
View file

@ -15,7 +15,7 @@ namespace Sylius\Bundle\ApiBundle\Controller;
use ApiPlatform\Symfony\Validator\Exception\ValidationException;
use Sylius\Bundle\ApiBundle\Query\GetStatistics;
use Sylius\Bundle\ApiBundle\Validator\Constraints;
use Sylius\Bundle\ApiBundle\Validator\Constraints\Code;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@ -25,6 +25,7 @@ use Symfony\Component\Messenger\MessageBusInterface;
use Symfony\Component\Serializer\SerializerInterface;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\Constraints as SymfonyConstraints;
use Symfony\Component\Validator\Context\ExecutionContextInterface;
use Symfony\Component\Validator\Validator\ValidatorInterface;
final class GetStatisticsAction
@ -90,24 +91,32 @@ final class GetStatisticsAction
private function createInputDataConstraints(): array
{
return [
new SymfonyConstraints\Sequentially([
new SymfonyConstraints\Collection([
'channelCode' => new Constraints\Code(),
'startDate' => [
new SymfonyConstraints\NotBlank(),
new SymfonyConstraints\DateTime('Y-m-d\TH:i:s', message: 'sylius.date_time.invalid'),
],
'interval' => new SymfonyConstraints\Choice(choices: array_keys($this->intervalsMap), multiple: false),
'endDate' => [
new SymfonyConstraints\NotBlank(),
new SymfonyConstraints\DateTime('Y-m-d\TH:i:s', message: 'sylius.date_time.invalid'),
],
]),
new SymfonyConstraints\Expression(expression: 'value["startDate"] < value["endDate"]', message: 'sylius.statistics.end_date.invalid'),
new SymfonyConstraints\Collection([
'channelCode' => new Code(),
'startDate' => [
new SymfonyConstraints\NotBlank(),
new SymfonyConstraints\DateTime('Y-m-d\TH:i:s', message: 'sylius.date_time.invalid'),
],
'interval' => new SymfonyConstraints\Choice(choices: array_keys($this->intervalsMap), multiple: false),
'endDate' => [
new SymfonyConstraints\NotBlank(),
new SymfonyConstraints\DateTime('Y-m-d\TH:i:s', message: 'sylius.date_time.invalid'),
],
]),
new SymfonyConstraints\Callback(function (array $data, ExecutionContextInterface $context) {
$this->validateDateRange($data, $context);
}),
];
}
/** @param array<array-key, mixed> $data */
private function validateDateRange(array $data, ExecutionContextInterface $context): void
{
if (isset($data['startDate'], $data['endDate']) && $data['startDate'] >= $data['endDate']) {
$context->buildViolation('sylius.statistics.end_date.invalid')->addViolation();
}
}
/**
* @param array<string, array{interval: string, period_format: string}> $intervalsMap
*

8
tests/Api/Admin/StatisticsTest.php
View file

@ -347,6 +347,10 @@ final class StatisticsTest extends JsonApiTestCase
'propertyPath' => '[endDate]',
'message' => 'This value should not be blank.',
],
[
'propertyPath' => '',
'message' => 'The start date must be earlier than the end date.',
],
],
];
}
@ -380,6 +384,10 @@ final class StatisticsTest extends JsonApiTestCase
'propertyPath' => '[startDate]',
'message' => 'The date time is not valid ISO 8601 date time in Y-m-d\TH:i:s format.',
],
[
'propertyPath' => '',
'message' => 'The start date must be earlier than the end date.',
],
],
];