feat: add new filters to orders/tickets endpoints (#386)

* feat: add new filters to orders/tickets endpoints

GET   api/v1/summits/{id}/orders/me
* tickets_owner_email
* tickets_number

GET api/v1/summits/{id}/orders/all/tickets/me
* order_number
* number
* order_owner_email

GET  api/v1/summits/all/orders/{order_id}/tickets
* number
* owner_email

* fix: add missing filter order_owner_email

* fix: query missing class

* chore: fix filter

Author: smarcet

app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitOrdersApiController.php

@@ -420,13 +420,15 @@ public function getAllMyOrdersBySummit($summit_id)
             return $this->_getAll(
                 function () {
                     return [
-                        'number' => ['=@', '=='],
+                        'number' => ['=@', '==','@@'],
                         'summit_id' => ['=='],
                         'status' => ['==', '<>'],
                         'owner_id' => ['=='],
                         'created' => ['>', '<', '<=', '>=', '==','[]'],
+                        'tickets_number' => ['=@', '==','@@'],
                         'tickets_assigned_to' =>  ['=='],
                         'tickets_owner_status' =>  ['=='],
+                        'tickets_owner_email' =>  ['=@', '==','@@'],
                         'tickets_badge_features_id' =>  ['=='],
                         'tickets_type_id' =>  ['=='],
                         'amount' => ['==', '<>', '>=', '>'],
@@ -440,7 +442,9 @@ function () {
                         'summit_id' => 'sometimes|integer',
                         'owner_id' => 'sometimes|integer',
                         'created' => 'sometimes|required|date_format:U|epoch_seconds',
+                        'tickets_number' => 'sometimes|string',
                         'tickets_assigned_to' => sprintf('sometimes|in:%s', implode(',', ['Me', 'SomeoneElse', 'Nobody'])),
+                        'tickets_owner_email' => 'sometimes|string',
                         'tickets_owner_status' => sprintf('sometimes|in:%s', implode(',', SummitAttendee::AllowedStatus)),
                         'tickets_badge_features_id' => 'sometimes|integer',
                         'tickets_type_id' => 'sometimes|integer',
@@ -1121,6 +1125,8 @@ public function getMyTicketsByOrderId($order_id)
         return $this->_getAll(
             function () {
                 return [
+                    'number' => ['=@', '==', '@@'],
+                    'owner_email' =>  ['=@', '==', '@@'],
                     'order_id' => ['=='],
                     'order_owner_id' => ['=='],
                     'is_active' => ['=='],
@@ -1134,6 +1140,8 @@ function () {
             },
             function () {
                 return [
+                    'number' => 'sometimes|string',
+                    'owner_email' => 'sometimes|string',
                     'order_id' => 'sometimes|integer',
                     'order_owner_id' => 'sometimes|integer',
                     'is_active' => ['sometimes', new Boolean()],
@@ -1370,4 +1378,4 @@ public function delegateTicket($summit_id, $order_id, $ticket_id)
                 ));
         });
     }
-}
+}

app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitTicketApiController.php

@@ -621,8 +621,9 @@ public function getAllMyTicketsBySummit($summit_id)
             return $this->_getAll(
                 function () {
                     return [
-                        'number' => ['=@', '=='],
-                        'order_number' => ['=@', '=='],
+                        'number' => ['=@', '==', '@@'],
+                        'order_number' => ['=@', '==', '@@'],
+                        'order_owner_email' => ['=@', '==', '@@'],
                         'summit_id' => ['=='],
                         'order_id' => ['=='],
                         'status' => ['==', '<>'],
@@ -640,6 +641,7 @@ function () {
                     return [
                         'number' => 'sometimes|string',
                         'order_number' => 'sometimes|string',
+                        'order_owner_email' => 'sometimes|string',
                         'summit_id' => 'sometimes|integer',
                         'order_id' => 'sometimes|integer',
                         'order_owner_id' => 'sometimes|integer',

app/Repositories/ResourceServer/DoctrineApiEndpointRepository.php

@@ -38,17 +38,22 @@ final class DoctrineApiEndpointRepository
     public function getApiEndpointByUrlAndMethod($url, $http_method)
     {
         try {
-            return $this->getEntityManager()->createQueryBuilder()
-                ->select("e")
-                ->from(\App\Models\ResourceServer\ApiEndpoint::class, "e")
+            $em = $this->getEntityManager();
+
+            $qb = $em->createQueryBuilder();
+            $qb->select('e')
+                ->from(ApiEndpoint::class, 'e')
+                ->leftJoin('e.scopes', 's', 'WITH', 's.active = true')
+                ->addSelect('s')
                 ->where('e.route = :route')
-                ->andWhere('e.http_method = :http_method')
+                ->andWhere('e.http_method = :method')
                 ->setParameter('route', trim($url))
-                ->setParameter('http_method', trim($http_method))
-                ->setCacheable(true)
-                ->setCacheRegion('resource_server_region')
-                ->getQuery()
-                ->getOneOrNullResult();
+                ->setParameter('method', strtoupper(trim($http_method)));
+
+            $q = $qb->getQuery();
+            $q->setCacheable(false);
+
+            return $q->getOneOrNullResult();
         }
         catch(\Exception $ex){
             Log::error($ex);
@@ -80,4 +85,4 @@ protected function getOrderMappings()
         return [];
     }
 
-}
+}

app/Repositories/Summit/DoctrineSummitAttendeeTicketRepository.php

@@ -98,9 +98,10 @@ private function requiredAliases(?Filter $filter, ?Order $order): array
         $val = fn(string $f) => $filter?->getValue($f)[0] ?? null;
 
         // --- Filters ---
-        if ($has('order_number') || $has('order_id') || $has('order_owner_id') || $has('bought_date') || $has('summit_id')) {
+        if ($has('order_number') || $has('order_id') || $has('order_owner_id')  || $has('order_owner_email')
+            || $has('bought_date') || $has('summit_id')) {
             $need['o'] = true;
-            if ($has('order_owner_id')) {
+            if ($has('order_owner_id') ||  $has('order_owner_email')) {
                 $this->joinCatalog['ord_m'][1] = 'join';
                 $need['ord_m'] = true;
             }
@@ -265,6 +266,7 @@ protected function getFilterMappings()
             'number' => 'e.number:json_string',
             'is_active' => 'e.is_active',
             'order_number' => 'o.number:json_string',
+            'order_owner_email' => 'COALESCE(ord_m.email, o.owner_email)',
             'owner_name' => "COALESCE(LOWER(CONCAT(a.first_name, ' ', a.surname)),LOWER(CONCAT(m.first_name, ' ', m.last_name)))",
             'owner_company' => 'COALESCE(a.company_name, a_c.name)',
             'has_owner_company' => new DoctrineSwitchFilterMapping([