Revert "Merge remote-tracking branch 'origin/MC-21694-bucket' into MC-19226"

This reverts commit bb6f080, reversing
changes made to 1a2ae29.

Author: prabhuram93

app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/AttributeOptionProvider.php

@@ -41,11 +41,10 @@ public function __construct(ResourceConnection $resourceConnection)
      * Get option data. Return list of attributes with option data
      *
      * @param array $optionIds
-     * @param array $attributeCodes
      * @return array
      * @throws \Zend_Db_Statement_Exception
      */
-    public function getOptions(array $optionIds, array $attributeCodes = []): array
+    public function getOptions(array $optionIds): array
     {
         if (!$optionIds) {
             return [];
@@ -61,28 +60,20 @@ public function getOptions(array $optionIds, array $attributeCodes = []): array
                     'attribute_label' => 'a.frontend_label',
                 ]
             )
-            ->joinLeft(
+            ->joinInner(
                 ['options' => $this->resourceConnection->getTableName('eav_attribute_option')],
                 'a.attribute_id = options.attribute_id',
                 []
             )
-            ->joinLeft(
+            ->joinInner(
                 ['option_value' => $this->resourceConnection->getTableName('eav_attribute_option_value')],
                 'options.option_id = option_value.option_id',
                 [
                     'option_label' => 'option_value.value',
                     'option_id' => 'option_value.option_id',
                 ]
-            );
-
-        $select->where('option_value.option_id IN (?)', $optionIds);
-
-        if (!empty($attributeCodes)) {
-            $select->orWhere(
-                'a.attribute_code in (?) AND a.frontend_input = \'boolean\'',
-                $attributeCodes
-            );
-        }
+            )
+            ->where('option_value.option_id IN (?)', $optionIds);
 
         return $this->formatResult($select);
     }

app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/Builder/Attribute.php

@@ -139,9 +139,7 @@ private function isBucketEmpty(?BucketInterface $bucket): bool
     private function getAttributeOptions(AggregationInterface $aggregation): array
     {
         $attributeOptionIds = [];
-        $attributes = [];
         foreach ($this->getAttributeBuckets($aggregation) as $bucket) {
-            $attributes[] = \preg_replace('~_bucket$~', '', $bucket->getName());
             $attributeOptionIds[] = \array_map(
                 function (AggregationValueInterface $value) {
                     return $value->getValue();
@@ -154,6 +152,6 @@ function (AggregationValueInterface $value) {
             return [];
         }
 
-        return $this->attributeOptionProvider->getOptions(\array_merge(...$attributeOptionIds), $attributes);
+        return $this->attributeOptionProvider->getOptions(\array_merge(...$attributeOptionIds));
     }
 }