Merge branch 'features/create_search_form' into 'master'

Add search feature use solr

See merge request !11

app/assets/stylesheets/application.scss

@@ -72,6 +72,13 @@ body{
 .search-box{
 .search-box{
   width: 100%;
   width: 100%;
   height: 50px;
   height: 50px;
+  margin-bottom: 20px;
+  .navbar-form{
+    padding: 0px !important;
+  }
+  input{
+    height: 45px;
+  }
 }// end
 }// end
 
 
 // City list
 // City list

app/controllers/jobs_controller.rb

@@ -4,6 +4,7 @@ class JobsController < ApplicationController
     @jobs = Job.top_list.includes(:company)
     @jobs = Job.top_list.includes(:company)
     @cities = City.top_cities.includes(:country)
     @cities = City.top_cities.includes(:country)
     @industries = Industry.top_industries
     @industries = Industry.top_industries
+    @jobs_count = @jobs.count
   end
   end
 
 
   def show
   def show
@@ -13,26 +14,77 @@ class JobsController < ApplicationController
 
 
   def city
   def city
     city = City.find(params[:city_id])
     city = City.find(params[:city_id])
-    @jobs = city.jobs.includes(:company).page(params[:page])
+    @jobs = city.jobs.includes(:company)
+    @jobs_count = @jobs.count
+    @jobs = @jobs.page(params[:page])
     @result = "jobs/City/#{city.name}"
     @result = "jobs/City/#{city.name}"
     render template: "jobs/job_lists"
     render template: "jobs/job_lists"
   end
   end
 
 
   def industry
   def industry
     industry = Industry.find(params[:industry_id])
     industry = Industry.find(params[:industry_id])
-    @jobs = industry.jobs.includes(:company).page(params[:page])
+    @jobs = industry.jobs.includes(:company)
+    @jobs_count = @jobs.count
+    @jobs = @jobs.page(params[:page])
     @result = "jobs/Industry/#{industry.name}"
     @result = "jobs/Industry/#{industry.name}"
     render template: "jobs/job_lists"
     render template: "jobs/job_lists"
   end
   end
 
 
   def company
   def company
     company = Company.find(params[:company_id])
     company = Company.find(params[:company_id])
-    @jobs = company.jobs.page(params[:page])
+    @jobs = company.jobs
+    @jobs_count = @jobs.count
+    @jobs = @jobs.page(params[:page])
     @result = "jobs/Company/#{company.name}"
     @result = "jobs/Company/#{company.name}"
     render template: "jobs/job_lists"
     render template: "jobs/job_lists"
   end
   end
 
 
+  def search
+    # byebug
+    condition = get_condition
+    response = query(condition)
+    job_ids = response["response"]["docs"].pluck("id")
+    @jobs = Job.where(id: job_ids).includes(:company).page(params[:page])
+    @jobs_count = job_ids.count
+    @result = params[:search]
+    render template: "jobs/job_lists"
+  end
+
+  private
+
   def set_job
   def set_job
     @job = Job.find(params[:id])
     @job = Job.find(params[:id])
   end
   end
+
+  def connect
+    url = 'http://localhost:8983/solr/my_solr_collection'
+    @solr = RSolr.connect url: url
+  end
+
+  def query(condition)
+    # Direct connection
+    connect
+    # use get method to query
+    response = @solr.get 'select', :params => condition
+    response
+  end
+
+  def get_condition
+    condition = {}
+    filter_query = []
+
+    # get condition
+    condition[:q] = "*:*"
+    condition[:fl] = "id"
+    condition[:start] = 0
+    condition[:rows] = Job.count
+    unless params[:search].blank?
+      filter_query << "name:\"#{params[:search]}\" ||
+                       company_name:\"#{params[:search]}\" ||
+                       city_name:\"#{params[:search]}\" ||
+                       industry:\"#{params[:search]}\""
+      condition[:fq] = filter_query
+    end
+    condition
+  end
 end
 end

app/views/jobs/index.html.erb

@@ -3,6 +3,7 @@
   <div class="container">
   <div class="container">
     <div class="top-page">
     <div class="top-page">
       <!-- Search -->
       <!-- Search -->
+      <%= render "layouts/search_box" %>
       <div class="panel border_bot clearfix">
       <div class="panel border_bot clearfix">
         <%= render @jobs %>
         <%= render @jobs %>
       </div>
       </div>

app/views/jobs/job_lists.html.erb

 <div class="row">
 <div class="row">
   <div class="container">
   <div class="container">
-    <p>
-      THIS IS A SEARCH BOX
-    </p>
+    <%= render "layouts/search_box" %>
     <div class="job-list">
     <div class="job-list">
+      <div class="alert alert-success" role="alert">
         <p>
         <p>
-        <span>1. Total: <%= "#{@jobs.count}" %></span>
+          <span>Total: <%= @jobs_count %></span>
           <span>Result for: <%= "#{@result}" %></span>
           <span>Result for: <%= "#{@result}" %></span>
         </p>
         </p>
+      </div>
       <div class="top-page">
       <div class="top-page">
         <div class="top-page-info">
         <div class="top-page-info">
         </div>
         </div>
       </div>
       </div>
-      <div class="pagination">
+      <div class="pagination navbar-right">
         <%= paginate @jobs %>
         <%= paginate @jobs %>
       </div>
       </div>
       <div class="jobs clearfix">
       <div class="jobs clearfix">
@@ -35,7 +35,7 @@
         </div>
         </div>
         <%- end -%>
         <%- end -%>
       </div>
       </div>
-      <div class="pagination">
+      <div class="pagination navbar-right">
         <%= paginate @jobs %>
         <%= paginate @jobs %>
       </div>
       </div>
     </div>
     </div>

app/views/layouts/_search_box.html.erb

 <div class="search-box">
 <div class="search-box">
-  <%= form_tag nil, method: :get, class: "navbar-form navbar-left search-form wid100" do %>
+  <%= form_tag search_jobs_path, method: :get, class: "navbar-form navbar-left search-form wid100" do %>
     <%= text_field_tag(
     <%= text_field_tag(
         :search,
         :search,
         params[:search],
         params[:search],
         placeholder: "Search",
         placeholder: "Search",
-        class: "form-control wid80"
+        class: "form-control wid100"
     ) %>
     ) %>
-    <%= submit_tag "Search", class: "btn btn-default"%>
   <% end %>
   <% end %>
 </div>
 </div>

config/routes.rb

@@ -23,9 +23,10 @@ Rails.application.routes.draw do
   end
   end
   resources :jobs do
   resources :jobs do
     collection do
     collection do
-      get 'city/:city_id' => 'jobs#city', as: :city
-      get 'industry/:industry_id' => 'jobs#industry', as: :industry
-      get 'company/:company_id' => 'jobs#company', as: :company
+      get 'city/:city_id' => "jobs#city", as: :city
+      get 'industry/:industry_id' => "jobs#industry", as: :industry
+      get 'company/:company_id' => "jobs#company", as: :company
+      get 'search' => "jobs#search"
     end
     end
   end
   end
   resources :my_pages, path: '', only: [:index] do
   resources :my_pages, path: '', only: [:index] do