sqlstore GetXStats funcs should return nil when there are 0 results. #50

pkg/aggregator/aggregator.go

@@ -9,19 +9,25 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-type aggregator struct {
+type Aggregator struct {
 	database datastore.Datastore
 }
 
+type results struct {
+	Sites     map[string]*models.SiteStats
+	Pages     map[string]*models.PageStats
+	Referrers map[string]*models.ReferrerStats
+}
+
 // New returns a new aggregator instance with the database dependency injected.
-func New(db datastore.Datastore) *aggregator {
-	return &aggregator{
+func New(db datastore.Datastore) *Aggregator {
+	return &Aggregator{
 		database: db,
 	}
 }
 
 // Run processes the pageviews which are ready to be processed and adds them to daily aggregation
-func (agg *aggregator) Run() int {
+func (agg *Aggregator) Run() int {
 	// Get unprocessed pageviews
 	pageviews, err := agg.database.GetProcessablePageviews()
 	if err != nil && err != datastore.ErrNoResults {
@@ -51,17 +57,20 @@ func (agg *aggregator) Run() int {
 
 	// create map of public tracking ID's => site ID
 	trackingIDMap := make(map[string]int64, len(sites)+1)
-	trackingIDMap[""] = 1
 	for _, s := range sites {
 		trackingIDMap[s.TrackingID] = s.ID
 	}
 
+	// if no explicit site ID was given in the tracking request, default to site with ID 1
+	trackingIDMap[""] = 1
+
 	// add each pageview to the various statistics we gather
 	for _, p := range pageviews {
 
 		// discard pageview if site tracking ID is unknown
 		siteID, ok := trackingIDMap[p.SiteTrackingID]
 		if !ok {
+			log.Debugf("discarding pageview because of unrecognized site tracking ID %s", p.SiteTrackingID)
 			continue
 		}
 
@@ -100,29 +109,25 @@ func (agg *aggregator) Run() int {
 
 	// update stats
 	for _, site := range results.Sites {
-		err = agg.database.SaveSiteStats(site)
-		if err != nil {
+		if err := agg.database.SaveSiteStats(site); err != nil {
 			log.Error(err)
 		}
 	}
 
 	for _, pageStats := range results.Pages {
-		err = agg.database.SavePageStats(pageStats)
-		if err != nil {
+		if err := agg.database.SavePageStats(pageStats); err != nil {
 			log.Error(err)
 		}
 	}
 
 	for _, referrerStats := range results.Referrers {
-		err = agg.database.SaveReferrerStats(referrerStats)
-		if err != nil {
+		if err := agg.database.SaveReferrerStats(referrerStats); err != nil {
 			log.Error(err)
 		}
 	}
 
 	// finally, remove pageviews that we just processed
-	err = agg.database.DeletePageviews(pageviews)
-	if err != nil {
+	if err := agg.database.DeletePageviews(pageviews); err != nil {
 		log.Error(err)
 	}
 

pkg/aggregator/result.go

@@ -1,19 +0,0 @@
-package aggregator
-
-import (
-	"github.com/usefathom/fathom/pkg/models"
-)
-
-type results struct {
-	Sites     map[string]*models.SiteStats
-	Pages     map[string]*models.PageStats
-	Referrers map[string]*models.ReferrerStats
-}
-
-func newResults() *results {
-	return &results{
-		Sites:     map[string]*models.SiteStats{},
-		Pages:     map[string]*models.PageStats{},
-		Referrers: map[string]*models.ReferrerStats{},
-	}
-}

pkg/aggregator/store.go

@@ -9,7 +9,7 @@ import (
 	"github.com/usefathom/fathom/pkg/models"
 )
 
-func (agg *aggregator) getSiteStats(r *results, siteID int64, t time.Time) (*models.SiteStats, error) {
+func (agg *Aggregator) getSiteStats(r *results, siteID int64, t time.Time) (*models.SiteStats, error) {
 	// get from map
 	cacheKey := fmt.Sprintf("%d-%s", siteID, t.Format("2006-01-02"))
 	if stats, ok := r.Sites[cacheKey]; ok {
@@ -35,7 +35,7 @@ func (agg *aggregator) getSiteStats(r *results, siteID int64, t time.Time) (*mod
 	return stats, nil
 }
 
-func (agg *aggregator) getPageStats(r *results, siteID int64, t time.Time, hostname string, pathname string) (*models.PageStats, error) {
+func (agg *Aggregator) getPageStats(r *results, siteID int64, t time.Time, hostname string, pathname string) (*models.PageStats, error) {
 	cacheKey := fmt.Sprintf("%d-%s-%s-%s", siteID, t.Format("2006-01-02"), hostname, pathname)
 	if stats, ok := r.Pages[cacheKey]; ok {
 		return stats, nil
@@ -61,7 +61,7 @@ func (agg *aggregator) getPageStats(r *results, siteID int64, t time.Time, hostn
 	return stats, nil
 }
 
-func (agg *aggregator) getReferrerStats(r *results, siteID int64, t time.Time, hostname string, pathname string) (*models.ReferrerStats, error) {
+func (agg *Aggregator) getReferrerStats(r *results, siteID int64, t time.Time, hostname string, pathname string) (*models.ReferrerStats, error) {
 	cacheKey := fmt.Sprintf("%d-%s-%s-%s", siteID, t.Format("2006-01-02"), hostname, pathname)
 	if stats, ok := r.Referrers[cacheKey]; ok {
 		return stats, nil

pkg/datastore/sqlstore/page_stats.go

@@ -1,15 +1,20 @@
 package sqlstore
 
 import (
+	"database/sql"
 	"time"
 
 	"github.com/usefathom/fathom/pkg/models"
 )
 
 func (db *sqlstore) GetPageStats(siteID int64, date time.Time, hostname string, pathname string) (*models.PageStats, error) {
-	stats := &models.PageStats{}
+	stats := &models.PageStats{New: false}
 	query := db.Rebind(`SELECT * FROM daily_page_stats WHERE site_id = ? AND hostname = ? AND pathname = ? AND date = ? LIMIT 1`)
 	err := db.Get(stats, query, siteID, hostname, pathname, date.Format("2006-01-02"))
+	if err == sql.ErrNoRows {
+		return nil, ErrNoResults
+	}
+
 	return stats, mapError(err)
 }
 

pkg/datastore/sqlstore/referrer_stats.go

@@ -1,15 +1,20 @@
 package sqlstore
 
 import (
+	"database/sql"
 	"time"
 
 	"github.com/usefathom/fathom/pkg/models"
 )
 
 func (db *sqlstore) GetReferrerStats(siteID int64, date time.Time, hostname string, pathname string) (*models.ReferrerStats, error) {
-	stats := &models.ReferrerStats{}
+	stats := &models.ReferrerStats{New: false}
 	query := db.Rebind(`SELECT * FROM daily_referrer_stats WHERE site_id = ? AND date = ? AND hostname = ? AND pathname = ? LIMIT 1`)
 	err := db.Get(stats, query, siteID, date.Format("2006-01-02"), hostname, pathname)
+	if err == sql.ErrNoRows {
+		return nil, ErrNoResults
+	}
+
 	return stats, mapError(err)
 }
 

pkg/datastore/sqlstore/site_stats.go

@@ -10,7 +10,12 @@ import (
 func (db *sqlstore) GetSiteStats(siteID int64, date time.Time) (*models.SiteStats, error) {
 	stats := &models.SiteStats{New: false}
 	query := db.Rebind(`SELECT * FROM daily_site_stats WHERE site_id = ? AND date = ? LIMIT 1`)
+
 	err := db.Get(stats, query, siteID, date.Format("2006-01-02"))
+	if err == sql.ErrNoRows {
+		return nil, ErrNoResults
+	}
+
 	return stats, mapError(err)
 }