Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Issue #202 and #190 #206

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[FIX] Issue #202 and #190 #206

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7674e75
fix(request): ensure the precision isn't lost when decoding numeric v…
quetzyg Apr 5, 2021
1774d8b
tests(request): update an expected ID value to a high value
quetzyg Apr 5, 2021
7ea5e24
tests(request): full coverage of the handleNumeric() function
quetzyg Apr 5, 2021
cb512b4
fix(request): ensure numeric values are all handled as json.Number in…
quetzyg Apr 11, 2021
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
119 changes: 57 additions & 62 deletions request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"fmt"
"io"
"reflect"
"strconv"
"strings"
"time"
)
Expand Down Expand Up @@ -95,7 +94,10 @@ func newErrUnsupportedPtrType(rf reflect.Value, t reflect.Type, structField refl
func UnmarshalPayload(in io.Reader, model interface{}) error {
payload := new(OnePayload)

if err := json.NewDecoder(in).Decode(payload); err != nil {
decoder := json.NewDecoder(in)
decoder.UseNumber()

if err := decoder.Decode(payload); err != nil {
return err
}

Expand All @@ -116,7 +118,10 @@ func UnmarshalPayload(in io.Reader, model interface{}) error {
func UnmarshalManyPayload(in io.Reader, t reflect.Type) ([]interface{}, error) {
payload := new(ManyPayload)

if err := json.NewDecoder(in).Decode(payload); err != nil {
decoder := json.NewDecoder(in)
decoder.UseNumber()

if err := decoder.Decode(payload); err != nil {
return nil, err
}

Expand Down Expand Up @@ -209,18 +214,9 @@ func unmarshalNode(data *Node, model reflect.Value, included *map[string]*Node)
continue
}

// Value was not a string... only other supported type was a numeric,
// which would have been sent as a float value.
floatValue, err := strconv.ParseFloat(data.ID, 64)
if err != nil {
// Could not convert the value in the "id" attr to a float
er = ErrBadJSONAPIID
break
}

// Convert the numeric float to one of the supported ID numeric types
// (int[8,16,32,64] or uint[8,16,32,64])
idValue, err := handleNumeric(floatValue, fieldType.Type, fieldValue)
idValue, err := handleNumeric(json.Number(data.ID), fieldType.Type, fieldValue)
if err != nil {
// We had a JSON float (numeric), but our field was not one of the
// allowed numeric types
Expand Down Expand Up @@ -271,7 +267,10 @@ func unmarshalNode(data *Node, model reflect.Value, included *map[string]*Node)
buf := bytes.NewBuffer(nil)

json.NewEncoder(buf).Encode(data.Relationships[args[1]])
json.NewDecoder(buf).Decode(relationship)

decoder := json.NewDecoder(buf)
decoder.UseNumber()
decoder.Decode(relationship)

data := relationship.Data
models := reflect.New(fieldValue.Type()).Elem()
Expand All @@ -298,10 +297,11 @@ func unmarshalNode(data *Node, model reflect.Value, included *map[string]*Node)

buf := bytes.NewBuffer(nil)

json.NewEncoder(buf).Encode(
data.Relationships[args[1]],
)
json.NewDecoder(buf).Decode(relationship)
json.NewEncoder(buf).Encode(data.Relationships[args[1]])

decoder := json.NewDecoder(buf)
decoder.UseNumber()
decoder.Decode(relationship)

/*
http://jsonapi.org/format/#document-resource-object-relationships
Expand Down Expand Up @@ -416,9 +416,12 @@ func unmarshalAttribute(
return
}

// JSON value was a float (numeric)
if value.Kind() == reflect.Float64 {
value, err = handleNumeric(attribute, fieldType, fieldValue)
switch attribute.(type) {
case json.Number:
value, err = handleNumeric(attribute.(json.Number), fieldType, fieldValue)
return
case float64:
quetzyg marked this conversation as resolved.
Show resolved Hide resolved
value, err = handleNumeric(json.Number(fmt.Sprint(attribute)), fieldType, fieldValue)
quetzyg marked this conversation as resolved.
Show resolved Hide resolved
return
}

Expand Down Expand Up @@ -495,27 +498,26 @@ func handleTime(attribute interface{}, args []string, fieldValue reflect.Value)
return reflect.ValueOf(t), nil
}

var at int64
switch v.Interface().(type) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original logic was kept, since we're still checking the type of the attribute, while the previous/following checks are done to the fieldValue kind.

I wonder if we should check the fieldValue kind here as well for consistency.

case json.Number:
i, err := v.Interface().(json.Number).Int64()
if err == nil {
return reflect.ValueOf(time.Unix(i, 0)), nil
}

if v.Kind() == reflect.Float64 {
at = int64(v.Interface().(float64))
} else if v.Kind() == reflect.Int {
at = v.Int()
} else {
return reflect.ValueOf(time.Now()), ErrInvalidTime
f, err := v.Interface().(json.Number).Float64()
if err == nil {
return reflect.ValueOf(time.Unix(int64(f), 0)), nil
}
}

t := time.Unix(at, 0)

return reflect.ValueOf(t), nil
return reflect.ValueOf(time.Now()), ErrInvalidTime
}

func handleNumeric(
attribute interface{},
attribute json.Number,
fieldType reflect.Type,
fieldValue reflect.Value) (reflect.Value, error) {
v := reflect.ValueOf(attribute)
floatValue := v.Interface().(float64)

var kind reflect.Kind
if fieldValue.Kind() == reflect.Ptr {
Expand All @@ -524,50 +526,41 @@ func handleNumeric(
kind = fieldType.Kind()
}

var numericValue reflect.Value
i, err := attribute.Int64()

switch kind {
case reflect.Int:
n := int(floatValue)
numericValue = reflect.ValueOf(&n)
return reflect.ValueOf(int(i)), err
case reflect.Int8:
n := int8(floatValue)
numericValue = reflect.ValueOf(&n)
return reflect.ValueOf(int8(i)), err
case reflect.Int16:
n := int16(floatValue)
numericValue = reflect.ValueOf(&n)
return reflect.ValueOf(int16(i)), err
case reflect.Int32:
n := int32(floatValue)
numericValue = reflect.ValueOf(&n)
return reflect.ValueOf(int32(i)), err
case reflect.Int64:
n := int64(floatValue)
numericValue = reflect.ValueOf(&n)
return reflect.ValueOf(i), err
case reflect.Uint:
n := uint(floatValue)
numericValue = reflect.ValueOf(&n)
return reflect.ValueOf(uint(i)), err
case reflect.Uint8:
n := uint8(floatValue)
numericValue = reflect.ValueOf(&n)
return reflect.ValueOf(uint8(i)), err
case reflect.Uint16:
n := uint16(floatValue)
numericValue = reflect.ValueOf(&n)
return reflect.ValueOf(uint16(i)), err
case reflect.Uint32:
n := uint32(floatValue)
numericValue = reflect.ValueOf(&n)
return reflect.ValueOf(uint32(i)), err
case reflect.Uint64:
n := uint64(floatValue)
numericValue = reflect.ValueOf(&n)
return reflect.ValueOf(uint64(i)), err
}

f, err := attribute.Float64()

switch kind {
case reflect.Float32:
n := float32(floatValue)
numericValue = reflect.ValueOf(&n)
return reflect.ValueOf(float32(f)), err
case reflect.Float64:
n := floatValue
numericValue = reflect.ValueOf(&n)
default:
return reflect.Value{}, ErrUnknownFieldNumberType
return reflect.ValueOf(f), err
}

return numericValue, nil
return reflect.Value{}, ErrUnknownFieldNumberType
}

func handlePointer(
Expand All @@ -580,6 +573,8 @@ func handlePointer(
var concreteVal reflect.Value

switch cVal := attribute.(type) {
case json.Number:
return handleNumeric(attribute.(json.Number), fieldType, fieldValue)
case string:
concreteVal = reflect.ValueOf(&cVal)
case bool:
Expand Down
4 changes: 2 additions & 2 deletions request_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ func TestUnmarshalSetsID(t *testing.T) {
t.Fatal(err)
}

if out.ID != 2 {
if out.ID != 9223372036854775807 {
Copy link
Contributor Author

@quetzyg quetzyg Apr 5, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we used this value previously, the test would fail;

t.Fatalf("Did not set ID on dst interface")
}
}
Expand Down Expand Up @@ -1070,7 +1070,7 @@ func samplePayload() io.Reader {
func samplePayloadWithID() io.Reader {
payload := &OnePayload{
Data: &Node{
ID: "2",
ID: "9223372036854775807",
Type: "blogs",
Attributes: map[string]interface{}{
"title": "New blog",
Expand Down