Merge pull request #23 from drupal-graphql/load-response-doc-refactor

Load response doc refactor

Author: duartegarin

src/Plugin/GraphQL/Fields/SearchAPIFacets.php

@@ -24,8 +24,22 @@ class SearchAPIFacets extends FieldPluginBase {
    */
   public function resolveValues($value, array $args, ResolveContext $context, ResolveInfo $info) {
     if (isset($value['facets'])) {
-      foreach ($value['facets'] as $facet) {
-        yield $facet;
+      foreach ($value['facets'] as $facet_id => $facet) {
+
+        // Prepare a facet response.
+        $response_facet['type'] = 'SearchAPIFacet';
+        $response_facet['name'] = $facet_id;
+
+        // Loop through the facet values and load them into the response.
+        foreach ($facet as $facet_value) {
+          $response_facet_value = [];
+          $response_facet_value['type'] = 'SearchAPIFacetValue';
+          $response_facet_value['filter'] = trim($facet_value['filter'], '"');
+          $response_facet_value['count'] = $facet_value['count'];
+          $response_facet['solrFacetValues'][] = $response_facet_value;
+        }
+
+        yield $response_facet;
       }
     }
   }

src/Plugin/GraphQL/Fields/SearchAPIField.php

@@ -26,17 +26,37 @@ public function resolveValues($value, array $args, ResolveContext $context, Reso
     $derivative_id = $this->getDerivativeId();
 
     // Not all documents have values for all fields so we need to check.
-    if (isset($value[$derivative_id])) {
+    if (isset($value['item'][$derivative_id])) {
 
-      // Checking if the value of this derivative is a list or single value so
-      // we can parse accordingly.
-      if (is_array($value[$derivative_id])) {
-        foreach ($value[$derivative_id] as $value_item) {
-          yield $value_item;
+      $field = $value['item'][$derivative_id];
+
+      $field_values = $field->getValues();
+      $field_type = $field->getType();
+      $value = NULL;
+
+      // Fulltext multivalue fields have a different format.
+      if ($field_type == 'text') {
+        // Create a new array with text values instead of objects.
+        foreach ($field_values as $field_value) {
+          $value[] = $field_value->getText();
         }
       }
+      // For other types of fields we can just grab contents from the array.
       else {
-        yield $value[$derivative_id];
+        $value = $field_values;
+      }
+      // Load the value in the response document.
+      if (!is_null($value)) {
+        // Checking if the value of this derivative is a list or single value so
+        // we can parse accordingly.
+        if (is_array($value)) {
+          foreach ($value as $value_item) {
+            yield $value_item;
+          }
+        }
+        else {
+          yield $value;
+        }
       }
     }
   }

src/Plugin/GraphQL/Fields/SearchAPISearch.php

@@ -341,111 +341,20 @@ private function getSearchResponse($results) {
     // Loop through each item in the result set.
     foreach ($result_items as $id => &$item) {
       // Load the response document into the search response array.
-      $search_response['SearchAPIDocument'][] = $this->loadResponseDocument($item);
+      $document['item'] = $item->getFields();
+      $document['index_id'] = $this->index->id();;
+      $document['type'] = str_replace("_", "", ucwords($this->index->id() . "Doc", '_'));
+
+      $search_response['SearchAPIDocument'][] = $document;
     }
 
     // Extract facets from the result set.
     $facets = $results->getExtraData('search_api_facets');
 
     if ($facets) {
-      // Loop through each facet in the result set.
-      foreach ($facets as $facet_id => $facet_values) {
-        // Load the response facet in the response array.
-        $search_response['facets'][] = $this->loadResponseFacet($facet_id, $facet_values);
-      }
+      $search_response['facets'] = $facets;
     }
     return $search_response;
   }
 
-  /**
-   * Loads a Facet into a structured response array.
-   *
-   * @facet_id
-   *  The id of the facet to be added.
-   * @facet_values
-   *  The values for the facet to be added.
-   */
-  private function loadResponseFacet($facet_id, $facet_values) {
-
-    // Initialise variables.
-    $response_facet = [];
-
-    // Config the facet response.
-    $response_facet['type'] = 'SearchAPIFacet';
-    $response_facet['name'] = $facet_id;
-
-    // Loop through the facet values and load them into the response.
-    foreach ($facet_values as $facet_value) {
-      $response_facet_value = [];
-      $response_facet_value['type'] = 'SearchAPIFacetValue';
-      $response_facet_value['filter'] = trim($facet_value['filter'], '"');
-      $response_facet_value['count'] = $facet_value['count'];
-      $response_facet['solrFacetValues'][] = $response_facet_value;
-    }
-
-    return $response_facet;
-  }
-
-  /**
-   * Loads a Document into a structured response array.
-   *
-   * @result_item
-   *  The result item that contains the document information.
-   */
-  private function loadResponseDocument($result_item) {
-
-    // Initialise a response document.
-    $response_document = [];
-
-    // Loop through all fields in the result item.
-    foreach ($result_item->getFields() as $field_id => $field) {
-
-      // Initialise a values.
-      $value = NULL;
-      $field_values = $field->getValues();
-      $field_type = $field->getType();
-      $field_cardinality = count($field_values);
-
-      // Fulltext multivalue fields have a different format.
-      if ($field_type == 'text') {
-        // Multivalue fields.
-        if ($field_cardinality > 1) {
-          // Create a new array with text values instead of objects.
-          foreach ($field_values as $field_value) {
-            $value[] = $field_value->getText();
-          }
-        }
-        // Singlevalue fields.
-        elseif (!empty($field_values)) {
-          $value = $field_values[0]->getText();
-        }
-      }
-      // For other types of fields we can just grab contents from the array.
-      else {
-        // Multivalue fields.
-        if ($field_cardinality > 1) {
-          $value = $field_values;
-        }
-        // Single value fields.
-        else {
-          if (!empty($field_values)) {
-            $value = $field_values[0];
-          }
-        }
-      }
-      // Load the value in the response document.
-      if (!empty($value)) {
-        $response_document[$field_id] = $value;
-      }
-    }
-
-    // Set the index id in the response document.
-    $response_document['index_id'] = $this->index->id();
-
-    // Append the response to the correct index document.
-    $response_document['type'] = str_replace("_", "", ucwords($this->index->id() . "Doc", '_'));
-
-    return $response_document;
-  }
-
 }