diff options
| author | enahum <nahumhbl@gmail.com> | 2016-07-05 12:02:24 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-07-05 12:02:24 -0400 |
| commit | ff5b429eb57964c5c6ff15a1bf92e176694c3022 (patch) | |
| tree | 163f794c1161e2c7a69a7099a6b969069765db0a /store/sql_post_store.go | |
| parent | dc2f2a800105b77e665ec2a00c6290f35b1a2ba3 (diff) | |
| download | chat-ff5b429eb57964c5c6ff15a1bf92e176694c3022.tar.gz chat-ff5b429eb57964c5c6ff15a1bf92e176694c3022.tar.bz2 chat-ff5b429eb57964c5c6ff15a1bf92e176694c3022.zip | |
PLT-3429 "Site Statistics" graphs do not always have the same start date (#3480)
Diffstat (limited to 'store/sql_post_store.go')
| -rw-r--r-- | store/sql_post_store.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/store/sql_post_store.go b/store/sql_post_store.go index 8b1c2bf9b..e6291687e 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 { |