diff --git a/api/handler.go b/api/handler.go index d99c7b7..388cea9 100644 --- a/api/handler.go +++ b/api/handler.go @@ -56,6 +56,7 @@ func Handler() *mux.Router { m.Get(router.TextMeasurementType).Handler(handler(serveTextMeasurementType)) m.Get(router.CreateTextMeasurementType).Handler(handler(serveCreateTextMeasurementType)) m.Get(router.TextMeasurementTypes).Handler(handler(serveTextMeasurementTypeList)) + m.Get(router.UpdateTextMeasurementType).Handler(handler(serveUpdateTextMeasurementType)) return m } diff --git a/api/text_measurement_types.go b/api/text_measurement_types.go index c309fc8..587a0a4 100644 --- a/api/text_measurement_types.go +++ b/api/text_measurement_types.go @@ -57,3 +57,22 @@ func serveTextMeasurementTypeList(w http.ResponseWriter, r *http.Request) error return writeJSON(w, text_measurement_types) } + +func serveUpdateTextMeasurementType(w http.ResponseWriter, r *http.Request) error { + id, _ := strconv.ParseInt(mux.Vars(r)["Id"], 10, 0) + var text_measurement_type models.TextMeasurementType + err := json.NewDecoder(r.Body).Decode(&text_measurement_type) + if err != nil { + return err + } + + updated, err := store.TextMeasurementTypes.Update(id, &text_measurement_type) + if err != nil { + return err + } + if updated { + w.WriteHeader(http.StatusOK) + } + + return writeJSON(w, text_measurement_type) +} diff --git a/api/text_measurement_types_test.go b/api/text_measurement_types_test.go index f5d3e3f..db6b148 100644 --- a/api/text_measurement_types_test.go +++ b/api/text_measurement_types_test.go @@ -94,3 +94,33 @@ func TestTextMeasurementType_List(t *testing.T) { t.Errorf("got text_measurement_types %+v but wanted text_measurement_types %+v", text_measurement_types, want) } } + +func TestTextMeasurementType_Update(t *testing.T) { + setup() + + want := newTextMeasurementType() + + calledPut := false + store.TextMeasurementTypes.(*models.MockTextMeasurementTypesService).Update_ = func(id int64, text_measurement_type *models.TextMeasurementType) (bool, error) { + if id != want.Id { + t.Errorf("wanted request for text_measurement_type %d but got %d", want.Id, id) + } + if !normalizeDeepEqual(want, text_measurement_type) { + t.Errorf("wanted request for text_measurement_type %d but got %d", want, text_measurement_type) + } + calledPut = true + return true, nil + } + + success, err := apiClient.TextMeasurementTypes.Update(want.Id, want) + if err != nil { + t.Fatal(err) + } + + if !calledPut { + t.Error("!calledPut") + } + if !success { + t.Error("!success") + } +} diff --git a/datastore/text_measurement_types.go b/datastore/text_measurement_types.go index 9ea83ff..f415ddb 100644 --- a/datastore/text_measurement_types.go +++ b/datastore/text_measurement_types.go @@ -46,3 +46,26 @@ func (s *textMeasurementTypesStore) List(opt *models.TextMeasurementTypeListOpti } return text_measurement_types, nil } + +func (s *textMeasurementTypesStore) Update(id int64, text_measurement_type *models.TextMeasurementType) (bool, error) { + _, err := s.Get(id) + if err != nil { + return false, err + } + + if id != text_measurement_type.Id { + return false, models.ErrObservationNotFound + } + + text_measurement_type.UpdatedAt = time.Now() + changed, err := s.dbh.Update(text_measurement_type) + if err != nil { + return false, err + } + + if changed == 0 { + return false, ErrNoRowsUpdated + } + + return true, nil +} diff --git a/datastore/text_measurement_types_test.go b/datastore/text_measurement_types_test.go index 74b3ba9..b8112c0 100644 --- a/datastore/text_measurement_types_test.go +++ b/datastore/text_measurement_types_test.go @@ -85,3 +85,23 @@ func TestTextMeasurementTypesStore_List_db(t *testing.T) { t.Errorf("got text_measurement_types %+v, want %+v", text_measurement_types, want) } } + +func TestTextMeasurementTypesStore_Update_db(t *testing.T) { + tx, _ := DB.Begin() + defer tx.Rollback() + + text_measurement_type := insertTextMeasurementType(t, tx) + + d := NewDatastore(tx) + + // Tweak it + text_measurement_type.TextMeasurementName = "Updated Text Measurement Type" + updated, err := d.TextMeasurementTypes.Update(text_measurement_type.Id, text_measurement_type) + if err != nil { + t.Fatal(err) + } + + if !updated { + t.Error("!updated") + } +} diff --git a/models/text_measurement_types.go b/models/text_measurement_types.go index 68625c7..a56c32b 100644 --- a/models/text_measurement_types.go +++ b/models/text_measurement_types.go @@ -34,6 +34,9 @@ type TextMeasurementTypesService interface { // Create a text measurement type Create(text_measurement_type *TextMeasurementType) (bool, error) + + // Updated a text measurement type + Update(id int64, TextMeasurementType *TextMeasurementType) (updated bool, err error) } var ( @@ -109,10 +112,32 @@ func (s *textMeasurementTypesService) List(opt *TextMeasurementTypeListOptions) return text_measurement_types, nil } +func (s *textMeasurementTypesService) Update(id int64, text_measurement_type *TextMeasurementType) (bool, error) { + strId := strconv.FormatInt(id, 10) + + url, err := s.client.url(router.UpdateTextMeasurementType, map[string]string{"Id": strId}, nil) + if err != nil { + return false, err + } + + req, err := s.client.NewRequest("PUT", 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.StatusOK, nil +} + type MockTextMeasurementTypesService struct { Get_ func(id int64) (*TextMeasurementType, error) List_ func(opt *TextMeasurementTypeListOptions) ([]*TextMeasurementType, error) Create_ func(text_measurement_type *TextMeasurementType) (bool, error) + Update_ func(id int64, text_measurement_type *TextMeasurementType) (bool, error) } var _ TextMeasurementTypesService = &MockTextMeasurementTypesService{} @@ -137,3 +162,10 @@ func (s *MockTextMeasurementTypesService) List(opt *TextMeasurementTypeListOptio } return s.List_(opt) } + +func (s *MockTextMeasurementTypesService) Update(id int64, text_measurement_type *TextMeasurementType) (bool, error) { + if s.Update_ == nil { + return false, nil + } + return s.Update_(id, text_measurement_type) +} diff --git a/models/text_measurement_types_test.go b/models/text_measurement_types_test.go index f40bf38..7db0b51 100644 --- a/models/text_measurement_types_test.go +++ b/models/text_measurement_types_test.go @@ -112,3 +112,34 @@ func TestTextMeasurementTypeService_List(t *testing.T) { t.Errorf("TextMeasurementTypes.List return %+v, want %+v", text_measurement_type, want) } } + +func TestTextMeasurementTypeService_Update(t *testing.T) { + setup() + defer teardown() + + want := newTextMeasurementType() + + var called bool + mux.HandleFunc(urlPath(t, router.UpdateTextMeasurementType, map[string]string{"Id": "1"}), func(w http.ResponseWriter, r *http.Request) { + called = true + testMethod(t, r, "PUT") + testBody(t, r, `{"id":1,"textMeasurementName":"Test Text Measurement Type Updated","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.StatusOK) + writeJSON(w, want) + }) + + text_measurement_type := newTextMeasurementType() + text_measurement_type.TextMeasurementName = "Test Text Measurement Type Updated" + updated, err := client.TextMeasurementTypes.Update(text_measurement_type.Id, text_measurement_type) + if err != nil { + t.Errorf("TextMeasurementTypes.Update returned error: %v", err) + } + + if !updated { + t.Error("!updated") + } + + if !called { + t.Fatal("!called") + } +} diff --git a/router/api.go b/router/api.go index 5024dd7..3f8f5ac 100644 --- a/router/api.go +++ b/router/api.go @@ -49,6 +49,7 @@ func API() *mux.Router { m.Path("/text_measurement_types/").Methods("GET").Name(TextMeasurementTypes) m.Path("/text_measurement_types/").Methods("POST").Name(CreateTextMeasurementType) m.Path("/text_measurement_types/{Id:.+}").Methods("GET").Name(TextMeasurementType) + m.Path("/text_measurement_types/{Id:.+}").Methods("PUT").Name(UpdateTextMeasurementType) return m } diff --git a/router/routes.go b/router/routes.go index 3b72596..ee03b09 100644 --- a/router/routes.go +++ b/router/routes.go @@ -38,4 +38,5 @@ const ( TextMeasurementType = "text_measurement_type:get" CreateTextMeasurementType = "text_measurement_type:create" TextMeasurementTypes = "text_measurement_type:list" + UpdateTextMeasurementType = "text_measurement_type:update" )