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

Payload stutter

Browse source
This commit is contained in:
Matthew Dillon 2015-10-01 14:25:08 -07:00
parent da523e0160
commit 419ef7b5cf
11 changed files with 43 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
api/characteristics.go
View file

@ -14,7 +14,7 @@ import (
type CharacteristicService struct{} type CharacteristicService struct{}
func (c CharacteristicService) Unmarshal(b []byte) (types.Entity, error) { func (c CharacteristicService) Unmarshal(b []byte) (types.Entity, error) {
var cj payloads.CharacteristicPayload var cj payloads.Characteristic
err := json.Unmarshal(b, &cj) err := json.Unmarshal(b, &cj)
return &cj, err 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) return nil, types.NewJSONError(err, http.StatusInternalServerError)
} }
payload := payloads.CharacteristicsPayload{ payload := payloads.Characteristics{
Characteristics: characteristics, Characteristics: characteristics,
Measurements: measurements, Measurements: measurements,
Strains: strains, Strains: strains,
@ -102,7 +102,7 @@ func (c CharacteristicService) Get(id int64, genus string, claims *types.Claims)
return nil, types.NewJSONError(err, http.StatusInternalServerError) return nil, types.NewJSONError(err, http.StatusInternalServerError)
} }
payload := payloads.CharacteristicPayload{ payload := payloads.Characteristic{
Characteristic: characteristic, Characteristic: characteristic,
Measurements: measurements, Measurements: measurements,
Strains: strains, 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 { 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.UpdatedBy = claims.Sub
payload.Characteristic.Id = id 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 { 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.CreatedBy = claims.Sub
payload.Characteristic.UpdatedBy = claims.Sub payload.Characteristic.UpdatedBy = claims.Sub

2
api/compare.go
View file

@ -40,7 +40,7 @@ func HandleCompare(w http.ResponseWriter, r *http.Request) *types.AppError {
if appErr != nil { if appErr != nil {
return appErr return appErr
} }
measurementsPayload := (measurementsEntity).(*payloads.MeasurementsPayload) measurementsPayload := (measurementsEntity).(*payloads.Measurements)
// Assemble matrix // Assemble matrix
characteristic_ids := strings.Split(opt.Get("characteristic_ids"), ",") characteristic_ids := strings.Split(opt.Get("characteristic_ids"), ",")

10
api/measurements.go
View file

@ -14,7 +14,7 @@ import (
type MeasurementService struct{} type MeasurementService struct{}
func (s MeasurementService) Unmarshal(b []byte) (types.Entity, error) { func (s MeasurementService) Unmarshal(b []byte) (types.Entity, error) {
var mj payloads.MeasurementPayload var mj payloads.Measurement
err := json.Unmarshal(b, &mj) err := json.Unmarshal(b, &mj)
return &mj, err 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) return nil, types.NewJSONError(err, http.StatusInternalServerError)
} }
payload := payloads.MeasurementsPayload{ payload := payloads.Measurements{
Characteristics: characteristics, Characteristics: characteristics,
Strains: strains, Strains: strains,
Measurements: measurements, 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) return nil, types.NewJSONError(err, http.StatusInternalServerError)
} }
payload := payloads.MeasurementPayload{ payload := payloads.Measurement{
Measurement: 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 { 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.UpdatedBy = claims.Sub
payload.Measurement.Id = id 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 { 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.CreatedBy = claims.Sub
payload.Measurement.UpdatedBy = claims.Sub payload.Measurement.UpdatedBy = claims.Sub

10
api/species.go
View file

@ -14,7 +14,7 @@ import (
type SpeciesService struct{} type SpeciesService struct{}
func (s SpeciesService) Unmarshal(b []byte) (types.Entity, error) { func (s SpeciesService) Unmarshal(b []byte) (types.Entity, error) {
var sj payloads.SpeciesPayload var sj payloads.Species
err := json.Unmarshal(b, &sj) err := json.Unmarshal(b, &sj)
return &sj, err 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) return nil, types.NewJSONError(err, http.StatusInternalServerError)
} }
payload := payloads.ManySpeciesPayload{ payload := payloads.ManySpecies{
Species: species, Species: species,
Strains: strains, Strains: strains,
Meta: &models.SpeciesMeta{ 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) return nil, types.NewJSONError(err, http.StatusInternalServerError)
} }
payload := payloads.SpeciesPayload{ payload := payloads.Species{
Species: species, Species: species,
Strains: strains, Strains: strains,
Meta: &models.SpeciesMeta{ 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 { 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.UpdatedBy = claims.Sub
payload.Species.Id = id 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 { 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.CreatedBy = claims.Sub
payload.Species.UpdatedBy = claims.Sub payload.Species.UpdatedBy = claims.Sub

10
api/strains.go
View file

@ -14,7 +14,7 @@ import (
type StrainService struct{} type StrainService struct{}
func (s StrainService) Unmarshal(b []byte) (types.Entity, error) { func (s StrainService) Unmarshal(b []byte) (types.Entity, error) {
var sj payloads.StrainPayload var sj payloads.Strain
err := json.Unmarshal(b, &sj) err := json.Unmarshal(b, &sj)
return &sj, err 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) return nil, types.NewJSONError(err, http.StatusInternalServerError)
} }
payload := payloads.StrainsPayload{ payload := payloads.Strains{
Strains: strains, Strains: strains,
Species: species, Species: species,
Measurements: measurements, 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} var many_species models.ManySpecies = []*models.Species{species}
payload := payloads.StrainPayload{ payload := payloads.Strain{
Strain: strain, Strain: strain,
Species: &many_species, Species: &many_species,
Characteristics: characteristics, 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 { 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.UpdatedBy = claims.Sub
payload.Strain.Id = id 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 { 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.CreatedBy = claims.Sub
payload.Strain.UpdatedBy = claims.Sub payload.Strain.UpdatedBy = claims.Sub

8
api/users.go
View file

@ -30,7 +30,7 @@ var (
type UserService struct{} type UserService struct{}
func (u UserService) Unmarshal(b []byte) (types.Entity, error) { func (u UserService) Unmarshal(b []byte) (types.Entity, error) {
var uj payloads.UserPayload var uj payloads.User
err := json.Unmarshal(b, &uj) err := json.Unmarshal(b, &uj)
return &uj, err 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 user.CanEdit = claims.Role == "A" || id == claims.Sub
payload := payloads.UserPayload{ payload := payloads.User{
User: user, User: user,
Meta: &models.UserMeta{ Meta: &models.UserMeta{
CanAdd: claims.Role == "A", 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 { 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) original_user, err := models.DbGetUserById(id)
if err != nil { 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 { 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 { if err := user.Validate(); err != nil {
return &types.AppError{Error: err, Status: helpers.StatusUnprocessableEntity} return &types.AppError{Error: err, Status: helpers.StatusUnprocessableEntity}
} }

8
payloads/characteristics.go
View file

@ -6,7 +6,7 @@ import (
"github.com/thermokarst/bactdb/models" "github.com/thermokarst/bactdb/models"
) )
type CharacteristicPayload struct { type Characteristic struct {
Characteristic *models.Characteristic `json:"characteristic"` Characteristic *models.Characteristic `json:"characteristic"`
Measurements *models.Measurements `json:"measurements"` Measurements *models.Measurements `json:"measurements"`
Strains *models.Strains `json:"strains"` Strains *models.Strains `json:"strains"`
@ -14,7 +14,7 @@ type CharacteristicPayload struct {
Meta *models.CharacteristicMeta `json:"meta"` Meta *models.CharacteristicMeta `json:"meta"`
} }
type CharacteristicsPayload struct { type Characteristics struct {
Characteristics *models.Characteristics `json:"characteristics"` Characteristics *models.Characteristics `json:"characteristics"`
Measurements *models.Measurements `json:"measurements"` Measurements *models.Measurements `json:"measurements"`
Strains *models.Strains `json:"strains"` Strains *models.Strains `json:"strains"`
@ -22,10 +22,10 @@ type CharacteristicsPayload struct {
Meta *models.CharacteristicMeta `json:"meta"` Meta *models.CharacteristicMeta `json:"meta"`
} }
func (c *CharacteristicPayload) Marshal() ([]byte, error) { func (c *Characteristic) Marshal() ([]byte, error) {
return json.Marshal(c) return json.Marshal(c)
} }
func (c *CharacteristicsPayload) Marshal() ([]byte, error) { func (c *Characteristics) Marshal() ([]byte, error) {
return json.Marshal(c) return json.Marshal(c)
} }

8
payloads/measurements.go
View file

@ -6,20 +6,20 @@ import (
"github.com/thermokarst/bactdb/models" "github.com/thermokarst/bactdb/models"
) )
type MeasurementPayload struct { type Measurement struct {
Measurement *models.Measurement `json:"measurement"` Measurement *models.Measurement `json:"measurement"`
} }
type MeasurementsPayload struct { type Measurements struct {
Strains *models.Strains `json:"strains"` Strains *models.Strains `json:"strains"`
Characteristics *models.Characteristics `json:"characteristics"` Characteristics *models.Characteristics `json:"characteristics"`
Measurements *models.Measurements `json:"measurements"` Measurements *models.Measurements `json:"measurements"`
} }
func (m *MeasurementPayload) Marshal() ([]byte, error) { func (m *Measurement) Marshal() ([]byte, error) {
return json.Marshal(m) return json.Marshal(m)
} }
func (m *MeasurementsPayload) Marshal() ([]byte, error) { func (m *Measurements) Marshal() ([]byte, error) {
return json.Marshal(m) return json.Marshal(m)
} }

8
payloads/species.go
View file

@ -6,22 +6,22 @@ import (
"github.com/thermokarst/bactdb/models" "github.com/thermokarst/bactdb/models"
) )
type SpeciesPayload struct { type Species struct {
Species *models.Species `json:"species"` Species *models.Species `json:"species"`
Strains *models.Strains `json:"strains"` Strains *models.Strains `json:"strains"`
Meta *models.SpeciesMeta `json:"meta"` Meta *models.SpeciesMeta `json:"meta"`
} }
type ManySpeciesPayload struct { type ManySpecies struct {
Species *models.ManySpecies `json:"species"` Species *models.ManySpecies `json:"species"`
Strains *models.Strains `json:"strains"` Strains *models.Strains `json:"strains"`
Meta *models.SpeciesMeta `json:"meta"` Meta *models.SpeciesMeta `json:"meta"`
} }
func (s *SpeciesPayload) Marshal() ([]byte, error) { func (s *Species) Marshal() ([]byte, error) {
return json.Marshal(s) return json.Marshal(s)
} }
func (s *ManySpeciesPayload) Marshal() ([]byte, error) { func (s *ManySpecies) Marshal() ([]byte, error) {
return json.Marshal(s) return json.Marshal(s)
} }

8
payloads/strains.go
View file

@ -6,7 +6,7 @@ import (
"github.com/thermokarst/bactdb/models" "github.com/thermokarst/bactdb/models"
) )
type StrainPayload struct { type Strain struct {
Strain *models.Strain `json:"strain"` Strain *models.Strain `json:"strain"`
Species *models.ManySpecies `json:"species"` Species *models.ManySpecies `json:"species"`
Characteristics *models.Characteristics `json:"characteristics"` Characteristics *models.Characteristics `json:"characteristics"`
@ -14,7 +14,7 @@ type StrainPayload struct {
Meta *models.StrainMeta `json:"meta"` Meta *models.StrainMeta `json:"meta"`
} }
type StrainsPayload struct { type Strains struct {
Strains *models.Strains `json:"strains"` Strains *models.Strains `json:"strains"`
Species *models.ManySpecies `json:"species"` Species *models.ManySpecies `json:"species"`
Characteristics *models.Characteristics `json:"characteristics"` Characteristics *models.Characteristics `json:"characteristics"`
@ -22,10 +22,10 @@ type StrainsPayload struct {
Meta *models.StrainMeta `json:"meta"` Meta *models.StrainMeta `json:"meta"`
} }
func (s *StrainPayload) Marshal() ([]byte, error) { func (s *Strain) Marshal() ([]byte, error) {
return json.Marshal(s) return json.Marshal(s)
} }
func (s *StrainsPayload) Marshal() ([]byte, error) { func (s *Strains) Marshal() ([]byte, error) {
return json.Marshal(s) return json.Marshal(s)
} }

4
payloads/users.go
View file

@ -6,11 +6,11 @@ import (
"github.com/thermokarst/bactdb/models" "github.com/thermokarst/bactdb/models"
) )
type UserPayload struct { type User struct {
User *models.User `json:"user"` User *models.User `json:"user"`
Meta *models.UserMeta `json:"meta"` Meta *models.UserMeta `json:"meta"`
} }
func (u *UserPayload) Marshal() ([]byte, error) { func (u *User) Marshal() ([]byte, error) {
return json.Marshal(u) return json.Marshal(u)
} }