Olivier Massot il y a 3 ans
Parent
commit
0feae6a995

+ 1 - 1
src/Commands/PostUpgrade/V0_2/PostUpgradeCommand.php

@@ -31,7 +31,7 @@ class PostUpgradeCommand extends Command
     {
         $this->logger->info('Run post-upgrade scripts for version ' . self::TARGETED_VERSION);
 
-//        $this->populateSubdomains();
+        $this->populateSubdomains();
         $this->genEventsUuid();
 
         $output->writeln("Post-upgrade operations successfully executed");

+ 2 - 0
src/Entity/Public/PublicEvent.php

@@ -7,6 +7,7 @@ use ApiPlatform\Core\Annotation\ApiFilter;
 use ApiPlatform\Core\Annotation\ApiResource;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\DateFilter;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\NumericFilter;
+use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\OrderFilter;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\SearchFilter;
 use App\Filter\Utils\DistanceFilter;
 use App\Repository\Public\PublicEventRepository;
@@ -37,6 +38,7 @@ use Doctrine\ORM\Mapping as ORM;
 #[ApiFilter(NumericFilter::class, properties: ['organizationId'])]
 #[ApiFilter(DateFilter::class, properties: ['datetimeStart', 'datetimeEnd'])]
 #[ApiFilter(DistanceFilter::class)]
+#[ApiFilter(OrderFilter::class, properties: ['datetimeStart', 'datetimeEnd'], arguments: ['orderParameterName' => 'order'])]
 class PublicEvent
 {
     #[ORM\Id]

+ 2 - 2
src/Filter/Utils/DistanceFilter.php

@@ -14,7 +14,7 @@ use JetBrains\PhpStorm\ArrayShape;
  *
  * To use it, add the following query :
  *
- *     withinDistance=({latitude}, {longitude}, {distance})
+ *     withinDistance={latitude},{longitude},{distance}
  *
  * Where latitude and longitude are the coordinates of the origine point, and distance the maximum
  * distance in Km.
@@ -64,7 +64,7 @@ final class DistanceFilter extends AbstractFilter
         if ($property !== 'withinDistance') {
             return;
         }
-        if (!preg_match('/^(\d+(\.\d+)?,){2}\d+(\.\d+)?$/', $value)) {
+        if (!preg_match('/^(-?\d+(\.\d+)?,){2}\d+(\.\d+)?$/', $value)) {
             throw new \RuntimeException('DistanceFilter : Invalid argument, please pass latitude, longitude and distance to the parameter as comma separated floating numbers.');
         }