Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
V
VeNJob
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Tô Ngọc Ánh
  • VeNJob
  • Merge Requests
  • !14

Merged
Opened Sep 01, 2020 by Tô Ngọc Ánh@anhtn 
  • Report abuse
Report abuse

Solr

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b solr origin/solr

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff solr

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 8
  • Commits 8
  • Pipelines 7
  • Changes 21
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Sep 01, 2020
    Resolved by Tô Ngọc Ánh Sep 01, 2020
    lib/tasks/solr.rake 0 → 100644
    1 # require './lib/common/solr_server'
    • Thanh Hung Pham @hungpt commented Sep 01, 2020
      Master

      @anhtn này không dùng xóa đi em.

      Edited Sep 01, 2020
      @anhtn này không dùng xóa đi em.
    • Tô Ngọc Ánh @anhtn

      changed this line in version 2 of the diff

      Sep 01, 2020

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/14/diffs?diff_id=5173&start_sha=4fa2910196758512c8b7b262b2045f4b3ad1c187#5ca0b5a8639da0f3c92a68e10b4f04671cb2989f_1_0)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Sep 01, 2020
    Resolved by Tô Ngọc Ánh Sep 01, 2020
    lib/common/solr_server.rb 0 → 100644
    1 class SolrServer
    2 def initialize
    3 @solr = RSolr.connect(url: 'http://192.168.1.133:8983/solr/venjob')
    • Thanh Hung Pham @hungpt commented Sep 01, 2020
      Master

      @anhtn Chỗ này mình config cho mỗi môi trường url khác nhau nha em.

      https://github.com/binarylogic/settingslogic

      Edited Sep 01, 2020
      @anhtn Chỗ này mình config cho mỗi môi trường `url` khác nhau nha em. `https://github.com/binarylogic/settingslogic`
    • Tô Ngọc Ánh @anhtn

      changed this line in version 2 of the diff

      Sep 01, 2020

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/14/diffs?diff_id=5173&start_sha=4fa2910196758512c8b7b262b2045f4b3ad1c187#3726134a8ba122e86ffeec931682f6b34600e9ab_3_3)
      Toggle commit list
    Please register or sign in to reply
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • 2550b768 - add config gem

    Compare with previous version

    Sep 01, 2020

    added 1 commit

    • 2550b768 - add config gem

    Compare with previous version

    added 1 commit * 2550b768 - add config gem [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/14/diffs?diff_id=5173&start_sha=4fa2910196758512c8b7b262b2045f4b3ad1c187)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • 7f9aec69 - replace gem config to settingslogic

    Compare with previous version

    Sep 01, 2020

    added 1 commit

    • 7f9aec69 - replace gem config to settingslogic

    Compare with previous version

    added 1 commit * 7f9aec69 - replace gem config to settingslogic [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/14/diffs?diff_id=5174&start_sha=2550b7680a8a54e6448cd22d80d3dcb70d9ce30b)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    resolved all discussions

    Sep 01, 2020

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Sep 01, 2020
    Resolved by Tô Ngọc Ánh Sep 03, 2020
    lib/common/solr_server.rb 0 → 100644
    1 class SolrServer
    2 def initialize
    3 @solr = RSolr.connect(url: Settings.solr_server)
    4 end
    5
    6 def search(keyword, industry_id, location_id, page)
    • Thanh Hung Pham @hungpt commented Sep 01, 2020
      Master

      @anhtn Truyền param vào dạng hash cho dễ đọc em. Ví dụ search_params chẵn hạn. Sau này em search nhiều thì param của method nó dài ra.

      Edited Sep 03, 2020
      @anhtn Truyền param vào dạng hash cho dễ đọc em. Ví dụ `search_params` chẵn hạn. Sau này em search nhiều thì param của method nó dài ra.
    • Tô Ngọc Ánh @anhtn

      changed this line in version 4 of the diff

      Sep 03, 2020

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/14/diffs?diff_id=5178&start_sha=7f9aec69a127ac7771e3eac9248ff6fb007b5e80#3726134a8ba122e86ffeec931682f6b34600e9ab_6_0)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Sep 01, 2020
    Resolved by Tô Ngọc Ánh Sep 03, 2020
    lib/common/solr_server.rb 0 → 100644
    1 class SolrServer
    2 def initialize
    3 @solr = RSolr.connect(url: Settings.solr_server)
    4 end
    5
    6 def search(keyword, industry_id, location_id, page)
    7 query, fq = set_query_search(keyword, industry_id, location_id)
    8 @solr.paginate(page, Job::NUMBER_SEARCH_RESULTS, 'select', params: { q: query, fq: fq })
    9 end
    10
    11 private
    12
    13 def set_query_search(keyword, industry_id, location_id)
    • Thanh Hung Pham @hungpt commented Sep 01, 2020
      Master

      @anhtn Tương tự như trên

      Edited Sep 03, 2020
      @anhtn Tương tự như trên
    • Tô Ngọc Ánh @anhtn

      changed this line in version 4 of the diff

      Sep 03, 2020

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/14/diffs?diff_id=5178&start_sha=7f9aec69a127ac7771e3eac9248ff6fb007b5e80#3726134a8ba122e86ffeec931682f6b34600e9ab_13_0)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Sep 01, 2020
    Resolved by Tô Ngọc Ánh Sep 03, 2020
    lib/common/solr_server.rb 0 → 100644
    1 class SolrServer
    2 def initialize
    3 @solr = RSolr.connect(url: Settings.solr_server)
    4 end
    5
    6 def search(keyword, industry_id, location_id, page)
    7 query, fq = set_query_search(keyword, industry_id, location_id)
    8 @solr.paginate(page, Job::NUMBER_SEARCH_RESULTS, 'select', params: { q: query, fq: fq })
    9 end
    10
    11 private
    12
    13 def set_query_search(keyword, industry_id, location_id)
    • Thanh Hung Pham @hungpt commented Sep 01, 2020
      Master

      @anhtn Tương tự như trên

      Edited Sep 03, 2020
      @anhtn Tương tự như trên
    • Tô Ngọc Ánh @anhtn

      changed this line in version 4 of the diff

      Sep 03, 2020

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/14/diffs?diff_id=5178&start_sha=7f9aec69a127ac7771e3eac9248ff6fb007b5e80#3726134a8ba122e86ffeec931682f6b34600e9ab_13_0)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Sep 01, 2020
    Resolved by Tô Ngọc Ánh Sep 04, 2020
    lib/common/solr_server.rb 0 → 100644
    2 def initialize
    3 @solr = RSolr.connect(url: Settings.solr_server)
    4 end
    5
    6 def search(keyword, industry_id, location_id, page)
    7 query, fq = set_query_search(keyword, industry_id, location_id)
    8 @solr.paginate(page, Job::NUMBER_SEARCH_RESULTS, 'select', params: { q: query, fq: fq })
    9 end
    10
    11 private
    12
    13 def set_query_search(keyword, industry_id, location_id)
    14 industry_id = industry_id.blank? ? "*" : RSolr.solr_escape(industry_id)
    15 location_id = location_id.blank? ? "*" : RSolr.solr_escape(location_id)
    16 keyword = keyword.blank? ? "*" : RSolr.solr_escape(keyword)
    17 query = "(title:#{keyword})^5 OR company:#{keyword}"
    • Thanh Hung Pham @hungpt commented Sep 01, 2020
      Master

      @anhtn ^5 cái này là gì ta?

      @anhtn `^5` cái này là gì ta?
    • Tô Ngọc Ánh @anhtn commented Sep 03, 2020
      Master

      @hungpt để tăng trọng số của cái title lên á anh, mà đoạn này em làm bị sai, em đang sửa lại ạ

      @hungpt để tăng trọng số của cái title lên á anh, mà đoạn này em làm bị sai, em đang sửa lại ạ
    • Tô Ngọc Ánh @anhtn

      changed this line in version 4 of the diff

      Sep 03, 2020

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/14/diffs?diff_id=5178&start_sha=7f9aec69a127ac7771e3eac9248ff6fb007b5e80#3726134a8ba122e86ffeec931682f6b34600e9ab_17_0)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Sep 03, 2020
    Resolved by Tô Ngọc Ánh Sep 03, 2020
    app/controllers/jobs_controller.rb
    1 require './lib/common/solr_server.rb'
    • Thanh Hung Pham @hungpt commented Sep 03, 2020
      Master

      @anhtn Tham khảo này để load file trong lib không cần phải require nha em. Fix mấy chỗ require khác luôn.

      • https://guides.rubyonrails.org/autoloading_and_reloading_constants.html
      Edited Sep 03, 2020
      @anhtn Tham khảo này để load file trong lib không cần phải require nha em. Fix mấy chỗ require khác luôn. - https://guides.rubyonrails.org/autoloading_and_reloading_constants.html
    • Tô Ngọc Ánh @anhtn

      changed this line in version 4 of the diff

      Sep 03, 2020

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/14/diffs?diff_id=5178&start_sha=7f9aec69a127ac7771e3eac9248ff6fb007b5e80#6fa69a07843a58f190bf4d7e0692b9cc5b0bf52b_1_1)
      Toggle commit list
    Please register or sign in to reply
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • e24f4ced - add autoload sub folder lib

    Compare with previous version

    Sep 03, 2020

    added 1 commit

    • e24f4ced - add autoload sub folder lib

    Compare with previous version

    added 1 commit * e24f4ced - add autoload sub folder lib [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/14/diffs?diff_id=5178&start_sha=7f9aec69a127ac7771e3eac9248ff6fb007b5e80)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • 1b11a899 - edit search query

    Compare with previous version

    Sep 03, 2020

    added 1 commit

    • 1b11a899 - edit search query

    Compare with previous version

    added 1 commit * 1b11a899 - edit search query [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/14/diffs?diff_id=5179&start_sha=e24f4ced42024d323ae3c7404f71204219085ed3)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • 11da7ea9 - edit name params search form

    Compare with previous version

    Sep 03, 2020

    added 1 commit

    • 11da7ea9 - edit name params search form

    Compare with previous version

    added 1 commit * 11da7ea9 - edit name params search form [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/14/diffs?diff_id=5180&start_sha=1b11a899681cdb6bb5e24215d03a710a3ddf3121)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    added 1 commit

    • ceafc8f3 - edit name params search form

    Compare with previous version

    Sep 03, 2020

    added 1 commit

    • ceafc8f3 - edit name params search form

    Compare with previous version

    added 1 commit * ceafc8f3 - edit name params search form [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/14/diffs?diff_id=5181&start_sha=11da7ea947758f7652bcd78c38d40e76056c7947)
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    mentioned in commit 1b7a0aa8

    Sep 04, 2020

    mentioned in commit 1b7a0aa8

    mentioned in commit 1b7a0aa8d36f1f7443c1eeba1bb953b12b19800e
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    merged

    Sep 04, 2020

    merged

    merged
    Toggle commit list
  • Tô Ngọc Ánh @anhtn

    resolved all discussions

    Sep 04, 2020

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: anhtn/VeNJob!14
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.