fix: lookup urlkey for sku, adapt product (#77)

* fix: lookup urlkey for sku, adapt product

* chore: fix tesst

Author: maxakuru

src/catalog/storage/r2.js

@@ -43,8 +43,15 @@ export default class StorageClient {
       throw errorWithResponse(404, 'Product not found');
     }
 
-    const productData = await object.text();
-    return JSON.parse(productData);
+    const productData = await object.json();
+    productData.attributeMap = Object.fromEntries((productData.attributes ?? [])
+      .map(({ name, value }) => [name, value]));
+    (productData.variants ?? []).forEach((variant) => {
+      variant.attributeMap = Object.fromEntries((variant.attributes ?? [])
+        .map(({ name, value }) => [name, value]));
+    });
+
+    return productData;
   }
 
   /**

src/content/helix-commerce.js

@@ -21,13 +21,19 @@ import htmlTemplateFromContext from '../templates/html/index.js';
 export async function handle(ctx) {
   const { config } = ctx;
   const { urlkey } = config.params;
-  const { sku } = config.params;
+  let { sku } = config.params;
 
   if (!sku && !urlkey) {
     return errorResponse(404, 'missing sku or urlkey');
   }
 
   const storageClient = new StorageClient(ctx, config);
+  if (!sku) {
+    sku = await storageClient.lookupSku(urlkey);
+    if (!sku) {
+      return errorResponse(404, 'could not find sku');
+    }
+  }
 
   const product = await storageClient.fetchProduct(sku);
   const html = htmlTemplateFromContext(ctx, product, product.variants).render();

test/catalog/storage/r2.test.js

@@ -74,7 +74,7 @@ describe('StorageClient Class Tests', () => {
         env: {
           CATALOG_BUCKET: {
             get: sinon.stub().resolves({
-              text: sinon.stub().resolves(JSON.stringify({ sku: 'sku1', name: 'Test Product' })),
+              json: sinon.stub().resolves({ sku: 'sku1', name: 'Test Product' }),
             }),
           },
         },
@@ -86,7 +86,9 @@ describe('StorageClient Class Tests', () => {
 
       assert(ctx.log.debug.calledOnceWithExactly('Fetching product from R2:', 'org/site/store/view/products/sku1.json'));
       assert(ctx.env.CATALOG_BUCKET.get.calledOnceWithExactly('org/site/store/view/products/sku1.json'));
-      assert.deepStrictEqual(product, { sku: 'sku1', name: 'Test Product' });
+      assert.deepStrictEqual(product, {
+        sku: 'sku1', attributeMap: {}, name: 'Test Product',
+      });
     });
 
     it('should throw 404 error if product not found', async () => {
@@ -117,33 +119,6 @@ describe('StorageClient Class Tests', () => {
       assert.strictEqual(thrownError, error);
     });
 
-    it('should throw error if JSON parsing fails', async () => {
-      const ctx = {
-        log: { debug: sinon.stub() },
-        env: {
-          CATALOG_BUCKET: {
-            get: sinon.stub().resolves({
-              text: sinon.stub().resolves('invalid json'),
-            }),
-          },
-        },
-      };
-
-      const sku = 'sku1';
-      const client = new StorageClient(ctx, config);
-
-      let thrownError;
-      try {
-        await client.fetchProduct(sku);
-      } catch (e) {
-        thrownError = e;
-      }
-
-      assert(ctx.log.debug.calledOnceWithExactly('Fetching product from R2:', 'org/site/store/view/products/sku1.json'));
-      assert(ctx.env.CATALOG_BUCKET.get.calledOnceWithExactly('org/site/store/view/products/sku1.json'));
-      assert(thrownError instanceof SyntaxError);
-    });
-
     it('should propagate errors from CATALOG_BUCKET.get', async () => {
       const ctx = {
         log: { debug: sinon.stub() },