thermokarst/bactdb
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update strain. Fixed EML/EMBL typo in json.

Browse source
This commit is contained in:
Matthew Dillon 2014-10-29 13:39:31 -08:00
parent b8bda910cd
commit ff0e37d2ef
9 changed files with 163 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

34
models/strains.go
View file

@ -17,7 +17,7 @@ type Strain struct {
StrainType string `db:"strain_type" json:"strain_type"`
Etymology string `db:"etymology" json:"etymology"`
AccessionBanks string `db:"accession_banks" json:"accession_banks"`
GenbankEmblDdb string `db:"genbank_embl_ddb" json:"genbank_eml_ddb"`
GenbankEmblDdb string `db:"genbank_embl_ddb" json:"genbank_embl_ddb"`
CreatedAt time.Time `db:"created_at" json:"created_at"`
UpdatedAt time.Time `db:"updated_at" json:"updated_at"`
DeletedAt time.Time `db:"deleted_at" json:"deleted_at"`
@ -37,6 +37,9 @@ type StrainsService interface {
// Create a strain record
Create(strain *Strain) (bool, error)
// Update an existing strain
Update(id int64, strain *Strain) (updated bool, err error)
}
var (
@ -112,10 +115,32 @@ func (s *strainsService) List(opt *StrainListOptions) ([]*Strain, error) {
return strains, nil
}
func (s *strainsService) Update(id int64, strain *Strain) (bool, error) {
strId := strconv.FormatInt(id, 10)
url, err := s.client.url(router.UpdateStrain, map[string]string{"Id": strId}, nil)
if err != nil {
return false, err
}
req, err := s.client.NewRequest("PUT", url.String(), strain)
if err != nil {
return false, err
}
resp, err := s.client.Do(req, &strain)
if err != nil {
return false, err
}
return resp.StatusCode == http.StatusOK, nil
}
type MockStrainsService struct {
Get_ func(id int64) (*Strain, error)
List_ func(opt *StrainListOptions) ([]*Strain, error)
Create_ func(strain *Strain) (bool, error)
Update_ func(id int64, strain *Strain) (bool, error)
}
var _ StrainsService = &MockStrainsService{}
@ -140,3 +165,10 @@ func (s *MockStrainsService) List(opt *StrainListOptions) ([]*Strain, error) {
}
return s.List_(opt)
}
func (s *MockStrainsService) Update(id int64, strain *Strain) (bool, error) {
if s.Update_ == nil {
return false, nil
}
return s.Update_(id, strain)
}

37
models/strains_test.go
View file

@ -55,7 +55,7 @@ func TestStrainService_Create(t *testing.T) {
mux.HandleFunc(urlPath(t, router.CreateStrain, nil), func(w http.ResponseWriter, r *http.Request) {
called = true
testMethod(t, r, "POST")
testBody(t, r, `{"id":1,"species_id":1,"strain_name":"Test Strain","strain_type":"Test Type","etymology":"Test Etymology","accession_banks":"Test Accession","genbank_eml_ddb":"Test Genbank","created_at":"0001-01-01T00:00:00Z","updated_at":"0001-01-01T00:00:00Z","deleted_at":"0001-01-01T00:00:00Z"}`+"\n")
testBody(t, r, `{"id":1,"species_id":1,"strain_name":"Test Strain","strain_type":"Test Type","etymology":"Test Etymology","accession_banks":"Test Accession","genbank_embl_ddb":"Test Genbank","created_at":"0001-01-01T00:00:00Z","updated_at":"0001-01-01T00:00:00Z","deleted_at":"0001-01-01T00:00:00Z"}`+"\n")
w.WriteHeader(http.StatusCreated)
writeJSON(w, want)
@ -113,3 +113,38 @@ func TestStrainService_List(t *testing.T) {
t.Errorf("Strains.List return %+v, want %+v", strains, want)
}
}
func TestStrainService_Update(t *testing.T) {
setup()
defer teardown()
want := newStrain()
var called bool
mux.HandleFunc(urlPath(t, router.UpdateStrain, map[string]string{"Id": "1"}), func(w http.ResponseWriter, r *http.Request) {
called = true
testMethod(t, r, "PUT")
testBody(t, r, `{"id":1,"species_id":1,"strain_name":"Test Strain Updated","strain_type":"Test Type Updated","etymology":"Test Etymology Updated","accession_banks":"Test Accession Updated","genbank_embl_ddb":"Test Genbank Updated","created_at":"0001-01-01T00:00:00Z","updated_at":"0001-01-01T00:00:00Z","deleted_at":"0001-01-01T00:00:00Z"}`+"\n")
w.WriteHeader(http.StatusOK)
writeJSON(w, want)
})
strain := newStrain()
strain.StrainName = "Test Strain Updated"
strain.StrainType = "Test Type Updated"
strain.Etymology = "Test Etymology Updated"
strain.AccessionBanks = "Test Accession Updated"
strain.GenbankEmblDdb = "Test Genbank Updated"
updated, err := client.Strains.Update(strain.Id, strain)
if err != nil {
t.Errorf("Strains.Update returned error: %v", err)
}
if !updated {
t.Error("!updated")
}
if !called {
t.Fatal("!called")
}
}