fix: Suggested changes (#2)

.gitignore

@@ -1 +1,2 @@
 vendor/
+.idea/

cmd/metrics-api/metrics-server.go

@@ -0,0 +1,35 @@
+package main
+
+import (
+	"github.com/aerogear/aerogear-metrics-api/pkg/web"
+	"github.com/aerogear/aerogear-metrics-api/pkg/dao"
+	"github.com/aerogear/aerogear-metrics-api/pkg/mobile"
+	"net/http"
+)
+
+func main()  {
+	router := web.NewRouter()
+	db, err := dao.Connect()
+	if err != nil{
+		panic("failed to connect to sql database : "+ err.Error())
+	}
+	defer db.Close()
+	metricDao := dao.NewMetricsDAO(db)
+
+	//metrics route
+	{
+		metricsService := mobile.NewMetricsService(metricDao)
+		metricsHandler := web.NewMetricsHandler(metricsService)
+		web.MetricsRoute(router,metricsHandler)
+	}
+	//health route
+	{
+		healthHandler := web.NewHealthHandler()
+		web.HealthzRoute(router,healthHandler)
+	}
+
+	//start
+	if err := http.ListenAndServe(":3000",router); err != nil{
+		panic("failed to start " + err.Error())
+	}
+}

pkg/dao/dao.go

@@ -2,21 +2,18 @@ package dao
 
 import (
 	"errors"
-
-	"github.com/aerogear/aerogear-metrics-api/pkg/models"
+	"database/sql"
+	"github.com/aerogear/aerogear-metrics-api/pkg/mobile"
 )
 
 type MetricsDAO struct {
-	DBConnectionString string
+	db *sql.DB
 }
 
-// Connect to database
-func (m *MetricsDAO) Connect() {
 
-}
 
 // Create a metrics record
-func (m *MetricsDAO) Create(metric models.Metric) (models.Metric, error) {
+func (m *MetricsDAO) Create(metric mobile.Metric) (mobile.Metric, error) {
 	return metric, errors.New("Not Implemented yet")
 }
 
@@ -38,8 +35,8 @@ func (m *MetricsDAO) CheckConnection() {
 
 }
 
-func GetMetricsDAO(connectionString string) MetricsDAO {
-	return MetricsDAO{
-		DBConnectionString: connectionString,
+func NewMetricsDAO(db *sql.DB) *MetricsDAO {
+	return &MetricsDAO{
+		db:db,
 	}
 }

pkg/dao/db.go

@@ -0,0 +1,21 @@
+package dao
+
+import "database/sql"
+
+
+var db *sql.DB
+
+func Connect()(*sql.DB,error){
+	if db != nil{
+		return db,nil
+	}
+	//connection logic
+	return nil,nil
+}
+
+func Disconnect()error{
+	if nil != db{
+		return db.Close()
+	}
+	return nil
+}

pkg/mobile/interfaces.go

@@ -0,0 +1,7 @@
+package mobile
+
+
+// MetricCreator defines how a metric can be created
+type MetricCreator interface{
+	Create(m Metric)(Metric,error)
+}

pkg/mobile/metrics.go

@@ -0,0 +1,20 @@
+package mobile
+
+import (
+	"errors"
+
+)
+
+type MetricsService struct {
+	mdao MetricCreator
+}
+
+func NewMetricsService(dao MetricCreator)*MetricsService{
+	return &MetricsService{mdao:dao}
+}
+
+
+
+func (m MetricsService) Create(metric Metric) (Metric, error) {
+	return metric, errors.New("This is an error")
+}

pkg/models/metric.go → pkg/mobile/types.go

@@ -1,11 +1,15 @@
-package models
+package mobile
 
 import "time"
 
-// Metric struct is what the client payload should be parsed into
+type AppConfig struct {
+	DBConnectionString string
+}
+
+// ClientMetric struct is what the client payload should be parsed into
 // Need to figure out how to structure this
 type Metric struct {
 	Timestamp time.Time   `json:"timestamp"`
 	ClientID  string      `json:"clientId"`
 	Data      interface{} `json:"data"`
-}
+}

pkg/web/healthzHandler.go

@@ -0,0 +1,39 @@
+package web
+
+import (
+	"net/http"
+	"time"
+
+
+)
+
+// not reusable type so make it package local
+
+type healthResponse struct {
+	Timestamp time.Time `json:"time"`
+	Status    string    `json:"status"`
+}
+
+type healthHandler struct{
+
+}
+
+func NewHealthHandler()*healthHandler{
+	return &healthHandler{}
+}
+
+func (hh *healthHandler) Healthz(w http.ResponseWriter, r *http.Request) {
+	status := healthResponse{
+		Timestamp: time.Now().UTC(),
+		Status:    "ok",
+	}
+
+	if err := withJSON(w, 200, status); err != nil{
+		http.Error(w,err.Error(),http.StatusInternalServerError)
+		return
+	}
+}
+
+func (hh *healthHandler)Ping(w http.ResponseWriter, r *http.Request)  {
+
+}