refact(dao): go fmt src, update DAO with typed const

chore(make): clean the clean target to prevent glide.lock removal

Author: sebastienfr

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Changelog
 ## v0.0.1 [Unreleased]
-- 17/02/12 refact(dao): update model and dao to use UUID (SFR)
+- 17/03/14 refact(dao): go fmt src, update DAO with typed const (SFR)
+ chore(make): clean the clean target to prevent glide.lock removal
+- 17/03/12 refact(dao): update model and dao to use UUID (SFR)
  chore(doc): update main architecture diagram
 - 17/02/21 chore(vendor): update vendors to glide (SFR)
  refact(model): add const types

Makefile

@@ -55,10 +55,8 @@ help:
 clean:
 @go clean
 @rm -Rf .tmp
-@rm -Rf .DS_Store
 @rm -Rf *.log
 @rm -Rf *.out
-@rm -Rf *.lock
 @rm -Rf *.mem
 @rm -Rf *.test
 @rm -Rf build

dao/task-dao-factory.go

@@ -6,9 +6,12 @@ import (
 "time"
 )
 
+// DBType lists the type of implementation the factory can return
+type DBType int
+
 const (
 // DAOMongo is used for Mongo implementation of TaskDAO
-DAOMongo int = iota
+DAOMongo DBType = iota
 // DAOMock is used for mocked implementation of TaskDAO
 DAOMock
 
@@ -24,7 +27,7 @@ var (
 )
 
 // GetTaskDAO returns a TaskDAO according to type and params
-func GetTaskDAO(param string, daoType int) (TaskDAO, error) {
+func GetTaskDAO(param string, daoType DBType) (TaskDAO, error) {
 switch daoType {
 case DAOMongo:
 // mongo connection

dao/task-dao-mock_internal_test.go

@@ -1,9 +1,9 @@
 package dao
 
 import (
-"testing"
 "github.com/Sfeir/golang-200/model"
 "github.com/satori/go.uuid"
+"testing"
 "time"
 )
 
@@ -27,7 +27,7 @@ func TestDAOMockInternal(t *testing.T) {
 
 tasks := daoMock.getBy(func(task *model.Task) bool {
 return task.Status == model.StatusTodo
-});
+})
 
 if len(tasks) != 1 {
 t.Errorf("Expected 1 task, got %d", len(tasks))

dao/task-dao-mock_test.go

@@ -1,11 +1,11 @@
 package dao_test
 
 import (
+"github.com/Sfeir/golang-200/dao"
 "github.com/Sfeir/golang-200/model"
 "github.com/satori/go.uuid"
 "testing"
 "time"
-"github.com/Sfeir/golang-200/dao"
 )
 
 func TestDAOMock(t *testing.T) {

dao/task-dao-mongo_test.go

@@ -1,12 +1,12 @@
 package dao_test
 
 import (
+"github.com/Sfeir/golang-200/dao"
 "github.com/Sfeir/golang-200/model"
 "github.com/satori/go.uuid"
 "os"
 "testing"
 "time"
-"github.com/Sfeir/golang-200/dao"
 )
 
 func TestDAOMongo(t *testing.T) {

statistics/statistics_test.go

@@ -31,7 +31,7 @@ func TestStatistics(t *testing.T) {
 t.Errorf("Wrong statictics count %d is different from expected %d", statistics.counter, expectedCount)
 }
 
-time.Sleep(3 * statPeriod)
+time.Sleep(2 * statPeriod)
 
 if statistics.counter != emptyCount {
 t.Errorf("Wrong statictics count %d is different from expected %d", statistics.counter, emptyCount)

web/web-server.go

@@ -9,7 +9,7 @@ import (
 )
 
 // BuildWebServer constructs a new web server with the right DAO and tasks handler
-func BuildWebServer(db string, daoType int, statisticsDuration time.Duration) (*negroni.Negroni, error) {
+func BuildWebServer(db string, daoType dao.DBType, statisticsDuration time.Duration) (*negroni.Negroni, error) {
 
 // task dao
 dao, err := dao.GetTaskDAO(db, daoType)

web/web_test.go

@@ -143,7 +143,7 @@ func TestTaskHandlerGetServer(t *testing.T) {
 
 t.Run("Get one task (end-to-end)", func(t *testing.T) {
 
-res, err := http.Get(ts.URL + "/tasks/"+dao.MockedTask.ID)
+res, err := http.Get(ts.URL + "/tasks/" + dao.MockedTask.ID)
 if err != nil {
 t.Error(err)
 }
@@ -174,7 +174,7 @@ func TestTaskHandlerGetServer(t *testing.T) {
 }
 body, _ := json.Marshal(task)
 
-res, err := http.Post(ts.URL + "/tasks", "application/json", bytes.NewReader(body))
+res, err := http.Post(ts.URL+"/tasks", "application/json", bytes.NewReader(body))
 if err != nil {
 t.Error(err)
 }