Create a measurement

api/handler.go

@@ -66,6 +66,7 @@ func Handler() *mux.Router {
 	m.Get(router.DeleteUnitType).Handler(handler(serveDeleteUnitType))
 
 	m.Get(router.Measurement).Handler(handler(serveMeasurement))
+	m.Get(router.CreateMeasurement).Handler(handler(serveCreateMeasurement))
 
 	return m
 }

api/measurements.go

@@ -1,10 +1,12 @@
 package api
 
 import (
+	"encoding/json"
 	"net/http"
 	"strconv"
 
 	"github.com/gorilla/mux"
+	"github.com/thermokarst/bactdb/models"
 )
 
 func serveMeasurement(w http.ResponseWriter, r *http.Request) error {
@@ -20,3 +22,21 @@ func serveMeasurement(w http.ResponseWriter, r *http.Request) error {
 
 	return writeJSON(w, measurement)
 }
+
+func serveCreateMeasurement(w http.ResponseWriter, r *http.Request) error {
+	var measurement models.Measurement
+	err := json.NewDecoder(r.Body).Decode(&measurement)
+	if err != nil {
+		return err
+	}
+
+	created, err := store.Measurements.Create(&measurement)
+	if err != nil {
+		return err
+	}
+	if created {
+		w.WriteHeader(http.StatusCreated)
+	}
+
+	return writeJSON(w, measurement)
+}

api/measurements_test.go

@@ -38,3 +38,30 @@ func TestMeasurement_Get(t *testing.T) {
 		t.Errorf("got %+v but wanted %+v", got, want)
 	}
 }
+
+func TestMeasurement_Create(t *testing.T) {
+	setup()
+
+	want := newMeasurement()
+
+	calledPost := false
+	store.Measurements.(*models.MockMeasurementsService).Create_ = func(measurement *models.Measurement) (bool, error) {
+		if !normalizeDeepEqual(want, measurement) {
+			t.Errorf("wanted request for measurement %d but got %d", want, measurement)
+		}
+		calledPost = true
+		return true, nil
+	}
+
+	success, err := apiClient.Measurements.Create(want)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !calledPost {
+		t.Error("!calledPost")
+	}
+	if !success {
+		t.Error("!success")
+	}
+}

datastore/measurements.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.Measurement{}, "measurements").SetKeys(true, "Id")
@@ -20,3 +24,13 @@ func (s *measurementsStore) Get(id int64) (*models.Measurement, error) {
 	}
 	return measurement[0], nil
 }
+
+func (s *measurementsStore) Create(measurement *models.Measurement) (bool, error) {
+	currentTime := time.Now()
+	measurement.CreatedAt = currentTime
+	measurement.UpdatedAt = currentTime
+	if err := s.dbh.Insert(measurement); err != nil {
+		return false, err
+	}
+	return true, nil
+}

datastore/measurements_test.go

@@ -55,3 +55,23 @@ func TestMeasurementsStore_Get_db(t *testing.T) {
 		t.Errorf("got measurement %+v, want %+v", measurement, want)
 	}
 }
+
+func TestMeasurementsStore_Create_db(t *testing.T) {
+	tx, _ := DB.Begin()
+	defer tx.Rollback()
+
+	measurement := newMeasurement(t, tx)
+
+	d := NewDatastore(tx)
+
+	created, err := d.Measurements.Create(measurement)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !created {
+		t.Error("!created")
+	}
+	if measurement.Id == 0 {
+		t.Error("want nonzero measurement.Id after submitting")
+	}
+}

models/measurements.go

@@ -3,6 +3,7 @@ package models
 import (
 	"database/sql"
 	"errors"
+	"net/http"
 	"strconv"
 	"time"
 
@@ -36,6 +37,9 @@ func NewMeasurement() *Measurement {
 type MeasurementsService interface {
 	// Get a measurement
 	Get(id int64) (*Measurement, error)
+
+	// Create a measurement
+	Create(measurement *Measurement) (bool, error)
 }
 
 var (
@@ -68,8 +72,28 @@ func (s *measurementsService) Get(id int64) (*Measurement, error) {
 	return measurement, nil
 }
 
+func (s *measurementsService) Create(measurement *Measurement) (bool, error) {
+	url, err := s.client.url(router.CreateMeasurement, nil, nil)
+	if err != nil {
+		return false, err
+	}
+
+	req, err := s.client.NewRequest("POST", url.String(), measurement)
+	if err != nil {
+		return false, err
+	}
+
+	resp, err := s.client.Do(req, &measurement)
+	if err != nil {
+		return false, err
+	}
+
+	return resp.StatusCode == http.StatusCreated, nil
+}
+
 type MockMeasurementsService struct {
 	Get_    func(id int64) (*Measurement, error)
+	Create_ func(measurement *Measurement) (bool, error)
 }
 
 var _ MeasurementsService = &MockMeasurementsService{}
@@ -80,3 +104,10 @@ func (s *MockMeasurementsService) Get(id int64) (*Measurement, error) {
 	}
 	return s.Get_(id)
 }
+
+func (s *MockMeasurementsService) Create(measurement *Measurement) (bool, error) {
+	if s.Create_ == nil {
+		return false, nil
+	}
+	return s.Create_(measurement)
+}

models/measurements_test.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"database/sql"
 	"net/http"
 	"reflect"
 	"testing"
@@ -11,6 +12,9 @@ import (
 func newMeasurement() *Measurement {
 	measurement := NewMeasurement()
 	measurement.Id = 1
+	measurement.StrainId = 1
+	measurement.ObservationId = 1
+	measurement.UnitTypeId = sql.NullInt64{Int64: 1, Valid: true}
 	return measurement
 }
 
@@ -43,3 +47,39 @@ func TestMeasurementService_Get(t *testing.T) {
 		t.Errorf("Measurements.Get return %+v, want %+v", measurement, want)
 	}
 }
+
+func TestMeasurementService_Create(t *testing.T) {
+	setup()
+	defer teardown()
+
+	want := newMeasurement()
+
+	var called bool
+	mux.HandleFunc(urlPath(t, router.CreateMeasurement, nil), func(w http.ResponseWriter, r *http.Request) {
+		called = true
+		testMethod(t, r, "POST")
+		testBody(t, r, `{"id":1,"strainId":1,"observationId":1,"textMeasurementTypeId":{"Int64":0,"Valid":false},"measurementValue":{"Float64":1.23,"Valid":true},"confidenceInterval":{"Float64":0,"Valid":false},"unitTypeId":{"Int64":1,"Valid":true},"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)
+	})
+
+	measurement := newMeasurement()
+	created, err := client.Measurements.Create(measurement)
+	if err != nil {
+		t.Errorf("Measurements.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(measurement, want) {
+		t.Errorf("Measurements.Create returned %+v, want %+v", measurement, want)
+	}
+}

router/api.go

@@ -60,6 +60,7 @@ func API() *mux.Router {
 	m.Path("/unit_types/{Id:.+}").Methods("DELETE").Name(DeleteUnitType)
 
 	// Measurements
+	m.Path("/measurements/").Methods("POST").Name(CreateMeasurement)
 	m.Path("/measurements/{Id:.+}").Methods("GET").Name(Measurement)
 
 	return m

router/routes.go

@@ -48,4 +48,5 @@ const (
 	DeleteUnitType = "unit_type:delete"
 
 	Measurement       = "measurement:get"
+	CreateMeasurement = "measurements:create"
 )