Merge branch '39-count-unique-users-for-more-accurate-smau-reporting' into 'master'

Allow UsageData.count to use count_by:

See merge request gitlab-org/gitlab-ce!30770

app/models/members/group_member.rb

@@ -15,8 +15,8 @@ class GroupMember < Member
   default_scope { where(source_type: SOURCE_TYPE) }
 
   scope :of_groups, ->(groups) { where(source_id: groups.select(:id)) }
-
   scope :count_users_by_group_id, -> { joins(:user).group(:source_id).count }
+  scope :of_ldap_type, -> { where(ldap: true) }
 
   after_create :update_two_factor_requirement, unless: :invite?
   after_destroy :update_two_factor_requirement, unless: :invite?

lib/gitlab/usage_data.rb

@@ -188,8 +188,8 @@ module Gitlab
         {} # augmented in EE
       end
 
-      def count(relation, fallback: -1)
-        relation.count
+      def count(relation, count_by: nil, fallback: -1)
+        count_by ? relation.count(count_by) : relation.count
       rescue ActiveRecord::StatementInvalid
         fallback
       end

spec/factories/group_members.rb

@@ -20,5 +20,9 @@ FactoryBot.define do
         "email#{n}@email.com"
       end
     end
+
+    trait(:ldap) do
+      ldap true
+    end
   end
 end

spec/lib/gitlab/usage_data_spec.rb

@@ -266,6 +266,12 @@ describe Gitlab::UsageData do
       expect(described_class.count(relation)).to eq(1)
     end
 
+    it 'returns the count for count_by when provided' do
+      allow(relation).to receive(:count).with(:creator_id).and_return(2)
+
+      expect(described_class.count(relation, count_by: :creator_id)).to eq(2)
+    end
+
     it 'returns the fallback value when counting fails' do
       allow(relation).to receive(:count).and_raise(ActiveRecord::StatementInvalid.new(''))
 

spec/models/members/group_member_spec.rb

@@ -3,6 +3,7 @@
 require 'spec_helper'
 
 describe GroupMember do
+  context 'scopes' do
     describe '.count_users_by_group_id' do
       it 'counts users by group ID' do
         user_1 = create(:user)
@@ -19,6 +20,15 @@ describe GroupMember do
       end
     end
 
+    describe '.of_ldap_type' do
+      it 'returns ldap type users' do
+        group_member = create(:group_member, :ldap)
+
+        expect(described_class.of_ldap_type).to eq([group_member])
+      end
+    end
+  end
+
   describe '.access_level_roles' do
     it 'returns Gitlab::Access.options_with_owner' do
       expect(described_class.access_level_roles).to eq(Gitlab::Access.options_with_owner)