diff options
Diffstat (limited to 'api')
-rw-r--r-- | api/admin.go | 44 | ||||
-rw-r--r-- | api/admin_test.go | 110 |
2 files changed, 153 insertions, 1 deletions
diff --git a/api/admin.go b/api/admin.go index 0ea6341e2..0ca05287e 100644 --- a/api/admin.go +++ b/api/admin.go @@ -161,9 +161,10 @@ func getAnalytics(c *Context, w http.ResponseWriter, r *http.Request) { rows[1] = &model.AnalyticsRow{"channel_private_count", 0} rows[2] = &model.AnalyticsRow{"post_count", 0} rows[3] = &model.AnalyticsRow{"unique_user_count", 0} + openChan := Srv.Store.Channel().AnalyticsTypeCount(teamId, model.CHANNEL_OPEN) privateChan := Srv.Store.Channel().AnalyticsTypeCount(teamId, model.CHANNEL_PRIVATE) - postChan := Srv.Store.Post().AnalyticsPostCount(teamId) + postChan := Srv.Store.Post().AnalyticsPostCount(teamId, false, false) userChan := Srv.Store.User().AnalyticsUniqueUserCount(teamId) if r := <-openChan; r.Err != nil { @@ -209,6 +210,47 @@ func getAnalytics(c *Context, w http.ResponseWriter, r *http.Request) { } else { w.Write([]byte(r.Data.(model.AnalyticsRows).ToJson())) } + } else if name == "extra_counts" { + var rows model.AnalyticsRows = make([]*model.AnalyticsRow, 4) + rows[0] = &model.AnalyticsRow{"file_post_count", 0} + rows[1] = &model.AnalyticsRow{"hashtag_post_count", 0} + rows[2] = &model.AnalyticsRow{"incoming_webhook_count", 0} + rows[3] = &model.AnalyticsRow{"outgoing_webhook_count", 0} + + fileChan := Srv.Store.Post().AnalyticsPostCount(teamId, true, false) + hashtagChan := Srv.Store.Post().AnalyticsPostCount(teamId, false, true) + iHookChan := Srv.Store.Webhook().AnalyticsIncomingCount(teamId) + oHookChan := Srv.Store.Webhook().AnalyticsOutgoingCount(teamId) + + if r := <-fileChan; r.Err != nil { + c.Err = r.Err + return + } else { + rows[0].Value = float64(r.Data.(int64)) + } + + if r := <-hashtagChan; r.Err != nil { + c.Err = r.Err + return + } else { + rows[1].Value = float64(r.Data.(int64)) + } + + if r := <-iHookChan; r.Err != nil { + c.Err = r.Err + return + } else { + rows[2].Value = float64(r.Data.(int64)) + } + + if r := <-oHookChan; r.Err != nil { + c.Err = r.Err + return + } else { + rows[3].Value = float64(r.Data.(int64)) + } + + w.Write([]byte(rows.ToJson())) } else { c.SetInvalidParam("getAnalytics", "name") } diff --git a/api/admin_test.go b/api/admin_test.go index 2552e642c..053a2a730 100644 --- a/api/admin_test.go +++ b/api/admin_test.go @@ -362,3 +362,113 @@ func TestUserCountsWithPostsByDay(t *testing.T) { } } } + +func TestGetTeamAnalyticsExtra(t *testing.T) { + Setup() + + team := &model.Team{DisplayName: "Name", Name: "z-z-" + model.NewId() + "a", Email: "test@nowhere.com", Type: model.TEAM_OPEN} + team = Client.Must(Client.CreateTeam(team)).Data.(*model.Team) + + user := &model.User{TeamId: team.Id, Email: model.NewId() + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "pwd"} + user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) + store.Must(Srv.Store.User().VerifyEmail(user.Id)) + + Client.LoginByEmail(team.Name, user.Email, "pwd") + + channel1 := &model.Channel{DisplayName: "TestGetPosts", Name: "a" + model.NewId() + "a", Type: model.CHANNEL_PRIVATE, TeamId: team.Id} + channel1 = Client.Must(Client.CreateChannel(channel1)).Data.(*model.Channel) + + post1 := &model.Post{ChannelId: channel1.Id, Message: "a" + model.NewId() + "a"} + post1 = Client.Must(Client.CreatePost(post1)).Data.(*model.Post) + + post2 := &model.Post{ChannelId: channel1.Id, Message: "#test a" + model.NewId() + "a"} + post2 = Client.Must(Client.CreatePost(post2)).Data.(*model.Post) + + if _, err := Client.GetTeamAnalytics("", "extra_counts"); err == nil { + t.Fatal("Shouldn't have permissions") + } + + c := &Context{} + c.RequestId = model.NewId() + c.IpAddress = "cmd_line" + UpdateRoles(c, user, model.ROLE_SYSTEM_ADMIN) + + Client.LoginByEmail(team.Name, user.Email, "pwd") + + if result, err := Client.GetTeamAnalytics(team.Id, "extra_counts"); err != nil { + t.Fatal(err) + } else { + rows := result.Data.(model.AnalyticsRows) + + if rows[0].Name != "file_post_count" { + t.Log(rows.ToJson()) + t.Fatal() + } + + if rows[0].Value != 0 { + t.Log(rows.ToJson()) + t.Fatal() + } + + if rows[1].Name != "hashtag_post_count" { + t.Log(rows.ToJson()) + t.Fatal() + } + + if rows[1].Value != 1 { + t.Log(rows.ToJson()) + t.Fatal() + } + + if rows[2].Name != "incoming_webhook_count" { + t.Log(rows.ToJson()) + t.Fatal() + } + + if rows[2].Value != 0 { + t.Log(rows.ToJson()) + t.Fatal() + } + + if rows[3].Name != "outgoing_webhook_count" { + t.Log(rows.ToJson()) + t.Fatal() + } + + if rows[3].Value != 0 { + t.Log(rows.ToJson()) + t.Fatal() + } + } + + if result, err := Client.GetSystemAnalytics("extra_counts"); err != nil { + t.Fatal(err) + } else { + rows := result.Data.(model.AnalyticsRows) + + if rows[0].Name != "file_post_count" { + t.Log(rows.ToJson()) + t.Fatal() + } + + if rows[1].Name != "hashtag_post_count" { + t.Log(rows.ToJson()) + t.Fatal() + } + + if rows[1].Value < 1 { + t.Log(rows.ToJson()) + t.Fatal() + } + + if rows[2].Name != "incoming_webhook_count" { + t.Log(rows.ToJson()) + t.Fatal() + } + + if rows[3].Name != "outgoing_webhook_count" { + t.Log(rows.ToJson()) + t.Fatal() + } + } +} |