From 1895d8cc1141b28525acfc21715f6f523b8194a2 Mon Sep 17 00:00:00 2001
From: "Carlos R. L. Rodrigues"
 <37986729+carlos-r-l-rodrigues@users.noreply.github.com>
Date: Thu, 27 Mar 2025 09:28:24 -0300
Subject: [PATCH] Merge branch 'develop' of https://github.com/medusajs/medusa
 into fix/wfe-context-ref (#12006)

---
 .changeset/happy-baboons-cough.md                     |  5 +++++
 packages/medusa/src/api/store/products/middlewares.ts | 11 +++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/happy-baboons-cough.md

diff --git a/.changeset/happy-baboons-cough.md b/.changeset/happy-baboons-cough.md
new file mode 100644
index 0000000000..9091ea58f7
--- /dev/null
+++ b/.changeset/happy-baboons-cough.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+fix(medusa): skip index module when tags or categories present
diff --git a/packages/medusa/src/api/store/products/middlewares.ts b/packages/medusa/src/api/store/products/middlewares.ts
index 83e7a4942d..2f4eee1f4e 100644
--- a/packages/medusa/src/api/store/products/middlewares.ts
+++ b/packages/medusa/src/api/store/products/middlewares.ts
@@ -11,6 +11,7 @@ import {
   MiddlewareRoute,
 } from "@medusajs/framework/http"
 import { isPresent, ProductStatus } from "@medusajs/framework/utils"
+import IndexEngineFeatureFlag from "../../../loaders/feature-flags/index-engine"
 import {
   filterByValidSalesChannels,
   normalizeDataForContext,
@@ -19,7 +20,6 @@ import {
 } from "../../utils/middlewares"
 import * as QueryConfig from "./query-config"
 import { StoreGetProductsParams } from "./validators"
-import IndexEngineFeatureFlag from "../../../loaders/feature-flags/index-engine"
 
 export const storeProductRoutesMiddlewares: MiddlewareRoute[] = [
   {
@@ -35,7 +35,14 @@ export const storeProductRoutesMiddlewares: MiddlewareRoute[] = [
       ),
       filterByValidSalesChannels(),
       (req, res, next) => {
-        if (featureFlagRouter.isFeatureEnabled(IndexEngineFeatureFlag.key)) {
+        const canUseIndex = !(
+          isPresent(req.filterableFields.tags) ||
+          isPresent(req.filterableFields.categories)
+        )
+        if (
+          featureFlagRouter.isFeatureEnabled(IndexEngineFeatureFlag.key) &&
+          canUseIndex
+        ) {
           return next()
         }