@akinon/next 1.102.0-rc.79 → 1.103.0-rc.80

package/CHANGELOG.md

@@ -1,18 +1,6 @@
 # @akinon/next
 
-## 1.102.0-rc.79
-
-### Minor Changes
-
-- 9a3885b: ZERO-3660: skip catch-all not_found route in generate route script
-
-## 1.102.0-rc.78
-
-### Minor Changes
-
-- d512ea2: ZERO-3656: update setLoyaltyData mutation to accept string type
-
-## 1.102.0-rc.77
+## 1.103.0-rc.80
 
 ### Minor Changes
 
@@ -60,6 +48,7 @@
 - 9dc7298a: ZERO-3416: Refactor Accordion component to enhance props and improve styling flexibility
 - 33377cfd: ZERO-3267: Refactor import statement for ROUTES in error-page component
 - 43c182eef: ZERO-3054: Update Redis variable checks to conditionally include CACHE_SECRET
+- d512ea2: ZERO-3656: update setLoyaltyData mutation to accept string type
 - c480272c: ZERO-3531: Refactor checkoutApi: Remove unnecessary invalidatesTags property from POST request from sample products
 - facf1ada: ZERO-3445: Add SameSite and Secure attributes
 - 3b255fe: ZERO-3629 :edit warnings in build
@@ -79,6 +68,13 @@
 - 3f9b8d7e7: ZERO-2761: Update plugins.js for akinon-next
 - 0e823010: ZERO-3531: Add saveSampleProducts endpoint
 
+## 1.102.0
+
+### Minor Changes
+
+- 6b949cb: ZERO-3615: Refactor product data handling and improve 404 error handling
+- 9a3885b: ZERO-3660: skip catch-all not_found route in generate route script
+
 ## 1.101.0
 
 ### Minor Changes

package/data/server/product.ts

@@ -6,7 +6,7 @@ import { ServerVariables } from '../../utils/server-variables';
 import logger from '../../utils/log';
 
 type GetProduct = {
-  pk: number;
+  pk: number | string;
   locale?: string;
   currency?: string;
   searchParams?: URLSearchParams;
@@ -23,9 +23,21 @@ const getProductDataHandler = ({
   headers
 }: GetProduct) => {
   return async function () {
+    // Convert pk to number if it's a string and validate
+    const numericPk = typeof pk === 'string' ? parseInt(pk, 10) : pk;
+
+    if (isNaN(numericPk)) {
+      logger.warn('Invalid product pk provided', {
+        handler: 'getProductDataHandler',
+        pk,
+        numericPk
+      });
+      return null;
+    }
+
     let url = groupProduct
-      ? product.getGroupProductByPk(pk)
-      : product.getProductByPk(pk);
+      ? product.getGroupProductByPk(numericPk)
+      : product.getProductByPk(numericPk);
 
     if (searchParams) {
       url +=
@@ -35,10 +47,8 @@ const getProductDataHandler = ({
           .join('&');
     }
 
-    let data: ProductResult;
-
     try {
-      data = await appFetch<ProductResult>({
+      const data = await appFetch<ProductResult>({
         url,
         locale,
         currency,
@@ -50,23 +60,21 @@ const getProductDataHandler = ({
           }
         }
       });
-    } catch (error) {
-      logger.error('Failed to fetch product data', {
-        handler: 'getProductDataHandler',
-        pk,
-        error: error.message,
-        url
-      });
-      return null;
-    }
 
-    const categoryUrl = product.categoryUrl(data.product.pk);
+      // If product data is not found, return null to trigger 404
+      if (!data?.product?.pk) {
+        logger.warn('Product not found', {
+          handler: 'getProductDataHandler',
+          pk: numericPk,
+          hasData: !!data,
+          hasProduct: !!data?.product
+        });
+        return null;
+      }
 
-    let productCategoryData: ProductCategoryResult;
-    let breadcrumbData: { menu?: unknown } = {};
+      const categoryUrl = product.categoryUrl(data.product.pk);
 
-    try {
-      productCategoryData = await appFetch<ProductCategoryResult>({
+      const productCategoryData = await appFetch<ProductCategoryResult>({
         url: categoryUrl,
         locale,
         currency,
@@ -81,19 +89,16 @@ const getProductDataHandler = ({
       const menuItemModel = productCategoryData?.results[0]?.menuitemmodel;
 
       if (!menuItemModel) {
-        logger.warn(
-          'menuItemModel is undefined, skipping breadcrumbData fetch',
-          {
-            handler: 'getProductDataHandler',
-            pk
-          }
-        );
+        logger.warn('menuItemModel is undefined, skipping breadcrumbData fetch', {
+          handler: 'getProductDataHandler',
+          pk: numericPk
+        });
         return { data, breadcrumbData: undefined };
       }
 
       const breadcrumbUrl = product.breadcrumbUrl(menuItemModel);
 
-      breadcrumbData = await appFetch<{ menu?: unknown }>({
+      const breadcrumbData = await appFetch<any>({
         url: breadcrumbUrl,
         locale,
         currency,
@@ -104,19 +109,19 @@ const getProductDataHandler = ({
           }
         }
       });
+
+      return {
+        data,
+        breadcrumbData: breadcrumbData?.menu
+      };
     } catch (error) {
-      logger.warn('Failed to fetch breadcrumb data', {
+      logger.error('Error in getProductDataHandler', {
         handler: 'getProductDataHandler',
-        pk,
+        pk: numericPk,
         error: error.message
       });
-      // Continue without breadcrumb data
+      return null;
     }
-
-    return {
-      data,
-      breadcrumbData: breadcrumbData?.menu
-    };
   };
 };
 
@@ -128,9 +133,12 @@ export const getProductData = async ({
   groupProduct,
   headers
 }: GetProduct) => {
-  return Cache.wrap(
+  // Convert pk to number for cache key if it's a string
+  const numericPkForCache = typeof pk === 'string' ? parseInt(pk, 10) : pk;
+
+  const result = await Cache.wrap(
     CacheKey[groupProduct ? 'GroupProduct' : 'Product'](
-      pk,
+      numericPkForCache,
       searchParams ?? new URLSearchParams()
     ),
     locale,
@@ -147,4 +155,13 @@ export const getProductData = async ({
       compressed: true
     }
   );
+
+  // If product data is not found, throw 404 error
+  if (!result) {
+    const error = new Error('Product not found') as Error & { status: number };
+    error.status = 404;
+    throw error;
+  }
+
+  return result;
 };

package/middlewares/default.ts

@@ -214,7 +214,6 @@ const withPzDefault =
 
     req.middlewareParams = {
       commerceUrl,
-      found: true,
       rewrites: {}
     };
 

package/middlewares/index.ts

@@ -30,7 +30,6 @@ export {
 export interface PzNextRequest extends NextRequest {
   middlewareParams: {
     commerceUrl: string;
-    found: boolean;
     rewrites: {
       locale?: string;
       prettyUrl?: string;

package/middlewares/pretty-url.ts

@@ -123,8 +123,6 @@ const withPrettyUrl =
       return middleware(req, event);
     }
 
-    req.middlewareParams.found = false;
-
     return middleware(req, event);
   };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.102.0-rc.79",
+  "version": "1.103.0-rc.80",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -35,7 +35,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.102.0-rc.79",
+    "@akinon/eslint-plugin-projectzero": "1.103.0-rc.80",
     "@babel/core": "7.26.10",
     "@babel/preset-env": "7.26.9",
     "@babel/preset-typescript": "7.27.0",