From 419ef7b5cf54a6bfb06af93deef7d10e223966e6 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 1 Oct 2015 14:25:08 -0700 Subject: [PATCH] Payload stutter --- api/characteristics.go | 10 +++++----- api/compare.go | 2 +- api/measurements.go | 10 +++++----- api/species.go | 10 +++++----- api/strains.go | 10 +++++----- api/users.go | 8 ++++---- payloads/characteristics.go | 8 ++++---- payloads/measurements.go | 8 ++++---- payloads/species.go | 8 ++++---- payloads/strains.go | 8 ++++---- payloads/users.go | 4 ++-- 11 files changed, 43 insertions(+), 43 deletions(-) diff --git a/api/characteristics.go b/api/characteristics.go index 275c9df..8727a00 100644 --- a/api/characteristics.go +++ b/api/characteristics.go @@ -14,7 +14,7 @@ import ( type CharacteristicService struct{} func (c CharacteristicService) Unmarshal(b []byte) (types.Entity, error) { - var cj payloads.CharacteristicPayload + var cj payloads.Characteristic err := json.Unmarshal(b, &cj) return &cj, err } @@ -63,7 +63,7 @@ func (c CharacteristicService) List(val *url.Values, claims *types.Claims) (type return nil, types.NewJSONError(err, http.StatusInternalServerError) } - payload := payloads.CharacteristicsPayload{ + payload := payloads.Characteristics{ Characteristics: characteristics, Measurements: measurements, Strains: strains, @@ -102,7 +102,7 @@ func (c CharacteristicService) Get(id int64, genus string, claims *types.Claims) return nil, types.NewJSONError(err, http.StatusInternalServerError) } - payload := payloads.CharacteristicPayload{ + payload := payloads.Characteristic{ Characteristic: characteristic, Measurements: measurements, Strains: strains, @@ -113,7 +113,7 @@ func (c CharacteristicService) Get(id int64, genus string, claims *types.Claims) } func (c CharacteristicService) Update(id int64, e *types.Entity, genus string, claims *types.Claims) *types.AppError { - payload := (*e).(*payloads.CharacteristicPayload) + payload := (*e).(*payloads.Characteristic) payload.Characteristic.UpdatedBy = claims.Sub payload.Characteristic.Id = id @@ -160,7 +160,7 @@ func (c CharacteristicService) Update(id int64, e *types.Entity, genus string, c } func (c CharacteristicService) Create(e *types.Entity, genus string, claims *types.Claims) *types.AppError { - payload := (*e).(*payloads.CharacteristicPayload) + payload := (*e).(*payloads.Characteristic) payload.Characteristic.CreatedBy = claims.Sub payload.Characteristic.UpdatedBy = claims.Sub diff --git a/api/compare.go b/api/compare.go index eb47acc..04ac122 100644 --- a/api/compare.go +++ b/api/compare.go @@ -40,7 +40,7 @@ func HandleCompare(w http.ResponseWriter, r *http.Request) *types.AppError { if appErr != nil { return appErr } - measurementsPayload := (measurementsEntity).(*payloads.MeasurementsPayload) + measurementsPayload := (measurementsEntity).(*payloads.Measurements) // Assemble matrix characteristic_ids := strings.Split(opt.Get("characteristic_ids"), ",") diff --git a/api/measurements.go b/api/measurements.go index 53019bb..d09c38c 100644 --- a/api/measurements.go +++ b/api/measurements.go @@ -14,7 +14,7 @@ import ( type MeasurementService struct{} func (s MeasurementService) Unmarshal(b []byte) (types.Entity, error) { - var mj payloads.MeasurementPayload + var mj payloads.Measurement err := json.Unmarshal(b, &mj) return &mj, err } @@ -53,7 +53,7 @@ func (m MeasurementService) List(val *url.Values, claims *types.Claims) (types.E return nil, types.NewJSONError(err, http.StatusInternalServerError) } - payload := payloads.MeasurementsPayload{ + payload := payloads.Measurements{ Characteristics: characteristics, Strains: strains, Measurements: measurements, @@ -68,7 +68,7 @@ func (m MeasurementService) Get(id int64, genus string, claims *types.Claims) (t return nil, types.NewJSONError(err, http.StatusInternalServerError) } - payload := payloads.MeasurementPayload{ + payload := payloads.Measurement{ Measurement: measurement, } @@ -76,7 +76,7 @@ func (m MeasurementService) Get(id int64, genus string, claims *types.Claims) (t } func (s MeasurementService) Update(id int64, e *types.Entity, genus string, claims *types.Claims) *types.AppError { - payload := (*e).(*payloads.MeasurementPayload) + payload := (*e).(*payloads.Measurement) payload.Measurement.UpdatedBy = claims.Sub payload.Measurement.Id = id @@ -120,7 +120,7 @@ func (m MeasurementService) Delete(id int64, genus string, claims *types.Claims) } func (m MeasurementService) Create(e *types.Entity, genus string, claims *types.Claims) *types.AppError { - payload := (*e).(*payloads.MeasurementPayload) + payload := (*e).(*payloads.Measurement) payload.Measurement.CreatedBy = claims.Sub payload.Measurement.UpdatedBy = claims.Sub diff --git a/api/species.go b/api/species.go index 5df6b66..23950db 100644 --- a/api/species.go +++ b/api/species.go @@ -14,7 +14,7 @@ import ( type SpeciesService struct{} func (s SpeciesService) Unmarshal(b []byte) (types.Entity, error) { - var sj payloads.SpeciesPayload + var sj payloads.Species err := json.Unmarshal(b, &sj) return &sj, err } @@ -43,7 +43,7 @@ func (s SpeciesService) List(val *url.Values, claims *types.Claims) (types.Entit return nil, types.NewJSONError(err, http.StatusInternalServerError) } - payload := payloads.ManySpeciesPayload{ + payload := payloads.ManySpecies{ Species: species, Strains: strains, Meta: &models.SpeciesMeta{ @@ -65,7 +65,7 @@ func (s SpeciesService) Get(id int64, genus string, claims *types.Claims) (types return nil, types.NewJSONError(err, http.StatusInternalServerError) } - payload := payloads.SpeciesPayload{ + payload := payloads.Species{ Species: species, Strains: strains, Meta: &models.SpeciesMeta{ @@ -77,7 +77,7 @@ func (s SpeciesService) Get(id int64, genus string, claims *types.Claims) (types } func (s SpeciesService) Update(id int64, e *types.Entity, genus string, claims *types.Claims) *types.AppError { - payload := (*e).(*payloads.SpeciesPayload) + payload := (*e).(*payloads.Species) payload.Species.UpdatedBy = claims.Sub payload.Species.Id = id @@ -118,7 +118,7 @@ func (s SpeciesService) Update(id int64, e *types.Entity, genus string, claims * } func (s SpeciesService) Create(e *types.Entity, genus string, claims *types.Claims) *types.AppError { - payload := (*e).(*payloads.SpeciesPayload) + payload := (*e).(*payloads.Species) payload.Species.CreatedBy = claims.Sub payload.Species.UpdatedBy = claims.Sub diff --git a/api/strains.go b/api/strains.go index 2f61e4e..1233230 100644 --- a/api/strains.go +++ b/api/strains.go @@ -14,7 +14,7 @@ import ( type StrainService struct{} func (s StrainService) Unmarshal(b []byte) (types.Entity, error) { - var sj payloads.StrainPayload + var sj payloads.Strain err := json.Unmarshal(b, &sj) return &sj, err } @@ -76,7 +76,7 @@ func (s StrainService) List(val *url.Values, claims *types.Claims) (types.Entity return nil, types.NewJSONError(err, http.StatusInternalServerError) } - payload := payloads.StrainsPayload{ + payload := payloads.Strains{ Strains: strains, Species: species, Measurements: measurements, @@ -131,7 +131,7 @@ func (s StrainService) Get(id int64, genus string, claims *types.Claims) (types. var many_species models.ManySpecies = []*models.Species{species} - payload := payloads.StrainPayload{ + payload := payloads.Strain{ Strain: strain, Species: &many_species, Characteristics: characteristics, @@ -145,7 +145,7 @@ func (s StrainService) Get(id int64, genus string, claims *types.Claims) (types. } func (s StrainService) Update(id int64, e *types.Entity, genus string, claims *types.Claims) *types.AppError { - payload := (*e).(*payloads.StrainPayload) + payload := (*e).(*payloads.Strain) payload.Strain.UpdatedBy = claims.Sub payload.Strain.Id = id @@ -181,7 +181,7 @@ func (s StrainService) Update(id int64, e *types.Entity, genus string, claims *t } func (s StrainService) Create(e *types.Entity, genus string, claims *types.Claims) *types.AppError { - payload := (*e).(*payloads.StrainPayload) + payload := (*e).(*payloads.Strain) payload.Strain.CreatedBy = claims.Sub payload.Strain.UpdatedBy = claims.Sub diff --git a/api/users.go b/api/users.go index b09963c..45ac7ac 100644 --- a/api/users.go +++ b/api/users.go @@ -30,7 +30,7 @@ var ( type UserService struct{} func (u UserService) Unmarshal(b []byte) (types.Entity, error) { - var uj payloads.UserPayload + var uj payloads.User err := json.Unmarshal(b, &uj) return &uj, err } @@ -66,7 +66,7 @@ func (u UserService) Get(id int64, dummy string, claims *types.Claims) (types.En user.CanEdit = claims.Role == "A" || id == claims.Sub - payload := payloads.UserPayload{ + payload := payloads.User{ User: user, Meta: &models.UserMeta{ CanAdd: claims.Role == "A", @@ -76,7 +76,7 @@ func (u UserService) Get(id int64, dummy string, claims *types.Claims) (types.En } func (u UserService) Update(id int64, e *types.Entity, dummy string, claims *types.Claims) *types.AppError { - user := (*e).(*payloads.UserPayload).User + user := (*e).(*payloads.User).User original_user, err := models.DbGetUserById(id) if err != nil { @@ -106,7 +106,7 @@ func (u UserService) Update(id int64, e *types.Entity, dummy string, claims *typ } func (u UserService) Create(e *types.Entity, dummy string, claims *types.Claims) *types.AppError { - user := (*e).(*payloads.UserPayload).User + user := (*e).(*payloads.User).User if err := user.Validate(); err != nil { return &types.AppError{Error: err, Status: helpers.StatusUnprocessableEntity} } diff --git a/payloads/characteristics.go b/payloads/characteristics.go index 8f89201..7da77ca 100644 --- a/payloads/characteristics.go +++ b/payloads/characteristics.go @@ -6,7 +6,7 @@ import ( "github.com/thermokarst/bactdb/models" ) -type CharacteristicPayload struct { +type Characteristic struct { Characteristic *models.Characteristic `json:"characteristic"` Measurements *models.Measurements `json:"measurements"` Strains *models.Strains `json:"strains"` @@ -14,7 +14,7 @@ type CharacteristicPayload struct { Meta *models.CharacteristicMeta `json:"meta"` } -type CharacteristicsPayload struct { +type Characteristics struct { Characteristics *models.Characteristics `json:"characteristics"` Measurements *models.Measurements `json:"measurements"` Strains *models.Strains `json:"strains"` @@ -22,10 +22,10 @@ type CharacteristicsPayload struct { Meta *models.CharacteristicMeta `json:"meta"` } -func (c *CharacteristicPayload) Marshal() ([]byte, error) { +func (c *Characteristic) Marshal() ([]byte, error) { return json.Marshal(c) } -func (c *CharacteristicsPayload) Marshal() ([]byte, error) { +func (c *Characteristics) Marshal() ([]byte, error) { return json.Marshal(c) } diff --git a/payloads/measurements.go b/payloads/measurements.go index c35db68..2c7853b 100644 --- a/payloads/measurements.go +++ b/payloads/measurements.go @@ -6,20 +6,20 @@ import ( "github.com/thermokarst/bactdb/models" ) -type MeasurementPayload struct { +type Measurement struct { Measurement *models.Measurement `json:"measurement"` } -type MeasurementsPayload struct { +type Measurements struct { Strains *models.Strains `json:"strains"` Characteristics *models.Characteristics `json:"characteristics"` Measurements *models.Measurements `json:"measurements"` } -func (m *MeasurementPayload) Marshal() ([]byte, error) { +func (m *Measurement) Marshal() ([]byte, error) { return json.Marshal(m) } -func (m *MeasurementsPayload) Marshal() ([]byte, error) { +func (m *Measurements) Marshal() ([]byte, error) { return json.Marshal(m) } diff --git a/payloads/species.go b/payloads/species.go index 39cbbc0..d391579 100644 --- a/payloads/species.go +++ b/payloads/species.go @@ -6,22 +6,22 @@ import ( "github.com/thermokarst/bactdb/models" ) -type SpeciesPayload struct { +type Species struct { Species *models.Species `json:"species"` Strains *models.Strains `json:"strains"` Meta *models.SpeciesMeta `json:"meta"` } -type ManySpeciesPayload struct { +type ManySpecies struct { Species *models.ManySpecies `json:"species"` Strains *models.Strains `json:"strains"` Meta *models.SpeciesMeta `json:"meta"` } -func (s *SpeciesPayload) Marshal() ([]byte, error) { +func (s *Species) Marshal() ([]byte, error) { return json.Marshal(s) } -func (s *ManySpeciesPayload) Marshal() ([]byte, error) { +func (s *ManySpecies) Marshal() ([]byte, error) { return json.Marshal(s) } diff --git a/payloads/strains.go b/payloads/strains.go index bb0ec8d..f73cd0b 100644 --- a/payloads/strains.go +++ b/payloads/strains.go @@ -6,7 +6,7 @@ import ( "github.com/thermokarst/bactdb/models" ) -type StrainPayload struct { +type Strain struct { Strain *models.Strain `json:"strain"` Species *models.ManySpecies `json:"species"` Characteristics *models.Characteristics `json:"characteristics"` @@ -14,7 +14,7 @@ type StrainPayload struct { Meta *models.StrainMeta `json:"meta"` } -type StrainsPayload struct { +type Strains struct { Strains *models.Strains `json:"strains"` Species *models.ManySpecies `json:"species"` Characteristics *models.Characteristics `json:"characteristics"` @@ -22,10 +22,10 @@ type StrainsPayload struct { Meta *models.StrainMeta `json:"meta"` } -func (s *StrainPayload) Marshal() ([]byte, error) { +func (s *Strain) Marshal() ([]byte, error) { return json.Marshal(s) } -func (s *StrainsPayload) Marshal() ([]byte, error) { +func (s *Strains) Marshal() ([]byte, error) { return json.Marshal(s) } diff --git a/payloads/users.go b/payloads/users.go index 5329f25..bf30dce 100644 --- a/payloads/users.go +++ b/payloads/users.go @@ -6,11 +6,11 @@ import ( "github.com/thermokarst/bactdb/models" ) -type UserPayload struct { +type User struct { User *models.User `json:"user"` Meta *models.UserMeta `json:"meta"` } -func (u *UserPayload) Marshal() ([]byte, error) { +func (u *User) Marshal() ([]byte, error) { return json.Marshal(u) }