Address code review feedback

Author: jazairi

app/controllers/search_controller.rb

@@ -193,7 +193,7 @@ def query_timdex(query)
       raw = if Feature.enabled?(:geodata)
               execute_geospatial_query(query)
             else
-              TimdexBase::Client.query(base_query_for_mode, variables: query)
+              TimdexBase::Client.query(TimdexSearch::BaseQuery, variables: query)
             end
 
       # The response type is a GraphQL::Client::Response, which is not directly serializable, so we
@@ -226,16 +226,10 @@ def execute_geospatial_query(query)
     elsif query['geodistance'] == 'true'
       TimdexBase::Client.query(TimdexSearch::GeodistanceQuery, variables: query)
     else
-      TimdexBase::Client.query(base_query_for_mode, variables: query)
+      TimdexBase::Client.query(TimdexSearch::BaseQuery, variables: query)
     end
   end
 
-  def base_query_for_mode
-    return TimdexSearch::BaseQuery unless Feature.enabled?(:timdex_semantic_search)
-
-    TimdexSearch::SemanticBaseQuery
-  end
-
   def extract_errors(response)
     response[:errors]['data'] if response.is_a?(Hash) && response.key?(:errors) && response[:errors].key?('data')
   end

app/models/timdex_search.rb

@@ -3,148 +3,6 @@
 
 class TimdexSearch < TimdexBase
   BaseQuery = TimdexBase::Client.parse <<-GRAPHQL
-    query(
-      $q: String
-      $citation: String
-      $contributors: String
-      $fundingInformation: String
-      $identifiers: String
-      $locations: String
-      $subjects: String
-      $title: String
-      $index: String
-      $from: String
-      $booleanType: String
-      $fulltext: Boolean
-      $perPage: Int
-      $accessToFilesFilter: [String!]
-      $contentTypeFilter: [String!]
-      $contributorsFilter: [String!]
-      $formatFilter: [String!]
-      $languagesFilter: [String!]
-      $literaryFormFilter: String
-      $placesFilter: [String!]
-      $sourceFilter: [String!]
-      $subjectsFilter: [String!]
-    ) {
-      search(
-        searchterm: $q
-        citation: $citation
-        contributors: $contributors
-        fundingInformation: $fundingInformation
-        identifiers: $identifiers
-        locations: $locations
-        subjects: $subjects
-        title: $title
-        index: $index
-        from: $from
-        booleanType: $booleanType
-        fulltext: $fulltext
-        perPage: $perPage
-        accessToFilesFilter: $accessToFilesFilter
-        contentTypeFilter: $contentTypeFilter
-        contributorsFilter: $contributorsFilter
-        formatFilter: $formatFilter
-        languagesFilter: $languagesFilter
-        literaryFormFilter: $literaryFormFilter
-        placesFilter: $placesFilter
-        sourceFilter: $sourceFilter
-        subjectsFilter: $subjectsFilter
-      ) {
-        hits
-        records {
-          timdexRecordId
-          identifiers {
-            kind
-            value
-          }
-          title
-          source
-          contentType
-          contributors {
-            kind
-            value
-          }
-          publicationInformation
-          dates {
-            kind
-            value
-            range {
-              gte
-              lte
-            }
-          }
-          links {
-            kind
-            restrictions
-            text
-            url
-          }
-          notes {
-            kind
-            value
-          }
-          highlight {
-            matchedField
-            matchedPhrases
-          }
-          provider
-          rights {
-            kind
-            description
-            uri
-          }
-          sourceLink
-          summary
-          subjects {
-            kind
-            value
-          }
-          citation
-        }
-        aggregations {
-          accessToFiles {
-            key
-            docCount
-          }
-          contentType {
-            key
-            docCount
-          }
-          contributors {
-            key
-            docCount
-          }
-          format {
-            key
-            docCount
-          }
-          languages {
-            key
-            docCount
-          }
-          literaryForm {
-            key
-            docCount
-          }
-          places {
-            key
-            docCount
-          }
-          source {
-            key
-            docCount
-          }
-          subjects {
-            key
-            docCount
-          }
-        }
-      }
-    }
-  GRAPHQL
-
-  SemanticBaseQuery = TimdexBase::Client.parse <<-GRAPHQL
     query(
       $q: String
       $citation: String

test/controllers/search_controller_test.rb

@@ -1220,26 +1220,4 @@ def source_filter_count(controller)
     # Should not be redirected to Turnstile (doesn't hit SearchController)
     assert_response :success
   end
-
-  test 'uses BaseQuery when semantic search feature is disabled' do
-    # When the feature flag is not enabled, base_query_for_mode returns BaseQuery (default tab is 'all')
-    mock_primo_search_all_tab
-    mock_timdex_search_all_tab
-
-    get '/results?q=test'
-
-    assert_response :success
-  end
-
-  test 'uses SemanticBaseQuery when semantic search feature is enabled' do
-    # When the feature flag is enabled, base_query_for_mode returns SemanticBaseQuery (default tab is 'all')
-    ClimateControl.modify FEATURE_TIMDEX_SEMANTIC_SEARCH: 'true' do
-      mock_primo_search_all_tab
-      mock_timdex_search_all_tab
-
-      get '/results?q=test'
-
-      assert_response :success
-    end
-  end
 end