Fix heartbeats insertion.

Add OS and editor fields.
Introduce aggregations (not working yet).

routes/aggregation.go

@@ -0,0 +1,39 @@
+package routes
+
+import (
+	"net/http"
+	"time"
+
+	"github.com/n1try/wakapi/models"
+	"github.com/n1try/wakapi/services"
+	"github.com/n1try/wakapi/utils"
+)
+
+type AggregationHandler struct {
+	AggregationSrvc *services.AggregationService
+}
+
+func (h *AggregationHandler) Get(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "GET" {
+		w.WriteHeader(415)
+		return
+	}
+
+	user := r.Context().Value(models.UserKey).(*models.User)
+	params := r.URL.Query()
+	from, err := utils.ParseDate(params.Get("from"))
+	if err != nil {
+		w.WriteHeader(400)
+		w.Write([]byte("Missing 'from' parameter"))
+		return
+	}
+
+	to, err := utils.ParseDate(params.Get("to"))
+	if err != nil {
+		to = time.Now()
+	}
+
+	h.AggregationSrvc.Aggregate(from, to, user)
+
+	w.WriteHeader(200)
+}

routes/heartbeat.go

@@ -6,6 +6,7 @@ import (
 	"os"
 
 	"github.com/n1try/wakapi/services"
+	"github.com/n1try/wakapi/utils"
 
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/n1try/wakapi/models"
@@ -20,14 +21,21 @@ func (h *HeartbeatHandler) Post(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(415)
 		return
 	}
+
+	opSys, editor, _ := utils.ParseUserAgent(r.Header.Get("User-Agent"))
+
 	dec := json.NewDecoder(r.Body)
-	var heartbeats []models.Heartbeat
+	var heartbeats []*models.Heartbeat
 	err := dec.Decode(&heartbeats)
 	if err != nil {
 		w.WriteHeader(400)
 		w.Write([]byte(err.Error()))
 		return
 	}
+	for _, h := range heartbeats {
+		h.OperatingSystem = opSys
+		h.Editor = editor
+	}
 
 	user := r.Context().Value(models.UserKey).(*models.User)
 	err = h.HeartbeatSrvc.InsertBatch(heartbeats, user)
@@ -37,5 +45,5 @@ func (h *HeartbeatHandler) Post(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	w.WriteHeader(201)
+	w.WriteHeader(200)
 }