GraphQL - Created one resolver for sort_fields. Added tests.

magento · May 17, 2018 · 9962c66 · 9962c66
1 parent d804bab
commit 9962c66
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 72 deletions.
diff --git a/...el/Resolver/Category/SortFieldDefault.php → ...Ql/Model/Resolver/Category/SortFields.php b/...el/Resolver/Category/SortFieldDefault.php → ...Ql/Model/Resolver/Category/SortFields.php
@@ -14,9 +14,9 @@
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 
 /**
- * Retrieves the sort field default value
+ * Retrieves the sort fields data
  */
-class SortFieldDefault implements ResolverInterface
+class SortFields implements ResolverInterface
 {
     /**
      * @var ValueFactory
@@ -41,7 +41,8 @@ class SortFieldDefault implements ResolverInterface
     public function __construct(
         ValueFactory $valueFactory,
         \Magento\Catalog\Model\Config $catalogConfig,
-        \Magento\Store\Model\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Catalog\Model\Category\Attribute\Source\Sortby $ss
     ) {
         $this->valueFactory = $valueFactory;
         $this->catalogConfig = $catalogConfig;
@@ -53,10 +54,20 @@ public function __construct(
      */
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) : Value
     {
-        $sortFieldDefault = $this->catalogConfig->getProductListDefaultSortBy($this->storeManager->getStore()->getId());
+        $sortFieldsOptions = [
+            ['value' => 'position', 'label' => 'Position']
+        ];
+        foreach ($this->catalogConfig->getAttributesUsedForSortBy() as $attribute) {
+            $sortFieldsOptions[] = ['value' => $attribute->getAttributeCode(), 'label' => $attribute->getStoreLabel()];
+        }
 
-        $result = function () use ($sortFieldDefault) {
-            return $sortFieldDefault;
+        $data = [
+            'default' => $this->catalogConfig->getProductListDefaultSortBy($this->storeManager->getStore()->getId()),
+            'options' => $sortFieldsOptions,
+        ];
+
+        $result = function () use ($data) {
+            return $data;
         };
 
         return $this->valueFactory->create($result);

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/SortFieldsOptions.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/SortFieldsOptions.php
diff --git a/app/code/Magento/GraphQl/etc/schema.graphqls b/app/code/Magento/GraphQl/etc/schema.graphqls
@@ -25,7 +25,7 @@ input FilterTypeInput @doc(description: "FilterTypeInput specifies which action
 type SearchResultPageInfo @doc(description: "SearchResultPageInfo provides navigation for the query response") {
     page_size: Int @doc(description: "Specifies the maximum number of items to return")
     current_page: Int @doc(description: "Specifies which page of results to return")
-    sort_fields: SortFields @doc(description: "An object that includes the default sort field and all available sort fields")
+    sort_fields: SortFields @doc(description: "An object that includes the default sort field and all available sort fields") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\SortFields")
 }
 
 enum SortEnum @doc(description: "This enumeration indicates whether to return results in ascending or descending order") {
@@ -34,11 +34,11 @@ enum SortEnum @doc(description: "This enumeration indicates whether to return re
 }
 
 type SortField {
-    key: String @doc(description: "Attribute code of sort field")
+    value: String @doc(description: "Attribute code of sort field")
     label: String @doc(description: "Label of sort field")
 }
 
 type SortFields @doc(description: "SortFields contains a default value for sort fields and all available sort fields") {
-    default: String @doc(description: "Default value of sort fields") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\SortFieldDefault")
-    options: [SortField] @doc(description: "Available sort fields") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\SortFieldsOptions")
+    default: String @doc(description: "Default value of sort fields") 
+    options: [SortField] @doc(description: "Available sort fields")
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
@@ -516,7 +516,7 @@ public function testQueryProductsInCurrentPageSortedByPriceASC()
             default
             options 
             {
-                key
+                value
                 label
             }
           }
@@ -543,6 +543,9 @@ public function testQueryProductsInCurrentPageSortedByPriceASC()
         $this->assertArrayHasKey('options', $response['products']['page_info']['sort_fields']);
         $this->assertArrayHasKey('default', $response['products']['page_info']['sort_fields']);
         $this->assertEquals('position', $response['products']['page_info']['sort_fields']['default']);
+        $this->assertArrayHasKey('value', $response['products']['page_info']['sort_fields']['options'][0]);
+        $this->assertArrayHasKey('label', $response['products']['page_info']['sort_fields']['options'][0]);
+        $this->assertEquals(['value'=>'position', 'label' => 'Position'], $response['products']['page_info']['sort_fields']['options'][0]);
     }
 
     /**