Merge pull request #29 from flagbit/fix-select-form-3.0

Cannot save attribute options on select typed attributes
flagbit · Jul 4, 2019 · 1aaaae6 · 1aaaae6
2 parents db270ff + 6a29efa
commit 1aaaae6
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 4 deletions.
diff --git a/CHANGELOG-3.0.md b/CHANGELOG-3.0.md
@@ -1,7 +1,15 @@
+# 3.0.1
+
+## Bug fixes
+
+- Fixes issue saving Akeneo AttributeOptions. [#29][pr29]
+
 # 3.0.0
 
 - Add support for Akeneo 3.0.0.
 
 ## BC breaks
 
 - `Flagbit\Bundle\TableAttributeBundle\Normalizer\StructuredAttributeOptionNormalizer` was deleted. `Flagbit\Bundle\TableAttributeBundle\Normalizer\AttributeOptionNormalizer` is now used for its service.
+
+[pr29]: https://github.com/flagbit/akeneo-table-attribute-bundle/pull/29
diff --git a/spec/Flagbit/Bundle/TableAttributeBundle/Entity/AttributeOptionSpec.php b/spec/Flagbit/Bundle/TableAttributeBundle/Entity/AttributeOptionSpec.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace spec\Flagbit\Bundle\TableAttributeBundle\Entity;
+
+use Akeneo\Pim\Structure\Component\Model\AttributeInterface;
+use Flagbit\Bundle\TableAttributeBundle\AttributeType\TableType;
+use PhpSpec\ObjectBehavior;
+
+class AttributeOptionSpec extends ObjectBehavior
+{
+    function it_is_an_attribute_option_of_a_different_attribute(AttributeInterface $attribute)
+    {
+        $this->setAttribute($attribute);
+        $attribute->getType()->willReturn('foo');
+        $this->isTableAttribute()->shouldReturn(false);
+    }
+
+    function it_is_an_attribute_option_of_a_table_attribute(AttributeInterface $attribute)
+    {
+        $this->setAttribute($attribute);
+        $attribute->getType()->willReturn(TableType::FLAGBIT_CATALOG_TABLE);
+        $this->isTableAttribute()->shouldReturn(true);
+    }
+
+    function it_is_an_attribute_option_without_an_attribute()
+    {
+        $this->isTableAttribute()->shouldReturn(false);
+    }
+}
diff --git a/spec/Flagbit/Bundle/TableAttributeBundle/Normalizer/AttributeOptionNormalizerSpec.php b/spec/Flagbit/Bundle/TableAttributeBundle/Normalizer/AttributeOptionNormalizerSpec.php
@@ -34,10 +34,13 @@ public function it_checks_return_type_array_and_right_values
             'onlyActivatedLocales' => true,
         ];
 
-        $baseNormalizer->normalize($attributeOption, 'array', $activatedLocales)->shouldBeCalled();
+        $baseNormalizer->normalize($attributeOption, 'array', $activatedLocales)
+            ->willReturn([])
+            ->shouldBeCalled();
         $attributeOption->getType()->willReturn('text');
         $attributeOption->getTypeConfig()->willReturn([]);
         $attributeOption->getConstraints()->willReturn($constraints);
+        $attributeOption->isTableAttribute()->willReturn(true);
 
         $normalizedValues = $this->normalize($attributeOption, 'array', $activatedLocales);
 
@@ -51,4 +54,27 @@ public function it_checks_return_type_array_and_right_values
         $normalizedValues->shouldHaveKeyWithValue('type_config', []);
         $normalizedValues->shouldHaveKeyWithValue('constraints', $constraints);
     }
+
+    public function it_checks_return_type_for_default_akeneo_attribute_options
+    (
+        AttributeOption $attributeOption,
+        $baseNormalizer
+    )
+    {
+        $baseNormalizer->normalize($attributeOption, 'array', [])
+            ->willReturn([])
+            ->shouldBeCalled();
+        $attributeOption->getType()->willReturn(null);
+        $attributeOption->getTypeConfig()->willReturn([]);
+        $attributeOption->getConstraints()->willReturn([]);
+        $attributeOption->isTableAttribute()->willReturn(false);
+
+        $normalizedValues = $this->normalize($attributeOption, 'array');
+
+        $normalizedValues->shouldBeArray();
+
+        $normalizedValues->shouldNotHaveKey('type');
+        $normalizedValues->shouldNotHaveKey('type_config');
+        $normalizedValues->shouldNotHaveKey('constraints');
+    }
 }
diff --git a/src/Entity/AttributeOption.php b/src/Entity/AttributeOption.php
@@ -3,6 +3,7 @@
 namespace Flagbit\Bundle\TableAttributeBundle\Entity;
 
 use Akeneo\Pim\Structure\Component\Model\AttributeOption as BaseAttributeOption;
+use Flagbit\Bundle\TableAttributeBundle\AttributeType\TableType;
 
 /**
  * @todo move Table specific columns into an own entity
@@ -71,4 +72,9 @@ public function setTypeConfig($typeConfig)
     {
         $this->typeConfig = $typeConfig;
     }
+
+    public function isTableAttribute() : bool
+    {
+        return null !== $this->attribute && TableType::FLAGBIT_CATALOG_TABLE === $this->attribute->getType();
+    }
 }
diff --git a/src/Normalizer/AttributeOptionNormalizer.php b/src/Normalizer/AttributeOptionNormalizer.php
@@ -2,6 +2,7 @@
 
 namespace Flagbit\Bundle\TableAttributeBundle\Normalizer;
 
+use Flagbit\Bundle\TableAttributeBundle\Entity\AttributeOption;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 class AttributeOptionNormalizer implements NormalizerInterface
@@ -21,9 +22,12 @@ public function normalize($object, $format = null, array $context = [])
     {
         $normalizedValues = $this->baseNormalizer->normalize($object, $format, $context);
 
-        $normalizedValues['type'] = $object->getType();
-        $normalizedValues['type_config'] = $object->getTypeConfig();
-        $normalizedValues['constraints'] = $object->getConstraints();
+        /** @var AttributeOption $object */
+        if ($object->isTableAttribute()) {
+            $normalizedValues['type'] = $object->getType();
+            $normalizedValues['type_config'] = $object->getTypeConfig();
+            $normalizedValues['constraints'] = $object->getConstraints();
+        }
 
         return $normalizedValues;
     }