Convert aggregation fields to format expected by aggregations model

Author: jazairi

app/graphql/types/query_type.rb

@@ -123,10 +123,20 @@ def highlight_requested?
       context[:tracers].first.log_data[:used_fields].include?('Record.highlight')
     end
 
+    # Convert aggregation fields to format expected by aggregations model.
+    # We believe format was set to `content_format` because when TIMDEX was a rest REST API, the
+    # format parameter would likely have triggered the format feature (i.e. format html, format
+    # json, format xml, etc). We are retaining this out of caution.
+    def requested_aggregation_field(field_name)
+      return :content_format if field_name == 'format'
+
+      field_name.underscore.to_sym
+    end
+
     def requested_aggregations
       used_fields = context[:tracers].first.log_data[:used_fields]
       used_fields.select { |field| field.start_with?('Aggregations.') }
-                 .map { |field| field.sub('Aggregations.', '').to_sym }
+                 .map { |field| requested_aggregation_field(field.sub('Aggregations.', '')) }
     end
 
     # Long-term, we will probably want to define these fields discretely in RecordType. However, this might end up

test/controllers/graphql_controller_test.rb

@@ -1062,4 +1062,82 @@ class GraphqlControllerTest < ActionDispatch::IntegrationTest
       end
     end
   end
+
+  test 'graphql search with camelCase aggregation fields (accessToFiles, contentType)' do
+    VCR.use_cassette('opensearch init') do
+      VCR.use_cassette('graphql search data analytics') do
+        post '/graphql', params: { query: '{
+                                    search(searchterm: "data analytics") {
+                                      aggregations {
+                                        accessToFiles {
+                                          key
+                                          docCount
+                                        }
+                                        contentType {
+                                          key
+                                          docCount
+                                        }
+                                      }
+                                    }
+                                  }' }
+        assert_equal(200, response.status)
+        json = JSON.parse(response.body)
+        aggs = json['data']['search']['aggregations']
+
+        # Verify aggregations are present when requested
+        assert_not_nil aggs
+        assert_not_nil aggs['accessToFiles']
+        assert_not_nil aggs['contentType']
+
+        # Verify structure
+        assert aggs['accessToFiles'].is_a?(Array)
+        assert aggs['contentType'].is_a?(Array)
+      end
+    end
+  end
+
+  test 'graphql search with format aggregation (should map to content_format)' do
+    VCR.use_cassette('opensearch init') do
+      VCR.use_cassette('graphql search data analytics') do
+        post '/graphql', params: { query: '{
+                                    search(searchterm: "data analytics") {
+                                      aggregations {
+                                        format {
+                                          key
+                                          docCount
+                                        }
+                                      }
+                                    }
+                                  }' }
+        assert_equal(200, response.status)
+        json = JSON.parse(response.body)
+        aggs = json['data']['search']['aggregations']
+
+        # Verify format aggregation is present and populated
+        assert_not_nil aggs
+        assert_not_nil aggs['format']
+        assert aggs['format'].is_a?(Array)
+      end
+    end
+  end
+
+  test 'graphql search without aggregations excludes them from OpenSearch query' do
+    VCR.use_cassette('opensearch init') do
+      VCR.use_cassette('graphql search data analytics') do
+        post '/graphql', params: { query: '{
+                                    search(searchterm: "data analytics") {
+                                      hits
+                                      records {
+                                        title
+                                      }
+                                    }
+                                  }' }
+        assert_equal(200, response.status)
+        json = JSON.parse(response.body)
+
+        # Verify aggregations field is null when not requested
+        assert_nil json['data']['search']['aggregations']
+      end
+    end
+  end
 end