feat(products): filter products by a single product_type

The products resolver accepted a list of item types while the REST
endpoint only ever filters by one. With just two item types, filtering by
both is equivalent to no filter, so a single value is enough.

Replace the product_types list filter with a single product_type on
ProductsQuery and the resolver, so the GraphQL and REST surfaces are
consistent.

Author: rsempe

app/graphql/resolvers/products_resolver.rb

@@ -12,18 +12,18 @@ class ProductsResolver < Resolvers::BaseResolver
     argument :limit, Integer, required: false
     argument :page, Integer, required: false
     argument :product_category_ids, [ID], required: false
-    argument :product_types, [Types::Products::ProductTypeEnum], required: false
+    argument :product_type, Types::Products::ProductTypeEnum, required: false
     argument :search_term, String, required: false
     argument :without_product_category, Boolean, required: false
 
     type Types::Products::Object.collection_type, null: false
 
-    def resolve(page: nil, limit: nil, search_term: nil, product_category_ids: nil, without_product_category: nil, product_types: nil)
+    def resolve(page: nil, limit: nil, search_term: nil, product_category_ids: nil, without_product_category: nil, product_type: nil)
       result = ::ProductsQuery.call(
         organization: current_organization,
         search_term:,
         pagination: {page:, limit:},
-        filters: {product_category_ids:, without_product_category:, product_types:}
+        filters: {product_category_ids:, without_product_category:, product_type:}
       )
 
       result.products

app/queries/products_query.rb

@@ -2,7 +2,7 @@
 
 class ProductsQuery < BaseQuery
   Result = BaseResult[:products]
-  Filters = BaseFilters[:product_category_ids, :without_product_category, :product_types]
+  Filters = BaseFilters[:product_category_ids, :without_product_category, :product_type]
 
   def call
     products = base_scope.result
@@ -12,7 +12,7 @@ def call
     if filters.product_category_ids.present? || filters.without_product_category.present?
       products = with_product_category(products)
     end
-    products = with_product_types(products) if filters.product_types.present?
+    products = with_product_type(products) if filters.product_type.present?
 
     result.products = products
     result
@@ -45,7 +45,7 @@ def with_product_category(scope)
     end
   end
 
-  def with_product_types(scope)
-    scope.where(product_type: filters.product_types)
+  def with_product_type(scope)
+    scope.where(product_type: filters.product_type)
   end
 end

schema.graphql

@@ -20,8 +20,8 @@
 
   let(:query) do
     <<~GQL
-      query($searchTerm: String, $productTypes: [ProductTypeEnum!], $productCategoryIds: [ID!], $withoutProductCategory: Boolean) {
-        products(limit: 5, searchTerm: $searchTerm, productTypes: $productTypes, productCategoryIds: $productCategoryIds, withoutProductCategory: $withoutProductCategory) {
+      query($searchTerm: String, $productType: ProductTypeEnum, $productCategoryIds: [ID!], $withoutProductCategory: Boolean) {
+        products(limit: 5, searchTerm: $searchTerm, productType: $productType, productCategoryIds: $productCategoryIds, withoutProductCategory: $withoutProductCategory) {
           collection { id name code productType }
           metadata { currentPage totalCount }
         }
@@ -45,7 +45,7 @@
   end
 
   context "with an item type filter" do
-    let(:variables) { {productTypes: %w[fixed]} }
+    let(:variables) { {productType: "fixed"} }
 
     it "returns only matching items" do
       expect(execution["data"]["products"]["collection"].map { it["id"] }).to eq([fixed_item.id])

schema.json

@@ -47,10 +47,10 @@
     end
   end
 
-  context "with an product_types filter" do
-    let(:filters) { {product_types: %w[fixed]} }
+  context "with an product_type filter" do
+    let(:filters) { {product_type: "fixed"} }
 
-    it "returns only items of those types" do
+    it "returns only items of that type" do
       expect(result.products).to eq([fixed_item])
     end
   end