check if city/industry id valid

app/services/solr_service.rb

 require "rsolr"
 
 class SolrService
-  def initialize(search_keyword)
+  def initialize(search_keyword = {})
     @solr = RSolr.connect(
       url: Settings.solr.connection.server_url,
       read_timeout: Settings.solr.connection.read_timeout,
@@ -56,21 +56,21 @@ class SolrService
   end
 
   def query_by_city
-    city = City.find(@search_keyword)
-    city_name = city.name
+    city = City.find_by(id: @search_keyword)
+    fq_city = city ? "city: #{escape_str(city.name)}" : ""
 
     q = "*:*"
-    fq = "city: #{escape_str(city_name)}"
+    fq = fq_city
 
     send_request(q, fq)
   end
 
   def query_by_industry
-    industry = Industry.find(@search_keyword)
-    industry_name = industry.name
+    industry = Industry.find_by(id: @search_keyword)
+    fq_industry = industry ? "industry: #{escape_str(industry.name)}" : ""
 
     q = "*:*"
-    fq = "industry: #{escape_str(industry_name)}"
+    fq = fq_industry
 
     send_request(q, fq)
   end

lib/tasks/task.rake

@@ -13,15 +13,15 @@ namespace :solr do
   task solr_index: :environment do
     SolrService.new.add_data
 
-    solr_index_data = ActiveSupport::Logger.new("log/solr_service.log")
-    solr_index_data.info "Solr index data succesfully at #{Time.current}"
+    solr_index_logger = ActiveSupport::Logger.new("log/solr_service.log")
+    solr_index_logger.info "Solr index data succesfully at #{Time.current}"
   end
 
   desc "solr delete data"
   task solr_delete: :environment do
     SolrService.new.delete_data
 
-    solr_delete_data = ActiveSupport::Logger.new("log/solr_service.log")
-    solr_delete_data.info "Solr delete all data succesfully at #{Time.current}"
+    solr_delete_logger = ActiveSupport::Logger.new("log/solr_service.log")
+    solr_delete_logger.info "Solr delete all data succesfully at #{Time.current}"
   end
 end