From ff5b429eb57964c5c6ff15a1bf92e176694c3022 Mon Sep 17 00:00:00 2001 From: enahum Date: Tue, 5 Jul 2016 12:02:24 -0400 Subject: [PATCH] PLT-3429 "Site Statistics" graphs do not always have the same start date (#3480) --- store/sql_post_store.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/store/sql_post_store.go b/store/sql_post_store.go index 8b1c2bf9b5..e6291687e2 100644 --- a/store/sql_post_store.go +++ b/store/sql_post_store.go @@ -830,7 +830,7 @@ func (s SqlPostStore) AnalyticsUserCountsWithPostsByDay(teamId string) StoreChan query += " AND Channels.TeamId = :TeamId" } - query += ` AND Posts.CreateAt <= :EndTime + query += ` AND Posts.CreateAt >= :StartTime AND Posts.CreateAt <= :EndTime ORDER BY Name DESC) AS t1 GROUP BY Name ORDER BY Name DESC @@ -853,7 +853,7 @@ func (s SqlPostStore) AnalyticsUserCountsWithPostsByDay(teamId string) StoreChan query += " AND Channels.TeamId = :TeamId" } - query += ` AND Posts.CreateAt <= :EndTime + query += ` AND Posts.CreateAt >= :StartTime AND Posts.CreateAt <= :EndTime ORDER BY Name DESC) AS t1 GROUP BY Name ORDER BY Name DESC @@ -861,12 +861,13 @@ func (s SqlPostStore) AnalyticsUserCountsWithPostsByDay(teamId string) StoreChan } end := utils.MillisFromTime(utils.EndOfDay(utils.Yesterday())) + start := utils.MillisFromTime(utils.StartOfDay(utils.Yesterday().AddDate(0, 0, -31))) var rows model.AnalyticsRows _, err := s.GetReplica().Select( &rows, query, - map[string]interface{}{"TeamId": teamId, "EndTime": end}) + map[string]interface{}{"TeamId": teamId, "StartTime": start, "EndTime": end}) if err != nil { result.Err = model.NewLocAppError("SqlPostStore.AnalyticsUserCountsWithPostsByDay", "store.sql_post.analytics_user_counts_posts_by_day.app_error", nil, err.Error()) } else {