Update after testing

Signed-off-by: Etzelia <etzelia@hotmail.com>
model_post
Etzelia 2019-11-24 15:17:54 -06:00
parent 017a921a4b
commit 7ad5a3a5d6
No known key found for this signature in database
GPG Key ID: 708511AE7ABC5314
9 changed files with 24 additions and 11 deletions

View File

@ -40,5 +40,5 @@ func (q *Model) Alert(builder *django.Builder) ([]*Alert, error) {
func (a *Alert) Save() (*internal.Status, error) {
endpoint := a.model.endpoint("alert")
return internal.ResponseStatus(endpoint, Values(a))
return internal.ResponseStatus(endpoint, a.model.Values(a))
}

View File

@ -45,5 +45,5 @@ func (q *Model) Application(builder *django.Builder) ([]*Application, error) {
func (a *Application) Save() (*internal.Status, error) {
endpoint := a.model.endpoint("application")
return internal.ResponseStatus(endpoint, Values(a))
return internal.ResponseStatus(endpoint, a.model.Values(a))
}

View File

@ -38,5 +38,5 @@ func (q *Model) IP(builder *django.Builder) ([]*IP, error) {
func (i *IP) Save() (*internal.Status, error) {
endpoint := i.model.endpoint("ip")
return internal.ResponseStatus(endpoint, Values(i))
return internal.ResponseStatus(endpoint, i.model.Values(i))
}

View File

@ -25,7 +25,7 @@ func (q *Model) NewDjangoBuilder() *django.Builder {
}
func (q *Model) endpoint(model string) string {
return fmt.Sprintf("%s/%s", q.URL, model)
return fmt.Sprintf("%s/%s/", q.URL, model)
}
func (q *Model) queryEndpoint(model, query string) string {
@ -35,12 +35,25 @@ func (q *Model) queryEndpoint(model, query string) string {
return fmt.Sprintf("%s%s", q.endpoint(model), query)
}
func Values(i interface{}) url.Values {
func (q *Model) Values(i interface{}) url.Values {
values := url.Values{}
values.Set("api", q.Token)
iVal := reflect.ValueOf(i).Elem()
typ := iVal.Type()
for i := 0; i < iVal.NumField(); i++ {
values.Set(strings.ToLower(typ.Field(i).Name), fmt.Sprint(iVal.Field(i)))
values.Set(strings.ToLower(typ.Field(i).Tag.Get("json")), PyConvert(iVal.Field(i)))
}
return values
}
func PyConvert(value reflect.Value) string {
switch value.Kind() {
case reflect.Bool:
if fmt.Sprint(value) == "true" {
return "True"
}
return "False"
default:
return fmt.Sprint(value)
}
}

View File

@ -49,5 +49,5 @@ func (q *Model) Note(builder *django.Builder) ([]*Note, error) {
func (n *Note) Save() (*internal.Status, error) {
endpoint := n.model.endpoint("note")
return internal.ResponseStatus(endpoint, Values(n))
return internal.ResponseStatus(endpoint, n.model.Values(n))
}

View File

@ -42,5 +42,5 @@ func (q *Model) Player(builder *django.Builder) ([]*Player, error) {
func (p *Player) Save() (*internal.Status, error) {
endpoint := p.model.endpoint("player")
return internal.ResponseStatus(endpoint, Values(p))
return internal.ResponseStatus(endpoint, p.model.Values(p))
}

View File

@ -62,5 +62,5 @@ func (q *Model) Ticket(builder *django.Builder) ([]*Ticket, error) {
func (t *Ticket) Save() (*internal.Status, error) {
endpoint := t.model.endpoint("ticket")
return internal.ResponseStatus(endpoint, Values(t))
return internal.ResponseStatus(endpoint, t.model.Values(t))
}

View File

@ -41,5 +41,5 @@ func (q *Model) TicketNote(builder *django.Builder) ([]*TicketNote, error) {
func (t *TicketNote) Save() (*internal.Status, error) {
endpoint := t.model.endpoint("ticketnote")
return internal.ResponseStatus(endpoint, Values(t))
return internal.ResponseStatus(endpoint, t.model.Values(t))
}

View File

@ -62,5 +62,5 @@ func (q *Model) UserSettings(builder *django.Builder) ([]*UserSettings, error) {
func (u *UserSettings) Save() (*internal.Status, error) {
endpoint := u.model.endpoint("usersettings")
return internal.ResponseStatus(endpoint, Values(u))
return internal.ResponseStatus(endpoint, u.model.Values(u))
}