diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 2b2b885bf523a03afcf6ee1abd734f215e5e3fd4..0b13dbf5f8d260ff32d01bf287a0b6686f172ff9 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -165,11 +165,8 @@ module IssuablesHelper html.html_safe end - def cached_assigned_issuables_count(assignee, issuable_type, state) - cache_key = hexdigest(['assigned_issuables_count', assignee.id, issuable_type, state].join('-')) - Rails.cache.fetch(cache_key, expires_in: 2.minutes) do - assigned_issuables_count(assignee, issuable_type, state) - end + def assigned_issuables_count(issuable_type) + current_user.public_send("assigned_open_#{issuable_type}_count") end def issuable_filter_params @@ -192,11 +189,6 @@ module IssuablesHelper 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? cookies[:collapsed_gutter] == 'true' end diff --git a/app/models/user.rb b/app/models/user.rb index 87c409104b94cd5d8b1bfceb43a499ab9511bb88..0f0c5dc254ebf20100d506c529400cd883b4a805 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -888,8 +888,8 @@ class User < ActiveRecord::Base @global_notification_setting end - def assigned_open_merge_request_count(force: false) - Rails.cache.fetch(['users', id, 'assigned_open_merge_request_count'], force: force) do + def assigned_open_merge_requests_count(force: false) + Rails.cache.fetch(['users', id, 'assigned_open_merge_requests_count'], force: force) do MergeRequestsFinder.new(self, assignee_id: self.id, state: 'opened').execute.count end end @@ -901,7 +901,7 @@ class User < ActiveRecord::Base end def update_cache_counts - assigned_open_merge_request_count(force: true) + assigned_open_merge_requests_count(force: true) assigned_open_issues_count(force: true) end diff --git a/app/services/members/authorized_destroy_service.rb b/app/services/members/authorized_destroy_service.rb index e4c35e29cc963768a2d9861155ed0fb2a23340f6..1711be7211c6f566e2ca7457fba7c07e489dcf25 100644 --- a/app/services/members/authorized_destroy_service.rb +++ b/app/services/members/authorized_destroy_service.rb @@ -36,6 +36,7 @@ module Members project = member.source 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) + member.user.update_cache_counts end end end diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index a9893dea68fb31c953b44ae172c39fd732415248..49962aced6f40d0178495da0c6ce72d9736a22a3 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -47,13 +47,13 @@ %li = link_to assigned_issues_dashboard_path, title: 'Issues', aria: { label: "Issues" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = 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?) } = number_with_delimiter(issues_count) %li = 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') - - 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?) } = number_with_delimiter(merge_requests_count) %li diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml index 444ecc414c073ccb1a632d05806307c3f9d7a643..ac222ad8c823042ee21a1efa546f6980d9c43f8b 100644 --- a/app/views/layouts/nav/_dashboard.html.haml +++ b/app/views/layouts/nav/_dashboard.html.haml @@ -44,7 +44,7 @@ I %span 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 = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do .shortcut-mappings @@ -53,7 +53,7 @@ M %span 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 = link_to dashboard_snippets_path, class: 'dashboard-shortcuts-snippets', title: 'Snippets' do .shortcut-mappings diff --git a/doc/user/permissions.md b/doc/user/permissions.md index 2b01b530dc7bbe9ed2524a9e2deaf5f31bc28b8b..637967510f34947f51e0cb34c4d1bd9124159d07 100644 --- a/doc/user/permissions.md +++ b/doc/user/permissions.md @@ -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 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. GitLab administrators receive all permissions. diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb index d057c9cf6e9e3d89b99bab4e1d82ba5ddf0ea935..11befd4edfe4944a99032f069f4fa4e4e98fb1d2 100644 --- a/spec/models/issue_spec.rb +++ b/spec/models/issue_spec.rb @@ -361,7 +361,10 @@ describe Issue, models: true do it 'updates when assignees change' do user1 = 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(user2.assigned_open_issues_count).to eq(0) diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 90b3a2ba42d11208f04a9ea3058cda406efe9635..415d3e7b2004ecb3b797c6625d0334a66c882095 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -820,15 +820,17 @@ describe MergeRequest, models: true do user1 = create(:user) user2 = create(:user) 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(user2.assigned_open_merge_request_count).to eq(0) + expect(user1.assigned_open_merge_requests_count).to eq(1) + expect(user2.assigned_open_merge_requests_count).to eq(0) mr.assignee = user2 mr.save - expect(user1.assigned_open_merge_request_count).to eq(0) - expect(user2.assigned_open_merge_request_count).to eq(1) + expect(user1.assigned_open_merge_requests_count).to eq(0) + expect(user2.assigned_open_merge_requests_count).to eq(1) end end diff --git a/spec/services/members/authorized_destroy_service_spec.rb b/spec/services/members/authorized_destroy_service_spec.rb index 5cf2a4f656c05bfb6d816404678ee6f57333beca..3b35a3b8e3a3a0991e2a295345e3f2b0346c8a5e 100644 --- a/spec/services/members/authorized_destroy_service_spec.rb +++ b/spec/services/members/authorized_destroy_service_spec.rb @@ -21,8 +21,8 @@ describe Members::AuthorizedDestroyService, services: true do member = group.members.find_by(user_id: member_user.id) - expect{ described_class.new(member, member_user).execute } - .to change{ number_of_assigned_issuables(member_user) }.from(4).to(2) + expect { described_class.new(member, member_user).execute } + .to change { number_of_assigned_issuables(member_user) }.from(4).to(2) expect(issue.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 member = project.members.find_by(user_id: member_user.id) - expect{ described_class.new(member, member_user).execute } - .to change{ number_of_assigned_issuables(member_user) }.from(2).to(0) + expect { described_class.new(member, member_user).execute } + .to change { number_of_assigned_issuables(member_user) }.from(2).to(0) end end end