From a527b0918e96a39f9b1e43dad18a12238fa65efd Mon Sep 17 00:00:00 2001 From: Nathan Sankbeil Date: Wed, 10 Jul 2019 11:39:08 -0400 Subject: [PATCH] fix: Include children when querying SFCC for category info --- .../7d316c068d500c57bdd1fea7a7a271d1.json | 67 ++++++ .../90e7c164841b0c9820f7b7d09c48c5b9.json | 225 ++++++++++++++++++ .../src/classes/ProductCatalogDataSource.ts | 3 +- 3 files changed, 294 insertions(+), 1 deletion(-) create mode 100644 packages/fssalesforce/src/__tests__/fixtures/7d316c068d500c57bdd1fea7a7a271d1.json create mode 100644 packages/fssalesforce/src/__tests__/fixtures/90e7c164841b0c9820f7b7d09c48c5b9.json diff --git a/packages/fssalesforce/src/__tests__/fixtures/7d316c068d500c57bdd1fea7a7a271d1.json b/packages/fssalesforce/src/__tests__/fixtures/7d316c068d500c57bdd1fea7a7a271d1.json new file mode 100644 index 0000000000..0750f9f8d6 --- /dev/null +++ b/packages/fssalesforce/src/__tests__/fixtures/7d316c068d500c57bdd1fea7a7a271d1.json @@ -0,0 +1,67 @@ +{ + "data": { + "_v": "18.6", + "_type": "category", + "categories": [ + { + "_type": "category", + "id": "newarrivals-womens", + "image": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dw2c996310/images/slot/sub_banners/cat-banner-womens-clothing.jpg", + "name": "Womens", + "page_description": "New Arrivals in womens fashionable and stylish Shoes, jackets and all other clothing for unbeatable comfort day in, day out. Practical and fashionable styles wherever the occasion.", + "page_title": "New Arrivals in Women's Footwear, Outerwear, Clothing & Accessories", + "parent_category_id": "newarrivals", + "c_enableCompare": false, + "c_showInMenu": true, + "c_slotBannerImage": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dw48eed0de/images/slot/landing/cat-landing-slotbottom-womens-clothing.jpg" + }, + { + "_type": "category", + "id": "newarrivals-mens", + "image": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dwe3aaa4ae/images/slot/sub_banners/cat-banner-mens-clothing.jpg", + "name": "Mens", + "page_description": "New Arrivals in Mens jackets and clothing for unbeatable comfort day in, day out. Practical, easy-to-wear styles wherever you're headed.", + "page_title": "New Arrivals in Men's Clothing, Suits & Accessories", + "parent_category_id": "newarrivals", + "c_enableCompare": false, + "c_showInMenu": true, + "c_slotBannerImage": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dw663dcfde/images/slot/landing/cat-landing-slotbottom-mens-dressshirts.jpg" + }, + { + "_type": "category", + "id": "newarrivals-electronics", + "image": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dw156354f0/images/slot/sub_banners/cat-banner-electronics.jpg", + "name": "Electronics", + "page_description": "Shop New Arrivals in Electronics including the latest in televisions, digital cameras, camcorders, mp3, ipod, mobil phones, GPS & gaming at Salesforce Commerce Cloud.", + "page_title": "Shop New Arrivals in Electronics Including Televisions, Digital Cameras, iPods & More", + "parent_category_id": "newarrivals", + "c_enableCompare": false, + "c_showInMenu": true, + "c_slotBannerImage": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dw5499218b/images/slot/landing/cat-landing-slotbottom-electronics.jpg" + } + ], + "id": "newarrivals", + "name": "New Arrivals", + "page_description": "Shop all new arrivals including women and mens clothing, jewelry, accessories, suits & more at Salesforce Commerce Cloud", + "page_title": "Women and Mens New Arrivals in Clothing, Jewelry, Accessories & More", + "parent_category_id": "root", + "c_enableCompare": false, + "c_headerMenuBanner": "\"New", + "c_headerMenuOrientation": "Vertical", + "c_showInMenu": true + }, + "status": 200, + "headers": { + "accept-ranges": "bytes", + "x-dw-request-base-id": "TD06mzQHJl2WAAAK", + "allow": "GET,HEAD,OPTIONS", + "x-dw-version-status": "deprecated", + "cache-control": "max-age=0,no-cache,no-store,must-revalidate", + "vary": "accept-encoding", + "content-type": "application/json;charset=UTF-8", + "content-length": "2968", + "date": "Wed, 10 Jul 2019 15:41:40 GMT", + "connection": "close", + "server": "Apache" + } +} \ No newline at end of file diff --git a/packages/fssalesforce/src/__tests__/fixtures/90e7c164841b0c9820f7b7d09c48c5b9.json b/packages/fssalesforce/src/__tests__/fixtures/90e7c164841b0c9820f7b7d09c48c5b9.json new file mode 100644 index 0000000000..2529556582 --- /dev/null +++ b/packages/fssalesforce/src/__tests__/fixtures/90e7c164841b0c9820f7b7d09c48c5b9.json @@ -0,0 +1,225 @@ +{ + "data": { + "_v": "18.6", + "_type": "category", + "categories": [ + { + "_type": "category", + "categories": [ + { + "_type": "category", + "id": "newarrivals-womens", + "image": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dw2c996310/images/slot/sub_banners/cat-banner-womens-clothing.jpg", + "name": "Womens", + "page_description": "New Arrivals in womens fashionable and stylish Shoes, jackets and all other clothing for unbeatable comfort day in, day out. Practical and fashionable styles wherever the occasion.", + "page_title": "New Arrivals in Women's Footwear, Outerwear, Clothing & Accessories", + "parent_category_id": "newarrivals", + "c_enableCompare": false, + "c_showInMenu": true, + "c_slotBannerImage": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dw48eed0de/images/slot/landing/cat-landing-slotbottom-womens-clothing.jpg" + }, + { + "_type": "category", + "id": "newarrivals-mens", + "image": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dwe3aaa4ae/images/slot/sub_banners/cat-banner-mens-clothing.jpg", + "name": "Mens", + "page_description": "New Arrivals in Mens jackets and clothing for unbeatable comfort day in, day out. Practical, easy-to-wear styles wherever you're headed.", + "page_title": "New Arrivals in Men's Clothing, Suits & Accessories", + "parent_category_id": "newarrivals", + "c_enableCompare": false, + "c_showInMenu": true, + "c_slotBannerImage": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dw663dcfde/images/slot/landing/cat-landing-slotbottom-mens-dressshirts.jpg" + }, + { + "_type": "category", + "id": "newarrivals-electronics", + "image": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dw156354f0/images/slot/sub_banners/cat-banner-electronics.jpg", + "name": "Electronics", + "page_description": "Shop New Arrivals in Electronics including the latest in televisions, digital cameras, camcorders, mp3, ipod, mobil phones, GPS & gaming at Salesforce Commerce Cloud.", + "page_title": "Shop New Arrivals in Electronics Including Televisions, Digital Cameras, iPods & More", + "parent_category_id": "newarrivals", + "c_enableCompare": false, + "c_showInMenu": true, + "c_slotBannerImage": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dw5499218b/images/slot/landing/cat-landing-slotbottom-electronics.jpg" + } + ], + "id": "newarrivals", + "name": "New Arrivals", + "page_description": "Shop all new arrivals including women and mens clothing, jewelry, accessories, suits & more at Salesforce Commerce Cloud", + "page_title": "Women and Mens New Arrivals in Clothing, Jewelry, Accessories & More", + "parent_category_id": "root", + "c_enableCompare": false, + "c_headerMenuBanner": "\"New", + "c_headerMenuOrientation": "Vertical", + "c_showInMenu": true + }, + { + "_type": "category", + "description": "Test Category created at 1484904194896", + "id": "test_category_1484904194896", + "image": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/en_US/v1522823584032/demandware.jpg", + "name": "test category 1", + "page_description": "page description", + "page_keywords": "page keywords", + "page_title": "page title", + "parent_category_id": "root", + "thumbnail": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/en_US/v1522823584032/demandware-thumb.jpg" + }, + { + "_type": "category", + "categories": [ + { + "_type": "category", + "id": "mens-clothing", + "image": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dwe3aaa4ae/images/slot/sub_banners/cat-banner-mens-clothing.jpg", + "name": "Clothing", + "page_description": "Shop Men's Clothing. Relaxed, timeless classics you can rely on; from denim to corduroys and sweaters to shirts. Huge range of contemporary colours and eco-aware designs: great casualwear at Salesforce Commerce Cloud.", + "page_keywords": "mens outerwear, mens tops, mens bottoms", + "page_title": "Mens Clothing Including Suits, Tops, Bottoms & More", + "parent_category_id": "mens", + "c_enableCompare": false, + "c_showInMenu": true + }, + { + "_type": "category", + "id": "mens-accessories", + "image": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dw24d63815/images/slot/sub_banners/cat-banner-mens-accessories.jpg", + "name": "Accessories", + "page_description": "Shop mens accessories including belts, wallets. gloves, hats, watches, luggage & more at Salesforce Commerce Cloud.", + "page_keywords": "mens accessories, mens belts, mens wallets, mens gloves, mens hats, sunglasses, watches, gloves, hats, scarves, luggage, travel bag, backpack, book bag, laptop bag, hiking backpack, mens socks, man socks", + "page_title": "Men's Accessories Belts, Wallets. Gloves, Hats, Watches, Luggage & More", + "parent_category_id": "mens", + "c_enableCompare": false, + "c_showInMenu": true, + "c_slotBannerImage": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dwd23ca897/images/slot/landing/cat-landing-slotbottom-mens-accessories.jpg" + } + ], + "id": "mens", + "name": "Mens", + "page_description": "Men's range. Hard-wearing boots, jackets and clothing for unbeatable comfort day in, day out. Practical, easy-to-wear styles wherever you're headed.", + "page_keywords": "mens boots, mens shoes, mens clothing, mens apparel, mens jackets", + "page_title": "Men's Footwear, Outerwear, Clothing & Accessories", + "parent_category_id": "root", + "c_enableCompare": true, + "c_headerMenuBanner": "\"Men's", + "c_headerMenuOrientation": "Horizontal", + "c_showInMenu": true, + "c_slotBannerImage": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dwe202466e/images/slot/landing/cat-landing-slotbanner-mens.jpg" + }, + { + "_type": "category", + "categories": [ + { + "_type": "category", + "id": "electronics-televisions", + "image": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dw9dec64f8/images/slot/sub_banners/cat-banner-electronics-tv.jpg", + "name": "Televisions", + "page_description": "Shop the latest Televisions including LCD, Plasma, Flat Screens, Projection including all the top brands, makes and models at Salesforce Commerce Cloud.", + "page_keywords": "televisions, tvs, LCD, plasma, flat screen, high definition, HDTV, projection", + "page_title": "Televisions Including LCD, Plasma & More in High Definition", + "parent_category_id": "electronics", + "c_enableCompare": true, + "c_showInMenu": true, + "c_slotBannerImage": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dwda11db7e/images/slot/landing/cat-landing-tv.jpg" + }, + { + "_type": "category", + "id": "electronics-digital-cameras", + "image": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dw94ac3f84/images/slot/sub_banners/cat-banner-electronics-camera.jpg", + "name": "Digital Cameras", + "page_description": "Shop the latest digital cameras from all the top brands, makes and models at Salesforce Commerce Cloud.", + "page_keywords": "cameras, digital camerasm point and shoot, slr", + "page_title": "Digital Cameras", + "parent_category_id": "electronics", + "c_enableCompare": true, + "c_showInMenu": true, + "c_slotBannerImage": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dw4454badb/images/slot/landing/cat-landing-camera.jpg" + }, + { + "_type": "category", + "id": "electronics-digital-media-players", + "image": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dwbcd3a2ea/images/slot/sub_banners/cat-banner-electronics-mp3.jpg", + "name": "iPod & MP3 Players", + "page_description": "Shop Digital Media Players including iPods, Creative Zen, Sony & the latest from all the top brands, makes and models at Salesforce Commerce Cloud.", + "page_keywords": "mp3, iPods, mp3 players", + "page_title": "iPod & MP3 Digital Media Players", + "parent_category_id": "electronics", + "c_enableCompare": true, + "c_showInMenu": true, + "c_slotBannerImage": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dw0b1c460c/images/slot/landing/cat-landing-mp3.jpg" + }, + { + "_type": "category", + "id": "electronics-gps-units", + "image": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dw01136d4d/images/slot/sub_banners/cat-banner-electronics-gps.jpg", + "name": "GPS Navigation", + "page_description": "Shop the latest in GPS units from Garmin and Tom Tom along with other brands, makes and models at Salesforce Commerce Cloud.", + "page_keywords": "gps, gps units, garmin, tom tom", + "page_title": "GPS Units", + "parent_category_id": "electronics", + "c_enableCompare": true, + "c_showInMenu": true, + "c_slotBannerImage": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dw70f656ee/images/slot/landing/cat-landing-gps.jpg" + }, + { + "_type": "category", + "id": "electronics-gaming", + "image": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/default/dw156354f0/images/slot/sub_banners/cat-banner-electronics.jpg", + "name": "Gaming", + "page_description": "Shop games and game consoles from Xbox, Xbox360, Playstation 2, Playstation 3, Game Cube, Wii, Playstation Portable and Nintento DS at Salesforce Commerce Cloud.", + "page_keywords": "gaming, xbox, xbox360, ps3, ps2, playstaion 3, psp, game cube, wii, nintendo, nintendo ds", + "page_title": "Gaming", + "parent_category_id": "electronics", + "c_enableCompare": true, + "c_showInMenu": true, + "c_slotBannerImage": "https://demo-ocapi.demandware.net/on/demandware.static/-/Sites-storefront-catalog-en/en_US/v1522823584032/images/slot/landing/cat-landing-gaming.jpg" + } + ], + "id": "electronics", + "name": "Electronics", + "page_description": "Shop Electronics including the latest in televisions, digital cameras, camcorders, mp3, ipod, mobil phones, GPS & gaming at Salesforce Commerce Cloud", + "page_keywords": "televisions, digital cameras, camcorders, mp3, ipod, mobil phones, GPS, gaming", + "page_title": "Shop Electronics Including Televisions, Digital Cameras, iPods & More", + "parent_category_id": "root", + "c_enableCompare": true, + "c_headerMenuBanner": "\"Electronics", + "c_headerMenuOrientation": "Vertical", + "c_showInMenu": true + }, + { + "_type": "category", + "id": "gift-certificates", + "name": "Gift Certificates", + "parent_category_id": "root", + "c_alternativeUrl": "https://demo-ocapi.demandware.net/s/SiteGenesis/giftcertpurchase?lang=en_US", + "c_enableCompare": false, + "c_showInMenu": true + }, + { + "_type": "category", + "id": "top-seller", + "name": "Top Sellers", + "parent_category_id": "root", + "c_alternativeUrl": "https://demo-ocapi.demandware.net/s/SiteGenesis/search?cgid=root&srule=top-sellers&lang=en_US", + "c_enableCompare": false, + "c_showInMenu": true + } + ], + "id": "root", + "name": "Storefront Catalog - EN" + }, + "status": 200, + "headers": { + "accept-ranges": "bytes", + "x-dw-request-base-id": "TD05mzQHJl2WAAAK", + "allow": "GET,HEAD,OPTIONS", + "x-dw-version-status": "deprecated", + "cache-control": "max-age=0,no-cache,no-store,must-revalidate", + "vary": "accept-encoding", + "content-type": "application/json;charset=UTF-8", + "content-length": "11190", + "date": "Wed, 10 Jul 2019 15:41:40 GMT", + "connection": "close", + "server": "Apache" + } +} \ No newline at end of file diff --git a/packages/fssalesforce/src/classes/ProductCatalogDataSource.ts b/packages/fssalesforce/src/classes/ProductCatalogDataSource.ts index 72c12408b7..d2a1d5b683 100644 --- a/packages/fssalesforce/src/classes/ProductCatalogDataSource.ts +++ b/packages/fssalesforce/src/classes/ProductCatalogDataSource.ts @@ -23,7 +23,8 @@ export class DemandwareProductCatalogAndSearchDataSource extends DemandwareBase id?: string, query?: FSCommerceTypes.CategoryQuery ): Promise { - let _qs = qs.stringify(query); + const updatedQuery = { ...query, levels: 2 }; + let _qs = qs.stringify(updatedQuery); _qs = _qs ? '?' + _qs : ''; const response = await this.client.get(