default to site_id 1, even though it may not exist yet

pkg/aggregator/aggregator.go

@@ -51,7 +51,7 @@ func (agg *aggregator) Run() int {
 
 	// create map of public tracking ID's => site ID
 	trackingIDMap := make(map[string]int64, len(sites)+1)
-	trackingIDMap[""] = 0
+	trackingIDMap[""] = 1
 	for _, s := range sites {
 		trackingIDMap[s.TrackingID] = s.ID
 	}

pkg/api/sites.go

@@ -2,7 +2,6 @@ package api
 
 import (
 	"encoding/json"
-	"log"
 	"math/rand"
 	"net/http"
 	"strconv"
@@ -53,13 +52,10 @@ func (api *API) SaveSiteHandler(w http.ResponseWriter, r *http.Request) error {
 		return err
 	}
 
-	log.Printf("Site tracking ID: %s\n", s.TrackingID)
 	if err := api.database.SaveSite(s); err != nil {
 		return err
 	}
 
-	// TODO: If we just created the first site, add existing data (with site_id = 0) to the site we just created
-
 	return respond(w, http.StatusOK, envelope{Data: s})
 }
 

pkg/datastore/sqlstore/migrations/mysql/7_add_site_id_to_site_stats_table.sql

@@ -1,6 +1,6 @@
 -- +migrate Up
 
-ALTER TABLE daily_site_stats ADD COLUMN site_id INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE daily_site_stats ADD COLUMN site_id INTEGER NOT NULL DEFAULT 1;
 
 -- +migrate Down
 

pkg/datastore/sqlstore/migrations/mysql/8_add_site_id_to_page_stats_table.sql

@@ -1,6 +1,6 @@
 -- +migrate Up
 
-ALTER TABLE daily_page_stats ADD COLUMN site_id INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE daily_page_stats ADD COLUMN site_id INTEGER NOT NULL DEFAULT 1;
 
 -- +migrate Down
 

pkg/datastore/sqlstore/migrations/mysql/9_add_site_id_to_referrer_stats_table.sql

@@ -1,6 +1,6 @@
 -- +migrate Up
 
-ALTER TABLE daily_referrer_stats ADD COLUMN site_id INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE daily_referrer_stats ADD COLUMN site_id INTEGER NOT NULL DEFAULT 1;
 
 -- +migrate Down
 

pkg/datastore/sqlstore/migrations/postgres/7_add_site_id_to_site_stats_table.sql

@@ -1,6 +1,6 @@
 -- +migrate Up
 
-ALTER TABLE daily_site_stats ADD COLUMN site_id INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE daily_site_stats ADD COLUMN site_id INTEGER NOT NULL DEFAULT 1;
 
 -- +migrate Down
 

pkg/datastore/sqlstore/migrations/postgres/8_add_site_id_to_page_stats_table.sql

@@ -1,6 +1,6 @@
 -- +migrate Up
 
-ALTER TABLE daily_page_stats ADD COLUMN site_id INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE daily_page_stats ADD COLUMN site_id INTEGER NOT NULL DEFAULT 1;
 
 -- +migrate Down
 

pkg/datastore/sqlstore/migrations/postgres/9_add_site_id_to_referrer_stats_table.sql

@@ -1,6 +1,6 @@
 -- +migrate Up
 
-ALTER TABLE daily_referrer_stats ADD COLUMN site_id INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE daily_referrer_stats ADD COLUMN site_id INTEGER NOT NULL DEFAULT 1;
 
 -- +migrate Down
 

pkg/datastore/sqlstore/migrations/sqlite3/7_add_site_id_to_site_stats_table.sql

@@ -1,6 +1,6 @@
 -- +migrate Up
 
-ALTER TABLE daily_site_stats ADD COLUMN site_id INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE daily_site_stats ADD COLUMN site_id INTEGER NOT NULL DEFAULT 1;
 
 -- +migrate Down
 

pkg/datastore/sqlstore/migrations/sqlite3/8_add_site_id_to_page_stats_table.sql

@@ -1,6 +1,6 @@
 -- +migrate Up
 
-ALTER TABLE daily_page_stats ADD COLUMN site_id INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE daily_page_stats ADD COLUMN site_id INTEGER NOT NULL DEFAULT 1;
 
 -- +migrate Down
 

pkg/datastore/sqlstore/migrations/sqlite3/9_add_site_id_to_referrer_stats_table.sql

@@ -1,6 +1,6 @@
 -- +migrate Up
 
-ALTER TABLE daily_referrer_stats ADD COLUMN site_id INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE daily_referrer_stats ADD COLUMN site_id INTEGER NOT NULL DEFAULT 1;
 
 -- +migrate Down
 

pkg/datastore/sqlstore/sites.go

@@ -53,8 +53,11 @@ func (db *sqlstore) insertSite(s *models.Site) error {
 	}
 
 	s.ID, err = r.LastInsertId()
-	return err
+	if err != nil {
+		return err
+	}
 
+	return nil
 }
 
 // UpdateSite updates an existing site in the database