fix: query for owner email

Signed-off-by: smarcet@gmail.com <smarcet@gmail.com>
Change-Id: Icae8de8f9640066f510d88539dd828357614ba83

Author: smarcet

app/Http/Utils/Filters/Filter.php

@@ -187,7 +187,13 @@ public function getFiltersKeyValues()
                 // OR
                 foreach ($filter as $e) {
                     if ($e instanceof FilterElement) {
-                        if (!isset($res[$e->getField()])) $res[$e->getField()] = [];
+                        if (!isset($res[$e->getField()])){
+                            $res[$e->getField()] = [];
+                        }
+                        $former_filter_value = $res[$e->getField()];
+                        if(!is_array($former_filter_value)){
+                            $res[$e->getField()] = [$former_filter_value];
+                        }
                         $res[$e->getField()][] = $e->getValue();
                     }
                 }

app/Repositories/Summit/DoctrineSummitRegistrationPromoCodeRepository.php

@@ -337,10 +337,14 @@ public function getIdsBySummit
                     Filter::buildConcatStringFields(["owr2.FirstName", "owr2.Surname"]),
                     "owr2.FirstName :operator :value",
                     "owr2.Surname :operator :value",
+                    Filter::buildConcatStringFields(["mpc.FirstName", "mpc.LastName"]),
+                    Filter::buildConcatStringFields(["mdc.FirstName", "mdc.LastName"]),
                 ],
                 'owner_email' => [
                     Filter::buildEmailField('owr.Email'),
                     Filter::buildEmailField('owr2.Email'),
+                    Filter::buildEmailField('mpc.Email'),
+                    Filter::buildEmailField('mdc.Email'),
                 ],
                 'speaker' => [
                     Filter::buildConcatStringFields(["ps3.FirstName", "ps3.LastName"]),

tests/FilterParserTest.php

@@ -15,6 +15,8 @@
 
 use App\Http\Utils\Filters\DoctrineInFilterMapping;
 use App\Http\Utils\Filters\DoctrineNotInFilterMapping;
+use App\Models\Foundation\Summit\PromoCodes\PromoCodesConstants;
+use App\Rules\Boolean;
 use Doctrine\ORM\Query\Expr\Join;
 use models\summit\Presentation;
 use models\summit\PresentationType;
@@ -755,4 +757,52 @@ public function testFilterRegistrationInvitations(){
         $this->assertEquals("SELECT DISTINCT e FROM models\summit\SummitRegistrationInvitation e WHERE  (  ( e.hash is not null )  )  AND e.id NOT IN ( :value_1 ) AND e.id IN ( :value_2 )", $dql);
         $res = $query->getQuery()->getResult();
     }
+
+    public function testDuplicateCriteria(){
+        $filter = FilterParser::parse([
+            'owner_email==cespin+174@gmail.com',
+            'code=@cespin+174@gmail.com,creator=@cespin+174@gmail.com,creator_email=@cespin+174@gmail.com,owner=@cespin+174@gmail.com,owner_email=@cespin+174@gmail.com,speaker=@cespin+174@gmail.com,speaker_email=@cespin+174@gmail.com,sponsor_company_name=@cespin+174@gmail.com'
+        ],
+            [
+                'code' => ['@@', '=@', '=='],
+                'description' => ['@@', '=@'],
+                'notes' => ['@@', '=@'],
+                'creator' => ['@@', '=@', '=='],
+                'creator_email' => ['@@', '=@', '=='],
+                'owner' => ['@@', '=@', '=='],
+                'owner_email' => ['@@', '=@', '=='],
+                'speaker' => ['@@', '=@', '=='],
+                'speaker_email' => ['@@', '=@', '=='],
+                'class_name' => ['=='],
+                'type' => ['=='],
+                'tag' => ['@@','=@', '=='],
+                'tag_id' => ['=='],
+                'sponsor_company_name' => ['@@', '=@', '=='],
+                'sponsor_id' => ['=='],
+                'contact_email' =>  ['@@', '=@', '=='],
+                'tier_name' =>  ['@@', '=@', '=='],
+                'email_sent' => ['=='],
+            ]);
+
+        $filter->validate([
+            'class_name' => sprintf('sometimes|required|in:%s', implode(',', PromoCodesConstants::$valid_class_names)),
+            'code' => 'sometimes|string',
+            'description' => 'sometimes|string',
+            'notes' => 'sometimes|string',
+            'creator' => 'sometimes|string',
+            'creator_email' => 'sometimes|string',
+            'owner' => 'sometimes|string',
+            'owner_email' => 'sometimes|string',
+            'speaker' => 'sometimes|string',
+            'speaker_email' => 'sometimes|string',
+            'type' => sprintf('sometimes|in:%s', implode(',', PromoCodesConstants::getValidTypes())),
+            'tag' => 'sometimes|required|string',
+            'tag_id' => 'sometimes|integer',
+            'sponsor_company_name' => 'sometimes|string',
+            'contact_email' => 'sometimes|string',
+            'sponsor_id' => 'sometimes|integer',
+            'tier_name' =>  'sometimes|string',
+            'email_sent' => ['sometimes', new Boolean()],
+        ]);
+    }
 }