From 4bbd67dd4f4b79c7db3a412f0a4f7e9846d2bd20 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Wed, 26 Nov 2014 17:18:22 -0900 Subject: [PATCH] Tweaking JSON field naming convention for emberjs --- models/genera.go | 8 ++++---- models/genera_test.go | 4 ++-- models/observation_types.go | 8 ++++---- models/observation_types_test.go | 4 ++-- models/observations.go | 10 +++++----- models/observations_test.go | 4 ++-- models/species.go | 10 +++++----- models/species_test.go | 4 ++-- models/strains.go | 16 ++++++++-------- models/strains_test.go | 4 ++-- models/users.go | 8 ++++---- models/users_test.go | 2 +- 12 files changed, 41 insertions(+), 41 deletions(-) diff --git a/models/genera.go b/models/genera.go index 715ce46..71dbfdf 100644 --- a/models/genera.go +++ b/models/genera.go @@ -13,10 +13,10 @@ import ( // A Genus is a high-level classifier in bactdb. type Genus struct { Id int64 `json:"id,omitempty"` - GenusName string `db:"genus_name" json:"genus_name"` - CreatedAt time.Time `db:"created_at" json:"created_at"` - UpdatedAt time.Time `db:"updated_at" json:"updated_at"` - DeletedAt pq.NullTime `db:"deleted_at" json:"deleted_at"` + GenusName string `db:"genus_name" json:"genusName"` + CreatedAt time.Time `db:"created_at" json:"createdAt"` + UpdatedAt time.Time `db:"updated_at" json:"updatedAt"` + DeletedAt pq.NullTime `db:"deleted_at" json:"deletedAt"` } func NewGenus() *Genus { diff --git a/models/genera_test.go b/models/genera_test.go index 21efc97..2555430 100644 --- a/models/genera_test.go +++ b/models/genera_test.go @@ -54,7 +54,7 @@ func TestGeneraService_Create(t *testing.T) { mux.HandleFunc(urlPath(t, router.CreateGenus, nil), func(w http.ResponseWriter, r *http.Request) { called = true testMethod(t, r, "POST") - testBody(t, r, `{"id":1,"genus_name":"Test Genus","created_at":"0001-01-01T00:00:00Z","updated_at":"0001-01-01T00:00:00Z","deleted_at":{"Time":"0001-01-01T00:00:00Z","Valid":false}}`+"\n") + testBody(t, r, `{"id":1,"genusName":"Test Genus","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) @@ -124,7 +124,7 @@ func TestGeneraService_Update(t *testing.T) { mux.HandleFunc(urlPath(t, router.UpdateGenus, map[string]string{"Id": "1"}), func(w http.ResponseWriter, r *http.Request) { called = true testMethod(t, r, "PUT") - testBody(t, r, `{"id":1,"genus_name":"Test Genus Updated","created_at":"0001-01-01T00:00:00Z","updated_at":"0001-01-01T00:00:00Z","deleted_at":{"Time":"0001-01-01T00:00:00Z","Valid":false}}`+"\n") + testBody(t, r, `{"id":1,"genusName":"Test Genus 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) diff --git a/models/observation_types.go b/models/observation_types.go index ccbe10a..beaf41d 100644 --- a/models/observation_types.go +++ b/models/observation_types.go @@ -13,10 +13,10 @@ import ( // An Observation Type is a lookup type type ObservationType struct { Id int64 `json:"id,omitempty"` - ObservationTypeName string `db:"observation_type_name" json:"observation_type_name"` - CreatedAt time.Time `db:"created_at" json:"created_at"` - UpdatedAt time.Time `db:"updated_at" json:"updated_at"` - DeletedAt pq.NullTime `db:"deleted_at" json:"deleted_at"` + ObservationTypeName string `db:"observation_type_name" json:"observationTypeName"` + CreatedAt time.Time `db:"created_at" json:"createdAt"` + UpdatedAt time.Time `db:"updated_at" json:"updatedAt"` + DeletedAt pq.NullTime `db:"deleted_at" json:"deletedAt"` } func NewObservationType() *ObservationType { diff --git a/models/observation_types_test.go b/models/observation_types_test.go index 2b16741..6718ff7 100644 --- a/models/observation_types_test.go +++ b/models/observation_types_test.go @@ -54,7 +54,7 @@ func TestObservationTypeService_Create(t *testing.T) { mux.HandleFunc(urlPath(t, router.CreateObservationType, nil), func(w http.ResponseWriter, r *http.Request) { called = true testMethod(t, r, "POST") - testBody(t, r, `{"id":1,"observation_type_name":"Test Obs Type","created_at":"0001-01-01T00:00:00Z","updated_at":"0001-01-01T00:00:00Z","deleted_at":{"Time":"0001-01-01T00:00:00Z","Valid":false}}`+"\n") + testBody(t, r, `{"id":1,"observationTypeName":"Test Obs 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) @@ -123,7 +123,7 @@ func TestObservationTypeService_Update(t *testing.T) { mux.HandleFunc(urlPath(t, router.UpdateObservationType, map[string]string{"Id": "1"}), func(w http.ResponseWriter, r *http.Request) { called = true testMethod(t, r, "PUT") - testBody(t, r, `{"id":1,"observation_type_name":"Test Obs Type Updated","created_at":"0001-01-01T00:00:00Z","updated_at":"0001-01-01T00:00:00Z","deleted_at":{"Time":"0001-01-01T00:00:00Z","Valid":false}}`+"\n") + testBody(t, r, `{"id":1,"observationTypeName":"Test Obs 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) }) diff --git a/models/observations.go b/models/observations.go index 753029e..8d70565 100644 --- a/models/observations.go +++ b/models/observations.go @@ -13,11 +13,11 @@ import ( // An Observation is a lookup type type Observation struct { Id int64 `json:"id,omitempty"` - ObservationName string `db:"observation_name" json:"observation_name"` - ObservationTypeId int64 `db:"observation_type_id" json:"observation_type_id"` - CreatedAt time.Time `db:"created_at" json:"created_at"` - UpdatedAt time.Time `db:"updated_at" json:"updated_at"` - DeletedAt pq.NullTime `db:"deleted_at" json:"deleted_at"` + ObservationName string `db:"observation_name" json:"observationName"` + ObservationTypeId int64 `db:"observation_type_id" json:"observationTypeId"` + CreatedAt time.Time `db:"created_at" json:"createdAt"` + UpdatedAt time.Time `db:"updated_at" json:"updatedAt"` + DeletedAt pq.NullTime `db:"deleted_at" json:"deletedAt"` } func NewObservation() *Observation { diff --git a/models/observations_test.go b/models/observations_test.go index 5f4964b..0267552 100644 --- a/models/observations_test.go +++ b/models/observations_test.go @@ -54,7 +54,7 @@ func TestObservationService_Create(t *testing.T) { mux.HandleFunc(urlPath(t, router.CreateObservation, nil), func(w http.ResponseWriter, r *http.Request) { called = true testMethod(t, r, "POST") - testBody(t, r, `{"id":1,"observation_name":"Test Observation","observation_type_id":0,"created_at":"0001-01-01T00:00:00Z","updated_at":"0001-01-01T00:00:00Z","deleted_at":{"Time":"0001-01-01T00:00:00Z","Valid":false}}`+"\n") + testBody(t, r, `{"id":1,"observationName":"Test Observation","observationTypeId":0,"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) @@ -123,7 +123,7 @@ func TestObservationService_Update(t *testing.T) { mux.HandleFunc(urlPath(t, router.UpdateObservation, map[string]string{"Id": "1"}), func(w http.ResponseWriter, r *http.Request) { called = true testMethod(t, r, "PUT") - testBody(t, r, `{"id":1,"observation_name":"Test Obs Updated","observation_type_id":0,"created_at":"0001-01-01T00:00:00Z","updated_at":"0001-01-01T00:00:00Z","deleted_at":{"Time":"0001-01-01T00:00:00Z","Valid":false}}`+"\n") + testBody(t, r, `{"id":1,"observationName":"Test Obs Updated","observationTypeId":0,"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) }) diff --git a/models/species.go b/models/species.go index fa8e650..ad3375d 100644 --- a/models/species.go +++ b/models/species.go @@ -13,11 +13,11 @@ import ( // A Species is a high-level classifier in bactdb. type Species struct { Id int64 `json:"id,omitempty"` - GenusId int64 `db:"genus_id" json:"genus_id"` - SpeciesName string `db:"species_name" json:"species_name"` - CreatedAt time.Time `db:"created_at" json:"created_at"` - UpdatedAt time.Time `db:"updated_at" json:"updated_at"` - DeletedAt pq.NullTime `db:"deleted_at" json:"deleted_at"` + GenusId int64 `db:"genus_id" json:"genusId"` + SpeciesName string `db:"species_name" json:"speciesName"` + CreatedAt time.Time `db:"created_at" json:"createdAt"` + UpdatedAt time.Time `db:"updated_at" json:"updatedAt"` + DeletedAt pq.NullTime `db:"deleted_at" json:"deletedAt"` } func NewSpecies() *Species { diff --git a/models/species_test.go b/models/species_test.go index b6639f9..2405d50 100644 --- a/models/species_test.go +++ b/models/species_test.go @@ -55,7 +55,7 @@ func TestSpeciesService_Create(t *testing.T) { mux.HandleFunc(urlPath(t, router.CreateSpecies, nil), func(w http.ResponseWriter, r *http.Request) { called = true testMethod(t, r, "POST") - testBody(t, r, `{"id":1,"genus_id":1,"species_name":"Test Species","created_at":"0001-01-01T00:00:00Z","updated_at":"0001-01-01T00:00:00Z","deleted_at":{"Time":"0001-01-01T00:00:00Z","Valid":false}}`+"\n") + testBody(t, r, `{"id":1,"genusId":1,"speciesName":"Test Species","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) @@ -124,7 +124,7 @@ func TestSpeciesService_Update(t *testing.T) { mux.HandleFunc(urlPath(t, router.UpdateSpecies, map[string]string{"Id": "1"}), func(w http.ResponseWriter, r *http.Request) { called = true testMethod(t, r, "PUT") - testBody(t, r, `{"id":1,"genus_id":1,"species_name":"Test Species Updated","created_at":"0001-01-01T00:00:00Z","updated_at":"0001-01-01T00:00:00Z","deleted_at":{"Time":"0001-01-01T00:00:00Z","Valid":false}}`+"\n") + testBody(t, r, `{"id":1,"genusId":1,"speciesName":"Test Species 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) diff --git a/models/strains.go b/models/strains.go index a890a31..5f36379 100644 --- a/models/strains.go +++ b/models/strains.go @@ -13,15 +13,15 @@ import ( // A Strain is a subclass of species type Strain struct { Id int64 `json:"id,omitempty"` - SpeciesId int64 `db:"species_id" json:"species_id"` - StrainName string `db:"strain_name" json:"strain_name"` - StrainType string `db:"strain_type" json:"strain_type"` + SpeciesId int64 `db:"species_id" json:"speciesId"` + StrainName string `db:"strain_name" json:"strainName"` + StrainType string `db:"strain_type" json:"strainType"` Etymology string `db:"etymology" json:"etymology"` - AccessionBanks string `db:"accession_banks" json:"accession_banks"` - 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 pq.NullTime `db:"deleted_at" json:"deleted_at"` + AccessionBanks string `db:"accession_banks" json:"accessionBanks"` + GenbankEmblDdb string `db:"genbank_embl_ddb" json:"genbankEmblDdb"` + CreatedAt time.Time `db:"created_at" json:"createdAt"` + UpdatedAt time.Time `db:"updated_at" json:"updatedAt"` + DeletedAt pq.NullTime `db:"deleted_at" json:"deletedAt"` } func NewStrain() *Strain { diff --git a/models/strains_test.go b/models/strains_test.go index 0ccf9b7..3961098 100644 --- a/models/strains_test.go +++ b/models/strains_test.go @@ -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_embl_ddb":"Test Genbank","created_at":"0001-01-01T00:00:00Z","updated_at":"0001-01-01T00:00:00Z","deleted_at":{"Time":"0001-01-01T00:00:00Z","Valid":false}}`+"\n") + testBody(t, r, `{"id":1,"speciesId":1,"strainName":"Test Strain","strainType":"Test Type","etymology":"Test Etymology","accessionBanks":"Test Accession","genbankEmblDdb":"Test Genbank","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) @@ -124,7 +124,7 @@ func TestStrainService_Update(t *testing.T) { 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":{"Time":"0001-01-01T00:00:00Z","Valid":false}}`+"\n") + testBody(t, r, `{"id":1,"speciesId":1,"strainName":"Test Strain Updated","strainType":"Test Type Updated","etymology":"Test Etymology Updated","accessionBanks":"Test Accession Updated","genbankEmblDdb":"Test Genbank 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) }) diff --git a/models/users.go b/models/users.go index bceb786..3f82107 100644 --- a/models/users.go +++ b/models/users.go @@ -12,10 +12,10 @@ import ( // A User is a person that has administrative access to bactdb. type User struct { Id int64 `json:"id,omitempty"` - UserName string `json:"user_name"` - 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"` + UserName string `json:"userName"` + CreatedAt time.Time `db:"created_at" json:"createdAt"` + UpdatedAt time.Time `db:"updated_at" json:"updatedAt"` + DeletedAt time.Time `db:"deleted_at" json:"deletedAt"` } func NewUser() *User { diff --git a/models/users_test.go b/models/users_test.go index 9c23a85..5b9399e 100644 --- a/models/users_test.go +++ b/models/users_test.go @@ -54,7 +54,7 @@ func TestUsersService_Create(t *testing.T) { mux.HandleFunc(urlPath(t, router.CreateUser, nil), func(w http.ResponseWriter, r *http.Request) { called = true testMethod(t, r, "POST") - testBody(t, r, `{"id":1,"user_name":"Test User","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,"userName":"Test User","createdAt":"0001-01-01T00:00:00Z","updatedAt":"0001-01-01T00:00:00Z","deletedAt":"0001-01-01T00:00:00Z"}`+"\n") w.WriteHeader(http.StatusCreated) writeJSON(w, want)