From 3e22efc5f791603c3b9fe3c1bea88cbb30e3e1e8 Mon Sep 17 00:00:00 2001 From: Danny Date: Wed, 9 May 2018 08:36:29 +0200 Subject: [PATCH] when getting stats for a given period; date should larger than start date, but not equal --- pkg/datastore/page_stats.go | 2 +- pkg/datastore/referrer_stats.go | 2 +- pkg/datastore/site_stats.go | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/datastore/page_stats.go b/pkg/datastore/page_stats.go index 232567f..63dacef 100644 --- a/pkg/datastore/page_stats.go +++ b/pkg/datastore/page_stats.go @@ -30,7 +30,7 @@ func UpdatePageStats(s *models.PageStats) error { func GetAggregatedPageStats(startDate time.Time, endDate time.Time, limit int) ([]*models.PageStats, error) { var result []*models.PageStats - query := dbx.Rebind(`SELECT hostname, pathname, SUM(pageviews) AS pageviews, SUM(visitors) AS visitors, SUM(entries) AS entries, ROUND(AVG(bounce_rate), 0) AS bounce_rate FROM daily_page_stats WHERE date >= ? AND date <= ? GROUP BY hostname, pathname ORDER BY pageviews DESC LIMIT ?`) + query := dbx.Rebind(`SELECT hostname, pathname, SUM(pageviews) AS pageviews, SUM(visitors) AS visitors, SUM(entries) AS entries, ROUND(AVG(bounce_rate), 0) AS bounce_rate FROM daily_page_stats WHERE date > ? AND date <= ? GROUP BY hostname, pathname ORDER BY pageviews DESC LIMIT ?`) err := dbx.Select(&result, query, startDate.Format("2006-01-02"), endDate.Format("2006-01-02"), limit) return result, err } diff --git a/pkg/datastore/referrer_stats.go b/pkg/datastore/referrer_stats.go index 15b2e80..ffbf04b 100644 --- a/pkg/datastore/referrer_stats.go +++ b/pkg/datastore/referrer_stats.go @@ -31,7 +31,7 @@ func UpdateReferrerStats(s *models.ReferrerStats) error { func GetAggregatedReferrerStats(startDate time.Time, endDate time.Time, limit int) ([]*models.ReferrerStats, error) { var result []*models.ReferrerStats - query := dbx.Rebind(`SELECT url, SUM(visitors) AS visitors, SUM(pageviews) AS pageviews FROM daily_referrer_stats WHERE date >= ? AND date <= ? GROUP BY url ORDER BY pageviews DESC LIMIT ?`) + query := dbx.Rebind(`SELECT url, SUM(visitors) AS visitors, SUM(pageviews) AS pageviews FROM daily_referrer_stats WHERE date > ? AND date <= ? GROUP BY url ORDER BY pageviews DESC LIMIT ?`) err := dbx.Select(&result, query, startDate.Format("2006-01-02"), endDate.Format("2006-01-02"), limit) return result, err } diff --git a/pkg/datastore/site_stats.go b/pkg/datastore/site_stats.go index 3e0f0a7..16c6aa4 100644 --- a/pkg/datastore/site_stats.go +++ b/pkg/datastore/site_stats.go @@ -29,7 +29,7 @@ func UpdateSiteStats(s *models.SiteStats) error { } func GetTotalSiteViews(startDate time.Time, endDate time.Time) (int, error) { - sql := `SELECT COALESCE(SUM(pageviews), 0) FROM daily_site_stats WHERE date >= ? AND date <= ?` + sql := `SELECT COALESCE(SUM(pageviews), 0) FROM daily_site_stats WHERE date > ? AND date <= ?` query := dbx.Rebind(sql) var total int err := dbx.Get(&total, query, startDate.Format("2006-01-02"), endDate.Format("2006-01-02")) @@ -37,7 +37,7 @@ func GetTotalSiteViews(startDate time.Time, endDate time.Time) (int, error) { } func GetTotalSiteVisitors(startDate time.Time, endDate time.Time) (int, error) { - sql := `SELECT COALESCE(SUM(visitors), 0) FROM daily_site_stats WHERE date >= ? AND date <= ?` + sql := `SELECT COALESCE(SUM(visitors), 0) FROM daily_site_stats WHERE date > ? AND date <= ?` query := dbx.Rebind(sql) var total int err := dbx.Get(&total, query, startDate.Format("2006-01-02"), endDate.Format("2006-01-02")) @@ -45,7 +45,7 @@ func GetTotalSiteVisitors(startDate time.Time, endDate time.Time) (int, error) { } func GetTotalSiteSessions(startDate time.Time, endDate time.Time) (int, error) { - sql := `SELECT COALESCE(SUM(sessions), 0) FROM daily_site_stats WHERE date >= ? AND date <= ?` + sql := `SELECT COALESCE(SUM(sessions), 0) FROM daily_site_stats WHERE date > ? AND date <= ?` query := dbx.Rebind(sql) var total int err := dbx.Get(&total, query, startDate.Format("2006-01-02"), endDate.Format("2006-01-02")) @@ -53,7 +53,7 @@ func GetTotalSiteSessions(startDate time.Time, endDate time.Time) (int, error) { } func GetAverageSiteDuration(startDate time.Time, endDate time.Time) (int, error) { - sql := `SELECT COALESCE(ROUND(AVG(avg_duration), 0), 0) FROM daily_site_stats WHERE date >= ? AND date <= ?` + sql := `SELECT COALESCE(ROUND(AVG(avg_duration), 0), 0) FROM daily_site_stats WHERE date > ? AND date <= ?` query := dbx.Rebind(sql) var total int err := dbx.Get(&total, query, startDate.Format("2006-01-02"), endDate.Format("2006-01-02")) @@ -61,7 +61,7 @@ func GetAverageSiteDuration(startDate time.Time, endDate time.Time) (int, error) } func GetAverageSiteBounceRate(startDate time.Time, endDate time.Time) (float64, error) { - sql := `SELECT COALESCE(AVG(bounce_rate), 0.00) FROM daily_site_stats WHERE date >= ? AND date <= ?` + sql := `SELECT COALESCE(AVG(bounce_rate), 0.00) FROM daily_site_stats WHERE date > ? AND date <= ?` query := dbx.Rebind(sql) var total float64 err := dbx.Get(&total, query, startDate.Format("2006-01-02"), endDate.Format("2006-01-02"))