Merge pull request #11 from adobe-rnd/urlkey-search

fix: search by urlkey

Author: maxakuru

src/config.js

@@ -56,7 +56,8 @@ export async function resolveConfig(ctx, tenant, overrides = {}) {
   );
 
   // merge configs
-  return {
+  /** @type {Config} */
+  const resolved = {
     ...paths.reduce((conf, key) => ({
       ...conf,
       ...confMap[key],
@@ -70,4 +71,13 @@ export async function resolveConfig(ctx, tenant, overrides = {}) {
     }),
     ...overrides,
   };
+
+  // ensure validity
+  // TODO: make this more robust
+  if (!resolved.pageType) {
+    ctx.log.warn('invalid config for tenant (missing pageType)', tenant);
+    return null;
+  }
+
+  return resolved;
 }

src/index.js

@@ -14,6 +14,7 @@
 import { errorResponse, errorWithResponse, makeContext } from './util.js';
 import getProductQueryCS, { adapter } from './queries/cs-product.js';
 import getProductQueryCore from './queries/core-product.js';
+import getProductSKUQuery from './queries/core-product-sku.js';
 import HTML_TEMPLATE from './templates/html.js';
 import { resolveConfig } from './config.js';
 
@@ -79,7 +80,7 @@ async function fetchProductCore(opt, config) {
 
   const json = await resp.json();
   try {
-    const [product] = json.data.products;
+    const [product] = json.data.products.items;
     if (!product) {
       throw errorWithResponse(404, 'could not find product', json.errors);
     }
@@ -90,14 +91,57 @@ async function fetchProductCore(opt, config) {
   }
 }
 
+/**
+ * @param {string} urlkey
+ * @param {Config} config
+ */
+async function lookupProductSKU(urlkey, config) {
+  const query = getProductSKUQuery({ urlkey });
+  const resp = await fetch(`${config.coreEndpoint}?query=${encodeURIComponent(query)}`, {
+    headers: {
+      origin: 'https://api.adobecommerce.live',
+      'x-api-key': config.apiKey,
+      'Magento-Environment-Id': config.magentoEnvironmentId,
+      'Magento-Website-Code': config.magentoWebsiteCode,
+      'Magento-Store-View-Code': config.magentoStoreViewCode,
+    },
+  });
+  if (!resp.ok) {
+    console.warn('failed to fetch product sku: ', resp.status, resp.statusText);
+    throw errorWithResponse(resp.status, 'failed to fetch product sku');
+  }
+
+  const json = await resp.json();
+  try {
+    const [product] = json.data.products.items;
+    if (!product) {
+      throw errorWithResponse(404, 'could not find product sku', json.errors);
+    }
+    return product.sku;
+  } catch (e) {
+    console.error('failed to parse product sku: ', e);
+    throw errorWithResponse(500, 'failed to parse product sku response');
+  }
+}
+
 /**
  * @param {Context} ctx
  * @param {Config} config
  */
 async function handlePDPRequest(ctx, config) {
-  const { sku, urlkey } = config.params;
+  const { urlkey } = config.params;
+  let { sku } = config.params;
+
   if (!sku && !urlkey) {
     return errorResponse(404, 'missing sku or urlkey');
+  } else if (!sku && !config.coreEndpoint) {
+    return errorResponse(400, 'missing sku and coreEndpoint');
+  }
+
+  if (!sku) {
+    // lookup sku by urlkey with core
+    // TODO: test if livesearch if enabled
+    sku = await lookupProductSKU(urlkey, config);
   }
 
   // const product = await fetchProductCore({ sku }, config);
@@ -146,13 +190,13 @@ export default {
       return errorResponse(404, 'missing route');
     }
 
-    const overrides = Object.fromEntries(ctx.url.searchParams.entries());
-    const config = await resolveConfig(ctx, tenant, overrides);
-    if (!config) {
-      return errorResponse(404, 'config not found');
-    }
-
     try {
+      const overrides = Object.fromEntries(ctx.url.searchParams.entries());
+      const config = await resolveConfig(ctx, tenant, overrides);
+      if (!config) {
+        return errorResponse(404, 'config not found');
+      }
+
       return handlers[route](ctx, config);
     } catch (e) {
       if (e.response) {

src/queries/core-product-sku.js

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2024 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+import { gql } from '../util.js';
+
+/**
+ * @param {{ urlkey: string; }} param0
+ */
+export default ({ urlkey }) => gql`{
+  products(
+    filter: { url_key: { eq: "${urlkey}" } }
+  ) {
+    items {
+      sku
+    }
+  }
+}`;

src/types.d.ts

@@ -7,6 +7,7 @@ declare global {
     magentoEnvironmentId: string;
     magentoWebsiteCode: string;
     magentoStoreViewCode: string;
+    magentoStoreCode: string;
     coreEndpoint: string;
     params: Record<string, string>;
   }

wrangler.toml

@@ -21,6 +21,10 @@ ENVIRONMENT = "dev"
 [env.ci]
 name = "adobe-commerce-api-ci"
 
+kv_namespaces = [
+  { binding = "CONFIGS", id = "bb91e12a65a8462282396f32e63406f1", preview_id = "bb91e12a65a8462282396f32e63406f1" }
+]
+
 [env.ci.vars]
 VERSION = "@@VERSION@@-ci"
 ENVIRONMENT = "ci"
@@ -31,6 +35,10 @@ ENVIRONMENT = "ci"
 [env.production]
 name = "adobe-commerce-api"
 
+kv_namespaces = [
+  { binding = "CONFIGS", id = "bb91e12a65a8462282396f32e63406f1", preview_id = "bb91e12a65a8462282396f32e63406f1" }
+]
+
 [env.production.vars]
 VERSION = "@@VERSION@@"
 ENVIRONMENT = "prod"