Ngô Trung Hưng · @hungnt · Hiếu Lê · Hoang Phuc Do · Hiếu Lê · Hoang Phuc Do
--- a/.vscode/settings.json 0 → 100644
+++ b/.vscode/settings.json 0 → 100644
+{
+    "compile-hero.disable-compile-files-on-did-save-code": true
+}
--- a/app/controllers/histories_controller.rb
+++ b/app/controllers/histories_controller.rb

  def index
    histories = current_user.histories.order(created_at: :desc)
-    @jobs = histories.map(&:job)
+    @jobs = histories.map(&:job).select { |val| val.present? }
--- a/app/controllers/search_controller.rb 0 → 100644
+++ b/app/controllers/search_controller.rb 0 → 100644
+class SearchController < ApplicationController
+  NUMBER_RECORD_IN_PAGE = 10
+  before_action :load_data_dropdown, only: :multi_search
+
+  def multi_search
+    solr = connect_solr
+    @keyword = params[:keyword]
+    @industry = Industry.find_by(id: params[:industry]) if params[:industry].present?
--- a/app/controllers/search_controller.rb 0 → 100644
+++ b/app/controllers/search_controller.rb 0 → 100644
+class SearchController < ApplicationController
+  NUMBER_RECORD_IN_PAGE = 10
+  before_action :load_data_dropdown, only: :multi_search
+
+  def multi_search
+    solr = connect_solr
+    @keyword = params[:keyword]
+    @industry = Industry.find_by(id: params[:industry]) if params[:industry].present?
+    @city = City.find_by(id: params[:city]) if params[:city].present?
+    # Value data is Array, index[0]: name_job or company name, index[1]: id industry, index[2]: id location
+    data = sub_space_params!(params[:keyword], params[:industry], params[:city])
--- a/app/controllers/search_controller.rb 0 → 100644
+++ b/app/controllers/search_controller.rb 0 → 100644
+    data = sub_space_params!(params[:keyword], params[:industry], params[:city])
+    query = if params[:keyword].blank? && params[:industry].blank? && params[:city].blank?
+              '*:*'
+            else
+              "solr((name: #{data[0]}) OR (company_name: #{data[0]})) AND (industry_id: #{data[1]}) AND (location_id: #{data[2]})"
+            end
+    response = solr.paginate(params[:page], NUMBER_RECORD_IN_PAGE, 'select', params: { q: query })
+    @results = Kaminari.paginate_array(response['response']['docs'], total_count: response['response']['numFound']).page(params[:page]).per(NUMBER_RECORD_IN_PAGE)
+    return render 'error/page_not_found' if params[:page].to_i > @results.total_pages
+
+    render :result
+  end
+
+  def sub_space_params!(keyword, industry_id, location_id)
+    arr_params = []
+    keyword = keyword.present? ? RSolr.solr_escape(keyword) : '' 
--- a/app/controllers/search_controller.rb 0 → 100644
+++ b/app/controllers/search_controller.rb 0 → 100644
+    return render 'error/page_not_found' if params[:page].to_i > @results.total_pages
+
+    render :result
+  end
+
+  def sub_space_params!(keyword, industry_id, location_id)
+    arr_params = []
+    keyword = keyword.present? ? RSolr.solr_escape(keyword) : '' 
+    industry_id = industry_id.present? ? RSolr.solr_escape(industry_id) : ''
+    location_id = location_id.present? ? RSolr.solr_escape(location_id) : ''
+    arr_params << keyword << industry_id << location_id
+    arr_params.each { |val| val.sub!('', '*') if val.blank? }
+  end
+
+  def load_data_dropdown
+    @industries = Industry.order(name: :asc).all
--- a/config/application.rb
+++ b/config/application.rb
    config.autoload_paths << Rails.root.join('lib/service')
    config.autoload_paths << Rails.root.join('lib/src')
    config.eager_load_paths << Rails.root.join('lib/business')
