Fix project team members count

In Rails 5 `project.team.members` returns a CollectionProxy instead of array, which causes that `.flatten` fails. Although we could update the call to get distinct count directly with sql query, in this case it's better to re-use the list of members which is being loaded anyway.

Fix project team members count
8a5ad3ca · Jan Provaznik · c5adf04c · 8a5ad3ca
Commit 8a5ad3ca authored May 29, 2018 by Jan Provaznik
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

participants_service.rb app/services/projects/participants_service.rb +5 -3

No files found.
--- a/app/services/projects/participants_service.rb
+++ b/app/services/projects/participants_service.rb
@@ -5,14 +5,16 @@ module Projects
    def execute(noteable)
      @noteable = noteable

-      project_members = sorted(project.team.members)
      participants = noteable_owner + participants_in_noteable + all_members + groups + project_members
      participants.uniq
    end

+    def project_members
+      @project_members ||= sorted(project.team.members)
+    end
+
    def all_members
-      count = project.team.members.flatten.count
-      [{ username: "all", name: "All Project and Group Members", count: count }]
+      [{ username: "all", name: "All Project and Group Members", count: project_members.count }]
    end
  end
 end