Skip to content

CIF-1226 - Update Product Filters in Components for Magento 2.3.4 Schema #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 5, 2020
Merged

CIF-1226 - Update Product Filters in Components for Magento 2.3.4 Schema #186

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f94c8d9
CIF-1226 - Update Product Filters in Components for Magento 2.3.4 Schema
herzog31 Jan 30, 2020
db27d53
Merge branch 'master' of github.com:adobe/aem-core-cif-components int…
herzog31 Feb 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bundles/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@
<dependency>
<groupId>com.adobe.commerce.cif</groupId>
<artifactId>magento-graphql</artifactId>
<version>4.0.0-magento233</version>
<version>5.0.0-magento234</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
8 changes: 4 additions & 4 deletions ...va/com/adobe/cq/commerce/core/components/internal/models/v1/product/ProductRetriever.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
import com.adobe.cq.commerce.core.components.client.MagentoGraphqlClient;
import com.adobe.cq.commerce.core.components.models.retriever.AbstractProductRetriever;
import com.adobe.cq.commerce.graphql.client.GraphqlResponse;
import com.adobe.cq.commerce.magento.graphql.FilterTypeInput;
import com.adobe.cq.commerce.magento.graphql.FilterEqualTypeInput;
import com.adobe.cq.commerce.magento.graphql.Operations;
import com.adobe.cq.commerce.magento.graphql.ProductFilterInput;
import com.adobe.cq.commerce.magento.graphql.ProductAttributeFilterInput;
import com.adobe.cq.commerce.magento.graphql.ProductInterface;
import com.adobe.cq.commerce.magento.graphql.ProductInterfaceQueryDefinition;
import com.adobe.cq.commerce.magento.graphql.ProductPricesQueryDefinition;
Expand Down Expand Up @@ -60,8 +60,8 @@ protected void populate() {
@Override
protected String generateQuery(String slug) {
// Override the method here to first use a slug instead of SKU and also add the store config query
FilterTypeInput input = new FilterTypeInput().setEq(slug);
ProductFilterInput filter = new ProductFilterInput().setUrlKey(input);
FilterEqualTypeInput slugFilter = new FilterEqualTypeInput().setEq(slug);
ProductAttributeFilterInput filter = new ProductAttributeFilterInput().setUrlKey(slugFilter);
QueryQuery.ProductsArgumentsDefinition searchArgs = s -> s.filter(filter);

// GraphQL query
Expand Down
8 changes: 4 additions & 4 deletions ...commerce/core/components/internal/models/v1/relatedproducts/RelatedProductsRetriever.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
import com.adobe.cq.commerce.core.components.client.MagentoGraphqlClient;
import com.adobe.cq.commerce.core.components.models.retriever.AbstractProductsRetriever;
import com.adobe.cq.commerce.magento.graphql.ConfigurableProductQueryDefinition;
import com.adobe.cq.commerce.magento.graphql.FilterTypeInput;
import com.adobe.cq.commerce.magento.graphql.FilterEqualTypeInput;
import com.adobe.cq.commerce.magento.graphql.Operations;
import com.adobe.cq.commerce.magento.graphql.ProductFilterInput;
import com.adobe.cq.commerce.magento.graphql.ProductAttributeFilterInput;
import com.adobe.cq.commerce.magento.graphql.ProductInterface;
import com.adobe.cq.commerce.magento.graphql.ProductInterfaceQueryDefinition;
import com.adobe.cq.commerce.magento.graphql.ProductPricesQueryDefinition;
Expand Down Expand Up @@ -61,8 +61,8 @@ static enum ProductIdType {

@Override
protected String generateQuery(List<String> identifiers) {
FilterTypeInput input = new FilterTypeInput().setEq(identifiers.get(0));
ProductFilterInput filter = new ProductFilterInput();
FilterEqualTypeInput input = new FilterEqualTypeInput().setEq(identifiers.get(0));
ProductAttributeFilterInput filter = new ProductAttributeFilterInput();
if (ProductIdType.SKU.equals(productIdType)) {
filter.setSku(input);
} else {
Expand Down
8 changes: 4 additions & 4 deletions ...java/com/adobe/cq/commerce/core/components/models/retriever/AbstractProductRetriever.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

import com.adobe.cq.commerce.core.components.client.MagentoGraphqlClient;
import com.adobe.cq.commerce.graphql.client.GraphqlResponse;
import com.adobe.cq.commerce.magento.graphql.FilterTypeInput;
import com.adobe.cq.commerce.magento.graphql.FilterEqualTypeInput;
import com.adobe.cq.commerce.magento.graphql.Operations;
import com.adobe.cq.commerce.magento.graphql.ProductFilterInput;
import com.adobe.cq.commerce.magento.graphql.ProductAttributeFilterInput;
import com.adobe.cq.commerce.magento.graphql.ProductInterface;
import com.adobe.cq.commerce.magento.graphql.ProductInterfaceQuery;
import com.adobe.cq.commerce.magento.graphql.ProductInterfaceQueryDefinition;
Expand Down Expand Up @@ -148,8 +148,8 @@ public void extendVariantQueryWith(Consumer<SimpleProductQuery> variantQueryHook
* @return GraphQL query as string
*/
protected String generateQuery(String identifier) {
FilterTypeInput input = new FilterTypeInput().setEq(identifier);
ProductFilterInput filter = new ProductFilterInput().setSku(input);
FilterEqualTypeInput skuFilter = new FilterEqualTypeInput().setEq(identifier);
ProductAttributeFilterInput filter = new ProductAttributeFilterInput().setSku(skuFilter);
QueryQuery.ProductsArgumentsDefinition searchArgs = s -> s.filter(filter);

ProductsQueryDefinition queryArgs = q -> q.items(generateProductQuery());
Expand Down
8 changes: 4 additions & 4 deletions ...ava/com/adobe/cq/commerce/core/components/models/retriever/AbstractProductsRetriever.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

import com.adobe.cq.commerce.core.components.client.MagentoGraphqlClient;
import com.adobe.cq.commerce.graphql.client.GraphqlResponse;
import com.adobe.cq.commerce.magento.graphql.FilterTypeInput;
import com.adobe.cq.commerce.magento.graphql.FilterEqualTypeInput;
import com.adobe.cq.commerce.magento.graphql.Operations;
import com.adobe.cq.commerce.magento.graphql.ProductFilterInput;
import com.adobe.cq.commerce.magento.graphql.ProductAttributeFilterInput;
import com.adobe.cq.commerce.magento.graphql.ProductInterface;
import com.adobe.cq.commerce.magento.graphql.ProductInterfaceQuery;
import com.adobe.cq.commerce.magento.graphql.ProductInterfaceQueryDefinition;
Expand Down Expand Up @@ -126,8 +126,8 @@ public void extendVariantQueryWith(Consumer<SimpleProductQuery> variantQueryHook
* @return GraphQL query as string
*/
protected String generateQuery(List<String> identifiers) {
FilterTypeInput input = new FilterTypeInput().setIn(identifiers);
ProductFilterInput filter = new ProductFilterInput().setSku(input);
FilterEqualTypeInput skuFilter = new FilterEqualTypeInput().setIn(identifiers);
ProductAttributeFilterInput filter = new ProductAttributeFilterInput().setSku(skuFilter);
QueryQuery.ProductsArgumentsDefinition searchArgs = s -> s.filter(filter);

ProductsQueryDefinition queryArgs = q -> q.items(generateProductQuery());
Expand Down