diff --git a/api/handler.go b/api/handler.go index a4be240..f535115 100644 --- a/api/handler.go +++ b/api/handler.go @@ -54,6 +54,7 @@ func Handler() *mux.Router { m.Get(router.DeleteObservation).Handler(handler(serveDeleteObservation)) m.Get(router.TextMeasurementType).Handler(handler(serveTextMeasurementType)) + m.Get(router.CreateTextMeasurementType).Handler(handler(serveCreateTextMeasurementType)) return m } diff --git a/api/text_measurement_types.go b/api/text_measurement_types.go index e454cbc..f1fba37 100644 --- a/api/text_measurement_types.go +++ b/api/text_measurement_types.go @@ -1,10 +1,12 @@ package api import ( + "encoding/json" "net/http" "strconv" "github.com/gorilla/mux" + "github.com/thermokarst/bactdb/models" ) func serveTextMeasurementType(w http.ResponseWriter, r *http.Request) error { @@ -20,3 +22,21 @@ func serveTextMeasurementType(w http.ResponseWriter, r *http.Request) error { return writeJSON(w, text_measurement_type) } + +func serveCreateTextMeasurementType(w http.ResponseWriter, r *http.Request) error { + var text_measurement_type models.TextMeasurementType + err := json.NewDecoder(r.Body).Decode(&text_measurement_type) + if err != nil { + return err + } + + created, err := store.TextMeasurementTypes.Create(&text_measurement_type) + if err != nil { + return err + } + if created { + w.WriteHeader(http.StatusCreated) + } + + return writeJSON(w, text_measurement_type) +} diff --git a/api/text_measurement_types_test.go b/api/text_measurement_types_test.go index 95d0bee..af03918 100644 --- a/api/text_measurement_types_test.go +++ b/api/text_measurement_types_test.go @@ -38,3 +38,30 @@ func TestTextMeasurementType_Get(t *testing.T) { t.Errorf("got %+v but wanted %+v", got, want) } } + +func TestTextMeasurementType_Create(t *testing.T) { + setup() + + want := newTextMeasurementType() + + calledPost := false + store.TextMeasurementTypes.(*models.MockTextMeasurementTypesService).Create_ = func(text_measurement_type *models.TextMeasurementType) (bool, error) { + if !normalizeDeepEqual(want, text_measurement_type) { + t.Errorf("wanted request for text_measurement_type %d but got %d", want, text_measurement_type) + } + calledPost = true + return true, nil + } + + success, err := apiClient.TextMeasurementTypes.Create(want) + if err != nil { + t.Fatal(err) + } + + if !calledPost { + t.Error("!calledPost") + } + if !success { + t.Error("!success") + } +} diff --git a/datastore/text_measurement_types.go b/datastore/text_measurement_types.go index ae83c56..22d7738 100644 --- a/datastore/text_measurement_types.go +++ b/datastore/text_measurement_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.TextMeasurementType{}, "text_measurement_types").SetKeys(true, "Id") @@ -20,3 +24,13 @@ func (s *textMeasurementTypesStore) Get(id int64) (*models.TextMeasurementType, } return text_measurement_type[0], nil } + +func (s *textMeasurementTypesStore) Create(text_measurement_type *models.TextMeasurementType) (bool, error) { + currentTime := time.Now() + text_measurement_type.CreatedAt = currentTime + text_measurement_type.UpdatedAt = currentTime + if err := s.dbh.Insert(text_measurement_type); err != nil { + return false, err + } + return true, nil +} diff --git a/datastore/text_measurement_types_test.go b/datastore/text_measurement_types_test.go index d79e3d9..1bb7b28 100644 --- a/datastore/text_measurement_types_test.go +++ b/datastore/text_measurement_types_test.go @@ -42,3 +42,23 @@ func TestTextMeasurementTypesStore_Get_db(t *testing.T) { t.Errorf("got text_measurement_type %+v, want %+v", text_measurement_type, want) } } + +func TestTextMeasurementTypesStore_Create_db(t *testing.T) { + tx, _ := DB.Begin() + defer tx.Rollback() + + text_measurement_type := newTextMeasurementType(t, tx) + + d := NewDatastore(tx) + + created, err := d.TextMeasurementTypes.Create(text_measurement_type) + if err != nil { + t.Fatal(err) + } + if !created { + t.Error("!created") + } + if text_measurement_type.Id == 0 { + t.Error("want nonzero text_measurement_type.Id after submitting") + } +} diff --git a/models/text_measurement_types.go b/models/text_measurement_types.go index 4b0a70a..33aebb7 100644 --- a/models/text_measurement_types.go +++ b/models/text_measurement_types.go @@ -2,6 +2,7 @@ package models import ( "errors" + "net/http" "strconv" "time" @@ -27,6 +28,9 @@ func NewTextMeasurementType() *TextMeasurementType { type TextMeasurementTypesService interface { // Get a text measurement type Get(id int64) (*TextMeasurementType, error) + + // Create a text measurement type + Create(text_measurement_type *TextMeasurementType) (bool, error) } var ( @@ -59,8 +63,28 @@ func (s *textMeasurementTypesService) Get(id int64) (*TextMeasurementType, error return text_measurement_type, nil } +func (s *textMeasurementTypesService) Create(text_measurement_type *TextMeasurementType) (bool, error) { + url, err := s.client.url(router.CreateTextMeasurementType, nil, nil) + if err != nil { + return false, err + } + + req, err := s.client.NewRequest("POST", url.String(), text_measurement_type) + if err != nil { + return false, err + } + + resp, err := s.client.Do(req, &text_measurement_type) + if err != nil { + return false, err + } + + return resp.StatusCode == http.StatusCreated, nil +} + type MockTextMeasurementTypesService struct { - Get_ func(id int64) (*TextMeasurementType, error) + Get_ func(id int64) (*TextMeasurementType, error) + Create_ func(text_measurement_type *TextMeasurementType) (bool, error) } var _ TextMeasurementTypesService = &MockTextMeasurementTypesService{} @@ -71,3 +95,10 @@ func (s *MockTextMeasurementTypesService) Get(id int64) (*TextMeasurementType, e } return s.Get_(id) } + +func (s *MockTextMeasurementTypesService) Create(text_measurement_type *TextMeasurementType) (bool, error) { + if s.Create_ == nil { + return false, nil + } + return s.Create_(text_measurement_type) +} diff --git a/models/text_measurement_types_test.go b/models/text_measurement_types_test.go index c9cfd2a..b292da4 100644 --- a/models/text_measurement_types_test.go +++ b/models/text_measurement_types_test.go @@ -43,3 +43,39 @@ func TestTextMeasurementTypeService_Get(t *testing.T) { t.Errorf("TextMeasurementTypes.Get return %+v, want %+v", text_measurement_type, want) } } + +func TestTextMeasurementTypeService_Create(t *testing.T) { + setup() + defer teardown() + + want := newTextMeasurementType() + + var called bool + mux.HandleFunc(urlPath(t, router.CreateTextMeasurementType, nil), func(w http.ResponseWriter, r *http.Request) { + called = true + testMethod(t, r, "POST") + testBody(t, r, `{"id":1,"textMeasurementName":"Test Text Measurement Type","createdAt":"0001-01-01T00:00:00Z","updatedAt":"0001-01-01T00:00:00Z","deletedAt":{"Time":"0001-01-01T00:00:00Z","Valid":false}}`+"\n") + + w.WriteHeader(http.StatusCreated) + writeJSON(w, want) + }) + + text_measurement_type := newTextMeasurementType() + created, err := client.TextMeasurementTypes.Create(text_measurement_type) + if err != nil { + t.Errorf("TextMeasurementTypes.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(text_measurement_type, want) { + t.Errorf("TextMeasurementTypes.Create returned %+v, want %+v", text_measurement_type, want) + } +} diff --git a/router/api.go b/router/api.go index adbac9c..70bc4e8 100644 --- a/router/api.go +++ b/router/api.go @@ -46,6 +46,7 @@ func API() *mux.Router { m.Path("/observations/{Id:.+}").Methods("DELETE").Name(DeleteObservation) // TextMeasurementTypes + m.Path("/text_measurement_types/").Methods("POST").Name(CreateTextMeasurementType) m.Path("/text_measurement_types/{Id:.+}").Methods("GET").Name(TextMeasurementType) return m diff --git a/router/routes.go b/router/routes.go index 381b576..b46e8db 100644 --- a/router/routes.go +++ b/router/routes.go @@ -35,5 +35,6 @@ const ( UpdateObservation = "observation:update" DeleteObservation = "observation:delete" - TextMeasurementType = "text_measurement_type:get" + TextMeasurementType = "text_measurement_type:get" + CreateTextMeasurementType = "text_measurement_type:create" )