fix method sub_space_params!

app/common/indexed_job.rb

+# frozen_string_literal: true
+
+class IndexedJob
+  attr_accessor :job
+
+  def initialize(job)
+    @job = job
+  end
+
+  def do
+    index_strategy = Sync::Entities::Job.new(job)
+    Sync::Indexer.new.do(index_strategy)
+  end
+end

db/solr/data-config.xml

+<dataConfig>
+	<dataSource type="JdbcDataSource" 
+							driver="com.mysql.jdbc.Driver"
+							batchSize="-1"
+							url="jdbc:mysql://127.0.0.1:3306/hungnt_development" 
+							user="root" 
+							password="Trunghung5055@"/>
+	<document>
+	<entity name="jobs"  
+		pk="id"
+		query="SELECT jobs.*, companies.name AS company_name FROM jobs, companies WHERE jobs.company_id = companies.id">
+		<field column="id" name="id"/>
+		<field column="name" name="name"/>       
+		<field column="company_name" name="company_name"/>       
+		<field column="salary" name="salary"/>       
+		<field column="description" name="description"/>
+		<!-- QUERY INDUSTRIES -->
+		<entity name="industries" 
+			query="SELECT industries.id AS industry_id, industries.name AS industry_name FROM industries, industry_jobs, jobs WHERE jobs.id = industry_jobs.job_id AND industry_jobs.industry_id = industries.id AND jobs.id='${jobs.id}'">
+			<field column="industry_name" name="industries" />
+			<field column="industry_id" name="industry_id" />
+		</entity>
+		<!-- QUERY CITIES -->
+		<entity name="cities" 
+			query="SELECT cities.id AS location_id, cities.name AS location_name FROM cities, city_jobs, jobs WHERE jobs.id = city_jobs.job_id AND city_jobs.city_id = cities.id AND jobs.id='${jobs.id}'">
+			<field column="location_name" name="locations" />
+			<field column="location_id" name="location_id" />
+		</entity>
+	</entity>
+	</document>
+</dataConfig>

lib/service/import_data.rb

@@ -52,8 +52,7 @@ class ImportData
       end
       end
       if record.new_record?
       if record.new_record?
         record.save
         record.save
-        index_strategy = Sync::Entities::Job.new(record)
-        Sync::Indexer.new.do(index_strategy)
+        IndexedJob.new(job).do
       end
       end
     rescue StandardError => e
     rescue StandardError => e
       logger.error "Import_jobs: #{e}"
       logger.error "Import_jobs: #{e}"

lib/solr/searches/query.rb

+# frozen_string_literal: true
+
 module Searches
 module Searches
   class Query
   class Query
     def search(params)
     def search(params)
       solr = connect_solr
       solr = connect_solr
       # Escape input & Convert space to asterisks
       # Escape input & Convert space to asterisks
       data = sub_space_params!(params[:search][:keyword], params[:search][:industry_id], params[:search][:city_id])
       data = sub_space_params!(params[:search][:keyword], params[:search][:industry_id], params[:search][:city_id])
-      query = if [params[:search][:keyword], params[:search][:industry_id], params[:search][:city_id]].all? { |v| v.blank?}
+      query = if [params[:search][:keyword], params[:search][:industry_id], params[:search][:city_id]].all?(&:blank?)
                 '*:*'
                 '*:*'
               else
               else
                 "solr((name: #{data[:keyword]}) OR (company_name: #{data[:keyword]})) AND (industry_id: #{data[:industry_id]}) AND (location_id: #{data[:location_id]})"
                 "solr((name: #{data[:keyword]}) OR (company_name: #{data[:keyword]})) AND (industry_id: #{data[:industry_id]}) AND (location_id: #{data[:location_id]})"
               end
               end
       response = solr.paginate(params[:page], Settings.number_result_search_in_page, 'select', params: { q: query })
       response = solr.paginate(params[:page], Settings.number_result_search_in_page, 'select', params: { q: query })
-      results = Kaminari.paginate_array(response['response']['docs'], total_count: response['response']['numFound']).page(params[:page]).per(Settings.number_result_search_in_page)
+      Kaminari.paginate_array(response['response']['docs'], total_count: response['response']['numFound']).page(params[:page]).per(Settings.number_result_search_in_page)
     end
     end
 
 
     def sub_space_params!(keyword, industry_id, location_id)
     def sub_space_params!(keyword, industry_id, location_id)
       arr_params = {}
       arr_params = {}
-      arr_params[:keyword] = RSolr.solr_escape(keyword)
-      arr_params[:industry_id] = RSolr.solr_escape(industry_id)
-      arr_params[:location_id] = RSolr.solr_escape(location_id)
+      arr_params[:keyword] = RSolr.solr_escape(keyword || '')
+      arr_params[:industry_id] = RSolr.solr_escape(industry_id || '')
+      arr_params[:location_id] = RSolr.solr_escape(location_id || '')
       arr_params.each_value { |val| val.sub!('', '*') if val.blank? }
       arr_params.each_value { |val| val.sub!('', '*') if val.blank? }
     end
     end
 
 

lib/solr/sync/entities/job.rb

@@ -9,9 +9,9 @@ module Sync::Entities
       data[:company_name] = job.company.name
       data[:company_name] = job.company.name
       data[:salary] = job.salary
       data[:salary] = job.salary
       data[:description] = job.description
       data[:description] = job.description
-      data[:industries] = job.industry_jobs.map(&:industry).map(&:name)
+      data[:industries] = job.industries.pluck(:name)
       data[:industry_id] = job.industry_jobs.map(&:industry_id)
       data[:industry_id] = job.industry_jobs.map(&:industry_id)
-      data[:locations] = job.city_jobs.map(&:city).map(&:name)
+      data[:locations] = job.cities.pluck(:name)
       data[:location_id] = job.city_jobs.map(&:city_id)
       data[:location_id] = job.city_jobs.map(&:city_id)
       data
       data
     end
     end

lib/src/crawler_job.rb

@@ -57,8 +57,7 @@ class CrawlerJob < Crawler
     create_industry_relation(data[:industry_name], job)
     create_industry_relation(data[:industry_name], job)
     create_city_relation(data[:city_name], job)
     create_city_relation(data[:city_name], job)
     # Index data to solr
     # Index data to solr
-    index_strategy = Sync::Entities::Job.new(job)
-    Sync::Indexer.new.do(index_strategy)
+    IndexedJob.new(job).do
   rescue StandardError => e
   rescue StandardError => e
     logger.error "Crawler data jobs has error: #{e}"
     logger.error "Crawler data jobs has error: #{e}"
   end
   end