And/Or Filters

* added new filter is_printable(boolean) for
GET api/v1/summits/{id}/tickets
GET api/v1/summits/{id}/tickets/csv

Change-Id: I5e22d69825da450aea2b68e40bdb001d1425b539

And/Or filter

* fixed order on where is applied the extra filters

Change-Id: I66503dea1c703fb88d49ba4275c3ee45ab46ec7d

And/Or filters

* fixed attendee ticket ammount filter

Change-Id: I8ebf0e43cf0f60a21a11b5b319607d33a8aa3149

Author: smarcet

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

@@ -16,6 +16,7 @@
 use App\Models\Foundation\Summit\Registration\ISummitExternalRegistrationFeedType;
 use App\ModelSerializers\ISummitAttendeeTicketSerializerTypes;
 use App\ModelSerializers\SerializerUtils;
+use App\Rules\Boolean;
 use App\Services\Model\ISummitOrderService;
 use Illuminate\Http\Request as LaravelRequest;
 use Illuminate\Support\Facades\Request;
@@ -120,6 +121,7 @@ function () {
                     'promo_code_tag_id' => ['=='],
                     'promo_code_tag' => ['==', '@@', '=@'],
                     'final_amount' => ['==', '<>', '>=', '>'],
+                    'is_printable' => ['=='],
                 ];
             },
             function () {
@@ -150,6 +152,7 @@ function () {
                     'promo_code_tag_id' => 'sometimes|integer',
                     'promo_code_tag' => 'sometimes|string',
                     'final_amount' => 'sometimes|numeric',
+                    'is_printable' => ['sometimes', new Boolean()],
                 ];
             },
             function () {
@@ -258,6 +261,7 @@ function () {
                     'promo_code_tag_id' => ['=='],
                     'promo_code_description' => ['@@', '=@'],
                     'final_amount' => ['==', '<>', '>=', '>'],
+                    'is_printable' => ['=='],
                 ];
             },
             function () {
@@ -288,6 +292,7 @@ function () {
                     'promo_code_description' => 'sometimes|string',
                     'promo_code_tag_id' => 'sometimes|integer',
                     'final_amount' => 'sometimes|numeric',
+                    'is_printable' => ['sometimes', new Boolean()],
                 ];
             },
             function () {

app/Repositories/DoctrineRepository.php

@@ -151,12 +151,12 @@ protected function getParametrizedAllByPage
 
         $query = $this->applyExtraJoins($query, $filter);
 
-        $query = $this->applyExtraFilters($query);
-
         if(!is_null($filter)){
             $filter->apply2Query($query, $this->getFilterMappings($filter));
         }
 
+        $query = $this->applyExtraFilters($query);
+
         if(!is_null($order)){
             $order->apply2Query($query, $this->getOrderMappings($filter));
         }
@@ -199,20 +199,21 @@ public function getParametrizedAllIdsByPage(callable $fnQuery,PagingInfo $paging
 
         $query = $this->applyExtraJoins($query, $filter);
 
-        $query = $this->applyExtraFilters($query);
+        ;
 
         if(!is_null($filter)){
             $filter->apply2Query($query, $this->getFilterMappings($filter));
         }
+        else if(!is_null($fnDefaultFilter)){
+            $query = call_user_func($fnDefaultFilter, $query);
+        }
+
+        $query = $this->applyExtraFilters($query);
 
         if(!is_null($order)){
             $order->apply2Query($query, $this->getOrderMappings($filter));
         }
 
-        else if(!is_null($fnDefaultFilter)){
-            $query = call_user_func($fnDefaultFilter, $query);
-        }
-
         $query = $query
             ->setFirstResult($paging_info->getOffset())
             ->setMaxResults($paging_info->getPerPage());
@@ -235,12 +236,12 @@ public function getAllByPage(PagingInfo $paging_info, Filter $filter = null, Ord
 
         $query = $this->applyExtraJoins($query, $filter);
 
-        $query = $this->applyExtraFilters($query);
-
         if(!is_null($filter)){
             $filter->apply2Query($query, $this->getFilterMappings($filter));
         }
 
+        $query = $this->applyExtraFilters($query);
+
         if(!is_null($order)){
             $order->apply2Query($query, $this->getOrderMappings($filter));
         }
@@ -282,12 +283,12 @@ public function getAllIdsByPage(PagingInfo $paging_info, Filter $filter = null,
 
         $query = $this->applyExtraJoins($query, $filter);
 
-        $query = $this->applyExtraFilters($query);
-
         if(!is_null($filter)){
             $filter->apply2Query($query, $this->getFilterMappings($filter));
         }
 
+        $query = $this->applyExtraFilters($query);
+
         if(!is_null($order)){
             $order->apply2Query($query, $this->getOrderMappings($filter));
         }

app/Repositories/Summit/DoctrineSummitAttendeeTicketRepository.php

@@ -14,10 +14,12 @@
 
 use Doctrine\DBAL\LockMode;
 use Doctrine\ORM\QueryBuilder;
+use Google\Service\AccessContextManager\AccessLevel;
 use models\summit\IOrderConstants;
 use models\summit\ISummitAttendeeTicketRepository;
 use models\summit\ISummitRefundRequestConstants;
 use models\summit\Summit;
+use models\summit\SummitAccessLevelType;
 use models\summit\SummitAttendeeTicket;
 use App\Repositories\SilverStripeDoctrineRepository;
 use models\summit\SummitAttendeeTicketRefundRequest;
@@ -129,7 +131,20 @@ protected function getFilterMappings()
                 ]
             ),
             'owner_status' => 'a.status',
-            'final_amount' => new DoctrineHavingFilterMapping("", "e.id", "((e.raw_cost + SUM(COALESCE(ta.amount, 0))) - e.discount) :operator :value"),
+            'final_amount' =>  "(e.raw_cost - e.discount) :operator :value)",
+            'is_printable' =>
+                new DoctrineSwitchFilterMapping([
+                        '1' => new DoctrineCaseFilterMapping(
+                            'true',
+                            sprintf("e.is_active = 1 and al.name = '%s'", SummitAccessLevelType::IN_PERSON),
+                        ),
+                        '0' => new DoctrineCaseFilterMapping(
+                            'false',
+                            sprintf("not(e.is_active = 1 and al.name = '%s')", SummitAccessLevelType::IN_PERSON),
+                        ),
+                    ]
+                ),
+
         ];
     }