Add missing Experience Platform Connector events to Core Components

.circleci/config.yml

@@ -182,7 +182,7 @@ jobs:
       - codecov/upload:
           flags: jest
 
-  jest-extension:
+  jest-extension-product-recs:
     docker:
       - image: cimg/node:lts-browsers
     steps:
@@ -216,6 +216,27 @@ jobs:
       - codecov/upload:
           flags: jest
 
+  jest-extension-experience-platform-connector:
+    docker:
+      - image: cimg/node:lts-browsers
+    steps:
+      - checkout
+      - run:
+          name: Provision (Extension)
+          command: |
+            npm install
+          working_directory: ./extensions/experience-platform-connector
+      - run:
+          name: Run Unit Tests (Jest)
+          command: npm run ci
+          working_directory: ./extensions/experience-platform-connector
+      - store_test_results:
+          path: ./extensions/experience-platform-connector/test-results
+      - store_artifacts:
+          path: ./extensions/experience-platform-connector/test-results
+      - codecov/upload:
+          flags: jest
+
   integration-test-655:
     executor: test_executor_655
     environment:
@@ -318,7 +339,11 @@ workflows:
           filters:
             tags:
               only: /.*/
-      - jest-extension:
+      - jest-extension-product-recs:
+          filters:
+            tags:
+              only: /.*/
+      - jest-extension-experience-platform-connector:
           filters:
             tags:
               only: /.*/
@@ -333,7 +358,8 @@ workflows:
             - build-java-8
             - karma
             - jest
-            - jest-extension
+            - jest-extension-product-recs
+            - jest-extension-experience-platform-connector
       - integration-test-cloudready-with-addon:
           context:
             - CIF Artifactory Cloud
@@ -345,7 +371,8 @@ workflows:
             - build-java-8
             - karma
             - jest
-            - jest-extension
+            - jest-extension-product-recs
+            - jest-extension-experience-platform-connector
       - selenium-chrome-655:
           context:
             - CIF Artifactory Cloud
@@ -357,7 +384,8 @@ workflows:
             - build-java-8
             - karma
             - jest
-            - jest-extension
+            - jest-extension-product-recs
+            - jest-extension-experience-platform-connector
       - selenium-chrome-cloudready-with-addon:
           context:
             - CIF Artifactory Cloud
@@ -369,7 +397,8 @@ workflows:
             - build-java-8
             - karma
             - jest
-            - jest-extension
+            - jest-extension-product-recs
+            - jest-extension-experience-platform-connector
       - release:
           context:
             - CIF Artifactory Cloud

bundles/core/src/main/java/com/adobe/cq/commerce/core/components/datalayer/ProductData.java

@@ -31,6 +31,11 @@ default Double getPrice() {
         throw new UnsupportedOperationException();
     }
 