+    config.eager_load_paths << Rails.root.join('lib/solr')
--- a/lib/solr/solr_setting/solr_server.rb 0 → 100644
+++ b/lib/solr/solr_setting/solr_server.rb 0 → 100644
+# frozen_string_literal: true
+
+module SolrSetting
+  class SolrServer
+    URL_SERVER_SOLR = 'http://localhost:8983/solr/venjob'
--- a/app/controllers/search_controller.rb 0 → 100644
+++ b/app/controllers/search_controller.rb 0 → 100644
+class SearchController < ApplicationController
+  NUMBER_RECORD_IN_PAGE = 10
+  before_action :load_data_dropdown, only: :multi_search
+
+  def multi_search
+    solr = connect_solr
+    @keyword = params[:keyword]
+    @industry = Industry.find_by(id: params[:industry_id]) if params[:industry_id].present?
+    @city = City.find_by(id: params[:city_id]) if params[:city_id].present?
+    data = sub_space_params!(params[:keyword], params[:industry_id], params[:city_id])
+    query = if params[:keyword].blank? && params[:industry_id].blank? && params[:city_id].blank?
--- a/app/helpers/search_helper.rb 0 → 100644
+++ b/app/helpers/search_helper.rb 0 → 100644
+module SearchHelper
--- a/app/controllers/histories_controller.rb
+++ b/app/controllers/histories_controller.rb

  def index
    histories = current_user.histories.order(created_at: :desc)
-    @jobs = histories.map(&:job)
+    @jobs = histories.map(&:job).compact
--- a/config/settings/production.yml 0 → 100644
+++ b/config/settings/production.yml 0 → 100644
+url_server_solr: 'http://.../solr/venjob'
--- a/app/controllers/search_controller.rb 0 → 100644
+++ b/app/controllers/search_controller.rb 0 → 100644
+class SearchController < ApplicationController
+  NUMBER_RECORD_IN_PAGE = 10
--- a/app/views/home/_banner_and_search.html.erb
+++ b/app/views/home/_banner_and_search.html.erb
          <h4 class="show_total_job"><%= t('pages.banner.slogan_3', job_count: @job_count) %></h4>
        <% end %>
      </div>
-      <div class="filter_box">
-        <div class="search_input">
-          <input type="search" name="" id="" class="custom_input_search" placeholder="<%= t('pages.banner.search_placeholder') %>">
-        </div>
-        <div class="search_industries">
-          <div class="icon_list">
-            <i class="fa fa-list-ul" aria-hidden="true"></i>
+      <%= form_with url: search_path, method: :get, local: true, skip_enforcing_utf8: true do |f| %>
--- a/app/views/search/_block_info_job.html.erb 0 → 100644
+++ b/app/views/search/_block_info_job.html.erb 0 → 100644
+                  <h5 class="box_info_copany_name"><i class="far fa-building"></i> <%= data['company_name'] %></h5>
+                </div>
+                <div class="loc">
+                  <h5 class="box_info_location"><i class="fas fa-map-marker-alt"></i>
+                    <%= data['locations'].join(' | ') %>
+                  </h5>
+                </div>
+                <h5 class="box_info_salary"><i class="fas fa-dollar-sign"></i>&nbsp;<%= "#{t('pages.index.salary')}: #{data['salary']}" %></h5>
+                <div class="coc">
+                  <h5 class="box_info_des"><%= strip_tags(data['description']) %></h5>
+                </div>
+              </div>
+            </div>
+            <div class="col-sm-2 col-md-3 d-none d-sm-block col-lg-2">
+              <div class="link_favorite_top block_link_favorite">
+                <% if user_signed_in? %>
--- a/app/views/search/result.html.erb 0 → 100644
+++ b/app/views/search/result.html.erb 0 → 100644
+<% provide(:title ,"#{t('pages.detail.br_title')}") %>
+<%= render 'home/banner_and_search' %>  
+<div class="padding_index"></div>
+<div class="container">
+  <div class="row">    
+    <div class="col-lg-12">
+      <div class="breadcrumb_total_search">
+        <span class="breadcrumb-item active">
+          <% if @results.total_count == Job.count %>
+            <div style="word-wrap: break-word;">
+              <%= "#{t('pages.result.all')} #{@results.total_count}" %>
+            </div>
+          <% elsif @results.total_count > 0 %>
--- a/app/views/search/result.html.erb 0 → 100644
+++ b/app/views/search/result.html.erb 0 → 100644
+      <div class="breadcrumb_total_search_pagination_jobs">
+        <div class="pagination_jobs">
+          <div id="paginator">
+            <%= paginate @results %>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+<%= render 'job/modal_login' %>
+<%= render partial: 'block_info_job', collection: @results, as: :data %>
+<div class="container">
+  <div class="row">
+    <div class="col-lg-12">      
+      <div class="breadcrumb_total_search_pagination_jobs">
--- a/lib/solr/index_data.rb 0 → 100644
+++ b/lib/solr/index_data.rb 0 → 100644
+
+  def self.indexed(job)
+    solr = SolrSetting::SolrServer.connection
+    data = {}
+    data[:id] = job.id
+    data[:name] = job.name
+    data[:company_name] = job.company.name
+    data[:salary] = job.salary
+    data[:description] = job.description
+    data[:industries] = job.industry_jobs.map(&:industry).map(&:name)
+    data[:industry_id] = job.industry_jobs.map(&:industry_id)
+    data[:locations] = job.city_jobs.map(&:city).map(&:name)
+    data[:location_id] = job.city_jobs.map(&:city_id)
+    solr.add data, add_attributes: {commitWithin: 10}
+  rescue StandardError => e
+    logger.error "Indexed data to Solr have error: #{e}"
--- a/lib/solr/index_data.rb 0 → 100644
+++ b/lib/solr/index_data.rb 0 → 100644
+# frozen_string_literal: true
+
+class IndexData
+  def logger
+    @logger ||= Logger.new(Rails.root.join('log', 'indexed_data_to_solr.log'))
+  end
+
+  def self.indexed(job)
--- a/app/forms/send_data_to_apply_form.rb 0 → 100644
+++ b/app/forms/send_data_to_apply_form.rb 0 → 100644
+# frozen_string_literal: true
+
+class SendDataToApplyForm
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
  before_action :load_data_dropdown

  def search
