fix pageviews data retrieval for new table structure

api/pageviews.go

@@ -13,12 +13,15 @@ import (
 var GetPageviewsHandler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
   before, after := getRequestedPeriods(r)
   stmt, err := db.Conn.Prepare(`SELECT
-      path,
+      s.url,
-      COUNT(ip_address) AS pageviews,
+      p.path,
-      COUNT(DISTINCT(ip_address)) AS pageviews_unique
+      COUNT(v.ip_address) AS pageviews,
-    FROM visits
+      COUNT(DISTINCT(v.ip_address)) AS pageviews_unique
-    WHERE UNIX_TIMESTAMP(timestamp) <= ? AND UNIX_TIMESTAMP(timestamp) >= ?
+    FROM visits v
-    GROUP BY path
+    LEFT JOIN pages p ON v.page_id = p.id
+    LEFT JOIN sites s ON p.site_id = s.id
+    WHERE UNIX_TIMESTAMP(v.timestamp) <= ? AND UNIX_TIMESTAMP(timestamp) >= ?
+    GROUP BY p.path, s.url
     ORDER BY pageviews DESC
     LIMIT ?`)
   checkError(err)
@@ -31,7 +34,7 @@ var GetPageviewsHandler = http.HandlerFunc(func(w http.ResponseWriter, r *http.R
   results := make([]models.Pageview, 0)
   for rows.Next() {
     var p models.Pageview
-    err = rows.Scan(&p.Path, &p.Count, &p.CountUnique);
+    err = rows.Scan(&p.Url, &p.Path, &p.Count, &p.CountUnique);
     checkError(err)
     results = append(results, p)
   }

db/seed.go

@@ -52,7 +52,7 @@ var screenResolutions = []string {
 func seedSite() models.Site {
   // get first site or create one
   var site models.Site
-  Conn.QueryRow("SELECT url FROM sites LIMIT 1").Scan(&site.Url)
+  Conn.QueryRow("SELECT id, url FROM sites LIMIT 1").Scan(&site.ID, &site.Url)
 
   if site.Url == "" {
     site.Url = "http://local.wordpress.dev/"

models/pageview.go

@@ -1,6 +1,7 @@
 package models
 
 type Pageview struct {
+  Url string 
   Path string
   Count int
   CountUnique int