diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-11-04 12:27:19 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-11-04 12:27:19 -0400 |
commit | 00787974d0a87b1a54f15cf75d2dab398546b87e (patch) | |
tree | 6f41b56b10183b6543309b790cd13b1fbf7559af /api/team.go | |
parent | 263f29068386cdd3b5393e00ce97f776532c723f (diff) | |
download | chat-00787974d0a87b1a54f15cf75d2dab398546b87e.tar.gz chat-00787974d0a87b1a54f15cf75d2dab398546b87e.tar.bz2 chat-00787974d0a87b1a54f15cf75d2dab398546b87e.zip |
PLT-4481 Fix member count for team user lists and channel invite list (#4422)
* Fix member count for team user lists and channel invite list
* Fix client unit test
Diffstat (limited to 'api/team.go')
-rw-r--r-- | api/team.go | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/api/team.go b/api/team.go index 5a8c605ef..b1a1ae3cd 100644 --- a/api/team.go +++ b/api/team.go @@ -902,16 +902,27 @@ func getTeamStats(c *Context, w http.ResponseWriter, r *http.Request) { } } - if result := <-Srv.Store.Team().GetMemberCount(c.TeamId); result.Err != nil { + tchan := Srv.Store.Team().GetTotalMemberCount(c.TeamId) + achan := Srv.Store.Team().GetActiveMemberCount(c.TeamId) + + stats := &model.TeamStats{} + stats.TeamId = c.TeamId + + if result := <-tchan; result.Err != nil { c.Err = result.Err return } else { - stats := &model.TeamStats{} - stats.MemberCount = result.Data.(int64) - stats.TeamId = c.TeamId - w.Write([]byte(stats.ToJson())) + stats.TotalMemberCount = result.Data.(int64) + } + + if result := <-achan; result.Err != nil { + c.Err = result.Err return + } else { + stats.ActiveMemberCount = result.Data.(int64) } + + w.Write([]byte(stats.ToJson())) } func importTeam(c *Context, w http.ResponseWriter, r *http.Request) { |