@unchainedshop/api 4.0.0-rc.5 → 4.0.0-rc.6

package/src/mcp/tools/shopInfoHandler.ts

@@ -5,12 +5,14 @@ export async function shopInfoHandler(context: Context) {
   const { version, userId, loaders, locale, countryCode } = context;
 
   try {
-    log('query shopInfo', { userId });
+    log('handler shopInfoHandler', { userId });
 
     const language = await loaders.languageLoader.load({ isoCode: locale.language });
 
     const country = await loaders.countryLoader.load({ isoCode: countryCode });
-    const defaultLanguageIsoCode = language.isoCode + '-' + country.isoCode;
+    const defaultLanguageIsoCode = language?.isoCode
+      ? `${language.isoCode}${country?.isoCode ? '-' + country.isoCode : ''}`
+      : null;
 
     return {
       content: [

package/src/mcp/utils/getNormalizedProductDetails.ts

@@ -13,11 +13,38 @@ export async function getNormalizedProductDetails(productId: string, context: Co
     locale,
   });
   let variations = [];
+  let bundleItems = [];
   if (product.type === ProductTypes.ConfigurableProduct)
     variations = await context.modules.products.variations.findProductVariations({
       productId: product._id,
     });
 
+  if (product.type === ProductTypes.BundleProduct) {
+    bundleItems = await Promise.all(
+      (product.bundleItems || []).map(async (item) => {
+        const bundleItemProduct = await loaders.productLoader.load({
+          productId: item.productId,
+        });
+        const productMedias = await modules.products.media.findProductMedias({
+          productId: item.productId,
+        });
+        const media = await normalizeMediaUrl(productMedias, context);
+        const texts = await loaders.productTextLoader.load({
+          productId: item.productId,
+          locale,
+        });
+        return {
+          product: {
+            ...bundleItemProduct,
+            media,
+            texts,
+          },
+          ...item,
+        };
+      }),
+    );
+  }
+
   // Get pricing information
   let pricing = null;
   try {
@@ -37,6 +64,7 @@ export async function getNormalizedProductDetails(productId: string, context: Co
     texts,
     media,
     variations,
+    bundleItems,
     pricing,
   };
 }

package/src/resolvers/mutations/filters/createFilter.ts

@@ -2,6 +2,7 @@ import { log } from '@unchainedshop/logger';
 import { Filter } from '@unchainedshop/core-filters';
 import { Context } from '../../../context.js';
 import { FilterDirector, FilterInputText } from '@unchainedshop/core';
+import { DuplicateFilterKeyError } from '../../../errors.js';
 
 export default async function createFilter(
   root: never,
@@ -10,13 +11,17 @@ export default async function createFilter(
 ) {
   const { modules, userId } = context;
   log('mutation createFilter', { userId });
+  try {
+    const newFilter = await modules.filters.create(filter);
 
-  const newFilter = await modules.filters.create(filter);
+    await FilterDirector.invalidateProductIdCache(newFilter, context);
 
-  await FilterDirector.invalidateProductIdCache(newFilter, context);
-
-  if (texts) {
-    await modules.filters.texts.updateTexts({ filterId: newFilter._id }, texts);
+    if (texts) {
+      await modules.filters.texts.updateTexts({ filterId: newFilter._id }, texts);
+    }
+    return newFilter;
+  } catch (e) {
+    if (e?.message?.includes('duplicate')) throw new DuplicateFilterKeyError({ filter });
+    else throw e;
   }
-  return newFilter;
 }

package/src/schema/types/product/bundle-product.ts

@@ -1,7 +1,7 @@
 export default [
   /* GraphQL */ `
     """
-    A Bundle product consists of multiple configured products
+    A Bundle product consists of multiple products
     """
     type BundleProduct implements Product @cacheControl(maxAge: 180) {
       _id: ID!