f23b1cb453
Replace MR access checks with use of MergeRequestsFinder Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867 ⚠️ - Potentially untested 💣 - No test coverage 🚥 - Test coverage of some sort exists (a test failed when error raised) 🚦 - Test coverage of return value (a test failed when nil used) ✅ - Permissions check tested - [x] 💣 app/finders/notes_finder.rb:17 - [x] ⚠️ app/views/layouts/nav/_project.html.haml:80 [`.count`] - [x] 💣 app/controllers/concerns/creates_commit.rb:84 - [x] 🚥 app/controllers/projects/commits_controller.rb:24 - [x] 🚥 app/controllers/projects/compare_controller.rb:56 - [x] 🚦 app/controllers/projects/discussions_controller.rb:29 - [x] ✅ app/controllers/projects/todos_controller.rb:27 - [x] 🚦 app/models/commit.rb:268 - [x] ✅ lib/gitlab/search_results.rb:71 - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_267_266 Memoize ` merged_merge_request(current_user)` - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_248_247 Expected side effect for `merged_merge_request!`, consider `skip_authorization: true`. - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_269_269 Scary use of unchecked `merged_merge_request?` See merge request !2033
27 lines
972 B
Ruby
27 lines
972 B
Ruby
class NotesFinder
|
|
FETCH_OVERLAP = 5.seconds
|
|
|
|
def execute(project, current_user, params)
|
|
target_type = params[:target_type]
|
|
target_id = params[:target_id]
|
|
# Default to 0 to remain compatible with old clients
|
|
last_fetched_at = Time.at(params.fetch(:last_fetched_at, 0).to_i)
|
|
|
|
notes =
|
|
case target_type
|
|
when "commit"
|
|
project.notes.for_commit_id(target_id).non_diff_notes
|
|
when "issue"
|
|
IssuesFinder.new(current_user, project_id: project.id).find(target_id).notes.inc_author
|
|
when "merge_request"
|
|
MergeRequestsFinder.new(current_user, project_id: project.id).find(target_id).mr_and_commit_notes.inc_author
|
|
when "snippet", "project_snippet"
|
|
project.snippets.find(target_id).notes
|
|
else
|
|
raise 'invalid target_type'
|
|
end
|
|
|
|
# Use overlapping intervals to avoid worrying about race conditions
|
|
notes.where('updated_at > ?', last_fetched_at - FETCH_OVERLAP).fresh
|
|
end
|
|
end
|