-    @keyword = params[:keyword]
+    debugger
+    @keyword = params[:send_data_to_apply_form][:keyword]
    @industry = Industry.find_by(id: params[:industry_id]) if params[:industry_id].present?
    @city = City.find_by(id: params[:city_id]) if params[:city_id].present?
-    @results = Search::Query.new.search(params[:keyword], params[:industry_id], params[:city_id], params[:page])
+    @results = Search::Query.new.search(@keyword, params[:industry_id], params[:city_id], params[:page])
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
 # Home page
 class HomeController < ApplicationController
  def index
+    @search = SendDataToApplyForm.new
    @industries = Industry.order(name: :asc).all
--- a/app/views/search/_new.html.erb 0 → 100644
+++ b/app/views/search/_new.html.erb 0 → 100644
+<div class = "box-banner">
--- a/app/views/search/_new.html.erb 0 → 100644
+++ b/app/views/search/_new.html.erb 0 → 100644
+      <div class = "slogan">
+        <h2 class = "slogan_text">
+          <%= t('pages.banner.slogan') %>
+        </h2>
+        <h5 class = "slogan_text_h5">
+          <%= t('pages.banner.slogan') %>
+        </h5>
+      </div>
+    </div>
+  </div>
+  <!-- Process search pc-->
+  <div class="box-search">
+    <div class="search_scaffold">
+      <div class = "total_job">
+        <% if @job_count.blank? %>
+          <h4 class="show_total_job"><%= t('pages.banner.slogan_2') %></h4>
--- a/app/views/search/_new.html.erb 0 → 100644
+++ b/app/views/search/_new.html.erb 0 → 100644
+          <div class="search_input">
+            <%= f.search_field :keyword, value: @keyword, class: 'custom_input_search', placeholder: t('pages.banner.search_placeholder') %>
+          </div>
+          <div class="search_industries">
+            <div class="icon_list">
+              <i class="fa fa-list-ul" aria-hidden="true"></i>
+            </div>
+            <% selected = @industry.blank? ? '*' : @industry.id %>
+            <%= select_tag 'industry_id', options_from_collection_for_select(@industries, 'id', 'name', selected), prompt: t('pages.banner.all_industries'), class: 'show_list_industries' %>
+          </div>
+          <div class="search_location">
+            <div class="icon_list">
+              <i class="fas fa-map-marker-alt"></i>
+            </div>
+            <% selected = @city.blank? ? '*' : @city.id %>
+            <%= select_tag 'city_id', options_from_collection_for_select(@cities, 'id', 'name', selected), prompt: t('pages.banner.all_locations'), class: 'show_list_cities' %>
--- a/app/views/search/_new.html.erb 0 → 100644
+++ b/app/views/search/_new.html.erb 0 → 100644
+        <div class="filter_box">
+          <div class="search_input">
+            <%= f.search_field :keyword, value: @keyword, class: 'custom_input_search', placeholder: t('pages.banner.search_placeholder') %>
+          </div>
+          <div class="search_industries">
+            <div class="icon_list">
+              <i class="fa fa-list-ul" aria-hidden="true"></i>
+            </div>
+            <% selected = @industry.blank? ? '*' : @industry.id %>
+            <%= select_tag 'industry_id', options_from_collection_for_select(@industries, 'id', 'name', selected), prompt: t('pages.banner.all_industries'), class: 'show_list_industries' %>
+          </div>
+          <div class="search_location">
+            <div class="icon_list">
+              <i class="fas fa-map-marker-alt"></i>
+            </div>
+            <% selected = @city.blank? ? '*' : @city.id %>
--- a/config/routes.rb
+++ b/config/routes.rb
 Rails.application.routes.draw do
  get 'setting', to: 'users#set_lang', as: :set_lang
  scope '(:locale)', locale: /en|vi/ do
