Skip to content
This repository has been archived by the owner on Nov 2, 2021. It is now read-only.

Use enum for activity status #50

Merged
merged 1 commit into from
Jun 28, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions models/simulation_activity.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ package models
// Editing this file might prove futile when you re-run the swagger generate command

import (
"encoding/json"

strfmt "github.com/go-openapi/strfmt"

"github.com/go-openapi/errors"
"github.com/go-openapi/swag"
"github.com/go-openapi/validate"
)

Expand Down Expand Up @@ -62,6 +65,11 @@ func (m *SimulationActivity) Validate(formats strfmt.Registry) error {
res = append(res, err)
}

if err := m.validateStatus(formats); err != nil {
// prop
res = append(res, err)
}

if err := m.validateWorkerVersion(formats); err != nil {
// prop
res = append(res, err)
Expand Down Expand Up @@ -100,6 +108,53 @@ func (m *SimulationActivity) validateSimulationID(formats strfmt.Registry) error
return nil
}

var simulationActivityTypeStatusPropEnum []interface{}

func init() {
var res []string
if err := json.Unmarshal([]byte(`["Waiting","Running","Cancelled","Error","Finished"]`), &res); err != nil {
panic(err)
}
for _, v := range res {
simulationActivityTypeStatusPropEnum = append(simulationActivityTypeStatusPropEnum, v)
}
}

const (
// SimulationActivityStatusWaiting captures enum value "Waiting"
SimulationActivityStatusWaiting string = "Waiting"
// SimulationActivityStatusRunning captures enum value "Running"
SimulationActivityStatusRunning string = "Running"
// SimulationActivityStatusCancelled captures enum value "Cancelled"
SimulationActivityStatusCancelled string = "Cancelled"
// SimulationActivityStatusError captures enum value "Error"
SimulationActivityStatusError string = "Error"
// SimulationActivityStatusFinished captures enum value "Finished"
SimulationActivityStatusFinished string = "Finished"
)

// prop value enum
func (m *SimulationActivity) validateStatusEnum(path, location string, value string) error {
if err := validate.Enum(path, location, value, simulationActivityTypeStatusPropEnum); err != nil {
return err
}
return nil
}

func (m *SimulationActivity) validateStatus(formats strfmt.Registry) error {

if swag.IsZero(m.Status) { // not required
return nil
}

// value enum
if err := m.validateStatusEnum("status", "body", m.Status); err != nil {
return err
}

return nil
}

func (m *SimulationActivity) validateWorkerVersion(formats strfmt.Registry) error {

if err := validate.Required("workerVersion", "body", m.WorkerVersion); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion version.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION_TAG=0.4.4
VERSION_TAG=0.4.5