toppage using solr

app/controllers/top_controller.rb

@@ -3,9 +3,17 @@ class TopController < ApplicationController
   before_action :city_industry_list
   before_action :city_industry_list
 
 
   def index
   def index
-    @total_job = Job.count
-    @latest_jobs = Job.sort_by_date(per_page: Job::LATEST_JOBS_LIMIT)
-    @top_cities = City.top_jobs
-    @top_industries = Industry.top_jobs
+    solr = Solr.new(params)
+    @latest_jobs = get_jobs(solr.latest_jobs)
+    @total_job = solr.query_all['response']['numFound']
+    @top_cities = solr.facet_query('city_id')['vietnam'].take(City::TOP_JOB_COUNT)
+    @top_industries = solr.facet_query('industry_id').take(Industry::TOP_JOB_COUNT)
+  end
+
+  private
+
+  def get_jobs(query)
+    jobs_ids = query['response']['docs'].map { |j| j['job_id'] }
+    Job.eager_load(:cities, :cities_jobs, :company).find(jobs_ids)
   end
   end
 end
 end

app/models/job.rb

@@ -14,8 +14,4 @@ class Job < ApplicationRecord
   has_many :apply_jobs, dependent: :destroy
   has_many :apply_jobs, dependent: :destroy
   has_many :favorite_jobs, dependent: :destroy
   has_many :favorite_jobs, dependent: :destroy
   has_many :history_jobs, dependent: :destroy
   has_many :history_jobs, dependent: :destroy
-
-  def self.sort_by_date(page: 1, per_page: 1)
-    includes(:cities, :cities_jobs, :company).order(created_at: :desc).page(page).per(per_page).references(:cities)
-  end
 end
 end

app/services/solr.rb

@@ -10,6 +10,7 @@ class Solr
         {
         {
           job_id: job.id,
           job_id: job.id,
           job_title: job.title,
           job_title: job.title,
+          date_submitted: job.updated_at,
           company_name: job.company.name,
           company_name: job.company.name,
           job_level: job.position,
           job_level: job.position,
           min_salary: job.min_salary,
           min_salary: job.min_salary,
@@ -45,6 +46,15 @@ class Solr
     send_request(q, fq)
     send_request(q, fq)
   end
   end
 
 
+  def latest_jobs
+    facet = nil
+    q = '*:*'
+    fq = ''
+    sort = 'date_submitted asc'
+    rows = Job::LATEST_JOBS_LIMIT
+    send_request(q, fq, facet, sort, rows)
+  end
+
   def query_by_city
   def query_by_city
     city = City.find_by(slug: @params[:city_slug])
     city = City.find_by(slug: @params[:city_slug])
     return { "numFound": 0, "docs": [] } unless city
     return { "numFound": 0, "docs": [] } unless city
@@ -89,19 +99,20 @@ class Solr
     return industry_handle(ids, jobs_count) if facet == 'industry_id'
     return industry_handle(ids, jobs_count) if facet == 'industry_id'
   end
   end
 
 
-  def send_request(q_param, fq_param, facet_param = nil)
+  def send_request(q_param, fq_param, facet_param = nil, sort = '', rows = Job.count)
     @solr.get 'select', params: {
     @solr.get 'select', params: {
       'facet': true,
       'facet': true,
       'facet.field': facet_param,
       'facet.field': facet_param,
       'q': q_param,
       'q': q_param,
       'fq': fq_param,
       'fq': fq_param,
-      'rows': Job.count
+      'sort': sort,
+      'rows': rows
     }
     }
   end
   end
 
 
   def escape_str(str)
   def escape_str(str)
     # RSolr.solr_escape(str)
     # RSolr.solr_escape(str)
-    CGI::escapeHTML(str)
+    CGI.escapeHTML(str)
   end
   end
 
 
   def city_handle(ids, jobs_count)
   def city_handle(ids, jobs_count)

app/views/top/index.html.slim

@@ -35,12 +35,12 @@
     h2 Top cities
     h2 Top cities
     hr.my-2
     hr.my-2
     .row.align-items-start.mb-3
     .row.align-items-start.mb-3
-      - @top_cities.each do |city, city_jobs|
+      - @top_cities.each do |city|
         .col-4.city-item
         .col-4.city-item
           = link_to city[0], city_jobs_path(city_slug: city[1]), class: 'city-name'
           = link_to city[0], city_jobs_path(city_slug: city[1]), class: 'city-name'
           span.job-count
           span.job-count
             |  (
             |  (
-            = pluralize(city_jobs, 'job') 
+            = pluralize(city[2], 'job') 
             |)
             |)
     = link_to 'See all cities', cities_path, class:'all-cities-btn'
     = link_to 'See all cities', cities_path, class:'all-cities-btn'
 / top industries
 / top industries
@@ -49,11 +49,11 @@
     h2 Top industries
     h2 Top industries
     hr.my-2
     hr.my-2
     .row.align-items-start
     .row.align-items-start
-      - @top_industries.each do |industry, industry_jobs|
+      - @top_industries.each do |industry|
         .col-4.industry-item
         .col-4.industry-item
           = link_to industry[0], industry_jobs_path(industry_slug: industry[1]), class: 'industry-name'
           = link_to industry[0], industry_jobs_path(industry_slug: industry[1]), class: 'industry-name'
           span.job-count
           span.job-count
             |  (
             |  (
-            = pluralize(industry_jobs, 'job') 
+            = pluralize(industry[2], 'job') 
             |)
             |)
     = link_to 'See all industries', industries_path, class:'all-industries-btn'
     = link_to 'See all industries', industries_path, class:'all-industries-btn'
\ No newline at end of file