+    @JsonProperty("xdm:discountAmount")
+    default Double getDiscountAmount() {
+        return null;
+    }
+
     @JsonProperty("xdm:currencyCode")
     default String getCurrency() {
         throw new UnsupportedOperationException();

bundles/core/src/main/java/com/adobe/cq/commerce/core/components/datalayer/package-info.java

@@ -13,7 +13,7 @@
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License.
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-@Version("2.0.0")
+@Version("2.1.0")
 package com.adobe.cq.commerce.core.components.datalayer;
 
 import org.osgi.annotation.versioning.Version;

bundles/core/src/main/java/com/adobe/cq/commerce/core/components/internal/datalayer/DataLayerComponent.java

@@ -154,6 +154,11 @@ public Double getDataLayerPrice() {
         return null;
     }
 
+    @JsonIgnore
+    public Double getDataLayerDiscountAmount() {
+        return null;
+    }
+
     @JsonIgnore
     public String getDataLayerCurrency() {
         return null;

bundles/core/src/main/java/com/adobe/cq/commerce/core/components/internal/datalayer/ProductDataImpl.java

@@ -36,6 +36,11 @@ public Double getPrice() {
         return component.getDataLayerPrice();
     }
 
+    @Override
+    public Double getDiscountAmount() {
+        return component.getDataLayerDiscountAmount();
+    }
+
     @Override
     public String getCurrency() {
         return component.getDataLayerCurrency();

bundles/core/src/main/java/com/adobe/cq/commerce/core/components/internal/models/v1/common/ProductListItemImpl.java

@@ -213,6 +213,11 @@ public Double getDataLayerPrice() {
         return this.getPriceRange() != null ? this.getPriceRange().getFinalPrice() : null;
     }
 
+    @Override
+    public Double getDataLayerDiscountAmount() {
+        return this.getPriceRange() != null ? this.getPriceRange().getDiscountAmount() : null;
+    }
+
     @Override
     public String getDataLayerCurrency() {
         return this.getPriceRange() != null ? this.getPriceRange().getCurrency() : null;

bundles/core/src/main/java/com/adobe/cq/commerce/core/components/internal/models/v1/product/GroupItemImpl.java

@@ -17,6 +17,7 @@
 
 import com.adobe.cq.commerce.core.components.models.common.Price;
 import com.adobe.cq.commerce.core.components.models.product.GroupItem;
+import com.adobe.cq.commerce.core.components.storefrontcontext.ProductStorefrontContext;
 
 public class GroupItemImpl implements GroupItem {
 
@@ -25,6 +26,7 @@ public class GroupItemImpl implements GroupItem {
     private Price priceRange;
     private Double defaultQuantity;
     private Boolean virtualProduct;
+    private ProductStorefrontContext context;
 
     @Override
     public String getName() {
@@ -70,4 +72,13 @@ public Boolean isVirtualProduct() {
     public void setVirtualProduct(Boolean virtualProduct) {
         this.virtualProduct = virtualProduct;
     }
+
+    @Override
+    public ProductStorefrontContext getStorefrontContext() {
+        return context;
+    }
+
+    public void setStorefrontContext(ProductStorefrontContext context) {
+        this.context = context;
+    }
 }

bundles/core/src/main/java/com/adobe/cq/commerce/core/components/internal/models/v1/product/ProductImpl.java

@@ -443,6 +443,7 @@ private GroupItem mapGroupedProductItem(com.adobe.cq.commerce.magento.graphql.Gr
         groupedProductItem.setPriceRange(new PriceImpl(product.getPriceRange(), locale));
         groupedProductItem.setDefaultQuantity(item.getQty());
         groupedProductItem.setVirtualProduct(product instanceof VirtualProduct);
+        groupedProductItem.setStorefrontContext(new ProductStorefrontContextImpl(product, this.resource));
 
         return groupedProductItem;
     }

bundles/core/src/main/java/com/adobe/cq/commerce/core/components/internal/models/v1/productteaser/ProductTeaserImpl.java

@@ -306,6 +306,11 @@ public Double getDataLayerPrice() {
         return getPriceRange() != null ? getPriceRange().getFinalPrice() : null;
     }
 
+    @Override
+    public Double getDataLayerDiscountAmount() {
+        return getPriceRange() != null ? getPriceRange().getDiscountAmount() : null;
+    }
+
     @Override
     public String getDataLayerCurrency() {
         return getPriceRange() != null ? getPriceRange().getCurrency() : null;

bundles/core/src/main/java/com/adobe/cq/commerce/core/components/internal/models/v1/searchresults/SearchResultsImpl.java

@@ -17,6 +17,7 @@
 
 import java.util.Collection;
 import java.util.Map;
+import java.util.UUID;
 
 import javax.annotation.Nonnull;
 import javax.annotation.PostConstruct;
@@ -52,6 +53,7 @@ public class SearchResultsImpl extends ProductCollectionImpl implements SearchRe
     static final String RESOURCE_TYPE_V2 = "core/cif/components/commerce/searchresults/v2/searchresults";
 
     private String searchTerm;
+    String searchRequestId = UUID.randomUUID().toString();
 
     @PostConstruct
     protected void initModel() {
@@ -109,11 +111,11 @@ public SearchResultsSet getSearchResultsSet() {
 
     @Override
     public SearchStorefrontContext getSearchStorefrontContext() {
-        return new SearchStorefrontContextImpl(getSearchResultsSet().getSearchOptions(), resource);
+        return new SearchStorefrontContextImpl(getSearchResultsSet().getSearchOptions(), searchRequestId, getId(), resource);
     }
 
     @Override
     public SearchResultsStorefrontContext getSearchResultsStorefrontContext() {
-        return new SearchResultsStorefrontContextImpl(getSearchResultsSet(), resource);
+        return new SearchResultsStorefrontContextImpl(getSearchResultsSet(), searchRequestId, getId(), resource);
     }
 }

bundles/core/src/main/java/com/adobe/cq/commerce/core/components/internal/storefrontcontext/PricingImpl.java

@@ -0,0 +1,43 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2022 Adobe
+ ~
+ ~ Licensed 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 CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package com.adobe.cq.commerce.core.components.internal.storefrontcontext;
+
+import com.adobe.cq.commerce.core.components.storefrontcontext.Pricing;
+import com.adobe.cq.commerce.magento.graphql.ProductInterface;
+
+public class PricingImpl implements Pricing {
+    private final ProductInterface product;
+
+    public PricingImpl(ProductInterface product) {
+        this.product = product;
+    }
+
+    @Override
+    public Double getSpecialPrice() {
+        return product.getPriceRange().getMinimumPrice().getFinalPrice().getValue();
+    }
+
+    @Override
+    public Double getRegularPrice() {
+        return product.getPriceRange().getMinimumPrice().getRegularPrice().getValue();
+    }
+
+    @Override
+    public String getCurrencyCode() {
+        return product.getPriceRange().getMinimumPrice().getFinalPrice().getCurrency().toString();
+    }
+
+}

bundles/core/src/main/java/com/adobe/cq/commerce/core/components/internal/storefrontcontext/ProductStorefrontContextImpl.java

@@ -17,12 +17,15 @@
 
 import org.apache.sling.api.resource.Resource;
 
+import com.adobe.cq.commerce.core.components.storefrontcontext.Pricing;
 import com.adobe.cq.commerce.core.components.storefrontcontext.ProductStorefrontContext;
 import com.adobe.cq.commerce.magento.graphql.ProductInterface;
 
-public class ProductStorefrontContextImpl extends AbstractCommerceStorefrontContext implements ProductStorefrontContext {
+public class ProductStorefrontContextImpl extends AbstractCommerceStorefrontContext
+    implements ProductStorefrontContext {
 
     private final ProductInterface product;
+    private Pricing pricing = null;
 
     public ProductStorefrontContextImpl(ProductInterface product, Resource resource) {
         super(resource);
@@ -43,4 +46,12 @@ public String getSku() {
     public String getName() {
         return product.getName();
     }
+
+    @Override
+    public Pricing getPricing() {
+        if (pricing == null) {
+            pricing = new PricingImpl(product);
+        }
+        return pricing;
+    }
 }

bundles/core/src/main/java/com/adobe/cq/commerce/core/components/internal/storefrontcontext/SearchResultsStorefrontContextImpl.java

@@ -19,34 +19,36 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.sling.api.resource.Resource;
 
 import com.adobe.cq.commerce.core.components.storefrontcontext.SearchFacet;
 import com.adobe.cq.commerce.core.components.storefrontcontext.SearchResultCategory;
 import com.adobe.cq.commerce.core.components.storefrontcontext.SearchResultProduct;
 import com.adobe.cq.commerce.core.components.storefrontcontext.SearchResultSuggestion;
 import com.adobe.cq.commerce.core.components.storefrontcontext.SearchResultsStorefrontContext;
-import com.adobe.cq.commerce.core.search.models.SearchAggregation;
 import com.adobe.cq.commerce.core.search.models.SearchResultsSet;
 
 public class SearchResultsStorefrontContextImpl extends AbstractCommerceStorefrontContext implements SearchResultsStorefrontContext {
 
     private final SearchResultsSet searchResultsSet;
+    private final String unitId;
+    private final String requestId;
 
-    public SearchResultsStorefrontContextImpl(SearchResultsSet searchResultsSet, Resource resource) {
+    public SearchResultsStorefrontContextImpl(SearchResultsSet searchResultsSet, String requestId, String unitId, Resource resource) {
         super(resource);
         this.searchResultsSet = searchResultsSet;
+        this.unitId = unitId;
+        this.requestId = requestId;
     }
 
     @Override
     public String getSearchUnitId() {
-        return StringUtils.EMPTY;
+        return unitId;
     }
 
     @Override
     public String getSearchRequestId() {
-        return StringUtils.EMPTY;
+        return requestId;
     }
 
     @Override
@@ -57,17 +59,6 @@ public List<SearchResultProduct> getProducts() {
 
     @Override
     public List<SearchResultCategory> getCategories() {
-        SearchAggregation searchAggregationOptions = searchResultsSet
-            .getSearchAggregations().stream()
-            .filter(a -> a.getIdentifier().equals("category_id"))
-            .findFirst()
-            .orElse(null);
-
-        if (searchAggregationOptions != null) {
-            return searchAggregationOptions.getOptions().stream()
-                .map(SearchResultCategoryImpl::new).collect(Collectors.toList());
-        }
-
         return Collections.emptyList();
     }
 
@@ -88,6 +79,7 @@ public int getPerPage() {
 
     @Override
     public List<SearchFacet> getFacets() {
+        // TODO: return the facets as we have them available in our result set
         return null;
     }