-    devise_for :users, controllers: { registrations: 'registrations' }
+    devise_for :users, controllers: { registrations: 'registrations', passwords: 'passwords'}
    root 'home#index'
+    # Search
+    get 'search', to: 'search#search', as: :send_data_to_apply_forms
--- a/app/views/search/result.html.erb 0 → 100644
+++ b/app/views/search/result.html.erb 0 → 100644
+<%= render 'home/banner_and_search' %>  
+<div class="padding_index"></div>
+<div class="container">
+  <div class="row">    
+    <div class="col-lg-12">
+      <div class="breadcrumb_total_search">
+        <span class="breadcrumb-item active">
+          <% if @results.total_count == Job.count %>
+            <div style="word-wrap: break-word;">
+              <%= "#{t('pages.result.all')} #{@results.total_count}" %>
+            </div>
+          <% elsif @results.total_count.positive? %>
+            <%= t('pages.result.result_find', job: @results.total_count, key: @keyword).html_safe %>
+          <% else %>
+            <%= t('pages.result.no_result_find', key: @keyword).html_safe %>
+            <% end %>
--- a/lib/solr/search/query.rb 0 → 100644
+++ b/lib/solr/search/query.rb 0 → 100644
+module Search
+  class Query
+    def search(keyword, industry_id, city_id, params_page)
+      solr = connect_solr
+      # Escape input & Convert space to asterisks
+      data = sub_space_params!(keyword, industry_id, city_id)
+      query = if keyword.blank? && industry_id.blank? && city_id.blank?
+                '*:*'
+              else
+                "solr((name: #{data[:keyword]}) OR (company_name: #{data[:keyword]})) AND (industry_id: #{data[:industry_id]}) AND (location_id: #{data[:location_id]})"
--- a/lib/solr/searches/query.rb 0 → 100644
+++ b/lib/solr/searches/query.rb 0 → 100644
+module Searches
+  class Query    
+    def search(params)
+      solr = connect_solr
+      # Escape input & Convert space to asterisks
+      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?}
+                '*:*'
+              else
+                "solr((name: #{data[:keyword]}) OR (company_name: #{data[:keyword]})) AND (industry_id: #{data[:industry_id]}) AND (location_id: #{data[:location_id]})"
+              end
+      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)
--- a/lib/solr/searches/query.rb 0 → 100644
+++ b/lib/solr/searches/query.rb 0 → 100644
+    def search(params)
+      solr = connect_solr
+      # Escape input & Convert space to asterisks
+      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?}
+                '*:*'
+              else
+                "solr((name: #{data[:keyword]}) OR (company_name: #{data[:keyword]})) AND (industry_id: #{data[:industry_id]}) AND (location_id: #{data[:location_id]})"
+              end
+      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)
+    end
+    
+    def sub_space_params!(keyword, industry_id, location_id)
+      arr_params = {}
+      arr_params[:keyword] = RSolr.solr_escape(keyword)
--- a/lib/solr/sync/entities/job.rb 0 → 100644
+++ b/lib/solr/sync/entities/job.rb 0 → 100644
+# frozen_string_literal: true
+
+module Sync::Entities
+  class Job < Sync::Entities::Base
+    def to_h
+      data = {}
+      data[:id] = job.id
+      data[:name] = job.name
+      data[:company_name] = job.company.name
+      data[:salary] = job.salary
+      data[:description] = job.description
+      data[:industries] = job.industry_jobs.map(&:industry).map(&:name)
--- a/lib/solr/sync/entities/job.rb 0 → 100644
+++ b/lib/solr/sync/entities/job.rb 0 → 100644
+# frozen_string_literal: true
+
+module Sync::Entities
+  class Job < Sync::Entities::Base
+    def to_h
+      data = {}
+      data[:id] = job.id
+      data[:name] = job.name
+      data[:company_name] = job.company.name
+      data[:salary] = job.salary
+      data[:description] = job.description
+      data[:industries] = job.industry_jobs.map(&:industry).map(&:name)
+      data[:industry_id] = job.industry_jobs.map(&:industry_id)
+      data[:locations] = job.city_jobs.map(&:city).map(&:name)
--- a/lib/service/import_data.rb
+++ b/lib/service/import_data.rb
      industry_name = val['category'].gsub(',', '/').gsub('/', ' / ')
      industry = Industry.find_or_create_by(name: industry_name.strip)

