change params pass into @search

app/controllers/jobs_controller.rb

@@ -4,7 +4,7 @@ class JobsController < ApplicationController
   before_action :validate_city_industry, only: :index
   before_action :validate_city_industry, only: :index
 
 
   def index
   def index
-    @search = params[:search] || params[:city_id] || params[:industry_id] || ":"
+    @search = params
     solr = SolrService.new(@search)
     solr = SolrService.new(@search)
 
 
     if params[:city_id]
     if params[:city_id]

app/services/solr_service.rb

 require "rsolr"
 require "rsolr"
 
 
 class SolrService
 class SolrService
-  def initialize(search_keyword = {})
+  def initialize(params = {search: "*:*"})
     @solr = RSolr.connect(
     @solr = RSolr.connect(
       url: Settings.solr.connection.server_url,
       url: Settings.solr.connection.server_url,
       read_timeout: Settings.solr.connection.read_timeout,
       read_timeout: Settings.solr.connection.read_timeout,
@@ -9,7 +9,7 @@ class SolrService
       retry_503: Settings.solr.connection.retry_503
       retry_503: Settings.solr.connection.retry_503
     )
     )
 
 
-    @search_keyword = search_keyword
+    @params = params
   end
   end
 
 
   def add_data
   def add_data
@@ -49,14 +49,14 @@ class SolrService
   end
   end
 
 
   def query_all
   def query_all
-    q = "*#{@search_keyword}*"
+    q = "*#{@params[:search]}*"
     fq = ""
     fq = ""
 
 
     send_request(q, fq)
     send_request(q, fq)
   end
   end
 
 
   def query_by_city
   def query_by_city
-    city = City.find_by(id: @search_keyword)
+    city = City.find_by(id: @params[:city_id])
     return { "numFound": 0, "docs": [] } unless city
     return { "numFound": 0, "docs": [] } unless city
 
 
     city_name = city.name
     city_name = city.name
@@ -69,7 +69,7 @@ class SolrService
   end
   end
 
 
   def query_by_industry
   def query_by_industry
-    industry = Industry.find_by(id: @search_keyword)
+    industry = Industry.find_by(id: @params[:industry_id])
     return { "numFound": 0, "docs": [] } unless industry
     return { "numFound": 0, "docs": [] } unless industry
 
 
     industry_name = industry.name
     industry_name = industry.name