Commit 36a8cc3e authored by Valery Sizov's avatar Valery Sizov

Remove helpers assigned_issuables_count and cached_assigned_issuables_count

parent 59a330f4
...@@ -165,11 +165,8 @@ module IssuablesHelper ...@@ -165,11 +165,8 @@ module IssuablesHelper
html.html_safe html.html_safe
end end
def cached_assigned_issuables_count(assignee, issuable_type, state) def assigned_issuables_count(issuable_type)
cache_key = hexdigest(['assigned_issuables_count', assignee.id, issuable_type, state].join('-')) current_user.public_send("assigned_open_#{issuable_type}_count")
Rails.cache.fetch(cache_key, expires_in: 2.minutes) do
assigned_issuables_count(assignee, issuable_type, state)
end
end end
def issuable_filter_params def issuable_filter_params
...@@ -192,11 +189,6 @@ module IssuablesHelper ...@@ -192,11 +189,6 @@ module IssuablesHelper
private private
def assigned_issuables_count(assignee, issuable_type, state)
params = { assignee_id: assignee.id, state: state }
Object.const_get("#{issuable_type.to_s.camelize}Finder").new(current_user, params).execute.count
end
def sidebar_gutter_collapsed? def sidebar_gutter_collapsed?
cookies[:collapsed_gutter] == 'true' cookies[:collapsed_gutter] == 'true'
end end
......
...@@ -888,8 +888,8 @@ class User < ActiveRecord::Base ...@@ -888,8 +888,8 @@ class User < ActiveRecord::Base
@global_notification_setting @global_notification_setting
end end
def assigned_open_merge_request_count(force: false) def assigned_open_merge_requests_count(force: false)
Rails.cache.fetch(['users', id, 'assigned_open_merge_request_count'], force: force) do Rails.cache.fetch(['users', id, 'assigned_open_merge_requests_count'], force: force) do
MergeRequestsFinder.new(self, assignee_id: self.id, state: 'opened').execute.count MergeRequestsFinder.new(self, assignee_id: self.id, state: 'opened').execute.count
end end
end end
...@@ -901,7 +901,7 @@ class User < ActiveRecord::Base ...@@ -901,7 +901,7 @@ class User < ActiveRecord::Base
end end
def update_cache_counts def update_cache_counts
assigned_open_merge_request_count(force: true) assigned_open_merge_requests_count(force: true)
assigned_open_issues_count(force: true) assigned_open_issues_count(force: true)
end end
......
...@@ -36,6 +36,7 @@ module Members ...@@ -36,6 +36,7 @@ module Members
project = member.source project = member.source
project.issues.opened.assigned_to(member.user).update_all(assignee_id: nil) project.issues.opened.assigned_to(member.user).update_all(assignee_id: nil)
project.merge_requests.opened.assigned_to(member.user).update_all(assignee_id: nil) project.merge_requests.opened.assigned_to(member.user).update_all(assignee_id: nil)
member.user.update_cache_counts
end end
end end
end end
......
...@@ -47,13 +47,13 @@ ...@@ -47,13 +47,13 @@
%li %li
= link_to assigned_issues_dashboard_path, title: 'Issues', aria: { label: "Issues" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = link_to assigned_issues_dashboard_path, title: 'Issues', aria: { label: "Issues" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
= icon('hashtag fw') = icon('hashtag fw')
- issues_count = cached_assigned_issuables_count(current_user, :issues, :opened) - issues_count = assigned_issuables_count(:issues)
%span.badge.issues-count{ class: ('hidden' if issues_count.zero?) } %span.badge.issues-count{ class: ('hidden' if issues_count.zero?) }
= number_with_delimiter(issues_count) = number_with_delimiter(issues_count)
%li %li
= link_to assigned_mrs_dashboard_path, title: 'Merge requests', aria: { label: "Merge requests" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = link_to assigned_mrs_dashboard_path, title: 'Merge requests', aria: { label: "Merge requests" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
= custom_icon('mr_bold') = custom_icon('mr_bold')
- merge_requests_count = cached_assigned_issuables_count(current_user, :merge_requests, :opened) - merge_requests_count = assigned_issuables_count(:merge_requests)
%span.badge.merge-requests-count{ class: ('hidden' if merge_requests_count.zero?) } %span.badge.merge-requests-count{ class: ('hidden' if merge_requests_count.zero?) }
= number_with_delimiter(merge_requests_count) = number_with_delimiter(merge_requests_count)
%li %li
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
I I
%span %span
Issues Issues
.badge= number_with_delimiter(cached_assigned_issuables_count(current_user, :issues, :opened)) .badge= number_with_delimiter(assigned_issuables_count(:issues))
= nav_link(path: 'dashboard#merge_requests') do = nav_link(path: 'dashboard#merge_requests') do
= link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do
.shortcut-mappings .shortcut-mappings
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
M M
%span %span
Merge Requests Merge Requests
.badge= number_with_delimiter(cached_assigned_issuables_count(current_user, :merge_requests, :opened)) .badge= number_with_delimiter(assigned_issuables_count(:merge_requests))
= nav_link(controller: 'dashboard/snippets') do = nav_link(controller: 'dashboard/snippets') do
= link_to dashboard_snippets_path, class: 'dashboard-shortcuts-snippets', title: 'Snippets' do = link_to dashboard_snippets_path, class: 'dashboard-shortcuts-snippets', title: 'Snippets' do
.shortcut-mappings .shortcut-mappings
......
...@@ -7,7 +7,7 @@ project itself, the highest permission level is used. ...@@ -7,7 +7,7 @@ project itself, the highest permission level is used.
On public and internal projects the Guest role is not enforced. All users will On public and internal projects the Guest role is not enforced. All users will
be able to create issues, leave comments, and pull or download the project code. be able to create issues, leave comments, and pull or download the project code.
When member leaves the team the all assigned Issues and Merge Requests When a member leaves the team the all assigned Issues and Merge Requests
will be unassigned automatically. will be unassigned automatically.
GitLab administrators receive all permissions. GitLab administrators receive all permissions.
......
...@@ -361,7 +361,10 @@ describe Issue, models: true do ...@@ -361,7 +361,10 @@ describe Issue, models: true do
it 'updates when assignees change' do it 'updates when assignees change' do
user1 = create(:user) user1 = create(:user)
user2 = create(:user) user2 = create(:user)
issue = create(:issue, assignee: user1) project = create(:empty_project)
issue = create(:issue, assignee: user1, project: project)
project.add_developer(user1)
project.add_developer(user2)
expect(user1.assigned_open_issues_count).to eq(1) expect(user1.assigned_open_issues_count).to eq(1)
expect(user2.assigned_open_issues_count).to eq(0) expect(user2.assigned_open_issues_count).to eq(0)
......
...@@ -820,15 +820,17 @@ describe MergeRequest, models: true do ...@@ -820,15 +820,17 @@ describe MergeRequest, models: true do
user1 = create(:user) user1 = create(:user)
user2 = create(:user) user2 = create(:user)
mr = create(:merge_request, assignee: user1) mr = create(:merge_request, assignee: user1)
mr.project.add_developer(user1)
mr.project.add_developer(user2)
expect(user1.assigned_open_merge_request_count).to eq(1) expect(user1.assigned_open_merge_requests_count).to eq(1)
expect(user2.assigned_open_merge_request_count).to eq(0) expect(user2.assigned_open_merge_requests_count).to eq(0)
mr.assignee = user2 mr.assignee = user2
mr.save mr.save
expect(user1.assigned_open_merge_request_count).to eq(0) expect(user1.assigned_open_merge_requests_count).to eq(0)
expect(user2.assigned_open_merge_request_count).to eq(1) expect(user2.assigned_open_merge_requests_count).to eq(1)
end end
end end
......
...@@ -21,8 +21,8 @@ describe Members::AuthorizedDestroyService, services: true do ...@@ -21,8 +21,8 @@ describe Members::AuthorizedDestroyService, services: true do
member = group.members.find_by(user_id: member_user.id) member = group.members.find_by(user_id: member_user.id)
expect{ described_class.new(member, member_user).execute } expect { described_class.new(member, member_user).execute }
.to change{ number_of_assigned_issuables(member_user) }.from(4).to(2) .to change { number_of_assigned_issuables(member_user) }.from(4).to(2)
expect(issue.reload.assignee_id).to be_nil expect(issue.reload.assignee_id).to be_nil
expect(merge_request.reload.assignee_id).to be_nil expect(merge_request.reload.assignee_id).to be_nil
...@@ -38,8 +38,8 @@ describe Members::AuthorizedDestroyService, services: true do ...@@ -38,8 +38,8 @@ describe Members::AuthorizedDestroyService, services: true do
member = project.members.find_by(user_id: member_user.id) member = project.members.find_by(user_id: member_user.id)
expect{ described_class.new(member, member_user).execute } expect { described_class.new(member, member_user).execute }
.to change{ number_of_assigned_issuables(member_user) }.from(2).to(0) .to change { number_of_assigned_issuables(member_user) }.from(2).to(0)
end end
end end
end end
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 to comment