-      Job.find_or_create_by(name: val['name'], company_id: company_id) do |job|
+      record = Job.find_or_initialize_by(name: val['name'], company_id: company_id) do |job|
        job.level = val['level']
        job.salary = val['salary']
        job.description = desc
        job.city_ids.blank? ? job.cities << city : job.cities == city
        job.industry_ids.blank? ? job.industries << industry : job.industries == industry
      end
+      if record.new_record?
+        record.save
+        index_strategy = Sync::Entities::Job.new(record)
--- a/lib/service/import_data.rb
+++ b/lib/service/import_data.rb
      industry_name = val['category'].gsub(',', '/').gsub('/', ' / ')
      industry = Industry.find_or_create_by(name: industry_name.strip)

-      Job.find_or_create_by(name: val['name'], company_id: company_id) do |job|
+      record = Job.find_or_initialize_by(name: val['name'], company_id: company_id) do |job|
        job.level = val['level']
        job.salary = val['salary']
        job.description = desc
        job.city_ids.blank? ? job.cities << city : job.cities == city
        job.industry_ids.blank? ? job.industries << industry : job.industries == industry
      end
+      if record.new_record?
+        record.save
+        IndexedJob.new(job).do
--- a/app/controllers/search_controller.rb 0 → 100644
+++ b/app/controllers/search_controller.rb 0 → 100644
+class SearchController < ApplicationController
+  before_action :load_data_dropdown
+
+  def search
+    @keyword = params[:search][:keyword]
--- a/lib/solr/searches/query.rb 0 → 100644
+++ b/lib/solr/searches/query.rb 0 → 100644
+# frozen_string_literal: true
+
+module Searches
+  class Query
+    def search(params)
+      solr = connect_solr
+      # Escape input & Convert space to asterisks
+      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?(&:blank?)
+                '*:*'
+              else
+                "solr((name: #{data[:keyword]}) OR (company_name: #{data[:keyword]})) AND (industry_id: #{data[:industry_id]}) AND (location_id: #{data[:location_id]})"
--- a/lib/solr/searches/query.rb 0 → 100644
+++ b/lib/solr/searches/query.rb 0 → 100644
+      solr = connect_solr
+      # Escape input & Convert space to asterisks
+      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?(&:blank?)
+                '*:*'
+              else
+                "#{data[:keyword]} AND (industry_id: #{data[:industry_id]}) AND (location_id: #{data[:location_id]})"
+              end
+      response = solr.paginate(params[:page], Settings.number_result_search_in_page, 'select', params: { q: query })
+      Kaminari.paginate_array(response['response']['docs'], total_count: response['response']['numFound']).page(params[:page]).per(Settings.number_result_search_in_page)
+    end
+
+    def sub_space_params!(keyword, industry_id, location_id)
+      arr_params = {}
+      arr_params[:keyword] = RSolr.solr_escape(keyword.downcase || '')
+      arr_params[:industry_id] = RSolr.solr_escape(industry_id || '')
--- a/app/controllers/search_controller.rb 0 → 100644
+++ b/app/controllers/search_controller.rb 0 → 100644
+class SearchController < ApplicationController
+  before_action :load_data_dropdown
+
+  def search
+    return render 'error/internal_server_error' if params[:search].blank?
+    @keyword = params[:search][:keyword]
+    @industry = Industry.find_by(id: params[:search][:industry_id])
+    @city = City.find_by(id: params[:search][:city_id])
+    @results = Searches::Query.new.search(params)
+    return render 'error/page_not_found' if params[:page].to_i > @results.total_pages
+    @search = Search.new
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
 # Home page
 class HomeController < ApplicationController
  def index
-    @industries = Industry.order(name: :asc).all
+    @search = Search.new
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
 # Home page
 class HomeController < ApplicationController
  def index
-    @industries = Industry.order(name: :asc).all
+    @search = Search.new
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
 <% provide(:title, "#{t('title.home')}") %>
-<%= render 'home/banner_and_search' %>  
+<%= render 'search/banner_and_search' %>  
 <div class="padding_index"></div>
 <% unless @job_count.nil? %>