Add user movement graph

This commit is contained in:
Jakob Borg
2015-07-15 13:23:13 +02:00
parent ca96b13233
commit 0890b49e78
3 changed files with 199 additions and 13 deletions

View File

@@ -180,6 +180,7 @@ func main() {
http.HandleFunc("/", withDB(db, rootHandler))
http.HandleFunc("/newdata", withDB(db, newDataHandler))
http.HandleFunc("/summary.json", withDB(db, summaryHandler))
http.HandleFunc("/movement.json", withDB(db, movementHandler))
http.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("static"))))
err = srv.Serve(listener)
@@ -269,6 +270,25 @@ func summaryHandler(db *sql.DB, w http.ResponseWriter, r *http.Request) {
w.Write(bs)
}
func movementHandler(db *sql.DB, w http.ResponseWriter, r *http.Request) {
s, err := getMovement(db)
if err != nil {
log.Println("movementHandler:", err)
http.Error(w, "Database Error", http.StatusInternalServerError)
return
}
bs, err := json.Marshal(s)
if err != nil {
log.Println("movementHandler:", err)
http.Error(w, "JSON Encode Error", http.StatusInternalServerError)
return
}
w.Header().Set("Content-Type", "application/json")
w.Write(bs)
}
type category struct {
Values [4]float64
Key string
@@ -554,3 +574,33 @@ func getSummary(db *sql.DB) (summary, error) {
return s, nil
}
func getMovement(db *sql.DB) ([][]interface{}, error) {
rows, err := db.Query(`SELECT Day, Added, Removed FROM UserMovement WHERE Day > now() - '1 year'::INTERVAL ORDER BY Day`)
if err != nil {
return nil, err
}
defer rows.Close()
res := [][]interface{}{
{"Day", "Joined", "Left"},
}
for rows.Next() {
var day time.Time
var added, removed int
err := rows.Scan(&day, &added, &removed)
if err != nil {
return nil, err
}
row := []interface{}{day.Format("2006-01-02"), added, -removed}
if removed == 0 {
row[2] = nil
}
res = append(res, row)
}
return res, nil
}