Merge pull request #14 from landofcoder/fix-graphql-issue

Fix graphql issue

Author: landofcoder

Model/Resolver/Products/DataProvider/ProductSearch.php

@@ -123,11 +123,29 @@ public function getList(
         //Create a copy of search criteria without filters to preserve the results from search
         $searchCriteriaForCollection = $this->searchCriteriaBuilder->build($searchCriteria);
         //Apply CatalogSearch results from search and join table
-        $this->getSearchResultsApplier(
-            $searchResult,
-            $collection,
-            $this->getSortOrderArray($searchCriteriaForCollection)
-        )->apply();
+        if (!empty($searchResult) && $searchResult->getItems()) {
+            $items = [];
+            foreach ($searchResult->getItems() as $_item) {
+                if (get_class($_item) == "Smile\\ElasticsuiteCore\\Search\\Adapter\\Elasticsuite\\Response\\Document") {
+                    $score = $_item->getCustomAttribute('score');
+                    if (!$score) {
+                        $_item->setCustomAttribute('score', '');
+                    }
+                    $items[] = $_item;
+                }
+            }
+            if (!empty($items)) {
+                $searchResult->setItems($items);
+            }
+
+            $this->getSearchResultsApplier(
+                $searchResult,
+                $collection,
+                $this->getSortOrderArray($searchCriteriaForCollection)
+            )->apply();
+        }
+
+        $collection->setFlag('search_resut_applied', true);
 
         $this->collectionPreProcessor->process($collection, $searchCriteriaForCollection, $attributes, $context);
         $collection->load();
@@ -185,7 +203,6 @@ private function getSortOrderArray(SearchCriteriaInterface $searchCriteria)
                 $ordersArray[$sortOrder->getField()] = $sortOrder->getDirection();
             }
         }
-
         return $ordersArray;
     }
 }

Model/Resolver/Products/DataProvider/Sellers.php

@@ -166,10 +166,14 @@ public function getListSellers
                     ) . $data["thumbnail"];
             }
             $args['seller_id'] = $val->getData('seller_id');
-            $sellerRates = $this->sellerFrontendRepository->getSellersRating($data['seller_id']);
-            $data['seller_rates'] = $sellerRates;
+            $sellerRates = $this->sellerFrontendRepository->getSellersRating((int)$data['seller_id']);
+            $data['seller_rates'] = [
+                'total_count' => $sellerRates->getTotalCount(),
+                'items' => $sellerRates->getItems()
+            ];
             $data['group_id']  = $val->getGroupId();
             $data['group'] = $val->getSellerGroup();
+            $data['country'] = !empty($val->getCountry()) ? $val->getCountry() : $val->getCountryId();
             $data['products'] = $this->getResult( $args, $info, $context);
             $items[] = $data;
         }

Model/Resolver/Sellers.php

@@ -45,7 +45,7 @@ class Sellers extends AbstractSellerQuery implements ResolverInterface
 {
 
     /**
-     * @var SellersFrontendRepositoryInterface
+     * @var Products\Query\SellerQueryInterface
      */
     private $sellers;