Bump guzzlehttp/psr7 from 1.8.3 to 2.4.3

app/Console/Commands/Import/ImportCollectionsFull.php

@@ -53,13 +53,13 @@ protected function importEndpoint($endpoint, $page = 1)
     {
         $model = $this->getModelForEndpoint($endpoint);
 
-        if (!$this->isPartial) {
+        if (!$this->isPartial && app('Resources')->isModelSearchable($model)) {
             $model::disableSearchSyncing();
         }
 
         $this->import('Collections', $model, $endpoint, $page);
 
-        if (!$this->isPartial) {
+        if (!$this->isPartial && app('Resources')->isModelSearchable($model)) {
             $model::enableSearchSyncing();
         }
     }

app/Http/Search/Request.php

@@ -194,10 +194,16 @@ public function getBaseParams(array $input)
         // Make resources into a Laravel collection
         $resources = collect($resources);
 
+        // If more artworks are being searched alongside other resource types, disbale artworks boost
+        $artworksUseBoost = true;
+        if ($resources->contains('artworks') && $resources->count() > 1) {
+            $artworksUseBoost = false;
+        }
+
         // Grab settings from our models via the service provider
-        $settings = $resources->map(function ($resource) {
+        $settings = $resources->map(function ($resource) use ($artworksUseBoost) {
             return [
-                $resource => app('Search')->getSearchScopeForEndpoint($resource),
+                $resource => app('Search')->getSearchScopeForEndpoint($resource, $resource == 'artworks' ? $artworksUseBoost : null),
             ];
         })->collapse();
 
@@ -330,6 +336,7 @@ public function getSearchParams($input = null, $withAggregations = true)
          * 2. If `q` is present, add full-text search to the `must` clause.
          * 3. If `q` is absent, show all results.
          */
+
         if (isset($input['query'])) {
             $params = $this->addFullSearchParams($params, $input);
         }
@@ -817,9 +824,7 @@ private function addFullSearchParams(array $params, array $input)
     {
         // TODO: Validate `query` input to reduce shenanigans
         // TODO: Deep-find `fields` in certain queries + replace them w/ our custom field list
-        $params['body']['query']['bool']['must'][] = [
-            Arr::get($input, 'query'),
-        ];
+        $params['body']['query']['bool']['must'][] = Arr::get($input, 'query');
 
         return $params;
     }

app/Http/Search/Response.php

@@ -140,7 +140,7 @@ private function paginate()
         // This method should not be used for endpoints that return no results
 
         // LengthAwarePaginator has trouble here
-        $total = $this->searchResponse['hits']['total'];
+        $total = $this->searchResponse['hits']['total']['value'] ?? 0;
         $limit = $this->searchParams['size'] ?? 10;
         $offset = $this->searchParams['from'] ?? 0;
 

app/Models/BaseModel.php

@@ -155,7 +155,7 @@ public static function addRestrictContentScopes($isDump = false)
 
             // For present and future exhibitions, only show if they're published on the web
             // WEB-1419: Using subquery here instead of join to avoid field overrides
-            $builder->orWhereIn('id', function ($query) {
+            $builder->orWhereIn('exhibitions.id', function ($query) {
                 $query->select('datahub_id')
                     ->from('web_exhibitions');
             });

app/Models/Collections/Agent.php

@@ -71,6 +71,29 @@ public static function searchScopeArtists()
         ];
     }
 
+    /**
+     * Add relevancy tweaks to agents.
+     *
+     * @return array
+     */
+    public static function searchBoostAgents()
+    {
+        return [
+            // Boost agents that are artists
+            'term' => [
+                'is_artist' => true,
+            ],
+
+            // Boost agents that have an image
+            'exists' => [
+                'field' => 'image_id',
+            ],
+
+            'terms' => [
+                'id' => $this->boostedIds(),
+            ]
+        ];
+    }
     /**
      * API-341: Needed for the mobile app. Our mobile app frontends query `api/v1/autocomplete`,
      * which uses the `suggest_autocomplete_boosted` field. Per the `filter` on that field in

app/Models/Collections/Artwork.php

@@ -560,10 +560,8 @@ public static function searchBoostArtworks()
     {
         return [
             // Boost anything that has an image
-            [
-                'exists' => [
-                    'field' => 'image_id',
-                ],
+            'exists' => [
+                'field' => 'image_id',
             ],
         ];
     }

app/Models/Collections/Exhibition.php

@@ -91,6 +91,21 @@ public function isBoosted()
         return $this->webExhibition->is_featured ?? false;
     }
 
+    /**
+     * Add relevancy tweaks to exhibitions.
+     *
+     * @return array
+     */
+    public static function searchBoostExhibitions()
+    {
+        return [
+            // Boost anything that has an image
+            'exists' => [
+                'field' => 'image_id',
+            ],
+        ];
+    }
+
     public function getDateAicStartAttribute($value)
     {
         return $this->webExhibition->public_start_at ?? $this->castAttribute('date_aic_start', $value);

app/Models/ElasticSearchable.php

@@ -157,9 +157,7 @@ public function elasticsearchMapping()
 
         // Now bring it all together
         return [
-            $this->searchableType() => [
-                'properties' => $default,
-            ],
+            'properties' => $default,
         ];
     }
 

app/Providers/SearchServiceProvider.php

@@ -232,7 +232,7 @@ public function updateElasticsearchConfig()
                  * @param string $endpoint
                  * @return array
                  */
-                public function getSearchScopeForEndpoint($endpoint)
+                public function getSearchScopeForEndpoint($endpoint, $useBoost = true)
                 {
                     $model = app('Resources')->getModelForEndpoint($endpoint);
 
@@ -253,21 +253,23 @@ public function getSearchScopeForEndpoint($endpoint)
                         $settings['scope'] = $this->getScopedQuery($resource, $scope);
                     }
 
-                    // ex. `searchBoostArtworks` for `artworks` endpoint boosts `is_on_view`
-                    $searchBoostMethod = 'searchBoost' . Str::studly($endpoint);
+                    if ($useBoost) {
+                        // ex. `searchBoostArtworks` for `artworks` endpoint boosts `is_on_view`
+                        $searchBoostMethod = 'searchBoost' . Str::studly($endpoint);
 
-                    if (method_exists($model, $searchBoostMethod)) {
-                        $boost = $model::$searchBoostMethod();
+                        if (method_exists($model, $searchBoostMethod)) {
+                            $boost = $model::$searchBoostMethod();
 
-                        $settings['boost'] = $this->getScopedQuery($resource, $boost);
-                    }
+                            $settings['boost'] = $this->getScopedQuery($resource, $boost);
+                        }
 
-                    // ex. `searchFunctionScoreArtworks` for `artworks` endpoint applies `pageviews` and `boost_rank`
-                    $searchFunctionScoreMethod = 'searchFunctionScore' . Str::studly($endpoint);
+                        // ex. `searchFunctionScoreArtworks` for `artworks` endpoint applies `pageviews` and `boost_rank`
+                        $searchFunctionScoreMethod = 'searchFunctionScore' . Str::studly($endpoint);
 
-                    if (method_exists($model, $searchFunctionScoreMethod)) {
-                        // TODO: Inject `getScopedQuery` into the filter..?
-                        $settings['function_score'] = $model::$searchFunctionScoreMethod();
+                        if (method_exists($model, $searchFunctionScoreMethod)) {
+                            // TODO: Inject `getScopedQuery` into the filter..?
+                            $settings['function_score'] = $model::$searchFunctionScoreMethod();
+                        }
                     }
 
                     return $settings;
@@ -289,17 +291,13 @@ public function getScopedQuery($resource, $scope)
                         ];
                     }
 
-                    if (Arr::isAssoc($scope)) {
-                        $scope = [$scope];
-                    }
-
                     return [
                         'bool' => [
                             'should' => [
                                 [
                                     'bool' => [
                                         'must' => [
-                                            [$query],
+                                            $query,
                                             $scope,
                                         ],
                                     ],

composer.json

@@ -27,7 +27,7 @@
         "php": "^7.3|^8.0",
         "aic/data-hub-foundation": "dev-laravel-8-support",
         "aic/laravel-scout-elastic": "dev-master",
-        "cviebrock/laravel-elasticsearch": "^8.0",
+        "cviebrock/laravel-elasticsearch": "^9.0",
         "fruitcake/laravel-cors": "^2.0",
         "intervention/image": "^2.7",
         "jsq/amazon-es-php": "dev-master",