[MM-46692] Channel group member count (#21270)

* tools updates

* Revert "tools updates"

This reverts commit 6293297b55803c5a263e200ebd80192899666ae9.

* adding channel member count to groups request

* fixing models

* adding a new test

* removing unused var

Co-authored-by: Benjamin Cooke <benjamincooke@Benjamins-MacBook-Pro.local>
Co-authored-by: Benjamin Cooke <benjamincooke@Benjamins-MBP.ht.home>
Co-authored-by: Benjamin Cooke <benjamincooke@Benjamins-MBP.fritz.box>
Co-authored-by: Benjamin Cooke <benjamincooke@Benjamins-MacBook-Pro.fritz.box>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>

api4/group_test.go

@@ -1291,6 +1291,28 @@ func TestGetGroups(t *testing.T) {
 	assert.Len(t, groups, 1)
 	assert.Equal(t, groups[0].Id, group2.Id)
 
+	// Test IncludeChannelMemberCount url param is working
+	opts.IncludeChannelMemberCount = th.BasicChannel.Id
+	opts.IncludeTimezones = true
+	opts.Q = "-fOo"
+	opts.IncludeMemberCount = true
+
+	groups, _, _ = th.SystemAdminClient.GetGroups(opts)
+	assert.Equal(t, *groups[0].MemberCount, int(0))
+	assert.Equal(t, *groups[0].ChannelMemberCount, int(0))
+
+	_, appErr = th.App.UpsertGroupMember(group2.Id, th.BasicUser.Id)
+	assert.Nil(t, appErr)
+
+	groups, _, _ = th.SystemAdminClient.GetGroups(opts)
+	assert.NotNil(t, groups[0].MemberCount)
+	assert.Equal(t, *groups[0].ChannelMemberCount, int(1))
+
+	opts.IncludeChannelMemberCount = ""
+	opts.IncludeTimezones = false
+	opts.Q = ""
+	opts.IncludeMemberCount = false
+
 	th.App.UpdateConfig(func(cfg *model.Config) {
 		*cfg.ServiceSettings.EnableCustomGroups = false
 	})