MAGETWO-67623: Customer Segment - Multiple Select Attribute: MySQL Query Issue

Author: sevos1984

dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Customer/Webapi.php

@@ -70,6 +70,7 @@ class Webapi extends AbstractWebapi implements CustomerInterface
         'default_shipping',
         'addresses',
         'disable_auto_group_change',
+        'custom_attribute',
     ];
 
     /**
@@ -115,6 +116,29 @@ protected function prepareData(Customer $customer)
         unset($data['customer']['password_confirmation']);
         $data = $this->prepareAddressData($data);
         $data = $this->prepareExtensionAttributes($data);
+        $data = $this->prepareCustomAttributes($data);
+        return $data;
+    }
+
+    /**
+     * Prepare Custom Attributes.
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function prepareCustomAttributes(array $data)
+    {
+        if (isset($data['customer']['custom_attribute'])) {
+            $data['customer']['custom_attribute']['attribute_code'] = $data['customer']['custom_attribute']['code'];
+            unset($data['customer']['custom_attribute']['code']);
+            if (is_array($data['customer']['custom_attribute']['value'])) {
+                $data['customer']['custom_attribute']['value'] =
+                    implode(',', $data['customer']['custom_attribute']['value']);
+            }
+            $data['customer']['custom_attributes'][0] = $data['customer']['custom_attribute'];
+            unset($data['customer']['custom_attribute']);
+        }
+
         return $data;
     }