A few big changes

- Adding timezone to source config
- genera: update record (missed a few pieces)
- genera: delete record

datastore/datastore.go

@@ -1,6 +1,8 @@
 package datastore
 
 import (
+	"errors"
+
 	"github.com/jmoiron/modl"
 	"github.com/thermokarst/bactdb/models"
 )
@@ -12,6 +14,11 @@ type Datastore struct {
 	dbh    modl.SqlExecutor
 }
 
+var (
+	ErrNoRowsUpdated = errors.New(`no rows updated`)
+	ErrNoRowsDeleted = errors.New(`no rows deleted`)
+)
+
 // NewDatastore creates a new client for accessing the datastore (in PostgreSQL).
 // If dbh is nil, it uses the global DB handle.
 func NewDatastore(dbh modl.SqlExecutor) *Datastore {

datastore/db.go

@@ -26,7 +26,7 @@ var connectOnce sync.Once
 func Connect() {
 	connectOnce.Do(func() {
 		var err error
-		DB.Dbx, err = sqlx.Open("postgres", "sslmode=disable")
+		DB.Dbx, err = sqlx.Open("postgres", "timezone=UTC sslmode=disable")
 		if err != nil {
 			log.Fatal("Error connecting to PostgreSQL database (using PG* environment variables): ", err)
 		}

datastore/genera.go

@@ -47,12 +47,39 @@ func (s *generaStore) List(opt *models.GenusListOptions) ([]*models.Genus, error
 }
 
 func (s *generaStore) Update(id int64, genus *models.Genus) (bool, error) {
-	ret, err := s.dbh.Exec(`UPDATE genera SET genusname=$1 WHERE id=$2;`, genus.GenusName, id)
+	_, err := s.Get(id)
 	if err != nil {
 		return false, err
 	}
-	if rows, err := ret.RowsAffected(); rows == 0 {
+
+	if id != genus.Id {
+		return false, models.ErrGenusNotFound
+	}
+
+	changed, err := s.dbh.Update(genus)
+	if err != nil {
 		return false, err
 	}
+
+	if changed == 0 {
+		return false, ErrNoRowsUpdated
+	}
+
+	return true, nil
+}
+
+func (s *generaStore) Delete(id int64) (bool, error) {
+	genus, err := s.Get(id)
+	if err != nil {
+		return false, err
+	}
+
+	deleted, err := s.dbh.Delete(genus)
+	if err != nil {
+		return false, err
+	}
+	if deleted == 0 {
+		return false, ErrNoRowsDeleted
+	}
 	return true, nil
 }

datastore/genera_test.go

@@ -79,3 +79,62 @@ func TestGeneraStore_List_db(t *testing.T) {
 		t.Errorf("got genera %+v, want %+v", genera, want)
 	}
 }
+
+func TestGeneraStore_Update_db(t *testing.T) {
+	tx, _ := DB.Begin()
+	defer tx.Rollback()
+
+	// Test on a clean database
+	tx.Exec(`DELETE FROM genera;`)
+
+	d := NewDatastore(nil)
+	// Add a new record
+	genus := &models.Genus{GenusName: "Test Genus"}
+	created, err := d.Genera.Create(genus)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !created {
+		t.Error("!created")
+	}
+
+	// Tweak it
+	genus.GenusName = "Updated Genus"
+	updated, err := d.Genera.Update(genus.Id, genus)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !updated {
+		t.Error("!updated")
+	}
+}
+
+func TestGeneraStore_Delete_db(t *testing.T) {
+	tx, _ := DB.Begin()
+	defer tx.Rollback()
+
+	// Test on a clean database
+	tx.Exec(`DELETE FROM genera;`)
+
+	d := NewDatastore(tx)
+	// Add a new record
+	genus := &models.Genus{GenusName: "Test Genus"}
+	created, err := d.Genera.Create(genus)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !created {
+		t.Error("!created")
+	}
+
+	// Delete it
+	deleted, err := d.Genera.Delete(genus.Id)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !deleted {
+		t.Error("!delete")
+	}
+}