Search flights by subfleet #484 (#506)

* API level search of flights #484

* Add Subfleet to flights page for search

app/Repositories/Criteria/WhereCriteria.php

@@ -4,6 +4,7 @@ namespace App\Repositories\Criteria;
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
 use Prettus\Repository\Contracts\CriteriaInterface;
 use Prettus\Repository\Contracts\RepositoryInterface;
 
@@ -17,17 +18,20 @@ class WhereCriteria implements CriteriaInterface
      */
     protected $request;
     protected $where;
+    protected $relations;
 
     /**
      * Create a new Where search.
      *
-     * @param $request
-     * @param $where
+     * @param Request $request
+     * @param array   $where
+     * @param array   [$relations] Any whereHas (key = table name, value = array of criterea
      */
-    public function __construct($request, $where)
+    public function __construct(Request $request, $where, $relations = [])
     {
         $this->request = $request;
         $this->where = $where;
+        $this->relations = $relations;
     }
 
     /**
@@ -46,6 +50,17 @@ class WhereCriteria implements CriteriaInterface
             $model = $model->where($this->where);
         }
 
+        // See if any relationships need to be included in this WHERE
+        if ($this->relations) {
+            foreach ($this->relations as $relation => $criterea) {
+                $model = $model
+                    ->with($relation)
+                    ->whereHas($relation, function (Builder $query) use ($criterea) {
+                        $query->where($criterea);
+                    });
+            }
+        }
+
         return $model;
     }
 }