Fix encoding of selectable attributes. (#657)

* Fix encoding of selectable attributes. * Improve unit test. * Improve unit test.
commercetools · Oct 25, 2017 · a39f1df · a39f1df
1 parent 6c7ccca
commit a39f1df
Show file tree

Hide file tree

Showing 2 changed files with 95 additions and 1 deletion.
diff --git a/...ise/framework/viewmodels/content/products/SelectableProductAttributeViewModelFactory.java b/...ise/framework/viewmodels/content/products/SelectableProductAttributeViewModelFactory.java
@@ -128,7 +128,7 @@ private List<String> attributeCombination(final String attributeKey, final Attri
                 })
                 .map(variant -> variant.getAttribute(attributeKey))
                 .filter(Objects::nonNull)
-                .map(attribute -> attributeFormatter.value(AttributeWithProductType.of(attribute, fixedAttribute.getProductTypeRef())))
+                .map(attribute -> attributeFormatter.encodedValue(AttributeWithProductType.of(attribute, fixedAttribute.getProductTypeRef())))
                 .distinct()
                 .collect(toList());
     }

diff --git a/...framework/viewmodels/content/products/SelectableProductAttributeViewModelFactoryTest.java b/...framework/viewmodels/content/products/SelectableProductAttributeViewModelFactoryTest.java
@@ -0,0 +1,94 @@
+package com.commercetools.sunrise.framework.viewmodels.content.products;
+
+import com.commercetools.sunrise.ctp.products.ProductAttributesSettings;
+import com.commercetools.sunrise.framework.viewmodels.formatters.AttributeFormatter;
+import io.sphere.sdk.models.Reference;
+import io.sphere.sdk.products.ProductVariant;
+import io.sphere.sdk.products.attributes.Attribute;
+import io.sphere.sdk.products.attributes.AttributeAccess;
+import io.sphere.sdk.producttypes.ProductType;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static java.util.Collections.singletonList;
+import static java.util.Collections.singletonMap;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/**
+ * Unit tests for {@link SelectableProductAttributeViewModelFactory}.
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class SelectableProductAttributeViewModelFactoryTest  {
+    private static final String STRING_ATTRIBUTE_NAME = "stringAttribute";
+    private static final String NUMBER_ATTRIBUTE_NAME = "numberAttribute";
+    private static final String PRODUCT_TYPE_ID = "productTypeId";
+
+    @Mock
+    private ProductAttributesSettings fakeProductAttributeSettings;
+    @Mock
+    private AttributeFormatter fakeAttributeFormatter;
+    @Mock
+    private ProductAttributeFormSelectableOptionViewModelFactory productAttributeFormSelectableOptionViewModelFactory;
+    @Mock
+    private Reference<ProductType> fakeProductTypeRef;
+
+    @InjectMocks
+    private SelectableProductAttributeViewModelFactory viewModelFactory;
+
+    @Test
+    public void createFromSelectableStringAttributeAndSelectableNumberAttribute() {
+        final String stringValue = "v1";
+        final AttributeWithProductType stringAttributeWithProductType = attributeWithProductType(STRING_ATTRIBUTE_NAME, AttributeAccess.ofString(), stringValue);
+        when(fakeAttributeFormatter.encodedValue(eq(stringAttributeWithProductType))).thenReturn(stringValue);
+
+        final AttributeWithProductType numberAttributeWithProductType = attributeWithProductType(NUMBER_ATTRIBUTE_NAME, AttributeAccess.ofDouble(), 12.0);
+        when(fakeAttributeFormatter.encodedValue(eq(numberAttributeWithProductType))).thenReturn("120");
+
+        mockProductAttributeSettings(STRING_ATTRIBUTE_NAME, NUMBER_ATTRIBUTE_NAME);
+        final ProductVariant productVariant = mockProductVariant(stringAttributeWithProductType, numberAttributeWithProductType);
+        final List<ProductVariant> variants = Collections.singletonList(productVariant);
+
+        final SelectableProductAttributeViewModel attributeViewModel = viewModelFactory.create(variants, stringAttributeWithProductType);
+
+        assertThat(attributeViewModel.getSelectData())
+                .hasSize(1)
+                .containsEntry(stringValue, singletonMap(NUMBER_ATTRIBUTE_NAME, singletonList("120")));
+    }
+
+    private <T> AttributeWithProductType attributeWithProductType(final String name, final AttributeAccess<T> attributeAccess, final T value) {
+        final Attribute attribute = Attribute.of(name, attributeAccess, value);
+        final AttributeWithProductType attributeWithProductType = AttributeWithProductType.of(attribute, fakeProductTypeRef);
+        return attributeWithProductType;
+    }
+
+    private void mockProductAttributeSettings(final String selectablePrimaryAttribute, final String selectableSecondaryAttribute) {
+        when(fakeProductAttributeSettings.primarySelectable()).thenReturn(Arrays.asList(selectablePrimaryAttribute));
+        when(fakeProductAttributeSettings.selectable()).thenReturn(Arrays.asList(selectablePrimaryAttribute, selectableSecondaryAttribute));
+    }
+
+    private ProductVariant mockProductVariant(final AttributeWithProductType... attributeWithProductTypes) {
+        final ProductVariant productVariant = mock(ProductVariant.class);
+
+        final List<Attribute> attributes = Stream.of(attributeWithProductTypes)
+                .map(AttributeWithProductType::getAttribute)
+                .collect(Collectors.toList());
+
+        for (final Attribute attribute : attributes) {
+            when(productVariant.getAttribute(attribute.getName())).thenReturn(attribute);
+        }
+
+        return productVariant;
+    }
+}