fix: Fix filtering by categories and collections (#136)

mirumee · Dec 30, 2024 · 152c8fa · 152c8fa
1 parent c2469e8
commit 152c8fa
Show file tree

Hide file tree

Showing 5 changed files with 197 additions and 42 deletions.
diff --git a/apps/storefront/src/app/[locale]/(main)/search/page.tsx b/apps/storefront/src/app/[locale]/(main)/search/page.tsx
@@ -66,6 +66,8 @@ export default async function Page(props: { searchParams: SearchParams }) {
     sortBy = DEFAULT_SORT_BY,
     q: query = "",
     limit,
+    category,
+    collection,
     ...rest
   } = searchParams;
   const { results, pageInfo } = await searchService.search(
@@ -77,6 +79,8 @@ export default async function Page(props: { searchParams: SearchParams }) {
       before,
       sortBy,
       filters: rest,
+      category,
+      collection,
     },
     searchContext,
   );

diff --git a/packages/infrastructure/src/public/saleor/search/graphql/queries/SearchProductsQuery.graphql b/packages/infrastructure/src/public/saleor/search/graphql/queries/SearchProductsQuery.graphql
@@ -1,15 +1,70 @@
 query SearchProductQuery(
   $after: String
   $before: String
+  $categorySlug: String
   $channel: String!
+  $collectionSlug: String
   $filter: ProductFilterInput
   $first: Int
+  $languageCode: LanguageCodeEnum!
   $last: Int
   $search: String
+  $searchByCategory: Boolean!
+  $searchByCollection: Boolean!
+  $searchByProducts: Boolean!
   $sortBy: ProductOrder
-  $languageCode: LanguageCodeEnum!
   $where: ProductWhereInput
 ) {
+  category(slug: $categorySlug) @include(if: $searchByCategory) {
+    products(
+      after: $after
+      before: $before
+      channel: $channel
+      filter: $filter
+      first: $first
+      last: $last
+      sortBy: $sortBy
+      where: $where
+    ) {
+      edges {
+        node {
+          ...SearchProductFragment
+        }
+      }
+      pageInfo {
+        startCursor
+        endCursor
+        hasNextPage
+        hasPreviousPage
+      }
+      totalCount
+    }
+  }
+  collection(slug: $collectionSlug, channel: $channel)
+    @include(if: $searchByCollection) {
+    products(
+      after: $after
+      before: $before
+      filter: $filter
+      first: $first
+      last: $last
+      sortBy: $sortBy
+      where: $where
+    ) {
+      edges {
+        node {
+          ...SearchProductFragment
+        }
+      }
+      pageInfo {
+        startCursor
+        endCursor
+        hasNextPage
+        hasPreviousPage
+      }
+      totalCount
+    }
+  }
   products(
     after: $after
     before: $before
@@ -20,7 +75,7 @@ query SearchProductQuery(
     search: $search
     sortBy: $sortBy
     where: $where
-  ) {
+  ) @include(if: $searchByProducts) {
     edges {
       node {
         ...SearchProductFragment