diff --git a/api/handler.go b/api/handler.go index 5c063ba..c320e04 100644 --- a/api/handler.go +++ b/api/handler.go @@ -42,6 +42,7 @@ func Handler() *mux.Router { m.Get(router.DeleteStrain).Handler(handler(serveDeleteStrain)) m.Get(router.ObservationType).Handler(handler(serveObservationType)) + m.Get(router.CreateObservationType).Handler(handler(serveCreateObservationType)) return m } diff --git a/api/observation_types.go b/api/observation_types.go index 736d8ed..e2f9cb1 100644 --- a/api/observation_types.go +++ b/api/observation_types.go @@ -1,10 +1,12 @@ package api import ( + "encoding/json" "net/http" "strconv" "github.com/gorilla/mux" + "github.com/thermokarst/bactdb/models" ) func serveObservationType(w http.ResponseWriter, r *http.Request) error { @@ -20,3 +22,21 @@ func serveObservationType(w http.ResponseWriter, r *http.Request) error { return writeJSON(w, observation_type) } + +func serveCreateObservationType(w http.ResponseWriter, r *http.Request) error { + var observation_type models.ObservationType + err := json.NewDecoder(r.Body).Decode(&observation_type) + if err != nil { + return err + } + + created, err := store.ObservationTypes.Create(&observation_type) + if err != nil { + return err + } + if created { + w.WriteHeader(http.StatusCreated) + } + + return writeJSON(w, observation_type) +} diff --git a/api/observation_types_test.go b/api/observation_types_test.go index be689fa..768e9cf 100644 --- a/api/observation_types_test.go +++ b/api/observation_types_test.go @@ -38,3 +38,30 @@ func TestObservationType_Get(t *testing.T) { t.Errorf("got %+v but wanted %+v", got, want) } } + +func TestObservationType_Create(t *testing.T) { + setup() + + want := newObservationType() + + calledPost := false + store.ObservationTypes.(*models.MockObservationTypesService).Create_ = func(observation_type *models.ObservationType) (bool, error) { + if !normalizeDeepEqual(want, observation_type) { + t.Errorf("wanted request for observation_type %d but got %d", want, observation_type) + } + calledPost = true + return true, nil + } + + success, err := apiClient.ObservationTypes.Create(want) + if err != nil { + t.Fatal(err) + } + + if !calledPost { + t.Error("!calledPost") + } + if !success { + t.Error("!success") + } +} diff --git a/datastore/observation_types.go b/datastore/observation_types.go index f41d838..f47cfe4 100644 --- a/datastore/observation_types.go +++ b/datastore/observation_types.go @@ -1,6 +1,10 @@ package datastore -import "github.com/thermokarst/bactdb/models" +import ( + "time" + + "github.com/thermokarst/bactdb/models" +) func init() { DB.AddTableWithName(models.ObservationType{}, "observation_types").SetKeys(true, "Id") @@ -20,3 +24,13 @@ func (s *observationTypesStore) Get(id int64) (*models.ObservationType, error) { } return observation_type[0], nil } + +func (s *observationTypesStore) Create(observation_type *models.ObservationType) (bool, error) { + currentTime := time.Now() + observation_type.CreatedAt = currentTime + observation_type.UpdatedAt = currentTime + if err := s.dbh.Insert(observation_type); err != nil { + return false, err + } + return true, nil +} diff --git a/datastore/observation_types_test.go b/datastore/observation_types_test.go index 712e0e4..207a86e 100644 --- a/datastore/observation_types_test.go +++ b/datastore/observation_types_test.go @@ -42,3 +42,23 @@ func TestObservationTypesStore_Get_db(t *testing.T) { t.Errorf("got observation_type %+v, want %+v", observation_type, want) } } + +func TestObservationTypesStore_Create_db(t *testing.T) { + tx, _ := DB.Begin() + defer tx.Rollback() + + observation_type := newObservationType(t, tx) + + d := NewDatastore(tx) + + created, err := d.ObservationTypes.Create(observation_type) + if err != nil { + t.Fatal(err) + } + if !created { + t.Error("!created") + } + if observation_type.Id == 0 { + t.Error("want nonzero observation_type.Id after submitting") + } +} diff --git a/models/observation_types.go b/models/observation_types.go index abfc29b..a571958 100644 --- a/models/observation_types.go +++ b/models/observation_types.go @@ -2,6 +2,7 @@ package models import ( "errors" + "net/http" "strconv" "time" @@ -27,6 +28,9 @@ func NewObservationType() *ObservationType { type ObservationTypesService interface { // Get an observation type Get(id int64) (*ObservationType, error) + + // Create an observation type record + Create(observation_type *ObservationType) (bool, error) } var ( @@ -59,8 +63,28 @@ func (s *observationTypesService) Get(id int64) (*ObservationType, error) { return observation_type, nil } +func (s *observationTypesService) Create(observation_type *ObservationType) (bool, error) { + url, err := s.client.url(router.CreateObservationType, nil, nil) + if err != nil { + return false, err + } + + req, err := s.client.NewRequest("POST", url.String(), observation_type) + if err != nil { + return false, err + } + + resp, err := s.client.Do(req, &observation_type) + if err != nil { + return false, err + } + + return resp.StatusCode == http.StatusCreated, nil +} + type MockObservationTypesService struct { - Get_ func(id int64) (*ObservationType, error) + Get_ func(id int64) (*ObservationType, error) + Create_ func(observation_type *ObservationType) (bool, error) } var _ ObservationTypesService = &MockObservationTypesService{} @@ -71,3 +95,10 @@ func (s *MockObservationTypesService) Get(id int64) (*ObservationType, error) { } return s.Get_(id) } + +func (s *MockObservationTypesService) Create(observation_type *ObservationType) (bool, error) { + if s.Create_ == nil { + return false, nil + } + return s.Create_(observation_type) +} diff --git a/models/observation_types_test.go b/models/observation_types_test.go index 3f0fe51..4be845f 100644 --- a/models/observation_types_test.go +++ b/models/observation_types_test.go @@ -14,7 +14,7 @@ func newObservationType() *ObservationType { return observation_type } -func TestObservation_TypeService_Get(t *testing.T) { +func TestObservationTypeService_Get(t *testing.T) { setup() defer teardown() @@ -43,3 +43,39 @@ func TestObservation_TypeService_Get(t *testing.T) { t.Errorf("ObservationTypes.Get return %+v, want %+v", observation_type, want) } } + +func TestObservationTypeService_Create(t *testing.T) { + setup() + defer teardown() + + want := newObservationType() + + var called bool + mux.HandleFunc(urlPath(t, router.CreateObservationType, nil), func(w http.ResponseWriter, r *http.Request) { + called = true + testMethod(t, r, "POST") + testBody(t, r, `{"id":1,"observation_type_name":"Test Obs Type","created_at":"0001-01-01T00:00:00Z","updated_at":"0001-01-01T00:00:00Z","deleted_at":{"Time":"0001-01-01T00:00:00Z","Valid":false}}`+"\n") + + w.WriteHeader(http.StatusCreated) + writeJSON(w, want) + }) + + observation_type := newObservationType() + created, err := client.ObservationTypes.Create(observation_type) + if err != nil { + t.Errorf("ObservationTypes.Create returned error: %v", err) + } + + if !created { + t.Error("!created") + } + + if !called { + t.Fatal("!called") + } + + normalizeTime(&want.CreatedAt, &want.UpdatedAt, &want.DeletedAt) + if !reflect.DeepEqual(observation_type, want) { + t.Errorf("ObservationTypes.Create returned %+v, want %+v", observation_type, want) + } +} diff --git a/router/api.go b/router/api.go index c9c3a1d..da595bd 100644 --- a/router/api.go +++ b/router/api.go @@ -32,6 +32,7 @@ func API() *mux.Router { m.Path("/strains/{Id:.+}").Methods("DELETE").Name(DeleteStrain) // ObservationTypes + m.Path("/observation_types").Methods("POST").Name(CreateObservationType) m.Path("/observation_types/{Id:.+}").Methods("GET").Name(ObservationType) return m diff --git a/router/routes.go b/router/routes.go index b95ac95..db51137 100644 --- a/router/routes.go +++ b/router/routes.go @@ -23,5 +23,6 @@ const ( UpdateStrain = "strain:update" DeleteStrain = "strain:delete" - ObservationType = "observation_type:get" + ObservationType = "observation_type:get" + CreateObservationType = "observation_type:create" )