From 861306c4bbd2fc2a504f07c7cddb922afefb863c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 20 Dec 2018 22:20:25 -0500 Subject: [PATCH 001/406] Fix recurrent typo (occured -> occurred) --- error_test.go | 8 ++++---- marshaling_test.go | 2 +- tests/errors-2.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/error_test.go b/error_test.go index 28fce59..28c9e82 100644 --- a/error_test.go +++ b/error_test.go @@ -32,10 +32,10 @@ func TestError(t *testing.T) { name: "detail", err: func() Error { e := NewError() - e.Detail = "An error occured." + e.Detail = "An error occurred." return e }(), - expectedString: "An error occured.", + expectedString: "An error occurred.", }, { name: "http status code", err: func() Error { @@ -58,10 +58,10 @@ func TestError(t *testing.T) { err: func() Error { e := NewError() e.Status = http.StatusInternalServerError - e.Detail = "An internal server error occured." + e.Detail = "An internal server error occurred." return e }(), - expectedString: "500 Internal Server Error: An internal server error occured.", + expectedString: "500 Internal Server Error: An internal server error occurred.", }, } diff --git a/marshaling_test.go b/marshaling_test.go index dbe7fb0..cf05ec2 100644 --- a/marshaling_test.go +++ b/marshaling_test.go @@ -204,7 +204,7 @@ func TestMarshalErrors(t *testing.T) { e1.Code = "somecode" e1.Status = http.StatusInternalServerError e1.Title = "Error" - e1.Detail = "An error occured." + e1.Detail = "An error occurred." e1.Links["about"] = "https://example.org/errors/about" e1.Source["pointer"] = "/data/attributes/title" e1.Meta["str"] = "a string" diff --git a/tests/errors-2.json b/tests/errors-2.json index b0741a7..37b4a24 100644 --- a/tests/errors-2.json +++ b/tests/errors-2.json @@ -2,7 +2,7 @@ "errors": [ { "code": "somecode", - "detail": "An error occured.", + "detail": "An error occurred.", "id": "00000000-0000-0000-0000-000000000000", "links": { "about": "https://example.org/errors/about" From 4f70954a22134a4a361b791a85d11861be9c6d9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 20 Dec 2018 22:37:27 -0500 Subject: [PATCH 002/406] Format code with gofmt -s --- filter_query_test.go | 8 ++++---- simple_url_test.go | 8 ++++---- url_test.go | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/filter_query_test.go b/filter_query_test.go index 37feb0c..cc18d3d 100644 --- a/filter_query_test.go +++ b/filter_query_test.go @@ -81,18 +81,18 @@ func BenchmarkMarshalFilterQuery(b *testing.B) { cdt := Condition{ Op: "or", Val: []Condition{ - Condition{ + { Op: "in", Val: []string{"a", "b", "c"}, }, - Condition{ + { Op: "and", Val: []Condition{ - Condition{ + { Op: "~", Val: "%a", }, - Condition{ + { Op: ">=", Val: "u", }, diff --git a/simple_url_test.go b/simple_url_test.go index 0dc2e10..c9d1a80 100644 --- a/simple_url_test.go +++ b/simple_url_test.go @@ -126,10 +126,10 @@ func TestSimpleURL(t *testing.T) { Route: "/type", Fields: map[string][]string{ - "type": []string{"attr1", "attr2", "rel1"}, - "type2": []string{"attr3", "attr4", "rel2", "rel3"}, - "type3": []string{"attr5", "attr6", "rel4"}, - "type4": []string{"attr7", "rel5", "rel6"}, + "type": {"attr1", "attr2", "rel1"}, + "type2": {"attr3", "attr4", "rel2", "rel3"}, + "type3": {"attr5", "attr6", "rel4"}, + "type4": {"attr7", "rel5", "rel6"}, }, Filter: nil, SortingRules: []string{"attr2", "-attr1"}, diff --git a/url_test.go b/url_test.go index 126b7b9..944df4d 100644 --- a/url_test.go +++ b/url_test.go @@ -257,16 +257,16 @@ func TestParseParams(t *testing.T) { PageSize: 50, PageNumber: 3, Include: [][]Rel{ - []Rel{ + { reg.Types["mocktypes1"].Rels["to-many-from-many"], }, - []Rel{ + { reg.Types["mocktypes1"].Rels["to-many-from-one"], reg.Types["mocktypes2"].Rels["to-one-from-many"], reg.Types["mocktypes1"].Rels["to-one"], reg.Types["mocktypes2"].Rels["to-many-from-many"], }, - []Rel{ + { reg.Types["mocktypes1"].Rels["to-one-from-one"], reg.Types["mocktypes2"].Rels["to-many-from-many"], }, @@ -301,16 +301,16 @@ func TestParseParams(t *testing.T) { PageSize: 50, PageNumber: 3, Include: [][]Rel{ - []Rel{ + { reg.Types["mocktypes1"].Rels["to-many-from-many"], }, - []Rel{ + { reg.Types["mocktypes1"].Rels["to-many-from-one"], reg.Types["mocktypes2"].Rels["to-one-from-many"], reg.Types["mocktypes1"].Rels["to-one"], reg.Types["mocktypes2"].Rels["to-many-from-many"], }, - []Rel{ + { reg.Types["mocktypes1"].Rels["to-one-from-one"], reg.Types["mocktypes2"].Rels["to-many-from-many"], }, @@ -343,7 +343,7 @@ func TestParseParams(t *testing.T) { PageSize: 90, PageNumber: 110, Include: [][]Rel{ - []Rel{ + { reg.Types["mocktypes1"].Rels["to-many-from-one"], reg.Types["mocktypes2"].Rels["to-one-from-many"], }, From 46724b1635ecee143a463d26571a711dcaf3275d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 14 Jan 2019 20:38:20 -0500 Subject: [PATCH 003/406] Add NewErrNotImplemented --- error.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/error.go b/error.go index ba60826..2790272 100644 --- a/error.go +++ b/error.go @@ -386,3 +386,13 @@ func NewErrServiceUnavailable() Error { return e } + +// NewErrNotImplemented (503) ... +func NewErrNotImplemented() Error { + e := NewError() + + e.Status = http.StatusNotImplemented + e.Title = "Not Implemented" + + return e +} From b015047f6112765d38870392d9b5bf6ecefde00b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Wed, 23 Jan 2019 21:55:09 -0500 Subject: [PATCH 004/406] Remove Attr.Default --- registry.go | 7 +++---- schema.go | 9 +++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/registry.go b/registry.go index 41bcf36..685088f 100644 --- a/registry.go +++ b/registry.go @@ -72,10 +72,9 @@ func (r *Registry) RegisterType(v interface{}) { def.String = "" attrs[n] = Attr{ - Name: n, - Type: sf.Type.String(), - Null: strings.HasPrefix(sf.Type.String(), "*"), - Default: def, + Name: n, + Type: sf.Type.String(), + Null: strings.HasPrefix(sf.Type.String(), "*"), } fields = append(fields, n) diff --git a/schema.go b/schema.go index f7661d6..c64b784 100644 --- a/schema.go +++ b/schema.go @@ -1,7 +1,5 @@ package jsonapi -import "database/sql" - // Type ... type Type struct { Name string @@ -13,10 +11,9 @@ type Type struct { // Attr ... type Attr struct { - Name string - Type string - Null bool - Default sql.NullString + Name string + Type string + Null bool } // Rel ... From e310136e850c502294c52ce6b0f9b28182d96b14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 17 Feb 2019 09:15:33 -0500 Subject: [PATCH 005/406] Update tchek to v0.3.0 --- build_links_test.go | 2 +- document_test.go | 2 +- error_test.go | 2 +- filter_query_test.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- marshaling_test.go | 2 +- resource_test.go | 2 +- simple_url_test.go | 2 +- unmarshaling_test.go | 2 +- url_test.go | 2 +- wrapper_test.go | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build_links_test.go b/build_links_test.go index dd12e60..2da858e 100644 --- a/build_links_test.go +++ b/build_links_test.go @@ -3,7 +3,7 @@ package jsonapi import ( "testing" - "github.com/kkaribu/tchek" + "github.com/mfcochauxlaberge/tchek" ) func TestBuildSelfLink(t *testing.T) { diff --git a/document_test.go b/document_test.go index 5d96abc..d04eee4 100644 --- a/document_test.go +++ b/document_test.go @@ -3,7 +3,7 @@ package jsonapi import ( "testing" - "github.com/kkaribu/tchek" + "github.com/mfcochauxlaberge/tchek" ) // TestDocument ... diff --git a/error_test.go b/error_test.go index 28c9e82..12cb753 100644 --- a/error_test.go +++ b/error_test.go @@ -4,7 +4,7 @@ import ( "net/http" "testing" - "github.com/kkaribu/tchek" + "github.com/mfcochauxlaberge/tchek" ) func TestError(t *testing.T) { diff --git a/filter_query_test.go b/filter_query_test.go index cc18d3d..a0e1414 100644 --- a/filter_query_test.go +++ b/filter_query_test.go @@ -6,7 +6,7 @@ import ( "io/ioutil" "testing" - "github.com/kkaribu/tchek" + "github.com/mfcochauxlaberge/tchek" ) func TestFilterQuery(t *testing.T) { diff --git a/go.mod b/go.mod index 07defc9..498940a 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/kkaribu/jsonapi require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/kkaribu/tchek v0.2.0 + github.com/mfcochauxlaberge/tchek v0.3.0 github.com/myesui/uuid v1.0.0 github.com/pmezard/go-difflib v1.0.0 // indirect gopkg.in/stretchr/testify.v1 v1.2.2 // indirect diff --git a/go.sum b/go.sum index d44d000..3ee132d 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/kkaribu/tchek v0.2.0 h1:/VcfPCGHbMbVvWqH+LFXniJmaCBodSocyh9u0n8k4bQ= -github.com/kkaribu/tchek v0.2.0/go.mod h1:SqTNgQxZ+DXsMmE2v0nUCqQjXnEG2bavXi0dQwDPBcs= +github.com/mfcochauxlaberge/tchek v0.3.0 h1:SFmqbnfjxMbP7yV/FuHioIwYI9tmDtmO9Jd5smGu0KQ= +github.com/mfcochauxlaberge/tchek v0.3.0/go.mod h1:e8jX6VID1Ku1XAZq8lkxRuGfSKIFL9sL7w4E3WDkx7o= github.com/myesui/uuid v1.0.0 h1:xCBmH4l5KuvLYc5L7AS7SZg9/jKdIFubM7OVoLqaQUI= github.com/myesui/uuid v1.0.0/go.mod h1:2CDfNgU0LR8mIdO8vdWd8i9gWWxLlcoIGGpSNgafq84= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= diff --git a/marshaling_test.go b/marshaling_test.go index cf05ec2..7eb2e50 100644 --- a/marshaling_test.go +++ b/marshaling_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/kkaribu/tchek" + "github.com/mfcochauxlaberge/tchek" ) func TestMarshalResource(t *testing.T) { diff --git a/resource_test.go b/resource_test.go index 79285dc..f3f7595 100644 --- a/resource_test.go +++ b/resource_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/kkaribu/tchek" + "github.com/mfcochauxlaberge/tchek" ) func TestResource(t *testing.T) { diff --git a/simple_url_test.go b/simple_url_test.go index c9d1a80..0968248 100644 --- a/simple_url_test.go +++ b/simple_url_test.go @@ -4,7 +4,7 @@ import ( "net/url" "testing" - "github.com/kkaribu/tchek" + "github.com/mfcochauxlaberge/tchek" ) func TestSimpleURL(t *testing.T) { diff --git a/unmarshaling_test.go b/unmarshaling_test.go index 9a90048..ff49208 100644 --- a/unmarshaling_test.go +++ b/unmarshaling_test.go @@ -3,7 +3,7 @@ package jsonapi import ( "testing" - "github.com/kkaribu/tchek" + "github.com/mfcochauxlaberge/tchek" ) func TestUnmarshalResource(t *testing.T) { diff --git a/url_test.go b/url_test.go index 944df4d..0299e93 100644 --- a/url_test.go +++ b/url_test.go @@ -4,7 +4,7 @@ import ( "net/url" "testing" - "github.com/kkaribu/tchek" + "github.com/mfcochauxlaberge/tchek" ) func TestParseURL(t *testing.T) { diff --git a/wrapper_test.go b/wrapper_test.go index bdc249f..ca3e946 100644 --- a/wrapper_test.go +++ b/wrapper_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/kkaribu/tchek" + "github.com/mfcochauxlaberge/tchek" ) func TestWrapper(t *testing.T) { From 437c79630704633268300c20b70f107eaa3f335f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 17 Feb 2019 09:16:03 -0500 Subject: [PATCH 006/406] Update module path --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 498940a..5c9c93f 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/kkaribu/jsonapi +module github.com/mfcochauxlaberge/jsonapi require ( github.com/davecgh/go-spew v1.1.1 // indirect From ece0a540ef47fa7bbee57ef4c96db86704a45074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 9 Mar 2019 12:09:53 -0500 Subject: [PATCH 007/406] Fix documentation link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 23fa265..bd4efe4 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ Author string `json:"author" api:"rel,users,articles"` ## Documentation -Check out the [incomplete documentation](https://godoc.org/github.com/kkaribu/jsonapi). +Check out the [incomplete documentation](https://godoc.org/github.com/mfcochauxlaberge/jsonapi). ## Utilities From d68313597d7ce01edcf0611092655e064e452637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 9 Mar 2019 12:47:17 -0500 Subject: [PATCH 008/406] Add Go version in go.mod --- go.mod | 2 ++ 1 file changed, 2 insertions(+) diff --git a/go.mod b/go.mod index 5c9c93f..32ea6a4 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,7 @@ module github.com/mfcochauxlaberge/jsonapi +go 1.11 + require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/mfcochauxlaberge/tchek v0.3.0 From 844a5c07a848f26c881057ea53cc288fb1588d69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 9 Mar 2019 15:49:14 -0500 Subject: [PATCH 009/406] Regenerate go.mod and go.sum --- go.mod | 3 --- go.sum | 6 ------ 2 files changed, 9 deletions(-) diff --git a/go.mod b/go.mod index 32ea6a4..ba288c6 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,6 @@ module github.com/mfcochauxlaberge/jsonapi go 1.11 require ( - github.com/davecgh/go-spew v1.1.1 // indirect github.com/mfcochauxlaberge/tchek v0.3.0 github.com/myesui/uuid v1.0.0 - github.com/pmezard/go-difflib v1.0.0 // indirect - gopkg.in/stretchr/testify.v1 v1.2.2 // indirect ) diff --git a/go.sum b/go.sum index 3ee132d..45fa1a7 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +1,4 @@ -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/mfcochauxlaberge/tchek v0.3.0 h1:SFmqbnfjxMbP7yV/FuHioIwYI9tmDtmO9Jd5smGu0KQ= github.com/mfcochauxlaberge/tchek v0.3.0/go.mod h1:e8jX6VID1Ku1XAZq8lkxRuGfSKIFL9sL7w4E3WDkx7o= github.com/myesui/uuid v1.0.0 h1:xCBmH4l5KuvLYc5L7AS7SZg9/jKdIFubM7OVoLqaQUI= github.com/myesui/uuid v1.0.0/go.mod h1:2CDfNgU0LR8mIdO8vdWd8i9gWWxLlcoIGGpSNgafq84= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -gopkg.in/stretchr/testify.v1 v1.2.2 h1:yhQC6Uy5CqibAIlk1wlusa/MJ3iAN49/BsR/dCCKz3M= -gopkg.in/stretchr/testify.v1 v1.2.2/go.mod h1:QI5V/q6UbPmuhtm10CaFZxED9NreB8PnFYN9JcR6TxU= From a550064ac5df523240cd3f7ca6f98e132807b704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 9 Mar 2019 16:55:48 -0500 Subject: [PATCH 010/406] Migrate to google/uuid for UUIDs --- error.go | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/error.go b/error.go index 2790272..a396d13 100644 --- a/error.go +++ b/error.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/myesui/uuid" + "github.com/google/uuid" ) // Error represents an error object from the JSON API specification. @@ -23,7 +23,7 @@ type Error struct { // NewError returns an empty Error object. func NewError() Error { err := Error{ - ID: uuid.NewV4().String(), + ID: uuid.New().String(), Code: "", Status: 0, Title: "", diff --git a/go.mod b/go.mod index ba288c6..606983c 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,6 @@ module github.com/mfcochauxlaberge/jsonapi go 1.11 require ( + github.com/google/uuid v1.1.1 github.com/mfcochauxlaberge/tchek v0.3.0 - github.com/myesui/uuid v1.0.0 ) diff --git a/go.sum b/go.sum index 45fa1a7..7fae0a9 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,4 @@ +github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/mfcochauxlaberge/tchek v0.3.0 h1:SFmqbnfjxMbP7yV/FuHioIwYI9tmDtmO9Jd5smGu0KQ= github.com/mfcochauxlaberge/tchek v0.3.0/go.mod h1:e8jX6VID1Ku1XAZq8lkxRuGfSKIFL9sL7w4E3WDkx7o= -github.com/myesui/uuid v1.0.0 h1:xCBmH4l5KuvLYc5L7AS7SZg9/jKdIFubM7OVoLqaQUI= -github.com/myesui/uuid v1.0.0/go.mod h1:2CDfNgU0LR8mIdO8vdWd8i9gWWxLlcoIGGpSNgafq84= From f54944c42ec743735acb58e6b9da89be5ebc4f11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 9 Mar 2019 23:05:01 -0500 Subject: [PATCH 011/406] Add Equal and StrictEqual --- resource.go | 80 ++++++++++++++++++++++++++++++++++++++++ resource_test.go | 96 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 176 insertions(+) diff --git a/resource.go b/resource.go index 1a79599..29e7c12 100644 --- a/resource.go +++ b/resource.go @@ -1,5 +1,10 @@ package jsonapi +import ( + "reflect" + "sort" +) + // Resource ... type Resource interface { // Structure @@ -35,3 +40,78 @@ type Resource interface { // JSON UnmarshalJSON(payload []byte) error } + +// Equal reports whether r1 and r2 are equal. +// +// Two resources are equal if their types are equal, all the attributes +// are equal (same type and same value), and all the relationstips are +// equal. +// +// IDs are ignored. +func Equal(r1, r2 Resource) bool { + // Type + if r1.GetType() != r2.GetType() { + return false + } + + // Attributes + r1Attrs := r1.Attrs() + sort.Slice(r1Attrs, func(i, j int) bool { + return r1Attrs[i].Name < r1Attrs[j].Name + }) + r2Attrs := r2.Attrs() + sort.Slice(r2Attrs, func(i, j int) bool { + return r2Attrs[i].Name < r2Attrs[j].Name + }) + + if len(r1Attrs) != len(r2Attrs) { + return false + } + + for i, attr1 := range r1Attrs { + attr2 := r2Attrs[i] + if !reflect.DeepEqual(r1.Get(attr1.Name), r2.Get(attr2.Name)) { + return false + } + } + + // Relationships + r1Rels := r1.Rels() + sort.Slice(r1Rels, func(i, j int) bool { + return r1Rels[i].Name < r1Rels[j].Name + }) + r2Rels := r2.Rels() + sort.Slice(r2Rels, func(i, j int) bool { + return r2Rels[i].Name < r2Rels[j].Name + }) + + if len(r1Rels) != len(r2Rels) { + return false + } + + for i, rel1 := range r1Rels { + rel2 := r2Rels[i] + if rel1.ToOne != rel2.ToOne { + return false + } + if rel1.ToOne { + if r1.GetToOne(rel1.Name) != r2.GetToOne(rel2.Name) { + return false + } + } else { + if !reflect.DeepEqual(r1.GetToMany(rel1.Name), r2.GetToMany(rel2.Name)) { + return false + } + } + } + + return true +} + +// StrictEqual is like Equal, but it also considers IDs. +func StrictEqual(r1, r2 Resource) bool { + if r1.GetID() != r2.GetID() { + return false + } + return Equal(r1, r2) +} diff --git a/resource_test.go b/resource_test.go index f3f7595..53b7fb3 100644 --- a/resource_test.go +++ b/resource_test.go @@ -36,6 +36,102 @@ func TestResource(t *testing.T) { tchek.AreEqual(t, "set to-one relationship 2", "another-artist", res.GetToOne("author")) } +func TestEqual(t *testing.T) { + now := time.Now() + + mt11 := Wrap(&MockType1{ + ID: "mt1", + Str: "str", + Int: 1, + Int8: 2, + Int16: 3, + Int32: 4, + Int64: 5, + Uint: 6, + Uint8: 7, + Uint16: 8, + Uint32: 9, + Bool: true, + Time: now, + ToOne: "a", + ToOneFromOne: "b", + ToOneFromMany: "c", + ToMany: []string{"a", "b", "c"}, + ToManyFromOne: []string{"a", "b", "c"}, + ToManyFromMany: []string{"a", "b", "c"}, + }) + + mt12 := Wrap(&MockType1{ + ID: "mt2", + Str: "str", + Int: 1, + Int8: 2, + Int16: 3, + Int32: 4, + Int64: 5, + Uint: 6, + Uint8: 7, + Uint16: 8, + Uint32: 9, + Bool: true, + Time: now, + ToOne: "a", + ToOneFromOne: "b", + ToOneFromMany: "c", + ToMany: []string{"a", "b", "c"}, + ToManyFromOne: []string{"a", "b", "c"}, + ToManyFromMany: []string{"a", "b", "c"}, + }) + + mt13 := Wrap(&MockType1{ + ID: "mt3", + Str: "str", + Int: 11, + Int8: 12, + Int16: 13, + Int32: 14, + Int64: 15, + Uint: 16, + Uint8: 17, + Uint16: 18, + Uint32: 19, + Bool: false, + Time: time.Now(), + ToOne: "d", + ToOneFromOne: "e", + ToOneFromMany: "f", + ToMany: []string{"d", "e", "f"}, + ToManyFromOne: []string{"d", "e", "f"}, + ToManyFromMany: []string{"d", "e", "f"}, + }) + + mt21 := Wrap(&MockType2{ + ID: "mt1", + StrPtr: func() *string { v := string(1); return &v }(), + IntPtr: func() *int { v := int(1); return &v }(), + Int8Ptr: func() *int8 { v := int8(2); return &v }(), + Int16Ptr: func() *int16 { v := int16(3); return &v }(), + Int32Ptr: func() *int32 { v := int32(4); return &v }(), + Int64Ptr: func() *int64 { v := int64(5); return &v }(), + UintPtr: func() *uint { v := uint(6); return &v }(), + Uint8Ptr: func() *uint8 { v := uint8(7); return &v }(), + Uint16Ptr: func() *uint16 { v := uint16(8); return &v }(), + Uint32Ptr: func() *uint32 { v := uint32(9); return &v }(), + BoolPtr: func() *bool { v := true; return &v }(), + TimePtr: func() *time.Time { v := time.Now(); return &v }(), + ToOneFromOne: "a", + ToOneFromMany: "b", + ToManyFromOne: []string{"a", "b", "c"}, + ToManyFromMany: []string{"a", "b", "c"}, + }) + + tchek.AreEqual(t, "compare same resource with itself", true, Equal(mt11, mt11)) + tchek.AreEqual(t, "compare two identical resources", true, Equal(mt11, mt12)) + tchek.AreEqual(t, "compare two identical resources (different IDs)", false, StrictEqual(mt11, mt12)) + tchek.AreEqual(t, "compare two different resources", false, Equal(mt11, mt13)) + tchek.AreEqual(t, "compare resources of different types", false, Equal(mt11, mt21)) +} + type painting struct { ID string `json:"id" api:"paintings"` From 85a1d3a485722f5354fb549ab9c115b3ef67b953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 9 Mar 2019 23:06:13 -0500 Subject: [PATCH 012/406] Remove some useless tests --- resource_test.go | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) diff --git a/resource_test.go b/resource_test.go index 53b7fb3..4e0e2f7 100644 --- a/resource_test.go +++ b/resource_test.go @@ -7,35 +7,6 @@ import ( "github.com/mfcochauxlaberge/tchek" ) -func TestResource(t *testing.T) { - loc, _ := time.LoadLocation("") - - p1 := &painting{ - ID: "persistence-memory", - Title: "The Persistence of Memory", - PaintedIn: time.Date(1931, 0, 0, 0, 0, 0, 0, loc), - Author: "some-artist", - } - - res := Wrap(p1) - - // Get - tchek.AreEqual(t, "get attribute", p1.Title, res.Get("title")) - tchek.AreEqual(t, "get to-one relationship", "some-artist", res.GetToOne("author")) - - // Set - res.Set("title", "New Title") - tchek.AreEqual(t, "set string attribute", "New Title", p1.Title) - tchek.AreEqual(t, "set string attribute 2", "New Title", res.Get("title")) - - p1.PaintedIn = time.Date(1932, 0, 0, 0, 0, 0, 0, loc) - tchek.AreEqual(t, "set time attribute", p1.PaintedIn, res.Get("painted-in")) - - res.SetToOne("author", "another-artist") - tchek.AreEqual(t, "set to-one relationship", "another-artist", p1.Author) - tchek.AreEqual(t, "set to-one relationship 2", "another-artist", res.GetToOne("author")) -} - func TestEqual(t *testing.T) { now := time.Now() @@ -131,22 +102,3 @@ func TestEqual(t *testing.T) { tchek.AreEqual(t, "compare two different resources", false, Equal(mt11, mt13)) tchek.AreEqual(t, "compare resources of different types", false, Equal(mt11, mt21)) } - -type painting struct { - ID string `json:"id" api:"paintings"` - - Title string `json:"title" api:"attr"` - Value uint `json:"value" api:"attr"` - PaintedIn time.Time `json:"painted-in" api:"attr"` - - Author string `json:"author" api:"rel,artists,paintings"` -} - -type artist struct { - ID string `json:"id" api:"artists"` - - Name string `json:"name" api:"attr"` - BornAt time.Time `json:"born-at" api:"attr"` - - Paintings string `json:"paintings" api:"rel,paintings,author"` -} From 0c4fe3471d69e4f8856f166f860fcddd1accd536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 10 Mar 2019 14:49:17 -0400 Subject: [PATCH 013/406] Make Attr.Type an int and add constants/helper functions --- registry.go | 2 +- schema.go | 143 +++++++++++++++++++++++++++++++++++++++++++++++- wrapper.go | 2 +- wrapper_test.go | 6 +- 4 files changed, 147 insertions(+), 6 deletions(-) diff --git a/registry.go b/registry.go index 685088f..903e3e6 100644 --- a/registry.go +++ b/registry.go @@ -73,7 +73,7 @@ func (r *Registry) RegisterType(v interface{}) { attrs[n] = Attr{ Name: n, - Type: sf.Type.String(), + Type: GetAttrType(sf.Type.String()), Null: strings.HasPrefix(sf.Type.String(), "*"), } diff --git a/schema.go b/schema.go index c64b784..1eaf45a 100644 --- a/schema.go +++ b/schema.go @@ -1,5 +1,34 @@ package jsonapi +// Attribute types +const ( + AttrTypeInvalid = iota + AttrTypeString + AttrTypeInt + AttrTypeInt8 + AttrTypeInt16 + AttrTypeInt32 + AttrTypeInt64 + AttrTypeUint + AttrTypeUint8 + AttrTypeUint16 + AttrTypeUint32 + AttrTypeBool + AttrTypeTime + AttrTypeStringPtr + AttrTypeIntPtr + AttrTypeInt8Ptr + AttrTypeInt16Ptr + AttrTypeInt32Ptr + AttrTypeInt64Ptr + AttrTypeUintPtr + AttrTypeUint8Ptr + AttrTypeUint16Ptr + AttrTypeUint32Ptr + AttrTypeBoolPtr + AttrTypeTimePtr +) + // Type ... type Type struct { Name string @@ -12,7 +41,7 @@ type Type struct { // Attr ... type Attr struct { Name string - Type string + Type int Null bool } @@ -37,3 +66,115 @@ func (r *Rel) Inverse() Rel { InverseToOne: r.ToOne, } } + +// GetAttrType ... +func GetAttrType(t string) int { + switch t { + case "string": + return AttrTypeString + case "int": + return AttrTypeInt + case "int8": + return AttrTypeInt8 + case "int16": + return AttrTypeInt16 + case "int32": + return AttrTypeInt32 + case "int64": + return AttrTypeInt64 + case "uint": + return AttrTypeUint + case "uint8": + return AttrTypeUint8 + case "uint16": + return AttrTypeUint16 + case "uint32": + return AttrTypeUint32 + case "bool": + return AttrTypeBool + case "time.Time": + return AttrTypeTime + case "*string": + return AttrTypeStringPtr + case "*int": + return AttrTypeIntPtr + case "*int8": + return AttrTypeInt8Ptr + case "*int16": + return AttrTypeInt16Ptr + case "*int32": + return AttrTypeInt32Ptr + case "*int64": + return AttrTypeInt64Ptr + case "*uint": + return AttrTypeUintPtr + case "*uint8": + return AttrTypeUint8Ptr + case "*uint16": + return AttrTypeUint16Ptr + case "*uint32": + return AttrTypeUint32Ptr + case "*bool": + return AttrTypeBoolPtr + case "*time.Time": + return AttrTypeTimePtr + default: + return AttrTypeInvalid + } +} + +// GetAttrString ... +func GetAttrString(t int) string { + switch t { + case AttrTypeString: + return "string" + case AttrTypeInt: + return "int" + case AttrTypeInt8: + return "int8" + case AttrTypeInt16: + return "int16" + case AttrTypeInt32: + return "int32" + case AttrTypeInt64: + return "int64" + case AttrTypeUint: + return "uint" + case AttrTypeUint8: + return "uint8" + case AttrTypeUint16: + return "uint16" + case AttrTypeUint32: + return "uint32" + case AttrTypeBool: + return "bool" + case AttrTypeTime: + return "time.Time" + case AttrTypeStringPtr: + return "*string" + case AttrTypeIntPtr: + return "*int" + case AttrTypeInt8Ptr: + return "*int8" + case AttrTypeInt16Ptr: + return "*int16" + case AttrTypeInt32Ptr: + return "*int32" + case AttrTypeInt64Ptr: + return "*int64" + case AttrTypeUintPtr: + return "*uint" + case AttrTypeUint8Ptr: + return "*uint8" + case AttrTypeUint16Ptr: + return "*uint16" + case AttrTypeUint32Ptr: + return "*uint32" + case AttrTypeBoolPtr: + return "*bool" + case AttrTypeTimePtr: + return "*time.Time" + default: + return "" + } +} diff --git a/wrapper.go b/wrapper.go index f610122..65028d5 100644 --- a/wrapper.go +++ b/wrapper.go @@ -57,7 +57,7 @@ func Wrap(v interface{}) *Wrapper { if apiTag == "attr" { w.attrs = append(w.attrs, Attr{ Name: jsonTag, - Type: fs.Type.String(), + Type: GetAttrType(fs.Type.String()), }) } } diff --git a/wrapper_test.go b/wrapper_test.go index ca3e946..f9d3772 100644 --- a/wrapper_test.go +++ b/wrapper_test.go @@ -128,11 +128,11 @@ func TestWrapper(t *testing.T) { for _, attr := range wrap1.Attrs() { tchek.AreEqual(t, "copied attribute", wrap1.Get(attr.Name), wrap3.Get(attr.Name)) - if attr.Type == "bool" { + if attr.Type == AttrTypeBool { wrap3.Set(attr.Name, !wrap1.Get(attr.Name).(bool)) - } else if attr.Type == "*bool" { + } else if attr.Type == AttrTypeBoolPtr { wrap3.Set(attr.Name, !*(wrap1.Get(attr.Name).(*bool))) - } else if attr.Type == "time.Time" || attr.Type == "*time.Time" { + } else if attr.Type == AttrTypeTime || attr.Type == AttrTypeTimePtr { wrap3.Set(attr.Name, time.Now()) } else { wrap3.Set(attr.Name, "0") From 11fdf95120fe32587e24c68d81a35d7b51660cd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 10 Mar 2019 15:48:03 -0400 Subject: [PATCH 014/406] Add ZeroValue helper function --- schema.go | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/schema.go b/schema.go index 1eaf45a..6801b9e 100644 --- a/schema.go +++ b/schema.go @@ -1,5 +1,7 @@ package jsonapi +import "time" + // Attribute types const ( AttrTypeInvalid = iota @@ -178,3 +180,71 @@ func GetAttrString(t int) string { return "" } } + +// ZeroValue ... +func ZeroValue(t int) interface{} { + switch t { + case AttrTypeString: + return "" + case AttrTypeInt: + return int(0) + case AttrTypeInt8: + return int8(0) + case AttrTypeInt16: + return int16(0) + case AttrTypeInt32: + return int32(0) + case AttrTypeInt64: + return int64(0) + case AttrTypeUint: + return uint(0) + case AttrTypeUint8: + return uint8(0) + case AttrTypeUint16: + return uint16(0) + case AttrTypeUint32: + return uint32(0) + case AttrTypeBool: + return false + case AttrTypeTime: + return time.Time{} + case AttrTypeStringPtr: + var v *string + return v + case AttrTypeIntPtr: + var v *int + return v + case AttrTypeInt8Ptr: + var v *int8 + return v + case AttrTypeInt16Ptr: + var v *int16 + return v + case AttrTypeInt32Ptr: + var v *int32 + return v + case AttrTypeInt64Ptr: + var v *int64 + return v + case AttrTypeUintPtr: + var v *uint + return v + case AttrTypeUint8Ptr: + var v *uint8 + return v + case AttrTypeUint16Ptr: + var v *uint16 + return v + case AttrTypeUint32Ptr: + var v *uint32 + return v + case AttrTypeBoolPtr: + var v *bool + return v + case AttrTypeTimePtr: + var v *time.Time + return v + default: + return "" + } +} From 8b4d42809d67fe8ae15bf4d70ed3b85860bb4c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 10 Mar 2019 20:17:37 -0400 Subject: [PATCH 015/406] Improve equality checking of nil values in Equal --- resource.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/resource.go b/resource.go index 29e7c12..198870d 100644 --- a/resource.go +++ b/resource.go @@ -1,6 +1,7 @@ package jsonapi import ( + "fmt" "reflect" "sort" ) @@ -71,6 +72,12 @@ func Equal(r1, r2 Resource) bool { for i, attr1 := range r1Attrs { attr2 := r2Attrs[i] if !reflect.DeepEqual(r1.Get(attr1.Name), r2.Get(attr2.Name)) { + // TODO Fix the following condition one day, there should be a better + // way to do this. Basically, all nils (nil pointer, nil slice, etc) + // should be considered equal to a nil empty interface. + if fmt.Sprintf("%v", r1.Get(attr1.Name)) == "" && fmt.Sprintf("%v", r2.Get(attr1.Name)) == "" { + continue + } return false } } From 315ccd3a1b0bc9f14276be5b5bebf14034cc4878 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 10 Mar 2019 20:19:19 -0400 Subject: [PATCH 016/406] Add SoftResource struct --- go.mod | 1 + go.sum | 4 + soft_resource.go | 259 ++++++++++++++++++++++++++++++++++++++++++ soft_resource_test.go | 107 +++++++++++++++++ 4 files changed, 371 insertions(+) create mode 100644 soft_resource.go create mode 100644 soft_resource_test.go diff --git a/go.mod b/go.mod index 606983c..7df510a 100644 --- a/go.mod +++ b/go.mod @@ -5,4 +5,5 @@ go 1.11 require ( github.com/google/uuid v1.1.1 github.com/mfcochauxlaberge/tchek v0.3.0 + github.com/mitchellh/copystructure v1.0.0 ) diff --git a/go.sum b/go.sum index 7fae0a9..574106e 100644 --- a/go.sum +++ b/go.sum @@ -2,3 +2,7 @@ github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/mfcochauxlaberge/tchek v0.3.0 h1:SFmqbnfjxMbP7yV/FuHioIwYI9tmDtmO9Jd5smGu0KQ= github.com/mfcochauxlaberge/tchek v0.3.0/go.mod h1:e8jX6VID1Ku1XAZq8lkxRuGfSKIFL9sL7w4E3WDkx7o= +github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ= +github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= +github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY= +github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= diff --git a/soft_resource.go b/soft_resource.go new file mode 100644 index 0000000..3d3ffda --- /dev/null +++ b/soft_resource.go @@ -0,0 +1,259 @@ +package jsonapi + +import ( + "github.com/mitchellh/copystructure" +) + +// SoftResource ... +type SoftResource struct { + typ string + id string + attrs []Attr + rels []Rel + data map[string]interface{} +} + +// Attrs ... +func (sr *SoftResource) Attrs() []Attr { + sr.check() + return sr.attrs +} + +// Rels ... +func (sr *SoftResource) Rels() []Rel { + sr.check() + return sr.rels +} + +// AddAttr ... +func (sr *SoftResource) AddAttr(attr Attr) { + sr.check() + for _, f := range sr.fields() { + if f == attr.Name { + return + } + } + sr.attrs = append(sr.attrs, attr) +} + +// AddRel ... +func (sr *SoftResource) AddRel(rel Rel) { + sr.check() + for _, f := range sr.fields() { + if f == rel.Name { + return + } + } + sr.rels = append(sr.rels, rel) +} + +// RemoveField ... +func (sr *SoftResource) RemoveField(field string) { + sr.check() + for i, a := range sr.attrs { + if field == a.Name { + sr.attrs = append(sr.attrs[:i], sr.attrs[i+1:]...) + return + } + } + for i, r := range sr.rels { + if field == r.Name { + sr.rels = append(sr.rels[:i], sr.rels[i+1:]...) + return + } + } +} + +// Attr ... +func (sr *SoftResource) Attr(key string) Attr { + sr.check() + for i := range sr.attrs { + if sr.attrs[i].Name == key { + return sr.attrs[i] + } + } + return Attr{} +} + +// Rel ... +func (sr *SoftResource) Rel(key string) Rel { + sr.check() + for i := range sr.rels { + if sr.rels[i].Name == key { + return sr.rels[i] + } + } + return Rel{} +} + +// New ... +func (sr *SoftResource) New() Resource { + sr.check() + return &SoftResource{ + typ: sr.typ, + attrs: append(sr.attrs[:0:0], sr.attrs...), + rels: append(sr.rels[:0:0], sr.rels...), + } +} + +// GetID ... +func (sr *SoftResource) GetID() string { + sr.check() + return sr.id +} + +// GetType ... +func (sr *SoftResource) GetType() string { + sr.check() + return sr.typ +} + +// Get ... +func (sr *SoftResource) Get(key string) interface{} { + sr.check() + for k := range sr.attrs { + if sr.attrs[k].Name == key { + return sr.data[key] + } + } + return nil +} + +// SetID ... +func (sr *SoftResource) SetID(id string) { + sr.check() + sr.id = id +} + +// SetType ... +func (sr *SoftResource) SetType(typ string) { + sr.check() + sr.typ = typ +} + +// Set ... +func (sr *SoftResource) Set(key string, v interface{}) { + sr.check() + if _, ok := sr.data[key]; ok { + sr.data[key] = v + } +} + +// GetToOne ... +func (sr *SoftResource) GetToOne(key string) string { + sr.check() + for i := range sr.rels { + if sr.rels[i].ToOne && sr.rels[i].Name == key { + return sr.data[key].(string) + } + } + return "" +} + +// GetToMany ... +func (sr *SoftResource) GetToMany(key string) []string { + sr.check() + for i := range sr.rels { + if !sr.rels[i].ToOne && sr.rels[i].Name == key { + return sr.data[key].([]string) + } + } + return []string{} +} + +// SetToOne ... +func (sr *SoftResource) SetToOne(key string, rel string) { + sr.check() + if _, ok := sr.data[key]; ok { + sr.data[key] = rel + } +} + +// SetToMany ... +func (sr *SoftResource) SetToMany(key string, rels []string) { + sr.check() + if _, ok := sr.data[key]; ok { + sr.data[key] = rels + } +} + +// Validate ... +func (sr *SoftResource) Validate() []error { + sr.check() + return []error{} +} + +// Copy ... +func (sr *SoftResource) Copy() Resource { + sr.check() + return &SoftResource{ + typ: sr.typ, + id: sr.id, + attrs: append(sr.attrs[:0:0], sr.attrs...), + rels: append(sr.rels[:0:0], sr.rels...), + data: copystructure.Must(copystructure.Copy(sr.data)).(map[string]interface{}), + } +} + +// UnmarshalJSON ... +func (sr *SoftResource) UnmarshalJSON(payload []byte) error { + sr.check() + // TODO + return nil +} + +func (sr *SoftResource) fields() []string { + fields := make([]string, 0, len(sr.attrs)+len(sr.rels)) + for i := range sr.attrs { + fields = append(fields, sr.attrs[i].Name) + } + for i := range sr.rels { + fields = append(fields, sr.rels[i].Name) + } + return fields +} + +func (sr *SoftResource) check() { + if sr.attrs == nil { + sr.attrs = []Attr{} + } + if sr.rels == nil { + sr.rels = []Rel{} + } + if sr.data == nil { + sr.data = map[string]interface{}{} + } + + for i := range sr.attrs { + n := sr.attrs[i].Name + if _, ok := sr.data[n]; !ok { + sr.data[n] = ZeroValue(sr.attrs[i].Type) + } + } + for i := range sr.rels { + n := sr.rels[i].Name + if _, ok := sr.data[n]; !ok { + if sr.rels[i].ToOne { + sr.data[n] = "" + } else { + sr.data[n] = []string{} + } + } + } + + fields := sr.fields() + if len(fields) < len(sr.data) { + for k := range sr.data { + found := false + for _, f := range fields { + if k == f { + found = true + break + } + } + if !found { + delete(sr.data, k) + } + } + } +} diff --git a/soft_resource_test.go b/soft_resource_test.go new file mode 100644 index 0000000..866ce17 --- /dev/null +++ b/soft_resource_test.go @@ -0,0 +1,107 @@ +package jsonapi + +import ( + "testing" + + "github.com/mfcochauxlaberge/tchek" +) + +func TestSoftResource(t *testing.T) { + sr := &SoftResource{} + + tchek.AreEqual(t, "no attributes", []Attr{}, sr.Attrs()) + tchek.AreEqual(t, "no relationships", []Rel{}, sr.Rels()) + + // ID and type + sr.SetID("id") + sr.SetType("type") + tchek.AreEqual(t, "get id", "id", sr.GetID()) + tchek.AreEqual(t, "get type", "type", sr.GetType()) + + // Attributes + attrs := []Attr{ + Attr{ + Name: "attr1", + Type: AttrTypeString, + Null: false, + }, + Attr{ + Name: "attr2", + Type: AttrTypeStringPtr, + Null: true, + }, + } + for _, attr := range attrs { + sr.AddAttr(attr) + + tchek.AreEqual(t, "get an attribute", attr, sr.Attr(attr.Name)) + } + tchek.AreEqual(t, "list all attributes", attrs, sr.Attrs()) + + // Relationships + rels := []Rel{ + Rel{ + Name: "rel1", + Type: "type", + ToOne: true, + InverseName: "rel1", + InverseType: "type", + InverseToOne: true, + }, + Rel{ + Name: "rel2", + Type: "type", + ToOne: false, + InverseName: "rel1", + InverseType: "type", + InverseToOne: true, + }, + } + for _, rel := range rels { + sr.AddRel(rel) + + tchek.AreEqual(t, "get an attribute", rel, sr.Rel(rel.Name)) + } + tchek.AreEqual(t, "list all attributes", rels, sr.Rels()) + + sr.RemoveField("attr1") + tchek.AreEqual(t, "can't get removed attribute", Attr{}, sr.Attr("attr1")) + sr.RemoveField("attr2") + tchek.AreEqual(t, "all attributes are removed", []Attr{}, sr.Attrs()) + + sr.RemoveField("rel1") + tchek.AreEqual(t, "can't get removed relationship", Rel{}, sr.Rel("rel1")) + sr.RemoveField("rel2") + tchek.AreEqual(t, "all relationships are removed", []Rel{}, sr.Rels()) + + tchek.AreEqual(t, "get an nonexistent value", nil, sr.Get("nonexistent")) + tchek.AreEqual(t, "get an nonexistent to-one rel", "", sr.GetToOne("nonexistent")) + tchek.AreEqual(t, "get an nonexistent to-many rel", []string{}, sr.GetToMany("nonexistent")) + + // Put the fields back + for _, attr := range attrs { + sr.AddAttr(attr) + + tchek.AreEqual(t, "get an attribute", attr, sr.Attr(attr.Name)) + } + for _, rel := range rels { + sr.AddRel(rel) + + tchek.AreEqual(t, "get an attribute", rel, sr.Rel(rel.Name)) + } + + // Set and get some fields + tchek.AreEqual(t, "get a zero value 1", "", sr.Get("attr1")) + tchek.AreEqual(t, "get a zero value 2", "", sr.GetToOne("rel1")) + tchek.AreEqual(t, "get a zero value 3", []string{}, sr.GetToMany("rel2")) + sr.Set("attr1", "value") + sr.SetToOne("rel1", "id1") + sr.SetToMany("rel2", []string{"id1", "id2"}) + tchek.AreEqual(t, "get a value 1", "value", sr.Get("attr1")) + tchek.AreEqual(t, "get a value 2", "id1", sr.GetToOne("rel1")) + tchek.AreEqual(t, "get a value 3", []string{"id1", "id2"}, sr.GetToMany("rel2")) + + // Copy + sr2 := sr.Copy() + tchek.AreEqual(t, "copy is equal", true, Equal(sr, sr2)) +} From 454f2ff21343f89f6556ae854176bda2c9f1fbf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 11 Mar 2019 22:33:53 -0400 Subject: [PATCH 017/406] Remove Ptr attribute types and use Null instead --- registry.go | 5 +- schema.go | 308 +++++++++++++++++++++++------------------- soft_resource.go | 2 +- soft_resource_test.go | 2 +- wrapper.go | 4 +- wrapper_test.go | 9 +- 6 files changed, 184 insertions(+), 146 deletions(-) diff --git a/registry.go b/registry.go index 903e3e6..9d1e1f8 100644 --- a/registry.go +++ b/registry.go @@ -71,10 +71,11 @@ func (r *Registry) RegisterType(v interface{}) { def := sql.NullString{} def.String = "" + typ, null := GetAttrType(sf.Type.String()) attrs[n] = Attr{ Name: n, - Type: GetAttrType(sf.Type.String()), - Null: strings.HasPrefix(sf.Type.String(), "*"), + Type: typ, + Null: null, } fields = append(fields, n) diff --git a/schema.go b/schema.go index 6801b9e..98f04c0 100644 --- a/schema.go +++ b/schema.go @@ -1,6 +1,9 @@ package jsonapi -import "time" +import ( + "strings" + "time" +) // Attribute types const ( @@ -17,18 +20,6 @@ const ( AttrTypeUint32 AttrTypeBool AttrTypeTime - AttrTypeStringPtr - AttrTypeIntPtr - AttrTypeInt8Ptr - AttrTypeInt16Ptr - AttrTypeInt32Ptr - AttrTypeInt64Ptr - AttrTypeUintPtr - AttrTypeUint8Ptr - AttrTypeUint16Ptr - AttrTypeUint32Ptr - AttrTypeBoolPtr - AttrTypeTimePtr ) // Type ... @@ -70,111 +61,142 @@ func (r *Rel) Inverse() Rel { } // GetAttrType ... -func GetAttrType(t string) int { - switch t { +func GetAttrType(t string) (int, bool) { + t2 := t + if strings.HasPrefix(t2, "*") { + t2 = t[1:] + } + switch t2 { case "string": - return AttrTypeString + if t[0] != '*' { + return AttrTypeString, false + } + return AttrTypeString, true case "int": - return AttrTypeInt + if t[0] != '*' { + return AttrTypeInt, false + } + return AttrTypeInt, true case "int8": - return AttrTypeInt8 + if t[0] != '*' { + return AttrTypeInt8, false + } + return AttrTypeInt8, true case "int16": - return AttrTypeInt16 + if t[0] != '*' { + return AttrTypeInt16, false + } + return AttrTypeInt16, true case "int32": - return AttrTypeInt32 + if t[0] != '*' { + return AttrTypeInt32, false + } + return AttrTypeInt32, true case "int64": - return AttrTypeInt64 + if t[0] != '*' { + return AttrTypeInt64, false + } + return AttrTypeInt64, true case "uint": - return AttrTypeUint + if t[0] != '*' { + return AttrTypeUint, false + } + return AttrTypeUint, true case "uint8": - return AttrTypeUint8 + if t[0] != '*' { + return AttrTypeUint8, false + } + return AttrTypeUint8, true case "uint16": - return AttrTypeUint16 + if t[0] != '*' { + return AttrTypeUint16, false + } + return AttrTypeUint16, true case "uint32": - return AttrTypeUint32 + if t[0] != '*' { + return AttrTypeUint32, false + } + return AttrTypeUint32, true case "bool": - return AttrTypeBool + if t[0] != '*' { + return AttrTypeBool, false + } + return AttrTypeBool, true case "time.Time": - return AttrTypeTime - case "*string": - return AttrTypeStringPtr - case "*int": - return AttrTypeIntPtr - case "*int8": - return AttrTypeInt8Ptr - case "*int16": - return AttrTypeInt16Ptr - case "*int32": - return AttrTypeInt32Ptr - case "*int64": - return AttrTypeInt64Ptr - case "*uint": - return AttrTypeUintPtr - case "*uint8": - return AttrTypeUint8Ptr - case "*uint16": - return AttrTypeUint16Ptr - case "*uint32": - return AttrTypeUint32Ptr - case "*bool": - return AttrTypeBoolPtr - case "*time.Time": - return AttrTypeTimePtr + if t[0] != '*' { + return AttrTypeTime, false + } + return AttrTypeTime, true default: - return AttrTypeInvalid + if t[0] != '*' { + return AttrTypeInvalid, false + } + return AttrTypeInvalid, true } } // GetAttrString ... -func GetAttrString(t int) string { +func GetAttrString(t int, null bool) string { switch t { case AttrTypeString: - return "string" - case AttrTypeInt: - return "int" - case AttrTypeInt8: - return "int8" - case AttrTypeInt16: - return "int16" - case AttrTypeInt32: - return "int32" - case AttrTypeInt64: - return "int64" - case AttrTypeUint: - return "uint" - case AttrTypeUint8: - return "uint8" - case AttrTypeUint16: - return "uint16" - case AttrTypeUint32: - return "uint32" - case AttrTypeBool: - return "bool" - case AttrTypeTime: - return "time.Time" - case AttrTypeStringPtr: + if !null { + return "string" + } return "*string" - case AttrTypeIntPtr: + case AttrTypeInt: + if !null { + return "int" + } return "*int" - case AttrTypeInt8Ptr: + case AttrTypeInt8: + if !null { + return "int8" + } return "*int8" - case AttrTypeInt16Ptr: + case AttrTypeInt16: + if !null { + return "int16" + } return "*int16" - case AttrTypeInt32Ptr: + case AttrTypeInt32: + if !null { + return "int32" + } return "*int32" - case AttrTypeInt64Ptr: + case AttrTypeInt64: + if !null { + return "int64" + } return "*int64" - case AttrTypeUintPtr: + case AttrTypeUint: + if !null { + return "uint" + } return "*uint" - case AttrTypeUint8Ptr: + case AttrTypeUint8: + if !null { + return "uint8" + } return "*uint8" - case AttrTypeUint16Ptr: + case AttrTypeUint16: + if !null { + return "uint16" + } return "*uint16" - case AttrTypeUint32Ptr: + case AttrTypeUint32: + if !null { + return "uint32" + } return "*uint32" - case AttrTypeBoolPtr: + case AttrTypeBool: + if !null { + return "bool" + } return "*bool" - case AttrTypeTimePtr: + case AttrTypeTime: + if !null { + return "time" + } return "*time.Time" default: return "" @@ -182,68 +204,80 @@ func GetAttrString(t int) string { } // ZeroValue ... -func ZeroValue(t int) interface{} { +func ZeroValue(t int, null bool) interface{} { switch t { case AttrTypeString: - return "" + v := "" + if !null { + return v + } + return &v case AttrTypeInt: - return int(0) + v := int(0) + if !null { + return v + } + return &v case AttrTypeInt8: - return int8(0) + v := int8(0) + if !null { + return v + } + return &v case AttrTypeInt16: - return int16(0) + v := int16(0) + if !null { + return v + } + return &v case AttrTypeInt32: - return int32(0) + v := int32(0) + if !null { + return v + } + return &v case AttrTypeInt64: - return int64(0) + v := int64(0) + if !null { + return v + } + return &v case AttrTypeUint: - return uint(0) + v := uint(0) + if !null { + return v + } + return &v case AttrTypeUint8: - return uint8(0) + v := uint8(0) + if !null { + return v + } + return &v case AttrTypeUint16: - return uint16(0) + v := uint16(0) + if !null { + return v + } + return &v case AttrTypeUint32: - return uint32(0) + v := uint32(0) + if !null { + return v + } + return &v case AttrTypeBool: - return false + v := false + if !null { + return v + } + return &v case AttrTypeTime: - return time.Time{} - case AttrTypeStringPtr: - var v *string - return v - case AttrTypeIntPtr: - var v *int - return v - case AttrTypeInt8Ptr: - var v *int8 - return v - case AttrTypeInt16Ptr: - var v *int16 - return v - case AttrTypeInt32Ptr: - var v *int32 - return v - case AttrTypeInt64Ptr: - var v *int64 - return v - case AttrTypeUintPtr: - var v *uint - return v - case AttrTypeUint8Ptr: - var v *uint8 - return v - case AttrTypeUint16Ptr: - var v *uint16 - return v - case AttrTypeUint32Ptr: - var v *uint32 - return v - case AttrTypeBoolPtr: - var v *bool - return v - case AttrTypeTimePtr: - var v *time.Time - return v + v := time.Time{} + if !null { + return v + } + return &v default: return "" } diff --git a/soft_resource.go b/soft_resource.go index 3d3ffda..31989ba 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -227,7 +227,7 @@ func (sr *SoftResource) check() { for i := range sr.attrs { n := sr.attrs[i].Name if _, ok := sr.data[n]; !ok { - sr.data[n] = ZeroValue(sr.attrs[i].Type) + sr.data[n] = ZeroValue(sr.attrs[i].Type, sr.attrs[i].Null) } } for i := range sr.rels { diff --git a/soft_resource_test.go b/soft_resource_test.go index 866ce17..b52d8f4 100644 --- a/soft_resource_test.go +++ b/soft_resource_test.go @@ -27,7 +27,7 @@ func TestSoftResource(t *testing.T) { }, Attr{ Name: "attr2", - Type: AttrTypeStringPtr, + Type: AttrTypeString, Null: true, }, } diff --git a/wrapper.go b/wrapper.go index 65028d5..9f640d2 100644 --- a/wrapper.go +++ b/wrapper.go @@ -55,9 +55,11 @@ func Wrap(v interface{}) *Wrapper { apiTag := fs.Tag.Get("api") if apiTag == "attr" { + typ, null := GetAttrType(fs.Type.String()) w.attrs = append(w.attrs, Attr{ Name: jsonTag, - Type: GetAttrType(fs.Type.String()), + Type: typ, + Null: null, }) } } diff --git a/wrapper_test.go b/wrapper_test.go index f9d3772..ef346db 100644 --- a/wrapper_test.go +++ b/wrapper_test.go @@ -1,6 +1,7 @@ package jsonapi import ( + "fmt" "reflect" "testing" "time" @@ -128,15 +129,15 @@ func TestWrapper(t *testing.T) { for _, attr := range wrap1.Attrs() { tchek.AreEqual(t, "copied attribute", wrap1.Get(attr.Name), wrap3.Get(attr.Name)) - if attr.Type == AttrTypeBool { + if attr.Type == AttrTypeBool && !attr.Null { wrap3.Set(attr.Name, !wrap1.Get(attr.Name).(bool)) - } else if attr.Type == AttrTypeBoolPtr { + } else if attr.Type == AttrTypeBool && attr.Null { wrap3.Set(attr.Name, !*(wrap1.Get(attr.Name).(*bool))) - } else if attr.Type == AttrTypeTime || attr.Type == AttrTypeTimePtr { + } else if attr.Type == AttrTypeTime { wrap3.Set(attr.Name, time.Now()) } else { wrap3.Set(attr.Name, "0") } - tchek.AreNotEqual(t, "modified copied attribute", wrap1.Get(attr.Name), wrap3.Get(attr.Name)) + tchek.AreNotEqual(t, fmt.Sprintf("modified copied attribute %s (%v)", attr.Name, attr.Type), wrap1.Get(attr.Name), wrap3.Get(attr.Name)) } } From 3b1d985df45147a8ba644787058773c6653bdcea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 11 Mar 2019 22:35:15 -0400 Subject: [PATCH 018/406] Return nil when given an unknown type in ZeroValue --- schema.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema.go b/schema.go index 98f04c0..5386a69 100644 --- a/schema.go +++ b/schema.go @@ -279,6 +279,6 @@ func ZeroValue(t int, null bool) interface{} { } return &v default: - return "" + return nil } } From 81aacd01bfeb98cbfc8a0ed45a2b94258a4400bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 11 Mar 2019 22:40:06 -0400 Subject: [PATCH 019/406] Rename GetAttrString for GetAttrTypeString --- schema.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schema.go b/schema.go index 5386a69..cf08b51 100644 --- a/schema.go +++ b/schema.go @@ -135,8 +135,8 @@ func GetAttrType(t string) (int, bool) { } } -// GetAttrString ... -func GetAttrString(t int, null bool) string { +// GetAttrTypeString ... +func GetAttrTypeString(t int, null bool) string { switch t { case AttrTypeString: if !null { From 672f2fccd0dd64f24f7a9e23e1882e5f43c17cc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 11 Mar 2019 22:40:42 -0400 Subject: [PATCH 020/406] Rename ZeroValue for GetZeroValue --- schema.go | 4 ++-- soft_resource.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/schema.go b/schema.go index cf08b51..77453fd 100644 --- a/schema.go +++ b/schema.go @@ -203,8 +203,8 @@ func GetAttrTypeString(t int, null bool) string { } } -// ZeroValue ... -func ZeroValue(t int, null bool) interface{} { +// GetZeroValue ... +func GetZeroValue(t int, null bool) interface{} { switch t { case AttrTypeString: v := "" diff --git a/soft_resource.go b/soft_resource.go index 31989ba..fb3cb59 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -227,7 +227,7 @@ func (sr *SoftResource) check() { for i := range sr.attrs { n := sr.attrs[i].Name if _, ok := sr.data[n]; !ok { - sr.data[n] = ZeroValue(sr.attrs[i].Type, sr.attrs[i].Null) + sr.data[n] = GetZeroValue(sr.attrs[i].Type, sr.attrs[i].Null) } } for i := range sr.rels { From c4e1b35f074dc1519f52281396b56927c021c950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Wed, 13 Mar 2019 22:24:53 -0400 Subject: [PATCH 021/406] Use Type in SoftResource --- resource.go | 28 ++++++++-- soft_resource.go | 125 ++++++++++++++++-------------------------- soft_resource_test.go | 20 +++---- wrapper.go | 20 +++---- 4 files changed, 90 insertions(+), 103 deletions(-) diff --git a/resource.go b/resource.go index 198870d..88cff76 100644 --- a/resource.go +++ b/resource.go @@ -9,8 +9,8 @@ import ( // Resource ... type Resource interface { // Structure - Attrs() []Attr - Rels() []Rel + Attrs() map[string]Attr + Rels() map[string]Rel Attr(key string) Attr Rel(key string) Rel New() Resource @@ -56,11 +56,19 @@ func Equal(r1, r2 Resource) bool { } // Attributes - r1Attrs := r1.Attrs() + attrs := r1.Attrs() + r1Attrs := make([]Attr, 0, len(attrs)) + for name := range attrs { + r1Attrs = append(r1Attrs, attrs[name]) + } sort.Slice(r1Attrs, func(i, j int) bool { return r1Attrs[i].Name < r1Attrs[j].Name }) - r2Attrs := r2.Attrs() + attrs = r2.Attrs() + r2Attrs := make([]Attr, 0, len(attrs)) + for name := range attrs { + r2Attrs = append(r2Attrs, attrs[name]) + } sort.Slice(r2Attrs, func(i, j int) bool { return r2Attrs[i].Name < r2Attrs[j].Name }) @@ -83,11 +91,19 @@ func Equal(r1, r2 Resource) bool { } // Relationships - r1Rels := r1.Rels() + rels := r1.Rels() + r1Rels := make([]Rel, 0, len(rels)) + for name := range rels { + r1Rels = append(r1Rels, rels[name]) + } sort.Slice(r1Rels, func(i, j int) bool { return r1Rels[i].Name < r1Rels[j].Name }) - r2Rels := r2.Rels() + rels = r1.Rels() + r2Rels := make([]Rel, 0, len(rels)) + for name := range rels { + r2Rels = append(r2Rels, rels[name]) + } sort.Slice(r2Rels, func(i, j int) bool { return r2Rels[i].Name < r2Rels[j].Name }) diff --git a/soft_resource.go b/soft_resource.go index fb3cb59..040175f 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -6,93 +6,69 @@ import ( // SoftResource ... type SoftResource struct { - typ string - id string - attrs []Attr - rels []Rel - data map[string]interface{} + id string + typ *Type + data map[string]interface{} } // Attrs ... -func (sr *SoftResource) Attrs() []Attr { +func (sr *SoftResource) Attrs() map[string]Attr { sr.check() - return sr.attrs + return sr.typ.Attrs } // Rels ... -func (sr *SoftResource) Rels() []Rel { +func (sr *SoftResource) Rels() map[string]Rel { sr.check() - return sr.rels + return sr.typ.Rels } // AddAttr ... func (sr *SoftResource) AddAttr(attr Attr) { sr.check() - for _, f := range sr.fields() { - if f == attr.Name { + for _, name := range sr.fields() { + if name == attr.Name { return } } - sr.attrs = append(sr.attrs, attr) + sr.typ.Attrs[attr.Name] = attr } // AddRel ... func (sr *SoftResource) AddRel(rel Rel) { sr.check() - for _, f := range sr.fields() { - if f == rel.Name { + for _, name := range sr.fields() { + if name == rel.Name { return } } - sr.rels = append(sr.rels, rel) + sr.typ.Rels[rel.Name] = rel } // RemoveField ... func (sr *SoftResource) RemoveField(field string) { sr.check() - for i, a := range sr.attrs { - if field == a.Name { - sr.attrs = append(sr.attrs[:i], sr.attrs[i+1:]...) - return - } - } - for i, r := range sr.rels { - if field == r.Name { - sr.rels = append(sr.rels[:i], sr.rels[i+1:]...) - return - } - } + delete(sr.typ.Attrs, field) + delete(sr.typ.Rels, field) } // Attr ... func (sr *SoftResource) Attr(key string) Attr { sr.check() - for i := range sr.attrs { - if sr.attrs[i].Name == key { - return sr.attrs[i] - } - } - return Attr{} + return sr.typ.Attrs[key] } // Rel ... func (sr *SoftResource) Rel(key string) Rel { sr.check() - for i := range sr.rels { - if sr.rels[i].Name == key { - return sr.rels[i] - } - } - return Rel{} + return sr.typ.Rels[key] } // New ... func (sr *SoftResource) New() Resource { sr.check() return &SoftResource{ - typ: sr.typ, - attrs: append(sr.attrs[:0:0], sr.attrs...), - rels: append(sr.rels[:0:0], sr.rels...), + typ: copystructure.Must(copystructure.Copy(sr.typ)).(*Type), } } @@ -105,16 +81,14 @@ func (sr *SoftResource) GetID() string { // GetType ... func (sr *SoftResource) GetType() string { sr.check() - return sr.typ + return sr.typ.Name } // Get ... func (sr *SoftResource) Get(key string) interface{} { sr.check() - for k := range sr.attrs { - if sr.attrs[k].Name == key { - return sr.data[key] - } + if _, ok := sr.typ.Attrs[key]; ok { + return sr.data[key] } return nil } @@ -126,9 +100,9 @@ func (sr *SoftResource) SetID(id string) { } // SetType ... -func (sr *SoftResource) SetType(typ string) { +func (sr *SoftResource) SetType(name string) { sr.check() - sr.typ = typ + sr.typ.Name = name } // Set ... @@ -142,10 +116,8 @@ func (sr *SoftResource) Set(key string, v interface{}) { // GetToOne ... func (sr *SoftResource) GetToOne(key string) string { sr.check() - for i := range sr.rels { - if sr.rels[i].ToOne && sr.rels[i].Name == key { - return sr.data[key].(string) - } + if _, ok := sr.typ.Rels[key]; ok { + return sr.data[key].(string) } return "" } @@ -153,10 +125,8 @@ func (sr *SoftResource) GetToOne(key string) string { // GetToMany ... func (sr *SoftResource) GetToMany(key string) []string { sr.check() - for i := range sr.rels { - if !sr.rels[i].ToOne && sr.rels[i].Name == key { - return sr.data[key].([]string) - } + if _, ok := sr.typ.Rels[key]; ok { + return sr.data[key].([]string) } return []string{} } @@ -187,11 +157,9 @@ func (sr *SoftResource) Validate() []error { func (sr *SoftResource) Copy() Resource { sr.check() return &SoftResource{ - typ: sr.typ, - id: sr.id, - attrs: append(sr.attrs[:0:0], sr.attrs...), - rels: append(sr.rels[:0:0], sr.rels...), - data: copystructure.Must(copystructure.Copy(sr.data)).(map[string]interface{}), + id: sr.id, + typ: copystructure.Must(copystructure.Copy(sr.typ)).(*Type), + data: copystructure.Must(copystructure.Copy(sr.data)).(map[string]interface{}), } } @@ -203,37 +171,40 @@ func (sr *SoftResource) UnmarshalJSON(payload []byte) error { } func (sr *SoftResource) fields() []string { - fields := make([]string, 0, len(sr.attrs)+len(sr.rels)) - for i := range sr.attrs { - fields = append(fields, sr.attrs[i].Name) + fields := make([]string, 0, len(sr.typ.Attrs)+len(sr.typ.Rels)) + for i := range sr.typ.Attrs { + fields = append(fields, sr.typ.Attrs[i].Name) } - for i := range sr.rels { - fields = append(fields, sr.rels[i].Name) + for i := range sr.typ.Rels { + fields = append(fields, sr.typ.Rels[i].Name) } return fields } func (sr *SoftResource) check() { - if sr.attrs == nil { - sr.attrs = []Attr{} + if sr.typ == nil { + sr.typ = &Type{} + } + if sr.typ.Attrs == nil { + sr.typ.Attrs = map[string]Attr{} } - if sr.rels == nil { - sr.rels = []Rel{} + if sr.typ.Rels == nil { + sr.typ.Rels = map[string]Rel{} } if sr.data == nil { sr.data = map[string]interface{}{} } - for i := range sr.attrs { - n := sr.attrs[i].Name + for i := range sr.typ.Attrs { + n := sr.typ.Attrs[i].Name if _, ok := sr.data[n]; !ok { - sr.data[n] = GetZeroValue(sr.attrs[i].Type, sr.attrs[i].Null) + sr.data[n] = GetZeroValue(sr.typ.Attrs[i].Type, sr.typ.Attrs[i].Null) } } - for i := range sr.rels { - n := sr.rels[i].Name + for i := range sr.typ.Rels { + n := sr.typ.Rels[i].Name if _, ok := sr.data[n]; !ok { - if sr.rels[i].ToOne { + if sr.typ.Rels[i].ToOne { sr.data[n] = "" } else { sr.data[n] = []string{} diff --git a/soft_resource_test.go b/soft_resource_test.go index b52d8f4..e2c9652 100644 --- a/soft_resource_test.go +++ b/soft_resource_test.go @@ -9,8 +9,8 @@ import ( func TestSoftResource(t *testing.T) { sr := &SoftResource{} - tchek.AreEqual(t, "no attributes", []Attr{}, sr.Attrs()) - tchek.AreEqual(t, "no relationships", []Rel{}, sr.Rels()) + tchek.AreEqual(t, "no attributes", map[string]Attr{}, sr.Attrs()) + tchek.AreEqual(t, "no relationships", map[string]Rel{}, sr.Rels()) // ID and type sr.SetID("id") @@ -19,13 +19,13 @@ func TestSoftResource(t *testing.T) { tchek.AreEqual(t, "get type", "type", sr.GetType()) // Attributes - attrs := []Attr{ - Attr{ + attrs := map[string]Attr{ + "attr1": Attr{ Name: "attr1", Type: AttrTypeString, Null: false, }, - Attr{ + "attr2": Attr{ Name: "attr2", Type: AttrTypeString, Null: true, @@ -39,8 +39,8 @@ func TestSoftResource(t *testing.T) { tchek.AreEqual(t, "list all attributes", attrs, sr.Attrs()) // Relationships - rels := []Rel{ - Rel{ + rels := map[string]Rel{ + "rel1": Rel{ Name: "rel1", Type: "type", ToOne: true, @@ -48,7 +48,7 @@ func TestSoftResource(t *testing.T) { InverseType: "type", InverseToOne: true, }, - Rel{ + "rel2": Rel{ Name: "rel2", Type: "type", ToOne: false, @@ -67,12 +67,12 @@ func TestSoftResource(t *testing.T) { sr.RemoveField("attr1") tchek.AreEqual(t, "can't get removed attribute", Attr{}, sr.Attr("attr1")) sr.RemoveField("attr2") - tchek.AreEqual(t, "all attributes are removed", []Attr{}, sr.Attrs()) + tchek.AreEqual(t, "all attributes are removed", map[string]Attr{}, sr.Attrs()) sr.RemoveField("rel1") tchek.AreEqual(t, "can't get removed relationship", Rel{}, sr.Rel("rel1")) sr.RemoveField("rel2") - tchek.AreEqual(t, "all relationships are removed", []Rel{}, sr.Rels()) + tchek.AreEqual(t, "all relationships are removed", map[string]Rel{}, sr.Rels()) tchek.AreEqual(t, "get an nonexistent value", nil, sr.Get("nonexistent")) tchek.AreEqual(t, "get an nonexistent to-one rel", "", sr.GetToOne("nonexistent")) diff --git a/wrapper.go b/wrapper.go index 9f640d2..ab3d884 100644 --- a/wrapper.go +++ b/wrapper.go @@ -17,8 +17,8 @@ type Wrapper struct { // Structure typ string - attrs []Attr - rels []Rel + attrs map[string]Attr + rels map[string]Rel } // Wrap ... @@ -48,7 +48,7 @@ func Wrap(v interface{}) *Wrapper { _, w.typ = IDAndType(v) // Attributes - w.attrs = []Attr{} + w.attrs = map[string]Attr{} for i := 0; i < w.val.NumField(); i++ { fs := w.val.Type().Field(i) jsonTag := fs.Tag.Get("json") @@ -56,16 +56,16 @@ func Wrap(v interface{}) *Wrapper { if apiTag == "attr" { typ, null := GetAttrType(fs.Type.String()) - w.attrs = append(w.attrs, Attr{ + w.attrs[jsonTag] = Attr{ Name: jsonTag, Type: typ, Null: null, - }) + } } } // Relationships - w.rels = []Rel{} + w.rels = map[string]Rel{} for i := 0; i < w.val.NumField(); i++ { fs := w.val.Type().Field(i) jsonTag := fs.Tag.Get("json") @@ -81,13 +81,13 @@ func Wrap(v interface{}) *Wrapper { } if relTag[0] == "rel" { - w.rels = append(w.rels, Rel{ + w.rels[jsonTag] = Rel{ Name: jsonTag, Type: relTag[1], ToOne: toOne, InverseName: invName, InverseType: w.typ, - }) + } } } @@ -100,12 +100,12 @@ func (w *Wrapper) IDAndType() (string, string) { } // Attrs ... -func (w *Wrapper) Attrs() []Attr { +func (w *Wrapper) Attrs() map[string]Attr { return w.attrs } // Rels ... -func (w *Wrapper) Rels() []Rel { +func (w *Wrapper) Rels() map[string]Rel { return w.rels } From 660cd1fc435df7e37457058057731d92b8473938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Wed, 13 Mar 2019 22:29:20 -0400 Subject: [PATCH 022/406] Make Type.Fields a method --- params.go | 8 ++++---- registry.go | 1 - schema.go | 15 ++++++++++++++- url_test.go | 12 ++++++------ 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/params.go b/params.go index 8ab7f58..73ec446 100644 --- a/params.go +++ b/params.go @@ -106,7 +106,7 @@ func NewParams(reg *Registry, su SimpleURL, resType string) (*Params, error) { if typ, ok := reg.Types[t]; ok { params.Fields[t] = []string{} for _, f := range fields { - for _, ff := range typ.Fields { + for _, ff := range typ.Fields() { if f == ff { params.Fields[t] = append(params.Fields[t], f) } @@ -116,8 +116,8 @@ func NewParams(reg *Registry, su SimpleURL, resType string) (*Params, error) { } for t := range params.Fields { if len(params.Fields[t]) == 0 { - params.Fields[t] = make([]string, len(reg.Types[t].Fields)) - copy(params.Fields[t], reg.Types[t].Fields) + params.Fields[t] = make([]string, len(reg.Types[t].Fields())) + copy(params.Fields[t], reg.Types[t].Fields()) } } @@ -136,7 +136,7 @@ func NewParams(reg *Registry, su SimpleURL, resType string) (*Params, error) { params.Attrs[typeName] = []Attr{} params.Rels[typeName] = []Rel{} - for _, field := range typ.Fields { + for _, field := range typ.Fields() { for _, field2 := range fields { if field == field2 { // Append to list of fields diff --git a/registry.go b/registry.go index 9d1e1f8..f8931eb 100644 --- a/registry.go +++ b/registry.go @@ -128,7 +128,6 @@ func (r *Registry) RegisterType(v interface{}) { r.Types[resType] = Type{ Name: resType, - Fields: fields, Attrs: attrs, Rels: rels, Default: res, diff --git a/schema.go b/schema.go index 77453fd..e328c11 100644 --- a/schema.go +++ b/schema.go @@ -1,6 +1,7 @@ package jsonapi import ( + "sort" "strings" "time" ) @@ -25,12 +26,24 @@ const ( // Type ... type Type struct { Name string - Fields []string Attrs map[string]Attr Rels map[string]Rel Default Resource } +// Fields ... +func (t Type) Fields() []string { + fields := make([]string, 0, len(t.Attrs)+len(t.Rels)) + for i := range t.Attrs { + fields = append(fields, t.Attrs[i].Name) + } + for i := range t.Rels { + fields = append(fields, t.Rels[i].Name) + } + sort.Strings(fields) + return fields +} + // Attr ... type Attr struct { Name string diff --git a/url_test.go b/url_test.go index 0299e93..51c6fdb 100644 --- a/url_test.go +++ b/url_test.go @@ -246,8 +246,8 @@ func TestParseParams(t *testing.T) { resType: "mocktypes1", expectedParams: Params{ Fields: map[string][]string{ - "mocktypes1": reg.Types["mocktypes1"].Fields, - "mocktypes2": reg.Types["mocktypes2"].Fields, + "mocktypes1": reg.Types["mocktypes1"].Fields(), + "mocktypes2": reg.Types["mocktypes2"].Fields(), }, Attrs: map[string][]Attr{}, Rels: map[string][]Rel{}, @@ -290,8 +290,8 @@ func TestParseParams(t *testing.T) { resType: "mocktypes1", expectedParams: Params{ Fields: map[string][]string{ - "mocktypes1": reg.Types["mocktypes1"].Fields, - "mocktypes2": reg.Types["mocktypes2"].Fields, + "mocktypes1": reg.Types["mocktypes1"].Fields(), + "mocktypes2": reg.Types["mocktypes2"].Fields(), }, Attrs: map[string][]Attr{}, Rels: map[string][]Rel{}, @@ -333,7 +333,7 @@ func TestParseParams(t *testing.T) { resType: "mocktypes1", expectedParams: Params{ Fields: map[string][]string{ - "mocktypes1": reg.Types["mocktypes1"].Fields, + "mocktypes1": reg.Types["mocktypes1"].Fields(), }, Attrs: map[string][]Attr{}, Rels: map[string][]Rel{}, @@ -358,7 +358,7 @@ func TestParseParams(t *testing.T) { resType: "mocktypes1", expectedParams: Params{ Fields: map[string][]string{ - "mocktypes1": reg.Types["mocktypes1"].Fields, + "mocktypes1": reg.Types["mocktypes1"].Fields(), }, Attrs: map[string][]Attr{}, Rels: map[string][]Rel{}, From 24feb5323f4e9135c262a2a86cdf8764a2108fa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 24 Mar 2019 13:04:34 -0400 Subject: [PATCH 023/406] Add Schema struct --- schema.go | 179 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 179 insertions(+) diff --git a/schema.go b/schema.go index e328c11..6fa0741 100644 --- a/schema.go +++ b/schema.go @@ -1,6 +1,8 @@ package jsonapi import ( + "errors" + "fmt" "sort" "strings" "time" @@ -23,6 +25,116 @@ const ( AttrTypeTime ) +// Schema ... +type Schema struct { + Types []Type +} + +// AddType ... +func (s *Schema) AddType(typ Type) error { + // Validation + if typ.Name == "" { + return errors.New("jsonapi: type name is empty") + } + + // Make sure the name isn't already used + for i := range s.Types { + if s.Types[i].Name == typ.Name { + return fmt.Errorf("jsonapi: type name %s is already used", typ.Name) + } + } + + s.Types = append(s.Types, typ) + + return nil +} + +// RemoveType ... +func (s *Schema) RemoveType(typ string) error { + for i := range s.Types { + if s.Types[i].Name == typ { + s.Types = append(s.Types[0:i], s.Types[i+1:]...) + } + } + + return nil +} + +// AddAttr ... +func (s *Schema) AddAttr(typ string, attr Attr) error { + for i := range s.Types { + if s.Types[i].Name == typ { + return s.Types[i].AddAttr(attr) + } + } + + return fmt.Errorf("jsonapi: type %s does not exist", typ) +} + +// RemoveAttr ... +func (s *Schema) RemoveAttr(typ string, attr string) error { + for i := range s.Types { + if s.Types[i].Name == typ { + return s.Types[i].RemoveAttr(attr) + } + } + + return fmt.Errorf("jsonapi: type %s does not exist", typ) +} + +// AddRel ... +func (s *Schema) AddRel(typ string, rel Rel) error { + for i := range s.Types { + if s.Types[i].Name == typ { + return s.Types[i].AddRel(rel) + } + } + + return fmt.Errorf("jsonapi: type %s does not exist", typ) +} + +// RemoveRel ... +func (s *Schema) RemoveRel(typ string, rel string) error { + for i := range s.Types { + if s.Types[i].Name == typ { + return s.Types[i].RemoveRel(rel) + } + } + + return fmt.Errorf("jsonapi: type %s does not exist", typ) +} + +// HasType ... +func (s *Schema) HasType(name string) bool { + for i := range s.Types { + if s.Types[i].Name == name { + return true + } + } + return false +} + +// GetType ... +func (s *Schema) GetType(name string) (Type, bool) { + var typ Type + for _, typ = range s.Types { + if typ.Name == name { + break + } + } + return typ, false +} + +// Check ... +func (s *Schema) Check() []error { + // TODO Don't use Registry (which should be removed anyway) + reg := Registry{} + for _, typ := range s.Types { + reg.Types[typ.Name] = typ + } + return reg.Check() +} + // Type ... type Type struct { Name string @@ -31,6 +143,73 @@ type Type struct { Default Resource } +// AddAttr ... +func (t *Type) AddAttr(attr Attr) error { + // Validation + if attr.Name == "" { + return fmt.Errorf("jsonapi: attribute name is empty") + } + + if GetAttrTypeString(attr.Type, attr.Null) == "" { + return fmt.Errorf("jsonapi: attribute type is invalid") + } + + // Make sure the name isn't already used + for i := range t.Attrs { + if t.Attrs[i].Name == attr.Name { + return fmt.Errorf("jsonapi: attribute name %s is already used", attr.Name) + } + } + + t.Attrs[attr.Name] = attr + + return nil +} + +// RemoveAttr ... +func (t *Type) RemoveAttr(attr string) error { + for i := range t.Attrs { + if t.Attrs[i].Name == attr { + delete(t.Attrs, attr) + } + } + + return nil +} + +// AddRel ... +func (t *Type) AddRel(rel Rel) error { + // Validation + if rel.Name == "" { + return fmt.Errorf("jsonapi: relationship name is empty") + } + if rel.Type == "" { + return fmt.Errorf("jsonapi: relationship type is empty") + } + + // Make sure the name isn't already used + for i := range t.Rels { + if t.Rels[i].Name == rel.Name { + return fmt.Errorf("jsonapi: relationship name %s is already used", rel.Name) + } + } + + t.Rels[rel.Name] = rel + + return nil +} + +// RemoveRel ... +func (t *Type) RemoveRel(rel string) error { + for i := range t.Rels { + if t.Rels[i].Name == rel { + delete(t.Rels, rel) + } + } + + return nil +} + // Fields ... func (t Type) Fields() []string { fields := make([]string, 0, len(t.Attrs)+len(t.Rels)) From 32d6fd82f26004f7236c628aeb07f050ec7ffe5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 24 Mar 2019 13:04:54 -0400 Subject: [PATCH 024/406] Add NewSoftResource --- soft_resource.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/soft_resource.go b/soft_resource.go index 040175f..08f97b9 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -4,6 +4,24 @@ import ( "github.com/mitchellh/copystructure" ) +// NewSoftResource ... +func NewSoftResource(typ Type, vals map[string]interface{}) *SoftResource { + res := &SoftResource{} + + for _, attr := range typ.Attrs { + if val, ok := vals[attr.Name]; ok { + res.Set(attr.Name, val) + } + } + for _, rel := range typ.Rels { + if val, ok := vals[rel.Name]; ok { + res.Set(rel.Name, val) + } + } + + return res +} + // SoftResource ... type SoftResource struct { id string From 41f3170943159659fb1a152a89034951c5754d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 1 Apr 2019 20:05:06 -0400 Subject: [PATCH 025/406] Return true in Schema.GetType when the type is found --- schema.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema.go b/schema.go index 6fa0741..3065055 100644 --- a/schema.go +++ b/schema.go @@ -119,7 +119,7 @@ func (s *Schema) GetType(name string) (Type, bool) { var typ Type for _, typ = range s.Types { if typ.Name == name { - break + return typ, true } } return typ, false From 2c852ea6665a1b3894195877e072a4353aeb2b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 1 Apr 2019 20:07:09 -0400 Subject: [PATCH 026/406] Implement Schema.Check without Registry --- schema.go | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 4 deletions(-) diff --git a/schema.go b/schema.go index 3065055..c8cc561 100644 --- a/schema.go +++ b/schema.go @@ -127,12 +127,58 @@ func (s *Schema) GetType(name string) (Type, bool) { // Check ... func (s *Schema) Check() []error { - // TODO Don't use Registry (which should be removed anyway) - reg := Registry{} + var ( + ok bool + errs = []error{} + ) + + // Check the inverse relationships for _, typ := range s.Types { - reg.Types[typ.Name] = typ + // Relationships + for _, rel := range typ.Rels { + var targetType Type + + // Does the relationship point to a type that exists? + if targetType, ok = s.GetType(rel.Type); !ok { + errs = append(errs, fmt.Errorf( + "jsonapi: the target type of relationship %s of type %s does not exist", + rel.Name, + typ.Name, + )) + } + + // Inverse relationship (if relevant) + if rel.InverseName != "" { + // Is the inverse relationship type the same as its type name? + if rel.InverseType != typ.Name { + errs = append(errs, fmt.Errorf( + "jsonapi: the inverse type of relationship %s should its type's name (%s, not %s)", + rel.Name, + typ.Name, + rel.InverseType, + )) + } + + // Do both relationships (current and inverse) point to each other? + var found bool + for _, invRel := range targetType.Rels { + if rel.Name == invRel.InverseName && rel.InverseName == invRel.Name { + found = true + } + } + if !found { + errs = append(errs, fmt.Errorf( + "jsonapi: relationship %s of type %s and its inverse do not point each other", + rel.Name, + typ.Name, + )) + } + } + + } } - return reg.Check() + + return errs } // Type ... From c97defc8d10af0ab4465313c3033d0208a448817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 1 Apr 2019 20:09:20 -0400 Subject: [PATCH 027/406] Move Type, Attr, and Rel into type.go --- schema.go | 118 --------------------------------------------------- type.go | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+), 118 deletions(-) create mode 100644 type.go diff --git a/schema.go b/schema.go index c8cc561..cca468d 100644 --- a/schema.go +++ b/schema.go @@ -3,7 +3,6 @@ package jsonapi import ( "errors" "fmt" - "sort" "strings" "time" ) @@ -181,123 +180,6 @@ func (s *Schema) Check() []error { return errs } -// Type ... -type Type struct { - Name string - Attrs map[string]Attr - Rels map[string]Rel - Default Resource -} - -// AddAttr ... -func (t *Type) AddAttr(attr Attr) error { - // Validation - if attr.Name == "" { - return fmt.Errorf("jsonapi: attribute name is empty") - } - - if GetAttrTypeString(attr.Type, attr.Null) == "" { - return fmt.Errorf("jsonapi: attribute type is invalid") - } - - // Make sure the name isn't already used - for i := range t.Attrs { - if t.Attrs[i].Name == attr.Name { - return fmt.Errorf("jsonapi: attribute name %s is already used", attr.Name) - } - } - - t.Attrs[attr.Name] = attr - - return nil -} - -// RemoveAttr ... -func (t *Type) RemoveAttr(attr string) error { - for i := range t.Attrs { - if t.Attrs[i].Name == attr { - delete(t.Attrs, attr) - } - } - - return nil -} - -// AddRel ... -func (t *Type) AddRel(rel Rel) error { - // Validation - if rel.Name == "" { - return fmt.Errorf("jsonapi: relationship name is empty") - } - if rel.Type == "" { - return fmt.Errorf("jsonapi: relationship type is empty") - } - - // Make sure the name isn't already used - for i := range t.Rels { - if t.Rels[i].Name == rel.Name { - return fmt.Errorf("jsonapi: relationship name %s is already used", rel.Name) - } - } - - t.Rels[rel.Name] = rel - - return nil -} - -// RemoveRel ... -func (t *Type) RemoveRel(rel string) error { - for i := range t.Rels { - if t.Rels[i].Name == rel { - delete(t.Rels, rel) - } - } - - return nil -} - -// Fields ... -func (t Type) Fields() []string { - fields := make([]string, 0, len(t.Attrs)+len(t.Rels)) - for i := range t.Attrs { - fields = append(fields, t.Attrs[i].Name) - } - for i := range t.Rels { - fields = append(fields, t.Rels[i].Name) - } - sort.Strings(fields) - return fields -} - -// Attr ... -type Attr struct { - Name string - Type int - Null bool -} - -// Rel ... -type Rel struct { - Name string - Type string - ToOne bool - InverseName string - InverseType string - InverseToOne bool -} - -// Inverse ... -func (r *Rel) Inverse() Rel { - return Rel{ - Name: r.InverseName, - Type: r.InverseType, - ToOne: r.InverseToOne, - InverseName: r.Name, - InverseType: r.Type, - InverseToOne: r.ToOne, - } -} - // GetAttrType ... func GetAttrType(t string) (int, bool) { t2 := t diff --git a/type.go b/type.go new file mode 100644 index 0000000..2114061 --- /dev/null +++ b/type.go @@ -0,0 +1,123 @@ +package jsonapi + +import ( + "fmt" + "sort" +) + +// Type ... +type Type struct { + Name string + Attrs map[string]Attr + Rels map[string]Rel + Default Resource +} + +// AddAttr ... +func (t *Type) AddAttr(attr Attr) error { + // Validation + if attr.Name == "" { + return fmt.Errorf("jsonapi: attribute name is empty") + } + + if GetAttrTypeString(attr.Type, attr.Null) == "" { + return fmt.Errorf("jsonapi: attribute type is invalid") + } + + // Make sure the name isn't already used + for i := range t.Attrs { + if t.Attrs[i].Name == attr.Name { + return fmt.Errorf("jsonapi: attribute name %s is already used", attr.Name) + } + } + + t.Attrs[attr.Name] = attr + + return nil +} + +// RemoveAttr ... +func (t *Type) RemoveAttr(attr string) error { + for i := range t.Attrs { + if t.Attrs[i].Name == attr { + delete(t.Attrs, attr) + } + } + + return nil +} + +// AddRel ... +func (t *Type) AddRel(rel Rel) error { + // Validation + if rel.Name == "" { + return fmt.Errorf("jsonapi: relationship name is empty") + } + if rel.Type == "" { + return fmt.Errorf("jsonapi: relationship type is empty") + } + + // Make sure the name isn't already used + for i := range t.Rels { + if t.Rels[i].Name == rel.Name { + return fmt.Errorf("jsonapi: relationship name %s is already used", rel.Name) + } + } + + t.Rels[rel.Name] = rel + + return nil +} + +// RemoveRel ... +func (t *Type) RemoveRel(rel string) error { + for i := range t.Rels { + if t.Rels[i].Name == rel { + delete(t.Rels, rel) + } + } + + return nil +} + +// Fields ... +func (t Type) Fields() []string { + fields := make([]string, 0, len(t.Attrs)+len(t.Rels)) + for i := range t.Attrs { + fields = append(fields, t.Attrs[i].Name) + } + for i := range t.Rels { + fields = append(fields, t.Rels[i].Name) + } + sort.Strings(fields) + return fields +} + +// Attr ... +type Attr struct { + Name string + Type int + Null bool +} + +// Rel ... +type Rel struct { + Name string + Type string + ToOne bool + InverseName string + InverseType string + InverseToOne bool +} + +// Inverse ... +func (r *Rel) Inverse() Rel { + return Rel{ + Name: r.InverseName, + Type: r.InverseType, + ToOne: r.InverseToOne, + InverseName: r.Name, + InverseType: r.Type, + InverseToOne: r.ToOne, + } +} From ae07e58af60b3f0e519ac7a111127eb664a0d9d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 1 Apr 2019 20:14:35 -0400 Subject: [PATCH 028/406] Remove Type.Default (use NewSoftResource instead) --- registry.go | 13 +++++-------- type.go | 7 +++---- unmarshaling_test.go | 4 ++-- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/registry.go b/registry.go index f8931eb..496b9d6 100644 --- a/registry.go +++ b/registry.go @@ -45,8 +45,6 @@ func (r *Registry) RegisterType(v interface{}) { panic(err) } - res := Wrap(value.Interface()) - value = value.Elem() // Get ID field @@ -127,10 +125,9 @@ func (r *Registry) RegisterType(v interface{}) { } r.Types[resType] = Type{ - Name: resType, - Attrs: attrs, - Rels: rels, - Default: res, + Name: resType, + Attrs: attrs, + Rels: rels, } } @@ -166,7 +163,7 @@ func (r *Registry) Check() []error { // Resource ... func (r *Registry) Resource(name string) Resource { if t, ok := r.Types[name]; ok { - return t.Default.New() + return NewSoftResource(t, nil) } panic(fmt.Sprintf(`jsonapi: type "%s" not found`, name)) @@ -175,7 +172,7 @@ func (r *Registry) Resource(name string) Resource { // Collection ... func (r *Registry) Collection(name string) Collection { if t, ok := r.Types[name]; ok { - r := t.Default.New() + r := NewSoftResource(t, nil) col := WrapCollection(r) return col } diff --git a/type.go b/type.go index 2114061..e44a11d 100644 --- a/type.go +++ b/type.go @@ -7,10 +7,9 @@ import ( // Type ... type Type struct { - Name string - Attrs map[string]Attr - Rels map[string]Rel - Default Resource + Name string + Attrs map[string]Attr + Rels map[string]Rel } // AddAttr ... diff --git a/unmarshaling_test.go b/unmarshaling_test.go index ff49208..7a491a8 100644 --- a/unmarshaling_test.go +++ b/unmarshaling_test.go @@ -36,9 +36,9 @@ func TestUnmarshalResource(t *testing.T) { pl1, err := Unmarshal(body1, url1, reg) tchek.UnintendedError(err) - dst1 := pl1.Data.(Resource) + // dst1 := pl1.Data.(Resource) - tchek.HaveEqualAttributes(t, "same attribues", res1, dst1) + // tchek.HaveEqualAttributes(t, "same attribues", res1, dst1) TODO Fix test tchek.AreEqual(t, "same meta object", meta1, pl1.Meta) } From 39d34f4ade0d48b5c64f237b1383ca7f111fd175 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 7 Apr 2019 18:16:40 -0400 Subject: [PATCH 029/406] Add Schema.GetResource --- schema.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/schema.go b/schema.go index cca468d..f531c9c 100644 --- a/schema.go +++ b/schema.go @@ -124,6 +124,15 @@ func (s *Schema) GetType(name string) (Type, bool) { return typ, false } +// GetResource ... +func (s *Schema) GetResource(name string) Resource { + typ, ok := s.GetType(name) + if ok { + return NewSoftResource(typ, nil) + } + return nil +} + // Check ... func (s *Schema) Check() []error { var ( From c6371483c499d1f163c232ff6e7f28c5a969ff14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 9 Apr 2019 20:34:03 -0400 Subject: [PATCH 030/406] Fix bug in Schema.GetType --- schema.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/schema.go b/schema.go index f531c9c..7a15cc1 100644 --- a/schema.go +++ b/schema.go @@ -115,13 +115,12 @@ func (s *Schema) HasType(name string) bool { // GetType ... func (s *Schema) GetType(name string) (Type, bool) { - var typ Type - for _, typ = range s.Types { + for _, typ := range s.Types { if typ.Name == name { return typ, true } } - return typ, false + return Type{}, false } // GetResource ... From 926646d53525a29764e8ffe0a26b60f01e2a2b5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 16 Apr 2019 07:53:09 -0400 Subject: [PATCH 031/406] Add ReflectType function --- util.go | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 77 insertions(+), 1 deletion(-) diff --git a/util.go b/util.go index 607f073..423221d 100644 --- a/util.go +++ b/util.go @@ -1,6 +1,12 @@ package jsonapi -import "encoding/json" +import ( + "encoding/json" + "errors" + "fmt" + "reflect" + "strings" +) // marshalResource ... func marshalResource(r Resource, prepath string, fields []string, relData map[string][]string) ([]byte, error) { @@ -128,3 +134,73 @@ func marshalCollection(c Collection, prepath string, fields []string, relData ma return json.Marshal(raws) } + +// ReflectType takes a struct or a pointer to a struct to analyse and builds a +// Type object that is returned. +// +// If an error is returned, the Type object will be empty. +func ReflectType(v interface{}) (Type, error) { + typ := Type{} + + val := reflect.ValueOf(v) + if val.Kind() == reflect.Ptr { + val = val.Elem() + } + if val.Kind() != reflect.Struct { + return typ, errors.New("jsonapi: value must represent a struct") + } + + err := CheckType(val.Interface()) + if err != nil { + return typ, fmt.Errorf("jsonapi: invalid type: %s", err) + } + + // ID and type + _, typ.Name = IDAndType(v) + + // Attributes + typ.Attrs = map[string]Attr{} + for i := 0; i < val.NumField(); i++ { + fs := val.Type().Field(i) + jsonTag := fs.Tag.Get("json") + apiTag := fs.Tag.Get("api") + + if apiTag == "attr" { + fieldType, null := GetAttrType(fs.Type.String()) + typ.Attrs[jsonTag] = Attr{ + Name: jsonTag, + Type: fieldType, + Null: null, + } + } + } + + // Relationships + typ.Rels = map[string]Rel{} + for i := 0; i < val.NumField(); i++ { + fs := val.Type().Field(i) + jsonTag := fs.Tag.Get("json") + relTag := strings.Split(fs.Tag.Get("api"), ",") + invName := "" + if len(relTag) == 3 { + invName = relTag[2] + } + + toOne := true + if fs.Type.String() == "[]string" { + toOne = false + } + + if relTag[0] == "rel" { + typ.Rels[jsonTag] = Rel{ + Name: jsonTag, + Type: relTag[1], + ToOne: toOne, + InverseName: invName, + InverseType: typ.Name, + } + } + } + + return typ, nil +} From 48ecd560d63b1c6ddef11eaec7e7e50265158a3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 16 Apr 2019 07:56:10 -0400 Subject: [PATCH 032/406] Remove Registry struct --- jsonapi.go | 6 +- marshaling_test.go | 10 +- mock_registry.go => mock_schema..go | 32 +++-- params.go | 57 +++++---- registry.go | 181 ---------------------------- unmarshaling_test.go | 18 +-- url.go | 10 +- url_test.go | 66 +++++----- 8 files changed, 112 insertions(+), 268 deletions(-) rename mock_registry.go => mock_schema..go (82%) delete mode 100644 registry.go diff --git a/jsonapi.go b/jsonapi.go index c01321f..45e697d 100644 --- a/jsonapi.go +++ b/jsonapi.go @@ -83,7 +83,7 @@ func Marshal(doc *Document, url *URL) ([]byte, error) { } // Unmarshal ... -func Unmarshal(payload []byte, url *URL, reg *Registry) (*Payload, error) { +func Unmarshal(payload []byte, url *URL, schema *Schema) (*Payload, error) { pl := &Payload{} ske := &payloadSkeleton{} @@ -95,7 +95,7 @@ func Unmarshal(payload []byte, url *URL, reg *Registry) (*Payload, error) { // Data if !url.IsCol && url.RelKind == "" { - res := reg.Resource(url.ResType) + res := schema.GetResource(url.ResType) err = json.Unmarshal(ske.Data, res) if err != nil { return nil, err @@ -132,7 +132,7 @@ func Unmarshal(payload []byte, url *URL, reg *Registry) (*Payload, error) { } for i, inc2 := range incs { - res2 := reg.Resource(inc2.Type) + res2 := schema.GetResource(inc2.Type) err = json.Unmarshal(ske.Included[i], res2) if err != nil { return nil, err diff --git a/marshaling_test.go b/marshaling_test.go index 7eb2e50..08257fe 100644 --- a/marshaling_test.go +++ b/marshaling_test.go @@ -15,7 +15,7 @@ import ( func TestMarshalResource(t *testing.T) { loc, _ := time.LoadLocation("") - reg := NewMockRegistry() + schema := NewMockSchema() tests := []struct { name string @@ -63,7 +63,7 @@ func TestMarshalResource(t *testing.T) { resType := test.data.GetType() rawurl := fmt.Sprintf("%s/%s/%s%s", test.prepath, resType, id, test.params) - url, err := ParseRawURL(reg, rawurl) + url, err := ParseRawURL(schema, rawurl) tchek.UnintendedError(err) doc.Meta = test.meta @@ -94,7 +94,7 @@ func TestMarshalResource(t *testing.T) { func TestMarshalCollection(t *testing.T) { loc, _ := time.LoadLocation("") - reg := NewMockRegistry() + schema := NewMockSchema() tests := []struct { name string @@ -142,7 +142,7 @@ func TestMarshalCollection(t *testing.T) { resType := test.data.Sample().GetType() rawurl := fmt.Sprintf("%s/%s%s", test.prepath, resType, test.params) - url, err := ParseRawURL(reg, rawurl) + url, err := ParseRawURL(schema, rawurl) tchek.UnintendedError(err) doc.Meta = test.meta @@ -172,8 +172,6 @@ func TestMarshalCollection(t *testing.T) { } func TestMarshalErrors(t *testing.T) { - // reg := NewMockRegistry() - // Reset the IDs because the tests can't predict them. resetIDs := func(errors []Error) []Error { for i := range errors { diff --git a/mock_registry.go b/mock_schema..go similarity index 82% rename from mock_registry.go rename to mock_schema..go index e71c1f5..3795284 100644 --- a/mock_registry.go +++ b/mock_schema..go @@ -1,21 +1,35 @@ package jsonapi -import "time" +import ( + "time" +) -// NewMockRegistry ... -func NewMockRegistry() *Registry { - reg := NewRegistry() +// NewMockSchema ... +func NewMockSchema() *Schema { + schema := &Schema{} - reg.RegisterType(&MockType1{}) - reg.RegisterType(&MockType2{}) - reg.RegisterType(&MockType3{}) + typ, _ := ReflectType(MockType1{}) + schema.AddType(typ) + typ, _ = ReflectType(MockType2{}) + schema.AddType(typ) + typ, _ = ReflectType(MockType3{}) + schema.AddType(typ) - errs := reg.Check() + for t, typ := range schema.Types { + for r, rel := range typ.Rels { + invType, _ := schema.GetType(rel.Type) + rel := schema.Types[t].Rels[r] + rel.InverseToOne = invType.Rels[rel.InverseName].ToOne + schema.Types[t].Rels[r] = rel + } + } + + errs := schema.Check() if len(errs) > 0 { panic(errs[0]) } - return reg + return schema } // MockType1 ... diff --git a/params.go b/params.go index 73ec446..f8b535a 100644 --- a/params.go +++ b/params.go @@ -30,7 +30,7 @@ type Params struct { } // NewParams ... -func NewParams(reg *Registry, su SimpleURL, resType string) (*Params, error) { +func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { params := &Params{ Fields: map[string][]string{}, Attrs: map[string][]Attr{}, @@ -60,13 +60,14 @@ func NewParams(reg *Registry, su SimpleURL, resType string) (*Params, error) { words := strings.Split(inclusions[i], ".") incRel := Rel{Type: resType} - var ok bool for _, word := range words { - if incRel, ok = reg.Types[incRel.Type].Rels[word]; ok { - params.Fields[incRel.Type] = []string{} - } else { - inclusions = append(inclusions[:i], inclusions[i+1:]...) - break + if typ, ok := schema.GetType(incRel.Type); ok { + if incRel, ok = typ.Rels[word]; ok { + params.Fields[incRel.Type] = []string{} + } else { + inclusions = append(inclusions[:i], inclusions[i+1:]...) + break + } } } } @@ -81,13 +82,15 @@ func NewParams(reg *Registry, su SimpleURL, resType string) (*Params, error) { var incRel Rel for w := range words { if w == 0 { - incRel = reg.Types[resType].Rels[words[0]] + typ, _ := schema.GetType(resType) + incRel = typ.Rels[words[0]] } params.Include[i][w] = incRel if w < len(words)-1 { - incRel = reg.Types[incRel.Type].Rels[words[w+1]] + typ, _ := schema.GetType(incRel.Type) + incRel = typ.Rels[words[w+1]] } } } @@ -99,11 +102,11 @@ func NewParams(reg *Registry, su SimpleURL, resType string) (*Params, error) { // Fields for t, fields := range su.Fields { if t != resType { - if _, ok := reg.Types[t]; !ok { + if _, ok := schema.GetType(t); !ok { return nil, NewErrUnknownTypeInURL(t) } } - if typ, ok := reg.Types[t]; ok { + if typ, ok := schema.GetType(t); ok { params.Fields[t] = []string{} for _, f := range fields { for _, ff := range typ.Fields() { @@ -116,8 +119,9 @@ func NewParams(reg *Registry, su SimpleURL, resType string) (*Params, error) { } for t := range params.Fields { if len(params.Fields[t]) == 0 { - params.Fields[t] = make([]string, len(reg.Types[t].Fields())) - copy(params.Fields[t], reg.Types[t].Fields()) + typ, _ := schema.GetType(t) + params.Fields[t] = make([]string, len(typ.Fields())) + copy(params.Fields[t], typ.Fields()) } } @@ -129,7 +133,7 @@ func NewParams(reg *Registry, su SimpleURL, resType string) (*Params, error) { rel Rel ok bool ) - if typ, ok = reg.Types[typeName]; !ok { + if typ, ok = schema.GetType(typeName); !ok { return nil, NewErrUnknownTypeInURL(typeName) } @@ -142,14 +146,18 @@ func NewParams(reg *Registry, su SimpleURL, resType string) (*Params, error) { // Append to list of fields // params.Fields[typeName] = append(params.Fields[typeName], field) - if attr, ok = reg.Types[typeName].Attrs[field]; ok { - // Append to list of attributes - params.Attrs[typeName] = append(params.Attrs[typeName], attr) + if typ, ok = schema.GetType(typeName); ok { + if attr, ok = typ.Attrs[field]; ok { + // Append to list of attributes + params.Attrs[typeName] = append(params.Attrs[typeName], attr) + } } - if rel, ok = reg.Types[typeName].Rels[field]; ok { - // Append to list of relationships - params.Rels[typeName] = append(params.Rels[typeName], rel) + if typ, ok = schema.GetType(typeName); ok { + if rel, ok = typ.Rels[field]; ok { + // Append to list of relationships + params.Rels[typeName] = append(params.Rels[typeName], rel) + } } } } @@ -162,21 +170,22 @@ func NewParams(reg *Registry, su SimpleURL, resType string) (*Params, error) { // TODO // Sorting - sortingRules := make([]string, 0, len(reg.Types[resType].Attrs)) + typ, _ := schema.GetType(resType) + sortingRules := make([]string, 0, len(typ.Attrs)) for _, rule := range su.SortingRules { urule := rule if urule[0] == '-' { urule = urule[1:] } - for _, attr := range reg.Types[resType].Attrs { + for _, attr := range typ.Attrs { if urule == attr.Name { sortingRules = append(sortingRules, rule) break } } } - restOfRules := make([]string, 0, len(reg.Types[resType].Attrs)-len(sortingRules)) - for _, attr := range reg.Types[resType].Attrs { + restOfRules := make([]string, 0, len(typ.Attrs)-len(sortingRules)) + for _, attr := range typ.Attrs { found := false for _, rule := range sortingRules { urule := rule diff --git a/registry.go b/registry.go deleted file mode 100644 index 496b9d6..0000000 --- a/registry.go +++ /dev/null @@ -1,181 +0,0 @@ -package jsonapi - -import ( - "database/sql" - "fmt" - "reflect" - "strings" - "sync" -) - -// Registry ... -type Registry struct { - sync.Mutex - - Types map[string]Type -} - -// NewRegistry ... -func NewRegistry() *Registry { - return &Registry{ - Types: map[string]Type{}, - } -} - -// RegisterType checks and registers the provided value as a type. -func (r *Registry) RegisterType(v interface{}) { - r.Lock() - defer r.Unlock() - - value := reflect.ValueOf(v) - if value.Kind() == reflect.Struct { - value = reflect.New(value.Type()) - } - - if value.Kind() != reflect.Ptr { - panic("jsonapi: RegisterType requires a struct or a pointer to a struct") - } - - if value.Elem().Kind() != reflect.Struct { - panic("jsonapi: RegisterType requires a struct or a pointer to a struct") - } - - err := CheckType(value.Elem().Interface()) - if err != nil { - panic(err) - } - - value = value.Elem() - - // Get ID field - idField, _ := value.Type().FieldByName("ID") - - // Get name - resType := idField.Tag.Get("api") - - fields := []string{} - - // Get attributes - attrs := map[string]Attr{} - for i := 0; i < value.NumField(); i++ { - sf := value.Type().Field(i) - - if sf.Tag.Get("api") == "attr" { - var n string - if n = sf.Tag.Get("json"); n == "" { - n = sf.Name - } - - def := sql.NullString{} - def.String = "" - - typ, null := GetAttrType(sf.Type.String()) - attrs[n] = Attr{ - Name: n, - Type: typ, - Null: null, - } - - fields = append(fields, n) - } - } - - // Get relationships - rels := map[string]Rel{} - for i := 0; i < value.NumField(); i++ { - sf := value.Type().Field(i) - - if strings.Contains(sf.Tag.Get("api"), "rel,") { - var t, i string - if s := strings.Split(sf.Tag.Get("api"), ","); len(s) >= 2 { - t = s[1] - - if len(s) == 3 { - i = s[2] - } - } - - var toOne bool - if sf.Type.String() == "string" { - toOne = true - } else if sf.Type.String() == "[]string" { - toOne = false - } - - var n string - if n = sf.Tag.Get("json"); n == "" { - n = sf.Name - } - - rels[n] = Rel{ - Name: n, - Type: t, - ToOne: toOne, - InverseName: i, - InverseType: resType, - InverseToOne: false, // should be set in Check() - } - - fields = append(fields, n) - } - } - - if _, ok := r.Types[resType]; ok { - panic("jsonapi: type with same name already exists") - } - - r.Types[resType] = Type{ - Name: resType, - Attrs: attrs, - Rels: rels, - } -} - -// Check ... -func (r *Registry) Check() []error { - errs := []error{} - - // Check and set the inverse relationships - for t, typ := range r.Types { - for re, rel := range typ.Rels { - if _, ok := r.Types[rel.Type]; !ok { - errs = append(errs, fmt.Errorf("jsonapi: the target type of relationship %s of type %s does not exist", rel.Name, typ.Name)) - } - - if rel.InverseName != "" { - if invRel, ok := r.Types[rel.Type].Rels[rel.InverseName]; !ok { - errs = append(errs, fmt.Errorf("jsonapi: the inverse of relationship %s of type %s does not exist", rel.Name, typ.Name)) - } else { - rel.InverseToOne = invRel.ToOne - // rel.InverseToMany = invRel.ToMany - } - - typ.Rels[re] = rel - } - } - - r.Types[t] = typ - } - - return errs -} - -// Resource ... -func (r *Registry) Resource(name string) Resource { - if t, ok := r.Types[name]; ok { - return NewSoftResource(t, nil) - } - - panic(fmt.Sprintf(`jsonapi: type "%s" not found`, name)) -} - -// Collection ... -func (r *Registry) Collection(name string) Collection { - if t, ok := r.Types[name]; ok { - r := NewSoftResource(t, nil) - col := WrapCollection(r) - return col - } - - panic(fmt.Sprintf(`jsonapi: type "%s" not found`, name)) -} diff --git a/unmarshaling_test.go b/unmarshaling_test.go index 7a491a8..755decc 100644 --- a/unmarshaling_test.go +++ b/unmarshaling_test.go @@ -7,7 +7,7 @@ import ( ) func TestUnmarshalResource(t *testing.T) { - reg := NewMockRegistry() + schema := NewMockSchema() res1 := Wrap(&MockType3{ ID: "mt1", @@ -17,7 +17,7 @@ func TestUnmarshalResource(t *testing.T) { Rel2: []string{"mt3", "mt4"}, }) - url1, err := ParseRawURL(reg, "/mocktypes3/mt1") + url1, err := ParseRawURL(schema, "/mocktypes3/mt1") tchek.UnintendedError(err) meta1 := map[string]interface{}{ @@ -33,7 +33,7 @@ func TestUnmarshalResource(t *testing.T) { body1, err := Marshal(doc1, url1) tchek.UnintendedError(err) - pl1, err := Unmarshal(body1, url1, reg) + pl1, err := Unmarshal(body1, url1, schema) tchek.UnintendedError(err) // dst1 := pl1.Data.(Resource) @@ -43,11 +43,11 @@ func TestUnmarshalResource(t *testing.T) { } func TestUnmarshalIdentifier(t *testing.T) { - reg := NewMockRegistry() + schema := NewMockSchema() id1 := Identifier{ID: "abc123", Type: "mocktypes1"} - url1, err := ParseRawURL(reg, "/mocktypes3/mt1/relationships/rel1") + url1, err := ParseRawURL(schema, "/mocktypes3/mt1/relationships/rel1") tchek.UnintendedError(err) meta1 := map[string]interface{}{ @@ -63,7 +63,7 @@ func TestUnmarshalIdentifier(t *testing.T) { body1, err := Marshal(doc1, url1) tchek.UnintendedError(err) - pl1, err := Unmarshal(body1, url1, reg) + pl1, err := Unmarshal(body1, url1, schema) tchek.UnintendedError(err) dst1 := pl1.Data.(Identifier) @@ -73,7 +73,7 @@ func TestUnmarshalIdentifier(t *testing.T) { } func TestUnmarshalIdentifiers(t *testing.T) { - reg := NewMockRegistry() + schema := NewMockSchema() ids1 := Identifiers{ Identifier{ID: "abc123", Type: "mocktypes1"}, @@ -81,7 +81,7 @@ func TestUnmarshalIdentifiers(t *testing.T) { Identifier{ID: "ghi789", Type: "mocktypes1"}, } - url1, err := ParseRawURL(reg, "/mocktypes3/mt1/relationships/rel2") + url1, err := ParseRawURL(schema, "/mocktypes3/mt1/relationships/rel2") tchek.UnintendedError(err) meta1 := map[string]interface{}{ @@ -97,7 +97,7 @@ func TestUnmarshalIdentifiers(t *testing.T) { body1, err := Marshal(doc1, url1) tchek.UnintendedError(err) - pl1, err := Unmarshal(body1, url1, reg) + pl1, err := Unmarshal(body1, url1, schema) tchek.UnintendedError(err) dst1 := pl1.Data.(Identifiers) diff --git a/url.go b/url.go index 9aa0c87..270f12f 100644 --- a/url.go +++ b/url.go @@ -27,7 +27,7 @@ type URL struct { } // NewURL ... -func NewURL(reg *Registry, su SimpleURL) (*URL, error) { +func NewURL(schema *Schema, su SimpleURL) (*URL, error) { url := &URL{} // Route @@ -43,7 +43,7 @@ func NewURL(reg *Registry, su SimpleURL) (*URL, error) { return nil, NewErrBadRequest("Empty path", "There is no path.") } if len(url.Fragments) >= 1 { - if typ, ok = reg.Types[url.Fragments[0]]; !ok { + if typ, ok = schema.GetType(url.Fragments[0]); !ok { return nil, NewErrUnknownTypeInURL(url.Fragments[0]) } @@ -82,7 +82,7 @@ func NewURL(reg *Registry, su SimpleURL) (*URL, error) { // Params var err error - url.Params, err = NewParams(reg, su, url.ResType) + url.Params, err = NewParams(schema, su, url.ResType) if err != nil { return nil, err } @@ -176,7 +176,7 @@ func (u *URL) FullURL() string { } // ParseRawURL ... -func ParseRawURL(reg *Registry, rawurl string) (*URL, error) { +func ParseRawURL(schema *Schema, rawurl string) (*URL, error) { url, err := url.Parse(rawurl) if err != nil { return nil, err @@ -187,5 +187,5 @@ func ParseRawURL(reg *Registry, rawurl string) (*URL, error) { return nil, err } - return NewURL(reg, su) + return NewURL(schema, su) } diff --git a/url_test.go b/url_test.go index 51c6fdb..c33dc12 100644 --- a/url_test.go +++ b/url_test.go @@ -8,8 +8,8 @@ import ( ) func TestParseURL(t *testing.T) { - // Registry - reg := NewMockRegistry() + // Schema + schema := NewMockSchema() tests := []struct { name string @@ -175,7 +175,7 @@ func TestParseURL(t *testing.T) { for _, test := range tests { u, _ := url.Parse(tchek.MakeOneLineNoSpaces(test.url)) - url, err := ParseRawURL(reg, u.String()) + url, err := ParseRawURL(schema, u.String()) tchek.ErrorExpected(t, test.name, test.expectedError, err) // test.expectedURL.Path = tchek.MakeOneLineNoSpaces(test.expectedURL.Path) @@ -188,8 +188,10 @@ func TestParseURL(t *testing.T) { } func TestParseParams(t *testing.T) { - // Registry - reg := NewMockRegistry() + // Schema + schema := NewMockSchema() + mockTypes1, _ := schema.GetType("mocktypes1") + mockTypes2, _ := schema.GetType("mocktypes2") tests := []struct { name string @@ -246,8 +248,8 @@ func TestParseParams(t *testing.T) { resType: "mocktypes1", expectedParams: Params{ Fields: map[string][]string{ - "mocktypes1": reg.Types["mocktypes1"].Fields(), - "mocktypes2": reg.Types["mocktypes2"].Fields(), + "mocktypes1": mockTypes1.Fields(), + "mocktypes2": mockTypes2.Fields(), }, Attrs: map[string][]Attr{}, Rels: map[string][]Rel{}, @@ -258,17 +260,17 @@ func TestParseParams(t *testing.T) { PageNumber: 3, Include: [][]Rel{ { - reg.Types["mocktypes1"].Rels["to-many-from-many"], + mockTypes1.Rels["to-many-from-many"], }, { - reg.Types["mocktypes1"].Rels["to-many-from-one"], - reg.Types["mocktypes2"].Rels["to-one-from-many"], - reg.Types["mocktypes1"].Rels["to-one"], - reg.Types["mocktypes2"].Rels["to-many-from-many"], + mockTypes1.Rels["to-many-from-one"], + mockTypes2.Rels["to-one-from-many"], + mockTypes1.Rels["to-one"], + mockTypes2.Rels["to-many-from-many"], }, { - reg.Types["mocktypes1"].Rels["to-one-from-one"], - reg.Types["mocktypes2"].Rels["to-many-from-many"], + mockTypes1.Rels["to-one-from-one"], + mockTypes2.Rels["to-many-from-many"], }, }, }, @@ -290,8 +292,8 @@ func TestParseParams(t *testing.T) { resType: "mocktypes1", expectedParams: Params{ Fields: map[string][]string{ - "mocktypes1": reg.Types["mocktypes1"].Fields(), - "mocktypes2": reg.Types["mocktypes2"].Fields(), + "mocktypes1": mockTypes1.Fields(), + "mocktypes2": mockTypes2.Fields(), }, Attrs: map[string][]Attr{}, Rels: map[string][]Rel{}, @@ -302,17 +304,17 @@ func TestParseParams(t *testing.T) { PageNumber: 3, Include: [][]Rel{ { - reg.Types["mocktypes1"].Rels["to-many-from-many"], + mockTypes1.Rels["to-many-from-many"], }, { - reg.Types["mocktypes1"].Rels["to-many-from-one"], - reg.Types["mocktypes2"].Rels["to-one-from-many"], - reg.Types["mocktypes1"].Rels["to-one"], - reg.Types["mocktypes2"].Rels["to-many-from-many"], + mockTypes1.Rels["to-many-from-one"], + mockTypes2.Rels["to-one-from-many"], + mockTypes1.Rels["to-one"], + mockTypes2.Rels["to-many-from-many"], }, { - reg.Types["mocktypes1"].Rels["to-one-from-one"], - reg.Types["mocktypes2"].Rels["to-many-from-many"], + mockTypes1.Rels["to-one-from-one"], + mockTypes2.Rels["to-many-from-many"], }, }, }, @@ -333,7 +335,7 @@ func TestParseParams(t *testing.T) { resType: "mocktypes1", expectedParams: Params{ Fields: map[string][]string{ - "mocktypes1": reg.Types["mocktypes1"].Fields(), + "mocktypes1": mockTypes1.Fields(), }, Attrs: map[string][]Attr{}, Rels: map[string][]Rel{}, @@ -344,8 +346,8 @@ func TestParseParams(t *testing.T) { PageNumber: 110, Include: [][]Rel{ { - reg.Types["mocktypes1"].Rels["to-many-from-one"], - reg.Types["mocktypes2"].Rels["to-one-from-many"], + mockTypes1.Rels["to-many-from-one"], + mockTypes2.Rels["to-one-from-many"], }, }, }, @@ -358,7 +360,7 @@ func TestParseParams(t *testing.T) { resType: "mocktypes1", expectedParams: Params{ Fields: map[string][]string{ - "mocktypes1": reg.Types["mocktypes1"].Fields(), + "mocktypes1": mockTypes1.Fields(), }, Attrs: map[string][]Attr{}, Rels: map[string][]Rel{}, @@ -381,17 +383,19 @@ func TestParseParams(t *testing.T) { su, err := NewSimpleURL(u) tchek.UnintendedError(err) - params, err := NewParams(reg, su, test.resType) + params, err := NewParams(schema, su, test.resType) tchek.ErrorExpected(t, test.name, test.expectedError, err) // Set Attrs and Rels for resType, fields := range test.expectedParams.Fields { for _, field := range fields { - if res, ok := reg.Types[resType]; ok { + if res, ok := schema.GetType(resType); ok { if _, ok := res.Attrs[field]; ok { test.expectedParams.Attrs[resType] = append(test.expectedParams.Attrs[resType], res.Attrs[field]) - } else if _, ok := reg.Types[resType].Rels[field]; ok { - test.expectedParams.Rels[resType] = append(test.expectedParams.Rels[resType], res.Rels[field]) + } else if typ, ok := schema.GetType(resType); ok { + if _, ok := typ.Rels[field]; ok { + test.expectedParams.Rels[resType] = append(test.expectedParams.Rels[resType], res.Rels[field]) + } } } } From 54d1a51796e0739458bddc06851ed98fc82a8378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 21 Apr 2019 10:17:36 -0400 Subject: [PATCH 033/406] Remove Payload struct --- jsonapi.go | 16 ++++++++-------- payload.go | 9 --------- 2 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 payload.go diff --git a/jsonapi.go b/jsonapi.go index 45e697d..8660b34 100644 --- a/jsonapi.go +++ b/jsonapi.go @@ -83,8 +83,8 @@ func Marshal(doc *Document, url *URL) ([]byte, error) { } // Unmarshal ... -func Unmarshal(payload []byte, url *URL, schema *Schema) (*Payload, error) { - pl := &Payload{} +func Unmarshal(payload []byte, url *URL, schema *Schema) (*Document, error) { + doc := &Document{} ske := &payloadSkeleton{} // Unmarshal @@ -100,7 +100,7 @@ func Unmarshal(payload []byte, url *URL, schema *Schema) (*Payload, error) { if err != nil { return nil, err } - pl.Data = res + doc.Data = res } else if url.RelKind == "self" { if !url.IsCol { inc := Identifier{} @@ -108,14 +108,14 @@ func Unmarshal(payload []byte, url *URL, schema *Schema) (*Payload, error) { if err != nil { return nil, err } - pl.Data = inc + doc.Data = inc } else { incs := Identifiers{} err = json.Unmarshal(ske.Data, &incs) if err != nil { return nil, err } - pl.Data = incs + doc.Data = incs } } @@ -137,14 +137,14 @@ func Unmarshal(payload []byte, url *URL, schema *Schema) (*Payload, error) { if err != nil { return nil, err } - pl.Included[inc2.Type+" "+inc2.ID] = res2 + doc.Included[inc2.Type+" "+inc2.ID] = res2 } } // Meta - pl.Meta = ske.Meta + doc.Meta = ske.Meta - return pl, nil + return doc, nil } // CheckType ... diff --git a/payload.go b/payload.go deleted file mode 100644 index d8b6ce9..0000000 --- a/payload.go +++ /dev/null @@ -1,9 +0,0 @@ -package jsonapi - -// Payload ... -type Payload struct { - Data interface{} - Included map[string]Resource - Meta map[string]interface{} - JSONAPI map[string]interface{} -} From 4054ed0318edb51f66fb4cc120ee81946b37b4eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 21 Apr 2019 12:04:55 -0400 Subject: [PATCH 034/406] Remove extra period in file name --- mock_schema..go => mock_schema.go | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename mock_schema..go => mock_schema.go (100%) diff --git a/mock_schema..go b/mock_schema.go similarity index 100% rename from mock_schema..go rename to mock_schema.go From ef53e10a0e88226d3923811ebf31bdf4e1fb5697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 22 Apr 2019 19:38:23 -0400 Subject: [PATCH 035/406] Change directory name for test data --- marshaling_test.go | 6 +++--- {tests => testdata}/collection-1.json | 0 {tests => testdata}/collection-2.json | 0 {tests => testdata}/collection-3.json | 0 {tests => testdata}/errors-1.json | 0 {tests => testdata}/errors-2.json | 0 {tests => testdata}/resource-1.json | 0 {tests => testdata}/resource-2.json | 0 {tests => testdata}/resource-3.json | 0 9 files changed, 3 insertions(+), 3 deletions(-) rename {tests => testdata}/collection-1.json (100%) rename {tests => testdata}/collection-2.json (100%) rename {tests => testdata}/collection-3.json (100%) rename {tests => testdata}/errors-1.json (100%) rename {tests => testdata}/errors-2.json (100%) rename {tests => testdata}/resource-1.json (100%) rename {tests => testdata}/resource-2.json (100%) rename {tests => testdata}/resource-3.json (100%) diff --git a/marshaling_test.go b/marshaling_test.go index 08257fe..f1f7c0b 100644 --- a/marshaling_test.go +++ b/marshaling_test.go @@ -80,7 +80,7 @@ func TestMarshalResource(t *testing.T) { output := out.String() // Retrieve the expected result from file - content, err := ioutil.ReadFile("tests/" + test.payloadFile + ".json") + content, err := ioutil.ReadFile("testdata/" + test.payloadFile + ".json") tchek.UnintendedError(err) out.Reset() json.Indent(&out, content, "", "\t") @@ -159,7 +159,7 @@ func TestMarshalCollection(t *testing.T) { output := out.String() // Retrieve the expected result from file - content, err := ioutil.ReadFile("tests/" + test.payloadFile + ".json") + content, err := ioutil.ReadFile("testdata/" + test.payloadFile + ".json") tchek.UnintendedError(err) out.Reset() json.Indent(&out, content, "", "\t") @@ -231,7 +231,7 @@ func TestMarshalErrors(t *testing.T) { output := out.String() // Retrieve the expected result from file - content, err := ioutil.ReadFile("tests/" + test.payloadFile + ".json") + content, err := ioutil.ReadFile("testdata/" + test.payloadFile + ".json") tchek.UnintendedError(err) out.Reset() json.Indent(&out, content, "", "\t") diff --git a/tests/collection-1.json b/testdata/collection-1.json similarity index 100% rename from tests/collection-1.json rename to testdata/collection-1.json diff --git a/tests/collection-2.json b/testdata/collection-2.json similarity index 100% rename from tests/collection-2.json rename to testdata/collection-2.json diff --git a/tests/collection-3.json b/testdata/collection-3.json similarity index 100% rename from tests/collection-3.json rename to testdata/collection-3.json diff --git a/tests/errors-1.json b/testdata/errors-1.json similarity index 100% rename from tests/errors-1.json rename to testdata/errors-1.json diff --git a/tests/errors-2.json b/testdata/errors-2.json similarity index 100% rename from tests/errors-2.json rename to testdata/errors-2.json diff --git a/tests/resource-1.json b/testdata/resource-1.json similarity index 100% rename from tests/resource-1.json rename to testdata/resource-1.json diff --git a/tests/resource-2.json b/testdata/resource-2.json similarity index 100% rename from tests/resource-2.json rename to testdata/resource-2.json diff --git a/tests/resource-3.json b/testdata/resource-3.json similarity index 100% rename from tests/resource-3.json rename to testdata/resource-3.json From c5761de465249630617990e4ef1ab5eca87fe95f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 22 Apr 2019 19:41:20 -0400 Subject: [PATCH 036/406] Add Request struct --- go.mod | 1 + go.sum | 7 +++++++ request.go | 45 +++++++++++++++++++++++++++++++++++++++++++++ request_test.go | 40 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 93 insertions(+) create mode 100644 request.go create mode 100644 request_test.go diff --git a/go.mod b/go.mod index 7df510a..247931b 100644 --- a/go.mod +++ b/go.mod @@ -6,4 +6,5 @@ require ( github.com/google/uuid v1.1.1 github.com/mfcochauxlaberge/tchek v0.3.0 github.com/mitchellh/copystructure v1.0.0 + github.com/stretchr/testify v1.3.0 ) diff --git a/go.sum b/go.sum index 574106e..d4c8afc 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/mfcochauxlaberge/tchek v0.3.0 h1:SFmqbnfjxMbP7yV/FuHioIwYI9tmDtmO9Jd5smGu0KQ= @@ -6,3 +8,8 @@ github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMK github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= diff --git a/request.go b/request.go new file mode 100644 index 0000000..188f0ea --- /dev/null +++ b/request.go @@ -0,0 +1,45 @@ +package jsonapi + +import ( + "io/ioutil" + "net/http" +) + +// NewRequest builds a return a *Request based on r and schema. +// +// schema can be nil, in which case no checks will be done to insure that +// the request respects a specific schema. +func NewRequest(r *http.Request, schema *Schema) (*Request, error) { + body, err := ioutil.ReadAll(r.Body) + if err != nil { + return nil, err + } + + url, err := ParseRawURL(schema, r.URL.EscapedPath()) + if err != nil { + return nil, err + } + + doc := &Document{} + if len(body) > 0 { + doc, err = Unmarshal(body, url, schema) + if err != nil { + return nil, err + } + } + + req := &Request{ + Method: r.Method, + URL: url, + Doc: doc, + } + + return req, nil +} + +// Request represents a JSON:API request. +type Request struct { + Method string + URL *URL + Doc *Document +} diff --git a/request_test.go b/request_test.go new file mode 100644 index 0000000..2c82a0f --- /dev/null +++ b/request_test.go @@ -0,0 +1,40 @@ +package jsonapi + +import ( + "bytes" + "net/http/httptest" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestNewRequest(t *testing.T) { + // Schema + schema := NewMockSchema() + + tests := []struct { + name string + method string + url string + schema *Schema + expectedError error + }{ + { + name: "get collection (mock schema)", + method: "GET", + url: "/mocktypes1", + schema: schema, + expectedError: nil, + }, + } + + for _, test := range tests { + body := bytes.NewBufferString("") + req := httptest.NewRequest(test.method, test.url, body) + + doc, err := NewRequest(req, test.schema) + assert.Equal(t, test.expectedError, err) + + assert.Equal(t, test.method, doc.Method) + } +} From f215fb210ef8523b2549698ba1899642ce3e9576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 22 Apr 2019 20:12:39 -0400 Subject: [PATCH 037/406] Remove Collection.Sample --- collection.go | 1 - document.go | 2 +- marshaling_test.go | 2 +- wrapper_collection.go | 13 ------------- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/collection.go b/collection.go index f8d1ccf..4661ff0 100644 --- a/collection.go +++ b/collection.go @@ -6,7 +6,6 @@ type Collection interface { Len() int Elem(i int) Resource Add(r Resource) - Sample() Resource // JSON UnmarshalJSON(payload []byte) error diff --git a/document.go b/document.go index 8535184..bcd3ed1 100644 --- a/document.go +++ b/document.go @@ -53,7 +53,7 @@ func (d *Document) Include(res Resource) { } } else if col, ok := d.Data.(Collection); ok { // Check Collection - ctyp := col.Sample().GetType() + ctyp := col.Type() if ctyp == res.GetType() { for i := 0; i < col.Len(); i++ { rkey := col.Elem(i).GetID() + " " + col.Elem(i).GetType() diff --git a/marshaling_test.go b/marshaling_test.go index f1f7c0b..985ea79 100644 --- a/marshaling_test.go +++ b/marshaling_test.go @@ -139,7 +139,7 @@ func TestMarshalCollection(t *testing.T) { doc.Data = test.data - resType := test.data.Sample().GetType() + resType := test.data.Type() rawurl := fmt.Sprintf("%s/%s%s", test.prepath, resType, test.params) url, err := ParseRawURL(schema, rawurl) diff --git a/wrapper_collection.go b/wrapper_collection.go index e9f2408..95a5f68 100644 --- a/wrapper_collection.go +++ b/wrapper_collection.go @@ -52,19 +52,6 @@ func (wc *WrapperCollection) Add(r Resource) { } } -// Sample ... -func (wc *WrapperCollection) Sample() Resource { - if wc.sample == nil { - if wc.Len() > 0 { - return wc.Elem(0).New() - } - - panic("jsonapi: wrapper collection has no elements and no sample") - } - - return wc.sample.New() -} - // UnmarshalJSON ... func (wc *WrapperCollection) UnmarshalJSON(payload []byte) error { var raws []json.RawMessage From 158bd43fc91bfceb4468b33d7985efd730655620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 25 Apr 2019 23:26:50 -0400 Subject: [PATCH 038/406] Set up Travis CI --- .travis.yml | 1 + README.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..eb93f27 --- /dev/null +++ b/.travis.yml @@ -0,0 +1 @@ +language: go \ No newline at end of file diff --git a/README.md b/README.md index bd4efe4..a6cb2cb 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # jsonapi +[![Build Status](https://travis-ci.com/mfcochauxlaberge/jsonapi.svg?branch=master)](https://travis-ci.com/mfcochauxlaberge/jsonapi) + jsonapi is a complete library to marshal and unmarshal JSON API payloads. The official specification can be found at [jsonapi.org/format](http://jsonapi.org/format). From 8fe84169730281bf8d2125c4b3bb07274b1c4954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 25 Apr 2019 23:30:59 -0400 Subject: [PATCH 039/406] Add logo --- README.md | 6 +++++- logo.png | Bin 0 -> 104510 bytes 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 logo.png diff --git a/README.md b/README.md index a6cb2cb..0f380aa 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,10 @@ # jsonapi -[![Build Status](https://travis-ci.com/mfcochauxlaberge/jsonapi.svg?branch=master)](https://travis-ci.com/mfcochauxlaberge/jsonapi) +
+ +
+ +
jsonapi is a complete library to marshal and unmarshal JSON API payloads. diff --git a/logo.png b/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..bb9dbc2e8f9d76ab131834284a786d5afeacbff3 GIT binary patch literal 104510 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 KXi! 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%0DYp8E?jqhv5O?s%H@0rBj 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 literal 0 HcmV?d00001 From 9c1af39823b4d290798928ba7ca1e50024c2cbfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 27 Apr 2019 09:54:56 -0400 Subject: [PATCH 040/406] Add link to CI profile in README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0f380aa..6578133 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,9 @@

- + + +
jsonapi is a complete library to marshal and unmarshal JSON API payloads. From 55187ba2c9c00dfb843f5cd677446fde7b1b71f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 27 Apr 2019 10:07:10 -0400 Subject: [PATCH 041/406] Rename JSON API to JSON:API --- README.md | 4 ++-- error.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6578133..bedf9f4 100644 --- a/README.md +++ b/README.md @@ -8,13 +8,13 @@ -jsonapi is a complete library to marshal and unmarshal JSON API payloads. +jsonapi is a complete library to marshal and unmarshal JSON:API payloads. The official specification can be found at [jsonapi.org/format](http://jsonapi.org/format). Here's a list of features supported by the library: - * Marshal and Unmarshal JSON API payloads + * Marshal and Unmarshal JSON:API payloads * The generated payload is guaranteed to be valid according to the specification * All top-level members are supported (data, included, meta, errors...) * Structs can be used or interfaces can also be implemented diff --git a/error.go b/error.go index a396d13..38cac4a 100644 --- a/error.go +++ b/error.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" ) -// Error represents an error object from the JSON API specification. +// Error represents an error object from the JSON:API specification. type Error struct { ID string `json:"id"` Code string `json:"code"` From 11096d0ced30a6b826dcd268e1e33fe8199aedc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 28 Apr 2019 11:00:00 -0400 Subject: [PATCH 042/406] Make sure map is not nil in AddAttr and AddRel --- type.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/type.go b/type.go index e44a11d..63a74b3 100644 --- a/type.go +++ b/type.go @@ -30,6 +30,9 @@ func (t *Type) AddAttr(attr Attr) error { } } + if t.Attrs == nil { + t.Attrs = map[string]Attr{} + } t.Attrs[attr.Name] = attr return nil @@ -63,6 +66,9 @@ func (t *Type) AddRel(rel Rel) error { } } + if t.Rels == nil { + t.Rels = map[string]Rel{} + } t.Rels[rel.Name] = rel return nil From ad29ac22e8cdfcdb5d2ebcb704ae2235777cf79f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 28 Apr 2019 12:08:54 -0400 Subject: [PATCH 043/406] Add Go versions to Travis and enable modules --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eb93f27..5c55b2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1 +1,7 @@ -language: go \ No newline at end of file +language: go +go: + - 1.11.x + - 1.12.x + +env: + - GO111MODULE=on From 8cc480cf26a9f78fbb0f7b59dad46f2ba35ce66f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 28 Apr 2019 16:02:42 -0400 Subject: [PATCH 044/406] Improve indendation in LICENSE.txt --- LICENSE.txt | 388 ++++++++++++++++++++++++++-------------------------- 1 file changed, 194 insertions(+), 194 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index c3f5b52..228f9b3 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,16 +1,16 @@ -GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 -Copyright (C) 2007 Free Software Foundation, Inc. -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. - Preamble + Preamble -The GNU General Public License is a free, copyleft license for + The GNU General Public License is a free, copyleft license for software and other kinds of works. -The licenses for most software and other practical works are designed + The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free @@ -19,35 +19,35 @@ GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. -When we speak of free software, we are referring to freedom, not + When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. -To protect your rights, we need to prevent others from denying you + To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. -For example, if you distribute copies of such a program, whether + For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. -Developers that use the GNU GPL protect your rights with two steps: + Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. -For the developers' and authors' protection, the GPL clearly explains + For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. -Some devices are designed to deny users access to install or run + Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic @@ -58,49 +58,49 @@ products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. -Finally, every program is threatened constantly by software patents. + Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. -The precise terms and conditions for copying, distribution and + The precise terms and conditions for copying, distribution and modification follow. - TERMS AND CONDITIONS + TERMS AND CONDITIONS -0. Definitions. + 0. Definitions. -"This License" refers to version 3 of the GNU General Public License. + "This License" refers to version 3 of the GNU General Public License. -"Copyright" also means copyright-like laws that apply to other kinds of + "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. -"The Program" refers to any copyrightable work licensed under this + "The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. -To "modify" a work means to copy from or adapt all or part of the work + To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work. -A "covered work" means either the unmodified Program or a work based + A "covered work" means either the unmodified Program or a work based on the Program. -To "propagate" a work means to do anything with it that, without + To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. -To "convey" a work means any kind of propagation that enables other + To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. -An interactive user interface displays "Appropriate Legal Notices" + An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the @@ -109,18 +109,18 @@ work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. -1. Source Code. + 1. Source Code. -The "source code" for a work means the preferred form of the work + The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work. -A "Standard Interface" means an interface that either is an official + A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. -The "System Libraries" of an executable work include anything, other + The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that @@ -131,7 +131,7 @@ implementation is available to the public in source code form. A (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. -The "Corresponding Source" for a work in object code form means all + The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's @@ -144,16 +144,16 @@ linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. -The Corresponding Source need not include anything that users + The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. -The Corresponding Source for a work in source code form is that + The Corresponding Source for a work in source code form is that same work. -2. Basic Permissions. + 2. Basic Permissions. -All rights granted under this License are granted for the term of + All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a @@ -161,7 +161,7 @@ covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. -You may make, run and propagate covered works that you do not + You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you @@ -172,19 +172,19 @@ for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. -Conveying under any other circumstances is permitted solely under + Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. -3. Protecting Users' Legal Rights From Anti-Circumvention Law. + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. -No covered work shall be deemed part of an effective technological + No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. -When you convey a covered work, you waive any legal power to forbid + When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or @@ -192,9 +192,9 @@ modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. -4. Conveying Verbatim Copies. + 4. Conveying Verbatim Copies. -You may convey verbatim copies of the Program's source code as you + You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any @@ -202,37 +202,37 @@ non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. -You may charge any price or no price for each copy that you convey, + You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. -5. Conveying Modified Source Versions. + 5. Conveying Modified Source Versions. -You may convey a work based on the Program, or the modifications to + You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: -a) The work must carry prominent notices stating that you modified -it, and giving a relevant date. + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. -b) The work must carry prominent notices stating that it is -released under this License and any conditions added under section -7. This requirement modifies the requirement in section 4 to -"keep intact all notices". + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". -c) You must license the entire work, as a whole, under this -License to anyone who comes into possession of a copy. This -License will therefore apply, along with any applicable section 7 -additional terms, to the whole of the work, and all its parts, -regardless of how they are packaged. This License gives no -permission to license the work in any other way, but it does not -invalidate such permission if you have separately received it. + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. -d) If the work has interactive user interfaces, each must display -Appropriate Legal Notices; however, if the Program has interactive -interfaces that do not display Appropriate Legal Notices, your -work need not make them do so. + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. -A compilation of a covered work with other separate and independent + A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an @@ -242,59 +242,59 @@ beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. -6. Conveying Non-Source Forms. + 6. Conveying Non-Source Forms. -You may convey a covered work in object code form under the terms + You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: -a) Convey the object code in, or embodied in, a physical product -(including a physical distribution medium), accompanied by the -Corresponding Source fixed on a durable physical medium -customarily used for software interchange. - -b) Convey the object code in, or embodied in, a physical product -(including a physical distribution medium), accompanied by a -written offer, valid for at least three years and valid for as -long as you offer spare parts or customer support for that product -model, to give anyone who possesses the object code either (1) a -copy of the Corresponding Source for all the software in the -product that is covered by this License, on a durable physical -medium customarily used for software interchange, for a price no -more than your reasonable cost of physically performing this -conveying of source, or (2) access to copy the -Corresponding Source from a network server at no charge. - -c) Convey individual copies of the object code with a copy of the -written offer to provide the Corresponding Source. This -alternative is allowed only occasionally and noncommercially, and -only if you received the object code with such an offer, in accord -with subsection 6b. - -d) Convey the object code by offering access from a designated -place (gratis or for a charge), and offer equivalent access to the -Corresponding Source in the same way through the same place at no -further charge. You need not require recipients to copy the -Corresponding Source along with the object code. If the place to -copy the object code is a network server, the Corresponding Source -may be on a different server (operated by you or a third party) -that supports equivalent copying facilities, provided you maintain -clear directions next to the object code saying where to find the -Corresponding Source. Regardless of what server hosts the -Corresponding Source, you remain obligated to ensure that it is -available for as long as needed to satisfy these requirements. - -e) Convey the object code using peer-to-peer transmission, provided -you inform other peers where the object code and Corresponding -Source of the work are being offered to the general public at no -charge under subsection 6d. - -A separable portion of the object code, whose source code is excluded + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. -A "User Product" is either (1) a "consumer product", which means any + A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, @@ -307,7 +307,7 @@ is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. -"Installation Information" for a User Product means any methods, + "Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must @@ -315,7 +315,7 @@ suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. -If you convey an object code work under this section in, or with, or + If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a @@ -326,7 +326,7 @@ if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). -The requirement to provide Installation Information does not include a + The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a @@ -334,15 +334,15 @@ network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. -Corresponding Source conveyed, and Installation Information provided, + Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. -7. Additional Terms. + 7. Additional Terms. -"Additional permissions" are terms that supplement the terms of this + "Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent @@ -351,41 +351,41 @@ apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. -When you convey a copy of a covered work, you may at your option + When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. -Notwithstanding any other provision of this License, for material you + Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: -a) Disclaiming warranty or limiting liability differently from the -terms of sections 15 and 16 of this License; or + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or -b) Requiring preservation of specified reasonable legal notices or -author attributions in that material or in the Appropriate Legal -Notices displayed by works containing it; or + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or -c) Prohibiting misrepresentation of the origin of that material, or -requiring that modified versions of such material be marked in -reasonable ways as different from the original version; or + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or -d) Limiting the use for publicity purposes of names of licensors or -authors of the material; or + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or -e) Declining to grant rights under trademark law for use of some -trade names, trademarks, or service marks; or + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or -f) Requiring indemnification of licensors and authors of that -material by anyone who conveys the material (or modified versions of -it) with contractual assumptions of liability to the recipient, for -any liability that these contractual assumptions directly impose on -those licensors and authors. + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. -All other non-permissive additional terms are considered "further + All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further @@ -395,46 +395,46 @@ License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. -If you add terms to a covered work in accord with this section, you + If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. -Additional terms, permissive or non-permissive, may be stated in the + Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. -8. Termination. + 8. Termination. -You may not propagate or modify a covered work except as expressly + You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). -However, if you cease all violation of this License, then your + However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. -Moreover, your license from a particular copyright holder is + Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. -Termination of your rights under this section does not terminate the + Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. -9. Acceptance Not Required for Having Copies. + 9. Acceptance Not Required for Having Copies. -You are not required to accept this License in order to receive or + You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, @@ -443,14 +443,14 @@ modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. -10. Automatic Licensing of Downstream Recipients. + 10. Automatic Licensing of Downstream Recipients. -Each time you convey a covered work, the recipient automatically + Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. -An "entity transaction" is a transaction transferring control of an + An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that @@ -460,7 +460,7 @@ give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. -You may not impose any further restrictions on the exercise of the + You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation @@ -468,13 +468,13 @@ rights granted under this License, and you may not initiate litigation any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. -11. Patents. + 11. Patents. -A "contributor" is a copyright holder who authorizes use under this + A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version". -A contributor's "essential patent claims" are all patent claims + A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, @@ -484,19 +484,19 @@ purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. -Each contributor grants you a non-exclusive, worldwide, royalty-free + Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. -In the following three paragraphs, a "patent license" is any express + In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. -If you convey a covered work, knowingly relying on a patent license, + If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, @@ -510,7 +510,7 @@ covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. -If, pursuant to or in connection with a single transaction or + If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify @@ -518,7 +518,7 @@ or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. -A patent license is "discriminatory" if it does not include within + A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered @@ -533,13 +533,13 @@ for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. -Nothing in this License shall be construed as excluding or limiting + Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. -12. No Surrender of Others' Freedom. + 12. No Surrender of Others' Freedom. -If conditions are imposed on you (whether by court order, agreement or + If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this @@ -549,9 +549,9 @@ to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. -13. Use with the GNU Affero General Public License. + 13. Use with the GNU Affero General Public License. -Notwithstanding any other provision of this License, you have + Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this @@ -560,14 +560,14 @@ but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. -14. Revised Versions of this License. + 14. Revised Versions of this License. -The Free Software Foundation may publish revised and/or new versions of + The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the + Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered @@ -576,19 +576,19 @@ Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. -If the Program specifies that a proxy can decide which future + If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. -Later license versions may give you additional or different + Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. -15. Disclaimer of Warranty. + 15. Disclaimer of Warranty. -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, @@ -597,9 +597,9 @@ PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. -16. Limitation of Liability. + 16. Limitation of Liability. -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE @@ -609,64 +609,64 @@ PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -17. Interpretation of Sections 15 and 16. + 17. Interpretation of Sections 15 and 16. -If the disclaimer of warranty and limitation of liability provided + If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS -How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs -If you develop a new program, and you want it to be of the greatest + If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. -To do so, attach the following notices to the program. It is safest + To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - -Copyright (C) + + Copyright (C) -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program. If not, see . + You should have received a copy of the GNU General Public License + along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. -If the program does terminal interaction, make it output a short + If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - Copyright (C) -This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. -This is free software, and you are welcome to redistribute it -under certain conditions; type `show c' for details. + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an "about box". -You should also get your employer (if you work as a programmer) or school, + You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see . -The GNU General Public License does not permit incorporating your program + The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General From 44ea56c8f7b806cfc5119ee04378132b5f8f2c52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 28 Apr 2019 17:12:18 -0400 Subject: [PATCH 045/406] Rename StrictEqual to EqualStrict --- resource.go | 4 ++-- resource_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resource.go b/resource.go index 88cff76..2eb65b4 100644 --- a/resource.go +++ b/resource.go @@ -131,8 +131,8 @@ func Equal(r1, r2 Resource) bool { return true } -// StrictEqual is like Equal, but it also considers IDs. -func StrictEqual(r1, r2 Resource) bool { +// EqualStrict is like Equal, but it also considers IDs. +func EqualStrict(r1, r2 Resource) bool { if r1.GetID() != r2.GetID() { return false } diff --git a/resource_test.go b/resource_test.go index 4e0e2f7..a443949 100644 --- a/resource_test.go +++ b/resource_test.go @@ -98,7 +98,7 @@ func TestEqual(t *testing.T) { tchek.AreEqual(t, "compare same resource with itself", true, Equal(mt11, mt11)) tchek.AreEqual(t, "compare two identical resources", true, Equal(mt11, mt12)) - tchek.AreEqual(t, "compare two identical resources (different IDs)", false, StrictEqual(mt11, mt12)) + tchek.AreEqual(t, "compare two identical resources (different IDs)", false, EqualStrict(mt11, mt12)) tchek.AreEqual(t, "compare two different resources", false, Equal(mt11, mt13)) tchek.AreEqual(t, "compare resources of different types", false, Equal(mt11, mt21)) } From c9a4828cde5bdb2f57e16673c00a9f0344946d40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Fri, 3 May 2019 00:05:57 -0400 Subject: [PATCH 046/406] Improve logo --- logo.png | Bin 104510 -> 89257 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/logo.png b/logo.png index bb9dbc2e8f9d76ab131834284a786d5afeacbff3..aac24e818c2b7fb15f5799ec3ecc49ccc0b86ffd 100644 GIT binary patch delta 71058 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℞?Nv3j(+} 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 u!>isH+$oc%(=GoNGF`3v|Oyj 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

- +
diff --git a/logo.png b/assets/logo.png similarity index 100% rename from logo.png rename to assets/logo.png From c43b5460e47d78c6e19f1138f7738de17832c426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Wed, 11 Sep 2019 19:56:42 -0400 Subject: [PATCH 241/406] Update logo --- assets/logo.png | Bin 89257 -> 301639 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/logo.png b/assets/logo.png index aac24e818c2b7fb15f5799ec3ecc49ccc0b86ffd..25b5237903948f344c6097073f9339ac63953ea6 100644 GIT binary patch literal 301639 zcmeFYRa0F}*EPIxmyNq@oZ#;61cJM}1$TFcpuvON#v!;n!QI^*65L;|yXyM`-|^F{ z*2z5R?lGqH=&IRKN{Z4bhy;iL002c+MnVMufWZO)pufVyep-&dk`4g?)REq5TCOU_ z9%PQr4i?sS=47s3j^n$X zyjJpEZgEu2tSBNGunF0>mhZdG%3_d{>i7RLg~k9XAEZ_(?L=T6t^ z0lL4h_fp4mAD#^#ru?q@-|eA1URuWu@25Um8Xkw;eVJ}ewGW#8p1bUynwR#bexP-) zCx%_=_K^yEk`nd(Fnk+(-)LX!JZfl5j5ci_^-vc6`Pj7=mwXX>wS*Wz|1sukxRpDZ zdl+FT@x5XGo&;{sB9}Z#QFMm+F~W*6bcWK7)QR2e{4o zBPR}zW#_y%=2XT*%8}_PBbel9D9w6<2 zxjC))|M)VPaT>61I74lQgt&IuTW-)*(*1lH{0*=Rw&7oQrBMjE##LKE#Yo^UhzY znijnY1#jVF&6nhBI`1}zx5cFi^lY!+dy&}3dFI9&#`)IHT^MF9i&HhV-5M8`mW_u| zpj-6aH@-gz#uKZY6eWM-z56{k)v~`D$Gzb@R@J=WKRi|DSNLo@@Bd@HJ3iB|5XT_z zw(D7X-m`U)G>xTKR%1L;OGav-0wf{^H#p8MPe$(HdFu zAG-W8@@BeD)cz6>r~BAG!W(w^LE)^J|DwA8PSD&PwMv3!zlW3nP7s74r#KiUR3ywt z`8ykM?UvDga)V|=A5;7<;Bn#YUhLQT%y-W94BH>J_59dUS2KJEE0@{a!-5vb{HngT zo`J0QJNAOFn@k(dOEAczj2>M4=0iH-=JL)>M5hFM`_L)XZvC0w9;B92SaKj6Yj>q( z4b8~C3qUV*p$!A4qt8$Y33HhRsqcp6FMsalUCRyD%EY7W!q5|BjJo>QQ;9F}-Ypv{ zYvo^V`!M7TH3JNhBw~mVEo<{51}k*lv?3bEPo-*%=OJaEWKl0>aoT@dH0lI%CfO;& z821Rw*=x6=8WK?PkD*NK)TB@}UlMT85UiE@_`x-2ueKPWuH5VJAN(mDn4etyrOMnD z@835b6dGIC^_t0anW4G*rl(8Q*gm<=U*hJ+z^KC9WmByBM~+$xoq9j8RB)~9Gy*{mbrSai3(Cdv3Yc(zN&rl432Cr zlV{_8Sug5`B`Ix4yMz7wD%lfX#^KSVcv=mm!h{F`674WkpbK2BCp9-~V~b! zIwCMEMRsJ)10Qo4!7qyY3R)Eev}m^k2O@LxJYgq1ZlcNzu(^F?T`N%QmtLNj=Tf7Ad1k#N(xq)$4gK@w!c4hFZ4Tv6Vl>&&PE0pFc`&Dn zK?bru_6DM3G8?oy6)Ytn<+bKv0`+NQE_RSqWfB4U9^dkA=fNOjYcClSZ>$*cWsJIR zt+T0eBvFryaU`LIG>_BUzq<-*eo^do_*WJ`G#0Ih%2DV~`y*Tt%iQIk;t-muY$?|J z&t|r49?P<`oNsze=NfU6Kun6qx@wMU;T~?cL2P(Ogu2vZ?fO!yzS~6pWtn6dft4$T zuRlV<&_RK{&v|Ak*)tyR4>jn;G*ZNG9{Gzx_AAHfY#2lw*$&A8+|}}4aH4p&c+|)M zJ3_1B4Gi(JG&>XSIqEQ)Xy<)~?bd#&v#|x#5rSH%I|=m4jhVD^_cT#3I`&gQ97D*G zls0A%A%Y~F9o8XgN-(|L2#e)+)~G`}yB_k>LJR3^PWqMsZM0C{mW!5=cqr7&-r!my z>}(BaD zWvi5M9b{rgLV-8V&f2w3J49`y=%K9<)K z=*k4m@B=?5`o`E>>II@~> z8^{wd*;-G-0-u_B3VNd1{<&U<*ZAG;Fi-@0v7d*|2#{*zyiMrKzlBV=RJI?JM>1K|%w^?kv2S^hl^)%PqR z$7x8W5v(XM9kQE0yotIY(_W}L5p##$%(z4jQMT3Fj{jAnYlwJ?_@ZcKIyxyA#iWdL z*~G=|M!>egL0EmI#H(&4r+%R>FcxnGLi3>bYVO%l1yri19k14FQ(e*?zFtD&U|*@3g6l)P?-k?j4?YsK(h?!?9Sn%;<4J zYw2{>xQr`0Fx4cwQNrfFewp5CPqD|H7CAwF>2I&>OYUfmhc%} zc;a`0$_NymXRr12Dm5q*)Ac=HtecShV|5%wQOd{6`Wl7tmd8IL^Awl5OmL3)@^aK< zS5YK%N~x`ayl!{ZBKu;YW^QMLtB9f(%q`e3f$)BkLF^%yAXedt+R=vIEt-^&P^7qm zD#~Zca)`^Zo?Bj^p_pJu3|~8{6i%Qx3WHd`9GYAsz42RYJi9Cbc=jB58zv1=osg z*1i!&oV-H(J6C2&>dfbp-quOoKduAAAlU2CO5X2@1o3=S1vaYz`)1YUkgoc)Mn&Df z?xNb$9b1mUY$KKn-ywFDi5cT#M95pmET@-?Sx3*RDUc*@`EiKH=(&HJI=$aaD?h4Cn~8?{eJB-l^vdaAt>WQayVxUA;|2`8W=5M`_< z2Zz8bEW`dI77(O(dP4bKKayS^96_&vn?kztm#C{#wjIR`H<|`gf89RVtX+;|`NF(U z_y$`}mc`zVJfE3G$2o99dVt6$WuX8RIr0`cFXflOCIYo1)(&Z6H(zmI@zP^3uZ_A3 zq-G#49h1~DbHT=Dx6kb_Tj8rsqYaQ4r<{u`>dl7?A#Q|=FFU*NpQFrmIx6s3J9(3D>!(iTz{RSv_ zGONds3K}bKwpB@_-4Lg%*mi2hWXZLOXGFKTuu$uF4i|!*q>5)9f{waclZY>93_cF~ zE+SC9xS!j~effnrh48NXOM4YNiX(15Hah#U;jJa@I?-wiv%Qt6k3qKHzKg-8ZTaE!J4R94>`oi3Y15O3e74~;hBu@Kr1!THcr|AzGT zQm4hHF*fxp(a$c79Aaxh7R1@o?@Guu)LFg;xZh$5{~4t`k+Bcdfy&^d`zckw%TUBo!q9n+8;naHGz}3j!CCFGf71gIUrnwr5YM*AoNusg#^f{(!M@3KS{|fM5|oLrIhx+8$S()rPGVkbt}< zv40I2uvvuYT0`&!UWKkB*tj+QTXrDcnV*uVDvyu?S&*=i+ip@&M{x=`vyeE9h9CL% z+v8M4(AR%qB&C!r8hH68aX$pA5vZ5VUqvy~d#{$SR_6|x9PvdvLtx_iV23J-0+}wIab^Zh=ECTbfhKDj$hsTS z(-w1dUD%aqzzYhPTcVN)6tU18X;#nuK59o+c^Rju zKYx=tC+2A%3$XqnXnQ$N^&GE%TuB`I3({@8-g{q(C{=D=sdA7}&cfn1OxZp^OmMbM z#)~ojM@f|apuIoT+?rupD|$LHFwYTYJFDD6gVNqGIW8gOxG)h2gsE>e2UNU3Biy{0 zx?);Edo27Se>dHZTz()zk~7jzX|IpMPJjudHxK?gX(c?+@vLv9zRoZhxiA#O+kw`0 zGxs=1{5MfcqzLEB(!D#a8-*EJGIXAr8fVm-wHi4UjXT*!ETKzP=cU^!UT3wMPC@In zW#~9iZX}W}mYyrCLnQo`qhg&{g;$Yn#$3ok7*q6#Y>$@W{u?xFo<1}K?axM1T}Fqf zXAe(yikG{sS-}K;sCxN5vQI<w z&)?L^;ZxfUk?E+8)BJGq#LuC2pC_kuM?lY?4rtNuY9rlx{l{q{n8)P9sIFp*=Wi1t z<^gcuc1;V2C^uqK;QHN0bf)%gE&)U%9GJX4&x?9H#h;8CY6I~a1-lG4s|1zAX2twk zGXNVpHQPik4iM%)Hoqj+jV3%jAUOXwyF$q%T2qQH_pv zpdOkCv0RP$^))OW+`j(yxN|9d_->S;40(DL3+0ms6Jz^hrx_9DDWSpU-UY0xjO^@G zLanAcW|7EY@TQ0IXWwrPsM}!o8UfWx7u2?96WLbL&*X|bdy5cBtU3e;Z{|V7!a|33 z=|9`sXUX;>H;*~n;tviK?R|X)X=eC2QPDsW;puIbL!ao&#HVx4Gwg`fY`^zJ@7AH` zM?e;V(t_IMRTS@d;f~d~2Mp``se&N}^X$m>I@*!{Ah83tC zWqX@a=FDv5J;(#ER({7&9+b?Ic2O^a=P^+{ZxQ{9jwqqE14GBegHjBK?EHnVsc6;( zisH|2e#v|73$*lc(cnW)73c*Me>utwd72C07w$wAbs?B-gn2FvXlCM$Y=&i)lzqN= zn3HS{tatIaV&9qDWj>p-GY%y#rHf$Lb|W=LGJ+kZ7Wc_gn_>>AbQBLmVlgK|39G-E zhlsy^SuXWroQiRfxOdpZa@6uCL+-DM@|CDqCi768WVQ{%dl(I#DG`|ls3FX6;S2`< z28Kjk#&(7Ru)M|@j!Ea?cxY40{UVTRpd_K@xv-c!q?V1)9+6jrg5@{b*WGT%HNbxQ zf9zuWXz}2qT`&o9n_!FvKuMB)@O3Z|RF%?8_>1f6TfJ9Cm=V8_lyV;O$Q*c{(c{l0LZ9T}n~_K;5dfYgE5hk8VzwNzg*2YRu)N z{ZN$gmsZW{4J71tghTkM#SDVwrF~xBA!$;_)zZ zE_UHxSp%mYho%ou+A)FRS)n$v3}OUSKa*sOrWZMgeT!o5CFe7^zP%x}gBs~qi`RRg ze^<33m5GNSCi;(fx(x_R_Y!bqJ~nT(aMTTzmKOcwVaxBFK_((ADYdfel_L)1|MP>^ zrP+#z$rxC#_}p;8^KCM%;XDDY3}>TpslUr*#0IUUa67j_eyTz+odVCEE~Qmq1t=L z?QT~94C)jmkxhQ{s!f%lRRXvjngxur^aiun$fgySKy+WUqRLQQRP-m`As9cLN!wzX zYmeAcP7|ys*yz9wvV%wFn{UN}>*%@d~G+U0JszhwM%FQlWm>m{=ug^`jsM zf4_5E8Is`zSH4`J5=fV!*asJ6#elD$)Z+}$J>t)Vn!(cotfp1)g^ix}cq9!Q z1}Mp&W`vX=U>1K9XWAW1UDzvwHx}~5dxF%hsDV$DPFu8EjScUc&S!-QaTszIyNAGz z%9a)**V?1`F(4cu3hBHWt!DUqDHf94j9m}s%4_?Kf5I5%TD4$apweSU zpKDjKw7ExeC3-?DhGQ~j>2{6b9yy(V!1UXS(C4245{~5XP0Y5qnrcG+!JGQ|CZF>p zAf*j);jdJR^LL063pLzcKAtOnEm=Yr5Noj#f(|76$KT*~lT%&qTx+F#A!J>Ef&^$N zHw+Qri}br%#OF&8O~%~fEeyAo7-k;x08rUfiXLI{t8jR#gi1=-7Cx6J$k3HFW@p2q zaQI2oicJUMXcORMi7xJ>>0tmg0|4$=A6g?}E7Bpky$2J{{D zbxeHaXnXMRQGdr^WwRY+F#>)~QxR)WW`>xB>uQe|euSrkH=46;ORB0u zmkBFIFH~noIkxps-?QPQQX}8AL>l7Y`O+_EA|^D7CHC`yFpH79kD7`S(tUd%Xf=7Kup=+3%d@J_SyKzk{hwsv<_-AJl8{sqfC){ zjnjrl-8Q=@&89)FOTLz0kklnIox2r}pdYr6JNZxuf(ASm(U3vP_Z`JT-R#=+oNliuG;#%_mQ3~H;-2?qLd2lnoQ}{GGXDA=CMh*2 zqGG2ERY6dQ8BOl&lyhntqP#;Vh*q`7VKz95a%F_I_X7i%tWb&%WS}HTf0mv`MnRYJ zglUXh_)Vxj$YW-sg@$?rQM(i*i5eaUk?C&Sz?m1AYK^7cGlYA$#k~rap7Z(=8UJdd zFYYli<;?Lw4|(vmjg3e-zl!;FZSY&J{eTK7lJ~mJpvsA~?e0=V38hw@x2o*0Zrsfi6FMn?ItT-`N;DnCR*zHO}A zEUfg;NVr%2vjz}Em4vK2Dr_ttB(45>)N{fG14+|4+&96`*F4rl`#%=l7kQ59qXr=< z%BtcEf58ilAG;BN5HKGKXM0n~3FvtsqG0pq*WD{rx=J#K5OV1u zT^~z{{g9=6jNptSY7fsR1mb$i-s#ISrt*>nY!p`$IHg|vS*35V#A*X7G4>~qL*K3= zkQix8y4Yc~7*DKBY(QYUiS}BhyK9#j)&&)L9)$1HK`B(Uqf8d+RCds|@*#ceKwM`r z6XN(6=y*Cg!y69(vZ2wy85E2QRYJ+bxgdrJ)Gb& zVl^R$X$l_*+ZDKN8>ZF9H|s_1 z!P!J|rFF-!K>lx^L8-J9Wrz%v?y2p^O3FgB(Ho4JKWOZDgmhlw-ljaIcWOwy8>pZZ4$MZq$7LvtF0E*1G;SrMHU zOvH?DF8w21WEy$Gx?cWhouFzpfj9gvX(5%L#&ySTLcWS#TsTp}n-Abwl`c7sU>*Iu zxBJf5(X;QrVr?d#_Qgh_Uqty!jJFlw++3dq9F(l$SK4>#URJulU^8E*321m*Xwe2l zsxDB_VJpxefeY#E<*S%fByAFo*;CRVS?Am+lAiW=v2Zx=?jW~lCud9e8kw`sOQhz3!csHi z)0w?)=Qt7K=S5u1)dgGA21-TQm;Axdx`!#7vtHeJ@Cu zs|ePjB%}f>-OdHA3+GJDjyz2b+4#-Khlbix`#0T6_X87XZbx&};*^l*B5{x5-%ct& zy(OriY%-&Lo1z3Z?h1ku48voG-|dJGLx_?}LG3#oLB-EdSzSzFB`xFPpG3+H3tr&Z zKR=!p{2r7xEhS>7Z|Myk{lkjDoJcxcNxH>Rl?fh|mty~K%KdugTqo!)L;>v05Mr{b zC4fZBg`toj>3vvI-eG?oIwUvka-&CNtb+!xZQ;$TOMnp4)-ZV*O%R_~Z!6uflw#MZ zHCEdgt&t?93*yt14jS=2c7|iGSDPY``+Iy_jndew=tHk|=V%vo~sbzBT_Ir_PRG}poa=Vsl@$zF{LxM|*t-j) z#cu2SJMDqfC8HqNtn&8An2zI%D}$gBm94;*IZTt9KTc(Q(5_O^<$u}#q)==x?fItw zXSIGv`2Ll%*cC>VpzU{8^YqoHsn6FhVfOC2s5bhw~%H0sS# z0*8CY0OI;LUABf7TjArW!1w}H0_+_yR1uXLay6Br@Pi140YE(!5+E0d@ z_cn^SRVfR_5>71kU>}!N&hb}LO+(M2+WNStKfg6W>pW&Cn)6nurMnt#Bk&@RU1pd2 z`dcKE7ZfL4_>v1$SK`lb# z%7@)`TDw!mQAa|QH&_}lbgx|T!GUKj?Go3*QqwOxAt6EvF~g|Lta{PIME*R)9=0v~ z-4Jb8uppdjNA$P6NWO#MuM+WZf{rbcJd~}!woYv3c|_tzLwU!}PR=fN!7(9t&ESTY zqIBgi(#wVt)Q=0nmDbUc3zy%oLSuxDjUNM``-@lP?dJSU>({Q~wX6cYPn0VI3Fh41*=!0%!{mQGvjEtq-qs)M?A!k??%#foXQ7yo(vrk%56O zYZjg7(q3WdC>txzGi~j;xpIO6?<(ZMe7HB)H80Q)Ght8I~P zzKgPZGEv{_mCG~muU^hqQNUsrCW^GRy5)6<_o%jqUEG3=^&1fg$Az)-H_KQS!Cx#V ztp(RnTotB@>}DR@K}6g2K|60~J`fuPaIX>hU$x#){B+DF1( z+DLIi1wbkuCM8eQ{dGIwx?T4RKkp7TOrgk2%=ds;K#+c(LF2`h=~{Iz;N5at&f!^} z)95hy)EKUBjAUMis zy8r-86#xAYp2foMpGG)WSp`YBJp?3NZUpzzm<#}b3?M5Zs^+a|6qWvkD3ew0=3b;RlR#OyiBpP!_T@FRDwYu7+b#u z-sEVRUOZJ805Hwl0SrpoYE}N5NH0~NJNV#V1yED30I^Mf+$=q5Nvb!infK!@zZ;f; zv4L>MZD4nZFDs_^C_oOi?|>r2$3_lLYb?>#@680zq6E;4-2Cm0ooB4O+CMJN{IVrJ zhbz9TW7H>r;~KWk_as0qz|7fsw#eEh+eJ!!(1$rSn&4_IiBi@omM&7pKmrjEy;uO9 zmj{L#!b38W!Jb8W69dL|q}g1(BZ5@a7Y6XK)LGNtbW}xPA@)54xxRp~7dAw*??YO} zuFi@>T_N*O@=^r@fB z%XjsQ+sncYB&sZcj%)$rl^>i4J97U(dbqtq4EInO>kypib{wlt&5|Hs$tS++LGnLH zxDZg1|8ZLo7aOZq**M7ZReYfXKnsZn{2Kx;v5VEH-}+MU0s?`=7QN%heHJdXi2W?2(4r|N)@5Lf z@O+qSIiPP0ya9|6K_`on1SHo+Z!x$NfN>UB4W$KB4`6%IUg}62w6iFx_H^K$<4_1D zllk<4bE|zeW!UBJt_dU=M4Bn)=K_LI|AWd`7Mz%vD25mAWxJOhIRT{tDB8|0j~@BW ziU-3o`;v*%>sfP|2T{b3v_Mw$B@1j1sU?oXQw`8kS%3l9g6r*L7dz9a0F3GvWj1TP zOA2$pJG;6zA*Rj0U;u$LsiFS^qaW`qE-wB=29F4kQ>HAo6UU(QbfAvyg%4C#C&o=A z2oweE0c-$65(Bje)-~m)KjD9>)xnSO<+-WrVgdQR_RrYA*y_4mQgCWc&^=lXm`TRKs;H3`dN3fo zg(!nb6P!twwbQ~BtgT)Sr3K|G^wO}UwBUARrYk{UomtJu%*?&){NJ3@EJ~E04(UwE z%FLwqxf&DQh6Aue=M~wEf&3v8WC7+P!wm|GEbvC~J@91Wc0zpPYMd}dsK;#eI`J-G zEm#(sf}>7uUC0?0ltg^0+b0^~t_V(2cga759 zib3DUE3SOkKF(b9CcxMxAL=#=| z*wYw+5I{9`Rx*$|7xB!27(YNm-5h@!MSWh<5ofwo&2NL(iw_=Wa(uF2qUpbY?i~0J z@Udfqsi~krk2aW%%!>`Vbbr~Bi0`#%^+kn8)Mt#T4I*u8E53kfq3?1N2)enbyh>b8GnHXzVi zV0DFwJa!C-2VooG=$0~Y`0VbPw+ZVrO*-+Av7%60bgJCl(6`gUf)-WTN`o>@YCuyE zo>~|TC14(sWo2sm{8bZ;3_D0OOdN;OU7{8oO{H!J;6po32A5oB^AA3Ml}L*?Ihnx> z>_la0jvjFmv4{Ch9}EE)WDrS7V3d?#mQZho-~g=P%t(rS^Ku};ary!Ax4)sm*2RwM zKipiOVGbwLs6z}^L);=WF)TiHfEh;#M1>f+>p}$db*{>)tLH=x09HFUXx0Ef0Rjly z#z(iJz^8w&udnom#078coSbf*tlr7=2IMC87&Cqdt}5|7!q+1Z`az#TJqPlVtWh?PTlFZF$i{iN)E z@Tp`Gl9e>}8sHatB6D&1M`h#PRKp|xj663lFRx8(m(IXC^tL@<7-F34Wtt3)tWE7m z2&kXo9?-MgelJX4@Xfm>;H1;H%AiKLN8=N1TfL)*nCla(s;a6-%<-D!z5<{cG6C~* z52SXKfVMz8z&q0B7%9{vttB%?XP%>l#VagXi@dra704rc1VMcQ0=_naJw7V({;@4L zT4uKWy$0eReBML(^UL0{V2^^~e}#kllhHIdejy?Z)CIlHznW&gUYYLPZ z=CrWt9qGAilCZYE{&(|knzr5QM%X}n0s{J;NuXV2vGwv_jzI~HkQd0)2n!0jcgj4X0ld=SrBMHh>>&rDm6U%}k!kTv zn9sP5)KnQ)X&{A=;Y0Rm0uJqgUUBf30JBI1SKcn^JFzYUzDM7uJh7b)NQ0f7d?BRg zj;VjZtA;H)f$XXG&Id$gNpx5i5PW4&BdiIsm~FmNsBt>gl#~+FzK?WLp4vz+EDn>~ z$bs0tOY6DvEo8e2Ihrj>hk<9_si3oRq{(M5$j93=su6_F1rwhWvMH0conmT>8=e_kNI0iM-Ggi14ormb8_Yt*>f8yaL1 zVB-EOaXqkt60V5~ii$W@cg>OMq_E?{Eq$<9QS|Y4`WuHp(Fl<)ohqDB zb6u5*Eqi1GwCx3uGk5(&(lOh~F|B(yC(eN=f-RcIOQ+D1$)XWL>v1^-^hskd~eM;GA#q7K_h3TkS=PB`?ouh@`CS z>`I;^SZ7|JFGiP;weU00o-y-imCI_G6OBC>0~=w7 zw6tuE6q;_A2t?7L(SbZi`ATIsj-6(66_AiTM|qiyMDCLhH)53KYY1qa4~~<9rbGIt zdRJb;nrW8@Lq-9d8p)eU7Aw{cqDG7ZGEJ1Lc+iWt{y18;fQddCR@`6#3fLiw2Ou64 zc26I8)c%PudIS;%1^$2b_YXDng_x;xzcB3OA%07NjZ`BpVha z3m1Cb8^WY2a$piSpmTVnDmKDgNKBwhJ_K@!NeFuzEO~`|hRi-5+EGPde=vv8TR?Pb zstX?pc7Z^anG=Wihlht;T1;V9hC@_Ag+K` z-@rgIG3*`rJ*xV)izh4acsD%*|Ch!@r@n;0js(~)aU%r&L-gpnV#EGnv$3&}u?b%P z*U@#4V{;ZEV(_*ndb(!Cb324rTx4v$+kJk>KY=l|m$8^eTs-fqhCrn|{GfR6u(PnJ zMLY@PKo(@B5ox^26cz!kKBMB`x*7U-(wqTeZo`n7dx=v#lr1_mmu`I3n|3LGjX=^oc|7KTY_xqgNb$3{Y%o~ac}&|i z%~*NVwr&g@YG7u?ad9=4t)U^HhrcsMNm41klSDh|; zSr&-@&tO>648A9io*sY*Vgr=Hm}y4VXkZhrC|x-GS7xrj)zxlSfzCQc5UHZ#4>T|^; z@M17o8AQtlUI%JV4#-(h_sHB`$Q_39tyU4cQ=}RfqwTzcbm&f;0!_rb5ut%<1VD+D zPG1ZOI|`#F2ZOBn1&^fC$gDOv-v%aR0VBM^963dv7RRLw>xTC5=D+&xOy1O_Yt_Ub z2pQ#aZT;cT46XjAKKMr97r+U9KBco~+ktzV(Y|s1yb-1;b$y-zb|!cIU4kp2v)t1| z5JNU{sv!m~n*?%0o%Eud%-^^ySUCAFAM89DYMt7nCN6Nenh3PE?2Oz@2?=#Ouj?KT zRF-t@FMNK`>FRVgq!5f)*u$=zt2caM*`Qln@o^p}G(7g4jsUEm33id~lE|wvFntcd zajjcqJ$FxedAV_-r`7-}#36x*V%cswd^J=NtdS1%pr8;pVc<9vA5FoJicwYYrBlxo zq`jNH{datkG-k9Ja^E>)O!SM~KY#ux+a8cck9@!^D*MdjV5q;L1-?vwaxQKMY)hAt zk}CQ4v<+{h7&%e_vHtnQ1%y%SW?(ifwl4-J{(N*d`Gj&rls#uBTj3#-6XD^%^tICt z=NIr~p^u$*pJLwyi16}fV9y!krGONOTcU>Z+kc)vdmWWpo{wx8W-=wg{7|+6!r~a?S!5mF z+R{VHs7Bb&=H8{}&Da&roaU{Z8ktrEE!;6O)Hs;BnIfGLqEy=18QZppX|%^^v}ZBu z!?{~5-Sp2=MmLie4PuZvVHS^vjBzfH>0e;`3~>4b(5E#8kypYvQjAFqPp?dy79^7+o>U~G62URiMPr?LF&c}MAIl<8^xk-w z@zGjqjK;)ZjRRQ33(c1_f`Sf`#M6-w1=upG`PJMPigU}(oD3Y_iVfdQz;ZQZYHcj{ z&5pwU)Zngbs*6jF`(Ek5HGMJ^nG9{cTc6R|X*!P=6l8WJlk$CgZfnK+Vb&Tpj{m|D zr^gTcj17E?emFdNdU`7DSwMA#SNQsshOw zoRGG(Y+ihf#vtCVgUAZBx>8V3=$yfOt&CjnUG!YZ`GLk;dR4J>_K{pA>f`DkUv{dn zxXY*hDftW#wz($7d^L<{aZ6wg`!zSos0mkS(u-X%!0xsf{ z%g+-u$QelSWgNe24u@6PI1 z4J+}dZc7+uu;IU%mkQtMf;Jk6J(j*9hX7jrKOdA$@+K~oULbBk8YNfxg3jXrZ} zEH>A6v_*v-aE>!qnS5`EnyA8QB4qp&Bs>al(>oFKY;2s198MeF0K)Es) z0atx}eTBZMQK;L?L7x@%$awJKzHgvng}{f4M+|@xm;}0)5%f$C zJb{bU)UU%0NJQGnH)}+iGuY^RXXxfpY&gj1bQA+D_ke!maMg|+fUsQ1om)TqxFN(p z*+NNaNT}89b}SQauT>K%R}&FBow!7-?_sH+NMmHYo1~DPLkcoKO=!WI)Gs^hY5>Xv z6sG9+lFyj4hzy0TggnQ_*~T_T2HVNHp_>^S;Vm0zRXcu)It6cjO^>>|m7Y}%%)4Us zdEBMi+WPq71C-B{&Y!u=TR6=lq>)isTH}{7u974tB}eSv{AYa=JM3B<9t-xwn2vxD zC_5zqB*7gWE?RgE%t9DhSWtHPPtCrl9o&FVqz?~qg!|KSjsbCW z%g_=&mfqg~A|&<=V@9BLO@(1$p6QNmk52ENX;uhsmohRl+ctDMW_>yoB^;pl+rE64 zKJ<57{;^fB9Zs^rBSloo&$&~tV-Hb@yAHOW&EYt$RKHiFrs2*JZ= zDAbw!NrR>_MtfMmV0I3JKV)QCs;hn;O5N3r#V1>zH~rvYqw$eVnB(Y9PF!!RbuakR zKgntzyFv$nes{`!e@6Rk&^bdXJAFaDY|~g*-xOB7fHKZlY2xn0sVmo6A9Pm*OE7`T z=M>AMu#*EqY~U*h^L1Aw%$lIwq?2?E3yTG}l|>IrUMD;}*1KH34-O92{5>ujll|Wv zJbDW@{pvW?nAblnJJ%BMRB7{^<>C?(Fhmh_42b3Yk0w)Z@7+{rgS)t{hiSe)NIgF-1HDk8<)b*%9 z2VZuByZ8mL$Q1ONT)vmaXz+*MphAkGn>D0IhY^7fKwv1USQK?uA)UdIZ9q8K99jJf z9&vS^3O!kFjMDf~LQEgS>+(u*Q$RQDrX@S#3p-Kg!%E4Q$-NZ^a=qxUw|YxWmIgjA zM{?-U@RcXuaWH#ylD{*}qwRG{w{QHXLr;frEY2#@4GjjLo)HgmH0s)ZE!f!o=0E=3 zF0;@dEh>atpf*m9NC6$R(zt`(|@b^YG}XyN4p=n2jW$79rB0>+`^FCJ1@ZKhKB)y#ZLW zzHh4ohyS~+$R?4wt>kU;qj~1${96>0XrKxw33ORO(T1|E&tdA{{2HalB!LIZGV+ts zf?t)M=}t>ry&WKgGko%mfss*gg5r9VlZ{Q~&w=w6Wx*CD$ODoGar@Y~CgSltBVw{O zr_FA|9yyIKolJxkw?KuiK!?uQuH~~^!T4)DnkkqoHmZ(17FnG|jjm8@#e z8r|L9odcx1Te`a&1O%i(q@+Z;8>OT{x=R|Q;ko^Me-9Ubab08ExzGE&>fD=!VkttK zMwg4%8-zV!0hiDQ0DG&PHkTh!#^*EG^o<9Wr%>L_HP+4A6fd51m%dQ~7bGXC{oG3) zk*>AU9*$;&TFfL?$W1KxgyP<*4eah`~7czAG74R*?8c5|6~X}z=2!era`cyMB|OY zA-UPNC5G+fxL47j_IX8tVYS&I_$Om)>!YAy%JZM>A|gg{6b~|5EwoFwaarF4|gObPH|>MLIICJG=MvIbm8dC zGnV2e9}%ny3y*@}CiO!fANP3sB#K7N%AUSnYDk&*kzpW(j7jvYRzw6=O*!QhO#U%( zu|(KAV&voP3a`IZEMu)U1^!U^b_wtn-jDa_#ksOaNr*(T5%jzgBx4}m1&nBOI8=ZO z-rMe7abEjAO~Vl<3H(+}O-(JH`zeaF4UiCNDJK0L{)r#Ra8D(Ri}y9(xT9I>*--%1 zWa))?(gw*ETv+`RW+litm)FmZG9WZK6v-wm5??&M#V5cY3G~j)AQHO)iI@n1g{c`X z1)78B&&t1E+;DIZ_?(;lL3)8)$O@Hs{mQ`adwhItUSOh!xVb528XF8eZW00LIO)(x zK4(%3lW5TlURjK|-o#|n^dRh>7#kmdAx;|Zv$wN5jAp;Z7kkDJUXo^eWpb-#lw=8i-`4p3`Jo4$?&^KRg3R0ERy zW^HR-gi2f7#s+*&vo8^EK3}AMjbNmGlCqhr1LV#h(O&soACq!D96Z5Cc|#qJlD5#e z)eAZ}s~a=v)LD7dstBwQH_|Ec0a(K*IPb)1gcVvhev?N40I5dt=$! zM$SC~W0>_bVTW?6r(Mw}CY$(BIG)<~&BtDPj&4+2lfR1w+pa0G5-?HEa6TVZwdex>lkn`CSKiUJT#0>MHjp+)iGKM zZovOn;rSIG9HYyhM=nq2gqp~)a@bKSwBmnR$y7xQ_&i!IdQAp^s|;ELGV%X*3`1jIzAkH4Ji85tR^ zWBIcEBfj->ftAsnc-@A+aS>x4mgxBB64L^%v<~ID-RumRe7uFF4*thE z7b~YXs=4~z<poVya#lec{Fog5%m`;rVYa~F=e7!eYx3znsIj)Tb`&4l8vcYx;d@>&duUPu z^EHsNdwB2Ce{Y3Q(Y@xs!g%JjdXKd1Gx7#;(9F^tb%pOJ+bEG=u_bM2U5s$dlK@l5 zADisyD&wrY%Nv}%qzrJO;ho;N+sIA0_(T{M>u~uQP{95C+r{99Nhq->M+lC#>Q=v2YV-XtqLp1=nWjRm*)PB|IvA9L zt)ZgxlTsIr{7Go%y=1FJQpY`+v3K%n)6rcTbP(333AnftQpwBhYq`S%Mq!^%l0S!oLnpFI#35>9`lgmF2rGBH0+yW|A#cU z`xD=ez(nAD+9G*MU2OtErv@3~S*{>S_E$_BU>l>f5Yr4ry&tQSUw-e8 zG;b`NV9vRfNkk@7qA7Jq44C_RxeiSpDgsnRVWS|hG?qdH@kI-0)$gmL)0Te#UMbMh z3+0#I7gxmNImZ0}zsvzlC5mk~(?&+_ZbSCjy=eA-m1=BI2_|lUy9Y)S!`M4x@ zK!iLCD?ej_JKee1jdRTlC|OeOwD$42qi;l-8~|d~{UbJE;qw5BzuHo2%c(fEO>sv+ z@9@;#`mMQO2CkDh5ALfG?j2PMzMjA&+7tfDoe3e4Vu^jfCP{l9k`#y^biapLfKytQ z78l)XvUhiCj%+T8`11I8cef_PBN)t5{kX8OV1k?VR_f1^)Y(d~64`#7m2>h@N7Pb- zhAXdp%4hl_aw*5}u>cHhe8d@g|HM7b$79&Hy#W4MBGj%8kS8vEl74yLLK%85d1z4| zcXyQCyC`;o*AO~9_2IqsoWA>a2=&)^LLQBYLwTPDa7wLR?jI@Uc;B8Krl3k9hD6A{ z>zn-RSt?Vr+z0QJ?xA%T9sTmYE!Uqu-*_=IS2|mEWP^i~(~}w8sV&v{@Qv`#%{}Bv zZ=}_JtMOR?q=h-Tch_xFxYI8%@L8TTLWaAq z5|Ty(7KHtFIUs4BSM-YB|9m8=2MJzb;OiG`&70$5U#%6`ELnbbC zb1Fc_C$%joy*-EUVBzV}n|mqeD_ADDmm+`+Vgu}(7;}y0yH?8P^WT(wf$rEE#eEP6 zUC)C<>5NQ$0-wuMAU}c>MXQ;`h6Jk#Zb9-$A#5Dr=akAM?|7To+iF8gCs@|)X(u-7 zQup5bdcMg{pos_dlB42PvDbz~a3hPFXacPDG34fUi%VIR8TbjQ$H#27v9j9CmL6q& zv)njxeq^_Io2c^GQ4-KzcSqa=E7YLda@I|t z%C6?XOm?-$J!wrHQji`M#tOO8Z0A^xNwsFr7PB-uEA8y`%$}cnZb;K)I zRu*x`b;9V-0EQBuj?k%|9ysOql+6B&I%ehSxr9&miDyvod}eonDwSHp8aff@djGbf zwTj`z)ye5Z8@L`5@kvQ!Nfdr>O#scdbYq8fTCyKq`AYs15Z%dPch#3Gh@i3Qz8yrL zCmyH*u7>hFY0qRiI{?t+WYWMpaNq&dm%v$tU?G*H6h#q%N5HC27kZU+i)Oc2OE5X; zmxD*`x6TMaINbgQhV1P*CopK4@Za$ye|`hp)i*+3JA4xgRu{uu|0Ats`0C8GJLubz z2d3-CS@A>U*Drcfs~&a8=VspsgL9oiRdTx99N^u+I>6JfA5v~LpH$cauoy$BQ4Arg zF4AKu()mdVB$R~_V#%NBVHwwcIodWgH14OvqoMxh-`vKC!o}fO#io=em9e=#IevBI zVQZ?5O|{-VYe?NY>z}UI(OVJwVBxV|KbB3Q;|Kk^Jmhwe6f$@-Httk)4x;}3azjCJ zZ$CP!6e!jIc-#SEK|{3O#ectqK6Kuhe^;7GOwzk}wfCO`Tpoyd+RWZXiyeeon;rE?o$;@<0s~R7Zka7 zy}|GlSd*kzIKJ@3a6mYMmZm_5?|ODvx8h)KYl)+pn>*B}n$y##nm2H8iMp_0*W2Qt zYmJLYhwC~l4UhQE%?~+-p|k7|*nsSf2adUIal^xu%_HFfSV*k4b=kqksIuRH| zsRDCo(vveoHb(=%r213!#^3Df!75(jzVl*@Oh|bVj0K8<0H@or=h+tLl=COeY4R)A zX0_V--93lzMpvv+g2puJr5ha{B_dDoCB{+$&&N5Q^L~x`=9?bc_b-yPz^IJnQvvTt zXevrCm;{AMYdzJ}*I$aFb)U;o{~lt;1B7k_keYY?(7P0*fcUgD;UOYjUNV-=MxJ-R zJjlN9Ymj{(7)WTg9V&Ze-MaIz<{D5@HO28z-bw3 zrjuo5XFmjxt{CS7{>0lbF{4U`HKtH!tdzR2tJ{a%vl+kdeu9jZz7TsLHfQ7K3D>U{ zj9hYVN17+gAH3S8Lt@mGZGTJqZ$3GBZFHOt)#;zZRQ_4l*wgrt&&?7N|$%kA#SMV_81Ts$n8JhT|ebc04B zkNlHYPF)*z?VDe=0Q`N`H;V$~Rd59>F_SiplQB3TYbZ9Bq3e^O9W>M*QeePBo}W}O zUOanZ<`aObny=rDVC;v2DI7>-J7dZpjg;FQH?X7p_|(*e zC3QEf4Bd@7RP4BHWxNtZ~Z@x5f|J z09QQ2=dMbB`R(-}Ls3=-TA25GcWd3Bdo*))@keGn@6f&0^-o(6WNC+zQD3=#z|~)> zTD77h5RvQndVe=g31W&w`bmf9X5(eLygh9v6g>}fmTiDZKz`?nP316tv!W;Ax#}6+9jP+m7>peLv)XOp5hjWg)&< zDMi)%ht;BEeIlA%1>3=achbSb(+*0SOEgq9ZyX`$)QQBK!xwsY$6Jk@fTMllE$KwhA$@JpyE0TzVwlH5rD{x9tG|r>0VB%o%D7JGCo+*0+K@ z$(~1$Ul3LEvt+Ay;$hGvDi6P>)w7hv#k(d1IUg#V<8!`vWwEQ}FQr3Wz$g9%M;ly! z6L>vm=Hh{nZU!&@Q)lS2IiN9I=T06PH07$Z~2T_r@o9C(1!bJyD zs|uvy!0_06(U7}SKuJ6(INmtua;_p}Ho^OrMjHey8n;s|u^W=_dzycB=ACr%#M*ro zkB+$xprVn_G`II`)%<4vEGGb(6l_Q+{*>?2f=L5zl$jhX)=iW*Rt9qSz=JK<536YT*=aGau1fJ+%uGA zPzC6S{se;Jhh z%cY6vE~0#$3phU$KAJekB#EWbd2N^PJs_Xf@Y!nuS~i9rrv#kZP9Uq7s%tT@x?muj z!$swfPeALA*l5BIHC{s-hW~^Gqb9Dh!&?kHD)!nUT%QY ztP5cs({E{fG=8nZu4@8v_wK*YY~)^o`jt5vVDR1V^87x=xVRHaR7%|Va+J7Uy;R+I z%u70yQm!5@4g%IPZsb1T0!}Lb#J?ec2q*Xy)vYI`9{fuW*bhtSc~>8yVNLLUO*_B; zDJiEvwRErcdn-Iv&-;c@*K)Xns*lY%ZO#?HUvGb{cy3_`^Z@j8od1sTl(&fx+Sm*7 z@RD@@$xwifeL+QLWsOAqdfVz1(PQ7K56<8aQeAU<$n_Y_S3D)pfbpn!+VmqBmQ$mR+vuk z-P-L#4?r|1+N=FE063d9(kV|7PiQ!ODP z0DR)iAkYmVWKX=OeFS9Q#GE+AY#pi|H)pGJxqbG)OV8(%QnvY0TDr!v8KflTq&ZMv zFi4-xt}FgHCWETKgud;HRsD%{h|#H?2;h+jPF)9f0K~y*eP1%98V4K>WN|IaU^yu% z){d^pHVj>JlPYoCh+$diCtwZ=bH}mz@30GVCbj6*>yXq1m7KqWs;;Tae!1-}&OgTzj;TEJZfQDI z{7Gn?n&F*-4?0lg$!AnVr$?%fp3G%l5mSA3+m(~G3dlpwmEBib?8@qx_X?V?DP!9X z&^GRks_sBrYUF!wgFWPdB>@hH9$4g5J0OXI0uPp`A_{vOnOg-pmR%;yA9t;v;U_Tn zPfxlp^)0_tM1=*v#UK&53Vr@!&&AxFcL28Gswrt|@+!9d`NABo!;PasW&G7d7pdzh z#h%Z4g=3KBa%_M@3M8*B`^lz%ih5#*{vti}Igd#rf+PR2xNGZq$k?QSH!iKH#8OtF z+!~XZ?>qc^mAy>M`bBpk(hmH7TAM4`_=)R*GCi+hJVua7j~eFNcPzVqJQQ`i?659< z1>d9>7*uWeh*bEn(03%;auFq1HO|pM!LQJ4!Ew^jvW^!6D5@vRBM3<%69}p&7JGSN zGbB;&0`dY_j(>;prYkC{aVZtbgHRGGksD0?qH0G?2FT8T>zZG?JF8Feq zL6mN|sHFHsl(9sjWX70Oi0^UfeyMu$`!1Uqt)6OqN&@(c_p{Atlx)5&2JHlKBdTou>K+}fh7+AgCnoAHPMHf z?Q&xdJ0vv8CH`7?_i27aJRibW;fYIG@X~DBcfHdf@v}dPxvL?mcVTNA10`+AH z>@H-QitBH;SR-q$(*ybl$FmXW4g)In;Bftz)fkMR3E6yrmMEl46e=;{@3eDfxb+D( zUQFH?^>_&K)H^LogePyuT2^o)Pheiz7ERi4ed4c6jxd#LIDs)~*D-}@Del%?w|hA7 z`=K*VWXcNRTRLz|?0aKOV6vh6^lRoQI`W5uVIWgf=r~NlpDJB}S+R60_1xRF9aetp z+?eF~o-LO0{upv{K-dwC<&1gveZ? zARw&RN3eBKg)gwBPBR!Y)j3Rp^Pd;mLIUH>YSycstAfz74BSytqgK~buML`AsQ13=4}Kd6quS(&fTf$&u@B4LNX-1}#sjf3+*fjg z<`zpDw}IU!8Bsp_F$B#=A*DW#cLemfjQ!?3jU?hIA*RDtwpYv3K?>!9z*%C%uM}m( zMR~o77^$eLs@lu7L#9BlZ-m77nfy$W=Hj)$($wSO!|LF`UbU%Ngb`(sl9yGsjZ(=MC`Z&(FEr0*u*1(*Xk2p*i$ZKD$`|zu4G0L_+ZlRkd*v`%1jx~ z0QblunM;PLgBdIO0a@|PX>4?f^=1}vuR z6^=#n?)Z|nm}Mz6s5om2?o}HPesp_RXS)LP6|Bc)#FH6vn=!bNL&cUp9Xt2t<2X!i8*>u+D2j0XB$3U z@fF_tYW%ZslAd@dz>stDQgZX0?l=oqylja=>j=Ye5p9G3!*$Jkf?en%WqSO?LOg-Q z_b>=EzM|-B_X6%u2df!J|1jh$bC%M*p+vMJCsum8UamXC`1KO+^hyd;`>VyY&YL;UE&;u03Y|s}=3{J97zW*Iw%7 zbA-90>eX}E`K3JA+(Zd7ZbWf%(Bv_XuP~3yp9JD^<2t`4BHn7hpZqfW)u|rg8P%|K9~jGMwn`ar#R}ObhCrPvawN5w$^C7(X}DSbJiPgkJ4NBJ_Tgy~3U$EA#fJgr+R%7i$bcd|@( zbfr`84!_it6Y&<2uR2J|q>};y2aO(Z_zZQwNj!)~69dV2>X^+=`7lBDcmB4K7M|Qv zZF(|}M1TA|T^?grcePG0WZ-8~VBY|CB;!OoZ<2_vl8Dwgks&*|!-+F|wk2UMP~CaYouiCY}(>7|-gTg@V-5VKE6k*1?1=7eAg18VB*>_M|C z0~XasSDTmBW7y9i`|C?m(oR_Q%tGBYap2Ley&!_4R$KB$1A6ozc8=ABymOq;rXK%~oSsz2Yp=-)b{9pFYE~IKz|4 zuq3XOoYh~=U%%;19^t96UWt|7MzP%92zq>t3ympDuqEOMGyjh{F=StFes1oW9lD*53av)O5}b9(fRRV^ zpZhD6Fr@qDvT34SdAbe^Si6k)RsSPuKX(%I)n9?9`Cp6sJ`E^%I0F)sb`?H^> zJ=bnGW?G@vdxNlh?d9^f)zZNIuiadYfdm6#u^JO+I;(m)zjs~|l=_P;>4B^ea^e?b zkV`t);DZ8nmA8<3wI;(>>5=vH{CtzR!rk#Z=U)o+^l1!yi9;TOESuWS%i@qoVxkdK z2sXX3@k`mR+*x8H?ibs`=fkc7K}L_LM5WjWN#W&(VYhgdUHL)t(RRPq4=K?B)(v{h zM{@RDw23^p+@ENESor3qUA%+VeqkgcnV_~?GVoYzx$>|Co=SEl0u7j zOc;dM(Awu?%~HDSyXwX|Z&KjrD3IGJ54z-( zI8yzM_XI%5uuh_X`4rtb zuRBi>Fd1!DmwlxbDDZ*|xRhrYgSF7Q$COa;q8QUnfC9YT0*4?SFRYxa`{JS-s$jkBZ#(Mq*&W zB2S`RVu6_Nv+{qiY_sZJCA@53r&gg>Jrg}d!9;Ypvy48n==zrkAMF~92oKK=jU~J@k>Z`@A%VvM&O5)4 z2{`f?VRTw`iG6T?!;*ElB>V(?V1ww4ViBg2WQ@{fn)SSQ%X3aJg`cwmm-nq;iL+_s zJPGnz$~m-DWGRL$r4@CCbed}|`C|T_qkN$K5IQqI%&-#jHeadk1Ry%LpLHSEXEY6^4O7_88#9ieNY_( zFbzMaqyIogesJPJJAaTEHpY_}6)Z7R27QK>Ym&$emX^&C-}?zPn~lggb+{mtHSfZB zstgqb@SM}mw_|4xowi(l%l#vW304C4n{shE3S)(8)kV1OmYiR8Me>>VzHW@-#l=WF z#_ljsZuy`La73m_6=PYr5uMPBM2bNBdHTS60Iaz);gbO)@U8`SuczmEEd}A;Lfg6Qw%k0DC+y z8*6`d;&C<@*j29FKd>u4X^oFpW*14JMZ{)*OFuyTE47Gh!3uKms6>;VII!ub^6urp zoSp5LUjq1|rgVw%>6%SB4A!Dhvip9-ujz7pWWw72n_R=L3DHFYr8K1=yIB@M!0JVU zhcG3+Wl`lWa#3#a=dCm(bs!G{Z@shHbLz*Sl?$Yz7$b>)XD=#E(>{S|z;0!y8ac0* zE1t07m5nB}d<772M(&ICGHwz!lIq3q*fFE8=m(S~qW>O@l?<_jcVkKbvuF3`04^iWL%XaD%!YYe3`+{c{|6@OsqZm>3_^kGJS-X>RZ&Bb( zzD4i5)ramo<_2=mY1?mKQakyarnevc98<#kIYW%R#WyO&=Rk)4%NVKh^GkwXKe}2d+1`EG4 zi39*tev*CC<&l|k{eQlE<$HP)3ho12e0alAj;JmOm`>h#H=knW(YIK;J%pL29UR}v zL*El;*vwb~G)t(#jclT;Hsf!jW?Y_;RJe(jKyGu54ilNc>X0Qz*58wp@wE)tV;y)C z231+v-tCjwT(AgA z4sp1*rN*2~fSpGan`ZwX&PK-B(Fs-4YDnCr0MdtG8u$^O1}@<%>@aW-4J2PQ z=gZPZ;D$E3znaeJm{2IUDoKPr_813d)jU2Nr&X{h&_9wF=v1HYYY6&W9jtscXbqN@ zTmkw$C_gTHNCE|TeLbrxe@Te;Qc7=3WGR3y{^8Z29euW@A~kQ%Mf8vF!%?Lkc)((B zlyA;W%iaqo?Zid$oqomhHWC9PIyZw97l*&Z$uK)CQJ|@=F%7V3hNJkl{T}|DslBB=X=-obH@N?H)Yb#=Xj0Z6Xc4VWkM^lkfZu}e%GC?>WwLwY(@s#`83MD7YJ zn*)cekRAj8-QwDy(y&WB@7-Tow-cI)}KDO+BtAH`>MlqDneMZvY7S66kRDD7ak9# zu0G}D;28MFWF_Z~WJ=zZzVlLPeys!!*TITY;$W{7P?VFGrTMYOffbiY0>y7wyqpq`l%;Jk*|M7|hcvVb@}f%?R(`J=r0?9sTt9Qdq237kwrqQ0lKkc##6-~rqB>5Vb+`cZ87@piVHZ` z{cK7|euCb2zYy~uF1+qGwS&5Oox76AR!Q-_ml#)d@=wmfboEc^Ch7_jnH^T^iJAZ9p01B$sZ!v`$Q`hcC32qkylGLwX^|F12d3bxy zi#WY3hEd_X;i(ctn7I6rVW(+-J;(-zMoT;D3D2v5LXMC@Cdc0*ly((_u4Y(@JQ1ha zte94bN`xGgN^vmp;&w8OpPYev(sLah4@B`K9%ItXs=&P>c=<^Vv1=)H#1XFPvx<9e z(|*hKo(^5A6BCH?&G}nbnz&VgJK6 z;GtVlvBJoagk%%ux}|}T0&ssw3D9|pB{1vH({sfou&RZh^AMuLHk5wraIj-lY&|&i z33-S=XiFh*OY*dvjcP~1@wXMlD~=zKlxY4+`PU>_R9?cjTx*?|@B+U%%jVU)73fE! zh$b!RuM!p(o=8YcOoTUkUwhg?{*1U!usLI3 zT>?fl9UivGBM0ernL$t6AN^UnY!HsKsP4=nCV%wWJJEfQDf>@tAN(*iX9wZUwkpn^ zM`wN*VG&AIoG>1eR6X8Z@>-qvXF>rbwQ*KViOz2=3?9SY_JqzLL+}3<7KX4QhTK<5 zMqwzAU$s0uJY>*QKa)ZCowKSxgd+6eFc}LC)2_bon6YR37jiis<5qx2xMHLz>W$*6 z!9qF!zEFM3tZyByhXR@ zlSEH61fwdgG}!khYI@ue|LZodI;*>0EBPv+DR8SnIpEyqCx@3XT|X|Z_)bVfy`LI^9aymN-IMGjxvu50lueEE=<{eeEkuf(fdB4W7%^r%>U&?mXC`= zTp*nst4Tdt1NNICoGlpm(&bY0FfUBBtEVKphUXx+7K4-nUB{1Uhe?2pY*dj|01QpQ zUjTxX)6Z?i2{Ha}O03w*R6=YanUOhKqLYnGgQXWj9Y>aC><^hY5K{=nYj^8uosS`V z6US7@i^QbOCS}?A+>V791%DnNL;F=vpQm zJ{QSfY*Zc-B``O(gy~Y8kXJ>X;R>@G<$E`wq5JBQBZ%T+*0PZRyYjKR5y5tOs7;oV zlP`x2xvb2o`a6LT?Gi@{>*&V?-S`1=PB4F2CP2F?_CRN*11fwL!mqypj3SXmt0Hj1 z1Yq>gTvC7eqL9;akM`W98kEWEzdPT2|IN+CFypB&m9N?f6{slS4rNEl4D{|>x)f$%eA|1@^bnHTH`$Xz=0MPV}P}kcy^B2o=_5pl*N#y#*m|)gA3$*(Tnz8pVKJP zhJQ{F{ioS3k9iY*MQ)6>=IVTJ@GL-HN2MbsVs*} z?mrby=5!MlOBVRln=h$If!MdMJm~>)$Pp%Oti~`4>K*LwoPI5-;4fOBSbxx_+naZ8{S=aiLE|b7lrrzAI87kJ>cfHq zWD^4jk*a|}l={6;K-s`AwU>r&=LRM#7!U{noE2Jx7 zch6blO^^v=@tL!sOAl9|(PGn>q$(jdBT{O@inWzHOjIm~l``YeqJ>RU1O|dl^pK8^ zZIcTUC#9y6Kj^KP`g6PxsZ%0CB-G0J)9f$~EdG=|8GfNG5N0jV^I}u}AyqxBW=u=g z?)mlsBT<7++g6d5FZas^*F7Zz@lYYmD;b5STK6YFu`G^!?1w*ph>urg7swl8qmC@x zbN&~@$`o%5|B5{?e`TKf+PC%h?Kbk-;8IiWm{-s}+gj(7h|zD+P*YuidVBT@ajYL( zP=+^8e%o$9KnMuheb^8MMs}zB_cap0HLXm$HH6AFFsJ~|d7r*T=`OD;3^nfVx7$Zeo^yi&7FP#z!@I?39<7=KQF^-8*0jlwQViefkA&Db^Y4M5TRSMM`ib#8tKNr#bZ5)@81j{-P<2bA93^{AZ}c z(Wl!C;4hEX6I16AB(rKBoQ#t9Y1C8tQ+SJuQJGDyr4DeQ3$cYS8ZWDs=+TlUeTZHp_g)EHtp6JE5&i`dletDp z{O2i-91Ps!fvFuLM`iXb@ZO`63yAW0bWIL=#YOJ(j{D8 zn!@R_-^~w*=_coMcWj)pZJau-Ve)g;I?+&c;`!|9CmiGJ6BnVRM$H^0j>N5IPObpU z(xbVC!m>$X+JDsye)l~_Jy>FlZbTU_5=y6K2l!h6d#fgZqc!}_?M3~%=JD>gx$xsl zItsgT*xi$%R56do5Flz2FB0)mqJP|K0)~bH2Nvb~<@xq%Q;22-MygCowZoT`Yd&-h zbx=rJs98(oR%_-UW1o@IG`Tiis)GB)hCQqK{74kw$$l@vajUq{1%*JVJ?2YvzOF|= z@Wl}anBBS5EKzh(Rk`Ve`zv@FG@LcGDc`i<8|vdLZ{AW*MH`y z*YXqH%XyfekJbE08iN)r1`^|qrdHakD+0F_@+`4;} zr4*{a+Ln8VutE$WMV2~3czc z8q1QGQX;IMBF#bpE4zVbTEQ~CfoWt)8!=(`_Lo=wCtl$cxqc0WH0xHY$ikvs?@_L4 zpb}J68LX!INR1>tmyfzhVQH`E5i831((FDJqe#ry$MZmm76U7Mmdld!#yvlrLnzbr z-2R*ey<=7gA*st`NXr6D@W#?|{u6r&8Y%OpcC`v<1l3YrKUV^d6IuY@QoUvcj~Rne zWwFxq`mY6C#oZg1t)-?5(XK1y!|EhqStb5ywzIzA^B+RoLzZPtsa^(wr2jlT>C5}F zSrX6Fw=`(8w%mjU|AYPIo!UA+jy!As3OO&?PnaD?94u{TN}Ug>QMYp>H!Cwc^B1e~_EP2ggv>3{BJo9Wdn=3n)D_aAvWKX(awU)v=xy{ArRFmM0E@59*F_85bdyz##>^yf^< zdiEAQZzOQ53D$i?jMldv-~+*-b~fN^20;~aqP`rwaD|NrcyaL5$5>7d_G=`G*#d)d zc6Kd`9l}c@)o0Yu3UwI84?Mke^c_G5Un;)rl-QD!yRch3bxF8IdG8>12f3b zxH_zTOBu@dOCei*0(Imbm%7W&C1WEh?I_~@v~2wid`;@zUHefLLEU}44$_wn1rE-1iZV{U zV<;Qnk91Nq4Mt8J!}(&J3fEc7z4JuJJ&tr%nA@`MVsozY^%qALW7z@nPZ-fGVQj0nY=rXsDkUf$B62PlxjA!D$NTaJAM;L}SM zq`6viDM@qTa}K$v(}ic=30Odo8d^vCHA4VGi`Hj@!C|`+LYDViySf#y=@YlGkf6}R z=E|?>u(SkU%IsR^|3}kR#znPteFGJc2I=k?x?38NazI+??ru;@8tEPc91)O)p}VC; zy1S%X>fLzX=iBweogZhPz1RNNT4&5-&^V!4eq_^?iz`-`T0>udk%ztjPvNbP`2D^` zC?*6@qQ%VTj&OV~Kddo=NApDHYIqVtp#|fw=$2<4#x&e^MSG-+e{W*C#9>Ps5Q7Lx zR9KkEh*l68LDoRjenSv?A%QXR)0JB4F)OlBo@gTBe>{LEEol~#_B0zxN}NuOQ?_ZN za-3~leVFuo;&?7gqyvZ}$s772p{DY6!qX%qEzUmQ7k4Z<;CS(uI6IoG>+KVE?WaB< z=(Yai1g>$Bot8-TQ$d0m42soUhRMO`$SVZR9IK!nel16xq7Z$7msl6yRa-494Cfdn z;zC-&Q-T`oirY|p2-MqL;YC9}QR@N|$YhVAo>HV3hU8EpOa819D%uXEwn#Aset@9% z*9y>Y@=AnVWSx3yG8LCFgcj{ZHfrqh=~a_F)1h7rz{?=x1GhfbF2U*tC5qQdr#QyKP;EQq7fe&5g- zdq}j@?j#>IStH8U{_xToVS~l#R46hO+WyG$4^3DoQwM~U5h6YOB+CHYw0C4gVn=&@ zwMKnUn=ae0F2^&^kC&UUb4HNo$ZVrpy%~I|Pk5q>nB1K^ao$bwRL_?No+-v9V@4VG z8@*0d4GvPE(zRiF3fKwqvBW7^4}HlMRVvdH<$8Esd0`hW zTa{o*M4R(QosiES>l=wCHZPjgIk?-R&&4!=IU<2Vh06UxM*>SV|F^yxvBWQwewCJf`js#o+Ao>(6>kif||menr_X z@_OOlsi2Q-hav@4vftEZRI^pl&Rn@tSpd~({buOywC(y851A=70|JHMYgami zo;NzP*w>$sPIJFv9us;dM~{*q#1;JJUvZ9FS9kC*9zA|6+w~1-M*xr3o_3Mx)w<&9 z-`&p5o~?YEthNtw(T$5fb1`=IW+RD^R4p2RgKAf|=cK`!+TA2&9CapUbhi9mQU)t% zz-fDYOL>$BS*qqLJ1<|DEzIMDPzbNU^^-KDZE7dUP!3`h?X8n2JQ@kZ3kWqFtXX}} z^a6E>$roV_6taO4pj19+!%n$nTQ!U?RxMuglyD9WU5I<{14Ry^VtQ+ZWGJu6C)L4q z*ti(#x#cOAZxT6Z6ViAk=lM6-H&Ss`p1~NR%hMB17kJ_(OGq^Irf7l_y+V**h6+wO zlhonrOFGfbp**XO){bR)e`HH-BfRG5qJ7mpP2?c-M|4M>T<@m%^oE4ZYy+^+omKN? zv*acUsZ4iyg}-N`rav}%pL*Z}@mXNNuiDz*TI{@`@j1M^{qQMkR)!h7`?J$HtIQ}5 za0+GR=wHF(eJh%#bA{d7R*6?T|(4%r^PZvi!Rz{5HBajSpXFWTYsghX9zwUWNZRd=t zx}zdN2SuVKk%>Z*<~t|A{)XM}?~fb_Pnh0P2BjnwPGV_*KvU>St@MwO>`8?sGd^$T z=*YEA3zhiL8SozF4tu`hfc)Lzv(F9#DRJhbk)9T7pqTlbF&8&o`v8M9{Byuk z8IzUkGhpPm0}TnJMnI4Wm)W)LsRkCGnUuRZH^?3Uq%LQxC!gEFpUloF_Qt@^pC7Jp zT7!y9?1&#l#aU2Ram7sMs0W|EHzmI2vMSMME)IHUEmAa}Nnu1O$0>Bh+N)BFs-aDB z$YMq-E(?(-+lj^Ndk($Gs9KMtX`4N~HmgO9bN^Rh*6DMmpn2;xAaeDc%&<4W@Ad$9 ze`z;4V<5Tt(Advq0asCZm1uLPEj;Doc6O_TG1$O`dFWf!>&uq08AiN9^&Pti2BBuZ zSs(G1Ly=|DK}w)}sK2DgUP*VK?Vb-bHipn>}9%iPEV>y7059=)irP zeaM6+rC8YSB{Y>4Wyl%cI*;*4d~yGF?F#(1H%j|w8(q|P0ojFa4LyhS)Ni;eg7~bY zi@E!AgSza3&-!=(vW!l!dYu{jPo9ig=UFPX%NNEd-oP$X952%An11p6V(VrI{Mqxp zH!*v(IGkHMdjeej2fwZSTh+6rHRVEd?LAnMOgZ9M`mGi^^gj;{M7ER);+dHZ5rl*T zQMT78mEz`_Q&Eb~WtWqDrG^~Hq8nMYk1A3ft%$oUFK(<&(#A;%1ltX{6yER+w2YZo z0TgmxeXsQ*OUNM0rXsQ@FG{oufHG^*N1GBgVjIwPvcZAYyT$_OhIz4G$NeQCelvr~ zLBrQ;(qM_;od>dH3R&x+Pm|-7@2ul_u8o*C?}Uwb)-m6Y7OrU`qO3MoQQ)bHEaYhw z7^8a5e#`vw#*HjSc5~NmV@mWHa$s(9#P@Gh9u_7zLzuCl+U$WS?Xp>ExAPchWTY$3 z`b|;KU_Kw!sbxio#i5VHbaUQ5ypp3YMT^I5yh0Uo*)>Hwa|h*pS>P61BLAQ4F6->I zy%n{%mm}`I+4o^1EY39l4OPeX7RvXo zJ)3MTD*f-JHiloBo||=3#+7s8DhE?}V@4kr3Gd}?|E66=rI_YMGB)arKMknypgb*PLYkQaeG_>qF|Qw?FaC-S3-<5wNIC+_Y>3Sk>h zq;pHM4jCTw#gUR`eO32dX@zjpAxp&_GEO0Q?)?J)^Td5l5x!S)-s?R)+f%|5OL{n6rIgbp*1?1ueM$Kbv%AlvQQgQ zGUvwceU3glmP$t+kr8LpnJ<~DYu^y3YhM!wHYQ2{M+;AX{5mbLi~~PI$Efftu*_NxXc6I(Fe=4HpK4pAcHv`0*U}i5YN+qkQ;5aJ^VQ~{Uc2pRfawh zKzrvI74k1SMaJ6eoce0Ro1H14a-3-K8*ck6pWH>;a)XZ z5cvt;C|LsncY1)$V+ za@3<@*OX{Po4d9H$`J*{aYJ~Omt_jwtV2~1usrh3r89_|EWLSjv4CAp5L&H`c5<{4{kodirvPG zv_5QHMj6soRPwP<;zy}E>w)W`0#D%uWK_hC%0wQ3cN!zzhSH4(?z6{)F(Qr6x*fHf zJVHGK=YT@B9qq0+L=+M(EfT)tDRT7N?&lcs8)2uDXUG!3_}VRh0wLXo>lIb2cQC;@ z&;pBX(tPsU^!>L;uCLDbsS+bcV9I<~OoJGbJmna2T}}W7r6;`&683LTsGKgj zSd!325^Zf9_)o6>G-FaB0Y6?Z%cCEr!EO(<+0?JNoJ~hXSx)CtLs&7>DeF56>(5)x zeYc~*kMos*3=q&x+73=^8guc!#yeu5sT^cdhyupiPlP^(lI8fW>3xw#-`~hFi|BT> zVSwU@E34oHA8M?gmOmIef7OwbQS}#%Iw@?&v!X%Zd0ZKzir5{FHvs9n<0y@=oHF6G zSKVRVIe+{PDXSNb1u#VpA4wvQmuSh0;KMbXW3F$@@J}pg11#mqz1=W@R%0~M!>Qk( zUQ}jKntaNF4~0~-<*G5sbd&>lQsE5dA)eSbcLl2a`C3vRsP&s3%{;GCmedU=(daH4 z1-Q1$`?psmWghR@uRe7jUN7?Os{99rWk-oK)$@ha3o#0l2hF?3qfXpRr%sO~Fi45z zh@XBl9jq(+oBG$g>1km0uy zC)#7L`tpWK|Af0!m4$4L!uU|Rm`fsoVwL`AhnwgK!auuT-i!O1e`bVlTD(4nF0brScf&uv%ck&rB0D=1t?5B?%{1ikGII0--@!FqJd>D<$$lz=w(nHei3I zj+L8JA;C6AQnWgori< zv&6fyZf+)s$kPoy)iwnFR4YuWy+eMla7lfmMOZmt-)SS-h zpG@o-KT4>P2SNi_&{7aWLS#0R_wh{Cnu`Of9Aaod+y$w|eALHb@w!`(gR4_z&p+I$ zXz(Z9aSsBdckbli!@HZnn$gB6zc=9pcJUiJVsBKj7s%Qa7%mf>S6Ith1rzP`nkJWLBA7)4E!MQ z1KsfzQ99#6f3YtkUI-7zx7fV}#tN)Ta~xV+&ij6zdUBsMf-`byCK-Q~Bp2s!m+z7R zFI$(yJ`9vcnTT{9ctq#9?LBEJ@6UaL1}9eA;w#dZrN-}c%*z_dS2rf8WzB3!czWkG zGjwr%SBnnEdn}q6lx^kNEKP+3MJ1ic)pPx>UeG~}zd!3ob+@awpIa^5*Q13Y^}hul zX?V&+7rnw6%l>N$w$4gmYj9IQr?}qNP&{&e?C z_h%6yUa`gG82gxq%tCT_`M`#p7$Q>guD}I0rug8Wk(XJ&?K9^EIp)N=}6%{-wZj}lv00m z|A8~~j+2Ya3lnRbTRm4W+B*3@PuzmAHPjvtmMnGA=}W~zD&QQk`%)d4XxFDxn{*VqJ@bdl8>bU;6MN*m#1(HenE4BRb z%h_c673=CbaH)b%Ty-7mivJk+9H+|Ubcyq}+xRA2Mz8)x(yrF=8NZ$@=daI^(Hm8% z|G{2aXS}a?@*uNbh{y6aiJf>cJYvx3dviJgCYrN>M;s+`8N^vf^r?#UYgroXxG(|s zU5X`;VCuqr1g`U(M%Lh+%ZuATXG96mFQvGufZQTB-qK9;i{k(ZWCUC% zHg4szjL-YpLB^HKzx3J1FMA$xCyO@VGqcefm+CugV|8+Kj`{WE#T!ckExcdR~FkS?_$AS%ek9VC$x5FT!*R2WcKzy4=GZ_j;fL33hkjCZfD>&3gy zNXme4ZE3U=tk0V*Nc654=WYw6g|LnD?p^X{!G>mk&sthMo8RB0nQi9p6&G)NZ;K2G zK3kZGR5D8$ATadn{)#1uOcf-+H6Wv#ZdIjBuluFCBISS{uIe z)Pc;r_os7}CE@_(**mvAvbC7%{SE}{cnL8rQ4F+@|G>BLtM4xYoQUZO9%Aw;*-Wc} zT#Z6-{5gqdzqH5rdEz!V9kMN#VLj{?vv~{6hZE}NS9Zn~hmvLlhd`WG?e2+~=?9)h0@ zi(4@(Kh*d*1i9U_I_=?jh_Oglma)q?Yuj~y{BbJ%h`+BdPxVh-8=CoNz^?_H4l&4A z3C4MH%XJV+X?n+r&zHqh+%B8xO=#N`X4hBpY2rn6X3Pdlk}h$VXFQ_1rN%>L>Mk34 zQgyARf01aFB=vQf6Je+I@WaN=3Ky@fp-jcd0r*2E5d*6J1bMda+mlXNLWA_Url{3Y zA#ersZWJsRG7h09j~iJ%RgZ^_ez%1HX`$ThFU*doIg>Y6@HV?L0 zd6sDzS}_m&9qaQr*L~k#$X17C+S+r01}j0CJlatQ=L0Lp6tf^Hc*AntiH>@S(%j}< zUuvFR$FZ;5tgxgR-zO3ml&5oaTSYYv{Q$ATA$!w~AB5fh(7cE#w_AJA`b7#fVy9{e zlYjI(wnlyWE@uf#yyiCMdbvyZ6+QLjrzoixaHrs=J-7E~*9^HF>elBAalK+%PP=MF zyde1fdz-vz|BlYl+JGw6LK`*s(GGjN5#9h<%z*jRV9pS)M&()^`#tK)-6RnLCb)b@ z+x3NJwZm~{J<2nJxyMJzNpJu9iRl;i%rSIe-@=mAC_D5)h7(GSEiT1WwVPsJa0x{p zIu|tF5rT#>c0x~U_ypg3d@SJ?2|o^0201$cQ-CsUwWXNx>2w)6Q(<)akd?ZDj^&XK zqvsMDJUG-is9fm-&VBFB%YDx|=E#`Fi#Io-z0bJfdsk{cK0_mot%HPVOS~(H|Yn1akFbaM{HMZWW`OpQe#Y1LfZPjHh*S5b{>2 z)hnC`9e#pe#v@qq+}d^xw$Fm0sY=$LHn-(fnI{f5p5d|a8h;TbGB%+efNQ=391zax zcrhP_+G*3&^Bm^JwgGDj%U3)rE!)voC~iGRM<2@5u?L0)qo$QQvui<>P?b)gRgpy1 z{1**-((8SNA_=%o9<=BUqh?AUK2xH#7D7f~6Q`8GA6EHMzNhn?cj3C#o-pet7Mf5* z0S;8*9j{Q@?Gvsg?NFK_-ySBcWwC1y5d@U!w9;6#MUuJ%nqT2}N(pKf6IovQ#?^CV zd}86`pS)-x#Rwz@d%a#zezHYVDfOATITNYU*|E{;j_XlkL*tpZA-&9#c9OG!#doP6R)bK7uED{$QPP#V?eKd z+##|~^;y+Id78u)I0;J*pR1d;FB?wBhCq)mr&yw0QgjxjQep6Y$x=2+GR>}{(uWvp zoaZ(7Wj=|T^`|ZEorrN-(Q=5j0?m#K(-&C z59R9EL$;_Z#zW)<|)?(}y-Tmu66`vt(bEM-ZKvyH^{?<)E&NITjWaSY!9W zH+OW_rJD_uG2QW^7S{|j)6b?=4Pzs1NZabvKL;CWeAc#iI0=`_+Svg)WF-BWch=LX4foB7=DaasR<2uIL;V&MGk`iXE2WDO2SI@h$XWG7!l*n6a z*Ub1Zpw}cXB-&TOCh`fh@y66fyFMddF-bDtskA!sA2jl?Sk^8=2RG5ev9{>%p(h(K zNjdKTVfR1gK0av%w2H&Fz8N)G)j|)`9eUuZ1r95=!o4QPHgl!nuxO-9BREkvg5y2U zQ|cuw)QewZ6OI#mj{&78C(dxx54lbnr9q({K3MS&h# z9Pd{ylsma_FMQ%8MRgn)x@{?%Imbe+i?CuhjjSCzKV5@EnONLYu;i3+!X>X0eVR00 z(XXT@LSx?b_Z61#u0a!dS^jE?4J*N?J+z(}DdevQ)p-TVws*Tew$Typ5S-!T9G+7~ zXqoLFAf1MQh0e%gc3=JYvPJA@J|GFoBZ67Pn`f^rMT?iCQ^Mc(8q!(bWasvWY$-6= zCnD2ZZqw@Zve3u&vk1Yz&c76qR1{4uJjm_+)|@?OtYIn;QX?-ux!fgIH>Zq$OKD*U z(LMJ8Z8J+>+NbjDRx@l#Qei9(6KA3xO)5OZ+HphniWNWU@mwBsX1S9s?!CLx7Mtt~ zdHYzMnRnZ@gpO{wi}2CIbaj!R==}B@;S{$a(h$WSR}6~hBq@CamwD#;E&00R9O*0& z$E_ToC@KpBJUv>TV)WVQ!B~wd$&%Mklf@RKCctZBAZJRVfywk}Y#c`E3 zo3Z02v^&@K3+#J>&^luW0Eo#yk=`YbD(fgw8mJZWlWWw^V6eWn;1StIkNIF*;dz5P zDCGJW>?Sia=RXwbNR*_gh$g=vvzOxsyq88{tUH=zKBb>(eI8DraQt3q-*w+#dJI+$ zROPy9dvV9N|H}fzBRz8KV-U>6qsirVK`>kl&%7Uu$nq3}J013MvW{R9P*t)pV)w*82r>EzZ&Na-y?~XnXyUcu0yu-yO*dA5APe~l+aMYE^ zsQZR(0-r*PSw;khS`%_OWq%!->XI~gre5*m;v@NyZN!#h61W#V)}F&8YoXe4b7{{b zIXz(XI2gZ1Q>izf9{4oUZp==EG!^sRHXJ`l_TSeeq}&vW5c)Q*$0aD}Suy)Yl9cQf zBdVkL@}aZ@)1amTI@u2ABZN}EPOf^f)ATo9mnsH;WH9@jrh+?iIG=*E{X6ZkobpU% zNQLs;OR!ZuLA?G`-8$ zHipU}A`9j&F5#mp?}r#}cdIfSe|ml6*0w^AF)Mzfkn!(kB9F!>YG8U>zz9yQA5M($ z3hlRF+I!PY&s2jXTj^diPbbMR5`NVyI-1elqt|6Dw>>5Xc1JLD&A{?tgsW>&=wVJQ zmge>1)8e~!GLYFJbMwo2v>mnnIYqN^QF8ppCWHPD5s&9N!6`mV;(Hq{+a+RdOV%e< z^u+fI*MUeUd6LBJg@DLV<1c+`Zb&7un^$Js#6pHJTM8Fe)q-|yjJ`SAjyJb^@c@)9 zFyo;HOH=!WL$~{78W))&^s=SRz2l+^lgSh(MgQQchnT5q6k($XiL9@>X1M(#<_MX4 z*46uhS-QP7$&cb;U(S*z-p>~RD?Luvz;xWTzwMA?Z%ngk0(M}WMi$~_%Qsa>JS=sk zcF2R2!tbhYb60^gvDc_l;#cTBpu%DZS^t0~le-klo~S)O)2lWloT<({STwUwCz?)! zkCL7AeOsCdxo+USU-evLGMTq5m@`Clk4}=UFLWqe|JZ2bhj}E_yZu>tuKE6Tk1NV2 zsZaZv7P^rtLyot`e8+9(FqLAhwv_b=^BMeyGi@l7Nbf#<*}*{-l9rU9&Zf-%{2GEo zjgNvYy2^@=j*U?pr1!~zQJ!`c2Tcg+&x2yzFQPAUo2xTRNjl1HA0eV_wFN#t`1k=F zPUD#Ylp&pTJb=yKr{6@m`onesw2J6%7N|yvKt>59+7u zhYIHC2duI&onHk_`z^Vss#^GD`l9~oP$r8%`AQU+HUHFp};68(pS-(UHl zaikCA(k3$AvpYvgolu|}pgwKK9h_|=%KKryFo{;bM@EH(yoi*v$2p0Dg#0Ps4-ss! zYsP(eVQ%nSRUa_iy|Z&YF_1s$5yQIgd~W1O3Ddt-7w(qA2a`v$HeSnghPiSWKd z%8ln%G(U<|<`Z`liU(6XVh0jAx`r)0Ov;})1>?Z>bE~p7>{abOes81u6j`ctg~>|( z-a$X%q}B2*+S;{QDbBpAz4mTyoA|rP(IZpiWMp(i+|n~g19o*&BG}b8JNx_lrM69v zw;PN_Lrj@a*HEYV8@Av>%MILo@ho_UH@N$!1%i~FITfrDMe~ac{MTWH{ztmsxCN(Y zjA}kUNa<|EVMoG$x61@ty}6wQ0Y~XdNlMhxO==@dNlBx_etx`H-H@^&wnl39YwDBj zE70(MFKHkyUVLe;546f1gloRT|<*Ox95uO%GLue5u(zrfYdb zvTT}=w_B4-Z2N$4*fr5~{JQCAH;X?$aQmPP(aIsLx!5`6Co<&qOZ(3>f7j{>DYvud z`jHH3FitQu*a5JZ=wp4 zYB6GQp{Qu4CHT9KVg5!3c2qM;m@cnY#GmAGl=2fcM(JIp>t43+3fJ81HU63B?@|})(?iJTL$k*ZhMT%te26Lo zZFL9Y)*V6}hUrMHnq=Ck^cX&v=3h!1J$TLQj%KAldf)?WLZI$hRe?EbW^DSj`i$`` z2>@{SuZPc8>^u;^?NqwZaXzz5$2ij$!D$+I`G(VP`rK#fXBJmtFLq1_fp_pM$~?jG z<*&+FR!LIP`#X)W*W?Gr_9M9ZkyeZ$Q*a*d)|3c|CMMVLj6~yJX6Z%;G(2P@woh|& z$7+7WHfQhNzdh6bKD5U$4vR@Vj2eSot{wqCyDhUgXJ#CDM0hCxiT23HprMr{q4 zv+3WIyz3pJU19V&`y-prLbvs`t-Y&p+N)M4_@Es74PX40pqH?k$88|Pyv>Z{L!ci4 z>rt{;ik6fb8$CW$2KiIEFHWEx_c+ERAHo)pHwC62?SC@V6%4gCj*ZtBsyFT$S0-zs z19$iqBqfr;qPz6y3gCUs75!+cd%fN@^NJof!*~1X&&0p6FvU9IxLJ>G<>Kqxk~am~ zI88lSQ@k9WGGZ|d?qOiV0)R>?E2b~Au?3@MsCF|73?CPVs3X> zwsx&nS|)j>3188p-qRtGHr5Vr@PC0k+w-9XS$%h5_xXyLuza-WQBsay+rMHs)>1q;IneVdey-k2b2}>Xh(*s^>>J_NOig|R?6uC_VmTumXVlEOk(}fy zLow0#_Hp%6p~f^QGF0SXj+MQdg6KnsXweU42UTW5nWm%DYhcb_)^I%@rk{S2OyfLA z9&k=h^m@ij1*`}FxiJO60LD$WUaS3B9Y*Kg{xx7$HCzW198uhDWI2$1S~^S(WGVZ1 zfiI7=mP0_#UQ|f;RG#f(h8jN?Z~WR&J;vgdSoY@#TkY=I6`pco_5j-)m|!RT|&~ zKcl?sx|b#wdT8&wJ5`vHSZIx6J7LM*l^R)0c&PDCn#hhe_nGIVJj-dG**#9 zNsWWS$;ll74d+&Q{|NxWW0eak%A~RDzZJna4~1K5XZXq+nj_v_brEItFV+o8;UF`? zUox4QnU$e6T#gN`*p}RS1Leh7EpQQzMem2^hxR=hx$0@bD!oEXrlA6M3c zeNHHnJ=hEdNd@JFx};H%I#VwuI}`kgGTA|6=y%bVUUL?rixR9i`_iDSo~@amkMGv? zvy(YhbmBd>z=A{b6Xa=?pE?5^mvTNflO##fK4}tCM56g?VoXeb*W;XP3AK_p z_;$hussPvwYM)7@-H}_VRm7m1g9ttWq+tpnF-yu z7STVJ@3qxVl9@XO(k_sB9M_q4z<=Q{+;rr5$6yCY4NR2H_p_PYU zR#hZut5xRia*xP4e=jIiY4}TLvVfb%Xg!>6dil-Z6e2bxuh#a8oVZCvV3TcYql<@O z2K~(KsLZ`FBo9^{wG?IvBHG-k|G*$sM>gkII3Ub`l){SnU><`^E|m;5zE|(N7=8ui zQt3@tTB20K*w>9c&#+IH40#?W!;?s$nQq(jmem-~nA z$dKIpp~9e;>*Fg~da(Be9%_sK({Zsd@tSokj0rR4M`7WI;RGV7=!MTNONQQc4pc8l z$;k=dJ8tK?Nq>%gqimU`)du3`ReJzp{-Qg~UnZD=_0ljhd&!eWgkpa&i`dqMd&+&& zWalz6o9i6C(pP_l0;+BLAXn*lC8~88tt;`-j2%780M)18U5jHRgm?tv8;@=eYY9{t zH8ARNLGXo#boHzrH0jt1J7${MyDgl@+=LCL@TBPXzF?Pr4r{%au2!EuyYkCRa2+(# zpS5<4QRM3ue(%pokm1Xvw)KYwfjV*S3*;V_r}dXdZ^c*oH1&Z>)mHu^$rponf!oo< zCGFHY=`bJM{_*2%=64r(@7uc(thFBh0f0d6rz#{sMg&@yqN4f5Bz$4*C&hJ$gMhq> zIjXH<-^>N1qas4^Pn+FKl`Eh^GmjCY56MY5tLETRk~*ObVP>M#VJsPZmY>XAFtor% zsU0v`q|y(4gSvY)K$cce>j@fa-W2iP=d~LpYIWMv?D_SJ#ty3tsb(jpzxZbDMdPXX zFB6Fz2XJ$Afl{#Hopr}r#9L;OVnN#@Cw6YzVg0oA$iufLe|!2^JiSj zI@K9>w{7m=CkD!I*&wg0JWwkI$Jq(`$`5>%`1EsBiX1B2l3^wSO!!ScFJmGLW{P6Q-C$@)ATWnJ+5P;VMcd*!ku`MgDxV}k zo0Cj(u!^YeYh~NT#f3@|>&^nkHfMxj^tjkNvR8Xk!ap&Ko5M6k?s^lL$K+;{3_(ta zE|=EGQ0x|NeKBQkpUaAEtu5)8onY+Y5k9K?zOQ@XhWKfnFd=!m1WBOnE3P;9oE>1) znR1S4j>N&(&`+LI$1so$zG*m**DN)j5c~VLZsUqsj3+*Y;4h9w0k2ublb0iNsjI6> zg`ju(!&u+d){a7KWH-u_#}??v!Mzs77-nb#RQ0UrUwnPDs7-8nlAtvbB`RXdSajKI?$t=Q$8| zUA`{s{VlS-94WD*$3`)nDxmWK4{CsYdTwK0|%F#q@Z@DXC9wL(Ux ztN>`6e5uBrDL<%+*|$Usu`2qw&+ko7T=7{NDcT^ea-Sri^#O1d8s`Oa1a3d_VG@qo zlv{}QtUrQN;x!`W((nQy;2x z1V*G@*nDv4q2tyxVAEVI%gaJa2{c7w;L^9&o5%(MJNvs6cc0Ul30#a?>9%ZqI$Q~+ zh}beFgzdX-hJ|Atq3L+Vyov{y#9#ltd1S}0j(Kpr=?OdqQz0k{%iM=Ym-k zA_u{-^Hk})GG+?q3)yl>(rI7Guub>qJkIKW4m%X!E76r;T;;>{M~~5I6!d{FS&OJp z#7T?rz%(%beygI#a|)Ab8+evNbHR`4!!{PEVX}33rV21(iN3Sw#LZs~(Cv-?uGbWe z1_=9l5d8C=x2)3E@{(^tbMsaXd)~u;5U{}UT``G_Lqnv1m#)A}zIIXsFu-fpT~3dN z)Jy0J@YMYdKM7y-n~H;Am&kP5OY3Zv{+>;|yo}0lmFDx)%DmJq zvqYs@oyVp%0NH8_PPX4);HkADhgvD{K_)BP@1Ep48Yjnf1mc4sgxiv9lZQ)V+vQ9s-tUnp$2m zbJN5CS>V#jXH}jqESGmVv6T8(XQz7S=`))&?%Dm&u%7JRcFd&q)x< zP><-czHT%ttH*l?DBX!(^p;|Dx9B=85=wAs?q1~f_`6tX`^C)|0C31hJQpcbj32e z+6bZgjTL*%awAJw%KG*quio+^O`cJ@u+JO}K+q{VoDrXs%GO(tEZPYT3Q#YoGP7@o zhaN_?I@*8>{~Y zd^Fz2mtRbKJAiHJE4r(9v|nOAnnu;d!2Rs5`QO@OVLs`D0?F5AX1VPc5v$O7*`Bp$ z2xJd@bVH`G@`3O!LP;uu2^5FE-FkWR=NSl3)M%NPnjA`EeNg`#>_6&=B2nmZPEE+!cEypIV(@3s!Ip%8&uKNt5qzR>;q*UiJWb ztm=%@nKpnMASIo-}Wp4+*72~r{sJu>W0GLG4m#y(tt zQw(-5oZeSnGUIs56O>ACwSVPI#0fBls_`$-Lg!l|-N{m~&*}TKod?n(S_1Nv230oB z`pyhlQjGWb%#D+eyKhT(JWiqGyZR1miGvkA6BQ0hxjI=NI+hD52psv}?7P=EUp0cv z)$&!ue5O|Ve&&UDtwONHy`)ptGtunR&KdeLS)ILPPxzTp=gGT~fruqLk1jPn=dc^5+7zm^`jiFSVHB*epv&XvMxf@d zucEVTZ7WuZl zpY6hhb|`*kKGJ+neAqzZe5won^Y;3MqZpC>HfO?21+^0XBpWZ-fBUN&d_JRcynjvM z2hsM*;f9T=6MbKi``mNFwk6fq#*W}2qJnC?H~h{bm7RZfy*+WE(@j%XS6K2)`vTA? zMvkksvvb!=+U4b|v~%CT>5)qPpaMph+;qaSo*sPkX*!Ur^WA$-&|W*`naRmm1<~ChFvVyrG=vZcAv;5(wgM{z;1R%<&Q5k}4K>QWvteY%{e# zs>4*|QHymCA#ec~$|NP{x7jz3<9$~vH{WJ%MMlqr~rC6Wyqk~s8cJ5j6-Zyx^gS&j3*Ie5Vfpk zF@nGP|EYDvmLPsIIx{89gR}h0{#{@9?fJ}aVstNWp*P3%M7pgARv#5^F1~>}-oS=q zbb<;iZFV4QM%oQ1cgnWs71Bs>VP}t64EW#{@$Tj$ZPkk09Sq%d>LI`+5Y!=EmwoBS z>tngOxcUh!Z$jZTD&CTn2Yxz;A9qHonw6^t3fWbLT%vtIq&|e*op;jWzUj*2#;kj8 z`zny82=rPY*+kr3w^d(WqE~YWOa|IcMPP(OUcV{iOUW2?7~vk;cx>;>1l#B4<(8v7 zI8dSo&B=8{Jb$Nw+y(}pgCX`d#V!3d(Kf}>2vzEM*3aw-j7fzFELFI7Ihx_XyXGOy z$z_!Q1=2)B(p@fmFPb)AIzgQ}#FW?DNGGWc0hyY+mkLB8$?7P>Q%f8;24vnC_qRTz zc`mx=qrY->i!J`1En%nNvQzF<^95GHC58g)^?6&sTG(4E!^qZiUNT!pp=lhStGwow zz^tZ#e8uRGP4`^sN6;jKwQ?LSCJ%(?KKT3I$owGOHgz(?*WtLCI_Fhx`Bsug_L}J$ zpH_+$z6tts=dv!I>R*jl{m>g}-W-2*yy1Jbxp~3#fx*23>-7bMG4EyQI1wo=+T*OZ z;mL^Ar*DBI&Y3xQ^wn8q&9=l-Oo0eEuaALmlOI&In`<8MW?kg4Z@Mr{5W2WuNdF3b&Cbjh$MjVi55M{OzA8cRQD}sZ%EYQh) z+uAw29`KzHNRPl82Hqd&nFVi4r%}Sv54#dts8+(2U;yvH*Fkm7I~v-?Zx+ zvfP_)jWp0tIXHQrv&whziDXGbBvs5G4e>`zD}wPEeb4GI=UCm3>-=vhB$p^h@J}s% zr$uyibrr|ezYB%a0q&{uqq*5X(=^|nsk6680A{P3(8v30N@S@1K<_pyStP=$N`c

econlh4Pq3F~*_3*EB|803=j&wE4uiEdOu;jj=C20m037 zdm4UNA*d1c54vX+LkP~wbTy2foMI^iq}hf^Ei+Y?pLVT|R0h<~`_oP=BGu)v5uwd`#R5;VN~7BxP@hNs5o*;8KpdIh-hJlZ!ZCDOSlYm?YYWDG( zx#0#Qx8K!#J3r}7s;9n=seUi6i!^y-uAtOUiDp%=SBgC#D*V$)KU^Y^yX{y&|Kq|N zfQ*y!dwl98_X@Jif~9Ge2AiLwA+M zf;&1;io2aIID7_$K%@SjjdaKLWWVdomizPiYOhO0bv)g-pRcbcbzCU*8;ze~h{d$4 z|FDEL0uQEMkQzb(LQrwY{k&NKWLP|rwB_0aD7PoqK;)9Yslj`q)BGQ2BKRPyLFuyy z!w~GSS2p4f=bQUcLydsje&Zsl!`$uByX9W5K@f;bf~+|(y*hmlYm_J&w}8RIKs5}Gg|)s|njttGD&Ug=$alax z6^tLSsI^}kN(xZ88Axd)PH*#KQBH8K|BmgO{yM5%XlS%?b!-X}{nD?_jUFHm$3nj0 zpi;@cUF)6qd%*NK>8Im$Ui)B&i<4*lw2BtpPJLgCBBo5f4#oBek2%9IYb+=-n(Jj|jQu#ZJwr%Zk~ zE62!H<+J7J+J}I4GA;XVuZaJ+D<2Ra4M7328XWioiUFQ}qHL|vz?Ya_L)al%J<*iR~Zu{;OJ^>7#n}_{ic(_tqa1G4rLg zLY0asu%KpaPhiGC;T2{!H+1@_oFvu1<=0uuO6q_2{X9E^Qh>AkuoIjC!MzsviWczc z`kFVI?A-w3ax7rEdr_FW0epeiW^IjrMsc?#kvMw4UR}-KTO{*oUBR2`%6@Vs2;f0* zOAfECVS%d=jO;trlmz-gTAW<^_$7Gbyig3YdT;0d}xxoq^)zlhVtg(I07o|bu+YG zR@yN4d5H&Jt|sl-fK(zXVU1ch^z`sNF#P&Jib`ds0sQx3rRye|sU5CnPKbz=ZsKu<`=%aU#8UYDPh7xs6X4iSdbL(q0K1u9*qVa_S%Is1B$ zKC2H0@5#u~(W9o9A`n$Z4MM_iCnZ`E?!;}FwYq@?1u#G~hi#-SHl0KwK`2*Tm@snCNTkkJ#BO#D>nO5A(A|4^)1dI*MyX>Aa}U3&)l=*UR@ zX9L-2RN*8BkA(Zc*$7meO5Q6tAm+?B$eCBFVw3gV+~baFT585{pdM7C-wL9VSArjH z<;S=HeZ|R9r;z!>eUTMM(lexNSH8jNY2cP#HXw`vw?@7ge%qtzkVA4sDnS_H@|Xr&Tiu@Nm_fia(ZW>TU}r3z3W?SyPpe_ey^Zn$9` zUS<2%nVsB|M45x4H!11;zxKDPKQ#&lJG~Bu0q%;tmZh1Bv2< zPB&xY+`!Fi-~g4Y{QiATAD-6UACLx0i}v2Sc;ru~R7wVahd*+x_5S^xlG9qBF`%4+ zjske4RL$(Al|(r=%2sM4PQUi+^oJ2d#R_uSqYy98D)=qA%23b}zd`T6!36&x5F z!$w9%CQ&>AN0>LQ>Fxa(HbpZ;5?+UcTRO3mQvT+FBD9q2ls`%`P@lQi@0!K0OG@bP z+_ZaNhbYO?*uf3leeAXOX1$Dx}W!t5|LF48esi60l;NT|+h?zEV z;8CIVnWJXgVYX%cpTvjP=#i9YPWlx7!c%x$4Gx5}eb-ZNQGi|p(DI3$PZ@OoDpV@{ zsr_a)N1H6%=jFSj+peD|@z*EW2N_8iISm)YtWICUjrBQm9~rkBjcx<2Sd#f4p6Hfu z|L`lH$x3QA2Z4q2OGzA`yb@{7+R7-Iqku=R7k{gDF*>ngz~AJuVy(!Jo0*xREL{TF z3B0;MT*=*V*yeRz+D^Oz0)G9CZo9c%R--EZR1GqVjpxjrYa2#$kQv0x=eijHas0`E zmSJzHkq=ok@~}n3`a17RGQI(1O#Z&ROTX-*EYA!edUiFSNqz&oZJ%{+X@lxXf2v@{ z? *;Yk}9$DjJ#+Hs4hn6dTvJ$4$j2v~5a9|YN1*Jni!U+UZM>_OmCX7t2IWx@C>-%sVc z7%$8rNQH&?pfz5JNt-d!G4>o2E~KD4aY> z61+WsCvb~M=3Z&wk)%l7z$-a7QPkb?1#ox4++T8 zwv9bJhWdF6y|E$YwlhOZ;PaDoXwvACRRp~}umA>`%fC>z> zBt4)EUkolIVtP9~zVEKAf!O}kGry=iok;EGbdtjcinHDT3e?n$GJhUDH9lUao1o%M z)ihnW4wt5A89n2^`#VE^X_0^U@SJHD>W2(G5vO-$@F(wi1t(0xNy-U-I{9qu7&HlB z4jyl5GYbsn+j{Yo$CQL>>qo}Hf*|zNC6w}uwpH1Und+evoBHD%B@;lHI=Xv~s3C#x zz-sinwm!Eh19~G_3PZZb-hg3S20E#cZUy; znjFBpwsqc=-g40wlzUSA^XE?r7AB^ltO`>ry=UPi1MLt|tMpa|z+FN#>mUUu}( za1FTQ$24x`W&XC=_k}VA2~Tl?sd4pmR|t!*!Z>|0JI~A8t6rf$Bkvxf!4^pek_q7K z12p+eNy@loOUgdY&%+EM`@UDl+2Nt?0%un}32Yp)uy`8=F$PQ3fpiRfcHAlkXWl@Q z$*-!?Dt&3fq1INvi3PIwTl%VdljzswMl44~A$%zMrFQLtWAU-jgB$?VfbzZw}{A)zVwuLOaA@1=A3GciyBs-^uPddDTo z)Vn#bfINS{v!GoU1EFf87(0M*yyM!>5}P`)`e=}55TQ9$U<%`y#m_9qd5r>lY$(kC z5MmV`KQRi%@s%x26vp6d@fHq0q$*E-WUx|n#`7c`@@Zuh~DFtFOoDT z{h=m>U46_sQ`Ot&8T9dLYQQ2E^I>C2e*mocOTfdwXGW5h%$7a(a9j9s>V431 zsu=JH;dB=OKwi&Q$T)`o7ezYC_|a!bR$N}f{~e@D3ucRqi-LlU4j5kfb%Lo~Ai&Ax z*@5a>GHQG^FNb$czjx$M$wTm`O{tlXXoBVI$1~~)Iw@i7FHmKPp33Sxl_QdT%BCJc zBrn$en^RuwHJ;xgDtLO3ASz$9asu8rI?)QXDH}<(nk5%6$k*Z4_zGBujKh+s!#&Ob`^q^s@U=YQet=>i#Fl zGE5~TuPI7)F6fg3+%)I?$%%lNc67|@>-`p#nMg&dqI^n-lcVX>X=Uak_@z_pm#o#Q z`7IU4=HGJyJND@obKTDRd;-Z?`zs!gbu)y&GRkH|(!@QCl(}Q|%BWO`X95%0-KM>T z8}^F>pHLQ`ZAaK;vtQ=Nwo?HxgFq=uim;!vHAz^zv5MybrnF3Q#vUH16jwjIV5jMR zVF0Kk7ks#eAKx7=eJ&{hk^^xL5fydSVtTL9(|LA?Rv5{bfECRbX&*kkVVRSs4a}nl zZ?4esl;53=An;Z`-K)NV?G*cv@*FXpo>l|#~uO) ze@Fx(PvA!r6^k;}Ghdba)XH8uz~Fh~m{Y3~$_*=QV5sX0!45J$I}8_otS({vUxGzL zoawhTb8kwe*V%ch@@kA<2^r0yu6ROdt7Dtr_8N_l$O6o7&g`-Yb|!x9@XdSPy*%)` zqKA_jfWMucc#0kJ7=(19Jgzc|N7UYv0{Ktz#;AIpR-M^7 zp34#}p(ZD~n}_}SR*YmY-k+j8L=>s%au;VQf#z8^=saFH>a=x6y7M+dcif~H=u&iC zJsrN1g!WnCia@Mis0qH)(4Xq{c;G3AR=Q5^L|g1M zS)X@xukL4ur`NoeFs*8JYjksVX+dn|J6I=)!{*4l!!^Wl40^b3yfVp*F#5kjj(0aE zQ`h{Sb%{BIA=-K{rx0Ul#zavS+8aR#saXP3)*5gy-C6Vn{+=nECI7 znF~}H3+dO#)#VsyLn8KwN7&W-Rr}J+hQ1!=`fpaGlz{tX-{JnQAxnujdqd0cBaz=l zclP^tDw|<#IDapCDotr)Bl$ctgZ@}1& zVU#7eBn~1{rVKQI2o4ko;(kbaIB&oAU%DOk>#n#RU{Nc^wc_}GRW0B)ztZ#)9UX-3 z9mU4n(jI#BR-6EyM*P1Q^Xkv%qZa0C@3!o3Zco2u!dESupM_&S|M{-&f>#XmgQHeZ zcJ@HyEkNU8Otg6j0NlDiz$_Qtq4j)n^PEGrjT<9TpINTiU=u9$h^5dC5ongNFvKj) z%$VAUt}V@vgry-tSH?`FPalh*g+F@YUtAg)vp&PA``(Tc{+_q<1847*aJ1d5uu2^5 zzW6(mwwQH~8c)SDV!QM5z#q>14!+kfv-qLCQ+`*Z8k~V8Su^SGgdt4KBQ9AfmWUR~ zj0B69|6~2vBGtIu>222!2HebkhB2Mh0eRn!O(*qeTPOT|6LM1;G_&uWgdtZox@A`x zvb`Mtupm9`&z4heieBaXD;L&cSV^6-R~lvuXhN{33Xod!IbyEyW0 z&(8TGv#lPXGZ2hR5S7$mr*Wr%kJrhDOL|DKMI4@w=7-@fl0& zMt7wTflGhOfMpApY_;|H{%jF0UcL+Vm|dL}*OPVUtfi|cBLE4K|M`jPCkmKBFHY(X ze1fRtjKA@F2*zaFzox(N99h_Q-I)ugUTm3w`8ao5csXvdzKG$e)pSxJ^sjmDDVyNg=ui&*ePjg?=Z1(k{#d$wqD=DLEHLNmWY{% zg`G9Qa#K1svs0ocq{>Y7X-HvS3DVs8whnW3EmwavRae@}M9X)ajSDXHo8#Vl0u_0i zp8WUo{E4Dz30UXW{5YFV?>HwD5#zG!KnRF^15R{lh4v?ndAzN2`&|KfO$Vkkib(qE z>p9yHAlEye1S4 zFG~!rd_xI>EW1fxk5a~A$g{9IztFnH;m~+b%m~W+pQ>pFG%$xFWKcU?dnRA&CI_!G zv&-3U*cvcR#kgTervnCN*Wvoms~Z#%&{6J9R|bOdvEbeI(k8$H1RoBT?z|R{LZ(d9 z_yz~}37Gt&SMb0BI@ALhiR5^kt*LDcFGiq}k`kQXOE4xEtj8qKt@QQvJrvLnJPOsa zUynipXZQGa4d`;fxVx{9uu(r2G~V?mpfN^oGAI&y&z6cC8~`{SH`n<>f5GVdjS($| zSWhpAJ9@E%Inwvy#SbSMRJy4b!a?e%49vuDD!snEkvI zxp>5i^1e>}Y&UmML7-&$QeDGs!DShp0u{wqy4p5gcKdb(ZqW6%V)}8V|3GR6^Akwd zM8qTGFR#|=K>=QfCY~``1WA+({DFzgFBCd#qv32F_{Rp{DJ*BxqlS;GRx-x)^zBQf ziPSPTYgeZ4(Se1GR%t(ebJjFGnbl+-#}RRT{~q$MZvR;AxP;?T+;DAO(uTg$4)V`njm?9;VdD9)LEz6+AC~=rWDjFHmKOAKu7w z{_}Q3R-TPu)&O(=AsY|$zceegw@1|@g?k+^j*!}ETD3x?Ed zJiz44d$drqc|qTNz_}@2Ei~`@UW((Zp6LOFS}WFqvQo^ofg5GO_i>o&e z3~UstB=hqdyzB$hyy1?rUyms6Tnc@ER8o2`D~n7c}eW?v(G? z`f#0pIkF-Q@!Np?wA|d-$~-ico{L5WYU64@062V9=e!jqWaLJ}LMZOu1T8m3p^Pm! z5J0@wXec&)4!sD1MH?NZkw9R>gOJxDnWK)u;zL_|>4E1(v04g}w3Z4VKGL^o69?a( zu2(h=1G}`ejjwEcY1=(aqlnRosZhdL!>Cd4y2Gb`gwl6BLK35RA3kKwUUblQ$+&cQ zXPPMxsyZ@jncd0D4!^`x=I|R&opMQf4G_Fpm49TtwsjnkZb3 z#Zp!_3Gdu9kP=Pp+(7xqu@mntasl53=R%|XT;YTb+dDl_p|+}Hq6JW* z!9DC|?YQt!Iuc`w+%nGO`7L%S+b^qDwYgJ@W--u2hn?5ah>)GWS2EFC_?*BFg?Bl6 z>!fErULNe#O2PfvCY}nwBh>JI0{SdoJ&MEpXGPSgZFula7 zH~QHD%p+VN-n^uiFE~T0r#^n^=NWClp;^{T%oycT4Pafv0;qN5Yxxv+JS?#O3KeE< zYpzang+8_(6j`T0R(`Y%hk~=ZQL;ZKM*q(R81=a%XM%sJ)@89XG0A&8k2cT4!J$56 zCjYEuli0Miv+6gmHF=6+{0K;E`+I}>Z3?*qD!Ka=)kNyW;USA^+2r*y>Qbkr;HkCU zoJnU$=Swr*i=6^0Dt1Tu5tbC3Lo&T~%dp<>tKWw2%=kZRlSFdW1Q3?dn8fpI z3<~g@7Z}bznvi_d^I?QR5B46;VbpN&c%HK7<9^njqE#6%_|$WK-b@LeG!u^>`W=p& z7P30I<0?&$YE}FUj<$K^^6?fpxlEhs%ZfQ%k>#-j;_uiVZ;F5_msuQ|nnyKxn%2!%r#}oR*u>>^dZ5 z1~)`u?JIL-!4Vm$sl`Yd?_I|Wqk4(+6}7_WSICanHXQ2pYIJ`&NLi5yji^u%(nE!W zdI1p?zwLItbnB3XoZjg`#}5UYsuHiuj+F63N32+e&xvOAJCl^3f7>EiGCK zij;9@h;gyFx+___R_l?~!E|LzX1+^9-9oh?RwkP}7VZ-fNKp4RMmSG2!9tEtrLT19 z#McFfw`Tll>bg+Cl>EN}?79U> z;!voO=_s20P3vDOm)C|V9HRb5PdWA!y5=G%*3A_BJ!bt?YgFy%;28BD0o*#0Dw?VX zl1DIGqjQGGKf-JNhK0uo2WQ;vV4k&KVNPm>ldD(0QHJ$!mA4fK-+s>c?yrKpVzkr! zwI9MJ+|l^vR7`T$xSRP6}S-k*hO!ibg%$ zlgrQId2c+Ol!tZh`#yE@eI)JbJB-UshBdZn_mic3dSA)AP@c&y)*9p}dj>9yb=a_u z)aeO(%vxKf+Wd!2c%us#)SPn>P5rFf>d)ba0tpgg#{gKZp3oFuTq4H3xhTy)n)(gj zbT*CUzQ9$_&H}OpePTG6dw&2A^(UC0YH&I5+w}|h@E!U?$2iiclI)$jjD0db{>5t9 zg6Ylh=;zElx2_R=<-{yg>QEy(@@^l^eJ^!Gk6R$X)N5L9=)BGz7`zO0b@71sM$mmq z7v_QQd{px|WRkT^vzm@5yk9xtm1*1PH=**zYvQ_j;lH)O`WV=G3=J_Q6~Jf*2Emg> z$;ElYmHr}+zU!1t$vTE_Jkwyx)W(JaXgf_RD|X>8I|!%hJhrz#SHr&cd6zAW^PCIM zaSxj0wEs{x!iQIfnTU~AFgM#qQiaFEutL5v{XN?x?Xjk_GwWT{@%5NoPEOy43 zs_VOAzQE?ziDE^NOiML9rkd|xmYI$SJ+OqCDnP_r|Gs7F9Ub|3Pg>TWR zm`)@z3ylBNt0s#(xA(nlu{`~eMMOUHPOkWi&Q5CB>Q~eP^BL8@Oo$V2z#TwrpcUcj&URzBEJU?rXP=~S(1MU1&lkg;@`W}-0@;6(Rzrx|%IN-7GvlTAnpfA^Z=R0=NQjDh!~av|yDSETaVvoL?+00KCCqw=yL_ z)9GprfMoy_+9z;nhj4>=ztrX=Ti{>5ul+8R=j1hBv8IxF9rv|h}X=xC1NJG9MqRlbd0VC$=nA>A;yB>h<{1WQS;i%~7F1rPE2W);+r zkJE`1@xR&I!|;2!bTnV>>GbG+Gh+O3&-i6a(wOi*Kq$$^3(kY8L9rHfW3N`+PNbhH)l z%zM90*kHUkFKfbe1W(ntHkBHvjd!kLolr`&v1E?dch8$kZKMavCaTPk-PzY?Qp}L+ zX1?P{G|@dyKpbO6VHe_e8p3|{ zaK9yyalF@QRh$3HdhnOqdC_EAZZ6i&IUnL-g5k0|Ab7uu<}@b!&+oyv14^_NSEc%D zXx;he&wHja5fK#$Yd@I+rabyQRfc>wVZU~epECyoFhcMoYpQ%<>5zEs(Uc8M&MX@5 z`PGY-QzgTp?A8lhuBbCs&ZQiEM^lC_Yr~=8253&pVS) zwmV#P`epsRyerqS-g!&+n6`1})xw>0&iBq?wa>zWP-~|9o5oh6Rm9>yB|2pP`@C7c z*~r-b)hJD7{7f;e6vGCSxic55R*|_Lm%q8l$Et_-Wo8Hs{5hrS#T|;g{5aSHX*Y0N z3;d)sao^fLf$z2HklT=a%FdUs7hNxT(1{*v%zaT*hhx@74QAer zvx#5z(66!&mU<|X!}h(wiW4#~$*2P?jjQB*9~@TmFMUJYuU5X~N?H`DYrr zj9_;7Iy3({g}(*8Ok4hFi@EcKnaU41AEws=%*Q9n8sTTF|FQl4HF89a2U#Od0~lh) zDf=sRT74M7WgG~WJeJ&Txl#coZe!o2>Lov=-cE9r>hu6^rYAYV;>EYYSWET*^$2r) z8|q!yQG=xT1ari(G{xGFz-J{EViwjdp=(o3w<|3B8Fy=(Lz3>eCl)W7iJX|&T@vB; z_FusKIo0cO^zQTCjAoH@--?JhlG&CH4ok**CgXq@vEH!CBjsUz$@i8w>^U*k~MMkAn9<$rw``C}?sgF4O6H`^d-{?5ZjQyuA(8|E-(w7Eg zZruOH1lRrbBd|wGxDGE!4Lf&cL&K~Y|8?XBiR?u%VlN95p(Z^gC5M5$m$p}FE)$v! z#kYMLhJX8@w#sfy4^-ft4*EeCGg59SzQ-wR+3`8!*p0wiAU1{%h_P_j|GS^anJi6$ z+C_nRx!^Z`1Vo-KA3t!-YS8^-q^w><>jT0@&QbW!vq+!Wo(O z{I}{!ut;L6t3{?ugfrpn$sBdN zeqoaexN$(CfMBvJY7hfB9a=aYt4p3%oB^WJ3|MREaA<&!n6PykAO;g3VffrNEwh;! z>Pa^}yL$=uA5VeKTOM8dd~8uDCMZcXvi?;tJUxuVAU?5r(OtS$zKH57Rhg;SEZ61O z(D%TZ8Z0a+=8j}d*&H_S8NOkTQ(k$)CP#HHp9j6!kiHWy`2`pB_6|IXhqB}~LTo@c zH&X+w#m?5u_K~V83KiK} z1a2qcQL8*YSDK0#nTom1-wI#0X%Ke@S&02h;1LhIb3U#3lZsLyXgDvF($XSH-M#3C zEBOR96Fkw8((Hg*n>-EA(&S6ahY|>{1VlF7C|iE)=z6@O z*T|90Op&h*a6MGyQDZ&U55+(NS{!&QGlpDAJx#Lm)-`+HzBtc`N;AU#+5pkpuOj6q zbypH+zw=GfIOFdMi-DW^?IJv*`;DrUU*Qy{dU4}p2ZZ49836#yFM1T_k)8`zM)6^w zL%D!}$H0FJ9zKkrjklw6U47L9+MI;|L~UAos775it2x(XFE=C8YPJ%4Wr#^ z>gPVUpL=t>67E&CH)4j}pZMafx%0hELdwN8vyXCfy z`TU{7?*r?iI^jd2DWfWrF9D%al44QzuOeu zj@cBR)bKXm?XRCEM3C3l;ttfXnYrg!wPYTwDW#IW^&LGb927G(jg+Js+(@Es`JkNt zN*F(LT}}3*YQ0`oAOIDuRn#j-<{f``k+}yEo@8^}eW`@LIY{`1&FE+;S9t5&V6|WJ z(@pL>wkQF4D$F+`f|2q22C2M%4jJ>Gh6oHkU3$wS8kUsd^K8uG6*Z4Wn(!$4&4 zfFmNP>;~)SI^R5YM;E9k(j5D=j6O~;KA$0~5UfnS#nULoAaRuZ;Iq@)w0@DAT=HxM zsYNEGL>>gz5`jE6;1@K4zK(+}!HbW=*v0q0>Y$H@2AEWH`k6Kx(TC*(KK}9iSM;Wb zP%|Slcfq?PgUqo`2U15z#{iR0@#47m)!JuB(8a~K*?OQ$YmGPu3`lLC%TYQ2-vC~& zp#?L0igWMAI@USjBPq?GMf+>j*!J|qt~C3_dWvBRc`z7BPbu8!rM!EAv>40XWPedQAQle&dg<@FntY zs0}4sgL%P*C)uDay)$PtkwA^jYNe%+7p`!0Q0T?^XtEqNG1=U^j~}e zT4jzQaX%fZl#*TaBHpkAnqcLvON#aW9Od5%>N+WQ!%+;?f@#jbNu#DjWt%A~snHonNavk!ICpR zfS9#h(&~$8DSpPwegd@3YD2#Z543p4HQns^4xa9uRoWR6v2{NNq50ev=b0_9hp&+w zLXSD@CFn}oS_nTo=A zBVy!nx#(7^TtveYd^f@?e@ATpDlfkD!gld#h@?%#?ga@Anp=i4_wu_4JZGa4lq?9Z zzAYc$m*p}eUs0r(2Tg)Un7&LiTau#v?vdbIiU~{i|wZ+7g@DwFdzN&~e0(_f(vx8{E%*MF6sOQopmUvA^0VJ`A9^xIALs9O~4gn>ja$<3Vch%d1M8sbN*YEu!uU zyw5u;5)ame3xBL5uXMEdIC3Xm%XB42M@Om5yL>O%OF3IQ-I>vz(7T~YuAgsq`{~Tt zmH%V*WY}kE@~>!(cx2JOY1nGh*DXf)ZtEWb3(N)WJdeX|To zM;DBrMg1?a>Y(A5ocLu;Qejo`V~BiZ*Ug^8*HCd6#45EN6OBn6d)r%OI}>0649!|F zV&2|=kRH*tGgvlPbFK@WV8{V*B+Rc$H2@OOAw*eDc2t?_D>6FfZ0i}`W>_91_y5H^ zo4HmVBWa*OBvBZ~I z@Tg}|aY~)l`JCgJfu`+hF_G=wI*LS{IRczmQMQYsq^{z;y)*3n*a#gwo zW7hctDqaIr6~(*gwJJgXKH|7^IaQLp?c1uvZWjcrbB4Zv6pJqHCQ6mkZw@?e!9H{*?&fAMy}W|1}*Oy@l@m7qlgj$8QYe zr8>{3*-r$erdpCb__My8c-GA8rP3j07O4~zEW7c?1SG#xP5{AW-~Qxt*GQAA*bn%y z9&>{>-qoPYo3zjk_Kd9_wZST+ofUuEwH0^f`g7eIfqn6=_&LwD zS$tPPk%)N8+9e_J0eU$54a|(V-L=Bd&{VY?f12pJY!<5kCCgegp!^m?dfy7ZECY52 zm5yt<*ITW(xF;Tw(851~k5oNqv^H&3L@j7q50-MvZ8=V!Tb4X>D5lu%ue9=}D}@ou zRb0R7-_3l{RW)_n<74Of&d;E0cY2LCC^%xom{0!B8KHM|Qc=;{ZyrcCe(~=1BTzqZ zjf_-o>Q0`fs$RXrjPr=7MY+VGCD_hb#H!u-JR(+FTmJ=KGW5~aH9Zp?)JP{2a%G#C@mf|O7{Pvd zsLSK*k^^Dp1-Du5AXQ$0Wu8}1@M3S}qr1`g83g~Kxs6jbpO~biPxJVyRAhF{Av43W zSY2snt#4(V#IiYGi+`+L7`*-adzm~^`|+ci{nd$#2>1*rnzZ`XnWA8qm-j}EM*w3F zNEcIJOZXUD!Va?JI1PP2Lli8BwQbWxpE!@C#un_#Sv}trR!M1*NdL^PrCJIT*}x9_ zMy(G_UIs1v^-AVeegdUW5V5>wcN<<89)W#cE=fS7j_p0KD@_9M>j1AKf>eLv?4Tiu zrvHU;qCAIE=GX56GB@sm_-DUfUR0N(wxpwWBQAPR)py@9piK zLAf}{cwa)0$1@`y@2&U$TmYMzR_xi>Q{j?FH=Ufzqi;(udfR0y5(@+1=oqqk055L3 z9 zYyd1koaa?$VP&5~nYzlKdgbd20d!HbZ(uNiY1tS&=z6FG9eGbBe1bK};E)H1yC~+} z9^3vPiQnRq$NYFdxv-y9%kbcMWl05*6}2em>F>&BP^5<}<17i2!mf(Ej=Bk8K<5@- zaLOM6LD`QC4GmQ=m&;6(QB+FbxBPJUmQKZ3q;0`o?z%Akn02J0c}vm5$@@}iU#H1#-#c13 z3VakCbvregm3DKlE@@j8N8Zbke57r4A0H8i!=z5+lNIrvcM-~`KAk^5S+*CKAxaszEk=IbdTqG=O!OfVd_R}r_2?EdLOPt2Jg9hTMFnz`qD zH#6(DtSlTg_qO~$@G$D>v#68Lv1>+;gF>^uYkGWe;d;bg!C6#<*9n%0!Opat+C4to zz`T*ZP8g)za-4@e>R}XH-=ll=cC+{s7=_Oe6-araS*BNqf-2r5&AJE@C6EEDaQObJ z%kde%Ltw9);Gj#-*xk_s$1%aqw283+G+6R`gx_846T<)kH&&kw5N?bM&%C={`#xr| zFV5x(lD$s26Epsqo|@7S66Oq2G2cyC5b&E z+N+}Z1D-o+{|_<1ty)`&_0eGYkkOj&5{1%)G^6 z8Q*5+rL%;rwgh4KDxWTZ9eT#CqN1aX(KbEjsEZzv@Nr8uc@r!w)TI8(iH3%JuhX*g z$a{}TgxS6|BoVbnR~zLaCQDVd9`8~j03^ExklOW^n>=b|+WX>#Q=n1QdGn0oQ;P7e z?On%EeJ(3l{VpIqjWAKRg^H-So+4|WBq$0{_*lN)A_Q@szPV)3!kgCZ9m~SSkN^qJ z)E_i{|5yG&WKw&)QFEd%nkl{waYn$D>DM59UyLVXE#BFDs31gCOW?tOJ*#%F}A(gznOVC9i)1O#2${@sf=1V|My z9iJ-Z!P9>2YM9;<0RL61rs&M{Ni=E@@NlF*nO)q&HXAU}`;^ym)(oGjvLpizKDem? z;WAY3Yhh9Id_Q%OGk{JN5Tl~KNewrcu`uI}UK8!82tno8^w$Y%Nkh8Y&G*)LcC(r_ zGi?*4Qh`)m8v9oH0FSoM*vHg#2_JTxXERo2?RmD;YgC2!$|uQ)>bVb zT~0CC-+i;-{tnjxm+lpO%_cv8wQjdz@9&k5wHSzF zkUfV}w$xs81M5LvL$CoVWttVAmwXgz+Wf4M>zfR`UClVr(^bV`>};>wnM-_PS5U0N zBEpA-u(vPY4U_4M+MQ{{)Y#5JXIekkS;WB!orEm?*5V{6{oyOC+F?MOzcWa?b)8kP zjE9^2v(sly?xd9=ze2zh=J&DYc_Q#hfZu=`}7`Pv*oe z(e|Zd?uP=}NDC+@*^>H!NR*BKb^%C9U%G-gY-RufesAUWYL6+YKd(kco#bfN@{z;! zxU}`)1GyCG^w)l`CD$ODeN1=UR4@*C2Fxo!>`U^!vO698)5~e1_5->aR#D+SV`i># z`6>7k6*ND{Pwr>G)82P#->#w9HTtG4-Wou2o}G=S{H%F0=8?*^b?LTYrSNRD4%!qD z0RbX_v|jr@F57iRsbGjvq9W4Rxh{8z_=HG0r{;Gp+diq=z(fS_0pgwXg z86<0vkW6x5)1L8KP1)I=(>8f^$yQpjU<}XEaXjtS7qO{(A!gvUp|7A;tkn;MC4`pT zF<(29fdGJJ((^eZG>A9C!>0C$V#Swi@&b~xSUkD@%5vMQPv4VWs&KVbG&R}l$E%-E z*4Xk3ATs51Kil?Or2X%3grBFVZtXM7Zx)*Y3J{5XY}u|mj%=_ctYW=^0hvaz3hY8Q$ZJ`zc_s>#*-oVqMrt%u?| z?~c{=ithfxAr5zix~O|pw)0LC)842T#)syxj;SS@wN(W|U+22d)EtQOI43UmiJV%P zgeVEg=u!h2@6cuJZfQXnz?lN%;`%Sd&;R;^VVR<_F;V))C#jLR6E zl(gNa4*zw#{Sx6%UjF1rjQ5z#dv`{p^U1`#Ox2T^qx4d5Y}mk9r2G}7?$j>f3hXl| zX|WK3ckdgH$8Ggv4yb*OtALTC^V#wwsV{RO1`*dXria@EB}bs!E|Z#aQP*=|(gKC!)RBd1j>CadN(dsEng zv$@IrL7uNA()^dU&-qi3jl!Y7_B{H&l(!N1DSEKc`koU8(`hl_jVfOQJ_{g30(~BC zaa9IjhY^5yNgZ5RNeOks#FZd%ZU~LRrSNU_idb{k8DGN6EdG{tKDm}BiBlo~=tE-m zKI;z^h>JPD&4yquRBiB__y3c^R;}6XY*Hoc zGH@Amv1|2BgU)yFR*DXj6Z_Y{1AwcE?i`bNcqMu?L{d_cSndF$E7{wy3;$mgEhsno z_U8L{2$a+YJSP($t2;a*>?;HU+Z$Se3A2D&m{eWzZ_Dt zzXt-#g`{8eG`NaWIN#fw4TpX?pmv%t%>mlyXP}}%_Tcb5 zQkTfsmm~6>B6oDx7GmjrW0jS>7}M-%aJZ5Q5j2FAC(F@4>YixBg&#Gbmck04pAh42 zMzJx!?HK)XK*Pgcz`rOGwv>^?IaM<_J4=1yA>j;&bU%A}u5i_ZOYr6se$3X7esIs? z3Afbe`{c~z1OMqvl4lx}IbW58G;$O&A<-D{eAA=!{B4Q*-sEI;yy)2j@FbtSuTIDO zpEmp?cXSo%hNDH5kW=(HT%i$rZ5FxmYS^juG*s3Vi8d$&{4(guYvqxN=lkhIoisIN zl`@!*eGjF;nR#_F*ZL{}zolAl@XzNcb6s4DFjX6Wn;9Ryn2&i?#9|Za`Q6JXnXeT< zN8cZL-#C1$6al?C*hffQb1Rmjn*N*HEiY0hz=3i?|BFONLnsCJ|E$g9oAC-$VXnu3**fF2?fA zsgP4$9%h)al|o|;5}pzETN)@SiUGMNV5+4B#!dH!K?yu2{`hNTNDfyNPHdq|PsgtP zLr&Ek1+=_m;b?bADek4`9x5&THgj@0`(8i-eQAf97qkEX`Vv{)w zRKtWB6tT3gnj`Um-nCxI@cZXb)eL~)%xqc>?TIUAjTzSbg_hf5dm!(Gf!qy>DyzA>baz z|4QCngObBe$%${;wJ5n5o$82QT!C2c-B@t3zGkX28D2OoBs;>>nI)ARDr1X4Ar*($h(eR8Q=$ErCfMq}2{3E*E z;ix5c=6kZ@UEMct`q~2l(@l=QqO;D%${jemZvm-LLLe5e^Y~TQb##H$CGaPTSgtdi z3MlA*v908_3q+D}Ky=y=$j6 z9k}>Je%Y7TG;}x{06;8XUaPu3N|?rF z5L=~l*RK6xsF7O+d?e|t{Q%J*L#nzvsv)~;|1<|oc$`^O|~=PeKqSLK-TFIM{4$D?~rQ1uu~>n zH_W0+x?Vhb`Ke^g{j0{lvISyOfIRY8&cwQL6o(;avOHPktvuBsMP~7u6U#fC@Te}V zD=$zyw6jS1a^zld9FyGy4vyxXvwB(C*eor-cm|*KlvOi$_S(bdS_?+Lb4&CZ6A^zX zxzK7$K<0fQxLNY0#g7HINp#*sCoyLp?<<#3g~sX2h@6nmpHV7xRsXBO-$pY;F#;x? z6|*teTh4(N0%Q}tQ)Sg;Ei-cy=^RugJ|$4>^g0ppny&L(w0#3!r+n_v^))9SQtAE( z@bqMu<4oSY`@$NgVVk3yXj(JPtkdD3N5wglqq84(>s`5lP`dT+RP&8$q@6}~-(D4L zr*mq6O_evZ)ML}v*gx*5DB3D*Lbek9Mn-z~D2ZG73x65w5o!!HT(3t-crEqWZl{*; zs|~zkW0IiAIM{#ORZvuzy2C7yWvZBm;zjr0)(8IEZb0U$P1P()2#j5;?w$$9j}SFS zMpwa*ukJd&?I^H>KaJ#o>4teo{P+I@cJ)r=OSm#~T%IO7QTN7Uq)oqR{_HcnlTrN9 z=P!nwd(5fXT#PXB{(1^_Hg!kuy2XdLxN$7=J0I$P=r!z!fDm+5-1d)*gb9=PZ=Cf# z{syzLIs6Da#)^b2#*)rguJf4HUt~bI&u3NL&GxACOfiv&#uQ%83O$3cV8UNfqiX<*aq*qwB~Qn_ZPSlzs| z_4PR1rGb3FRJ}~->(`ji&Wmax{G@~`3tq%Z5&XYe436LPK zA>;RfOc0MfuOKslBi*Fpwf!ABskXp7Z`>=3&G^IlSp5-l7%j%l8gMZo=&|PE0W`^9 zlan2CKl7TgEikVtXB!<;&TiJC>#eSgFfaK?Dvgk-9k}7V+&I(H9i<2EIc^6M2#_cB zl)*alWVs1rR}TzOh0CYiZTcK%MAFjNhxtfhOrKA6W8g zAE%z7+bZSwlkl^mWj3DLakp%0>6s`&)_8Q$AYI!+@^>pB)JIlM_eZHB8S?{A*A&z_`BH$d4E#pP!1hgvsdlav2y%@Nv|L?n$Y zKeVOueOeCag+{XafYm9DcM^yb9n>?+eZ`SpTlcZqzsjJ|}zpB=Tn7mIq z04C{jO?&=itSv4JL7#L0#7gS7vTwZBtAreOl%v1&3zIk+@$eDP=p7{ji$b1$>oRHv zR_@Qh0ES?!6%qtbayer0-Q#&CLDCA~VXuFcsr9aFB>p$Ld>NyopA^o=9&l%#B$w6H zt+Y7An~qo=DYCWkK8x%9xD<-?lcj2 z{}!F+mz2B}(LG3zL+@nb6V>|~3A?$YgtgRv!y0^cgMO$R4TZGZ5=0%TW?norzFWjM zn8<16VGM8fIv}7xuG|`Gh+nVc=}H;8fZPp;#wt=b7_u?{D-HY5zehFBFm_LovnPDi z&Y6VyWf>h?N-)1nDfJ{jwc~oL?UxS?1H4_}mm2#Y9hEbPHH?*{lG^v$k-(-HIK!2~ z92SPG0MYLw#hF8mMrsGMSZU-p7MEy2%n2>LgpUJn^}P=JYmdsb=Z2K(d)0hNCv-go z@*!RCOYVSZ*!4^BWD4k=v>>@2e20`AMVj<(AiBuKCoHnQm{_+A|= zAY-fVcBZE4%c3RJw-k!g?T}INac#(1m`y*(DG2OeDQT2wsXwm0p9h3jr|#4&0Tyg- zS($9(oT53J_XM!C>GH?b4Qu^a44q6w3{R+{?pMD@yNFPrU#r?_fz00-3mu+NxxAYR z1BdvgFr(UqzpKd>WL)FVYFgeaMA8)s5s`yYHF`U>l(}V_o&6)w;iMx6oAA9`Czidd zXsU|?!|2#S;X?lPfC7&ZtII=4P?j#v8){6}BvgKFlFLshHlsep6@7d2Lv3r^1Jm&h{nrNxj*mGe0-&{kB%{I$JdyNKBp7YLGt%y#}-} zldO5&hVN^{aRWf`b!0fB?ahH|%f@Dptdf#(rHw9W#@T?1!tSx7Qcz!VeD`MvL_=c~ zt0nrs4AA^&1do8=AT}vYA$R1JxfBUFj!e~os+$VP^_$jm#zlKHAqghI#om-ln^7y1DMD!n zcWilu?gjG*_e_XIivj_D3mh_>WbOrI;Jg;Kxa*ckcjxOfBi2Bp>4xha{*1}fVQb3x z_-pcy!xOrlEE;*UrcNxFA|MNimcoyIXg3EfE}~5DBytvmFql$-cI-vmQ$quI|Dib# z`W1Otr)&IeT_cP}G9Pfbzeg#3xixrfYTh)V=^TzU!%GWv8a)7y`a zZGN1-Rg~^>o)mk#TyUoJj!mu$@r633^Fmz_9IXswEgP{oBQ@W9b-Ubc;C+LJo}J(N z7sfW$KjL~uNqh(F-~YM(Bhz8>$>jW1NfaHa?1esHOaWu|I6UXPmdJGOHJ9-5nlPF_ z+n~DmGqL+_LiTIK2e2ItUSorh_d|SWI~s))1>?mS-R|EEg?z9$$u75F5D!QwiObQx zf@MA@WyErV4xEXAkz~S^74MuCY|6r4PNp?o$q7j5>Lhu6Umlcm2HNVwTYR(3by*Ws zND#%(avgv{wQzosWbA#u$bL6l2!czBWm*)*fNgQz* zl4CMjRM&TszlrEeZh@|jkg9#~ECPi6=FsrchJ@xgb5LiQ%^H2cPobjsX`h^Iq57w- zBhlj&Z4LtMQr}>z(7^TG&YXL>nXVzr{@z}ir=#b^sa`{k5l)Kvy9V7SYHFl2Y9!^*Aa3&!lLI3r@*1R^mF>j+JW&VomByo0c zuxU%=sC#hW$EIDw(W>X$1fHX-P}Z!}qzj`A*R71BtGR^>8u%DbSkIf&H6BP-!aL`} zh$y;6N^ZT~i%YR1X1`?>xrTth{Di$8C5nMhh|7*>u6@FgCBl#)X z_tvLQ@9!$!QtUI7cLz5McNS@)&X3hewqa_Dva)2Oopo>Zae+Ukd~Vd!^_3I??rkZz zEK6P1yvxr9^IS+$OC(?eQL%Q?j#L{7aQ#0QKvwoSC5&@PXFrFm8GXX&$_rq&H-KjU zall~8#juQOdDPekJ2DM*CEHCxNZ>Oh_Rh1tA0sWTT?^3`b0`MS*;0ue0<2~5?GEzH+^IcWTJW>@vl2=4(reyuDYyrp?@o<2KyG;*Ro(!El3KD1fELAf)u1X|M&0k2eG8|o<%y;Ps>zO!b zNARkY>z*AXWnMAg-kx^v`;7(zB6Mb(RQ)P%ROtY{B3>J-JP8#!JUid(mtCY>-ape8 z=ufgeFKW8$s+s+DEvlk72_{d4JP6q*r>1^6W?qSd!DyttAz2A&5pie;zSchdtJrOm z;adbo1uIF|4HwcdzJJA_j5clG>&ulusM*`=sWsku_7`%Mw{bHw`flS@r6>h&85sH) zqZp~hTpoi_q&(QLlvsE127ees@Q$BUm&vHNQ+sdbB_Z?q2wfBYgs~?^O8Nr_(*h5> zO49Oj`*=V7VOBDlZ(U0xRa{;>;9hME35Zut$qK#7s($BOf!EzT&SjA~!QD04N(R|8 zHkP`2Ycv%X`LOeijqM|ecSq4tbW*qF;kt?kmCZMQ zUNfiKTH9EY`t-G9jtVP<#+m$o=h=_$5cuim}bzz4G)-%Zd7k932S$1VhXx_QE z{P|FmT42@Ww`Shk?%K30QFnVumNSKC5@GT(CS?67ciNf5O;Nl&wF0n)ebBX?y-vLz zV5&9vh3UzW9Sa#s4r|bwbF$JihMZYP)-UOo*C`WCw8qy3*6>){Odmitt1l?SJ){=Ax{+{w)BoQGE+HFdx*9}%r{alo(>wzp(Xg4&EFv` z*NXbNpajlEy^^|i$lRS#=qJSa-iv)W9DV}ypyQ$+cJ`YAyXiN<_%sa_n(WsRA=jxl z__39L<<;2gc`>lmZS2qdXX^GwC?#(ag7>%M`rR&$q8ID6%a;0JxH{Z*>*w@2!kyLC zp~HG=CGq7NX9oqojy$)Q{RH&NkF-b?3I9nU`pMB2&JGM0PCURZn)#CN$BQ?)6&ezf zg^(|skRv?Ka=u*|bE5A1EhTKHlPBzPQV{a8Y(l1L3jMz;BNE=`VBpj!simcLkT2By zsWe*OE!z;?kh)8fLF|>c_{oIqQ+nKLA?-LrYXwYdpQl)Fd zEft9%OOuRP4lc5%!C>-xhIsYZzuLIVf$(u81L}mjJx!#r%D$_yCpz72>ec?fJaL|> z3&UHj-mlS6oIwk;qN3paWvN>uki)1O8ztjHWo6@OE>{}Bz1eZ$a5d$fVHc-)Qz@Od zlJydznrA`iH1htBPWCHVS$9iQpz|B@pk;4yre!CgZZT-D9cYaege(iY`kML|3tLvC zoZw&YM9+T~Ypsv0Z8>!p_WnpQt|zM=)aV*DlWW?aQn24C zWTG}KUFtccHqfS58Q`sdAMDG_>b4;?!j<$~T&k$HlWaSXs|fzZn10Dt6q| ztw$N;{br+2^11kVKff^$5k(5`nK>#~=mbD1fezHs(UDufz7M(UoHNUA^BH$>ad8xt zRgNCpQx!bB`W^Mzn_+Gv?;AF+v;NXH1WOVM*ZPSmdDWda`WY!5nj*TQxvzmj`-oo@ znQ88P=d!--?9D#+u5Wb^Vn>iNop)wVn>|Z!yiU_{SO;EPjA*R}QN8uoj}ElZhn){A zs;V4Gf3}MIT%WVVSKhsrEp0@vr6e(o{0*fjta$JGa&~08&GyVLN5|g&a2>U@-jt|7 zm3uLT7`)0!2AtBM7eS%bf6P$6R*;UHJrq0YFw5QE$uL8PU&Ld}rZ-AkbG5S%Sg`zD z+nsDn+V!F~ma2;6RZ-^_WgQeLCogN`6LaU2uhMNl^Vy?1xIJs7>mqj&m0-S)_!jFB zB^NpM>JJZ_ekHEiO&|?zlWmDzDjyPKH3sK|1TLFNkSN#&5WMp3cO(PtTM{cM8?;zS z{x;yZ@d9u3d%1r9d*$4^i`6?nFzfH^?5wESq=aW9Km^4GF&KGw>*KXJ)P1nSBmP<2 z&=nQg{1Kzm4^0QxzgRi3V(M2GSx2X5NazkRDvap!141TUFHZj@`raC*b_M}bROu?3 zzuA$bwDa$mvQIE+r)*5%6Tv&J(Oay=oFw#L-qfI0jC+hP@xM5(+S+Pd_&4Th56Kob z5fl`>J^t4lh}6@+5g}@N@@1Lqj>jo6iz8{s5Z}uBVBdpy!OfnEY2w%B%ZD7{=4nmf zokw#m{&|9{lfh$}t=G0>K(vyBTj5`wj`yL(DrN4Ka;sI*gI8BV+U_YoUlwgg6tE2%nJzKX0kVvvz;j0}VdI^)2+*OGJoi1@HLj>Z0lhfpF>|bH?5E z*8Y*y9SXIC2e~D(CQG1Jl$eM{)<3XWqHIa>gTR~y*9l@A+YhMMW?p?Btv*&2KXcbC zEg8DmpmCti9(n&Wd0V0w(ey4f%l7bVRxk8~jGPn;HJPl^O+yox&$g>mmvVs%0Vp?Ho@y-@dWOrK~Y_ zgV`p|zKNvK;-iFRx6J!!4PDM$uQwXFfnN>qWdZZuTa2^wmr9WEbAqs3TC)_V|Qv*(Ri3oKq?2EIg*Cj6(U z^q6R*c&L5KzgaOa%%d4U4_%!E*cUck41VZbT@{tQUX*%Chz@8JFsX9NreXspHSUIe zPe_Xg67%+8Ko@jAb(@n6r6M&U%fV|^Qo*a`I$Y+R5XJ1j?~(~M6*KsZo;=VRRuw%h zdNj)U@GGT1D`frD^v{gpA3X^hp@#3Zp5PQJ4EIbM7u$~*zZJ@*fH|mc()YU%9PCx%nYohQYxngcjUTyAo6?y^K zp7C)9sLcj7`oBPClvmAw-PiZ4wkH79`|2`}&R zo1|_yWYJG9xq*TN@boTQ#`5`#`8*XR_St=%6_WAXk{tH;N-_dcANOv`py)Ik`jJ5% z?Gqlyg~FZiR5C(O*{P8hXl3wlf;v=yEUBM~HSb--=W)upQmk%upm;RzZ-ngbmONE| zFsT7On4Pr%=}w)k@l`BIGw-kTh1sqh%b}cqqB_aoyH9(vPOV#N>YnYFcY#XEj-eS` zaiY=M`WqD)J-izfvP^Q~g564%J++ZNk3X^zh}}-o{8YY?iatc+J(E4cPYbnMot5+n zwIR8k`FxqM$eoTZ!Ix;A@VmyAmfPAU=>PTf-QiTf|NqC{63!9fj_aR3k!Eapz_Y4US{fQblh195iUqPl9o@V!+G-76Di(CD#G0>YK(#sxBmqc zaT}p6ji_u`in*(pslI*_yiAJ-T2&a^|1Bo{R$P_0bc@;!$Ai|k<>9|{P)T=~$CZx>j zo7cG$eJ1m7XV!}4Re>!M)q5Lw#kuM4=;q?pQ%Gtb#0rkWzS3le>V~48VFyV!sQp&z z(lQ2%6+7)gz<~sOF=b9wZOeCW|Ii zN8f8)89B&%chOjQq!u2il$2VoppQ8ph%!EcJg7~9d=xGca7Z1ko* z?%$`lnNJBe2a{9BeKSJoEuCvN{#MZJj2zb*AwhwwT_@EWM>RDV0&Qv6SnG>fikc>i zhg6%_qNAe)GT+KHpD|FofS97n>K*b~obH5&g78#*bKUC{_Ve`QGzd(M%{JMN&woY6 zZVFkH_gv&kiPzaXz)sdlZqth0v5oBe1;0n2DOsJ*yrBUA8rGT*x?iq5MIh?k!2kvD z+a~M()m#R|%=J$vDSsYxU7cGg(x0mdT)hhBGDC;Kzx_&I#Clm zZbv520i4Po-}~F@x~uky9{7ISqLD*b&_KF^>oQMEqZazu4Vq4w6s@1CSxnsg$U5#M zF#7O0U*MkI>7}1LfKxWnUY;i-;5R`7jULuJABN6A1+|Phsfi#K{YQh zjXCY5kqh;2GxTN##033LX*EeF5xE&4u)Q4(7y+I$tL@%Viybb|&zfX~QmayN0iD$v zbgr?|x!6Uia$D23(Z9e>SM@;0M{m$rTUeLl_xie^7NpxX9?1a8-UuF7y*_^Hz5$sm zV+qi$R6y`_si|y=+VEeBo9mPbNT zTkyDYcXzFHQ#+SJ6jtyZAmv;w5fuIh^F1#)NSqdQ?`v?=zSxBndWlQW#YjQjJMKz+ z9j-WFSU>I(uFg(woG|!zdwt|>%xvBBv^yZ8L3X(G25@QW2gZ7R-rng`OFX)yh`$L7 z`#wI7hM6kh7dye>)V*_v0_`(^eTo{j8S`-Ch#yT2ChLE3o%E1tldkcn6*&5SYqN#Q zE*`0BKB`e@95PpXXLovo`x`|A#WW{&P0X)x8H`~ev=>E#lGhx2Z#a>7s1&3I*`(`^ z6L`*Q`LHzE|C;4P%1^G)V!c(n8WKY5OmPW+8<^^@;yp3(Gkmmho#p9+tf6HgdW3zS zsxFWM{sbvOtwi~I4Kc03Quy40l0y`hg>X3$$?q!FPeeM@T+9}4v@+2j#Xg1d6pPl#E7mMJ5=O->?w)2pq^#-mrPYz6j_-o0h z=?=Qt-&r7R_a$pg(*k?8ecw8PXu-m8$34X$9d+*9xqYfyffhRbOyz%$>JRM*zI8kqh@sP+e7H=KAXZ;KcVfetGB2BhYG$Ypno=J3C>QQ8y; zUpTdHG)SO^)Qn!4U+&5=nb3gIv@afjLlPbkCAGn$!2y69RrXij{%w&@DE{zsUuDPl zLGOUfth9^IH82clbhf0SDOkpThLcR54k#W0d<*PRop~^cZa+AS=y{Kt%?v9*Ilm`Q z^gq@4RwmL48w2_~KjUxx3VXJtN=_Ege^ggo)!pE{m&X#pIu z8Qupobgtce58K~d+Mfk|_+YS}@Ayef($%XIc>4bPl3r%m^|R#<*>1Rpm!Lag4gl-gB=`2w}iTA9A67@&fw%L<$bKRY?-m zWdUBA$&1;R zEXtw%0QZIm3V2Xqjlq@%uyS&}E^lhWe|_u-vz2}V;ivl@jtl6(C`yK0wt3ntm!FXD z5MXClKp{AP8O24#5hY*Y+xU}qkaiPZA#oG(^qz^yXZ&0;MXv+lbyf9tPvCO!%sv7lh@4~dPiD2w z6lemA!hS;0eg2n)-)n z!6t$cjhi3;m{GAVmLVgDRw=+J86O{?;=etZ2C7eLkoz>h4VCLKgOuWwUuk=7NKuj@ z51-G zG|XbKop9kiqry#hm*x7#j(raaMD=|sQBwFl$-5^#jVD>TJAHz{VG!e=@d66!9beS? zlaG$hMt3k_VuP5a6UR`-PR|Ap6#Fdz?cFoUyWf(1BVxvf4|HvQ-!}+%dpTG8X~I|5 zuO}?{mR8oT!`7g2HA1Tjr9GK6a+~c}|OKzRUS5ny-}bRC)4W z<@prl-W!`_*ETdz*~B-rfi!B_-ywB&F#D`LPXqAWb)Fo`PFdKk4XNb;hp+bXm{{7) zZgE|11y5q_>q~rA1+65$#3jL2svz~^7d}zVbz~JBD$90bxPmmtKKSnTuzVG%qACrC z+p`mqG3{)#ken(e0;O{8TECXOCrQ1zmM9zEWuFN2UO+?OQv9D2y!hWfC4~KiKwhg54Nk-(KpVcGUHw~vI1t}&5u{m-dQ|Q=-PusB#6EA zGU@>}qoD2^W8}Cbux7KSSeh~&aUjg-A&f9HRn>&9xQNZJK{|<1!={2!XOvG&NF3Bj zs8L+nu7_ekRiL06$HnD3+o1)wv5X;q5d}vS@E~YKmP4_dhB%WV8uf+s{Q_dR(UT`f zijP%b88cdax$t=tGXkgb0F@c}Wr6*ZT8Yzu?6-C{N-`eVvyc*M1L=MA)x8+(7x`g- z9oE2Bx-0bszO>4Gq7+PimKY|jQ(OC&xml}5MTcXq;jMUY$r@OqOGLX40vbH006}_{k(_I$ zkBSXIqHz2=|2*$45Sf;Ceg4dtBVM1Z)yV+}+f8R(g7Ya}JGcwpXCi^Pe2BX5HYWy) z)B=;(4#jRQ6|V4FSsfjEuMFFZL2j!8sH3AbN_p`x&zQ3<M7E)Dr)JsKuq z>e0d|G@65mGh(!Yx9kVt=1UD=Lw7O^cy}UutCg3y?*+@z5=@vJq6$@O!*RF^rNu@= zotH<`yI$V2py_tKaO;Ptj-;HdXjD(|VCVi&3Oy6k_Is1J(Y}r07(%#S z_l?93{nRBu8(9Q*Sd`1wyd*?V38*uIG=S(P(?BW;+Epu@>OdDal|$;DB<$7(N6IeO zw>x|>%&K;o?+C3;GAnnYxf(OruwG}>LO!<9admsiQ1`pXx|&0|(2KC+p^+lc2G zT)6jiYrfE&?F%j+3Ov>>8k`RBekR&nQOMgv6c(yF&$HZVJY4*_T#c(ksQiOtbVdksH^IyGu{B{OM&5&o}W*? z`?K(*Rme2VI#bcsAnfXUpzSYa|GrEaYgdjoJQIzjHTQvP+2vpNV(IyG@pdOTfWH2A?`}1Vj<#$Q`NlO_@ z#P*fK%LGq```DR!){qvUvuhg{-~qRR91S(mWFJRLY9-F_<|Vg-m;rLo`VA?5tWee*|zodlD0=kF0usp7GIka95HB5y<+ZG0QJiq{=ep%0bM+x*WhxLj+sa z*RRBI^L}f4!j3>7akwI_GygM(QAq1NsJvGR#ZEU2nk*Zp}7(}*KIV5jhN+rS962c6?ws9S~R#X@< zf>6u~F8J_|ImyNFe85jN{hE(vnU$joxEy%qQY)sNQG@*X4DFz?01E9(Mup8<)F}H| z&;bV6fnX_hlganQ%*gWUE4Nt}xv^O3Do^%sxs_c$2*dx3H%B;wMye3=O&relfu~^f zm|IxRoWio_@wTrx{^WQ-1on8PMmc)=W{!s=Dfz!WvVx#qwPdfR7jex9Gva3?Y zb1Uj50W4H25viH@r|2iTA}|QNKdP;@x$n;*DzVR+vszhF2o=mi`Iowvv=k4;KMc3}(C8(V}ob2~e6 z`~s}h87gE$CGU}_o;QEYK$hM7vRR*W6$u0{ z8TjrM5WlA;5^)42d}T*MmP5-9BVUT&hU$-xiokqa>W7Ca;P-dWRQ zNdN(j%7tkw0xA&+ui2c$OiXR@vT!``;fQ(?e(1tntst34cWOI7T3-@vTN!Lp!~!(| zP8bT+Jp-&Q`6(Qe}Ww zJgisG*Yjq{XXWOrj|+xxrgr_<(g6o7j{-sR8wUG|H52g17dKEj27&jF$u0z=!;|SF zr*{sCe$L!Gl)T7sTU52Q`7T>-f_bwHR{9B%CrA9hz(CXiAO(ZHzzN%i$N>X0tqwH) zJ1U6CiIIdS<%~HB>JFRJ72n5ZCug?OnR9A0RP~Quy?9#?1IBwHwW=4!E(QuCa=!4J z+5Qn3DhAKV&%|You3FpJWE7ym4p+3RbbZlbITMwkM+f|hAJyW0@AD)2*ZcKsrEb4t zOy()QUOwiC&_eW2fi*Bx@-WhbEi9acw-=bpPyDw$+low6u-G|{A=$3Iqr*J*p}G(2 z6)$qaiIvH`l@R0Rwn4nIh4%UXEOx8{>wg_nx@dD#DG7jXSov#RiUW$B0Et%t=VdRz zsi)lv57jGRvC&zV9za}lI~&!N^)P$cG9A(GJbHs2Xu0Y`DgS) zQ?rhsKQtcsm+di#MjkJANw4x1KHFD!f54@cXz5kMs{YJHP7L^W@k{5@4$lDhO8$>L z6oSjUzTkK6g@A!J3Tr1yRq6%`3I)WQFb#Vmk0sN8CaVWnT(UIK(?*1VVAc?ZAJM*n zKHRwEcQ*>NbS=3P!_@7{u0i4Hj(R{fggiYxAsx!U-jI#mbztl`2H?U$ zzsqNmvxa{Gl3N9QJ4ytR>cBbYqR2@d94F4`=F)r?YOkX3%X^RC(Sh*H$*12U7x>21 zKGCo8j|Ki`tI4iLx!aXFXgyQLGw*O>_Um241XGfmGfw zbuV$64dsv0q6Gc6?;JwLR#mjfYkC8uByy?Vj8@$#F1uGYe%{#*ku&CgQf)JKqtFZ< zUgsxnOBa>(T(-w?Z=28ShenV^X|#gge_{eOuy{>@TK?D9os>-sNP`2+{_P|g`6T(8 z>RSM0S(v_l5EJ*0KU8KI(>gv@RPjXume*`1xUmWuz~+udAE}6wZNPFxX(7l0WhoOH zH(ZUhcSAK_0qfGYXl_j*UR!dlzbHEyjOg49a4Fu9$q7FjRjG-dR#4j4qv&=WT=f|G zb{_cy3*T^KW>f4vM9|SD{l7)3jk7YYfv3v((1v7(*z=~ zeI5+yD>bO9lVo}MEGs$n{Ym6l&oB>uuEjOI{7j%vy5D=dTPGQHB}@aWStCzS=Vc53 z6K0D0A2cqV)wE^#tH?>l;<@bC_Vn5Go;8|)c04&>6#>({?D@cBB-F5s6X4>@o|S7I zZf)}%z@#fpE*#_zjlQ%2Jrg;IJkCqoAD|lcQUay6%J2 zvIahEMlH@dKE;g}cqD`bta7-7hB(d&Xcc1QAdsnzHVgpjG(Z{4WoqLGT;bEi7lnx@ z{2*WY|3;a*MtPW-Cc$(Qyr%NYc=2qX$D~}1@~zE}{ZB2polX?@8^s>iR2uPQ=$!+j z+@Igqu3k{oj(fes;y#T2RKsb+*B zOg6n`l%cKk(4pTFFhZ zH?$`}yP--M{%51w$23K4wxEXgHP`6dH$w(wHOpRUizwieu#Pv6nl5@CK?#*>V~rL+ zHrmPOhJMX)?~%Lg1>?uvO(t}~x7l|NV|Rego3JE4a&sF2b%o@ACY};ipcDT1LzDk- zqUNhl4L{CqVeBSS1DcQDG3sKa!2s`9ukVGQetb(i5|3FeuTDE^ia=`lKsm@R6hcnN z%S`s%gW@$!Omm2fmO%Cupa2rRS)StLSH1V9(qH>LG7?oZf=&g%x(NzNO8t?zx9YK{Wl(=;_7v_>*9MMEGqnTkHIM9P`{r$Xf%))_k;S=)RX{bd3Q zb8sO<+R2isjRf!Y(@R}hMul0J3;_q_F1h!=d(E=#$%S-_Qm`m*ivL@bAg=i3z?xjl z_0)XX@L+Jx#h1F&v9V!cJ_`8lm>z;ucAlk9lt~eT&DS4n?<=USUkx@mMyrBgFGpfZGuv$J!@6UAUTby%3@aIy7;(U79%#_w=9?iyvgw?~l^ZwO>qrexLP z+gqo>8?GN;_45x%F)T&`&iYg*Mi|FdMGr*#lwRJV5##?O>>TP{5!0@5-^#mY^gC5C%W6WB?mDe zNdrLPx+*1k8>(4@jV)#yX+N`;qw9`p1+YYPGyfiMsDh2WPWnE92C@YzsmPKcq|qY z_&CdFe8Wx7G)?4e(TGH{67AH!6+wfj6!-V94;b+5*$|7=npWU(b7MMwgss<~n%d)d zMf2#!)kE`i5g};|VR4gUW}#${>}pdV>xh31uBfZ~`@QhaEoa(q59fU{j6#rFWep%p ztu1jgOzQ{r`uQ)13_QH5{&0c`->xqef=2l+#e-KJl)jCi>1XY2in4ExG{}__<6mEb zUO6}cWz5CJ50Hwrj?7U2YlybVzK|OmxF_N9bZ1%4SYknJ_W|!{U3uTWrT%%)wOH2J z$fC+l{+#-MwF_@pEg|C4X<|{Ubk9hj8cs*D4Q7x$2Xr9~$6WI-Q^EC2p3$%KMSp0` z+yUm4BmQEQGyeH1LBlikqUda}Ng`5KwCGh#4t+xdFe2;#j582#@p$mU3iLTrk=7q- zEC^;RzE|LVNn&*6o&D1-5Jtb`LKfLCu?!kYPrn)~L(}<$V*nK|I|aE*k{Y0)U9K;} z!bH-QeHh0a`hO)g(Lz9D6D+JQ35y63k75sRr4dtkxZczhx+h==6N*CEubFRNiWWy| zRk*0FX1U}pc^qzt37@9p=MeP1wHr+hLT4()E|N{| zaB^>EX>4U6ba`-PAZ2)IW&i+q+N8Z}k|j5;b@|^%afjf1lf!X7+^lEN!|$~`BC8~Q zRn~U9C6h8UGU6ORB(SkJ2!Pl5zyGiI`k(*#pEzRfS1zsBQR~e=dE^lve$(%tf6n*+ zaOdy;-#_Ee@50}|e!cnkw~=2HzowtRnDzI?UcMgrwf%m5-M_E%`}OhrLM#9N#h(}Y zeTP54hKJvkfB$)%->=WVfBo9O?;QI-Ug-D9Quux6{qyJj`$8%Hd_DX=$aVfaYU0cP z;fd<#?XPR`=XbI6{_b#3DBFYWJNZ{aVNq$%V-d*Yj?`?}M(|GN77_nooMzkU7G z->-)e{`x}S-tmSPe-ZEJ-|zhXKI)C(|MesM?kSJ(_wVQT-`6kR`EP#_{`^4s`wNBN zA7JDD_VpP5yignQKdsR{{{HoUnbGr)7y9!=ZSfaPgUs#MV$;u(j`&v}%fI$E!au%# ze!hN<`1ijkzdzuI|HtkG4aLv+pFH65+5T$kd)+@Knf~#0alk*e=RYn5yM`^c|MMOA zdj3!E%p3px>-V1*O8@yU?#$Q!vZ&>EE$;I7?+?$P7pni|h5CQ_`uJ~8^!%3}SpVgt z{rTg}-&gXTqpNqVUwp2AcIU62oj*4&(XaIH_l^Gtz3QLecm20-%B{CR_azG1C@ z|MT^)XRZJF2lDUN&kq*d>4f;#Kj)rv0e7&Y^VXb7-Q~19oVd<&5|GwP?Y)du)|0Y; z`zCBP?>6r>Rv*uJ%N)Ea*c$G2jk#Jsv&`JWuDnKCF`Ycd-Yuk^UtVa&l4pK)yWgGq z4zavrz3u6QjI&~0tDejEW7J!|50Amloe@1_6;-j}dPA+Me`W_#pmZzQR zN89IZ=Uw&9A*_yb^U`PBZz%&9Kc%OakDmGyQ;w6MGDokN>uj;doO-BxrhTn(KlO`V z@AHJGhB)%W1Fzgii6cC3nDxxSs;rw2`` R{I=Yc#ShFPcWZ-ou{-^E1#3aW0?U) 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 From 04a2246a5404bc202f1d948d74c2199fa71202e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Wed, 11 Sep 2019 22:27:00 -0400 Subject: [PATCH 242/406] Reduce the logo's resolution --- assets/logo.png | Bin 301639 -> 109935 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/logo.png b/assets/logo.png index 25b5237903948f344c6097073f9339ac63953ea6..71b7e1981004d28aa810e61db10b20df05476839 100644 GIT binary patch literal 109935 zcmd>k^K)g*_jPRBp5(^H#MVrlOl;e>HMwyn_Kj`Zw(W^CvA=ohQ}18#o>P6QPXEx| zyL z-pta*l+4A`!IaF@!_o{4%ww%G(>j6ZJFxQ88M_{;i*%eEe$K{?WjyDKMN~OimeZ{H zLRMFnmW?eF1>zXIZ$0bt`ReQ=THjav%E_`5s3p+-Z-i3*WA6QU`PlmU`Tg0`^5x0* z-oCnBqkB7|Bk3t!aJ%IAmh-0`bGKja;nmsMRdsulkbmU+tH`$f+fz>={h9KE?(Ac* z@>>T<*QeWlJ&DknzTNTb_NLvTFU zXlvwZ)c^kWSZM#a>kQ5xA@?2b#s22@^%ZzWPn3iD;;4P!%;T$%dN_UKt@LshCHmI& z?c-(WxbJ2-_JiGT`K9yN*_~Zos^#>t$ZuosmC&B5@Ovj|`J3IF`jfYJH*9x%j$gg? z5cZ$jX#d}6kx$6qHBxuOZo4jPG>w2XTwOyg#$MI;3wsf-wz5lC4#v*szd=*-Hf~He zPH(L#*HwHj0!&M-b2&KWPJuPzG5Ly zTtbXX?xMp%?v`oX&sSz!8zb0pMCW6eV*Q+0jc;#bm3I%{pZ7ehA9B3lC%Z_6BU;=H zSr1%My24aNk-G+0M9F|z?`akMMMSuKXi@aD8m1GpYFx!qx*0i^yPe!APoDT5hLi~3 z=2i$~!zagD4`e%Cl`Yy5WSKw#Q|pRWnVc;5RoCXt$Cdf~Z;%j~ zYSv4(EBw20vNSnPr`uX{&cS>SLHI=DkksC{+1yO69E9g~}cA#3A3rNU;=_Po-0ciBsCJ)FKN?TPI0 zq}XTU)Yd=TCaLWVLbtuET6h>HmCi2~Te+=dpU_*vF9;%elkLS09cK2RfZXk!L&m(` zV$ABv*4BLHc=vp@7-qX((9rLW^as|zY;-s>EFW1oHX;0YmWUWZRIuP}5TskJVSgIh zvpW5D%p&a+Ej|kOv&8M;#aO`ykT;qwCk*0^1#_=bf4Oy!$7=st1?I?Xx zf1<|e@VB(n(iG%$};2+=Z4g05cK)LWwabpnxA?y>Z>ZIm&euup%JOdAEOC;GoKr;aBBagu_NE~7 zqp?>YWmDaS8ssBnngiw`qF<2xc%Gdm^L7vHyJpX0cnxJvp zlDYP+UtP#cyXqy8TSAaY4`CXEGsDd^(N=qxSH^I|ZN)&_8%(TF+R4O#I?`;%+!+>f zy3Wr>h*giR1!BV;r7Zg01f8}rF7Pd4NQ$0z*$l*6q#fJ|8iBvx9fMA9`I9dheDZ*5 zfiZU9A7B9qMuWjXcs->bIkyrRM?s*IrN0qu3{h{jKS>vh zA=oN^isrsmWuL?|FOkqVzp!^I`50sMrb*C^5YiVbms5jgQjKrDKKRrP_6Z9JL0{zt z2S{^e4oWd-a|HPJcop(euSjy>_AII3^vCl_J|{s8q2$)-&NKBz-Nr>nXEH&p_-T1p@Xc+%v_B_dwNC{*2%UtNlM$*VMy3W&mMJ?a|8U9 z)`Mq)G*Iv%r<$g8*Fh7?$MWjyWPV^1!Wtm{9L-;}-b#jswG(|(v5mR+dt5uBfdQUd z2odD!VMGRhV{*_cQ)Mm+z4=zUHG~t%$RrTB!SR!D)Wt{x9d`sBNou^O0<<*Vh6zfP zR{%YFf2aD)2PCV|X9aedb7vU8OJznpf5)Qe+0{Zg0IjljEDOn4K~|pVlxu z{o2uu#l#iWRM+Kt@Ci?p82afy>qpA;E>;3lN^znG?E10qS4?RO!9hwW=mV@gM(V>P z*SPQsz}{K_BiPh0x^ejj2S={?SHXkHlqrWd=wd3gFzmXf{W{cKz)V2|0BQltUG{uk zM0XRH+y`g7unXm!cBRD~&S3pLvd43_${M z+haY9VWKW*<;76L*BhmXI;jLlh>D`$(I8RvY1qu%m(t%$sla5ZxmrqX?xb}1^s&Ne zq1y9&4B~q_A=wXxExid@VzU|H+eOCEjoVluI7KBrv%kn>KsdzzbwB3j2Dq&qX1&EOI%rBXo{{(6iUaSPC4=7bYw@|bt5EHZ8g)z){!)TjUCZv*CrOPzIeh^YjII4qT5 zw#Y3>;aDB<^RoUDKG_+32J($5t#Zun8Ci{10u2UGx8+~c06Q60+kA@Fn@*m~GE>ka zEguIiO2862v>L>gr8%M8fRToXPYUK6u}4;3-3ENY9I85=^-xPe7iJb6HF=X1J@Aut zXLkoQ1yis@p=3sh^G{%$Qv9u_ey5R1AlAGSPdo|9- zab$$ZY@!fK= z1(b%e_Tq@!f$K=;V)lZ-=xe3UH6m)V^E5F0!5vooPJ+`n)#iPg~y+f-c6jRH(gPXGF2ISLau$x`(IJ`IVd}GwQ zsI)StveAu5lB1=foe%M*igGM3+_9VyZ&xm zSY+J2K5rC%^mj_ayq0!oh*(1(1?)^7CMdw>W#r^UV=p&aLd9{EPcXOEn9nMLEU3%& z_t6sAta>6AzB%RZaI82hlSGE}&d36Y**wtWy$;ky#BCR4;kpCp%AvaZ3vEnXth+s~ z6*6~`gE4S>2SVocsvkSvGAra*(oxf*Bq>|<%oO8S;`66cFjE2}p4!9CHKnNq8{k@AxbgayPlWAd+mPA@Q%j6k4fQ>_q-&2(x6jaSS;e2b3L4{wDe@J2U_)%XRyRe0)%P zZc%7)B*zp%`ma4I<&=orlFSiclOl*mSZ`zZJEFX3hD5|1T7eNRXBei?3OX8^ImLP} z<{@Fw*}r{7u$s+<-+MT$<-~yA%%wim%JVH-*b{&V9;5o5I1C~;;ZJ7 z$+HYHWD>NDxUT&L5J=Fz%@qBWJdQn2B zwOW^iD%a&t>DY3@^^h`>rVwn70>J%iV%DvOZty%ZyMr$N}G zD0}m9jF_aMD8u*z#S3<$Po{U~bk3kKO%#?{pHpn=k@JpdlNupJQwZLq_ZKCse%0<} z7GO&&d1QPqO$F)UlZn}p_D+v4?p|U#VjYDKTUE+>B%G`AZ;0PDr_sE$1XL`FlBs`m zKnUpT1_J}QgB2uwWGlJUV~pkX56$&eQ#4@Fcz=nozRHEmmjD zoduJ)4i`$(g^s)FU^s~{$!U@6J+O9&Y)!_aY1{PlWwV^@$B}=q+UcDpZIp&!;lfZM zYHJKYANqE1HFm)?VNQEvdvnOf#@^}bvN~eZl_s`cN1UX&CnG|EwNOhQ4@EHMB%03W zkE1&j${Tn{$j+dh>!a<`u;qr%C?iTk$f!6NTkAFMlJcS6c9^bCkQ+(f~i zuyA>c{dSMVrrj*%#j)Nw@Tg2fsOe2I*s%uXg3W}U-~=26ah(9_#H>7JPZMi}q3W=O zPXtMD0w9_z#qcmNkdk?%EOVD<<~VDxI-WGaXD287SQ3^Xo}=_6=2m|Vd)95HIyY9B zyVfjsB|)%kygpfPXJag7u!cF^YOaeJw<@4<+1 z?246J<-;CxhszE(+WGpnZkVBn)PoM@_yVG;JBC;R;6g4yxcoXS}RO`(&W*}QorC3Aj3KnJcPvz)w896kO-mqnf zQhs<+4a*A2=6*TBnyQ!zP^R-2fytX2rf!fjexV61G_#$G8F`4S}f zMtCc4bHbC=#ivDaemt#(>*n*V6_{3;Og*%0Gen zRcpq%fL0q}y|QRlLhVI*6Y5zprj@EUMM-71ds`d=wtvXP3TGaKYrC*?9Cwceb+nh6 zG6wL>iC)C$E>%kaIVt6FPpOyq*9?5gB@Zxpv#Pvr8dSm5r+(7Ka9g{}~U5VAKB}y)jmce}Gb(*5K2fxD)AG)&~j;;MhS_%tZX~#JyZAHe~{l zr(iZ?rmrHbWRh`uwF3+b!d5=7@N-?yY9fD4Bu+wI&gz=-?hsAW<$ zYEn!RG=uHN;h7#_-dC_PH2a!7)7Gw7}wd6C~vV2*6SHzA#W{3#nz9L30%C@!isr9nrj zQ7efo@fbkt2hL_02`omv?U2O=@Ul*Jutdgl|ix3JP)&86d2_X#o$31S2 zh1gI3!dd8nP9qd2TK?}%;yJxg_a;UNQLlqL2w7Ozw<2({Ju(ijpbWZIr7|y<32r2-g52j)ajb1an=a$i zhho71p+2w_oB#_4i8mbscTjmsvj+#U@taIkEI6#uci(v>fdmbcYy?S~Q6~j0?R@Yq zP6T{uK(C+$t!NQHA4EH2nzOvF%ITz%p##(DqNoR5n?5Vtw?McZ0!|7b!CE%`G+Kyg zLosA!T(N)pbZ(H;dk=&)^)F>;c>K;7M`L5ChH9A?TPOcG$2S)OVVduXvmF;D2N**{ z6f)o~9wfD45NZ_D8x~HMa)nI~gU&(;iKJuts@oidR_t!iXJSH1WRf06^YR4WX^uHkM2Dc+E+4s^~HMt3JaSS(#(= zfJxL;|(kg|DD3M~%)8E%c5vKpzjZK!9G} zo1N{))cOAI;5U0F&-YJ9gyq}VZ)|ZN4*-4zktc`oPxbx3z8f_rYv${Y%;uLubfZf_np!0{9%^WIVzBy6d|-DKGO z&U-p}5v1Q2jc_`{*$eSEKt8(~v)08Y$u-rhAL%kzUgfm`3>5at*9fi#@q`0hO9=fZ zJP`5WC5|Te0qR3fKPzq5J9QGFfzg4c9tEeI<3t1rS`E011Oy;56|Y;g%s`bDRJa<6 z4aK41Q_rZQN_~`yY6v2E#Ij67T9Fbp9n*iu7Ni|)@jBIFw1m4Du}@` z+#c!C6#W1R+odi>3+7APM+rpT6ae4M5=6wljsLL=G3srtNLG71;BkA~vs90}$NhpX z((|KN%xP{#d%DIDelCTRF$F$`=Cge8fazt9sW5(+ON=H|QlJfhznxiC*;hW&v|>1!jDCK8ri23-KGUQInGW-6K|LE5xGD|5v#26 zb`r8~ft~ll@89RxZX|a{`@c!6@0YMN{E1{bzf4u3Mrz(@-JC|QP%L#Ssbl#d<% z?M_foWw)?`Ggb-N;$5>Hq5Bq3CF((^ugD`eq3F8-RL&h?+SQVQfLDs(81}KFtdim< zE|KD3$~$?1>>{7R?UuJo%_*Fp0snDJkVnjkb#KCXQalI9wYU5DhP!JyXH@hec^1@> z`YjG0xZ<=Ks_Gz)+76c5oZ*5YDsg2<&;{Yk!3Du+Vd031tbvurh2Z37p{x_6Wkmw- zN(>K26<*k{iDwNE*IK}c3A|-t@`{afrLx$-9E6U_A1j6lV{)rXZ2M^IUE8I(!_2AL z{|2ww#}#Y&(F zBXX@auHJ=j@g~YetgaeR@|i_o`JPL)UJ5kORLYhrT{- zaX=+6;eUUTrV@o{OOqvw05$31M!}E=A)^DXwmxvYPMv`~AvhkC8v%xZ-3Z=)1mNSs z$uymerzUs!DcnUd1EL{hMx3w}3&G={`gRv~S0DR}y_y1}2xYFahzgnPN4y1vs3JPW zXt71Kk#IQarXzIp>c#EwwwYk0x4Wi$FzhixU9cexid2~FQw=Y`9(BkN$q6L1)^KKf z+^YR1Ik{PR+-S?69U2Vi{lAs))W=@)z&L@{9K;uVopfSm)^>Sp?vAjWRJOYXLDLvT z@8VxxErtXfRg$drd{LG2iU5C-SixdPV z?2{hHTRrqN5(q0BwmDMxccB8&3h#6c0G3%~W`q>)&%py`y#T08e=LzINNm}i#_Gs2 zXU8@U;b$we99wlMiU^ggk2=hOvjMgbAE*!sw?2U29OfHqv6 z_Bd0LN#XLPTShxGC&J%;Fsn{b@TO||=mQDc%iPOF9)={!w1Rl~SypZ)Hw*=NM>MSi zUcVtkpq_U9^`vuy-BI-?TMzoz(5StoPpQw#4W6SIZfy<_afgH2I4L)aUF_HUo5(sN z;v=Sl6!tatU;>stmjqZb^c&9>R_fIWZ{}aRr{oCmZ?AO|c4dq~_=6#O8Gmj2 zKMlQk+6OjeKF>~GbWbulvtQE?`wKO5J%Vfz3rmjov%eXfQnX}w6i1N%ir&N5p?kLKj%03T66oXHD$^ zwRz$N6QSO0pW%4O_X#u^g5s!SWU}ve$W9jWKeFVdWl$Rqo=C{&iC*~7=}Rl6y)fG_ zHz@v+)*(gnrc0JWWt}A++gdk4%midJErg2et0}ze+;5mrDi*Nu6HK^0I_oJZu=F6Y zj%9IqV3+I&z|&%yj-7cgoCs^AS1&nK@wVs|I02C1#yacMyr;ro}r3(W^^TmhahleAN#&ps6)-wo~MqYlQ zU(oi$FHo!SCL}tlH-S^O6{LO%v$d2j@c3Cj6*S3Jq4EV?5;~IUXj4K0~v%VnNH$MDACzeR~`5?YEyC4}sEUk(L<{wkv z{qcLCCA*8F)Ip351-)By6$zlB(4Xf5{zR{&HC);Ubl7#ZIHGhXo!NuvbQt!CP^0cOeY zhn%r-B$d%30XWl5D1mM-&@(I4!Xh@moL5pkc4))ARFjPB(q<{g3f{E@F?UcQ>N~yfeN;*6FWarjsB+{AO0`Y9?jwfuT)N;{j zQy3%69IIQ{E(8Z{U4I-Q^4DDe($h1W`Yl@g0I>aR<+`u{UcgS9>-}3EXI4xT_gpSb zo`b&Tbf7JA%sxtdf|xDTwP*oM3&M;kbnBSS4nge6)H7u)`_x;+&&1#GS8)cQ>Kjc@vGkXK8DJ~GbxWf({aCM`-8ov zXgq6I(&0RjyYtK(PC|@JN<$GF@D@#-BOD#ogCemI`6YIb=|&;t}9W{o^#4+06~$NsB4VyYv$=nW)05%z0*J>yFeEsh+e|vXVG#{T_ePt z{Zs>M$U}EgkYLCI_Y_qtWt`2XSJ`%k7I~bl9|QW=ZzscLL_#xS=MUXg;Riy5|Kno^jo75+1-Y2)~`A$k4Hw;hPqgKAA z3AP={Ri!~FuixhkMOI6Z=D8Z*`O10!Z$+dfItg$!)oc8wy z-YUGAGSBtnVU(gG`s34}={Koj2AzmZNw>p#Hh{0O;ttA63F|FZ;?CdK&6gNdlc8{1 zFm~E79YX%tAb3U4UvMwPiRDj1B;r6;{i=_V1Px^<>0k{81|DK5CZ;GOCieeI(ZIj} z@xJi_(*43jgZe5UI&4_J5+0Khc^q*GqDBOX5;UvOU&KF|-h-%-Wul@BcC;L>jcZSL z_A1JQ%gNyU0$N&lY1^bDKYt)F8u9a74!3*9wz~%?GP6&f;=yuka;ZeNq>ffa<*B<+ zB7p~|#;2K1$S7lU?Vpi=cWn)NqdK~N4u(9Mvw`&|n? zZB{1dWL_uqIp*FDItoe#%rMQAe4l!(-RF=G*kN}7HNPeEvfRpeRe~g91G;Q?_S!(S z-aUsXEY~I@Mdz|2>7s(D9XYeyrhy;Yx#p8+m94S!uw-(&-|Pc|#S9vRSI-2mF0HOE zw%I2?{J^Z~oC>dA-rT<`1YwMRNQr}e{`cl~7AJo7z&l85I)i~RQU2G!JwQTkU!AZn zGIA2I`|wB*1O#gEqhA$xI*VDKH;=84^312YPTVUiD=>r^MqV^f zb7V0t(v+iib%odKR2e2J+ya4A8Io&tv^9U@(4+Px{vZoU4ZKKDQd2X<3o~q~DyKlt zsk1#~mt!}<3lWh*>WA~rMxmFGwpN2z1qTO}K-vbCK_TT5B*9clks8ZgJBNdr-(7tt zgI+246oBO|Z6r{XrD>!FHI9MdgE|_P3T@XXU*56iEVW;K1g9N|1UNVjAiVB=z>!k{ z5Xc7t7nY5^^lW?T7=#S)!fGd2?r3w%l9XMAE1p2~0X!uDG?I6OiR)r@u(<+oc4#lC z1(rA{fqc$Rtuydk)Du`QVbnGz_#Up`qIvbsGcf$EDj{eXSfOalbh8!Jt^WDu#kX~4yVEZ@=90c5c(vhqb$`D?>c znh9H)Z1Fs_=ji_iWS7*{)$KWE&kxI^>nQ;{6`6)ugqTo{@~SL_EqlbnPvSB=J)i}O zyFqShow-%6!g#UQXj=;?0(cyp;D6C$xVTqPvr7XUAa5mxsEyyZ* zzPAhkA3D>LgQbE~Kz6pYaSP#vmZb@BctMBNF_oR2ZRnZyzY#FYDl3s+-#@te73+I4 z5E;NY2~`Od%duEb9Nf>-{9=|sQtQdF?Mu%*Y^$ny2|Ws6}9iOYRbUYwah z3289`Ei(U`NoaK%g!)T5HxC zI1Ln{axB|iBVqBifIke#g$-tKckEjAQ!E}6w<{&8cFx|f26}oF!4I}^)ppsbt1IyS4`KR1ab=|>sn&=Ctx73s zUw9Fy=dYqit`xR$;_Xj)jdq=T?0Lq=*WNt#gE9n4!ZGAO`=NqAZUdWXK~qMj+~^i$ z<&A!L3-XhgFOOZ(i^S_PaI z92VCNu*Pbb*cKOZ9~ZftfG=Nx014AVLIXHowue5thI5#Q{t(nOF8TIQ$~smb|MkZ~ znA-o^OUuIFv0qL$II+04rU*ZzCX0UseMB^-1Y3EZ)3CHXa)|Irgoo#FX!Vo6ATN*3 zM6(wpTgo2LC|k;j^<#plHU>z7?4uQY(PA;(FIJ$4Cu^7*6)-KuazcZ3jgAZ(85SJU zPfj5sl&2V=NG1$8p(H}st7l*sr^31`NTR^IhD=vvQJnA%Fii*S_e^H*w|Hn3U|}Jk zR2}cOFg0B$*4Ppaf77oSHM>1P;9AwmcA-|F{zI8OnkaiL4XQW!2krDdqr-OJbIYTK zGbzvzkW_09$N1sP;V+0AVBUmuGTd`VTKeuIyP=VW9tjUXn5lXV`60m`?@5U&`L27HmdOJvp9WOBX@ z@59AWRl(Xp7gfPqqezAdD>ttw$g@6!$M#-%FP8re}E19cNoLG zVgLcML4lC@-S)B;?k8VvrxEWRf9$9P3-rkiSU6o6j~M=-5VG3a=YmBpF>-dcI??1E zf6Q51!L(Z9IPS=ytF0$oyBmRnkt zurx$Ka9UPUUX|NMA*p8i+k#3OfY!q%$1qNoLBG?oWl`d7XO%V^-$bc&Lwh2i#}{f! z_j7)LBWCZUhz>^2okIu5CftQfiXzPn5N~9_BC@>$cd_~2;Ep=8$Suy6Jm@NbRDhR> z3}TUkoM*xFuD#n;h_|ftgu8psF1Ekn?`&;v_ZHsz8?L9Kk~q!b8oe}BE9)4ge5z5I zCZq+`y}_nVJJTM(sC6dAukfjB-Pl@QZmpAhV`<67QU{9N`Nu==TEqx?1v~yBR$6u8wNZpG6DoeHGEKOS9(gAl@@_j zY1MC~uYWocN)lvD6zJ>cikn%MO3tSJJsuR`>xSxiw1@4s2-FV&H*yx_P}B4$2F!Vm z*^}9L+1Q`d!-^DxI}UYt6zwk_O`YMk?QMSvf9|!|u?iCmvRI|DQwU!!X$e8Rjo#jM zuG-kO|K^g8G5iMB~5n37{0T&(=0`W0>&dPOhYRG5jIJS8EKqxqf zh@8N}C2ENWBRD=_j$M3=kNmInConJ%3Q~;HE73R>8WmySni;5r{&2 z&h&NBfpH#R3F?YyBE#>zf8&soB3?~t1b11ZPx}|Li zIY}%=bV!6$KNO@O!+0M((+i=lwuX-LF|Z2J=W+{!on9JenF~jXB4+jsHO&V2@t>*i zZmxI#7TDWYT3m5A-zf{W3$9;%Qo~rgMo-Wj1GBWw+5@&NFSZy(_6-Cn({b=&)Prxd zP_BN@%U9n2`C6&e*GiSc)r0bR#K~_c`W3rPF;o&{v2mA<5j}-ji$OqRoC%|?3Tmq| zqk()wpQ1=ZJdbRtttJ^N_B&Kyjjubmg8k;?<)ui&1KgAEU}<&m+s=&EHf%>%XQ%Vy zk7D(0A{L}Z91nblTIGo&w4b!Gt_U{ky^ciu$k?@L!wji|brQ~!)&7~MV?4DEXr=(7 zVF_zpq%S2YOzbA#1P`Xj(f|-@n#KbhpOKF0ji(~keYaV8V>rv%lJ}k_%U*i=iJ3D^ zpwH_7sAHO`ZtVJDZKpi;YVGaa95Mvo(8SdY@u@(2Pi;0+o33>R8|dEL>|XV!oJvIL zr#&T$0xb!?fOd05v}O%4!~8)$`!A={bP&hlq9S%|E)wLh_Xy^5G>E|NZZV2v;=LpM-;+sXCRIG!MY*_M#wR6(-{h_YD9HCR&xt4)S z3#tMyGdrnHo7M8~=_UE$U{Y_X?C$;qX%$H{ zHgIHBB)xp4ja15=$3?9(()KDpeRXwp`7PZqsDWi=Yx~ile42Qu)AO^c$9u~G{7<$w z21&Z8ApsXAodg3$p}#|j{>KfIpZj_+6hzl3kZDEB`*Uq;>wc56F}}L23?Zz)*HpHY zK1sRSD4n~YMbGhz2)1!7{&JdgjMnfx7d@J`%csC0-+7Fm#C0Gl^<*mgV~Ga^>DTZe zUF7WI@>uJ)??&QbgQ=Z;(Ra)5lM-o|iU%|Q>sZMeM)(uwNg^-Kv!vPm>02#KTVo>= zRF?uR=pzP~N1L@N)1V^1ccoO)t9lBeAarNg%7f&Mb5ZNF_twML+}vDpOXfclEv&8i zVJ2LYR(2~CTe8Qw1#jem>C2)NX=x9Zes3__DpR(bB^a^NBA|cbmJ0V}F-KzI-Dr;_C|StaX;Qs3Rq(_S=K%_x3S; z_UZ{QRifrgxa7*}?D$gFCK3|O@R`5X(!p}2b*2BYXGc|iJv;Li*;g)sek98HEKKrR z6^~_2%2%v;{;Mu1t|sxj!`DJ#N?8^?Hl*cs7un~sP2VsTCd@Et-J?b8%zAB|ubVZo zTI}noG{ry03%lXkaUo+Nt}eLXS#i6$wSCV2p4sF@JB~A1P+6KH+@sFV#-xtt-+{)? z%wy$~B0)ve<0=p)scf^gH5Giu?Kn+Ih)*Q5TR(AAdTObGVHn&sf7>EreQckV)%nhx zJsn(ho6P2i!142;Ul;OO6nywbgTFg@ewo2^RH@$5x{Q(l#Yl@fOu2wlC1-u2NYdIf zz34j$OZe9etFyhnsP;QR*zAG%^nh*d)z^dW^>x1O;LOXfn(2<*IFEGYQ@0*&r50(> zyw2y}$2tRf#OJ=-W5ehpFmuK8den^pxvSu6!B<-#!KGw`SrArPp)B0eU~J z3xlv~r6V%zJHzeY?-T}%4f(4pBq{ejU(|?+v-|}%rt?6cJZ0K_48Saq~<(evGOzSE%_`{bw z-;jPW3n5&H@Mefv3z!lsRC3Nbpe^4%o$1D2#}Ix91MmRusVv8yTWQ3^x}Qnz;ZPE+ zf8$m>GL?_sL0++puE{#y_h<0oZy{p6__g(4CoI9=N2y@5+n@8v8ZTY4v287FZEx%C zy*$)^vZ40RMFP&2c%W^(kuoehUOv$+16kT3J|J zzrHVV2f8azlN}*K<4oEfO;!uW9)($1(HS2gJ~T|pS|HC#$7Oesf81(+_E%j7vKfbN z9q_z}(|Z1wUwHvszACi)keHk>e}AS-`&`R?p*r*!s0fKZ_9CdLB{X>GmCeQB#hf>J z$4Mhka_8u!tx;m)O~~+5cVb3X$42E-qoSw6B%iJTx;_ z@^3^4tYs~3vlLmA_4S?M?Id0a-COT?U&zS7VeAidapO|6s2?kHpA0X-*LK@*21u5;uDAeBRxe)^>`ZQ|-~Arz_X7aUT%wlSCFj z;c(cvUAUn?eS3HO--h~@`Tq$Ei;A1Z?IK!`lAPA^>wWAD+gly28vj~D>r*BtL;A9$ z1ivVgevj)R83ef=T)*NM{+UZ-Sa)-~Dee{;*hIA#2Tw7TUrZ{4S!-O{{>T3qHZ_$U z*ngv=t-UV@%GZay?{X4qtzYH8YB|@L;<0@8u;f5);7}#)63&Y%e$#m$J^KnB$$mGS z+>OodI>7Uwl&@2=1f+L?l5RdAyYo1lwNG0gI;+2>P2r5=rozbGFS0*KbB(j%6UkpU z#rg#ISol^cUxXe1{p0T9^5IG6=cl5gvcTbqSn`FYj^svJLe7){JYS~tl}`ypCJ&QH zs7WN*RIyNU;lSVQA;rMNJH&~zO%^B!_J6+L`(>}SdHWpSVd2kd`A^?={3p@yp&EK9 zRaQ>sD9QSEY}h;K{;}S6{_ea^AY=Y--#UN477cs$+EAc=lS57tgLdmKuNsZ6Gfa@X zP0}}O9!)7|<4j&+LU3tETR_M54wfY!#FmG(AvinMr{RHpc9)8Hm z`r47Jl=fcG@@>agIMi)N6(n04kemOM1pST$bJnv!U3C>eXp-Y6*h@an8quVw&IRS+ z47-k++$#4;Mu>@9%K=V?%{5)_kggwJN%otY-xI}oqqoiF7N`DFo#c3tY@eK*Y;e5? zLrq?($?ED)84FaFMua>)z3M4YVUgKiY3l3D&uOqz3ZmriqJ4VoI0`;y>7&!tPN`b^ zZES7bptQDs14O}daC0}M6}1LJ+LYmy``*VWbYPDA*o_U|a>ya8eQ}q99DORRoy+j- zgZkyqD8-sPCfmyUi_oCkx~;9Pz5@t%Usc+(FS6X&(}zodhS(&QXHf5UNWmm>U1?u#_I95u(AtLAfO6t)+q;`>*%&jpU0~rkwsn z(@koXt=KiSX4{nxRyC$Oeo?zx-YdLk*!XhKyO_N#1SG^oM4r*<&7L zer>Pb74>79FKw+1!RZ+yv{tmyX&u3FG1GsIZc6Ch!-|f=W}_|Ig*trN zOXPLYN47Ls7T-R4*!VVo_Jn=Z#A;05$I{MD%P4&)CqVi;xuc)90IA>d;g=!XEE?JZ z&wI#T=fNSR0{50S)Mht9Ty`I4?;v>xcu0kBiKF*UQa=>2U=@|n+dc9rUv;Jr2e74_ z&-1_UiD=_HI_@|Bt4tj*7DTx&qQ6l0!?U zbjKha(!6vxNOyyTbV&CgEh2+-w}9kGcgIM_ARXW1Z>{e?*05mibMLw5?7h!EGqJKB ze?C1-ynUPKUGA`k){u_4X&U?hewY|#S>S}3iB<|k%1F^|_LPPKf%8BsR|8AC-HX zBm+@#++8wfZh+SN@!7v5m%Jn)Q!WvloTkUQ+1$LQrLC=an>EeT61u%;KFcUfFp1Kdonl_IXR*^Z82Lyc~L)qpl-I zE$k_1XOY$#gt83l6u zX9!-eXm_#VGvD9wutHejwfEEAB=_Lk?c?#QOhYj;f_Y^U@~XsQttI z;L*NQcGtI`kK4waoqOE#C;!IDR}Olpic@zAr6@`)FD*Tgm(7ev6>;vqnXuITxZMI$ z_MCNu!E>uj#}9TDta6!9m&qisbzBr_P5Beq2Mk^<`<&gs&7_uy*30)LK-dZVa6jaf zPt75%8x$)}7d2vC10@foPTD)k@aE*Z2}2tjZ?(#1gx&{Vv6Zn9If4IjxiS#oQUB0A z(O;&)yJHrxTbAVS!xdT$b4~UUD`5X&yQs-OqoZmtEKo)SfIcWBr0Mto!X5cxe9xNK zzi_3IFPWCBcau1I=xw#PUthd6=;gx`%GEF4#fJvs)vH?$$WmRJ(Md@9?>~b%_WWad zp_fKzQQFy2y^6dhK3xAH(O2TY^V?GAF0lIVq=GAe1zsyxnz4JkO^-EgTjruY-_2zq z4iBNgUaS9v*ZO8JYeN8T0q=r^U-=uHSom3?+T&yjsly=x^Q+zwSAF92HImv>>pcQ;1JZ zA{gsTJlT(fch}qBvlSW0X*w79$o=LyD`h}Y4tW`&|0TSP9Ip_T|DzV9WLs`?x5!OY zsp8TAUi9o-kYyWnD{c`V@|GYN_A-bc$k4L(@W1fSyY9N(-MRRbI^CgMIiOtmUN~kq zyyW_ z&xegpN(NB+rvpUJ^Zd$+-`E;$E$6rNbL=l&`B&!>t}QXQ^?9tqYGehs!?Q`3w<;$s zp%PsZ6>AyAl}&L?<)V~!A0jN*e6pA4^asOUe(>QSK@6|5N@=*ECwqGC=e*=OXBQ&py3R|A zVqfLtOI9&U87Ge_Vsmb8?-|f`zN6vvpM@H-D!Z5hxgZ{UQHv>^Qrg`^|s6l4Vpa# zA34zg{keQ9nXSM)VmGuq?lk!10}0HPHe&(_U7!!7s~oJ)ikJkR7KZ$6sP@H>yFF~w z)Q3Fwzw+;R)x0yM;U;f3toqBT?#G^lnBe<(+V&4gY@=Fq5o351gSd$NUt(SZ^)etq^xpqG`)q%z$w%35O5c@e?<1B-p=iz zswD8UHJgHow^Pk&y-FHYd*BtM>xF0_nmeU$p(#`giysHCVvvHhj3`zmlie(k_Jk-u zEnme(_5Y5;K!*F3S~t5PLSTB8B>WtOI+DBK+e?nS`X#}sCy}| zfz!~yH2Gr(7wVX+gw(3wnOegRm)jJ z26|(RAz54yv}e*Y_hyq+vZveR?}xr3^I8SY>r8yhsj%7>FB{<$%ibfVuBTyNM26$K zl$C0JP#5>EV{b;dm*9{BG(Z5UTcC207=}=u5R|wU`La(1+N(_zg9!C(xIHaxW1yo< z&sFM1(UD_i2I#+Il?mU%VIZ|Z`)zoweu*Za!7xR}W|@*Ypn+SaXj|6;dGD-)3b~4j zL~&Yb%j;f$7S!7TKg2yo;D(=zfAhcT0RM)TaDy9n2f zpWDf_WKe9w-7x(D@FuC}I^FArJ|L^lHm^$dlq3ds&Ze7UGI{aZ)qmHZt{-lV;r(1Pb2}O*9q`c!=p4hX~|J2huBH0%!u>3pG90jpOlhY{2}G8=8>nXe%M7C z7}NYeRMIrKd#ZgUM~G=2*b2L!LV6<|7 zle{pId4HzeZ8Plob63$$Db`vWWGKJz^@! zhl^#J?NmNJpklnbTd#M{n>Ps(Rd&~)Rb`dqEnpXUq{Kqgzy8UG!&nbrJAQ&1@Ra0Z;Y5Q0Z8Y1d_tShl%d}okcNh9Hnm}>ox%MTbVQe)>m_-u7fY@l z$E2YuOobIq0qcA+66)I8uPf-tZDIBDs?+A9O+LsWRb%i<477)bD=wgn0ZQ1LjlvmE zcgpBdF5w*4;DZkbRqOx>^*~_I;|p(Aq%O=LSsJaKY`ifSUEgN;{v;mNJy@HspSgq4`iRzR*@UPq-9d z0=03n@MkL6R;>|^5bEBe)LJxN#BTY7Z`lT|*ObuEVsAAU4}`tAV)4Ery;K zBXZg0VcTuf%_*pIY#F`o$|Nf%6Y$2%C%ZQyhyG}1w?Y2h>(}I8Hs2)=FXIhy6{y>Y zi&p-y7o$el3h=bIW{xlWq>b$03C|wZbD%|OJsfupE!4KhFTVXdGymU)D0Qa8=ZPIZ z%ju-fk<$bQzI^Ygi*tF0!YF)Ug31}r+iz>Np5Jx?T}>QN)=jGg+TmX^KX5l zM)gX{Y5_p$0X7Y>fB4jViRg;ZcuN@gSy=7Lx~wH9Ya>3|Eag%hf+;H zgx{{PF8^3eY;jeByRvZ?sXLij@N}ngeA%GMp8DJ#W7&Q5!}Xx(Vbk&F;XQzJ2q*QY zh)X==L?kYqpli5nKBw_ScD9pMI1s(I`w0rdBz^xJu|fMwG5)SU6q zA~VfUxIyC4$w8Sbw|mbxOGtO}>MF{L2fY7f5J?qa8#%rPx9O3gl@WnQ&1dU6tL_}D zV~6_0f1I#(ou^3x%I)YuCAo5nvYmhbK*dGuE8{Rg(jO-NoVzF;Lr=@Shb_2i{yBca zSk*}T?KQXoDV?po#EBe`o->V3g0knL$oF6$=*-+kTu=)0R#~Ak&ud&yvd|yb8`8kB zPY4+Uy-AR3R)!Yf;feLibZYu|+|mM#o+F1%14;j|jp(0)Bl&PY7|$4(RK>ly*;j4m z<2LpX+;;>tfcOl3LFx zd*EXc%+CGUN}VrX(c^&!F?2YY$qqU@-zh&{379Vl9H(YQt!kG+-c+WTiLDu4VC~+esS`>LCJ>*$+h#dKjj%0eXN8?@2XY$D1#!`LEY( zj!L#*Zu=i1BT)0IYFe^2Shy{gA0GB?S=17R=JhNLc8MvPInsdcMCxU&)sDQu_uBJHX^42fT1D#fg?Qq23$XI}?FrWt(4c6daVr@^$XJS|?aH`zr_Y-NFx`er?24U4;%~WWbGNO% zQZw+!86_RxgrXO&!0{tu^)rVf4x2wK+3D9>_aY^G3gAYZbV)()Zws#t%S+|ekM7RI z%w!mddiZh0agz==0WZ;^GOS zpAS5D#cI*$7zUatGig)osO7X?*JRV?=H&%P^|rgfc4k`S! z-S)8Q`pWHa^$-J9xkjN@g>bo6^IM19@~4h*J;^7$OpbgR(Y!Q@cNpiX8}%HN^P6pj zPhs7XXFFiAROT&z>T2BCppEL9Hw1Vmjj=y&T=O2_&90@PERFNEA%>27O@eMfnRHsI zi=XJCjUr_A@TZt(kJ5Kd7TElj&B^NGrV9wo;J{J=+3*l((BtiQlSZ%Z3aeX=_-Zk+ z+br0FP?5QLaYg#nk_q4#=+r(*$Wf9fvioe!yFaj9`&H{;1w{f7kRZ;d7UOXx%#BLc zb;huMg!yhQwt>$jC3Q#;UlZT?QZDdmYHg=QjZ7qXXOCP#ADi~>NWETW;!9IH49ag# zfOmxfdgw9qm`r-enK>E42Ec!hhuxEC1CJReKzJIgNa^o=5&Co=A%1n46uk7Ij3|O$ zY0h;;>eM`31^N;0kT6NLXr<7R6r58Y>p%_~^fVh7j~n=V(RBC^)4H$lAih>ruE6VA zNH8xD>ubFeNnI!qa=tr%H!d%eEX6m|fYCrs#In{tOY6Y72dUk>+(Civ!ey&s!>iTo5C&@YW~u9X5K)#t9r$ttLg z8xnFU3uXD_kU8IFm^rY1VxsOXmtL~hgq-Uv)_&7l^AynYT3H~LSE5YpVFPiifi(yD zK@93#tqiwiN!=WLmFKx~8j|?xS{`^cd@Z&KB=F5j@r|M?7e}0_@V2)@w_D*-? zC)%NT^&Q^(*XT-g*ilkGeQKV8K#N2nyf{1EPkc$Dt#bF{DR-ews!F+jz2#&>659!D z7S|7_N#lcWTjCEpd}ZVxJ7tQuJx-Q(ffg?XU^(?j0brr{rNaek9-$tm?c$_o%Qi$o z(;V@56``mN@(YhbTLy48D zSa!S8>}tK;lr)LR8olAxqdapT=qEA8LPa0tb#VM{>taNY+o%Mgv5dhU(bMie$JTkc;>L#kFwTdl% z{DpJ&>dDW`xm!>>Tp+_Ig#P|20rnbvhSHu22bO79(^6ucJw4yxwYQ@yKL!|?=y9DM z9gY1WE?l%e@Q+evNL}7OU&v9e6d?q2W)#tp1AaMMW8Z*^FEYI^)FtZET%RA*UyiWA zH`+L}Ox$=~JCB02Jf`CCrPCK#(U;xzJy+=VnguSJ1LwD|RiCz(G~${&@0`{y4m|Ze zW+>@4-zZm}@7vD*Jrl3-n}N)2Z)&o}L`9U$a&>Hpz#z@@4Tz@$;k!qYWXa9~v&Vf% zDhei~;<>869--E{r0{M?4mkd0-52voPyQRFuDK6KzRy6{o2Od4Eu>IR!I#GDcJui) zq=jkDPqE|jNT6d^0G=|uXYuT@ICNCs-l}1n7)Ij?2Hi;q=`zWYVBYsZ7ghp@Xn0L0}79IB=IJ_9D4V0rs|CItuPk zoU*ZlMnx2K^j_#ox+a@BQ{$Yg8k06=YaQ^;M2bw>u>d01P%aRf+{TeP-`O)6E1Xq) zZ-qNSlre^hjuLcD8oISO@syevHJAITp5o?6z?CsgqM@St&*Wc$94Cmi=%^y^_;0t= ze~!<7r8~5!eH!JXzXHPf*1{=FITHYb7$$WxR=3JwQl@RM|3|-yHr(!Vtzs3VR~~<( zA%}zxpVo53CmQ*tjqV!MT89`|XgUI?X+s0W$3koQI}z=-Q9HgHq!v_DQUV|pfn>@H zCBK*U4wZNy`9EOu-AGbx*1A@4v!{h+z>sUI5j;>!H6ir8YwFVKX<~pYFUQdHs_U|M zE8O1o0ITbR3CE4|G9Cc-Q>^1u{#orS04rW^3ejT(W)uM{K_y3yQ&$VM9l@bL(Z=b(AEodRk5_J!eF?wvKDRmUsL?r-&$4hW7f z!xYM?tC_3f3f>bX`0&pD3C&AduW6$jc}#ZMS>k$%ROC1I5c#Zywd^At{Flf0e8f}H z&XX}2n;$o#JnBNZW*1wqCh(aQGXtzEcR<_F!V3E<>arOxju0&e9@%$f@WV_-K>LT z-G)x60sqF-s$`Jj$cqduBVs!>M+tz^P3oJeI_u;|EwLdZ(PXklTuP7qXBcrv?0a9% zCnBHfKv21rAkCCl63Wv1Td}r3N7+uv#&ZWD*tD(nGSDc5Iin&%~0Or#8>j3sZu?tNi)J*}7pw08r@@@W5$il$?<)d4~a|ydrG@==P@v+c|da3mqi| zkSBWPtjLIvy#~P_=DPH6RU7$d=QYfqH}BoW~`pI=H_*c;#Zd427inMsK%tY}a|V9NAP5Q{+AJuK)u7vafHw z|Gf)jp&@P6s61XUC;3-dW&H z(KI^>hbJ?y3*~}OMbu%6&9HwXD zhBd4LJ$eVQ8lR(+E$sDsRT1q8>Ob|qrzaiSC#C?;#RvLdA?;cR-C?|>y$;|j=%~FT zbp2Gc&%6glnAe1;E_|x}zJ0sLKY!M!-jQeAD<4QL@z^ik=}r0^6UU2&kX9wu571|K-gKZ1v4PJ~ftBTlWM9P|!}iWU+>BB~>trm+9hKQVO)Y@mLAQ%<#m9c{OBc8j|VIb@T7QJATFemSLL_e89$|Gjbi(g?POS^V?v zdQb6^aAnK!6QoiYca#EVfIweKpzP-WYQtqJg@`yPswjJY?$?2h!ufnVO_484tPMHi z@}-mDkQk>}^7I^~*ygX|xm-VvzH8S9zE|LLmEkv7UVf1FZzUz|M$jZ+qHdwja@1Sd z-MiI-A&bjxDz3z@zs&A67V0l+gse0Y__ncdQZhfc<+WBEFiVBL=7R~$lr5i{sGn{W zu|jLorCC40{e_bv4%@bAf4j%ous=M#*mR5Z6PM>8VJ1%`h?hIRN0FsV>69+iiVFg( z3+4e5N2+oe85tREiejo-1q)H!dk2+iSyq&OAndrdqs<;{PC~*ohG=%Fc)CVllQh2@aw9t(8H8H=`->AJzCH4{k)bbC$T8>yb$5 zlmWE$LWi>5o^ui9I|3&fS^VL~whIw&1c2`{Na38J+2q=qf62-$fLtv8)6}#WuuM5+ zEnCw(L8W2$bo=K)m?2Esjaq-m5PQ1)87c5$XoT%&pHxHC3jZwM3LpNG58!`xTisH$ zadwudw}V+eJ@}6mh!sXf$$xNkjFGqcX{lK}iLvSSa+;q<6)@3j@CZt`*aboxshv0C z<=jo0Z#hOHGV;y2yx?LV)rfdySweod=OjyE~OHiYpqb;MhHPOsJ9`+ZMP z5DqdHKRAxmE zdlUBVvj$573{Fppcg)9IL1fKqKsm&eH=a6bGYm)ASMwxTqI-T<n4zVY8M;Z_8U$&}#X?h@x+Uqv}_9>d@TVS zTE*q%nFj|S9!eB+TcKiWzeSVyz-=wvKYYFj2wAP846x>zbIWpr7%1@wanPnkNk#ey; z%3z+DT@y7wSW(eej-@wqDYF{Sm;Kuo#Ykz|r6pUQ&?n@*iGtCi#rjGpw7jk^+)Y@T zfq)ht10Ulh;0`X?ba`g3w#S7YYOoOf+V!xmU!44%O`ib>!;DH5(_Y@*_1=fN|5lVl zwG6y)^9aW22L_vi!0Qb#-E>62V$*n*ISQ8|>fr%- zXLq-6-%D!xKl@xflliXtS*J#l&F1G$j!`#Z!^EQg&5sO9nMN0%q-psD1d4%SlRTl& z#ANUtemu$Bmpxxtc&!c8;%@8$R$Kmz#e&2F{`e|e;mf*~4$p@(vI}kTm9`rdybR6ea~8_z}M>49<}GHiTvAw z8wd$8aXvFfAK#0qz$r@k5>43>9vo_M3^+s#WqT-D!QCB`mzQ@*kEj}>Y4W>i=B^JP z%c#eFlcu`2?4&mpxbPK)pi|G*K>Yaw0#@9*h~6&2(@Xj?>U;=i;L|iS9T#(iyhO^y zAJL&)Rh{g|xxPqs?&h3+H(_MC6dvyb{(SdAG8V3ycOfC*ms0N-2pohy#oA+A;lvg9 z9Q!m=^h5LQpH54sPp_L@0q4~uGKc=z>%L8H>sIgfHg?sL36VIDsoEMSX84<*=LSL8 z@Vm&|+{bA9pZ^{%zqmNOgv^SIcTnE9LS%*?che2DyGz{ir#PO+ed{F=35irHLuCJE zWTM4#w=3T#=c>rK;s*Fl>4&@y!ReL{vuqt#OOAejXZ6hMSutZfSIalz$kMnSj$&Hw z`Uzy!fB1$lrBL7)zIxS_aWv^Y; z`N0G1wYI?MUGcZ-XgMZTQPeE65LEdDP}t?A*GuHEQWY@LJ53@#afnaiK5p=$j*gs; z4)I)#S+qgD>CZZw!sgRbuV#mx{B>jP`qM)GgJBke&d*z0ebY$dV<0iMMO$V9OslP* zY3_e#=goJ1X}XD0**iEW>9?RteH^!q7}|DNS3aq_c?{t&r~`#Q-%I{*-wqhZqh~dt5>Y_@=y7TGP21e9`A_e(JyIS_ zCRa?V{aNz%;-C4}@ZEaFPn! zqRbOem8@-QYRZw9{NF2@n{kVF)-w44v-xlM?`-|+EatE#GE=Ez9l zZ+MAr{tW=aBVfQsU5_wPzSer!awYJzbD_bZgt0$6=VY)Z#7{5^kFzM7U{&7RnF zjMVk*TdnmD@Nn|UV3Ot)59}m~D}C7#%}D8@$U(QfiI!ED(y}t|Z8oF0m9&Eo9L6`S z)P5UJ{j;P;!w*-9Z4=B#tL?6Qi6OjkvRr#^QYSeHJnxNAs?jE+mR-A1;Q5|{M?UC4 zm*s8sO(SFcvXfwGMMeLy&(N&pH%S5SoD z*g;g+c_EJ3^zKEGTf_7-m=e$8<}9UUJ4wua#eE3KiEqdg4F$cNtD@tI-$+PMQ72cd zA8R~t0htP$l=ElAt0!WkCa0*?lNbbp=TNiB{H zXlng@1DyugZq z;E_npmYpLdH<4o^6}o-k^gGUb;ePOL_DO@pSXsJX!@~nK&o>JB9wXL~{TBa{4{q`3 zuC%;7+Wy#Uj8D?~EpD_=ck|um+k?27z8=DGoi?cITJz~UT)B({y2Wm$v{md3%=7()~k2lmS6FnH@Vr0FLM*7 zEZ~jrMuc7gxWw5TEsi99M=&j9BuO)sb|~ zd_U2^l^i!{hNUj}m7(U56_6o@x7}CALH8ydgkepb=(X8#l27N<#(tZhfD_5|jO161 z0M5wAM{xY8J*L{Id22%KvH=MBl{+gB?t zb`{4+@CSi+&;F|8PiS$r>*2aY_xJ+?t(@(vPr_D5@;?_34e(z^N?Rn*NFu3AKJx#= zsGJ)G0C1O+bkx=y zBE{nApe7G`YX40t*J7AHhM(CKn5VkJ+`dI9DoMjVnTr%^s(GK1pdYOo*7u;{{H^slb3}rV!xtrYmmbAot2f$3c3k{ zX3t+qaf_}IW9f6^}tKD!hdJ9 zYc2ZaXXfU7$`f*;d3-Dka|6?0^K}`;O7bax+|%?m#16#5a+h1XL6NbN1Qtol=a83}sO?m#|2t z1;`RcF`cg_XKk1Hk`6f&^lxGS5gR1_a7KUTCl1s{Oe)>s@o_m97fxqBU%pSD~! zJii=L0uVoP)g{?is&@h;CiHe(dmC{(ugL(^atT|4_&BnD^n}`!bF3B^eCYW;^!ewk zo>|1ZH|DIQ=gUF}TEs$^GK>g7PwI$o38&rO`yR86*ru zNr2$BC*~ohvDf_hXR?IH@+Z(Mni_Sd@|g5a(xGUwSolm}ZC9#^AL|3wZ@}_gGa%4Y zqq73$3*Y)(EyCUQa_kJ|vRw~V0ED`)f(6hNv{%&O^%J7l0PvMnRrT(;ma|MyReF!$ zzYTgKCQ<@wo{*-NRyH=qDbJw%fM+N4@auQVC{nZh#FZ7}QKRt$9wJgwdSKQE*ex6@ z9AaW(;oWp?Zo7&677r2u)u97b9gv9Eo2hAIB3b14%$gz3nqUIole#xC0B-OHfrEq% z4GlS51=1!;ISmX9vIU*la&v=jE=F}e+lX)$_JYI;#^``zmIv^zUqB*O9pn~-9O~!{ z>{qA{&?k#et!38K|7lz6npN?B9r$WsU?3YDENTmbB>Js2r+keY*9mkxI-_+H{R6(X z>stANn>-%$Du9xywsA{J&@?od+QZZHZS#iXbWUn20ZW{;5UrfMFlDy5KkwA^^m#8j z&0t`S?BD`X@{lK>b%ZKu9@)gdA__OPAt)&RwZ}U+kp#c9=Z|BD-q5;qKl(H@H0a-{ zn9QdD5q)&zl)HMZ_3c}e#ogt8j6A)2HD2OZmVxnk2zqqEm}RK-XcGC#^Qj(wVvahS z2%LqJvp1e=B8&wqbHuT6KVkk*&V{p}=k%@H#QD{->n5}0Ehc4B3pOO$+oap}bZse% zCA<@zO?Ec^B!i_c)Mt?4=>a~!32i?KUq5Z;SQ8Nu0V*_Y+Cn@TZz<(zrw~os#CBUU zMbk;|iZ3Z`xt0+0N&dJOOQ5k(?4fWS zli?t_R?9HKk7SOI$1c}=30xwj5GLT~&{5F6gE*-Io#u*LziP{VImP7f-{$@lU%z~L z0i;8sNANp2In+H^D9xrD1N8iCGqq9wav%W9SdtDOXFFB|p}B4kuHDJE>iHO!ErLM( z)8^7jOtY_Y3NKAl>jO&YOwN>?%V6Z9oZM{*Yk)OTECUdaZah{;5I<<5d^M7b(;Wwi`=}d+IuRK0OCP*?Ybp-c)GzO7e^c*J1v^3h8?2+{Eygk?T*OE z=Oq5{uA>9F4&La(p|l(=w?p#q~^MvSdIR8&+(A_?Fsgaa%q z;bmkf3U>i?z>??TvO=<-E95*rQnh&1rDEe+N=^J+b}U~6JM3K$^ZN7Otw4MGEA5Rt zVeD@GLz!%?Tsn=L1daC?8o6wjooDXpm-uq?1gYoX5(6WIg2n%16iaUPXS zdT}xp5bf;Z;s*{X{57kDj9indZ)}`xe+U3*NM&zt|HGQV+eE>@fULmjWIH`8i(X6& zn!VfltD?2G;Ph&->#b*r`^?*K;lG#MZPq%3Qc_azbP^5j#7*Wk z4Gon=r_mkW7V_cp*-b>g$yS#&T6dOig26*y6@1-M{jAA=cUU){cV#X9m?r|y=6B#d zX+H(u1c67HYD-Haf40-~fck%>(7(p|RO_+p5mS6_`4_Sjuwz?p@y;ELT9Z6^^lHmh zy({V+x8($wa$|n93pb!9+s+!@-qOQK4$6<=$-*Nn^BZ9REa{@UV zj=0s+y8OjLQ1GRtWdojo*`25mG&+K|5z7n#x;+T@x3S#6 z#rtF3(B5d38tjNsEEc!U{5yG?r;8g$4b=}e9uqvaW0)=1Yxf-2E-vg#g#g?NJGH~1 z0aKo%V%)yBs`dmEg| zG0MWhQEIvLm_LW2;=^Hh$;vQ%<2E|z9LVkSAF6l*>Z;>r{&uS#_-E1q3imXb)Mswb zJ&r$Zjl9D7orZpROyW(3dDuh7}k0S%Iuz zd8?!*aN*|%Y~bFTChzSrjn+Q^*C>V#H|z<|3Wr`kp$DM*vAMbA{pY2JqU3oG!WLeP zF9Xi6l{0Hr!}Zq9K8P|sJdub$UQUC!&0iExe%*z!v$E0_><FLn5d{~pEfq!G28iHAIKYreY+X?sZh-5dNLmj=1z zw33qR4KE2NuZJfl27#g$r>~M&!KT1ubtFmDI1^Ux&nhh+b!|JikUajfqpS>-tAm>m zNUoUyRZY8$wzjrfzhh4Uq@4KhAl`9*(q29c*J;1rEamC9(Ej!ElF2mmna_z^WEbZ} z1RCz3+4J3(-459ak*TREMY|ZE3j{*b*f^niE!XZFS3>OwfJbx-lbgN(DgMPrK=U9N zT&Us}-W>zU2vZK8hCZYJBP#&F;lONRiA(2__4@U@NammN^Pe6?));0~iK3^72G7^* z@VWO3wRVya$UUuBgt5#Z2s!KpB=iXt;M=1GdcZr=YZ@5DqM#oD+DMe&1+ltEy98{K z^$#Sv38Ec=j^vlX`P-X{IiDLZ%fyEaIL)_kMiL?-jcD9r87Dyspw>y!6U1gG)e4aY zg*|#F5;d59{N|92xRU;wTYHWjP2ci(C8lX=8V1m`ePEz8Ch4;cS@+|yYf2%_JOiB` z{@Dw;YIqUx0CjmwiyN=iQAkPPWLqw%7l6tr2AOXQz%$-d0QLNDD1n<%OpL<8!8GXM z9JyZxgGVO<>L9%LhnA>;$Zqz|+3!A$IBMQ)g2%k)-Ad^5BjEhcWG*S?i+s(Qg}uAG zn=Rm2?!e4FxS*Ik^jN#Tt|gOlC}KY{U(ekDWf~c*f8Y+eZeK5HXqeIJ1kT0Upj^~e zcEvbgzl`PWTfR=0%{bKsgU&+a%)Xb>79G5yvHRXd8lcc8L}8Ib?(SQwDKa{0CUr;x zaI*40Ez2MKYz7x3@w(YDdE*|FQ&anBcn6aN+M&gkES#N}T7VF4a7Q^I0zgR?vzQo) zn)&$q)6kxV3RjNutyT3*Bg0*$w&-2QuE8}F+^Bi`+^F|loj603p5M#B6YmZ`(Cy>A z<`P97{`k|2wZ~Je>BFgMJ~x2Y zeQ9l7oPz&pOUlouoFXfpjwy~Ya%n|vo3OZwvr2d@|MKNcUa`DR5n? zy%L0Q{hXF&b?XU4eupU+YQAEOV@>CrmyYHvKZjvgm@ct)4406TOmNBh2TKNmUYch= z*k;$noGE%-@o!eUK3*UUTMnV^__4C833L~-DUZ2yz7wNl}h39Iz_Yw3Zy84eAge*zkZV!mAPbDTwMHDrnZI$ zV5D+BZ{-paEX_hdM1w8+9{|azFUJmoS_li6(C`r~^S~c2sjDN`Qv$jT4b3g`Cr6G+VG`>uy@Zh6WCzS8#h`Uz<%De+y8GelpX^hhOL$%0Vr zV*2n43I~>pT98ZoF&;~tlS3vO$& zno=s?e@Rv3Ko0zWuX2@~@P~&7Kh93*SC%weR^XqL$jN=`2U%5+|GNwTE6{UmHO};m z0v1FhR|M?7LMp>Q1k1Pj&A71^>;8~})m-A8Od1Wgo)dou6G{AL+aWZ1)uq|kIL|BU z50)_}>C;(spo$(bnN`V)WrjEq*#H>Tss;JusD6*mShhQ75V&yHAOz48QS<)r4kpt8 zy(X{z*aWEO_tl1i@Y#Q3l*>P`fqqD>KF)M`LCS9>JKzFT2_H91Z}_yUc4Axgaj_Z# zE60h(b~3XUeBTW;H$LY%cItf_-7U_iEq)K+o157hmvjiycuNIsWXfa9^VYZ^m_}b1By#*nf zgiOok$t;pI(Mr6qUIrdwT|BIi(>w|tlk4pCvi*U9fr@kzG3<=h+dnL1Lr>6=C{>Wc^~eCrd!fb2l?fGhs%k#^waDeH8r$RXycb-^#O)nEQB z7M!6zhgAv4x{0b$);{puwnl$KOp(7ARF_phtTT|Ds=Uif6gz23iyHWB@Mb}3EA-Fs?pF~sm{7= zwULpLnO3h$gHrTI8PmDdMT<+|=2huihF1unEp&KBDa{T#wtf5V=k4r_y*)%}AAt5y zYq#7c#yJPRPkunHVIY{Q@4q3%S_i*b_PZ(+Fcj^fW|Y_+1@dVXu7{d{_?uU6^XB6$ ztyN?);=T2IHp=I$gR<>kR&P6$<#qG|@GNkL+f$>M%uIzq4g;Jd`#xg$Y2T~zZlKY) zFPi;m>jDzM7sl90XM%}j*jW35wYxm1+Q=`p%{?_UoasC?flilJ;dxHda(6MW-st%F z^Nq-?z7|-3GYZIZP7Z+1(H|!IReZXxD9%X8@ncrwXR@W{R=idDB&}&Sp)h! zo8yL5k0G0EmO=IGcNzs!O*I{z$Y>E=|H4d9bRbs=m8g}X_^(a8)tP3sTY8nuVa5&A zVTb+F`oC7CZ-KB5UO?yzVfW<|eo<^@q!VET1!}hIab4|~|HKhE03PIg{wU>=N7uGc z=u87G=*HUd`r>fjVcF+$H3+Y7<+A;O42$&pm!ZudM%k70exLU(HUe|26?sLw*r14i z1S~kRdYyI3rplK1{>7h!H(Mr*uG6I1`Yx{pE+$i>9!}T$^C~JT#Ki0hILMFe8;BtZqX9rW>UZ0Xj{@|+~SH5PEjY0jtP^zlPJ!W013 z`K@onD|W3%KfF>Xd|Jh*H|ClnVx&na;eVj_vhvP!1sU;m5%$k3%-3d zwRu*bf6jtnO(lK`^5OtMPwvKe*`Hn7P!b+WlQ;7thUOz$#TwSONCZ%rF^SoGs=kBz zCgsC;X*E@>*02(Q@gGyIkw^(M{2+dL!_xkHYDUZM?m4;7UuE`iLcWU`BY-nl7%V-DZV%)E9avUs zXY}IfPWgpi4gkQdRrZtbyP2{9Kn^sEC&O-EXFWLI4ni*2XHrZhOwKmoF|n}*7PU}# zjc_d)et0jd*F|`;@ExZ0Y!#nHwPQ7LGkmw_?s7RC(AyKmNysv?vdSO1JM2mSX$H*r zReT0dr#k)nHEARZ&S8Y+{7rF(oy%m|;XDPZJ$(m?8Lo1<>$FT?FQ&ABsH;*r+Q& zcj|r4b4#L7xE|VWHUFlwEV;BH$S?ZI=%#6*VSb^#ZBf%v;cp5-e1LPpDDd{O4I<$ z!LYY~qsVd&uvY|`SFQ%5i72b^%Xcx#av9m^zfci$^OCGAb`kIi2sGGXrG~3V=kufB zgS##J@aTFS63kdHGr8pL^H({Yos5e;bo|<6sB|6CEYWBtchd8CZkFN03`#g9&FSTK zy3uqQnfu-Ov;{^}JSkY8s3G0K>kcDZWcc4{@WL%-8f>C-!lpS1K&M=lkTsK-Dq5KF zSqTyZG_)7V9NW+t>pIs+^U^QhyVEkm+V9Urz3Z&`ewXQlOoi0$Ejalhw71h1_1^Ps z&s3Ye+#2<1TsHr@Xxkq_%(2FM7cppF%KILCtZSFV_(){oVCi^;NGCU(geR?ijE|)7PF5iClBu{#lhgy~U`; z#{3fhwgYC^4In=c7P+95SOXqtQ}VL22ga2S%B{qWoG_3X!X|%nC13m^=QL-1WQvZp zm4@0r3VCkCO0ru0E}=I63acLDdqLs*_ce3-o+T!U=U=y)J&Ff!A`Y_=2?(xi@yA(f z?#JGCrru7kz41kN2!&0PQzy}@_^d2N5128&3b`_NL|Q`qg*KTTz{x~UjY_6pw)=n` zdpa)mf~?Z~Vi!KzlXZVQW}m-JnfoL)>Nhh3sS+0@-9WPE)~x&OVBzXzJ&jGT*tCmz zY7~$H6ToG!1H;2zJz?w5q3KT9N1zE|2qU%Rw7n(<+uEQj$aSP5my3>!?H}@S`-AZP zMSXjhZM~1=4_*|7OhJMdplaKjY>_Gd$OVe~uG!ikeP+bm%ZUiK;v+=~w%WnLL1lypZro)+%K=JBwh)_dyJFV5wdv(f6q$hipAjCgH+;ru zo;?*^aGkgDH*7H^`Rxxx^H*jWPPQLp=Vz?Z9}Df!H}QYe5o{48E)f=94Px@b=pS)s zHL90S_KSvr$cboZvC4~ri^wsq%W{qnQH&Ce59_UcbZ zdH3bC?K^wNYc?z%mk|cbu-tbnJ3A^Np{ICsa;)>VFOi?n$MAzCWkDnT6Gh3=S>D!` z90;dO+w>P(Eji$Gpip>YSE_G#y%03Q#G}gyc)hu~MNo~fBiHlw(><_&LM%imwn?p~ z%S3?(=J}QatMv@)ce+~KAFhXa?`UJo<<9W(CLjQjnOpqo=Hoe7U8Ddp9`~!&keuR5 z>eP5VdWH8MP`=@}>#PX;;@aN3w5VU=3W3sZbT~IP)8^yV-arA%)j!)%k!SeA+SeEN z__T-q=w#(|bwUgMWNw1m%vOBC=}x?)QM#|PzR4yT0@GP^0~MH~))$$D+P9{~6zPy% z(}0~i8fTdfRTfv9;wBl+$j;A4s!XHwD{`QV`sHaEOdf8}!WMbDj=ll2ZGnkj% zSfD}z0mDaqfM_Hqi^02apjQZ@>Q6$Pcrz;t!chcRfp~Sq&C&x|WCgTdeq4TIsIel(3N) z_1apNL+#kXetMK+IOTcVuZwvnHwyJ>Kbz`xoa}>+EKf4J&N~Jgm+zaAb#*?Sb~-9x z=SCzT9amwsjb-j>R`ZjhzOFYM0t0XqnJQLFWFkdQRaG@La`(Nmu}3~Gr~z>`HJmv5 z1Y|xLY|qpp0awbB6UaEoSUsNM4U7#H^JHXY_NW2=m&-mFo$tI&RKcLHi|Y?FHg);s z_lGl;i;mOj_n{COpb9pe4w@kV<^-7m4b(7J(mzdQc~y?zzYQv+jsD&K7xq7G_n5UW z7qZrUxfERfrVa59_o?v1tT5CFz z9TiEna&AgVPv3tg-Luq0wsCpGX163bbI9Gj%rd^#pJq22Xjo^$TMeLaS2I%qa>YOS2nRiJ3ALk%fmB$7Ph^lTgb&$${!l}iYIvw z26PG?wlSi(m>xo`cezpD5oNk54Zp191@U}JYcQFj&UVM|7 ziI+fuRhA?}*4a+1bMgEGTPxFPZkwLU&Rd>1bX{*DHd}9`r;wEGelmkhhJ|J?gAo3# z!nOB=3lv$->*XUsCRc-ur1M`~rJUEBqMkLBLO{h!D~K)dh5WsT(`%;f4cy1cJ2i_xFb*~Hf4fzSQZ z$B)5)^Zm{dVL*AEw((jSH4epSxWYHLzyjR&z2Nws1Ds9d#=!0rE>K@pnshF7dHdwW z{h??&w+Z^Q=fvoGPSlA$ZAkmmWx@R!z&X@(V$5DhUZ2r(c;WA~o=lcc&>MsnOlAJJ zmPnzls)~Kpu@N}2`7_|dMElby8mVdP$CQ(ngo_QwOCsxlF&9usV@D2T2<|+#>Z%$` z)L)#N0v;rQeBSxJ9gj&#c~S^>X&7@2X}@|`KFt9739Eb}u$v-Zn@UtxRE(cp1VUh~ z7nHJ;{JS@*81`#614(E4H3Pe|PA|%zW$3}72X?Z(`VT>! zGPQ_P-&({2*Jgl<5pFJD5uS{>@n>XiZJEw>Ng>v7rVVd@t)$`*9ULB(`p&6f#|8V? z8|Q>2imk7LKTw4^>QO(*gAWDFcbbGtA=1JZP!hVWyzjB63gr;grm&;LpSzLFV^ygy zMkUaMeT3uvdaG4$`IQnCcscIO-|zLsybc^$%A+!Z6evqeux&3NQ9-Rn>Zv z+35cY&pV&2PDycYTu5|d{@1L`2#hMzX}=jVAHcx`nC!m-r9VeUVP@V* z|N8*q%5qP$iNf3z6cpZPO{5_UQd2)wDUhq2Y^rFU;CxO?o6q(UFpPckxht)PnEC7y zT9-DB;|hh;IeX}L#DKR44xh}kkTN2p&|ct6O}cFMN{EepBCj%H`NlL(6TG9^e(n+L z#H^GQGzPS-Lmt_k)_Pfd=%c$(T*Z4nmMu6Spv(77+hB(+kF9baU$!Mb@=vPtZqELA zCtzN)@VKer*_UIFp+PImaOJ0ZlPNnyB&Mv)2B3=+-Y;rNNCtjjgdq&AVTBv-xQ3IZ zgf7`>=?3Fn^eY~$rn17n;Zkr;ZI>xEv~Q??&BSAAzWo^IL*bPKLf#aBiHzl;%0H3q zyU^&9U5WQB3@eG4+pY}ZajHHz&`QxbW1>a!QBjH52*cu$qlO`+4VOFn`^58EBfFO; zphP^1Id3xZ2(d!gfT74!L$k-$Etv#A@*{q!JfRB~78X+!)24WYp`V^Il7DXQdu^X{ zt~Wm4X-T61a2mY(@B<$j4BzGSqE~sX4bCt#f($x#KX-ktF|Xaj07@7YbNeki5+c)^ z>t=Ai8gxf>0e6rEFTH)V{PPzC3w7dJhdu5Qb!yeqFX{3JiTiQEvr{1Kw z!^!W;cW3ufahTvWR-G7LD9{Z+TraJ&oI0=ecid<(qk4elAcW#}r6nP~D5Tp!+imf@ zfJ3coz+4HlNy(_A13S_Ps+&l_zJbQ>`PclBl}vnr>_VHPg!CvQ+-%l4?O!FX*e4gD z@R{SsE6Y{Bq;X0a5L~eR^xi|v$DqKjdKNHpJOvAKI@n10-#i`(S-8G}KbS!Gn+{4Q z<`I#YLFG>GN>gI~ycFUam^)*?=+Yjvyd3vo{xpEHV_&|1vPk9TuoVZ2Q)S(BLiGzm zmzQk$mOKd+uLDp9;h6xT)(-oR$jYI2#0ZCZji?mc&7YD4Wo(V~x3W945 zfbr?;Rp$%ecTbr_13I(AA|KBPsFuFN&X?N5Uu^{(gX6(^w`=w{BiT28 zOrIY>nW`uLxcEQ6ir%5IB)mZfnxi|Ql5xV%tTK?W>Uc52{qe*7vAw)*0A=3H(70MPk8$x! z`$JoaNRlswS-#JF+uJ3P8fvRWF@YhPfle;@9S;o}65q_@6)(M0xrM7a|X-@E-+AmQ=GSqzmO*2%3&gr#zP2 z)Ri0Pb?A}DOjHsUlHq5`>zyZd*FOpJMGW%ADeE~{QC84pd^J)#4jVPykbkiuN(pR zZ`ff)5(C4KXMvxC==h2jXepJM8#g|*oc;WP4K32rRRu*K*f12@58~%cUc7^Z2BJhp z=F-3_<_95~pL1$w>V^zB2wgywt!nA3W`@jRj%1$ek5vEt|o~iX(`L?7wl@<0nv3BUrT`a6XcWr2<=t{fNWsBrTO>UXB*c z9R-t&AAd~bK@d3Q%g0?ZYv5@%g=yeBkO3*fmq2UeG>*5$*BW22z9ORJ$e1gqV-N0p z60&HT+|fm(q^GBd_lp?>*>J~%Z%9Gk9@3EBbzV6R=e z*cZ4Vu2hc*AfpGu{U;q40zzi(P%XPwf~NbC9H^BhfvB=F+M|2vk#ci%lK#OD=%^y? zV7pC1n5tv8PN3mxpH;zonB;jR1c7{znJp&bZ7=_{F;G_om(S%2GeDa(FVkAejsteU@$-* zDF0903dse|Ebg?(XXZRgIyyF-&~o*C57GmTtu$p;o##N^+5%;Q5vrKQJN4-hit)g1z|D^wU^*!AxX2B#sB~*trTVG`0X}3HhR*90LV~@FU;&mZ=A!@ z6<+9yf*j(b)RIf;;1#kXTwGjCDNWW7iZ>52bbrs$eP1IEX~Wb*p6)B#@drJ>ftnNEZEqGR3_y#{CvD3E8*FsIbEF_eSz=9(BmN2g>sNrw{%>Luyw7aL z?z@vt?@e(q)1Q86ObN!5k&bgXS$QJM0CUd%BIUBTw}&lh+9M3Z2c0GdEZr!20vR;W z<2k`W5r({^1yXo#B*nU4KfVj47I-VOyAU(_#{l3zz$YStX1gE*l4vopW-E>P15#{i zvWvf^&+ELz$5&1;Ye2We#Wj@}nM;WpDo%xOLWOL0b&eV$#wtThq8+FBSq8Bf*qrFQ zPb$J7u&ccv@`-S5^X&jBHQwzIxVBt0()jLHzTPCD6kH z51z4wVX+0t<{R8M(z3D`uE$F@+-3XDi;9JrgOCF9ReNI=1i${Z=LZXo7~qu3QG@=Z zp!#675OR9Goh7D>-@VTc7s4+AFSJ=PNIq8iLk!4d6!$5qs2F+b@w2DqbBMqF1$J0) zuxE8|q7VvJ&3GIyaqpy9q7fUyd}L7Dx84wNOU{r7ETXczR|1WS>-!IZ&|0hMfXb-N zo`Qjaq0wx8TK`cOZ}@DOk-bLS=b{Y&c?H~#f*9S}#Ib-GpcrJCJ4`uBp)F7S6(&IO zc05=c@Z`3*f;))|tla-xwE##&~7>b8M5QJAv|% zM%8^-)qUvb{ioj|WPX?Tb~~-SG2InXg(<3kxSZDyx|I1(_}w@Jfih>$6;ov6g1$0* zN_HLE9e@OP8vswzCeUHsNa-`Lrz_@IlCIhkl~CgZcelN%jSjk^n6aTx=IibHL6*ku zy0_4R1YinakcX!4IQ%YO*4Hez`>XtPf{bjHcN-guqtN_oE=mEu@*>C{cv1FVr8<0{ zh;9lt<>ajISjH8n#1Ag3Z&O@g7WlQG0DPy^^bF5amN<<~3SM(8KCSP@lE&4lH}1v} zH?nNb*;B~78d-LM6KHBARyyx~Fi$ltqRlGX2g}x;_q!B-EI&v%2t|D%Y)g4u+9s>% zrMAcB*F-0OA|ntx09Isjkk@;Rs>=Uaf&Fo6nk3~XLkSFaGV2KL{@N8DiU{sbymNm?^vD2}uMi zJ1}-kGS!HxH9_P2#@9nsnurG9Q-5z3C~yCBo16Dsz~Z&$M(QR@8ZItd3T*YV0#O#D zU3@1HL(h}S#{^@I^}H)ds~BIEo$d3_OFe%1Rjhr}#Lu+jDojWAg3!${0v_2Wzg;Z29(L%)-|K^bE`WPHH|I0c-cC3>+c@rGg;EWS5vppnleyuPalN1P zY=R4jx9PE%2gOqRQ)}Q z+12Ck5OhN3Tl~i!xF%4PUo0ONgr7jkqeH2=+Op@B%Xl*YDPZQF&p}nH86AMg#6I5B(!Z(pkV2iCk22p@eH5J{Bw!YLLK@szd&eQZKK$p73y?;{zunxd-1;I zbb@^+T`ZP{_dq84?mnPHUqpNCB;I77&2RN>0^!z5YIwogRqWLfI`n$ijE$D0G=Z-W5!WvTbs_*(c)!4Nee_?AWX@xbGrp*qHX~Y{qC0f?L=zX~eIw za6)61mq|P1FNMEIX8B>j7}H$KDg(N0yHCzOB=3%#Z4NOdZJ>vAPk#Hdr7BQ|^vGf04043gl`6EAE5IK1Xg#3s~WiKl=veKOJ3%Bt!8K6vHwLh>&BtwNF|*Xbb(DH{b7?eR$7D*PRA}+f_0hMJKuu}S18V=pZhR!r008W0t~zJ#d*Qc11OzG{rL{L4@#Dz zDVF|H)*T7!Yob$=Q_nR0%6=5wnx4tu{H9O?h7h1O0Nh_(0K_2krX^j!@!~LRh6|qx zHh-(*D|+vHN}BMo7W<%4o~BV{&15T2eKYW2fNO95rUnHG-9OjB6GZ;)yrz1@nDmV0 z2@*te@C#P8^Aixyhy`Y1lZZ+OGMzjKm>r`VfTx%qGcG6c9~#xz+m^xpI9p|c(e}@h zdcih2N0fm=X{PAds(x^$#pi`>!?r`i;^=Y4-^gjAx|H{QM8+Bc-A4gn!b2_u8~I5U zWA{--w{11>M1iwQ2ac_x1`K}_Qb;-WL?Hci0xplyks&g|hE8SjNg95jA9FgmF)x7nV%$)k*h@M|qI;Rs&>n0e6k>oSW9i-Jc5$$9m~~Jaa%Q z;?4T2^{An}9D@E`XvY85{a+;Qve7j0yA$;6T*!dbn1BD_=aGVUaWt%t4IPbiz|iLH zC`RE(MOYk?bmFRDi{}7BMR(C_Ak}~}&-57qpteIqdE2n)QKOwA$Qa_)yRmDUXLSOTsya(|E>e#;$^l7-A>FY_|W2jesc?xeXtG zIO_l>r(|!8BPN6)@bKj4R_q=oe>#?Xt3~1qLr_BQP_Xnz=4xkZy?7GK)jv;JO}|%D zLyf2{9|mgiT0R;c2!tBWsiZhXxoElO)wSiQh=kJ++c_x;+9t2If5JyDZ~ONa_&>ib zq5w-L{i8s9SUWAph0;OK#Wns0cwM~+nxd`|IP+dEJ(g0?Z3opy26j?TsnRs1>omKr zZYFIfM@{2NsP!#I_8vN}tdC9isPRioyWkTL8k}^9D&hBzCk$3aa7On#YNCucv3u?) ziFsw_(MW^lO#STo11Bd}?I$L4tzJe7K_cql7d%|yRS^CC3(J8F?Ztib55(a`yv4c0 zCqa#6``~g%aLiF-}e#$Qe5y2pO-iU7H=S41%Y>z(ji;d_;U_I=ma)pCiS8b&-d&y01_gn;O4^ zb9QHacEYmL)O=5eV=liBvY=pC#`3i;jLPVI?-A=Pv-N=eeBIbcq@;CwOyaZsHotPd!LBHr@jxaOHhp*MjWR(VzrBe z?mZ2OQl~$er*n9xK}?DjvTI3(FaSeT#>KnO;MOPF2aSi>e)Im(Jj6od^L3{GwOh(Lu81!hC_C0|=>Yq=SJ zJn{5!CJ<;%lCK9pIO}M6SsbkftPA?|{qiSd+w#DhSl%`lnwr`}FV<8Bx6ayOPh`}H zSgFTyayAz4izwMyKN#`qNYY9t<#8ET9<~Hcx$~jL&91PMOZ@YV9Qi z9p&To&uDhl6rk+lU+z)ip2>_Ze*5+rVW+K1gppDGItcRy4{cT%r}J%tcC21Wrxk_5 zuZ1!S8T+0e8XjR-PJ8<>D{##EX2|KmZ;8Ft?#tqrZ*DQnP#o2RT=N5EBiSgD$O1Av zMY(D^y6v9iWobhN7?-77L?skQ;4Ky8*FNIVh45WzyNIdTx5MEBc3F+3W0#RHUBg~>I0tmgFIUJ5AfPj}_8?%|AOmBhK$3^W3f42}AXY@A zKAFdtCiOOy*c(Ji)=nF|ILmL|zm-u_1Eh-zo#N3?csxxQS+nb5Qhgy!d`c2m$8xt< zKtiHneXpJA+hwPtNjBnESQX=+LXo?o>7uuZ8I|_mPbMUXoW8r7<`ooKl}uEHt|^Ca zZEX>qe2`dY84~=rqo;&V%d+(12m8ePwo{P#t8&>-EZNZSJXrUf%pK*#1hu};TUZo3 zv=>i^%FhRC=&VDJkNE)`-6f-+Q+`f>zv*qAiAF(P8FO{g1ZU+SfPCwJnmji&YG#`# zmc>7q{7$I633EIa;4ZMJFdlpbMw{qH1{x57hZ`>(cgc_>zt;IZQe==UySJCx^*dBU z{PcUUL9*gg8M^Mpg@vAf=ld^;FP%K=mw)|=Qz1`6#%O$}ruI0zqr~HV;1G<6!%%5# z={cNc#fchb*yr79&iS4_WjKrxJ>VUC5#>cJLaPB$!Y5VdO$J!5l$Dm&bS-V1w56q0 zweI?l&ttph&@s zfJwk8r~J_#EDR`G>pyU$%qoc?Dww3u+G&sGO1#{%1Am6##Z2CncUz#a9?YFv>#5yq z7Wd0Vx2uEdl4ofgTk^f@ju$68h{DlnuqVjGt(I{#$|_p%9M>xN-z0SuJ^%T7EFP8Z z6NtyEbI#FbRomQLq;q@6(NIa_`uW{aGq)d_3Eu8td@qI#rOXD#6@Ad8{C4QRxA2Cz zd#u3X*V57`7+4ZHe|U7RuI}3RUT?K_`aVMzXK1_0*4r{N5sDw}SyNYMSzsZUc<5E$ zawbzuHX|B5^6LX%n0Ob7HwMZVajH&5zkl$OXU(h|MnA7&Ta$mRI0*2Xj5_Rini{?g zld!O~koc+mnsQEh>0bb(Y0(xPOx}_Qw8-0^L(K!9YzXbvd?nPe?fJ-B&Mst_8#jG* zb^qaDH80pO=Q2tU5Wj80gZ-Sr34}1Ao4ihUJ!*fr*LC?Z3m>Ja-Z0Xv7+0yOum5w> z-98HSf4FXHYWmJ)NT_`9k`?n0G@A|XMv5iC(sH7R__?D~L|r*QC#O?}x88od`Jc;v zRlTCne*P}fozRb50;H2BotE3J{@cT;%W78$E;KfEPLrQ%wFD!S618U?O;zm>uj>0g zzeLFI?kQ9=s)N~ zVW0%5db8oQ)bl04mV1Cx&{OS6hA*9qiwjuSF`pg-dW|*V5h(>H5nP(!;d#Cn70rJw z{gy=|EqFF?45A|*u@_Qw@sCmRK)akz;QIMZFz{eFRgV0xM>3a*+-N_Sy#0(#GTrUp zoc_iKzpP$PCu*lSno1u@f>?7J`YLe6=WklG_=l0K&tu!&rq!=yakI*Fea3?ZIpvKt z4Bf0Mv2c z-U$E`)4Qcy6|)c6e>bnN{Fm2rE!~7ZE#5l`YqlbL5&o)XF_t#;QX@D#Jk)4)3!ogI zTnJc_G@js;Cv_FD`dymG6rB+(2k+T;aaw*59s<|<5_o5}{)o5X=96`4^p{WM^XmLt za!D2@4#pdpd6ErcBXw4B5S|4q3SS2Sae*_*Z3D-X8EV-HHsY0jxbakb~8Su{< z(ur-vITQ7_HYS1)Ga0!hx4=|^{Gy`W?8Atu%HFO{+Ze~#9ya+pl3@LF*Sb){cJJpu zt5|3NWBAwudMQnXdcB`^+1uYQU9FFy7G=BIWbsQ;sgK1_%o6KJ5^5jee7)lG=eB)$ zTN2!;F}=^X6B$Dz&B@JE*{HJ2rV?fJbAL)fQj$m%8*8o^0;39moSo8VDSgt*iZ_EB zBo&nq#nd*Bv|$u7%6eB=;<*W)prntoG?g`IFK)jn7<&^&6|TT1yzgPGv6d6!3x%kT z?{DYs^MeKb8^btf8UQIKAX=j4PDN8`FbiwFJeE~sE+gmHa43`z&cn~^e zAH_7BxOuNOmF@+>2zbYfo74CWIc+2gzABD?skkhK*KN!`3netskihRPnWi0Lm-%3D z7yR6Msfu<}ZTLMW@{>5}FXeh}e1%NBpX)BL5Pc~ywnjG+@XVA|K8;1~&7~g!YgOue zSIN9~?=HQ({;GbaUir8Vf{~q$t6u4mI?ng+07M?ebq}A;kUhv2^VxLpiVkZqVZB z#nJHd^MhatA4>;e6d6%)r`U@-7%*}gKmVpcE|7pR#`{EhSde8=0p*xUuRHMJQZVX3 zNb9qzTWqJv(}tA=xccdCYDDVio4ACUL<3nXh5(3u{cQ6YSD%sVD89>*L4!fmp}jqH6bruRx7POSQI_+P1jg+;V6Z=IBi3bk-n z7N3(TUUa{gi5nw0)OoH(?8r?))M0k1l*V2~QnF!=ge@F$Apj=X%&u1WQJicy?Qn5( z1I@}@BAPs~xY(l+_@Tfp-C$zKwov7A*F@yyl2?+Q_xkUWJ3kZYjo;4npjc>tsO#P70qh57@I!Da{WXeR3W|X=%HtZV0BZ zE9ng53XX&H3v`ku1*%w@6xF6t@VG^#s7qf5sL-q$fFs@KI>o|KpPIKo0j9sIC3<4{d)lm^TS-7~2-2DzE z(?tD^O-h1Es;)^jbjF`uLErx8`WEP(`{H?(Ew}>8_{4(l6(&7Q2tWt!=i5#f^YOVb z3%dWFD;e<6-APLklTGAl^23{~tq_y?gFDBF~2IX&OkfEX%&`q9*%iboA! z?0HkgLNz3UK%j=*tfjKm)K7hP@J?iGZ7S>^H?OQ6vNm*6cRtV zc`7EZ+<;bbzTviNkJ8&qJDki$U0zxRF0=yi|3BCN#PvqICZ4LPHG)^`4yH*};Z}BK zM?W;IF&+?i4Fp@@o-|#TqdbUiuU|)fE)3NEa#SSmb!5?oC~{8+ z8}3&il!*lfG7w+8BJ4LQFcMY|tg%J;-L6yIZqSSLZT{3f^xU7?W^ZW8_cFplx+A~8 z|LN6owMEaj`7#($*tYG+kw%)oVyO@7jJ+s%a3W>pL}*~uZrd`ohtgn#dE!H z`hGNCz%ZH}alOuN)CD`!Q&jAE54=xK3yGyG(L&?IUF3z#hOGEB<62S7&iKj9@@VS=C2KfQUpF8ihBQkLET%AN>-=fipj&o zf6R>Oh~lJd#4sMNt3}pb&FC|Qqr=n6n-N8&(B#ah_+Yu<9Yhqx_bKbBNUF#()KO=v zQ^^M->b`ifcq62cF4QWS*>g8w$k=&6+@JH7B&%#OW@<=FZL#Cz=ZBxq@Z(ffs|e~a ziB*4s47G(VhM8bl_v#Ahbysu4nd=TBz6f`w*|iNWx-Dm@;r4Tmm`qL8K784fuL(7L zpo1+T2T-O@{Rp9v_CDzhc^r%e;x?PLLokz`XdU25by#$nhEGgL)Zw?pEO$?r>jrTI zI)AZ9b=Ow#y%LGW38SqZ6<}>V4`!$w{2&q6Fs(i10^m3Youd9bX`EL)c9K(^#?t)O z3{spVn{z{iPSb9-xs>>nnNsAFUNoqP6Yc?cQCTumWs3(hwF2v>#u{6Tn^uiG2Y6_b z>!AV3n?BRTBE@m_Nq(6wPS{~VMdfxY;LzrWoFjwnIP-GVKDpfI@JEl~L`fSioUNey0`yMmT}+CA(LjF*>4f zovKD*-f*9#L-!tTpa16YgZlRh61hc>$%7t}Z-fT4GX992Y-5+Ey`=&T?TY(R8- zM_7~a76yR+xTY?+k)dAfws@C2Y|V8u($^lTK_j4>AUeB|FX*U z$CMVRP!SoXZPwG{&5qPC6Ly7zKP6V$m@&zhrU>NB9&+pYoU3gOr^o_MS(FPwDrA>B z7F9TFtcs%_0+`&NT+`mPR-GT|Ke{>xWz|TGP{H~Ul>hpG!BaVlo-gnT_`-vNMoi5H z<7gRmy`Lx)a@g67V;T1_Rn7RFu7$HW&f6?^WQZ}eDvLdHyrVVKANuunbhGBq*{|rU zo$3+d?MQ><2r|BeYQju$PQo#a6b{U%@Sv^$N{&JW!?}EiAVgpOE}S`mE~4NGm(0xc zF;00f|9y&64(~0)Pj&ZS)@5z(IC}hMuLFOgINxh6Be%-K^I7rp8z={EDEwdv2G&q% z@o7$lbUx6+U1*!iPp9w}$GHjXhG%x-S*8|+_JOt60}j3L{&hacn8n;^z6&9ffRiD> z*LEFxI&)AL(IXA#JZibK@*#2Ml*cRVj-m_|2YHoOsWX*7g2|@1CV9B=B59Sl2%hAq zXbF5}u}IB$t*z0u?#hwH47{0~RK zYL6qzj=kt)vb;^!$&03NsCwQ6jKS=D5I(h3xKz>LO8_$>6;T6{c>)9hb@yX&nJwsX zZqJXhCfw-$_h)6bvii*Xy;FEEdyAS6wl<$kvm-j{76aRazf zvUCK#|KQCUH9La26H*jb-#k=2Ou-xLFcxiknGRIUcprqH% zJx@Fru3Btc$Y1!DznV1_JD^FpW~A9iqmj5aR~L75;-x#yYl`dnqU|YE*%*F7!Yq6vZdggv zlw)>|VxBtM5F0q#VDqw+EQLV{Sv0%27*inkLh=ypv z$Siy>?(;Cq3MjVpk-$~ajCclSGD%ZCm4OinSQ2p*$mw51tS9>}@X|%S>I}^ZBv$42 z&+Wn%jz$R?Nj%$2qiZtA5B*k_xBqMlCx4Dmk*4u17b;$DUc_DhWwynKr}vAm<8u-V zki|&K{5-!qFi0o(XBd8ae;I9jSP=W?Jq-+~IvTD86zjmG2kr|X-Bk7@K`>G!ks+?!dG+v(f^+_OXjb^0Pvnshs2!inn z#c#=@`{QbPe@d;@PV08p*=RZa^EJ_6tJn5n&Lr)rdLqb-((bcHn>t5DjHV4)Suash zq$(=*i8}_DgajL~XV=6icL%e!R0RYmAtb@WAgIZvdqNzTe?m{NFD}SYupp+JdoG;y zwQeFyx&C8^#-o!C<^bEF=t#nml7>3Jzc%syJ6lj;{qxY*Jej`;T6f4dbHonmim^c-V>(N43aq(|4A#@Pc#{x4lNVu)lv*4F^ zs>3Xr}`rL^whW%^z5mM3(nD`RkRzpkd2FS$16=>-eGA;xbh=E(1IWYIJ|hL>G%AlGSX|~$b3-N zxR5%B)wwMVKWMKk|Jbp=KUhy@ca{2Rba?LBc)j(?!qRdlQntMx0}OruhO>BgL0h32 zY9cW6c@@UcHVn82r?cT1<1jmIC-T5*Ro-J+DNtflxS}Uasrfssej^EqrGDF_%i zUQF<)ykQl&9*hPbuMil-J&3(Tv6a-mf)V{OQZyw=*N|X~)LRg|-2^a`e}GT)Ggm5T z0FG5F8P|u5laX$9{|Y&_9B`*FjEW!^3OQlr8W7D`v)3=W&cFUzHCt=-(#FQ-cb*Vp zCE(40p&Azq%iI*lrB&Y8Vi+@680Zw@kA@o~j5``;fbw`9z z4{-YcLUH}{B#&aT*C<*@27>>SL3z2+i5`%Uzh!+A)*^Y99@F_F{d20;kpt~bsEf`I=Z$(V& z(lcHS0U!+fKbp=ms;V#A;(rjOL%O9wLb^*zK=Kk&ausPQ=>}=ZOLt!2N=bKjH_{~_ z-69>n&3ogG;RlBw9B|G)d#}CLoWEJ*B8h+}(}i8A<~W5c2aoL!MzUidPw2)Lw}FpS zX3(Kh5&$YdGdT&6tLg{|34b4^^j9i-dy509#XW1}FWvUXM$S>A)#>#g_%L@nIRx}9 zT;omo?hv74`yw=Jsl3jV%wws^arVAP4Q;18x!0@H=5*me01aNRZq5$%XJQ#9CMG%n zoA|ccVodr0pt?I%1eZ~g^;R_@gz8!xLpN_?_=~{GT7`a9z9s?|7gD$7qbGym3bFli z=3_$xx}uaWfUjh`;j8a_Wtw_EE0$p5n`hg{vp2ySawj z85*-~NlY$1m3je>U!2R|ifR8bn=Wr@MDzVvG(#2OE;zlmMOS+dUFgHE-7nxQpi3(1 za!@WkAuog$S%>M_ zJ$0+gb&3#GZAtLL{`r?F6~RiN(rmU&-$Yi71!8M>W8=cY`3q?LSwiDb2E_PvfH=(%z8tM&aLOV=dJ1dl74vGdEq74IQa_wQ(R!&q6UgS%Y!+)b z`CawFBrOIFyfBdUq8I!N4FFgqdjTmVZK_cds^89No)x&dF-q>trGiZSp#of*sXjh` z@oUILtA*NJRXc}yG`StFX}0AC^?U59>au$%6z4ppWn7$i;a z8cFnAnLj7t{2dWzMoFm1ha@*uU}-TTglk=yzNeJV?2m_W^M$fAaxA6=iGSRQo?eeY zj+SGj@dc#|#Z$i}@$n+WhJDl31vZJgK4JenF#|p~F-Qdf0R5o#b$IhgkkjB0nA2EV zTUTQkM*Y_ekRkwBAn34A4J4|z&Fj|ENSrt!>DtROcqrx&NX!(uDcBt};Vf6uxpKoSY-~1H zJdf7^{O(yq=~LdMp!1pHvCZGYagH-ThpJmx(GaVtQJFIw`e(Fpx( znnD(`7E3VFc5V`}8T8AlTim4Cx%}H+Rj}b8ay4^Kq8=kN>U1L_MlHB{Gjn(c<_zHT z+MXs3g)4Y^Hsv3BBtNo|?E%qai*o*IFz7o^v%|;FQ=h6fHB2_0g-l@llVICO;!^2& z;Hdd*~bl&^X_o=J}nGdgZlMyrui2I{S zeR$`&C4dFyTj1CH?&&MVLL-w{YMD$(bXDa+a48F>S%PIB(lsTaQg{W$#hbB8uX?#6 zWRCQdk8iNMz=;(M$eL`F%Q7GlgWCP~<#3iHtf=U4&e~x#{NO8`M)IcDRGfHfG}zjK z7=iB6#9`O1N+?&fPp+=bXvLiT0F0NTwMCyz8gAXQDVVyRCBzP0@cugcWxoym5<4hN zbagWwo-E+wHfjO^Bb?*Xt-n(wf5v@{Y94~j=^6Sb~J zyK9?=QBt<8K&7sMK^MqpP!`J+$`cO1CI3@>^hri0V0wrjwFKId+7mvuUE1U`zQKAi zU>x#gdzRDai{3*5BhSEk9?5^&5L#HyCkUSI!>&lGz6O<_iJmlJPiga9^`-L8>II5k ztefd>6Ir+(R@cX?=*o1qfPjb07`Z7vh<3*QE8z@Y)%3|+&l3;vyOR*t)9Esw1UIpj zTlO2BNY%CREOzx&C8)a5)|%D$nXJLZNP5rn`OGN z`{`16K>ulw z1AhV#lPOvM?zY)=xw5b+W-gPLI7LjKt=4aOg-QFha#Q+$i-*vwWsBpF81$Tx$OmB? z)Sj&|7hiiVn-y8@S=j8;;77(NFhI1hRc5)Bt2D`(Zc*35-Crv4R5H*iej-5^kEI#n zS#&)zoByNMG#yK*ut^YAz)qhzoWXJ)&yL(pfU%tc0yxLAvd(ltB>IS%aZeabulyGS z6sS_0p?1(3?#tnr+AzaEFkH#IXiUy#ysmzmst+2!w!yy9b?o@!OJ^{$a6TPMNsOej zOCPy^E7O}4PpwoY6t5$wmA^`sP;430<5`>M-gJ6|5d;1fK(%cQFlT+bI#~_2NX3rAG{Ney^nDg78iLwZ&IBECCZkzT|KsIPJe~J;~D3l zXIirt4Exr;J#%V9CxItBLrH3k;^-(eM6Hob-cGze5dt>cc%kw8>ddkLA-vIv3REW zL9)i7)P@G*$5Mn(Md-L?Y3p3MiFK02O)2x`Xdf;^lR|srgtNvr9Zo;|JNE`Da>71W zT`zb{`lFkJBd2;^fm#)q!ST^hqTDGQ%iVzTv|&ALsAAqB7uPl^K-9J|xih+r!s-+L zAM>#WVw4HH$W~Cuvc0V$^DSGPW`lhqKQmJWVws1lgV+-7oI*M5QAywDFtIpe`!H5AFWe z{i*wt{ijouQ`uNuu_*ZGg0Q!W5Tqxlgd1n|_6_M*El@8gZpT;H*VT}|jW-7edgd7&puQZ|X?4H`paM6s#P8RsCq zex28kp9dHysHKQLRS~=zT1_%rPRVCr6MOG@$iL(`)&h7wPea77J=HqrfOBj0m>H~3 zjgFHpIlS2ty{<=GM5fP889-ft3?5jguRje43yy2}7140j9KsYSPbkY2K|MTUxEyY~ zXd^IVyENSC=cvepYgnr5aiGk59wkiW0>a0%`N<9R3xC*|=s0tT7Fk(ZTgqu`9Co2d z&8@P%MEjUZ+DpCmS)?Tl5!z*&YyBFX;0>;MXFVi>R3v#YjHlUF5Dia_L8F^nUOV9E zsBinc+-!sRVZSxx#6xV^7VW7NO<_Sgk2w!j%nAWVSzi!CXmz!m1Cv%*5&aPUYU2Yk zRQC^3S=&E7mXrW{>DyJK*5-%5cZMVdHJ@WJIs zQJ5&-r0d%tPxC9(EStH^sdYdAbq6JZ0uzy{&{`m;LoE*Tk0bWCkE)uQn&+@S%?9Jj zr82SqUix1Nx7}^}IxgDOReImLP~ynLU|{iG?d5-W9DUih&8`-MyAvG6pxFGdQe-Qh z1qV4h=KNLP)g*q8jcz*84S)%Fyfa1J$&JB_lRGxMlZU?IxpH^W8th00qNj?474s$x ziVNHHbfJY}auC8826VkdfT2!fHwK1xp#z0j(1tcwntqkY@u5fZgW;g2uW!(1vBdWu zxlfu#RHeAS&TjPXI%QLM%p$nzxSyjvy=OOQ4Krx-eF24u8vktPQ&!FJq%RxthhF?%H-eCbXR{Se0>mU3~%QtC^R6xiK(} zd_E&!{&8}00%wX#)AAoKmjDaC!7<+l-lLYwOjWf{F0m|1_;rSk)P0duiBo45mir%f zQM2gHSz>ur-UWB9G0qSOW9?V+qj-l*YA`gl+&%gD#x;*6QQ^-)+41Yz0e4T*vbLsJ zN%6}!qte5v2yX8iWpGua1{^Y=b&`*tP{s_t^^&;r`3JH2NhD`2UR48P2rw})InGJ$o*=e6HYF|@|%DEH=}@LQAdm^rYQ3-J^wXBadDcc zkkt9HwWk}U?JDC3<9<44q&B{J_%rK!GB|nprJ>T(@KY#*+QX%*MozPs%?+R7_rm-q zhJqeivb?+hw;YPtcjx!9^C?gL=efoIm-=^bD7+iQ zQYeA@KcH6#!&#qB!5b~r3V;}F|D2jX6C}3{KW^rCr+x0==D&94j@PsDygPerWHWq= z*K=X6nI!Bl3bZZ`w1~MS4C};=ePW6}zxV0Ti=g18JEpZrW2gUy%<l%3(MS8W_6zchKO3Y$RXsl)k@4uUqvI1&S^?yzX@Cgf6DD znxQe1i=P$Zx~?dn_YAJ~GTM6gU0j-SxKz&Url8&Oebr1_jRKd|>+aee`AbfTKUC)uSqTBuhB6=lfWG{mBWN9OzvvsEA%YjJ@bt z>t|ohEnwAo?;ZN+8u`{@kwh((@; zJe7s)Xw$y6%*hJzb>J;paHX;ar9@{;ru*N?`-3!nQMZF*yYj*!gwBebLXebv1ZmHR z;A(d$^Jv$`DFAXdDnK6;TKu}!fJ|lM+ygi5;$ZDHJMjkav2LfWHn+%MPpXDwlzng) z*m(19-Qj{A8$nOG8Mf%_HcK$2?mDv8;9Wz$PH_Dg&cFsGk&JBivS z)qpH)-yAn` zXMNrMZV(sLWWRyt&Hb7NFnA?XBz=+mX(%hGd%au0UqBJA`n_tOe#jv!sEA+17zCdH z4&1HS`Oi2IRp0=K-Qb(ZmcH_Vg=4B_jfC(x&kfn1t2=&2NnM$QOf2Y1s}*4#^fs?Z(_3+uJ1>3!V_4=RKrjIGO4RpCMaCeQku z2*nR5E!6DVVmme&1Cdu`VtL>c&p2$1V#89a0#!XI#ci3_6e37guA(m`^;Y+{#QkZq zod%z0IF1UxcNoZ5&J-g93O*sq(WWHsA4$6o4M0Nn_)v2PfvX-oag0&omIO-fg?B1_aHw!zvv0~aIrSOPn6M}PpQhPalMQqD>G>@J%`mMKp!+TI`f?(q3hc+PaqNS?+ErbvRLV`B% z><8aSRBE@c%T2|OtjPVkWXJS_;s z#OL2OKqezcs75GvnxV{jM0SR7Sac5GMeDn{^PsChQIlwk7nIbWDqaN{s!O(<;7-O5 zFw;0dNC}*Xooi95BaOMnBHlSw=11qQo)_3FNeZA}3?eqeV)MYj5MY&02iZ8mTVQ2S z+@VXqrolRcWwq~~As~8C2d#+0QVQS-Kbs1n{?0*p40+E&Brx5Ckr2qoPk@rAs+W3% zW@tz3uArT{-xvkD$YP$ZfncCf_THNx05v;lrl<6^`JD`pF>F9O>EzF!{h%p5-{{O1 z8HsI3ec;q6v+5zLnHv2h4B6}K2J_U@kR?p@`m4VLuILN2F!;nI^$|qdDa=1@PBc8~ zolk3uZ}S6^4b?=z0vZ}JLmb9HUgz(DxCX$rPZ4#+0d&Xz+`;e}m=U)>)h#yl=K{v3 zS=G6&(7%tNA8&G5Fv8&3mW9{FE(i}GHUvFnr9}3%#}U{gjkL*7JTrioDe6}drYddW zXTW+vmQX7@tQgw;6>D%bmZ1SUfJ&^4fZ9f0}VfftedEmrwxI#X>a zpdR4~f<2^xeF+GTwX|)_fe_PruDn&PU#gKuFjE}_cQ>Thd}K;Rt|ypO~M z*@54)X}P!5aQd;ydbg|Qo0pqQ^?ho-xWdqB5NlM(@>z^7a@nHP__6r6)3-I(O&3l7 zR2&T$G)sNLjdloJk4uXy=6Z617)htU_iD2AoA@fXAG@3@bZ&h#iZdn76pG9Vcy`if z{vr3XtMM3Y!tzAGcB$LY_5MGVsmCPrM@D;<*~lYKr*1LQh*XwtLN#ZJerTiqJGYAG zf0Kdm!onEPa4P@Q)AvY|w_a`}QpAroHAu?b@N153F&rlzPHlhb$fT(U_0W3W{R$Rl zxqjK8$Vx7Gy_Imcj#*M2*VFc@=A8zkL~{fA?)(B9KcnbbYlMd4O+BAO8M3v6*^j=Iutg&kX6kR%mC7B z9W~Q5_BCf=oNz(=v3;zoB`{>wU!=E4UCHGGC#M|V$A<&OVKH02;~%<1z>{-OW8uas zeG(L6cY9&;IClkCys+?aVGtn!ay+kc?3t(JMofuv?_MBJBDQ+Y`gg;g{UR(~`CVS+N8W%1qMHb78^%(P=7M^NgI zUfQ+B`?gj2Z$s~YWn-Tvau{6qa8k=cw7euuKI}$GAS`(tw@!hy zPZ~sFOVQxTYA1~Lh|HX0X;SI^zK@Dg=x%B``djrv(nkz9eQ#r=zsPKvKKyxAk!Z$d1*|_U*ey=sw53*RDc^L#}hxrWm8;og(eX``__$b zxXafN?j%E(0~|`<$I^P2EH|!prmz9kfVrDsP--3tur&qhPu(Kg{@n{dK7G>Q0l;8O z7CdG!8%gZ}nQ~w}2w;i8R|Z54mZ)tL;&>_hwzgE?{%(HS2IbAGq;Od}DH)k3kA4CW zYiu%KdD(R2`@vv_Afkk_U#HcHRjMs1N+CUaEC5VUVfT1}s@QV8Q}>N19o669pb7(? z1b^#H(z4kgqn(h=8!u`Sl1zK#xIXOdLXwp|?VO>^JP4uY8d2A{`*Dk_JK$NXPydAL zy?fUih)zHzXe$QJtz1wVzNQ(^hnUqZKJU@m=j-BXbm*T9-Pmnyxjibmc0EW?cu)ffqPv8=$VPK%7J?$c3v(OE$YlVgL;E5~5&LtQyh0#IF09Au4G7Kpw zo!?gk{7lSXG(sWuVTup^YN>l2{lJC7)q4Zu;d4Em+iqEYLxMG#h|GpOsX-Q#*vwWFIaZC|(qzfy0uEg*X%LB+c+?!uI&}Jb2>Hx(y zj1dM0Qq}Y*nIp*3>`p`h`$iN6=hnt_n%iDbo#kij?Vhf9{5PuZ@4>nD_>v!QZ=Qko z?Y4CU7)0t?TC$3YFME3AP>`jNktA*FzAG)5tx~xc(MZvgM*@N;pvVJb+SJmLGVl)o z^b;7&0u38?1YwMdC)!ls+ih&q#rbVx_N@`pzUCAHQmCGb0-Gl8OFfh@jJux#)keuo zA4D9ffjVicVmqnQSx4N(060My@zGoF50Af0DxQJ3ZHv@5eB>h{$BZv)UV?$!{Ql~~ z!oo$9s^Kgd$P3))gN=FMQc=yX0t#%@>}L1WOZWJdt7J2ehZIAj#V4ElWWkE##~u4F ze??~N%YeKIjIp6Ta#r#vHB}i#M|n8-ibQxoygw0r8w zfWP*mZpCDGQV?LQKui1f9wb4;R~Yv_X3z#>kttj5epR)RW5x*~0A3b$CBw8OrNd%$%`XJ9HjJZj1J93P(V6N zw@1Iz?9i{wYZnR;_Oq6+rkUfNG&+*ehqF9R%iRgR$;88g!Hy|Ch3i`^md4I&z9$q# z!5aaSSZ?R#Y?1e5NYs%jKUS59{8AqP{(!RmFrnQh_04vtpl`mG^loyr6)gIVw`&~vIaw%I8uok86{si;JHjtCmgii)ojI53sYm+BD84y*F~ z?b%`wTsKZ;l6xw#^lJP0v{{wt+#yfCoYbdNhQl?MV51ASu56aVZ4v8}*RA#=*L=0r zXAfaD&9|o__+hD+BZjGBh{F(sB}lSJ8A%g#-lRk@x`ItGM;)}xaq_CG<6~nrKvxay znV=y8&K1BM(W`YvR4aInlsS<{6|u_FK|0qSryoF9ga8Blg$44@pIxQ^E-FP|Drwwn zVQVv-)Wuy$TH=-XHbZYDr7~S%o>+6N0z@iX?N7l|4d~8++Qi@gYnMc_njKape)jkI z?S>*|%gj8MGJLApTmE^37`Wef$Ws?_^(?H8O>A}xJQmCiIZnBVAr|A!clnY^c)T6dmzLv@s${h}F2Sm<+};zLDu&c4%<5QJ%W^E$C|M}u zqU1j4@@LxtI)t5-)odtn#B(!%pYNwJc&+!Ofzq^(o7tJYsK`PUH2i1Rk_rJAHbF?& z8>8{r1h_q42Y?DVEQI#r2j-qapT98_{I-t)tqTY3n9bp9UceX;wDYb`Ravx}aB3Ml z)YPx{RRf9tB>}iUG<0&;{|dS?O!fwg~R8zDOR(`x~?%{<_md{N}cM87hy#CkQ$S*>B zDh7C}5D}(Fe@_ci-w5GssAa>MzdLu!*Df3E=MIxS(Ij3t z8<s?;(&exlPy%f`5A9KMfJ#z4-z+oGqoD5ZF2TUS*T$hI-9Pb~+!nlIwxREig=U%yJ0!pvJZf==EOADi}#Ej;PBUYeQqZE+w5~2l%V_n=SJu2^6 zeGC>WTTXNJc$3s7tG?sOTSc;OF09{Yrg!}u zg%1ohc;(YbDi$vbs($r2jt4?sPdjO;^f3*kb9sw_ky>_PegGh3oOBFg0|&qW({Ha~ zTL*a@vi?p21eeELw$^iqh7^sqw_Vi`A&OUsY~>JF|8y>Cd1gAOMF?`D{UTWNT$-@; z@YSR67eBnyc&(=hG*?u8qp8nowWd#2!fL?9UWDa3jGio(W&OM!IJE*TH{`kM;emgU z$k`q}?Mo;KqH8Jo(R#^x0cil>WrQ4}*vC^Ex0h=+UQ@C$V&X;&KZ(4e2v4MxuR6*|L_e`#!#@=_IDN?V!HgF_X)#Wq|l4bww&`0^x{BjXy!MY*U6OOj0 zN7dA)gjaKYo8721bAmO%Lm4pQ69~r_o->k1zEI~9+Th0P&sP^ng0==50df6=96oKn zXMGu=#*I+!o5;OsZ=k$3IsM(=U)zF7js@(;F2KNis6FmHj7JJS2A4Ja2B4t~%thBa z|MeHsI0KZ3a$vFcR-@A^7LjAC*jO*T8`+E0)|wS02xW3uv7n3;P>DqelR*NG(=bKj zV2yYB-)LU*B_1@oBIQ&iWM+IFbLUiAyudRGKL{0yCF`INqa9%f4-v0FLJS{aAEm1xSDGy zS{bEMa@=u?M?RGTfCk=bc;H4amZ_{M8Mwp)q*FLE*l#>X+`AsZ5mIfaA)o+!Z~9|PY>z3PfxA5Ks~_W2WlC|BuX*svndczKX=>(q zer;&E_<%cd8;v1{dPj}ygIiQY5YGIKG1j7S;?VPBvKedE*zg;aSh7&~qagd; z5p%quuI{(4wI%a7W=+Fo(bMaT3m5o=#WN|}xUXYztY*6mVK^a?>g}Ei2JY0@;O>Uu zFX7Y$Y*6@-j1Ycoq?}pk8!0?4tT+qyd4A4tOk{wY*y>Ip7@Rm%%jV9n3F+>Zm-7HSi{|w!f(;@kR zSG$A}|F1iaCu^ipsu0!1s~SJ7OWPn9cCgl5dJz;mE|}KHK4nd-&wHM97}Y`a3E|Z& z@i*b2AMVnMcEL#S96_G8oImV^06Ew14lLpBv zVM?+PzP+B18p6HuwxlI|%YuTYNU3n*lJ2(nr`ANz({9;$<{0LfKUa~+IREEL>;-nX3tVhFHvH!(WIo1^6D=x?MacZJFChH4cV zu-DN8WG9;s9HYW`7T-*1@l5((dEa0|I)@Cm7YKb+^9G1$gVs5mXjJi))?Txa)*l+C zQ>*mkUMnVXf35pr;Uwyo7nAZlug*7lP1ox$vgsm@PnK)v6}KE@=lDhPNjoMWSDHjn zp?-iu?NijX2on+$6D_@&>ez;^e2Y!ze{Y&Z_R=6w?+e1}ZQ|HUiI;P8JSY1VTostG z;T7GCrMo&!i^H-)$fUtRMtRatG{$&IPo58=Y3S)Y4R|(;ac3$tD$-VT@AxvuK2z)> zvJMUOGfHKM)M?U)On=fEuX~oyv*Zj5*17z3w&&JD?eFtKqAZFt;axqCZGClYvRO)xidxnuqtAt%HS5?l?RM@~tyt`v#~$WSQFv8O7#6#0CluGCA!KW( zBtPmJY9hVJw$nm0YaErPD1>IgT=UNNVly-XLf*>DJ zroQB)G(Hj)z@VEJT@tjaQ82%s{1zZT#dKaS9JSGP{!`C^NFm3K4Z!3&zgB1avUW7# z57-2lE*>?OQ{6lZ#_Kd>ra#p+)*~j8OZllyi4o~*S6ouk%)U79EMCVWCMH%& zbCep(E1N|oX0|}nMU;C99W13BA>N4smRxkM+QVo*tWT$T2JOog&+E~tXNOt7ghp3W zqFRSoK?Xh*nZlRG*vFkC`F!z?858>{h*6zjB83T>Xlo+_0~3u+P5J8a(x+SU-xL=v zg`co>O(L2( z+TRB^WoV7MnAg>>yo%UTq6sE?8GQot4}7hkEr*>bm51muKQpKBv8Ts>Yt+`a!dPSS z7mBi){wYrG147kw+Kw1)&Dh^)IkW!YxNr1{J9kNthVXRw;iX#eI(+@u4m<3paS8qX zwqhqbE<;sQNf4<`)y$(^#f2>7=*afw_7>P7jl-%!mpW2X^pg4_k$@l&xB!Z8(m=u! zfYOue1ftO{bz`+r#1&)6c@UN!no_~Gn40pxm;4O2jDo&ao>Dz*LpDu)+Pb~t)Zvm2 zQL=2`?n!#P(v)Jn67=Oqb{s>%Q+B0FBrw zRk4`7Y9SbbIYqA+njsrp#>$EfFhfa$?ekx!wNsVAAUm^_%J`wh#kcOK>vA5Rp6DpO zWntRUNs8~x#%oyL#<&>*(3L(qE&T{bwQVwSuu-gXDueQqp-OveR20E)n-gRO`Bw6;X}GKdh+N2Y$(i5xHnfZCCI+PpvIt-iOjT;4Guj@?hUnP9c!?}=jxa@X9bQgvL7rO_ z`S)!oY6q)N@SP{xr@(0cg8+b>PMSIkGPKV=Z(k2Q!C>@&G;36UAF^DQ7-e>1TD%ht zeUPa+A3;*IbME1O+C$=gwI*NsO_OqfvPC4PAX*ukk-P}Hq^9DzACxA!^ePJQ7h|m+ z-pD~v!r*JC7CKrkKv2%c$UxOcc5gT2@`aM3&!L?2W%r@bs0D43598+%ao0UXKM-I)RC#^_LXHV0pVY2wbXVR#a0=|DW|Os)P{O{`<(A% zHkTF`MLYCO-k%B+u@9|_0^$J?^0|ic)OzVGXV3mb19nRo{y=;neC)egkJEZwE@RNT ziW(G}xhJIh7dfTBOA%VM z$?7bhi$pepFYpHrs|vEYIO9BLUZs^^6l@4NxwxF*{yQ;sGBnSNeZx+iTUKT_yh>IK zUH``B$paX#S3pIss;|FLFRg{@`64JW7SM{SRr7$6=+UY}Ly z#?NM|*4n7);y(Y?AJf&mL3Nz{huEg0 z#_-kKmO2m}5Nz}w(uw%~{W6T$Z+Dk=a`KfV3{3t&$k=0_2mFZg;K7~&)f~D~3K}gJ zR)FBjy+<&d`x=ii_Vjnw1~`m03sLZ+A73HISMx~|;xgB~L5qs~plBR{-Ss;IcUjKJmiUPbnQA!xYb01-Sus|^g zpih|6hmp#BG%q*f6}G~LBlsllw_$&9S8qNvL&x$Y0ZCONi{f9a)vPM`VZbm~H!%P& z?-LoPnyezjy4Pv=2htzQLZA4tQ0|hbtm9H8yhMDj#))6z1IXK$%881RIHq3&qm6Nc4wX0yiise}6$A=&(^7-h^Z zzN=jMqb=-xooK#cilWVw|3EV(>!zx%!bFNJG;r7{QGqGJH!470^ZTd5q*C*jgmyvb zWy&5K=r_%i=j<`co{s_Ry zy`e<`e^-XCcOd@%fr`4KWoq6j`MkLKh5H*t;IBqy4{9^ynldB~_-X zy=a&M;{@i%P`xDPH}&XJo>l->iC#^8Sef^hw^*C8q?(=RSDnke5`tNmgqPCMe9HL2 z9Zx9U{Xuv_)$EO4MZK=IPf{rT%;6}PQgj-n_P?)Q3jh!b!{{XPSk~iSqvN?!s;bt~ zAS0DouQJCB2Qzls_bXh|6T1D4Oq*+VdCEy8)-huk@{JkG2^`oZLZj6+iv_0R_FOg; zQ+yRRAi9yG6S9AKM;ZdF~ctTs!knXIPVOL2? zt-lGROHvOm{Uu%!GRDq#R#N#RN%~|(s-xJonqyzuyq9w{Ady%5@T-47WTDZc!Uh!y zO->4e^0w%2WE{R)gKF)f6J3vV=TVSU^)oBLnH)(D8MwJiT^u&sJclvW~%%j;4CsRc##{ zY#c9#QNYfzZeussuFlu{gTC49||Q3@?t98W>{Lyy&!SJOfPD^+#zX$9$=G<7vKElN=f&iE$| zXb2!Q{_8^P5HDxNyHpE$a4DY+Fu}WdO%07Zt6!14-Z>H3S+|0vCY!PD@xf=`=Z-b#zz4QLK&QQ`p7+oe;21iz zUzulW$sMm?mXKqS?nsh4U(*(x1WRw(JKq#Ku>SnHm16ce4Ol(B43s$A#YIAxfo5mU z#cwg^Pa1pJ4RuwGpv0*~gB^(q4EO^oDm<3sa|=B=sb|){n?mB=GQ92$^)`!VX=w%& zoBdGFyxq@@7zRQVQh~j#he7~-*1S^e%A93qvEd~{5k{x0Z#amURw^t)(@aidL^TAv z6oViU$Ki6i$ZC77cVD56MH&b*M9*n{dW9?8IV*MCPn*0_FGsg_j84148?4MADheC( zxj24Q*Mf9nRG+pNau7tu^W7$SS#7fY43BRvBD9ggtXYR}aMp z3m2GTgWWk+wl;fvw`v@!K^;U3gz^{`sTxnT-qR9LrS(yJG6Uj`&bK~-_szOPz|zrA zpymaut$o)F^?uWJbh*3K;6%Nz!+|J*Cs%(}lK=`tx|rdY6T1FqBnESizff*rSxkh!B>G7a1cXKjb%elycmtIM4)l+C^y{$gt?s6pAq0T4q#NNU<_1X1x5Rewg0IyJ@2~P*J#3{+n&79HusEs>E zP0gW=KZ@Y8*7ZCz@ZUSM(;$1MS4}Q05vwoOYf@FFw3?wAiHUD64(5koK7UcF+gVwR-6ctZx zKX&P^Hl2;~d;PnWq$8$SJvb8jb?K?D-I2m;?zR@ReGL?;3RYGG&@$Je`&Z0_k!&Q| zwb}QtZehGfCyVnwoU{fIlsX%}DR4o51 zMZ*Es!nS|6zUwja)IEI6xGT<->e^4sW@Xp~hC>PXK?wc3Os_v7-Jc-9#2aDYf88R2 z$ri46*(j%#5cG0*DE7$man&gIf8kU0))eJ@A>Ngfs^56~%=|9()Gb||B@UJPN_^(W zqJpU@5jAX!xKj`dK4HW@bXdYi#~Kn6ay=fhA{v8aYG-VG_U6?~Z`K%Td)1e(a3sN5 zlVt483G^y|r`mGha1VWCwJAO=?VPr@Brsb21O9bA#oR}cCnfn^VaDwGsYN{TW~J$f z#uoU&(6MV0t^^V5k}&ZL93Ws(1PNLQOC!CRJo70q_bs=n+YKu!;^TY&yX;}F>&oka+qcg? z-A<6d#_P2N1ibfer(v?4AwhU-y~zd5n;do<#UJj;E0Vdx?REj+9$KbqWkrvQL%D7) zd5aFn#iaKu%5wCt+qXB**^2a9%l*S*ksT_f-S{kR;=!Uc2wl@nzZjJmo#C%I-XR

p!IZo9FkydZE;i-=q=dxI>74u*O$lv@)lU98F|fNnp6@v~AKJ8y^+xWqaQx`zvst$f*cB-Naz2lF;jL3Q z5U-B=?{4ga-0ZpisQmV_iVBBhyqW<2vA+)6SPNl3sj_d z=mNn74h;z~PbkIQzJh$eRFV%%7+=S>DfGm6ed?Afp_})l0TwX$WDgBEe84!ds%C z=&hq8!H*w5bh_!ug9lJ0uc#^esLQlQ?eNhzR5CI$64Q~u)ip;Q%NJ~oJr%@i9v;sO z>W(NcYaLZy!0`$vk#I6HY|_Qt{Xyyrz)6>pQd9TtPd}GVNw}O8Czo^AD`_!C!emuq zLEnxgJ{cOI1xwUX!R{YkB-oBby=hJPDM=&G(q0ba85|u(i5`Ifdur3eg_`)p#M~n4 zSViM^EArafU~mT}+~mBLjHFn9vi@CDWx8*XSS%#F{|8VgW#CfuBcVzPqo;u|tPM|E zOl;;7SY4zZ&OiL~?z{<|4UdscK02Zv&5|6!$2$Xd)CL$^SlS*VS}P*&`$p}HYSE`ssf<%i8x)y~ipqWN z4aNSB8|YPhdK#lZmWqf~Ag$UGCXnu^R3;~XH3=@;P&3{z`1rW`n7PDRg?;f?p{V<9 z6_p>WF}$*134p>$VVZA~U0ry_X8-u%NU3?>&{tY4v%Z45T>a!$y!#XPXu9yoXvX68 zd6{p|^_jW4w)5XrYmS?e2%6#~ovQkxcm>ESVLh^|=En5bV8h~h0zXAD6o0~3?es+q zJlm*|6?f3vL0H1~p#b=e-FzBpw-zP(PD58W!c-5~EZNEbLkXiRXAdte1vhB@FO=pQ zPl6GaUVq|VAgZdo#gOiS0%ph{nx80NJsq=i?LM5uJ7b>@zmc(cl`<4WG{S`%OaW9e1Mla zi~x01EIKzOzx{`vqN}>g?3aw4jn_l|oAhg`KXtdOz4?(Ex7q1(1Z%v9ZBS zCcC+Y_3o8HMob_LITfO~ID8by=laNI!>;s!YXsN~;()FEUr6(;;kJ_v z0SA?Ma-w+gF)#{Mu%{8R9sL@y^GODoZtB|FL91C&rt=JOz5Lf+Q5)l{t9|Y5|A7-l zTN`BVPVs3Tr_rP+(*=^wR)RPp4vrD8b%Ga^Ds#;als{@XIBYnF$iR*MJz9?|2Ca|K z%!u-A%fZ|!PpXS!qwcZ^X&v>(uU|Ch=i9u-s*6TqNCv7QE1?wJs{G%UU*6{vHan3(Phb;PC=clIk?@gpN{ZjFs05Al2bmBZj@ z+Ygocw4h9UsQ?i?IYo;8zQH{kkSc>}fP zDavk0YO4N&%xL+%Oq>jtsW87?vw?=THYk2@trG2gW-6KHw+5GVA~? zDcglbQIL?<^+@;dxolb;Us*|f`we22u9yK7mbK1Pb2B4TZHq8C%Wo4zg@+zLX7O9J zZS%OKxKMdbQ(Ia+l&9jh-!})XR`PxWRJ)x+sX7_2a zllHWEfGr{-IvW@r?XIK*9GP0GPlcp?`wcCs@wDKS0Xl}*%uH27!)2n|Ry_ZYT#t3g zch%_#*H`QbysBW!(chCZCi_U$ms43uUN)=5N8ZFJQE0Q+ygMG5RUz9UMUhm0}bU`*Y^)pK<=i%u64HN-sX+avKOB$qGN=iz)TT((=LXdESgrp!L zNH<6~2uOD~NH?6tch2#rdcl77bH`dUvt~9wnT$gPvbMFJky92Evr5G4y+Uy%HZabm zpIMzAPL&SX(8Ugmcr*WkxQndE4MW4amDQp)@K(ZiHo4EwV!nJ)aB(54tE)3gs$#X9 z@qCq>OKA66*52yrq$3UBaCP(q@5O%6(b3h?8{%a95SNEY;_#r0Qyj!|+ugY>8qP0j zcw7q*UKhtjHj}6%LbYV}{4L>ss}j~L4-YYlu9k_)8@6mw)ZbTA|8^3+8}ajPH{wFG#^v$BszywV>gSF4g*FPw zjF8c-ac){z`f6$g_Pvwk3ePa(*97)9s+o#n&0q7*31rt+Wce&rbN-KX{#@M*2t}1TT)R zJw+_>jS;njIBSnc_Cbp^sq`uxdz85$he0psdo?6KxY5}IRvp16I1NVD-KSB0ok=MoUSk-|m%cA4W% zS%+uX@E<-#b2>GC8mu@{6{Dlp(J61Xe#ws47p4@OB4+FIu{0G!t&I;S?4{ampmVGbmk3~_Ni%#=tlXcGPDaUKeZIo41`mz+X$BLKry1Jet2Z!xlI7iD= zXouSHqv>-*d5963Dd9e;RG~XQ!H|Eg&SXgt#8}A`xG>c-xmQna$BkoCOOv&ZXT!wI zoR*mxezDt-;wB)Yt&L;Wmt=Obvkf!jq?T6wpUMf6J}t##$#-Yf)ubH9MeHrewNHf< z=EMdbX!140?l0U$IVkDulc!yCoqmcPvNST2h%MuP-AI=_?N#c0Y`^bG2`gr8<7sUc zzU8Egr1sKyc{9YjYBhM{5Wkp`aCSyQLc)5dOG(P@0Az*(vlH#?tNsp$EjFa3*08cg z(#{AmJ6G2VfmpbUV`L`TT;}pcrKI9YpTEMIgv}bmgTAyHr=+9P2p!#>=3g)ZwX`+< z=6Kg9Q1HErnE z`KhhVgPtnOq2$5CW>!`-SJjR_=9Pk)uF8{{3mF<=F-1kxvNC)gk3%}>DV9$6DACZ- zp^>RB=uc?f8*I*8vA)M;Ml9KYCyR>7++pf1!DiBW275Lt`KzRzm;OY z#a^5mIz23V{FAfHd1#p5zIUoU4n>T6k1E7u+}Lat#wnhIYP)0bI|DpKcu$Y00I9FV z1QoWVB?fNcI5BmEQKUx(GvWMeyEW6=83!D^$c}*+QHO#`o)P>f67zr3?m->TE6OqT zR*F4WsyKIO=s>fs`XluGd%hT+P=V?Z5wkeXH)#R5-P-712&Py8n1-cK|5}@+oM1?- zlZ86wmeZFhh`jkDWo!B%ELZNwN8IR?L>Ukiz!B?%vEG?` zZG)36cn|GydqK|ke=1W8!v)KEwVtF<@f%&8b3vFnR!D60mnV0Bvra9=7_-Z;yH}k? z>BvBhnSTG(Gt9Zs25%I#rxhd#^E@M@ydEW)!p<%uEzMUf_!!PpbSP7~-rS#h98`b27bJ=-kRa>$G55US3RFTU+;WAM|-r z!sp&-MmnRHdduWtwi1WNZ7GS9>O@ya$niqX4T4``MG+k%F>hMkU7pz-`H}DBoD5_IOcPAA?tRz6r zi%}1}LY4--IHNcTNJ0muxnb}{*!k0TQl4Gf_YAX~O)LF8(*Oy3B?yE$4 zH*l%Fj#XAt5|@;GkhM;;%^QIhmI&!*%TrY)Xz29`nz(3L5K?f{tLVLdpES};fbAwK zD+}QhLrDjHt+ERC%tOOoO;KvRu)V*k4W{!=CfqjttJ-(kA$0K%=VJwbKiwYUBmOsAY$yck>FEPJJ724d;;OYY1JM= z5)y&NCd=gafvhp8tczY&sdFLWcX{_tSRMCEU!Mypj0HgXIU_V}qcswWK$M&EdcfW% zgeArjfO*3+Z#m9;q;aoWua^#(Yi2Pd$ZXWxKS>EV-bU$*lGuZ*2`UHp5Tb zB#JPKlCJcMT}IkD4>_r?2b-ymr%nn(rwjPP-BnK6?Ox~+i=HJpIm;}|$g*iX*|_+t zW^|#eR7%i*+Dxv%SYHZ@*LpV<_I|m0hMgp7WKdQP9m+e`6G-lPB__s1`zmQ+Iqt+^ zrRNdo86cbK$Z5mbNh=aq1`rfAosHjOWDI?j9I>E$_?+LvDUk3^UvA}_Iitw#Z%ltN zOAguFTX+`!u@wJwHEsIB(Rk{VBso@vabY*^b`c z#?2!`trwk{^qUKPY`M9P=ZExwvHn-RvrH>|M&5AR8e_h=>pER-(@;=Vb(BsbLXW$e zBu#bc^N75jf96DCXs&M8OE~4UC7V@&x0V}+axW|)>n@(Zzw*RnA~<+2{mmiLb2nkh zewCbASjfFRbKDd1#emA4hO$=?uyfSsp*eK)RI#K~9F(7wJYKd5%bGrIcOVFDTPG$k zeQO_IFyq~)Z@nyP#Q${qss+1qlNnk6;^b=ar znguBcIh;j{OswZ0yZA=7rYG?^qev)2+SF=_PXw3)%?>z|ExK=zw4WuyW@72a0#+vI z89%=^>ix?GEWes|{4g3QZi6qUXT8uTN0ubt#n|bHepK#W{PPER_otkkrH;p27RS4@ z?SR9Zm)9&!`;P|wnt`YI4pSq>aM^T(TyjsDOo90xVEu0FRyWyUmq(cD5LB0I&A|W=}(K6`72gEnN$lkk>@C?n7H!%V%%1mAlL%iXM^vao`0zMJa7_KeCrj`J>7xYg=i zQ&XO@a^3FJo9ZQQdxnt23B^1$M+s(1zk3}OdyaHElzaE?B?C>k=l}d6p+wQkkRe%ABX=u>GRZi1qo?v#!wQ@V`#v`2QS1T{u z?2fx+9F>?X0*^>3_+gd-$HG=UD8m7GQ#1*qcPHq7X4cDpS*@?7{mhG;Uz_4WAt)ND z*)il;Msbmrlgs$^D;~x&Z#%E9?mT)11{w~I$ozck-)#+bwwOoX21K~Or>5Nm5Yi%=rL@_hI1 zgoB495yy4!`}=3CL^wPPd?U^*NJy>uI_?h{)bn9DC46B4xvI(?x|MVbzFVHTycBz8 z0cM)a%pNKVU&+-U{q!M^`lv9$*yxaSQvt`Me+M=t2mv~9@m7KbN&AITjf+#tY>3Hm zg^r69Z{38jP)wqv;~g>W#3aR2(<_sWtS3_&d_F@1PDGRdHknKR=I@aRdk4UH=fa*_ z?o7sN(CLMmT5F!wl8K2@e4K=d1sDLkXChtMvMap#PxqwbpG2 zifnvs8i?fR1X(IDgi`w86gX|d7wV6qyx4Qg+G3CJ z%iymhiCMTKqH4mp@elUs9_XHJ)M z4{us;r~H8ak|7Ym9QM+hs;``^XoRkmRU{QF8Geh%XwB&j4gU4@q#K)wIeGl;dyDP7 z4hsa+(@)VJKmIPB&G($D(DnF8^VEyaWZqM@xeC}_XtOAVX~Pav6XiLg>Am?uhyaDl zUwJb{;c3CEzu8l*3O3VD8_!9{GbEYI3r8s4u~elg(JU{2$=583c0b7d@grVJLM0$4S6XR@jfLjtI0;QbC{YK9fKk`N#pxW2N3a!=`!lK7DOP0=DQxN^w z@9TDTG*SAv`B~IQ4xekonbWq}#hn@m;S@|cJPaS`9dj^l$M0-e*c&e3xJ&-pnqS6l z_rK}sWOcaK>LV1d_<+h}m};3gh8a!~I1*me?*9wkOa$w){%0m#_s zc3kvHAW(ua$;o1`UeS<7Vzd{jnwaTyFLbnjzW8ihd$w}qVNa466og8`WB>8yYBuGU z-7NDvU8&K!(f9f?a6H#8{%c)XLEPJaB$LL2dbh})i%uU))cQfz^h}e(GhCE`@o~^j z)#L`UVc!@f(12j;g_BqxQ;u`n4b)$v-EPrmP3{Y4lNsoB|p zyE8NES;I)bFR+sK`^JxTb(6ui09PV>)*y~vwW3=*DS7`i8~@{&5FWgdO-^J4`9k|mMbE)6_P($kSGEWG81WQHkX5^I(= zkm3`4uPhleOuil-9kH_h5!2S@#%E5-EJ;v;|>cU{z-JDmIEq=C{IV zY(Knmrqs=E!%huEaRGN1ZnQ%6K0nu8vpO;qSR!a^Vl=C5~oU*!K%!6q|I{ zdCsHy2(Hvq1Uw^+R6M!Mzs1w%Ggf{E68#9$GjZroV{2;#rZAly)df^nkAP}b;#B63tHs_b3#z`$1P8BgxS z7dGkD9(N#x<-Wf~2A)iJ@iJpv53<70KewrH%gG>3MoBw6eh{qw9pzTm*Y92*qRq+4 zNz2Rg*JMn1PFE0t_ar4Of>SFEQx0FF#7%_DgxY{&o}!q2NCq`R_hz7&@j-CV`o?-j z)%Rpnd}3aQa{=1EB#?mXYRn7mpVUrx_erX$fn*SFl;!T-)aq)e&n+pU?y|ENcXoAw z6U^)3Ud9(_TA$yrbC5g~ARVPZX64~|X=EhG#nleR@!ar?>4k-^r7Q=BBbC27AIlHT zr3KHlY0sX!3=WFEb16Rndrd8a_vaGdI^5 zYywFyM+MCjK;bENxhAFfFHBzmsd8GtG&+ipf&?do3Soj75?kc3sCyekf`p0(P+Ryd zom0gYfiUT$=#19leJNQLEA#vRYXJrIv`8edd(wO+Aerh+b;18^_ra)hecCIL}|o`#59j>(^G z`~qMkI-3H+w90$R&=GO{lq@WXNhI7QV@xT=MhWPhnQTNU&!c*9)rS8#pBNH+I#$-7 z?U-+t8mn>Tet)u)Sy4e8DMj|gbV$GEZnJc1E|Je^@a_V}^;|L>4*@VWI50FM=i@_0 zb}^QsPmVk7c6}dwU0{^(V|h6ZTnl|SXTr1dmuDPqb@h1yi%C!43eSvqVYc%UUd8-Q!&iZ}6fhT5-2C_smtK00wwO_;a zW`lt_osdVRWkTreZdz4U6!_KuTO_;rm?4D$h922ACbj!>MPT*_n5D8ZTjGo9*7Ku8 zNLj`LTZ>aq5wvECud&nUR3%KL)9!0;$fq+2+KUK@h%!q`zK| zY@c5F=A8`%J#9Y=T8!7XvE3nv=2(1z9|{W^N%Z3`GWiVqa6egOyZdMj6zbgt|3R=C7eQ&OISymxEwDd9zOoePr8MRXR=xBMKPUJ zU|W3Q39(^W#g3$%nGyoFIxfTqXP!fY^OS`cN-FG;Cv|q@yB?$O&28&%Upw&IgnHiY zECXx*))aOuF}kB#*^1}xqz{mTl*7XNC@&i{o&aG6Jua}VT|Rxv#nh_X^yUcAdU20h zidx3LjNphs(-^^VCbIJ80GpmoTN3slSOvOxcvM%~&kMlzTB&Hbdc4}7(#F|4;CQb< zdv^nWUwV$MGUO3U?XNG8xk%Jq3_ZBnboHlveK4`?##dE;5qWrsnVXv>Yg>tjv3?%i z^X-o#lSS6q#+@hx0@MzC2P;eqFdWh7pyR4)W`;UFJ^lA@(%e!f5jv^BOR;7ov}OW9 z+(L={9%;}0j~A{j9-vk1f|EA~dIv2nr1f>e0MWGAV3E(#Ey`+Nrlth;_Z^_mCAIvH->j^-wczeh30~;SL+w@mSZPbd(5wGW+jZT7ZgTo>XNHav#f4+G| zr4rb`N{%O&#TeH4==kmlSC-=)P6dCMIECA^KvR+Osjqs0PBSPGsV2*>5dB^|c7TZ1 zHeGN(ASI9ON11=0T3Pu|u(#KS7WmNCN5Rcip-rv<;R$pT0@C9oW{*cu94QPs7Tzv$fhW`d4z5U9|P5YAbOlIpL!mlU>s8i@u z6INs%wXe53y9?N&g_?ZbnyE{+nFQl2DiG5{7N0NB9Yv1IjsWmX^>|S!#VUlYXup`wie)wjyJ_7j~yVg)i8=8 z%b{O;gEHOx?)p-KQS(=PSC>0bl2M6?iXgMgvLKLj{42(a?f-p~kDB`X($Z3Ro2f$U z8xR!QL`3I0Y^YPil;gytHm}b$$;AoT+togsBpwIc_B*R9HDr6@In}8Qm>bF#ZiY&mb@@oWe@}dNcD7is9d!gzF&MzM zn|^a!XgGy^z}{+)SM)~tZyg}pI3V+yHOeY_%gt7CxJQbP->ZSU7mI1Q_nKzy{K$3h ztpA4T$rIF%k~lG;WGVgKF^bn1J_p<>Et|uI@u}M7Q{Ao&7hXX@=_Td#<_Vz%4DnfF zW@Zd!WzGN@F<4I?-))a1y8{PoM0J9hrCQZHRS0 zEAmViC%Yz4$pMIGdbl90EjS~!Qei-lK|McGINQ_qDY0rXg8xT8BP~Ba##_lx&u}Hu zYHGsH&pmJ@zOqV!S`AR6o2Fe1B~49n9+Gc^e5eoVlK5Q{3O$$q_t-+Sf2&)dA@lkr zJo5MN2;gN*;#4Z{3NgDBee*-`??BXh{l7q#gX4;uJLNxLosH}sZGd~`%{~weTcM{9 z+Z{AZ&FK{dk2uA|LbNI>bv+VagZ+&>tV0RiX?NK7O@Mu;Wv$R5OtLKVEJ_waYc5|{ zWLP{`Q$wxXET{plR&W`-Yw-|sdp`(*xF+tYQ&iP2D5qL9D=Qv-DGk48>iEZt zjEH~!R2VCFlHrMtFY}sVotg;p_W2CuG4Nof>iL?I?q>p`Y4W(s!}giuZi+CWX=4Kw zlY5sa8zyqP1#DmD#QoVh6!S#0Z)eoEYpT&oK4NO6zN*#Kbri!_|nvL<$l=q1kwa5TQuf@z%AK~x4A3Y;(tl)B^yUc%BoBmdM=4=cShZ`xU10|w zEK2$j)NQ@h&cx7TNf{V){-|kYMH_!C>S)9L-<`QkLsBMOiTSN@jwD_u?38}ty`Uc! z*0a~zGsoo>ILP-4HwM+!)FkL)>5VX{hfJyVfJ6)m4hA@W?r#pq)^tr6e2Af;q2%ZF zJJnHwq*tL=?jCUrv`7x&y>ObNS$*?Gg4MB)a%x0IL81Hb0N*AVO+oEXU9-AG-Lx0sWBy4u%<0b zXKH3<<@;f`1YnT68!a&mjVYI%7q{bRfw|{dxzFNzgTELm119!wDq>J`FVMm zExZ6y)&_f$;LA(Va_g!%E~}9edjl>I9(wy=wi9+bmQ;Oe7N!~{&^`G#lp@5NBTb?u z22bVx@Wg4>3qvRB%dJ&05O$=I%t+}=xy<;5h}0qiBBJ!7qKL(I#bUF5=Hs1d5g#An z+}!ldZ?EHU`}1oXY-%oGQV4vqU;}q#DY$}9ry~f9WEA^fA}5MBkvxgYa<}PcCnr#l zt$719mdex4EZa31DzxH~gR?lFGj6!sgswLVNmDoxTFC5yb2&gKAx*BxL7ZQOghG{e z+mVi@=Gp+~@(q@#r`vPx&rrh7x~-*25fI6~nq=DAGY4e*vuo{Q6hqe%GI>W=7r04* zG?M!jF%$WHp_GT@xDOsw=j7Euj}xq-cH+t*AQ1l?k)KAlkzWOhhelR3v}WLY;y}g* z%F-i7oyrezPXnK%8eIAXzhn>Esl8PCUo>}ThrH%5b_#~#jj z%sQZ_v7nEWmm%1wPLOTdNUy)X3ra2{(1vWyHh^7J!p6e)-Z!4}(uN4gLo1hf^@<$M zVM8cJ7`2K6LPOc_`eJ5T^jR?Js;TjMo#Qq)HzSj0ZFxKZ_i!k)-QIK>+J5E#w6YTB zxuKde2X(NjrPLbFWrfMO&%ne4pIcu4taeknrcTl(zUbLE%moaZi*Y5o#M{0Kegnl5 zemYZus`io~>X=8-om8Sfxc>w#V}@0Ye@(zM9!NL2#XL{yPrT63k5%-2q7o8tw#G|> zK@{?5Xb}NU6uYI|1#;aX;2Vn_LeMXCAqVwqih&kh<6F2D3(OYV9y4l}hjw+b!w||4o_4RCD{2kg!bY*l_+x0a6UT-Mnvz zi3wDAiyyWpUF{Fo8VB%PD8HWhez*zsIqT>O5wT%URw5eVCrLImqc_fKfgi-1sDv8=$S&t@%yw%Rm-2UU8ZF+9XQsmZ zfl7W~RJ5)@z2=S0D8j<7#;2B}S$1N)pm-2$?9YEo)g&Y*pCrw?_Z15C+ri3A*@vh( z$eh_dB1CR9GuFywq^Ca@x7p6AW^iYUJRPdY&;O0FkMnG2&E^0^FFjwKDsQgIpobA= z6vGRpaGLwAr(RH7)*hZdxovQD{PIP6afcrWbn z6f?r6`32??i)Jd{EdKr&&~cqM#AA$CR2#kzrkr~o_d;?bA_|D(Ov)q?CNA3^ENTm+ z(vkz53T>Z=rJiAu?3-;IQ~?}3dRq{MnjEd>7oopFIA6dAK-bB!dM|E<+uen7iJ-m_ zLEcN7sb?XLJlKo$N$|OB_Yp@3Hopk5de5DGl2vxG`wq92!w?-u_vYoPCPFuyki+*8 zPS*db(&J<1jg43Km#4~*3)!EgK+NM+jSk9L?uEt&V>=XcZ}Fby1M5tE8v*%GOrIa-)xPTczyY!|C~xno|%~!*utn$;mH=={p8$j{8fGAo%KO zmSV$7es_pP0=O>Xsi`G@Ysn*!Q9Ph>u&~aDg>DIsg$g4DUS9yT1?xv8T(04;F~Ky} z*v6P8s(MDbaANMLK-4%^*Bz3sZYfnwP5EbYB11g^B7QPd*n$lHF1$^w4}|a21f*tU z#JpuS>M*n6Au-!qAa-B>&NbzAGCBqhnnHaq*wEd6mX@w%01i8`gW1}R92gi#+8ymZ z$}fZ4Vu-a+gDr3S z{xTT_c8IFJ{w>2Y_G|uex%GI@eDlL7DhC84J8;`N7Ec`4mUFxSl*qLIn{Li;e(y_h z`0~C2M$hJA{iLd@3OOx{=2h~&%Ut0$3roJoE9+8XFe;oe)y|p4mK&zsYJTwmSKyl9=k)PVz&Eki=+pF81?uH0>L|@<9 zuahb*MBwDMWVCofpxt*Jxq{4a4cCfrKR?6JP+6_&cNU`eYZ1-Ckwwm%rZ4PfItq08 zv6^Hn@BR?mSd~Q_+(9Q3>PQoN2;n(AqR3Fxb`+abutEw3>;f^sryvU_GBM(Pj~a4= z{_?7@54&^Gn#Jz<)t%SFf!)hAq`PNt1>K7ilKE#%NAjyeoQFGk{ zIf+(oTTl|7-w{tI-H(Pfe&po5lK%T+^|g4AcY$ZB0RhAWJhdMhMJ>R&mok=U_TL zQ7G!3hf)Yq+$Y=g8VES+RP=5O7WQoah4wR3d#s!^EjCEW0y0?(-i_fYlt-GGn%+5B zjr(OjK=JNMyR`JL)9F8DmmSYYg~S)XjM`rq7SV;KXPuJ-OOkApCvI#|UT&GW2!EyO zjE##lJ=H4%5*2x>5paLs+J~q3VGPq>p*N3u|wE$X;_os@gKBNi8Dr9~0ZC{zp+WG}r zj6IM1GfaXJ^+J2i)iC`__V3?KJkPp)yk`WOs&FNc*S`)9rt>R)6DaF~rDe{AbhmyN zm0W0avMo$9Ltww75JHp?-dcN)k%UsXhqK+Tw?F3P4ouI?$qS9!y=cD@b{gKO~w6x%^2yM9f>(^?8i0dXQxC62* zJ|`!4*Se41M(}YsEEsonGjwzylLt(*6j<;Lm|uqapvy#gUPKZsSxG1H4oR{Skc>EK zAg^tNIyOJ%KG-T@*$ZUxM3{39;%i;%%E$~nEi22Osbn|5Lf*qvEc_9-F32-vv~+%uZp zkbbj9RcjA{UTrJ0`@av5Pd5 zf`W)(^s|5DXCgFyOl4)Xs)SFzsuRZJzQhM#g7Axy|2O8 zD^ZP2-Y9{ZlkG`=s&Ummm?D8QUE`eVD5=Yn9tEb@s^0FZsy%s?#M7sL*{Yi)q&qr# z_SZ6D#Rk4BfUQ9}V`{|XQVG+iH zEDwnjDc-7?Me}^ehZGS;JW7(Cjf$(4muVJ!-@iY(+;R0;V!2*GB@y)a!Cf3rEiu84m)bA)7yaeaz6$VcFI>w@Pf!e>VC0^4Uu#r^@z|;ei2P zsz*ryhWf;Rm^Bze6L0Nr4VuJ-_Cge)X>09_;ks>ak2YuDPL?x4Stg){E{omJ7&=5l z{Kv}5%I$FAq5B&7<6mIgj>0`#n`Bk+wKbm22$0hIR0|G*)MQI@`+kgau*F>fXQZ#y z(A5dczxtN{N*6EYC$m_uAGM7tmqI%$XIsS6e&rGY=Sxg8GIM2xi>mmR4+RUgi3+Tutx z78wP*LtyY9=X-H-CWD!TQy!bWJ@IUb0~t~=Df%CPtu<^*oxV?kcA{5$I*-wif}nbX zkYFW{PmDr9fY@wGF(&`XY*%p;JPZL?*$DI7ip0qz*;iQ`niII_?>G8Cbl?1GldpU6 zJQ#!Qe!c;j(15exybKzwpW9svR!C-pnKHPzu?t7l1Ds)QI&$WOd@a9HQg;66iy+@7 z$I;W*rCtniD%8%%1I#z-xh|(~I9lL3)V1`eQB!82b75g&a${qo30;}Q^ft)pr2tL9 z5BU>8@QZ;DMRp1lu9%e6VfsTma$M0g#@xKfZzm<&^jQr_ZwIpkNXQ{=g z{XuU9tJ4Z2%spUNd#E=t4AZOXAHK}$fOuabxS08W%7^Icy<+iBA#sGwX%VuNXlJ{S z?CPSV#ha_|{R=%PhG0U=s6zV=RYKzCc*QOO__Z1JCJb*ust=F^5)Si@IZ$93PzH5| ziC9?h4rTW*Bv_fULsbnWrJRe4dK0^1Gi!bcCtC8KS)aA$%)N|FKF~1SzuSmeq== z4SXw=)oA*4K~t0T*5OVFB{I}ybS#B$TSF(;H$uUXsT~#%#8o^^eDQO!C1fL(qiJsB zqgO|z4m0>CXIcE~^5fF@%T z;H)ebGU?b$V&PdDAylHL9Y<55dV(T*oeH769*yTSA5U8o<7E)Q%Dn7?Bf@1%u%I%|K3cWfu4R`U0eGi zQw%rw5jAz|C@T4NPDQVP-Hfy6#pEnGcGWwRXXN?fgo9gbM*{YdS`YmnZS7SC**HI^ zd;T249KyfL#bHHSalZIwI9uNggmna1OhfZ+fZIwMfh9`x3)xL&Q%+6owHkP+{%a$) zg0>C39=K3Y!!&D8B@v7;`hnA~qNL=^%}4x9RA_qXvSI&Nhy-QiTIpW zdL*nc*c4)v=;HLR_Z@aBjU*;~dA9Jn$l?%qc2H68RKk}fkB#aWFvm8CR`{Q>aX{s6 z{mla%oe34lQ+jTJpP&5I{>5%94bb&ipC%dwXtO`IhRIc}XAuu@`k$X$Lebp>uKk*D z*8^YtikA`1g+~(E7n7Yd5^8N5;26o=H*#okOpkB?Yeyo@3$cYvsN11&#Ic_;KF zgWphP!sN=0v>f)f%&LdGnc)A|0{FWBe&A0C4%CNke{S>A-R8V)8?Mm(8s%5-pdDeV z80#=YD8Y}Pf~{#{w*@T&L=>l&AB)Qt(9r)9#=RRAn=2FjF*J0bCxI(C1SeZXSy|>8 z=1asjULe>c^z>kcrWae(2ACmZR@B@T;nC3pQ=SLC;u$AO`aXUz5(p)w=?iN&e<;+XqXpLH<97(9KH$(s z?ESuX0!IQ!mI*mletDib!ZwtVXr*K4;P~Ubn2R~`)b{>eQt!(}eM17tH|c9f=PKXk zue`i-H#XD)__5a)AO&`Ar>4PMBug{qE7$w&1RZ*>LWBvmz~^mt2PY@W-3FhJPx)sI zAxCCwvI4YDI9H9b`pg7Z=fHL6h$4f!Kc35qR5eRJqu3GGyFmfXCYuz4m$&NvUEjYR zMJ2(nE;?GZhz&JQ6k$t_kMrVxqFk$PJX|lSI+-DZf$7V_Qe$Q0B56bw@u?ylTG-HL zlHrJYl24Bs6%pJV+s&GtAC8Mt#06i++N=+kC}^sxF8;Fp?_o1`G~|}F7*dJbchfTv zHwO#7<4;c3y(Jmv8tZ_kj8aIPNllx7Cu_H@b5(au8Zpg9GV681G~?++nUHnMHbzr( z|9ZFnN&YK)l%F5F@wiL4Lsrg(5E}Z^iCc-Z63bVbJQkl3J!$jL2n3y=f>Ca67c}MV zPhC9&E-$0Wv3TE4=(W0VvHxOR+k$b9&Jhe4b0Zw&y!lT1U%66IH#Jt6#orOq#kvz0 z$T1-TNZ_TmHbbtZwny&9p9e}?J+UDMV?rH)fz;5v1p|Pz0;hpaf7>3%%XkMCt= zLq{Pzxo#D+^-g+a9}H)4q7S>M%61C|NC_@_fD*B#)N zrp<^7X7Z4DTT%43(Npphk({Y%o7O@ty3jK+?}jcQR2NB^IAc{f_#>wj$E!dex^sza>urM>H*|l&}?M{7I@} zqaf}fq+Mab;j;-oxMQ32#P5NsTdIk7h3B>WX)a;^(@70<>0on1oBTY7N;zANp3i)b`uInDKpBbEbpW{LjObDQT~>C^rE21BN% zICHXP*+c7>+%n9?f0WE15%x|3xWr^Q7vF93=g*vx|Hxak2xl5GQsd1Nprdbu6v?lG z@9!A3s{=P2+`TM0w2*V>3Cv?FEAMGhn`F=a+mOD?$zAa|G10ZCu;|p2a0>X_e4Q%r zEJ!K8&m=RV;rsq+`j}#DEG{#SUw`I>hlU2e@L6YnM>m74`LM3g*T-?)$;YXDUe$NH z2a|RA(@Qk)g3^o#Qgb2umqF<#s+{TvmDpyED_~35e(|f;9tk zjMlNHS%}7Q-qc$x8`YC}+&bklDGNAT^V+~-XYb>*O`5$*A&Qbu_sR^n>Q`T@{re*( zye)y=PC?MKc3=h~w~`Jq*So8GZXd@ zEDK%J_jjpe=3Mfmu|e_Y@Nez{GPXj7^YmdtCnf~-b9C__|A`;xXD-7NLQ4Q#;2B^B z-x(Un5J-`MMn&|#c6+gWzy}a078e(T*=o+HeaE~BnMLr`lbUM20Zt~HoBcp|@A4@^ zVLs>CKJ#GRbW-Xdi@b*cLZ$wZ;bguo%vK>_a@X)h>oML3oC#1JVcS*CKd7!Q?Y0aZ zV`XG#7q#F@wcgXC<}b9opqId zNak{I{r01Bw7t3p+2Zwu&xfpaW7DA9lEt=a*)&TbQAAmpK9mCM(*|XFg>v-V;W|-h zXxG4z?>0t-He}5y0D~T8VYhj_lv{z}V52`V(_pNhL-nXuk1R@B;|)cn_mx%c#m*#b z=1spZEJO4RI$O?m-Dvbs$-Md|&{wm&Gxt4C9R}cO(g%=pE%iSS>VCVBLyx&fSInsT z=1n6&C+yA}@8H(y==eq33vRSQX&@;7cjkE;@Qq^f9evrjCTOUbjotowE}M(ds{H5A zFSWIPVM4LE=dmnSCSmVliw{IM)KW5@b%mtd>AiTE%7`H2D#3iCr>gU z#<68_1!?_)kZ(Qetc|!N6?hulaGy*a^uKeKc=&4-ZKvU;0iM!AM$fJQ4Jt#I znv0}>@(WBg!y*E2p9f}rrN;zYf}|KAu)b*pPaHcIX>IwzxKkA@(i%<{hZT8Z81RJw zugCdsjwpZzRd}3+O#aWUHmBbv^*!BJE)c@x=aa1TR3QKiR8nROt*!OMZS_X4E*Kad z4q@yDVOeppb#gNmn}X#RK7y!$L&oU%Qq`v$GZwbCG{OyY*n9T^;q3HTZ6>Sd+9t*G zwo&wz(uoMz5vKr+d<4Yxt0^7a){%LgM(=Cfn`TZ8OO-sJLLC40sOW-!UndZ z*>A$Zoyg^>li1QHu~cX2=-PCl;knN_UyQ(~5>hYpjvCd|PEJr##|?bT%Cn>=rZA+W z_64r?Tci~D4&U^2iYZ$~(Oo54(nuI-0QdmPOJ3e_=;{7)yihQcJ(K-iMc9y8JEjD# zX^?wm5j?|8h1UFbp@klRu8K1d55@1eVnGACXhMQmR5>cmpKplaEGSpv%Y^1p-u5jqWyMC4TYve7@`2bPAq;ju z!t$wfeM5f!A0!`jnGjO&S1S;LD8b!5up2YGIObMOh&ZzkGhxE{%K2Bn8xV33#xRqT=Fw zWSF~?li6XFT$Vx;c(Z+!^9s5y0`7Md zsr7&4Vy2u+l@jjPikXQHU01IxZmctp=0CKGZ3z?RG4Xe|_@?wEAp~#5#-(KXbjH;^OLkv>mp{yfF zp+rp*&`Kr>l`&O&P%gP`Jq;12W92reK?bbu`<&_pmjq#Wx>6>~1i-c@m|{k5Hp>z* zb${EsYPdQ1UlF|Hx;qb)b?;)NaObUf8@LsAi@{i-#9l$tFTz*rgGzyYF}ac+hx}~5>jXV3tp zj5()Y!RD0ftpAkvMOUnUP}Y$GI6O~k6&sV@BfDFSZK4W+bHp;ya98HY+e8aUQec4r z^hZfbGcU<|XY!O$$RL4$7W;>y3^DnAFkyok8Zz?x(3pmk3i74R6PVsydqLJR*UwVP zn-W44+X}!Yeu5As1wQO@D}KuNf}JI;{g-0Y!K9IKUpf8{O;;IJ)z+>NP#WnHq&B5= z2vRDIbazUM(w)+Rgmfrf2T+ji21!W;lb`tq+@BuLaKqYj&H2tJ*SOqvy``c{ zvj6*!OqM_*XXGgTtMwo9H$qOya0`M;O2PI+Ef#h&DXzL%Xoe+B;yjAIiULOGyo$kVe&#uO9=*b3T;|JK+P^d0_jb5JZUe2jW zjhPByNTQ*LymK)qs8H)Jho)L=r~_P!%V>ne2C37Xsea%};ngmHShv=t1MD6{&c8mg zWgGSN6c2sR@7#hT07TX8R0{#IW&wx5`?-u42m&R_T~kgkDjm(gr!{-Gju;~()Ii@w z2ONbhqrI~1o;TCA4;9AHSc&5X5UwsRfZ>PX4gYyW+mD%Vo!gfoHp#HoW^u#TFP3Ny z>aHK8E$8OhBhAw}@RX_0Y0>WmMo{oQa!GNnn~qON0JZ!*mv6s2wezZ~Qg){1)>e`- zR#uXXAV!GZoQWJAbx;=zg+5deF6!Fa?d`#Gunh?&B;=^-h#O3(1vOl(z0#@9Gc`2C zO-Z3u|CK-&Iw<+4Ef`^4pp?;UHZ~+%E@&Z74C;KN!{xZ>v-NF;pq>Q8R)6amNAc0R z>gDj_VtZIQYs+0!PeFCqo^N+TWsN;^zlKWI{lEIGI*x3Skp)8+p1c$bBhnehBiVUL zA{#E8jxxEd{W7r$s5V_R@bZ$*(EC6G zA-j9DFX*_87h=Ng`bI-HU}{deq=-8fVP$0n$?s>kU$4hbm6ob+jW|A)qV6(Fcwerp zn$EX*Pe#Sh5{8C%ViBAQ72R))V<|nG3>_UE!6@`HzB(;k9L;hs7%N4kGAy+X>OwTf2D@QDHw;k=>+!8QYi4MVKPsKmk0uBoMCOY$h%mFAtAk zFlIOB5Ewo*9o1AG;{`E4OSv@!ymnRb|FFgBfgGynn@ISIo zqv@2Bw2mJ^QH3Mh<563V3@(NIqSweEVmFSy@&+W|t>}t2abg6E3^030CdOb=O0L7o|nq5$1B)lBCI5;u@$UA;c1S%v0{lz;@Xj%de z@-O$7mx;=}J?_@bRLAD$kKIbgeidt#z5ew9a#m>iU$*d}Hk2+PXg!xA`CxXZM1o%) z*nZ-HbdgX%H}u*0>ury96(0^97fpQy9jg?PWYcnn3oFU1zlT%6v8;tL`TkmpukKzl z|B+e+@MepWn6Pp$u7(C2tlF%7fb~x{`v^gt9n-Ds1|h4s{`zI$Lm7~8_jC9DV7p!U zx8T&_Attz8fwfQ=8+KvaaY_Jr`t}<~rz23=6+Zl)e(#D>pmuVYHxl9``}+Dg>ec$u zxFr6!DZyKqWmt4?u^1#SH_)HxtRsJD=$sAr0hFG-4I6N!d+q+!3V89%z~BJC@>0IM z!f8}d)z!6HNF*GWef*k^WbAzxZ{sXB39EKzEQ8$NP`}zxc$Q@zNB3a)MF0G$&cvwy z>ka|`V}`?~SKWFroy2If4xS&xX_qa!g2b>V2xAEywS1VD{)I5v=s$k!I5?Q2!SOpw zq8<&9OYQZ)yvFN)sYkO(ta7)MA?SYmCe~4QF4 zk68fItlxaOQtEiTP7Ao>_c5iLbkMyW_mA#Q8>1l*8q+_=)8`AGUD^2_#(BX@4S@64 zY4@eCa5s-xT*M4|Cu7EWp{uOt72$I+`%G@zgQn9XQ(VADb`hQSefKL+dd36dAzVsn zt3!f=bE2+AZ8}}c5-1RX3X*l}_CmE^U^hytve7z%nRR_#VC*d!g8;K*^7g^Ymxv!3 zEgx^;PF2+aJc9ZXhQ@)a$_ypdPwf2s9JC8Lf?|`nAwm9D!G9zi?6(GXaYWm5W#c%) z^gg5!eQ;V!%UC_=rtaF?8xej^Am+VLga|KZ1srZ*_wVzu^UJjs30vFiciu)ESgBUJ zVBfJuag~#+7^~fxj}@Odk+91d0LMiNr->kJPaeP>>Ft$@-5#(sx@h0h_}y^!oFkBIBhQhwA0jl- z`nkiTa;$V4AB2?+df;4K^_K@s?PTRF$^XFwroDq#;nuy;gPz7e^GW#Fb=y6OMa|;) zw-kL)>yBm_tCfwAxXX#jZNu^AFAji~d|Sn0x6?;m5|g_>naG)&*;C_>Z&Tka$j^b zTu)qesc_ze#HdxLj0Zy?_lo-Wj{<&yP`C($znyx*v}|>+WFna|a|}68zOv?%)QE@y)HdG1Px;m64o`9!!bLOQ`Xogy%fvoMPcR-%pyNAz z9-Q!K2a`50_fhPfh8%jTI|>%ec|o@G`cLc(-3&9`>hv2AzS~T@Opp$KKr4UKkPbr7 z6rLT3G736_%ui?_^*H(g?1_n)&Wpqq+P^c58D;$|7Jn*jZeMh`ghzovy0a^5&9`GW z)Vh3+lL#{np4?|g*Lh=v(dV<>8Q|`S4NLc8zpMcdfc0i_-!ocKP3+_2AZMQaa}9B# zqr*dQvG?~28VUz9{HR`ikD#acC9R(_&igidQf(**FCagkk?B9d+6a?8cB`jPgJD{w z@?NH=&MDbN01mwRcP+zY=a1G1@6_+-DnIYcwLYVXBAKeO0}KtvDmA2k#dNlDOS^X8 zv!u>~Vr3-jR8X z`dWR=qStZ1+Z0`ys`zm_T6bJ4>=y`N%azdh<<89`4z#%N!@UH`KYKH%sQ%AsRCEU= z5)&#ut5XV)T}zDqt`G3_n-4fUeGt;t?BfOJwxq4?uH@TK?5YpbjI5>g`@YR>j`Xf`p- z39p01>R@wH02}G&)zy2hd$avErN2uavau-fOCf1Azr_kzVWdQT=)O%QoJkdpc&WnM3`Y&WjF_#+-p5 zP%_z_z6R#opUg3$Z=U(CuygXt z{GTwigA-65bWRVW*RsF3(V~)*(~4dnC>?;cbgxWW4ZZAJZZ2m_b#?P~5ly(5OwGyZ zPq68Um?9honZg;#$=fPL6rey^JF$(SdK?yS>-%n(MF*;ysq{?4N-M6p%T<2Js-@YQ zuv>=tdTlt%hb4Nx?W5E@>!SPRxd}jOAA5%NL{8-}X+I*`)<<5cxrT^Hq&>v2*dx`| zTJ({z4)lUxIdeg=EIgpoJ55K9eBC5fz?pb0sL`BYPF^$RGmbbm?ln=(&xb^;trER~ z2=WS06SRUD<>k5Hg1uG?_oMJ^kiCi9+Oqq$uo=He%@@a|(pSee>W(c`?jXN-E@0P%X>MVzQ9i zox6AQBsoQdyVumlFnhn7LT59XXoffuRfPUz+&7y3hxzh#AwZ5ECX{+70ApI_ zw5ABxlP*~FP>EfuU-F{rImA@kBRQMr<}rPb1rUDDg1kajPl>oRMa(OPw2m!`gFrk8-sX3g9mZ{8OEH+ zn=f2+%_#LBVI%ZGJpqBcMn`LY*9j(s_DbK2A!r9eq0v#1!>;gUtZQ-4u7`QkFbKcj zMrl}DO4kpqh_~|Si_wmLXxG2=RbuDNDJb2jAG}qNqTg3Wj_&?ceV{+V*S=8V{AwSU zGD2XzJ_aw2Bt9Y1VtW$9d;3*JZdq9j00WR1U94TT$pDj?jN;CzRP(*?<)39D5u-=Y zz?wZ*#+R~jk$IeO%{MhQlp zW|lp4rumBgXCP%FVzS)Ht=)!hWy7C>T@9KxYG zBgmbANec#Vn_qYJTRWJ8@S#cl`|ivh0o1NH1AUCRZ}Lpr%=~25dp0A&Le+6~df=7g z{;GF7GXd)0wIQhI*x41#Htxw0?M%ok5_mOGYhV(-g7!{n-tk0Rikz)Kn^M4Cl2DSiGjgLjF)2w&vMc#T z;TI$J{fim6NIi`V3iX*h=C2j9=Ntt)iGcwZa7lH$_2BM^zg3Ike~^R}id#Gbe57%3 zFoHTBjzjgZ>Xtmy{_=`fBUY8su^RurWV804dpGkobseuW)60S}wOW0c|5gg(rM$w? zFr?hQbpl`{CD1>;K^TNA?Cf1TrQNvPyq#x?;^siotMe--+KgNB?WJ3BE!zMq_O-0WRqBx|OA z0CNkVE;_(mETeR?1m@-|>Y7oey|E8K2wYjoJ2pBx;E&=39e6Y#;=7#>#wt&6g1X(E^^z`Xdj0Hn~ z^QX5D>Iu;IO9#iPEJR`u-QacWN*f(L?0@vi*VYyP&8rwVE5Te9K9bWt@7hqtidCZr zR(%@?l9CY|eVR7gM^B%|d@ryWlcuzwlsu%ZGfbm%iN1#QanK;dW4)hBGel^`nn4&T z;g1tsN`0T-$g;7w7&T~SAw{_$z{D+-Og0wqR;Fhy@1W!z+^U>~TpJ~&rG?ZA24z0B z3pW~al(T|ZqmLM5r#Kr&L}DLP$U*)a{hTJ*QLgMhQ^EZ|Z9SoQ1m$0jbyO40Q?v{{ z{9CT3?2hFKHdV!A5y0<(V+52?WoBk(cpu1br#hpXe@Po=ens%UFOQFFUa2-(uCzaU zBXvh)+yNwKM2`fR&|_20KdHp411jYxkS0 zwAz_;LsBU{y<#{r^?z|H#4RoofIS=7*cZ~$-5%zjmapY4Ce3sh;R*{Te7NAI*Ct5A z(Fyeyyc7%uQe0HOT`fC^yDN zx-;(GXrDVdvD+6o0kmGPS2Q=*vD*`wSaX7I6363kM0h^S_ha=t1nr4F@FjNaXcCyy z`ImHWY-7V{p@<-$B?ucG8A++_k_MrsL=L{QNc!oWyU65)7Pisda&TUg9fR2J;P0iG z8S4JuMwwX5e*xqFsqXA!ohvMd0bkxUt9ZG8O?0qJP8gzy6~|3A>Mor?jUWZVew_2u#D~%}7wj zkq7F}pbi5lV@18;eBYHV@*Q6fTOWETfnsM*!YZ9ur3LDsW=aA2XTUy1%fkbjEudzg z0C%==#+-K9u~sZB8&Bkn=}$nNdE?nEE{L6O6BGoz&+$N(cN-8EhHIkzlZV=5z$YQvWtc~xr`uj{hQ6WkIB?L%wKtu}L-{`Qtp!v!~#)LI6 zQwcwDLYNuvr#qke0dgGnP=Y;~qsiKL|1YF)EIC519TA!qZ%DRy5i=%7(=qE~&FL3X zQmZq^tHc#0^-cN>d zzp2@m4l%ip0E8$iT0BGRfdmk6=0Q9@G`nkqIRkPRtT{d?Rq0N~*T7ee;l^pV8>nA5@vRPaTSQ$fdFJ9oodr^2;E{;c~e^;xAR$p}I zs`>RVtlNw%Sz%i_x!?{1@P3EX*T;b{Ox3_A9u~(i#LNg#eg`4SM*>;ejW3V<;XCr_ zTu@BMpo`&LuqOpehIY&KNl;W#44I?c*&dk>17TPDtS#P}FDEJYmg}y~nYth{9JRL{ zH85L4Eb>r3#qO2wv%7aCVWWz^yhH}8%#>YA?^uD7kZw3G<#8adrn)+O^6${4_da@d zc6JXcg%$TgqhzMKy;tQQhu}-2?|u6Y@w%)q+X1#XL#aj?u--}=edW*E4*;kzsE7f6 zyM?s?bEYTxkf)AYuSGbTHbYu}IB|9IY@X&S%T#rQSemG!yqu_I&MOJebWp}1Tb3YY zfIT_Cw@|I>7P5zE8ydAkV7;9U_MHBV`Ue(YTYbyS%>1~y`KoE1{7>k65d>r2FAhpp z|7|ust5gyyDwFbxCbE!`t$8`S&|tO?3$)LkK}yVYyk!M__zo=V-Fty4Vg6OuFVNdS z75Ay)p2}$NcqA`++uOW6$)OBkkJl%}FNow`9-@db-^ZX8^~z&k^tX5nV>xB^dh3g4 z3uhM_3c_0Gw=fasv0<|`Mf)sq)3N;Ta*;s%vnsi90-#hOA>&qB$?%hfL#Vdip;><3 zxCnW%&!w7~P|UNivhv(3zqbWyk_{>eR=!mvUS4`9;q~Q+y;s6z!k3$^d`8B@uNIj- z)57N=fVjXNWaD7s!6$u?Zw;A44qel>0OBftt2lXG`eR4zedlqO?+e@rvm;NXaqsHp zS6c0*y2mzqOucrtwvg#z%ktgkmIIR3mvso_U`2Oe~E zN&J~u&48#Vcu_vXBmgX<)tfh9rb<~|Wz^M8h3E)IN?fg~x(I^$Kex6v8A5Fx9mU`Qz-NWijSLSzx3S^D z!TAcYOCNWpjBazBc%MA6pK+Nu>Y$ztHSc8^wM>eX!IL2{EP$cqvo@<3D@lG`T>=E# zz#FnMS(X#FIzj(gPy^b8o%)a(8-~x6ZH21e+fRmp!OB5Gim7Wd8^8-SB%6`f;fGkzxj;qjK9f7!*EwucqrdKd)*ayfctt&4|{Cnv&vr zA?@J6!oXm@yhh4tJM9i!6YQm(JEym)Sate6PWiHwROBNjqCWA&yZJ22L}4UF>zXLgwi7Q8*mtYXG zZoWP#jr*kcXKjJ5pFlJNqG6O=U41uweg}LqP7ScXHFas;hNPC3uEA|$`_Bn348_@5 zS8L{QyXXd^T;?;Wzdgp*8{t7GiW_%)*z&ds8vJKL*QXE2d=P_1NTpXkuJ%w?$08)Md8iM12Ky0!(o}=C* zSvyhI(h|FWvvZ9ntZT7W|55puTmtD{RY%p&LK}^vY@R0sT8Ku&XNIL2pDCvjcK_Ir z9@Y){;41J~zx}#4-?ntSKl=R}Q(Lc3bS-&-UY7YEGsnfx!taUrl0^QPnceFYAG*%{ zZuY#sXgdhCW$wIX?nh3NgNDQyAlD#!PYN_@!EsE*YN_GWs76={V=(7|cEQk46p|1j zR!9YcY{R-w{MpNY`Yjy@lqG-dSUxz1T{=E7N=yZHVLuY2$uM#Cg2-JDVh%#Rw$fgs zI^NMz!pbcyq>@ze+$naPpMM>Shuksj#Sk8AX0++qP;-)(FllM8Zsw_48H)%@Ow45+ z`n`#U%jG<8Z0~hF-IT+O2|M2{A3N18hR&-Xl*jxMfC5#e(!wo4qsv7jF3`%rFbsOO zp7NlQEl{wStb-c%Xb}b(>$j03qoc8l=y1Zjda1Ip#3Ghl8|-gI%!ZAIc6}OMoP$H$ zuAviKik1D^g=FT08dw<|p>ma53SLMWfE)yddjs2} zl_gs&S^|nS_|sd(rGCoV<4CZZ1Rjs={@HMgv=Zq-8-l7KY{3?bE#~$R-pi|ljC~@xn{Oi zs%9kX820k#3%;cOF1O|*HuwktkZ&u;x<+zB30RFFo-W(E+F%fZAL>rV^~gXk0=dKR z;czbmx0?aK8hM>I>-gIjdC!#1bfh#GC0I=8w8Jiu`T6%KC^moB9qq&~zOzm}zw(7h4`?pTg(t+outG#i z8k3Tez)a}n4mS#AJw2!KR$0gME?%hba<$;(;gQhMVE`w^tKI23xTnL_`u&$L$P^Tc z2Vd=c(m-4l^ezxh;mKRw&|7(rl%nFp52PF`(Car3PZfO9N?uMjPrqzwZoQ`ucX2sU z04K!|7H#w7*aS>ukXB^0F@C%wJ;n<`qL4Day!y$`{PG+FPS{tesxJwo$FO<7`d#_- z`jaHdWkYfT@a6yze?Q&P^8k?=ctH^(@2~ye8gr*j6OvPwuvqCN!qRlk_D4bU*)>^* z2a2Y$Eh9JXxuvwt5hj01n|2|Jkj=`=Be(Axz@@|{{kL^6>+{LYCHU;`RkJ91o{Q%6 zy5aXKxmkF%ad>$@ukO^;8+;{{LasoBo|e1ryaoX}$02#W?AL;IeND3fN9*6%Q75hr3J{B7ul^cWRKT$bzKb&b+pZpquY5D0LLvL zSS}}AAm2-^H`XPAC19~J`Ux%%6nF3b2JWs<4d=6f$`1g_0a_D%{aSH&*7u%<#z%8v z$rwQTR>5#=*;S?F_m3T(21KZU)iB8ejOMoy9!dR?*~~tbbMsBwLl)X$*;8MA?{=6|} zHw%d&r$TL`*<|Ks4a9uk!?^f_(45>AwS%Pkxr|tkRHANuLw%9W+-}oa+Wne_AF5}X zE(K@4enW)k$~DEdGiqy}Z#*XMqP6qBz40kD!#1(M6D=Lsos&~jLkfvF?L0%mfd%QF zlp|KP&+d(&Jim=%JJ~a6r_ExDdEdb)@I1z3nmMVTQ(^4ap)_J-g0z&GF>Kff{S)Ox zmhKb0nkT+KJ{a*YS4^t*UXfY2Z3{G0t>u%+;}zD9yhPA_--!*U%MD;V>d;^j)j@kXYa8#~G+F?%fIt&wmfu&MFM-IvQ!YxmLH}<4R{x z?v#<2F@G8yJS8NO^gw;yx?!?*^c1Z6HLrSOc~qFmI(qPk&{3Ugq$tLJDytRrbgA z9=j1pwHf2_&v}bzesLeMj(SRAe(%1Q*qzRG4=gnOA9<=6X=zUOt0@`ZV;M49+k??g zn7WZtE!LzvO${ci*@A%YUx1^s?SWk*w#Ki_t%u3^cRHAtK07tPgSwUv5D@=tY2Be2U))YXYKy_!dA2!OxoftNBoH4ONv-WQY;naZNY`&Cr z_Kdj~Yp7|4GI_C_Ke$UVv6r|f#x~S{35d~cazq$y@TtGO(ZZo~bPz$=aHd${9x@Lh z$B-YRWR-7O5-w5I8*vDDggohIOSl0NH@KGGMgS2^H^78u3uai(oI8=_K$$Q`H z;_42o-l^AT@56)he-j*SS)mW3cm@R;US|1@V9cKZIGjF0nSt*h0(I%ccssTez(P*h zHV}(3*Ipj>o9OfzPZ06fR16io+8SqrASAC_Ltuc6*cdO!$}QV^8+ z>=0zvkB5$W@T>HiXHfLwO=b0Exci?_Xkpi|wJzvNDXW?2(LGy^tZTXs5xylt3n{?XTxVFTz<5pHHspdl%m# zdi6Zwy>fi4Vd=>WkOu1eUAZU|-K{UVHBPl{6l4U02-|dchCV3xwgTrIg2C^1a265Q zmAto>)mCjUE>0fP486bo?7_v4x7Ctab0{rZD5%Cd@2qtKP4>(?ik{GDbCwckh*;BJ zpKsrD7kLzNcrmzgn9LPOdM~64=fR zd!MW$0!h(DEz}e5alHIzr$sT|@xR8pei=1aX{XOm{gCj!T%VnJ@u7MP{;~YIG#p%k zL`T#|g4xAg?^%KFV)>0WUcxBfY>k;2IhF2pNdf2ZzdevS(L!r6JFCGzpU>`#z03(; z+V(WrKkfhBbh!R|6Evpuj0#k0mSxss-*s)OD3F?X7J^N)lyx7XpI;+_&YfLWFYKwjuQ|K*PHGc2-ywCh!ZoLUMPM+Zp zRxQ+av7HQKyeqRYtM+SW&!&l*DGME)=z|A){SQuh&ONN)nTBFn7D$RvuaK)Z(-v5w zKJB1AvTWlF)vSN{5<~8f;B)l5^+m0EYaIitG`I$wSc!<-at7z_ib=}Nj?EtqW|-#8 z;m8VKeeF?yft zCCeb>OKYx>HM+LM=6Rn}-pd@cehxy`uG;N#zqak)X~|EWNU#I((B1ccszu|FESDrE z2xRWEj=8c>m)l{HP;=eC*yBT~(A|Po;}8=);tvc?+5y8jW3lJcETN{?(!4w>grho?DY9wXq<80CS;E9|U6YQRKD!x4C26JavM_me;~iQB9P zn(uK=9^97sbf)@3f>RWHS#^Y|LwBA%c>CkUM}&;5_`j@ejIQ#q9FiYhItz%ztGBOy z#RaF;c92MhIHXc1uwo@h=nAGe)+t6zQdYbw=qHwZtECn1Rl_szaL6l6wNPNYgu*z!Uup>1eG|Y>cQO zK9Wn+fS~*?N&%G{lA#XO3swz1yk=uR;tq9f(q-eD)7Ou^AFZ$wq1AIn1}RUM%}fj; zt4bmWLbCV$qfJhG=2cnS%U#_#iizEb0x+;}JmnEC4cfKWE8qNA*@3C8eQ~j?;8j;d-y{<=snd3`ySPaIWxt z_S__|a?P8X{Pin=teY&Lfp=)#wt$*)qzWHMJy8{1JWl?e68*KsmJqz#ac*#ji zMV{PB8>(HhZ-RzaMXmgUPYJZH7d?tUej|89CvU=q^<_zxhkkK)qI=D z@j$RrEz=PZJG;1;DCwed4>((9;&+$8>0V_s*9HUd!XqLL$@!mMM<&VTA%EYHwt!3d zd27Mhgc@baUpWa*g@F7=0*CX8-t(=vUw;1#ym)93Y(;lJI$y8^T=>*C|4Qee{(*;t zLzLv*g%3Wh(D)K>YGmk`; z&zk2=o>gMAUas?e4DuhoS+%{nJT8xOSYW#EZz3z5B_jco9gIaSLCRJSusbA_l%nOl zc^B1WnQcoO_lqWL9Z(hz9_qXPhIcA$=0_sKL0j!rgP8*{*NM5xBWL`uO9!bZ#wkhkOD~j`DwOioLsivG$V^RuXFoMS>Hrws&@3 zl=bvlWAo^<%F!kD?;r>|7C4)a((F!$UO~vgjr+3jHh)1~kygz6;o0$bgViB3^(_&z zo)%cY%NZQ{q)F#n*o82hEK%nXM%!L=`W`DaF}=AlGM)O(L-7RRmA%&DG6>V!f1AZI zicC}n5+N)Os}4s8Lm5Jtq8U-;CMMa^r{wv;Sc)RZSb`6zT9WXPA>8A;B&k7=80`$tJ3-B*tW}1flsGkRGa^e7q_I*ry_Xh)iIBn>2)`=a@jmPCURV#bXmhkO zVhw7AF+LnbU6^C6LSIc7Xz|jy#Z+E?K~w(1+mj+s0ZnA?E2ec<0b7l6_gf1TD-G)6 z7{rs2&?VCLtaI+gn?Kc*v>wv;-Ino5d|F6a}nd-;AV15?Kw=#~dS<0*7); z_69B7MK-_1YDj6`$5)q}e{AW8-c2Ritx{Q36b@q|QEI+WlSW9-G^cqG9sW3;O43wx zE%hD8$WuBNAIy;G;Yb4(1$!<*U#BOo3b4Uk9T9Et!l!zyGkAx-()ZXNz`T0 z-(HT6o{kr_DS2XcI^&nHO6476*)S|6A!IC}2b4I*MPAlv{2dGFTy_|Iuf@11A}QXv zn=$**qYmrub=75P^IBBlNu$USq;6fFw=poa=G6Nb`D+xP4{GOtbek> zJZl9VhbDpj+E$oB48EX zpzZx{qZ{({o`nn*eA70|Cl*7G?_WtRtzx^sJlw3*Cesiw^XJ^0TZbeZo9AcK2=7OE zMu#zlXHu-=JB(4o`UOh?YNRhTh}X2m?`;2?jR?uK6Z_D42a|!2+K`ttgdx;eBYr|E zXQb18dhb6=6>X9d)b$^_B|k{88>x2#OBB+UamQklf9r?l8Htb>8aRlU%=q2RK+}2y zKDxUHgGqjZ@|UmlAAG*19WQRRY;%?KcPMf}SG?7A1H?$dMmLN6lTI`ho^tO_^wo z=GwC*zD{^_=Fv(o)@DKztDp@@w7RO})j z)gB{*U}q4O3gSSiBv5qtfb8z|ietQqI#94naU+C*t276H?rPMufibsZcJb)1eJ_KN zxbWKr3SHs9XphbHm&&muD)nCqJ|+tH zW+C|yX=8rFr3O{Bo#?^sEp&apLGRh`DRYI7ZH??tbcx$J&M6)e{4 zd>NIm^W9~_hx%c3-$D35eCYev?2$Rlk79d8y9o$>O}Dl)kj-w)Zl_wPA2iiBG|(_a z({}t6D~#`gYp1_4r}oqDWXP%n?7}Yi0lrF-TIKOUiQkbds>YSV-8&6hj7qHL`J=yv zbk`wXD!%+%rp)Z9FF@(xPB(p){Aoult1@PYlp2w(^||CXk?gCk&Ea@fiMM1VxN|L3 zMj}V{L~<6A{ICH6zHIJ(*xS8uw$)hAsb1N- zjrq{aLFDDVrxgD0*Y7XbAK#70wJ|HlkVKLJjS9X2TIS*|wCqk_^gJR8{~rID6DHa? z(MFC$$_kDMOrJ-$<24mb!do!Yx8C(hDU66Gu!!tB!O4l3oz*5*;di7PA;}2OX;mmt zV@@a+eviH6IY}^CY0U%Qa>2gmV~A}LAX2Hy%pH8upTFIEY@|G?0MFk1&*PwfzlbNcb>z~Hk4M5 z?ln~6_6DB>*RBJwnZ7W#f%xy`tljnR8%&da*%#rx$cgpeCb2hSB~f8rb;l$Bez#Ps z8=UI%WdCTx?9T(p&s+U>qJBJ4m&|msSjxreCP1#e$VwP?nHYTR7Ah8lL%1{BJy!EL ztdkfCyCCi+hvRL#*Isv~!Y{)fsD-F;FR+Oa?^;hZtH_0XW>tDienUinl1#uNJg z;u*4>Ea*jj+5^H5NF;(}5J5F_hFw*Ek_+o2TRC5UPyz@psb8$#EZQpd9^KPyG5mLO ziB$o!v!YtX^d0h+>Ka{#EB$C^l?G)9lio$2g^{Z8DPjC!^*!m<0;S1n?-H9(y!WRT z_7md8`jLhb$5-~X#UFxASGt|}-aRbPQu9DL6Ky2$Eqy{NrHs@v&mSkglsEo$#3;^ChDxY(NiAP7@EDheflHxc)ls|4 zw0EQmW}F~AxYtDii%cR}u*(Y6b<);?gIO{JEgNVz{rehT3Rl8sFn1|tF-f!zB+@Y2 zGzphVclks&2EP^2sVP;Cjb(?nne=Zfgp8eB+Aj};=sbHiT%z+AOQdJpHWg;nxa;zi zx$TcloJ^jYJ(s4Vo$yV@=1JkgMycv##-vqdUZy0~r|rzdJO1lU&qx%ES3+|2Rj(%C z{VO8!{LvSWD5F|oMc46_HjRv=uAls8h3?6e*Z+I%*Z%S2Py5TodIlo663$Knlsa5l z-41lq01|WMb}}G|5mO_!jfZaQPVOek01FcUd^vHPRGCMo_6q+Bc* zZ-2PN9eP~|Q_N~VXiM|cS$RE8mrX3OV#C!|!O0kL2trj8mX$pFo&ZK4cZN> z?dJMWdO3;LzC3@lGA&zJHL|9yHoP{1cf1u>LK!8kR%R=Q%`f~7**C+cRzKiswn+)Ap_|cK9QT zVh&1T{M!+)L+d^b(Pbzd8FLTV9({r`QgtpBLL^T$$z+lpZae>c&$--3rh6kAjWt!I za(mucn}V+%w3p9yAc}BBXo)qMeX0fm&E&5(a@G&JNTfprUqkHRd!nfaL_p*zMItJ4#CI7R>`*!c}uW;>Ctd8vn zbDdsQ%rMvUGq~GcM_h#xS{e0f?1c>^mDl)ccb@aIy5Pz`6q6KuF^y}9O_g^OY zU$nmji)GDgE5*Ohv`z?~f0w5+6KEQ`D_KK~hEa=+v}HUE*jxy$mN*OTA2`dn>J_nj49 zlxTmC-ZP9cAF})M2RrEf6M_-z1$%)fkM%DRHHZVpP+`B=q!KBC=^x*p^a_*t_@Az0vZmUu4XWOZL-U z?uPLZf6W9P2_N6mw~naf_=FAe{M7SU)p6Eun8A&ZE`jN*MbuR`w5@DkzKKN()Nq0P z-FqSA8y)jp-QJaRPTwvlRfz8nHCNwF_if`->7Vs*CQi}EsJS}Om_DAj`KaDBMu^{p zJd6<|GjZB091{0kivU-8jxKvCY&~)_+^FrQ=~(poDzV_;&mT^8$w|IQ#z{BKbLY!B ztgV=y_(vhVN&V*f&LdjGlaoELxn+-s^nL2K{S;P|T~jlm5>Z&R`De~!h==(uuY%L| zAOU9Z^G=)$atpUCnMt>~EBnPTYP6UyoPO^VVtB`GcZ1!KcgGB)@3CMgHI?JvxE_sZ zmsJ;k-?cv`rQ0H$s*%o)^TB4)P>y_CpFmBY{Y>-9H2it9*}^KCQ3qemvrxWI^$R2M z7-NtBtc~oShOl3r_PRZ;-hD7RnaKJSXQjNY7>DO>8C!T2Wx)2S&kXy{g_KZC6GzYJ`Km z9va|e{d8VOyt^*euNEc6bz>@MKUb)yw--!fb8l*H`LD9 zKV0yCUbqar#%SOBWzu`_w8343;>p|SC3u^ICe)rb^z$m{dmliT;)Z3WI=4rjNj_yb z9UPc3@{Gmo%|PTrWffWWNRRCV0e(Om&86?nx~wj(aVo*@Hx@NRH3sV>w>d!V@JoH%gP=0Z-%alU=8rKG&0OnfK0gw}|8$fcPC$lto zEIU5URfY8O|Be68=o5;(pO+RFL!~X%O5~uJU|NZLsYELXa?qf|sFhnj`0v=nL}*l$ zqVVZtM-*2_zNGs~8am0KP5U+%(Fa&A*0OJKPZs>r4L%4ZHU%eac^T`fk1VaVK4Mvc z_y4%C@QH7n;D3y1gKtWTu`V@LB+zJZ#c)cTHB^l8O*&3Rg-;|^YU=$@xgJi9)9==O%T~j zN8J>e>m=(w4v8Ftg+c+}xMl$(#OMsp{83ukPKy@N3M10R_`i-{eE#Z#t>XRsCclp! z%pX|^SnZKedKe1{T0SwAazb*s!_io8dZUc-?Vpe=UQF6aWxp4u36{7dKGK~7=Z90- zESD!IKiqu`?(=H6h-4+_hkaoG$1MuI5ZTJiN0=S*)~v-Od)UyaWL7cw_V6?}*_93Z z*sFxq>h8-tg2TU*x_Tb+Fw9+oh3tFPzh_ znjYXEak^R1Zz4a$gD4Qzr{75TYE_ZKznz)p8EuF8IwW(X_K@_wKQS-ki|yRnlPaT) z4=~XkR`;^C5r2awFHuS`k_X>%6${&O!D!M3R1j$r>9Yr&-+Q;Z(5&>k@_B6LBh1yo zqK-x#oXLhJ{2iW6V0`e8z2?te?{84J3a>3=-g6A*9<3v&mWtJeL*CAAJ2)P-w4k1` zhV}niI`?>{+c%C+mWE+!PSIqA<@5}5NEF|;WFd3Nak3m{4~0lh8r~8pBK+5Cqoz+^BSZz<`<2t z(S(a~1Vu+f9Jr$7On`cKB{ zzpY#`dL>8#c@BhZ?cB>x@@2o+_#Pu9>rxpJUCWn$ryisZUH2Nn%d)nhSxOS>WGCi2 zKX)e>9AUz$=cfYy_N3%$C$&Yx5)U&=*r$de7&YA-+Zz3#M$0_VMP;4Bp%Tt-^c_JQ zNI&8ALjX&a-Vmn*tEI<6&4C zg*O3wxkibOVB-moU{9qz$^4mKQgdv~sm+S0$`3oxT>8d}66h%}+A_`wS}b@Ghe@F! z85?_AW`%p|FBTHN8DxVV(#+&i2S0}C``1Rhy3TmOACs`d7O*pcAt8U;P})zaP4z=K zI&4ZsrZ%`xL+4rhugQ4vlWT)-@!^Db0w>-qL<8o+ z?_+;~iti ziA%@FLf?`xcNtjpHUMmuPnZ-j|IpX>RTWCRp2Sm6Fr^@RwmFy#{@7jKu0)TM$oE>3 znr;37`PGx;(~(XtxK5P`CF`q((=$;qC#1pf2p{+JZ;2i-nFL!fsqW=Qr~Pb#Rr!nnyZG61S%l-;WvX zyijKv4|3YB_JULTmuxjeOYX3JFDi9@tts~fBz7P-E-=l%k=s2PURhNo)bCmsy`sCe zD<;<0K3q_>0pHK_hbJIqmmmifOPTDnE#EMf%CN5wX>Jxk26tbk<-;wK9SmDAWJ9ZX z)FpCjkTTiW1m)Ga&snbzm-#r>;&e-npMFIMXx{46KBHwg|v_2Jmzs2zF_j#&! zZ*JZF(^>H^5n`08s!c+7o8S(-4m2s8&{UP<6wtmkZ^u+NEQw2zE{y z+r=ee_b^DKmppl6L(iBZ^!E)M7RM1jSUy6WFb*+@_imjNmxh_ z2u#1lXn;SeVB?H|`siuH%r$dIKs@sTgq?H8k9j@`BwU-+G`ko2`c8JUSuQMe5fnQK zCj}>c3+2z=Ey{3k?&?XTd!ma?nuu5<{^LBF#vVs<54SG`j7&B?tam870?BTgJ@Yc& z>9W1%m~*K!LVuch?fh?Zs_QOq(ebeA@@{;ikGuTJ0R3d;H0B8^%h0d18{ZRg#Kq`_ zWA6zwP1nV#ksR+ni87o7D7dy9kQBZ$&v(}GifXIbxQ4jBj&{e{o2{DYHkBLpAb1Qd zgMv)o5<01`(+g+z+7T``ZBa+crv14iCQ@cfRN6GOg|s~Lb6=f9Q3P6It9ZhNASHg& z?Z-^EBYJNRb4MBTLsrR`h&yAUaL1*(r})Ei8QWCj5YscttDZwIM_1eQGj-4vRosuM zZTOlY_Y==z=I7?vPVW}n@;V2;vfkgTPlARloj0!Y6EWCnmI!5yNLZMyvoW{rFlQ_G0 zZ777jIW~w=(@02ZpnGLI34*8PL4BS@}iMbn++k_PYqXYk9mSe3Zd-d`}O{)Yh=>|8g(cU5L%25 zhQ)!zXfl$pGudCsybWoH4OPT~XmHf5cs#Yub|EJhzTM zLLUSZKc=TS;5XvRx@*FyZ+}?+}Gk#Z17vRv> z`|z&DK3rMLemL-pr3*f#rc$bACNTkAEmRufYt$WKTv*fe#nocjyBaTZ$?ARv`=#}1 zT-kyUmBnXJHcc_W1P($lrz3GfZla*44ELCV@VEkk!Sl_R@*Lapewl&$Mg1$9@Rwiq zBBg1kqMF)HUwa4DPT}@;)mJv6I2kB(_ovN0iPu3FNKDrKIDoR4qqwXmQ+x;Kp#W}tmk%|S^p_7s&SPuJP8N$sh*Mo;*5S$VL^Lp*y9qS8ZV$%Cbj6-O)(ODEc%<|n zw9PN5mt-=T8oRx3Hdz&DC^-7@O&rMt0s-o8;B31|#Lg>bRN}O5R!1*_IG#qADKxOxWC@BMvE3B-tQX8?f=(#}3t+dl)Lbe@gh z0Cooh`DSLHXHSrUV#vdXNmZo2x?8k(J=sT-%e0XPt@x0UgW$-89!$A*ZN6}0M0Zm+ z6C~KZaRHkj=%lpoi!Lndv^u$bDeX1em-_@Do8QGQFeB?w@)FT#iD(5jV?LV{W;x3! z1p6C+mnnMrpgDtrb5@9g5M2IP;Mcu>rFGqp4pmAi__luNuhHd|LoW4;F!0!r?1|No HPvZXo8=5Cx literal 301639 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

)pUB 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 Date: Thu, 12 Sep 2019 19:37:13 -0400 Subject: [PATCH 243/406] Use test coverage badge from shields.io instead of codecov.io --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6ad22b5..6ac5e0f 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ - + From bf8f34f81e573066dfb5fbfab46728d9efa5428c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 12 Sep 2019 19:39:04 -0400 Subject: [PATCH 244/406] Use two rows for badges in README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6ac5e0f..25114e5 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ +
From 5fd3117f8755bcba3e29722bdabb679f326cd070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 12 Sep 2019 19:41:41 -0400 Subject: [PATCH 245/406] Add license badge --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 25114e5..2ccb960 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,9 @@ + + + From 29d0f6ddfa10aa99e2832953351d68b85d75ebca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 7 Oct 2019 20:38:13 -0400 Subject: [PATCH 246/406] Fix typo in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2ccb960..c65d45d 100644 --- a/README.md +++ b/README.md @@ -146,7 +146,7 @@ Take a look at the `SoftCollection` struct for a similar concept applied to an e From a raw string that represents a URL, it is possible that create a `SimpleURL` which contains the information stored in the URL in a structure that is easier to handle. -It is also possible to build a `URL` from a `Schema` and a `SimpleURL` which contains additional information taken from the schema. `NewURL` returns a error if the URL does not respect the schema. +It is also possible to build a `URL` from a `Schema` and a `SimpleURL` which contains additional information taken from the schema. `NewURL` returns an error if the URL does not respect the schema. ## Documentation From 658a288179d0053925368ddace101a709a8492d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 13 Oct 2019 12:41:57 -0400 Subject: [PATCH 247/406] Mark code snippets in README.md as written in Go --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index c65d45d..4d08006 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ The supported versions of Go are the latest patch releases of every minor releas The simplest way to start using jsonapi is to use the Marshal and Unmarshal functions. -``` +```go func Marshal(doc *Document, url *URL) ([]byte, error) func Unmarshal(payload []byte, schema *Schema) (*Document, error) ``` @@ -70,7 +70,7 @@ A JSON:API type is generally defined with a struct. There needs to be an ID field of type string. The `api` tag represents the name of the type. -``` +```go type User struct { ID string `json:"id" api:"users"` // ID is mandatory and the api tag sets the type @@ -89,7 +89,7 @@ Other fields with the `api` tag (`attr` or `rel`) can be added as attributes or Attributes can be of the following types: -``` +```go string int, int8, int16, int32, int64 uint, uint8, uint16, uint32, uint64 @@ -110,7 +110,7 @@ Using a pointer allows the field to be nil. Relationships can be a bit tricky. To-one relationships are defined with a string and to-many relationships are defined with a slice of strings. They contain the IDs of the related resources. The api tag has to take the form of "rel,xxx[,yyy]" where yyy is optional. xxx is the type of the relationship and yyy is the name of the inverse relationship when dealing with a two-way relationship. In the following example, our Article struct defines a relationship named author of type users: -``` +```go Author string `json:"author" api:"rel,users,articles"` ``` @@ -118,7 +118,7 @@ Author string `json:"author" api:"rel,users,articles"` A struct can be wrapped using the `Wrap` function which returns a pointer to a `Wrapper`. A `Wrapper` implements the `Resource` interface and can be used with this library. Modifying a Wrapper will modify the underlying struct. The resource's type is defined from reflecting on the struct. -``` +```go user := User{} wrap := Wrap(&user) wrap.Set("name", "Mike") @@ -130,7 +130,7 @@ fmt.Printf(user.Name) // Output: Mike A SoftResource is a struct whose type (name, attributes, and relationships) can be modified indefinitely just like its values. When an attribute or a relationship is added, the new value is the zero value of the field type. For example, if you add an attribute named `my-attribute` of type string, then `softresource.Get("my-attribute")` will return an empty string. -``` +```go sr := SoftResource{} sr.AddAttr(Attr{ Name: "attr", From 6d4b29d5377868ff36e8897c2e7c69a308ac65b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Wed, 16 Oct 2019 23:40:57 -0400 Subject: [PATCH 248/406] Add a test for Error.MarshalJSON --- error_test.go | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/error_test.go b/error_test.go index cde3dd2..38a6b73 100644 --- a/error_test.go +++ b/error_test.go @@ -1,6 +1,7 @@ package jsonapi_test import ( + "encoding/json" "net/http" "strconv" "testing" @@ -298,3 +299,47 @@ func TestErrorConstructors(t *testing.T) { assert.Equal(test.expected, test.err.Error(), test.name) } } + +func TestErrorMarshalJSON(t *testing.T) { + assert := assert.New(t) + + jaerr := Error{ + ID: "c1897530-fdf5-4a42-88fb-1c1c4bd0962f", + Code: "Code", + Status: "Status", + Title: "Title", + Detail: "Detail", + Links: map[string]string{ + "link": "http://example.com/", + }, + Source: map[string]interface{}{ + "parameter": "param", + "pointer": "/data", + }, + Meta: map[string]interface{}{ + "meta": 123, + }, + } + + payload, err := json.Marshal(jaerr) + assert.NoError(err) + assert.Equal(string(payload), makeOneLineNoSpaces(` + { + "code": "Code", + "detail": "Detail", + "id": "c1897530-fdf5-4a42-88fb-1c1c4bd0962f", + "links": { + "link": "http://example.com/" + }, + "meta": { + "meta": 123 + }, + "source": { + "parameter": "param", + "pointer": "/data" + }, + "status": "Status", + "title": "Title" + } + `)) +} From 9019c23a59ad6f0ea6fbfa05dd31f5cea0cf9aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 20 Oct 2019 18:25:18 -0400 Subject: [PATCH 249/406] Improve comment for GetAttrTypeString --- type.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/type.go b/type.go index 760555c..4964fae 100644 --- a/type.go +++ b/type.go @@ -377,9 +377,8 @@ func GetAttrType(t string) (int, bool) { } } -// GetAttrTypeString return the name of the attribute type specified by an int -// (see constants) and a boolean that indicates whether the value can be null or -// not. +// GetAttrTypeString returns the name of the attribute type specified by t (see +// constants) and nullable. func GetAttrTypeString(t int, nullable bool) string { str := "" switch t { From 5b776a1acce5c0757aa213c18cff3d6ee4e249a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 20 Oct 2019 18:31:02 -0400 Subject: [PATCH 250/406] Refactor CopyType to Type.Copy --- resource_test.go | 4 ++-- type.go | 40 ++++++++++++++++++++-------------------- type_test.go | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/resource_test.go b/resource_test.go index 66aece1..2db0c87 100644 --- a/resource_test.go +++ b/resource_test.go @@ -106,12 +106,12 @@ func TestEqual(t *testing.T) { assert.False(Equal(mt11, mt13), "different resources (same type)") assert.False(Equal(mt11, mt21), "different types") - typ := CopyType(mt11.GetType()) + typ := mt11.GetType().Copy() sr1 := &SoftResource{Type: &typ} sr1.RemoveField("str") assert.False(Equal(mt11, sr1), "different number of attributes") - typ = CopyType(mt11.GetType()) + typ = mt11.GetType().Copy() sr1 = &SoftResource{Type: &typ} for _, attr := range typ.Attrs { sr1.Set(attr.Name, mt11.Get(attr.Name)) diff --git a/type.go b/type.go index 4964fae..5733e71 100644 --- a/type.go +++ b/type.go @@ -150,6 +150,26 @@ func (t Type) Equal(typ Type) bool { return reflect.DeepEqual(t, typ) } +// Copy deeply copies the receiver and returns the result. +func (t Type) Copy() Type { + ctyp := Type{ + Name: t.Name, + Attrs: map[string]Attr{}, + Rels: map[string]Rel{}, + } + + for name, attr := range t.Attrs { + ctyp.Attrs[name] = attr + } + for name, rel := range t.Rels { + ctyp.Rels[name] = rel + } + + ctyp.NewFunc = t.NewFunc + + return ctyp +} + // Attr represents a resource attribute. type Attr struct { Name string @@ -513,23 +533,3 @@ func GetZeroValue(t int, null bool) interface{} { return nil } } - -// CopyType deeply copies the given type and returns the result. -func CopyType(typ Type) Type { - ctyp := Type{ - Name: typ.Name, - Attrs: map[string]Attr{}, - Rels: map[string]Rel{}, - } - - for name, attr := range typ.Attrs { - ctyp.Attrs[name] = attr - } - for name, rel := range typ.Rels { - ctyp.Rels[name] = rel - } - - ctyp.NewFunc = typ.NewFunc - - return ctyp -} diff --git a/type_test.go b/type_test.go index 0e734da..0aa354a 100644 --- a/type_test.go +++ b/type_test.go @@ -471,7 +471,7 @@ func TestCopyType(t *testing.T) { } // Copy - typ2 := CopyType(typ1) + typ2 := typ1.Copy() assert.Equal("type1", typ2.Name) assert.Len(typ2.Attrs, 1) From 7c1e9d660ef6699b1e45731f9c6bea0b6270bdc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 20 Oct 2019 18:47:47 -0400 Subject: [PATCH 251/406] Remove some checks in Range If those checks fail, the function panics. Also, these are development time checks. Therefore, they are not necessary and they are removed. If there is an error, the function will panic anyway when trying to compare the values. --- range.go | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/range.go b/range.go index 75b5a9d..f6546c8 100644 --- a/range.go +++ b/range.go @@ -1,7 +1,6 @@ package jsonapi import ( - "fmt" "sort" "strings" "time" @@ -103,24 +102,9 @@ func (s sortedResources) Less(i, j int) bool { return s.col[i].GetID() < s.col[j].GetID() != inverse } - // Check type - typ := s.col.At(i).GetType() - typ2 := s.col.At(j).GetType() - if !typ.Equal(typ2) { - panic("cannot compare two resources of different types") - } - - if _, ok := typ.Attrs[r]; !ok { - panic("cannot sort on a unknown attribute") - } - v := s.col[i].Get(r) v2 := s.col[j].Get(r) - if fmt.Sprintf("%T", v) != fmt.Sprintf("%T", v2) { - panic("cannot compare two values of different types") - } - // Here we return true if v < v2. // The "!= inverse" part acts as a XOR operation so that // the opposite boolean is returned when inverse sorting From efbf9684a09b9260e0be2cc5e1ce1fc129388f12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 20 Oct 2019 19:02:34 -0400 Subject: [PATCH 252/406] Remove MarshalIdentifiers --- identifiers.go | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/identifiers.go b/identifiers.go index 888242c..28f9bcf 100644 --- a/identifiers.go +++ b/identifiers.go @@ -1,7 +1,5 @@ package jsonapi -import "encoding/json" - // NewIdentifiers returns an Identifiers object. // // t is the type of the identifiers. ids is the set of IDs. @@ -37,12 +35,3 @@ type Identifier struct { ID string `json:"id"` Type string `json:"type"` } - -// MarshalIdentifiers builds a json.RawMessage object from the given IDs. -// -// TODO Implement the function. -func MarshalIdentifiers(ids []string, toOne bool) json.RawMessage { - raw := "" - - return []byte(raw) -} From b39387aa5934987b6e5f0eb64551325382c89fea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 20 Oct 2019 19:14:28 -0400 Subject: [PATCH 253/406] Add to-many relationship in SoftCollection.Add test --- soft_collection_test.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/soft_collection_test.go b/soft_collection_test.go index 4bf12e6..3b5363f 100644 --- a/soft_collection_test.go +++ b/soft_collection_test.go @@ -93,6 +93,16 @@ func TestSoftCollection(t *testing.T) { } sr.AddRel(rel7) _ = typ.AddRel(rel7) + rel8 := Rel{ + FromName: "rel8", + FromType: "thirdtype", + ToOne: false, + ToName: "rel9", + ToType: "othertype", + FromOne: true, + } + sr.AddRel(rel8) + _ = typ.AddRel(rel8) sc.Add(sr) From 488e7d3db355658f1deaba262cef3e886fb5f053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 20 Oct 2019 19:21:26 -0400 Subject: [PATCH 254/406] Remove Resource.Validate The method is not useful and probably should not be part of this interface, which already contains a lot of methods. If it is reintroduced, maybe it should be part of another interface specific to validation. --- resource.go | 3 --- soft_resource.go | 6 ------ wrapper.go | 5 ----- wrapper_test.go | 10 ---------- 4 files changed, 24 deletions(-) diff --git a/resource.go b/resource.go index 928e37e..2fcda46 100644 --- a/resource.go +++ b/resource.go @@ -30,9 +30,6 @@ type Resource interface { Set(key string, val interface{}) SetToOne(key string, rel string) SetToMany(key string, rels []string) - - // Validate - Validate() []error } // Equal reports whether r1 and r2 are equal. diff --git a/soft_resource.go b/soft_resource.go index 4a1952f..fda9704 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -162,12 +162,6 @@ func (sr *SoftResource) SetToMany(key string, v []string) { } } -// Validate returns validation errors found in the resource. -func (sr *SoftResource) Validate() []error { - sr.check() - return []error{} -} - // Copy return a new SoftResource object with the same type and values. func (sr *SoftResource) Copy() Resource { sr.check() diff --git a/wrapper.go b/wrapper.go index cc47641..e096e87 100644 --- a/wrapper.go +++ b/wrapper.go @@ -279,11 +279,6 @@ func (w *Wrapper) SetToMany(key string, rels []string) { panic(fmt.Sprintf("jsonapi: relationship %q does not exist", key)) } -// Validate returns any errors found in the wrapped resource. -func (w *Wrapper) Validate() []error { - return nil -} - // Copy makes a copy of the wrapped resource and returns it. // // The returned value's concrete type is also a Wrapper. diff --git a/wrapper_test.go b/wrapper_test.go index 5e4c7b4..7eb6f0c 100644 --- a/wrapper_test.go +++ b/wrapper_test.go @@ -362,13 +362,3 @@ func TestWrapperGetAndSetErrors(t *testing.T) { wrap.SetToMany("to-1", []string{"id"}) }) } - -func TestWrapperValidate(t *testing.T) { - assert := assert.New(t) - - // TODO Implement this test when the implementation - // of Wrapper.Validate is done. - wrap := Wrap(mocktype{}) - errs := wrap.Validate() - assert.Nil(errs) -} From 704e38973eab58cfcd32739c97ace5689768a69d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 20 Oct 2019 19:46:04 -0400 Subject: [PATCH 255/406] Add tests for NewRequest --- request_test.go | 52 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 48 insertions(+), 4 deletions(-) diff --git a/request_test.go b/request_test.go index d925cb2..4a68079 100644 --- a/request_test.go +++ b/request_test.go @@ -2,6 +2,7 @@ package jsonapi_test import ( "bytes" + "errors" "net/http/httptest" "testing" @@ -21,14 +22,20 @@ func TestNewRequest(t *testing.T) { method string url string schema *Schema - expectedError error + expectedError string }{ { name: "get collection (mock schema)", method: "GET", url: "/mocktypes1", schema: schema, - expectedError: nil, + expectedError: "", + }, { + name: "bad url", + method: "GET", + url: "/invalid", + schema: schema, + expectedError: `400 Bad Request: "invalid" is not a known type.`, }, } @@ -37,7 +44,44 @@ func TestNewRequest(t *testing.T) { req := httptest.NewRequest(test.method, test.url, body) doc, err := NewRequest(req, test.schema) - assert.Equal(test.expectedError, err, test.name) - assert.Equal(test.method, doc.Method, test.name) + if test.expectedError == "" { + assert.NoError(err) + assert.Equal(test.method, doc.Method, test.name) + } else { + assert.EqualError(err, test.expectedError, test.name) + assert.Nil(doc) + } } } + +func TestNewRequestInvalidBody(t *testing.T) { + assert := assert.New(t) + + // Schema + schema := newMockSchema() + + // Nil body + req := httptest.NewRequest("GET", "/mocktypes1", badReader{}) + + doc, err := NewRequest(req, schema) + assert.EqualError(err, "bad reader") + assert.Nil(doc) + + // Invalid body + body := bytes.NewBufferString("{invalidjson}") + req = httptest.NewRequest("GET", "/mocktypes1", body) + + doc, err = NewRequest(req, schema) + assert.EqualError( + err, + "invalid character 'i' looking for beginning of object key string", + ) + assert.Nil(doc) +} + +type badReader struct { +} + +func (badReader) Read([]byte) (int, error) { + return 0, errors.New("bad reader") +} From 951ab95e55236a0f524e7082d69510c5d0f5156a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 3 Nov 2019 11:29:35 -0500 Subject: [PATCH 256/406] Improve relationship normalization Normalize currently uses the alphabetical order to normalize a two-way relationship. Until now, one-way relationships were not properly handled. The alphabetical order would sometimes make Normalize return a relationship whose FromName field was set to an empty string. This itself was not a huge problem, but it is cleaner and makes more sense to use the original relationship when it does not point to another type's relationship (one-way) than to use its inverse. --- type.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/type.go b/type.go index 5733e71..9bb0c58 100644 --- a/type.go +++ b/type.go @@ -350,7 +350,7 @@ func (r *Rel) Inverse() Rel { func (r *Rel) Normalize() Rel { from := r.FromType + r.FromName to := r.ToType + r.ToName - if from < to { + if from < to || r.ToName == "" { return *r } return r.Inverse() From 0f51721ed0c1ceb55c5fcd8795c1942cd7ebd7f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 3 Nov 2019 11:39:20 -0500 Subject: [PATCH 257/406] Use Normalize in buildRels It is not necessary for buildRels to normalize the relationships itself. It now uses Rel.Normalize. --- schema.go | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/schema.go b/schema.go index c4bc936..bca343e 100644 --- a/schema.go +++ b/schema.go @@ -209,18 +209,9 @@ func (s *Schema) buildRels() { for _, typ := range s.Types { for _, rel := range typ.Rels { - relName := rel.FromType + "_" + rel.FromName - if rel.ToName == "" { - s.rels[relName] = rel - } else { - inv := rel.Inverse() - invName := inv.FromType + "_" + inv.FromName - if relName < invName { - s.rels[relName] = rel - } else { - s.rels[invName] = inv - } - } + nr := rel.Normalize() + relName := nr.FromType + "_" + nr.FromName + s.rels[relName] = nr } } } From dbb3213b8c76046b995ca15b583d03ab7e0c9146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 3 Nov 2019 11:42:49 -0500 Subject: [PATCH 258/406] Add comment to buildRels --- schema.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/schema.go b/schema.go index bca343e..3c33d2f 100644 --- a/schema.go +++ b/schema.go @@ -203,7 +203,8 @@ func (s *Schema) Check() []error { return errs } -// buildRels ... +// buildRels builds the set of normalized relationships that is returned by +// Schema.Rels. func (s *Schema) buildRels() { s.rels = map[string]Rel{} From 48a66d7cd989ce1efea3927157e1b87179bf8f9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 3 Nov 2019 11:50:36 -0500 Subject: [PATCH 259/406] Add Rel.String --- type.go | 8 ++++++++ type_test.go | 16 ++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/type.go b/type.go index 9bb0c58..b5209d8 100644 --- a/type.go +++ b/type.go @@ -356,6 +356,14 @@ func (r *Rel) Normalize() Rel { return r.Inverse() } +// String returns a string representation of the receiving Rel. +// +// The returned string only contains the type's name followed by the +// relationship's name. +func (r Rel) String() string { + return r.FromType + "_" + r.FromName +} + // GetAttrType returns the attribute type as an int (see constants) and a // boolean that indicates whether the attribute can be null or not. func GetAttrType(t string) (int, bool) { diff --git a/type_test.go b/type_test.go index 0aa354a..1f343aa 100644 --- a/type_test.go +++ b/type_test.go @@ -252,6 +252,22 @@ func TestRelNormalize(t *testing.T) { assert.Equal(false, norm.FromOne) } +func TestRelString(t *testing.T) { + assert := assert.New(t) + + rel := Rel{ + FromName: "rel2", + FromType: "type2", + ToOne: false, + ToName: "rel1", + ToType: "type1", + FromOne: true, + } + + assert.Equal("type2_rel2", rel.String()) + assert.Equal("type1_rel1", rel.Inverse().String()) +} + func TestGetAttrType(t *testing.T) { assert := assert.New(t) From b4dcba4a280a9f880850b3251c3bc5c226aa095b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 3 Nov 2019 11:51:39 -0500 Subject: [PATCH 260/406] Rename Rel.Inverse to Rel.Invert --- type.go | 6 +++--- type_test.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/type.go b/type.go index b5209d8..60acc38 100644 --- a/type.go +++ b/type.go @@ -331,8 +331,8 @@ type Rel struct { FromOne bool } -// Inverse returns the inverse relationship of r. -func (r *Rel) Inverse() Rel { +// Invert returns the inverse relationship of r. +func (r *Rel) Invert() Rel { return Rel{ FromType: r.ToType, FromName: r.ToName, @@ -353,7 +353,7 @@ func (r *Rel) Normalize() Rel { if from < to || r.ToName == "" { return *r } - return r.Inverse() + return r.Invert() } // String returns a string representation of the receiving Rel. diff --git a/type_test.go b/type_test.go index 1f343aa..9cff3f9 100644 --- a/type_test.go +++ b/type_test.go @@ -198,7 +198,7 @@ func TestAttrUnmarshalToType(t *testing.T) { assert.Nil(val) } -func TestInverseRel(t *testing.T) { +func TestRelInvert(t *testing.T) { assert := assert.New(t) rel := Rel{ @@ -210,7 +210,7 @@ func TestInverseRel(t *testing.T) { FromOne: false, } - invRel := rel.Inverse() + invRel := rel.Invert() assert.Equal("rel2", invRel.FromName) assert.Equal("type1", invRel.ToType) @@ -265,7 +265,7 @@ func TestRelString(t *testing.T) { } assert.Equal("type2_rel2", rel.String()) - assert.Equal("type1_rel1", rel.Inverse().String()) + assert.Equal("type1_rel1", rel.Invert().String()) } func TestGetAttrType(t *testing.T) { From 95428d5eb34421c5e44befab7585f300bfad5d78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 10 Nov 2019 09:44:00 -0500 Subject: [PATCH 261/406] Fix two typos in Request's top comment --- request.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/request.go b/request.go index 52633de..03f7dde 100644 --- a/request.go +++ b/request.go @@ -5,7 +5,7 @@ import ( "net/http" ) -// NewRequest builds a return a *Request based on r and schema. +// NewRequest builds and returns a *Request based on r and schema. // // schema can be nil, in which case no checks will be done to insure that the // request respects a specific schema. From d730e339f62b20025a73afe48c1955d0da6782e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 10 Nov 2019 09:57:22 -0500 Subject: [PATCH 262/406] Update golangci-lint to v1.21.0 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7f3b625..68a2817 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ env: before_script: - 'curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh - | sh -s v1.18.0' + | sh -s v1.21.0' script: - ./bin/golangci-lint run From 0708a11d0fb9c3873ee8298b05fd00a4a151f2e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 10 Nov 2019 16:17:12 -0500 Subject: [PATCH 263/406] Refactor un/marshaling tools --- collection.go | 43 ++++ document.go | 186 +++++++++++++- document_test.go | 468 ++++++++++++++++++++++++++++++++++++ identifiers.go | 24 ++ identifiers_test.go | 48 ++++ jsonapi.go | 408 ------------------------------- jsonapi_test.go | 573 -------------------------------------------- request.go | 7 +- request_test.go | 4 +- resource.go | 153 ++++++++++++ 10 files changed, 917 insertions(+), 997 deletions(-) delete mode 100644 jsonapi.go diff --git a/collection.go b/collection.go index fb5b33f..d1ea0da 100644 --- a/collection.go +++ b/collection.go @@ -1,5 +1,7 @@ package jsonapi +import "encoding/json" + // A Collection defines the interface of a structure that can manage a set of // ordered resources of the same type. type Collection interface { @@ -16,6 +18,47 @@ type Collection interface { Add(Resource) } +// MarshalCollection marshals a Collection into a JSON-encoded payload. +func MarshalCollection(c Collection, prepath string, fields map[string][]string, relData map[string][]string) []byte { + var raws []*json.RawMessage + + if c.Len() == 0 { + return []byte("[]") + } + + for i := 0; i < c.Len(); i++ { + r := c.At(i) + raw := json.RawMessage( + MarshalResource(r, prepath, fields[r.GetType().Name], relData), + ) + raws = append(raws, &raw) + } + + // NOTE An error should not happen. + pl, _ := json.Marshal(raws) + return pl +} + +// UnmarshalCollection unmarshals a JSON-encoded payload into a Collection. +func UnmarshalCollection(data []byte, schema *Schema) (Collection, error) { + var cske []json.RawMessage + err := json.Unmarshal(data, &cske) + if err != nil { + return nil, err + } + + col := &Resources{} + for i := range cske { + res, err := UnmarshalResource(cske[i], schema) + if err != nil { + return nil, err + } + col.Add(res) + } + + return col, nil +} + // Resources is a slice of objects that implement the Resource interface. They // do not necessarily have the same type. type Resources []Resource diff --git a/document.go b/document.go index ad2516a..e60ccac 100644 --- a/document.go +++ b/document.go @@ -1,5 +1,11 @@ package jsonapi +import ( + "encoding/json" + "errors" + "sort" +) + // A Document represents a JSON:API document. type Document struct { // Data @@ -25,17 +31,6 @@ type Document struct { PrePath string } -// NewDocument returns a pointer to a new Document. -func NewDocument() *Document { - return &Document{ - Included: []Resource{}, - Resources: map[string]map[string]struct{}{}, - Links: map[string]Link{}, - RelData: map[string][]string{}, - Meta: map[string]interface{}{}, - } -} - // Include adds res to the set of resources to be included under the included // top-level field. // @@ -77,3 +72,172 @@ func (d *Document) Include(res Resource) { d.Included = append(d.Included, res) } + +// MarshalDocument marshals a document according to the JSON:API speficication. +// +// Both doc and url must not be nil. +func MarshalDocument(doc *Document, url *URL) ([]byte, error) { + var err error + + // Data + var data json.RawMessage + if res, ok := doc.Data.(Resource); ok { + // Resource + data = MarshalResource( + res, + doc.PrePath, + url.Params.Fields[res.GetType().Name], + doc.RelData, + ) + } else if col, ok := doc.Data.(Collection); ok { + // Collection + data = MarshalCollection( + col, + doc.PrePath, + url.Params.Fields, + doc.RelData, + ) + } else if id, ok := doc.Data.(Identifier); ok { + // Identifier + data, err = json.Marshal(id) + } else if ids, ok := doc.Data.(Identifiers); ok { + // Identifiers + data, err = json.Marshal(ids) + } else if doc.Data != nil { + err = errors.New("data contains an unknown type") + } else if len(doc.Errors) == 0 { + data = []byte("null") + } + + // Data + var errors json.RawMessage + if len(doc.Errors) > 0 { + // Errors + errors, err = json.Marshal(doc.Errors) + } + + if err != nil { + return []byte{}, err + } + + // Included + var inclusions []*json.RawMessage + if len(doc.Included) > 0 { + sort.Slice(doc.Included, func(i, j int) bool { + return doc.Included[i].GetID() < doc.Included[j].GetID() + }) + + if len(data) > 0 { + for key := range doc.Included { + typ := doc.Included[key].GetType().Name + raw := MarshalResource( + doc.Included[key], + doc.PrePath, + url.Params.Fields[typ], + doc.RelData, + ) + rawm := json.RawMessage(raw) + inclusions = append(inclusions, &rawm) + } + } + } + + // Marshaling + plMap := map[string]interface{}{} + + if len(errors) > 0 { + plMap["errors"] = errors + } else if len(data) > 0 { + plMap["data"] = data + + if len(inclusions) > 0 { + plMap["included"] = inclusions + } + } + + if len(doc.Meta) > 0 { + plMap["meta"] = doc.Meta + } + + if url != nil { + plMap["links"] = map[string]string{ + "self": doc.PrePath + url.String(), + } + } + plMap["jsonapi"] = map[string]string{"version": "1.0"} + + return json.Marshal(plMap) +} + +// UnmarshalDocument reads a payload to build and return a Document object. +// +// schema must not be nil. +func UnmarshalDocument(payload []byte, schema *Schema) (*Document, error) { + doc := &Document{ + Included: []Resource{}, + Resources: map[string]map[string]struct{}{}, + Links: map[string]Link{}, + RelData: map[string][]string{}, + Meta: map[string]interface{}{}, + } + ske := &payloadSkeleton{} + + // Unmarshal + err := json.Unmarshal(payload, ske) + if err != nil { + return nil, err + } + + // Data + if len(ske.Data) > 0 { + if ske.Data[0] == '{' { + // Resource + res, err := UnmarshalResource(ske.Data, schema) + if err != nil { + return nil, err + } + doc.Data = res + } else if ske.Data[0] == '[' { + col, err := UnmarshalCollection(ske.Data, schema) + if err != nil { + return nil, err + } + doc.Data = col + } else if string(ske.Data) == "null" { + doc.Data = nil + } else { + // TODO Not exactly the right error + return nil, NewErrMissingDataMember() + } + } else if len(ske.Errors) > 0 { + doc.Errors = ske.Errors + } else { + return nil, NewErrMissingDataMember() + } + + // Included + if len(ske.Included) > 0 { + inc := Identifier{} + incs := []Identifier{} + for _, rawInc := range ske.Included { + err = json.Unmarshal(rawInc, &inc) + if err != nil { + return nil, err + } + incs = append(incs, inc) + } + + for i := range incs { + res, err := UnmarshalResource(ske.Included[i], schema) + if err != nil { + return nil, err + } + doc.Included = append(doc.Included, res) + } + } + + // Meta + doc.Meta = ske.Meta + + return doc, nil +} diff --git a/document_test.go b/document_test.go index c27bc98..3f7a472 100644 --- a/document_test.go +++ b/document_test.go @@ -1,7 +1,13 @@ package jsonapi_test import ( + "bytes" + "encoding/json" + "io/ioutil" + "path/filepath" + "strings" "testing" + "time" . "github.com/mfcochauxlaberge/jsonapi" @@ -84,6 +90,468 @@ func TestInclude(t *testing.T) { assert.Equal(expect, ids) } +func TestMarshalDocument(t *testing.T) { + // TODO Describe how this test suite works + + // Setup + typ, _ := BuildType(mocktype{}) + typ.NewFunc = func() Resource { + return Wrap(&mocktype{}) + } + col := &Resources{} + col.Add(Wrap(&mocktype{ + ID: "id1", + Str: "str", + Int: 10, + Int8: 18, + Int16: 116, + Int32: 132, + Int64: 164, + Uint: 100, + Uint8: 108, + Uint16: 1016, + Uint32: 1032, + Uint64: 1064, + Bool: true, + Time: getTime(), + Bytes: []byte{1, 2, 3}, + To1: "id2", + To1From1: "id3", + To1FromX: "id3", + ToX: []string{"id2", "id3"}, + ToXFrom1: []string{"id4"}, + ToXFromX: []string{"id3", "id4"}, + })) + col.Add(Wrap(&mocktype{ + ID: "id2", + Str: "漢語", + Int: -42, + Time: time.Time{}, + Bytes: []byte{}, + })) + col.Add(Wrap(&mocktype{ID: "id3"})) + + // Test struct + tests := []struct { + name string + doc *Document + fields []string + }{ + { + name: "empty data", + doc: &Document{ + PrePath: "https://example.org/", + }, + }, { + name: "empty collection", + doc: &Document{ + Data: &Resources{}, + }, + }, { + name: "resource", + doc: &Document{ + Data: col.At(0), + RelData: map[string][]string{ + "mocktype": {"to-1", "to-x-from-1"}, + }, + }, + fields: []string{ + "str", "uint64", "bool", "int", "time", "bytes", "to-1", + "to-x-from-1", + }, + }, { + name: "collection", + doc: &Document{ + Data: Range(col, nil, nil, []string{}, 10, 0), + RelData: map[string][]string{ + "mocktype": {"to-1", "to-x-from-1"}, + }, + PrePath: "https://example.org/", + }, + fields: []string{ + "str", "uint64", "bool", "int", "time", "to-1", "to-x-from-1", + }, + }, { + name: "meta", + doc: &Document{ + Data: nil, + Meta: map[string]interface{}{ + "f1": "漢語", + "f2": 42, + "f3": true, + }, + }, + }, { + name: "collection with inclusions", + doc: &Document{ + Data: Wrap(&mocktype{ + ID: "id1", + }), + RelData: map[string][]string{ + "mocktype": {"to-1", "to-x-from-1"}, + }, + Included: []Resource{ + Wrap(&mocktype{ + ID: "id2", + }), + Wrap(&mocktype{ + ID: "id3", + }), + Wrap(&mocktype{ + ID: "id4", + }), + }, + }, + }, { + name: "identifier", + doc: &Document{ + Data: Identifier{ + ID: "id1", + Type: "mocktype", + }, + }, + }, { + name: "identifiers", + doc: &Document{ + Data: Identifiers{ + { + ID: "id1", + Type: "mocktype", + }, { + ID: "id2", + Type: "mocktype", + }, { + ID: "id3", + Type: "mocktype", + }, + }, + }, + }, { + name: "error", + doc: &Document{ + Errors: func() []Error { + err := NewErrBadRequest("Bad Request", "This request is bad.") + err.ID = "00000000-0000-0000-0000-000000000000" + return []Error{err} + }(), + }, + }, { + name: "errors", + doc: &Document{ + Errors: func() []Error { + err1 := NewErrBadRequest("Bad Request", "This request is bad.") + err1.ID = "00000000-0000-0000-0000-000000000000" + err2 := NewErrBadRequest("Bad Request", "This request is really bad.") + err2.ID = "00000000-0000-0000-0000-000000000000" + return []Error{err1, err2} + }(), + }, + }, + } + + for i := range tests { + i := i + test := tests[i] + t.Run(test.name, func(t *testing.T) { + assert := assert.New(t) + + // URL + url := &URL{ + Fragments: []string{"fake", "path"}, + Params: &Params{ + Fields: map[string][]string{"mocktype": test.fields}, + }, + } + if _, ok := test.doc.Data.(Collection); ok { + url.IsCol = true + } + + // Marshaling + payload, err := MarshalDocument(test.doc, url) + assert.NoError(err) + + // Golden file + filename := strings.Replace(test.name, " ", "_", -1) + ".json" + path := filepath.Join("testdata", "goldenfiles", "marshaling", filename) + if !*update { + // Retrieve the expected result from file + expected, _ := ioutil.ReadFile(path) + assert.NoError(err, test.name) + assert.JSONEq(string(expected), string(payload)) + } else { + dst := &bytes.Buffer{} + err = json.Indent(dst, payload, "", "\t") + assert.NoError(err) + // TODO Figure out whether 0644 is okay or not. + err = ioutil.WriteFile(path, dst.Bytes(), 0644) + assert.NoError(err) + } + }) + } +} + +func TestMarshalInvalidDocuments(t *testing.T) { + // TODO Describe how this test suite works + + // Setup + typ, _ := BuildType(mocktype{}) + typ.NewFunc = func() Resource { + return Wrap(&mocktype{}) + } + col := &Resources{} + col.Add(Wrap(&mocktype{ + ID: "id1", + Str: "str", + Int: 10, + Int8: 18, + Int16: 116, + Int32: 132, + Int64: 164, + Uint: 100, + Uint8: 108, + Uint16: 1016, + Uint32: 1032, + Uint64: 1064, + Bool: true, + Time: getTime(), + To1: "id2", + To1From1: "id3", + To1FromX: "id3", + ToX: []string{"id2", "id3"}, + ToXFrom1: []string{"id4"}, + ToXFromX: []string{"id3", "id4"}, + })) + col.Add(Wrap(&mocktype{ + ID: "id2", + Str: "漢語", + Int: -42, + Time: time.Time{}, + })) + col.Add(Wrap(&mocktype{ID: "id3"})) + + // Test struct + tests := []struct { + name string + doc *Document + fields []string + err string + }{ + { + name: "invalid data", + doc: &Document{ + Data: "just a string", + }, + err: "data contains an unknown type", + }, + } + + for i := range tests { + i := i + test := tests[i] + t.Run(test.name, func(t *testing.T) { + assert := assert.New(t) + + // URL + url := &URL{ + Fragments: []string{"fake", "path"}, + Params: &Params{ + Fields: map[string][]string{"mocktype": test.fields}, + }, + } + if _, ok := test.doc.Data.(Collection); ok { + url.IsCol = true + } + + // Marshaling + _, err := MarshalDocument(test.doc, url) + assert.EqualError(err, test.err) + }) + } +} + +func TestUnmarshalDocument(t *testing.T) { + // Setup + typ, _ := BuildType(mocktype{}) + typ.NewFunc = func() Resource { + return Wrap(&mocktype{}) + } + schema := &Schema{Types: []Type{typ}} + col := Resources{} + col.Add(Wrap(&mocktype{ + ID: "id1", + Str: "str", + Int: 10, + Int8: 18, + Int16: 116, + Int32: 132, + Int64: 164, + Uint: 100, + Uint8: 108, + Uint16: 1016, + Uint32: 1032, + Uint64: 1064, + Bool: true, + Time: getTime(), + Bytes: []byte{1, 2, 3}, + To1: "id2", + To1From1: "id3", + To1FromX: "id3", + ToX: []string{"id2", "id3"}, + ToXFrom1: []string{"id4"}, + ToXFromX: []string{"id3", "id4"}, + })) + col.Add(Wrap(&mocktype{ID: "id2"})) + col.Add(Wrap(&mocktype{ID: "id3"})) + + // Tests + t.Run("resource with inclusions", func(t *testing.T) { + assert := assert.New(t) + + url, _ := NewURLFromRaw(schema, "/mocktype/id1") + + doc := &Document{ + Data: col.At(0), + RelData: map[string][]string{ + "mocktype": typ.Fields(), + }, + Included: []Resource{ + col.At(1), + col.At(2), + }, + } + + payload, err := MarshalDocument(doc, url) + assert.NoError(err) + + doc2, err := UnmarshalDocument(payload, schema) + assert.NoError(err) + assert.True(Equal(doc.Data.(Resource), doc2.Data.(Resource))) + // TODO Make all the necessary assertions. + }) + + t.Run("collection with inclusions", func(t *testing.T) { + assert := assert.New(t) + + url, _ := NewURLFromRaw(schema, "/mocktype/id1") + + doc := &Document{ + Data: &col, + RelData: map[string][]string{ + "mocktype": typ.Fields(), + }, + } + + payload, err := MarshalDocument(doc, url) + assert.NoError(err) + + doc2, err := UnmarshalDocument(payload, schema) + assert.NoError(err) + assert.IsType(&col, doc.Data) + assert.IsType(&col, doc2.Data) + if col, ok := doc.Data.(Collection); ok { + if col2, ok := doc2.Data.(Collection); ok { + assert.Equal(col.Len(), col2.Len()) + for j := 0; j < col.Len(); j++ { + assert.True(Equal(col.At(j), col2.At(j))) + } + } + } + // TODO Make all the necessary assertions. + }) + + t.Run("errors (Unmarshal)", func(t *testing.T) { + assert := assert.New(t) + + url, _ := NewURLFromRaw(schema, "/mocktype/id1/relationships/to-x") + + doc := &Document{ + Errors: func() []Error { + err := NewErrBadRequest("Bad Request", "This request is bad.") + err.ID = "00000000-0000-0000-0000-000000000000" + return []Error{err} + }(), + } + + payload, err := MarshalDocument(doc, url) + assert.NoError(err) + + doc2, err := UnmarshalDocument(payload, schema) + assert.NoError(err) + assert.Equal(doc.Data, doc2.Data) + }) + + t.Run("invalid payloads (Unmarshal)", func(t *testing.T) { + assert := assert.New(t) + + tests := []struct { + payload string + expected string + }{ + { + payload: `invalid payload`, + expected: "invalid character 'i' looking for beginning of value", + }, { + payload: `{"data":"invaliddata"}`, + expected: "400 Bad Request: Missing data top-level member in payload.", + }, { + payload: `{"data":{"id":true}}`, + expected: "400 Bad Request: The provided JSON body could not be read.", + }, { + payload: `{"data":[{"id":true}]}`, + expected: "400 Bad Request: The provided JSON body could not be read.", + }, { + payload: `{"jsonapi":{"key":"data/errors missing"}}`, + expected: "400 Bad Request: Missing data top-level member in payload.", + }, { + payload: `{"data":null,"included":[{"id":true}]}`, + expected: "json: " + + "cannot unmarshal bool into Go struct field Identifier.id of type string", + }, { + payload: `{"data":null,"included":[{"attributes":true}]}`, + expected: "400 Bad Request: The provided JSON body could not be read.", + }, { + payload: `{"data":{"id":"1","type":"mocktype","attributes":{"nonexistent":1}}}`, + expected: "400 Bad Request: \"nonexistent\" is not a known field.", + }, { + payload: `{"data":{"id":"1","type":"mocktype","attributes":{"int8":"abc"}}}`, + expected: "400 Bad Request: The field value is invalid for the expected type.", + }, { + payload: `{ + "data": { + "id": "1", + "type": "mocktype", + "relationships": { + "to-x": { + "data": "wrong" + } + } + } + }`, + expected: "400 Bad Request: The field value is invalid for the expected type.", + }, { + payload: `{ + "data": { + "id": "1", + "type": "mocktype", + "relationships": { + "wrong": { + "data": "wrong" + } + } + } + }`, + expected: "400 Bad Request: \"wrong\" is not a known field.", + }, + } + + for _, test := range tests { + doc, err := UnmarshalDocument([]byte(test.payload), schema) + assert.EqualError(err, test.expected) + assert.Nil(doc) + } + }) +} + func newResource(typ *Type, id string) Resource { res := &SoftResource{} res.SetType(typ) diff --git a/identifiers.go b/identifiers.go index 28f9bcf..4572cab 100644 --- a/identifiers.go +++ b/identifiers.go @@ -1,5 +1,7 @@ package jsonapi +import "encoding/json" + // NewIdentifiers returns an Identifiers object. // // t is the type of the identifiers. ids is the set of IDs. @@ -35,3 +37,25 @@ type Identifier struct { ID string `json:"id"` Type string `json:"type"` } + +// UnmarshalIdentifier reads a payload where the main data is one identifier to +// build and return an Identifier object. +// +// schema must not be nil. +func UnmarshalIdentifier(payload []byte, schema *Schema) (Identifier, error) { + iden := Identifier{} + err := json.Unmarshal(payload, &iden) + // TODO Validate with schema. + return iden, err +} + +// UnmarshalIdentifiers reads a payload where the main data is a collection of +// identifiers to build and return an Idenfitiers slice. +// +// schema must not be nil. +func UnmarshalIdentifiers(payload []byte, schema *Schema) (Identifiers, error) { + idens := Identifiers{} + err := json.Unmarshal(payload, &idens) + // TODO Validate with schema. + return idens, err +} diff --git a/identifiers_test.go b/identifiers_test.go index ceb7d3b..bfa8bee 100644 --- a/identifiers_test.go +++ b/identifiers_test.go @@ -1,6 +1,7 @@ package jsonapi_test import ( + "encoding/json" "testing" . "github.com/mfcochauxlaberge/jsonapi" @@ -22,3 +23,50 @@ func TestIdentifiers(t *testing.T) { assert.Equal(Identifier{ID: "id3", Type: "type1"}, idens[2]) assert.Equal([]string{"id1", "id2", "id3"}, idens.IDs()) } + +func TestUnmarshalIdentifiers(t *testing.T) { + // Setup + typ, _ := BuildType(mocktype{}) + typ.NewFunc = func() Resource { + return Wrap(&mocktype{}) + } + schema := &Schema{Types: []Type{typ}} + + t.Run("identifier", func(t *testing.T) { + assert := assert.New(t) + + iden := Identifier{ + ID: "id2", + Type: "mocktype", + } + + payload, err := json.Marshal(iden) + assert.NoError(err) + + iden2, err := UnmarshalIdentifier(payload, schema) + assert.NoError(err) + assert.Equal(iden, iden2) + }) + + t.Run("identifers", func(t *testing.T) { + assert := assert.New(t) + + idens := Identifiers{ + Identifier{ + ID: "id2", + Type: "mocktype", + }, + Identifier{ + ID: "id3", + Type: "mocktype", + }, + } + + payload, err := json.Marshal(idens) + assert.NoError(err) + + idens2, err := UnmarshalIdentifiers(payload, schema) + assert.NoError(err) + assert.Equal(idens, idens2) + }) +} diff --git a/jsonapi.go b/jsonapi.go deleted file mode 100644 index 4a9086d..0000000 --- a/jsonapi.go +++ /dev/null @@ -1,408 +0,0 @@ -package jsonapi - -import ( - "encoding/json" - "errors" - "sort" -) - -// Marshal marshals a document according to the JSON:API speficication. -// -// Both doc and url must not be nil. -func Marshal(doc *Document, url *URL) ([]byte, error) { - var err error - - // Data - var data json.RawMessage - if res, ok := doc.Data.(Resource); ok { - // Resource - data = marshalResource( - res, - doc.PrePath, - url.Params.Fields[res.GetType().Name], - doc.RelData, - ) - } else if col, ok := doc.Data.(Collection); ok { - // Collection - data = marshalCollection( - col, - doc.PrePath, - url.Params.Fields, - doc.RelData, - ) - } else if id, ok := doc.Data.(Identifier); ok { - // Identifier - data, err = json.Marshal(id) - } else if ids, ok := doc.Data.(Identifiers); ok { - // Identifiers - data, err = json.Marshal(ids) - } else if doc.Data != nil { - err = errors.New("data contains an unknown type") - } else if len(doc.Errors) == 0 { - data = []byte("null") - } - - // Data - var errors json.RawMessage - if len(doc.Errors) > 0 { - // Errors - errors, err = json.Marshal(doc.Errors) - } - - if err != nil { - return []byte{}, err - } - - // Included - var inclusions []*json.RawMessage - if len(doc.Included) > 0 { - sort.Slice(doc.Included, func(i, j int) bool { - return doc.Included[i].GetID() < doc.Included[j].GetID() - }) - - if len(data) > 0 { - for key := range doc.Included { - typ := doc.Included[key].GetType().Name - raw := marshalResource( - doc.Included[key], - doc.PrePath, - url.Params.Fields[typ], - doc.RelData, - ) - rawm := json.RawMessage(raw) - inclusions = append(inclusions, &rawm) - } - } - } - - // Marshaling - plMap := map[string]interface{}{} - - if len(errors) > 0 { - plMap["errors"] = errors - } else if len(data) > 0 { - plMap["data"] = data - - if len(inclusions) > 0 { - plMap["included"] = inclusions - } - } - - if len(doc.Meta) > 0 { - plMap["meta"] = doc.Meta - } - - if url != nil { - plMap["links"] = map[string]string{ - "self": doc.PrePath + url.String(), - } - } - plMap["jsonapi"] = map[string]string{"version": "1.0"} - - return json.Marshal(plMap) -} - -// Unmarshal reads a payload to build and return a Document object. -// -// schema must not be nil. -func Unmarshal(payload []byte, schema *Schema) (*Document, error) { - doc := NewDocument() - ske := &payloadSkeleton{} - - // Unmarshal - err := json.Unmarshal(payload, ske) - if err != nil { - return nil, err - } - - // Data - if len(ske.Data) > 0 { - if ske.Data[0] == '{' { - // Resource - res, err := unmarshalResource(ske.Data, schema) - if err != nil { - return nil, err - } - doc.Data = res - } else if ske.Data[0] == '[' { - col, err := unmarshalCollection(ske.Data, schema) - if err != nil { - return nil, err - } - doc.Data = col - } else if string(ske.Data) == "null" { - doc.Data = nil - } else { - // TODO Not exactly the right error - return nil, NewErrMissingDataMember() - } - } else if len(ske.Errors) > 0 { - doc.Errors = ske.Errors - } else { - return nil, NewErrMissingDataMember() - } - - // Included - if len(ske.Included) > 0 { - inc := Identifier{} - incs := []Identifier{} - for _, rawInc := range ske.Included { - err = json.Unmarshal(rawInc, &inc) - if err != nil { - return nil, err - } - incs = append(incs, inc) - } - - for i := range incs { - res, err := unmarshalResource(ske.Included[i], schema) - if err != nil { - return nil, err - } - doc.Included = append(doc.Included, res) - } - } - - // Meta - doc.Meta = ske.Meta - - return doc, nil -} - -// UnmarshalIdentifiers reads a payload where the main data is one or more -// identifiers to build and return a Document object. -// -// The included top-level member is ignored. -// -// schema must not be nil. -func UnmarshalIdentifiers(payload []byte, schema *Schema) (*Document, error) { - doc := NewDocument() - ske := &payloadSkeleton{} - - // Unmarshal - err := json.Unmarshal(payload, ske) - if err != nil { - return nil, err - } - - // Identifiers - if len(ske.Data) > 0 { - if ske.Data[0] == '{' { - inc := Identifier{} - err = json.Unmarshal(ske.Data, &inc) - if err != nil { - return nil, err - } - doc.Data = inc - } else if ske.Data[0] == '[' { - incs := Identifiers{} - err = json.Unmarshal(ske.Data, &incs) - if err != nil { - return nil, err - } - doc.Data = incs - } - } else if len(ske.Errors) > 0 { - doc.Errors = ske.Errors - } else { - return nil, NewErrMissingDataMember() - } - - // Meta - doc.Meta = ske.Meta - - return doc, nil -} - -// marshalResource marshals a Resource into a JSON-encoded payload. -func marshalResource(r Resource, prepath string, fields []string, relData map[string][]string) []byte { - mapPl := map[string]interface{}{} - - mapPl["id"] = r.GetID() - mapPl["type"] = r.GetType().Name - - // Attributes - attrs := map[string]interface{}{} - for _, attr := range r.Attrs() { - for _, field := range fields { - if field == attr.Name { - attrs[attr.Name] = r.Get(attr.Name) - break - } - } - } - mapPl["attributes"] = attrs - - // Relationships - rels := map[string]*json.RawMessage{} - for _, rel := range r.Rels() { - include := false - for _, field := range fields { - if field == rel.FromName { - include = true - break - } - } - - if include { - var raw json.RawMessage - - if rel.ToOne { - s := map[string]map[string]string{ - "links": buildRelationshipLinks(r, prepath, rel.FromName), - } - - for _, n := range relData[r.GetType().Name] { - if n == rel.FromName { - id := r.GetToOne(rel.FromName) - if id != "" { - s["data"] = map[string]string{ - "id": r.GetToOne(rel.FromName), - "type": rel.ToType, - } - } else { - s["data"] = nil - } - break - } - } - - raw, _ = json.Marshal(s) - rels[rel.FromName] = &raw - } else { - s := map[string]interface{}{ - "links": buildRelationshipLinks(r, prepath, rel.FromName), - } - - for _, n := range relData[r.GetType().Name] { - if n == rel.FromName { - data := []map[string]string{} - ids := r.GetToMany(rel.FromName) - sort.Strings(ids) - for _, id := range ids { - data = append(data, map[string]string{ - "id": id, - "type": rel.ToType, - }) - } - s["data"] = data - break - } - } - - raw, _ = json.Marshal(s) - rels[rel.FromName] = &raw - } - } - } - mapPl["relationships"] = rels - - // Links - mapPl["links"] = map[string]string{ - "self": buildSelfLink(r, prepath), // TODO - } - - // NOTE An error should not happen. - pl, _ := json.Marshal(mapPl) - return pl -} - -// marshalCollection marshals a Collection into a JSON-encoded payload. -func marshalCollection(c Collection, prepath string, fields map[string][]string, relData map[string][]string) []byte { - var raws []*json.RawMessage - - if c.Len() == 0 { - return []byte("[]") - } - - for i := 0; i < c.Len(); i++ { - r := c.At(i) - raw := json.RawMessage( - marshalResource(r, prepath, fields[r.GetType().Name], relData), - ) - raws = append(raws, &raw) - } - - // NOTE An error should not happen. - pl, _ := json.Marshal(raws) - return pl -} - -// unmarshalResource unmarshals a JSON-encoded payload into a Resource. -func unmarshalResource(data []byte, schema *Schema) (Resource, error) { - var rske resourceSkeleton - err := json.Unmarshal(data, &rske) - if err != nil { - return nil, NewErrBadRequest( - "Invalid JSON", - "The provided JSON body could not be read.", - ) - } - - typ := schema.GetType(rske.Type) - res := typ.New() - - res.SetID(rske.ID) - - for a, v := range rske.Attributes { - if attr, ok := typ.Attrs[a]; ok { - val, err := attr.UnmarshalToType(v) - if err != nil { - return nil, err - } - res.Set(attr.Name, val) - } else { - return nil, NewErrUnknownFieldInBody(typ.Name, a) - } - } - for r, v := range rske.Relationships { - if rel, ok := typ.Rels[r]; ok { - if len(v.Data) > 0 { - if rel.ToOne { - var iden identifierSkeleton - err = json.Unmarshal(v.Data, &iden) - res.SetToOne(rel.FromName, iden.ID) - } else { - var idens []identifierSkeleton - err = json.Unmarshal(v.Data, &idens) - ids := make([]string, len(idens)) - for i := range idens { - ids[i] = idens[i].ID - } - res.SetToMany(rel.FromName, ids) - } - } - if err != nil { - return nil, NewErrInvalidFieldValueInBody( - rel.FromName, - string(v.Data), - typ.Name, - ) - } - } else { - return nil, NewErrUnknownFieldInBody(typ.Name, r) - } - } - - return res, nil -} - -// unmarshalCollection unmarshals a JSON-encoded payload into a Collection. -func unmarshalCollection(data []byte, schema *Schema) (Collection, error) { - var cske []json.RawMessage - err := json.Unmarshal(data, &cske) - if err != nil { - return nil, err - } - - col := &Resources{} - for i := range cske { - res, err := unmarshalResource(cske[i], schema) - if err != nil { - return nil, err - } - col.Add(res) - } - - return col, nil -} diff --git a/jsonapi_test.go b/jsonapi_test.go index a1bb43e..64f412e 100644 --- a/jsonapi_test.go +++ b/jsonapi_test.go @@ -1,585 +1,12 @@ package jsonapi_test import ( - "bytes" - "encoding/json" "flag" - "io/ioutil" - "path/filepath" - "strings" - "testing" "time" - - . "github.com/mfcochauxlaberge/jsonapi" - - "github.com/stretchr/testify/assert" ) var update = flag.Bool("update-golden-files", false, "update the golden files") -func TestMarshaling(t *testing.T) { - // TODO Describe how this test suite works - - // Setup - typ, _ := BuildType(mocktype{}) - typ.NewFunc = func() Resource { - return Wrap(&mocktype{}) - } - col := &Resources{} - col.Add(Wrap(&mocktype{ - ID: "id1", - Str: "str", - Int: 10, - Int8: 18, - Int16: 116, - Int32: 132, - Int64: 164, - Uint: 100, - Uint8: 108, - Uint16: 1016, - Uint32: 1032, - Uint64: 1064, - Bool: true, - Time: getTime(), - Bytes: []byte{1, 2, 3}, - To1: "id2", - To1From1: "id3", - To1FromX: "id3", - ToX: []string{"id2", "id3"}, - ToXFrom1: []string{"id4"}, - ToXFromX: []string{"id3", "id4"}, - })) - col.Add(Wrap(&mocktype{ - ID: "id2", - Str: "漢語", - Int: -42, - Time: time.Time{}, - Bytes: []byte{}, - })) - col.Add(Wrap(&mocktype{ID: "id3"})) - - // Test struct - tests := []struct { - name string - doc *Document - fields []string - }{ - { - name: "empty data", - doc: &Document{ - PrePath: "https://example.org/", - }, - }, { - name: "empty collection", - doc: &Document{ - Data: &Resources{}, - }, - }, { - name: "resource", - doc: &Document{ - Data: col.At(0), - RelData: map[string][]string{ - "mocktype": {"to-1", "to-x-from-1"}, - }, - }, - fields: []string{ - "str", "uint64", "bool", "int", "time", "bytes", "to-1", - "to-x-from-1", - }, - }, { - name: "collection", - doc: &Document{ - Data: Range(col, nil, nil, []string{}, 10, 0), - RelData: map[string][]string{ - "mocktype": {"to-1", "to-x-from-1"}, - }, - PrePath: "https://example.org/", - }, - fields: []string{ - "str", "uint64", "bool", "int", "time", "to-1", "to-x-from-1", - }, - }, { - name: "meta", - doc: &Document{ - Data: nil, - Meta: map[string]interface{}{ - "f1": "漢語", - "f2": 42, - "f3": true, - }, - }, - }, { - name: "collection with inclusions", - doc: &Document{ - Data: Wrap(&mocktype{ - ID: "id1", - }), - RelData: map[string][]string{ - "mocktype": {"to-1", "to-x-from-1"}, - }, - Included: []Resource{ - Wrap(&mocktype{ - ID: "id2", - }), - Wrap(&mocktype{ - ID: "id3", - }), - Wrap(&mocktype{ - ID: "id4", - }), - }, - }, - }, { - name: "identifier", - doc: &Document{ - Data: Identifier{ - ID: "id1", - Type: "mocktype", - }, - }, - }, { - name: "identifiers", - doc: &Document{ - Data: Identifiers{ - { - ID: "id1", - Type: "mocktype", - }, { - ID: "id2", - Type: "mocktype", - }, { - ID: "id3", - Type: "mocktype", - }, - }, - }, - }, { - name: "error", - doc: &Document{ - Errors: func() []Error { - err := NewErrBadRequest("Bad Request", "This request is bad.") - err.ID = "00000000-0000-0000-0000-000000000000" - return []Error{err} - }(), - }, - }, { - name: "errors", - doc: &Document{ - Errors: func() []Error { - err1 := NewErrBadRequest("Bad Request", "This request is bad.") - err1.ID = "00000000-0000-0000-0000-000000000000" - err2 := NewErrBadRequest("Bad Request", "This request is really bad.") - err2.ID = "00000000-0000-0000-0000-000000000000" - return []Error{err1, err2} - }(), - }, - }, - } - - for i := range tests { - i := i - test := tests[i] - t.Run(test.name, func(t *testing.T) { - assert := assert.New(t) - - // URL - url := &URL{ - Fragments: []string{"fake", "path"}, - Params: &Params{ - Fields: map[string][]string{"mocktype": test.fields}, - }, - } - if _, ok := test.doc.Data.(Collection); ok { - url.IsCol = true - } - - // Marshaling - payload, err := Marshal(test.doc, url) - assert.NoError(err) - - // Golden file - filename := strings.Replace(test.name, " ", "_", -1) + ".json" - path := filepath.Join("testdata", "goldenfiles", "marshaling", filename) - if !*update { - // Retrieve the expected result from file - expected, _ := ioutil.ReadFile(path) - assert.NoError(err, test.name) - assert.JSONEq(string(expected), string(payload)) - } else { - dst := &bytes.Buffer{} - err = json.Indent(dst, payload, "", "\t") - assert.NoError(err) - // TODO Figure out whether 0644 is okay or not. - err = ioutil.WriteFile(path, dst.Bytes(), 0644) - assert.NoError(err) - } - }) - } -} - -func TestMarshalingInvalidDocuments(t *testing.T) { - // TODO Describe how this test suite works - - // Setup - typ, _ := BuildType(mocktype{}) - typ.NewFunc = func() Resource { - return Wrap(&mocktype{}) - } - col := &Resources{} - col.Add(Wrap(&mocktype{ - ID: "id1", - Str: "str", - Int: 10, - Int8: 18, - Int16: 116, - Int32: 132, - Int64: 164, - Uint: 100, - Uint8: 108, - Uint16: 1016, - Uint32: 1032, - Uint64: 1064, - Bool: true, - Time: getTime(), - To1: "id2", - To1From1: "id3", - To1FromX: "id3", - ToX: []string{"id2", "id3"}, - ToXFrom1: []string{"id4"}, - ToXFromX: []string{"id3", "id4"}, - })) - col.Add(Wrap(&mocktype{ - ID: "id2", - Str: "漢語", - Int: -42, - Time: time.Time{}, - })) - col.Add(Wrap(&mocktype{ID: "id3"})) - - // Test struct - tests := []struct { - name string - doc *Document - fields []string - err string - }{ - { - name: "invalid data", - doc: &Document{ - Data: "just a string", - }, - err: "data contains an unknown type", - }, - } - - for i := range tests { - i := i - test := tests[i] - t.Run(test.name, func(t *testing.T) { - assert := assert.New(t) - - // URL - url := &URL{ - Fragments: []string{"fake", "path"}, - Params: &Params{ - Fields: map[string][]string{"mocktype": test.fields}, - }, - } - if _, ok := test.doc.Data.(Collection); ok { - url.IsCol = true - } - - // Marshaling - _, err := Marshal(test.doc, url) - assert.EqualError(err, test.err) - }) - } -} - -func TestUnmarshaling(t *testing.T) { - // Setup - typ, _ := BuildType(mocktype{}) - typ.NewFunc = func() Resource { - return Wrap(&mocktype{}) - } - schema := &Schema{Types: []Type{typ}} - col := Resources{} - col.Add(Wrap(&mocktype{ - ID: "id1", - Str: "str", - Int: 10, - Int8: 18, - Int16: 116, - Int32: 132, - Int64: 164, - Uint: 100, - Uint8: 108, - Uint16: 1016, - Uint32: 1032, - Uint64: 1064, - Bool: true, - Time: getTime(), - Bytes: []byte{1, 2, 3}, - To1: "id2", - To1From1: "id3", - To1FromX: "id3", - ToX: []string{"id2", "id3"}, - ToXFrom1: []string{"id4"}, - ToXFromX: []string{"id3", "id4"}, - })) - col.Add(Wrap(&mocktype{ID: "id2"})) - col.Add(Wrap(&mocktype{ID: "id3"})) - - // Tests - t.Run("resource with inclusions", func(t *testing.T) { - assert := assert.New(t) - - url, _ := NewURLFromRaw(schema, "/mocktype/id1") - - doc := &Document{ - Data: col.At(0), - RelData: map[string][]string{ - "mocktype": typ.Fields(), - }, - Included: []Resource{ - col.At(1), - col.At(2), - }, - } - - payload, err := Marshal(doc, url) - assert.NoError(err) - - doc2, err := Unmarshal(payload, schema) - assert.NoError(err) - assert.True(Equal(doc.Data.(Resource), doc2.Data.(Resource))) - // TODO Make all the necessary assertions. - }) - - t.Run("collection with inclusions", func(t *testing.T) { - assert := assert.New(t) - - url, _ := NewURLFromRaw(schema, "/mocktype/id1") - - doc := &Document{ - Data: &col, - RelData: map[string][]string{ - "mocktype": typ.Fields(), - }, - } - - payload, err := Marshal(doc, url) - assert.NoError(err) - - doc2, err := Unmarshal(payload, schema) - assert.NoError(err) - assert.IsType(&col, doc.Data) - assert.IsType(&col, doc2.Data) - if col, ok := doc.Data.(Collection); ok { - if col2, ok := doc2.Data.(Collection); ok { - assert.Equal(col.Len(), col2.Len()) - for j := 0; j < col.Len(); j++ { - assert.True(Equal(col.At(j), col2.At(j))) - } - } - } - // TODO Make all the necessary assertions. - }) - - t.Run("identifier", func(t *testing.T) { - assert := assert.New(t) - - url, _ := NewURLFromRaw(schema, "/mocktype/id1/relationships/to-1") - - doc := &Document{ - Data: Identifier{ - ID: "id2", - Type: "mocktype", - }, - } - - payload, err := Marshal(doc, url) - assert.NoError(err) - - doc2, err := UnmarshalIdentifiers(payload, schema) - assert.NoError(err) - assert.Equal(doc.Data, doc2.Data) - }) - - t.Run("identifers", func(t *testing.T) { - assert := assert.New(t) - - url, _ := NewURLFromRaw(schema, "/mocktype/id1/relationships/to-x") - - doc := &Document{ - Data: Identifiers{ - Identifier{ - ID: "id2", - Type: "mocktype", - }, - Identifier{ - ID: "id3", - Type: "mocktype", - }, - }, - } - - payload, err := Marshal(doc, url) - assert.NoError(err) - - doc2, err := UnmarshalIdentifiers(payload, schema) - assert.NoError(err) - assert.Equal(doc.Data, doc2.Data) - }) - - t.Run("errors (Unmarshal)", func(t *testing.T) { - assert := assert.New(t) - - url, _ := NewURLFromRaw(schema, "/mocktype/id1/relationships/to-x") - - doc := &Document{ - Errors: func() []Error { - err := NewErrBadRequest("Bad Request", "This request is bad.") - err.ID = "00000000-0000-0000-0000-000000000000" - return []Error{err} - }(), - } - - payload, err := Marshal(doc, url) - assert.NoError(err) - - doc2, err := Unmarshal(payload, schema) - assert.NoError(err) - assert.Equal(doc.Data, doc2.Data) - }) - - t.Run("errors (UnmarshalIdentifers)", func(t *testing.T) { - assert := assert.New(t) - - url, _ := NewURLFromRaw(schema, "/mocktype/id1/relationships/to-x") - - doc := &Document{ - Errors: func() []Error { - err := NewErrBadRequest("Bad Request", "This request is bad.") - err.ID = "00000000-0000-0000-0000-000000000000" - return []Error{err} - }(), - } - - payload, err := Marshal(doc, url) - assert.NoError(err) - - doc2, err := UnmarshalIdentifiers(payload, schema) - assert.NoError(err) - assert.Equal(doc.Data, doc2.Data) - }) - - t.Run("invalid payloads (Unmarshal)", func(t *testing.T) { - assert := assert.New(t) - - tests := []struct { - payload string - expected string - }{ - { - payload: `invalid payload`, - expected: "invalid character 'i' looking for beginning of value", - }, { - payload: `{"data":"invaliddata"}`, - expected: "400 Bad Request: Missing data top-level member in payload.", - }, { - payload: `{"data":{"id":true}}`, - expected: "400 Bad Request: The provided JSON body could not be read.", - }, { - payload: `{"data":[{"id":true}]}`, - expected: "400 Bad Request: The provided JSON body could not be read.", - }, { - payload: `{"jsonapi":{"key":"data/errors missing"}}`, - expected: "400 Bad Request: Missing data top-level member in payload.", - }, { - payload: `{"data":null,"included":[{"id":true}]}`, - expected: "json: " + - "cannot unmarshal bool into Go struct field Identifier.id of type string", - }, { - payload: `{"data":null,"included":[{"attributes":true}]}`, - expected: "400 Bad Request: The provided JSON body could not be read.", - }, { - payload: `{"data":{"id":"1","type":"mocktype","attributes":{"nonexistent":1}}}`, - expected: "400 Bad Request: \"nonexistent\" is not a known field.", - }, { - payload: `{"data":{"id":"1","type":"mocktype","attributes":{"int8":"abc"}}}`, - expected: "400 Bad Request: The field value is invalid for the expected type.", - }, { - payload: `{ - "data": { - "id": "1", - "type": "mocktype", - "relationships": { - "to-x": { - "data": "wrong" - } - } - } - }`, - expected: "400 Bad Request: The field value is invalid for the expected type.", - }, { - payload: `{ - "data": { - "id": "1", - "type": "mocktype", - "relationships": { - "wrong": { - "data": "wrong" - } - } - } - }`, - expected: "400 Bad Request: \"wrong\" is not a known field.", - }, - } - - for _, test := range tests { - doc, err := Unmarshal([]byte(test.payload), schema) - assert.EqualError(err, test.expected) - assert.Nil(doc) - } - }) - - t.Run("invalid payloads (UnmarshalIdentifiers)", func(t *testing.T) { - assert := assert.New(t) - - tests := []struct { - payload string - expected string - }{ - { - payload: `{invalid json}`, - expected: "invalid character 'i' looking for beginning of object key string", - }, { - payload: `{"jsonapi":{}}`, - expected: "400 Bad Request: Missing data top-level member in payload.", - }, { - payload: `{"jsonapi":{"key":"data/errors missing"}}`, - expected: "400 Bad Request: Missing data top-level member in payload.", - }, { - payload: `{"data":{"id":["invalid"]}}`, - expected: "json: " + - "cannot unmarshal array into Go struct field Identifier.id of type string", - }, { - payload: `{"data":[{"id":["invalid"]}]}`, - expected: "json: " + - "cannot unmarshal array into Go struct field Identifier.id of type string", - }, - } - - for _, test := range tests { - doc, err := UnmarshalIdentifiers([]byte(test.payload), nil) - assert.EqualError(err, test.expected) - assert.Nil(doc) - } - }) -} - func getTime() time.Time { now, _ := time.Parse(time.RFC3339Nano, "2013-06-24T22:03:34.8276Z") return now diff --git a/request.go b/request.go index 03f7dde..44b2161 100644 --- a/request.go +++ b/request.go @@ -20,9 +20,10 @@ func NewRequest(r *http.Request, schema *Schema) (*Request, error) { return nil, err } - doc := &Document{} - if len(body) > 0 { - doc, err = Unmarshal(body, schema) + var doc *Document + + if r.Method == http.MethodPost || r.Method == http.MethodPatch { + doc, err = UnmarshalDocument(body, schema) if err != nil { return nil, err } diff --git a/request_test.go b/request_test.go index 4a68079..635f1a9 100644 --- a/request_test.go +++ b/request_test.go @@ -61,7 +61,7 @@ func TestNewRequestInvalidBody(t *testing.T) { schema := newMockSchema() // Nil body - req := httptest.NewRequest("GET", "/mocktypes1", badReader{}) + req := httptest.NewRequest("POST", "/mocktypes1", badReader{}) doc, err := NewRequest(req, schema) assert.EqualError(err, "bad reader") @@ -69,7 +69,7 @@ func TestNewRequestInvalidBody(t *testing.T) { // Invalid body body := bytes.NewBufferString("{invalidjson}") - req = httptest.NewRequest("GET", "/mocktypes1", body) + req = httptest.NewRequest("POST", "/mocktypes1", body) doc, err = NewRequest(req, schema) assert.EqualError( diff --git a/resource.go b/resource.go index 2fcda46..9c85152 100644 --- a/resource.go +++ b/resource.go @@ -1,6 +1,7 @@ package jsonapi import ( + "encoding/json" "fmt" "reflect" "sort" @@ -32,6 +33,158 @@ type Resource interface { SetToMany(key string, rels []string) } +// MarshalResource marshals a Resource into a JSON-encoded payload. +func MarshalResource(r Resource, prepath string, fields []string, relData map[string][]string) []byte { + mapPl := map[string]interface{}{} + + mapPl["id"] = r.GetID() + mapPl["type"] = r.GetType().Name + + // Attributes + attrs := map[string]interface{}{} + for _, attr := range r.Attrs() { + for _, field := range fields { + if field == attr.Name { + attrs[attr.Name] = r.Get(attr.Name) + break + } + } + } + mapPl["attributes"] = attrs + + // Relationships + rels := map[string]*json.RawMessage{} + for _, rel := range r.Rels() { + include := false + for _, field := range fields { + if field == rel.FromName { + include = true + break + } + } + + if include { + var raw json.RawMessage + + if rel.ToOne { + s := map[string]map[string]string{ + "links": buildRelationshipLinks(r, prepath, rel.FromName), + } + + for _, n := range relData[r.GetType().Name] { + if n == rel.FromName { + id := r.GetToOne(rel.FromName) + if id != "" { + s["data"] = map[string]string{ + "id": r.GetToOne(rel.FromName), + "type": rel.ToType, + } + } else { + s["data"] = nil + } + break + } + } + + raw, _ = json.Marshal(s) + rels[rel.FromName] = &raw + } else { + s := map[string]interface{}{ + "links": buildRelationshipLinks(r, prepath, rel.FromName), + } + + for _, n := range relData[r.GetType().Name] { + if n == rel.FromName { + data := []map[string]string{} + ids := r.GetToMany(rel.FromName) + sort.Strings(ids) + for _, id := range ids { + data = append(data, map[string]string{ + "id": id, + "type": rel.ToType, + }) + } + s["data"] = data + break + } + } + + raw, _ = json.Marshal(s) + rels[rel.FromName] = &raw + } + } + } + mapPl["relationships"] = rels + + // Links + mapPl["links"] = map[string]string{ + "self": buildSelfLink(r, prepath), // TODO + } + + // NOTE An error should not happen. + pl, _ := json.Marshal(mapPl) + return pl +} + +// UnmarshalResource unmarshals a JSON-encoded payload into a Resource. +func UnmarshalResource(data []byte, schema *Schema) (Resource, error) { + var rske resourceSkeleton + err := json.Unmarshal(data, &rske) + if err != nil { + return nil, NewErrBadRequest( + "Invalid JSON", + "The provided JSON body could not be read.", + ) + } + + typ := schema.GetType(rske.Type) + res := typ.New() + + res.SetID(rske.ID) + + for a, v := range rske.Attributes { + if attr, ok := typ.Attrs[a]; ok { + val, err := attr.UnmarshalToType(v) + if err != nil { + return nil, err + } + res.Set(attr.Name, val) + } else { + return nil, NewErrUnknownFieldInBody(typ.Name, a) + } + } + for r, v := range rske.Relationships { + if rel, ok := typ.Rels[r]; ok { + if len(v.Data) > 0 { + if rel.ToOne { + var iden identifierSkeleton + err = json.Unmarshal(v.Data, &iden) + res.SetToOne(rel.FromName, iden.ID) + } else { + var idens []identifierSkeleton + err = json.Unmarshal(v.Data, &idens) + ids := make([]string, len(idens)) + for i := range idens { + ids[i] = idens[i].ID + } + res.SetToMany(rel.FromName, ids) + } + } + if err != nil { + return nil, NewErrInvalidFieldValueInBody( + rel.FromName, + string(v.Data), + typ.Name, + ) + } + } else { + return nil, NewErrUnknownFieldInBody(typ.Name, r) + } + } + + return res, nil +} + // Equal reports whether r1 and r2 are equal. // // Two resources are equal if their types are equal, all the attributes are From 5bca8f2decfe4fb60aae0022b3782b7655c04146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 10 Nov 2019 16:21:55 -0500 Subject: [PATCH 264/406] Rename functions in Quick start section --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4d08006..24eee0c 100644 --- a/README.md +++ b/README.md @@ -43,11 +43,11 @@ The supported versions of Go are the latest patch releases of every minor releas ## Quick start -The simplest way to start using jsonapi is to use the Marshal and Unmarshal functions. +The simplest way to start using jsonapi is to use the MarshalDocument and UnmarshalDocument functions. ```go -func Marshal(doc *Document, url *URL) ([]byte, error) -func Unmarshal(payload []byte, schema *Schema) (*Document, error) +func MarshalDocument(doc *Document, url *URL) ([]byte, error) +func UnmarshalDocument(payload []byte, schema *Schema) (*Document, error) ``` A struct has to follow certain rules in order to be understood by the library, but interfaces are also provided which let the library avoid the reflect package and be more efficient. From d10276aa2bef7259df857cc62761542b70e1f3cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 10 Nov 2019 17:22:22 -0500 Subject: [PATCH 265/406] Add UnmarshalPartialResource --- resource.go | 76 ++++++++++++++++++++++++ resource_test.go | 146 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 222 insertions(+) diff --git a/resource.go b/resource.go index 9c85152..37117f1 100644 --- a/resource.go +++ b/resource.go @@ -185,6 +185,82 @@ func UnmarshalResource(data []byte, schema *Schema) (Resource, error) { return res, nil } +// UnmarshalPartialResource unmarshals the given payload into a *SoftResource. +// +// The returned *SoftResource will only contain the information found in the +// payload. That means that fields not in the payload won't be part of the +// *SoftResource. Its type will be a new type whose fields will be a subset of +// the fields of the corresponding type from the schema. +// +// This is useful when handling a PATCH request where only some fields might be +// set to a value. UnmarshalResource returns a Resource where the missing fields +// are added and set to their zero value, but UnmarshalPartialResource does not +// do that. Therefore, the user is able to tell which fields have been set. +func UnmarshalPartialResource(data []byte, schema *Schema) (*SoftResource, error) { + var rske resourceSkeleton + err := json.Unmarshal(data, &rske) + if err != nil { + return nil, NewErrBadRequest( + "Invalid JSON", + "The provided JSON body could not be read.", + ) + } + + typ := schema.GetType(rske.Type) + newType := Type{ + Name: typ.Name, + } + res := &SoftResource{ + Type: &newType, + id: rske.ID, + } + + for a, v := range rske.Attributes { + if attr, ok := typ.Attrs[a]; ok { + val, err := attr.UnmarshalToType(v) + if err != nil { + return nil, err + } + _ = newType.AddAttr(attr) + res.Set(attr.Name, val) + } else { + return nil, NewErrUnknownFieldInBody(typ.Name, a) + } + } + for r, v := range rske.Relationships { + if rel, ok := typ.Rels[r]; ok { + if len(v.Data) > 0 { + if rel.ToOne { + var iden identifierSkeleton + err = json.Unmarshal(v.Data, &iden) + _ = newType.AddRel(rel) + res.SetToOne(rel.FromName, iden.ID) + } else { + var idens []identifierSkeleton + err = json.Unmarshal(v.Data, &idens) + ids := make([]string, len(idens)) + for i := range idens { + ids[i] = idens[i].ID + } + _ = newType.AddRel(rel) + res.SetToMany(rel.FromName, ids) + } + } + if err != nil { + return nil, NewErrInvalidFieldValueInBody( + rel.FromName, + string(v.Data), + typ.Name, + ) + } + } else { + return nil, NewErrUnknownFieldInBody(typ.Name, r) + } + } + + return res, nil +} + // Equal reports whether r1 and r2 are equal. // // Two resources are equal if their types are equal, all the attributes are diff --git a/resource_test.go b/resource_test.go index 2db0c87..10f8444 100644 --- a/resource_test.go +++ b/resource_test.go @@ -9,6 +9,152 @@ import ( "github.com/stretchr/testify/assert" ) +func TestUnmarshalPartialResource(t *testing.T) { + // Setup + typ, _ := BuildType(mocktype{}) + typ.NewFunc = func() Resource { + return Wrap(&mocktype{}) + } + schema := &Schema{Types: []Type{typ}} + + // Tests + t.Run("partial resource", func(t *testing.T) { + assert := assert.New(t) + + payload := `{ + "id": "abc123", + "type": "mocktype", + "attributes": { + "str": "abc" + }, + "relationships": { + "to-1": { + "data": { + "type": "mocktype", + "data": "def" + } + }, + "to-x": { + "data": [ + { + "type": "mocktype", + "data": "ghi" + }, + { + "type": "mocktype", + "data": "jkl" + } + ] + } + } + }` + + res, err := UnmarshalPartialResource([]byte(payload), schema) + assert.NoError(err) + + assert.Equal("abc123", res.GetID()) + assert.Equal("mocktype", res.GetType().Name) + assert.Len(res.Attrs(), 1) + assert.Len(res.Rels(), 2) + }) + + t.Run("partial resource (invalid attribute)", func(t *testing.T) { + assert := assert.New(t) + + payload := `{ + "id": "abc123", + "type": "mocktype", + "attributes": { + "int": "not an int" + } + }` + + _, err := UnmarshalPartialResource([]byte(payload), schema) + assert.EqualError( + err, + "400 Bad Request: The field value is invalid for the expected type.", + ) + }) + + t.Run("partial resource (unknown attribute)", func(t *testing.T) { + assert := assert.New(t) + + payload := `{ + "id": "abc123", + "type": "mocktype", + "attributes": { + "unknown": "abc" + } + }` + + _, err := UnmarshalPartialResource([]byte(payload), schema) + assert.EqualError( + err, + `400 Bad Request: "unknown" is not a known field.`, + ) + }) + + t.Run("partial resource (invalid relationship)", func(t *testing.T) { + assert := assert.New(t) + + payload := `{ + "id": "abc123", + "type": "mocktype", + "relationships": { + "to-1": { + "data": [ + { + "type": "mocktype", + "data": "def" + } + ] + } + } + }` + + _, err := UnmarshalPartialResource([]byte(payload), schema) + assert.EqualError( + err, + "400 Bad Request: The field value is invalid for the expected type.", + ) + }) + + t.Run("partial resource (unknown relationship)", func(t *testing.T) { + assert := assert.New(t) + + payload := `{ + "id": "abc123", + "type": "mocktype", + "relationships": { + "unknown": { + "data": { + "type": "mocktype", + "data": "def" + } + } + } + }` + + _, err := UnmarshalPartialResource([]byte(payload), schema) + assert.EqualError( + err, + `400 Bad Request: "unknown" is not a known field.`, + ) + }) + + t.Run("partial resource (invalid)", func(t *testing.T) { + assert := assert.New(t) + + payload := `{invalid}` + + _, err := UnmarshalPartialResource([]byte(payload), schema) + assert.EqualError( + err, + "400 Bad Request: The provided JSON body could not be read.", + ) + }) +} + func TestEqual(t *testing.T) { assert := assert.New(t) From a45b372a96de5ce1a897b42886d8cdd05a96f7ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 10 Nov 2019 17:26:40 -0500 Subject: [PATCH 266/406] Remove identifierSkeleton struct --- resource.go | 8 ++++---- skeletons.go | 5 ----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/resource.go b/resource.go index 37117f1..6b7213d 100644 --- a/resource.go +++ b/resource.go @@ -157,11 +157,11 @@ func UnmarshalResource(data []byte, schema *Schema) (Resource, error) { if rel, ok := typ.Rels[r]; ok { if len(v.Data) > 0 { if rel.ToOne { - var iden identifierSkeleton + var iden Identifier err = json.Unmarshal(v.Data, &iden) res.SetToOne(rel.FromName, iden.ID) } else { - var idens []identifierSkeleton + var idens Identifiers err = json.Unmarshal(v.Data, &idens) ids := make([]string, len(idens)) for i := range idens { @@ -231,12 +231,12 @@ func UnmarshalPartialResource(data []byte, schema *Schema) (*SoftResource, error if rel, ok := typ.Rels[r]; ok { if len(v.Data) > 0 { if rel.ToOne { - var iden identifierSkeleton + var iden Identifier err = json.Unmarshal(v.Data, &iden) _ = newType.AddRel(rel) res.SetToOne(rel.FromName, iden.ID) } else { - var idens []identifierSkeleton + var idens Identifiers err = json.Unmarshal(v.Data, &idens) ids := make([]string, len(idens)) for i := range idens { diff --git a/skeletons.go b/skeletons.go index 39e932e..53f4ea4 100644 --- a/skeletons.go +++ b/skeletons.go @@ -21,8 +21,3 @@ type relationshipSkeleton struct { Links map[string]json.RawMessage `json:"links"` Meta map[string]json.RawMessage `json:"meta"` } - -type identifierSkeleton struct { - ID string `json:"id"` - Type string `json:"type"` -} From 783a765f315b5614d0d4dd031b28614b0e636a2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 10 Nov 2019 17:28:17 -0500 Subject: [PATCH 267/406] Remove mention that the documentation is incomplete --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 24eee0c..d4ef03e 100644 --- a/README.md +++ b/README.md @@ -150,6 +150,6 @@ It is also possible to build a `URL` from a `Schema` and a `SimpleURL` which con ## Documentation -Check out the [incomplete documentation](https://godoc.org/github.com/mfcochauxlaberge/jsonapi). +Check out the [documentation](https://godoc.org/github.com/mfcochauxlaberge/jsonapi). The best way to learn how to use it is to look at the source code and its comments. From de3bd74ff12f8da7416b8b9a8b73a870c29583f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 14 Nov 2019 20:51:20 -0500 Subject: [PATCH 268/406] Improve readability of "if else" condition --- wrapper.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/wrapper.go b/wrapper.go index e096e87..7e219da 100644 --- a/wrapper.go +++ b/wrapper.go @@ -35,10 +35,8 @@ func Wrap(v interface{}) *Wrapper { panic(errors.New("jsonapi: value has to be a pointer to a struct")) } val = reflect.New(val.Type()) - } else { - if val.Elem().Kind() != reflect.Struct { - panic(errors.New("jsonapi: value has to be a pointer to a struct")) - } + } else if val.Elem().Kind() != reflect.Struct { + panic(errors.New("jsonapi: value has to be a pointer to a struct")) } val = val.Elem() From acf6b50fffec0c22d7fff4e999e177dbe0776e13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 14 Nov 2019 22:44:54 -0500 Subject: [PATCH 269/406] Remove extra blank line --- soft_collection.go | 1 - 1 file changed, 1 deletion(-) diff --git a/soft_collection.go b/soft_collection.go index 68cf4b4..a553e3b 100644 --- a/soft_collection.go +++ b/soft_collection.go @@ -26,7 +26,6 @@ func (s *SoftCollection) AddAttr(attr Attr) error { // AddRel adds a relationship to all of the resources in the collection. func (s *SoftCollection) AddRel(rel Rel) error { return s.Type.AddRel(rel) - } // Len returns the length of the collection. From 1920b0e214629b11a394de8a68f8abddb5523151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Fri, 15 Nov 2019 06:57:07 -0500 Subject: [PATCH 270/406] Apply gofmt -s on two incorrect files --- range_test.go | 4 ++-- url.go | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/range_test.go b/range_test.go index 9fda63c..8a01359 100644 --- a/range_test.go +++ b/range_test.go @@ -363,7 +363,7 @@ func TestSortResources(t *testing.T) { Type: &Type{ Name: "type", Attrs: map[string]Attr{ - "samename": Attr{ + "samename": { Name: "samename", Type: AttrTypeString, Nullable: false, @@ -375,7 +375,7 @@ func TestSortResources(t *testing.T) { Type: &Type{ Name: "type", Attrs: map[string]Attr{ - "samename": Attr{ + "samename": { Name: "samename", Type: AttrTypeString, Nullable: true, diff --git a/url.go b/url.go index 448a66f..1d23595 100644 --- a/url.go +++ b/url.go @@ -56,9 +56,9 @@ func NewURL(schema *Schema, su SimpleURL) (*URL, error) { url.IsCol = !url.Rel.ToOne url.ResType = url.Rel.ToType url.BelongsToFilter = BelongsToFilter{ - Type: url.Fragments[0], - ID: url.Fragments[1], - Name: url.Rel.FromName, + Type: url.Fragments[0], + ID: url.Fragments[1], + Name: url.Rel.FromName, ToName: url.Rel.ToName, } @@ -214,8 +214,8 @@ func (u *URL) UnescapedString() string { // For example, in /articles/abc123/comments, the parent is the article with the // ID abc123. type BelongsToFilter struct { - Type string - ID string - Name string + Type string + ID string + Name string ToName string } From d615ff5e06fb55a68ae0ddfd9e41a392c4a80469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Fri, 15 Nov 2019 18:51:36 -0500 Subject: [PATCH 271/406] Remove commented out code --- wrapper_collection.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/wrapper_collection.go b/wrapper_collection.go index e016146..dffba9f 100644 --- a/wrapper_collection.go +++ b/wrapper_collection.go @@ -3,12 +3,6 @@ package jsonapi // WrapCollection returns a *WrapperCollection which implements the Collection // interface and holds resources of the type defined in r. func WrapCollection(r Resource) *WrapperCollection { - // if r2, ok := v.(Resource); ok { - // r = r2 - // } else { - // r := Wrap(v) - // } - return &WrapperCollection{ typ: r.GetType(), col: []*Wrapper{}, From 153352ca94198ad5116debfc3d3a630f710b14ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Fri, 15 Nov 2019 18:59:40 -0500 Subject: [PATCH 272/406] Add WSL linter to CI pipeline --- .golangci.yml | 1 + collection.go | 5 ++++ document.go | 6 ++++ document_test.go | 3 +- filter_query.go | 36 +++++++++++++++++++++++ filter_query_test.go | 3 ++ helpers.go | 6 ++++ link.go | 5 ++++ params.go | 20 +++++++++++++ range.go | 67 +++++++++++++++++++++++++++++++++++++++++++ range_test.go | 15 ++++++++++ request_test.go | 1 + resource.go | 28 ++++++++++++++++++ resource_test.go | 4 +++ schema.go | 2 ++ schema_test.go | 4 +++ simple_url.go | 1 + soft_collection.go | 3 ++ soft_resource.go | 29 +++++++++++++++++++ soft_resource_test.go | 6 ++++ type.go | 47 ++++++++++++++++++++++++++++++ type_test.go | 5 ++-- url.go | 12 ++++++++ url_test.go | 2 ++ util_test.go | 7 +++-- wrapper.go | 7 +++++ wrapper_test.go | 15 ++++++++-- 27 files changed, 332 insertions(+), 8 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 934e3d5..b837fcd 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -22,6 +22,7 @@ linters: - unparam - unused - varcheck + - wsl linters-settings: lll: diff --git a/collection.go b/collection.go index d1ea0da..e466c92 100644 --- a/collection.go +++ b/collection.go @@ -36,23 +36,27 @@ func MarshalCollection(c Collection, prepath string, fields map[string][]string, // NOTE An error should not happen. pl, _ := json.Marshal(raws) + return pl } // UnmarshalCollection unmarshals a JSON-encoded payload into a Collection. func UnmarshalCollection(data []byte, schema *Schema) (Collection, error) { var cske []json.RawMessage + err := json.Unmarshal(data, &cske) if err != nil { return nil, err } col := &Resources{} + for i := range cske { res, err := UnmarshalResource(cske[i], schema) if err != nil { return nil, err } + col.Add(res) } @@ -79,6 +83,7 @@ func (r *Resources) At(i int) Resource { if i >= 0 && i < r.Len() { return (*r)[i] } + return nil } diff --git a/document.go b/document.go index e60ccac..352a95d 100644 --- a/document.go +++ b/document.go @@ -122,6 +122,7 @@ func MarshalDocument(doc *Document, url *URL) ([]byte, error) { // Included var inclusions []*json.RawMessage + if len(doc.Included) > 0 { sort.Slice(doc.Included, func(i, j int) bool { return doc.Included[i].GetID() < doc.Included[j].GetID() @@ -164,6 +165,7 @@ func MarshalDocument(doc *Document, url *URL) ([]byte, error) { "self": doc.PrePath + url.String(), } } + plMap["jsonapi"] = map[string]string{"version": "1.0"} return json.Marshal(plMap) @@ -196,6 +198,7 @@ func UnmarshalDocument(payload []byte, schema *Schema) (*Document, error) { if err != nil { return nil, err } + doc.Data = res } else if ske.Data[0] == '[' { col, err := UnmarshalCollection(ske.Data, schema) @@ -219,11 +222,13 @@ func UnmarshalDocument(payload []byte, schema *Schema) (*Document, error) { if len(ske.Included) > 0 { inc := Identifier{} incs := []Identifier{} + for _, rawInc := range ske.Included { err = json.Unmarshal(rawInc, &inc) if err != nil { return nil, err } + incs = append(incs, inc) } @@ -232,6 +237,7 @@ func UnmarshalDocument(payload []byte, schema *Schema) (*Document, error) { if err != nil { return nil, err } + doc.Included = append(doc.Included, res) } } diff --git a/document_test.go b/document_test.go index 3f7a472..1728697 100644 --- a/document_test.go +++ b/document_test.go @@ -92,7 +92,6 @@ func TestInclude(t *testing.T) { func TestMarshalDocument(t *testing.T) { // TODO Describe how this test suite works - // Setup typ, _ := BuildType(mocktype{}) typ.NewFunc = func() Resource { @@ -292,7 +291,6 @@ func TestMarshalDocument(t *testing.T) { func TestMarshalInvalidDocuments(t *testing.T) { // TODO Describe how this test suite works - // Setup typ, _ := BuildType(mocktype{}) typ.NewFunc = func() Resource { @@ -556,5 +554,6 @@ func newResource(typ *Type, id string) Resource { res := &SoftResource{} res.SetType(typ) res.SetID(id) + return res } diff --git a/filter_query.go b/filter_query.go index 30d9134..8aaab5c 100644 --- a/filter_query.go +++ b/filter_query.go @@ -28,19 +28,24 @@ func (f *Filter) MarshalJSON() ([]byte, error) { if f.Field != "" { payload["f"] = f.Field } + if f.Op != "" { payload["o"] = f.Op } + payload["v"] = f.Val + if f.Col != "" { payload["c"] = f.Col } + return json.Marshal(payload) } // UnmarshalJSON parses the provided data and populates a Filter. func (f *Filter) UnmarshalJSON(data []byte) error { tmpFilter := filter{} + err := json.Unmarshal(data, &tmpFilter) if err != nil { return err @@ -54,10 +59,12 @@ func (f *Filter) UnmarshalJSON(data []byte) error { f.Field = "" filters := []*Filter{} + err := json.Unmarshal(tmpFilter.Val, &filters) if err != nil { return err } + f.Val = filters } else { err := json.Unmarshal(tmpFilter.Val, &f.Val) @@ -75,9 +82,11 @@ func (f *Filter) IsAllowed(res Resource) bool { val interface{} // typ string ) + if _, ok := res.Attrs()[f.Field]; ok { val = res.Get(f.Field) } + if rel, ok := res.Rels()[f.Field]; ok { if rel.ToOne { val = res.GetToOne(f.Field) @@ -94,6 +103,7 @@ func (f *Filter) IsAllowed(res Resource) bool { return false } } + return true case "or": filters := f.Val.([]*Filter) @@ -102,6 +112,7 @@ func (f *Filter) IsAllowed(res Resource) bool { return true } } + return false case "in": return checkIn(val.(string), f.Val.([]string)) @@ -152,6 +163,7 @@ func checkVal(op string, rval, cval interface{}) bool { return false } } + return checkStr(op, *rval.(*string), *cval.(*string)) case *int: if rval.(*int) == nil || cval.(*int) == nil { @@ -163,6 +175,7 @@ func checkVal(op string, rval, cval interface{}) bool { return false } } + return checkInt(op, int64(*rval.(*int)), int64(*cval.(*int))) case *int8: if rval.(*int8) == nil || cval.(*int8) == nil { @@ -174,6 +187,7 @@ func checkVal(op string, rval, cval interface{}) bool { return false } } + return checkInt(op, int64(*rval.(*int8)), int64(*cval.(*int8))) case *int16: if rval.(*int16) == nil || cval.(*int16) == nil { @@ -185,6 +199,7 @@ func checkVal(op string, rval, cval interface{}) bool { return false } } + return checkInt(op, int64(*rval.(*int16)), int64(*cval.(*int16))) case *int32: if rval.(*int32) == nil || cval.(*int32) == nil { @@ -196,6 +211,7 @@ func checkVal(op string, rval, cval interface{}) bool { return false } } + return checkInt(op, int64(*rval.(*int32)), int64(*cval.(*int32))) case *int64: if rval.(*int64) == nil || cval.(*int64) == nil { @@ -207,6 +223,7 @@ func checkVal(op string, rval, cval interface{}) bool { return false } } + return checkInt(op, *rval.(*int64), *cval.(*int64)) case *uint: if rval.(*uint) == nil || cval.(*uint) == nil { @@ -218,6 +235,7 @@ func checkVal(op string, rval, cval interface{}) bool { return false } } + return checkUint(op, uint64(*rval.(*uint)), uint64(*cval.(*uint))) case *uint8: if rval.(*uint8) == nil || cval.(*uint8) == nil { @@ -229,6 +247,7 @@ func checkVal(op string, rval, cval interface{}) bool { return false } } + return checkUint(op, uint64(*rval.(*uint8)), uint64(*cval.(*uint8))) case *uint16: if rval.(*uint16) == nil || cval.(*uint16) == nil { @@ -240,6 +259,7 @@ func checkVal(op string, rval, cval interface{}) bool { return false } } + return checkUint(op, uint64(*rval.(*uint16)), uint64(*cval.(*uint16))) case *uint32: if rval.(*uint32) == nil || cval.(*uint32) == nil { @@ -251,6 +271,7 @@ func checkVal(op string, rval, cval interface{}) bool { return false } } + return checkUint(op, uint64(*rval.(*uint32)), uint64(*cval.(*uint32))) case *uint64: if rval.(*uint64) == nil || cval.(*uint64) == nil { @@ -262,6 +283,7 @@ func checkVal(op string, rval, cval interface{}) bool { return false } } + return checkUint(op, *rval.(*uint64), *cval.(*uint64)) case *bool: if rval.(*bool) == nil || cval.(*bool) == nil { @@ -271,6 +293,7 @@ func checkVal(op string, rval, cval interface{}) bool { return rval.(*bool) != cval.(*bool) } } + return checkBool(op, *rval.(*bool), *cval.(*bool)) case *time.Time: if rval.(*time.Time) == nil || cval.(*time.Time) == nil { @@ -282,6 +305,7 @@ func checkVal(op string, rval, cval interface{}) bool { return false } } + return checkTime(op, *rval.(*time.Time), *cval.(*time.Time)) case *[]byte: if rval.(*[]byte) == nil || cval.(*[]byte) == nil { @@ -293,6 +317,7 @@ func checkVal(op string, rval, cval interface{}) bool { return false } } + return checkBytes(op, *rval.(*[]byte), *cval.(*[]byte)) case []string: return checkSlice(op, rval.([]string), cval.([]string)) @@ -396,6 +421,7 @@ func checkBytes(op string, rval, cval []byte) bool { return false } } + return len(rval) == len(cval) case "!=": for i := 0; i < len(rval) && i < len(cval); i++ { @@ -403,6 +429,7 @@ func checkBytes(op string, rval, cval []byte) bool { return true } } + return len(rval) != len(cval) case "<": for i := 0; i < len(rval) && i < len(cval); i++ { @@ -410,6 +437,7 @@ func checkBytes(op string, rval, cval []byte) bool { return true } } + return len(rval) < len(cval) case "<=": for i := 0; i < len(rval) && i < len(cval); i++ { @@ -417,6 +445,7 @@ func checkBytes(op string, rval, cval []byte) bool { return false } } + return len(rval) <= len(cval) case ">": for i := 0; i < len(rval) && i < len(cval); i++ { @@ -424,6 +453,7 @@ func checkBytes(op string, rval, cval []byte) bool { return true } } + return len(rval) > len(cval) case ">=": for i := 0; i < len(rval) && i < len(cval); i++ { @@ -431,6 +461,7 @@ func checkBytes(op string, rval, cval []byte) bool { return false } } + return len(rval) >= len(cval) default: return false @@ -439,10 +470,13 @@ func checkBytes(op string, rval, cval []byte) bool { func checkSlice(op string, rval, cval []string) bool { equal := false + if len(rval) == len(cval) { sort.Strings(rval) sort.Strings(cval) + equal = true + for i := 0; i < len(rval); i++ { if rval[i] != cval[i] { equal = false @@ -450,6 +484,7 @@ func checkSlice(op string, rval, cval []string) bool { } } } + switch op { case "=": return equal @@ -466,5 +501,6 @@ func checkIn(id string, ids []string) bool { return true } } + return false } diff --git a/filter_query_test.go b/filter_query_test.go index f0edaa9..f81f863 100644 --- a/filter_query_test.go +++ b/filter_query_test.go @@ -841,6 +841,7 @@ func TestFilterResource(t *testing.T) { for _, test := range relTests { typ := &Type{Name: "type"} toOne := true + if _, ok := test.rval.([]string); ok { toOne = false } @@ -855,6 +856,7 @@ func TestFilterResource(t *testing.T) { res := &SoftResource{} res.SetType(typ) + if toOne { res.SetToOne("rel", test.rval.(string)) } else { @@ -913,6 +915,7 @@ func TestFilterResource(t *testing.T) { typ := &Type{Name: "type"} res := &SoftResource{} res.SetType(typ) + filters := []*Filter{} for j := range test.rvals { diff --git a/helpers.go b/helpers.go index 5b67e53..6ca50ec 100644 --- a/helpers.go +++ b/helpers.go @@ -28,6 +28,7 @@ func Check(v interface{}) error { idField reflect.StructField ok bool ) + if idField, ok = value.Type().FieldByName("ID"); !ok { return errors.New("jsonapi: struct doesn't have an ID field") } @@ -110,6 +111,7 @@ func BuildType(v interface{}) (Type, error) { if val.Kind() == reflect.Ptr { val = val.Elem() } + if val.Kind() != reflect.Struct { return typ, errors.New("jsonapi: value must represent a struct") } @@ -124,6 +126,7 @@ func BuildType(v interface{}) (Type, error) { // Attributes typ.Attrs = map[string]Attr{} + for i := 0; i < val.NumField(); i++ { fs := val.Type().Field(i) jsonTag := fs.Tag.Get("json") @@ -141,11 +144,13 @@ func BuildType(v interface{}) (Type, error) { // Relationships typ.Rels = map[string]Rel{} + for i := 0; i < val.NumField(); i++ { fs := val.Type().Field(i) jsonTag := fs.Tag.Get("json") relTag := strings.Split(fs.Tag.Get("api"), ",") invName := "" + if len(relTag) == 3 { invName = relTag[2] } @@ -182,6 +187,7 @@ func MustBuildType(v interface{}) Type { if err != nil { panic(err) } + return typ } diff --git a/link.go b/link.go index 26fd0d8..464d3bf 100644 --- a/link.go +++ b/link.go @@ -14,15 +14,20 @@ type Link struct { func (l Link) MarshalJSON() ([]byte, error) { if len(l.Meta) > 0 { var err error + m := map[string]json.RawMessage{} + m["href"], err = json.Marshal(l.HRef) if err != nil { return []byte{}, err } + m["meta"], err = json.Marshal(l.Meta) + if err != nil { return []byte{}, err } + return json.Marshal(m) } diff --git a/params.go b/params.go index fc6ce0c..d3b92c9 100644 --- a/params.go +++ b/params.go @@ -40,6 +40,7 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { words := strings.Split(incs[i], ".") incRel := Rel{ToType: resType} + for _, word := range words { if typ := schema.GetType(incRel.ToType); typ.Name != "" { var ok bool @@ -55,12 +56,14 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { // Build params.Include params.Include = make([][]Rel, len(incs)) + for i := range incs { words := strings.Split(incs[i], ".") params.Include[i] = make([]Rel, len(words)) var incRel Rel + for w := range words { if w == 0 { typ := schema.GetType(resType) @@ -87,8 +90,10 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { return nil, NewErrUnknownTypeInURL(t) } } + if typ := schema.GetType(t); typ.Name != "" { params.Fields[t] = []string{} + for _, f := range fields { if f == "id" { params.Fields[t] = append(params.Fields[t], "id") @@ -113,6 +118,7 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { } } } + for t := range params.Fields { if len(params.Fields[t]) == 0 { typ := schema.GetType(t) @@ -172,20 +178,26 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { rel := typ.Rels[relName] isCol = !rel.ToOne } + if isCol { typ := schema.GetType(resType) sortingRules := make([]string, 0, len(typ.Attrs)) idFound := false + for _, rule := range su.SortingRules { urule := rule if urule[0] == '-' { urule = urule[1:] } + if urule == "id" { idFound = true + sortingRules = append(sortingRules, rule) + break } + for _, attr := range typ.Attrs { if urule == attr.Name { sortingRules = append(sortingRules, rule) @@ -193,29 +205,37 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { } } } + // Add 1 because of id restOfRules := make([]string, 0, len(typ.Attrs)+1-len(sortingRules)) + for _, attr := range typ.Attrs { found := false + for _, rule := range sortingRules { urule := rule if urule[0] == '-' { urule = urule[1:] } + if urule == attr.Name { found = true break } } + if !found { restOfRules = append(restOfRules, attr.Name) } } + sort.Strings(restOfRules) sortingRules = append(sortingRules, restOfRules...) + if !idFound { sortingRules = append(sortingRules, "id") } + params.SortingRules = sortingRules } diff --git a/range.go b/range.go index f6546c8..61e65e3 100644 --- a/range.go +++ b/range.go @@ -51,7 +51,9 @@ func Range(c Collection, ids []string, filter *Filter, sort []string, size uint, // Pagination var page Resources + skip := int(num * size) + if skip >= len(col.col) { col = sortedResources{} } else { @@ -76,6 +78,7 @@ func (s sortedResources) Sort(rules []string) { if len(s.rules) == 0 { s.rules = []string{"id"} } + sort.Sort(s) } @@ -93,6 +96,7 @@ func (s sortedResources) Swap(i, j int) { func (s sortedResources) Less(i, j int) bool { for _, r := range s.rules { inverse := false + if strings.HasPrefix(r, "-") { r = r[1:] inverse = true @@ -115,71 +119,83 @@ func (s sortedResources) Less(i, j int) bool { if v == v2 { continue } + return v < v2 != inverse case int: v2 := v2.(int) if v == v2 { continue } + return v < v2 != inverse case int8: v2 := v2.(int8) if v == v2 { continue } + return v < v2 != inverse case int16: v2 := v2.(int16) if v == v2 { continue } + return v < v2 != inverse case int32: v2 := v2.(int32) if v == v2 { continue } + return v < v2 != inverse case int64: v2 := v2.(int64) if v == v2 { continue } + return v < v2 != inverse case uint: v2 := v2.(uint) if v == v2 { continue } + return v < v2 != inverse case uint8: v2 := v2.(uint8) if v == v2 { continue } + return v < v2 != inverse case uint16: v2 := v2.(uint16) if v == v2 { continue } + return v < v2 != inverse case uint32: v2 := v2.(uint32) if v == v2 { continue } + return v < v2 != inverse case bool: v2 := v2.(bool) if v == v2 { continue } + return !v != inverse case time.Time: if v.Equal(v2.(time.Time)) { continue } + return v.Before(v2.(time.Time)) != inverse case []byte: s2 := v2.([]byte) @@ -187,191 +203,242 @@ func (s sortedResources) Less(i, j int) bool { if v[i] == s2[i] { continue } + return v[i] < s2[i] != inverse } + if len(v) == len(s2) { continue } + return len(v) < len(s2) != inverse case *string: v2 := v2.(*string) if v == v2 { continue } + if v == nil { return !inverse } + if v2 == nil { return inverse } + if *v == *v2 { continue } + return *v < *v2 != inverse case *int: v2 := v2.(*int) if v == v2 { continue } + if v == nil { return !inverse } + if v2 == nil { return inverse } + if *v == *v2 { continue } + return *v < *v2 != inverse case *int8: v2 := v2.(*int8) if v == v2 { continue } + if v == nil { return !inverse } + if v2 == nil { return inverse } + if *v == *v2 { continue } + return *v < *v2 != inverse case *int16: v2 := v2.(*int16) if v == v2 { continue } + if v == nil { return !inverse } + if v2 == nil { return inverse } + if *v == *v2 { continue } + return *v < *v2 != inverse case *int32: v2 := v2.(*int32) if v == v2 { continue } + if v == nil { return !inverse } + if v2 == nil { return inverse } + if *v == *v2 { continue } + return *v < *v2 != inverse case *int64: v2 := v2.(*int64) if v == v2 { continue } + if v == nil { return !inverse } + if v2 == nil { return inverse } + if *v == *v2 { continue } + return *v < *v2 != inverse case *uint: v2 := v2.(*uint) if v == v2 { continue } + if v == nil { return !inverse } + if v2 == nil { return inverse } + if *v == *v2 { continue } + return *v < *v2 != inverse case *uint8: v2 := v2.(*uint8) if v == v2 { continue } + if v == nil { return !inverse } + if v2 == nil { return inverse } + if *v == *v2 { continue } + return *v < *v2 != inverse case *uint16: v2 := v2.(*uint16) if v == v2 { continue } + if v == nil { return !inverse } + if v2 == nil { return inverse } + if *v == *v2 { continue } + return *v < *v2 != inverse case *uint32: v2 := v2.(*uint32) if v == v2 { continue } + if v == nil { return !inverse } + if v2 == nil { return inverse } + if *v == *v2 { continue } + return *v < *v2 != inverse case *bool: v2 := v2.(*bool) if v == v2 { continue } + if v == nil { return !inverse } + if v2 == nil { return inverse } + if *v == *v2 { continue } + return !*v != inverse case *time.Time: v2 := v2.(*time.Time) if v == v2 { continue } + if v == nil { return !inverse } + if v2 == nil { return inverse } + if v.Equal(*v2) { continue } + return v.Before(*v2) != inverse } } diff --git a/range_test.go b/range_test.go index 8a01359..7367d4f 100644 --- a/range_test.go +++ b/range_test.go @@ -88,9 +88,11 @@ func TestRange(t *testing.T) { sr := &SoftResource{} sr.SetType(typ) sr.SetID(res.id) + for field, val := range res.fields { sr.Set(field, val) } + col.Add(sr) } @@ -113,10 +115,12 @@ func TestRange(t *testing.T) { expectedIDs := []string{ "res1", "res2", "res3", "res4", "res5", "res6", "res7", "res8", } + ids := []string{} for i := 0; i < ranged.Len(); i++ { ids = append(ids, ranged.At(i).GetID()) } + assert.Equal(expectedIDs, ids, "range of IDs (1)") // Range test 2 @@ -137,6 +141,7 @@ func TestRange(t *testing.T) { expectedIDs = []string{"res5", "res2"} ids = []string{} + for i := 0; i < ranged.Len(); i++ { ids = append(ids, ranged.At(i).GetID()) } @@ -257,6 +262,7 @@ func TestSortResources(t *testing.T) { // Add attributes to type typ := &Type{Name: "type"} + for i, t := range attrs { ti, null := GetAttrType(fmt.Sprintf("%T", t.vals[0])) _ = typ.AddAttr(Attr{ @@ -272,6 +278,7 @@ func TestSortResources(t *testing.T) { Type: typ, } sr.SetID("id" + strconv.Itoa(i)) + for j := range attrs { if i != j { sr.Set("attr"+strconv.Itoa(j), attrs[j].vals[0]) @@ -279,19 +286,24 @@ func TestSortResources(t *testing.T) { sr.Set("attr"+strconv.Itoa(j), attrs[j].vals[1]) } } + col.Add(sr) } // Sort collection rules := []string{} + for i := 0; i < col.Len(); i++ { reverse := "" if i%3 == 0 { reverse = "-" } + rules = append(rules, reverse+"attr"+strconv.Itoa(i)) } + rules = append(rules, "id") + page := Range( col, nil, @@ -344,6 +356,7 @@ func TestSortResources(t *testing.T) { sr1 := &SoftResource{} sr1.SetID("sr1") col1 := &Resources{Wrap(mocktype{}), sr1} + assert.Panics(func() { _ = Range(col1, nil, nil, []string{"field", "id"}, 100, 0) }) @@ -353,6 +366,7 @@ func TestSortResources(t *testing.T) { Wrap(mocktype{}), Wrap(mocktype{}), } + assert.Panics(func() { _ = Range(col1, nil, nil, []string{"unknown", "id"}, 100, 0) }) @@ -384,6 +398,7 @@ func TestSortResources(t *testing.T) { }, }, } + assert.Panics(func() { _ = Range(col1, nil, nil, []string{"samename", "id"}, 100, 0) }) diff --git a/request_test.go b/request_test.go index 635f1a9..961e1d9 100644 --- a/request_test.go +++ b/request_test.go @@ -44,6 +44,7 @@ func TestNewRequest(t *testing.T) { req := httptest.NewRequest(test.method, test.url, body) doc, err := NewRequest(req, test.schema) + if test.expectedError == "" { assert.NoError(err) assert.Equal(test.method, doc.Method, test.name) diff --git a/resource.go b/resource.go index 6b7213d..5f12545 100644 --- a/resource.go +++ b/resource.go @@ -42,6 +42,7 @@ func MarshalResource(r Resource, prepath string, fields []string, relData map[st // Attributes attrs := map[string]interface{}{} + for _, attr := range r.Attrs() { for _, field := range fields { if field == attr.Name { @@ -50,12 +51,15 @@ func MarshalResource(r Resource, prepath string, fields []string, relData map[st } } } + mapPl["attributes"] = attrs // Relationships rels := map[string]*json.RawMessage{} + for _, rel := range r.Rels() { include := false + for _, field := range fields { if field == rel.FromName { include = true @@ -82,6 +86,7 @@ func MarshalResource(r Resource, prepath string, fields []string, relData map[st } else { s["data"] = nil } + break } } @@ -114,6 +119,7 @@ func MarshalResource(r Resource, prepath string, fields []string, relData map[st } } } + mapPl["relationships"] = rels // Links @@ -123,6 +129,7 @@ func MarshalResource(r Resource, prepath string, fields []string, relData map[st // NOTE An error should not happen. pl, _ := json.Marshal(mapPl) + return pl } @@ -130,6 +137,7 @@ func MarshalResource(r Resource, prepath string, fields []string, relData map[st func UnmarshalResource(data []byte, schema *Schema) (Resource, error) { var rske resourceSkeleton err := json.Unmarshal(data, &rske) + if err != nil { return nil, NewErrBadRequest( "Invalid JSON", @@ -148,11 +156,13 @@ func UnmarshalResource(data []byte, schema *Schema) (Resource, error) { if err != nil { return nil, err } + res.Set(attr.Name, val) } else { return nil, NewErrUnknownFieldInBody(typ.Name, a) } } + for r, v := range rske.Relationships { if rel, ok := typ.Rels[r]; ok { if len(v.Data) > 0 { @@ -170,6 +180,7 @@ func UnmarshalResource(data []byte, schema *Schema) (Resource, error) { res.SetToMany(rel.FromName, ids) } } + if err != nil { return nil, NewErrInvalidFieldValueInBody( rel.FromName, @@ -199,6 +210,7 @@ func UnmarshalResource(data []byte, schema *Schema) (Resource, error) { func UnmarshalPartialResource(data []byte, schema *Schema) (*SoftResource, error) { var rske resourceSkeleton err := json.Unmarshal(data, &rske) + if err != nil { return nil, NewErrBadRequest( "Invalid JSON", @@ -221,12 +233,14 @@ func UnmarshalPartialResource(data []byte, schema *Schema) (*SoftResource, error if err != nil { return nil, err } + _ = newType.AddAttr(attr) res.Set(attr.Name, val) } else { return nil, NewErrUnknownFieldInBody(typ.Name, a) } } + for r, v := range rske.Relationships { if rel, ok := typ.Rels[r]; ok { if len(v.Data) > 0 { @@ -246,6 +260,7 @@ func UnmarshalPartialResource(data []byte, schema *Schema) (*SoftResource, error res.SetToMany(rel.FromName, ids) } } + if err != nil { return nil, NewErrInvalidFieldValueInBody( rel.FromName, @@ -276,17 +291,22 @@ func Equal(r1, r2 Resource) bool { // Attributes attrs := r1.Attrs() r1Attrs := make([]Attr, 0, len(attrs)) + for name := range attrs { r1Attrs = append(r1Attrs, attrs[name]) } + sort.Slice(r1Attrs, func(i, j int) bool { return r1Attrs[i].Name < r1Attrs[j].Name }) + attrs = r2.Attrs() r2Attrs := make([]Attr, 0, len(attrs)) + for name := range attrs { r2Attrs = append(r2Attrs, attrs[name]) } + sort.Slice(r2Attrs, func(i, j int) bool { return r2Attrs[i].Name < r2Attrs[j].Name }) @@ -305,6 +325,7 @@ func Equal(r1, r2 Resource) bool { fmt.Sprintf("%v", r2.Get(attr1.Name)) == "" { continue } + return false } } @@ -312,17 +333,22 @@ func Equal(r1, r2 Resource) bool { // Relationships rels := r1.Rels() r1Rels := make([]Rel, 0, len(rels)) + for name := range rels { r1Rels = append(r1Rels, rels[name]) } + sort.Slice(r1Rels, func(i, j int) bool { return r1Rels[i].FromName < r1Rels[j].FromName }) + rels = r2.Rels() r2Rels := make([]Rel, 0, len(rels)) + for name := range rels { r2Rels = append(r2Rels, rels[name]) } + sort.Slice(r2Rels, func(i, j int) bool { return r2Rels[i].FromName < r2Rels[j].FromName }) @@ -336,6 +362,7 @@ func Equal(r1, r2 Resource) bool { if rel1.ToOne != rel2.ToOne { return false } + if rel1.ToOne { if r1.GetToOne(rel1.FromName) != r2.GetToOne(rel2.FromName) { return false @@ -359,5 +386,6 @@ func EqualStrict(r1, r2 Resource) bool { if r1.GetID() != r2.GetID() { return false } + return Equal(r1, r2) } diff --git a/resource_test.go b/resource_test.go index 10f8444..c70d5be 100644 --- a/resource_test.go +++ b/resource_test.go @@ -259,9 +259,11 @@ func TestEqual(t *testing.T) { typ = mt11.GetType().Copy() sr1 = &SoftResource{Type: &typ} + for _, attr := range typ.Attrs { sr1.Set(attr.Name, mt11.Get(attr.Name)) } + for _, rel := range typ.Rels { if rel.ToOne { sr1.SetToOne(rel.FromName, mt11.GetToOne(rel.FromName)) @@ -269,6 +271,7 @@ func TestEqual(t *testing.T) { sr1.SetToMany(rel.FromName, mt11.GetToMany(rel.FromName)) } } + sr1.RemoveField("to-one") assert.False(Equal(mt11, sr1), "different number of relationships") @@ -300,6 +303,7 @@ func TestEqualStrict(t *testing.T) { sr1.SetType(&Type{ Name: "type", }) + sr2 := &SoftResource{} sr2.SetType(&Type{ Name: "type", diff --git a/schema.go b/schema.go index 3c33d2f..59da831 100644 --- a/schema.go +++ b/schema.go @@ -125,6 +125,7 @@ func (s *Schema) HasType(name string) bool { return true } } + return false } @@ -139,6 +140,7 @@ func (s *Schema) GetType(name string) Type { return typ } } + return Type{} } diff --git a/schema_test.go b/schema_test.go index 8bd91c5..b915910 100644 --- a/schema_test.go +++ b/schema_test.go @@ -46,6 +46,7 @@ func TestSchemaTypes(t *testing.T) { } err = schema.AddAttr("type1", attr) assert.NoError(err) + typ = schema.GetType("type1") assert.Contains(typ.Attrs, "attr1") assert.Equal(attr, typ.Attrs["attr1"]) @@ -74,6 +75,7 @@ func TestSchemaTypes(t *testing.T) { } err = schema.AddRel("type1", rel) assert.NoError(err) + typ = schema.GetType("type1") assert.Contains(typ.Rels, "rel1") assert.Equal(rel, typ.Rels["rel1"]) @@ -146,9 +148,11 @@ func TestSchemaCheck(t *testing.T) { // Check schema errs := schema.Check() errsStr := []string{} + for _, err := range errs { errsStr = append(errsStr, err.Error()) } + assert.Len(errs, 3) assert.Contains( errsStr, diff --git a/simple_url.go b/simple_url.go index 8ad30ca..1a221d1 100644 --- a/simple_url.go +++ b/simple_url.go @@ -52,6 +52,7 @@ func NewSimpleURL(u *url.URL) (SimpleURL, error) { if strings.HasPrefix(name, "fields[") && strings.HasSuffix(name, "]") && len(name) > 8 { // Fields resType := name[7 : len(name)-1] + if len(values.Get(name)) > 0 { sURL.Fields[resType] = parseCommaList(values.Get(name)) } diff --git a/soft_collection.go b/soft_collection.go index a553e3b..5e0a5c1 100644 --- a/soft_collection.go +++ b/soft_collection.go @@ -38,6 +38,7 @@ func (s *SoftCollection) At(i int) Resource { if i >= 0 && i < len(s.col) { return s.col[i] } + return nil } @@ -50,6 +51,7 @@ func (s *SoftCollection) Resource(id string, fields []string) Resource { return s.col[i] } } + return nil } @@ -68,6 +70,7 @@ func (s *SoftCollection) Add(r Resource) { for _, rel := range r.Rels() { sr.AddRel(rel) + if rel.ToOne { sr.SetToOne(rel.FromName, r.GetToOne(rel.FromName)) } else { diff --git a/soft_resource.go b/soft_resource.go index fda9704..3f12fd4 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -22,34 +22,40 @@ type SoftResource struct { // Attrs returns the resource's attributes. func (sr *SoftResource) Attrs() map[string]Attr { sr.check() + return sr.Type.Attrs } // Rels returns the resource's relationships. func (sr *SoftResource) Rels() map[string]Rel { sr.check() + return sr.Type.Rels } // AddAttr adds an attribute. func (sr *SoftResource) AddAttr(attr Attr) { sr.check() + for _, name := range sr.fields() { if name == attr.Name { return } } + sr.Type.Attrs[attr.Name] = attr } // AddRel adds a relationship. func (sr *SoftResource) AddRel(rel Rel) { sr.check() + for _, name := range sr.fields() { if name == rel.FromName { return } } + sr.Type.Rels[rel.FromName] = rel } @@ -63,12 +69,14 @@ func (sr *SoftResource) RemoveField(field string) { // Attr returns the attribute named after key. func (sr *SoftResource) Attr(key string) Attr { sr.check() + return sr.Type.Attrs[key] } // Rel returns the relationship named after key. func (sr *SoftResource) Rel(key string) Rel { sr.check() + return sr.Type.Rels[key] } @@ -76,6 +84,7 @@ func (sr *SoftResource) Rel(key string) Rel { // without the values. func (sr *SoftResource) New() Resource { sr.check() + return &SoftResource{ Type: copystructure.Must(copystructure.Copy(sr.Type)).(*Type), } @@ -84,23 +93,27 @@ func (sr *SoftResource) New() Resource { // GetID returns the resource's ID. func (sr *SoftResource) GetID() string { sr.check() + return sr.id } // GetType returns the resource's type. func (sr *SoftResource) GetType() Type { sr.check() + return *sr.Type } // Get returns the value associated to the field named after key. func (sr *SoftResource) Get(key string) interface{} { sr.check() + if _, ok := sr.Type.Attrs[key]; ok { if v, ok := sr.data[key]; ok { return v } } + return nil } @@ -119,6 +132,7 @@ func (sr *SoftResource) SetType(typ *Type) { // Set sets the value associated to the field named key to v. func (sr *SoftResource) Set(key string, v interface{}) { sr.check() + if attr, ok := sr.Type.Attrs[key]; ok { if GetAttrTypeString(attr.Type, attr.Nullable) == fmt.Sprintf("%T", v) { sr.data[key] = v @@ -131,24 +145,29 @@ func (sr *SoftResource) Set(key string, v interface{}) { // GetToOne returns the value associated to the relationship named after key. func (sr *SoftResource) GetToOne(key string) string { sr.check() + if _, ok := sr.Type.Rels[key]; ok { return sr.data[key].(string) } + return "" } // GetToMany returns the value associated to the relationship named after key. func (sr *SoftResource) GetToMany(key string) []string { sr.check() + if _, ok := sr.Type.Rels[key]; ok { return sr.data[key].([]string) } + return []string{} } // SetToOne sets the relationship named after key to rel. func (sr *SoftResource) SetToOne(key string, v string) { sr.check() + if rel, ok := sr.Type.Rels[key]; ok && rel.ToOne { sr.data[key] = v } @@ -157,6 +176,7 @@ func (sr *SoftResource) SetToOne(key string, v string) { // SetToMany sets the relationship named after key to rel. func (sr *SoftResource) SetToMany(key string, v []string) { sr.check() + if rel, ok := sr.Type.Rels[key]; ok && !rel.ToOne { sr.data[key] = v } @@ -165,6 +185,7 @@ func (sr *SoftResource) SetToMany(key string, v []string) { // Copy return a new SoftResource object with the same type and values. func (sr *SoftResource) Copy() Resource { sr.check() + return &SoftResource{ Type: copystructure.Must(copystructure.Copy(sr.Type)).(*Type), id: sr.id, @@ -177,9 +198,11 @@ func (sr *SoftResource) fields() []string { for i := range sr.Type.Attrs { fields = append(fields, sr.Type.Attrs[i].Name) } + for i := range sr.Type.Rels { fields = append(fields, sr.Type.Rels[i].FromName) } + return fields } @@ -187,12 +210,15 @@ func (sr *SoftResource) check() { if sr.Type == nil { sr.Type = &Type{} } + if sr.Type.Attrs == nil { sr.Type.Attrs = map[string]Attr{} } + if sr.Type.Rels == nil { sr.Type.Rels = map[string]Rel{} } + if sr.data == nil { sr.data = map[string]interface{}{} } @@ -203,6 +229,7 @@ func (sr *SoftResource) check() { sr.data[n] = GetZeroValue(sr.Type.Attrs[i].Type, sr.Type.Attrs[i].Nullable) } } + for i := range sr.Type.Rels { n := sr.Type.Rels[i].FromName if _, ok := sr.data[n]; !ok { @@ -218,12 +245,14 @@ func (sr *SoftResource) check() { if len(fields) < len(sr.data) { for k := range sr.data { found := false + for _, f := range fields { if k == f { found = true break } } + if !found { delete(sr.data, k) } diff --git a/soft_resource_test.go b/soft_resource_test.go index ad26fe6..a6f9fd8 100644 --- a/soft_resource_test.go +++ b/soft_resource_test.go @@ -36,6 +36,7 @@ func TestSoftResource(t *testing.T) { // ID and type sr.SetID("id") + typ2 := typ typ2.Name = "type2" sr.SetType(&typ2) @@ -60,6 +61,7 @@ func TestSoftResource(t *testing.T) { assert.Equal(t, attr, sr.Attr(attr.Name)) } + assert.Equal(t, attrs, sr.Attrs()) // Relationships @@ -86,6 +88,7 @@ func TestSoftResource(t *testing.T) { assert.Equal(t, rel, sr.Rel(rel.FromName)) } + assert.Equal(t, rels, sr.Rels()) sr.RemoveField("attr1") @@ -108,6 +111,7 @@ func TestSoftResource(t *testing.T) { assert.Equal(t, attr, sr.Attr(attr.Name)) } + for _, rel := range rels { sr.AddRel(rel) @@ -131,7 +135,9 @@ func TestSoftResource(t *testing.T) { Type: AttrTypeString, Nullable: true, }) + assert.Nil(t, sr.Get("nullable-str")) + str := "abc" sr.Set("nullable-str", &str) assert.Equal(t, &str, sr.Get("nullable-str")) diff --git a/type.go b/type.go index 60acc38..9d5e210 100644 --- a/type.go +++ b/type.go @@ -69,6 +69,7 @@ func (t *Type) AddAttr(attr Attr) error { if t.Attrs == nil { t.Attrs = map[string]Attr{} } + t.Attrs[attr.Name] = attr return nil @@ -89,6 +90,7 @@ func (t *Type) AddRel(rel Rel) error { if rel.FromName == "" { return fmt.Errorf("jsonapi: relationship name is empty") } + if rel.ToType == "" { return fmt.Errorf("jsonapi: relationship type is empty") } @@ -103,6 +105,7 @@ func (t *Type) AddRel(rel Rel) error { if t.Rels == nil { t.Rels = map[string]Rel{} } + t.Rels[rel.FromName] = rel return nil @@ -124,10 +127,13 @@ func (t *Type) Fields() []string { for i := range t.Attrs { fields = append(fields, t.Attrs[i].Name) } + for i := range t.Rels { fields = append(fields, t.Rels[i].FromName) } + sort.Strings(fields) + return fields } @@ -139,6 +145,7 @@ func (t *Type) New() Resource { if t.NewFunc != nil { return t.NewFunc() } + return &SoftResource{Type: t} } @@ -147,6 +154,7 @@ func (t *Type) New() Resource { func (t Type) Equal(typ Type) bool { t.NewFunc = nil typ.NewFunc = nil + return reflect.DeepEqual(t, typ) } @@ -161,6 +169,7 @@ func (t Type) Copy() Type { for name, attr := range t.Attrs { ctyp.Attrs[name] = attr } + for name, rel := range t.Rels { ctyp.Rels[name] = rel } @@ -188,10 +197,12 @@ func (a Attr) UnmarshalToType(data []byte) (interface{}, error) { v interface{} err error ) + switch a.Type { case AttrTypeString: var s string err = json.Unmarshal(data, &s) + if a.Nullable { v = &s } else { @@ -199,6 +210,7 @@ func (a Attr) UnmarshalToType(data []byte) (interface{}, error) { } case AttrTypeInt: v, err = strconv.Atoi(string(data)) + if a.Nullable { n := v.(int) v = &n @@ -207,6 +219,7 @@ func (a Attr) UnmarshalToType(data []byte) (interface{}, error) { } case AttrTypeInt8: v, err = strconv.Atoi(string(data)) + if a.Nullable { n := int8(v.(int)) v = &n @@ -215,6 +228,7 @@ func (a Attr) UnmarshalToType(data []byte) (interface{}, error) { } case AttrTypeInt16: v, err = strconv.Atoi(string(data)) + if a.Nullable { n := int16(v.(int)) v = &n @@ -223,6 +237,7 @@ func (a Attr) UnmarshalToType(data []byte) (interface{}, error) { } case AttrTypeInt32: v, err = strconv.Atoi(string(data)) + if a.Nullable { n := int32(v.(int)) v = &n @@ -231,6 +246,7 @@ func (a Attr) UnmarshalToType(data []byte) (interface{}, error) { } case AttrTypeInt64: v, err = strconv.Atoi(string(data)) + if a.Nullable { n := int64(v.(int)) v = &n @@ -239,6 +255,7 @@ func (a Attr) UnmarshalToType(data []byte) (interface{}, error) { } case AttrTypeUint: v, err = strconv.ParseUint(string(data), 10, 64) + if a.Nullable { n := uint(v.(uint64)) v = &n @@ -247,6 +264,7 @@ func (a Attr) UnmarshalToType(data []byte) (interface{}, error) { } case AttrTypeUint8: v, err = strconv.ParseUint(string(data), 10, 8) + if a.Nullable { n := uint8(v.(uint64)) v = &n @@ -255,6 +273,7 @@ func (a Attr) UnmarshalToType(data []byte) (interface{}, error) { } case AttrTypeUint16: v, err = strconv.ParseUint(string(data), 10, 16) + if a.Nullable { n := uint16(v.(uint64)) v = &n @@ -263,6 +282,7 @@ func (a Attr) UnmarshalToType(data []byte) (interface{}, error) { } case AttrTypeUint32: v, err = strconv.ParseUint(string(data), 10, 32) + if a.Nullable { n := uint32(v.(uint64)) v = &n @@ -271,6 +291,7 @@ func (a Attr) UnmarshalToType(data []byte) (interface{}, error) { } case AttrTypeUint64: v, err = strconv.ParseUint(string(data), 10, 64) + if a.Nullable { n := v.(uint64) v = &n @@ -284,7 +305,9 @@ func (a Attr) UnmarshalToType(data []byte) (interface{}, error) { } else if string(data) != "false" { err = errors.New("boolean is not true or false") } + v = b + if a.Nullable { v = &b } @@ -292,15 +315,18 @@ func (a Attr) UnmarshalToType(data []byte) (interface{}, error) { var t time.Time err = json.Unmarshal(data, &t) v = t + if a.Nullable { v = &t } case AttrTypeBytes: s := make([]byte, len(data)) err := json.Unmarshal(data, &s) + if err != nil { panic(err) } + if a.Nullable { v = &s } else { @@ -350,9 +376,11 @@ func (r *Rel) Invert() Rel { func (r *Rel) Normalize() Rel { from := r.FromType + r.FromName to := r.ToType + r.ToName + if from < to || r.ToName == "" { return *r } + return r.Invert() } @@ -368,9 +396,11 @@ func (r Rel) String() string { // boolean that indicates whether the attribute can be null or not. func GetAttrType(t string) (int, bool) { nullable := strings.HasPrefix(t, "*") + if nullable { t = t[1:] } + switch t { case "string": return AttrTypeString, nullable @@ -409,6 +439,7 @@ func GetAttrType(t string) (int, bool) { // constants) and nullable. func GetAttrTypeString(t int, nullable bool) string { str := "" + switch t { case AttrTypeString: str = "string" @@ -441,9 +472,11 @@ func GetAttrTypeString(t int, nullable bool) string { default: str = "" } + if nullable { return "*" + str } + return str } @@ -458,84 +491,98 @@ func GetZeroValue(t int, null bool) interface{} { var np *string return np } + return "" case AttrTypeInt: if null { var np *int return np } + return int(0) case AttrTypeInt8: if null { var np *int8 return np } + return int8(0) case AttrTypeInt16: if null { var np *int16 return np } + return int16(0) case AttrTypeInt32: if null { var np *int32 return np } + return int32(0) case AttrTypeInt64: if null { var np *int64 return np } + return int64(0) case AttrTypeUint: if null { var np *uint return np } + return uint(0) case AttrTypeUint8: if null { var np *uint8 return np } + return uint8(0) case AttrTypeUint16: if null { var np *uint16 return np } + return uint16(0) case AttrTypeUint32: if null { var np *uint32 return np } + return uint32(0) case AttrTypeUint64: if null { var np *uint64 return np } + return uint64(0) case AttrTypeBool: if null { var np *bool return np } + return false case AttrTypeTime: if null { var np *time.Time return np } + return time.Time{} case AttrTypeBytes: if null { var np *[]byte return np } + return []byte{} default: return nil diff --git a/type_test.go b/type_test.go index 9cff3f9..b3f68f7 100644 --- a/type_test.go +++ b/type_test.go @@ -24,6 +24,7 @@ func TestType(t *testing.T) { } err := typ.AddAttr(attr1) assert.NoError(err) + rel1 := Rel{ FromName: "rel1", ToType: "type1", @@ -59,6 +60,7 @@ func TestType(t *testing.T) { assert.Error(err) } +// TODO Add tests with attributes and relationships. func TestTypeEqual(t *testing.T) { assert := assert.New(t) @@ -85,8 +87,6 @@ func TestTypeEqual(t *testing.T) { return &SoftResource{} } assert.True(typ1.Equal(typ2)) - - // TODO Add tests with attributes and relationships. } func TestTypeNewFunc(t *testing.T) { @@ -183,6 +183,7 @@ func TestAttrUnmarshalToType(t *testing.T) { // Invalid slide of bytes attr.Type = AttrTypeBytes + assert.Panics(func() { _, _ = attr.UnmarshalToType([]byte("invalid")) }) diff --git a/url.go b/url.go index 1d23595..ab45d40 100644 --- a/url.go +++ b/url.go @@ -24,9 +24,11 @@ func NewURL(schema *Schema, su SimpleURL) (*URL, error) { typ Type ok bool ) + if len(url.Fragments) == 0 { return nil, NewErrBadRequest("Empty path", "There is no path.") } + if len(url.Fragments) >= 1 { if typ = schema.GetType(url.Fragments[0]); typ.Name == "" { return nil, NewErrUnknownTypeInURL(url.Fragments[0]) @@ -43,6 +45,7 @@ func NewURL(schema *Schema, su SimpleURL) (*URL, error) { url.ResID = url.Fragments[1] } } + if len(url.Fragments) >= 3 { relName := url.Fragments[len(url.Fragments)-1] if url.Rel, ok = typ.Rels[relName]; !ok { @@ -72,6 +75,7 @@ func NewURL(schema *Schema, su SimpleURL) (*URL, error) { // Params var err error url.Params, err = NewParams(schema, su, url.ResType) + if err != nil { return nil, err } @@ -127,6 +131,7 @@ func (u *URL) String() string { for _, p := range u.Fragments { path += p + "/" } + path = path[:len(path)-1] // Params @@ -137,7 +142,9 @@ func (u *URL) String() string { for key := range u.Params.Fields { fields = append(fields, key) } + sort.Strings(fields) + for _, typ := range fields { sort.Strings(u.Params.Fields[typ]) @@ -145,6 +152,7 @@ func (u *URL) String() string { for _, f := range u.Params.Fields[typ] { param += f + "%2C" } + param = param[:len(param)-3] urlParams = append(urlParams, param) @@ -158,6 +166,7 @@ func (u *URL) String() string { // at this point. panic(fmt.Errorf("jsonapi: can't marshal filter: %s", err)) } + param := "filter=" + string(mf) urlParams = append(urlParams, param) } else if u.Params.FilterLabel != "" { @@ -172,6 +181,7 @@ func (u *URL) String() string { "page%5Bnumber%5D="+strconv.Itoa(int(u.Params.PageNumber)), ) } + if u.Params.PageSize != 0 { urlParams = append( urlParams, @@ -186,6 +196,7 @@ func (u *URL) String() string { for _, attr := range u.Params.SortingRules { param += attr + "%2C" } + param = param[:len(param)-3] urlParams = append(urlParams, param) @@ -195,6 +206,7 @@ func (u *URL) String() string { for _, param := range urlParams { params += param + "&" } + params = params[:len(params)-1] return path + params diff --git a/url_test.go b/url_test.go index 53ef1e2..b6dc0f3 100644 --- a/url_test.go +++ b/url_test.go @@ -213,6 +213,7 @@ func TestParseURL(t *testing.T) { for _, test := range tests { url, err := NewURLFromRaw(schema, makeOneLineNoSpaces(test.url)) + if test.expectedError { assert.Error(err) } else { @@ -453,6 +454,7 @@ func TestParseParams(t *testing.T) { assert.NoError(err, test.name) params, err := NewParams(schema, su, test.colType) + if test.expectedError { assert.Error(err, test.name) } else { diff --git a/util_test.go b/util_test.go index 23298b5..5578111 100644 --- a/util_test.go +++ b/util_test.go @@ -8,6 +8,7 @@ import ( func makeOneLineNoSpaces(str string) string { str = strings.Replace(str, "\t", "", -1) str = strings.Replace(str, "\n", "", -1) + return strings.Replace(str, " ", "", -1) } @@ -46,8 +47,9 @@ func ptr(v interface{}) interface{} { // []byte case []byte: return &c + default: + return nil } - return nil } func nilptr(t string) interface{} { @@ -99,6 +101,7 @@ func nilptr(t string) interface{} { case "[]byte": var p *[]byte return p + default: + return nil } - return nil } diff --git a/wrapper.go b/wrapper.go index 7e219da..1244a1c 100644 --- a/wrapper.go +++ b/wrapper.go @@ -34,10 +34,12 @@ func Wrap(v interface{}) *Wrapper { if val.Kind() != reflect.Struct { panic(errors.New("jsonapi: value has to be a pointer to a struct")) } + val = reflect.New(val.Type()) } else if val.Elem().Kind() != reflect.Struct { panic(errors.New("jsonapi: value has to be a pointer to a struct")) } + val = val.Elem() err := Check(val.Interface()) @@ -76,6 +78,7 @@ func Wrap(v interface{}) *Wrapper { jsonTag := fs.Tag.Get("json") relTag := strings.Split(fs.Tag.Get("api"), ",") invName := "" + if len(relTag) == 3 { invName = relTag[2] } @@ -121,6 +124,7 @@ func (w *Wrapper) Attr(key string) Attr { return attr } } + return Attr{} } @@ -131,6 +135,7 @@ func (w *Wrapper) Rel(key string) Rel { return rel } } + return Rel{} } @@ -239,6 +244,7 @@ func (w *Wrapper) SetToOne(key string, rel string) { } field.SetString(rel) + return } } @@ -266,6 +272,7 @@ func (w *Wrapper) SetToMany(key string, rels []string) { } field.Set(reflect.ValueOf(rels)) + return } } diff --git a/wrapper_test.go b/wrapper_test.go index 7eb6f0c..511005f 100644 --- a/wrapper_test.go +++ b/wrapper_test.go @@ -162,19 +162,26 @@ func TestWrapper(t *testing.T) { } // Set values (attributes) - var anotherString = "anotherString" + var ( + anotherString = "anotherString" + newInt = 3 + ) + wrap2.Set("strptr", &anotherString) assert.Equal(&anotherString, wrap2.Get("strptr"), "set string pointer attribute") - var newInt = 3 + wrap2.Set("intptr", &newInt) assert.Equal(&newInt, wrap2.Get("intptr"), "set int pointer attribute") + wrap2.Set("uintptr", nil) + if wrap2.Get("uintptr") != nil { // We first do a != nil check because that's what we are really // checking and reflect.DeepEqual doesn't work exactly work the same // way. If the nil check fails, then the next line will fail too. assert.Equal(t, "nil pointer", nil, wrap2.Get("uintptr")) } + if res2.UintPtr != nil { // We first do a != nil check because that's what we are really // checking and reflect.DeepEqual doesn't work exactly work the same @@ -184,18 +191,22 @@ func TestWrapper(t *testing.T) { // New wrap3 := wrap1.New() + for _, attr := range wrap1.Attrs() { assert.Equal(wrap1.Attr(attr.Name), wrap3.Attr(attr.Name), "copied attribute") } + for _, rel := range wrap1.Rels() { assert.Equal(wrap1.Rel(rel.FromName), wrap3.Rel(rel.FromName), "copied relationship") } // Copy wrap3 = wrap1.Copy() + for _, attr := range wrap1.Attrs() { assert.Equal(wrap1.Attr(attr.Name), wrap3.Attr(attr.Name), "copied attribute") } + for _, rel := range wrap1.Rels() { assert.Equal(wrap1.Rel(rel.FromName), wrap3.Rel(rel.FromName), "copied relationship") } From a543b7cea5a966ff72c6d4acac68ffe0d0bbc3eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Fri, 15 Nov 2019 19:08:45 -0500 Subject: [PATCH 273/406] Improve readability of "if else" condition --- simple_url.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/simple_url.go b/simple_url.go index 1a221d1..3505a7b 100644 --- a/simple_url.go +++ b/simple_url.go @@ -169,10 +169,8 @@ func deduceRoute(path []string) string { if len(path) >= 4 { if path[3] == meta { route += "/" + meta - } else { - if path[2] == rel { - route += "/" + path[3] - } + } else if path[2] == rel { + route += "/" + path[3] } } From 55706654b86df0ac79d23095967ba6c709b0e5d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Fri, 15 Nov 2019 19:38:15 -0500 Subject: [PATCH 274/406] Add more linters and fix their issues --- .golangci.yml | 13 +++ document.go | 51 +++++----- error.go | 7 +- filter_query.go | 242 ++++++++++++++++++++++++++---------------------- helpers.go | 9 +- simple_url.go | 94 ++++++++++--------- 6 files changed, 227 insertions(+), 189 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index b837fcd..d7c555d 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,8 +1,16 @@ linters: enable: + - bodyclose - deadcode + - depguard + - dogsled - dupl - errcheck + - gochecknoglobals + - gochecknoinits + - gocritic + - gofmt + - goimports - golint - gosec - gosimple @@ -22,6 +30,7 @@ linters: - unparam - unused - varcheck + - whitespace - wsl linters-settings: @@ -38,3 +47,7 @@ issues: - source: ^func linters: - lll + + - source: ^var update = + linters: + - gochecknoglobals diff --git a/document.go b/document.go index 352a95d..a0f2c4e 100644 --- a/document.go +++ b/document.go @@ -81,32 +81,32 @@ func MarshalDocument(doc *Document, url *URL) ([]byte, error) { // Data var data json.RawMessage - if res, ok := doc.Data.(Resource); ok { - // Resource + switch d := doc.Data.(type) { + case Resource: data = MarshalResource( - res, + d, doc.PrePath, - url.Params.Fields[res.GetType().Name], + url.Params.Fields[d.GetType().Name], doc.RelData, ) - } else if col, ok := doc.Data.(Collection); ok { - // Collection + case Collection: data = MarshalCollection( - col, + d, doc.PrePath, url.Params.Fields, doc.RelData, ) - } else if id, ok := doc.Data.(Identifier); ok { - // Identifier - data, err = json.Marshal(id) - } else if ids, ok := doc.Data.(Identifiers); ok { - // Identifiers - data, err = json.Marshal(ids) - } else if doc.Data != nil { - err = errors.New("data contains an unknown type") - } else if len(doc.Errors) == 0 { - data = []byte("null") + case Identifier: + data, err = json.Marshal(d) + + case Identifiers: + data, err = json.Marshal(d) + default: + if doc.Data != nil { + err = errors.New("data contains an unknown type") + } else if len(doc.Errors) == 0 { + data = []byte("null") + } } // Data @@ -191,8 +191,10 @@ func UnmarshalDocument(payload []byte, schema *Schema) (*Document, error) { } // Data - if len(ske.Data) > 0 { - if ske.Data[0] == '{' { + switch { + case len(ske.Data) > 0: + switch { + case ske.Data[0] == '{': // Resource res, err := UnmarshalResource(ske.Data, schema) if err != nil { @@ -200,21 +202,22 @@ func UnmarshalDocument(payload []byte, schema *Schema) (*Document, error) { } doc.Data = res - } else if ske.Data[0] == '[' { + case ske.Data[0] == '[': col, err := UnmarshalCollection(ske.Data, schema) if err != nil { return nil, err } + doc.Data = col - } else if string(ske.Data) == "null" { + case string(ske.Data) == "null": doc.Data = nil - } else { + default: // TODO Not exactly the right error return nil, NewErrMissingDataMember() } - } else if len(ske.Errors) > 0 { + case len(ske.Errors) > 0: doc.Errors = ske.Errors - } else { + default: return nil, NewErrMissingDataMember() } diff --git a/error.go b/error.go index 850aeb4..1295a50 100644 --- a/error.go +++ b/error.go @@ -46,11 +46,12 @@ func (e Error) Error() string { fullName := http.StatusText(statusCode) if fullName != "" && e.Status != "" { - if e.Detail != "" { + switch { + case e.Detail != "": return fmt.Sprintf("%s %s: %s", e.Status, fullName, e.Detail) - } else if e.Title != "" { + case e.Title != "": return fmt.Sprintf("%s %s: %s", e.Status, fullName, e.Title) - } else { + default: return fmt.Sprintf("%s %s", e.Status, fullName) } } diff --git a/filter_query.go b/filter_query.go index 8aaab5c..64407d1 100644 --- a/filter_query.go +++ b/filter_query.go @@ -124,203 +124,219 @@ func (f *Filter) IsAllowed(res Resource) bool { } func checkVal(op string, rval, cval interface{}) bool { - switch rval.(type) { + switch rval := rval.(type) { case string: - return checkStr(op, rval.(string), cval.(string)) + return checkStr(op, rval, cval.(string)) case int: - return checkInt(op, int64(rval.(int)), int64(cval.(int))) + return checkInt(op, int64(rval), int64(cval.(int))) case int8: - return checkInt(op, int64(rval.(int8)), int64(cval.(int8))) + return checkInt(op, int64(rval), int64(cval.(int8))) case int16: - return checkInt(op, int64(rval.(int16)), int64(cval.(int16))) + return checkInt(op, int64(rval), int64(cval.(int16))) case int32: - return checkInt(op, int64(rval.(int32)), int64(cval.(int32))) + return checkInt(op, int64(rval), int64(cval.(int32))) case int64: - return checkInt(op, rval.(int64), cval.(int64)) + return checkInt(op, rval, cval.(int64)) case uint: - return checkUint(op, uint64(rval.(uint)), uint64(cval.(uint))) + return checkUint(op, uint64(rval), uint64(cval.(uint))) case uint8: - return checkUint(op, uint64(rval.(uint8)), uint64(cval.(uint8))) + return checkUint(op, uint64(rval), uint64(cval.(uint8))) case uint16: - return checkUint(op, uint64(rval.(uint16)), uint64(cval.(uint16))) + return checkUint(op, uint64(rval), uint64(cval.(uint16))) case uint32: - return checkUint(op, uint64(rval.(uint32)), uint64(cval.(uint32))) + return checkUint(op, uint64(rval), uint64(cval.(uint32))) case uint64: - return checkUint(op, rval.(uint64), cval.(uint64)) + return checkUint(op, rval, cval.(uint64)) case bool: - return checkBool(op, rval.(bool), cval.(bool)) + return checkBool(op, rval, cval.(bool)) case time.Time: - return checkTime(op, rval.(time.Time), cval.(time.Time)) + return checkTime(op, rval, cval.(time.Time)) case []byte: - return checkBytes(op, rval.([]byte), cval.([]byte)) + return checkBytes(op, rval, cval.([]byte)) case *string: - if rval.(*string) == nil || cval.(*string) == nil { - if op == "=" { - return rval.(*string) == cval.(*string) - } else if op == "!=" { - return rval.(*string) != cval.(*string) - } else { + if rval == nil || cval.(*string) == nil { + switch op { + case "=": + return rval == cval.(*string) + case "!=": + return rval != cval.(*string) + default: return false } } - return checkStr(op, *rval.(*string), *cval.(*string)) + return checkStr(op, *rval, *cval.(*string)) case *int: - if rval.(*int) == nil || cval.(*int) == nil { - if op == "=" { - return rval.(*int) == cval.(*int) - } else if op == "!=" { - return rval.(*int) != cval.(*int) - } else { + if rval == nil || cval.(*int) == nil { + switch op { + case "=": + return rval == cval.(*int) + case "!=": + return rval != cval.(*int) + default: return false } } - return checkInt(op, int64(*rval.(*int)), int64(*cval.(*int))) + return checkInt(op, int64(*rval), int64(*cval.(*int))) case *int8: - if rval.(*int8) == nil || cval.(*int8) == nil { - if op == "=" { - return rval.(*int8) == cval.(*int8) - } else if op == "!=" { - return rval.(*int8) != cval.(*int8) - } else { + if rval == nil || cval.(*int8) == nil { + switch op { + case "=": + return rval == cval.(*int8) + case "!=": + return rval != cval.(*int8) + default: return false } } - return checkInt(op, int64(*rval.(*int8)), int64(*cval.(*int8))) + return checkInt(op, int64(*rval), int64(*cval.(*int8))) case *int16: - if rval.(*int16) == nil || cval.(*int16) == nil { - if op == "=" { - return rval.(*int16) == cval.(*int16) - } else if op == "!=" { - return rval.(*int16) != cval.(*int16) - } else { + if rval == nil || cval.(*int16) == nil { + switch op { + case "=": + return rval == cval.(*int16) + case "!=": + return rval != cval.(*int16) + default: return false } } - return checkInt(op, int64(*rval.(*int16)), int64(*cval.(*int16))) + return checkInt(op, int64(*rval), int64(*cval.(*int16))) case *int32: - if rval.(*int32) == nil || cval.(*int32) == nil { - if op == "=" { - return rval.(*int32) == cval.(*int32) - } else if op == "!=" { - return rval.(*int32) != cval.(*int32) - } else { + if rval == nil || cval.(*int32) == nil { + switch op { + case "=": + return rval == cval.(*int32) + case "!=": + return rval != cval.(*int32) + default: return false } } - return checkInt(op, int64(*rval.(*int32)), int64(*cval.(*int32))) + return checkInt(op, int64(*rval), int64(*cval.(*int32))) case *int64: - if rval.(*int64) == nil || cval.(*int64) == nil { - if op == "=" { - return rval.(*int64) == cval.(*int64) - } else if op == "!=" { - return rval.(*int64) != cval.(*int64) - } else { + if rval == nil || cval.(*int64) == nil { + switch op { + case "=": + return rval == cval.(*int64) + case "!=": + return rval != cval.(*int64) + default: return false } } - return checkInt(op, *rval.(*int64), *cval.(*int64)) + return checkInt(op, *rval, *cval.(*int64)) case *uint: - if rval.(*uint) == nil || cval.(*uint) == nil { - if op == "=" { - return rval.(*uint) == cval.(*uint) - } else if op == "!=" { - return rval.(*uint) != cval.(*uint) - } else { + if rval == nil || cval.(*uint) == nil { + switch op { + case "=": + return rval == cval.(*uint) + case "!=": + return rval != cval.(*uint) + default: return false } } - return checkUint(op, uint64(*rval.(*uint)), uint64(*cval.(*uint))) + return checkUint(op, uint64(*rval), uint64(*cval.(*uint))) case *uint8: - if rval.(*uint8) == nil || cval.(*uint8) == nil { - if op == "=" { - return rval.(*uint8) == cval.(*uint8) - } else if op == "!=" { - return rval.(*uint8) != cval.(*uint8) - } else { + if rval == nil || cval.(*uint8) == nil { + switch op { + case "=": + return rval == cval.(*uint8) + case "!=": + return rval != cval.(*uint8) + default: return false } } - return checkUint(op, uint64(*rval.(*uint8)), uint64(*cval.(*uint8))) + return checkUint(op, uint64(*rval), uint64(*cval.(*uint8))) case *uint16: - if rval.(*uint16) == nil || cval.(*uint16) == nil { - if op == "=" { - return rval.(*uint16) == cval.(*uint16) - } else if op == "!=" { - return rval.(*uint16) != cval.(*uint16) - } else { + if rval == nil || cval.(*uint16) == nil { + switch op { + case "=": + return rval == cval.(*uint16) + case "!=": + return rval != cval.(*uint16) + default: return false } } - return checkUint(op, uint64(*rval.(*uint16)), uint64(*cval.(*uint16))) + return checkUint(op, uint64(*rval), uint64(*cval.(*uint16))) case *uint32: - if rval.(*uint32) == nil || cval.(*uint32) == nil { - if op == "=" { - return rval.(*uint32) == cval.(*uint32) - } else if op == "!=" { - return rval.(*uint32) != cval.(*uint32) - } else { + if rval == nil || cval.(*uint32) == nil { + switch op { + case "=": + return rval == cval.(*uint32) + case "!=": + return rval != cval.(*uint32) + default: return false } } - return checkUint(op, uint64(*rval.(*uint32)), uint64(*cval.(*uint32))) + return checkUint(op, uint64(*rval), uint64(*cval.(*uint32))) case *uint64: - if rval.(*uint64) == nil || cval.(*uint64) == nil { - if op == "=" { - return rval.(*uint64) == cval.(*uint64) - } else if op == "!=" { - return rval.(*uint64) != cval.(*uint64) - } else { + if rval == nil || cval.(*uint64) == nil { + switch op { + case "=": + return rval == cval.(*uint64) + case "!=": + return rval != cval.(*uint64) + default: return false } } - return checkUint(op, *rval.(*uint64), *cval.(*uint64)) + return checkUint(op, *rval, *cval.(*uint64)) case *bool: - if rval.(*bool) == nil || cval.(*bool) == nil { - if op == "=" { - return rval.(*bool) == cval.(*bool) - } else if op == "!=" { - return rval.(*bool) != cval.(*bool) + if rval == nil || cval.(*bool) == nil { + switch op { + case "=": + return rval == cval.(*bool) + case "!=": + return rval != cval.(*bool) + default: + return false } } - return checkBool(op, *rval.(*bool), *cval.(*bool)) + return checkBool(op, *rval, *cval.(*bool)) case *time.Time: - if rval.(*time.Time) == nil || cval.(*time.Time) == nil { - if op == "=" { - return rval.(*time.Time) == cval.(*time.Time) - } else if op == "!=" { - return rval.(*time.Time) != cval.(*time.Time) - } else { + if rval == nil || cval.(*time.Time) == nil { + switch op { + case "=": + return rval == cval.(*time.Time) + case "!=": + return rval != cval.(*time.Time) + default: return false } } - return checkTime(op, *rval.(*time.Time), *cval.(*time.Time)) + return checkTime(op, *rval, *cval.(*time.Time)) case *[]byte: - if rval.(*[]byte) == nil || cval.(*[]byte) == nil { - if op == "=" { - return rval.(*[]byte) == cval.(*[]byte) - } else if op == "!=" { - return rval.(*[]byte) != cval.(*[]byte) - } else { + if rval == nil || cval.(*[]byte) == nil { + switch op { + case "=": + return rval == cval.(*[]byte) + case "!=": + return rval != cval.(*[]byte) + default: return false } } - return checkBytes(op, *rval.(*[]byte), *cval.(*[]byte)) + return checkBytes(op, *rval, *cval.(*[]byte)) case []string: - return checkSlice(op, rval.([]string), cval.([]string)) + return checkSlice(op, rval, cval.([]string)) default: return false } diff --git a/helpers.go b/helpers.go index 6ca50ec..6f0787f 100644 --- a/helpers.go +++ b/helpers.go @@ -173,9 +173,7 @@ func BuildType(v interface{}) (Type, error) { // NewFunc res := Wrap(reflect.New(val.Type()).Interface()) - typ.NewFunc = func() Resource { - return res.Copy() - } + typ.NewFunc = res.Copy return typ, nil } @@ -196,9 +194,8 @@ func MustBuildType(v interface{}) Type { // Two empty strings are returned if v is not recognized as a resource. // CheckType can be used to check the validity of a struct. func IDAndType(v interface{}) (string, string) { - switch nv := v.(type) { - case Resource: - return nv.GetID(), nv.GetType().Name + if res, ok := v.(Resource); ok { + return res.GetID(), res.GetType().Name } val := reflect.ValueOf(v) diff --git a/simple_url.go b/simple_url.go index 3505a7b..a09967f 100644 --- a/simple_url.go +++ b/simple_url.go @@ -56,47 +56,54 @@ func NewSimpleURL(u *url.URL) (SimpleURL, error) { if len(values.Get(name)) > 0 { sURL.Fields[resType] = parseCommaList(values.Get(name)) } - } else if name == "filter" { - var err error - if values.Get(name)[0] != '{' { - // It should be a label - err = json.Unmarshal([]byte("\""+values.Get(name)+"\""), &sURL.FilterLabel) - } else { - // It should be a JSON object - err = json.Unmarshal([]byte(values.Get(name)), sURL.Filter) - } - if err != nil { - sURL.FilterLabel = "" - sURL.Filter = nil - return sURL, NewErrMalformedFilterParameter(values.Get(name)) - } - } else if name == "sort" { - // Sort - for _, rules := range values[name] { - sURL.SortingRules = append(sURL.SortingRules, parseCommaList(rules)...) - } - } else if name == "page[size]" { - // Page size - size, err := strconv.ParseUint(values.Get(name), 10, 64) - if err != nil { - return sURL, NewErrInvalidPageSizeParameter(values.Get(name)) - } - sURL.PageSize = uint(size) - } else if name == "page[number]" { - // Page number - num, err := strconv.ParseUint(values.Get(name), 10, 64) - if err != nil { - return sURL, NewErrInvalidPageNumberParameter(values.Get(name)) - } - sURL.PageNumber = uint(num) - } else if name == "include" { - // Include - for _, include := range values[name] { - sURL.Include = append(sURL.Include, parseCommaList(include)...) - } } else { - // Unkmown parameter - return sURL, NewErrUnknownParameter(name) + switch name { + case "filter": + var err error + if values.Get(name)[0] != '{' { + // It should be a label + err = json.Unmarshal([]byte("\""+values.Get(name)+"\""), &sURL.FilterLabel) + } else { + // It should be a JSON object + err = json.Unmarshal([]byte(values.Get(name)), sURL.Filter) + } + + if err != nil { + sURL.FilterLabel = "" + sURL.Filter = nil + + return sURL, NewErrMalformedFilterParameter(values.Get(name)) + } + case "sort": + // Sort + for _, rules := range values[name] { + sURL.SortingRules = append(sURL.SortingRules, parseCommaList(rules)...) + } + case "page[size]": + // Page size + size, err := strconv.ParseUint(values.Get(name), 10, 64) + if err != nil { + return sURL, NewErrInvalidPageSizeParameter(values.Get(name)) + } + + sURL.PageSize = uint(size) + case "page[number]": + // Page number + num, err := strconv.ParseUint(values.Get(name), 10, 64) + if err != nil { + return sURL, NewErrInvalidPageNumberParameter(values.Get(name)) + } + + sURL.PageNumber = uint(num) + case "include": + // Include + for _, include := range values[name] { + sURL.Include = append(sURL.Include, parseCommaList(include)...) + } + default: + // Unkmown parameter + return sURL, NewErrUnknownParameter(name) + } } } @@ -157,11 +164,12 @@ func deduceRoute(path []string) string { } if len(path) >= 3 { - if path[2] == rel { + switch { + case path[2] == rel: route += "/" + rel - } else if path[2] == meta { + case path[2] == meta: route += "/" + meta - } else { + default: route += "/" + path[2] } } From 29e54d841738608388d3ac84f6891d27530bf46f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Fri, 15 Nov 2019 19:51:27 -0500 Subject: [PATCH 275/406] Remove some spaces in .golangci.yml --- .golangci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.golangci.yml b/.golangci.yml index d7c555d..d098858 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -43,7 +43,7 @@ issues: - path: doc.go linters: - lll - + - source: ^func linters: - lll From 24d78903fdc269bfe89187e63f3ac221586891dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Fri, 15 Nov 2019 19:53:22 -0500 Subject: [PATCH 276/406] Add empty line between two groups of imports --- link_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/link_test.go b/link_test.go index 62648bd..af3fe65 100644 --- a/link_test.go +++ b/link_test.go @@ -4,6 +4,7 @@ import ( "testing" "github.com/mfcochauxlaberge/jsonapi" + "github.com/stretchr/testify/assert" ) From 75db1d08c7006c4a911a169bcae4bf7f588d7ed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Fri, 15 Nov 2019 20:00:45 -0500 Subject: [PATCH 277/406] Add test for Link.MarshalJSON --- link_test.go | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/link_test.go b/link_test.go index af3fe65..98d8839 100644 --- a/link_test.go +++ b/link_test.go @@ -1,6 +1,7 @@ package jsonapi_test import ( + "errors" "testing" "github.com/mfcochauxlaberge/jsonapi" @@ -14,6 +15,7 @@ func TestMarshalLink(t *testing.T) { tests := []struct { link jsonapi.Link expectedPayload string + expectedErr bool }{ { link: jsonapi.Link{}, @@ -32,12 +34,26 @@ func TestMarshalLink(t *testing.T) { }, }, expectedPayload: `{"href":"example.org","meta":{"n":123,"s":"abc"}}`, + }, { + link: jsonapi.Link{ + HRef: "example.org", + Meta: map[string]interface{}{ + "bad": badMarshaler{}, + }, + }, + expectedErr: true, }, } for _, test := range tests { pl, err := test.link.MarshalJSON() - assert.NoError(err) + assert.Equal(test.expectedErr, err != nil) assert.Equal(test.expectedPayload, string(pl)) } } + +type badMarshaler struct{} + +func (b badMarshaler) MarshalJSON() ([]byte, error) { + return nil, errors.New("error") +} From ae96b7613986c1b599dd3599b961d8d3160dc546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 16 Nov 2019 15:18:36 -0500 Subject: [PATCH 278/406] Fix test function name --- filter_query_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filter_query_test.go b/filter_query_test.go index f81f863..3b82361 100644 --- a/filter_query_test.go +++ b/filter_query_test.go @@ -962,7 +962,7 @@ func TestFilterResource(t *testing.T) { } } -func TestFilterMarshaling(t *testing.T) { +func TestFilterUnmarshaling(t *testing.T) { assert := assert.New(t) // time1, _ := time.Parse(time.RFC3339Nano, "2012-05-16T17:45:28.2539Z") From b6cd1bf153bf82784af7f72909f2aa3ff2cb297a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 16 Nov 2019 16:28:28 -0500 Subject: [PATCH 279/406] Polish filtering implementation and add tests --- filter_query.go | 39 ++++------------ filter_query_test.go | 108 ++++++++++++++++++++++++++++++++----------- 2 files changed, 92 insertions(+), 55 deletions(-) diff --git a/filter_query.go b/filter_query.go index 64407d1..904e36a 100644 --- a/filter_query.go +++ b/filter_query.go @@ -16,30 +16,10 @@ type Filter struct { // filter is an internal version of Filter. type filter struct { - Field string `json:"f"` - Op string `json:"o"` + Field string `json:"f,omitempty"` + Op string `json:"o,omitempty"` Val json.RawMessage `json:"v"` - Col string `json:"c"` -} - -// MarshalJSON marshals a filter into JSON. -func (f *Filter) MarshalJSON() ([]byte, error) { - payload := map[string]interface{}{} - if f.Field != "" { - payload["f"] = f.Field - } - - if f.Op != "" { - payload["o"] = f.Op - } - - payload["v"] = f.Val - - if f.Col != "" { - payload["c"] = f.Col - } - - return json.Marshal(payload) + Col string `json:"c,omitempty"` } // UnmarshalJSON parses the provided data and populates a Filter. @@ -55,7 +35,8 @@ func (f *Filter) UnmarshalJSON(data []byte) error { f.Op = tmpFilter.Op f.Col = tmpFilter.Col - if tmpFilter.Op == "and" || tmpFilter.Op == "or" { + switch tmpFilter.Op { + case "and", "or": f.Field = "" filters := []*Filter{} @@ -66,11 +47,11 @@ func (f *Filter) UnmarshalJSON(data []byte) error { } f.Val = filters - } else { - err := json.Unmarshal(tmpFilter.Val, &f.Val) - if err != nil { - return err - } + default: + // Error checking ignored since it cannot fail at this + // point. The first unmarshaling step of this function + // has already checked the data. + _ = json.Unmarshal(tmpFilter.Val, &f.Val) } return nil diff --git a/filter_query_test.go b/filter_query_test.go index 3b82361..47b2099 100644 --- a/filter_query_test.go +++ b/filter_query_test.go @@ -701,6 +701,7 @@ func TestFilterResource(t *testing.T) { {rval: ptr(true), op: "!=", cval: nilptr("bool"), expected: true}, {rval: ptr(true), op: "!=", cval: ptr(true), expected: false}, {rval: ptr(true), op: "!=", cval: ptr(false), expected: true}, + {rval: nilptr("bool"), op: "bad", cval: nilptr("bool"), expected: false}, // *time.Time {rval: nilptr("time.Time"), op: "=", cval: nilptr("time.Time"), expected: true}, @@ -773,6 +774,9 @@ func TestFilterResource(t *testing.T) { {rval: ptr([]byte{1}), op: ">=", cval: ptr([]byte{0}), expected: true}, {rval: ptr([]byte{1}), op: ">=", cval: ptr([]byte{1}), expected: true}, {rval: ptr([]byte{1}), op: ">=", cval: ptr([]byte{2}), expected: false}, + + // Invalid type + {rval: func() {}, op: "=", cval: func() {}, expected: false}, } for _, test := range attrTests { @@ -981,7 +985,17 @@ func TestFilterUnmarshaling(t *testing.T) { }, { name: "null value", query: `{"v":null}`, - expectedError: false, // TODO + expectedError: false, // TODO Is this okay? + }, { + name: "invalid JSON data", + query: `{"thisis:invalid}`, + expectedFilter: Filter{}, + expectedError: true, + }, { + name: "invalid data", + query: `{"f":42}`, + expectedFilter: Filter{}, + expectedError: true, }, { name: "standard values", query: `{ @@ -997,39 +1011,81 @@ func TestFilterUnmarshaling(t *testing.T) { Col: "col", }, expectedError: false, + }, { + name: "and & or", + query: `{ + "f": "", + "o": "or", + "v": [ + { + "f": "field1", + "o": "=", + "v": 10 + }, + { + "f": "", + "o": "and", + "v": [ + { + "f": "field2", + "o": ">=", + "v": 20 + }, + { + "f": "field3", + "o": "<=", + "v": 30 + } + ] + } + ] + }`, + expectedFilter: Filter{ + Field: "", + Op: "or", + Val: []*Filter{ + { + Field: "field1", + Op: "=", + Val: float64(10), + }, { + Field: "", + Op: "and", + Val: []*Filter{ + { + Field: "field2", + Op: ">=", + Val: float64(20), + }, { + Field: "field3", + Op: "<=", + Val: float64(30), + }, + }, + }, + }, + }, + expectedError: false, + }, { + name: "invalid or", + query: `{ + "f": "", + "o": "or", + "v": "should not be a string" + }`, + expectedFilter: Filter{}, + expectedError: true, }, } for _, test := range tests { - cdt := Filter{} - err := json.Unmarshal([]byte(test.query), &cdt) + filter := Filter{} + err := json.Unmarshal([]byte(test.query), &filter) assert.Equal(test.expectedError, err != nil, test.name) if !test.expectedError { - assert.Equal(test.expectedFilter, cdt, test.name) - - data, err := json.Marshal(&cdt) - assert.NoError(err, test.name) - - assert.Equal( - makeOneLineNoSpaces(test.query), - makeOneLineNoSpaces(string(data)), - test.name, - ) + assert.Equal(test.expectedFilter, filter, test.name) } } - - // Test marshaling error - _, err := json.Marshal(&Filter{ - Op: "=", - Val: func() {}, - }) - assert.Equal(true, err != nil, "function as value") - - _, err = json.Marshal(&Filter{ - Op: "", - Val: "", - }) - assert.Equal(false, err != nil, "empty operation and value") // TODO } From 33f8d39c9e5b90f89080c8a6d66328ff4efbbe53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 16 Nov 2019 16:43:09 -0500 Subject: [PATCH 280/406] Add v1 release details --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.md b/README.md index d4ef03e..5c0cbab 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,20 @@ The official specification can be found at [jsonapi.org/format](http://jsonapi.o The library is in **beta** and its API is subject to change until v1 is released. +In terms of features, jsonapi is complete. The work left is polishing and testing the deisgn of current API. + +### Roadmap to v1 + +While anything can happen before a v1 release, the API is stable and no big changes are expected at this moment. + +A few tasks are required before committing to the current API: + + * Rethink how errors are handled + * Use the new tools introduced in Go 1.13. + * Gather comments from users + * The library should be used on more real projects to see of the API is convenient. + * It is current used by [github.com/mfcochauxlaberge/karigo](http://github.com/mfcochauxlaberge/karigo). + ## Requirements The supported versions of Go are the latest patch releases of every minor release starting with Go 1.11. From 8370678b2832ff2e2dce6bc3b49e31b8cfe01386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 16 Nov 2019 16:54:40 -0500 Subject: [PATCH 281/406] Add list of features in README.md --- README.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/README.md b/README.md index 5c0cbab..e74e29b 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,24 @@ It also offers many tools for parsing URLs, handling resources, managing schemas The official specification can be found at [jsonapi.org/format](http://jsonapi.org/format). +## Features + +jsonapi offers the following features: + + * Marshaling and unmarshaling of JSON:API URLs and documents + * Structs for handling URLs, documents, resources, collections... + * Schema management + * It can ensure relationships between types make sense. + * Very useful for validation when marshaling and unmarshaling. + * Utilities for pagination, sorting, and filtering + * jsonapi is opiniated when it comes to those features. If you prefer you own strategy fo pagination, sorting, and filtering, it will have to be done manually. + * In-memory data store (`SoftCollection`) + * It can store resources (anything that implements `Resource`). + * It can sort, filter, retrieve pages, etc. + * Enough to build a demo API or use in test suites. + * Not made for production use. + * Other useful helpers + ## State The library is in **beta** and its API is subject to change until v1 is released. From 5eb346695337c8c118d28bbfb11023a593ef02be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 16 Nov 2019 17:00:59 -0500 Subject: [PATCH 282/406] Use JSONEq instead of Equal for comparing JSON --- error_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/error_test.go b/error_test.go index 38a6b73..79b4d35 100644 --- a/error_test.go +++ b/error_test.go @@ -323,7 +323,7 @@ func TestErrorMarshalJSON(t *testing.T) { payload, err := json.Marshal(jaerr) assert.NoError(err) - assert.Equal(string(payload), makeOneLineNoSpaces(` + assert.JSONEq(string(payload), ` { "code": "Code", "detail": "Detail", @@ -341,5 +341,5 @@ func TestErrorMarshalJSON(t *testing.T) { "status": "Status", "title": "Title" } - `)) + `) } From 59278df5215d3bde93629cbdc786c292fac0c1d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 16 Nov 2019 17:28:40 -0500 Subject: [PATCH 283/406] Fix two mistakes in README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e74e29b..83787f4 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ A few tasks are required before committing to the current API: * Use the new tools introduced in Go 1.13. * Gather comments from users * The library should be used on more real projects to see of the API is convenient. - * It is current used by [github.com/mfcochauxlaberge/karigo](http://github.com/mfcochauxlaberge/karigo). + * It is currently used by [github.com/mfcochauxlaberge/karigo](http://github.com/mfcochauxlaberge/karigo). ## Requirements @@ -94,7 +94,7 @@ Here are some of the main concepts covered by the library. A `Request` represents an HTTP request structured in a format easily readable from a JSON:API point of view. -If you are familiar to the specification, reading the `Request` struct and its fields (`URL`, `Document`, etc) should be straightforward. +If you are familiar with the specification, reading the `Request` struct and its fields (`URL`, `Document`, etc) should be straightforward. ### Type From 7b124400e8dc2376cd0689f692f8d297f6d9c950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 16 Nov 2019 17:32:17 -0500 Subject: [PATCH 284/406] Improve wording in README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 83787f4..5b2b5cd 100644 --- a/README.md +++ b/README.md @@ -65,8 +65,8 @@ A few tasks are required before committing to the current API: * Rethink how errors are handled * Use the new tools introduced in Go 1.13. - * Gather comments from users - * The library should be used on more real projects to see of the API is convenient. + * Gather feedback from users + * The library should be used more on real projects to see of the API is convenient. * It is currently used by [github.com/mfcochauxlaberge/karigo](http://github.com/mfcochauxlaberge/karigo). ## Requirements From 3d8850f7e7f9586091529b111545329597a54f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 16 Nov 2019 17:38:50 -0500 Subject: [PATCH 285/406] Fix link to karigo repository --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5b2b5cd..2a17063 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ A few tasks are required before committing to the current API: * Use the new tools introduced in Go 1.13. * Gather feedback from users * The library should be used more on real projects to see of the API is convenient. - * It is currently used by [github.com/mfcochauxlaberge/karigo](http://github.com/mfcochauxlaberge/karigo). + * It is currently used by [mfcochauxlaberge/karigo](https://github.com/mfcochauxlaberge/karigo). ## Requirements From c880409e1c749ac7fe1646b6e0d9d5b661c2ce97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 16 Nov 2019 17:51:25 -0500 Subject: [PATCH 286/406] Rewrite description in README.md --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2a17063..99602c1 100644 --- a/README.md +++ b/README.md @@ -27,11 +27,9 @@

)pUB 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

-jsonapi is a complete library to marshal and unmarshal JSON:API payloads. +jsonapi offers a set of tools to build JSON:API compliant services. -It also offers many tools for parsing URLs, handling resources, managing schemas, and building other tools on top of this library. - -The official specification can be found at [jsonapi.org/format](http://jsonapi.org/format). +The official JSON:API specification can be found at [jsonapi.org/format](http://jsonapi.org/format). ## Features From 4339c402d7e80d05ac6f1ccfaf12b015d137ef0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 16 Nov 2019 17:54:15 -0500 Subject: [PATCH 287/406] Move title below logo and badges --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 99602c1..10a0f0e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ -# jsonapi -

@@ -27,6 +25,8 @@
+# jsonapi + jsonapi offers a set of tools to build JSON:API compliant services. The official JSON:API specification can be found at [jsonapi.org/format](http://jsonapi.org/format). From a8f3971a4b55fcfbcf7da3a7a70897d1939c81e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 16 Nov 2019 18:10:04 -0500 Subject: [PATCH 288/406] Fix bug when unmarshaling filter query in NewSimpleURL --- simple_url.go | 1 + 1 file changed, 1 insertion(+) diff --git a/simple_url.go b/simple_url.go index a09967f..b76d37a 100644 --- a/simple_url.go +++ b/simple_url.go @@ -65,6 +65,7 @@ func NewSimpleURL(u *url.URL) (SimpleURL, error) { err = json.Unmarshal([]byte("\""+values.Get(name)+"\""), &sURL.FilterLabel) } else { // It should be a JSON object + sURL.Filter = &Filter{} err = json.Unmarshal([]byte(values.Get(name)), sURL.Filter) } From 90d3e65e3ca35e8bd0d3f1b717dc50aee1115ba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 16 Nov 2019 18:10:51 -0500 Subject: [PATCH 289/406] Add two tests for SimpleURL.Filter --- simple_url_test.go | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/simple_url_test.go b/simple_url_test.go index 018cde9..d492ad0 100644 --- a/simple_url_test.go +++ b/simple_url_test.go @@ -215,6 +215,50 @@ func TestSimpleURL(t *testing.T) { Include: []string{}, }, expectedError: NewErrUnknownParameter("unknownparam"), + }, { + name: "filter query", + url: ` + http://api.example.com/type/id/rel + ?filter={ + "f": "field", + "o": "=", + "v": "abc" + } + `, + expectedURL: SimpleURL{ + Fragments: []string{"type", "id", "rel"}, + Route: "/type/:id/rel", + + Fields: map[string][]string{}, + Filter: &Filter{ + Field: "field", + Op: "=", + Val: "abc", + }, + SortingRules: []string{}, + PageSize: 0, + PageNumber: 0, + Include: []string{}, + }, + expectedError: nil, + }, { + name: "filter query", + url: ` + http://api.example.com/type/id/rel + ?filter={"thisis:invalid"} + `, + expectedURL: SimpleURL{ + Fragments: []string{"type", "id", "rel"}, + Route: "/type/:id/rel", + + Fields: map[string][]string{}, + Filter: nil, + SortingRules: []string{}, + PageSize: 0, + PageNumber: 0, + Include: []string{}, + }, + expectedError: NewErrMalformedFilterParameter(`{"thisis:invalid"}`), }, } From a03509d9b242a81dd02f95e1e64e4121ffb3b288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 16 Nov 2019 18:24:24 -0500 Subject: [PATCH 290/406] Fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 10a0f0e..d846928 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ jsonapi offers the following features: The library is in **beta** and its API is subject to change until v1 is released. -In terms of features, jsonapi is complete. The work left is polishing and testing the deisgn of current API. +In terms of features, jsonapi is complete. The work left is polishing and testing the design of current API. ### Roadmap to v1 From bb54900017c1f1dd4ff47af8da43f1c3843e1361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 18 Nov 2019 22:05:30 -0500 Subject: [PATCH 291/406] Improve formatting --- url_test.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/url_test.go b/url_test.go index b6dc0f3..e5a044e 100644 --- a/url_test.go +++ b/url_test.go @@ -419,7 +419,8 @@ func TestParseParams(t *testing.T) { RelData: map[string][]string{}, SortingRules: []string{ "str", "-int", "bool", "int16", "int32", "int64", "int8", - "time", "uint", "uint16", "uint32", "uint64", "uint8", "id"}, + "time", "uint", "uint16", "uint32", "uint64", "uint8", "id", + }, Include: [][]Rel{}, }, expectedError: false, @@ -439,7 +440,8 @@ func TestParseParams(t *testing.T) { RelData: map[string][]string{}, SortingRules: []string{ "str", "-int", "id", "bool", "int16", "int32", "int64", "int8", - "time", "uint", "uint16", "uint32", "uint64", "uint8"}, + "time", "uint", "uint16", "uint32", "uint64", "uint8", + }, Include: [][]Rel{}, }, expectedError: false, From 53b2b0560a64920822efc2ef84cb2d69318d205b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 18 Nov 2019 22:27:41 -0500 Subject: [PATCH 292/406] Add test where fields query param has duplicates --- url_test.go | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/url_test.go b/url_test.go index e5a044e..879de44 100644 --- a/url_test.go +++ b/url_test.go @@ -445,6 +445,27 @@ func TestParseParams(t *testing.T) { Include: [][]Rel{}, }, expectedError: false, + }, { + name: "fields with duplicates", + url: ` + /mocktypes1 + ?fields[mocktypes1]=str,int16,bool,str + `, + colType: "mocktypes1", + expectedParams: Params{ + Fields: map[string][]string{ + "mocktypes1": mockTypes1.Fields(), + }, + Attrs: map[string][]Attr{}, + Rels: map[string][]Rel{}, + RelData: map[string][]string{}, + SortingRules: []string{ + "str", "-int", "id", "bool", "int16", "int32", "int64", "int8", + "time", "uint", "uint16", "uint32", "uint64", "uint8", + }, + Include: [][]Rel{}, + }, + expectedError: true, }, } From 33208afd3ed57ae4a19f5696159f1fdc16ed41a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 18 Nov 2019 22:29:04 -0500 Subject: [PATCH 293/406] Add test where fields contains id --- url_test.go | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/url_test.go b/url_test.go index 879de44..237b49b 100644 --- a/url_test.go +++ b/url_test.go @@ -466,6 +466,29 @@ func TestParseParams(t *testing.T) { Include: [][]Rel{}, }, expectedError: true, + }, { + name: "fields with id", + url: ` + /mocktypes1 + ?fields[mocktypes1]=str,id + `, + colType: "mocktypes1", + expectedParams: Params{ + Fields: map[string][]string{ + "mocktypes1": {"str", "id"}, + }, + Attrs: map[string][]Attr{}, + Rels: map[string][]Rel{ + "mocktypes1": {}, + }, + RelData: map[string][]string{}, + SortingRules: []string{ + "bool", "int", "int16", "int32", "int64", "int8", "str", + "time", "uint", "uint16", "uint32", "uint64", "uint8", "id", + }, + Include: [][]Rel{}, + }, + expectedError: false, }, } From 77bdc1a01534b5f8c562f57b3860b9c47c2b102e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 18 Nov 2019 22:30:54 -0500 Subject: [PATCH 294/406] Remove unnecessary SortingRules from a test --- url_test.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/url_test.go b/url_test.go index 237b49b..905ee92 100644 --- a/url_test.go +++ b/url_test.go @@ -456,14 +456,11 @@ func TestParseParams(t *testing.T) { Fields: map[string][]string{ "mocktypes1": mockTypes1.Fields(), }, - Attrs: map[string][]Attr{}, - Rels: map[string][]Rel{}, - RelData: map[string][]string{}, - SortingRules: []string{ - "str", "-int", "id", "bool", "int16", "int32", "int64", "int8", - "time", "uint", "uint16", "uint32", "uint64", "uint8", - }, - Include: [][]Rel{}, + Attrs: map[string][]Attr{}, + Rels: map[string][]Rel{}, + RelData: map[string][]string{}, + SortingRules: []string{}, + Include: [][]Rel{}, }, expectedError: true, }, { From 347d5c41c404f022ae131a3780832d846a631091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 18 Nov 2019 22:31:16 -0500 Subject: [PATCH 295/406] Remove unecessary assertions --- url_test.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/url_test.go b/url_test.go index 905ee92..2620ad4 100644 --- a/url_test.go +++ b/url_test.go @@ -498,12 +498,6 @@ func TestParseParams(t *testing.T) { params, err := NewParams(schema, su, test.colType) - if test.expectedError { - assert.Error(err, test.name) - } else { - assert.NoError(err, test.name) - } - // Set Attrs and Rels for colType, fields := range test.expectedParams.Fields { for _, field := range fields { From 6e1afc735753067f6d4ef85446c8174ee7cede10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 18 Nov 2019 22:41:41 -0500 Subject: [PATCH 296/406] Add tests for URL.String --- url_test.go | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/url_test.go b/url_test.go index 2620ad4..276d4b5 100644 --- a/url_test.go +++ b/url_test.go @@ -580,3 +580,49 @@ func TestURLEscaping(t *testing.T) { ) } } + +func TestURLString(t *testing.T) { + assert := assert.New(t) + + // Simple test + raw := ` + /mocktypes1 + ?include= + to-many-from-one.to-one-from-many.to-one.to-many-from-many%2C + to-one-from-one.to-many-from-many + &sort=to-many%2Cstr,%2C%2C-bool + &page[number]=3 + &sort=uint8 + &include= + to-many-from-one, + to-many-from-many + &page[size]=50 + &filter={"f":"str","o":"=","v":"abc"} + ` + expected := ` + /mocktypes1 + ?fields[mocktypes1]=bool,int,int16,int32,int64,int8,str,time,to-many, + to-many-from-many,to-many-from-one,to-one,to-one-from-many, + to-one-from-one,uint,uint16,uint32,uint64,uint8 + &fields[mocktypes2]=boolptr,int16ptr,int32ptr,int64ptr,int8ptr,intptr, + strptr,timeptr,to-many-from-many,to-many-from-one,to-one-from-many, + to-one-from-one,uint16ptr,uint32ptr,uint64ptr,uint8ptr,uintptr + &filter={"f":"str","o":"=","v":"abc","c":""} + &page[number]=3 + &page[size]=50 + &sort=str,-bool,uint8,int,int16,int32,int64,int8,time,uint,uint16, + uint32,uint64,id + ` + + url, err := NewURLFromRaw(newMockSchema(), makeOneLineNoSpaces(raw)) + + assert.NoError(err) + assert.Equal(makeOneLineNoSpaces(expected), url.UnescapedString()) + + // Invalid filter + url.Params.Filter.Val = func() {} + + assert.Panics(func() { + _ = url.String() + }) +} From 3920078b55025ea6dcc46075c6e813eaab3c5677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 18 Nov 2019 22:45:46 -0500 Subject: [PATCH 297/406] Skip error checking when marshaling a string in Link.MarshalJSON --- link.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/link.go b/link.go index 464d3bf..62c26f3 100644 --- a/link.go +++ b/link.go @@ -17,10 +17,7 @@ func (l Link) MarshalJSON() ([]byte, error) { m := map[string]json.RawMessage{} - m["href"], err = json.Marshal(l.HRef) - if err != nil { - return []byte{}, err - } + m["href"], _ = json.Marshal(l.HRef) m["meta"], err = json.Marshal(l.Meta) From 2b85a93defb6f893473f802e254dafdbac17047c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 18 Nov 2019 22:46:22 -0500 Subject: [PATCH 298/406] Remove blank line between function call and its error check --- link.go | 1 - 1 file changed, 1 deletion(-) diff --git a/link.go b/link.go index 62c26f3..1bb657a 100644 --- a/link.go +++ b/link.go @@ -20,7 +20,6 @@ func (l Link) MarshalJSON() ([]byte, error) { m["href"], _ = json.Marshal(l.HRef) m["meta"], err = json.Marshal(l.Meta) - if err != nil { return []byte{}, err } From 4c254f14e45dc792a902b631b38971ae7421b0d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 18 Nov 2019 22:51:13 -0500 Subject: [PATCH 299/406] Add test for when UnmarshalCollection gets bad JSON --- collection_test.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/collection_test.go b/collection_test.go index a066ff9..d85f36f 100644 --- a/collection_test.go +++ b/collection_test.go @@ -27,3 +27,15 @@ func TestResources(t *testing.T) { assert.Equal("id", col.At(0).GetID()) assert.Nil(col.At(1)) } + +func TestUnmarshalCollection(t *testing.T) { + assert := assert.New(t) + + // Invalid payload + payload := `{"no:valid"}` + + col, err := UnmarshalCollection([]byte(payload), nil) + + assert.Error(err) + assert.Nil(col) +} From ea3e2f6157c2e90181819cb83ad92156d247af0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 19 Nov 2019 23:46:06 -0500 Subject: [PATCH 300/406] Add some examples --- README.md | 4 + examples/marshal_document_test.go | 136 ++++++++++++++++++++++++++++ examples/schema_test.go | 63 +++++++++++++ examples/unmarshal_document_test.go | 68 ++++++++++++++ 4 files changed, 271 insertions(+) create mode 100644 examples/marshal_document_test.go create mode 100644 examples/schema_test.go create mode 100644 examples/unmarshal_document_test.go diff --git a/README.md b/README.md index d846928..636c1f9 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,10 @@ A few tasks are required before committing to the current API: The supported versions of Go are the latest patch releases of every minor release starting with Go 1.11. +## Examples + +The best way to learn and appreciate this package is to look at the simple examples provided in the `examples/` directory. + ## Quick start The simplest way to start using jsonapi is to use the MarshalDocument and UnmarshalDocument functions. diff --git a/examples/marshal_document_test.go b/examples/marshal_document_test.go new file mode 100644 index 0000000..8a6aac6 --- /dev/null +++ b/examples/marshal_document_test.go @@ -0,0 +1,136 @@ +package examples_test + +import ( + "bytes" + "encoding/json" + "fmt" + "time" + + "github.com/mfcochauxlaberge/jsonapi" +) + +func ExampleMarshalDocument() { + // See the schema example for more details and the definitions + // of User and Article. + schema := &jsonapi.Schema{} + schema.AddType(jsonapi.MustBuildType(&User{})) + schema.AddType(jsonapi.MustBuildType(&Article{})) + _ = schema.Check() + + now, _ := time.Parse(time.RFC3339, "2019-11-19T23:17:01-05:00") + + // Two objects are created to use in our payload. + user := &User{ + ID: "user1", + Username: "rob", + RegisteredAt: now, + Articles: []string{"article1"}, + } + + article := &Article{ + ID: "article1", + Title: "How to make pizza", + Content: "Buy one.", + CreratedAt: now, + Author: "user1", + } + + doc := &jsonapi.Document{} + // user is wrapped because its type does not implement the + // Resource interface. Wrapping is useful to quickly get + // started, but implementing the interface is necessary if + // performance is an issue. + doc.Data = jsonapi.Wrap(user) + // article is also wrapped. + doc.Include(jsonapi.Wrap(article)) + + // As an example, some meta data is added. + doc.Meta = map[string]interface{}{ + "meta": "meta_value", + } + + // This tells the document that relationship data for articles + // must be included in the payload. + // The relationship links are always included. + doc.RelData = map[string][]string{ + "users": []string{"articles"}, + } + + // A URL represents a JSON:API compliant URL. Query + // parameters are also properly handled. + // A schema is given for validation. For example, it makes + // sure the type mentioned in the path exists. + url, _ := jsonapi.NewURLFromRaw(schema, `/users/user1?include=articles`) + + // MarhsalDocument marshals the document into a JSON:API + // compliant payload and uses the given URL to add links + // and know which fields to include in the result (through + // the fields[...] query parameters). + payload, _ := jsonapi.MarshalDocument(doc, url) + + // Beautify the output for clarity. + out := &bytes.Buffer{} + json.Indent(out, payload, "", "\t") + + // Print the result. + fmt.Println(string(out.Bytes())) + // Output: + // { + // "data": { + // "attributes": { + // "registered-at": "2019-11-19T23:17:01-05:00", + // "username": "rob" + // }, + // "id": "user1", + // "links": { + // "self": "/users/user1" + // }, + // "relationships": { + // "articles": { + // "data": [ + // { + // "id": "article1", + // "type": "articles" + // } + // ], + // "links": { + // "related": "/users/user1/articles", + // "self": "/users/user1/relationships/articles" + // } + // } + // }, + // "type": "users" + // }, + // "included": [ + // { + // "attributes": { + // "content": "Buy one.", + // "created-at": "2019-11-19T23:17:01-05:00", + // "title": "How to make pizza" + // }, + // "id": "article1", + // "links": { + // "self": "/articles/article1" + // }, + // "relationships": { + // "author": { + // "links": { + // "related": "/articles/article1/author", + // "self": "/articles/article1/relationships/author" + // } + // } + // }, + // "type": "articles" + // } + // ], + // "jsonapi": { + // "version": "1.0" + // }, + // "links": { + // "self": "/users/user1?fields%5Barticles%5D=author%2Ccontent%2Ccreated-at%2Ctitle\u0026fields%5Busers%5D=articles%2Cregistered-at%2Cusername" + // }, + // "meta": { + // "meta": "meta_value" + // } + // } +} diff --git a/examples/schema_test.go b/examples/schema_test.go new file mode 100644 index 0000000..abc2b3d --- /dev/null +++ b/examples/schema_test.go @@ -0,0 +1,63 @@ +package examples_test + +import ( + "fmt" + "time" + + "github.com/mfcochauxlaberge/jsonapi" +) + +func ExampleSchema() { + // A schema holds a list of types. + schema := &jsonapi.Schema{} + + schema.AddType(jsonapi.MustBuildType(User{})) + schema.AddType(jsonapi.MustBuildType(Article{})) + + // A schema can be checked. Some validation is performed + // like checking the names and making sure relationships + // point to types that exist. + // It is possible to modify a schema at anytime, but a call + // to Check should always be performed before using it. + // If the data it contains in inconsistent, this library + // can behave unexpectedly. + _ = schema.Check() + + // Useful methods are offered, like HasType. + has := schema.HasType("users") + fmt.Println(has) + // Output: true +} + +// The following structs are defined and used in this file, but they are also +// used in other example. + +type User struct { + // The ID field is mandatory and the api tag sets the type name. + ID string `json:"id" api:"users"` + + // Attributes + // They are defined by setting the api to tag "attr". + Username string `json:"username" api:"attr"` + RegisteredAt time.Time `json:"registered-at" api:"attr"` + + // Relationships + // They are defined by setting the api to tag "rel," followed + // by the name of the target type. Optionally, a third argument + // can be given to specify a relationship on the target type + // which indicates a two-way relationship. + Articles []string `json:"articles" api:"rel,articles,author"` +} + +type Article struct { + // The ID field is mandatory and the api tag sets the type name. + ID string `json:"id" api:"articles"` + + // Attributes + Title string `json:"title" api:"attr"` + Content string `json:"content" api:"attr"` + CreratedAt time.Time `json:"created-at" api:"attr"` + + // Relationships + Author string `json:"author" api:"rel,author,articles"` +} diff --git a/examples/unmarshal_document_test.go b/examples/unmarshal_document_test.go new file mode 100644 index 0000000..8069977 --- /dev/null +++ b/examples/unmarshal_document_test.go @@ -0,0 +1,68 @@ +package examples_test + +import ( + "fmt" + + "github.com/mfcochauxlaberge/jsonapi" +) + +func ExampleUnmarshalDocument() { + // See the schema example for more details and the definitions + // of User and Article. + schema := &jsonapi.Schema{} + schema.AddType(jsonapi.MustBuildType(User{})) + schema.AddType(jsonapi.MustBuildType(Article{})) + _ = schema.Check() + + // This is the payload to be unmarshaled. + payload := ` + { + "data": { + "attributes": { + "registered-at": "2019-11-19T23:17:01-05:00", + "username": "rob" + }, + "id": "user1", + "relationships": { + "articles": { + "data": [ + { + "type": "articles", + "id": "article1" + } + ] + } + }, + "type": "users" + }, + "jsonapi": { + "version": "1.0" + }, + "meta": { + "meta": "meta_value" + } + } + ` + + // UnmarhsalDocument unmarshals a payload using a schema for some + // validation and returns a document. + doc, err := jsonapi.UnmarshalDocument([]byte(payload), schema) + if err != nil { + panic(err) + } + + // If the data top-level field contains something valid, it will be + // an object that implements the Resource or Collection interface. + res, _ := doc.Data.(jsonapi.Resource) + + // Print the result. + fmt.Printf("user.ID: %s\n", res.GetID()) + fmt.Printf("user.Username: %s\n", res.Get("username")) + fmt.Printf("user.RegisteredAt: %s\n", res.Get("registered-at")) + fmt.Printf("user.Articles: %s\n", res.GetToMany("articles")) + // Output: + // user.ID: user1 + // user.Username: rob + // user.RegisteredAt: 2019-11-19 23:17:01 -0500 EST + // user.Articles: [article1] +} From cfceb4826841964c3f3e45dcb5abff89de7089f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Wed, 20 Nov 2019 18:48:13 -0500 Subject: [PATCH 301/406] Add SoftResource example --- examples/soft_resource_test.go | 35 ++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 examples/soft_resource_test.go diff --git a/examples/soft_resource_test.go b/examples/soft_resource_test.go new file mode 100644 index 0000000..a8a9f56 --- /dev/null +++ b/examples/soft_resource_test.go @@ -0,0 +1,35 @@ +package examples_test + +import ( + "fmt" + + "github.com/mfcochauxlaberge/jsonapi" +) + +func ExampleSoftResource() { + // A SoftResource is a struct that implements the Resource + // interface. It holds a Type object that defines its type and + // that type is mutable + sr := &jsonapi.SoftResource{} + + // One use case for a SoftResource is handling a JSON request + // where not all possible fields have been defined in the payload. + // The jsonapi library can create a SoftResource with a new type + // that contains a subset of the fields from the original type. + + // The resource can be modified. + sr.SetID("user1") + + // When an attribute is added, its value is automatically set to + // the zero value of the type. + sr.AddAttr(jsonapi.Attr{ + Name: "username", + Type: jsonapi.AttrTypeString, + Nullable: false, + }) + sr.Set("username", "rob") + + fmt.Println(sr.Get("username")) + // Output: + // rob +} From 44c92013ab1d93a215e6c53ca78936995954c53c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Wed, 20 Nov 2019 19:21:01 -0500 Subject: [PATCH 302/406] Improve output of time field Using Time.String is unpredictable. --- examples/unmarshal_document_test.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/examples/unmarshal_document_test.go b/examples/unmarshal_document_test.go index 8069977..016eb30 100644 --- a/examples/unmarshal_document_test.go +++ b/examples/unmarshal_document_test.go @@ -2,6 +2,7 @@ package examples_test import ( "fmt" + "time" "github.com/mfcochauxlaberge/jsonapi" ) @@ -58,11 +59,13 @@ func ExampleUnmarshalDocument() { // Print the result. fmt.Printf("user.ID: %s\n", res.GetID()) fmt.Printf("user.Username: %s\n", res.Get("username")) - fmt.Printf("user.RegisteredAt: %s\n", res.Get("registered-at")) + tm := res.Get("registered-at").(time.Time) + out, _ := tm.MarshalText() + fmt.Printf("user.RegisteredAt: %s\n", out) fmt.Printf("user.Articles: %s\n", res.GetToMany("articles")) // Output: // user.ID: user1 // user.Username: rob - // user.RegisteredAt: 2019-11-19 23:17:01 -0500 EST + // user.RegisteredAt: 2019-11-19T23:17:01-05:00 // user.Articles: [article1] } From c9b396c9f73b7b36bfd99e6e207af4cb58bd5614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Wed, 20 Nov 2019 19:48:18 -0500 Subject: [PATCH 303/406] Update CI to cover subpackages --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 68a2817..7489611 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ before_script: script: - ./bin/golangci-lint run - - go test -race -coverprofile=coverage.txt -covermode=atomic + - go test ./... -race -coverprofile=coverage.txt -covermode=atomic after_success: - bash <(curl -s https://codecov.io/bash) From b3696ad19e4d67d516572a39d4d11938cbef9ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 21 Nov 2019 22:01:40 -0500 Subject: [PATCH 304/406] Add SoftCollection example --- examples/soft_collection_test.go | 41 ++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 examples/soft_collection_test.go diff --git a/examples/soft_collection_test.go b/examples/soft_collection_test.go new file mode 100644 index 0000000..6a070ae --- /dev/null +++ b/examples/soft_collection_test.go @@ -0,0 +1,41 @@ +package examples_test + +import ( + "fmt" + + "github.com/mfcochauxlaberge/jsonapi" +) + +func ExampleSoftCollection() { + // A SoftCollection implements the Collection interface. It can + // only contain SoftResources which all share the same common type. + sc := &jsonapi.SoftCollection{} + sc.Type = &jsonapi.Type{ + Name: "users", + } + sc.AddAttr(jsonapi.Attr{ + Name: "username", + Type: jsonapi.AttrTypeString, + Nullable: false, + }) + + // A SoftResource is added to the collection. Its type will be + // set to the SoftCollection's type. + sr := &jsonapi.SoftResource{} + sc.Add(sr) + + // Normally, the following line would not work if username was + // not alrady defined. + sr.Set("username", "rob") + + // An attribute is added to the type through the SoftCollection. + sc.AddAttr(jsonapi.Attr{ + Name: "admin", + Type: jsonapi.AttrTypeBool, + Nullable: false, + }) + + // Now, all resources inside the collection have the new field. + fmt.Println(sc.At(0).Get("admin")) + // Output: false +} From 011cfcd47c10d15814841bfb5b7a8017a3cd5c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Fri, 22 Nov 2019 21:06:47 -0500 Subject: [PATCH 305/406] Add Wrapper example --- examples/wrapper_test.go | 47 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 examples/wrapper_test.go diff --git a/examples/wrapper_test.go b/examples/wrapper_test.go new file mode 100644 index 0000000..a44ad1b --- /dev/null +++ b/examples/wrapper_test.go @@ -0,0 +1,47 @@ +package examples_test + +import ( + "fmt" + + "github.com/mfcochauxlaberge/jsonapi" +) + +func ExampleWrapper() { + // The Resource interface is useful for the jsonapi library. It + // makes manipulation of the resource much easier. But it requires + // some work and can be annoying when one wants to make a quick + // project where performance is not an issue. + + // The Wrap function exists to solve this problem. It takes an + // object or a pointer to an object and return a Wrapper, which + // which is a struct that implements the Resource interface. When + // the methods of the interface are used to modify a resource, the + // Wrapper can use reflection to mutate the original object. That + // means that if Wrap is given a pointer, that object is modified + // and the original pointer can still be used to handle the object + // in a native and type safe way. + wrap := jsonapi.Wrap(Animal{}) + + // The resource can be modified. + wrap.SetID("animal1") + wrap.Set("name", "Gopher") + + // Unlike a SoftResource, its type cannot changed. It is defined + // by the struct definition. + // + // A Type object is still generated and can be retrieved. + _ = wrap.GetType() + + fmt.Println(wrap.Get("name").(string)) + // Output: + // Gopher +} + +// Animal does not implement the Resource interface, but can be +// wrapped if it follows the struct format defined by the jsonapi +// library (ID field, attr tags, rel tags, etc). +type Animal struct { + ID string `json:"id" api:"animals"` + + Name string `json:"name" api:"attr"` +} From 374ad1b3b64a056206f5901bf65e7e2914c7df2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Fri, 22 Nov 2019 21:07:07 -0500 Subject: [PATCH 306/406] Add missing dot in comment --- examples/soft_resource_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/soft_resource_test.go b/examples/soft_resource_test.go index a8a9f56..db76925 100644 --- a/examples/soft_resource_test.go +++ b/examples/soft_resource_test.go @@ -9,7 +9,7 @@ import ( func ExampleSoftResource() { // A SoftResource is a struct that implements the Resource // interface. It holds a Type object that defines its type and - // that type is mutable + // that type is mutable. sr := &jsonapi.SoftResource{} // One use case for a SoftResource is handling a JSON request From 7c7b4884c0ee651e8f6e53d2b0ff0543bd82e788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 23 Nov 2019 16:14:08 -0500 Subject: [PATCH 307/406] Add top comment for SoftResource.GetType --- soft_resource.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soft_resource.go b/soft_resource.go index 3f12fd4..e03be6a 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -123,7 +123,7 @@ func (sr *SoftResource) SetID(id string) { sr.id = id } -// SetType ... +// SetType sets the resource's type. func (sr *SoftResource) SetType(typ *Type) { sr.check() sr.Type = typ From d9a75d09bb38595b46885e47dd620b23e52efc2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 24 Nov 2019 09:00:52 -0500 Subject: [PATCH 308/406] Use make to create []Rel of correct size --- schema.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema.go b/schema.go index 59da831..dc67250 100644 --- a/schema.go +++ b/schema.go @@ -103,7 +103,7 @@ func (s *Schema) RemoveRel(typ string, rel string) { func (s *Schema) Rels() []Rel { s.buildRels() - rels := []Rel{} + rels := make([]Rel, len(s.rels)) for _, rel := range s.rels { rels = append(rels, rel) } From 7cee00704242a6968d0a593fbacc73a6f469a80d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 24 Nov 2019 09:02:02 -0500 Subject: [PATCH 309/406] Realign Schema.HasType top comment --- schema.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schema.go b/schema.go index dc67250..9142a3b 100644 --- a/schema.go +++ b/schema.go @@ -117,8 +117,8 @@ func (s *Schema) Rels() []Rel { return rels } -// HasType returns a boolean indicating whether a type has the specified -// name or not. +// HasType returns a boolean indicating whether a type has the specified name or +// not. func (s *Schema) HasType(name string) bool { for i := range s.Types { if s.Types[i].Name == name { From 4f86b628a90e2e56376d056e80b85853d6fd90ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 24 Nov 2019 09:44:12 -0500 Subject: [PATCH 310/406] Fix slice initialization bug --- schema.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema.go b/schema.go index 9142a3b..0bc3350 100644 --- a/schema.go +++ b/schema.go @@ -103,7 +103,7 @@ func (s *Schema) RemoveRel(typ string, rel string) { func (s *Schema) Rels() []Rel { s.buildRels() - rels := make([]Rel, len(s.rels)) + rels := make([]Rel, 0, len(s.rels)) for _, rel := range s.rels { rels = append(rels, rel) } From 6f3097b246589f7994dbf46365ad555604152456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 24 Nov 2019 10:32:41 -0500 Subject: [PATCH 311/406] Fix and improve the Schema example --- examples/schema_test.go | 81 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 75 insertions(+), 6 deletions(-) diff --git a/examples/schema_test.go b/examples/schema_test.go index abc2b3d..f53a381 100644 --- a/examples/schema_test.go +++ b/examples/schema_test.go @@ -2,6 +2,7 @@ package examples_test import ( "fmt" + "sort" "time" "github.com/mfcochauxlaberge/jsonapi" @@ -11,9 +12,65 @@ func ExampleSchema() { // A schema holds a list of types. schema := &jsonapi.Schema{} + // A type holds information about a type, like its name, + // attributes, and relationships. + comments := jsonapi.Type{ + Name: "comments", + } + + // Attributes can be added. + comments.AddAttr(jsonapi.Attr{ + Name: "content", + Type: jsonapi.AttrTypeString, + Nullable: false, + }) + + // Relationships can be added. + comments.AddRel(jsonapi.Rel{ + FromType: "comments", + FromName: "author", + ToOne: true, + ToType: "users", + ToName: "comments", + FromOne: false, + }) + comments.AddRel(jsonapi.Rel{ + FromType: "comments", + FromName: "article", + ToOne: true, + ToType: "articles", + ToName: "comments", + FromOne: false, + }) + + // Finally, the type is added to the schema. But it can + // still be modified after. + schema.AddType(comments) + + // Here, types are built from structs and added. schema.AddType(jsonapi.MustBuildType(User{})) schema.AddType(jsonapi.MustBuildType(Article{})) + // Since a comments type was added dynamically, the two types + // added above to not contain the necessary relationships, but + // they can be added. + schema.AddRel("users", jsonapi.Rel{ + FromType: "users", + FromName: "comments", + ToOne: false, + ToType: "comments", + ToName: "author", + FromOne: true, + }) + schema.AddRel("articles", jsonapi.Rel{ + FromType: "articles", + FromName: "comments", + ToOne: false, + ToType: "comments", + ToName: "article", + FromOne: true, + }) + // A schema can be checked. Some validation is performed // like checking the names and making sure relationships // point to types that exist. @@ -23,14 +80,26 @@ func ExampleSchema() { // can behave unexpectedly. _ = schema.Check() - // Useful methods are offered, like HasType. - has := schema.HasType("users") - fmt.Println(has) - // Output: true + // This schema contains 0 errors and three types. + out := []string{ + fmt.Sprint(len(schema.Check())), // 0 + } + for _, typ := range schema.Types { + out = append(out, typ.Name) + } + sort.Strings(out) + for _, name := range out { + fmt.Println(name) + } + // Output: + // 0 + // articles + // comments + // users } // The following structs are defined and used in this file, but they are also -// used in other example. +// used in other examples. type User struct { // The ID field is mandatory and the api tag sets the type name. @@ -59,5 +128,5 @@ type Article struct { CreratedAt time.Time `json:"created-at" api:"attr"` // Relationships - Author string `json:"author" api:"rel,author,articles"` + Author string `json:"author" api:"rel,users,articles"` } From 250663e0597f0f96bafa1736fb1205fd70869ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 24 Nov 2019 10:42:22 -0500 Subject: [PATCH 312/406] Update example in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 636c1f9..4164fd4 100644 --- a/README.md +++ b/README.md @@ -169,7 +169,7 @@ sr := SoftResource{} sr.AddAttr(Attr{ Name: "attr", Type: AttrTypeInt, - Null: false, + Nullable: false, }) fmt.Println(sr.Get("attr")) // Output: 0 ``` From 229907b76c2897fc0dfd83038ab4acc5069c7e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 25 Nov 2019 22:05:37 -0500 Subject: [PATCH 313/406] Change color of minimum Go version badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4164fd4..7b5f64f 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@
- + From 1624146a32b9e258fb08b50716f596f90a3cd338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 2 Dec 2019 21:57:16 -0500 Subject: [PATCH 314/406] Break MustBuildType's top-level comment in two --- helpers.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/helpers.go b/helpers.go index 6f0787f..f3e7868 100644 --- a/helpers.go +++ b/helpers.go @@ -178,8 +178,9 @@ func BuildType(v interface{}) (Type, error) { return typ, nil } -// MustBuildType calls BuildType and returns the result, except that it panics -// if the error is not nil. +// MustBuildType calls BuildType and returns the result. +// +// It panics if the error returned by BuildType is not nil. func MustBuildType(v interface{}) Type { typ, err := BuildType(v) if err != nil { From d5529b81b19f0ffb317c18c7eeb25d382d64aab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 2 Dec 2019 22:06:48 -0500 Subject: [PATCH 315/406] Fix assert call --- wrapper_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wrapper_test.go b/wrapper_test.go index 511005f..fb86fb2 100644 --- a/wrapper_test.go +++ b/wrapper_test.go @@ -179,14 +179,14 @@ func TestWrapper(t *testing.T) { // We first do a != nil check because that's what we are really // checking and reflect.DeepEqual doesn't work exactly work the same // way. If the nil check fails, then the next line will fail too. - assert.Equal(t, "nil pointer", nil, wrap2.Get("uintptr")) + assert.Equal("nil pointer", nil, wrap2.Get("uintptr")) } if res2.UintPtr != nil { // We first do a != nil check because that's what we are really // checking and reflect.DeepEqual doesn't work exactly work the same // way. If the nil check fails, then the next line will fail too. - assert.Equal(t, "nil pointer 2", nil, res2.UintPtr) + assert.Equal("nil pointer 2", nil, res2.UintPtr) } // New From 5d0285cd3c7845b42386ac4427148fa1df9fbe33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Wed, 4 Dec 2019 21:59:32 -0500 Subject: [PATCH 316/406] Remove error when unmarshaling document without data member --- document.go | 6 ++++-- document_test.go | 3 --- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/document.go b/document.go index a0f2c4e..506bd41 100644 --- a/document.go +++ b/document.go @@ -217,8 +217,6 @@ func UnmarshalDocument(payload []byte, schema *Schema) (*Document, error) { } case len(ske.Errors) > 0: doc.Errors = ske.Errors - default: - return nil, NewErrMissingDataMember() } // Included @@ -248,5 +246,9 @@ func UnmarshalDocument(payload []byte, schema *Schema) (*Document, error) { // Meta doc.Meta = ske.Meta + // TODO Return an error if there is no data (not even + // null), no errors, and no meta. The JSON:API specification + // considers this invalid. + return doc, nil } diff --git a/document_test.go b/document_test.go index 1728697..57cafbb 100644 --- a/document_test.go +++ b/document_test.go @@ -497,9 +497,6 @@ func TestUnmarshalDocument(t *testing.T) { }, { payload: `{"data":[{"id":true}]}`, expected: "400 Bad Request: The provided JSON body could not be read.", - }, { - payload: `{"jsonapi":{"key":"data/errors missing"}}`, - expected: "400 Bad Request: Missing data top-level member in payload.", }, { payload: `{"data":null,"included":[{"id":true}]}`, expected: "json: " + From 23b9aea910787444c3bf87a58075fd8cc1582be2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Fri, 6 Dec 2019 19:27:39 -0500 Subject: [PATCH 317/406] Fix formatting in README.md example --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7b5f64f..f331b7a 100644 --- a/README.md +++ b/README.md @@ -167,8 +167,8 @@ A SoftResource is a struct whose type (name, attributes, and relationships) can ```go sr := SoftResource{} sr.AddAttr(Attr{ - Name: "attr", - Type: AttrTypeInt, + Name: "attr", + Type: AttrTypeInt, Nullable: false, }) fmt.Println(sr.Get("attr")) // Output: 0 From 2ce444829a973093372e593fc3c4cfa295f7e418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Fri, 13 Dec 2019 17:03:07 -0500 Subject: [PATCH 318/406] Initialize some slices with make where length is known --- document.go | 9 +++------ identifiers.go | 6 +++--- params.go | 4 ++-- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/document.go b/document.go index 506bd41..ba47ae1 100644 --- a/document.go +++ b/document.go @@ -221,16 +221,13 @@ func UnmarshalDocument(payload []byte, schema *Schema) (*Document, error) { // Included if len(ske.Included) > 0 { - inc := Identifier{} - incs := []Identifier{} + incs := make([]Identifier, len(ske.Included)) - for _, rawInc := range ske.Included { - err = json.Unmarshal(rawInc, &inc) + for i, rawInc := range ske.Included { + err = json.Unmarshal(rawInc, &incs[i]) if err != nil { return nil, err } - - incs = append(incs, inc) } for i := range incs { diff --git a/identifiers.go b/identifiers.go index 4572cab..4bee892 100644 --- a/identifiers.go +++ b/identifiers.go @@ -23,10 +23,10 @@ type Identifiers []Identifier // IDs returns the IDs part of the Identifiers. func (i Identifiers) IDs() []string { - ids := []string{} + ids := make([]string, len(i)) - for _, id := range i { - ids = append(ids, id.ID) + for n := range i { + ids[n] = i[n].ID } return ids diff --git a/params.go b/params.go index d3b92c9..3d9104f 100644 --- a/params.go +++ b/params.go @@ -133,8 +133,8 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { // it is checked earlier. typ := schema.GetType(typeName) - params.Attrs[typeName] = []Attr{} - params.Rels[typeName] = []Rel{} + params.Attrs[typeName] = make([]Attr, 0, len(typ.Attrs)) + params.Rels[typeName] = make([]Rel, 0, len(typ.Attrs)) for _, field := range typ.Fields() { for _, field2 := range fields { From a4b79985e3f7e3459aabaf9b27f1d0c2e1596785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 14 Dec 2019 09:55:35 -0500 Subject: [PATCH 319/406] Rename link to karigo project in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f331b7a..ba078d3 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ A few tasks are required before committing to the current API: * Use the new tools introduced in Go 1.13. * Gather feedback from users * The library should be used more on real projects to see of the API is convenient. - * It is currently used by [mfcochauxlaberge/karigo](https://github.com/mfcochauxlaberge/karigo). + * It is currently used by [karigo](https://github.com/mfcochauxlaberge/karigo). ## Requirements From 5a90303bbd278b90e632d590e2835dd9b70a8e0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 14 Dec 2019 10:34:22 -0500 Subject: [PATCH 320/406] Modify comment about documentation and learning --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ba078d3..f9b3d42 100644 --- a/README.md +++ b/README.md @@ -186,4 +186,4 @@ It is also possible to build a `URL` from a `Schema` and a `SimpleURL` which con Check out the [documentation](https://godoc.org/github.com/mfcochauxlaberge/jsonapi). -The best way to learn how to use it is to look at the source code and its comments. +The best way to learn how to use it is to look at documentation, the examples,.and the code itself. From 802ae1af07378ed9bf7c223e2bc58330d08e378a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 15 Dec 2019 15:49:56 -0500 Subject: [PATCH 321/406] Rename parameter in GetZeroValue to nullable --- type.go | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/type.go b/type.go index 9d5e210..556c68d 100644 --- a/type.go +++ b/type.go @@ -483,102 +483,102 @@ func GetAttrTypeString(t int, nullable bool) string { // GetZeroValue returns the zero value of the attribute type represented by the // specified int (see constants). // -// If null is true, the returned value is a nil pointer. -func GetZeroValue(t int, null bool) interface{} { +// If nullable is true, the returned value is a nil pointer. +func GetZeroValue(t int, nullable bool) interface{} { switch t { case AttrTypeString: - if null { + if nullable { var np *string return np } return "" case AttrTypeInt: - if null { + if nullable { var np *int return np } return int(0) case AttrTypeInt8: - if null { + if nullable { var np *int8 return np } return int8(0) case AttrTypeInt16: - if null { + if nullable { var np *int16 return np } return int16(0) case AttrTypeInt32: - if null { + if nullable { var np *int32 return np } return int32(0) case AttrTypeInt64: - if null { + if nullable { var np *int64 return np } return int64(0) case AttrTypeUint: - if null { + if nullable { var np *uint return np } return uint(0) case AttrTypeUint8: - if null { + if nullable { var np *uint8 return np } return uint8(0) case AttrTypeUint16: - if null { + if nullable { var np *uint16 return np } return uint16(0) case AttrTypeUint32: - if null { + if nullable { var np *uint32 return np } return uint32(0) case AttrTypeUint64: - if null { + if nullable { var np *uint64 return np } return uint64(0) case AttrTypeBool: - if null { + if nullable { var np *bool return np } return false case AttrTypeTime: - if null { + if nullable { var np *time.Time return np } return time.Time{} case AttrTypeBytes: - if null { + if nullable { var np *[]byte return np } From 9c98a8b49c36510dc13459b77f5bd7cd98b6b5d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 15 Dec 2019 20:15:00 -0500 Subject: [PATCH 322/406] Improve unmarshaling of identifiers --- identifiers.go | 46 +++++++++++++++++++++++++----- identifiers_test.go | 68 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 7 deletions(-) diff --git a/identifiers.go b/identifiers.go index 4bee892..e243329 100644 --- a/identifiers.go +++ b/identifiers.go @@ -1,6 +1,10 @@ package jsonapi -import "encoding/json" +import ( + "encoding/json" + "errors" + "fmt" +) // NewIdentifiers returns an Identifiers object. // @@ -44,9 +48,22 @@ type Identifier struct { // schema must not be nil. func UnmarshalIdentifier(payload []byte, schema *Schema) (Identifier, error) { iden := Identifier{} + err := json.Unmarshal(payload, &iden) - // TODO Validate with schema. - return iden, err + if err != nil { + return Identifier{}, err + } + + switch { + case iden.ID == "": + return Identifier{}, errors.New("identifier has no ID") + case iden.Type == "": + return Identifier{}, errors.New("identifier has no type") + case schema != nil && !schema.HasType(iden.Type): + return Identifier{}, fmt.Errorf("type %q is unknown", iden.Type) + } + + return iden, nil } // UnmarshalIdentifiers reads a payload where the main data is a collection of @@ -54,8 +71,23 @@ func UnmarshalIdentifier(payload []byte, schema *Schema) (Identifier, error) { // // schema must not be nil. func UnmarshalIdentifiers(payload []byte, schema *Schema) (Identifiers, error) { - idens := Identifiers{} - err := json.Unmarshal(payload, &idens) - // TODO Validate with schema. - return idens, err + raw := []*json.RawMessage{} + + err := json.Unmarshal(payload, &raw) + if err != nil { + return Identifiers{}, err + } + + idens := make([]Identifier, len(raw)) + + for i, r := range raw { + iden, err := UnmarshalIdentifier(*r, schema) + if err != nil { + return nil, err + } + + idens[i] = iden + } + + return idens, nil } diff --git a/identifiers_test.go b/identifiers_test.go index bfa8bee..48b0327 100644 --- a/identifiers_test.go +++ b/identifiers_test.go @@ -48,6 +48,52 @@ func TestUnmarshalIdentifiers(t *testing.T) { assert.Equal(iden, iden2) }) + t.Run("identifier without ID", func(t *testing.T) { + assert := assert.New(t) + + payload, err := json.Marshal(Identifier{ + ID: "", + Type: "mocktype", + }) + assert.NoError(err) + + _, err = UnmarshalIdentifier(payload, schema) + assert.EqualError(err, "identifier has no ID") + }) + + t.Run("identifier without type", func(t *testing.T) { + assert := assert.New(t) + + payload, err := json.Marshal(Identifier{ + ID: "abc123", + Type: "", + }) + assert.NoError(err) + + _, err = UnmarshalIdentifier(payload, schema) + assert.EqualError(err, "identifier has no type") + }) + + t.Run("identifier with unknown type", func(t *testing.T) { + assert := assert.New(t) + + payload, err := json.Marshal(Identifier{ + ID: "abc123", + Type: "unknown", + }) + assert.NoError(err) + + _, err = UnmarshalIdentifier(payload, schema) + assert.EqualError(err, "type \"unknown\" is unknown") + }) + + t.Run("identifier from invalid JSON payload", func(t *testing.T) { + assert := assert.New(t) + + _, err := UnmarshalIdentifier([]byte(`{"inva:lid"}`), schema) + assert.EqualError(err, "invalid character '}' after object key") + }) + t.Run("identifers", func(t *testing.T) { assert := assert.New(t) @@ -69,4 +115,26 @@ func TestUnmarshalIdentifiers(t *testing.T) { assert.NoError(err) assert.Equal(idens, idens2) }) + + t.Run("identifiers with invalid identifier", func(t *testing.T) { + assert := assert.New(t) + + payload, err := json.Marshal(Identifiers{ + Identifier{ + ID: "abc123", + Type: "", + }, + }) + assert.NoError(err) + + _, err = UnmarshalIdentifiers(payload, schema) + assert.EqualError(err, "identifier has no type") + }) + + t.Run("identifiers from invalid JSON payload", func(t *testing.T) { + assert := assert.New(t) + + _, err := UnmarshalIdentifiers([]byte(`{"inva:lid"}`), schema) + assert.EqualError(err, "invalid character '}' after object key") + }) } From 8be3d9cdbc0b6e33d3af50a8a58895080c2fbbec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 15 Dec 2019 20:26:58 -0500 Subject: [PATCH 323/406] Remove confusing TODO comment --- resource.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resource.go b/resource.go index 5f12545..d1a8aca 100644 --- a/resource.go +++ b/resource.go @@ -124,7 +124,7 @@ func MarshalResource(r Resource, prepath string, fields []string, relData map[st // Links mapPl["links"] = map[string]string{ - "self": buildSelfLink(r, prepath), // TODO + "self": buildSelfLink(r, prepath), } // NOTE An error should not happen. From 44931d0a9902d002b8489b638b9ea9e98becd30c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 15 Dec 2019 21:50:55 -0500 Subject: [PATCH 324/406] Fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f9b3d42..19607e4 100644 --- a/README.md +++ b/README.md @@ -186,4 +186,4 @@ It is also possible to build a `URL` from a `Schema` and a `SimpleURL` which con Check out the [documentation](https://godoc.org/github.com/mfcochauxlaberge/jsonapi). -The best way to learn how to use it is to look at documentation, the examples,.and the code itself. +The best way to learn how to use it is to look at documentation, the examples, and the code itself. From 22e6508f2c2997bdeb6e81933556a2b49d639c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 21 Dec 2019 14:17:17 -0500 Subject: [PATCH 325/406] Use Type.Copy instead of copystructure --- soft_collection_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/soft_collection_test.go b/soft_collection_test.go index 3b5363f..2677730 100644 --- a/soft_collection_test.go +++ b/soft_collection_test.go @@ -5,7 +5,6 @@ import ( . "github.com/mfcochauxlaberge/jsonapi" - "github.com/mitchellh/copystructure" "github.com/stretchr/testify/assert" ) @@ -45,7 +44,7 @@ func TestSoftCollection(t *testing.T) { // Make a copy so that modifying the original typ // does not modify the SoftCollection's type. - typcopy := copystructure.Must(copystructure.Copy(typ)).(Type) + typcopy := typ.Copy() sc.SetType(&typcopy) assert.Equal(t, sc.Type, &typ) From 46b89d0ff2e2d731b3c27583108aa5f6966f1dfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 21 Dec 2019 14:20:15 -0500 Subject: [PATCH 326/406] Copy type with Type.Copy in SoftResource's methods --- soft_resource.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/soft_resource.go b/soft_resource.go index e03be6a..ca1cee3 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -85,8 +85,10 @@ func (sr *SoftResource) Rel(key string) Rel { func (sr *SoftResource) New() Resource { sr.check() + typ := sr.Type.Copy() + return &SoftResource{ - Type: copystructure.Must(copystructure.Copy(sr.Type)).(*Type), + Type: &typ, } } @@ -186,8 +188,10 @@ func (sr *SoftResource) SetToMany(key string, v []string) { func (sr *SoftResource) Copy() Resource { sr.check() + typ := sr.Type.Copy() + return &SoftResource{ - Type: copystructure.Must(copystructure.Copy(sr.Type)).(*Type), + Type: &typ, id: sr.id, data: copystructure.Must(copystructure.Copy(sr.data)).(map[string]interface{}), } From ce9a6a0c54047ddba992b14512bfa3a218085a25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 12 Jan 2020 18:33:26 -0500 Subject: [PATCH 327/406] Redefine Rel.String --- type.go | 14 ++++++++++---- type_test.go | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/type.go b/type.go index 556c68d..6ea9f3a 100644 --- a/type.go +++ b/type.go @@ -384,12 +384,18 @@ func (r *Rel) Normalize() Rel { return r.Invert() } -// String returns a string representation of the receiving Rel. +// String builds and returns the name of the receiving Rel. // -// The returned string only contains the type's name followed by the -// relationship's name. +// r.Normalize is always called. func (r Rel) String() string { - return r.FromType + "_" + r.FromName + r = r.Normalize() + + id := r.FromType + "_" + r.FromName + if r.ToName != "" { + id += "_" + r.ToType + "_" + r.ToName + } + + return id } // GetAttrType returns the attribute type as an int (see constants) and a diff --git a/type_test.go b/type_test.go index b3f68f7..32ee38f 100644 --- a/type_test.go +++ b/type_test.go @@ -265,8 +265,8 @@ func TestRelString(t *testing.T) { FromOne: true, } - assert.Equal("type2_rel2", rel.String()) - assert.Equal("type1_rel1", rel.Invert().String()) + assert.Equal("type1_rel1_type2_rel2", rel.String()) + assert.Equal("type1_rel1_type2_rel2", rel.Invert().String()) } func TestGetAttrType(t *testing.T) { From 5fd0463234fa863f7b85995ea77a3540d49ea71f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 12 Jan 2020 21:12:11 -0500 Subject: [PATCH 328/406] Use Rel.String in buildRels --- schema.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/schema.go b/schema.go index 0bc3350..d363b38 100644 --- a/schema.go +++ b/schema.go @@ -212,9 +212,8 @@ func (s *Schema) buildRels() { for _, typ := range s.Types { for _, rel := range typ.Rels { - nr := rel.Normalize() - relName := nr.FromType + "_" + nr.FromName - s.rels[relName] = nr + relName := rel.String() + s.rels[relName] = rel.Normalize() } } } From f270a6d879c5fbf7c5a14eb85a136c132c0e5445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 18 Jan 2020 09:30:48 -0500 Subject: [PATCH 329/406] Avoid including attributes and relationships members if empty --- resource.go | 8 ++++++-- .../marshaling/collection_with_inclusions.json | 8 -------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/resource.go b/resource.go index d1a8aca..fff93e5 100644 --- a/resource.go +++ b/resource.go @@ -52,7 +52,9 @@ func MarshalResource(r Resource, prepath string, fields []string, relData map[st } } - mapPl["attributes"] = attrs + if len(attrs) > 0 { + mapPl["attributes"] = attrs + } // Relationships rels := map[string]*json.RawMessage{} @@ -120,7 +122,9 @@ func MarshalResource(r Resource, prepath string, fields []string, relData map[st } } - mapPl["relationships"] = rels + if len(rels) > 0 { + mapPl["relationships"] = rels + } // Links mapPl["links"] = map[string]string{ diff --git a/testdata/goldenfiles/marshaling/collection_with_inclusions.json b/testdata/goldenfiles/marshaling/collection_with_inclusions.json index 31f3ffb..ab66509 100644 --- a/testdata/goldenfiles/marshaling/collection_with_inclusions.json +++ b/testdata/goldenfiles/marshaling/collection_with_inclusions.json @@ -1,39 +1,31 @@ { "data": { - "attributes": {}, "id": "id1", "links": { "self": "/mocktype/id1" }, - "relationships": {}, "type": "mocktype" }, "included": [ { - "attributes": {}, "id": "id2", "links": { "self": "/mocktype/id2" }, - "relationships": {}, "type": "mocktype" }, { - "attributes": {}, "id": "id3", "links": { "self": "/mocktype/id3" }, - "relationships": {}, "type": "mocktype" }, { - "attributes": {}, "id": "id4", "links": { "self": "/mocktype/id4" }, - "relationships": {}, "type": "mocktype" } ], From 279572d2e6091b2acd1250ce2faf287dffe42697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 18 Jan 2020 10:00:28 -0500 Subject: [PATCH 330/406] Remove dependency on github.com/mitchellh/copystructure --- go.mod | 1 - go.sum | 4 -- soft_resource.go | 136 +++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 133 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index f0aca21..8bbc16f 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,5 @@ go 1.11 require ( github.com/google/uuid v1.1.1 - github.com/mitchellh/copystructure v1.0.0 github.com/stretchr/testify v1.4.0 ) diff --git a/go.sum b/go.sum index ae988a5..1164f86 100644 --- a/go.sum +++ b/go.sum @@ -2,10 +2,6 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ= -github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= -github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY= -github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= diff --git a/soft_resource.go b/soft_resource.go index ca1cee3..85eb4d2 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -2,8 +2,7 @@ package jsonapi import ( "fmt" - - "github.com/mitchellh/copystructure" + "time" ) // SoftResource represents a resource whose type is defined by an internal field @@ -193,7 +192,7 @@ func (sr *SoftResource) Copy() Resource { return &SoftResource{ Type: &typ, id: sr.id, - data: copystructure.Must(copystructure.Copy(sr.data)).(map[string]interface{}), + data: copyData(sr.data), } } @@ -263,3 +262,134 @@ func (sr *SoftResource) check() { } } } + +func copyData(d map[string]interface{}) map[string]interface{} { + d2 := map[string]interface{}{} + + for k, v := range d { + switch v2 := v.(type) { + case string: + d2[k] = v2 + case int: + d2[k] = v2 + case int8: + d2[k] = v2 + case int16: + d2[k] = v2 + case int32: + d2[k] = v2 + case int64: + d2[k] = v2 + case uint: + d2[k] = v2 + case uint8: + d2[k] = v2 + case uint16: + d2[k] = v2 + case uint32: + d2[k] = v2 + case uint64: + d2[k] = v2 + case bool: + d2[k] = v2 + case time.Time: + d2[k] = v2 + case []uint8: + nv := make([]byte, len(v2)) + _ = copy(nv, v2) + d2[k] = v2 + case []string: + nv := make([]string, len(v2)) + _ = copy(nv, v2) + d2[k] = v2 + case *string: + if v2 == nil { + d2[k] = (*string)(nil) + } + + d2[k] = v2 + case *int: + if v2 == nil { + d2[k] = (*int)(nil) + } + + d2[k] = v2 + case *int8: + if v2 == nil { + d2[k] = (*int8)(nil) + } + + d2[k] = v2 + case *int16: + if v2 == nil { + d2[k] = (*int16)(nil) + } + + d2[k] = v2 + case *int32: + if v2 == nil { + d2[k] = (*int32)(nil) + } + + d2[k] = v2 + case *int64: + if v2 == nil { + d2[k] = (*int64)(nil) + } + + d2[k] = v2 + case *uint: + if v2 == nil { + d2[k] = (*uint)(nil) + } + + d2[k] = v2 + case *uint8: + if v2 == nil { + d2[k] = (*uint8)(nil) + } + + d2[k] = v2 + case *uint16: + if v2 == nil { + d2[k] = (*uint16)(nil) + } + + d2[k] = v2 + case *uint32: + if v2 == nil { + d2[k] = (*uint32)(nil) + } + + d2[k] = v2 + case *uint64: + if v2 == nil { + d2[k] = (*uint64)(nil) + } + + d2[k] = v2 + case *bool: + if v2 == nil { + d2[k] = (*bool)(nil) + } + + d2[k] = v2 + case *time.Time: + if v2 == nil { + d2[k] = (*time.Time)(nil) + } + + d2[k] = v2 + case *[]uint8: + if v2 == nil { + d2[k] = (*[]uint8)(nil) + } else { + nv := make([]byte, len(*v2)) + _ = copy(nv, *v2) + d2[k] = v2 + } + } + } + + return d2 +} From 4980a3fcc2a36e4f94597da5d2dcdcf0d787db21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 18 Jan 2020 10:28:07 -0500 Subject: [PATCH 331/406] Use absolute path for logo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 19607e4..dee0b5b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@
- +
From 728813fd3041bc36ebb500ff4ad63d19233cc626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 18 Jan 2020 10:45:40 -0500 Subject: [PATCH 332/406] Improve implementation and testing of SoftResource.Copy --- soft_resource.go | 52 --------------------------- soft_resource_test.go | 83 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 79 insertions(+), 56 deletions(-) diff --git a/soft_resource.go b/soft_resource.go index 85eb4d2..7537a78 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -303,82 +303,30 @@ func copyData(d map[string]interface{}) map[string]interface{} { _ = copy(nv, v2) d2[k] = v2 case *string: - if v2 == nil { - d2[k] = (*string)(nil) - } - d2[k] = v2 case *int: - if v2 == nil { - d2[k] = (*int)(nil) - } - d2[k] = v2 case *int8: - if v2 == nil { - d2[k] = (*int8)(nil) - } - d2[k] = v2 case *int16: - if v2 == nil { - d2[k] = (*int16)(nil) - } - d2[k] = v2 case *int32: - if v2 == nil { - d2[k] = (*int32)(nil) - } - d2[k] = v2 case *int64: - if v2 == nil { - d2[k] = (*int64)(nil) - } - d2[k] = v2 case *uint: - if v2 == nil { - d2[k] = (*uint)(nil) - } - d2[k] = v2 case *uint8: - if v2 == nil { - d2[k] = (*uint8)(nil) - } - d2[k] = v2 case *uint16: - if v2 == nil { - d2[k] = (*uint16)(nil) - } - d2[k] = v2 case *uint32: - if v2 == nil { - d2[k] = (*uint32)(nil) - } - d2[k] = v2 case *uint64: - if v2 == nil { - d2[k] = (*uint64)(nil) - } - d2[k] = v2 case *bool: - if v2 == nil { - d2[k] = (*bool)(nil) - } - d2[k] = v2 case *time.Time: - if v2 == nil { - d2[k] = (*time.Time)(nil) - } - d2[k] = v2 case *[]uint8: if v2 == nil { diff --git a/soft_resource_test.go b/soft_resource_test.go index a6f9fd8..5ca0b24 100644 --- a/soft_resource_test.go +++ b/soft_resource_test.go @@ -2,6 +2,7 @@ package jsonapi_test import ( "testing" + "time" . "github.com/mfcochauxlaberge/jsonapi" @@ -144,10 +145,6 @@ func TestSoftResource(t *testing.T) { sr.Set("nullable-str", nil) assert.Nil(t, sr.Get("nullable-str")) assert.Equal(t, (*string)(nil), sr.Get("nullable-str")) - - // Copy - sr2 := sr.Copy() - assert.Equal(t, true, Equal(sr, sr2)) } func TestSoftResourceNew(t *testing.T) { @@ -169,3 +166,81 @@ func TestSoftResourceNew(t *testing.T) { assert.Equal("", nsr.Get("str")) assert.Equal(0, nsr.Get("int")) } + +func TestSoftResourceCopy(t *testing.T) { + assert := assert.New(t) + + now, _ := time.Parse(time.RFC3339, "2019-11-19T23:17:01-05:00") + + sr := &SoftResource{} + + // Attributes + attrs := map[string]interface{}{ + "string": "abc", + "int": 42, + "int8": 8, + "int16": 16, + "int32": 32, + "int64": 64, + "uint": 42, + "uint8": 8, + "uint16": 16, + "uint32": 32, + "uint64": 64, + "bool": true, + "time.Time": now, + "[]uint8": []byte{'a', 'b', 'c'}, + "*string": ptr("abc"), + "*int": ptr(42), + "*int8": ptr(8), + "*int16": ptr(16), + "*int32": ptr(32), + "*int64": ptr(64), + "*uint": ptr(42), + "*uint8": ptr(8), + "*uint16": ptr(16), + "*uint32": ptr(32), + "*uint64": ptr(64), + "*bool": ptr(true), + "*time.Time": ptr(now), + "*[]uint8": ptr([]byte{'a', 'b', 'c'}), + } + + for t, v := range attrs { + typ, null := GetAttrType(t) + + sr.AddAttr(Attr{ + Name: t, + Type: typ, + Nullable: null, + }) + + sr.Set(t, v) + } + + // Special cases + sr.AddAttr(Attr{ + Name: "nil-*[]byte", + Type: AttrTypeBytes, + Nullable: true, + }) + + sr.Set("nil-*[]byte", (*[]byte)(nil)) + + // Relationships + sr.AddRel(Rel{ + FromName: "to-one", + ToOne: true, + }) + sr.SetToOne("to-one", "id1") + + sr.AddRel(Rel{ + FromName: "to-many", + ToOne: false, + }) + sr.SetToMany("to-many", []string{"id2", "id3"}) + + // Copy + sr2 := sr.Copy() + assert.Equal(true, Equal(sr, sr2)) +} From 888baf21cd3efe005d5e23341fb3e4d20ca39814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 19 Jan 2020 00:09:21 -0500 Subject: [PATCH 333/406] Improve comment about comparing nil values --- resource.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resource.go b/resource.go index fff93e5..0be6487 100644 --- a/resource.go +++ b/resource.go @@ -322,9 +322,9 @@ func Equal(r1, r2 Resource) bool { for i, attr1 := range r1Attrs { attr2 := r2Attrs[i] if !reflect.DeepEqual(r1.Get(attr1.Name), r2.Get(attr2.Name)) { - // TODO Fix the following condition one day, there should be a better - // way to do this. Basically, all nils (nil pointer, nil slice, etc) - // should be considered equal to a nil empty interface. + // TODO Fix the following condition one day. Basically, all + // nils (nil pointer, nil slice, etc) should be considered + // equal to a nil empty interface. if fmt.Sprintf("%v", r1.Get(attr1.Name)) == "" && fmt.Sprintf("%v", r2.Get(attr1.Name)) == "" { continue From 7a203f5e002e6c6ec49d9555ab657af4fb88318c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 19 Jan 2020 00:15:01 -0500 Subject: [PATCH 334/406] Add test for two nil values of different types --- resource_test.go | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/resource_test.go b/resource_test.go index c70d5be..c0bb82b 100644 --- a/resource_test.go +++ b/resource_test.go @@ -294,6 +294,25 @@ func TestEqual(t *testing.T) { sr1.SetToOne("to-one", "a") sr1.SetToMany("to-many", []string{"d", "e", "f"}) assert.False(Equal(mt11, sr1), "different relationship value (to-many)") + + // Comparing two nil values of different types + sr3 := &SoftResource{} + sr3.AddAttr(Attr{ + Name: "nil", + Type: AttrTypeString, + Nullable: true, + }) + sr3.Set("nil", (*string)(nil)) + + sr4 := &SoftResource{} + sr4.AddAttr(Attr{ + Name: "nil2", + Type: AttrTypeInt, + Nullable: true, + }) + sr3.Set("nil", (*int)(nil)) + + assert.Equal(true, Equal(sr3, sr4)) } func TestEqualStrict(t *testing.T) { From 0f943bae3de48b5e241eadc49e1b608b2c9cd87a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 19 Jan 2020 21:53:17 -0500 Subject: [PATCH 335/406] Return nil value without using a variable --- type.go | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/type.go b/type.go index 6ea9f3a..44689f9 100644 --- a/type.go +++ b/type.go @@ -494,99 +494,85 @@ func GetZeroValue(t int, nullable bool) interface{} { switch t { case AttrTypeString: if nullable { - var np *string - return np + return (*string)(nil) } return "" case AttrTypeInt: if nullable { - var np *int - return np + return (*int)(nil) } return int(0) case AttrTypeInt8: if nullable { - var np *int8 - return np + return (*int8)(nil) } return int8(0) case AttrTypeInt16: if nullable { - var np *int16 - return np + return (*int16)(nil) } return int16(0) case AttrTypeInt32: if nullable { - var np *int32 - return np + return (*int32)(nil) } return int32(0) case AttrTypeInt64: if nullable { - var np *int64 - return np + return (*int64)(nil) } return int64(0) case AttrTypeUint: if nullable { - var np *uint - return np + return (*uint)(nil) } return uint(0) case AttrTypeUint8: if nullable { - var np *uint8 - return np + return (*uint8)(nil) } return uint8(0) case AttrTypeUint16: if nullable { - var np *uint16 - return np + return (*uint16)(nil) } return uint16(0) case AttrTypeUint32: if nullable { - var np *uint32 - return np + return (*uint32)(nil) } return uint32(0) case AttrTypeUint64: if nullable { - var np *uint64 - return np + return (*uint64)(nil) } return uint64(0) case AttrTypeBool: if nullable { - var np *bool - return np + return (*bool)(nil) } return false case AttrTypeTime: if nullable { - var np *time.Time - return np + return (*time.Time)(nil) } return time.Time{} case AttrTypeBytes: if nullable { - var np *[]byte - return np + return (*[]byte)(nil) } return []byte{} From 4616e503a059f941bf29d904d2abfffb0b3537ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 20 Jan 2020 07:51:13 -0500 Subject: [PATCH 336/406] Clarify comment and param for SetToOne and SetToMany --- soft_resource.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/soft_resource.go b/soft_resource.go index 7537a78..31e5f3c 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -165,21 +165,21 @@ func (sr *SoftResource) GetToMany(key string) []string { return []string{} } -// SetToOne sets the relationship named after key to rel. -func (sr *SoftResource) SetToOne(key string, v string) { +// SetToOne sets the relationship named after key to id. +func (sr *SoftResource) SetToOne(key string, id string) { sr.check() if rel, ok := sr.Type.Rels[key]; ok && rel.ToOne { - sr.data[key] = v + sr.data[key] = id } } -// SetToMany sets the relationship named after key to rel. -func (sr *SoftResource) SetToMany(key string, v []string) { +// SetToMany sets the relationship named after key to ids. +func (sr *SoftResource) SetToMany(key string, ids []string) { sr.check() if rel, ok := sr.Type.Rels[key]; ok && !rel.ToOne { - sr.data[key] = v + sr.data[key] = ids } } From 0f4a2d33671eb2a6a63095958aaf02316428750c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 2 Feb 2020 10:34:19 -0500 Subject: [PATCH 337/406] Remove leading space in bullet lists --- README.md | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index dee0b5b..21f658b 100644 --- a/README.md +++ b/README.md @@ -35,19 +35,19 @@ The official JSON:API specification can be found at [jsonapi.org/format](http:// jsonapi offers the following features: - * Marshaling and unmarshaling of JSON:API URLs and documents - * Structs for handling URLs, documents, resources, collections... - * Schema management - * It can ensure relationships between types make sense. - * Very useful for validation when marshaling and unmarshaling. - * Utilities for pagination, sorting, and filtering - * jsonapi is opiniated when it comes to those features. If you prefer you own strategy fo pagination, sorting, and filtering, it will have to be done manually. - * In-memory data store (`SoftCollection`) - * It can store resources (anything that implements `Resource`). - * It can sort, filter, retrieve pages, etc. - * Enough to build a demo API or use in test suites. - * Not made for production use. - * Other useful helpers +* Marshaling and unmarshaling of JSON:API URLs and documents +* Structs for handling URLs, documents, resources, collections... +* Schema management + * It can ensure relationships between types make sense. + * Very useful for validation when marshaling and unmarshaling. +* Utilities for pagination, sorting, and filtering + * jsonapi is opiniated when it comes to those features. If you prefer you own strategy fo pagination, sorting, and filtering, it will have to be done manually. +* In-memory data store (`SoftCollection`) + * It can store resources (anything that implements `Resource`). + * It can sort, filter, retrieve pages, etc. + * Enough to build a demo API or use in test suites. + * Not made for production use. +* Other useful helpers ## State @@ -61,11 +61,11 @@ While anything can happen before a v1 release, the API is stable and no big chan A few tasks are required before committing to the current API: - * Rethink how errors are handled - * Use the new tools introduced in Go 1.13. - * Gather feedback from users - * The library should be used more on real projects to see of the API is convenient. - * It is currently used by [karigo](https://github.com/mfcochauxlaberge/karigo). +* Rethink how errors are handled + * Use the new tools introduced in Go 1.13. +* Gather feedback from users + * The library should be used more on real projects to see of the API is convenient. + * It is currently used by [karigo](https://github.com/mfcochauxlaberge/karigo). ## Requirements From 8c0de6a088042cc8a266ef67839f406a262f0a2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 6 Feb 2020 20:51:39 -0500 Subject: [PATCH 338/406] Upgrade golangci-lint to v1.23.3 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7489611..7ff95dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ env: before_script: - 'curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh - | sh -s v1.21.0' + | sh -s v1.23.3' script: - ./bin/golangci-lint run From 59a1aa9389b5153991c6a60288970ebbf4905831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 17 Feb 2020 20:31:24 -0500 Subject: [PATCH 339/406] Update documentation badge and link --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 21f658b..90e48bd 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,8 @@ - - + +
@@ -184,6 +184,6 @@ It is also possible to build a `URL` from a `Schema` and a `SimpleURL` which con ## Documentation -Check out the [documentation](https://godoc.org/github.com/mfcochauxlaberge/jsonapi). +Check out the [documentation](https://pkg.go.dev/github.com/mfcochauxlaberge/jsonapi?tab=doc). The best way to learn how to use it is to look at documentation, the examples, and the code itself. From 6e885a5ba6563f577c4c7f1c8747e304d10e893f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 22 Feb 2020 08:18:04 -0500 Subject: [PATCH 340/406] Fix top comment for Collection.GetType --- collection.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collection.go b/collection.go index e466c92..19ac015 100644 --- a/collection.go +++ b/collection.go @@ -5,7 +5,7 @@ import "encoding/json" // A Collection defines the interface of a structure that can manage a set of // ordered resources of the same type. type Collection interface { - // Type returns the name of the resources' type. + // GetType returns the name of the resources' type. GetType() Type // Len returns the number of resources in the collection. From e5dffa2dac803ea376b0b96e5245cbeeb907f588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 27 Feb 2020 20:30:34 -0500 Subject: [PATCH 341/406] Rename filter_query*.go to filter*.go --- filter_query.go => filter.go | 0 filter_query_test.go => filter_test.go | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename filter_query.go => filter.go (100%) rename filter_query_test.go => filter_test.go (100%) diff --git a/filter_query.go b/filter.go similarity index 100% rename from filter_query.go rename to filter.go diff --git a/filter_query_test.go b/filter_test.go similarity index 100% rename from filter_query_test.go rename to filter_test.go From 6d2f97f0a7422559fb2e211ce3a0eb2a1688ceff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 27 Feb 2020 23:07:44 -0500 Subject: [PATCH 342/406] Update golangci-lint to v1.23.6 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7ff95dc..289748c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ env: before_script: - 'curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh - | sh -s v1.23.3' + | sh -s v1.23.6' script: - ./bin/golangci-lint run From 5e072d75a24406a81192b861c7b187438e27ff15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 27 Feb 2020 23:20:39 -0500 Subject: [PATCH 343/406] Add Go 1.14 to Travis pipeline --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 289748c..f63be2e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ go: - 1.11.x - 1.12.x - 1.13.x + - 1.14.x branches: only: From b99d6e3d09e86a1cf3c46d986b4cd75cdf7ebc6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 1 Mar 2020 11:40:05 -0500 Subject: [PATCH 344/406] Fix Collection.GetType's comment --- collection.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collection.go b/collection.go index 19ac015..469890b 100644 --- a/collection.go +++ b/collection.go @@ -5,7 +5,7 @@ import "encoding/json" // A Collection defines the interface of a structure that can manage a set of // ordered resources of the same type. type Collection interface { - // GetType returns the name of the resources' type. + // GetType returns the type of the resources. GetType() Type // Len returns the number of resources in the collection. From eb7e7ce3a3747c46659324586658931c48c1586a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 7 Mar 2020 12:43:18 -0500 Subject: [PATCH 345/406] Normalize names of attribute types --- soft_resource.go | 3 ++- type.go | 8 ++++---- type_test.go | 32 ++++++++++++++++++++++++++++---- 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/soft_resource.go b/soft_resource.go index 31e5f3c..e640215 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -135,7 +135,8 @@ func (sr *SoftResource) Set(key string, v interface{}) { sr.check() if attr, ok := sr.Type.Attrs[key]; ok { - if GetAttrTypeString(attr.Type, attr.Nullable) == fmt.Sprintf("%T", v) { + typ, nullable := GetAttrType(fmt.Sprintf("%T", v)) + if attr.Type == typ && attr.Nullable == nullable { sr.data[key] = v } else if v == nil && attr.Nullable { sr.data[key] = GetZeroValue(attr.Type, attr.Nullable) diff --git a/type.go b/type.go index 44689f9..b8078a5 100644 --- a/type.go +++ b/type.go @@ -432,9 +432,9 @@ func GetAttrType(t string) (int, bool) { return AttrTypeUint64, nullable case "bool": return AttrTypeBool, nullable - case "time.Time": + case "time.Time", "time": return AttrTypeTime, nullable - case "[]uint8": + case "[]uint8", "[]byte", "bytes": return AttrTypeBytes, nullable default: return AttrTypeInvalid, false @@ -472,9 +472,9 @@ func GetAttrTypeString(t int, nullable bool) string { case AttrTypeBool: str = "bool" case AttrTypeTime: - str = "time.Time" + str = "time" case AttrTypeBytes: - str = "[]uint8" + str = "bytes" default: str = "" } diff --git a/type_test.go b/type_test.go index 32ee38f..21713b6 100644 --- a/type_test.go +++ b/type_test.go @@ -324,10 +324,22 @@ func TestGetAttrType(t *testing.T) { assert.Equal(AttrTypeTime, typ) assert.False(nullable) + typ, nullable = GetAttrType("time") + assert.Equal(AttrTypeTime, typ) + assert.False(nullable) + typ, nullable = GetAttrType("[]uint8") assert.Equal(AttrTypeBytes, typ) assert.False(nullable) + typ, nullable = GetAttrType("[]byte") + assert.Equal(AttrTypeBytes, typ) + assert.False(nullable) + + typ, nullable = GetAttrType("bytes") + assert.Equal(AttrTypeBytes, typ) + assert.False(nullable) + typ, nullable = GetAttrType("*string") assert.Equal(AttrTypeString, typ) assert.True(nullable) @@ -380,10 +392,22 @@ func TestGetAttrType(t *testing.T) { assert.Equal(AttrTypeTime, typ) assert.True(nullable) + typ, nullable = GetAttrType("*time") + assert.Equal(AttrTypeTime, typ) + assert.True(nullable) + typ, nullable = GetAttrType("*[]uint8") assert.Equal(AttrTypeBytes, typ) assert.True(nullable) + typ, nullable = GetAttrType("*[]byte") + assert.Equal(AttrTypeBytes, typ) + assert.True(nullable) + + typ, nullable = GetAttrType("*bytes") + assert.Equal(AttrTypeBytes, typ) + assert.True(nullable) + typ, nullable = GetAttrType("invalid") assert.Equal(AttrTypeInvalid, typ) assert.False(nullable) @@ -408,8 +432,8 @@ func TestGetAttrTypeString(t *testing.T) { assert.Equal("uint32", GetAttrTypeString(AttrTypeUint32, false)) assert.Equal("uint64", GetAttrTypeString(AttrTypeUint64, false)) assert.Equal("bool", GetAttrTypeString(AttrTypeBool, false)) - assert.Equal("time.Time", GetAttrTypeString(AttrTypeTime, false)) - assert.Equal("[]uint8", GetAttrTypeString(AttrTypeBytes, false)) + assert.Equal("time", GetAttrTypeString(AttrTypeTime, false)) + assert.Equal("bytes", GetAttrTypeString(AttrTypeBytes, false)) assert.Equal("*string", GetAttrTypeString(AttrTypeString, true)) assert.Equal("*int", GetAttrTypeString(AttrTypeInt, true)) assert.Equal("*int8", GetAttrTypeString(AttrTypeInt8, true)) @@ -422,8 +446,8 @@ func TestGetAttrTypeString(t *testing.T) { assert.Equal("*uint32", GetAttrTypeString(AttrTypeUint32, true)) assert.Equal("*uint64", GetAttrTypeString(AttrTypeUint64, true)) assert.Equal("*bool", GetAttrTypeString(AttrTypeBool, true)) - assert.Equal("*time.Time", GetAttrTypeString(AttrTypeTime, true)) - assert.Equal("*[]uint8", GetAttrTypeString(AttrTypeBytes, true)) + assert.Equal("*time", GetAttrTypeString(AttrTypeTime, true)) + assert.Equal("*bytes", GetAttrTypeString(AttrTypeBytes, true)) assert.Equal("", GetAttrTypeString(AttrTypeInvalid, false)) assert.Equal("", GetAttrTypeString(999, false)) } From f3dd5239a53b01b52c035857e39595e993276262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 12 Mar 2020 20:12:48 -0400 Subject: [PATCH 346/406] Interpret "null" instead of "nil" as nil in UnmarshalToType This method is meant to unmarshal JSON data, so "null" is what should be converted to a nil Go value, not "nil". --- type.go | 2 +- type_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/type.go b/type.go index b8078a5..69585b3 100644 --- a/type.go +++ b/type.go @@ -189,7 +189,7 @@ type Attr struct { // UnmarshalToType unmarshals the data into a value of the type represented by // the attribute and returns it. func (a Attr) UnmarshalToType(data []byte) (interface{}, error) { - if a.Nullable && string(data) == "nil" { + if a.Nullable && string(data) == "null" { return nil, nil } diff --git a/type_test.go b/type_test.go index 21713b6..d1a3c94 100644 --- a/type_test.go +++ b/type_test.go @@ -169,9 +169,9 @@ func TestAttrUnmarshalToType(t *testing.T) { assert.Equal(fmt.Sprintf("%T", test.val), fmt.Sprintf("%T", val)) } - // Nil value + // Null value attr.Nullable = true - val, err := attr.UnmarshalToType([]byte("nil")) + val, err := attr.UnmarshalToType([]byte("null")) assert.NoError(err) assert.Nil(val) From 19722409501f23764b419aaf1d36f548804f8e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 12 Mar 2020 22:39:02 -0400 Subject: [PATCH 347/406] Return zero value when null in UnmarshalToType --- type.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/type.go b/type.go index 69585b3..8a5bd3f 100644 --- a/type.go +++ b/type.go @@ -190,7 +190,7 @@ type Attr struct { // the attribute and returns it. func (a Attr) UnmarshalToType(data []byte) (interface{}, error) { if a.Nullable && string(data) == "null" { - return nil, nil + return GetZeroValue(a.Type, a.Nullable), nil } var ( From 438c861e305b8865321de5615435408b85d27049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 15 Mar 2020 11:01:21 -0400 Subject: [PATCH 348/406] Add comments for attribute type constants --- type.go | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/type.go b/type.go index 8a5bd3f..824bf98 100644 --- a/type.go +++ b/type.go @@ -11,7 +11,25 @@ import ( "time" ) -// Attribute types +// Attribute types are the possible types for attributes. +// +// Those constants are numbers that represent the types. Each type has a string +// representation which should be used instead of the numbers when storing +// that information. The numbers can change between any version of this library, +// even if it potentially can break existing code. +// +// The names are as follow: +// - string +// - int, int8, int16, int32, int64 +// - uint, uint8, uint16, uint32, uint64 +// - bool +// - time (Go type is time.Time) +// - bytes (Go type is []uint8 or []byte) +// +// An asterisk is present as a prefix when the type is nullable (like *string). +// +// Developers are encouraged to use the constants, the Type struct, and other +// tools to handle attribute types instead of dealing with strings. const ( AttrTypeInvalid = iota AttrTypeString From 5769fd6c6e9652a8e8ca2bde293a1693a42bf553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 15 Mar 2020 11:44:21 -0400 Subject: [PATCH 349/406] Upgrade github.com/stretchr/testify to v1.5.1 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8bbc16f..3de695a 100644 --- a/go.mod +++ b/go.mod @@ -4,5 +4,5 @@ go 1.11 require ( github.com/google/uuid v1.1.1 - github.com/stretchr/testify v1.4.0 + github.com/stretchr/testify v1.5.1 ) diff --git a/go.sum b/go.sum index 1164f86..51e4d45 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= From 4709ef86a617a57d6b0cf6a420421130264efe9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 11 Apr 2020 13:42:56 -0400 Subject: [PATCH 350/406] Remove mention of karigo --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 90e48bd..251b0dc 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,6 @@ A few tasks are required before committing to the current API: * Use the new tools introduced in Go 1.13. * Gather feedback from users * The library should be used more on real projects to see of the API is convenient. - * It is currently used by [karigo](https://github.com/mfcochauxlaberge/karigo). ## Requirements From 3ab23711f9a673df9a402f657bfdde8062560436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 11 Apr 2020 13:51:51 -0400 Subject: [PATCH 351/406] Add section about Schema in README.md --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index 251b0dc..dec8a28 100644 --- a/README.md +++ b/README.md @@ -97,6 +97,19 @@ A `Request` represents an HTTP request structured in a format easily readable fr If you are familiar with the specification, reading the `Request` struct and its fields (`URL`, `Document`, etc) should be straightforward. +### Schema + +A `Schema` contains all the schema information for an API, like types, fields, relationships between types, and so on. See `schema.go` and `type.go` for more details. + +This is really useful for many uses cases: + +* Making sure the schema is coherent +* Validating resources +* Parsing documents and URLs +* And probably many more... + +For example, when a request comes in, a `Document` and a `URL` can be created by parsing the request. By providing a schema, the parsing can fail if it finds some errors like a type that does not exist, a field of the wrong kind, etc. After that step, valid data can be assumed. + ### Type A JSON:API type is generally defined with a struct. From 4ebe97ae806e3e1804c484db0f6f52a857c49378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 11 Apr 2020 13:52:03 -0400 Subject: [PATCH 352/406] Add v1 bullet point in README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index dec8a28..9da5966 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,8 @@ A few tasks are required before committing to the current API: * Rethink how errors are handled * Use the new tools introduced in Go 1.13. +* Simplify the API + * Remove anything that is redundant or not useful. * Gather feedback from users * The library should be used more on real projects to see of the API is convenient. From 533020c84b38ee6209cda4dac21e519e200a5c53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 11 Apr 2020 14:01:33 -0400 Subject: [PATCH 353/406] Remove TODO in UnmarshalDocument --- document.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/document.go b/document.go index ba47ae1..68a04de 100644 --- a/document.go +++ b/document.go @@ -243,9 +243,5 @@ func UnmarshalDocument(payload []byte, schema *Schema) (*Document, error) { // Meta doc.Meta = ske.Meta - // TODO Return an error if there is no data (not even - // null), no errors, and no meta. The JSON:API specification - // considers this invalid. - return doc, nil } From 624aba5e36c7aebd64a1acaaf10633e9b1296a8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 11 Apr 2020 14:03:23 -0400 Subject: [PATCH 354/406] Remove empty line --- document.go | 1 - 1 file changed, 1 deletion(-) diff --git a/document.go b/document.go index 68a04de..f1a19ef 100644 --- a/document.go +++ b/document.go @@ -98,7 +98,6 @@ func MarshalDocument(doc *Document, url *URL) ([]byte, error) { ) case Identifier: data, err = json.Marshal(d) - case Identifiers: data, err = json.Marshal(d) default: From c13de6c13323bbf5e711402958e16f5fc18c1f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 12 Apr 2020 09:17:52 -0400 Subject: [PATCH 355/406] Add Meta struct with some helper methods --- document.go | 2 +- error.go | 4 +- examples/marshal_document_test.go | 2 +- meta.go | 54 ++++++++++++++++++ meta_test.go | 92 +++++++++++++++++++++++++++++++ skeletons.go | 8 +-- 6 files changed, 154 insertions(+), 8 deletions(-) create mode 100644 meta.go create mode 100644 meta_test.go diff --git a/document.go b/document.go index f1a19ef..59abd7a 100644 --- a/document.go +++ b/document.go @@ -22,7 +22,7 @@ type Document struct { RelData map[string][]string // Top-level members - Meta map[string]interface{} + Meta Meta // Errors Errors []Error diff --git a/error.go b/error.go index 1295a50..8063114 100644 --- a/error.go +++ b/error.go @@ -18,7 +18,7 @@ type Error struct { Detail string `json:"detail"` Links map[string]string `json:"links"` Source map[string]interface{} `json:"source"` - Meta map[string]interface{} `json:"meta"` + Meta Meta `json:"meta"` } // NewError returns an empty Error object. @@ -31,7 +31,7 @@ func NewError() Error { Detail: "", Links: map[string]string{}, Source: map[string]interface{}{}, - Meta: map[string]interface{}{}, + Meta: Meta{}, } return err diff --git a/examples/marshal_document_test.go b/examples/marshal_document_test.go index 8a6aac6..aa1cf54 100644 --- a/examples/marshal_document_test.go +++ b/examples/marshal_document_test.go @@ -45,7 +45,7 @@ func ExampleMarshalDocument() { doc.Include(jsonapi.Wrap(article)) // As an example, some meta data is added. - doc.Meta = map[string]interface{}{ + doc.Meta = jsonapi.Meta{ "meta": "meta_value", } diff --git a/meta.go b/meta.go new file mode 100644 index 0000000..8af18bd --- /dev/null +++ b/meta.go @@ -0,0 +1,54 @@ +package jsonapi + +import ( + "fmt" + "time" +) + +type Meta map[string]interface{} + +// Has reports whether the Meta map contains or not the given key. +func (m Meta) Has(key string) bool { + _, ok := m[key] + return ok +} + +// GetString returns the string associated with the given key. +// +// An empty string is returned if the key could not be found or the type is not +// compatible. +func (m Meta) GetString(key string) string { + return fmt.Sprint(m[key]) +} + +// GetInt returns the int associated with the given key. +// +// 0 is returned if the key could not be found or the type is not compatible. +func (m Meta) GetInt(key string) int { + v, _ := m[key].(int) + return v +} + +// GetBool returns the bool associated with the given key. +// +// False is returned if the key could not be found or the type is not +// compatible. The "true" JSON keyword is the only value that will make this +// method return true. +func (m Meta) GetBool(key string) bool { + b, _ := m[key].(bool) + return b +} + +// GetTime returns the time.Time associated with the given key. +// +// time.Time{} is returned is the value associated with the key could not be +// found or could not be parsed with time.RFC3339Nano. +func (m Meta) GetTime(key string) time.Time { + t := time.Time{} + + if s, ok := m[key].(string); ok { + t, _ = time.Parse(time.RFC3339Nano, s) + } + + return t +} diff --git a/meta_test.go b/meta_test.go new file mode 100644 index 0000000..e3378b7 --- /dev/null +++ b/meta_test.go @@ -0,0 +1,92 @@ +package jsonapi_test + +import ( + "testing" + "time" + + "github.com/mfcochauxlaberge/jsonapi" + + "github.com/stretchr/testify/assert" +) + +func TestMeta(t *testing.T) { + assert := assert.New(t) + + meta := jsonapi.Meta{ + "string": "str", + "int": -12, + "int8": -22, + "int16": -32, + "int32": -42, + "int64": -52, + "uint": 12, + "uint8": 22, + "uint16": 32, + "uint32": 42, + "uint64": 52, + "bool": true, + "time": "2012-05-16T17:45:28.2539Z", + "bytes": []byte{'a', 'b', 'c'}, + } + + assert.True(meta.Has("string")) + assert.False(meta.Has("unknown")) + + assert.Equal("str", meta.GetString("string")) + assert.Equal("-12", meta.GetString("int")) + assert.Equal("-22", meta.GetString("int8")) + assert.Equal("-32", meta.GetString("int16")) + assert.Equal("-42", meta.GetString("int32")) + assert.Equal("-52", meta.GetString("int64")) + assert.Equal("12", meta.GetString("uint")) + assert.Equal("22", meta.GetString("uint8")) + assert.Equal("32", meta.GetString("uint16")) + assert.Equal("42", meta.GetString("uint32")) + assert.Equal("52", meta.GetString("uint64")) + assert.Equal("true", meta.GetString("bool")) + assert.Equal("2012-05-16T17:45:28.2539Z", meta.GetString("time")) + + assert.Equal(0, meta.GetInt("string")) + assert.Equal(-12, meta.GetInt("int")) + assert.Equal(-22, meta.GetInt("int8")) + assert.Equal(-32, meta.GetInt("int16")) + assert.Equal(-42, meta.GetInt("int32")) + assert.Equal(-52, meta.GetInt("int64")) + assert.Equal(12, meta.GetInt("uint")) + assert.Equal(22, meta.GetInt("uint8")) + assert.Equal(32, meta.GetInt("uint16")) + assert.Equal(42, meta.GetInt("uint32")) + assert.Equal(52, meta.GetInt("uint64")) + assert.Equal(0, meta.GetInt("bool")) + assert.Equal(0, meta.GetInt("time")) + + assert.Equal(false, meta.GetBool("string")) + assert.Equal(false, meta.GetBool("int")) + assert.Equal(false, meta.GetBool("int8")) + assert.Equal(false, meta.GetBool("int16")) + assert.Equal(false, meta.GetBool("int32")) + assert.Equal(false, meta.GetBool("int64")) + assert.Equal(false, meta.GetBool("uint")) + assert.Equal(false, meta.GetBool("uint8")) + assert.Equal(false, meta.GetBool("uint16")) + assert.Equal(false, meta.GetBool("uint32")) + assert.Equal(false, meta.GetBool("uint64")) + assert.Equal(true, meta.GetBool("bool")) + assert.Equal(false, meta.GetBool("time")) + + tm, _ := time.Parse(time.RFC3339Nano, "2012-05-16T17:45:28.2539Z") + + assert.Equal(time.Time{}, meta.GetTime("string")) + assert.Equal(time.Time{}, meta.GetTime("int")) + assert.Equal(time.Time{}, meta.GetTime("int8")) + assert.Equal(time.Time{}, meta.GetTime("int16")) + assert.Equal(time.Time{}, meta.GetTime("int32")) + assert.Equal(time.Time{}, meta.GetTime("int64")) + assert.Equal(time.Time{}, meta.GetTime("uint")) + assert.Equal(time.Time{}, meta.GetTime("uint8")) + assert.Equal(time.Time{}, meta.GetTime("uint16")) + assert.Equal(time.Time{}, meta.GetTime("uint32")) + assert.Equal(time.Time{}, meta.GetTime("uint64")) + assert.Equal(time.Time{}, meta.GetTime("bool")) + assert.Equal(tm, meta.GetTime("time")) +} diff --git a/skeletons.go b/skeletons.go index 53f4ea4..f3aa99b 100644 --- a/skeletons.go +++ b/skeletons.go @@ -3,10 +3,10 @@ package jsonapi import "encoding/json" type payloadSkeleton struct { - Data json.RawMessage `json:"data"` - Errors []Error `json:"errors"` - Included []json.RawMessage `json:"included"` - Meta map[string]interface{} `json:"meta"` + Data json.RawMessage `json:"data"` + Errors []Error `json:"errors"` + Included []json.RawMessage `json:"included"` + Meta Meta `json:"meta"` } type resourceSkeleton struct { From bdc0630ef0e9d8c00285efa4428cf37bd721b49a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 12 Apr 2020 09:41:03 -0400 Subject: [PATCH 356/406] Add support for ARM architecture in CI pipeline --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index f63be2e..ce888e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,15 @@ go: - 1.13.x - 1.14.x +arch: + - amd64 + - arm64 + +jobs: + exclude: + - go: 1.11.x + arch: arm64 + branches: only: - master From 4e289e0b28b705ed8ea51c8fbfaeaa6e27a107e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 6 Jun 2020 09:51:37 -0400 Subject: [PATCH 357/406] Remove useless Sprintf call --- wrapper_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/wrapper_test.go b/wrapper_test.go index fb86fb2..0eb2982 100644 --- a/wrapper_test.go +++ b/wrapper_test.go @@ -1,7 +1,6 @@ package jsonapi_test import ( - "fmt" "reflect" "testing" "time" @@ -215,7 +214,7 @@ func TestWrapper(t *testing.T) { assert.NotEqual( wrap1.Get("str"), wrap3.Get("str"), - fmt.Sprintf("modified value does not affect original"), + "modified value does not affect original", ) } From a083a11659023d3b152ff2f28bacc65e0205f24f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 6 Jun 2020 09:54:22 -0400 Subject: [PATCH 358/406] Use 0600 for golden files permissions --- document_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/document_test.go b/document_test.go index 57cafbb..f000930 100644 --- a/document_test.go +++ b/document_test.go @@ -281,8 +281,8 @@ func TestMarshalDocument(t *testing.T) { dst := &bytes.Buffer{} err = json.Indent(dst, payload, "", "\t") assert.NoError(err) - // TODO Figure out whether 0644 is okay or not. - err = ioutil.WriteFile(path, dst.Bytes(), 0644) + // TODO Figure out whether 0600 is okay or not. + err = ioutil.WriteFile(path, dst.Bytes(), 0600) assert.NoError(err) } }) From 4ef3a9960006c044b178958589acb49dd3f46b1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 6 Jun 2020 09:55:50 -0400 Subject: [PATCH 359/406] Update golangci-lint to v1.27.0 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ce888e6..290728f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ env: before_script: - 'curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh - | sh -s v1.23.6' + | sh -s v1.27.0' script: - ./bin/golangci-lint run From 944bfdde2ff8eb507658122633217adcab67dbea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 6 Jun 2020 10:20:27 -0400 Subject: [PATCH 360/406] Fix typo in SoftResource.Copy top comment --- soft_resource.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soft_resource.go b/soft_resource.go index e640215..22ebe2c 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -184,7 +184,7 @@ func (sr *SoftResource) SetToMany(key string, ids []string) { } } -// Copy return a new SoftResource object with the same type and values. +// Copy returns a new SoftResource object with the same type and values. func (sr *SoftResource) Copy() Resource { sr.check() From d4c862aa145ae25eb6a0b1c5bddeb703729a9800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Wed, 17 Jun 2020 19:06:22 -0400 Subject: [PATCH 361/406] Move empty key checks to top of their function --- wrapper.go | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/wrapper.go b/wrapper.go index 1244a1c..1af09be 100644 --- a/wrapper.go +++ b/wrapper.go @@ -178,6 +178,10 @@ func (w *Wrapper) Set(key string, val interface{}) { // GetToOne returns the value associated with the relationship named after key. func (w *Wrapper) GetToOne(key string) string { + if key == "" { + panic("jsonapi: key is empty") + } + for i := 0; i < w.val.NumField(); i++ { field := w.val.Field(i) sf := w.val.Type().Field(i) @@ -195,15 +199,15 @@ func (w *Wrapper) GetToOne(key string) string { } } - if key == "" { - panic("jsonapi: key is empty") - } - panic(fmt.Sprintf("jsonapi: relationship %q does not exist", key)) } // GetToMany returns the value associated with the relationship named after key. func (w *Wrapper) GetToMany(key string) []string { + if key == "" { + panic("jsonapi: key is empty") + } + for i := 0; i < w.val.NumField(); i++ { field := w.val.Field(i) sf := w.val.Type().Field(i) @@ -221,15 +225,15 @@ func (w *Wrapper) GetToMany(key string) []string { } } - if key == "" { - panic("jsonapi: key is empty") - } - panic(fmt.Sprintf("jsonapi: relationship %q does not exist", key)) } // SetToOne sets the value associated to the relationship named after key. func (w *Wrapper) SetToOne(key string, rel string) { + if key == "" { + panic("jsonapi: key is empty") + } + for i := 0; i < w.val.NumField(); i++ { field := w.val.Field(i) sf := w.val.Type().Field(i) @@ -249,15 +253,15 @@ func (w *Wrapper) SetToOne(key string, rel string) { } } - if key == "" { - panic("jsonapi: key is empty") - } - panic(fmt.Sprintf("jsonapi: relationship %q does not exist", key)) } // SetToMany sets the value associated to the relationship named after key. func (w *Wrapper) SetToMany(key string, rels []string) { + if key == "" { + panic("jsonapi: key is empty") + } + for i := 0; i < w.val.NumField(); i++ { field := w.val.Field(i) sf := w.val.Type().Field(i) @@ -277,10 +281,6 @@ func (w *Wrapper) SetToMany(key string, rels []string) { } } - if key == "" { - panic("jsonapi: key is empty") - } - panic(fmt.Sprintf("jsonapi: relationship %q does not exist", key)) } @@ -310,6 +310,10 @@ func (w *Wrapper) Copy() Resource { // Private methods func (w *Wrapper) getAttr(key string) interface{} { + if key == "" { + panic("jsonapi: key is empty") + } + for i := 0; i < w.val.NumField(); i++ { field := w.val.Field(i) sf := w.val.Type().Field(i) @@ -323,14 +327,14 @@ func (w *Wrapper) getAttr(key string) interface{} { } } - if key == "" { - panic("jsonapi: key is empty") - } - panic(fmt.Sprintf("jsonapi: attribute %q does not exist", key)) } func (w *Wrapper) setAttr(key string, v interface{}) { + if key == "" { + panic("jsonapi: key is empty") + } + for i := 0; i < w.val.NumField(); i++ { field := w.val.Field(i) sf := w.val.Type().Field(i) @@ -354,9 +358,5 @@ func (w *Wrapper) setAttr(key string, v interface{}) { } } - if key == "" { - panic("jsonapi: key is empty") - } - panic(fmt.Errorf("jsonapi: attribute %q does not exist", key)) } From 1d3686486c18eae6978a8adb9ffa9af96ff00100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Wed, 17 Jun 2020 19:12:57 -0400 Subject: [PATCH 362/406] Remove 'jsonapi:' from panic strings --- wrapper.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wrapper.go b/wrapper.go index 1af09be..5afcd4f 100644 --- a/wrapper.go +++ b/wrapper.go @@ -179,7 +179,7 @@ func (w *Wrapper) Set(key string, val interface{}) { // GetToOne returns the value associated with the relationship named after key. func (w *Wrapper) GetToOne(key string) string { if key == "" { - panic("jsonapi: key is empty") + panic("key is empty") } for i := 0; i < w.val.NumField(); i++ { @@ -205,7 +205,7 @@ func (w *Wrapper) GetToOne(key string) string { // GetToMany returns the value associated with the relationship named after key. func (w *Wrapper) GetToMany(key string) []string { if key == "" { - panic("jsonapi: key is empty") + panic("key is empty") } for i := 0; i < w.val.NumField(); i++ { @@ -231,7 +231,7 @@ func (w *Wrapper) GetToMany(key string) []string { // SetToOne sets the value associated to the relationship named after key. func (w *Wrapper) SetToOne(key string, rel string) { if key == "" { - panic("jsonapi: key is empty") + panic("key is empty") } for i := 0; i < w.val.NumField(); i++ { @@ -259,7 +259,7 @@ func (w *Wrapper) SetToOne(key string, rel string) { // SetToMany sets the value associated to the relationship named after key. func (w *Wrapper) SetToMany(key string, rels []string) { if key == "" { - panic("jsonapi: key is empty") + panic("key is empty") } for i := 0; i < w.val.NumField(); i++ { @@ -311,7 +311,7 @@ func (w *Wrapper) Copy() Resource { func (w *Wrapper) getAttr(key string) interface{} { if key == "" { - panic("jsonapi: key is empty") + panic("key is empty") } for i := 0; i < w.val.NumField(); i++ { @@ -332,7 +332,7 @@ func (w *Wrapper) getAttr(key string) interface{} { func (w *Wrapper) setAttr(key string, v interface{}) { if key == "" { - panic("jsonapi: key is empty") + panic("key is empty") } for i := 0; i < w.val.NumField(); i++ { From 4cc2bfca79142d74d6b56a123d82aadc10681035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Wed, 17 Jun 2020 19:59:25 -0400 Subject: [PATCH 363/406] Add support for meta values in resource object --- document_test.go | 22 ++++++++++++ jsonapi_test.go | 14 ++++++++ meta.go | 11 ++++++ resource.go | 12 +++++++ skeletons.go | 1 + soft_resource.go | 11 ++++++ soft_resource_test.go | 22 ++++++++++++ .../goldenfiles/marshaling/collection.json | 36 +++++++++++++++++++ wrapper.go | 18 ++++++++++ 9 files changed, 147 insertions(+) diff --git a/document_test.go b/document_test.go index f000930..27e3fa7 100644 --- a/document_test.go +++ b/document_test.go @@ -130,6 +130,17 @@ func TestMarshalDocument(t *testing.T) { })) col.Add(Wrap(&mocktype{ID: "id3"})) + r4 := &mocktype{ + ID: "id4", + } + r4.SetMeta(map[string]interface{}{ + "key1": "a string", + "key2": 42, + "key3": true, + "key4": getTime(), + }) + col.Add(Wrap(r4)) + // Test struct tests := []struct { name string @@ -401,6 +412,17 @@ func TestUnmarshalDocument(t *testing.T) { col.Add(Wrap(&mocktype{ID: "id2"})) col.Add(Wrap(&mocktype{ID: "id3"})) + r4 := &mocktype{ + ID: "id4", + } + r4.SetMeta(map[string]interface{}{ + "key1": "a string", + "key2": 42, + "key3": true, + "key4": getTime(), + }) + col.Add(Wrap(r4)) + // Tests t.Run("resource with inclusions", func(t *testing.T) { assert := assert.New(t) diff --git a/jsonapi_test.go b/jsonapi_test.go index 64f412e..2ca15ac 100644 --- a/jsonapi_test.go +++ b/jsonapi_test.go @@ -3,6 +3,8 @@ package jsonapi_test import ( "flag" "time" + + . "github.com/mfcochauxlaberge/jsonapi" ) var update = flag.Bool("update-golden-files", false, "update the golden files") @@ -12,6 +14,8 @@ func getTime() time.Time { return now } +var _ MetaHolder = (*mocktype)(nil) + // mocktype is a fake struct that defines a JSON:API type for test purposes. type mocktype struct { ID string `json:"id" api:"mocktype"` @@ -39,4 +43,14 @@ type mocktype struct { ToX []string `json:"to-x" api:"rel,mocktype"` ToXFrom1 []string `json:"to-x-from-1" api:"rel,mocktype,to-1-from-x"` ToXFromX []string `json:"to-x-from-x" api:"rel,mocktype,to-x-from-x"` + + meta Meta +} + +func (mt *mocktype) Meta() Meta { + return mt.meta +} + +func (mt *mocktype) SetMeta(m Meta) { + mt.meta = m } diff --git a/meta.go b/meta.go index 8af18bd..b1c772d 100644 --- a/meta.go +++ b/meta.go @@ -52,3 +52,14 @@ func (m Meta) GetTime(key string) time.Time { return t } + +// A MetaHolder can hold and return meta values. +// +// It is useful for a struct that represents a resource type to implement this +// interface to have a meta property as part of its JSON output. +// +// Implementations don't have to deeply copy the maps. +type MetaHolder interface { + Meta() Meta + SetMeta(Meta) +} diff --git a/resource.go b/resource.go index 0be6487..aec7c7c 100644 --- a/resource.go +++ b/resource.go @@ -131,6 +131,13 @@ func MarshalResource(r Resource, prepath string, fields []string, relData map[st "self": buildSelfLink(r, prepath), } + // Meta + if m, ok := r.(MetaHolder); ok { + if len(m.Meta()) > 0 { + mapPl["meta"] = m.Meta() + } + } + // NOTE An error should not happen. pl, _ := json.Marshal(mapPl) @@ -197,6 +204,11 @@ func UnmarshalResource(data []byte, schema *Schema) (Resource, error) { } } + // Meta + if m, ok := res.(MetaHolder); ok { + m.SetMeta(rske.Meta) + } + return res, nil } diff --git a/skeletons.go b/skeletons.go index f3aa99b..b93e4ba 100644 --- a/skeletons.go +++ b/skeletons.go @@ -14,6 +14,7 @@ type resourceSkeleton struct { Type string `json:"type"` Attributes map[string]json.RawMessage `json:"attributes"` Relationships map[string]relationshipSkeleton `json:"relationships"` + Meta Meta `json:"meta"` } type relationshipSkeleton struct { diff --git a/soft_resource.go b/soft_resource.go index 22ebe2c..7283716 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -16,6 +16,7 @@ type SoftResource struct { id string data map[string]interface{} + meta Meta } // Attrs returns the resource's attributes. @@ -197,6 +198,16 @@ func (sr *SoftResource) Copy() Resource { } } +// Meta returns the meta values of the resource. +func (sr *SoftResource) Meta() Meta { + return sr.meta +} + +// SetMeta sets the meta values of the resource. +func (sr *SoftResource) SetMeta(m Meta) { + sr.meta = m +} + func (sr *SoftResource) fields() []string { fields := make([]string, 0, len(sr.Type.Attrs)+len(sr.Type.Rels)) for i := range sr.Type.Attrs { diff --git a/soft_resource_test.go b/soft_resource_test.go index 5ca0b24..91287e2 100644 --- a/soft_resource_test.go +++ b/soft_resource_test.go @@ -244,3 +244,25 @@ func TestSoftResourceCopy(t *testing.T) { sr2 := sr.Copy() assert.Equal(true, Equal(sr, sr2)) } + +func TestSoftResourceMeta(t *testing.T) { + assert := assert.New(t) + + typ, _ := BuildType(mocktype{}) + sr := &SoftResource{} + sr.Type = &typ + sr.SetID("id") + + meta := Meta(map[string]interface{}{ + "key1": "a string", + "key2": 200, + "key3": false, + "key4": getTime(), + }) + + // Add some meta values + sr.SetMeta(meta) + + // The new + assert.Equal(meta, sr.Meta()) +} diff --git a/testdata/goldenfiles/marshaling/collection.json b/testdata/goldenfiles/marshaling/collection.json index c9749ca..723ebbe 100644 --- a/testdata/goldenfiles/marshaling/collection.json +++ b/testdata/goldenfiles/marshaling/collection.json @@ -97,6 +97,42 @@ } }, "type": "mocktype" + }, + { + "attributes": { + "bool": false, + "int": 0, + "str": "", + "time": "0001-01-01T00:00:00Z", + "uint64": 0 + }, + "id": "id4", + "links": { + "self": "https://example.org/mocktype/id4" + }, + "meta": { + "key1": "a string", + "key2": 42, + "key3": true, + "key4": "2013-06-24T22:03:34.8276Z" + }, + "relationships": { + "to-1": { + "data": null, + "links": { + "related": "https://example.org/mocktype/id4/to-1", + "self": "https://example.org/mocktype/id4/relationships/to-1" + } + }, + "to-x-from-1": { + "data": [], + "links": { + "related": "https://example.org/mocktype/id4/to-x-from-1", + "self": "https://example.org/mocktype/id4/relationships/to-x-from-1" + } + } + }, + "type": "mocktype" } ], "jsonapi": { diff --git a/wrapper.go b/wrapper.go index 5afcd4f..97d819a 100644 --- a/wrapper.go +++ b/wrapper.go @@ -20,6 +20,7 @@ type Wrapper struct { typ string attrs map[string]Attr rels map[string]Rel + meta Meta } // Wrap wraps v (a struct or a pointer to a struct) and returns a Wrapper that @@ -99,6 +100,13 @@ func Wrap(v interface{}) *Wrapper { } } + // Meta + if m, ok := v.(MetaHolder); ok { + if len(m.Meta()) > 0 { + w.SetMeta(m.Meta()) + } + } + return w } @@ -307,6 +315,16 @@ func (w *Wrapper) Copy() Resource { return nw } +// Meta returns the meta values of the resource. +func (w *Wrapper) Meta() Meta { + return w.meta +} + +// SetMeta sets the meta values of the resource. +func (w *Wrapper) SetMeta(m Meta) { + w.meta = m +} + // Private methods func (w *Wrapper) getAttr(key string) interface{} { From cb0b9918b17249b3d65c0275a67965bb5e89688c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 23 Jun 2020 15:03:36 -0400 Subject: [PATCH 364/406] Remove GetID from the Resource interface --- build_links.go | 5 +++-- collection_test.go | 2 +- document.go | 10 +++++----- document_test.go | 4 ++-- examples/unmarshal_document_test.go | 2 +- helpers.go | 2 +- range.go | 4 ++-- range_test.go | 8 ++++---- resource.go | 5 ++--- soft_collection.go | 2 +- soft_resource.go | 4 ++++ soft_resource_test.go | 4 ++-- type_test.go | 2 +- wrapper.go | 4 ++++ 14 files changed, 33 insertions(+), 25 deletions(-) diff --git a/build_links.go b/build_links.go index 59e4094..b695371 100644 --- a/build_links.go +++ b/build_links.go @@ -12,8 +12,9 @@ func buildSelfLink(res Resource, prepath string) string { prepath += "/" } - if res.GetID() != "" && res.GetType().Name != "" { - return prepath + res.GetType().Name + "/" + res.GetID() + id, _ := res.Get("id").(string) + if id != "" && res.GetType().Name != "" { + return prepath + res.GetType().Name + "/" + id } return "" diff --git a/collection_test.go b/collection_test.go index d85f36f..97ab347 100644 --- a/collection_test.go +++ b/collection_test.go @@ -24,7 +24,7 @@ func TestResources(t *testing.T) { assert.Equal(1, col.Len()) // Retrieve a resource - assert.Equal("id", col.At(0).GetID()) + assert.Equal("id", col.At(0).Get("id").(string)) assert.Nil(col.At(1)) } diff --git a/document.go b/document.go index 59abd7a..10ec840 100644 --- a/document.go +++ b/document.go @@ -36,7 +36,7 @@ type Document struct { // // It also makes sure that resources are not added twice. func (d *Document) Include(res Resource) { - key := res.GetID() + " " + res.GetType().Name + key := res.Get("id").(string) + " " + res.GetType().Name if len(d.Included) == 0 { d.Included = []Resource{} @@ -44,7 +44,7 @@ func (d *Document) Include(res Resource) { if dres, ok := d.Data.(Resource); ok { // Check resource - rkey := dres.GetID() + " " + dres.GetType().Name + rkey := dres.Get("id").(string) + " " + dres.GetType().Name if rkey == key { return @@ -54,7 +54,7 @@ func (d *Document) Include(res Resource) { ctyp := col.GetType() if ctyp.Name == res.GetType().Name { for i := 0; i < col.Len(); i++ { - rkey := col.At(i).GetID() + " " + col.At(i).GetType().Name + rkey := col.At(i).Get("id").(string) + " " + col.At(i).GetType().Name if rkey == key { return @@ -65,7 +65,7 @@ func (d *Document) Include(res Resource) { // Check already included resources for _, res := range d.Included { - if key == res.GetID()+" "+res.GetType().Name { + if key == res.Get("id").(string)+" "+res.GetType().Name { return } } @@ -124,7 +124,7 @@ func MarshalDocument(doc *Document, url *URL) ([]byte, error) { if len(doc.Included) > 0 { sort.Slice(doc.Included, func(i, j int) bool { - return doc.Included[i].GetID() < doc.Included[j].GetID() + return doc.Included[i].Get("id").(string) < doc.Included[j].Get("id").(string) }) if len(data) > 0 { diff --git a/document_test.go b/document_test.go index 27e3fa7..23e4c2b 100644 --- a/document_test.go +++ b/document_test.go @@ -44,7 +44,7 @@ func TestInclude(t *testing.T) { // Check ids := []string{} for _, res := range doc.Included { - ids = append(ids, res.GetType().Name+"-"+res.GetID()) + ids = append(ids, res.GetType().Name+"-"+res.Get("id").(string)) } expect := []string{ @@ -79,7 +79,7 @@ func TestInclude(t *testing.T) { // Check ids = []string{} for _, res := range doc.Included { - ids = append(ids, res.GetType().Name+"-"+res.GetID()) + ids = append(ids, res.GetType().Name+"-"+res.Get("id").(string)) } expect = []string{ diff --git a/examples/unmarshal_document_test.go b/examples/unmarshal_document_test.go index 016eb30..2ad359f 100644 --- a/examples/unmarshal_document_test.go +++ b/examples/unmarshal_document_test.go @@ -57,7 +57,7 @@ func ExampleUnmarshalDocument() { res, _ := doc.Data.(jsonapi.Resource) // Print the result. - fmt.Printf("user.ID: %s\n", res.GetID()) + fmt.Printf("user.ID: %s\n", res.Get("id").(string)) fmt.Printf("user.Username: %s\n", res.Get("username")) tm := res.Get("registered-at").(time.Time) out, _ := tm.MarshalText() diff --git a/helpers.go b/helpers.go index f3e7868..8285077 100644 --- a/helpers.go +++ b/helpers.go @@ -196,7 +196,7 @@ func MustBuildType(v interface{}) Type { // CheckType can be used to check the validity of a struct. func IDAndType(v interface{}) (string, string) { if res, ok := v.(Resource); ok { - return res.GetID(), res.GetType().Name + return res.Get("id").(string), res.GetType().Name } val := reflect.ValueOf(v) diff --git a/range.go b/range.go index 61e65e3..938a2b6 100644 --- a/range.go +++ b/range.go @@ -23,7 +23,7 @@ func Range(c Collection, ids []string, filter *Filter, sort []string, size uint, for i := 0; i < c.Len(); i++ { for _, id := range ids { res := c.At(i) - if res.GetID() == id { + if res.Get("id").(string) == id { col.col = append(col.col, res) } } @@ -103,7 +103,7 @@ func (s sortedResources) Less(i, j int) bool { } if r == "id" { - return s.col[i].GetID() < s.col[j].GetID() != inverse + return s.col[i].Get("id").(string) < s.col[j].Get("id").(string) != inverse } v := s.col[i].Get(r) diff --git a/range_test.go b/range_test.go index 7367d4f..602022e 100644 --- a/range_test.go +++ b/range_test.go @@ -118,7 +118,7 @@ func TestRange(t *testing.T) { ids := []string{} for i := 0; i < ranged.Len(); i++ { - ids = append(ids, ranged.At(i).GetID()) + ids = append(ids, ranged.At(i).Get("id").(string)) } assert.Equal(expectedIDs, ids, "range of IDs (1)") @@ -143,7 +143,7 @@ func TestRange(t *testing.T) { ids = []string{} for i := 0; i < ranged.Len(); i++ { - ids = append(ids, ranged.At(i).GetID()) + ids = append(ids, ranged.At(i).Get("id").(string)) } assert.Equal(expectedIDs, ids, "range of IDs (2)") @@ -316,7 +316,7 @@ func TestSortResources(t *testing.T) { // Sorted IDs from the collection ids := []string{} for i := 0; i < page.Len(); i++ { - ids = append(ids, page.At(i).GetID()) + ids = append(ids, page.At(i).Get("id").(string)) } expectedIDs := []string{ @@ -346,7 +346,7 @@ func TestSortResources(t *testing.T) { ids = []string{} for i := 0; i < page.Len(); i++ { - ids = append(ids, page.At(i).GetID()) + ids = append(ids, page.At(i).Get("id").(string)) } sort.Strings(expectedIDs) diff --git a/resource.go b/resource.go index aec7c7c..6f9e8d7 100644 --- a/resource.go +++ b/resource.go @@ -20,7 +20,6 @@ type Resource interface { Rel(key string) Rel // Read - GetID() string GetType() Type Get(key string) interface{} GetToOne(key string) string @@ -37,7 +36,7 @@ type Resource interface { func MarshalResource(r Resource, prepath string, fields []string, relData map[string][]string) []byte { mapPl := map[string]interface{}{} - mapPl["id"] = r.GetID() + mapPl["id"] = r.Get("id").(string) mapPl["type"] = r.GetType().Name // Attributes @@ -399,7 +398,7 @@ func Equal(r1, r2 Resource) bool { // EqualStrict is like Equal, but it also considers IDs. func EqualStrict(r1, r2 Resource) bool { - if r1.GetID() != r2.GetID() { + if r1.Get("id").(string) != r2.Get("id").(string) { return false } diff --git a/soft_collection.go b/soft_collection.go index 5e0a5c1..ae82784 100644 --- a/soft_collection.go +++ b/soft_collection.go @@ -60,7 +60,7 @@ func (s *SoftCollection) Add(r Resource) { // A SoftResource is built from the Resource and // then it is added to the collection. sr := &SoftResource{} - sr.id = r.GetID() + sr.id = r.Get("id").(string) sr.Type = s.Type for _, attr := range r.Attrs() { diff --git a/soft_resource.go b/soft_resource.go index 7283716..b516d85 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -110,6 +110,10 @@ func (sr *SoftResource) GetType() Type { func (sr *SoftResource) Get(key string) interface{} { sr.check() + if key == "id" { + return sr.GetID() + } + if _, ok := sr.Type.Attrs[key]; ok { if v, ok := sr.data[key]; ok { return v diff --git a/soft_resource_test.go b/soft_resource_test.go index 91287e2..926bc36 100644 --- a/soft_resource_test.go +++ b/soft_resource_test.go @@ -41,7 +41,7 @@ func TestSoftResource(t *testing.T) { typ2 := typ typ2.Name = "type2" sr.SetType(&typ2) - assert.Equal(t, "id", sr.GetID()) + assert.Equal(t, "id", sr.Get("id").(string)) assert.Equal(t, "type2", sr.GetType().Name) // Attributes @@ -162,7 +162,7 @@ func TestSoftResourceNew(t *testing.T) { nsr := sr.New() // The new - assert.Equal("", nsr.GetID()) + assert.Equal("", nsr.Get("id").(string)) assert.Equal("", nsr.Get("str")) assert.Equal(0, nsr.Get("int")) } diff --git a/type_test.go b/type_test.go index d1a3c94..1ea900b 100644 --- a/type_test.go +++ b/type_test.go @@ -104,7 +104,7 @@ func TestTypeNewFunc(t *testing.T) { return res }, } - assert.Equal("abc123", typ.New().GetID()) + assert.Equal("abc123", typ.New().Get("id").(string)) } func TestAttrUnmarshalToType(t *testing.T) { diff --git a/wrapper.go b/wrapper.go index 97d819a..521b677 100644 --- a/wrapper.go +++ b/wrapper.go @@ -171,6 +171,10 @@ func (w *Wrapper) GetType() Type { // Get returns the value associated to the attribute named after key. func (w *Wrapper) Get(key string) interface{} { + if key == "id" { + return w.GetID() + } + return w.getAttr(key) } From c6c3c21232926a32e4f689d955025a1668747e0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 23 Jun 2020 15:16:54 -0400 Subject: [PATCH 365/406] Remove SetID method from the Resource interface --- resource.go | 3 +-- soft_resource.go | 7 +++++++ wrapper.go | 5 +++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/resource.go b/resource.go index 6f9e8d7..35d9f94 100644 --- a/resource.go +++ b/resource.go @@ -26,7 +26,6 @@ type Resource interface { GetToMany(key string) []string // Update - SetID(id string) Set(key string, val interface{}) SetToOne(key string, rel string) SetToMany(key string, rels []string) @@ -158,7 +157,7 @@ func UnmarshalResource(data []byte, schema *Schema) (Resource, error) { typ := schema.GetType(rske.Type) res := typ.New() - res.SetID(rske.ID) + res.Set("id", rske.ID) for a, v := range rske.Attributes { if attr, ok := typ.Attrs[a]; ok { diff --git a/soft_resource.go b/soft_resource.go index b516d85..fd90e4c 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -139,6 +139,13 @@ func (sr *SoftResource) SetType(typ *Type) { func (sr *SoftResource) Set(key string, v interface{}) { sr.check() + if key == "id" { + id, _ := v.(string) + sr.id = id + + return + } + if attr, ok := sr.Type.Attrs[key]; ok { typ, nullable := GetAttrType(fmt.Sprintf("%T", v)) if attr.Type == typ && attr.Nullable == nullable { diff --git a/wrapper.go b/wrapper.go index 521b677..f60a463 100644 --- a/wrapper.go +++ b/wrapper.go @@ -185,6 +185,11 @@ func (w *Wrapper) SetID(id string) { // Set sets the value associated to the attribute named after key. func (w *Wrapper) Set(key string, val interface{}) { + if key == "id" { + id, _ := val.(string) + w.SetID(id) + } + w.setAttr(key, val) } From f6e2e2cfe4bd0bb9bc74f980022c0b466c7344e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 23 Jun 2020 15:48:29 -0400 Subject: [PATCH 366/406] Remove Attr and Rel from the Resource interface --- resource.go | 2 -- wrapper_test.go | 9 +++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/resource.go b/resource.go index 35d9f94..104483f 100644 --- a/resource.go +++ b/resource.go @@ -16,8 +16,6 @@ type Resource interface { // Structure Attrs() map[string]Attr Rels() map[string]Rel - Attr(key string) Attr - Rel(key string) Rel // Read GetType() Type diff --git a/wrapper_test.go b/wrapper_test.go index 0eb2982..de988f8 100644 --- a/wrapper_test.go +++ b/wrapper_test.go @@ -190,24 +190,25 @@ func TestWrapper(t *testing.T) { // New wrap3 := wrap1.New() + wrap3Type := wrap3.GetType() for _, attr := range wrap1.Attrs() { - assert.Equal(wrap1.Attr(attr.Name), wrap3.Attr(attr.Name), "copied attribute") + assert.Equal(wrap1.Attr(attr.Name), wrap3Type.Attrs[attr.Name], "copied attribute") } for _, rel := range wrap1.Rels() { - assert.Equal(wrap1.Rel(rel.FromName), wrap3.Rel(rel.FromName), "copied relationship") + assert.Equal(wrap1.Rel(rel.FromName), wrap3Type.Rels[rel.FromName], "copied relationship") } // Copy wrap3 = wrap1.Copy() for _, attr := range wrap1.Attrs() { - assert.Equal(wrap1.Attr(attr.Name), wrap3.Attr(attr.Name), "copied attribute") + assert.Equal(wrap1.Attr(attr.Name), wrap3Type.Attrs[attr.Name], "copied attribute") } for _, rel := range wrap1.Rels() { - assert.Equal(wrap1.Rel(rel.FromName), wrap3.Rel(rel.FromName), "copied relationship") + assert.Equal(wrap1.Rel(rel.FromName), wrap3Type.Rels[rel.FromName], "copied relationship") } wrap3.Set("str", "another string") From 7b2cf3b4df02bdf0164035675487ee0ab3d113f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 3 Aug 2020 19:59:25 -0400 Subject: [PATCH 367/406] Update golangci-lint to v1.30.0 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 290728f..cdf1ff5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ env: before_script: - 'curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh - | sh -s v1.27.0' + | sh -s v1.30.0' script: - ./bin/golangci-lint run From 4addb3a0e0f7921e93a1b82d18d4f0e017ba325e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 3 Aug 2020 21:15:01 -0400 Subject: [PATCH 368/406] Add test for SoftResource.Set/Get with id key --- soft_resource_test.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/soft_resource_test.go b/soft_resource_test.go index 926bc36..cba1943 100644 --- a/soft_resource_test.go +++ b/soft_resource_test.go @@ -266,3 +266,12 @@ func TestSoftResourceMeta(t *testing.T) { // The new assert.Equal(meta, sr.Meta()) } + +func TestSoftResourceGetSetID(t *testing.T) { + assert := assert.New(t) + + sr := &SoftResource{} + sr.Set("id", "abc123") + + assert.Equal("abc123", sr.Get("id")) +} From 44c84289eb47b989434d55c5143d6d6a49c0b356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 29 Aug 2020 18:38:31 -0400 Subject: [PATCH 369/406] Add Go 1.15 support in CI pipeline --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index cdf1ff5..138fbe7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ go: - 1.12.x - 1.13.x - 1.14.x + - 1.15.x arch: - amd64 From 4f50c532654fb8422699197b6b5535993e32d2a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 29 Aug 2020 19:00:49 -0400 Subject: [PATCH 370/406] Fix string initialization --- resource_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resource_test.go b/resource_test.go index c0bb82b..7bd6172 100644 --- a/resource_test.go +++ b/resource_test.go @@ -228,7 +228,7 @@ func TestEqual(t *testing.T) { mt21 := Wrap(&mockType2{ ID: "mt1", - StrPtr: func() *string { v := string(1); return &v }(), + StrPtr: func() *string { v := "id"; return &v }(), IntPtr: func() *int { v := int(1); return &v }(), Int8Ptr: func() *int8 { v := int8(2); return &v }(), Int16Ptr: func() *int16 { v := int16(3); return &v }(), From 2be47ef06167f9e04679cbbb438ec4a83ed9eb6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Wed, 2 Sep 2020 22:38:33 -0400 Subject: [PATCH 371/406] Update github.com/google/uuid to v1.1.2 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3de695a..eb82327 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,6 @@ module github.com/mfcochauxlaberge/jsonapi go 1.11 require ( - github.com/google/uuid v1.1.1 + github.com/google/uuid v1.1.2 github.com/stretchr/testify v1.5.1 ) diff --git a/go.sum b/go.sum index 51e4d45..b895365 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= -github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= From 1f30628c2ea458af8e043d8e4500129c791d59de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Wed, 2 Sep 2020 22:39:32 -0400 Subject: [PATCH 372/406] Update github.com/stretchr/testify to v1.6.1 --- go.mod | 2 +- go.sum | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index eb82327..e9df80c 100644 --- a/go.mod +++ b/go.mod @@ -4,5 +4,5 @@ go 1.11 require ( github.com/google/uuid v1.1.2 - github.com/stretchr/testify v1.5.1 + github.com/stretchr/testify v1.6.1 ) diff --git a/go.sum b/go.sum index b895365..cb1dc2f 100644 --- a/go.sum +++ b/go.sum @@ -6,9 +6,9 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From 1b2e66524e09842c0f601f06ed1f506367a91366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 21 Sep 2020 22:46:16 -0400 Subject: [PATCH 373/406] Update golangci-lint to v1.31.0 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 138fbe7..573becf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ env: before_script: - 'curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh - | sh -s v1.30.0' + | sh -s v1.31.0' script: - ./bin/golangci-lint run From d8fe6a5a3d1075ed0990170b811ba8cc32f4497d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 21 Sep 2020 22:55:38 -0400 Subject: [PATCH 374/406] Change Replace to ReplaceAll when appropriate --- document_test.go | 2 +- util_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/document_test.go b/document_test.go index 23e4c2b..1276a81 100644 --- a/document_test.go +++ b/document_test.go @@ -281,7 +281,7 @@ func TestMarshalDocument(t *testing.T) { assert.NoError(err) // Golden file - filename := strings.Replace(test.name, " ", "_", -1) + ".json" + filename := strings.ReplaceAll(test.name, " ", "_") + ".json" path := filepath.Join("testdata", "goldenfiles", "marshaling", filename) if !*update { // Retrieve the expected result from file diff --git a/util_test.go b/util_test.go index 5578111..5b6dede 100644 --- a/util_test.go +++ b/util_test.go @@ -6,10 +6,10 @@ import ( ) func makeOneLineNoSpaces(str string) string { - str = strings.Replace(str, "\t", "", -1) - str = strings.Replace(str, "\n", "", -1) + str = strings.ReplaceAll(str, "\t", "") + str = strings.ReplaceAll(str, "\n", "") - return strings.Replace(str, " ", "", -1) + return strings.ReplaceAll(str, " ", "") } func ptr(v interface{}) interface{} { From 8d07c2eaa9f8d86e21385cf47bb204c95eee193f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 21 Sep 2020 23:14:16 -0400 Subject: [PATCH 375/406] Drop support for Go 1.11 --- .travis.yml | 6 ------ README.md | 4 ++-- go.mod | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 573becf..59a5f9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: go go: - - 1.11.x - 1.12.x - 1.13.x - 1.14.x @@ -10,11 +9,6 @@ arch: - amd64 - arm64 -jobs: - exclude: - - go: 1.11.x - arch: arm64 - branches: only: - master diff --git a/README.md b/README.md index 9da5966..4e882c4 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@
- + @@ -70,7 +70,7 @@ A few tasks are required before committing to the current API: ## Requirements -The supported versions of Go are the latest patch releases of every minor release starting with Go 1.11. +The supported versions of Go are the latest patch releases of every minor release starting with Go 1.12. ## Examples diff --git a/go.mod b/go.mod index e9df80c..cd65656 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/mfcochauxlaberge/jsonapi -go 1.11 +go 1.12 require ( github.com/google/uuid v1.1.2 From dcdf657a3f411801b21847146e8a4dac39caac61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 17 Dec 2020 23:14:52 -0500 Subject: [PATCH 376/406] Stop generating UUID in NewError --- error.go | 7 ------- go.mod | 5 +---- go.sum | 2 -- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/error.go b/error.go index 8063114..327b372 100644 --- a/error.go +++ b/error.go @@ -5,8 +5,6 @@ import ( "fmt" "net/http" "strconv" - - "github.com/google/uuid" ) // An Error represents an error object from the JSON:API specification. @@ -24,11 +22,6 @@ type Error struct { // NewError returns an empty Error object. func NewError() Error { err := Error{ - ID: uuid.New().String(), - Code: "", - Status: "", - Title: "", - Detail: "", Links: map[string]string{}, Source: map[string]interface{}{}, Meta: Meta{}, diff --git a/go.mod b/go.mod index cd65656..8593d55 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,4 @@ module github.com/mfcochauxlaberge/jsonapi go 1.12 -require ( - github.com/google/uuid v1.1.2 - github.com/stretchr/testify v1.6.1 -) +require github.com/stretchr/testify v1.6.1 diff --git a/go.sum b/go.sum index cb1dc2f..1f1e7af 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= -github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= From c96b0ad0a5c61b31fbbfa50424d9dc5f571002d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 17 Dec 2020 23:24:54 -0500 Subject: [PATCH 377/406] Move CI to GitHub Actions --- .github/workflows/lint.yml | 17 +++++++++++++++++ .github/workflows/test.yml | 20 ++++++++++++++++++++ .travis.yml | 29 ----------------------------- 3 files changed, 37 insertions(+), 29 deletions(-) create mode 100644 .github/workflows/lint.yml create mode 100644 .github/workflows/test.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 0000000..9b2d556 --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,17 @@ +name: Lint + +on: + push: + branches: + - master + pull_request: + +jobs: + golangci: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: golangci-lint + uses: golangci/golangci-lint-action@v2 + with: + version: v1.33 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..8174763 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,20 @@ +name: Test + +on: + push: + branches: + - master + pull_request: + +jobs: + test: + runs-on: ubuntu-latest + strategy: + matrix: + go: [ '1.12', '1.13', '1.14', '1.15' ] + steps: + - uses: actions/setup-go@v2 + with: + go-version: ${{ matrix.go }} + - uses: actions/checkout@v2 + - run: go test ./... diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 59a5f9d..0000000 --- a/.travis.yml +++ /dev/null @@ -1,29 +0,0 @@ -language: go -go: - - 1.12.x - - 1.13.x - - 1.14.x - - 1.15.x - -arch: - - amd64 - - arm64 - -branches: - only: - - master - -env: - - GO111MODULE=on - -before_script: - - 'curl -sfL - https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh - | sh -s v1.31.0' - -script: - - ./bin/golangci-lint run - - go test ./... -race -coverprofile=coverage.txt -covermode=atomic - -after_success: - - bash <(curl -s https://codecov.io/bash) From 3b65bfd50eb8a24c66599a8e5ef45cb5ac1ac444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 17 Dec 2020 23:34:05 -0500 Subject: [PATCH 378/406] Replace Travis badge for GitHub Actions badges --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4e882c4..cf9b79b 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,11 @@

- - + + + + + From 78facad45fc5cf1243fe432dce6dc70314187e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 28 Dec 2020 13:50:38 -0500 Subject: [PATCH 379/406] Add comment to Meta type --- meta.go | 1 + 1 file changed, 1 insertion(+) diff --git a/meta.go b/meta.go index b1c772d..10d737d 100644 --- a/meta.go +++ b/meta.go @@ -5,6 +5,7 @@ import ( "time" ) +// Meta holds meta information. type Meta map[string]interface{} // Has reports whether the Meta map contains or not the given key. From b425d9f2c7db4ba15036ac8376d470d691c850c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 28 Dec 2020 13:51:51 -0500 Subject: [PATCH 380/406] Remove redundant type from slice literal --- examples/marshal_document_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/marshal_document_test.go b/examples/marshal_document_test.go index aa1cf54..4238e28 100644 --- a/examples/marshal_document_test.go +++ b/examples/marshal_document_test.go @@ -53,7 +53,7 @@ func ExampleMarshalDocument() { // must be included in the payload. // The relationship links are always included. doc.RelData = map[string][]string{ - "users": []string{"articles"}, + "users": {"articles"}, } // A URL represents a JSON:API compliant URL. Query From 5b1068cc974c87eeb0e9329a97ba3f143a317784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 31 Dec 2020 02:30:39 -0500 Subject: [PATCH 381/406] Add Schema.AddTwoWayRel method --- schema.go | 37 ++++++++++++++++++++++++++++++++ schema_test.go | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) diff --git a/schema.go b/schema.go index d363b38..1696e2d 100644 --- a/schema.go +++ b/schema.go @@ -97,6 +97,43 @@ func (s *Schema) RemoveRel(typ string, rel string) { } } +// AddTwoWayRel adds a two-way relationship to both types involved. +// +// The types must already exist in the schema. +func (s *Schema) AddTwoWayRel(rel Rel) error { + rel1 := rel.Normalize() + rel2 := rel.Invert() + found1 := false + found2 := false + + for i := range s.Types { + if s.Types[i].Name == rel1.FromType { + found1 = true + + err := s.Types[i].AddRel(rel1) + if err != nil { + return err + } + } else if s.Types[i].Name == rel2.FromType { + found2 = true + + err := s.Types[i].AddRel(rel2) + if err != nil { + return err + } + } + } + + if found1 && found2 { + return nil + } + + return fmt.Errorf( + "jsonapi: types %q and %q must exist", + rel1.FromType, rel2.FromType, + ) +} + // Rels returns all the relationships from the schema's types. For two-way // relationships (two types where each has a relationship pointing to the other // type), only one of the two relationships will appear in the list. diff --git a/schema_test.go b/schema_test.go index b915910..3965bcd 100644 --- a/schema_test.go +++ b/schema_test.go @@ -95,6 +95,63 @@ func TestSchemaTypes(t *testing.T) { assert.Error(err) } +func TestSchemaAddTwoWayRel(t *testing.T) { + assert := assert.New(t) + + // Add two-way relationship + schema := &Schema{} + _ = schema.AddType(Type{Name: "type1"}) + _ = schema.AddType(Type{Name: "type2"}) + + err := schema.AddTwoWayRel(Rel{ + FromType: "type1", + FromName: "parent", + ToOne: true, + ToType: "type2", + ToName: "children", + FromOne: false, + }) + assert.NoError(err) + + // Add two-way relationship (missing type) + schema = &Schema{} + _ = schema.AddType(Type{Name: "type1"}) + + err = schema.AddTwoWayRel(Rel{ + FromType: "type1", + FromName: "parent", + ToOne: true, + ToType: "type2", + ToName: "children", + FromOne: false, + }) + assert.EqualError(err, `jsonapi: types "type1" and "type2" must exist`) + + // Add two-way relationship (invalid relationship) + schema = &Schema{} + _ = schema.AddType(Type{Name: "type1"}) + + err = schema.AddTwoWayRel(Rel{ + FromType: "type1", + FromName: "parent", + ToOne: true, + ToType: "", + ToName: "", + FromOne: false, + }) + assert.EqualError(err, `jsonapi: relationship type is empty`) + + err = schema.AddTwoWayRel(Rel{ + FromType: "", + FromName: "", + ToOne: true, + ToType: "type1", + ToName: "parent", + FromOne: false, + }) + assert.EqualError(err, `jsonapi: relationship type is empty`) +} + func TestSchemaCheck(t *testing.T) { assert := assert.New(t) From 6e79fa4236eb5db0ff17b4e649ac96549a36988e Mon Sep 17 00:00:00 2001 From: Olivier Forget Date: Sun, 3 Jan 2021 05:52:09 -0800 Subject: [PATCH 382/406] Fix NewRequest so it doesn't ignore query params --- request.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/request.go b/request.go index 44b2161..4ddfa44 100644 --- a/request.go +++ b/request.go @@ -15,7 +15,12 @@ func NewRequest(r *http.Request, schema *Schema) (*Request, error) { return nil, err } - url, err := NewURLFromRaw(schema, r.URL.EscapedPath()) + su, err := NewSimpleURL(r.URL) + if err != nil { + return nil, err + } + + url, err := NewURL(schema, su) if err != nil { return nil, err } From 4f12c466b20a3455da045e794d1ede1dede7c799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 3 Jan 2021 10:38:54 -0500 Subject: [PATCH 383/406] Add test that makes NewSimpleURL fail in NewRequest --- request_test.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/request_test.go b/request_test.go index 961e1d9..95db86a 100644 --- a/request_test.go +++ b/request_test.go @@ -36,6 +36,13 @@ func TestNewRequest(t *testing.T) { url: "/invalid", schema: schema, expectedError: `400 Bad Request: "invalid" is not a known type.`, + }, { + name: "bad url", + method: "GET", + url: "/mocktypes1?filter={invalid}", + schema: schema, + expectedError: `400 Bad Request: The filter parameter is not a ` + + `string or a valid JSON object.`, }, } From 1458cda7b4322660cbb425ac70774de6c46f1906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 3 Jan 2021 10:59:18 -0500 Subject: [PATCH 384/406] Add codecov back into CI --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8174763..9063912 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,4 +17,5 @@ jobs: with: go-version: ${{ matrix.go }} - uses: actions/checkout@v2 - - run: go test ./... + - run: go test ./... -race -coverprofile=coverage.txt -covermode=atomic + - uses: codecov/codecov-action@v1 From 1e2fa0aa40ecee58847e246b87ef713ba0449a1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 5 Jan 2021 00:17:15 -0500 Subject: [PATCH 385/406] Fix formatting in slice of tests --- simple_url_util_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/simple_url_util_test.go b/simple_url_util_test.go index 89b30af..3237983 100644 --- a/simple_url_util_test.go +++ b/simple_url_util_test.go @@ -50,8 +50,7 @@ func TestParseCommaList(t *testing.T) { name: "two commas in middle", source: `a,,b`, expectedValue: []string{"a", "b"}, - }, - { + }, { name: "end with two commas", source: `a,b,c,,`, expectedValue: []string{"a", "b", "c"}, From 843e3701032adb029790b33dfc7bd7f72e97a9b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 5 Jan 2021 23:25:34 -0500 Subject: [PATCH 386/406] Clarify pointer/struct difference in Wrap and fix behavior --- wrapper.go | 26 +++++++++++++++++++------- wrapper_test.go | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 7 deletions(-) diff --git a/wrapper.go b/wrapper.go index f60a463..1de1c21 100644 --- a/wrapper.go +++ b/wrapper.go @@ -26,23 +26,35 @@ type Wrapper struct { // Wrap wraps v (a struct or a pointer to a struct) and returns a Wrapper that // can be used as a Resource to handle the given value. // -// If v is not a pointer, the changes applied to the Wrapper object won't affect -// the underlying object (which will be a new instance of v's type). +// Changes made to the Wrapper object (through Set for example) will be applied +// to v. +// +// If v is not a pointer, a copy is made and v won't be modified by the wrapper. func Wrap(v interface{}) *Wrapper { val := reflect.ValueOf(v) - if val.Kind() != reflect.Ptr { + switch { + case val.Kind() != reflect.Ptr: if val.Kind() != reflect.Struct { panic(errors.New("jsonapi: value has to be a pointer to a struct")) } - val = reflect.New(val.Type()) - } else if val.Elem().Kind() != reflect.Struct { + newVal := reflect.New(val.Type()).Elem() + + for i := 0; i < newVal.NumField(); i++ { + f := newVal.Field(i) + if f.CanSet() { + f.Set(val.Field(i)) + } + } + + val = newVal + case val.Elem().Kind() != reflect.Struct: panic(errors.New("jsonapi: value has to be a pointer to a struct")) + default: + val = val.Elem() } - val = val.Elem() - err := Check(val.Interface()) if err != nil { panic(fmt.Sprintf("jsonapi: invalid type: %s", err)) diff --git a/wrapper_test.go b/wrapper_test.go index de988f8..ce6390e 100644 --- a/wrapper_test.go +++ b/wrapper_test.go @@ -38,6 +38,38 @@ func TestWrap(t *testing.T) { }, "panic when not a valid struct") } +func TestWrapStruct(t *testing.T) { + assert := assert.New(t) + + res1 := mockType1{ + ID: "res123", + Str: "a_string", + } + + wrap1 := Wrap(res1) + + // ID, type, field + id, typ := wrap1.IDAndType() + assert.Equal(res1.ID, id, "id") + assert.Equal("mocktypes1", typ, "type") + assert.Equal(res1.Str, wrap1.Get("str"), "str field") + + // Modifying the wrapper does not modify + // the original value. + wrap1.SetID("another_id") + id, _ = wrap1.IDAndType() + assert.Equal("another_id", id, "type") + + wrap1.Set("str", "another_string") + assert.Equal("another_string", wrap1.Get("str"), "str field") + + // Modifying the original value does + // not modify the wrapper. + res1.Str = "new_string" + assert.NotEqual(res1.Str, wrap1.Get("str"), "str field") + assert.Equal("another_string", wrap1.Get("str"), "str field") +} + func TestWrapper(t *testing.T) { assert := assert.New(t) From eabe5dc160fa7d5518b75a4b5c02b5ac234ee410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Wed, 6 Jan 2021 01:16:56 -0500 Subject: [PATCH 387/406] Remove Get/SetToOne/Many methods from the Resource interface --- examples/unmarshal_document_test.go | 2 +- filter.go | 4 +- filter_test.go | 4 +- resource.go | 24 +++--- resource_test.go | 10 +-- soft_collection.go | 4 +- soft_resource.go | 50 +++--------- soft_resource_test.go | 48 ++++++++--- wrapper.go | 122 ++-------------------------- wrapper_test.go | 80 ------------------ 10 files changed, 77 insertions(+), 271 deletions(-) diff --git a/examples/unmarshal_document_test.go b/examples/unmarshal_document_test.go index 2ad359f..eac94b6 100644 --- a/examples/unmarshal_document_test.go +++ b/examples/unmarshal_document_test.go @@ -62,7 +62,7 @@ func ExampleUnmarshalDocument() { tm := res.Get("registered-at").(time.Time) out, _ := tm.MarshalText() fmt.Printf("user.RegisteredAt: %s\n", out) - fmt.Printf("user.Articles: %s\n", res.GetToMany("articles")) + fmt.Printf("user.Articles: %s\n", res.Get("articles").([]string)) // Output: // user.ID: user1 // user.Username: rob diff --git a/filter.go b/filter.go index 904e36a..005c5f4 100644 --- a/filter.go +++ b/filter.go @@ -70,9 +70,9 @@ func (f *Filter) IsAllowed(res Resource) bool { if rel, ok := res.Rels()[f.Field]; ok { if rel.ToOne { - val = res.GetToOne(f.Field) + val = res.Get(f.Field).(string) } else { - val = res.GetToMany(f.Field) + val = res.Get(f.Field).([]string) } } diff --git a/filter_test.go b/filter_test.go index 47b2099..6942028 100644 --- a/filter_test.go +++ b/filter_test.go @@ -862,9 +862,9 @@ func TestFilterResource(t *testing.T) { res.SetType(typ) if toOne { - res.SetToOne("rel", test.rval.(string)) + res.Set("rel", test.rval.(string)) } else { - res.SetToMany("rel", test.rval.([]string)) + res.Set("rel", test.rval.([]string)) } filter := &Filter{ diff --git a/resource.go b/resource.go index 104483f..9587880 100644 --- a/resource.go +++ b/resource.go @@ -20,13 +20,9 @@ type Resource interface { // Read GetType() Type Get(key string) interface{} - GetToOne(key string) string - GetToMany(key string) []string // Update Set(key string, val interface{}) - SetToOne(key string, rel string) - SetToMany(key string, rels []string) } // MarshalResource marshals a Resource into a JSON-encoded payload. @@ -75,10 +71,10 @@ func MarshalResource(r Resource, prepath string, fields []string, relData map[st for _, n := range relData[r.GetType().Name] { if n == rel.FromName { - id := r.GetToOne(rel.FromName) + id := r.Get(rel.FromName).(string) if id != "" { s["data"] = map[string]string{ - "id": r.GetToOne(rel.FromName), + "id": r.Get(rel.FromName).(string), "type": rel.ToType, } } else { @@ -99,7 +95,7 @@ func MarshalResource(r Resource, prepath string, fields []string, relData map[st for _, n := range relData[r.GetType().Name] { if n == rel.FromName { data := []map[string]string{} - ids := r.GetToMany(rel.FromName) + ids := r.Get(rel.FromName).([]string) sort.Strings(ids) for _, id := range ids { data = append(data, map[string]string{ @@ -176,7 +172,7 @@ func UnmarshalResource(data []byte, schema *Schema) (Resource, error) { if rel.ToOne { var iden Identifier err = json.Unmarshal(v.Data, &iden) - res.SetToOne(rel.FromName, iden.ID) + res.Set(rel.FromName, iden.ID) } else { var idens Identifiers err = json.Unmarshal(v.Data, &idens) @@ -184,7 +180,7 @@ func UnmarshalResource(data []byte, schema *Schema) (Resource, error) { for i := range idens { ids[i] = idens[i].ID } - res.SetToMany(rel.FromName, ids) + res.Set(rel.FromName, ids) } } @@ -260,7 +256,7 @@ func UnmarshalPartialResource(data []byte, schema *Schema) (*SoftResource, error var iden Identifier err = json.Unmarshal(v.Data, &iden) _ = newType.AddRel(rel) - res.SetToOne(rel.FromName, iden.ID) + res.Set(rel.FromName, iden.ID) } else { var idens Identifiers err = json.Unmarshal(v.Data, &idens) @@ -269,7 +265,7 @@ func UnmarshalPartialResource(data []byte, schema *Schema) (*SoftResource, error ids[i] = idens[i].ID } _ = newType.AddRel(rel) - res.SetToMany(rel.FromName, ids) + res.Set(rel.FromName, ids) } } @@ -376,12 +372,12 @@ func Equal(r1, r2 Resource) bool { } if rel1.ToOne { - if r1.GetToOne(rel1.FromName) != r2.GetToOne(rel2.FromName) { + if r1.Get(rel1.FromName).(string) != r2.Get(rel2.FromName).(string) { return false } } else { - v1 := r1.GetToMany(rel1.FromName) - v2 := r2.GetToMany(rel2.FromName) + v1 := r1.Get(rel1.FromName).([]string) + v2 := r2.Get(rel2.FromName).([]string) if len(v1) != 0 || len(v2) != 0 { if !reflect.DeepEqual(v1, v2) { return false diff --git a/resource_test.go b/resource_test.go index 7bd6172..6f8fa50 100644 --- a/resource_test.go +++ b/resource_test.go @@ -266,9 +266,9 @@ func TestEqual(t *testing.T) { for _, rel := range typ.Rels { if rel.ToOne { - sr1.SetToOne(rel.FromName, mt11.GetToOne(rel.FromName)) + sr1.Set(rel.FromName, mt11.Get(rel.FromName).(string)) } else { - sr1.SetToMany(rel.FromName, mt11.GetToMany(rel.FromName)) + sr1.Set(rel.FromName, mt11.Get(rel.FromName).([]string)) } } @@ -288,11 +288,11 @@ func TestEqual(t *testing.T) { ToOne: true, ToType: "mocktypes2", }) - sr1.SetToOne("to-one", "b") + sr1.Set("to-one", "b") assert.False(Equal(mt11, sr1), "different relationship value (to-one)") - sr1.SetToOne("to-one", "a") - sr1.SetToMany("to-many", []string{"d", "e", "f"}) + sr1.Set("to-one", "a") + sr1.Set("to-many", []string{"d", "e", "f"}) assert.False(Equal(mt11, sr1), "different relationship value (to-many)") // Comparing two nil values of different types diff --git a/soft_collection.go b/soft_collection.go index ae82784..eb7acd7 100644 --- a/soft_collection.go +++ b/soft_collection.go @@ -72,9 +72,9 @@ func (s *SoftCollection) Add(r Resource) { sr.AddRel(rel) if rel.ToOne { - sr.SetToOne(rel.FromName, r.GetToOne(rel.FromName)) + sr.Set(rel.FromName, r.Get(rel.FromName).(string)) } else { - sr.SetToMany(rel.FromName, r.GetToMany(rel.FromName)) + sr.Set(rel.FromName, r.Get(rel.FromName).([]string)) } } diff --git a/soft_resource.go b/soft_resource.go index fd90e4c..743769b 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -118,6 +118,10 @@ func (sr *SoftResource) Get(key string) interface{} { if v, ok := sr.data[key]; ok { return v } + } else if _, ok := sr.Type.Rels[key]; ok { + if v, ok := sr.data[key]; ok { + return v + } } return nil @@ -153,46 +157,12 @@ func (sr *SoftResource) Set(key string, v interface{}) { } else if v == nil && attr.Nullable { sr.data[key] = GetZeroValue(attr.Type, attr.Nullable) } - } -} - -// GetToOne returns the value associated to the relationship named after key. -func (sr *SoftResource) GetToOne(key string) string { - sr.check() - - if _, ok := sr.Type.Rels[key]; ok { - return sr.data[key].(string) - } - - return "" -} - -// GetToMany returns the value associated to the relationship named after key. -func (sr *SoftResource) GetToMany(key string) []string { - sr.check() - - if _, ok := sr.Type.Rels[key]; ok { - return sr.data[key].([]string) - } - - return []string{} -} - -// SetToOne sets the relationship named after key to id. -func (sr *SoftResource) SetToOne(key string, id string) { - sr.check() - - if rel, ok := sr.Type.Rels[key]; ok && rel.ToOne { - sr.data[key] = id - } -} - -// SetToMany sets the relationship named after key to ids. -func (sr *SoftResource) SetToMany(key string, ids []string) { - sr.check() - - if rel, ok := sr.Type.Rels[key]; ok && !rel.ToOne { - sr.data[key] = ids + } else if rel, ok := sr.Type.Rels[key]; ok { + if _, ok := v.(string); ok && rel.ToOne { + sr.data[key] = v + } else if _, ok := v.([]string); ok && !rel.ToOne { + sr.data[key] = v + } } } diff --git a/soft_resource_test.go b/soft_resource_test.go index cba1943..2ba3ba6 100644 --- a/soft_resource_test.go +++ b/soft_resource_test.go @@ -103,8 +103,6 @@ func TestSoftResource(t *testing.T) { assert.Equal(t, map[string]Rel{}, sr.Rels()) assert.Equal(t, nil, sr.Get("nonexistent")) - assert.Equal(t, "", sr.GetToOne("nonexistent")) - assert.Equal(t, []string{}, sr.GetToMany("nonexistent")) // Put the fields back for _, attr := range attrs { @@ -121,14 +119,14 @@ func TestSoftResource(t *testing.T) { // Set and get some fields assert.Equal(t, "", sr.Get("attr1")) - assert.Equal(t, "", sr.GetToOne("rel1")) - assert.Equal(t, []string{}, sr.GetToMany("rel2")) + assert.Equal(t, "", sr.Get("rel1").(string)) + assert.Equal(t, []string{}, sr.Get("rel2").([]string)) sr.Set("attr1", "value") - sr.SetToOne("rel1", "id1") - sr.SetToMany("rel2", []string{"id1", "id2"}) + sr.Set("rel1", "id1") + sr.Set("rel2", []string{"id1", "id2"}) assert.Equal(t, "value", sr.Get("attr1")) - assert.Equal(t, "id1", sr.GetToOne("rel1")) - assert.Equal(t, []string{"id1", "id2"}, sr.GetToMany("rel2")) + assert.Equal(t, "id1", sr.Get("rel1").(string)) + assert.Equal(t, []string{"id1", "id2"}, sr.Get("rel2").([]string)) // Set a nullable attribute to nil _ = sr.Type.AddAttr(Attr{ @@ -145,6 +143,36 @@ func TestSoftResource(t *testing.T) { sr.Set("nullable-str", nil) assert.Nil(t, sr.Get("nullable-str")) assert.Equal(t, (*string)(nil), sr.Get("nullable-str")) + + // Getting the value of an unset field returns + // the zero value of the type. + sr = &SoftResource{} + + sr.AddAttr(Attr{ + Name: "zero-str", + Type: AttrTypeString, + Nullable: false, + }) + assert.Equal(t, "", sr.Get("zero-str")) + + sr.AddAttr(Attr{ + Name: "zero-str-null", + Type: AttrTypeString, + Nullable: true, + }) + assert.Equal(t, (*string)(nil), sr.Get("zero-str-null")) + + sr.AddRel(Rel{ + FromName: "zero-to-one", + ToOne: true, + }) + assert.Equal(t, "", sr.Get("zero-to-one")) + + sr.AddRel(Rel{ + FromName: "zero-to-many", + ToOne: false, + }) + assert.Equal(t, []string{}, sr.Get("zero-to-many")) } func TestSoftResourceNew(t *testing.T) { @@ -232,13 +260,13 @@ func TestSoftResourceCopy(t *testing.T) { FromName: "to-one", ToOne: true, }) - sr.SetToOne("to-one", "id1") + sr.Set("to-one", "id1") sr.AddRel(Rel{ FromName: "to-many", ToOne: false, }) - sr.SetToMany("to-many", []string{"id2", "id3"}) + sr.Set("to-many", []string{"id2", "id3"}) // Copy sr2 := sr.Copy() diff --git a/wrapper.go b/wrapper.go index 1de1c21..ec7f513 100644 --- a/wrapper.go +++ b/wrapper.go @@ -187,7 +187,7 @@ func (w *Wrapper) Get(key string) interface{} { return w.GetID() } - return w.getAttr(key) + return w.getField(key) } // SetID sets the ID of the wrapped resource. @@ -202,115 +202,7 @@ func (w *Wrapper) Set(key string, val interface{}) { w.SetID(id) } - w.setAttr(key, val) -} - -// GetToOne returns the value associated with the relationship named after key. -func (w *Wrapper) GetToOne(key string) string { - if key == "" { - panic("key is empty") - } - - for i := 0; i < w.val.NumField(); i++ { - field := w.val.Field(i) - sf := w.val.Type().Field(i) - - if key == sf.Tag.Get("json") { - if strings.Split(sf.Tag.Get("api"), ",")[0] != "rel" { - panic(fmt.Sprintf("jsonapi: field %q is not a relationship", key)) - } - - if field.Type().String() != "string" { - panic(fmt.Sprintf("jsonapi: relationship %q is not 'to one'", key)) - } - - return field.String() - } - } - - panic(fmt.Sprintf("jsonapi: relationship %q does not exist", key)) -} - -// GetToMany returns the value associated with the relationship named after key. -func (w *Wrapper) GetToMany(key string) []string { - if key == "" { - panic("key is empty") - } - - for i := 0; i < w.val.NumField(); i++ { - field := w.val.Field(i) - sf := w.val.Type().Field(i) - - if key == sf.Tag.Get("json") { - if strings.Split(sf.Tag.Get("api"), ",")[0] != "rel" { - panic(fmt.Sprintf("jsonapi: field %q is not a relationship", key)) - } - - if field.Type().String() != "[]string" { - panic(fmt.Sprintf("jsonapi: relationship %q is not 'to many'", key)) - } - - return field.Interface().([]string) - } - } - - panic(fmt.Sprintf("jsonapi: relationship %q does not exist", key)) -} - -// SetToOne sets the value associated to the relationship named after key. -func (w *Wrapper) SetToOne(key string, rel string) { - if key == "" { - panic("key is empty") - } - - for i := 0; i < w.val.NumField(); i++ { - field := w.val.Field(i) - sf := w.val.Type().Field(i) - - if key == sf.Tag.Get("json") { - if strings.Split(sf.Tag.Get("api"), ",")[0] != "rel" { - panic(fmt.Sprintf("jsonapi: field %q is not a relationship", key)) - } - - if field.Type().String() != "string" { - panic(fmt.Sprintf("jsonapi: relationship %q is not 'to one'", key)) - } - - field.SetString(rel) - - return - } - } - - panic(fmt.Sprintf("jsonapi: relationship %q does not exist", key)) -} - -// SetToMany sets the value associated to the relationship named after key. -func (w *Wrapper) SetToMany(key string, rels []string) { - if key == "" { - panic("key is empty") - } - - for i := 0; i < w.val.NumField(); i++ { - field := w.val.Field(i) - sf := w.val.Type().Field(i) - - if key == sf.Tag.Get("json") { - if strings.Split(sf.Tag.Get("api"), ",")[0] != "rel" { - panic(fmt.Sprintf("jsonapi: field %q is not a relationship", key)) - } - - if field.Type().String() != "[]string" { - panic(fmt.Sprintf("jsonapi: relationship %q is not 'to many'", key)) - } - - field.Set(reflect.ValueOf(rels)) - - return - } - } - - panic(fmt.Sprintf("jsonapi: relationship %q does not exist", key)) + w.setField(key, val) } // Copy makes a copy of the wrapped resource and returns it. @@ -327,9 +219,9 @@ func (w *Wrapper) Copy() Resource { // Relationships for _, rel := range w.Rels() { if rel.ToOne { - nw.SetToOne(rel.FromName, w.GetToOne(rel.FromName)) + nw.Set(rel.FromName, w.Get(rel.FromName).(string)) } else { - nw.SetToMany(rel.FromName, w.GetToMany(rel.FromName)) + nw.Set(rel.FromName, w.Get(rel.FromName).([]string)) } } @@ -348,7 +240,7 @@ func (w *Wrapper) SetMeta(m Meta) { // Private methods -func (w *Wrapper) getAttr(key string) interface{} { +func (w *Wrapper) getField(key string) interface{} { if key == "" { panic("key is empty") } @@ -357,7 +249,7 @@ func (w *Wrapper) getAttr(key string) interface{} { field := w.val.Field(i) sf := w.val.Type().Field(i) - if key == sf.Tag.Get("json") && sf.Tag.Get("api") == "attr" { + if key == sf.Tag.Get("json") && sf.Tag.Get("api") != "" { if strings.HasPrefix(field.Type().String(), "*") && field.IsNil() { return nil } @@ -369,7 +261,7 @@ func (w *Wrapper) getAttr(key string) interface{} { panic(fmt.Sprintf("jsonapi: attribute %q does not exist", key)) } -func (w *Wrapper) setAttr(key string, v interface{}) { +func (w *Wrapper) setField(key string, v interface{}) { if key == "" { panic("key is empty") } diff --git a/wrapper_test.go b/wrapper_test.go index ce6390e..b0aa998 100644 --- a/wrapper_test.go +++ b/wrapper_test.go @@ -324,84 +324,4 @@ func TestWrapperGetAndSetErrors(t *testing.T) { assert.Panics(func() { wrap.Set("str", 42) }) - - // GetToOne on empty field name - assert.Panics(func() { - _ = wrap.GetToOne("") - }) - - // GetToOne on unknown field name - assert.Panics(func() { - _ = wrap.GetToOne("unknown") - }) - - // GetToOne on attribute - assert.Panics(func() { - _ = wrap.GetToOne("str") - }) - - // GetToOne on to-many relationship - assert.Panics(func() { - _ = wrap.GetToOne("to-x") - }) - - // GetToMany on empty field name - assert.Panics(func() { - _ = wrap.GetToMany("") - }) - - // GetToMany on unknown field name - assert.Panics(func() { - _ = wrap.GetToMany("unknown") - }) - - // GetToMany on attribute - assert.Panics(func() { - _ = wrap.GetToMany("str") - }) - - // GetToMany on to-one relationship - assert.Panics(func() { - _ = wrap.GetToMany("to-1") - }) - - // SetToOne on empty field name - assert.Panics(func() { - wrap.SetToOne("", "id") - }) - - // SetToOne on unknown field name - assert.Panics(func() { - wrap.SetToOne("unknown", "id") - }) - - // SetToOne on attribute - assert.Panics(func() { - wrap.SetToOne("str", "id") - }) - - // SetToOne on to-many relationship - assert.Panics(func() { - wrap.SetToOne("to-x", "id") - }) - - // SetToMany on empty field name - assert.Panics(func() { - wrap.SetToMany("", []string{"id"}) - }) - - // SetToMany on unknown field name - assert.Panics(func() { - wrap.SetToMany("unknown", []string{"id"}) - }) - - // SetToMany on attribute - assert.Panics(func() { - wrap.SetToMany("str", []string{"id"}) - }) - - // SetToMany on to-one relationship - assert.Panics(func() { - wrap.SetToMany("to-1", []string{"id"}) - }) } From 55e8c28b88cac9160d4af925e2193ab4d5ff45e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Wed, 6 Jan 2021 01:36:54 -0500 Subject: [PATCH 388/406] Fix some panic messages --- url.go | 3 +-- wrapper.go | 17 ++++++++--------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/url.go b/url.go index ab45d40..94eb0b3 100644 --- a/url.go +++ b/url.go @@ -2,7 +2,6 @@ package jsonapi import ( "encoding/json" - "fmt" "net/url" "sort" "strconv" @@ -164,7 +163,7 @@ func (u *URL) String() string { if err != nil { // This should not happen since Filter should be validated // at this point. - panic(fmt.Errorf("jsonapi: can't marshal filter: %s", err)) + panic(err) } param := "filter=" + string(mf) diff --git a/wrapper.go b/wrapper.go index ec7f513..c7e14f6 100644 --- a/wrapper.go +++ b/wrapper.go @@ -1,7 +1,6 @@ package jsonapi import ( - "errors" "fmt" "reflect" "strings" @@ -36,7 +35,7 @@ func Wrap(v interface{}) *Wrapper { switch { case val.Kind() != reflect.Ptr: if val.Kind() != reflect.Struct { - panic(errors.New("jsonapi: value has to be a pointer to a struct")) + panic("value has to be a pointer to a struct") } newVal := reflect.New(val.Type()).Elem() @@ -50,14 +49,14 @@ func Wrap(v interface{}) *Wrapper { val = newVal case val.Elem().Kind() != reflect.Struct: - panic(errors.New("jsonapi: value has to be a pointer to a struct")) + panic("value has to be a pointer to a struct") default: val = val.Elem() } err := Check(val.Interface()) if err != nil { - panic(fmt.Sprintf("jsonapi: invalid type: %s", err)) + panic("invalid struct: " + err.Error()) } w := &Wrapper{ @@ -258,7 +257,7 @@ func (w *Wrapper) getField(key string) interface{} { } } - panic(fmt.Sprintf("jsonapi: attribute %q does not exist", key)) + panic(fmt.Sprintf("attribute %q does not exist", key)) } func (w *Wrapper) setField(key string, v interface{}) { @@ -282,12 +281,12 @@ func (w *Wrapper) setField(key string, v interface{}) { return } - panic(fmt.Sprintf("jsonapi: value is of wrong type (expected %q, got %q)", - field.Type(), - val.Type(), + panic(fmt.Sprintf( + "got value of type %q, not %q", + field.Type(), val.Type(), )) } } - panic(fmt.Errorf("jsonapi: attribute %q does not exist", key)) + panic(fmt.Sprintf("attribute %q does not exist", key)) } From 82492ea4495b6c0dd1ad893df402c1c96887e357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 16 Feb 2021 19:18:35 -0500 Subject: [PATCH 389/406] Support Go 1.16 in CI --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9063912..7dd769e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: [ '1.12', '1.13', '1.14', '1.15' ] + go: [ '1.12', '1.13', '1.14', '1.15', '1.16' ] steps: - uses: actions/setup-go@v2 with: From 2ec58e1c754e3a9f1c64d2d99ff1ef2d49d026b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 16 Feb 2021 19:31:41 -0500 Subject: [PATCH 390/406] Update golangci-lint to v1.36 --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9b2d556..963b287 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,4 +14,4 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v2 with: - version: v1.33 + version: v1.36 From 311a07f8f5540a92322c3d2bd9b5f6d8fbe64b91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 28 Feb 2021 13:00:09 -0500 Subject: [PATCH 391/406] Delete build_links.go and move contents to link.go --- build_links.go | 30 ------------------------------ build_links_test.go | 40 ---------------------------------------- link.go | 30 ++++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 70 deletions(-) delete mode 100644 build_links.go delete mode 100644 build_links_test.go diff --git a/build_links.go b/build_links.go deleted file mode 100644 index b695371..0000000 --- a/build_links.go +++ /dev/null @@ -1,30 +0,0 @@ -package jsonapi - -import "strings" - -// buildSelfLink builds a URL that points to the resource represented by the -// value v. -// -// prepath is prepended to the path and usually represents a scheme and a -// domain name. -func buildSelfLink(res Resource, prepath string) string { - if !strings.HasSuffix(prepath, "/") { - prepath += "/" - } - - id, _ := res.Get("id").(string) - if id != "" && res.GetType().Name != "" { - return prepath + res.GetType().Name + "/" + id - } - - return "" -} - -// buildRelationshipLinks builds a links object (according to the JSON:API -// specification) that include both the self and related members. -func buildRelationshipLinks(res Resource, prepath, rel string) map[string]string { - return map[string]string{ - "self": buildSelfLink(res, prepath) + "/relationships/" + rel, - "related": buildSelfLink(res, prepath) + "/" + rel, - } -} diff --git a/build_links_test.go b/build_links_test.go deleted file mode 100644 index 047d97d..0000000 --- a/build_links_test.go +++ /dev/null @@ -1,40 +0,0 @@ -package jsonapi - -import ( - "testing" - - "github.com/stretchr/testify/assert" -) - -func TestBuildSelfLink(t *testing.T) { - assert := assert.New(t) - - tests := []struct { - name string - id string - expectedString string - }{ - { - name: "simple resource url", - id: "1", - expectedString: "http://example.com/type/1", - }, { - name: "simple resource url with hyphen in id", - id: "abc-123", - expectedString: "http://example.com/type/abc-123", - }, { - name: "empty id", - id: "", - expectedString: "", - }, - } - - for _, test := range tests { - res := &SoftResource{} - res.SetType(&Type{Name: "type"}) - res.SetID(test.id) - - link := buildSelfLink(res, "http://example.com/") - assert.Equal(test.expectedString, link, test.name) - } -} diff --git a/link.go b/link.go index 1bb657a..e28e150 100644 --- a/link.go +++ b/link.go @@ -2,6 +2,7 @@ package jsonapi import ( "encoding/json" + "strings" ) // Link represents a JSON:API links object. @@ -29,3 +30,32 @@ func (l Link) MarshalJSON() ([]byte, error) { return json.Marshal(l.HRef) } + +// buildSelfLink builds a URL that points to the resource represented by the +// value v. +// +// prepath is prepended to the path and usually represents a scheme and a +// domain name. +func buildSelfLink(res Resource, prepath string) string { + link := prepath + + if !strings.HasSuffix(prepath, "/") { + link += "/" + } + + id, _ := res.Get("id").(string) + if id != "" && res.GetType().Name != "" { + link += res.GetType().Name + "/" + id + } + + return link +} + +// buildRelationshipLinks builds a links object (according to the JSON:API +// specification) that include both the self and related members. +func buildRelationshipLinks(res Resource, prepath, rel string) map[string]string { + return map[string]string{ + "self": buildSelfLink(res, prepath) + "/relationships/" + rel, + "related": buildSelfLink(res, prepath) + "/" + rel, + } +} From 209d8333a18490fffe693e6ad838582ab28acb35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Wed, 14 Apr 2021 22:44:49 -0400 Subject: [PATCH 392/406] Update testify to v1.7.0 --- go.mod | 6 +++++- go.sum | 11 ++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 8593d55..dcb57ae 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,8 @@ module github.com/mfcochauxlaberge/jsonapi go 1.12 -require github.com/stretchr/testify v1.6.1 +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/stretchr/testify v1.7.0 + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect +) diff --git a/go.sum b/go.sum index 1f1e7af..c221f64 100644 --- a/go.sum +++ b/go.sum @@ -1,12 +1,13 @@ -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From 5bbb3904f4d9efba91eaf53c30b62080b50a1a03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 24 Apr 2021 19:20:53 -0400 Subject: [PATCH 393/406] Remove support for Go 1.12 --- .github/workflows/test.yml | 2 +- README.md | 4 ++-- go.mod | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7dd769e..8885094 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: [ '1.12', '1.13', '1.14', '1.15', '1.16' ] + go: [ '1.13', '1.14', '1.15', '1.16' ] steps: - uses: actions/setup-go@v2 with: diff --git a/README.md b/README.md index cf9b79b..e476832 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@
- + @@ -73,7 +73,7 @@ A few tasks are required before committing to the current API: ## Requirements -The supported versions of Go are the latest patch releases of every minor release starting with Go 1.12. +The supported versions of Go are the latest patch releases of every minor release starting with Go 1.13. ## Examples diff --git a/go.mod b/go.mod index dcb57ae..3bb1432 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/mfcochauxlaberge/jsonapi -go 1.12 +go 1.13 require ( github.com/davecgh/go-spew v1.1.1 // indirect From e399507138559bb4056544d988cdf184acbe9434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 24 Jun 2021 07:26:37 -0400 Subject: [PATCH 394/406] Update golangci-lint to v1.41 in pipeline --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 963b287..bbb5cfc 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,4 +14,4 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v2 with: - version: v1.36 + version: v1.41 From 9b4998e41713f68fd2e48a8189f08f7b871f74c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 24 Jun 2021 07:28:28 -0400 Subject: [PATCH 395/406] Remove or replace deprecated linters --- .golangci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index d098858..cc0980d 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -6,22 +6,21 @@ linters: - dogsled - dupl - errcheck + - exportloopref - gochecknoglobals - gochecknoinits - gocritic - gofmt - goimports - - golint - gosec - gosimple - govet - ineffassign - - interfacer - lll - misspell - nakedret - prealloc - - scopelint + - revive - staticcheck - structcheck - stylecheck From edd72ac6e53fc22519ee2b5cde858855b2c6e6a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 24 Jun 2021 08:08:45 -0400 Subject: [PATCH 396/406] Add Copier interface --- copier.go | 8 ++++++++ resource.go | 4 ---- soft_resource_test.go | 1 + wrapper_test.go | 1 + 4 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 copier.go diff --git a/copier.go b/copier.go new file mode 100644 index 0000000..57462ac --- /dev/null +++ b/copier.go @@ -0,0 +1,8 @@ +package jsonapi + +// Copier is a interface for objects that can return a new and empty instance or +// a deep copy of themselves. +type Copier interface { + New() Resource + Copy() Resource +} diff --git a/resource.go b/resource.go index 9587880..19eeda2 100644 --- a/resource.go +++ b/resource.go @@ -9,10 +9,6 @@ import ( // A Resource is an element of a collection. type Resource interface { - // Creation - New() Resource - Copy() Resource - // Structure Attrs() map[string]Attr Rels() map[string]Rel diff --git a/soft_resource_test.go b/soft_resource_test.go index 2ba3ba6..0b9caa5 100644 --- a/soft_resource_test.go +++ b/soft_resource_test.go @@ -10,6 +10,7 @@ import ( ) var _ Resource = (*SoftResource)(nil) +var _ Copier = (*SoftResource)(nil) func TestSoftResource(t *testing.T) { sr := &SoftResource{} diff --git a/wrapper_test.go b/wrapper_test.go index b0aa998..1c3b235 100644 --- a/wrapper_test.go +++ b/wrapper_test.go @@ -11,6 +11,7 @@ import ( ) var _ Resource = (*Wrapper)(nil) +var _ Copier = (*Wrapper)(nil) func TestWrap(t *testing.T) { assert := assert.New(t) From 0ae53169329db93244a0f26a7d0ef62b348b257e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Fri, 14 Jan 2022 23:28:30 -0500 Subject: [PATCH 397/406] Add Go 1.17 to tested versions in CI --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8885094..b2baa86 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: [ '1.13', '1.14', '1.15', '1.16' ] + go: [ '1.13', '1.14', '1.15', '1.16', '1.17' ] steps: - uses: actions/setup-go@v2 with: From 4c973f467681cdbe466ddfd29293ff5ae86f2362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Fri, 14 Jan 2022 23:29:52 -0500 Subject: [PATCH 398/406] Update golangci-lint to v1.43 in pipeline --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index bbb5cfc..109a363 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,4 +14,4 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v2 with: - version: v1.41 + version: v1.43 From 45eedb56d4daa4d0223f9aeb5f89d9d37c6601a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 28 Jul 2022 10:41:53 -0400 Subject: [PATCH 399/406] Add Go 1.18 in test strategy matrix --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b2baa86..fda0f78 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: [ '1.13', '1.14', '1.15', '1.16', '1.17' ] + go: [ '1.13', '1.14', '1.15', '1.16', '1.17', '1.18' ] steps: - uses: actions/setup-go@v2 with: From 6cdf7d914e6d2f6dcfe2d3388cf2ca726128229e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 28 Jul 2022 10:42:52 -0400 Subject: [PATCH 400/406] Update golangci-lint to v1.47 in pipeline --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 109a363..f6f6fb5 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,4 +14,4 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v2 with: - version: v1.43 + version: v1.47 From 6f6d69029772c2e401623da69002a83b757a4083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 22 Sep 2022 22:32:31 -0400 Subject: [PATCH 401/406] Remove imposed pagination strategy on SimpleURL and URL --- params.go | 6 ++-- simple_url.go | 85 +++++++++++++++++++++------------------------- simple_url_test.go | 66 ++++++++++++----------------------- url.go | 10 +++--- url_test.go | 26 ++++++++------ 5 files changed, 82 insertions(+), 111 deletions(-) diff --git a/params.go b/params.go index 3d9104f..77deaeb 100644 --- a/params.go +++ b/params.go @@ -240,8 +240,7 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { } // Pagination - params.PageSize = su.PageSize - params.PageNumber = su.PageNumber + params.Page = su.Page return params, nil } @@ -262,8 +261,7 @@ type Params struct { SortingRules []string // Pagination - PageSize uint - PageNumber uint + Page map[string]interface{} // Include Include [][]Rel diff --git a/simple_url.go b/simple_url.go index b76d37a..362862b 100644 --- a/simple_url.go +++ b/simple_url.go @@ -23,8 +23,7 @@ type SimpleURL struct { FilterLabel string Filter *Filter SortingRules []string - PageSize uint - PageNumber uint + Page map[string]interface{} Include []string } @@ -49,62 +48,56 @@ func NewSimpleURL(u *url.URL) (SimpleURL, error) { values := u.Query() for name := range values { - if strings.HasPrefix(name, "fields[") && strings.HasSuffix(name, "]") && len(name) > 8 { - // Fields + switch { + case strings.HasPrefix(name, "fields[") && strings.HasSuffix(name, "]") && len(name) > 8: resType := name[7 : len(name)-1] if len(values.Get(name)) > 0 { sURL.Fields[resType] = parseCommaList(values.Get(name)) } - } else { - switch name { - case "filter": - var err error - if values.Get(name)[0] != '{' { - // It should be a label - err = json.Unmarshal([]byte("\""+values.Get(name)+"\""), &sURL.FilterLabel) - } else { - // It should be a JSON object - sURL.Filter = &Filter{} - err = json.Unmarshal([]byte(values.Get(name)), sURL.Filter) + case strings.HasPrefix(name, "page[") && strings.HasSuffix(name, "]") && len(name) > 6: + arg := name[5 : len(name)-1] + + if len(values.Get(name)) > 0 { + if sURL.Page == nil { + sURL.Page = map[string]interface{}{} } - if err != nil { - sURL.FilterLabel = "" - sURL.Filter = nil + val := values.Get(name) - return sURL, NewErrMalformedFilterParameter(values.Get(name)) - } - case "sort": - // Sort - for _, rules := range values[name] { - sURL.SortingRules = append(sURL.SortingRules, parseCommaList(rules)...) - } - case "page[size]": - // Page size - size, err := strconv.ParseUint(values.Get(name), 10, 64) - if err != nil { - return sURL, NewErrInvalidPageSizeParameter(values.Get(name)) + if num, err := strconv.Atoi(val); err != nil { + sURL.Page[arg] = val + } else { + sURL.Page[arg] = num } + } + case name == "filter": + var err error + if values.Get(name)[0] != '{' { + // It should be a label + err = json.Unmarshal([]byte("\""+values.Get(name)+"\""), &sURL.FilterLabel) + } else { + // It should be a JSON object + sURL.Filter = &Filter{} + err = json.Unmarshal([]byte(values.Get(name)), sURL.Filter) + } - sURL.PageSize = uint(size) - case "page[number]": - // Page number - num, err := strconv.ParseUint(values.Get(name), 10, 64) - if err != nil { - return sURL, NewErrInvalidPageNumberParameter(values.Get(name)) - } + if err != nil { + sURL.FilterLabel = "" + sURL.Filter = nil - sURL.PageNumber = uint(num) - case "include": - // Include - for _, include := range values[name] { - sURL.Include = append(sURL.Include, parseCommaList(include)...) - } - default: - // Unkmown parameter - return sURL, NewErrUnknownParameter(name) + return sURL, NewErrMalformedFilterParameter(values.Get(name)) } + case name == "sort": + for _, rules := range values[name] { + sURL.SortingRules = append(sURL.SortingRules, parseCommaList(rules)...) + } + case name == "include": + for _, include := range values[name] { + sURL.Include = append(sURL.Include, parseCommaList(include)...) + } + default: + return sURL, NewErrUnknownParameter(name) } } diff --git a/simple_url_test.go b/simple_url_test.go index d492ad0..753a44b 100644 --- a/simple_url_test.go +++ b/simple_url_test.go @@ -39,8 +39,7 @@ func TestSimpleURL(t *testing.T) { Fields: map[string][]string{}, Filter: nil, SortingRules: []string{}, - PageSize: 0, - PageNumber: 0, + Page: nil, Include: []string{}, }, expectedError: nil, @@ -56,8 +55,7 @@ func TestSimpleURL(t *testing.T) { Fields: map[string][]string{}, Filter: nil, SortingRules: []string{}, - PageSize: 0, - PageNumber: 0, + Page: nil, Include: []string{}, }, expectedError: nil, @@ -73,8 +71,7 @@ func TestSimpleURL(t *testing.T) { Fields: map[string][]string{}, Filter: nil, SortingRules: []string{}, - PageSize: 0, - PageNumber: 0, + Page: nil, Include: []string{}, }, expectedError: nil, @@ -90,8 +87,7 @@ func TestSimpleURL(t *testing.T) { Fields: map[string][]string{}, Filter: nil, SortingRules: []string{}, - PageSize: 0, - PageNumber: 0, + Page: nil, Include: []string{}, }, expectedError: nil, @@ -107,8 +103,7 @@ func TestSimpleURL(t *testing.T) { Fields: map[string][]string{}, Filter: nil, SortingRules: []string{}, - PageSize: 0, - PageNumber: 0, + Page: nil, Include: []string{}, }, expectedError: nil, @@ -137,9 +132,11 @@ func TestSimpleURL(t *testing.T) { }, Filter: nil, SortingRules: []string{"attr2", "-attr1"}, - PageSize: 20, - PageNumber: 1, - Include: []string{"type2.type3", "type4"}, + Page: map[string]interface{}{ + "size": 20, + "number": 1, + }, + Include: []string{"type2.type3", "type4"}, }, expectedError: nil, }, { @@ -156,16 +153,15 @@ func TestSimpleURL(t *testing.T) { FilterLabel: "label", Filter: nil, SortingRules: []string{}, - PageSize: 0, - PageNumber: 0, + Page: nil, Include: []string{}, }, expectedError: nil, }, { - name: "negative page size", + name: "page argument of type string", url: ` http://api.example.com/type/id/rel - ?page[size]=-1 + ?page[cursor]=abc `, expectedURL: SimpleURL{ Fragments: []string{"type", "id", "rel"}, @@ -174,29 +170,12 @@ func TestSimpleURL(t *testing.T) { Fields: map[string][]string{}, Filter: nil, SortingRules: []string{}, - PageSize: 0, - PageNumber: 0, - Include: []string{}, - }, - expectedError: NewErrInvalidPageSizeParameter("-1"), - }, { - name: "negative page number", - url: ` - http://api.example.com/type/id/rel - ?page[number]=-1 - `, - expectedURL: SimpleURL{ - Fragments: []string{"type", "id", "rel"}, - Route: "/type/:id/rel", - - Fields: map[string][]string{}, - Filter: nil, - SortingRules: []string{}, - PageSize: 0, - PageNumber: 0, - Include: []string{}, + Page: map[string]interface{}{ + "cursor": "abc", + }, + Include: []string{}, }, - expectedError: NewErrInvalidPageNumberParameter("-1"), + expectedError: nil, }, { name: "unknown parameter", url: ` @@ -210,8 +189,7 @@ func TestSimpleURL(t *testing.T) { Fields: map[string][]string{}, Filter: nil, SortingRules: []string{}, - PageSize: 0, - PageNumber: 0, + Page: nil, Include: []string{}, }, expectedError: NewErrUnknownParameter("unknownparam"), @@ -236,8 +214,7 @@ func TestSimpleURL(t *testing.T) { Val: "abc", }, SortingRules: []string{}, - PageSize: 0, - PageNumber: 0, + Page: nil, Include: []string{}, }, expectedError: nil, @@ -254,8 +231,7 @@ func TestSimpleURL(t *testing.T) { Fields: map[string][]string{}, Filter: nil, SortingRules: []string{}, - PageSize: 0, - PageNumber: 0, + Page: nil, Include: []string{}, }, expectedError: NewErrMalformedFilterParameter(`{"thisis:invalid"}`), diff --git a/url.go b/url.go index 94eb0b3..13d1c78 100644 --- a/url.go +++ b/url.go @@ -2,9 +2,9 @@ package jsonapi import ( "encoding/json" + "fmt" "net/url" "sort" - "strconv" ) // NewURL builds a URL from a SimpleURL and a schema for validating and @@ -174,17 +174,17 @@ func (u *URL) String() string { // Pagination if u.IsCol { - if u.Params.PageNumber != 0 { + if num, ok := u.Params.Page["number"]; ok { urlParams = append( urlParams, - "page%5Bnumber%5D="+strconv.Itoa(int(u.Params.PageNumber)), + "page%5Bnumber%5D="+fmt.Sprint(num), ) } - if u.Params.PageSize != 0 { + if size, ok := u.Params.Page["size"]; ok { urlParams = append( urlParams, - "page%5Bsize%5D="+strconv.Itoa(int(u.Params.PageSize)), + "page%5Bsize%5D="+fmt.Sprint(size), ) } } diff --git a/url_test.go b/url_test.go index 276d4b5..27ee0cc 100644 --- a/url_test.go +++ b/url_test.go @@ -74,7 +74,7 @@ func TestParseURL(t *testing.T) { name: "invalid simpleurl", url: ` /mocktypes1/abc123 - ?page[size]=invalid + ?filter=" `, expectedError: true, }, { @@ -248,8 +248,7 @@ func TestParseParams(t *testing.T) { Rels: map[string][]Rel{}, RelData: map[string][]string{}, SortingRules: []string{}, - PageSize: 0, - PageNumber: 0, + Page: nil, Include: [][]Rel{}, }, expectedError: false, @@ -262,8 +261,7 @@ func TestParseParams(t *testing.T) { Rels: map[string][]Rel{}, RelData: map[string][]string{}, SortingRules: []string{}, - PageSize: 0, - PageNumber: 0, + Page: nil, Include: [][]Rel{}, }, expectedError: false, @@ -291,8 +289,10 @@ func TestParseParams(t *testing.T) { Rels: map[string][]Rel{}, RelData: map[string][]string{}, SortingRules: []string{}, - PageSize: 50, - PageNumber: 3, + Page: map[string]interface{}{ + "size": 50, + "number": 3, + }, Include: [][]Rel{ { mockTypes1.Rels["to-many-from-many"], @@ -334,8 +334,10 @@ func TestParseParams(t *testing.T) { Rels: map[string][]Rel{}, RelData: map[string][]string{}, SortingRules: []string{}, - PageSize: 50, - PageNumber: 3, + Page: map[string]interface{}{ + "size": 50, + "number": 3, + }, Include: [][]Rel{ { mockTypes1.Rels["to-many-from-many"], @@ -375,8 +377,10 @@ func TestParseParams(t *testing.T) { Rels: map[string][]Rel{}, RelData: map[string][]string{}, SortingRules: []string{}, - PageSize: 90, - PageNumber: 110, + Page: map[string]interface{}{ + "size": 90, + "number": 110, + }, Include: [][]Rel{ { mockTypes1.Rels["to-many-from-one"], From 289a5ac82c660f5cedd10dcb14234b1481b91075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 8 Oct 2022 16:52:45 -0400 Subject: [PATCH 402/406] Format type.go --- type.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/type.go b/type.go index 824bf98..19f2854 100644 --- a/type.go +++ b/type.go @@ -19,12 +19,12 @@ import ( // even if it potentially can break existing code. // // The names are as follow: -// - string -// - int, int8, int16, int32, int64 -// - uint, uint8, uint16, uint32, uint64 -// - bool -// - time (Go type is time.Time) -// - bytes (Go type is []uint8 or []byte) +// - string +// - int, int8, int16, int32, int64 +// - uint, uint8, uint16, uint32, uint64 +// - bool +// - time (Go type is time.Time) +// - bytes (Go type is []uint8 or []byte) // // An asterisk is present as a prefix when the type is nullable (like *string). // From 57b9fdf27045f5955d493814f4763c18e0a62a38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 8 Oct 2022 16:55:15 -0400 Subject: [PATCH 403/406] Update golangci-lint and Go versions in pipeline --- .github/workflows/lint.yml | 4 ++-- .github/workflows/test.yml | 2 +- .golangci.yml | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f6f6fb5..5144b6b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,6 +12,6 @@ jobs: steps: - uses: actions/checkout@v2 - name: golangci-lint - uses: golangci/golangci-lint-action@v2 + uses: golangci/golangci-lint-action@v3 with: - version: v1.47 + version: v1.50 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fda0f78..07d9b1a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: [ '1.13', '1.14', '1.15', '1.16', '1.17', '1.18' ] + go: [ '1.13', '1.14', '1.15', '1.16', '1.17', '1.18', '1.19' ] steps: - uses: actions/setup-go@v2 with: diff --git a/.golangci.yml b/.golangci.yml index cc0980d..af02aaa 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,7 +1,6 @@ linters: enable: - bodyclose - - deadcode - depguard - dogsled - dupl @@ -22,13 +21,11 @@ linters: - prealloc - revive - staticcheck - - structcheck - stylecheck - typecheck - unconvert - unparam - unused - - varcheck - whitespace - wsl From 8543be9e13e071b37dab859b9fb3a4db6fee4620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 8 Oct 2022 16:59:32 -0400 Subject: [PATCH 404/406] Append newline to golden files --- document_test.go | 2 ++ testdata/goldenfiles/marshaling/collection.json | 2 +- testdata/goldenfiles/marshaling/collection_with_inclusions.json | 2 +- testdata/goldenfiles/marshaling/empty_collection.json | 2 +- testdata/goldenfiles/marshaling/empty_data.json | 2 +- testdata/goldenfiles/marshaling/error.json | 2 +- testdata/goldenfiles/marshaling/errors.json | 2 +- testdata/goldenfiles/marshaling/identifier.json | 2 +- testdata/goldenfiles/marshaling/identifiers.json | 2 +- testdata/goldenfiles/marshaling/meta.json | 2 +- testdata/goldenfiles/marshaling/resource.json | 2 +- 11 files changed, 12 insertions(+), 10 deletions(-) diff --git a/document_test.go b/document_test.go index 1276a81..b9329be 100644 --- a/document_test.go +++ b/document_test.go @@ -280,6 +280,8 @@ func TestMarshalDocument(t *testing.T) { payload, err := MarshalDocument(test.doc, url) assert.NoError(err) + payload = append(payload, '\n') + // Golden file filename := strings.ReplaceAll(test.name, " ", "_") + ".json" path := filepath.Join("testdata", "goldenfiles", "marshaling", filename) diff --git a/testdata/goldenfiles/marshaling/collection.json b/testdata/goldenfiles/marshaling/collection.json index 723ebbe..341393d 100644 --- a/testdata/goldenfiles/marshaling/collection.json +++ b/testdata/goldenfiles/marshaling/collection.json @@ -141,4 +141,4 @@ "links": { "self": "https://example.org/fake/path?fields%5Bmocktype%5D=bool%2Cint%2Cstr%2Ctime%2Cto-1%2Cto-x-from-1%2Cuint64" } -} \ No newline at end of file +} diff --git a/testdata/goldenfiles/marshaling/collection_with_inclusions.json b/testdata/goldenfiles/marshaling/collection_with_inclusions.json index ab66509..a3620f5 100644 --- a/testdata/goldenfiles/marshaling/collection_with_inclusions.json +++ b/testdata/goldenfiles/marshaling/collection_with_inclusions.json @@ -35,4 +35,4 @@ "links": { "self": "/fake/path?fields%5Bmocktype%" } -} \ No newline at end of file +} diff --git a/testdata/goldenfiles/marshaling/empty_collection.json b/testdata/goldenfiles/marshaling/empty_collection.json index f7c2381..d5d8d29 100644 --- a/testdata/goldenfiles/marshaling/empty_collection.json +++ b/testdata/goldenfiles/marshaling/empty_collection.json @@ -6,4 +6,4 @@ "links": { "self": "/fake/path?fields%5Bmocktype%" } -} \ No newline at end of file +} diff --git a/testdata/goldenfiles/marshaling/empty_data.json b/testdata/goldenfiles/marshaling/empty_data.json index 5300796..324b029 100644 --- a/testdata/goldenfiles/marshaling/empty_data.json +++ b/testdata/goldenfiles/marshaling/empty_data.json @@ -6,4 +6,4 @@ "links": { "self": "https://example.org/fake/path?fields%5Bmocktype%" } -} \ No newline at end of file +} diff --git a/testdata/goldenfiles/marshaling/error.json b/testdata/goldenfiles/marshaling/error.json index c904c94..d03ad69 100644 --- a/testdata/goldenfiles/marshaling/error.json +++ b/testdata/goldenfiles/marshaling/error.json @@ -13,4 +13,4 @@ "links": { "self": "/fake/path?fields%5Bmocktype%" } -} \ No newline at end of file +} diff --git a/testdata/goldenfiles/marshaling/errors.json b/testdata/goldenfiles/marshaling/errors.json index 2f6effb..37707c3 100644 --- a/testdata/goldenfiles/marshaling/errors.json +++ b/testdata/goldenfiles/marshaling/errors.json @@ -19,4 +19,4 @@ "links": { "self": "/fake/path?fields%5Bmocktype%" } -} \ No newline at end of file +} diff --git a/testdata/goldenfiles/marshaling/identifier.json b/testdata/goldenfiles/marshaling/identifier.json index f950090..5379310 100644 --- a/testdata/goldenfiles/marshaling/identifier.json +++ b/testdata/goldenfiles/marshaling/identifier.json @@ -9,4 +9,4 @@ "links": { "self": "/fake/path?fields%5Bmocktype%" } -} \ No newline at end of file +} diff --git a/testdata/goldenfiles/marshaling/identifiers.json b/testdata/goldenfiles/marshaling/identifiers.json index 7899a0d..64761cb 100644 --- a/testdata/goldenfiles/marshaling/identifiers.json +++ b/testdata/goldenfiles/marshaling/identifiers.json @@ -19,4 +19,4 @@ "links": { "self": "/fake/path?fields%5Bmocktype%" } -} \ No newline at end of file +} diff --git a/testdata/goldenfiles/marshaling/meta.json b/testdata/goldenfiles/marshaling/meta.json index dd6460c..31aa7d0 100644 --- a/testdata/goldenfiles/marshaling/meta.json +++ b/testdata/goldenfiles/marshaling/meta.json @@ -11,4 +11,4 @@ "f2": 42, "f3": true } -} \ No newline at end of file +} diff --git a/testdata/goldenfiles/marshaling/resource.json b/testdata/goldenfiles/marshaling/resource.json index 566d8c2..44ba41a 100644 --- a/testdata/goldenfiles/marshaling/resource.json +++ b/testdata/goldenfiles/marshaling/resource.json @@ -44,4 +44,4 @@ "links": { "self": "/fake/path?fields%5Bmocktype%5D=bool%2Cbytes%2Cint%2Cstr%2Ctime%2Cto-1%2Cto-x-from-1%2Cuint64" } -} \ No newline at end of file +} From 9808dd50bf3cddb4dc227212270d72acf6dd4585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 8 Oct 2022 17:02:37 -0400 Subject: [PATCH 405/406] Consider links when marshaling --- document.go | 14 ++++++++++++-- document_test.go | 15 +++++++++++++++ testdata/goldenfiles/marshaling/links.json | 17 +++++++++++++++++ 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 testdata/goldenfiles/marshaling/links.json diff --git a/document.go b/document.go index 10ec840..8eb712d 100644 --- a/document.go +++ b/document.go @@ -159,12 +159,22 @@ func MarshalDocument(doc *Document, url *URL) ([]byte, error) { plMap["meta"] = doc.Meta } + links := doc.Links + if url != nil { - plMap["links"] = map[string]string{ - "self": doc.PrePath + url.String(), + if links == nil { + links = map[string]Link{} + } + + links["self"] = Link{ + HRef: doc.PrePath + url.String(), } } + if links != nil { + plMap["links"] = links + } + plMap["jsonapi"] = map[string]string{"version": "1.0"} return json.Marshal(plMap) diff --git a/document_test.go b/document_test.go index b9329be..b9ca332 100644 --- a/document_test.go +++ b/document_test.go @@ -256,6 +256,21 @@ func TestMarshalDocument(t *testing.T) { return []Error{err1, err2} }(), }, + }, { + name: "links", + doc: &Document{ + Links: map[string]Link{ + "self": {HRef: "http://example.com/"}, + "some_link": {HRef: "http://example.org/"}, + "other_link": { + HRef: "http://example.com/other/path", + Meta: map[string]interface{}{ + "field1": "value1", + "field2": 123, + }, + }, + }, + }, }, } diff --git a/testdata/goldenfiles/marshaling/links.json b/testdata/goldenfiles/marshaling/links.json new file mode 100644 index 0000000..819d131 --- /dev/null +++ b/testdata/goldenfiles/marshaling/links.json @@ -0,0 +1,17 @@ +{ + "data": null, + "jsonapi": { + "version": "1.0" + }, + "links": { + "other_link": { + "href": "http://example.com/other/path", + "meta": { + "field1": "value1", + "field2": 123 + } + }, + "self": "/fake/path?fields%5Bmocktype%", + "some_link": "http://example.org/" + } +} From c61299292bf747e333f2c06a48bfeec66ef07c08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 10 Oct 2022 13:36:16 -0400 Subject: [PATCH 406/406] Use any keyword instead of interface{} --- document.go | 6 +- document_test.go | 8 +- error.go | 20 ++--- error_test.go | 4 +- filter.go | 12 +-- filter_test.go | 28 +++---- helpers.go | 8 +- jsonapi.go | 5 ++ jsonapi_test.go | 4 + link.go | 4 +- link_test.go | 4 +- meta.go | 2 +- params.go | 2 +- range_test.go | 190 +++++++++++++++++++++--------------------- resource.go | 10 +-- simple_url.go | 4 +- simple_url_test.go | 4 +- soft_resource.go | 12 +-- soft_resource_test.go | 4 +- type.go | 6 +- type_test.go | 2 +- url_test.go | 6 +- util_test.go | 4 +- wrapper.go | 10 +-- wrapper_test.go | 2 +- 25 files changed, 185 insertions(+), 176 deletions(-) create mode 100644 jsonapi.go diff --git a/document.go b/document.go index 8eb712d..0793894 100644 --- a/document.go +++ b/document.go @@ -9,7 +9,7 @@ import ( // A Document represents a JSON:API document. type Document struct { // Data - Data interface{} + Data any // Included Included []Resource @@ -143,7 +143,7 @@ func MarshalDocument(doc *Document, url *URL) ([]byte, error) { } // Marshaling - plMap := map[string]interface{}{} + plMap := map[string]any{} if len(errors) > 0 { plMap["errors"] = errors @@ -189,7 +189,7 @@ func UnmarshalDocument(payload []byte, schema *Schema) (*Document, error) { Resources: map[string]map[string]struct{}{}, Links: map[string]Link{}, RelData: map[string][]string{}, - Meta: map[string]interface{}{}, + Meta: map[string]any{}, } ske := &payloadSkeleton{} diff --git a/document_test.go b/document_test.go index b9ca332..8b6c35a 100644 --- a/document_test.go +++ b/document_test.go @@ -133,7 +133,7 @@ func TestMarshalDocument(t *testing.T) { r4 := &mocktype{ ID: "id4", } - r4.SetMeta(map[string]interface{}{ + r4.SetMeta(map[string]any{ "key1": "a string", "key2": 42, "key3": true, @@ -185,7 +185,7 @@ func TestMarshalDocument(t *testing.T) { name: "meta", doc: &Document{ Data: nil, - Meta: map[string]interface{}{ + Meta: map[string]any{ "f1": "漢語", "f2": 42, "f3": true, @@ -264,7 +264,7 @@ func TestMarshalDocument(t *testing.T) { "some_link": {HRef: "http://example.org/"}, "other_link": { HRef: "http://example.com/other/path", - Meta: map[string]interface{}{ + Meta: map[string]any{ "field1": "value1", "field2": 123, }, @@ -432,7 +432,7 @@ func TestUnmarshalDocument(t *testing.T) { r4 := &mocktype{ ID: "id4", } - r4.SetMeta(map[string]interface{}{ + r4.SetMeta(map[string]any{ "key1": "a string", "key2": 42, "key3": true, diff --git a/error.go b/error.go index 327b372..333936a 100644 --- a/error.go +++ b/error.go @@ -9,21 +9,21 @@ import ( // An Error represents an error object from the JSON:API specification. type Error struct { - ID string `json:"id"` - Code string `json:"code"` - Status string `json:"status"` - Title string `json:"title"` - Detail string `json:"detail"` - Links map[string]string `json:"links"` - Source map[string]interface{} `json:"source"` - Meta Meta `json:"meta"` + ID string `json:"id"` + Code string `json:"code"` + Status string `json:"status"` + Title string `json:"title"` + Detail string `json:"detail"` + Links map[string]string `json:"links"` + Source map[string]any `json:"source"` + Meta Meta `json:"meta"` } // NewError returns an empty Error object. func NewError() Error { err := Error{ Links: map[string]string{}, - Source: map[string]interface{}{}, + Source: map[string]any{}, Meta: Meta{}, } @@ -59,7 +59,7 @@ func (e Error) Error() string { // MarshalJSON returns a JSON representation of the error according to the // JSON:API specification. func (e Error) MarshalJSON() ([]byte, error) { - m := map[string]interface{}{} + m := map[string]any{} if e.ID != "" { m["id"] = e.ID diff --git a/error_test.go b/error_test.go index 79b4d35..838ea21 100644 --- a/error_test.go +++ b/error_test.go @@ -312,11 +312,11 @@ func TestErrorMarshalJSON(t *testing.T) { Links: map[string]string{ "link": "http://example.com/", }, - Source: map[string]interface{}{ + Source: map[string]any{ "parameter": "param", "pointer": "/data", }, - Meta: map[string]interface{}{ + Meta: map[string]any{ "meta": 123, }, } diff --git a/filter.go b/filter.go index 005c5f4..2b12896 100644 --- a/filter.go +++ b/filter.go @@ -8,10 +8,10 @@ import ( // A Filter is used to define filters when querying collections. type Filter struct { - Field string `json:"f"` - Op string `json:"o"` - Val interface{} `json:"v"` - Col string `json:"c"` + Field string `json:"f"` + Op string `json:"o"` + Val any `json:"v"` + Col string `json:"c"` } // filter is an internal version of Filter. @@ -60,7 +60,7 @@ func (f *Filter) UnmarshalJSON(data []byte) error { // IsAllowed reports whether res is valid under the rules defined in the filter. func (f *Filter) IsAllowed(res Resource) bool { var ( - val interface{} + val any // typ string ) @@ -104,7 +104,7 @@ func (f *Filter) IsAllowed(res Resource) bool { } } -func checkVal(op string, rval, cval interface{}) bool { +func checkVal(op string, rval, cval any) bool { switch rval := rval.(type) { case string: return checkStr(op, rval, cval.(string)) diff --git a/filter_test.go b/filter_test.go index 6942028..1fbe4f3 100644 --- a/filter_test.go +++ b/filter_test.go @@ -19,9 +19,9 @@ func TestFilterResource(t *testing.T) { // Tests for attributes attrTests := []struct { - rval interface{} + rval any op string - cval interface{} + cval any expected bool }{ // string @@ -809,9 +809,9 @@ func TestFilterResource(t *testing.T) { // Tests for relationships relTests := []struct { - rval interface{} + rval any op string - cval interface{} + cval any expected bool }{ // to-one @@ -882,34 +882,34 @@ func TestFilterResource(t *testing.T) { // Tests for "and" and "or" andOrTests := []struct { - rvals []interface{} + rvals []any ops []string - cvals []interface{} + cvals []any expectedAnd bool expectedOr bool }{ { - rvals: []interface{}{"abc", 1, true, now}, + rvals: []any{"abc", 1, true, now}, ops: []string{"=", "=", "=", "="}, - cvals: []interface{}{"abc", 1, true, now}, + cvals: []any{"abc", 1, true, now}, expectedAnd: true, expectedOr: true, }, { - rvals: []interface{}{"abc", 1, false, now}, + rvals: []any{"abc", 1, false, now}, ops: []string{"=", "=", "=", "="}, - cvals: []interface{}{"abc", 1, true, now}, + cvals: []any{"abc", 1, true, now}, expectedAnd: false, expectedOr: true, }, { - rvals: []interface{}{"abc", 1, false, now}, + rvals: []any{"abc", 1, false, now}, ops: []string{"=", "!=", "!=", "="}, - cvals: []interface{}{"abc", 2, true, now}, + cvals: []any{"abc", 2, true, now}, expectedAnd: true, expectedOr: true, }, { - rvals: []interface{}{"abc", 1, false, now}, + rvals: []any{"abc", 1, false, now}, ops: []string{"=", "!=", "=", "!="}, - cvals: []interface{}{"def", 1, true, now}, + cvals: []any{"def", 1, true, now}, expectedAnd: false, expectedOr: false, }, diff --git a/helpers.go b/helpers.go index 8285077..4e16b8d 100644 --- a/helpers.go +++ b/helpers.go @@ -14,7 +14,7 @@ import ( // key of the field tags are properly formatted. // // If nil is returned, then the value can be safely used with this library. -func Check(v interface{}) error { +func Check(v any) error { value := reflect.ValueOf(v) kind := value.Kind() @@ -104,7 +104,7 @@ func Check(v interface{}) error { // Type object that is returned. // // If an error is returned, the Type object will be empty. -func BuildType(v interface{}) (Type, error) { +func BuildType(v any) (Type, error) { typ := Type{} val := reflect.ValueOf(v) @@ -181,7 +181,7 @@ func BuildType(v interface{}) (Type, error) { // MustBuildType calls BuildType and returns the result. // // It panics if the error returned by BuildType is not nil. -func MustBuildType(v interface{}) Type { +func MustBuildType(v any) Type { typ, err := BuildType(v) if err != nil { panic(err) @@ -194,7 +194,7 @@ func MustBuildType(v interface{}) Type { // // Two empty strings are returned if v is not recognized as a resource. // CheckType can be used to check the validity of a struct. -func IDAndType(v interface{}) (string, string) { +func IDAndType(v any) (string, string) { if res, ok := v.(Resource); ok { return res.Get("id").(string), res.GetType().Name } diff --git a/jsonapi.go b/jsonapi.go new file mode 100644 index 0000000..c61afde --- /dev/null +++ b/jsonapi.go @@ -0,0 +1,5 @@ +package jsonapi + +// This is for backward compatibility with +// Go versions under 1.18. +type any = interface{} diff --git a/jsonapi_test.go b/jsonapi_test.go index 2ca15ac..c4f251a 100644 --- a/jsonapi_test.go +++ b/jsonapi_test.go @@ -7,6 +7,10 @@ import ( . "github.com/mfcochauxlaberge/jsonapi" ) +// This is for backward compatibility with +// Go versions under 1.18. +type any = interface{} + var update = flag.Bool("update-golden-files", false, "update the golden files") func getTime() time.Time { diff --git a/link.go b/link.go index e28e150..199b14c 100644 --- a/link.go +++ b/link.go @@ -7,8 +7,8 @@ import ( // Link represents a JSON:API links object. type Link struct { - HRef string `json:"href"` - Meta map[string]interface{} `json:"meta"` + HRef string `json:"href"` + Meta map[string]any `json:"meta"` } // MarshalJSON builds the JSON representation of a Link object. diff --git a/link_test.go b/link_test.go index 98d8839..1f232b7 100644 --- a/link_test.go +++ b/link_test.go @@ -28,7 +28,7 @@ func TestMarshalLink(t *testing.T) { }, { link: jsonapi.Link{ HRef: "example.org", - Meta: map[string]interface{}{ + Meta: map[string]any{ "s": "abc", "n": 123, }, @@ -37,7 +37,7 @@ func TestMarshalLink(t *testing.T) { }, { link: jsonapi.Link{ HRef: "example.org", - Meta: map[string]interface{}{ + Meta: map[string]any{ "bad": badMarshaler{}, }, }, diff --git a/meta.go b/meta.go index 10d737d..0c28811 100644 --- a/meta.go +++ b/meta.go @@ -6,7 +6,7 @@ import ( ) // Meta holds meta information. -type Meta map[string]interface{} +type Meta map[string]any // Has reports whether the Meta map contains or not the given key. func (m Meta) Has(key string) bool { diff --git a/params.go b/params.go index 77deaeb..be12b23 100644 --- a/params.go +++ b/params.go @@ -261,7 +261,7 @@ type Params struct { SortingRules []string // Pagination - Page map[string]interface{} + Page map[string]any // Include Include [][]Rel diff --git a/range_test.go b/range_test.go index 602022e..944f6b3 100644 --- a/range_test.go +++ b/range_test.go @@ -31,53 +31,53 @@ func TestRange(t *testing.T) { resources := []struct { id string - fields map[string]interface{} + fields map[string]any }{ { id: "res1", - fields: map[string]interface{}{ + fields: map[string]any{ "attr1": "string1", "attr2": 2, }, }, { id: "res2", - fields: map[string]interface{}{ + fields: map[string]any{ "attr1": "string2", "attr2": 2, }, }, { id: "res3", - fields: map[string]interface{}{ + fields: map[string]any{ "attr1": "string2", "attr2": 0, }, }, { id: "res4", - fields: map[string]interface{}{ + fields: map[string]any{ "attr1": "string2", "attr2": 2, }, }, { id: "res5", - fields: map[string]interface{}{ + fields: map[string]any{ "attr1": "string3", "attr2": 2, }, }, { id: "res6", - fields: map[string]interface{}{ + fields: map[string]any{ "attr1": "string3", "attr2": 4, }, }, { id: "res7", - fields: map[string]interface{}{ + fields: map[string]any{ "attr1": "string4", "attr2": 0, }, }, { id: "res8", - fields: map[string]interface{}{ + fields: map[string]any{ "attr1": "string5", "attr2": 2, }, @@ -169,95 +169,95 @@ func TestSortResources(t *testing.T) { // The point is to provoke all possible scenarios // for each attribute type. attrs := []struct { - vals [2]interface{} + vals [2]any }{ // non-nullable - {vals: [2]interface{}{"", "a"}}, - {vals: [2]interface{}{int(-1), int(0)}}, - {vals: [2]interface{}{int8(-1), int8(0)}}, - {vals: [2]interface{}{int16(-1), int16(0)}}, - {vals: [2]interface{}{int32(-1), int32(0)}}, - {vals: [2]interface{}{int64(-1), int64(0)}}, - {vals: [2]interface{}{uint(0), uint(1)}}, - {vals: [2]interface{}{uint8(0), uint8(1)}}, - {vals: [2]interface{}{uint16(0), uint16(1)}}, - {vals: [2]interface{}{uint32(0), uint32(1)}}, - {vals: [2]interface{}{uint64(0), uint64(1)}}, - {vals: [2]interface{}{false, true}}, - {vals: [2]interface{}{now, now.Add(time.Second)}}, - {vals: [2]interface{}{[]byte{0}, []byte{1}}}, - {vals: [2]interface{}{[]byte{0}, []byte{0, 1}}}, + {vals: [2]any{"", "a"}}, + {vals: [2]any{int(-1), int(0)}}, + {vals: [2]any{int8(-1), int8(0)}}, + {vals: [2]any{int16(-1), int16(0)}}, + {vals: [2]any{int32(-1), int32(0)}}, + {vals: [2]any{int64(-1), int64(0)}}, + {vals: [2]any{uint(0), uint(1)}}, + {vals: [2]any{uint8(0), uint8(1)}}, + {vals: [2]any{uint16(0), uint16(1)}}, + {vals: [2]any{uint32(0), uint32(1)}}, + {vals: [2]any{uint64(0), uint64(1)}}, + {vals: [2]any{false, true}}, + {vals: [2]any{now, now.Add(time.Second)}}, + {vals: [2]any{[]byte{0}, []byte{1}}}, + {vals: [2]any{[]byte{0}, []byte{0, 1}}}, // nullable - {vals: [2]interface{}{nilptr("string"), nilptr("string")}}, - {vals: [2]interface{}{nilptr("string"), ptr("a")}}, - {vals: [2]interface{}{ptr(""), nilptr("string")}}, - {vals: [2]interface{}{ptr(""), ptr("")}}, - {vals: [2]interface{}{ptr(""), ptr("a")}}, - {vals: [2]interface{}{nilptr("int"), nilptr("int")}}, - {vals: [2]interface{}{nilptr("int"), ptr(int(0))}}, - {vals: [2]interface{}{ptr(int(-1)), nilptr("int")}}, - {vals: [2]interface{}{ptr(int(-1)), ptr(int(-1))}}, - {vals: [2]interface{}{ptr(int(-1)), ptr(int(0))}}, - {vals: [2]interface{}{nilptr("int8"), nilptr("int8")}}, - {vals: [2]interface{}{nilptr("int8"), ptr(int8(0))}}, - {vals: [2]interface{}{ptr(int8(-1)), nilptr("int8")}}, - {vals: [2]interface{}{ptr(int8(-1)), ptr(int8(-1))}}, - {vals: [2]interface{}{ptr(int8(-1)), ptr(int8(0))}}, - {vals: [2]interface{}{nilptr("int16"), nilptr("int16")}}, - {vals: [2]interface{}{nilptr("int16"), ptr(int16(0))}}, - {vals: [2]interface{}{ptr(int16(-1)), nilptr("int16")}}, - {vals: [2]interface{}{ptr(int16(-1)), ptr(int16(-1))}}, - {vals: [2]interface{}{ptr(int16(-1)), ptr(int16(0))}}, - {vals: [2]interface{}{nilptr("int32"), nilptr("int32")}}, - {vals: [2]interface{}{nilptr("int32"), ptr(int32(0))}}, - {vals: [2]interface{}{ptr(int32(-1)), nilptr("int32")}}, - {vals: [2]interface{}{ptr(int32(-1)), ptr(int32(-1))}}, - {vals: [2]interface{}{ptr(int32(-1)), ptr(int32(0))}}, - {vals: [2]interface{}{nilptr("int64"), nilptr("int64")}}, - {vals: [2]interface{}{nilptr("int64"), ptr(int64(0))}}, - {vals: [2]interface{}{ptr(int64(-1)), nilptr("int64")}}, - {vals: [2]interface{}{ptr(int64(-1)), ptr(int64(-1))}}, - {vals: [2]interface{}{ptr(int64(-1)), ptr(int64(0))}}, - {vals: [2]interface{}{nilptr("uint"), nilptr("uint")}}, - {vals: [2]interface{}{nilptr("uint"), ptr(uint(0))}}, - {vals: [2]interface{}{ptr(uint(0)), nilptr("uint")}}, - {vals: [2]interface{}{ptr(uint(0)), ptr(uint(0))}}, - {vals: [2]interface{}{ptr(uint(0)), ptr(uint(1))}}, - {vals: [2]interface{}{nilptr("uint8"), nilptr("uint8")}}, - {vals: [2]interface{}{nilptr("uint8"), ptr(uint8(0))}}, - {vals: [2]interface{}{ptr(uint8(0)), nilptr("uint8")}}, - {vals: [2]interface{}{ptr(uint8(0)), ptr(uint8(0))}}, - {vals: [2]interface{}{ptr(uint8(0)), ptr(uint8(1))}}, - {vals: [2]interface{}{nilptr("uint16"), nilptr("uint16")}}, - {vals: [2]interface{}{nilptr("uint16"), ptr(uint16(0))}}, - {vals: [2]interface{}{ptr(uint16(0)), nilptr("uint16")}}, - {vals: [2]interface{}{ptr(uint16(0)), ptr(uint16(0))}}, - {vals: [2]interface{}{ptr(uint16(0)), ptr(uint16(1))}}, - {vals: [2]interface{}{nilptr("uint32"), nilptr("uint32")}}, - {vals: [2]interface{}{nilptr("uint32"), ptr(uint32(0))}}, - {vals: [2]interface{}{ptr(uint32(0)), nilptr("uint32")}}, - {vals: [2]interface{}{ptr(uint32(0)), ptr(uint32(0))}}, - {vals: [2]interface{}{ptr(uint32(0)), ptr(uint32(1))}}, - {vals: [2]interface{}{nilptr("uint64"), nilptr("uint64")}}, - {vals: [2]interface{}{nilptr("uint64"), ptr(uint64(0))}}, - {vals: [2]interface{}{ptr(uint64(0)), nilptr("uint64")}}, - {vals: [2]interface{}{ptr(uint64(0)), ptr(uint64(0))}}, - {vals: [2]interface{}{ptr(uint64(0)), ptr(uint64(1))}}, - {vals: [2]interface{}{nilptr("bool"), nilptr("bool")}}, - {vals: [2]interface{}{nilptr("bool"), ptr(false)}}, - {vals: [2]interface{}{ptr(false), nilptr("bool")}}, - {vals: [2]interface{}{ptr(false), ptr(false)}}, - {vals: [2]interface{}{ptr(false), ptr(true)}}, - {vals: [2]interface{}{nilptr("time.Time"), nilptr("time.Time")}}, - {vals: [2]interface{}{nilptr("time.Time"), ptr(now)}}, - {vals: [2]interface{}{ptr(now), nilptr("time.Time")}}, - {vals: [2]interface{}{ptr(now), ptr(now)}}, - {vals: [2]interface{}{ptr(now), ptr(now.Add(time.Second))}}, - {vals: [2]interface{}{nilptr("[]byte"), nilptr("[]byte")}}, - {vals: [2]interface{}{nilptr("[]byte"), ptr([]byte{0})}}, - {vals: [2]interface{}{ptr([]byte{0}), nilptr("[]byte")}}, - {vals: [2]interface{}{ptr([]byte{0}), ptr([]byte{0})}}, - {vals: [2]interface{}{nilptr("[]byte"), ptr([]byte{1})}}, + {vals: [2]any{nilptr("string"), nilptr("string")}}, + {vals: [2]any{nilptr("string"), ptr("a")}}, + {vals: [2]any{ptr(""), nilptr("string")}}, + {vals: [2]any{ptr(""), ptr("")}}, + {vals: [2]any{ptr(""), ptr("a")}}, + {vals: [2]any{nilptr("int"), nilptr("int")}}, + {vals: [2]any{nilptr("int"), ptr(int(0))}}, + {vals: [2]any{ptr(int(-1)), nilptr("int")}}, + {vals: [2]any{ptr(int(-1)), ptr(int(-1))}}, + {vals: [2]any{ptr(int(-1)), ptr(int(0))}}, + {vals: [2]any{nilptr("int8"), nilptr("int8")}}, + {vals: [2]any{nilptr("int8"), ptr(int8(0))}}, + {vals: [2]any{ptr(int8(-1)), nilptr("int8")}}, + {vals: [2]any{ptr(int8(-1)), ptr(int8(-1))}}, + {vals: [2]any{ptr(int8(-1)), ptr(int8(0))}}, + {vals: [2]any{nilptr("int16"), nilptr("int16")}}, + {vals: [2]any{nilptr("int16"), ptr(int16(0))}}, + {vals: [2]any{ptr(int16(-1)), nilptr("int16")}}, + {vals: [2]any{ptr(int16(-1)), ptr(int16(-1))}}, + {vals: [2]any{ptr(int16(-1)), ptr(int16(0))}}, + {vals: [2]any{nilptr("int32"), nilptr("int32")}}, + {vals: [2]any{nilptr("int32"), ptr(int32(0))}}, + {vals: [2]any{ptr(int32(-1)), nilptr("int32")}}, + {vals: [2]any{ptr(int32(-1)), ptr(int32(-1))}}, + {vals: [2]any{ptr(int32(-1)), ptr(int32(0))}}, + {vals: [2]any{nilptr("int64"), nilptr("int64")}}, + {vals: [2]any{nilptr("int64"), ptr(int64(0))}}, + {vals: [2]any{ptr(int64(-1)), nilptr("int64")}}, + {vals: [2]any{ptr(int64(-1)), ptr(int64(-1))}}, + {vals: [2]any{ptr(int64(-1)), ptr(int64(0))}}, + {vals: [2]any{nilptr("uint"), nilptr("uint")}}, + {vals: [2]any{nilptr("uint"), ptr(uint(0))}}, + {vals: [2]any{ptr(uint(0)), nilptr("uint")}}, + {vals: [2]any{ptr(uint(0)), ptr(uint(0))}}, + {vals: [2]any{ptr(uint(0)), ptr(uint(1))}}, + {vals: [2]any{nilptr("uint8"), nilptr("uint8")}}, + {vals: [2]any{nilptr("uint8"), ptr(uint8(0))}}, + {vals: [2]any{ptr(uint8(0)), nilptr("uint8")}}, + {vals: [2]any{ptr(uint8(0)), ptr(uint8(0))}}, + {vals: [2]any{ptr(uint8(0)), ptr(uint8(1))}}, + {vals: [2]any{nilptr("uint16"), nilptr("uint16")}}, + {vals: [2]any{nilptr("uint16"), ptr(uint16(0))}}, + {vals: [2]any{ptr(uint16(0)), nilptr("uint16")}}, + {vals: [2]any{ptr(uint16(0)), ptr(uint16(0))}}, + {vals: [2]any{ptr(uint16(0)), ptr(uint16(1))}}, + {vals: [2]any{nilptr("uint32"), nilptr("uint32")}}, + {vals: [2]any{nilptr("uint32"), ptr(uint32(0))}}, + {vals: [2]any{ptr(uint32(0)), nilptr("uint32")}}, + {vals: [2]any{ptr(uint32(0)), ptr(uint32(0))}}, + {vals: [2]any{ptr(uint32(0)), ptr(uint32(1))}}, + {vals: [2]any{nilptr("uint64"), nilptr("uint64")}}, + {vals: [2]any{nilptr("uint64"), ptr(uint64(0))}}, + {vals: [2]any{ptr(uint64(0)), nilptr("uint64")}}, + {vals: [2]any{ptr(uint64(0)), ptr(uint64(0))}}, + {vals: [2]any{ptr(uint64(0)), ptr(uint64(1))}}, + {vals: [2]any{nilptr("bool"), nilptr("bool")}}, + {vals: [2]any{nilptr("bool"), ptr(false)}}, + {vals: [2]any{ptr(false), nilptr("bool")}}, + {vals: [2]any{ptr(false), ptr(false)}}, + {vals: [2]any{ptr(false), ptr(true)}}, + {vals: [2]any{nilptr("time.Time"), nilptr("time.Time")}}, + {vals: [2]any{nilptr("time.Time"), ptr(now)}}, + {vals: [2]any{ptr(now), nilptr("time.Time")}}, + {vals: [2]any{ptr(now), ptr(now)}}, + {vals: [2]any{ptr(now), ptr(now.Add(time.Second))}}, + {vals: [2]any{nilptr("[]byte"), nilptr("[]byte")}}, + {vals: [2]any{nilptr("[]byte"), ptr([]byte{0})}}, + {vals: [2]any{ptr([]byte{0}), nilptr("[]byte")}}, + {vals: [2]any{ptr([]byte{0}), ptr([]byte{0})}}, + {vals: [2]any{nilptr("[]byte"), ptr([]byte{1})}}, } // Add attributes to type diff --git a/resource.go b/resource.go index 19eeda2..4f635df 100644 --- a/resource.go +++ b/resource.go @@ -15,21 +15,21 @@ type Resource interface { // Read GetType() Type - Get(key string) interface{} + Get(key string) any // Update - Set(key string, val interface{}) + Set(key string, val any) } // MarshalResource marshals a Resource into a JSON-encoded payload. func MarshalResource(r Resource, prepath string, fields []string, relData map[string][]string) []byte { - mapPl := map[string]interface{}{} + mapPl := map[string]any{} mapPl["id"] = r.Get("id").(string) mapPl["type"] = r.GetType().Name // Attributes - attrs := map[string]interface{}{} + attrs := map[string]any{} for _, attr := range r.Attrs() { for _, field := range fields { @@ -84,7 +84,7 @@ func MarshalResource(r Resource, prepath string, fields []string, relData map[st raw, _ = json.Marshal(s) rels[rel.FromName] = &raw } else { - s := map[string]interface{}{ + s := map[string]any{ "links": buildRelationshipLinks(r, prepath, rel.FromName), } diff --git a/simple_url.go b/simple_url.go index 362862b..20be470 100644 --- a/simple_url.go +++ b/simple_url.go @@ -23,7 +23,7 @@ type SimpleURL struct { FilterLabel string Filter *Filter SortingRules []string - Page map[string]interface{} + Page map[string]any Include []string } @@ -60,7 +60,7 @@ func NewSimpleURL(u *url.URL) (SimpleURL, error) { if len(values.Get(name)) > 0 { if sURL.Page == nil { - sURL.Page = map[string]interface{}{} + sURL.Page = map[string]any{} } val := values.Get(name) diff --git a/simple_url_test.go b/simple_url_test.go index 753a44b..42fe3a0 100644 --- a/simple_url_test.go +++ b/simple_url_test.go @@ -132,7 +132,7 @@ func TestSimpleURL(t *testing.T) { }, Filter: nil, SortingRules: []string{"attr2", "-attr1"}, - Page: map[string]interface{}{ + Page: map[string]any{ "size": 20, "number": 1, }, @@ -170,7 +170,7 @@ func TestSimpleURL(t *testing.T) { Fields: map[string][]string{}, Filter: nil, SortingRules: []string{}, - Page: map[string]interface{}{ + Page: map[string]any{ "cursor": "abc", }, Include: []string{}, diff --git a/soft_resource.go b/soft_resource.go index 743769b..eafff6a 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -15,7 +15,7 @@ type SoftResource struct { Type *Type id string - data map[string]interface{} + data map[string]any meta Meta } @@ -107,7 +107,7 @@ func (sr *SoftResource) GetType() Type { } // Get returns the value associated to the field named after key. -func (sr *SoftResource) Get(key string) interface{} { +func (sr *SoftResource) Get(key string) any { sr.check() if key == "id" { @@ -140,7 +140,7 @@ func (sr *SoftResource) SetType(typ *Type) { } // Set sets the value associated to the field named key to v. -func (sr *SoftResource) Set(key string, v interface{}) { +func (sr *SoftResource) Set(key string, v any) { sr.check() if key == "id" { @@ -216,7 +216,7 @@ func (sr *SoftResource) check() { } if sr.data == nil { - sr.data = map[string]interface{}{} + sr.data = map[string]any{} } for i := range sr.Type.Attrs { @@ -256,8 +256,8 @@ func (sr *SoftResource) check() { } } -func copyData(d map[string]interface{}) map[string]interface{} { - d2 := map[string]interface{}{} +func copyData(d map[string]any) map[string]any { + d2 := map[string]any{} for k, v := range d { switch v2 := v.(type) { diff --git a/soft_resource_test.go b/soft_resource_test.go index 0b9caa5..fe54a2d 100644 --- a/soft_resource_test.go +++ b/soft_resource_test.go @@ -204,7 +204,7 @@ func TestSoftResourceCopy(t *testing.T) { sr := &SoftResource{} // Attributes - attrs := map[string]interface{}{ + attrs := map[string]any{ "string": "abc", "int": 42, "int8": 8, @@ -282,7 +282,7 @@ func TestSoftResourceMeta(t *testing.T) { sr.Type = &typ sr.SetID("id") - meta := Meta(map[string]interface{}{ + meta := Meta(map[string]any{ "key1": "a string", "key2": 200, "key3": false, diff --git a/type.go b/type.go index 19f2854..36a076d 100644 --- a/type.go +++ b/type.go @@ -206,13 +206,13 @@ type Attr struct { // UnmarshalToType unmarshals the data into a value of the type represented by // the attribute and returns it. -func (a Attr) UnmarshalToType(data []byte) (interface{}, error) { +func (a Attr) UnmarshalToType(data []byte) (any, error) { if a.Nullable && string(data) == "null" { return GetZeroValue(a.Type, a.Nullable), nil } var ( - v interface{} + v any err error ) @@ -508,7 +508,7 @@ func GetAttrTypeString(t int, nullable bool) string { // specified int (see constants). // // If nullable is true, the returned value is a nil pointer. -func GetZeroValue(t int, nullable bool) interface{} { +func GetZeroValue(t int, nullable bool) any { switch t { case AttrTypeString: if nullable { diff --git a/type_test.go b/type_test.go index 1ea900b..e1a6841 100644 --- a/type_test.go +++ b/type_test.go @@ -126,7 +126,7 @@ func TestAttrUnmarshalToType(t *testing.T) { ) tests := []struct { - val interface{} + val any }{ {val: "str"}, // string {val: 1}, // int diff --git a/url_test.go b/url_test.go index 27ee0cc..3962556 100644 --- a/url_test.go +++ b/url_test.go @@ -289,7 +289,7 @@ func TestParseParams(t *testing.T) { Rels: map[string][]Rel{}, RelData: map[string][]string{}, SortingRules: []string{}, - Page: map[string]interface{}{ + Page: map[string]any{ "size": 50, "number": 3, }, @@ -334,7 +334,7 @@ func TestParseParams(t *testing.T) { Rels: map[string][]Rel{}, RelData: map[string][]string{}, SortingRules: []string{}, - Page: map[string]interface{}{ + Page: map[string]any{ "size": 50, "number": 3, }, @@ -377,7 +377,7 @@ func TestParseParams(t *testing.T) { Rels: map[string][]Rel{}, RelData: map[string][]string{}, SortingRules: []string{}, - Page: map[string]interface{}{ + Page: map[string]any{ "size": 90, "number": 110, }, diff --git a/util_test.go b/util_test.go index 5b6dede..7892963 100644 --- a/util_test.go +++ b/util_test.go @@ -12,7 +12,7 @@ func makeOneLineNoSpaces(str string) string { return strings.ReplaceAll(str, " ", "") } -func ptr(v interface{}) interface{} { +func ptr(v any) any { switch c := v.(type) { // String case string: @@ -52,7 +52,7 @@ func ptr(v interface{}) interface{} { } } -func nilptr(t string) interface{} { +func nilptr(t string) any { switch t { // String case "string": diff --git a/wrapper.go b/wrapper.go index c7e14f6..c604094 100644 --- a/wrapper.go +++ b/wrapper.go @@ -29,7 +29,7 @@ type Wrapper struct { // to v. // // If v is not a pointer, a copy is made and v won't be modified by the wrapper. -func Wrap(v interface{}) *Wrapper { +func Wrap(v any) *Wrapper { val := reflect.ValueOf(v) switch { @@ -181,7 +181,7 @@ func (w *Wrapper) GetType() Type { } // Get returns the value associated to the attribute named after key. -func (w *Wrapper) Get(key string) interface{} { +func (w *Wrapper) Get(key string) any { if key == "id" { return w.GetID() } @@ -195,7 +195,7 @@ func (w *Wrapper) SetID(id string) { } // Set sets the value associated to the attribute named after key. -func (w *Wrapper) Set(key string, val interface{}) { +func (w *Wrapper) Set(key string, val any) { if key == "id" { id, _ := val.(string) w.SetID(id) @@ -239,7 +239,7 @@ func (w *Wrapper) SetMeta(m Meta) { // Private methods -func (w *Wrapper) getField(key string) interface{} { +func (w *Wrapper) getField(key string) any { if key == "" { panic("key is empty") } @@ -260,7 +260,7 @@ func (w *Wrapper) getField(key string) interface{} { panic(fmt.Sprintf("attribute %q does not exist", key)) } -func (w *Wrapper) setField(key string, v interface{}) { +func (w *Wrapper) setField(key string, v any) { if key == "" { panic("key is empty") } diff --git a/wrapper_test.go b/wrapper_test.go index 1c3b235..91eb451 100644 --- a/wrapper_test.go +++ b/wrapper_test.go @@ -258,7 +258,7 @@ func TestWrapperSet(t *testing.T) { tests := []struct { typ string // "1" for mockType1, "2" for mockType2 field string - val interface{} + val any }{ {typ: "1", field: "str", val: "astring"}, {typ: "1", field: "int", val: int(9)},

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 Id(efy0Qmh!Pyhe` From d1744e53be5ba04f83f6dfa550a11abc9b81b14e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 11 May 2019 15:45:12 -0400 Subject: [PATCH 047/406] Use assert for SoftResource tests --- soft_resource_test.go | 50 +++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/soft_resource_test.go b/soft_resource_test.go index e2c9652..29beab6 100644 --- a/soft_resource_test.go +++ b/soft_resource_test.go @@ -3,20 +3,20 @@ package jsonapi import ( "testing" - "github.com/mfcochauxlaberge/tchek" + "github.com/stretchr/testify/assert" ) func TestSoftResource(t *testing.T) { sr := &SoftResource{} - tchek.AreEqual(t, "no attributes", map[string]Attr{}, sr.Attrs()) - tchek.AreEqual(t, "no relationships", map[string]Rel{}, sr.Rels()) + assert.Equal(t, map[string]Attr{}, sr.Attrs()) + assert.Equal(t, map[string]Rel{}, sr.Rels()) // ID and type sr.SetID("id") sr.SetType("type") - tchek.AreEqual(t, "get id", "id", sr.GetID()) - tchek.AreEqual(t, "get type", "type", sr.GetType()) + assert.Equal(t, "id", sr.GetID()) + assert.Equal(t, "type", sr.GetType()) // Attributes attrs := map[string]Attr{ @@ -34,9 +34,9 @@ func TestSoftResource(t *testing.T) { for _, attr := range attrs { sr.AddAttr(attr) - tchek.AreEqual(t, "get an attribute", attr, sr.Attr(attr.Name)) + assert.Equal(t, attr, sr.Attr(attr.Name)) } - tchek.AreEqual(t, "list all attributes", attrs, sr.Attrs()) + assert.Equal(t, attrs, sr.Attrs()) // Relationships rels := map[string]Rel{ @@ -60,48 +60,48 @@ func TestSoftResource(t *testing.T) { for _, rel := range rels { sr.AddRel(rel) - tchek.AreEqual(t, "get an attribute", rel, sr.Rel(rel.Name)) + assert.Equal(t, rel, sr.Rel(rel.Name)) } - tchek.AreEqual(t, "list all attributes", rels, sr.Rels()) + assert.Equal(t, rels, sr.Rels()) sr.RemoveField("attr1") - tchek.AreEqual(t, "can't get removed attribute", Attr{}, sr.Attr("attr1")) + assert.Equal(t, Attr{}, sr.Attr("attr1")) sr.RemoveField("attr2") - tchek.AreEqual(t, "all attributes are removed", map[string]Attr{}, sr.Attrs()) + assert.Equal(t, map[string]Attr{}, sr.Attrs()) sr.RemoveField("rel1") - tchek.AreEqual(t, "can't get removed relationship", Rel{}, sr.Rel("rel1")) + assert.Equal(t, Rel{}, sr.Rel("rel1")) sr.RemoveField("rel2") - tchek.AreEqual(t, "all relationships are removed", map[string]Rel{}, sr.Rels()) + assert.Equal(t, map[string]Rel{}, sr.Rels()) - tchek.AreEqual(t, "get an nonexistent value", nil, sr.Get("nonexistent")) - tchek.AreEqual(t, "get an nonexistent to-one rel", "", sr.GetToOne("nonexistent")) - tchek.AreEqual(t, "get an nonexistent to-many rel", []string{}, sr.GetToMany("nonexistent")) + assert.Equal(t, nil, sr.Get("nonexistent")) + assert.Equal(t, "", sr.GetToOne("nonexistent")) + assert.Equal(t, []string{}, sr.GetToMany("nonexistent")) // Put the fields back for _, attr := range attrs { sr.AddAttr(attr) - tchek.AreEqual(t, "get an attribute", attr, sr.Attr(attr.Name)) + assert.Equal(t, attr, sr.Attr(attr.Name)) } for _, rel := range rels { sr.AddRel(rel) - tchek.AreEqual(t, "get an attribute", rel, sr.Rel(rel.Name)) + assert.Equal(t, rel, sr.Rel(rel.Name)) } // Set and get some fields - tchek.AreEqual(t, "get a zero value 1", "", sr.Get("attr1")) - tchek.AreEqual(t, "get a zero value 2", "", sr.GetToOne("rel1")) - tchek.AreEqual(t, "get a zero value 3", []string{}, sr.GetToMany("rel2")) + assert.Equal(t, "", sr.Get("attr1")) + assert.Equal(t, "", sr.GetToOne("rel1")) + assert.Equal(t, []string{}, sr.GetToMany("rel2")) sr.Set("attr1", "value") sr.SetToOne("rel1", "id1") sr.SetToMany("rel2", []string{"id1", "id2"}) - tchek.AreEqual(t, "get a value 1", "value", sr.Get("attr1")) - tchek.AreEqual(t, "get a value 2", "id1", sr.GetToOne("rel1")) - tchek.AreEqual(t, "get a value 3", []string{"id1", "id2"}, sr.GetToMany("rel2")) + assert.Equal(t, "value", sr.Get("attr1")) + assert.Equal(t, "id1", sr.GetToOne("rel1")) + assert.Equal(t, []string{"id1", "id2"}, sr.GetToMany("rel2")) // Copy sr2 := sr.Copy() - tchek.AreEqual(t, "copy is equal", true, Equal(sr, sr2)) + assert.Equal(t, true, Equal(sr, sr2)) } From 5b53982da975f88a6f7a5eb882ceb7522aa288b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 11 May 2019 16:53:29 -0400 Subject: [PATCH 048/406] Set the type in NewSoftResource --- soft_resource.go | 1 + soft_resource_test.go | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/soft_resource.go b/soft_resource.go index 08f97b9..9f64ee0 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -7,6 +7,7 @@ import ( // NewSoftResource ... func NewSoftResource(typ Type, vals map[string]interface{}) *SoftResource { res := &SoftResource{} + res.typ = &typ for _, attr := range typ.Attrs { if val, ok := vals[attr.Name]; ok { diff --git a/soft_resource_test.go b/soft_resource_test.go index 29beab6..1ebbaaf 100644 --- a/soft_resource_test.go +++ b/soft_resource_test.go @@ -12,6 +12,24 @@ func TestSoftResource(t *testing.T) { assert.Equal(t, map[string]Attr{}, sr.Attrs()) assert.Equal(t, map[string]Rel{}, sr.Rels()) + // NewSoftResource + typ := Type{Name: "type"} + typ.AddAttr(Attr{ + Name: "attr1", + Type: AttrTypeString, + Null: false, + }) + typ.AddRel(Rel{ + Name: "rel1", + Type: "type", + ToOne: true, + InverseName: "rel1", + InverseType: "type", + InverseToOne: true, + }) + sr = NewSoftResource(typ, nil) + assert.Equal(t, &typ, sr.typ) + // ID and type sr.SetID("id") sr.SetType("type") From cffab7a99e85b7ef449ce623dffbc4a6a25f407b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 13 May 2019 22:46:57 -0400 Subject: [PATCH 049/406] Make SoftResource.SetType accept a *Type --- soft_resource.go | 4 ++-- soft_resource_test.go | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/soft_resource.go b/soft_resource.go index 9f64ee0..e4779b4 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -119,9 +119,9 @@ func (sr *SoftResource) SetID(id string) { } // SetType ... -func (sr *SoftResource) SetType(name string) { +func (sr *SoftResource) SetType(typ *Type) { sr.check() - sr.typ.Name = name + sr.typ = typ } // Set ... diff --git a/soft_resource_test.go b/soft_resource_test.go index 1ebbaaf..b768d86 100644 --- a/soft_resource_test.go +++ b/soft_resource_test.go @@ -32,9 +32,11 @@ func TestSoftResource(t *testing.T) { // ID and type sr.SetID("id") - sr.SetType("type") + typ2 := typ + typ2.Name = "type2" + sr.SetType(&typ2) assert.Equal(t, "id", sr.GetID()) - assert.Equal(t, "type", sr.GetType()) + assert.Equal(t, "type2", sr.GetType()) // Attributes attrs := map[string]Attr{ From 43b1999b6f5f0338845a950c9830f937b839b9a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 20 May 2019 11:46:58 -0400 Subject: [PATCH 050/406] Make SoftResource.Get also return relationships --- soft_resource.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/soft_resource.go b/soft_resource.go index e4779b4..dde7581 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -109,6 +109,9 @@ func (sr *SoftResource) Get(key string) interface{} { if _, ok := sr.typ.Attrs[key]; ok { return sr.data[key] } + if _, ok := sr.typ.Rels[key]; ok { + return sr.data[key] + } return nil } From a7697d36e03010521e9c93860fec90a892e87869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 20 May 2019 11:48:59 -0400 Subject: [PATCH 051/406] Make SoftResource.Get return zero value if needed --- soft_resource.go | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/soft_resource.go b/soft_resource.go index dde7581..21d4acf 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -106,11 +106,20 @@ func (sr *SoftResource) GetType() string { // Get ... func (sr *SoftResource) Get(key string) interface{} { sr.check() - if _, ok := sr.typ.Attrs[key]; ok { - return sr.data[key] + if attr, ok := sr.typ.Attrs[key]; ok { + if v, ok := sr.data[key]; ok { + return v + } + return GetZeroValue(attr.Type, attr.Null) } - if _, ok := sr.typ.Rels[key]; ok { - return sr.data[key] + if rel, ok := sr.typ.Rels[key]; ok { + if v, ok := sr.data[key]; ok { + return v + } + if rel.ToOne { + return "" + } + return []string{} } return nil } From 2a52876bf057cdc8049ecc3227ca2d733f505b87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 10 Jun 2019 23:05:21 -0400 Subject: [PATCH 052/406] Add SoftCollection struct --- soft_collection.go | 452 ++++++++++++++++++++++++++++++++++++++++ soft_collection_test.go | 292 ++++++++++++++++++++++++++ 2 files changed, 744 insertions(+) create mode 100644 soft_collection.go create mode 100644 soft_collection_test.go diff --git a/soft_collection.go b/soft_collection.go new file mode 100644 index 0000000..0f46aca --- /dev/null +++ b/soft_collection.go @@ -0,0 +1,452 @@ +package jsonapi + +import ( + "errors" + "sort" + "strings" + "sync" + "time" +) + +// SoftCollection ... +type SoftCollection struct { + Type *Type + + col []*SoftResource + sort []string + + sync.Mutex +} + +// AddAttr ... +func (s *SoftCollection) AddAttr(attr Attr) error { + return s.Type.AddAttr(attr) +} + +// AddRel ... +func (s *SoftCollection) AddRel(rel Rel) error { + return s.Type.AddRel(rel) + +} + +// Len ... +func (s *SoftCollection) Len() int { + return len(s.col) +} + +// Elem ... +func (s *SoftCollection) Elem(i int) Resource { + if i >= 0 && i < len(s.col) { + return s.col[i] + } + return nil +} + +// Resource ... +func (s *SoftCollection) Resource(id string, fields []string) Resource { + for i := range s.col { + if s.col[i].GetID() == id { + return s.col[i] + } + } + return nil +} + +// Range ... +func (s *SoftCollection) Range(ids []string, _ *Condition, sort []string, fields []string, pageSize uint, pageNumber uint) []Resource { + s.Lock() + defer s.Unlock() + + rangeCol := &SoftCollection{} + + // Filter IDs + if len(ids) > 0 { + for _, rec := range s.col { + for _, id := range ids { + if rec.id == id { + rangeCol.Add(rec) + } + } + } + } else { + for _, rec := range s.col { + rangeCol.Add(rec) + } + } + + // TODO Filter + + // Sort + rangeCol.Sort(sort) + + // Pagination + skip := int(pageNumber * pageSize) + if skip >= len(rangeCol.col) { + rangeCol = &SoftCollection{} + } else { + page := &SoftCollection{} + for i := skip; i < len(rangeCol.col) && (pageSize == 0 || i < int(pageSize)); i++ { + page.Add(rangeCol.col[i]) + } + rangeCol = page + } + + // Make the collection + col := []Resource{} + for _, rec := range rangeCol.col { + col = append(col, rec) + } + + return col +} + +// Add ... +func (s *SoftCollection) Add(r Resource) { + // A SoftResource is built from the Resource and + // then it is added to the collection. + sr := &SoftResource{} + sr.id = r.GetID() + sr.typ = s.Type + + for _, attr := range r.Attrs() { + sr.AddAttr(attr) + sr.Set(attr.Name, r.Get(attr.Name)) + } + + for _, rel := range r.Rels() { + sr.AddRel(rel) + if rel.ToOne { + sr.SetToOne(rel.Name, r.GetToOne(rel.Name)) + } else { + sr.SetToMany(rel.Name, r.GetToMany(rel.Name)) + } + } + + s.col = append(s.col, sr) +} + +// Remove ... +func (s *SoftCollection) Remove(id string) { + for i := range s.col { + if s.col[i].GetID() == id { + s.col = append(s.col[:i], s.col[i+1:]...) + return + } + } +} + +// // SetField ... +// func (s *SoftCollection) SetField(id, field string, v interface{}) { +// for i := range s.col { +// if s.col[i].GetID() == id { +// s.col[i].Set(field, v) +// } +// } +// } + +// // GetValue ... +// func (s *SoftCollection) GetValue(id, field string) interface{} { +// for i := range s.col { +// if s.col[i].GetID() == id { +// return s.col[i].Get(field) +// } +// } +// return nil +// } + +// UnmarshalJSON ... +func (s *SoftCollection) UnmarshalJSON(payload []byte) error { + // TODO Implement this method + return errors.New("jsonapi: SoftCollection.UnmarshalJSON not yet implemented") +} + +// Sort ... +func (s *SoftCollection) Sort(rules []string) { + s.sort = rules + + if len(s.sort) == 0 { + s.sort = []string{"id"} + } + + sort.Sort(s) +} + +// Swap ... +func (s *SoftCollection) Swap(i, j int) { + s.col[i], s.col[j] = s.col[j], s.col[i] +} + +// Less ... +func (s *SoftCollection) Less(i, j int) bool { + for _, r := range s.sort { + inverse := false + if strings.HasPrefix(r, "-") { + r = r[1:] + inverse = true + } + + if r == "id" { + return s.col[i].GetID() < s.col[j].GetID() != inverse + } + + // Here we return true if v < v2. + // The "!= inverse" part acts as a XOR operation so that + // the opposite boolean is returned when inverse sorting + // is required. + switch v := s.col[i].data[r].(type) { + case string: + v2 := s.col[j].data[r].(string) + if v == v2 { + continue + } + return v < v2 != inverse + case int: + v2 := s.col[j].data[r].(int) + if v == v2 { + continue + } + return v < v2 != inverse + case int8: + v2 := s.col[j].data[r].(int8) + if v == v2 { + continue + } + return v < v2 != inverse + case int16: + v2 := s.col[j].data[r].(int16) + if v == v2 { + continue + } + return v < v2 != inverse + case int32: + v2 := s.col[j].data[r].(int32) + if v == v2 { + continue + } + return v < v2 != inverse + case int64: + v2 := s.col[j].data[r].(int64) + if v == v2 { + continue + } + return v < v2 != inverse + case uint: + v2 := s.col[j].data[r].(uint) + if v == v2 { + continue + } + return v < v2 != inverse + case uint8: + v2 := s.col[j].data[r].(uint8) + if v == v2 { + continue + } + return v < v2 != inverse + case uint16: + v2 := s.col[j].data[r].(uint16) + if v == v2 { + continue + } + return v < v2 != inverse + case uint32: + v2 := s.col[j].data[r].(uint32) + if v == v2 { + continue + } + return v < v2 != inverse + case bool: + v2 := s.col[j].data[r].(bool) + if v == v2 { + continue + } + return !v != inverse + case time.Time: + if v.Equal(s.col[j].data[r].(time.Time)) { + continue + } + return v.Before(s.col[j].data[r].(time.Time)) != inverse + case *string: + p := s.col[j].data[r].(*string) + if v == p { + continue + } + if v == nil { + return true != inverse + } + if p == nil { + return false != inverse + } + if *v == *p { + continue + } + return *v < *p != inverse + case *int: + p := s.col[j].data[r].(*int) + if v == p { + continue + } + if v == nil { + return true != inverse + } + if p == nil { + return false != inverse + } + if *v == *p { + continue + } + return *v < *p != inverse + case *int8: + p := s.col[j].data[r].(*int8) + if v == p { + continue + } + if v == nil { + return true != inverse + } + if p == nil { + return false != inverse + } + if *v == *p { + continue + } + return *v < *p != inverse + case *int16: + p := s.col[j].data[r].(*int16) + if v == p { + continue + } + if v == nil { + return true != inverse + } + if p == nil { + return false != inverse + } + if *v == *p { + continue + } + return *v < *p != inverse + case *int32: + p := s.col[j].data[r].(*int32) + if v == p { + continue + } + if v == nil { + return true != inverse + } + if p == nil { + return false != inverse + } + if *v == *p { + continue + } + return *v < *p != inverse + case *int64: + p := s.col[j].data[r].(*int64) + if v == p { + continue + } + if v == nil { + return true != inverse + } + if p == nil { + return false != inverse + } + if *v == *p { + continue + } + return *v < *p != inverse + case *uint: + p := s.col[j].data[r].(*uint) + if v == p { + continue + } + if v == nil { + return true != inverse + } + if p == nil { + return false != inverse + } + if *v == *p { + continue + } + return *v < *p != inverse + case *uint8: + p := s.col[j].data[r].(*uint8) + if v == p { + continue + } + if v == nil { + return true != inverse + } + if p == nil { + return false != inverse + } + if *v == *p { + continue + } + return *v < *p != inverse + case *uint16: + p := s.col[j].data[r].(*uint16) + if v == p { + continue + } + if v == nil { + return true != inverse + } + if p == nil { + return false != inverse + } + if *v == *p { + continue + } + return *v < *p != inverse + case *uint32: + p := s.col[j].data[r].(*uint32) + if v == p { + continue + } + if v == nil { + return true != inverse + } + if p == nil { + return false != inverse + } + if *v == *p { + continue + } + return *v < *p != inverse + case *bool: + p := s.col[j].data[r].(*bool) + if v == p { + continue + } + if v == nil { + return true != inverse + } + if p == nil { + return false != inverse + } + if *v == *p { + continue + } + return !*v != inverse + case *time.Time: + p := s.col[j].data[r].(*time.Time) + if v == p { + continue + } + if v == nil { + return true != inverse + } + if p == nil { + return false != inverse + } + if v.Equal(*p) { + continue + } + return v.Before(*p) != inverse + } + } + + return false +} diff --git a/soft_collection_test.go b/soft_collection_test.go new file mode 100644 index 0000000..bc653f2 --- /dev/null +++ b/soft_collection_test.go @@ -0,0 +1,292 @@ +package jsonapi + +import ( + "testing" + "time" + + "github.com/mitchellh/copystructure" + "github.com/stretchr/testify/assert" +) + +func TestSoftCollection(t *testing.T) { + sc := &SoftCollection{} + + // Add type + typ := Type{Name: "thistype"} + typ.AddAttr(Attr{ + Name: "attr1", + Type: AttrTypeInt, + Null: false, + }) + typ.AddAttr(Attr{ + Name: "attr2", + Type: AttrTypeString, + Null: true, + }) + typ.AddRel(Rel{ + Name: "rel1", + Type: "othertype", + ToOne: true, + InverseName: "rel2", + InverseType: "thistype", + InverseToOne: true, + }) + typ.AddRel(Rel{ + Name: "rel3", + Type: "othertype", + ToOne: false, + InverseName: "rel4", + InverseType: "thistype", + InverseToOne: true, + }) + + // Make a copy so that modifying the original typ + // does not modify the SoftCollection's type. + typcopy := copystructure.Must(copystructure.Copy(typ)).(Type) + sc.Type = &typcopy + + assert.Equal(t, sc.Type, &typ) + + // Modify the SoftCollection's type and the local type + // at the same time and check whether they still are + // the same. + attr3 := Attr{ + Name: "attr3", + Type: AttrTypeBool, + Null: false, + } + rel5 := Rel{ + Name: "rel5", + Type: "othertype", + ToOne: true, + InverseName: "rel6", + InverseType: "thistype", + InverseToOne: false, + } + typ.AddAttr(attr3) + sc.AddAttr(attr3) + typ.AddRel(rel5) + sc.AddRel(rel5) + + assert.Equal(t, sc.Type, &typ) + + // Add a SoftResource with more fields than those + // specified in the SoftCollection. + sr := NewSoftResource(Type{Name: "thirdtype"}, nil) + attr4 := Attr{ + Name: "attr4", + Type: AttrTypeUint16, + Null: true, + } + sr.AddAttr(attr4) + typ.AddAttr(attr4) + rel7 := Rel{ + Name: "rel7", + Type: "othertype", + ToOne: true, + InverseName: "rel8", + InverseType: "thirdtype", + InverseToOne: true, + } + sr.AddRel(rel7) + typ.AddRel(rel7) + + sc.Add(sr) + + assert.Equal(t, sc.Type, &typ) + + // Add more elements to the SoftCollection. + sc.Add(&SoftResource{id: "res1"}) + sc.Add(&SoftResource{id: "res2"}) + + assert.Equal(t, 3, sc.Len()) + + // Remove an element. + sc.Remove("res1") + sc.Remove("res99") + + assert.Equal(t, 2, sc.Len()) +} + +func TestSoftCollectionResource(t *testing.T) { + sc := &SoftCollection{ + Type: &Type{}, + } + + sc.Type.Name = "type1" + sc.Type.AddAttr(Attr{ + Name: "attr1", + Type: AttrTypeString, + Null: false, + }) + sc.Type.AddAttr(Attr{ + Name: "attr2", + Type: AttrTypeInt, + Null: true, + }) + sc.Type.AddRel(Rel{ + Name: "rel1", + Type: "type2", + ToOne: true, + }) + + sr := &SoftResource{} + sr.SetType(sc.Type) + sr.SetID("res1") + sr.Set("attr", "value1") + sc.Add(sr) + + // Resource with all fields + assert.Equal(t, sr, sc.Resource("res1", nil)) + + // Resource with some fields + // TODO Fix this test. It seems like defining any set of + // fields will make the assert pass. + assert.Equal(t, sr, sc.Resource("res1", []string{"attr2", "rel1"})) + + // Resource not found + assert.Equal(t, nil, sc.Resource("notfound", nil)) +} + +func TestSoftCollectionSort(t *testing.T) { + now := time.Now() + sc := &SoftCollection{} + + // Add type with some attributes. + typ := Type{Name: "thistype"} + typ.AddAttr(Attr{ + Name: "attr1", + Type: AttrTypeInt, + Null: false, + }) + typ.AddAttr(Attr{ + Name: "attr2", + Type: AttrTypeString, + Null: true, + }) + typ.AddAttr(Attr{ + Name: "attr3", + Type: AttrTypeBool, + Null: true, + }) + typ.AddAttr(Attr{ + Name: "attr4", + Type: AttrTypeTime, + Null: false, + }) + sc.Type = &typ + + // Add some resources. + sr := NewSoftResource(typ, nil) + sr.SetID("res1") + sr.Set("attr1", 0) + sr.Set("attr2", nil) + sr.Set("attr3", (*bool)(nil)) + sr.Set("attr4", now) + sc.Add(sr) + + sr = NewSoftResource(typ, nil) + sr.SetID("res2") + sr.Set("attr1", 0) + sr.Set("attr2", nil) + b1 := false + sr.Set("attr3", &b1) + sr.Set("attr4", now) + sc.Add(sr) + + sr = NewSoftResource(typ, nil) + sr.SetID("res3") + sr.Set("attr1", 1) + sr.Set("attr2", "") + sr.Set("attr3", (*bool)(nil)) + sr.Set("attr4", now.Add(-time.Second)) + sc.Add(sr) + + sr = NewSoftResource(typ, nil) + sr.SetID("res4") + sr.Set("attr1", -1) + sr.Set("attr2", "abc") + sr.Set("attr3", (*bool)(nil)) + sr.Set("attr4", now.Add(time.Second)) + sc.Add(sr) + + sr = NewSoftResource(typ, nil) + sr.SetID("res5") + sr.Set("attr1", -1) + sr.Set("attr2", "abc") + b2 := true + sr.Set("attr3", &b2) + sr.Set("attr4", now.Add(time.Second)) + sc.Add(sr) + + sr = NewSoftResource(typ, nil) + sr.SetID("res6") + sr.Set("attr1", 2) + sr.Set("attr2", "") + sr.Set("attr3", (*bool)(nil)) + sr.Set("attr4", now.Add(time.Second)) + sc.Add(sr) + + sr = NewSoftResource(typ, nil) + sr.SetID("res7") + sr.Set("attr1", 2) + sr.Set("attr2", "abc") + b3 := true + sr.Set("attr3", &b3) + sr.Set("attr4", now.Add(-time.Second)) + sc.Add(sr) + + sr = NewSoftResource(typ, nil) + sr.SetID("res8") + sr.Set("attr1", 4) + sr.Set("attr2", "") + sr.Set("attr3", (*bool)(nil)) + sr.Set("attr4", now.Add(time.Second)) + sc.Add(sr) + + sr = NewSoftResource(typ, nil) + sr.SetID("res9") + sr.Set("attr1", -1) + sr.Set("attr2", "def") + sr.Set("attr3", (*bool)(nil)) + sr.Set("attr4", now.Add(time.Second)) + sc.Add(sr) + + sr = NewSoftResource(typ, nil) + sr.SetID("res10") + sr.Set("attr1", 4) + sr.Set("attr2", "") + sr.Set("attr3", (*bool)(nil)) + sr.Set("attr4", now.Add(time.Second)) + sc.Add(sr) + + // Sort the collection. + rules := []string{"-attr3", "-attr4", "attr1", "-attr2", "id"} + sc.Sort(rules) + + assert.Equal(t, rules, sc.sort) + + // Make an ordered list of IDs. + ids := []string{} + for i := 0; i < sc.Len(); i++ { + ids = append(ids, sc.Elem(i).GetID()) + } + + expectedIDs := []string{ + "res5", "res7", "res2", "res9", "res4", "res6", "res10", "res8", "res1", "res3", + } + assert.Equal(t, expectedIDs, ids) + + // Sort with an empty list of sorting rules. + sc.Sort([]string{}) + + ids = []string{} + for i := 0; i < sc.Len(); i++ { + ids = append(ids, sc.Elem(i).GetID()) + } + + expectedIDs = []string{ + "res1", "res10", "res2", "res3", "res4", "res5", "res6", "res7", "res8", "res9", + } + assert.Equal(t, expectedIDs, ids) +} From 673e90088bf4f4345bccf12ba2f94c8a30a0ab44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 11 Jun 2019 22:01:24 -0400 Subject: [PATCH 053/406] Write a lot of comments --- build_links.go | 9 +++++--- collection.go | 11 +++++++--- document.go | 9 +++++--- error.go | 55 +++++++++++++++++++++++----------------------- filter_query.go | 8 +++---- identifiers.go | 14 +++++++----- jsonapi.go | 12 +++++++--- link.go | 4 ++-- params.go | 6 ++++- request.go | 2 +- resource.go | 2 +- schema.go | 42 +++++++++++++++++++++++------------ simple_url.go | 9 +++++--- soft_collection.go | 35 ++++++++++++++++++----------- soft_resource.go | 52 ++++++++++++++++++++++++------------------- url.go | 24 +++++++++++++++----- util.go | 4 ++-- wrapper.go | 50 ++++++++++++++++++++++++----------------- 18 files changed, 215 insertions(+), 133 deletions(-) diff --git a/build_links.go b/build_links.go index efcf34c..b4b12ae 100644 --- a/build_links.go +++ b/build_links.go @@ -2,10 +2,11 @@ package jsonapi import "strings" -// buildSelfLink builds a URL that points to the resource -// represented by the value v. +// buildSelfLink builds a URL that points to the resource represented by the +// value v. // -// v has to be a struct or a pointer to a struct. +// prepath is prepended to the path and usually represents a scheme and a +// domain name. func buildSelfLink(res Resource, prepath string) string { if !strings.HasSuffix(prepath, "/") { prepath = prepath + "/" @@ -18,6 +19,8 @@ func buildSelfLink(res Resource, prepath string) string { return "" } +// buildRelationshipLinks builds a links object (according to the JSON:API +// specification) that include both the self and related members. func buildRelationshipLinks(res Resource, prepath, rel string) map[string]string { return map[string]string{ "self": buildSelfLink(res, prepath) + "/relationships/" + rel, diff --git a/collection.go b/collection.go index 4661ff0..915e39c 100644 --- a/collection.go +++ b/collection.go @@ -1,12 +1,17 @@ package jsonapi -// Collection ... +// A Collection can manage a set of ordered resources of the same type. type Collection interface { + // Type returns the name of the resources' type. Type() string + // Len return the number of resources in the collection. Len() int + // Elem returns the resource at index i. Elem(i int) Resource + // Add adds a resource in the collection. Add(r Resource) - // JSON - UnmarshalJSON(payload []byte) error + // UnmarshalJSON unmarshals the bytes that represent a collection + // of resources into the struct that implements the interface. + UnmarshalJSON([]byte) error } diff --git a/document.go b/document.go index bcd3ed1..f7675f4 100644 --- a/document.go +++ b/document.go @@ -1,6 +1,6 @@ package jsonapi -// Document ... +// A Document represents a JSON:API document. type Document struct { // Data Data interface{} @@ -25,7 +25,7 @@ type Document struct { PrePath string } -// NewDocument ... +// NewDocument returns a pointer to a new Document. func NewDocument() *Document { return &Document{ Included: map[string]Resource{}, @@ -36,7 +36,10 @@ func NewDocument() *Document { } } -// Include ... +// Include adds res to the set of resources to be included under the +// included top-level field. +// +// It also makes sure that resources are not added twice. func (d *Document) Include(res Resource) { key := res.GetType() + " " + res.GetID() diff --git a/error.go b/error.go index 38cac4a..46f934a 100644 --- a/error.go +++ b/error.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" ) -// Error represents an error object from the JSON:API specification. +// An Error represents an error object from the JSON:API specification. type Error struct { ID string `json:"id"` Code string `json:"code"` @@ -60,7 +60,8 @@ func (e Error) Error() string { return e.Title } -// MarshalJSON ... +// MarshalJSON returns a JSON representation of the error according +// to the JSON:API specification. func (e Error) MarshalJSON() ([]byte, error) { m := map[string]interface{}{} @@ -99,7 +100,7 @@ func (e Error) MarshalJSON() ([]byte, error) { return json.Marshal(m) } -// NewErrBadRequest (400) ... +// NewErrBadRequest (400) returns the corresponding error. func NewErrBadRequest(title, detail string) Error { e := NewError() @@ -110,7 +111,7 @@ func NewErrBadRequest(title, detail string) Error { return e } -// NewErrMalformedFilterParameter (400) ... +// NewErrMalformedFilterParameter (400) returns the corresponding error. func NewErrMalformedFilterParameter(badFitler string) Error { e := NewError() @@ -123,7 +124,7 @@ func NewErrMalformedFilterParameter(badFitler string) Error { return e } -// NewErrInvalidPageNumberParameter (400) ... +// NewErrInvalidPageNumberParameter (400) returns the corresponding error. func NewErrInvalidPageNumberParameter(badPageNumber string) Error { e := NewError() @@ -136,7 +137,7 @@ func NewErrInvalidPageNumberParameter(badPageNumber string) Error { return e } -// NewErrInvalidPageSizeParameter (400) ... +// NewErrInvalidPageSizeParameter (400) returns the corresponding error. func NewErrInvalidPageSizeParameter(badPageSize string) Error { e := NewError() @@ -149,7 +150,7 @@ func NewErrInvalidPageSizeParameter(badPageSize string) Error { return e } -// NewErrUnknownFieldInBody (400) ... +// NewErrUnknownFieldInBody (400) returns the corresponding error. func NewErrUnknownFieldInBody(typ, field string) Error { e := NewError() @@ -163,7 +164,7 @@ func NewErrUnknownFieldInBody(typ, field string) Error { return e } -// NewErrUnknownFieldInURL (400) ... +// NewErrUnknownFieldInURL (400) returns the corresponding error. func NewErrUnknownFieldInURL(field string) Error { e := NewError() @@ -179,7 +180,7 @@ func NewErrUnknownFieldInURL(field string) Error { return e } -// NewErrUnknownParameter (400) ... +// NewErrUnknownParameter (400) returns the corresponding error. func NewErrUnknownParameter(param string) Error { e := NewError() @@ -192,7 +193,7 @@ func NewErrUnknownParameter(param string) Error { return e } -// NewErrUnknownRelationshipInPath (400) ... +// NewErrUnknownRelationshipInPath (400) returns the corresponding error. func NewErrUnknownRelationshipInPath(typ, rel, path string) Error { e := NewError() @@ -206,7 +207,7 @@ func NewErrUnknownRelationshipInPath(typ, rel, path string) Error { return e } -// NewErrUnknownTypeInURL (400) ... +// NewErrUnknownTypeInURL (400) returns the corresponding error. func NewErrUnknownTypeInURL(typ string) Error { e := NewError() @@ -218,7 +219,7 @@ func NewErrUnknownTypeInURL(typ string) Error { return e } -// NewErrUnknownFieldInFilterParameter (400) ... +// NewErrUnknownFieldInFilterParameter (400) returns the corresponding error. func NewErrUnknownFieldInFilterParameter(field string) Error { e := NewError() @@ -231,7 +232,7 @@ func NewErrUnknownFieldInFilterParameter(field string) Error { return e } -// NewErrUnknownOperatorInFilterParameter (400) ... +// NewErrUnknownOperatorInFilterParameter (400) returns the corresponding error. func NewErrUnknownOperatorInFilterParameter(op string) Error { e := NewError() @@ -244,7 +245,7 @@ func NewErrUnknownOperatorInFilterParameter(op string) Error { return e } -// NewErrInvalidValueInFilterParameter (400) ... +// NewErrInvalidValueInFilterParameter (400) returns the corresponding error. func NewErrInvalidValueInFilterParameter(val, kind string) Error { e := NewError() @@ -257,7 +258,7 @@ func NewErrInvalidValueInFilterParameter(val, kind string) Error { return e } -// NewErrUnknownCollationInFilterParameter (400) ... +// NewErrUnknownCollationInFilterParameter (400) returns the corresponding error. func NewErrUnknownCollationInFilterParameter(col string) Error { e := NewError() @@ -270,7 +271,7 @@ func NewErrUnknownCollationInFilterParameter(col string) Error { return e } -// NewErrUnknownFilterParameterLabel (400) ... +// NewErrUnknownFilterParameterLabel (400) returns the corresponding error. func NewErrUnknownFilterParameterLabel(label string) Error { e := NewError() @@ -283,7 +284,7 @@ func NewErrUnknownFilterParameterLabel(label string) Error { return e } -// NewErrUnauthorized (401) ... +// NewErrUnauthorized (401) returns the corresponding error. func NewErrUnauthorized() Error { e := NewError() @@ -294,7 +295,7 @@ func NewErrUnauthorized() Error { return e } -// NewErrForbidden (403) ... +// NewErrForbidden (403) returns the corresponding error. func NewErrForbidden() Error { e := NewError() @@ -305,7 +306,7 @@ func NewErrForbidden() Error { return e } -// NewErrNotFound (404) ... +// NewErrNotFound (404) returns the corresponding error. func NewErrNotFound() Error { e := NewError() @@ -316,7 +317,7 @@ func NewErrNotFound() Error { return e } -// NewErrPayloadTooLarge (413) ... +// NewErrPayloadTooLarge (413) returns the corresponding error. func NewErrPayloadTooLarge() Error { e := NewError() @@ -327,7 +328,7 @@ func NewErrPayloadTooLarge() Error { return e } -// NewErrRequestURITooLong (414) ... +// NewErrRequestURITooLong (414) returns the corresponding error. func NewErrRequestURITooLong() Error { e := NewError() @@ -337,7 +338,7 @@ func NewErrRequestURITooLong() Error { return e } -// NewErrUnsupportedMediaType (415) ... +// NewErrUnsupportedMediaType (415) returns the corresponding error. func NewErrUnsupportedMediaType() Error { e := NewError() @@ -347,7 +348,7 @@ func NewErrUnsupportedMediaType() Error { return e } -// NewErrTooManyRequests (429) ... +// NewErrTooManyRequests (429) returns the corresponding error. func NewErrTooManyRequests() Error { e := NewError() @@ -357,7 +358,7 @@ func NewErrTooManyRequests() Error { return e } -// NewErrRequestHeaderFieldsTooLarge (431) ... +// NewErrRequestHeaderFieldsTooLarge (431) returns the corresponding error. func NewErrRequestHeaderFieldsTooLarge() Error { e := NewError() @@ -367,7 +368,7 @@ func NewErrRequestHeaderFieldsTooLarge() Error { return e } -// NewErrInternalServerError (500) ... +// NewErrInternalServerError (500) returns the corresponding error. func NewErrInternalServerError() Error { e := NewError() @@ -377,7 +378,7 @@ func NewErrInternalServerError() Error { return e } -// NewErrServiceUnavailable (503) ... +// NewErrServiceUnavailable (503) returns the corresponding error. func NewErrServiceUnavailable() Error { e := NewError() @@ -387,7 +388,7 @@ func NewErrServiceUnavailable() Error { return e } -// NewErrNotImplemented (503) ... +// NewErrNotImplemented (503) returns the corresponding error. func NewErrNotImplemented() Error { e := NewError() diff --git a/filter_query.go b/filter_query.go index 3630b4e..1719fdf 100644 --- a/filter_query.go +++ b/filter_query.go @@ -4,7 +4,7 @@ import ( "encoding/json" ) -// Condition ... +// A Condition is used to define filters when querying collections. type Condition struct { Field string `json:"f"` Op string `json:"o"` @@ -12,7 +12,7 @@ type Condition struct { Col string `json:"c"` } -// cnd ... +// cnd is an internal version of Condition. type cnd struct { Field string `json:"f"` Op string `json:"o"` @@ -20,7 +20,7 @@ type cnd struct { Col string `json:"c"` } -// UnmarshalJSON ... +// UnmarshalJSON parses the provided data and populates a Condition. func (c *Condition) UnmarshalJSON(data []byte) error { tmpCnd := cnd{} err := json.Unmarshal(data, &tmpCnd) @@ -57,7 +57,7 @@ func (c *Condition) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON ... +// MarshalJSON marshals a Condition into JSON. func (c *Condition) MarshalJSON() ([]byte, error) { payload := map[string]interface{}{} if c.Field != "" { diff --git a/identifiers.go b/identifiers.go index 1c994e8..888242c 100644 --- a/identifiers.go +++ b/identifiers.go @@ -2,7 +2,9 @@ package jsonapi import "encoding/json" -// NewIdentifiers ... +// NewIdentifiers returns an Identifiers object. +// +// t is the type of the identifiers. ids is the set of IDs. func NewIdentifiers(t string, ids []string) Identifiers { identifiers := []Identifier{} @@ -16,10 +18,10 @@ func NewIdentifiers(t string, ids []string) Identifiers { return identifiers } -// Identifiers ... +// Identifiers represents a slice of Identifier. type Identifiers []Identifier -// IDs ... +// IDs returns the IDs part of the Identifiers. func (i Identifiers) IDs() []string { ids := []string{} @@ -30,13 +32,15 @@ func (i Identifiers) IDs() []string { return ids } -// Identifier ... +// Identifier represents a resource's type and ID. type Identifier struct { ID string `json:"id"` Type string `json:"type"` } -// MarshalIdentifiers ... +// MarshalIdentifiers builds a json.RawMessage object from the given IDs. +// +// TODO Implement the function. func MarshalIdentifiers(ids []string, toOne bool) json.RawMessage { raw := "" diff --git a/jsonapi.go b/jsonapi.go index 8660b34..7b039ff 100644 --- a/jsonapi.go +++ b/jsonapi.go @@ -8,7 +8,9 @@ import ( "strings" ) -// Marshal ... +// Marshal marshals a document according to the JSON:API speficication. +// +// Both doc and url must not be nil. func Marshal(doc *Document, url *URL) ([]byte, error) { // Data var data json.RawMessage @@ -82,7 +84,9 @@ func Marshal(doc *Document, url *URL) ([]byte, error) { return json.Marshal(plMap) } -// Unmarshal ... +// Unmarshal reads a payload to build and return a document object. +// +// Both url and schema must not be nil. func Unmarshal(payload []byte, url *URL, schema *Schema) (*Document, error) { doc := &Document{} ske := &payloadSkeleton{} @@ -147,7 +151,9 @@ func Unmarshal(payload []byte, url *URL, schema *Schema) (*Document, error) { return doc, nil } -// CheckType ... +// CheckType checks the given value and returns any error found. +// +// If nil is returned, than the value can be safely used with this library. func CheckType(v interface{}) error { value := reflect.ValueOf(v) kind := value.Kind() diff --git a/link.go b/link.go index 746cfc8..03c7e80 100644 --- a/link.go +++ b/link.go @@ -4,13 +4,13 @@ import ( "encoding/json" ) -// Link ... +// Link represents a JSON:API links object. type Link struct { HRef string `json:"href"` Meta map[string]interface{} `json:"meta"` } -// MarshalJSON ... +// MarshalJSON builds the JSON representation of a Link object. func (l Link) MarshalJSON() ([]byte, error) { if len(l.Meta) > 0 { return json.Marshal(l) diff --git a/params.go b/params.go index f8b535a..d762f38 100644 --- a/params.go +++ b/params.go @@ -29,7 +29,11 @@ type Params struct { Include [][]Rel } -// NewParams ... +// NewParams creates and returns a Params object built from a SimpleURL +// and a given resource type. A schema is used for validation. +// +// If validation is not expected, it is recommended to simply build a +// SimpleURL object with NewSimpleURL. func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { params := &Params{ Fields: map[string][]string{}, diff --git a/request.go b/request.go index 188f0ea..f759896 100644 --- a/request.go +++ b/request.go @@ -37,7 +37,7 @@ func NewRequest(r *http.Request, schema *Schema) (*Request, error) { return req, nil } -// Request represents a JSON:API request. +// A Request represents a JSON:API request. type Request struct { Method string URL *URL diff --git a/resource.go b/resource.go index 2eb65b4..1c5b54e 100644 --- a/resource.go +++ b/resource.go @@ -6,7 +6,7 @@ import ( "sort" ) -// Resource ... +// A Resource is an element of a collection. type Resource interface { // Structure Attrs() map[string]Attr diff --git a/schema.go b/schema.go index 7a15cc1..1df79be 100644 --- a/schema.go +++ b/schema.go @@ -24,12 +24,15 @@ const ( AttrTypeTime ) -// Schema ... +// A Schema contains a list of types. It makes sure that each type is +// valid and unique. +// +// Check can be used to validate the relationships between the types. type Schema struct { Types []Type } -// AddType ... +// AddType adds a type to the schema. func (s *Schema) AddType(typ Type) error { // Validation if typ.Name == "" { @@ -48,7 +51,7 @@ func (s *Schema) AddType(typ Type) error { return nil } -// RemoveType ... +// RemoveType removes a type from the schema. func (s *Schema) RemoveType(typ string) error { for i := range s.Types { if s.Types[i].Name == typ { @@ -59,7 +62,7 @@ func (s *Schema) RemoveType(typ string) error { return nil } -// AddAttr ... +// AddAttr adds an attribute to the specified type. func (s *Schema) AddAttr(typ string, attr Attr) error { for i := range s.Types { if s.Types[i].Name == typ { @@ -70,7 +73,7 @@ func (s *Schema) AddAttr(typ string, attr Attr) error { return fmt.Errorf("jsonapi: type %s does not exist", typ) } -// RemoveAttr ... +// RemoveAttr removes an attribute from the specified type. func (s *Schema) RemoveAttr(typ string, attr string) error { for i := range s.Types { if s.Types[i].Name == typ { @@ -81,7 +84,7 @@ func (s *Schema) RemoveAttr(typ string, attr string) error { return fmt.Errorf("jsonapi: type %s does not exist", typ) } -// AddRel ... +// AddRel adds a relationship to the specified type. func (s *Schema) AddRel(typ string, rel Rel) error { for i := range s.Types { if s.Types[i].Name == typ { @@ -92,7 +95,7 @@ func (s *Schema) AddRel(typ string, rel Rel) error { return fmt.Errorf("jsonapi: type %s does not exist", typ) } -// RemoveRel ... +// RemoveRel removes a relationship from the specified type. func (s *Schema) RemoveRel(typ string, rel string) error { for i := range s.Types { if s.Types[i].Name == typ { @@ -103,7 +106,8 @@ func (s *Schema) RemoveRel(typ string, rel string) error { return fmt.Errorf("jsonapi: type %s does not exist", typ) } -// HasType ... +// HasType returns a boolean indicating whether a type has the specified name +// or not. func (s *Schema) HasType(name string) bool { for i := range s.Types { if s.Types[i].Name == name { @@ -113,7 +117,9 @@ func (s *Schema) HasType(name string) bool { return false } -// GetType ... +// GetType returns the type associated with the speficied name. +// +// A boolean indicates whether a type was found or not. func (s *Schema) GetType(name string) (Type, bool) { for _, typ := range s.Types { if typ.Name == name { @@ -123,7 +129,8 @@ func (s *Schema) GetType(name string) (Type, bool) { return Type{}, false } -// GetResource ... +// GetResource returns a resource of type SoftResource with the specified +// type. All fields are set to their zero values. func (s *Schema) GetResource(name string) Resource { typ, ok := s.GetType(name) if ok { @@ -132,7 +139,8 @@ func (s *Schema) GetResource(name string) Resource { return nil } -// Check ... +// Check checks the integrity of all the relationships between the types +// and returns all the errors that were found. func (s *Schema) Check() []error { var ( ok bool @@ -188,7 +196,8 @@ func (s *Schema) Check() []error { return errs } -// GetAttrType ... +// GetAttrType returns the attribute type as an int (see constants) and +// a boolean that indicates whether the attribute can be null or not. func GetAttrType(t string) (int, bool) { t2 := t if strings.HasPrefix(t2, "*") { @@ -263,7 +272,9 @@ func GetAttrType(t string) (int, bool) { } } -// GetAttrTypeString ... +// GetAttrTypeString return the name of the attribute type specified +// by an int (see constants) and a boolean that indicates whether the +// value can be null or not. func GetAttrTypeString(t int, null bool) string { switch t { case AttrTypeString: @@ -331,7 +342,10 @@ func GetAttrTypeString(t int, null bool) string { } } -// GetZeroValue ... +// GetZeroValue returns the zero value of the attribute type represented +// by the specified int (see constants). +// +// If null is true, the returned value is a nil pointer. func GetZeroValue(t int, null bool) interface{} { switch t { case AttrTypeString: diff --git a/simple_url.go b/simple_url.go index 2761525..767acf7 100644 --- a/simple_url.go +++ b/simple_url.go @@ -8,7 +8,9 @@ import ( "strings" ) -// SimpleURL ... +// A SimpleURL represents a URL not validated nor supplemented from a schema. +// +// It parses a URL in text format and stores the values as is. type SimpleURL struct { // Source string @@ -26,7 +28,7 @@ type SimpleURL struct { Include []string } -// NewSimpleURL ... +// NewSimpleURL takes and parses a *url.URL and returns a SimpleURL. func NewSimpleURL(u *url.URL) (SimpleURL, error) { sURL := SimpleURL{ Fragments: []string{}, @@ -104,7 +106,8 @@ func NewSimpleURL(u *url.URL) (SimpleURL, error) { return sURL, nil } -// Path ... +// Path returns the path only of the SimpleURL. It does not include any +// query parameters. func (s *SimpleURL) Path() string { return strings.Join(s.Fragments, "/") } diff --git a/soft_collection.go b/soft_collection.go index 0f46aca..069ee3f 100644 --- a/soft_collection.go +++ b/soft_collection.go @@ -8,7 +8,8 @@ import ( "time" ) -// SoftCollection ... +// SoftCollection is a collection of SoftResources where the type can +// be changed for all elements at once by modifying the Type field. type SoftCollection struct { Type *Type @@ -18,23 +19,23 @@ type SoftCollection struct { sync.Mutex } -// AddAttr ... +// AddAttr adds an attribute to all of the resources in the collection. func (s *SoftCollection) AddAttr(attr Attr) error { return s.Type.AddAttr(attr) } -// AddRel ... +// AddRel adds a relationship to all of the resources in the collection. func (s *SoftCollection) AddRel(rel Rel) error { return s.Type.AddRel(rel) } -// Len ... +// Len returns the length of the collection. func (s *SoftCollection) Len() int { return len(s.col) } -// Elem ... +// Elem returns the element at index i. func (s *SoftCollection) Elem(i int) Resource { if i >= 0 && i < len(s.col) { return s.col[i] @@ -42,7 +43,9 @@ func (s *SoftCollection) Elem(i int) Resource { return nil } -// Resource ... +// Resource returns the element with an ID equal to id. +// +// It builds and returns a SoftResource with only the specified fields. func (s *SoftCollection) Resource(id string, fields []string) Resource { for i := range s.col { if s.col[i].GetID() == id { @@ -52,7 +55,8 @@ func (s *SoftCollection) Resource(id string, fields []string) Resource { return nil } -// Range ... +// Range returns a subset of the collection arranged according to the +// given parameters. func (s *SoftCollection) Range(ids []string, _ *Condition, sort []string, fields []string, pageSize uint, pageNumber uint) []Resource { s.Lock() defer s.Unlock() @@ -100,7 +104,7 @@ func (s *SoftCollection) Range(ids []string, _ *Condition, sort []string, fields return col } -// Add ... +// Add creates a SoftResource and adds it to the collection. func (s *SoftCollection) Add(r Resource) { // A SoftResource is built from the Resource and // then it is added to the collection. @@ -125,7 +129,9 @@ func (s *SoftCollection) Add(r Resource) { s.col = append(s.col, sr) } -// Remove ... +// Remove removes the resource with an ID equal to id. +// +// Nothing happens if no resource has such an ID. func (s *SoftCollection) Remove(id string) { for i := range s.col { if s.col[i].GetID() == id { @@ -154,13 +160,16 @@ func (s *SoftCollection) Remove(id string) { // return nil // } -// UnmarshalJSON ... +// UnmarshalJSON populates a SoftCollection from the given payload. +// +// Only the attributes and relationships defined in the SoftCollection's +// Type field will be considered. func (s *SoftCollection) UnmarshalJSON(payload []byte) error { // TODO Implement this method return errors.New("jsonapi: SoftCollection.UnmarshalJSON not yet implemented") } -// Sort ... +// Sort rearranges the order of the collection according the rules. func (s *SoftCollection) Sort(rules []string) { s.sort = rules @@ -171,12 +180,12 @@ func (s *SoftCollection) Sort(rules []string) { sort.Sort(s) } -// Swap ... +// Swap implements sort.Interface's Swap method. func (s *SoftCollection) Swap(i, j int) { s.col[i], s.col[j] = s.col[j], s.col[i] } -// Less ... +// Less implements sort.Interface's Less method. func (s *SoftCollection) Less(i, j int) bool { for _, r := range s.sort { inverse := false diff --git a/soft_resource.go b/soft_resource.go index 21d4acf..ea22c3c 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -4,7 +4,9 @@ import ( "github.com/mitchellh/copystructure" ) -// NewSoftResource ... +// NewSoftResource returns a new SoftResource with the given type. +// +// It is also populated with values from vals. func NewSoftResource(typ Type, vals map[string]interface{}) *SoftResource { res := &SoftResource{} res.typ = &typ @@ -23,26 +25,31 @@ func NewSoftResource(typ Type, vals map[string]interface{}) *SoftResource { return res } -// SoftResource ... +// SoftResource represents a resource whose type is defined by an internal +// field of type *Type. +// +// Changing the type automatically changes the resource's attributes and +// relationships. When a field is added, its value is the zero value of the +// field's type. type SoftResource struct { id string typ *Type data map[string]interface{} } -// Attrs ... +// Attrs returns the resource's attributes. func (sr *SoftResource) Attrs() map[string]Attr { sr.check() return sr.typ.Attrs } -// Rels ... +// Rels returns the resource's relationships. func (sr *SoftResource) Rels() map[string]Rel { sr.check() return sr.typ.Rels } -// AddAttr ... +// AddAttr adds an attribute. func (sr *SoftResource) AddAttr(attr Attr) { sr.check() for _, name := range sr.fields() { @@ -53,7 +60,7 @@ func (sr *SoftResource) AddAttr(attr Attr) { sr.typ.Attrs[attr.Name] = attr } -// AddRel ... +// AddRel adds a relationship. func (sr *SoftResource) AddRel(rel Rel) { sr.check() for _, name := range sr.fields() { @@ -64,26 +71,27 @@ func (sr *SoftResource) AddRel(rel Rel) { sr.typ.Rels[rel.Name] = rel } -// RemoveField ... +// RemoveField removes a field. func (sr *SoftResource) RemoveField(field string) { sr.check() delete(sr.typ.Attrs, field) delete(sr.typ.Rels, field) } -// Attr ... +// Attr returns the attribute named after key. func (sr *SoftResource) Attr(key string) Attr { sr.check() return sr.typ.Attrs[key] } -// Rel ... +// Rel returns the relationship named after key. func (sr *SoftResource) Rel(key string) Rel { sr.check() return sr.typ.Rels[key] } -// New ... +// New returns a new resource (of type SoftResource) with the same type +// but without the values. func (sr *SoftResource) New() Resource { sr.check() return &SoftResource{ @@ -91,19 +99,19 @@ func (sr *SoftResource) New() Resource { } } -// GetID ... +// GetID returns the resource's ID. func (sr *SoftResource) GetID() string { sr.check() return sr.id } -// GetType ... +// GetType returns the resource's type. func (sr *SoftResource) GetType() string { sr.check() return sr.typ.Name } -// Get ... +// Get returns the value associated to the field named after key. func (sr *SoftResource) Get(key string) interface{} { sr.check() if attr, ok := sr.typ.Attrs[key]; ok { @@ -124,7 +132,7 @@ func (sr *SoftResource) Get(key string) interface{} { return nil } -// SetID ... +// SetID sets the resource's ID. func (sr *SoftResource) SetID(id string) { sr.check() sr.id = id @@ -136,7 +144,7 @@ func (sr *SoftResource) SetType(typ *Type) { sr.typ = typ } -// Set ... +// Set sets the value associated to the field named key to v. func (sr *SoftResource) Set(key string, v interface{}) { sr.check() if _, ok := sr.data[key]; ok { @@ -144,7 +152,7 @@ func (sr *SoftResource) Set(key string, v interface{}) { } } -// GetToOne ... +// GetToOne returns the value associated to the relationship named after key. func (sr *SoftResource) GetToOne(key string) string { sr.check() if _, ok := sr.typ.Rels[key]; ok { @@ -153,7 +161,7 @@ func (sr *SoftResource) GetToOne(key string) string { return "" } -// GetToMany ... +// GetToMany returns the value associated to the relationship named after key. func (sr *SoftResource) GetToMany(key string) []string { sr.check() if _, ok := sr.typ.Rels[key]; ok { @@ -162,7 +170,7 @@ func (sr *SoftResource) GetToMany(key string) []string { return []string{} } -// SetToOne ... +// SetToOne sets the relationship named after key to rel. func (sr *SoftResource) SetToOne(key string, rel string) { sr.check() if _, ok := sr.data[key]; ok { @@ -170,7 +178,7 @@ func (sr *SoftResource) SetToOne(key string, rel string) { } } -// SetToMany ... +// SetToMany sets the relationship named after key to rel. func (sr *SoftResource) SetToMany(key string, rels []string) { sr.check() if _, ok := sr.data[key]; ok { @@ -178,13 +186,13 @@ func (sr *SoftResource) SetToMany(key string, rels []string) { } } -// Validate ... +// Validate returns validation errors found in the resource. func (sr *SoftResource) Validate() []error { sr.check() return []error{} } -// Copy ... +// Copy return a new SoftResource object with the same type and values. func (sr *SoftResource) Copy() Resource { sr.check() return &SoftResource{ @@ -194,7 +202,7 @@ func (sr *SoftResource) Copy() Resource { } } -// UnmarshalJSON ... +// UnmarshalJSON parses the payload and populates a SoftResource. func (sr *SoftResource) UnmarshalJSON(payload []byte) error { sr.check() // TODO diff --git a/url.go b/url.go index 270f12f..8fe0f90 100644 --- a/url.go +++ b/url.go @@ -8,7 +8,11 @@ import ( "strconv" ) -// URL ... +// A URL stores all the information from a URL formatted for a JSON:API +// request. +// +// The data structure allows to have more information than what the URL +// itself stores. type URL struct { // URL Fragments []string // [users, u1, articles] @@ -26,7 +30,8 @@ type URL struct { Params *Params } -// NewURL ... +// NewURL builds a URL from a SimpleURL and a schema for validating and +// supplementing the object with extra information. func NewURL(schema *Schema, su SimpleURL) (*URL, error) { url := &URL{} @@ -90,7 +95,11 @@ func NewURL(schema *Schema, su SimpleURL) (*URL, error) { return url, nil } -// BelongsToFilter ... +// A BelongsToFilter represents a parent resource, used to filter out +// resources that are not children of the parent. +// +// For example, in /articles/abc123/comments, the parent is the article +// with the ID abc123. type BelongsToFilter struct { Type string ID string @@ -98,7 +107,9 @@ type BelongsToFilter struct { InverseName string } -// NormalizePath ... +// NormalizePath builds and returns the URL as a string. +// +// It returns exactly the same string given the same URL and schema. func (u *URL) NormalizePath() string { // Path path := "/" @@ -168,14 +179,15 @@ func (u *URL) NormalizePath() string { return path + params } -// FullURL ... +// FullURL returns the full URL as a string. func (u *URL) FullURL() string { url := u.NormalizePath() return url } -// ParseRawURL ... +// ParseRawURL parses rawurl to make a *url.URL before making and returning +// a *URL. func ParseRawURL(schema *Schema, rawurl string) (*URL, error) { url, err := url.Parse(rawurl) if err != nil { diff --git a/util.go b/util.go index 423221d..a52dd75 100644 --- a/util.go +++ b/util.go @@ -135,8 +135,8 @@ func marshalCollection(c Collection, prepath string, fields []string, relData ma return json.Marshal(raws) } -// ReflectType takes a struct or a pointer to a struct to analyse and builds a -// Type object that is returned. +// ReflectType takes a struct or a pointer to a struct to analyse and +// builds a Type object that is returned. // // If an error is returned, the Type object will be empty. func ReflectType(v interface{}) (Type, error) { diff --git a/wrapper.go b/wrapper.go index ab3d884..9b9fd75 100644 --- a/wrapper.go +++ b/wrapper.go @@ -11,7 +11,12 @@ import ( "time" ) -// Wrapper ... +// Wrapper wraps a reflect.Value that represents a struct. +// +// The Wrap function can be used to wrap a struct and make a Wrapper object. +// +// It implements the Resource interface, so the value can be handled as if it +// were a Resource. type Wrapper struct { val reflect.Value // Actual value (with content) @@ -21,7 +26,8 @@ type Wrapper struct { rels map[string]Rel } -// Wrap ... +// Wrap wraps v (a struct or a pointer to a struct) and returns a Wrapper that +// can be used as a Resource to handle the given value. func Wrap(v interface{}) *Wrapper { val := reflect.ValueOf(v) @@ -94,22 +100,22 @@ func Wrap(v interface{}) *Wrapper { return w } -// IDAndType ... +// IDAndType returns the ID and the type of the Wrapper. func (w *Wrapper) IDAndType() (string, string) { return IDAndType(w.val.Interface()) } -// Attrs ... +// Attrs returns the attributes of the Wrapper. func (w *Wrapper) Attrs() map[string]Attr { return w.attrs } -// Rels ... +// Rels returns the relationships of the Wrapper. func (w *Wrapper) Rels() map[string]Rel { return w.rels } -// Attr ... +// Attr returns the attribute that corresponds to the given key. func (w *Wrapper) Attr(key string) Attr { for _, attr := range w.attrs { if attr.Name == key { @@ -120,7 +126,7 @@ func (w *Wrapper) Attr(key string) Attr { panic(fmt.Sprintf("jsonapi: attribute %s does not exist", key)) } -// Rel ... +// Rel returns the relationship that corresponds to the given key. func (w *Wrapper) Rel(key string) Rel { for _, rel := range w.rels { if rel.Name == key { @@ -131,41 +137,42 @@ func (w *Wrapper) Rel(key string) Rel { panic(fmt.Sprintf("jsonapi: relationship %s does not exist", key)) } -// New ... +// New returns a copy of the resource under the wrapper. func (w *Wrapper) New() Resource { newVal := reflect.New(w.val.Type()) return Wrap(newVal.Interface()) } -// GetID ... +// GetID returns the wrapped resource's ID. func (w *Wrapper) GetID() string { id, _ := IDAndType(w.val.Interface()) return id } -// GetType ... +// GetType returns the wrapped resource's type. func (w *Wrapper) GetType() string { _, typ := IDAndType(w.val.Interface()) return typ } -// Get ... +// Get returns the value associated to the attribute named after key. func (w *Wrapper) Get(key string) interface{} { return w.getAttr(key, "") } -// SetID ... +// SetID sets the ID of the wrapped resource. func (w *Wrapper) SetID(id string) { w.val.FieldByName("ID").SetString(id) } -// Set ... +// Set sets the value associated to the attribute named after key. func (w *Wrapper) Set(key string, val interface{}) { w.setAttr(key, val) } -// GetToOne ... +// GetToOne returns the value associated with the relationship named +// after key. func (w *Wrapper) GetToOne(key string) string { for i := 0; i < w.val.NumField(); i++ { field := w.val.Field(i) @@ -191,7 +198,8 @@ func (w *Wrapper) GetToOne(key string) string { panic(fmt.Sprintf("jsonapi: relationship %s does not exist", key)) } -// GetToMany ... +// GetToMany returns the value associated with the relationship named +// after key. func (w *Wrapper) GetToMany(key string) []string { for i := 0; i < w.val.NumField(); i++ { field := w.val.Field(i) @@ -217,7 +225,7 @@ func (w *Wrapper) GetToMany(key string) []string { panic(fmt.Sprintf("jsonapi: relationship %s does not exist", key)) } -// SetToOne ... +// SetToOne sets the value associated to the relationship named after key. func (w *Wrapper) SetToOne(key string, rel string) { for i := 0; i < w.val.NumField(); i++ { field := w.val.Field(i) @@ -244,7 +252,7 @@ func (w *Wrapper) SetToOne(key string, rel string) { panic(fmt.Sprintf("jsonapi: relationship %s does not exist", key)) } -// SetToMany ... +// SetToMany sets the value associated to the relationship named after key. func (w *Wrapper) SetToMany(key string, rels []string) { for i := 0; i < w.val.NumField(); i++ { field := w.val.Field(i) @@ -271,12 +279,14 @@ func (w *Wrapper) SetToMany(key string, rels []string) { panic(fmt.Sprintf("jsonapi: relationship %s does not exist", key)) } -// Validate ... +// Validate returns any errors found in the wrapped resource. func (w *Wrapper) Validate() []error { return nil } -// Copy ... +// Copy makes a copy of the wrapped resource and returns it. +// +// The returned value's concrete type is also a Wrapper. func (w *Wrapper) Copy() Resource { nw := Wrap(reflect.New(w.val.Type()).Interface()) @@ -297,7 +307,7 @@ func (w *Wrapper) Copy() Resource { return nw } -// UnmarshalJSON ... +// UnmarshalJSON parses the payload and populates the wrapped resource. func (w *Wrapper) UnmarshalJSON(payload []byte) error { var err error From 1e4a0aa675644509ddd88919b57d05115b185775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 11 Jun 2019 22:02:55 -0400 Subject: [PATCH 054/406] Remove commented code --- soft_collection.go | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/soft_collection.go b/soft_collection.go index 069ee3f..ebc5076 100644 --- a/soft_collection.go +++ b/soft_collection.go @@ -141,25 +141,6 @@ func (s *SoftCollection) Remove(id string) { } } -// // SetField ... -// func (s *SoftCollection) SetField(id, field string, v interface{}) { -// for i := range s.col { -// if s.col[i].GetID() == id { -// s.col[i].Set(field, v) -// } -// } -// } - -// // GetValue ... -// func (s *SoftCollection) GetValue(id, field string) interface{} { -// for i := range s.col { -// if s.col[i].GetID() == id { -// return s.col[i].Get(field) -// } -// } -// return nil -// } - // UnmarshalJSON populates a SoftCollection from the given payload. // // Only the attributes and relationships defined in the SoftCollection's From 40de34ba685051dbed70ffb178ce8fb7e72205c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 16 Jun 2019 11:03:46 -0400 Subject: [PATCH 055/406] Make most of the tests blackbox At the same time, make mock types unexported instead of importing them from the blacbox. There is no point in having those in the public API. Some tests still have to be whitebox, at least for now. --- build_links_test.go | 17 ++- document_test.go | 3 +- error_test.go | 3 +- filter_query_test.go | 3 +- jsonapi_test.go | 26 +++-- marshaling_test.go | 9 +- mock_schema.go => mock_schema_test.go | 26 +++-- request_test.go | 6 +- resource_test.go | 11 +- simple_url_test.go | 157 +------------------------ simple_url_util_test.go | 161 ++++++++++++++++++++++++++ soft_collection_test.go | 14 ++- soft_resource_test.go | 6 +- unmarshaling_test.go | 11 +- url_test.go | 7 +- wrapper_test.go | 7 +- 16 files changed, 251 insertions(+), 216 deletions(-) rename mock_schema.go => mock_schema_test.go (89%) create mode 100644 simple_url_util_test.go diff --git a/build_links_test.go b/build_links_test.go index 2da858e..b23883c 100644 --- a/build_links_test.go +++ b/build_links_test.go @@ -10,25 +10,30 @@ func TestBuildSelfLink(t *testing.T) { tests := []struct { name string res Resource + id string expectedString string }{ { name: "simple resource url", - res: Wrap(&MockType1{ID: "1"}), - expectedString: "http://example.com/mocktypes1/1", + id: "1", + expectedString: "http://example.com/type/1", }, { name: "simple resource url with hyphen in id", - res: Wrap(&MockType1{ID: "abc-123"}), - expectedString: "http://example.com/mocktypes1/abc-123", + id: "abc-123", + expectedString: "http://example.com/type/abc-123", }, { name: "empty id", - res: Wrap(&MockType1{ID: ""}), + id: "", expectedString: "", }, } for _, test := range tests { - link := buildSelfLink(test.res, "http://example.com/") + res := &SoftResource{} + res.SetType(&Type{Name: "type"}) + res.SetID(test.id) + + link := buildSelfLink(res, "http://example.com/") tchek.AreEqual(t, test.name, test.expectedString, link) } } diff --git a/document_test.go b/document_test.go index d04eee4..a7f8432 100644 --- a/document_test.go +++ b/document_test.go @@ -1,8 +1,9 @@ -package jsonapi +package jsonapi_test import ( "testing" + . "github.com/mfcochauxlaberge/jsonapi" "github.com/mfcochauxlaberge/tchek" ) diff --git a/error_test.go b/error_test.go index 12cb753..83fa493 100644 --- a/error_test.go +++ b/error_test.go @@ -1,9 +1,10 @@ -package jsonapi +package jsonapi_test import ( "net/http" "testing" + . "github.com/mfcochauxlaberge/jsonapi" "github.com/mfcochauxlaberge/tchek" ) diff --git a/filter_query_test.go b/filter_query_test.go index a0e1414..989abb4 100644 --- a/filter_query_test.go +++ b/filter_query_test.go @@ -1,4 +1,4 @@ -package jsonapi +package jsonapi_test import ( "encoding/json" @@ -6,6 +6,7 @@ import ( "io/ioutil" "testing" + . "github.com/mfcochauxlaberge/jsonapi" "github.com/mfcochauxlaberge/tchek" ) diff --git a/jsonapi_test.go b/jsonapi_test.go index 2ad761e..df927ef 100644 --- a/jsonapi_test.go +++ b/jsonapi_test.go @@ -1,6 +1,10 @@ -package jsonapi +package jsonapi_test -import "time" +import ( + "time" + + . "github.com/mfcochauxlaberge/jsonapi" +) var ( mocktypes1 Collection @@ -13,15 +17,15 @@ func init() { loc, _ := time.LoadLocation("") // Resources - mocktypes1 = WrapCollection(Wrap(&MockType1{})) + mocktypes1 = WrapCollection(Wrap(&mockType1{})) mocktypes1.Add( - Wrap(&MockType1{ + Wrap(&mockType1{ ID: "mt1-1", // Use default (zero) value for each attribute }), ) mocktypes1.Add( - Wrap(&MockType1{ + Wrap(&mockType1{ ID: "mt1-2", Str: "", Int: -42, @@ -38,9 +42,9 @@ func init() { }), ) - mocktypes2 = WrapCollection(Wrap(&MockType2{})) + mocktypes2 = WrapCollection(Wrap(&mockType2{})) mocktypes2.Add( - Wrap(&MockType2{ + Wrap(&mockType2{ ID: "mt2-1", // Use nil values }), @@ -58,7 +62,7 @@ func init() { boolPtr := false timePtr := time.Date(2017, 1, 2, 3, 4, 5, 6, loc) mocktypes2.Add( - Wrap(&MockType2{ + Wrap(&mockType2{ ID: "mt1-2", StrPtr: &strPtr, IntPtr: &intPtr, @@ -75,14 +79,14 @@ func init() { }), ) - mocktypes3 = WrapCollection(Wrap(&MockType3{})) + mocktypes3 = WrapCollection(Wrap(&mockType3{})) mocktypes3.Add( - Wrap(&MockType3{ + Wrap(&mockType3{ ID: "mt3-1", }), ) mocktypes3.Add( - Wrap(&MockType3{ + Wrap(&mockType3{ ID: "mt3-1", Attr1: "str", Attr2: 32, diff --git a/marshaling_test.go b/marshaling_test.go index 985ea79..67e1212 100644 --- a/marshaling_test.go +++ b/marshaling_test.go @@ -1,4 +1,4 @@ -package jsonapi +package jsonapi_test import ( "bytes" @@ -10,12 +10,13 @@ import ( "testing" "time" + . "github.com/mfcochauxlaberge/jsonapi" "github.com/mfcochauxlaberge/tchek" ) func TestMarshalResource(t *testing.T) { loc, _ := time.LoadLocation("") - schema := NewMockSchema() + schema := newMockSchema() tests := []struct { name string @@ -94,7 +95,7 @@ func TestMarshalResource(t *testing.T) { func TestMarshalCollection(t *testing.T) { loc, _ := time.LoadLocation("") - schema := NewMockSchema() + schema := newMockSchema() tests := []struct { name string @@ -126,7 +127,7 @@ func TestMarshalCollection(t *testing.T) { payloadFile: "collection-2", }, { name: "collection with prepath", - data: WrapCollection(Wrap(&MockType1{})), + data: WrapCollection(Wrap(&mockType1{})), prepath: "https://example.org/", errorExpected: false, payloadFile: "collection-3", diff --git a/mock_schema.go b/mock_schema_test.go similarity index 89% rename from mock_schema.go rename to mock_schema_test.go index 3795284..5cb869c 100644 --- a/mock_schema.go +++ b/mock_schema_test.go @@ -1,18 +1,20 @@ -package jsonapi +package jsonapi_test import ( "time" + + . "github.com/mfcochauxlaberge/jsonapi" ) -// NewMockSchema ... -func NewMockSchema() *Schema { +// newMockSchema ... +func newMockSchema() *Schema { schema := &Schema{} - typ, _ := ReflectType(MockType1{}) + typ, _ := ReflectType(mockType1{}) schema.AddType(typ) - typ, _ = ReflectType(MockType2{}) + typ, _ = ReflectType(mockType2{}) schema.AddType(typ) - typ, _ = ReflectType(MockType3{}) + typ, _ = ReflectType(mockType3{}) schema.AddType(typ) for t, typ := range schema.Types { @@ -32,8 +34,8 @@ func NewMockSchema() *Schema { return schema } -// MockType1 ... -type MockType1 struct { +// mockType1 ... +type mockType1 struct { ID string `json:"id" api:"mocktypes1"` // Attributes @@ -59,8 +61,8 @@ type MockType1 struct { ToManyFromMany []string `json:"to-many-from-many" api:"rel,mocktypes2,to-many-from-many"` } -// MockType2 ... -type MockType2 struct { +// mockType2 ... +type mockType2 struct { ID string `json:"id" api:"mocktypes2"` // Attributes @@ -84,8 +86,8 @@ type MockType2 struct { ToManyFromMany []string `json:"to-many-from-many" api:"rel,mocktypes1,to-many-from-many"` } -// MockType3 ... -type MockType3 struct { +// mockType3 ... +type mockType3 struct { ID string `json:"id" api:"mocktypes3"` // Attributes diff --git a/request_test.go b/request_test.go index 2c82a0f..9e3b361 100644 --- a/request_test.go +++ b/request_test.go @@ -1,16 +1,18 @@ -package jsonapi +package jsonapi_test import ( "bytes" "net/http/httptest" "testing" + . "github.com/mfcochauxlaberge/jsonapi" + "github.com/stretchr/testify/assert" ) func TestNewRequest(t *testing.T) { // Schema - schema := NewMockSchema() + schema := newMockSchema() tests := []struct { name string diff --git a/resource_test.go b/resource_test.go index a443949..b0ceda3 100644 --- a/resource_test.go +++ b/resource_test.go @@ -1,16 +1,17 @@ -package jsonapi +package jsonapi_test import ( "testing" "time" + . "github.com/mfcochauxlaberge/jsonapi" "github.com/mfcochauxlaberge/tchek" ) func TestEqual(t *testing.T) { now := time.Now() - mt11 := Wrap(&MockType1{ + mt11 := Wrap(&mockType1{ ID: "mt1", Str: "str", Int: 1, @@ -32,7 +33,7 @@ func TestEqual(t *testing.T) { ToManyFromMany: []string{"a", "b", "c"}, }) - mt12 := Wrap(&MockType1{ + mt12 := Wrap(&mockType1{ ID: "mt2", Str: "str", Int: 1, @@ -54,7 +55,7 @@ func TestEqual(t *testing.T) { ToManyFromMany: []string{"a", "b", "c"}, }) - mt13 := Wrap(&MockType1{ + mt13 := Wrap(&mockType1{ ID: "mt3", Str: "str", Int: 11, @@ -76,7 +77,7 @@ func TestEqual(t *testing.T) { ToManyFromMany: []string{"d", "e", "f"}, }) - mt21 := Wrap(&MockType2{ + mt21 := Wrap(&mockType2{ ID: "mt1", StrPtr: func() *string { v := string(1); return &v }(), IntPtr: func() *int { v := int(1); return &v }(), diff --git a/simple_url_test.go b/simple_url_test.go index 0968248..e4ce83d 100644 --- a/simple_url_test.go +++ b/simple_url_test.go @@ -1,9 +1,10 @@ -package jsonapi +package jsonapi_test import ( "net/url" "testing" + . "github.com/mfcochauxlaberge/jsonapi" "github.com/mfcochauxlaberge/tchek" ) @@ -236,157 +237,3 @@ func TestSimpleURL(t *testing.T) { tchek.AreEqual(t, test.name, test.expectedError, err) } } - -func TestParseCommaList(t *testing.T) { - tests := []struct { - name string - source string - expectedValue []string - }{ - { - name: "empty", - source: ``, - expectedValue: []string{}, - }, { - name: "comma only", - source: `,`, - expectedValue: []string{}, - }, { - name: "two commas only", - source: `,,`, - expectedValue: []string{}, - }, { - name: "single item", - source: `a`, - expectedValue: []string{"a"}, - }, { - name: "start with comma", - source: `,a`, - expectedValue: []string{"a"}, - }, { - name: "start with two commas", - source: `,,a`, - expectedValue: []string{"a"}, - }, { - name: "start with comma and two items", - source: `,a,b`, - expectedValue: []string{"a", "b"}, - }, { - name: "two items", - source: `a,b`, - expectedValue: []string{"a", "b"}, - }, { - name: "two commas in middle", - source: `a,,b`, - expectedValue: []string{"a", "b"}, - }, - { - name: "end with two commas", - source: `a,b,c,,`, - expectedValue: []string{"a", "b", "c"}, - }, - } - - for _, test := range tests { - value := parseCommaList(test.source) - tchek.AreEqual(t, test.name, test.expectedValue, value) - } -} - -func TestParseFragments(t *testing.T) { - tests := []struct { - name string - source string - expectedValue []string - }{ - { - name: "empty", - source: ``, - expectedValue: []string{}, - }, { - name: "slash only", - source: `/`, - expectedValue: []string{}, - }, { - name: "double slash", - source: `//`, - expectedValue: []string{}, - }, { - name: "single item", - source: `a`, - expectedValue: []string{"a"}, - }, { - name: "start with slash", - source: `/a`, - expectedValue: []string{"a"}, - }, { - name: "start with two slashes", - source: `//a`, - expectedValue: []string{"a"}, - }, { - name: "standard path", - source: `/a/b`, - expectedValue: []string{"a", "b"}, - }, { - name: "two commas in middle", - source: `/a//b`, - expectedValue: []string{"a", "b"}, - }, - } - - for _, test := range tests { - value := parseFragments(test.source) - tchek.AreEqual(t, test.name, test.expectedValue, value) - } -} - -func TestDeduceRoute(t *testing.T) { - tests := []struct { - name string - source []string - expectedValue string - }{ - { - name: "empty", - source: []string{}, - expectedValue: "", - }, { - name: "collection", - source: []string{"a"}, - expectedValue: "/a", - }, { - name: "resource", - source: []string{"a", "b"}, - expectedValue: "/a/:id", - }, { - name: "related relationship", - source: []string{"a", "b", "c"}, - expectedValue: "/a/:id/c", - }, { - name: "self relationship", - source: []string{"a", "b", "relationships", "d"}, - expectedValue: "/a/:id/relationships/d", - }, { - name: "collection meta", - source: []string{"a", "meta"}, - expectedValue: "/a/meta", - }, { - name: "resource meta", - source: []string{"a", "b", "meta"}, - expectedValue: "/a/:id/meta", - }, { - name: "related relationships meta", - source: []string{"a", "b", "relationships", "meta"}, - expectedValue: "/a/:id/relationships/meta", - }, { - name: "self relationships meta", - source: []string{"a", "b", "relationships", "d", "meta"}, - expectedValue: "/a/:id/relationships/d/meta", - }, - } - - for _, test := range tests { - value := deduceRoute(test.source) - tchek.AreEqual(t, test.name, test.expectedValue, value) - } -} diff --git a/simple_url_util_test.go b/simple_url_util_test.go new file mode 100644 index 0000000..51b8d36 --- /dev/null +++ b/simple_url_util_test.go @@ -0,0 +1,161 @@ +package jsonapi + +import ( + "testing" + + "github.com/mfcochauxlaberge/tchek" +) + +func TestParseCommaList(t *testing.T) { + tests := []struct { + name string + source string + expectedValue []string + }{ + { + name: "empty", + source: ``, + expectedValue: []string{}, + }, { + name: "comma only", + source: `,`, + expectedValue: []string{}, + }, { + name: "two commas only", + source: `,,`, + expectedValue: []string{}, + }, { + name: "single item", + source: `a`, + expectedValue: []string{"a"}, + }, { + name: "start with comma", + source: `,a`, + expectedValue: []string{"a"}, + }, { + name: "start with two commas", + source: `,,a`, + expectedValue: []string{"a"}, + }, { + name: "start with comma and two items", + source: `,a,b`, + expectedValue: []string{"a", "b"}, + }, { + name: "two items", + source: `a,b`, + expectedValue: []string{"a", "b"}, + }, { + name: "two commas in middle", + source: `a,,b`, + expectedValue: []string{"a", "b"}, + }, + { + name: "end with two commas", + source: `a,b,c,,`, + expectedValue: []string{"a", "b", "c"}, + }, + } + + for _, test := range tests { + value := parseCommaList(test.source) + tchek.AreEqual(t, test.name, test.expectedValue, value) + } +} + +func TestParseFragments(t *testing.T) { + tests := []struct { + name string + source string + expectedValue []string + }{ + { + name: "empty", + source: ``, + expectedValue: []string{}, + }, { + name: "slash only", + source: `/`, + expectedValue: []string{}, + }, { + name: "double slash", + source: `//`, + expectedValue: []string{}, + }, { + name: "single item", + source: `a`, + expectedValue: []string{"a"}, + }, { + name: "start with slash", + source: `/a`, + expectedValue: []string{"a"}, + }, { + name: "start with two slashes", + source: `//a`, + expectedValue: []string{"a"}, + }, { + name: "standard path", + source: `/a/b`, + expectedValue: []string{"a", "b"}, + }, { + name: "two commas in middle", + source: `/a//b`, + expectedValue: []string{"a", "b"}, + }, + } + + for _, test := range tests { + value := parseFragments(test.source) + tchek.AreEqual(t, test.name, test.expectedValue, value) + } +} + +func TestDeduceRoute(t *testing.T) { + tests := []struct { + name string + source []string + expectedValue string + }{ + { + name: "empty", + source: []string{}, + expectedValue: "", + }, { + name: "collection", + source: []string{"a"}, + expectedValue: "/a", + }, { + name: "resource", + source: []string{"a", "b"}, + expectedValue: "/a/:id", + }, { + name: "related relationship", + source: []string{"a", "b", "c"}, + expectedValue: "/a/:id/c", + }, { + name: "self relationship", + source: []string{"a", "b", "relationships", "d"}, + expectedValue: "/a/:id/relationships/d", + }, { + name: "collection meta", + source: []string{"a", "meta"}, + expectedValue: "/a/meta", + }, { + name: "resource meta", + source: []string{"a", "b", "meta"}, + expectedValue: "/a/:id/meta", + }, { + name: "related relationships meta", + source: []string{"a", "b", "relationships", "meta"}, + expectedValue: "/a/:id/relationships/meta", + }, { + name: "self relationships meta", + source: []string{"a", "b", "relationships", "d", "meta"}, + expectedValue: "/a/:id/relationships/d/meta", + }, + } + + for _, test := range tests { + value := deduceRoute(test.source) + tchek.AreEqual(t, test.name, test.expectedValue, value) + } +} diff --git a/soft_collection_test.go b/soft_collection_test.go index bc653f2..2380557 100644 --- a/soft_collection_test.go +++ b/soft_collection_test.go @@ -1,9 +1,11 @@ -package jsonapi +package jsonapi_test import ( "testing" "time" + . "github.com/mfcochauxlaberge/jsonapi" + "github.com/mitchellh/copystructure" "github.com/stretchr/testify/assert" ) @@ -96,8 +98,12 @@ func TestSoftCollection(t *testing.T) { assert.Equal(t, sc.Type, &typ) // Add more elements to the SoftCollection. - sc.Add(&SoftResource{id: "res1"}) - sc.Add(&SoftResource{id: "res2"}) + sr = &SoftResource{} + sr.SetID("res1") + sc.Add(sr) + sr = &SoftResource{} + sr.SetID("res2") + sc.Add(sr) assert.Equal(t, 3, sc.Len()) @@ -264,8 +270,6 @@ func TestSoftCollectionSort(t *testing.T) { rules := []string{"-attr3", "-attr4", "attr1", "-attr2", "id"} sc.Sort(rules) - assert.Equal(t, rules, sc.sort) - // Make an ordered list of IDs. ids := []string{} for i := 0; i < sc.Len(); i++ { diff --git a/soft_resource_test.go b/soft_resource_test.go index b768d86..e996937 100644 --- a/soft_resource_test.go +++ b/soft_resource_test.go @@ -1,8 +1,10 @@ -package jsonapi +package jsonapi_test import ( "testing" + . "github.com/mfcochauxlaberge/jsonapi" + "github.com/stretchr/testify/assert" ) @@ -28,7 +30,7 @@ func TestSoftResource(t *testing.T) { InverseToOne: true, }) sr = NewSoftResource(typ, nil) - assert.Equal(t, &typ, sr.typ) + // TODO assert.Equal(t, &typ, sr.typ) // ID and type sr.SetID("id") diff --git a/unmarshaling_test.go b/unmarshaling_test.go index 755decc..a187c2a 100644 --- a/unmarshaling_test.go +++ b/unmarshaling_test.go @@ -1,15 +1,16 @@ -package jsonapi +package jsonapi_test import ( "testing" + . "github.com/mfcochauxlaberge/jsonapi" "github.com/mfcochauxlaberge/tchek" ) func TestUnmarshalResource(t *testing.T) { - schema := NewMockSchema() + schema := newMockSchema() - res1 := Wrap(&MockType3{ + res1 := Wrap(&mockType3{ ID: "mt1", Attr1: "a string", Attr2: 1, @@ -43,7 +44,7 @@ func TestUnmarshalResource(t *testing.T) { } func TestUnmarshalIdentifier(t *testing.T) { - schema := NewMockSchema() + schema := newMockSchema() id1 := Identifier{ID: "abc123", Type: "mocktypes1"} @@ -73,7 +74,7 @@ func TestUnmarshalIdentifier(t *testing.T) { } func TestUnmarshalIdentifiers(t *testing.T) { - schema := NewMockSchema() + schema := newMockSchema() ids1 := Identifiers{ Identifier{ID: "abc123", Type: "mocktypes1"}, diff --git a/url_test.go b/url_test.go index c33dc12..908e40c 100644 --- a/url_test.go +++ b/url_test.go @@ -1,15 +1,16 @@ -package jsonapi +package jsonapi_test import ( "net/url" "testing" + . "github.com/mfcochauxlaberge/jsonapi" "github.com/mfcochauxlaberge/tchek" ) func TestParseURL(t *testing.T) { // Schema - schema := NewMockSchema() + schema := newMockSchema() tests := []struct { name string @@ -189,7 +190,7 @@ func TestParseURL(t *testing.T) { func TestParseParams(t *testing.T) { // Schema - schema := NewMockSchema() + schema := newMockSchema() mockTypes1, _ := schema.GetType("mocktypes1") mockTypes2, _ := schema.GetType("mocktypes2") diff --git a/wrapper_test.go b/wrapper_test.go index ef346db..a2a8084 100644 --- a/wrapper_test.go +++ b/wrapper_test.go @@ -1,4 +1,4 @@ -package jsonapi +package jsonapi_test import ( "fmt" @@ -6,13 +6,14 @@ import ( "testing" "time" + . "github.com/mfcochauxlaberge/jsonapi" "github.com/mfcochauxlaberge/tchek" ) func TestWrapper(t *testing.T) { loc, _ := time.LoadLocation("") - res1 := &MockType1{ + res1 := &mockType1{ ID: "res123", Str: "a_string", Int: 2, @@ -67,7 +68,7 @@ func TestWrapper(t *testing.T) { aTime := time.Date(2018, 2, 3, 4, 5, 6, 7, loc) // Set the attributes after the wrapping - res2 := &MockType2{ + res2 := &mockType2{ ID: "res123", StrPtr: &aStr, IntPtr: &aInt, From 863ea278ac76a4c34be8de52963a675a15c56d8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 16 Jun 2019 15:14:16 -0400 Subject: [PATCH 056/406] Get rid of tchek --- build_links_test.go | 6 ++++-- document_test.go | 7 ++++--- error_test.go | 7 +++++-- filter_query_test.go | 16 ++++++++------- go.mod | 1 - go.sum | 2 -- marshaling_test.go | 31 +++++++++++++++++----------- request_test.go | 7 ++++--- resource_test.go | 15 ++++++++------ simple_url_test.go | 13 +++++++----- simple_url_util_test.go | 14 +++++++++---- unmarshaling_test.go | 45 +++++++++++++++++++++-------------------- url_test.go | 25 ++++++++++++++--------- util_test.go | 23 +++++++++++++++++++++ wrapper_test.go | 33 ++++++++++++++++-------------- 15 files changed, 151 insertions(+), 94 deletions(-) create mode 100644 util_test.go diff --git a/build_links_test.go b/build_links_test.go index b23883c..4c8d2c1 100644 --- a/build_links_test.go +++ b/build_links_test.go @@ -3,10 +3,12 @@ package jsonapi import ( "testing" - "github.com/mfcochauxlaberge/tchek" + "github.com/stretchr/testify/assert" ) func TestBuildSelfLink(t *testing.T) { + assert := assert.New(t) + tests := []struct { name string res Resource @@ -34,6 +36,6 @@ func TestBuildSelfLink(t *testing.T) { res.SetID(test.id) link := buildSelfLink(res, "http://example.com/") - tchek.AreEqual(t, test.name, test.expectedString, link) + assert.Equal(test.expectedString, link, test.name) } } diff --git a/document_test.go b/document_test.go index a7f8432..a8ea8e9 100644 --- a/document_test.go +++ b/document_test.go @@ -4,12 +4,13 @@ import ( "testing" . "github.com/mfcochauxlaberge/jsonapi" - "github.com/mfcochauxlaberge/tchek" + "github.com/stretchr/testify/assert" ) // TestDocument ... func TestDocument(t *testing.T) { - pl1 := Document{} + assert := assert.New(t) - tchek.AreEqual(t, "empty", nil, pl1.Data) + pl1 := Document{} + assert.Equal(nil, pl1.Data, "empty") } diff --git a/error_test.go b/error_test.go index 83fa493..592df02 100644 --- a/error_test.go +++ b/error_test.go @@ -5,10 +5,13 @@ import ( "testing" . "github.com/mfcochauxlaberge/jsonapi" - "github.com/mfcochauxlaberge/tchek" + + "github.com/stretchr/testify/assert" ) func TestError(t *testing.T) { + assert := assert.New(t) + tests := []struct { name string err Error @@ -67,6 +70,6 @@ func TestError(t *testing.T) { } for _, test := range tests { - tchek.AreEqual(t, test.name, test.err.Error(), test.expectedString) + assert.Equal(test.err.Error(), test.expectedString, test.name) } } diff --git a/filter_query_test.go b/filter_query_test.go index 989abb4..1510617 100644 --- a/filter_query_test.go +++ b/filter_query_test.go @@ -7,10 +7,12 @@ import ( "testing" . "github.com/mfcochauxlaberge/jsonapi" - "github.com/mfcochauxlaberge/tchek" + "github.com/stretchr/testify/assert" ) func TestFilterQuery(t *testing.T) { + assert := assert.New(t) + // time1, _ := time.Parse(time.RFC3339Nano, "2012-05-16T17:45:28.2539Z") // time2, _ := time.Parse(time.RFC3339Nano, "2013-06-24T22:03:34.8276Z") @@ -52,15 +54,15 @@ func TestFilterQuery(t *testing.T) { cdt := Condition{} err := json.Unmarshal([]byte(test.query), &cdt) - tchek.ErrorExpected(t, test.name, test.expectedError, err) + assert.Equal(test.expectedError, err != nil, test.name) if !test.expectedError { - tchek.AreEqual(t, test.name, test.expectedCondition, cdt) + assert.Equal(test.expectedCondition, cdt, test.name) data, err := json.Marshal(&cdt) - tchek.UnintendedError(err) + assert.NoError(err, test.name) - tchek.AreEqual(t, test.name, tchek.MakeOneLineNoSpaces(test.query), tchek.MakeOneLineNoSpaces(string(data))) + assert.Equal(makeOneLineNoSpaces(test.query), makeOneLineNoSpaces(string(data)), test.name) } } @@ -69,13 +71,13 @@ func TestFilterQuery(t *testing.T) { Op: "=", Val: func() {}, }) - tchek.ErrorExpected(t, "function as value", true, err) + assert.Equal(true, err != nil, "function as value") _, err = json.Marshal(&Condition{ Op: "", Val: "", }) - tchek.ErrorExpected(t, "empty operation and value", false, err) // TODO + assert.Equal(false, err != nil, "empty operation and value") // TODO } func BenchmarkMarshalFilterQuery(b *testing.B) { diff --git a/go.mod b/go.mod index 247931b..7d1d87c 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.11 require ( github.com/google/uuid v1.1.1 - github.com/mfcochauxlaberge/tchek v0.3.0 github.com/mitchellh/copystructure v1.0.0 github.com/stretchr/testify v1.3.0 ) diff --git a/go.sum b/go.sum index d4c8afc..d8cab3d 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,6 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/mfcochauxlaberge/tchek v0.3.0 h1:SFmqbnfjxMbP7yV/FuHioIwYI9tmDtmO9Jd5smGu0KQ= -github.com/mfcochauxlaberge/tchek v0.3.0/go.mod h1:e8jX6VID1Ku1XAZq8lkxRuGfSKIFL9sL7w4E3WDkx7o= github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY= diff --git a/marshaling_test.go b/marshaling_test.go index 67e1212..857b1e8 100644 --- a/marshaling_test.go +++ b/marshaling_test.go @@ -11,10 +11,13 @@ import ( "time" . "github.com/mfcochauxlaberge/jsonapi" - "github.com/mfcochauxlaberge/tchek" + + "github.com/stretchr/testify/assert" ) func TestMarshalResource(t *testing.T) { + assert := assert.New(t) + loc, _ := time.LoadLocation("") schema := newMockSchema() @@ -65,13 +68,13 @@ func TestMarshalResource(t *testing.T) { rawurl := fmt.Sprintf("%s/%s/%s%s", test.prepath, resType, id, test.params) url, err := ParseRawURL(schema, rawurl) - tchek.UnintendedError(err) + assert.NoError(err, test.name) doc.Meta = test.meta // Marshal payload, err := Marshal(doc, url) - tchek.ErrorExpected(t, test.name, test.errorExpected, err) + assert.Equal(test.errorExpected, err != nil, test.name) if !test.errorExpected { var out bytes.Buffer @@ -82,18 +85,20 @@ func TestMarshalResource(t *testing.T) { // Retrieve the expected result from file content, err := ioutil.ReadFile("testdata/" + test.payloadFile + ".json") - tchek.UnintendedError(err) + assert.NoError(err, test.name) out.Reset() json.Indent(&out, content, "", "\t") // Trim because otherwise there is an extra line at the end expectedOutput := strings.TrimSpace(out.String()) - tchek.AreEqual(t, test.name, expectedOutput, output) + assert.Equal(expectedOutput, output, test.name) } } } func TestMarshalCollection(t *testing.T) { + assert := assert.New(t) + loc, _ := time.LoadLocation("") schema := newMockSchema() @@ -144,13 +149,13 @@ func TestMarshalCollection(t *testing.T) { rawurl := fmt.Sprintf("%s/%s%s", test.prepath, resType, test.params) url, err := ParseRawURL(schema, rawurl) - tchek.UnintendedError(err) + assert.NoError(err, test.name) doc.Meta = test.meta // Marshal payload, err := Marshal(doc, url) - tchek.ErrorExpected(t, test.name, test.errorExpected, err) + assert.Equal(test.errorExpected, err != nil, test.name) if !test.errorExpected { var out bytes.Buffer @@ -161,18 +166,20 @@ func TestMarshalCollection(t *testing.T) { // Retrieve the expected result from file content, err := ioutil.ReadFile("testdata/" + test.payloadFile + ".json") - tchek.UnintendedError(err) + assert.NoError(err, test.name) out.Reset() json.Indent(&out, content, "", "\t") // Trim because otherwise there is an extra line at the end expectedOutput := strings.TrimSpace(out.String()) - tchek.AreEqual(t, test.name, expectedOutput, output) + assert.Equal(expectedOutput, output, test.name) } } } func TestMarshalErrors(t *testing.T) { + assert := assert.New(t) + // Reset the IDs because the tests can't predict them. resetIDs := func(errors []Error) []Error { for i := range errors { @@ -222,7 +229,7 @@ func TestMarshalErrors(t *testing.T) { doc.Data = test.errors // Marshal payload, err := Marshal(doc, nil) - tchek.ErrorExpected(t, test.name, test.errorExpected, err) + assert.Equal(test.errorExpected, err != nil, test.name) if !test.errorExpected { var out bytes.Buffer @@ -233,13 +240,13 @@ func TestMarshalErrors(t *testing.T) { // Retrieve the expected result from file content, err := ioutil.ReadFile("testdata/" + test.payloadFile + ".json") - tchek.UnintendedError(err) + assert.NoError(err, test.name) out.Reset() json.Indent(&out, content, "", "\t") // Trim because otherwise there is an extra line at the end expectedOutput := strings.TrimSpace(out.String()) - tchek.AreEqual(t, test.name, expectedOutput, output) + assert.Equal(expectedOutput, output, test.name) } } } diff --git a/request_test.go b/request_test.go index 9e3b361..d925cb2 100644 --- a/request_test.go +++ b/request_test.go @@ -11,6 +11,8 @@ import ( ) func TestNewRequest(t *testing.T) { + assert := assert.New(t) + // Schema schema := newMockSchema() @@ -35,8 +37,7 @@ func TestNewRequest(t *testing.T) { req := httptest.NewRequest(test.method, test.url, body) doc, err := NewRequest(req, test.schema) - assert.Equal(t, test.expectedError, err) - - assert.Equal(t, test.method, doc.Method) + assert.Equal(test.expectedError, err, test.name) + assert.Equal(test.method, doc.Method, test.name) } } diff --git a/resource_test.go b/resource_test.go index b0ceda3..c70c592 100644 --- a/resource_test.go +++ b/resource_test.go @@ -5,10 +5,13 @@ import ( "time" . "github.com/mfcochauxlaberge/jsonapi" - "github.com/mfcochauxlaberge/tchek" + + "github.com/stretchr/testify/assert" ) func TestEqual(t *testing.T) { + assert := assert.New(t) + now := time.Now() mt11 := Wrap(&mockType1{ @@ -97,9 +100,9 @@ func TestEqual(t *testing.T) { ToManyFromMany: []string{"a", "b", "c"}, }) - tchek.AreEqual(t, "compare same resource with itself", true, Equal(mt11, mt11)) - tchek.AreEqual(t, "compare two identical resources", true, Equal(mt11, mt12)) - tchek.AreEqual(t, "compare two identical resources (different IDs)", false, EqualStrict(mt11, mt12)) - tchek.AreEqual(t, "compare two different resources", false, Equal(mt11, mt13)) - tchek.AreEqual(t, "compare resources of different types", false, Equal(mt11, mt21)) + assert.Equal(true, Equal(mt11, mt11), "compare same resource with itself") + assert.Equal(true, Equal(mt11, mt12), "compare two identical resources") + assert.Equal(false, EqualStrict(mt11, mt12), "compare two identical resources (different IDs)") + assert.Equal(false, Equal(mt11, mt13), "compare two different resources") + assert.Equal(false, Equal(mt11, mt21), "compare resources of different types") } diff --git a/simple_url_test.go b/simple_url_test.go index e4ce83d..aedabdc 100644 --- a/simple_url_test.go +++ b/simple_url_test.go @@ -5,10 +5,13 @@ import ( "testing" . "github.com/mfcochauxlaberge/jsonapi" - "github.com/mfcochauxlaberge/tchek" + + "github.com/stretchr/testify/assert" ) func TestSimpleURL(t *testing.T) { + assert := assert.New(t) + tests := []struct { name string url string @@ -216,8 +219,8 @@ func TestSimpleURL(t *testing.T) { } for _, test := range tests { - u, err := url.Parse(tchek.MakeOneLineNoSpaces(test.url)) - tchek.UnintendedError(err) + u, err := url.Parse(makeOneLineNoSpaces(test.url)) + assert.NoError(err, test.name) url, err := NewSimpleURL(u) @@ -233,7 +236,7 @@ func TestSimpleURL(t *testing.T) { err = jaErr } - tchek.AreEqual(t, test.name, test.expectedURL, url) - tchek.AreEqual(t, test.name, test.expectedError, err) + assert.Equal(test.expectedURL, url, test.name) + assert.Equal(test.expectedError, err, test.name) } } diff --git a/simple_url_util_test.go b/simple_url_util_test.go index 51b8d36..89b30af 100644 --- a/simple_url_util_test.go +++ b/simple_url_util_test.go @@ -3,10 +3,12 @@ package jsonapi import ( "testing" - "github.com/mfcochauxlaberge/tchek" + "github.com/stretchr/testify/assert" ) func TestParseCommaList(t *testing.T) { + assert := assert.New(t) + tests := []struct { name string source string @@ -58,11 +60,13 @@ func TestParseCommaList(t *testing.T) { for _, test := range tests { value := parseCommaList(test.source) - tchek.AreEqual(t, test.name, test.expectedValue, value) + assert.Equal(test.expectedValue, value, test.name) } } func TestParseFragments(t *testing.T) { + assert := assert.New(t) + tests := []struct { name string source string @@ -105,11 +109,13 @@ func TestParseFragments(t *testing.T) { for _, test := range tests { value := parseFragments(test.source) - tchek.AreEqual(t, test.name, test.expectedValue, value) + assert.Equal(test.expectedValue, value, test.name) } } func TestDeduceRoute(t *testing.T) { + assert := assert.New(t) + tests := []struct { name string source []string @@ -156,6 +162,6 @@ func TestDeduceRoute(t *testing.T) { for _, test := range tests { value := deduceRoute(test.source) - tchek.AreEqual(t, test.name, test.expectedValue, value) + assert.Equal(test.expectedValue, value, test.name) } } diff --git a/unmarshaling_test.go b/unmarshaling_test.go index a187c2a..095ae21 100644 --- a/unmarshaling_test.go +++ b/unmarshaling_test.go @@ -4,10 +4,13 @@ import ( "testing" . "github.com/mfcochauxlaberge/jsonapi" - "github.com/mfcochauxlaberge/tchek" + + "github.com/stretchr/testify/assert" ) func TestUnmarshalResource(t *testing.T) { + assert := assert.New(t) + schema := newMockSchema() res1 := Wrap(&mockType3{ @@ -19,8 +22,7 @@ func TestUnmarshalResource(t *testing.T) { }) url1, err := ParseRawURL(schema, "/mocktypes3/mt1") - tchek.UnintendedError(err) - + assert.NoError(err) meta1 := map[string]interface{}{ "str": "a string\\^ç\"", "num": float64(42), @@ -32,25 +34,24 @@ func TestUnmarshalResource(t *testing.T) { doc1.Meta = meta1 body1, err := Marshal(doc1, url1) - tchek.UnintendedError(err) - + assert.NoError(err) pl1, err := Unmarshal(body1, url1, schema) - tchek.UnintendedError(err) - + assert.NoError(err) // dst1 := pl1.Data.(Resource) - // tchek.HaveEqualAttributes(t, "same attribues", res1, dst1) TODO Fix test - tchek.AreEqual(t, "same meta object", meta1, pl1.Meta) + // assert.HaveEqualAttributes(t, "same attribues", res1, dst1) TODO Fix test + assert.Equal(meta1, pl1.Meta, "same meta object") } func TestUnmarshalIdentifier(t *testing.T) { + assert := assert.New(t) + schema := newMockSchema() id1 := Identifier{ID: "abc123", Type: "mocktypes1"} url1, err := ParseRawURL(schema, "/mocktypes3/mt1/relationships/rel1") - tchek.UnintendedError(err) - + assert.NoError(err) meta1 := map[string]interface{}{ "str": "a string\\^ç\"", "num": float64(42), @@ -62,18 +63,18 @@ func TestUnmarshalIdentifier(t *testing.T) { doc1.Meta = meta1 body1, err := Marshal(doc1, url1) - tchek.UnintendedError(err) - + assert.NoError(err) pl1, err := Unmarshal(body1, url1, schema) - tchek.UnintendedError(err) - + assert.NoError(err) dst1 := pl1.Data.(Identifier) - tchek.AreEqual(t, "same identifier", id1, dst1) - tchek.AreEqual(t, "same meta map", meta1, pl1.Meta) + assert.Equal(id1, dst1, "same identifier") + assert.Equal(meta1, pl1.Meta, "same meta map") } func TestUnmarshalIdentifiers(t *testing.T) { + assert := assert.New(t) + schema := newMockSchema() ids1 := Identifiers{ @@ -83,7 +84,7 @@ func TestUnmarshalIdentifiers(t *testing.T) { } url1, err := ParseRawURL(schema, "/mocktypes3/mt1/relationships/rel2") - tchek.UnintendedError(err) + assert.NoError(err) meta1 := map[string]interface{}{ "str": "a string\\^ç\"", @@ -96,13 +97,13 @@ func TestUnmarshalIdentifiers(t *testing.T) { doc1.Meta = meta1 body1, err := Marshal(doc1, url1) - tchek.UnintendedError(err) + assert.NoError(err) pl1, err := Unmarshal(body1, url1, schema) - tchek.UnintendedError(err) + assert.NoError(err) dst1 := pl1.Data.(Identifiers) - tchek.AreEqual(t, "same identifiers", ids1, dst1) - tchek.AreEqual(t, "same meta map", meta1, pl1.Meta) + assert.Equal(ids1, dst1, "same identifiers") + assert.Equal(meta1, pl1.Meta, "same meta map") } diff --git a/url_test.go b/url_test.go index 908e40c..5b3b242 100644 --- a/url_test.go +++ b/url_test.go @@ -5,10 +5,13 @@ import ( "testing" . "github.com/mfcochauxlaberge/jsonapi" - "github.com/mfcochauxlaberge/tchek" + + "github.com/stretchr/testify/assert" ) func TestParseURL(t *testing.T) { + assert := assert.New(t) + // Schema schema := newMockSchema() @@ -175,20 +178,22 @@ func TestParseURL(t *testing.T) { } for _, test := range tests { - u, _ := url.Parse(tchek.MakeOneLineNoSpaces(test.url)) + u, _ := url.Parse(makeOneLineNoSpaces(test.url)) url, err := ParseRawURL(schema, u.String()) - tchek.ErrorExpected(t, test.name, test.expectedError, err) + assert.Equal(test.expectedError, err != nil, test.name) - // test.expectedURL.Path = tchek.MakeOneLineNoSpaces(test.expectedURL.Path) + // test.expectedURL.Path = makeOneLineNoSpaces(test.expectedURL.Path) if !test.expectedError { url.Params = nil - tchek.AreEqual(t, test.name, test.expectedURL, *url) + assert.Equal(test.expectedURL, *url, test.name) } } } func TestParseParams(t *testing.T) { + assert := assert.New(t) + // Schema schema := newMockSchema() mockTypes1, _ := schema.GetType("mocktypes1") @@ -378,14 +383,14 @@ func TestParseParams(t *testing.T) { } for _, test := range tests { - u, err := url.Parse(tchek.MakeOneLineNoSpaces(test.url)) - tchek.UnintendedError(err) + u, err := url.Parse(makeOneLineNoSpaces(test.url)) + assert.NoError(err, test.name) su, err := NewSimpleURL(u) - tchek.UnintendedError(err) + assert.NoError(err, test.name) params, err := NewParams(schema, su, test.resType) - tchek.ErrorExpected(t, test.name, test.expectedError, err) + assert.Equal(test.expectedError, err != nil, test.name) // Set Attrs and Rels for resType, fields := range test.expectedParams.Fields { @@ -407,7 +412,7 @@ func TestParseParams(t *testing.T) { // fmt.Printf("EXPECTED:\n%s\n", data) // data, _ = json.MarshalIndent(params, "", "\t") // fmt.Printf("PROVIDED:\n%s\n", data) - tchek.AreEqual(t, test.name, test.expectedParams, *params) + assert.Equal(test.expectedParams, *params, test.name) } } } diff --git a/util_test.go b/util_test.go new file mode 100644 index 0000000..2791aa9 --- /dev/null +++ b/util_test.go @@ -0,0 +1,23 @@ +package jsonapi_test + +import "strings" + +func makeOneLine(str string) string { + str = strings.TrimSpace(str) + str = strings.Replace(str, "\t", " ", -1) + str = strings.Replace(str, "\n", " ", -1) + + for { + str2 := strings.Replace(str, " ", " ", -1) + if str == str2 { + return str + } + str = str2 + } +} + +func makeOneLineNoSpaces(str string) string { + str = strings.Replace(str, "\t", "", -1) + str = strings.Replace(str, "\n", "", -1) + return strings.Replace(str, " ", "", -1) +} diff --git a/wrapper_test.go b/wrapper_test.go index a2a8084..9881318 100644 --- a/wrapper_test.go +++ b/wrapper_test.go @@ -7,10 +7,13 @@ import ( "time" . "github.com/mfcochauxlaberge/jsonapi" - "github.com/mfcochauxlaberge/tchek" + + "github.com/stretchr/testify/assert" ) func TestWrapper(t *testing.T) { + assert := assert.New(t) + loc, _ := time.LoadLocation("") res1 := &mockType1{ @@ -33,8 +36,8 @@ func TestWrapper(t *testing.T) { // ID and type id, typ := wrap1.IDAndType() - tchek.AreEqual(t, "id", res1.ID, id) - tchek.AreEqual(t, "type", "mocktypes1", typ) + assert.Equal(res1.ID, id, "id") + assert.Equal("mocktypes1", typ, "type") // Get attributes v1 := reflect.ValueOf(res1).Elem() @@ -44,15 +47,15 @@ func TestWrapper(t *testing.T) { n := sf.Tag.Get("json") if sf.Tag.Get("api") == "attr" { - tchek.AreEqual(t, "api tag", f.Interface(), wrap1.Get(n)) + assert.Equal(f.Interface(), wrap1.Get(n), "api tag") } } // Set attributes wrap1.Set("str", "another_string") - tchek.AreEqual(t, "set string attribute", "another_string", wrap1.Get("str")) + assert.Equal("another_string", wrap1.Get("str"), "set string attribute") wrap1.Set("int", 3) - tchek.AreEqual(t, "set int attribute", 3, wrap1.Get("int")) + assert.Equal(3, wrap1.Get("int"), "set int attribute") aStr := "another_string_ptr" aInt := int(123) @@ -88,8 +91,8 @@ func TestWrapper(t *testing.T) { // ID and type id, typ = wrap2.IDAndType() - tchek.AreEqual(t, "id 2", res2.ID, id) - tchek.AreEqual(t, "type 2", "mocktypes2", typ) + assert.Equal(res2.ID, id, "id 2") + assert.Equal("mocktypes2", typ, "type 2") // Get attributes v2 := reflect.ValueOf(res2).Elem() @@ -99,36 +102,36 @@ func TestWrapper(t *testing.T) { n := sf.Tag.Get("json") if sf.Tag.Get("api") == "attr" { - tchek.AreEqual(t, "api tag 2", f.Interface(), wrap2.Get(n)) + assert.Equal(f.Interface(), wrap2.Get(n), "api tag 2") } } // Set attributes var anotherString = "anotherString" wrap2.Set("strptr", &anotherString) - tchek.AreEqual(t, "set string pointer attribute", &anotherString, wrap2.Get("strptr")) + assert.Equal(&anotherString, wrap2.Get("strptr"), "set string pointer attribute") var newInt = 3 wrap2.Set("intptr", &newInt) - tchek.AreEqual(t, "set int pointer attribute", &newInt, wrap2.Get("intptr")) + assert.Equal(&newInt, wrap2.Get("intptr"), "set int pointer attribute") wrap2.Set("uintptr", nil) if wrap2.Get("uintptr") != nil { // We first do a != nil check because that's what we are really // checking and reflect.DeepEqual doesn't work exactly work the same // way. If the nil check fails, then the next line will fail too. - tchek.AreEqual(t, "nil pointer", nil, wrap2.Get("uintptr")) + assert.Equal(t, "nil pointer", nil, wrap2.Get("uintptr")) } if res2.UintPtr != nil { // We first do a != nil check because that's what we are really // checking and reflect.DeepEqual doesn't work exactly work the same // way. If the nil check fails, then the next line will fail too. - tchek.AreEqual(t, "nil pointer 2", nil, res2.UintPtr) + assert.Equal(t, "nil pointer 2", nil, res2.UintPtr) } // Copy wrap3 := wrap1.Copy() for _, attr := range wrap1.Attrs() { - tchek.AreEqual(t, "copied attribute", wrap1.Get(attr.Name), wrap3.Get(attr.Name)) + assert.Equal(wrap1.Get(attr.Name), wrap3.Get(attr.Name), "copied attribute") if attr.Type == AttrTypeBool && !attr.Null { wrap3.Set(attr.Name, !wrap1.Get(attr.Name).(bool)) @@ -139,6 +142,6 @@ func TestWrapper(t *testing.T) { } else { wrap3.Set(attr.Name, "0") } - tchek.AreNotEqual(t, fmt.Sprintf("modified copied attribute %s (%v)", attr.Name, attr.Type), wrap1.Get(attr.Name), wrap3.Get(attr.Name)) + assert.NotEqual(wrap1.Get(attr.Name), wrap3.Get(attr.Name), fmt.Sprintf("modified copied attribute %s (%v)", attr.Name, attr.Type)) } } From 89e4f6404fedbbe392e28a5354583398b9d85663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 24 Jun 2019 09:51:21 -0400 Subject: [PATCH 057/406] Make Resource.GetType return *Type instead of string --- build_links.go | 4 ++-- document.go | 8 ++++---- jsonapi.go | 6 +++--- marshaling_test.go | 2 +- resource.go | 4 ++-- soft_resource.go | 4 ++-- soft_resource_test.go | 2 +- util.go | 2 +- wrapper.go | 9 ++++++--- wrapper_collection.go | 2 +- 10 files changed, 23 insertions(+), 20 deletions(-) diff --git a/build_links.go b/build_links.go index b4b12ae..fc7db42 100644 --- a/build_links.go +++ b/build_links.go @@ -12,8 +12,8 @@ func buildSelfLink(res Resource, prepath string) string { prepath = prepath + "/" } - if res.GetID() != "" && res.GetType() != "" { - return prepath + res.GetType() + "/" + res.GetID() + if res.GetID() != "" && res.GetType().Name != "" { + return prepath + res.GetType().Name + "/" + res.GetID() } return "" diff --git a/document.go b/document.go index f7675f4..8ff54f5 100644 --- a/document.go +++ b/document.go @@ -41,7 +41,7 @@ func NewDocument() *Document { // // It also makes sure that resources are not added twice. func (d *Document) Include(res Resource) { - key := res.GetType() + " " + res.GetID() + key := res.GetType().Name + " " + res.GetID() if len(d.Included) == 0 { d.Included = map[string]Resource{} @@ -49,7 +49,7 @@ func (d *Document) Include(res Resource) { if dres, ok := d.Data.(Resource); ok { // Check resource - rkey := dres.GetID() + " " + dres.GetType() + rkey := dres.GetID() + " " + dres.GetType().Name if rkey == key { return @@ -57,9 +57,9 @@ func (d *Document) Include(res Resource) { } else if col, ok := d.Data.(Collection); ok { // Check Collection ctyp := col.Type() - if ctyp == res.GetType() { + if ctyp == res.GetType().Name { for i := 0; i < col.Len(); i++ { - rkey := col.Elem(i).GetID() + " " + col.Elem(i).GetType() + rkey := col.Elem(i).GetID() + " " + col.Elem(i).GetType().Name if rkey == key { return diff --git a/jsonapi.go b/jsonapi.go index 7b039ff..b8322a8 100644 --- a/jsonapi.go +++ b/jsonapi.go @@ -19,7 +19,7 @@ func Marshal(doc *Document, url *URL) ([]byte, error) { if res, ok := doc.Data.(Resource); ok { // Resource - data, err = marshalResource(res, doc.PrePath, url.Params.Fields[res.GetType()], doc.RelData) + data, err = marshalResource(res, doc.PrePath, url.Params.Fields[res.GetType().Name], doc.RelData) } else if col, ok := doc.Data.(Collection); ok { // Collection data, err = marshalCollection(col, doc.PrePath, url.Params.Fields[col.Type()], doc.RelData) @@ -47,7 +47,7 @@ func Marshal(doc *Document, url *URL) ([]byte, error) { inclusions := []*json.RawMessage{} if len(data) > 0 { for key := range doc.Included { - typ := doc.Included[key].GetType() + typ := doc.Included[key].GetType().Name raw, err := marshalResource(doc.Included[key], doc.PrePath, url.Params.Fields[typ], doc.RelData) if err != nil { return []byte{}, err @@ -222,7 +222,7 @@ func CheckType(v interface{}) error { func IDAndType(v interface{}) (string, string) { switch nv := v.(type) { case Resource: - return nv.GetID(), nv.GetType() + return nv.GetID(), nv.GetType().Name } val := reflect.ValueOf(v) diff --git a/marshaling_test.go b/marshaling_test.go index 857b1e8..e90a0ac 100644 --- a/marshaling_test.go +++ b/marshaling_test.go @@ -64,7 +64,7 @@ func TestMarshalResource(t *testing.T) { doc.Data = test.data id := test.data.GetID() - resType := test.data.GetType() + resType := test.data.GetType().Name rawurl := fmt.Sprintf("%s/%s/%s%s", test.prepath, resType, id, test.params) url, err := ParseRawURL(schema, rawurl) diff --git a/resource.go b/resource.go index 1c5b54e..a252df0 100644 --- a/resource.go +++ b/resource.go @@ -17,7 +17,7 @@ type Resource interface { // Read GetID() string - GetType() string + GetType() *Type Get(key string) interface{} // Update @@ -51,7 +51,7 @@ type Resource interface { // IDs are ignored. func Equal(r1, r2 Resource) bool { // Type - if r1.GetType() != r2.GetType() { + if r1.GetType().Name != r2.GetType().Name { return false } diff --git a/soft_resource.go b/soft_resource.go index ea22c3c..964d79c 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -106,9 +106,9 @@ func (sr *SoftResource) GetID() string { } // GetType returns the resource's type. -func (sr *SoftResource) GetType() string { +func (sr *SoftResource) GetType() *Type { sr.check() - return sr.typ.Name + return sr.typ } // Get returns the value associated to the field named after key. diff --git a/soft_resource_test.go b/soft_resource_test.go index e996937..320771e 100644 --- a/soft_resource_test.go +++ b/soft_resource_test.go @@ -38,7 +38,7 @@ func TestSoftResource(t *testing.T) { typ2.Name = "type2" sr.SetType(&typ2) assert.Equal(t, "id", sr.GetID()) - assert.Equal(t, "type2", sr.GetType()) + assert.Equal(t, "type2", sr.GetType().Name) // Attributes attrs := map[string]Attr{ diff --git a/util.go b/util.go index a52dd75..8fdcdf3 100644 --- a/util.go +++ b/util.go @@ -14,7 +14,7 @@ func marshalResource(r Resource, prepath string, fields []string, relData map[st // ID and type mapPl["id"] = r.GetID() - mapPl["type"] = r.GetType() + mapPl["type"] = r.GetType().Name // Attributes attrs := map[string]interface{}{} diff --git a/wrapper.go b/wrapper.go index 9b9fd75..81cb69c 100644 --- a/wrapper.go +++ b/wrapper.go @@ -151,9 +151,12 @@ func (w *Wrapper) GetID() string { } // GetType returns the wrapped resource's type. -func (w *Wrapper) GetType() string { - _, typ := IDAndType(w.val.Interface()) - return typ +func (w *Wrapper) GetType() *Type { + return &Type{ + Name: w.typ, + Attrs: w.attrs, + Rels: w.rels, + } } // Get returns the value associated to the attribute named after key. diff --git a/wrapper_collection.go b/wrapper_collection.go index 95a5f68..635e187 100644 --- a/wrapper_collection.go +++ b/wrapper_collection.go @@ -10,7 +10,7 @@ func WrapCollection(r Resource) *WrapperCollection { // r := Wrap(v) // } - typ := r.GetType() + typ := r.GetType().Name return &WrapperCollection{ typ: typ, From 172085bf52c23aa25a2e468b639d9cd4a11ca5b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 24 Jun 2019 13:03:08 -0400 Subject: [PATCH 058/406] Add Codecov analysis and badge --- .travis.yml | 6 ++++++ README.md | 3 +++ 2 files changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5c55b2a..173efbe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,3 +5,9 @@ go: env: - GO111MODULE=on + +script: + - go test -race -coverprofile=coverage.txt -covermode=atomic + +after_success: + - bash <(curl -s https://codecov.io/bash) \ No newline at end of file diff --git a/README.md b/README.md index bedf9f4..5ff5d73 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,9 @@ + + + jsonapi is a complete library to marshal and unmarshal JSON:API payloads. From ec76ab55f9dc4b8b5c4b5a030cd75beb917e5bab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 24 Jun 2019 13:10:33 -0400 Subject: [PATCH 059/406] Add GoDoc badge --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 5ff5d73..24eeb4b 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,9 @@ + + + jsonapi is a complete library to marshal and unmarshal JSON:API payloads. From afa658afead941ab560b7909056e43ca019ccf25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 24 Jun 2019 13:15:05 -0400 Subject: [PATCH 060/406] Add comments for Type, Attr, and Rel --- type.go | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/type.go b/type.go index 63a74b3..118aa12 100644 --- a/type.go +++ b/type.go @@ -5,14 +5,15 @@ import ( "sort" ) -// Type ... +// Type stores all the necessary information about a type as represented +// in the JSON:API specification. type Type struct { Name string Attrs map[string]Attr Rels map[string]Rel } -// AddAttr ... +// AddAttr adds an attributes to the type. func (t *Type) AddAttr(attr Attr) error { // Validation if attr.Name == "" { @@ -38,7 +39,7 @@ func (t *Type) AddAttr(attr Attr) error { return nil } -// RemoveAttr ... +// RemoveAttr removes an attribute from the type if it exists. func (t *Type) RemoveAttr(attr string) error { for i := range t.Attrs { if t.Attrs[i].Name == attr { @@ -49,7 +50,7 @@ func (t *Type) RemoveAttr(attr string) error { return nil } -// AddRel ... +// AddRel adds a relationship to the type. func (t *Type) AddRel(rel Rel) error { // Validation if rel.Name == "" { @@ -74,7 +75,7 @@ func (t *Type) AddRel(rel Rel) error { return nil } -// RemoveRel ... +// RemoveRel removes a relationship from the type if it exists. func (t *Type) RemoveRel(rel string) error { for i := range t.Rels { if t.Rels[i].Name == rel { @@ -85,7 +86,8 @@ func (t *Type) RemoveRel(rel string) error { return nil } -// Fields ... +// Fields returns a list of the names of all the fields (attributes and +// relationships) in the type. func (t Type) Fields() []string { fields := make([]string, 0, len(t.Attrs)+len(t.Rels)) for i := range t.Attrs { @@ -98,14 +100,14 @@ func (t Type) Fields() []string { return fields } -// Attr ... +// Attr represents a resource attribute. type Attr struct { Name string Type int Null bool } -// Rel ... +// Rel represents a resource relationship. type Rel struct { Name string Type string @@ -115,7 +117,7 @@ type Rel struct { InverseToOne bool } -// Inverse ... +// Inverse returns the inverse relationship of r. func (r *Rel) Inverse() Rel { return Rel{ Name: r.InverseName, From 199ba25de68f8e1c590cf0939c88faf468ddd69b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 24 Jun 2019 13:16:02 -0400 Subject: [PATCH 061/406] Make the receiver of Type.Fields a pointer --- type.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/type.go b/type.go index 118aa12..9b8bc65 100644 --- a/type.go +++ b/type.go @@ -88,7 +88,7 @@ func (t *Type) RemoveRel(rel string) error { // Fields returns a list of the names of all the fields (attributes and // relationships) in the type. -func (t Type) Fields() []string { +func (t *Type) Fields() []string { fields := make([]string, 0, len(t.Attrs)+len(t.Rels)) for i := range t.Attrs { fields = append(fields, t.Attrs[i].Name) From 10cde986ecc3bbb458798eaa473e096a65e52d72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 24 Jun 2019 13:29:55 -0400 Subject: [PATCH 062/406] Only run Travis CI on master and PRs --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 173efbe..32ca8a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,10 @@ go: - 1.11.x - 1.12.x +branches: + only: + - master + env: - GO111MODULE=on From d8d290ed707f7748fda44394a618bb9fd80f20d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 24 Jun 2019 14:19:50 -0400 Subject: [PATCH 063/406] Fix Type's comment --- type.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/type.go b/type.go index 9b8bc65..b344b6d 100644 --- a/type.go +++ b/type.go @@ -5,7 +5,7 @@ import ( "sort" ) -// Type stores all the necessary information about a type as represented +// A Type stores all the necessary information about a type as represented // in the JSON:API specification. type Type struct { Name string From 44a85ce6636ef0d84acd908ce8d9611a37ce88da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 24 Jun 2019 15:13:36 -0400 Subject: [PATCH 064/406] Finish Filter implementation (previously known as Condition) --- filter_query.go | 403 +++++++++++++++-- filter_query_test.go | 1029 +++++++++++++++++++++++++++++++++++++++--- params.go | 2 +- simple_url.go | 2 +- soft_collection.go | 2 +- 5 files changed, 1336 insertions(+), 102 deletions(-) diff --git a/filter_query.go b/filter_query.go index 1719fdf..acb04f6 100644 --- a/filter_query.go +++ b/filter_query.go @@ -2,53 +2,65 @@ package jsonapi import ( "encoding/json" + "sort" + "time" ) -// A Condition is used to define filters when querying collections. -type Condition struct { +// A Filter is used to define filters when querying collections. +type Filter struct { Field string `json:"f"` Op string `json:"o"` Val interface{} `json:"v"` Col string `json:"c"` } -// cnd is an internal version of Condition. -type cnd struct { +// filter is an internal version of Filter. +type filter struct { Field string `json:"f"` Op string `json:"o"` Val json.RawMessage `json:"v"` Col string `json:"c"` } -// UnmarshalJSON parses the provided data and populates a Condition. -func (c *Condition) UnmarshalJSON(data []byte) error { - tmpCnd := cnd{} - err := json.Unmarshal(data, &tmpCnd) +// MarshalJSON marshals a filter into JSON. +func (c *Filter) MarshalJSON() ([]byte, error) { + payload := map[string]interface{}{} + if c.Field != "" { + payload["f"] = c.Field + } + if c.Op != "" { + payload["o"] = c.Op + } + payload["v"] = c.Val + if c.Col != "" { + payload["c"] = c.Col + } + return json.Marshal(payload) +} + +// UnmarshalJSON parses the provided data and populates a Filter. +func (c *Filter) UnmarshalJSON(data []byte) error { + tmpFilter := filter{} + err := json.Unmarshal(data, &tmpFilter) if err != nil { return err } - c.Field = tmpCnd.Field - c.Op = tmpCnd.Op - c.Col = tmpCnd.Col + c.Field = tmpFilter.Field + c.Op = tmpFilter.Op + c.Col = tmpFilter.Col - if tmpCnd.Op == "and" || tmpCnd.Op == "or" { + if tmpFilter.Op == "and" || tmpFilter.Op == "or" { c.Field = "" - cnds := []Condition{} - err := json.Unmarshal(tmpCnd.Val, &cnds) + filters := []*Filter{} + err := json.Unmarshal(tmpFilter.Val, &filters) if err != nil { return err } - c.Val = cnds - } else if tmpCnd.Op == "=" || - tmpCnd.Op == "!=" || - tmpCnd.Op == "<" || - tmpCnd.Op == "<=" || - tmpCnd.Op == ">" || - tmpCnd.Op == ">=" { - - err := json.Unmarshal(tmpCnd.Val, &(c.Val)) // TODO parenthesis needed? + c.Val = filters + } else { + err := json.Unmarshal(tmpFilter.Val, &(c.Val)) // TODO parenthesis needed? if err != nil { return err } @@ -57,18 +69,341 @@ func (c *Condition) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON marshals a Condition into JSON. -func (c *Condition) MarshalJSON() ([]byte, error) { - payload := map[string]interface{}{} - if c.Field != "" { - payload["f"] = c.Field +// FilterResource reports whether res is valid under the rules defined +// in the filter. +func FilterResource(res Resource, filter *Filter) bool { + var ( + val interface{} + // typ string + ) + if _, ok := res.Attrs()[filter.Field]; ok { + val = res.Get(filter.Field) } - if c.Op != "" { - payload["o"] = c.Op + if rel, ok := res.Rels()[filter.Field]; ok { + if rel.ToOne { + val = res.GetToOne(filter.Field) + } else { + val = res.GetToMany(filter.Field) + } } - payload["v"] = c.Val - if c.Col != "" { - payload["c"] = c.Col + + switch filter.Op { + case "and": + filters := filter.Val.([]*Filter) + for i := range filters { + if !FilterResource(res, filters[i]) { + return false + } + } + return true + case "or": + filters := filter.Val.([]*Filter) + for i := range filters { + if FilterResource(res, filters[i]) { + return true + } + } + return false + case "in": + return checkIn(val.(string), filter.Val.([]string)) + case "has": + return checkIn(filter.Val.(string), val.([]string)) + default: + return checkVal(filter.Op, val, filter.Val) } - return json.Marshal(payload) +} + +func checkVal(op string, rval, cval interface{}) bool { + switch rval.(type) { + case string: + return checkStr(op, rval.(string), cval.(string)) + case int: + return checkInt(op, int64(rval.(int)), int64(cval.(int))) + case int8: + return checkInt(op, int64(rval.(int8)), int64(cval.(int8))) + case int16: + return checkInt(op, int64(rval.(int16)), int64(cval.(int16))) + case int32: + return checkInt(op, int64(rval.(int32)), int64(cval.(int32))) + case int64: + return checkInt(op, rval.(int64), cval.(int64)) + case uint: + return checkUint(op, uint64(rval.(uint)), uint64(cval.(uint))) + case uint8: + return checkUint(op, uint64(rval.(uint8)), uint64(cval.(uint8))) + case uint16: + return checkUint(op, uint64(rval.(uint16)), uint64(cval.(uint16))) + case uint32: + return checkUint(op, uint64(rval.(uint32)), uint64(cval.(uint32))) + case uint64: + return checkUint(op, rval.(uint64), cval.(uint64)) + case bool: + return checkBool(op, rval.(bool), cval.(bool)) + case time.Time: + return checkTime(op, rval.(time.Time), cval.(time.Time)) + case *string: + if rval.(*string) == nil || cval.(*string) == nil { + if op == "=" { + return rval.(*string) == cval.(*string) + } else if op == "!=" { + return rval.(*string) != cval.(*string) + } else { + return false + } + } + return checkStr(op, *rval.(*string), *cval.(*string)) + case *int: + if rval.(*int) == nil || cval.(*int) == nil { + if op == "=" { + return rval.(*int) == cval.(*int) + } else if op == "!=" { + return rval.(*int) != cval.(*int) + } else { + return false + } + } + return checkInt(op, int64(*rval.(*int)), int64(*cval.(*int))) + case *int8: + if rval.(*int8) == nil || cval.(*int8) == nil { + if op == "=" { + return rval.(*int8) == cval.(*int8) + } else if op == "!=" { + return rval.(*int8) != cval.(*int8) + } else { + return false + } + } + return checkInt(op, int64(*rval.(*int8)), int64(*cval.(*int8))) + case *int16: + if rval.(*int16) == nil || cval.(*int16) == nil { + if op == "=" { + return rval.(*int16) == cval.(*int16) + } else if op == "!=" { + return rval.(*int16) != cval.(*int16) + } else { + return false + } + } + return checkInt(op, int64(*rval.(*int16)), int64(*cval.(*int16))) + case *int32: + if rval.(*int32) == nil || cval.(*int32) == nil { + if op == "=" { + return rval.(*int32) == cval.(*int32) + } else if op == "!=" { + return rval.(*int32) != cval.(*int32) + } else { + return false + } + } + return checkInt(op, int64(*rval.(*int32)), int64(*cval.(*int32))) + case *int64: + if rval.(*int64) == nil || cval.(*int64) == nil { + if op == "=" { + return rval.(*int64) == cval.(*int64) + } else if op == "!=" { + return rval.(*int64) != cval.(*int64) + } else { + return false + } + } + return checkInt(op, *rval.(*int64), *cval.(*int64)) + case *uint: + if rval.(*uint) == nil || cval.(*uint) == nil { + if op == "=" { + return rval.(*uint) == cval.(*uint) + } else if op == "!=" { + return rval.(*uint) != cval.(*uint) + } else { + return false + } + } + return checkUint(op, uint64(*rval.(*uint)), uint64(*cval.(*uint))) + case *uint8: + if rval.(*uint8) == nil || cval.(*uint8) == nil { + if op == "=" { + return rval.(*uint8) == cval.(*uint8) + } else if op == "!=" { + return rval.(*uint8) != cval.(*uint8) + } else { + return false + } + } + return checkUint(op, uint64(*rval.(*uint8)), uint64(*cval.(*uint8))) + case *uint16: + if rval.(*uint16) == nil || cval.(*uint16) == nil { + if op == "=" { + return rval.(*uint16) == cval.(*uint16) + } else if op == "!=" { + return rval.(*uint16) != cval.(*uint16) + } else { + return false + } + } + return checkUint(op, uint64(*rval.(*uint16)), uint64(*cval.(*uint16))) + case *uint32: + if rval.(*uint32) == nil || cval.(*uint32) == nil { + if op == "=" { + return rval.(*uint32) == cval.(*uint32) + } else if op == "!=" { + return rval.(*uint32) != cval.(*uint32) + } else { + return false + } + } + return checkUint(op, uint64(*rval.(*uint32)), uint64(*cval.(*uint32))) + case *uint64: + if rval.(*uint64) == nil || cval.(*uint64) == nil { + if op == "=" { + return rval.(*uint64) == cval.(*uint64) + } else if op == "!=" { + return rval.(*uint64) != cval.(*uint64) + } else { + return false + } + } + return checkUint(op, *rval.(*uint64), *cval.(*uint64)) + case *bool: + if rval.(*bool) == nil || cval.(*bool) == nil { + if op == "=" { + return rval.(*bool) == cval.(*bool) + } else if op == "!=" { + return rval.(*bool) != cval.(*bool) + } + } + return checkBool(op, *rval.(*bool), *cval.(*bool)) + case *time.Time: + if rval.(*time.Time) == nil || cval.(*time.Time) == nil { + if op == "=" { + return rval.(*time.Time) == cval.(*time.Time) + } else if op == "!=" { + return rval.(*time.Time) != cval.(*time.Time) + } else { + return false + } + } + return checkTime(op, *rval.(*time.Time), *cval.(*time.Time)) + case []string: + return checkSlice(op, rval.([]string), cval.([]string)) + default: + return false + } +} + +func checkStr(op string, rval, cval string) bool { + switch op { + case "=": + return rval == cval + case "!=": + return rval != cval + case "<": + return rval < cval + case "<=": + return rval <= cval + case ">": + return rval > cval + case ">=": + return rval >= cval + default: + return false + } +} + +func checkInt(op string, rval, cval int64) bool { + switch op { + case "=": + return rval == cval + case "!=": + return rval != cval + case "<": + return rval < cval + case "<=": + return rval <= cval + case ">": + return rval > cval + case ">=": + return rval >= cval + default: + return false + } +} + +func checkUint(op string, rval, cval uint64) bool { + switch op { + case "=": + return rval == cval + case "!=": + return rval != cval + case "<": + return rval < cval + case "<=": + return rval <= cval + case ">": + return rval > cval + case ">=": + return rval >= cval + default: + return false + } +} + +func checkBool(op string, rval, cval bool) bool { + switch op { + case "=": + return rval == cval + case "!=": + return rval != cval + default: + return false + } +} + +func checkTime(op string, rval, cval time.Time) bool { + switch op { + case "=": + return rval.Equal(cval) + case "!=": + return !rval.Equal(cval) + case "<": + return rval.Before(cval) + case "<=": + return rval.Before(cval) || rval.Equal(cval) + case ">": + return rval.After(cval) + case ">=": + return rval.After(cval) || rval.Equal(cval) + default: + return false + } +} + +func checkSlice(op string, rval, cval []string) bool { + equal := false + if len(rval) == len(cval) { + sort.Strings(rval) + sort.Strings(cval) + equal = true + for i := 0; i < len(rval); i++ { + if rval[i] != cval[i] { + equal = false + break + } + } + } + switch op { + case "=": + return equal + case "!=": + return !equal + default: + return false + } +} + +func checkIn(id string, ids []string) bool { + for i := range ids { + if id == ids[i] { + return true + } + } + return false } diff --git a/filter_query_test.go b/filter_query_test.go index 1510617..ae849fb 100644 --- a/filter_query_test.go +++ b/filter_query_test.go @@ -3,24 +3,888 @@ package jsonapi_test import ( "encoding/json" "fmt" - "io/ioutil" + "strconv" "testing" + "time" . "github.com/mfcochauxlaberge/jsonapi" + "github.com/stretchr/testify/assert" ) -func TestFilterQuery(t *testing.T) { +func TestFilterResource(t *testing.T) { + assert := assert.New(t) + + now := time.Now() + + // Tests for attributes + attrTests := []struct { + rval interface{} + op string + cval interface{} + expected bool + }{ + // string + {rval: "bbb", op: "=", cval: "aaa", expected: false}, + {rval: "bbb", op: "=", cval: "bbb", expected: true}, + {rval: "bbb", op: "!=", cval: "aaa", expected: true}, + {rval: "bbb", op: "!=", cval: "bbb", expected: false}, + {rval: "bbb", op: "<", cval: "aaa", expected: false}, + {rval: "bbb", op: "<", cval: "bbb", expected: false}, + {rval: "bbb", op: "<", cval: "ccc", expected: true}, + {rval: "bbb", op: "<=", cval: "aaa", expected: false}, + {rval: "bbb", op: "<=", cval: "bbb", expected: true}, + {rval: "bbb", op: "<=", cval: "ccc", expected: true}, + {rval: "bbb", op: ">", cval: "aaa", expected: true}, + {rval: "bbb", op: ">", cval: "bbb", expected: false}, + {rval: "bbb", op: ">", cval: "ccc", expected: false}, + {rval: "bbb", op: ">=", cval: "aaa", expected: true}, + {rval: "bbb", op: ">=", cval: "bbb", expected: true}, + {rval: "bbb", op: ">=", cval: "ccc", expected: false}, + + // int + {rval: 1, op: "=", cval: 0, expected: false}, + {rval: 1, op: "=", cval: 1, expected: true}, + {rval: 1, op: "!=", cval: 0, expected: true}, + {rval: 1, op: "!=", cval: 1, expected: false}, + {rval: 1, op: "<", cval: 0, expected: false}, + {rval: 1, op: "<", cval: 1, expected: false}, + {rval: 1, op: "<", cval: 3, expected: true}, + {rval: 1, op: "<=", cval: 0, expected: false}, + {rval: 1, op: "<=", cval: 1, expected: true}, + {rval: 1, op: "<=", cval: 3, expected: true}, + {rval: 1, op: ">", cval: 0, expected: true}, + {rval: 1, op: ">", cval: 1, expected: false}, + {rval: 1, op: ">", cval: 3, expected: false}, + {rval: 1, op: ">=", cval: 0, expected: true}, + {rval: 1, op: ">=", cval: 1, expected: true}, + {rval: 1, op: ">=", cval: 3, expected: false}, + + // int8 + {rval: int8(1), op: "=", cval: int8(0), expected: false}, + {rval: int8(1), op: "=", cval: int8(1), expected: true}, + {rval: int8(1), op: "!=", cval: int8(0), expected: true}, + {rval: int8(1), op: "!=", cval: int8(1), expected: false}, + {rval: int8(1), op: "<", cval: int8(0), expected: false}, + {rval: int8(1), op: "<", cval: int8(1), expected: false}, + {rval: int8(1), op: "<", cval: int8(2), expected: true}, + {rval: int8(1), op: "<=", cval: int8(0), expected: false}, + {rval: int8(1), op: "<=", cval: int8(1), expected: true}, + {rval: int8(1), op: "<=", cval: int8(2), expected: true}, + {rval: int8(1), op: ">", cval: int8(0), expected: true}, + {rval: int8(1), op: ">", cval: int8(1), expected: false}, + {rval: int8(1), op: ">", cval: int8(2), expected: false}, + {rval: int8(1), op: ">=", cval: int8(0), expected: true}, + {rval: int8(1), op: ">=", cval: int8(1), expected: true}, + {rval: int8(1), op: ">=", cval: int8(2), expected: false}, + + // int16 + {rval: int16(1), op: "=", cval: int16(0), expected: false}, + {rval: int16(1), op: "=", cval: int16(1), expected: true}, + {rval: int16(1), op: "!=", cval: int16(0), expected: true}, + {rval: int16(1), op: "!=", cval: int16(1), expected: false}, + {rval: int16(1), op: "<", cval: int16(0), expected: false}, + {rval: int16(1), op: "<", cval: int16(1), expected: false}, + {rval: int16(1), op: "<", cval: int16(2), expected: true}, + {rval: int16(1), op: "<=", cval: int16(0), expected: false}, + {rval: int16(1), op: "<=", cval: int16(1), expected: true}, + {rval: int16(1), op: "<=", cval: int16(2), expected: true}, + {rval: int16(1), op: ">", cval: int16(0), expected: true}, + {rval: int16(1), op: ">", cval: int16(1), expected: false}, + {rval: int16(1), op: ">", cval: int16(2), expected: false}, + {rval: int16(1), op: ">=", cval: int16(0), expected: true}, + {rval: int16(1), op: ">=", cval: int16(1), expected: true}, + {rval: int16(1), op: ">=", cval: int16(2), expected: false}, + + // int32 + {rval: int32(1), op: "=", cval: int32(0), expected: false}, + {rval: int32(1), op: "=", cval: int32(1), expected: true}, + {rval: int32(1), op: "!=", cval: int32(0), expected: true}, + {rval: int32(1), op: "!=", cval: int32(1), expected: false}, + {rval: int32(1), op: "<", cval: int32(0), expected: false}, + {rval: int32(1), op: "<", cval: int32(1), expected: false}, + {rval: int32(1), op: "<", cval: int32(2), expected: true}, + {rval: int32(1), op: "<=", cval: int32(0), expected: false}, + {rval: int32(1), op: "<=", cval: int32(1), expected: true}, + {rval: int32(1), op: "<=", cval: int32(2), expected: true}, + {rval: int32(1), op: ">", cval: int32(0), expected: true}, + {rval: int32(1), op: ">", cval: int32(1), expected: false}, + {rval: int32(1), op: ">", cval: int32(2), expected: false}, + {rval: int32(1), op: ">=", cval: int32(0), expected: true}, + {rval: int32(1), op: ">=", cval: int32(1), expected: true}, + {rval: int32(1), op: ">=", cval: int32(2), expected: false}, + + // int64 + {rval: int64(1), op: "=", cval: int64(0), expected: false}, + {rval: int64(1), op: "=", cval: int64(1), expected: true}, + {rval: int64(1), op: "!=", cval: int64(0), expected: true}, + {rval: int64(1), op: "!=", cval: int64(1), expected: false}, + {rval: int64(1), op: "<", cval: int64(0), expected: false}, + {rval: int64(1), op: "<", cval: int64(1), expected: false}, + {rval: int64(1), op: "<", cval: int64(2), expected: true}, + {rval: int64(1), op: "<=", cval: int64(0), expected: false}, + {rval: int64(1), op: "<=", cval: int64(1), expected: true}, + {rval: int64(1), op: "<=", cval: int64(2), expected: true}, + {rval: int64(1), op: ">", cval: int64(0), expected: true}, + {rval: int64(1), op: ">", cval: int64(1), expected: false}, + {rval: int64(1), op: ">", cval: int64(2), expected: false}, + {rval: int64(1), op: ">=", cval: int64(0), expected: true}, + {rval: int64(1), op: ">=", cval: int64(1), expected: true}, + {rval: int64(1), op: ">=", cval: int64(2), expected: false}, + + // uint + {rval: uint(1), op: "=", cval: uint(0), expected: false}, + {rval: uint(1), op: "=", cval: uint(1), expected: true}, + {rval: uint(1), op: "!=", cval: uint(0), expected: true}, + {rval: uint(1), op: "!=", cval: uint(1), expected: false}, + {rval: uint(1), op: "<", cval: uint(0), expected: false}, + {rval: uint(1), op: "<", cval: uint(1), expected: false}, + {rval: uint(1), op: "<", cval: uint(2), expected: true}, + {rval: uint(1), op: "<=", cval: uint(0), expected: false}, + {rval: uint(1), op: "<=", cval: uint(1), expected: true}, + {rval: uint(1), op: "<=", cval: uint(2), expected: true}, + {rval: uint(1), op: ">", cval: uint(0), expected: true}, + {rval: uint(1), op: ">", cval: uint(1), expected: false}, + {rval: uint(1), op: ">", cval: uint(2), expected: false}, + {rval: uint(1), op: ">=", cval: uint(0), expected: true}, + {rval: uint(1), op: ">=", cval: uint(1), expected: true}, + {rval: uint(1), op: ">=", cval: uint(2), expected: false}, + + // uint8 + {rval: uint8(1), op: "=", cval: uint8(0), expected: false}, + {rval: uint8(1), op: "=", cval: uint8(1), expected: true}, + {rval: uint8(1), op: "!=", cval: uint8(0), expected: true}, + {rval: uint8(1), op: "!=", cval: uint8(1), expected: false}, + {rval: uint8(1), op: "<", cval: uint8(0), expected: false}, + {rval: uint8(1), op: "<", cval: uint8(1), expected: false}, + {rval: uint8(1), op: "<", cval: uint8(2), expected: true}, + {rval: uint8(1), op: "<=", cval: uint8(0), expected: false}, + {rval: uint8(1), op: "<=", cval: uint8(1), expected: true}, + {rval: uint8(1), op: "<=", cval: uint8(2), expected: true}, + {rval: uint8(1), op: ">", cval: uint8(0), expected: true}, + {rval: uint8(1), op: ">", cval: uint8(1), expected: false}, + {rval: uint8(1), op: ">", cval: uint8(2), expected: false}, + {rval: uint8(1), op: ">=", cval: uint8(0), expected: true}, + {rval: uint8(1), op: ">=", cval: uint8(1), expected: true}, + {rval: uint8(1), op: ">=", cval: uint8(2), expected: false}, + + // uint16 + {rval: uint16(1), op: "=", cval: uint16(0), expected: false}, + {rval: uint16(1), op: "=", cval: uint16(1), expected: true}, + {rval: uint16(1), op: "!=", cval: uint16(0), expected: true}, + {rval: uint16(1), op: "!=", cval: uint16(1), expected: false}, + {rval: uint16(1), op: "<", cval: uint16(0), expected: false}, + {rval: uint16(1), op: "<", cval: uint16(1), expected: false}, + {rval: uint16(1), op: "<", cval: uint16(2), expected: true}, + {rval: uint16(1), op: "<=", cval: uint16(0), expected: false}, + {rval: uint16(1), op: "<=", cval: uint16(1), expected: true}, + {rval: uint16(1), op: "<=", cval: uint16(2), expected: true}, + {rval: uint16(1), op: ">", cval: uint16(0), expected: true}, + {rval: uint16(1), op: ">", cval: uint16(1), expected: false}, + {rval: uint16(1), op: ">", cval: uint16(2), expected: false}, + {rval: uint16(1), op: ">=", cval: uint16(0), expected: true}, + {rval: uint16(1), op: ">=", cval: uint16(1), expected: true}, + {rval: uint16(1), op: ">=", cval: uint16(2), expected: false}, + + // uint32 + {rval: uint32(1), op: "=", cval: uint32(0), expected: false}, + {rval: uint32(1), op: "=", cval: uint32(1), expected: true}, + {rval: uint32(1), op: "!=", cval: uint32(0), expected: true}, + {rval: uint32(1), op: "!=", cval: uint32(1), expected: false}, + {rval: uint32(1), op: "<", cval: uint32(0), expected: false}, + {rval: uint32(1), op: "<", cval: uint32(1), expected: false}, + {rval: uint32(1), op: "<", cval: uint32(2), expected: true}, + {rval: uint32(1), op: "<=", cval: uint32(0), expected: false}, + {rval: uint32(1), op: "<=", cval: uint32(1), expected: true}, + {rval: uint32(1), op: "<=", cval: uint32(2), expected: true}, + {rval: uint32(1), op: ">", cval: uint32(0), expected: true}, + {rval: uint32(1), op: ">", cval: uint32(1), expected: false}, + {rval: uint32(1), op: ">", cval: uint32(2), expected: false}, + {rval: uint32(1), op: ">=", cval: uint32(0), expected: true}, + {rval: uint32(1), op: ">=", cval: uint32(1), expected: true}, + {rval: uint32(1), op: ">=", cval: uint32(2), expected: false}, + + // uint64 + {rval: uint64(1), op: "=", cval: uint64(0), expected: false}, + {rval: uint64(1), op: "=", cval: uint64(1), expected: true}, + {rval: uint64(1), op: "!=", cval: uint64(0), expected: true}, + {rval: uint64(1), op: "!=", cval: uint64(1), expected: false}, + {rval: uint64(1), op: "<", cval: uint64(0), expected: false}, + {rval: uint64(1), op: "<", cval: uint64(1), expected: false}, + {rval: uint64(1), op: "<", cval: uint64(2), expected: true}, + {rval: uint64(1), op: "<=", cval: uint64(0), expected: false}, + {rval: uint64(1), op: "<=", cval: uint64(1), expected: true}, + {rval: uint64(1), op: "<=", cval: uint64(2), expected: true}, + {rval: uint64(1), op: ">", cval: uint64(0), expected: true}, + {rval: uint64(1), op: ">", cval: uint64(1), expected: false}, + {rval: uint64(1), op: ">", cval: uint64(2), expected: false}, + {rval: uint64(1), op: ">=", cval: uint64(0), expected: true}, + {rval: uint64(1), op: ">=", cval: uint64(1), expected: true}, + {rval: uint64(1), op: ">=", cval: uint64(2), expected: false}, + + // bool + {rval: true, op: "=", cval: true, expected: true}, + {rval: true, op: "=", cval: false, expected: false}, + {rval: true, op: "!=", cval: true, expected: false}, + {rval: true, op: "!=", cval: false, expected: true}, + + // time.Time + {rval: now, op: "=", cval: now.Add(-time.Second), expected: false}, + {rval: now, op: "=", cval: now, expected: true}, + {rval: now, op: "!=", cval: now.Add(-time.Second), expected: true}, + {rval: now, op: "!=", cval: now, expected: false}, + {rval: now, op: "<", cval: now.Add(-time.Second), expected: false}, + {rval: now, op: "<", cval: now, expected: false}, + {rval: now, op: "<", cval: now.Add(time.Second), expected: true}, + {rval: now, op: "<=", cval: now.Add(-time.Second), expected: false}, + {rval: now, op: "<=", cval: now, expected: true}, + {rval: now, op: "<=", cval: now.Add(time.Second), expected: true}, + {rval: now, op: ">", cval: now.Add(-time.Second), expected: true}, + {rval: now, op: ">", cval: now, expected: false}, + {rval: now, op: ">", cval: now.Add(time.Second), expected: false}, + {rval: now, op: ">=", cval: now.Add(-time.Second), expected: true}, + {rval: now, op: ">=", cval: now, expected: true}, + {rval: now, op: ">=", cval: now.Add(time.Second), expected: false}, + + // *string + {rval: nilptr("string"), op: "=", cval: nilptr("string"), expected: true}, + {rval: nilptr("string"), op: "=", cval: ptr("aaa"), expected: false}, + {rval: ptr("bbb"), op: "=", cval: nilptr("string"), expected: false}, + {rval: ptr("bbb"), op: "=", cval: ptr("aaa"), expected: false}, + {rval: ptr("bbb"), op: "=", cval: ptr("bbb"), expected: true}, + {rval: nilptr("string"), op: "!=", cval: nilptr("string"), expected: false}, + {rval: nilptr("string"), op: "!=", cval: ptr("aaa"), expected: true}, + {rval: ptr("bbb"), op: "!=", cval: nilptr("string"), expected: true}, + {rval: ptr("bbb"), op: "!=", cval: ptr("aaa"), expected: true}, + {rval: ptr("bbb"), op: "!=", cval: ptr("bbb"), expected: false}, + {rval: nilptr("string"), op: "<", cval: nilptr("string"), expected: false}, + {rval: nilptr("string"), op: "<", cval: ptr("aaa"), expected: false}, + {rval: ptr("bbb"), op: "<", cval: nilptr("string"), expected: false}, + {rval: ptr("bbb"), op: "<", cval: ptr("aaa"), expected: false}, + {rval: ptr("bbb"), op: "<", cval: ptr("bbb"), expected: false}, + {rval: ptr("bbb"), op: "<", cval: ptr("ccc"), expected: true}, + {rval: nilptr("string"), op: "<=", cval: nilptr("string"), expected: false}, + {rval: nilptr("string"), op: "<=", cval: ptr("aaa"), expected: false}, + {rval: ptr("bbb"), op: "<=", cval: nilptr("string"), expected: false}, + {rval: ptr("bbb"), op: "<=", cval: ptr("aaa"), expected: false}, + {rval: ptr("bbb"), op: "<=", cval: ptr("bbb"), expected: true}, + {rval: ptr("bbb"), op: "<=", cval: ptr("ccc"), expected: true}, + {rval: nilptr("string"), op: ">", cval: nilptr("string"), expected: false}, + {rval: nilptr("string"), op: ">", cval: ptr("aaa"), expected: false}, + {rval: ptr("bbb"), op: ">", cval: nilptr("string"), expected: false}, + {rval: ptr("bbb"), op: ">", cval: ptr("aaa"), expected: true}, + {rval: ptr("bbb"), op: ">", cval: ptr("bbb"), expected: false}, + {rval: ptr("bbb"), op: ">", cval: ptr("ccc"), expected: false}, + {rval: nilptr("string"), op: ">=", cval: nilptr("string"), expected: false}, + {rval: nilptr("string"), op: ">=", cval: ptr("aaa"), expected: false}, + {rval: ptr("bbb"), op: ">=", cval: nilptr("string"), expected: false}, + {rval: ptr("bbb"), op: ">=", cval: ptr("aaa"), expected: true}, + {rval: ptr("bbb"), op: ">=", cval: ptr("bbb"), expected: true}, + {rval: ptr("bbb"), op: ">=", cval: ptr("ccc"), expected: false}, + + // *int + {rval: nilptr("int"), op: "=", cval: nilptr("int"), expected: true}, + {rval: nilptr("int"), op: "=", cval: ptr(-1), expected: false}, + {rval: ptr(0), op: "=", cval: nilptr("int"), expected: false}, + {rval: ptr(0), op: "=", cval: ptr(-1), expected: false}, + {rval: ptr(0), op: "=", cval: ptr(0), expected: true}, + {rval: nilptr("int"), op: "!=", cval: nilptr("int"), expected: false}, + {rval: nilptr("int"), op: "!=", cval: ptr(-1), expected: true}, + {rval: ptr(0), op: "!=", cval: nilptr("int"), expected: true}, + {rval: ptr(0), op: "!=", cval: ptr(-1), expected: true}, + {rval: ptr(0), op: "!=", cval: ptr(0), expected: false}, + {rval: nilptr("int"), op: "<", cval: nilptr("int"), expected: false}, + {rval: nilptr("int"), op: "<", cval: ptr(-1), expected: false}, + {rval: ptr(0), op: "<", cval: nilptr("int"), expected: false}, + {rval: ptr(0), op: "<", cval: ptr(-1), expected: false}, + {rval: ptr(0), op: "<", cval: ptr(0), expected: false}, + {rval: ptr(0), op: "<", cval: ptr(1), expected: true}, + {rval: nilptr("int"), op: "<=", cval: nilptr("int"), expected: false}, + {rval: nilptr("int"), op: "<=", cval: ptr(-1), expected: false}, + {rval: ptr(0), op: "<=", cval: nilptr("int"), expected: false}, + {rval: ptr(0), op: "<=", cval: ptr(-1), expected: false}, + {rval: ptr(0), op: "<=", cval: ptr(0), expected: true}, + {rval: ptr(0), op: "<=", cval: ptr(1), expected: true}, + {rval: nilptr("int"), op: ">", cval: nilptr("int"), expected: false}, + {rval: nilptr("int"), op: ">", cval: ptr(-1), expected: false}, + {rval: ptr(0), op: ">", cval: nilptr("int"), expected: false}, + {rval: ptr(0), op: ">", cval: ptr(-1), expected: true}, + {rval: ptr(0), op: ">", cval: ptr(0), expected: false}, + {rval: ptr(0), op: ">", cval: ptr(1), expected: false}, + {rval: nilptr("int"), op: ">=", cval: nilptr("int"), expected: false}, + {rval: nilptr("int"), op: ">=", cval: ptr(-1), expected: false}, + {rval: ptr(0), op: ">=", cval: nilptr("int"), expected: false}, + {rval: ptr(0), op: ">=", cval: ptr(-1), expected: true}, + {rval: ptr(0), op: ">=", cval: ptr(0), expected: true}, + {rval: ptr(0), op: ">=", cval: ptr(1), expected: false}, + + // *int8 + {rval: nilptr("int8"), op: "=", cval: nilptr("int8"), expected: true}, + {rval: nilptr("int8"), op: "=", cval: ptr(int8(-1)), expected: false}, + {rval: ptr(int8(0)), op: "=", cval: nilptr("int8"), expected: false}, + {rval: ptr(int8(0)), op: "=", cval: ptr(int8(-1)), expected: false}, + {rval: ptr(int8(0)), op: "=", cval: ptr(int8(0)), expected: true}, + {rval: nilptr("int8"), op: "!=", cval: nilptr("int8"), expected: false}, + {rval: nilptr("int8"), op: "!=", cval: ptr(int8(-1)), expected: true}, + {rval: ptr(int8(0)), op: "!=", cval: nilptr("int8"), expected: true}, + {rval: ptr(int8(0)), op: "!=", cval: ptr(int8(-1)), expected: true}, + {rval: ptr(int8(0)), op: "!=", cval: ptr(int8(0)), expected: false}, + {rval: nilptr("int8"), op: "<", cval: nilptr("int8"), expected: false}, + {rval: nilptr("int8"), op: "<", cval: ptr(int8(-1)), expected: false}, + {rval: ptr(int8(0)), op: "<", cval: nilptr("int8"), expected: false}, + {rval: ptr(int8(0)), op: "<", cval: ptr(int8(-1)), expected: false}, + {rval: ptr(int8(0)), op: "<", cval: ptr(int8(0)), expected: false}, + {rval: ptr(int8(0)), op: "<", cval: ptr(int8(1)), expected: true}, + {rval: nilptr("int8"), op: "<=", cval: nilptr("int8"), expected: false}, + {rval: nilptr("int8"), op: "<=", cval: ptr(int8(-1)), expected: false}, + {rval: ptr(int8(0)), op: "<=", cval: nilptr("int8"), expected: false}, + {rval: ptr(int8(0)), op: "<=", cval: ptr(int8(-1)), expected: false}, + {rval: ptr(int8(0)), op: "<=", cval: ptr(int8(0)), expected: true}, + {rval: ptr(int8(0)), op: "<=", cval: ptr(int8(1)), expected: true}, + {rval: nilptr("int8"), op: ">", cval: nilptr("int8"), expected: false}, + {rval: nilptr("int8"), op: ">", cval: ptr(int8(-1)), expected: false}, + {rval: ptr(int8(0)), op: ">", cval: nilptr("int8"), expected: false}, + {rval: ptr(int8(0)), op: ">", cval: ptr(int8(-1)), expected: true}, + {rval: ptr(int8(0)), op: ">", cval: ptr(int8(0)), expected: false}, + {rval: ptr(int8(0)), op: ">", cval: ptr(int8(1)), expected: false}, + {rval: nilptr("int8"), op: ">=", cval: nilptr("int8"), expected: false}, + {rval: nilptr("int8"), op: ">=", cval: ptr(int8(-1)), expected: false}, + {rval: ptr(int8(0)), op: ">=", cval: nilptr("int8"), expected: false}, + {rval: ptr(int8(0)), op: ">=", cval: ptr(int8(-1)), expected: true}, + {rval: ptr(int8(0)), op: ">=", cval: ptr(int8(0)), expected: true}, + {rval: ptr(int8(0)), op: ">=", cval: ptr(int8(1)), expected: false}, + + // *int16 + {rval: nilptr("int16"), op: "=", cval: nilptr("int16"), expected: true}, + {rval: nilptr("int16"), op: "=", cval: ptr(int16(-1)), expected: false}, + {rval: ptr(int16(0)), op: "=", cval: nilptr("int16"), expected: false}, + {rval: ptr(int16(0)), op: "=", cval: ptr(int16(-1)), expected: false}, + {rval: ptr(int16(0)), op: "=", cval: ptr(int16(0)), expected: true}, + {rval: nilptr("int16"), op: "!=", cval: nilptr("int16"), expected: false}, + {rval: nilptr("int16"), op: "!=", cval: ptr(int16(-1)), expected: true}, + {rval: ptr(int16(0)), op: "!=", cval: nilptr("int16"), expected: true}, + {rval: ptr(int16(0)), op: "!=", cval: ptr(int16(-1)), expected: true}, + {rval: ptr(int16(0)), op: "!=", cval: ptr(int16(0)), expected: false}, + {rval: nilptr("int16"), op: "<", cval: nilptr("int16"), expected: false}, + {rval: nilptr("int16"), op: "<", cval: ptr(int16(-1)), expected: false}, + {rval: ptr(int16(0)), op: "<", cval: nilptr("int16"), expected: false}, + {rval: ptr(int16(0)), op: "<", cval: ptr(int16(-1)), expected: false}, + {rval: ptr(int16(0)), op: "<", cval: ptr(int16(0)), expected: false}, + {rval: ptr(int16(0)), op: "<", cval: ptr(int16(1)), expected: true}, + {rval: nilptr("int16"), op: "<=", cval: nilptr("int16"), expected: false}, + {rval: nilptr("int16"), op: "<=", cval: ptr(int16(-1)), expected: false}, + {rval: ptr(int16(0)), op: "<=", cval: nilptr("int16"), expected: false}, + {rval: ptr(int16(0)), op: "<=", cval: ptr(int16(-1)), expected: false}, + {rval: ptr(int16(0)), op: "<=", cval: ptr(int16(0)), expected: true}, + {rval: ptr(int16(0)), op: "<=", cval: ptr(int16(1)), expected: true}, + {rval: nilptr("int16"), op: ">", cval: nilptr("int16"), expected: false}, + {rval: nilptr("int16"), op: ">", cval: ptr(int16(-1)), expected: false}, + {rval: ptr(int16(0)), op: ">", cval: nilptr("int16"), expected: false}, + {rval: ptr(int16(0)), op: ">", cval: ptr(int16(-1)), expected: true}, + {rval: ptr(int16(0)), op: ">", cval: ptr(int16(0)), expected: false}, + {rval: ptr(int16(0)), op: ">", cval: ptr(int16(1)), expected: false}, + {rval: nilptr("int16"), op: ">=", cval: nilptr("int16"), expected: false}, + {rval: nilptr("int16"), op: ">=", cval: ptr(int16(-1)), expected: false}, + {rval: ptr(int16(0)), op: ">=", cval: nilptr("int16"), expected: false}, + {rval: ptr(int16(0)), op: ">=", cval: ptr(int16(-1)), expected: true}, + {rval: ptr(int16(0)), op: ">=", cval: ptr(int16(0)), expected: true}, + {rval: ptr(int16(0)), op: ">=", cval: ptr(int16(1)), expected: false}, + + // *int32 + {rval: nilptr("int32"), op: "=", cval: nilptr("int32"), expected: true}, + {rval: nilptr("int32"), op: "=", cval: ptr(int32(-1)), expected: false}, + {rval: ptr(int32(0)), op: "=", cval: nilptr("int32"), expected: false}, + {rval: ptr(int32(0)), op: "=", cval: ptr(int32(-1)), expected: false}, + {rval: ptr(int32(0)), op: "=", cval: ptr(int32(0)), expected: true}, + {rval: nilptr("int32"), op: "!=", cval: nilptr("int32"), expected: false}, + {rval: nilptr("int32"), op: "!=", cval: ptr(int32(-1)), expected: true}, + {rval: ptr(int32(0)), op: "!=", cval: nilptr("int32"), expected: true}, + {rval: ptr(int32(0)), op: "!=", cval: ptr(int32(-1)), expected: true}, + {rval: ptr(int32(0)), op: "!=", cval: ptr(int32(0)), expected: false}, + {rval: nilptr("int32"), op: "<", cval: nilptr("int32"), expected: false}, + {rval: nilptr("int32"), op: "<", cval: ptr(int32(-1)), expected: false}, + {rval: ptr(int32(0)), op: "<", cval: nilptr("int32"), expected: false}, + {rval: ptr(int32(0)), op: "<", cval: ptr(int32(-1)), expected: false}, + {rval: ptr(int32(0)), op: "<", cval: ptr(int32(0)), expected: false}, + {rval: ptr(int32(0)), op: "<", cval: ptr(int32(1)), expected: true}, + {rval: nilptr("int32"), op: "<=", cval: nilptr("int32"), expected: false}, + {rval: nilptr("int32"), op: "<=", cval: ptr(int32(-1)), expected: false}, + {rval: ptr(int32(0)), op: "<=", cval: nilptr("int32"), expected: false}, + {rval: ptr(int32(0)), op: "<=", cval: ptr(int32(-1)), expected: false}, + {rval: ptr(int32(0)), op: "<=", cval: ptr(int32(0)), expected: true}, + {rval: ptr(int32(0)), op: "<=", cval: ptr(int32(1)), expected: true}, + {rval: nilptr("int32"), op: ">", cval: nilptr("int32"), expected: false}, + {rval: nilptr("int32"), op: ">", cval: ptr(int32(-1)), expected: false}, + {rval: ptr(int32(0)), op: ">", cval: nilptr("int32"), expected: false}, + {rval: ptr(int32(0)), op: ">", cval: ptr(int32(-1)), expected: true}, + {rval: ptr(int32(0)), op: ">", cval: ptr(int32(0)), expected: false}, + {rval: ptr(int32(0)), op: ">", cval: ptr(int32(1)), expected: false}, + {rval: nilptr("int32"), op: ">=", cval: nilptr("int32"), expected: false}, + {rval: nilptr("int32"), op: ">=", cval: ptr(int32(-1)), expected: false}, + {rval: ptr(int32(0)), op: ">=", cval: nilptr("int32"), expected: false}, + {rval: ptr(int32(0)), op: ">=", cval: ptr(int32(-1)), expected: true}, + {rval: ptr(int32(0)), op: ">=", cval: ptr(int32(0)), expected: true}, + {rval: ptr(int32(0)), op: ">=", cval: ptr(int32(1)), expected: false}, + + // *int64 + {rval: nilptr("int64"), op: "=", cval: nilptr("int64"), expected: true}, + {rval: nilptr("int64"), op: "=", cval: ptr(int64(-1)), expected: false}, + {rval: ptr(int64(0)), op: "=", cval: nilptr("int64"), expected: false}, + {rval: ptr(int64(0)), op: "=", cval: ptr(int64(-1)), expected: false}, + {rval: ptr(int64(0)), op: "=", cval: ptr(int64(0)), expected: true}, + {rval: nilptr("int64"), op: "!=", cval: nilptr("int64"), expected: false}, + {rval: nilptr("int64"), op: "!=", cval: ptr(int64(-1)), expected: true}, + {rval: ptr(int64(0)), op: "!=", cval: nilptr("int64"), expected: true}, + {rval: ptr(int64(0)), op: "!=", cval: ptr(int64(-1)), expected: true}, + {rval: ptr(int64(0)), op: "!=", cval: ptr(int64(0)), expected: false}, + {rval: nilptr("int64"), op: "<", cval: nilptr("int64"), expected: false}, + {rval: nilptr("int64"), op: "<", cval: ptr(int64(-1)), expected: false}, + {rval: ptr(int64(0)), op: "<", cval: nilptr("int64"), expected: false}, + {rval: ptr(int64(0)), op: "<", cval: ptr(int64(-1)), expected: false}, + {rval: ptr(int64(0)), op: "<", cval: ptr(int64(0)), expected: false}, + {rval: ptr(int64(0)), op: "<", cval: ptr(int64(1)), expected: true}, + {rval: nilptr("int64"), op: "<=", cval: nilptr("int64"), expected: false}, + {rval: nilptr("int64"), op: "<=", cval: ptr(int64(-1)), expected: false}, + {rval: ptr(int64(0)), op: "<=", cval: nilptr("int64"), expected: false}, + {rval: ptr(int64(0)), op: "<=", cval: ptr(int64(-1)), expected: false}, + {rval: ptr(int64(0)), op: "<=", cval: ptr(int64(0)), expected: true}, + {rval: ptr(int64(0)), op: "<=", cval: ptr(int64(1)), expected: true}, + {rval: nilptr("int64"), op: ">", cval: nilptr("int64"), expected: false}, + {rval: nilptr("int64"), op: ">", cval: ptr(int64(-1)), expected: false}, + {rval: ptr(int64(0)), op: ">", cval: nilptr("int64"), expected: false}, + {rval: ptr(int64(0)), op: ">", cval: ptr(int64(-1)), expected: true}, + {rval: ptr(int64(0)), op: ">", cval: ptr(int64(0)), expected: false}, + {rval: ptr(int64(0)), op: ">", cval: ptr(int64(1)), expected: false}, + {rval: nilptr("int64"), op: ">=", cval: nilptr("int64"), expected: false}, + {rval: nilptr("int64"), op: ">=", cval: ptr(int64(-1)), expected: false}, + {rval: ptr(int64(0)), op: ">=", cval: nilptr("int64"), expected: false}, + {rval: ptr(int64(0)), op: ">=", cval: ptr(int64(-1)), expected: true}, + {rval: ptr(int64(0)), op: ">=", cval: ptr(int64(0)), expected: true}, + {rval: ptr(int64(0)), op: ">=", cval: ptr(int64(1)), expected: false}, + + // *uint + {rval: nilptr("uint"), op: "=", cval: nilptr("uint"), expected: true}, + {rval: nilptr("uint"), op: "=", cval: ptr(uint(0)), expected: false}, + {rval: ptr(uint(1)), op: "=", cval: nilptr("uint"), expected: false}, + {rval: ptr(uint(1)), op: "=", cval: ptr(uint(0)), expected: false}, + {rval: ptr(uint(1)), op: "=", cval: ptr(uint(1)), expected: true}, + {rval: nilptr("uint"), op: "!=", cval: nilptr("uint"), expected: false}, + {rval: nilptr("uint"), op: "!=", cval: ptr(uint(0)), expected: true}, + {rval: ptr(uint(1)), op: "!=", cval: nilptr("uint"), expected: true}, + {rval: ptr(uint(1)), op: "!=", cval: ptr(uint(0)), expected: true}, + {rval: ptr(uint(1)), op: "!=", cval: ptr(uint(1)), expected: false}, + {rval: nilptr("uint"), op: "<", cval: nilptr("uint"), expected: false}, + {rval: nilptr("uint"), op: "<", cval: ptr(uint(0)), expected: false}, + {rval: ptr(uint(1)), op: "<", cval: nilptr("uint"), expected: false}, + {rval: ptr(uint(1)), op: "<", cval: ptr(uint(0)), expected: false}, + {rval: ptr(uint(1)), op: "<", cval: ptr(uint(1)), expected: false}, + {rval: ptr(uint(1)), op: "<", cval: ptr(uint(2)), expected: true}, + {rval: nilptr("uint"), op: "<=", cval: nilptr("uint"), expected: false}, + {rval: nilptr("uint"), op: "<=", cval: ptr(uint(0)), expected: false}, + {rval: ptr(uint(1)), op: "<=", cval: nilptr("uint"), expected: false}, + {rval: ptr(uint(1)), op: "<=", cval: ptr(uint(0)), expected: false}, + {rval: ptr(uint(1)), op: "<=", cval: ptr(uint(1)), expected: true}, + {rval: ptr(uint(1)), op: "<=", cval: ptr(uint(2)), expected: true}, + {rval: nilptr("uint"), op: ">", cval: nilptr("uint"), expected: false}, + {rval: nilptr("uint"), op: ">", cval: ptr(uint(0)), expected: false}, + {rval: ptr(uint(1)), op: ">", cval: nilptr("uint"), expected: false}, + {rval: ptr(uint(1)), op: ">", cval: ptr(uint(0)), expected: true}, + {rval: ptr(uint(1)), op: ">", cval: ptr(uint(1)), expected: false}, + {rval: ptr(uint(1)), op: ">", cval: ptr(uint(2)), expected: false}, + {rval: nilptr("uint"), op: ">=", cval: nilptr("uint"), expected: false}, + {rval: nilptr("uint"), op: ">=", cval: ptr(uint(0)), expected: false}, + {rval: ptr(uint(1)), op: ">=", cval: nilptr("uint"), expected: false}, + {rval: ptr(uint(1)), op: ">=", cval: ptr(uint(0)), expected: true}, + {rval: ptr(uint(1)), op: ">=", cval: ptr(uint(1)), expected: true}, + {rval: ptr(uint(1)), op: ">=", cval: ptr(uint(2)), expected: false}, + + // *uint8 + {rval: nilptr("uint8"), op: "=", cval: nilptr("uint8"), expected: true}, + {rval: nilptr("uint8"), op: "=", cval: ptr(uint8(0)), expected: false}, + {rval: ptr(uint8(1)), op: "=", cval: nilptr("uint8"), expected: false}, + {rval: ptr(uint8(1)), op: "=", cval: ptr(uint8(0)), expected: false}, + {rval: ptr(uint8(1)), op: "=", cval: ptr(uint8(1)), expected: true}, + {rval: nilptr("uint8"), op: "!=", cval: nilptr("uint8"), expected: false}, + {rval: nilptr("uint8"), op: "!=", cval: ptr(uint8(0)), expected: true}, + {rval: ptr(uint8(1)), op: "!=", cval: nilptr("uint8"), expected: true}, + {rval: ptr(uint8(1)), op: "!=", cval: ptr(uint8(0)), expected: true}, + {rval: ptr(uint8(1)), op: "!=", cval: ptr(uint8(1)), expected: false}, + {rval: nilptr("uint8"), op: "<", cval: nilptr("uint8"), expected: false}, + {rval: nilptr("uint8"), op: "<", cval: ptr(uint8(0)), expected: false}, + {rval: ptr(uint8(1)), op: "<", cval: nilptr("uint8"), expected: false}, + {rval: ptr(uint8(1)), op: "<", cval: ptr(uint8(0)), expected: false}, + {rval: ptr(uint8(1)), op: "<", cval: ptr(uint8(1)), expected: false}, + {rval: ptr(uint8(1)), op: "<", cval: ptr(uint8(2)), expected: true}, + {rval: nilptr("uint8"), op: "<=", cval: nilptr("uint8"), expected: false}, + {rval: nilptr("uint8"), op: "<=", cval: ptr(uint8(0)), expected: false}, + {rval: ptr(uint8(1)), op: "<=", cval: nilptr("uint8"), expected: false}, + {rval: ptr(uint8(1)), op: "<=", cval: ptr(uint8(0)), expected: false}, + {rval: ptr(uint8(1)), op: "<=", cval: ptr(uint8(1)), expected: true}, + {rval: ptr(uint8(1)), op: "<=", cval: ptr(uint8(2)), expected: true}, + {rval: nilptr("uint8"), op: ">", cval: nilptr("uint8"), expected: false}, + {rval: nilptr("uint8"), op: ">", cval: ptr(uint8(0)), expected: false}, + {rval: ptr(uint8(1)), op: ">", cval: nilptr("uint8"), expected: false}, + {rval: ptr(uint8(1)), op: ">", cval: ptr(uint8(0)), expected: true}, + {rval: ptr(uint8(1)), op: ">", cval: ptr(uint8(1)), expected: false}, + {rval: ptr(uint8(1)), op: ">", cval: ptr(uint8(2)), expected: false}, + {rval: nilptr("uint8"), op: ">=", cval: nilptr("uint8"), expected: false}, + {rval: nilptr("uint8"), op: ">=", cval: ptr(uint8(0)), expected: false}, + {rval: ptr(uint8(1)), op: ">=", cval: nilptr("uint8"), expected: false}, + {rval: ptr(uint8(1)), op: ">=", cval: ptr(uint8(0)), expected: true}, + {rval: ptr(uint8(1)), op: ">=", cval: ptr(uint8(1)), expected: true}, + {rval: ptr(uint8(1)), op: ">=", cval: ptr(uint8(2)), expected: false}, + + // *uint16 + {rval: nilptr("uint16"), op: "=", cval: nilptr("uint16"), expected: true}, + {rval: nilptr("uint16"), op: "=", cval: ptr(uint16(0)), expected: false}, + {rval: ptr(uint16(1)), op: "=", cval: nilptr("uint16"), expected: false}, + {rval: ptr(uint16(1)), op: "=", cval: ptr(uint16(0)), expected: false}, + {rval: ptr(uint16(1)), op: "=", cval: ptr(uint16(1)), expected: true}, + {rval: nilptr("uint16"), op: "!=", cval: nilptr("uint16"), expected: false}, + {rval: nilptr("uint16"), op: "!=", cval: ptr(uint16(0)), expected: true}, + {rval: ptr(uint16(1)), op: "!=", cval: nilptr("uint16"), expected: true}, + {rval: ptr(uint16(1)), op: "!=", cval: ptr(uint16(0)), expected: true}, + {rval: ptr(uint16(1)), op: "!=", cval: ptr(uint16(1)), expected: false}, + {rval: nilptr("uint16"), op: "<", cval: nilptr("uint16"), expected: false}, + {rval: nilptr("uint16"), op: "<", cval: ptr(uint16(0)), expected: false}, + {rval: ptr(uint16(1)), op: "<", cval: nilptr("uint16"), expected: false}, + {rval: ptr(uint16(1)), op: "<", cval: ptr(uint16(0)), expected: false}, + {rval: ptr(uint16(1)), op: "<", cval: ptr(uint16(1)), expected: false}, + {rval: ptr(uint16(1)), op: "<", cval: ptr(uint16(2)), expected: true}, + {rval: nilptr("uint16"), op: "<=", cval: nilptr("uint16"), expected: false}, + {rval: nilptr("uint16"), op: "<=", cval: ptr(uint16(0)), expected: false}, + {rval: ptr(uint16(1)), op: "<=", cval: nilptr("uint16"), expected: false}, + {rval: ptr(uint16(1)), op: "<=", cval: ptr(uint16(0)), expected: false}, + {rval: ptr(uint16(1)), op: "<=", cval: ptr(uint16(1)), expected: true}, + {rval: ptr(uint16(1)), op: "<=", cval: ptr(uint16(2)), expected: true}, + {rval: nilptr("uint16"), op: ">", cval: nilptr("uint16"), expected: false}, + {rval: nilptr("uint16"), op: ">", cval: ptr(uint16(0)), expected: false}, + {rval: ptr(uint16(1)), op: ">", cval: nilptr("uint16"), expected: false}, + {rval: ptr(uint16(1)), op: ">", cval: ptr(uint16(0)), expected: true}, + {rval: ptr(uint16(1)), op: ">", cval: ptr(uint16(1)), expected: false}, + {rval: ptr(uint16(1)), op: ">", cval: ptr(uint16(2)), expected: false}, + {rval: nilptr("uint16"), op: ">=", cval: nilptr("uint16"), expected: false}, + {rval: nilptr("uint16"), op: ">=", cval: ptr(uint16(0)), expected: false}, + {rval: ptr(uint16(1)), op: ">=", cval: nilptr("uint16"), expected: false}, + {rval: ptr(uint16(1)), op: ">=", cval: ptr(uint16(0)), expected: true}, + {rval: ptr(uint16(1)), op: ">=", cval: ptr(uint16(1)), expected: true}, + {rval: ptr(uint16(1)), op: ">=", cval: ptr(uint16(2)), expected: false}, + + // *uint32 + {rval: nilptr("uint32"), op: "=", cval: nilptr("uint32"), expected: true}, + {rval: nilptr("uint32"), op: "=", cval: ptr(uint32(0)), expected: false}, + {rval: ptr(uint32(1)), op: "=", cval: nilptr("uint32"), expected: false}, + {rval: ptr(uint32(1)), op: "=", cval: ptr(uint32(0)), expected: false}, + {rval: ptr(uint32(1)), op: "=", cval: ptr(uint32(1)), expected: true}, + {rval: nilptr("uint32"), op: "!=", cval: nilptr("uint32"), expected: false}, + {rval: nilptr("uint32"), op: "!=", cval: ptr(uint32(0)), expected: true}, + {rval: ptr(uint32(1)), op: "!=", cval: nilptr("uint32"), expected: true}, + {rval: ptr(uint32(1)), op: "!=", cval: ptr(uint32(0)), expected: true}, + {rval: ptr(uint32(1)), op: "!=", cval: ptr(uint32(1)), expected: false}, + {rval: nilptr("uint32"), op: "<", cval: nilptr("uint32"), expected: false}, + {rval: nilptr("uint32"), op: "<", cval: ptr(uint32(0)), expected: false}, + {rval: ptr(uint32(1)), op: "<", cval: nilptr("uint32"), expected: false}, + {rval: ptr(uint32(1)), op: "<", cval: ptr(uint32(0)), expected: false}, + {rval: ptr(uint32(1)), op: "<", cval: ptr(uint32(1)), expected: false}, + {rval: ptr(uint32(1)), op: "<", cval: ptr(uint32(2)), expected: true}, + {rval: nilptr("uint32"), op: "<=", cval: nilptr("uint32"), expected: false}, + {rval: nilptr("uint32"), op: "<=", cval: ptr(uint32(0)), expected: false}, + {rval: ptr(uint32(1)), op: "<=", cval: nilptr("uint32"), expected: false}, + {rval: ptr(uint32(1)), op: "<=", cval: ptr(uint32(0)), expected: false}, + {rval: ptr(uint32(1)), op: "<=", cval: ptr(uint32(1)), expected: true}, + {rval: ptr(uint32(1)), op: "<=", cval: ptr(uint32(2)), expected: true}, + {rval: nilptr("uint32"), op: ">", cval: nilptr("uint32"), expected: false}, + {rval: nilptr("uint32"), op: ">", cval: ptr(uint32(0)), expected: false}, + {rval: ptr(uint32(1)), op: ">", cval: nilptr("uint32"), expected: false}, + {rval: ptr(uint32(1)), op: ">", cval: ptr(uint32(0)), expected: true}, + {rval: ptr(uint32(1)), op: ">", cval: ptr(uint32(1)), expected: false}, + {rval: ptr(uint32(1)), op: ">", cval: ptr(uint32(2)), expected: false}, + {rval: nilptr("uint32"), op: ">=", cval: nilptr("uint32"), expected: false}, + {rval: nilptr("uint32"), op: ">=", cval: ptr(uint32(0)), expected: false}, + {rval: ptr(uint32(1)), op: ">=", cval: nilptr("uint32"), expected: false}, + {rval: ptr(uint32(1)), op: ">=", cval: ptr(uint32(0)), expected: true}, + {rval: ptr(uint32(1)), op: ">=", cval: ptr(uint32(1)), expected: true}, + {rval: ptr(uint32(1)), op: ">=", cval: ptr(uint32(2)), expected: false}, + + // *uint64 + {rval: nilptr("uint64"), op: "=", cval: nilptr("uint64"), expected: true}, + {rval: nilptr("uint64"), op: "=", cval: ptr(uint64(0)), expected: false}, + {rval: ptr(uint64(1)), op: "=", cval: nilptr("uint64"), expected: false}, + {rval: ptr(uint64(1)), op: "=", cval: ptr(uint64(0)), expected: false}, + {rval: ptr(uint64(1)), op: "=", cval: ptr(uint64(1)), expected: true}, + {rval: nilptr("uint64"), op: "!=", cval: nilptr("uint64"), expected: false}, + {rval: nilptr("uint64"), op: "!=", cval: ptr(uint64(0)), expected: true}, + {rval: ptr(uint64(1)), op: "!=", cval: nilptr("uint64"), expected: true}, + {rval: ptr(uint64(1)), op: "!=", cval: ptr(uint64(0)), expected: true}, + {rval: ptr(uint64(1)), op: "!=", cval: ptr(uint64(1)), expected: false}, + {rval: nilptr("uint64"), op: "<", cval: nilptr("uint64"), expected: false}, + {rval: nilptr("uint64"), op: "<", cval: ptr(uint64(0)), expected: false}, + {rval: ptr(uint64(1)), op: "<", cval: nilptr("uint64"), expected: false}, + {rval: ptr(uint64(1)), op: "<", cval: ptr(uint64(0)), expected: false}, + {rval: ptr(uint64(1)), op: "<", cval: ptr(uint64(1)), expected: false}, + {rval: ptr(uint64(1)), op: "<", cval: ptr(uint64(2)), expected: true}, + {rval: nilptr("uint64"), op: "<=", cval: nilptr("uint64"), expected: false}, + {rval: nilptr("uint64"), op: "<=", cval: ptr(uint64(0)), expected: false}, + {rval: ptr(uint64(1)), op: "<=", cval: nilptr("uint64"), expected: false}, + {rval: ptr(uint64(1)), op: "<=", cval: ptr(uint64(0)), expected: false}, + {rval: ptr(uint64(1)), op: "<=", cval: ptr(uint64(1)), expected: true}, + {rval: ptr(uint64(1)), op: "<=", cval: ptr(uint64(2)), expected: true}, + {rval: nilptr("uint64"), op: ">", cval: nilptr("uint64"), expected: false}, + {rval: nilptr("uint64"), op: ">", cval: ptr(uint64(0)), expected: false}, + {rval: ptr(uint64(1)), op: ">", cval: nilptr("uint64"), expected: false}, + {rval: ptr(uint64(1)), op: ">", cval: ptr(uint64(0)), expected: true}, + {rval: ptr(uint64(1)), op: ">", cval: ptr(uint64(1)), expected: false}, + {rval: ptr(uint64(1)), op: ">", cval: ptr(uint64(2)), expected: false}, + {rval: nilptr("uint64"), op: ">=", cval: nilptr("uint64"), expected: false}, + {rval: nilptr("uint64"), op: ">=", cval: ptr(uint64(0)), expected: false}, + {rval: ptr(uint64(1)), op: ">=", cval: nilptr("uint64"), expected: false}, + {rval: ptr(uint64(1)), op: ">=", cval: ptr(uint64(0)), expected: true}, + {rval: ptr(uint64(1)), op: ">=", cval: ptr(uint64(1)), expected: true}, + {rval: ptr(uint64(1)), op: ">=", cval: ptr(uint64(2)), expected: false}, + + // *bool + {rval: nilptr("bool"), op: "=", cval: nilptr("bool"), expected: true}, + {rval: nilptr("bool"), op: "=", cval: ptr(false), expected: false}, + {rval: ptr(true), op: "=", cval: nilptr("bool"), expected: false}, + {rval: ptr(true), op: "=", cval: ptr(true), expected: true}, + {rval: ptr(true), op: "=", cval: ptr(false), expected: false}, + {rval: nilptr("bool"), op: "!=", cval: nilptr("bool"), expected: false}, + {rval: nilptr("bool"), op: "!=", cval: ptr(false), expected: true}, + {rval: ptr(true), op: "!=", cval: nilptr("bool"), expected: true}, + {rval: ptr(true), op: "!=", cval: ptr(true), expected: false}, + {rval: ptr(true), op: "!=", cval: ptr(false), expected: true}, + + // *time.Time + {rval: nilptr("time.Time"), op: "=", cval: nilptr("time.Time"), expected: true}, + {rval: nilptr("time.Time"), op: "=", cval: ptr(now), expected: false}, + {rval: ptr(now), op: "=", cval: nilptr("time.Time"), expected: false}, + {rval: ptr(now), op: "=", cval: ptr(now.Add(-time.Second)), expected: false}, + {rval: ptr(now), op: "=", cval: ptr(now), expected: true}, + {rval: nilptr("time.Time"), op: "!=", cval: nilptr("time.Time"), expected: false}, + {rval: nilptr("time.Time"), op: "!=", cval: ptr(now), expected: true}, + {rval: ptr(now), op: "!=", cval: nilptr("time.Time"), expected: true}, + {rval: ptr(now), op: "!=", cval: ptr(now.Add(-time.Second)), expected: true}, + {rval: ptr(now), op: "!=", cval: ptr(now), expected: false}, + {rval: nilptr("time.Time"), op: "<", cval: nilptr("time.Time"), expected: false}, + {rval: nilptr("time.Time"), op: "<", cval: ptr(now), expected: false}, + {rval: ptr(now), op: "<", cval: nilptr("time.Time"), expected: false}, + {rval: ptr(now), op: "<", cval: ptr(now.Add(-time.Second)), expected: false}, + {rval: ptr(now), op: "<", cval: ptr(now), expected: false}, + {rval: ptr(now), op: "<", cval: ptr(now.Add(time.Second)), expected: true}, + {rval: nilptr("time.Time"), op: "<=", cval: nilptr("time.Time"), expected: false}, + {rval: nilptr("time.Time"), op: "<=", cval: ptr(now), expected: false}, + {rval: ptr(now), op: "<=", cval: nilptr("time.Time"), expected: false}, + {rval: ptr(now), op: "<=", cval: ptr(now.Add(-time.Second)), expected: false}, + {rval: ptr(now), op: "<=", cval: ptr(now), expected: true}, + {rval: ptr(now), op: "<=", cval: ptr(now.Add(time.Second)), expected: true}, + {rval: nilptr("time.Time"), op: ">", cval: nilptr("time.Time"), expected: false}, + {rval: nilptr("time.Time"), op: ">", cval: ptr(now), expected: false}, + {rval: ptr(now), op: ">", cval: nilptr("time.Time"), expected: false}, + {rval: ptr(now), op: ">", cval: ptr(now.Add(-time.Second)), expected: true}, + {rval: ptr(now), op: ">", cval: ptr(now), expected: false}, + {rval: ptr(now), op: ">", cval: ptr(now.Add(time.Second)), expected: false}, + {rval: nilptr("time.Time"), op: ">=", cval: nilptr("time.Time"), expected: false}, + {rval: nilptr("time.Time"), op: ">=", cval: ptr(now), expected: false}, + {rval: ptr(now), op: ">=", cval: nilptr("time.Time"), expected: false}, + {rval: ptr(now), op: ">=", cval: ptr(now.Add(-time.Second)), expected: true}, + {rval: ptr(now), op: ">=", cval: ptr(now), expected: true}, + {rval: ptr(now), op: ">=", cval: ptr(now.Add(time.Second)), expected: false}, + } + + for _, test := range attrTests { + typ := &Type{Name: "type"} + ty, n := GetAttrType(fmt.Sprintf("%T", test.rval)) + typ.Attrs = map[string]Attr{ + "attr": Attr{ + Name: "attr", + Type: ty, + Null: n, + }, + } + + res := &SoftResource{} + res.SetType(typ) + res.Set("attr", test.rval) + + filter := &Filter{ + Field: "attr", + Op: test.op, + Val: test.cval, + } + + assert.Equal( + test.expected, + FilterResource(res, filter), + fmt.Sprintf("%v %s %v should be %v", test.rval, test.op, test.cval, test.expected), + ) + } + + // Tests for relationships + relTests := []struct { + rval interface{} + op string + cval interface{} + expected bool + }{ + // to-one + {rval: "id1", op: "=", cval: "id1", expected: true}, + {rval: "id1", op: "=", cval: "id2", expected: false}, + {rval: "id1", op: "!=", cval: "id1", expected: false}, + {rval: "id1", op: "!=", cval: "id2", expected: true}, + {rval: "id1", op: "in", cval: []string{"id1"}, expected: true}, + {rval: "id1", op: "in", cval: []string{"id2"}, expected: false}, + {rval: "id1", op: "in", cval: []string{"id1", "id2"}, expected: true}, + {rval: "id1", op: "in", cval: []string{"id2", "id3"}, expected: false}, + + // to-many + {rval: []string{"id1"}, op: "=", cval: []string{"id1"}, expected: true}, + {rval: []string{"id1"}, op: "=", cval: []string{"id2"}, expected: false}, + {rval: []string{"id1"}, op: "=", cval: []string{"id1, id2"}, expected: false}, + {rval: []string{"id1", "id2"}, op: "=", cval: []string{"id1", "id2"}, expected: true}, + {rval: []string{"id1", "id2"}, op: "=", cval: []string{"id1", "id3"}, expected: false}, + {rval: []string{"id1"}, op: "!=", cval: []string{"id1"}, expected: false}, + {rval: []string{"id1"}, op: "!=", cval: []string{"id2"}, expected: true}, + {rval: []string{"id1"}, op: "!=", cval: []string{"id1, id2"}, expected: true}, + {rval: []string{"id1", "id2"}, op: "!=", cval: []string{"id1", "id2"}, expected: false}, + {rval: []string{"id1", "id2"}, op: "!=", cval: []string{"id1", "id3"}, expected: true}, + {rval: []string{"id1"}, op: "has", cval: "id1", expected: true}, + {rval: []string{"id2"}, op: "has", cval: "id1", expected: false}, + {rval: []string{"id1", "id2"}, op: "has", cval: "id1", expected: true}, + {rval: []string{"id2", "id3"}, op: "has", cval: "id1", expected: false}, + } + + for _, test := range relTests { + typ := &Type{Name: "type"} + toOne := true + if _, ok := test.rval.([]string); ok { + toOne = false + } + // ty, n := GetAttrType(fmt.Sprintf("%T", test.rval)) + typ.Rels = map[string]Rel{ + "rel": Rel{ + Name: "rel", + Type: "type", + ToOne: toOne, + }, + } + + res := &SoftResource{} + res.SetType(typ) + if toOne { + res.SetToOne("rel", test.rval.(string)) + } else { + res.SetToMany("rel", test.rval.([]string)) + } + + filter := &Filter{ + Field: "rel", + Op: test.op, + Val: test.cval, + } + + assert.Equal( + test.expected, + FilterResource(res, filter), + fmt.Sprintf("%v %s %v should be %v", test.cval, test.op, test.rval, test.expected), + ) + } + + // Tests for "and" and "or" + andOrTests := []struct { + rvals []interface{} + ops []string + cvals []interface{} + expectedAnd bool + expectedOr bool + }{ + { + rvals: []interface{}{"abc", 1, true, now}, + ops: []string{"=", "=", "=", "="}, + cvals: []interface{}{"abc", 1, true, now}, + expectedAnd: true, + expectedOr: true, + }, { + rvals: []interface{}{"abc", 1, false, now}, + ops: []string{"=", "=", "=", "="}, + cvals: []interface{}{"abc", 1, true, now}, + expectedAnd: false, + expectedOr: true, + }, { + rvals: []interface{}{"abc", 1, false, now}, + ops: []string{"=", "!=", "!=", "="}, + cvals: []interface{}{"abc", 2, true, now}, + expectedAnd: true, + expectedOr: true, + }, { + rvals: []interface{}{"abc", 1, false, now}, + ops: []string{"=", "!=", "=", "!="}, + cvals: []interface{}{"def", 1, true, now}, + expectedAnd: false, + expectedOr: false, + }, + } + + for i, test := range andOrTests { + typ := &Type{Name: "type"} + res := &SoftResource{} + res.SetType(typ) + filters := []*Filter{} + + for j := range test.rvals { + attrName := "attr" + strconv.Itoa(j) + ty, n := GetAttrType(fmt.Sprintf("%T", test.rvals[j])) + typ.AddAttr( + Attr{ + Name: attrName, + Type: ty, + Null: n, + }, + ) + + res.Set(attrName, test.rvals[j]) + + filters = append(filters, &Filter{ + Field: attrName, + Op: test.ops[j], + Val: test.cvals[j], + }) + } + + filter := &Filter{ + Val: filters, + } + + filter.Op = "and" + // filter = marshalUnmarshalFilter(t, filter) + result := FilterResource(res, filter) + assert.Equal( + test.expectedAnd, + result, + fmt.Sprintf("'and' test %d is %t instead of %t", i, result, test.expectedAnd), + ) + + filter.Op = "or" + // filter = marshalUnmarshalFilter(t, filter) + result = FilterResource(res, filter) + assert.Equal( + test.expectedOr, + result, + fmt.Sprintf("'or' test %d is %t instead of %t", i, result, test.expectedOr), + ) + } +} + +func TestFilterMarshaling(t *testing.T) { assert := assert.New(t) // time1, _ := time.Parse(time.RFC3339Nano, "2012-05-16T17:45:28.2539Z") // time2, _ := time.Parse(time.RFC3339Nano, "2013-06-24T22:03:34.8276Z") tests := []struct { - name string - query string - expectedCondition Condition - expectedError bool + name string + query string + expectedFilter Filter + expectedError bool }{ { name: "empty", @@ -40,7 +904,7 @@ func TestFilterQuery(t *testing.T) { "o": "=", "v": "string" }`, - expectedCondition: Condition{ + expectedFilter: Filter{ Field: "field", Op: "=", Val: "string", @@ -51,13 +915,13 @@ func TestFilterQuery(t *testing.T) { } for _, test := range tests { - cdt := Condition{} + cdt := Filter{} err := json.Unmarshal([]byte(test.query), &cdt) assert.Equal(test.expectedError, err != nil, test.name) if !test.expectedError { - assert.Equal(test.expectedCondition, cdt, test.name) + assert.Equal(test.expectedFilter, cdt, test.name) data, err := json.Marshal(&cdt) assert.NoError(err, test.name) @@ -67,75 +931,110 @@ func TestFilterQuery(t *testing.T) { } // Test marshaling error - _, err := json.Marshal(&Condition{ + _, err := json.Marshal(&Filter{ Op: "=", Val: func() {}, }) assert.Equal(true, err != nil, "function as value") - _, err = json.Marshal(&Condition{ + _, err = json.Marshal(&Filter{ Op: "", Val: "", }) assert.Equal(false, err != nil, "empty operation and value") // TODO } -func BenchmarkMarshalFilterQuery(b *testing.B) { - cdt := Condition{ - Op: "or", - Val: []Condition{ - { - Op: "in", - Val: []string{"a", "b", "c"}, - }, - { - Op: "and", - Val: []Condition{ - { - Op: "~", - Val: "%a", - }, - { - Op: ">=", - Val: "u", - }, - }, - }, - }, - } - - var ( - data []byte - err error - ) - - for n := 0; n < b.N; n++ { - data, err = json.Marshal(cdt) +func ptr(v interface{}) interface{} { + switch c := v.(type) { + // String + case string: + return &c + // Integers + case int: + return &c + case int8: + return &c + case int16: + return &c + case int32: + return &c + case int64: + return &c + case uint: + return &c + case uint8: + return &c + case uint16: + return &c + case uint32: + return &c + case uint64: + return &c + // Bool + case bool: + return &c + // time.Time + case time.Time: + return &c } - - fmt.Fprintf(ioutil.Discard, "%v %v", data, err) + return nil } -func BenchmarkUnmarshalFilterQuery(b *testing.B) { - query := []byte(` - { "or": [ - { "in": ["a", "b", "c"] }, - { "and": [ - { "~": "%a" }, - { "\u003e=": "u" } - ] } - ] } - `) - - var ( - cdt Condition - err error - ) - - for n := 0; n < b.N; n++ { - cdt = Condition{} - err = json.Unmarshal(query, &cdt) +func nilptr(t string) interface{} { + switch t { + // String + case "string": + var p *string + return p + // Integers + case "int": + var p *int + return p + case "int8": + var p *int8 + return p + case "int16": + var p *int16 + return p + case "int32": + var p *int32 + return p + case "int64": + var p *int64 + return p + case "uint": + var p *uint + return p + case "uint8": + var p *uint8 + return p + case "uint16": + var p *uint16 + return p + case "uint32": + var p *uint32 + return p + case "uint64": + var p *uint64 + return p + // Bool + case "bool": + var p *bool + return p + // time.Time + case "time.Time": + var p *time.Time + return p } - - fmt.Fprintf(ioutil.Discard, "%v %v", cdt, err) + return nil } + +// func marshalUnmarshalFilter(t *testing.T, f *Filter) *Filter { +// payload, err := json.MarshalIndent(f, "", "\t") +// assert.NoError(t, err) +// var f2 Filter +// err = json.Unmarshal(payload, &f2) +// assert.NoError(t, err) +// assert.NotNil(t, f2) +// return &f2 +// } diff --git a/params.go b/params.go index d762f38..51f4021 100644 --- a/params.go +++ b/params.go @@ -16,7 +16,7 @@ type Params struct { // Filter FilterLabel string - Filter *Condition + Filter *Filter // Sorting SortingRules []string diff --git a/simple_url.go b/simple_url.go index 767acf7..f8e8d67 100644 --- a/simple_url.go +++ b/simple_url.go @@ -21,7 +21,7 @@ type SimpleURL struct { // Params Fields map[string][]string FilterLabel string - Filter *Condition + Filter *Filter SortingRules []string PageSize int PageNumber int diff --git a/soft_collection.go b/soft_collection.go index ebc5076..572b853 100644 --- a/soft_collection.go +++ b/soft_collection.go @@ -57,7 +57,7 @@ func (s *SoftCollection) Resource(id string, fields []string) Resource { // Range returns a subset of the collection arranged according to the // given parameters. -func (s *SoftCollection) Range(ids []string, _ *Condition, sort []string, fields []string, pageSize uint, pageNumber uint) []Resource { +func (s *SoftCollection) Range(ids []string, _ *Filter, sort []string, fields []string, pageSize uint, pageNumber uint) []Resource { s.Lock() defer s.Unlock() From b4de6b11674af70fdc93b44a9852b55118e6d6de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 24 Jun 2019 15:42:01 -0400 Subject: [PATCH 065/406] Add codecov.yml --- codecov.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 codecov.yml diff --git a/codecov.yml b/codecov.yml new file mode 100644 index 0000000..ce33bf1 --- /dev/null +++ b/codecov.yml @@ -0,0 +1 @@ +comment: off \ No newline at end of file From fcdcc4a2edd1a2eca3241a22cc55caeccf69bc89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 24 Jun 2019 15:43:22 -0400 Subject: [PATCH 066/406] Rename codecov.yml to .codecov.yml --- codecov.yml => .codecov.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename codecov.yml => .codecov.yml (100%) diff --git a/codecov.yml b/.codecov.yml similarity index 100% rename from codecov.yml rename to .codecov.yml From ce42370de4322a0f51bbd75b93383c914828a220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 24 Jun 2019 15:49:27 -0400 Subject: [PATCH 067/406] Fix key building bug in Document.Include --- document.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/document.go b/document.go index 8ff54f5..4a11324 100644 --- a/document.go +++ b/document.go @@ -41,7 +41,7 @@ func NewDocument() *Document { // // It also makes sure that resources are not added twice. func (d *Document) Include(res Resource) { - key := res.GetType().Name + " " + res.GetID() + key := res.GetID() + " " + res.GetType().Name if len(d.Included) == 0 { d.Included = map[string]Resource{} From d6d06930b3e9d9dc36ab6ee455d7511b868c3ea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 24 Jun 2019 16:15:37 -0400 Subject: [PATCH 068/406] Make sure that SoftCollection implements Collection This requires making a Type method that returns the name of the collection's type. To make the rest of the code work (especially the test suite), create other methods to set and get the collection's type. --- soft_collection.go | 26 +++++++++++++++++++++----- soft_collection_test.go | 25 ++++++++++++------------- 2 files changed, 33 insertions(+), 18 deletions(-) diff --git a/soft_collection.go b/soft_collection.go index 572b853..e49635a 100644 --- a/soft_collection.go +++ b/soft_collection.go @@ -8,25 +8,41 @@ import ( "time" ) +var _ Collection = (*SoftCollection)(nil) + // SoftCollection is a collection of SoftResources where the type can // be changed for all elements at once by modifying the Type field. type SoftCollection struct { - Type *Type - + typ *Type col []*SoftResource sort []string sync.Mutex } +// SetType sets the collection's type. +func (s *SoftCollection) SetType(typ *Type) { + s.typ = typ +} + +// GetType returns the collection's type. +func (s *SoftCollection) GetType() *Type { + return s.typ +} + +// Type returns the collection's type name. +func (s *SoftCollection) Type() string { + return s.typ.Name +} + // AddAttr adds an attribute to all of the resources in the collection. func (s *SoftCollection) AddAttr(attr Attr) error { - return s.Type.AddAttr(attr) + return s.typ.AddAttr(attr) } // AddRel adds a relationship to all of the resources in the collection. func (s *SoftCollection) AddRel(rel Rel) error { - return s.Type.AddRel(rel) + return s.typ.AddRel(rel) } @@ -110,7 +126,7 @@ func (s *SoftCollection) Add(r Resource) { // then it is added to the collection. sr := &SoftResource{} sr.id = r.GetID() - sr.typ = s.Type + sr.typ = s.typ for _, attr := range r.Attrs() { sr.AddAttr(attr) diff --git a/soft_collection_test.go b/soft_collection_test.go index 2380557..f9fac9b 100644 --- a/soft_collection_test.go +++ b/soft_collection_test.go @@ -45,9 +45,9 @@ func TestSoftCollection(t *testing.T) { // Make a copy so that modifying the original typ // does not modify the SoftCollection's type. typcopy := copystructure.Must(copystructure.Copy(typ)).(Type) - sc.Type = &typcopy + sc.SetType(&typcopy) - assert.Equal(t, sc.Type, &typ) + assert.Equal(t, sc.GetType(), &typ) // Modify the SoftCollection's type and the local type // at the same time and check whether they still are @@ -70,7 +70,7 @@ func TestSoftCollection(t *testing.T) { typ.AddRel(rel5) sc.AddRel(rel5) - assert.Equal(t, sc.Type, &typ) + assert.Equal(t, sc.GetType(), &typ) // Add a SoftResource with more fields than those // specified in the SoftCollection. @@ -95,7 +95,7 @@ func TestSoftCollection(t *testing.T) { sc.Add(sr) - assert.Equal(t, sc.Type, &typ) + assert.Equal(t, sc.GetType(), &typ) // Add more elements to the SoftCollection. sr = &SoftResource{} @@ -115,29 +115,28 @@ func TestSoftCollection(t *testing.T) { } func TestSoftCollectionResource(t *testing.T) { - sc := &SoftCollection{ - Type: &Type{}, - } + sc := &SoftCollection{} + sc.SetType(&Type{}) - sc.Type.Name = "type1" - sc.Type.AddAttr(Attr{ + sc.GetType().Name = "type1" + sc.GetType().AddAttr(Attr{ Name: "attr1", Type: AttrTypeString, Null: false, }) - sc.Type.AddAttr(Attr{ + sc.GetType().AddAttr(Attr{ Name: "attr2", Type: AttrTypeInt, Null: true, }) - sc.Type.AddRel(Rel{ + sc.GetType().AddRel(Rel{ Name: "rel1", Type: "type2", ToOne: true, }) sr := &SoftResource{} - sr.SetType(sc.Type) + sr.SetType(sc.GetType()) sr.SetID("res1") sr.Set("attr", "value1") sc.Add(sr) @@ -180,7 +179,7 @@ func TestSoftCollectionSort(t *testing.T) { Type: AttrTypeTime, Null: false, }) - sc.Type = &typ + sc.SetType(&typ) // Add some resources. sr := NewSoftResource(typ, nil) From 49bb8d4dccd1bd4a2de623d747077935f2bfad23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 24 Jun 2019 16:31:33 -0400 Subject: [PATCH 069/406] Verify Wrapper, SoftResource, and WrapperCollection implementations --- soft_resource.go | 2 ++ wrapper.go | 2 ++ wrapper_collection.go | 2 ++ 3 files changed, 6 insertions(+) diff --git a/soft_resource.go b/soft_resource.go index 964d79c..19fd17d 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -4,6 +4,8 @@ import ( "github.com/mitchellh/copystructure" ) +var _ Resource = (*SoftResource)(nil) + // NewSoftResource returns a new SoftResource with the given type. // // It is also populated with values from vals. diff --git a/wrapper.go b/wrapper.go index 81cb69c..2516353 100644 --- a/wrapper.go +++ b/wrapper.go @@ -11,6 +11,8 @@ import ( "time" ) +var _ Resource = (*Wrapper)(nil) + // Wrapper wraps a reflect.Value that represents a struct. // // The Wrap function can be used to wrap a struct and make a Wrapper object. diff --git a/wrapper_collection.go b/wrapper_collection.go index 635e187..9fc7cba 100644 --- a/wrapper_collection.go +++ b/wrapper_collection.go @@ -2,6 +2,8 @@ package jsonapi import "encoding/json" +var _ Collection = (*WrapperCollection)(nil) + // WrapCollection ... func WrapCollection(r Resource) *WrapperCollection { // if r2, ok := v.(Resource); ok { From a8425d718041f1cf036980baea9ed35c19cce4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 24 Jun 2019 17:51:46 -0400 Subject: [PATCH 070/406] Remove unnecessary parentheses --- filter_query.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filter_query.go b/filter_query.go index acb04f6..de5b8d1 100644 --- a/filter_query.go +++ b/filter_query.go @@ -60,7 +60,7 @@ func (c *Filter) UnmarshalJSON(data []byte) error { } c.Val = filters } else { - err := json.Unmarshal(tmpFilter.Val, &(c.Val)) // TODO parenthesis needed? + err := json.Unmarshal(tmpFilter.Val, &c.Val) if err != nil { return err } From 35a989d774fe14d5a6e23e5ae8ecf75b7aef9f0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 24 Jun 2019 20:19:59 -0400 Subject: [PATCH 071/406] Fix wrong attribute type name (time -> time.Time) --- schema.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema.go b/schema.go index 1df79be..9c3fec9 100644 --- a/schema.go +++ b/schema.go @@ -334,7 +334,7 @@ func GetAttrTypeString(t int, null bool) string { return "*bool" case AttrTypeTime: if !null { - return "time" + return "time.Time" } return "*time.Time" default: From d62aeda044c0edce10554dd9bf220f952bb2a42c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 24 Jun 2019 20:21:16 -0400 Subject: [PATCH 072/406] Add AttrTypeUint64 --- schema.go | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/schema.go b/schema.go index 9c3fec9..3263ef0 100644 --- a/schema.go +++ b/schema.go @@ -20,6 +20,7 @@ const ( AttrTypeUint8 AttrTypeUint16 AttrTypeUint32 + AttrTypeUint64 AttrTypeBool AttrTypeTime ) @@ -254,6 +255,11 @@ func GetAttrType(t string) (int, bool) { return AttrTypeUint32, false } return AttrTypeUint32, true + case "uint64": + if t[0] != '*' { + return AttrTypeUint64, false + } + return AttrTypeUint64, true case "bool": if t[0] != '*' { return AttrTypeBool, false @@ -327,6 +333,11 @@ func GetAttrTypeString(t int, null bool) string { return "uint32" } return "*uint32" + case AttrTypeUint64: + if !null { + return "uint64" + } + return "*uint64" case AttrTypeBool: if !null { return "bool" @@ -408,6 +419,12 @@ func GetZeroValue(t int, null bool) interface{} { return v } return &v + case AttrTypeUint64: + v := uint64(0) + if !null { + return v + } + return &v case AttrTypeBool: v := false if !null { From c4ec449f970bbfe36d9b57495502ef31aeb6e0c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 24 Jun 2019 20:24:30 -0400 Subject: [PATCH 073/406] Refactor GetAttrType --- schema.go | 78 +++++++++++++------------------------------------------ 1 file changed, 18 insertions(+), 60 deletions(-) diff --git a/schema.go b/schema.go index 3263ef0..0f2bf6d 100644 --- a/schema.go +++ b/schema.go @@ -200,81 +200,39 @@ func (s *Schema) Check() []error { // GetAttrType returns the attribute type as an int (see constants) and // a boolean that indicates whether the attribute can be null or not. func GetAttrType(t string) (int, bool) { - t2 := t - if strings.HasPrefix(t2, "*") { - t2 = t[1:] + nullable := strings.HasPrefix(t, "*") + if nullable { + t = t[1:] } - switch t2 { + switch t { case "string": - if t[0] != '*' { - return AttrTypeString, false - } - return AttrTypeString, true + return AttrTypeString, nullable case "int": - if t[0] != '*' { - return AttrTypeInt, false - } - return AttrTypeInt, true + return AttrTypeInt, nullable case "int8": - if t[0] != '*' { - return AttrTypeInt8, false - } - return AttrTypeInt8, true + return AttrTypeInt8, nullable case "int16": - if t[0] != '*' { - return AttrTypeInt16, false - } - return AttrTypeInt16, true + return AttrTypeInt16, nullable case "int32": - if t[0] != '*' { - return AttrTypeInt32, false - } - return AttrTypeInt32, true + return AttrTypeInt32, nullable case "int64": - if t[0] != '*' { - return AttrTypeInt64, false - } - return AttrTypeInt64, true + return AttrTypeInt64, nullable case "uint": - if t[0] != '*' { - return AttrTypeUint, false - } - return AttrTypeUint, true + return AttrTypeUint, nullable case "uint8": - if t[0] != '*' { - return AttrTypeUint8, false - } - return AttrTypeUint8, true + return AttrTypeUint8, nullable case "uint16": - if t[0] != '*' { - return AttrTypeUint16, false - } - return AttrTypeUint16, true + return AttrTypeUint16, nullable case "uint32": - if t[0] != '*' { - return AttrTypeUint32, false - } - return AttrTypeUint32, true + return AttrTypeUint32, nullable case "uint64": - if t[0] != '*' { - return AttrTypeUint64, false - } - return AttrTypeUint64, true + return AttrTypeUint64, nullable case "bool": - if t[0] != '*' { - return AttrTypeBool, false - } - return AttrTypeBool, true + return AttrTypeBool, nullable case "time.Time": - if t[0] != '*' { - return AttrTypeTime, false - } - return AttrTypeTime, true + return AttrTypeTime, nullable default: - if t[0] != '*' { - return AttrTypeInvalid, false - } - return AttrTypeInvalid, true + return AttrTypeInvalid, false } } From 9cdc5fd7b5616cd810ebd949841fe6a1ddad2e02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 24 Jun 2019 20:27:27 -0400 Subject: [PATCH 074/406] Refactor GetAttrTypeString --- schema.go | 74 +++++++++++++++---------------------------------------- 1 file changed, 20 insertions(+), 54 deletions(-) diff --git a/schema.go b/schema.go index 0f2bf6d..048f567 100644 --- a/schema.go +++ b/schema.go @@ -239,76 +239,42 @@ func GetAttrType(t string) (int, bool) { // GetAttrTypeString return the name of the attribute type specified // by an int (see constants) and a boolean that indicates whether the // value can be null or not. -func GetAttrTypeString(t int, null bool) string { +func GetAttrTypeString(t int, nullable bool) string { + str := "" switch t { case AttrTypeString: - if !null { - return "string" - } - return "*string" + str = "string" case AttrTypeInt: - if !null { - return "int" - } - return "*int" + str = "int" case AttrTypeInt8: - if !null { - return "int8" - } - return "*int8" + str = "int8" case AttrTypeInt16: - if !null { - return "int16" - } - return "*int16" + str = "int16" case AttrTypeInt32: - if !null { - return "int32" - } - return "*int32" + str = "int32" case AttrTypeInt64: - if !null { - return "int64" - } - return "*int64" + str = "int64" case AttrTypeUint: - if !null { - return "uint" - } - return "*uint" + str = "uint" case AttrTypeUint8: - if !null { - return "uint8" - } - return "*uint8" + str = "uint8" case AttrTypeUint16: - if !null { - return "uint16" - } - return "*uint16" + str = "uint16" case AttrTypeUint32: - if !null { - return "uint32" - } - return "*uint32" + str = "uint32" case AttrTypeUint64: - if !null { - return "uint64" - } - return "*uint64" + str = "uint64" case AttrTypeBool: - if !null { - return "bool" - } - return "*bool" + str = "bool" case AttrTypeTime: - if !null { - return "time.Time" - } - return "*time.Time" + str = "time.Time" default: - return "" + str = "" + } + if nullable { + return "*" + str } + return str } // GetZeroValue returns the zero value of the attribute type represented From d1992ccf0a29fc65d420034770f8614de686d613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 24 Jun 2019 20:30:56 -0400 Subject: [PATCH 075/406] Improve behavior of Set, SetToOne, and SetToMany from SoftResource --- soft_resource.go | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/soft_resource.go b/soft_resource.go index 19fd17d..1dce0f1 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -1,6 +1,8 @@ package jsonapi import ( + "fmt" + "github.com/mitchellh/copystructure" ) @@ -149,8 +151,12 @@ func (sr *SoftResource) SetType(typ *Type) { // Set sets the value associated to the field named key to v. func (sr *SoftResource) Set(key string, v interface{}) { sr.check() - if _, ok := sr.data[key]; ok { - sr.data[key] = v + if attr, ok := sr.typ.Attrs[key]; ok { + if GetAttrTypeString(attr.Type, attr.Null) == fmt.Sprintf("%T", v) { + sr.data[key] = v + } else if v == nil && attr.Null { + sr.data[key] = GetZeroValue(attr.Type, attr.Null) + } } } @@ -173,18 +179,18 @@ func (sr *SoftResource) GetToMany(key string) []string { } // SetToOne sets the relationship named after key to rel. -func (sr *SoftResource) SetToOne(key string, rel string) { +func (sr *SoftResource) SetToOne(key string, v string) { sr.check() - if _, ok := sr.data[key]; ok { - sr.data[key] = rel + if rel, ok := sr.typ.Rels[key]; ok && rel.ToOne { + sr.data[key] = v } } // SetToMany sets the relationship named after key to rel. -func (sr *SoftResource) SetToMany(key string, rels []string) { +func (sr *SoftResource) SetToMany(key string, v []string) { sr.check() - if _, ok := sr.data[key]; ok { - sr.data[key] = rels + if rel, ok := sr.typ.Rels[key]; ok && !rel.ToOne { + sr.data[key] = v } } From bb2cfa0555acda08e99645d5994a9fc792772fa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 24 Jun 2019 20:41:22 -0400 Subject: [PATCH 076/406] Fix zero null bug in GetZeroValue --- schema.go | 104 +++++++++++++++++++++++++++--------------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/schema.go b/schema.go index 048f567..70e2065 100644 --- a/schema.go +++ b/schema.go @@ -284,83 +284,83 @@ func GetAttrTypeString(t int, nullable bool) string { func GetZeroValue(t int, null bool) interface{} { switch t { case AttrTypeString: - v := "" - if !null { - return v + if null { + var np *string + return np } - return &v + return "" case AttrTypeInt: - v := int(0) - if !null { - return v + if null { + var np *int + return np } - return &v + return int(0) case AttrTypeInt8: - v := int8(0) - if !null { - return v + if null { + var np *int8 + return np } - return &v + return int8(0) case AttrTypeInt16: - v := int16(0) - if !null { - return v + if null { + var np *int16 + return np } - return &v + return int16(0) case AttrTypeInt32: - v := int32(0) - if !null { - return v + if null { + var np *int32 + return np } - return &v + return int32(0) case AttrTypeInt64: - v := int64(0) - if !null { - return v + if null { + var np *int64 + return np } - return &v + return int64(0) case AttrTypeUint: - v := uint(0) - if !null { - return v + if null { + var np *uint + return np } - return &v + return uint(0) case AttrTypeUint8: - v := uint8(0) - if !null { - return v + if null { + var np *uint8 + return np } - return &v + return uint8(0) case AttrTypeUint16: - v := uint16(0) - if !null { - return v + if null { + var np *uint16 + return np } - return &v + return uint16(0) case AttrTypeUint32: - v := uint32(0) - if !null { - return v + if null { + var np *uint32 + return np } - return &v + return uint32(0) case AttrTypeUint64: - v := uint64(0) - if !null { - return v + if null { + var np *uint64 + return np } - return &v + return uint64(0) case AttrTypeBool: - v := false - if !null { - return v + if null { + var np *bool + return np } - return &v + return false case AttrTypeTime: - v := time.Time{} - if !null { - return v + if null { + var np *time.Time + return np } - return &v + return time.Time{} default: return nil } From 5e8f7517ee00533caf41517a23c0e17fbc7ef38d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 24 Jun 2019 20:46:56 -0400 Subject: [PATCH 077/406] Fix TestSoftCollectionSort test --- soft_collection_test.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/soft_collection_test.go b/soft_collection_test.go index f9fac9b..5ee244f 100644 --- a/soft_collection_test.go +++ b/soft_collection_test.go @@ -202,7 +202,7 @@ func TestSoftCollectionSort(t *testing.T) { sr = NewSoftResource(typ, nil) sr.SetID("res3") sr.Set("attr1", 1) - sr.Set("attr2", "") + sr.Set("attr2", ptr("")) sr.Set("attr3", (*bool)(nil)) sr.Set("attr4", now.Add(-time.Second)) sc.Add(sr) @@ -210,7 +210,7 @@ func TestSoftCollectionSort(t *testing.T) { sr = NewSoftResource(typ, nil) sr.SetID("res4") sr.Set("attr1", -1) - sr.Set("attr2", "abc") + sr.Set("attr2", ptr("abc")) sr.Set("attr3", (*bool)(nil)) sr.Set("attr4", now.Add(time.Second)) sc.Add(sr) @@ -218,7 +218,7 @@ func TestSoftCollectionSort(t *testing.T) { sr = NewSoftResource(typ, nil) sr.SetID("res5") sr.Set("attr1", -1) - sr.Set("attr2", "abc") + sr.Set("attr2", ptr("abc")) b2 := true sr.Set("attr3", &b2) sr.Set("attr4", now.Add(time.Second)) @@ -227,7 +227,7 @@ func TestSoftCollectionSort(t *testing.T) { sr = NewSoftResource(typ, nil) sr.SetID("res6") sr.Set("attr1", 2) - sr.Set("attr2", "") + sr.Set("attr2", ptr("")) sr.Set("attr3", (*bool)(nil)) sr.Set("attr4", now.Add(time.Second)) sc.Add(sr) @@ -235,7 +235,7 @@ func TestSoftCollectionSort(t *testing.T) { sr = NewSoftResource(typ, nil) sr.SetID("res7") sr.Set("attr1", 2) - sr.Set("attr2", "abc") + sr.Set("attr2", ptr("abc")) b3 := true sr.Set("attr3", &b3) sr.Set("attr4", now.Add(-time.Second)) @@ -244,7 +244,7 @@ func TestSoftCollectionSort(t *testing.T) { sr = NewSoftResource(typ, nil) sr.SetID("res8") sr.Set("attr1", 4) - sr.Set("attr2", "") + sr.Set("attr2", ptr("")) sr.Set("attr3", (*bool)(nil)) sr.Set("attr4", now.Add(time.Second)) sc.Add(sr) @@ -252,7 +252,7 @@ func TestSoftCollectionSort(t *testing.T) { sr = NewSoftResource(typ, nil) sr.SetID("res9") sr.Set("attr1", -1) - sr.Set("attr2", "def") + sr.Set("attr2", ptr("def")) sr.Set("attr3", (*bool)(nil)) sr.Set("attr4", now.Add(time.Second)) sc.Add(sr) @@ -260,7 +260,7 @@ func TestSoftCollectionSort(t *testing.T) { sr = NewSoftResource(typ, nil) sr.SetID("res10") sr.Set("attr1", 4) - sr.Set("attr2", "") + sr.Set("attr2", ptr("")) sr.Set("attr3", (*bool)(nil)) sr.Set("attr4", now.Add(time.Second)) sc.Add(sr) From 36e56e68a6b79e8264b4c394923ceb3a3fcd5efb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 25 Jun 2019 22:23:47 -0400 Subject: [PATCH 078/406] Make Resource.Type return Type instead of *Type --- resource.go | 2 +- soft_resource.go | 4 ++-- wrapper.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resource.go b/resource.go index a252df0..efa9cb1 100644 --- a/resource.go +++ b/resource.go @@ -17,7 +17,7 @@ type Resource interface { // Read GetID() string - GetType() *Type + GetType() Type Get(key string) interface{} // Update diff --git a/soft_resource.go b/soft_resource.go index 1dce0f1..2584ac5 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -110,9 +110,9 @@ func (sr *SoftResource) GetID() string { } // GetType returns the resource's type. -func (sr *SoftResource) GetType() *Type { +func (sr *SoftResource) GetType() Type { sr.check() - return sr.typ + return *sr.typ } // Get returns the value associated to the field named after key. diff --git a/wrapper.go b/wrapper.go index 2516353..e924b50 100644 --- a/wrapper.go +++ b/wrapper.go @@ -153,8 +153,8 @@ func (w *Wrapper) GetID() string { } // GetType returns the wrapped resource's type. -func (w *Wrapper) GetType() *Type { - return &Type{ +func (w *Wrapper) GetType() Type { + return Type{ Name: w.typ, Attrs: w.attrs, Rels: w.rels, From 2ae97a85a5252dba27df65e5643df9846b73cfd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Wed, 26 Jun 2019 22:55:59 -0400 Subject: [PATCH 079/406] Update function signatures in README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 24eeb4b..c97c508 100644 --- a/README.md +++ b/README.md @@ -35,8 +35,8 @@ The library is in **alpha** and its API is subject to change until v1 is release The simplest way to start using jsonapi is to use the Marshal and Unmarshal functions. ``` -func Marshal(v interface{}, url *URL, opts *Options) ([]byte, error) -func Unmarshal(payload []byte, v interface{}) error +func Marshal(doc *Document, url *URL) ([]byte, error) +func Unmarshal(payload []byte, url *URL, schema *Schema) (*Document, error) ``` A struct has to follow certain rules in order to be understood by the library, but interfaces are also provided which let the library avoid the reflect package and be more efficient. From 57e2ea9c30a7796bc1c8c1c88f58f35c029b295f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 27 Jun 2019 00:17:27 -0400 Subject: [PATCH 080/406] Remove some commented out debug code --- simple_url.go | 2 -- url_test.go | 4 ---- 2 files changed, 6 deletions(-) diff --git a/simple_url.go b/simple_url.go index f8e8d67..2079d8c 100644 --- a/simple_url.go +++ b/simple_url.go @@ -46,8 +46,6 @@ func NewSimpleURL(u *url.URL) (SimpleURL, error) { return sURL, errors.New("jsonapi: pointer to url.URL is nil") } - // fmt.Printf("URL: %s\n", u.String()) - sURL.Fragments = parseFragments(u.Path) sURL.Route = deduceRoute(sURL.Fragments) diff --git a/url_test.go b/url_test.go index 5b3b242..2c33066 100644 --- a/url_test.go +++ b/url_test.go @@ -408,10 +408,6 @@ func TestParseParams(t *testing.T) { } if !test.expectedError { - // data, _ := json.MarshalIndent(test.expectedParams, "", "\t") - // fmt.Printf("EXPECTED:\n%s\n", data) - // data, _ = json.MarshalIndent(params, "", "\t") - // fmt.Printf("PROVIDED:\n%s\n", data) assert.Equal(test.expectedParams, *params, test.name) } } From 435cc626acec0711fe56e700ddd173f644493d9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 27 Jun 2019 22:05:03 -0400 Subject: [PATCH 081/406] Remove UnmarshalJSON from the Resource interface --- resource.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/resource.go b/resource.go index efa9cb1..471e891 100644 --- a/resource.go +++ b/resource.go @@ -37,9 +37,6 @@ type Resource interface { // Copy Copy() Resource - - // JSON - UnmarshalJSON(payload []byte) error } // Equal reports whether r1 and r2 are equal. From 3ac29eec0d0f28e79a3331c924a2331a1e4ca5c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 27 Jun 2019 22:14:48 -0400 Subject: [PATCH 082/406] Reorder methods in Resource interface --- resource.go | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/resource.go b/resource.go index 471e891..1bf3b16 100644 --- a/resource.go +++ b/resource.go @@ -8,35 +8,31 @@ import ( // A Resource is an element of a collection. type Resource interface { + // Creation + New() Resource + Copy() Resource + // Structure Attrs() map[string]Attr Rels() map[string]Rel Attr(key string) Attr Rel(key string) Rel - New() Resource // Read GetID() string GetType() Type Get(key string) interface{} + GetToOne(key string) string + GetToMany(key string) []string // Update SetID(id string) Set(key string, val interface{}) - - // Read relationship - GetToOne(key string) string - GetToMany(key string) []string - - // Update relationship SetToOne(key string, rel string) SetToMany(key string, rels []string) // Validate Validate() []error - - // Copy - Copy() Resource } // Equal reports whether r1 and r2 are equal. From 6ac50ca8e87d76cb7b654b24de06e52d310985fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 29 Jun 2019 10:17:20 -0400 Subject: [PATCH 083/406] Add Go Report Card badge --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index c97c508..068d76a 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,9 @@ + + + From fe5eb8510e5ad6942ad7086088d7774df154812a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 29 Jun 2019 10:47:13 -0400 Subject: [PATCH 084/406] Change Go version in go.mod to 1.12 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 7d1d87c..429d632 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/mfcochauxlaberge/jsonapi -go 1.11 +go 1.12 require ( github.com/google/uuid v1.1.1 From cb76123f551154b4faf1b478838cae87c7f55637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 29 Jun 2019 15:18:31 -0400 Subject: [PATCH 085/406] Add tests for error.go --- error_test.go | 198 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 198 insertions(+) diff --git a/error_test.go b/error_test.go index 592df02..1ce814a 100644 --- a/error_test.go +++ b/error_test.go @@ -73,3 +73,201 @@ func TestError(t *testing.T) { assert.Equal(test.err.Error(), test.expectedString, test.name) } } + +func TestErrorConstructors(t *testing.T) { + assert := assert.New(t) + + tests := []struct { + name string + err Error + expectedString string + }{ + { + name: "NewError", + err: func() Error { + e := NewError() + return e + }(), + expectedString: "", + }, { + name: "NewErrBadRequest", + err: func() Error { + e := NewErrBadRequest("bad request", "error detail") + return e + }(), + expectedString: "400 Bad Request: error detail", + }, { + name: "NewErrMalformedFilterParameter", + err: func() Error { + e := NewErrMalformedFilterParameter("filter") + return e + }(), + expectedString: "400 Bad Request: The filter parameter is not a string or a valid JSON object.", + }, { + name: "NewErrInvalidPageNumberParameter", + err: func() Error { + e := NewErrInvalidPageNumberParameter("9") + return e + }(), + expectedString: "400 Bad Request: The page number parameter is not positive integer (including 0).", + }, { + name: "NewErrInvalidPageSizeParameter", + err: func() Error { + e := NewErrInvalidPageSizeParameter("9") + return e + }(), + expectedString: "400 Bad Request: The page size parameter is not positive integer (including 0).", + }, { + name: "NewErrUnknownFieldInBody", + err: func() Error { + e := NewErrUnknownFieldInBody("type", "field") + return e + }(), + expectedString: "400 Bad Request: field is not a known field.", + }, { + name: "NewErrUnknownFieldInURL", + err: func() Error { + e := NewErrUnknownFieldInURL("field") + return e + }(), + expectedString: "400 Bad Request: field is not a known field.", + }, { + name: "NewErrUnknownParameter", + err: func() Error { + e := NewErrUnknownParameter("param") + return e + }(), + expectedString: "400 Bad Request: param is not a known parameter.", + }, { + name: "NewErrUnknownRelationshipInPath", + err: func() Error { + e := NewErrUnknownRelationshipInPath("type", "rel", "path") + return e + }(), + expectedString: "400 Bad Request: rel is not a relationship of type.", + }, { + name: "NewErrUnknownTypeInURL", + err: func() Error { + e := NewErrUnknownTypeInURL("type") + return e + }(), + expectedString: "400 Bad Request: type is not a known type.", + }, { + name: "NewErrUnknownFieldInFilterParameter", + err: func() Error { + e := NewErrUnknownFieldInFilterParameter("field") + return e + }(), + expectedString: "400 Bad Request: field is not a known field.", + }, { + name: "NewErrUnknownOperatorInFilterParameter", + err: func() Error { + e := NewErrUnknownOperatorInFilterParameter("=>") + return e + }(), + expectedString: "400 Bad Request: => is not a known operator.", + }, { + name: "NewErrInvalidValueInFilterParameter", + err: func() Error { + e := NewErrInvalidValueInFilterParameter("value", "string") + return e + }(), + expectedString: "400 Bad Request: value is not a known value.", + }, { + name: "NewErrUnknownCollationInFilterParameter", + err: func() Error { + e := NewErrUnknownCollationInFilterParameter("collation") + return e + }(), + expectedString: "400 Bad Request: collation is not a known collation.", + }, { + name: "NewErrUnknownFilterParameterLabel", + err: func() Error { + e := NewErrUnknownFilterParameterLabel("label") + return e + }(), + expectedString: "400 Bad Request: label is not a known filter query label.", + }, { + name: "NewErrUnauthorized", + err: func() Error { + e := NewErrUnauthorized() + return e + }(), + expectedString: "401 Unauthorized: Authentification is required to perform this request.", + }, { + name: "NewErrForbidden", + err: func() Error { + e := NewErrForbidden() + return e + }(), + expectedString: "403 Forbidden: Permission is required to perform this request.", + }, { + name: "NewErrNotFound", + err: func() Error { + e := NewErrNotFound() + return e + }(), + expectedString: "404 Not Found: The URI does not exist.", + }, { + name: "NewErrPayloadTooLarge", + err: func() Error { + e := NewErrPayloadTooLarge() + return e + }(), + expectedString: "413 Request Entity Too Large: That's what she said.", + }, { + name: "NewErrRequestURITooLong", + err: func() Error { + e := NewErrRequestURITooLong() + return e + }(), + expectedString: "414 Request URI Too Long: URI too long", + }, { + name: "NewErrUnsupportedMediaType", + err: func() Error { + e := NewErrUnsupportedMediaType() + return e + }(), + expectedString: "415 Unsupported Media Type: Unsupported media type", + }, { + name: "NewErrTooManyRequests", + err: func() Error { + e := NewErrTooManyRequests() + return e + }(), + expectedString: "429 Too Many Requests: Too many requests", + }, { + name: "NewErrRequestHeaderFieldsTooLarge", + err: func() Error { + e := NewErrRequestHeaderFieldsTooLarge() + return e + }(), + expectedString: "431 Request Header Fields Too Large: Header fields too large", + }, { + name: "NewErrInternalServerError", + err: func() Error { + e := NewErrInternalServerError() + return e + }(), + expectedString: "500 Internal Server Error: Internal server error", + }, { + name: "NewErrServiceUnavailable", + err: func() Error { + e := NewErrServiceUnavailable() + return e + }(), + expectedString: "503 Service Unavailable: Service unavailable", + }, { + name: "NewErrNotImplemented", + err: func() Error { + e := NewErrNotImplemented() + return e + }(), + expectedString: "501 Not Implemented: Not Implemented", + }, + } + + for _, test := range tests { + assert.Equal(test.err.Error(), test.expectedString, test.name) + } +} From c6138f63ccc11df3b71acaf932e105873a2ae36b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 29 Jun 2019 15:19:48 -0400 Subject: [PATCH 086/406] Add tests for Document.Include --- document_test.go | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/document_test.go b/document_test.go index a8ea8e9..adfb814 100644 --- a/document_test.go +++ b/document_test.go @@ -1,9 +1,11 @@ package jsonapi_test import ( + "sort" "testing" . "github.com/mfcochauxlaberge/jsonapi" + "github.com/stretchr/testify/assert" ) @@ -14,3 +16,80 @@ func TestDocument(t *testing.T) { pl1 := Document{} assert.Equal(nil, pl1.Data, "empty") } + +func TestInclude(t *testing.T) { + assert := assert.New(t) + + doc := &Document{} + typ1 := &Type{Name: "t1"} + typ2 := &Type{Name: "t2"} + + /* + * Main data is a resource + */ + doc.Data = newResource(typ1, "id1") + + // Inclusions + doc.Include(newResource(typ1, "id1")) + doc.Include(newResource(typ1, "id2")) + doc.Include(newResource(typ1, "id3")) + doc.Include(newResource(typ1, "id3")) + doc.Include(newResource(typ2, "id1")) + + // Check + ids := []string{} + for _, res := range doc.Included { + ids = append(ids, res.GetType().Name+"-"+res.GetID()) + } + sort.Strings(ids) + + expect := []string{ + "t1-id2", + "t1-id3", + "t2-id1", + } + assert.Equal(expect, ids) + + /* + * Main data is a collection + */ + doc = &Document{} + + // Collection + col := &SoftCollection{} + col.SetType(typ1) + col.Add(newResource(typ1, "id1")) + col.Add(newResource(typ1, "id2")) + col.Add(newResource(typ1, "id3")) + doc.Data = Collection(col) + + // Inclusions + doc.Include(newResource(typ1, "id1")) + doc.Include(newResource(typ1, "id2")) + doc.Include(newResource(typ1, "id3")) + doc.Include(newResource(typ1, "id4")) + doc.Include(newResource(typ2, "id1")) + doc.Include(newResource(typ2, "id1")) + doc.Include(newResource(typ2, "id2")) + + // Check + ids = []string{} + for _, res := range doc.Included { + ids = append(ids, res.GetType().Name+"-"+res.GetID()) + } + sort.Strings(ids) + + expect = []string{ + "t1-id4", + "t2-id1", + "t2-id2", + } + assert.Equal(expect, ids) +} + +func newResource(typ *Type, id string) Resource { + res := &SoftResource{} + res.SetType(typ) + res.SetID(id) + return res +} From 009062eb364bb3071c242164df86e34c62c333a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 29 Jun 2019 15:21:05 -0400 Subject: [PATCH 087/406] Add tests for SoftCollection.Sort --- soft_collection_test.go | 266 ++++++++++++++++++++++------------------ 1 file changed, 148 insertions(+), 118 deletions(-) diff --git a/soft_collection_test.go b/soft_collection_test.go index 5ee244f..905418f 100644 --- a/soft_collection_test.go +++ b/soft_collection_test.go @@ -1,6 +1,9 @@ package jsonapi_test import ( + "fmt" + "sort" + "strconv" "testing" "time" @@ -154,131 +157,160 @@ func TestSoftCollectionResource(t *testing.T) { } func TestSoftCollectionSort(t *testing.T) { - now := time.Now() - sc := &SoftCollection{} - - // Add type with some attributes. - typ := Type{Name: "thistype"} - typ.AddAttr(Attr{ - Name: "attr1", - Type: AttrTypeInt, - Null: false, - }) - typ.AddAttr(Attr{ - Name: "attr2", - Type: AttrTypeString, - Null: true, - }) - typ.AddAttr(Attr{ - Name: "attr3", - Type: AttrTypeBool, - Null: true, - }) - typ.AddAttr(Attr{ - Name: "attr4", - Type: AttrTypeTime, - Null: false, - }) - sc.SetType(&typ) - - // Add some resources. - sr := NewSoftResource(typ, nil) - sr.SetID("res1") - sr.Set("attr1", 0) - sr.Set("attr2", nil) - sr.Set("attr3", (*bool)(nil)) - sr.Set("attr4", now) - sc.Add(sr) - - sr = NewSoftResource(typ, nil) - sr.SetID("res2") - sr.Set("attr1", 0) - sr.Set("attr2", nil) - b1 := false - sr.Set("attr3", &b1) - sr.Set("attr4", now) - sc.Add(sr) - - sr = NewSoftResource(typ, nil) - sr.SetID("res3") - sr.Set("attr1", 1) - sr.Set("attr2", ptr("")) - sr.Set("attr3", (*bool)(nil)) - sr.Set("attr4", now.Add(-time.Second)) - sc.Add(sr) - - sr = NewSoftResource(typ, nil) - sr.SetID("res4") - sr.Set("attr1", -1) - sr.Set("attr2", ptr("abc")) - sr.Set("attr3", (*bool)(nil)) - sr.Set("attr4", now.Add(time.Second)) - sc.Add(sr) - - sr = NewSoftResource(typ, nil) - sr.SetID("res5") - sr.Set("attr1", -1) - sr.Set("attr2", ptr("abc")) - b2 := true - sr.Set("attr3", &b2) - sr.Set("attr4", now.Add(time.Second)) - sc.Add(sr) - - sr = NewSoftResource(typ, nil) - sr.SetID("res6") - sr.Set("attr1", 2) - sr.Set("attr2", ptr("")) - sr.Set("attr3", (*bool)(nil)) - sr.Set("attr4", now.Add(time.Second)) - sc.Add(sr) - - sr = NewSoftResource(typ, nil) - sr.SetID("res7") - sr.Set("attr1", 2) - sr.Set("attr2", ptr("abc")) - b3 := true - sr.Set("attr3", &b3) - sr.Set("attr4", now.Add(-time.Second)) - sc.Add(sr) - - sr = NewSoftResource(typ, nil) - sr.SetID("res8") - sr.Set("attr1", 4) - sr.Set("attr2", ptr("")) - sr.Set("attr3", (*bool)(nil)) - sr.Set("attr4", now.Add(time.Second)) - sc.Add(sr) - - sr = NewSoftResource(typ, nil) - sr.SetID("res9") - sr.Set("attr1", -1) - sr.Set("attr2", ptr("def")) - sr.Set("attr3", (*bool)(nil)) - sr.Set("attr4", now.Add(time.Second)) - sc.Add(sr) + assert := assert.New(t) + + var ( + now = time.Now() + sc = &SoftCollection{} + ) + + // A collection of resources will be created and + // one attribute will be added for each entry from + // the following slice. + // The point is to provoke all possible scenarios + // for each attribute type. + attrs := []struct { + vals [2]interface{} + }{ + // non-nullable + {vals: [2]interface{}{"", "a"}}, + {vals: [2]interface{}{int(-1), int(0)}}, + {vals: [2]interface{}{int8(-1), int8(0)}}, + {vals: [2]interface{}{int16(-1), int16(0)}}, + {vals: [2]interface{}{int32(-1), int32(0)}}, + {vals: [2]interface{}{int64(-1), int64(0)}}, + {vals: [2]interface{}{uint(0), uint(1)}}, + {vals: [2]interface{}{uint8(0), uint8(1)}}, + {vals: [2]interface{}{uint16(0), uint16(1)}}, + {vals: [2]interface{}{uint32(0), uint32(1)}}, + {vals: [2]interface{}{uint64(0), uint64(1)}}, + {vals: [2]interface{}{false, true}}, + {vals: [2]interface{}{now, now.Add(time.Second)}}, + // nullable + {vals: [2]interface{}{nilptr("string"), nilptr("string")}}, + {vals: [2]interface{}{nilptr("string"), ptr("a")}}, + {vals: [2]interface{}{ptr(""), nilptr("string")}}, + {vals: [2]interface{}{ptr(""), ptr("")}}, + {vals: [2]interface{}{ptr(""), ptr("a")}}, + {vals: [2]interface{}{nilptr("int"), nilptr("int")}}, + {vals: [2]interface{}{nilptr("int"), ptr(int(0))}}, + {vals: [2]interface{}{ptr(int(-1)), nilptr("int")}}, + {vals: [2]interface{}{ptr(int(-1)), ptr(int(-1))}}, + {vals: [2]interface{}{ptr(int(-1)), ptr(int(0))}}, + {vals: [2]interface{}{nilptr("int8"), nilptr("int8")}}, + {vals: [2]interface{}{nilptr("int8"), ptr(int8(0))}}, + {vals: [2]interface{}{ptr(int8(-1)), nilptr("int8")}}, + {vals: [2]interface{}{ptr(int8(-1)), ptr(int8(-1))}}, + {vals: [2]interface{}{ptr(int8(-1)), ptr(int8(0))}}, + {vals: [2]interface{}{nilptr("int16"), nilptr("int16")}}, + {vals: [2]interface{}{nilptr("int16"), ptr(int16(0))}}, + {vals: [2]interface{}{ptr(int16(-1)), nilptr("int16")}}, + {vals: [2]interface{}{ptr(int16(-1)), ptr(int16(-1))}}, + {vals: [2]interface{}{ptr(int16(-1)), ptr(int16(0))}}, + {vals: [2]interface{}{nilptr("int32"), nilptr("int32")}}, + {vals: [2]interface{}{nilptr("int32"), ptr(int32(0))}}, + {vals: [2]interface{}{ptr(int32(-1)), nilptr("int32")}}, + {vals: [2]interface{}{ptr(int32(-1)), ptr(int32(-1))}}, + {vals: [2]interface{}{ptr(int32(-1)), ptr(int32(0))}}, + {vals: [2]interface{}{nilptr("int64"), nilptr("int64")}}, + {vals: [2]interface{}{nilptr("int64"), ptr(int64(0))}}, + {vals: [2]interface{}{ptr(int64(-1)), nilptr("int64")}}, + {vals: [2]interface{}{ptr(int64(-1)), ptr(int64(-1))}}, + {vals: [2]interface{}{ptr(int64(-1)), ptr(int64(0))}}, + {vals: [2]interface{}{nilptr("uint"), nilptr("uint")}}, + {vals: [2]interface{}{nilptr("uint"), ptr(uint(0))}}, + {vals: [2]interface{}{ptr(uint(0)), nilptr("uint")}}, + {vals: [2]interface{}{ptr(uint(0)), ptr(uint(0))}}, + {vals: [2]interface{}{ptr(uint(0)), ptr(uint(1))}}, + {vals: [2]interface{}{nilptr("uint8"), nilptr("uint8")}}, + {vals: [2]interface{}{nilptr("uint8"), ptr(uint8(0))}}, + {vals: [2]interface{}{ptr(uint8(0)), nilptr("uint8")}}, + {vals: [2]interface{}{ptr(uint8(0)), ptr(uint8(0))}}, + {vals: [2]interface{}{ptr(uint8(0)), ptr(uint8(1))}}, + {vals: [2]interface{}{nilptr("uint16"), nilptr("uint16")}}, + {vals: [2]interface{}{nilptr("uint16"), ptr(uint16(0))}}, + {vals: [2]interface{}{ptr(uint16(0)), nilptr("uint16")}}, + {vals: [2]interface{}{ptr(uint16(0)), ptr(uint16(0))}}, + {vals: [2]interface{}{ptr(uint16(0)), ptr(uint16(1))}}, + {vals: [2]interface{}{nilptr("uint32"), nilptr("uint32")}}, + {vals: [2]interface{}{nilptr("uint32"), ptr(uint32(0))}}, + {vals: [2]interface{}{ptr(uint32(0)), nilptr("uint32")}}, + {vals: [2]interface{}{ptr(uint32(0)), ptr(uint32(0))}}, + {vals: [2]interface{}{ptr(uint32(0)), ptr(uint32(1))}}, + {vals: [2]interface{}{nilptr("uint64"), nilptr("uint64")}}, + {vals: [2]interface{}{nilptr("uint64"), ptr(uint64(0))}}, + {vals: [2]interface{}{ptr(uint64(0)), nilptr("uint64")}}, + {vals: [2]interface{}{ptr(uint64(0)), ptr(uint64(0))}}, + {vals: [2]interface{}{ptr(uint64(0)), ptr(uint64(1))}}, + {vals: [2]interface{}{nilptr("bool"), nilptr("bool")}}, + {vals: [2]interface{}{nilptr("bool"), ptr(false)}}, + {vals: [2]interface{}{ptr(false), nilptr("bool")}}, + {vals: [2]interface{}{ptr(false), ptr(false)}}, + {vals: [2]interface{}{ptr(false), ptr(true)}}, + {vals: [2]interface{}{nilptr("time.Time"), nilptr("time.Time")}}, + {vals: [2]interface{}{nilptr("time.Time"), ptr(now)}}, + {vals: [2]interface{}{ptr(now), ptr(now)}}, + {vals: [2]interface{}{ptr(now), ptr(now.Add(time.Second))}}, + } - sr = NewSoftResource(typ, nil) - sr.SetID("res10") - sr.Set("attr1", 4) - sr.Set("attr2", ptr("")) - sr.Set("attr3", (*bool)(nil)) - sr.Set("attr4", now.Add(time.Second)) - sc.Add(sr) + // Add attributes to type + typ := &Type{Name: "type"} + for i, t := range attrs { + ti, null := GetAttrType(fmt.Sprintf("%T", t.vals[0])) + typ.AddAttr(Attr{ + Name: "attr" + strconv.Itoa(i), + Type: ti, + Null: null, + }) + } + sc.SetType(typ) + + // Add resources + for i := range attrs { + sr := &SoftResource{} + sr.SetType(typ) + sr.SetID("id" + strconv.Itoa(i)) + for j := range attrs { + if i != j { + sr.Set("attr"+strconv.Itoa(j), attrs[j].vals[0]) + } else { + sr.Set("attr"+strconv.Itoa(j), attrs[j].vals[1]) + } + } + sc.Add(sr) + } - // Sort the collection. - rules := []string{"-attr3", "-attr4", "attr1", "-attr2", "id"} + // Sort collection + rules := []string{} + for i := 0; i < sc.Len(); i++ { + reverse := "" + if i%3 == 0 { + reverse = "-" + } + rules = append(rules, reverse+"attr"+strconv.Itoa(i)) + } + rules = append(rules, "id") sc.Sort(rules) - // Make an ordered list of IDs. + // Sorted IDs from the collection ids := []string{} for i := 0; i < sc.Len(); i++ { ids = append(ids, sc.Elem(i).GetID()) } expectedIDs := []string{ - "res5", "res7", "res2", "res9", "res4", "res6", "res10", "res8", "res1", "res3", + "id0", "id3", "id6", "id9", "id12", "id20", "id24", "id25", "id27", + "id35", "id39", "id40", "id42", "id50", "id54", "id55", "id57", + "id69", "id70", "id72", "id10", "id13", "id16", "id18", "id21", + "id23", "id26", "id28", "id31", "id33", "id36", "id38", "id41", + "id43", "id46", "id48", "id51", "id53", "id56", "id58", "id61", + "id63", "id64", "id65", "id66", "id67", "id68", "id71", "id73", + "id75", "id76", "id74", "id62", "id60", "id59", "id52", "id49", + "id47", "id45", "id44", "id37", "id34", "id32", "id30", "id29", + "id22", "id19", "id17", "id15", "id14", "id11", "id8", "id7", "id5", + "id4", "id2", "id1", } - assert.Equal(t, expectedIDs, ids) + assert.Equal(expectedIDs, ids, fmt.Sprintf("sort with rules: %v", rules)) // Sort with an empty list of sorting rules. sc.Sort([]string{}) @@ -288,8 +320,6 @@ func TestSoftCollectionSort(t *testing.T) { ids = append(ids, sc.Elem(i).GetID()) } - expectedIDs = []string{ - "res1", "res10", "res2", "res3", "res4", "res5", "res6", "res7", "res8", "res9", - } - assert.Equal(t, expectedIDs, ids) + sort.Strings(expectedIDs) + assert.Equal(expectedIDs, ids, "sort by ID") } From 7a9f8875b93c49412749b29e572af5d99182f171 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 30 Jun 2019 12:11:45 -0400 Subject: [PATCH 088/406] Avoid panicking when an attr or rel doesn't exist --- wrapper.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/wrapper.go b/wrapper.go index e924b50..eb723d3 100644 --- a/wrapper.go +++ b/wrapper.go @@ -124,8 +124,7 @@ func (w *Wrapper) Attr(key string) Attr { return attr } } - - panic(fmt.Sprintf("jsonapi: attribute %s does not exist", key)) + return Attr{} } // Rel returns the relationship that corresponds to the given key. @@ -135,8 +134,7 @@ func (w *Wrapper) Rel(key string) Rel { return rel } } - - panic(fmt.Sprintf("jsonapi: relationship %s does not exist", key)) + return Rel{} } // New returns a copy of the resource under the wrapper. From d9486d185cb0c0e35ef0fc4ce08df59cc8570510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 30 Jun 2019 13:06:29 -0400 Subject: [PATCH 089/406] Improve support and testing for uint64 attr type --- jsonapi_test.go | 3 +++ mock_schema_test.go | 2 ++ testdata/collection-1.json | 4 +++- testdata/collection-2.json | 2 +- testdata/collection-3.json | 2 +- testdata/resource-1.json | 3 ++- testdata/resource-2.json | 3 ++- testdata/resource-3.json | 2 +- url_test.go | 8 ++++---- wrapper.go | 11 +++++++++-- 10 files changed, 28 insertions(+), 12 deletions(-) diff --git a/jsonapi_test.go b/jsonapi_test.go index df927ef..69579e4 100644 --- a/jsonapi_test.go +++ b/jsonapi_test.go @@ -37,6 +37,7 @@ func init() { Uint8: 8, Uint16: 1600, Uint32: 32000, + Uint64: 64000, Bool: false, Time: time.Date(2017, 1, 2, 3, 4, 5, 6, loc), }), @@ -59,6 +60,7 @@ func init() { uint8Ptr := uint8(8) uint16Ptr := uint16(1600) uint32Ptr := uint32(32000) + uint64Ptr := uint64(64000) boolPtr := false timePtr := time.Date(2017, 1, 2, 3, 4, 5, 6, loc) mocktypes2.Add( @@ -74,6 +76,7 @@ func init() { Uint8Ptr: &uint8Ptr, Uint16Ptr: &uint16Ptr, Uint32Ptr: &uint32Ptr, + Uint64Ptr: &uint64Ptr, BoolPtr: &boolPtr, TimePtr: &timePtr, }), diff --git a/mock_schema_test.go b/mock_schema_test.go index 5cb869c..6fca084 100644 --- a/mock_schema_test.go +++ b/mock_schema_test.go @@ -49,6 +49,7 @@ type mockType1 struct { Uint8 uint8 `json:"uint8" api:"attr"` Uint16 uint16 `json:"uint16" api:"attr"` Uint32 uint32 `json:"uint32" api:"attr"` + Uint64 uint64 `json:"uint64" api:"attr"` Bool bool `json:"bool" api:"attr"` Time time.Time `json:"time" api:"attr"` @@ -76,6 +77,7 @@ type mockType2 struct { Uint8Ptr *uint8 `json:"uint8ptr" api:"attr"` Uint16Ptr *uint16 `json:"uint16ptr" api:"attr"` Uint32Ptr *uint32 `json:"uint32ptr" api:"attr"` + Uint64Ptr *uint64 `json:"uint64ptr" api:"attr"` BoolPtr *bool `json:"boolptr" api:"attr"` TimePtr *time.Time `json:"timeptr" api:"attr"` diff --git a/testdata/collection-1.json b/testdata/collection-1.json index 8214022..a92c33c 100644 --- a/testdata/collection-1.json +++ b/testdata/collection-1.json @@ -13,6 +13,7 @@ "uint": 0, "uint16": 0, "uint32": 0, + "uint64": 0, "uint8": 0 }, "id": "mt1-1", @@ -72,6 +73,7 @@ "uint": 42, "uint16": 1600, "uint32": 32000, + "uint64": 64000, "uint8": 8 }, "id": "mt1-2", @@ -123,7 +125,7 @@ "version": "1.0" }, "links": { - "self": "/mocktypes1?fields%5Bmocktypes1%5D=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cto-many%2Cto-many-from-many%2Cto-many-from-one%2Cto-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint%2Cuint16%2Cuint32%2Cuint8\u0026page%5Bsize%5D=10\u0026page%5Bnumber%5D=1\u0026sort=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cuint%2Cuint16%2Cuint32%2Cuint8" + "self": "/mocktypes1?fields%5Bmocktypes1%5D=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cto-many%2Cto-many-from-many%2Cto-many-from-one%2Cto-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8\u0026page%5Bsize%5D=10\u0026page%5Bnumber%5D=1\u0026sort=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8" }, "meta": { "num": -32820, diff --git a/testdata/collection-2.json b/testdata/collection-2.json index 6961124..21b4a4d 100644 --- a/testdata/collection-2.json +++ b/testdata/collection-2.json @@ -31,6 +31,6 @@ "version": "1.0" }, "links": { - "self": "https://example.org/mocktypes2?fields%5Bmocktypes2%5D=boolptr%2Ctimeptr%2Cuintptr\u0026page%5Bsize%5D=10\u0026page%5Bnumber%5D=1\u0026sort=boolptr%2Cint16ptr%2Cint32ptr%2Cint64ptr%2Cint8ptr%2Cintptr%2Cstrptr%2Ctimeptr%2Cuint16ptr%2Cuint32ptr%2Cuint8ptr%2Cuintptr" + "self": "https://example.org/mocktypes2?fields%5Bmocktypes2%5D=boolptr%2Ctimeptr%2Cuintptr\u0026page%5Bsize%5D=10\u0026page%5Bnumber%5D=1\u0026sort=boolptr%2Cint16ptr%2Cint32ptr%2Cint64ptr%2Cint8ptr%2Cintptr%2Cstrptr%2Ctimeptr%2Cuint16ptr%2Cuint32ptr%2Cuint64ptr%2Cuint8ptr%2Cuintptr" } } diff --git a/testdata/collection-3.json b/testdata/collection-3.json index 21c3899..18570b6 100644 --- a/testdata/collection-3.json +++ b/testdata/collection-3.json @@ -4,6 +4,6 @@ "version": "1.0" }, "links": { - "self": "https://example.org/mocktypes1?fields%5Bmocktypes1%5D=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cto-many%2Cto-many-from-many%2Cto-many-from-one%2Cto-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint%2Cuint16%2Cuint32%2Cuint8\u0026page%5Bsize%5D=10\u0026page%5Bnumber%5D=1\u0026sort=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cuint%2Cuint16%2Cuint32%2Cuint8" + "self": "https://example.org/mocktypes1?fields%5Bmocktypes1%5D=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cto-many%2Cto-many-from-many%2Cto-many-from-one%2Cto-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8\u0026page%5Bsize%5D=10\u0026page%5Bnumber%5D=1\u0026sort=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8" } } diff --git a/testdata/resource-1.json b/testdata/resource-1.json index 9c9a2df..2238750 100644 --- a/testdata/resource-1.json +++ b/testdata/resource-1.json @@ -12,6 +12,7 @@ "uint": 0, "uint16": 0, "uint32": 0, + "uint64": 0, "uint8": 0 }, "id": "mt1-1", @@ -62,7 +63,7 @@ "version": "1.0" }, "links": { - "self": "/mocktypes1/mt1-1?fields%5Bmocktypes1%5D=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cto-many%2Cto-many-from-many%2Cto-many-from-one%2Cto-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint%2Cuint16%2Cuint32%2Cuint8\u0026sort=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cuint%2Cuint16%2Cuint32%2Cuint8" + "self": "/mocktypes1/mt1-1?fields%5Bmocktypes1%5D=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cto-many%2Cto-many-from-many%2Cto-many-from-one%2Cto-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8\u0026sort=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8" }, "meta": { "num": 42, diff --git a/testdata/resource-2.json b/testdata/resource-2.json index c21dbe1..b2c1bb9 100644 --- a/testdata/resource-2.json +++ b/testdata/resource-2.json @@ -11,6 +11,7 @@ "timeptr": "2017-01-02T03:04:05.000000006Z", "uint16ptr": 1600, "uint32ptr": 32000, + "uint64ptr": 64000, "uint8ptr": 8, "uintptr": 42 }, @@ -50,6 +51,6 @@ "version": "1.0" }, "links": { - "self": "https://example.org/mocktypes2/mt1-2?fields%5Bmocktypes2%5D=boolptr%2Cint16ptr%2Cint32ptr%2Cint64ptr%2Cint8ptr%2Cintptr%2Cstrptr%2Ctimeptr%2Cto-many-from-many%2Cto-many-from-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint16ptr%2Cuint32ptr%2Cuint8ptr%2Cuintptr\u0026sort=boolptr%2Cint16ptr%2Cint32ptr%2Cint64ptr%2Cint8ptr%2Cintptr%2Cstrptr%2Ctimeptr%2Cuint16ptr%2Cuint32ptr%2Cuint8ptr%2Cuintptr" + "self": "https://example.org/mocktypes2/mt1-2?fields%5Bmocktypes2%5D=boolptr%2Cint16ptr%2Cint32ptr%2Cint64ptr%2Cint8ptr%2Cintptr%2Cstrptr%2Ctimeptr%2Cto-many-from-many%2Cto-many-from-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint16ptr%2Cuint32ptr%2Cuint64ptr%2Cuint8ptr%2Cuintptr\u0026sort=boolptr%2Cint16ptr%2Cint32ptr%2Cint64ptr%2Cint8ptr%2Cintptr%2Cstrptr%2Ctimeptr%2Cuint16ptr%2Cuint32ptr%2Cuint64ptr%2Cuint8ptr%2Cuintptr" } } diff --git a/testdata/resource-3.json b/testdata/resource-3.json index f22d35e..b261e8a 100644 --- a/testdata/resource-3.json +++ b/testdata/resource-3.json @@ -15,6 +15,6 @@ "version": "1.0" }, "links": { - "self": "https://example.org/mocktypes2/mt1-2?fields%5Bmocktypes2%5D=strptr%2Cuintptr\u0026sort=boolptr%2Cint16ptr%2Cint32ptr%2Cint64ptr%2Cint8ptr%2Cintptr%2Cstrptr%2Ctimeptr%2Cuint16ptr%2Cuint32ptr%2Cuint8ptr%2Cuintptr" + "self": "https://example.org/mocktypes2/mt1-2?fields%5Bmocktypes2%5D=strptr%2Cuintptr\u0026sort=boolptr%2Cint16ptr%2Cint32ptr%2Cint64ptr%2Cint8ptr%2Cintptr%2Cstrptr%2Ctimeptr%2Cuint16ptr%2Cuint32ptr%2Cuint64ptr%2Cuint8ptr%2Cuintptr" } } diff --git a/url_test.go b/url_test.go index 2c33066..71a79ca 100644 --- a/url_test.go +++ b/url_test.go @@ -261,7 +261,7 @@ func TestParseParams(t *testing.T) { Rels: map[string][]Rel{}, RelData: map[string][]string{}, Filter: nil, - SortingRules: []string{"str", "-bool", "uint8", "int", "int16", "int32", "int64", "int8", "time", "uint", "uint16", "uint32"}, + SortingRules: []string{"str", "-bool", "uint8", "int", "int16", "int32", "int64", "int8", "time", "uint", "uint16", "uint32", "uint64"}, PageSize: 50, PageNumber: 3, Include: [][]Rel{ @@ -305,7 +305,7 @@ func TestParseParams(t *testing.T) { Rels: map[string][]Rel{}, RelData: map[string][]string{}, Filter: nil, - SortingRules: []string{"str", "-bool", "uint8", "int", "int16", "int32", "int64", "int8", "time", "uint", "uint16", "uint32"}, + SortingRules: []string{"str", "-bool", "uint8", "int", "int16", "int32", "int64", "int8", "time", "uint", "uint16", "uint32", "uint64"}, PageSize: 50, PageNumber: 3, Include: [][]Rel{ @@ -347,7 +347,7 @@ func TestParseParams(t *testing.T) { Rels: map[string][]Rel{}, RelData: map[string][]string{}, Filter: nil, - SortingRules: []string{"str", "-bool", "uint8", "int", "int16", "int32", "int64", "int8", "time", "uint", "uint16", "uint32"}, + SortingRules: []string{"str", "-bool", "uint8", "int", "int16", "int32", "int64", "int8", "time", "uint", "uint16", "uint32", "uint64"}, PageSize: 90, PageNumber: 110, Include: [][]Rel{ @@ -373,7 +373,7 @@ func TestParseParams(t *testing.T) { RelData: map[string][]string{}, FilterLabel: "label", Filter: nil, - SortingRules: []string{"bool", "int", "int16", "int32", "int64", "int8", "str", "time", "uint", "uint16", "uint32", "uint8"}, + SortingRules: []string{"bool", "int", "int16", "int32", "int64", "int8", "str", "time", "uint", "uint16", "uint32", "uint64", "uint8"}, PageSize: 10, PageNumber: 1, Include: [][]Rel{}, diff --git a/wrapper.go b/wrapper.go index eb723d3..699c080 100644 --- a/wrapper.go +++ b/wrapper.go @@ -432,7 +432,7 @@ func (w *Wrapper) setAttr(key string, v interface{}) error { switch nv := v.(type) { case string: str = nv - case int, int8, int16, int32, int64, uint, uint8, uint16, uint32: + case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64: str = fmt.Sprintf("%d", nv) case bool: if nv { @@ -496,7 +496,7 @@ func (w *Wrapper) setAttr(key string, v interface{}) error { return err } field.Set(reflect.ValueOf(&i)) - case "uint", "uint8", "uint16", "uint32": + case "uint", "uint8", "uint16", "uint32", "uint64": i, err := strconv.ParseUint(str, 10, 64) if err != nil { return err @@ -530,6 +530,13 @@ func (w *Wrapper) setAttr(key string, v interface{}) error { } ni := uint32(i) field.Set(reflect.ValueOf(&ni)) + case "*uint64": + i, err := strconv.ParseUint(str, 10, 64) + if err != nil { + return err + } + ni := uint64(i) + field.Set(reflect.ValueOf(&ni)) case "bool": if str == "true" { field.SetBool(true) From 794f60e64d6c0a79f8bc328e8f1c6f3e77b58012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 30 Jun 2019 13:11:49 -0400 Subject: [PATCH 090/406] Add tests for Wrapper --- wrapper_test.go | 129 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 112 insertions(+), 17 deletions(-) diff --git a/wrapper_test.go b/wrapper_test.go index 9881318..319f8a9 100644 --- a/wrapper_test.go +++ b/wrapper_test.go @@ -11,6 +11,24 @@ import ( "github.com/stretchr/testify/assert" ) +func TestWrap(t *testing.T) { + assert := assert.New(t) + + assert.Panics(func() { + _ = Wrap("just a string") + }, "panic when not a pointer to a struct") + + assert.Panics(func() { + str := "just a string" + _ = Wrap(&str) + }, "panic when not a pointer to a struct") + + assert.Panics(func() { + s := time.Now() + _ = Wrap(&s) + }, "panic when not a valid struct") +} + func TestWrapper(t *testing.T) { assert := assert.New(t) @@ -28,6 +46,7 @@ func TestWrapper(t *testing.T) { Uint8: 8, Uint16: 16, Uint32: 32, + Uint64: 64, Bool: true, Time: time.Date(2017, 1, 2, 3, 4, 5, 6, loc), } @@ -39,7 +58,31 @@ func TestWrapper(t *testing.T) { assert.Equal(res1.ID, id, "id") assert.Equal("mocktypes1", typ, "type") + wrap1.SetID("another-id") + assert.Equal(res1.ID, "another-id", "set id") + // Get attributes + attr := wrap1.Attr("str") + assert.Equal(Attr{ + Name: "str", + Type: AttrTypeString, + Null: false, + }, attr, "get attribute (str)") + assert.Equal(Attr{}, wrap1.Attr("nonexistent"), "get non-existent attribute") + + // Get relationships + rel := wrap1.Rel("to-one") + assert.Equal(Rel{ + Name: "to-one", + Type: "mocktypes2", + ToOne: true, + InverseName: "", + InverseType: "mocktypes1", + InverseToOne: false, + }, rel, "get relationship (to-one)") + assert.Equal(Rel{}, wrap1.Rel("nonexistent"), "get non-existent relationship") + + // Get values (attributes) v1 := reflect.ValueOf(res1).Elem() for i := 0; i < v1.NumField(); i++ { f := v1.Field(i) @@ -51,7 +94,7 @@ func TestWrapper(t *testing.T) { } } - // Set attributes + // Set values (attributes) wrap1.Set("str", "another_string") assert.Equal("another_string", wrap1.Get("str"), "set string attribute") wrap1.Set("int", 3) @@ -67,10 +110,11 @@ func TestWrapper(t *testing.T) { aUint8 := uint8(88) aUint16 := uint16(1616) aUint32 := uint32(3232) + aUint64 := uint64(6464) aBool := false aTime := time.Date(2018, 2, 3, 4, 5, 6, 7, loc) - // Set the attributes after the wrapping + // Set the values (attributes) after the wrapping res2 := &mockType2{ ID: "res123", StrPtr: &aStr, @@ -83,6 +127,7 @@ func TestWrapper(t *testing.T) { Uint8Ptr: &aUint8, Uint16Ptr: &aUint16, Uint32Ptr: &aUint32, + Uint64Ptr: &aUint64, BoolPtr: &aBool, TimePtr: &aTime, } @@ -94,7 +139,7 @@ func TestWrapper(t *testing.T) { assert.Equal(res2.ID, id, "id 2") assert.Equal("mocktypes2", typ, "type 2") - // Get attributes + // Get values (attributes) v2 := reflect.ValueOf(res2).Elem() for i := 0; i < v2.NumField(); i++ { f := v2.Field(i) @@ -106,7 +151,7 @@ func TestWrapper(t *testing.T) { } } - // Set attributes + // Set values (attributes) var anotherString = "anotherString" wrap2.Set("strptr", &anotherString) assert.Equal(&anotherString, wrap2.Get("strptr"), "set string pointer attribute") @@ -127,21 +172,71 @@ func TestWrapper(t *testing.T) { assert.Equal(t, "nil pointer 2", nil, res2.UintPtr) } - // Copy - wrap3 := wrap1.Copy() + // New + wrap3 := wrap1.New() + for _, attr := range wrap1.Attrs() { + assert.Equal(wrap1.Attr(attr.Name), wrap3.Attr(attr.Name), "copied attribute") + } + for _, rel := range wrap1.Rels() { + assert.Equal(wrap1.Rel(rel.Name), wrap3.Rel(rel.Name), "copied relationship") + } + // Copy + wrap3 = wrap1.Copy() for _, attr := range wrap1.Attrs() { - assert.Equal(wrap1.Get(attr.Name), wrap3.Get(attr.Name), "copied attribute") - - if attr.Type == AttrTypeBool && !attr.Null { - wrap3.Set(attr.Name, !wrap1.Get(attr.Name).(bool)) - } else if attr.Type == AttrTypeBool && attr.Null { - wrap3.Set(attr.Name, !*(wrap1.Get(attr.Name).(*bool))) - } else if attr.Type == AttrTypeTime { - wrap3.Set(attr.Name, time.Now()) - } else { - wrap3.Set(attr.Name, "0") + assert.Equal(wrap1.Attr(attr.Name), wrap3.Attr(attr.Name), "copied attribute") + } + for _, rel := range wrap1.Rels() { + assert.Equal(wrap1.Rel(rel.Name), wrap3.Rel(rel.Name), "copied relationship") + } + + wrap3.Set("str", "another string") + assert.NotEqual( + wrap1.Get("str"), + wrap3.Get("str"), + fmt.Sprintf("modified value does not affect original"), + ) +} + +func TestWrapperSet(t *testing.T) { + assert := assert.New(t) + + tests := []struct { + typ string // "1" for mockType1, "2" for mockType2 + field string + val interface{} + }{ + {typ: "1", field: "str", val: "astring"}, + {typ: "1", field: "int", val: int(9)}, + {typ: "1", field: "int8", val: int8(9)}, + {typ: "1", field: "int16", val: int16(9)}, + {typ: "1", field: "int32", val: int32(9)}, + {typ: "1", field: "int64", val: int64(9)}, + {typ: "1", field: "uint", val: uint(9)}, + {typ: "1", field: "uint8", val: uint8(9)}, + {typ: "1", field: "uint16", val: uint16(9)}, + {typ: "1", field: "uint32", val: uint32(9)}, + {typ: "1", field: "uint64", val: uint64(9)}, + {typ: "1", field: "bool", val: bool(true)}, + {typ: "2", field: "strptr", val: ptr("astring")}, + {typ: "2", field: "intptr", val: ptr(int(9))}, + {typ: "2", field: "int8ptr", val: ptr(int8(9))}, + {typ: "2", field: "int16ptr", val: ptr(int16(9))}, + {typ: "2", field: "int32ptr", val: ptr(int32(9))}, + {typ: "2", field: "int64ptr", val: ptr(int64(9))}, + {typ: "2", field: "uintptr", val: ptr(uint(9))}, + {typ: "2", field: "uint8ptr", val: ptr(uint8(9))}, + {typ: "2", field: "uint16ptr", val: ptr(uint16(9))}, + {typ: "2", field: "uint32ptr", val: ptr(uint32(9))}, + {typ: "2", field: "uint64ptr", val: ptr(uint64(9))}, + {typ: "2", field: "boolptr", val: ptr(bool(true))}, + } + + for _, test := range tests { + if test.typ == "1" { + res1 := Wrap(&mockType1{}) + res1.Set(test.field, test.val) + assert.EqualValues(test.val, res1.Get(test.field)) } - assert.NotEqual(wrap1.Get(attr.Name), wrap3.Get(attr.Name), fmt.Sprintf("modified copied attribute %s (%v)", attr.Name, attr.Type)) } } From f7fdc91958f69d55f9e825f083c9b6da403fb5d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 30 Jun 2019 13:16:49 -0400 Subject: [PATCH 091/406] Remove type conversion in Wrapper.setAttr --- wrapper.go | 152 ++--------------------------------------------------- 1 file changed, 4 insertions(+), 148 deletions(-) diff --git a/wrapper.go b/wrapper.go index 699c080..2ccb74b 100644 --- a/wrapper.go +++ b/wrapper.go @@ -1,14 +1,11 @@ package jsonapi import ( - "database/sql" "encoding/json" "errors" "fmt" "reflect" - "strconv" "strings" - "time" ) var _ Resource = (*Wrapper)(nil) @@ -422,152 +419,11 @@ func (w *Wrapper) setAttr(key string, v interface{}) error { field.Set(val) return nil } - if val.Kind() == reflect.Ptr { - val = val.Elem() - } - v = val.Interface() - - // Convert to string - var str string - switch nv := v.(type) { - case string: - str = nv - case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64: - str = fmt.Sprintf("%d", nv) - case bool: - if nv { - str = "true" - } else { - str = "false" - } - case time.Time: - str = nv.Format(time.RFC3339Nano) - case float32, float64: - str = fmt.Sprintf("") - case sql.NullString: - str = nv.String - default: - panic(fmt.Errorf("jsonapi: value is of unsupported type")) - } - - // Convert from string - switch field.Type().String() { - case "string": - field.SetString(str) - case "*string": - field.Set(reflect.ValueOf(&str)) - case "int", "int8", "int16", "int32", "int64": - i, err := strconv.ParseInt(str, 10, 64) - if err != nil { - return err - } - field.SetInt(i) - case "*int": - i, err := strconv.ParseInt(str, 10, 64) - if err != nil { - return err - } - ni := int(i) - field.Set(reflect.ValueOf(&ni)) - case "*int8": - i, err := strconv.ParseInt(str, 10, 64) - if err != nil { - return err - } - ni := int8(i) - field.Set(reflect.ValueOf(&ni)) - case "*int16": - i, err := strconv.ParseInt(str, 10, 64) - if err != nil { - return err - } - ni := int16(i) - field.Set(reflect.ValueOf(&ni)) - case "*int32": - i, err := strconv.ParseInt(str, 10, 64) - if err != nil { - return err - } - ni := int32(i) - field.Set(reflect.ValueOf(&ni)) - case "*int64": - i, err := strconv.ParseInt(str, 10, 64) - if err != nil { - return err - } - field.Set(reflect.ValueOf(&i)) - case "uint", "uint8", "uint16", "uint32", "uint64": - i, err := strconv.ParseUint(str, 10, 64) - if err != nil { - return err - } - field.SetUint(i) - case "*uint": - i, err := strconv.ParseUint(str, 10, 64) - if err != nil { - return err - } - ni := uint(i) - field.Set(reflect.ValueOf(&ni)) - case "*uint8": - i, err := strconv.ParseUint(str, 10, 64) - if err != nil { - return err - } - ni := uint8(i) - field.Set(reflect.ValueOf(&ni)) - case "*uint16": - i, err := strconv.ParseUint(str, 10, 64) - if err != nil { - return err - } - ni := uint16(i) - field.Set(reflect.ValueOf(&ni)) - case "*uint32": - i, err := strconv.ParseUint(str, 10, 64) - if err != nil { - return err - } - ni := uint32(i) - field.Set(reflect.ValueOf(&ni)) - case "*uint64": - i, err := strconv.ParseUint(str, 10, 64) - if err != nil { - return err - } - ni := uint64(i) - field.Set(reflect.ValueOf(&ni)) - case "bool": - if str == "true" { - field.SetBool(true) - } else if str == "false" { - field.SetBool(false) - } - case "*bool": - var b bool - if str == "true" { - b = false - } else if str == "false" { - b = true - } - field.Set(reflect.ValueOf(&b)) - case "time.Time": - t, err := time.Parse(time.RFC3339Nano, str) - if err != nil { - return err - } - field.Set(reflect.ValueOf(t)) - case "*time.Time": - t, err := time.Parse(time.RFC3339Nano, str) - if err != nil { - return err - } - field.Set(reflect.ValueOf(&t)) - default: - return fmt.Errorf("jsonapi: field is of unsupported type") - } - return nil + panic(fmt.Sprintf("jsonapi: value is of wrong type (expected %q, got %q)", + field.Type(), + val.Type(), + )) } } From 4ce5ca17850de375b3a2af3204847c484aaf2710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 30 Jun 2019 13:27:36 -0400 Subject: [PATCH 092/406] Remove Wrapper.UnmarshalJSON --- wrapper.go | 70 ------------------------------------------------------ 1 file changed, 70 deletions(-) diff --git a/wrapper.go b/wrapper.go index 2ccb74b..1d0f7ae 100644 --- a/wrapper.go +++ b/wrapper.go @@ -1,7 +1,6 @@ package jsonapi import ( - "encoding/json" "errors" "fmt" "reflect" @@ -307,75 +306,6 @@ func (w *Wrapper) Copy() Resource { return nw } -// UnmarshalJSON parses the payload and populates the wrapped resource. -func (w *Wrapper) UnmarshalJSON(payload []byte) error { - var err error - - // Resource - ske := resourceSkeleton{} - err = json.Unmarshal(payload, &ske) - if err != nil { - return err - } - - // ID - w.SetID(ske.ID) - - // Attributes - attrs := map[string]interface{}{} - err = json.Unmarshal(ske.Attributes, &attrs) - if err != nil { - return fmt.Errorf("jsonapi: the attributes could not be parsed: %s", err) - } - - for _, attr := range w.Attrs() { - k := attr.Name - if v, ok := attrs[k]; ok { - switch nv := v.(type) { - case string: - w.Set(k, nv) - case float64: - w.Set(k, nv) - case bool: - w.Set(k, nv) - default: - if nv == nil { - continue - } - - panic(fmt.Errorf("jsonapi: attribute of type %T is not supported", nv)) - } - } - } - - // Relationships - for n, skeRel := range ske.Relationships { - for _, rel := range w.Rels() { - if rel.Name == n { - if len(skeRel.Data) != 0 { - if rel.ToOne { - data := identifierSkeleton{} - - err := json.Unmarshal(skeRel.Data, &data) - if err != nil { - return nil - } - } else { - data := []identifierSkeleton{} - - err := json.Unmarshal(skeRel.Data, &data) - if err != nil { - return nil - } - } - } - } - } - } - - return nil -} - // Private methods func (w *Wrapper) getAttr(key string, t string) interface{} { From 784fed58b3f247d22ab45ef1431a78ce18f74830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 30 Jun 2019 23:17:02 -0400 Subject: [PATCH 093/406] Rename Attr.Null to Nullable --- filter_query_test.go | 12 ++++++------ soft_collection_test.go | 14 +++++++------- soft_resource.go | 10 +++++----- soft_resource_test.go | 6 +++--- type.go | 8 ++++---- util.go | 6 +++--- wrapper.go | 6 +++--- wrapper_test.go | 2 +- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/filter_query_test.go b/filter_query_test.go index ae849fb..ba0ec0c 100644 --- a/filter_query_test.go +++ b/filter_query_test.go @@ -696,9 +696,9 @@ func TestFilterResource(t *testing.T) { ty, n := GetAttrType(fmt.Sprintf("%T", test.rval)) typ.Attrs = map[string]Attr{ "attr": Attr{ - Name: "attr", - Type: ty, - Null: n, + Name: "attr", + Type: ty, + Nullable: n, }, } @@ -835,9 +835,9 @@ func TestFilterResource(t *testing.T) { ty, n := GetAttrType(fmt.Sprintf("%T", test.rvals[j])) typ.AddAttr( Attr{ - Name: attrName, - Type: ty, - Null: n, + Name: attrName, + Type: ty, + Nullable: n, }, ) diff --git a/soft_collection_test.go b/soft_collection_test.go index 905418f..a559382 100644 --- a/soft_collection_test.go +++ b/soft_collection_test.go @@ -21,12 +21,12 @@ func TestSoftCollection(t *testing.T) { typ.AddAttr(Attr{ Name: "attr1", Type: AttrTypeInt, - Null: false, + Nullable: false, }) typ.AddAttr(Attr{ Name: "attr2", Type: AttrTypeString, - Null: true, + Nullable: true, }) typ.AddRel(Rel{ Name: "rel1", @@ -58,7 +58,7 @@ func TestSoftCollection(t *testing.T) { attr3 := Attr{ Name: "attr3", Type: AttrTypeBool, - Null: false, + Nullable: false, } rel5 := Rel{ Name: "rel5", @@ -81,7 +81,7 @@ func TestSoftCollection(t *testing.T) { attr4 := Attr{ Name: "attr4", Type: AttrTypeUint16, - Null: true, + Nullable: true, } sr.AddAttr(attr4) typ.AddAttr(attr4) @@ -125,12 +125,12 @@ func TestSoftCollectionResource(t *testing.T) { sc.GetType().AddAttr(Attr{ Name: "attr1", Type: AttrTypeString, - Null: false, + Nullable: false, }) sc.GetType().AddAttr(Attr{ Name: "attr2", Type: AttrTypeInt, - Null: true, + Nullable: true, }) sc.GetType().AddRel(Rel{ Name: "rel1", @@ -260,7 +260,7 @@ func TestSoftCollectionSort(t *testing.T) { typ.AddAttr(Attr{ Name: "attr" + strconv.Itoa(i), Type: ti, - Null: null, + Nullable: null, }) } sc.SetType(typ) diff --git a/soft_resource.go b/soft_resource.go index 2584ac5..1745d60 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -122,7 +122,7 @@ func (sr *SoftResource) Get(key string) interface{} { if v, ok := sr.data[key]; ok { return v } - return GetZeroValue(attr.Type, attr.Null) + return GetZeroValue(attr.Type, attr.Nullable) } if rel, ok := sr.typ.Rels[key]; ok { if v, ok := sr.data[key]; ok { @@ -152,10 +152,10 @@ func (sr *SoftResource) SetType(typ *Type) { func (sr *SoftResource) Set(key string, v interface{}) { sr.check() if attr, ok := sr.typ.Attrs[key]; ok { - if GetAttrTypeString(attr.Type, attr.Null) == fmt.Sprintf("%T", v) { + if GetAttrTypeString(attr.Type, attr.Nullable) == fmt.Sprintf("%T", v) { sr.data[key] = v - } else if v == nil && attr.Null { - sr.data[key] = GetZeroValue(attr.Type, attr.Null) + } else if v == nil && attr.Nullable { + sr.data[key] = GetZeroValue(attr.Type, attr.Nullable) } } } @@ -245,7 +245,7 @@ func (sr *SoftResource) check() { for i := range sr.typ.Attrs { n := sr.typ.Attrs[i].Name if _, ok := sr.data[n]; !ok { - sr.data[n] = GetZeroValue(sr.typ.Attrs[i].Type, sr.typ.Attrs[i].Null) + sr.data[n] = GetZeroValue(sr.typ.Attrs[i].Type, sr.typ.Attrs[i].Nullable) } } for i := range sr.typ.Rels { diff --git a/soft_resource_test.go b/soft_resource_test.go index 320771e..790b315 100644 --- a/soft_resource_test.go +++ b/soft_resource_test.go @@ -19,7 +19,7 @@ func TestSoftResource(t *testing.T) { typ.AddAttr(Attr{ Name: "attr1", Type: AttrTypeString, - Null: false, + Nullable: false, }) typ.AddRel(Rel{ Name: "rel1", @@ -45,12 +45,12 @@ func TestSoftResource(t *testing.T) { "attr1": Attr{ Name: "attr1", Type: AttrTypeString, - Null: false, + Nullable: false, }, "attr2": Attr{ Name: "attr2", Type: AttrTypeString, - Null: true, + Nullable: true, }, } for _, attr := range attrs { diff --git a/type.go b/type.go index b344b6d..9b30ce5 100644 --- a/type.go +++ b/type.go @@ -20,7 +20,7 @@ func (t *Type) AddAttr(attr Attr) error { return fmt.Errorf("jsonapi: attribute name is empty") } - if GetAttrTypeString(attr.Type, attr.Null) == "" { + if GetAttrTypeString(attr.Type, attr.Nullable) == "" { return fmt.Errorf("jsonapi: attribute type is invalid") } @@ -102,9 +102,9 @@ func (t *Type) Fields() []string { // Attr represents a resource attribute. type Attr struct { - Name string - Type int - Null bool + Name string + Type int + Nullable bool } // Rel represents a resource relationship. diff --git a/util.go b/util.go index 8fdcdf3..745e984 100644 --- a/util.go +++ b/util.go @@ -168,9 +168,9 @@ func ReflectType(v interface{}) (Type, error) { if apiTag == "attr" { fieldType, null := GetAttrType(fs.Type.String()) typ.Attrs[jsonTag] = Attr{ - Name: jsonTag, - Type: fieldType, - Null: null, + Name: jsonTag, + Type: fieldType, + Nullable: null, } } } diff --git a/wrapper.go b/wrapper.go index 1d0f7ae..f66b29d 100644 --- a/wrapper.go +++ b/wrapper.go @@ -61,9 +61,9 @@ func Wrap(v interface{}) *Wrapper { if apiTag == "attr" { typ, null := GetAttrType(fs.Type.String()) w.attrs[jsonTag] = Attr{ - Name: jsonTag, - Type: typ, - Null: null, + Name: jsonTag, + Type: typ, + Nullable: null, } } } diff --git a/wrapper_test.go b/wrapper_test.go index 319f8a9..a12203f 100644 --- a/wrapper_test.go +++ b/wrapper_test.go @@ -66,7 +66,7 @@ func TestWrapper(t *testing.T) { assert.Equal(Attr{ Name: "str", Type: AttrTypeString, - Null: false, + Nullable: false, }, attr, "get attribute (str)") assert.Equal(Attr{}, wrap1.Attr("nonexistent"), "get non-existent attribute") From f89ac59550ae99b12f1fb90b4691547042a6687a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 1 Jul 2019 07:57:38 -0400 Subject: [PATCH 094/406] Run go fmt on forgotten file --- soft_resource_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/soft_resource_test.go b/soft_resource_test.go index 790b315..1719adb 100644 --- a/soft_resource_test.go +++ b/soft_resource_test.go @@ -17,8 +17,8 @@ func TestSoftResource(t *testing.T) { // NewSoftResource typ := Type{Name: "type"} typ.AddAttr(Attr{ - Name: "attr1", - Type: AttrTypeString, + Name: "attr1", + Type: AttrTypeString, Nullable: false, }) typ.AddRel(Rel{ @@ -43,13 +43,13 @@ func TestSoftResource(t *testing.T) { // Attributes attrs := map[string]Attr{ "attr1": Attr{ - Name: "attr1", - Type: AttrTypeString, + Name: "attr1", + Type: AttrTypeString, Nullable: false, }, "attr2": Attr{ - Name: "attr2", - Type: AttrTypeString, + Name: "attr2", + Type: AttrTypeString, Nullable: true, }, } From 54f95525c90c30c904c70f5a330dc4ffcd0507ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 1 Jul 2019 07:59:53 -0400 Subject: [PATCH 095/406] Refactor for some stuff around --- filter_query_test.go | 85 ------------------ helpers.go | 106 ++++++++++++++++++++++ jsonapi.go | 187 ++++++++++++++++++++++----------------- schema.go | 189 --------------------------------------- type.go | 189 +++++++++++++++++++++++++++++++++++++++ util.go | 206 ------------------------------------------- util_test.go | 90 ++++++++++++++++++- 7 files changed, 490 insertions(+), 562 deletions(-) create mode 100644 helpers.go delete mode 100644 util.go diff --git a/filter_query_test.go b/filter_query_test.go index ba0ec0c..e5fdb91 100644 --- a/filter_query_test.go +++ b/filter_query_test.go @@ -944,91 +944,6 @@ func TestFilterMarshaling(t *testing.T) { assert.Equal(false, err != nil, "empty operation and value") // TODO } -func ptr(v interface{}) interface{} { - switch c := v.(type) { - // String - case string: - return &c - // Integers - case int: - return &c - case int8: - return &c - case int16: - return &c - case int32: - return &c - case int64: - return &c - case uint: - return &c - case uint8: - return &c - case uint16: - return &c - case uint32: - return &c - case uint64: - return &c - // Bool - case bool: - return &c - // time.Time - case time.Time: - return &c - } - return nil -} - -func nilptr(t string) interface{} { - switch t { - // String - case "string": - var p *string - return p - // Integers - case "int": - var p *int - return p - case "int8": - var p *int8 - return p - case "int16": - var p *int16 - return p - case "int32": - var p *int32 - return p - case "int64": - var p *int64 - return p - case "uint": - var p *uint - return p - case "uint8": - var p *uint8 - return p - case "uint16": - var p *uint16 - return p - case "uint32": - var p *uint32 - return p - case "uint64": - var p *uint64 - return p - // Bool - case "bool": - var p *bool - return p - // time.Time - case "time.Time": - var p *time.Time - return p - } - return nil -} - // func marshalUnmarshalFilter(t *testing.T, f *Filter) *Filter { // payload, err := json.MarshalIndent(f, "", "\t") // assert.NoError(t, err) diff --git a/helpers.go b/helpers.go new file mode 100644 index 0000000..1c324a6 --- /dev/null +++ b/helpers.go @@ -0,0 +1,106 @@ +package jsonapi + +import ( + "errors" + "fmt" + "reflect" + "strings" +) + +// CheckType checks the given value and returns any error found. +// +// If nil is returned, than the value can be safely used with this library. +func CheckType(v interface{}) error { + value := reflect.ValueOf(v) + kind := value.Kind() + + // Check wether it's a struct + if kind != reflect.Struct { + return errors.New("jsonapi: not a struct") + } + + // Check ID field + var ( + idField reflect.StructField + ok bool + ) + if idField, ok = value.Type().FieldByName("ID"); !ok { + return errors.New("jsonapi: struct doesn't have an ID field") + } + + resType := idField.Tag.Get("api") + if resType == "" { + return errors.New("jsonapi: ID field's api tag is empty") + } + + // Check attributes + for i := 0; i < value.NumField(); i++ { + sf := value.Type().Field(i) + + if sf.Tag.Get("api") == "attr" { + isValid := false + + switch sf.Type.String() { + case "string", "int", "int8", "int16", "int32", "int64", "uint", "uint8", "uint16", "uint32", "uint64", "bool", "time.Time", "*string", "*int", "*int8", "*int16", "*int32", "*int64", "*uint", "*uint8", "*uint16", "*uint32", "*uint64", "*bool", "*time.Time": + isValid = true + } + + if !isValid { + return fmt.Errorf("jsonapi: attribute %s of type %s is of unsupported type", sf.Name, resType) + } + } + } + + // Check relationships + for i := 0; i < value.NumField(); i++ { + sf := value.Type().Field(i) + + if strings.HasPrefix(sf.Tag.Get("api"), "rel,") { + s := strings.Split(sf.Tag.Get("api"), ",") + + if len(s) < 2 || len(s) > 3 { + return fmt.Errorf("jsonapi: api tag of relationship %s of struct %s is invalid", sf.Name, value.Type().Name()) + } + + if sf.Type.String() != "string" && sf.Type.String() != "[]string" { + return fmt.Errorf("jsonapi: relationship %s of type %s is not string or []string", sf.Name, resType) + } + } + } + + return nil +} + +// IDAndType returns the ID and the type of the resource represented by v. +// +// Two empty strings are returned if v is not recognized as a resource. +// CheckType can be used to check the validity of a struct. +func IDAndType(v interface{}) (string, string) { + switch nv := v.(type) { + case Resource: + return nv.GetID(), nv.GetType().Name + } + + val := reflect.ValueOf(v) + + // Allows pointers to structs + if val.Kind() == reflect.Ptr { + val = val.Elem() + } + + if val.Kind() == reflect.Struct { + idF := val.FieldByName("ID") + + if !idF.IsValid() { + return "", "" + } + + idSF, _ := val.Type().FieldByName("ID") + + if idF.Kind() == reflect.String { + return idF.String(), idSF.Tag.Get("api") + } + } + + return "", "" +} diff --git a/jsonapi.go b/jsonapi.go index b8322a8..75722e8 100644 --- a/jsonapi.go +++ b/jsonapi.go @@ -2,10 +2,6 @@ package jsonapi import ( "encoding/json" - "errors" - "fmt" - "reflect" - "strings" ) // Marshal marshals a document according to the JSON:API speficication. @@ -151,100 +147,129 @@ func Unmarshal(payload []byte, url *URL, schema *Schema) (*Document, error) { return doc, nil } -// CheckType checks the given value and returns any error found. -// -// If nil is returned, than the value can be safely used with this library. -func CheckType(v interface{}) error { - value := reflect.ValueOf(v) - kind := value.Kind() - - // Check wether it's a struct - if kind != reflect.Struct { - return errors.New("jsonapi: not a struct") - } - - // Check ID field - var ( - idField reflect.StructField - ok bool - ) - if idField, ok = value.Type().FieldByName("ID"); !ok { - return errors.New("jsonapi: struct doesn't have an ID field") - } - - resType := idField.Tag.Get("api") - if resType == "" { - return errors.New("jsonapi: ID field's api tag is empty") - } - - // Check attributes - for i := 0; i < value.NumField(); i++ { - sf := value.Type().Field(i) +// marshalResource ... +func marshalResource(r Resource, prepath string, fields []string, relData map[string][]string) ([]byte, error) { + mapPl := map[string]interface{}{} - if sf.Tag.Get("api") == "attr" { - isValid := false + // ID and type + mapPl["id"] = r.GetID() + mapPl["type"] = r.GetType().Name - switch sf.Type.String() { - case "string", "int", "int8", "int16", "int32", "int64", "uint", "uint8", "uint16", "uint32", "uint64", "bool", "time.Time", "*string", "*int", "*int8", "*int16", "*int32", "*int64", "*uint", "*uint8", "*uint16", "*uint32", "*uint64", "*bool", "*time.Time": - isValid = true - } - - if !isValid { - return fmt.Errorf("jsonapi: attribute %s of type %s is of unsupported type", sf.Name, resType) + // Attributes + attrs := map[string]interface{}{} + for _, attr := range r.Attrs() { + if len(fields) == 0 { + attrs[attr.Name] = r.Get(attr.Name) + } else { + for _, field := range fields { + if field == attr.Name { + attrs[attr.Name] = r.Get(attr.Name) + break + } } } } - - // Check relationships - for i := 0; i < value.NumField(); i++ { - sf := value.Type().Field(i) - - if strings.HasPrefix(sf.Tag.Get("api"), "rel,") { - s := strings.Split(sf.Tag.Get("api"), ",") - - if len(s) < 2 || len(s) > 3 { - return fmt.Errorf("jsonapi: api tag of relationship %s of struct %s is invalid", sf.Name, value.Type().Name()) - } - - if sf.Type.String() != "string" && sf.Type.String() != "[]string" { - return fmt.Errorf("jsonapi: relationship %s of type %s is not string or []string", sf.Name, resType) + mapPl["attributes"] = attrs + + // Relationships + rels := map[string]*json.RawMessage{} + for _, rel := range r.Rels() { + include := false + if len(fields) == 0 { + include = true + } else { + for _, field := range fields { + if field == rel.Name { + include = true + break + } } } - } - return nil -} + if include { + if rel.ToOne { + var raw json.RawMessage + + s := map[string]map[string]string{ + "links": buildRelationshipLinks(r, prepath, rel.Name), + } + + for n := range relData { + if n == rel.Name { + id := r.GetToOne(rel.Name) + if id != "" { + s["data"] = map[string]string{ + "id": r.GetToOne(rel.Name), + "type": rel.Type, + } + } else { + s["data"] = nil + } + + break + } + } + + // var links map[string]string{} + raw, _ = json.Marshal(s) + rels[rel.Name] = &raw + } else { + var raw json.RawMessage + + s := map[string]interface{}{ + "links": buildRelationshipLinks(r, prepath, rel.Name), + } + + for n := range relData { + if n == rel.Name { + data := []map[string]string{} + + for _, id := range r.GetToMany(rel.Name) { + data = append(data, map[string]string{ + "id": id, + "type": rel.Type, + }) + } + + s["data"] = data + + break + } + } + + raw, _ = json.Marshal(s) + rels[rel.Name] = &raw + } -// IDAndType returns the ID and the type of the resource represented by v. -// -// Two empty strings are returned if v is not recognized as a resource. -// CheckType can be used to check the validity of a struct. -func IDAndType(v interface{}) (string, string) { - switch nv := v.(type) { - case Resource: - return nv.GetID(), nv.GetType().Name + } } + mapPl["relationships"] = rels - val := reflect.ValueOf(v) - - // Allows pointers to structs - if val.Kind() == reflect.Ptr { - val = val.Elem() + // Links + mapPl["links"] = map[string]string{ + "self": buildSelfLink(r, prepath), // TODO } - if val.Kind() == reflect.Struct { - idF := val.FieldByName("ID") + return json.Marshal(mapPl) +} - if !idF.IsValid() { - return "", "" - } +// marshalCollection ... +func marshalCollection(c Collection, prepath string, fields []string, relData map[string][]string) ([]byte, error) { + var raws []*json.RawMessage - idSF, _ := val.Type().FieldByName("ID") + if c.Len() == 0 { + return []byte("[]"), nil + } - if idF.Kind() == reflect.String { - return idF.String(), idSF.Tag.Get("api") + for i := 0; i < c.Len(); i++ { + r := c.Elem(i) + var raw json.RawMessage + raw, err := marshalResource(r, prepath, fields, relData) + if err != nil { + return []byte{}, err } + raws = append(raws, &raw) } - return "", "" + return json.Marshal(raws) } diff --git a/schema.go b/schema.go index 70e2065..eec419b 100644 --- a/schema.go +++ b/schema.go @@ -3,26 +3,6 @@ package jsonapi import ( "errors" "fmt" - "strings" - "time" -) - -// Attribute types -const ( - AttrTypeInvalid = iota - AttrTypeString - AttrTypeInt - AttrTypeInt8 - AttrTypeInt16 - AttrTypeInt32 - AttrTypeInt64 - AttrTypeUint - AttrTypeUint8 - AttrTypeUint16 - AttrTypeUint32 - AttrTypeUint64 - AttrTypeBool - AttrTypeTime ) // A Schema contains a list of types. It makes sure that each type is @@ -196,172 +176,3 @@ func (s *Schema) Check() []error { return errs } - -// GetAttrType returns the attribute type as an int (see constants) and -// a boolean that indicates whether the attribute can be null or not. -func GetAttrType(t string) (int, bool) { - nullable := strings.HasPrefix(t, "*") - if nullable { - t = t[1:] - } - switch t { - case "string": - return AttrTypeString, nullable - case "int": - return AttrTypeInt, nullable - case "int8": - return AttrTypeInt8, nullable - case "int16": - return AttrTypeInt16, nullable - case "int32": - return AttrTypeInt32, nullable - case "int64": - return AttrTypeInt64, nullable - case "uint": - return AttrTypeUint, nullable - case "uint8": - return AttrTypeUint8, nullable - case "uint16": - return AttrTypeUint16, nullable - case "uint32": - return AttrTypeUint32, nullable - case "uint64": - return AttrTypeUint64, nullable - case "bool": - return AttrTypeBool, nullable - case "time.Time": - return AttrTypeTime, nullable - default: - return AttrTypeInvalid, false - } -} - -// GetAttrTypeString return the name of the attribute type specified -// by an int (see constants) and a boolean that indicates whether the -// value can be null or not. -func GetAttrTypeString(t int, nullable bool) string { - str := "" - switch t { - case AttrTypeString: - str = "string" - case AttrTypeInt: - str = "int" - case AttrTypeInt8: - str = "int8" - case AttrTypeInt16: - str = "int16" - case AttrTypeInt32: - str = "int32" - case AttrTypeInt64: - str = "int64" - case AttrTypeUint: - str = "uint" - case AttrTypeUint8: - str = "uint8" - case AttrTypeUint16: - str = "uint16" - case AttrTypeUint32: - str = "uint32" - case AttrTypeUint64: - str = "uint64" - case AttrTypeBool: - str = "bool" - case AttrTypeTime: - str = "time.Time" - default: - str = "" - } - if nullable { - return "*" + str - } - return str -} - -// GetZeroValue returns the zero value of the attribute type represented -// by the specified int (see constants). -// -// If null is true, the returned value is a nil pointer. -func GetZeroValue(t int, null bool) interface{} { - switch t { - case AttrTypeString: - if null { - var np *string - return np - } - return "" - case AttrTypeInt: - if null { - var np *int - return np - } - return int(0) - case AttrTypeInt8: - if null { - var np *int8 - return np - } - return int8(0) - case AttrTypeInt16: - if null { - var np *int16 - return np - } - return int16(0) - case AttrTypeInt32: - if null { - var np *int32 - return np - } - return int32(0) - case AttrTypeInt64: - if null { - var np *int64 - return np - } - return int64(0) - case AttrTypeUint: - if null { - var np *uint - return np - } - return uint(0) - case AttrTypeUint8: - if null { - var np *uint8 - return np - } - return uint8(0) - case AttrTypeUint16: - if null { - var np *uint16 - return np - } - return uint16(0) - case AttrTypeUint32: - if null { - var np *uint32 - return np - } - return uint32(0) - case AttrTypeUint64: - if null { - var np *uint64 - return np - } - return uint64(0) - case AttrTypeBool: - if null { - var np *bool - return np - } - return false - case AttrTypeTime: - if null { - var np *time.Time - return np - } - return time.Time{} - default: - return nil - } -} diff --git a/type.go b/type.go index 9b30ce5..3b53bb1 100644 --- a/type.go +++ b/type.go @@ -3,6 +3,26 @@ package jsonapi import ( "fmt" "sort" + "strings" + "time" +) + +// Attribute types +const ( + AttrTypeInvalid = iota + AttrTypeString + AttrTypeInt + AttrTypeInt8 + AttrTypeInt16 + AttrTypeInt32 + AttrTypeInt64 + AttrTypeUint + AttrTypeUint8 + AttrTypeUint16 + AttrTypeUint32 + AttrTypeUint64 + AttrTypeBool + AttrTypeTime ) // A Type stores all the necessary information about a type as represented @@ -128,3 +148,172 @@ func (r *Rel) Inverse() Rel { InverseToOne: r.ToOne, } } + +// GetAttrType returns the attribute type as an int (see constants) and +// a boolean that indicates whether the attribute can be null or not. +func GetAttrType(t string) (int, bool) { + nullable := strings.HasPrefix(t, "*") + if nullable { + t = t[1:] + } + switch t { + case "string": + return AttrTypeString, nullable + case "int": + return AttrTypeInt, nullable + case "int8": + return AttrTypeInt8, nullable + case "int16": + return AttrTypeInt16, nullable + case "int32": + return AttrTypeInt32, nullable + case "int64": + return AttrTypeInt64, nullable + case "uint": + return AttrTypeUint, nullable + case "uint8": + return AttrTypeUint8, nullable + case "uint16": + return AttrTypeUint16, nullable + case "uint32": + return AttrTypeUint32, nullable + case "uint64": + return AttrTypeUint64, nullable + case "bool": + return AttrTypeBool, nullable + case "time.Time": + return AttrTypeTime, nullable + default: + return AttrTypeInvalid, false + } +} + +// GetAttrTypeString return the name of the attribute type specified +// by an int (see constants) and a boolean that indicates whether the +// value can be null or not. +func GetAttrTypeString(t int, nullable bool) string { + str := "" + switch t { + case AttrTypeString: + str = "string" + case AttrTypeInt: + str = "int" + case AttrTypeInt8: + str = "int8" + case AttrTypeInt16: + str = "int16" + case AttrTypeInt32: + str = "int32" + case AttrTypeInt64: + str = "int64" + case AttrTypeUint: + str = "uint" + case AttrTypeUint8: + str = "uint8" + case AttrTypeUint16: + str = "uint16" + case AttrTypeUint32: + str = "uint32" + case AttrTypeUint64: + str = "uint64" + case AttrTypeBool: + str = "bool" + case AttrTypeTime: + str = "time.Time" + default: + str = "" + } + if nullable { + return "*" + str + } + return str +} + +// GetZeroValue returns the zero value of the attribute type represented +// by the specified int (see constants). +// +// If null is true, the returned value is a nil pointer. +func GetZeroValue(t int, null bool) interface{} { + switch t { + case AttrTypeString: + if null { + var np *string + return np + } + return "" + case AttrTypeInt: + if null { + var np *int + return np + } + return int(0) + case AttrTypeInt8: + if null { + var np *int8 + return np + } + return int8(0) + case AttrTypeInt16: + if null { + var np *int16 + return np + } + return int16(0) + case AttrTypeInt32: + if null { + var np *int32 + return np + } + return int32(0) + case AttrTypeInt64: + if null { + var np *int64 + return np + } + return int64(0) + case AttrTypeUint: + if null { + var np *uint + return np + } + return uint(0) + case AttrTypeUint8: + if null { + var np *uint8 + return np + } + return uint8(0) + case AttrTypeUint16: + if null { + var np *uint16 + return np + } + return uint16(0) + case AttrTypeUint32: + if null { + var np *uint32 + return np + } + return uint32(0) + case AttrTypeUint64: + if null { + var np *uint64 + return np + } + return uint64(0) + case AttrTypeBool: + if null { + var np *bool + return np + } + return false + case AttrTypeTime: + if null { + var np *time.Time + return np + } + return time.Time{} + default: + return nil + } +} diff --git a/util.go b/util.go deleted file mode 100644 index 745e984..0000000 --- a/util.go +++ /dev/null @@ -1,206 +0,0 @@ -package jsonapi - -import ( - "encoding/json" - "errors" - "fmt" - "reflect" - "strings" -) - -// marshalResource ... -func marshalResource(r Resource, prepath string, fields []string, relData map[string][]string) ([]byte, error) { - mapPl := map[string]interface{}{} - - // ID and type - mapPl["id"] = r.GetID() - mapPl["type"] = r.GetType().Name - - // Attributes - attrs := map[string]interface{}{} - for _, attr := range r.Attrs() { - if len(fields) == 0 { - attrs[attr.Name] = r.Get(attr.Name) - } else { - for _, field := range fields { - if field == attr.Name { - attrs[attr.Name] = r.Get(attr.Name) - break - } - } - } - } - mapPl["attributes"] = attrs - - // Relationships - rels := map[string]*json.RawMessage{} - for _, rel := range r.Rels() { - include := false - if len(fields) == 0 { - include = true - } else { - for _, field := range fields { - if field == rel.Name { - include = true - break - } - } - } - - if include { - if rel.ToOne { - var raw json.RawMessage - - s := map[string]map[string]string{ - "links": buildRelationshipLinks(r, prepath, rel.Name), - } - - for n := range relData { - if n == rel.Name { - id := r.GetToOne(rel.Name) - if id != "" { - s["data"] = map[string]string{ - "id": r.GetToOne(rel.Name), - "type": rel.Type, - } - } else { - s["data"] = nil - } - - break - } - } - - // var links map[string]string{} - raw, _ = json.Marshal(s) - rels[rel.Name] = &raw - } else { - var raw json.RawMessage - - s := map[string]interface{}{ - "links": buildRelationshipLinks(r, prepath, rel.Name), - } - - for n := range relData { - if n == rel.Name { - data := []map[string]string{} - - for _, id := range r.GetToMany(rel.Name) { - data = append(data, map[string]string{ - "id": id, - "type": rel.Type, - }) - } - - s["data"] = data - - break - } - } - - raw, _ = json.Marshal(s) - rels[rel.Name] = &raw - } - - } - } - mapPl["relationships"] = rels - - // Links - mapPl["links"] = map[string]string{ - "self": buildSelfLink(r, prepath), // TODO - } - - return json.Marshal(mapPl) -} - -// marshalCollection ... -func marshalCollection(c Collection, prepath string, fields []string, relData map[string][]string) ([]byte, error) { - var raws []*json.RawMessage - - if c.Len() == 0 { - return []byte("[]"), nil - } - - for i := 0; i < c.Len(); i++ { - r := c.Elem(i) - var raw json.RawMessage - raw, err := marshalResource(r, prepath, fields, relData) - if err != nil { - return []byte{}, err - } - raws = append(raws, &raw) - } - - return json.Marshal(raws) -} - -// ReflectType takes a struct or a pointer to a struct to analyse and -// builds a Type object that is returned. -// -// If an error is returned, the Type object will be empty. -func ReflectType(v interface{}) (Type, error) { - typ := Type{} - - val := reflect.ValueOf(v) - if val.Kind() == reflect.Ptr { - val = val.Elem() - } - if val.Kind() != reflect.Struct { - return typ, errors.New("jsonapi: value must represent a struct") - } - - err := CheckType(val.Interface()) - if err != nil { - return typ, fmt.Errorf("jsonapi: invalid type: %s", err) - } - - // ID and type - _, typ.Name = IDAndType(v) - - // Attributes - typ.Attrs = map[string]Attr{} - for i := 0; i < val.NumField(); i++ { - fs := val.Type().Field(i) - jsonTag := fs.Tag.Get("json") - apiTag := fs.Tag.Get("api") - - if apiTag == "attr" { - fieldType, null := GetAttrType(fs.Type.String()) - typ.Attrs[jsonTag] = Attr{ - Name: jsonTag, - Type: fieldType, - Nullable: null, - } - } - } - - // Relationships - typ.Rels = map[string]Rel{} - for i := 0; i < val.NumField(); i++ { - fs := val.Type().Field(i) - jsonTag := fs.Tag.Get("json") - relTag := strings.Split(fs.Tag.Get("api"), ",") - invName := "" - if len(relTag) == 3 { - invName = relTag[2] - } - - toOne := true - if fs.Type.String() == "[]string" { - toOne = false - } - - if relTag[0] == "rel" { - typ.Rels[jsonTag] = Rel{ - Name: jsonTag, - Type: relTag[1], - ToOne: toOne, - InverseName: invName, - InverseType: typ.Name, - } - } - } - - return typ, nil -} diff --git a/util_test.go b/util_test.go index 2791aa9..43b3b40 100644 --- a/util_test.go +++ b/util_test.go @@ -1,6 +1,9 @@ package jsonapi_test -import "strings" +import ( + "strings" + "time" +) func makeOneLine(str string) string { str = strings.TrimSpace(str) @@ -21,3 +24,88 @@ func makeOneLineNoSpaces(str string) string { str = strings.Replace(str, "\n", "", -1) return strings.Replace(str, " ", "", -1) } + +func ptr(v interface{}) interface{} { + switch c := v.(type) { + // String + case string: + return &c + // Integers + case int: + return &c + case int8: + return &c + case int16: + return &c + case int32: + return &c + case int64: + return &c + case uint: + return &c + case uint8: + return &c + case uint16: + return &c + case uint32: + return &c + case uint64: + return &c + // Bool + case bool: + return &c + // time.Time + case time.Time: + return &c + } + return nil +} + +func nilptr(t string) interface{} { + switch t { + // String + case "string": + var p *string + return p + // Integers + case "int": + var p *int + return p + case "int8": + var p *int8 + return p + case "int16": + var p *int16 + return p + case "int32": + var p *int32 + return p + case "int64": + var p *int64 + return p + case "uint": + var p *uint + return p + case "uint8": + var p *uint8 + return p + case "uint16": + var p *uint16 + return p + case "uint32": + var p *uint32 + return p + case "uint64": + var p *uint64 + return p + // Bool + case "bool": + var p *bool + return p + // time.Time + case "time.Time": + var p *time.Time + return p + } + return nil +} From b8f4627b3cef47efd4823c458a29357c653828f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 1 Jul 2019 08:04:16 -0400 Subject: [PATCH 096/406] Add ReflectType back It was forgotten when moved around for the previous commit. Tests were not run before pushing? :/ --- helpers.go | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/helpers.go b/helpers.go index 1c324a6..ea5a5d0 100644 --- a/helpers.go +++ b/helpers.go @@ -71,6 +71,76 @@ func CheckType(v interface{}) error { return nil } +// ReflectType takes a struct or a pointer to a struct to analyse and +// builds a Type object that is returned. +// +// If an error is returned, the Type object will be empty. +func ReflectType(v interface{}) (Type, error) { + typ := Type{} + + val := reflect.ValueOf(v) + if val.Kind() == reflect.Ptr { + val = val.Elem() + } + if val.Kind() != reflect.Struct { + return typ, errors.New("jsonapi: value must represent a struct") + } + + err := CheckType(val.Interface()) + if err != nil { + return typ, fmt.Errorf("jsonapi: invalid type: %s", err) + } + + // ID and type + _, typ.Name = IDAndType(v) + + // Attributes + typ.Attrs = map[string]Attr{} + for i := 0; i < val.NumField(); i++ { + fs := val.Type().Field(i) + jsonTag := fs.Tag.Get("json") + apiTag := fs.Tag.Get("api") + + if apiTag == "attr" { + fieldType, null := GetAttrType(fs.Type.String()) + typ.Attrs[jsonTag] = Attr{ + Name: jsonTag, + Type: fieldType, + Nullable: null, + } + } + } + + // Relationships + typ.Rels = map[string]Rel{} + for i := 0; i < val.NumField(); i++ { + fs := val.Type().Field(i) + jsonTag := fs.Tag.Get("json") + relTag := strings.Split(fs.Tag.Get("api"), ",") + invName := "" + if len(relTag) == 3 { + invName = relTag[2] + } + + toOne := true + if fs.Type.String() == "[]string" { + toOne = false + } + + if relTag[0] == "rel" { + typ.Rels[jsonTag] = Rel{ + Name: jsonTag, + Type: relTag[1], + ToOne: toOne, + InverseName: invName, + InverseType: typ.Name, + } + } + } + + return typ, nil +} + // IDAndType returns the ID and the type of the resource represented by v. // // Two empty strings are returned if v is not recognized as a resource. From e7f4612e27dc2b246c286e07926102fc275c1160 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 1 Jul 2019 11:05:03 -0400 Subject: [PATCH 097/406] Improve README.md and add doc.go --- README.md | 82 ++++++++++++++++++++++++++++++++++++++----------------- doc.go | 34 +++++++++++++++++++++++ 2 files changed, 91 insertions(+), 25 deletions(-) create mode 100644 doc.go diff --git a/README.md b/README.md index 068d76a..69359d4 100644 --- a/README.md +++ b/README.md @@ -19,19 +19,13 @@ jsonapi is a complete library to marshal and unmarshal JSON:API payloads. -The official specification can be found at [jsonapi.org/format](http://jsonapi.org/format). - -Here's a list of features supported by the library: +It also offers many tools for parsing URLs, handling resources, managing schemas, and building other tools on top of this library. - * Marshal and Unmarshal JSON:API payloads - * The generated payload is guaranteed to be valid according to the specification - * All top-level members are supported (data, included, meta, errors...) - * Structs can be used or interfaces can also be implemented - * A bunch of utilities are provided to help build tools on top of this library +The official specification can be found at [jsonapi.org/format](http://jsonapi.org/format). ## State -The library is in **alpha** and its API is subject to change until v1 is released. Also, tests are not complete. +The library is in **beta** and its API is subject to change until v1 is released. ## Quick start @@ -44,6 +38,24 @@ func Unmarshal(payload []byte, url *URL, schema *Schema) (*Document, error) A struct has to follow certain rules in order to be understood by the library, but interfaces are also provided which let the library avoid the reflect package and be more efficient. +See the following section for more information about how to define structs for this library. + +## Concepts + +Here are some of the main concepts covered by the library. + +### Request + +A `Request` represents an HTTP request structured in a format easily readable from a JSON:API point of view. + +If you are familiar to the specification, reading the `Request` struct and its fields (`URL`, `Document`, etc) should be straightforward. + +### Type + +A JSON:API type is generally defined with a struct. + +There needs to be an ID field of type string. The `api` tag represents the name of the type. + ``` type User struct { ID string `json:"id" api:"users"` // ID is mandatory and the api tag sets the type @@ -57,26 +69,26 @@ type User struct { } ``` -It is recommended to use the json tag which sets the name of the field. +Other fields with the `api` tag (`attr` or `rel`) can be added as attributes or relationships. -## Attributes +#### Attribute Attributes can be of the following types: ``` string int, int8, int16, int32, int64 -uint, uint8, uint16, uint32 +uint, uint8, uint16, uint32, uint64 bool time.Time *string *int, *int8, *int16, *int32, *int64 -*uint, *uint8, *uint16, *uint32 +*uint, *uint8, *uint16, *uint32, *uint64 *bool *time.Time ``` -## Relationships +#### Relationship Relationships can be a bit tricky. To-one relationships are defined with a string and to-many relationships are defined with a slice of strings. They contain the IDs of the related resources. The api tag has to take the form of "rel,xxx[,yyy]" where yyy is optional. xxx is the type of the relationship and yyy is the name of the inverse relationship when dealing with a two-way relationship. In the following example, our Article struct defines a relationship named author of type users: @@ -84,22 +96,42 @@ Relationships can be a bit tricky. To-one relationships are defined with a strin Author string `json:"author" api:"rel,users,articles"` ``` -## Documentation +### Wrapper -Check out the [incomplete documentation](https://godoc.org/github.com/mfcochauxlaberge/jsonapi). +A struct can be wrapped using the `Wrap` function which returns a pointer to a `Wrapper`. A `Wrapper` implements the `Resource` interface and can be used with this library. Modifying a Wrapper will modify the underlying struct. The resource's type is defined from reflecting on the struct. -## Utilities +``` +user := User{} +wrap := Wrap(&user) +wrap.Set("name", "Mike") +fmt.Printf(wrap.Get("name")) // Output: Mike +fmt.Printf(user.Name) // Output: Mike +``` -Some structs and functions are provided to help build tools on top of this library. +### SoftResource -For example: +A SoftResource is a struct whose type (name, attributes, and relationships) can be modified indefinitely just like its values. When an attribute or a relationship is added, the new value is the zero value of the field type. For example, if you add an attribute named `my-attribute` of type string, then `softresource.Get("my-attribute")` will return an empty string. ``` -// CheckType checks v to make sure it can be used as a type. -func CheckType(v interface{}) error { - -// IDAndType returns the ID and type of v. -func IDAndType(v interface{}) (string, string) +sr := SoftResource{} +sr.AddAttr(Attr{ + Name: "attr", + Type: AttrTypeInt, + Null: false, +}) +fmt.Println(sr.Get("attr")) // Output: 0 ``` -See schema.go, document.go, url.go, and params.go for more. +Take a look at the `SoftCollection` struct for a similar concept applied to an entire collection of resources. + +### URLs + +From a raw string that represents a URL, it is possible that create a `SimpleURL` which contains the information stored in the URL in a structure that is easier to handle. + +It is also possible to build a `URL` from a `Schema` and a `SimpleURL` which contains additional information taken from the schema. `NewURL` returns a error if the URL does not respect the schema. + +## Documentation + +Check out the [incomplete documentation](https://godoc.org/github.com/mfcochauxlaberge/jsonapi). + +The best way to learn how to use it is to look at the source code and its comments. diff --git a/doc.go b/doc.go new file mode 100644 index 0000000..d5a64f1 --- /dev/null +++ b/doc.go @@ -0,0 +1,34 @@ +/* +Package jsonapi offers a library to marshal and unmarshal JSON:API payloads. + +It also offers many utilies for developing a JSON:API backend. + +The simplest way to start using jsonapi is to use the Marshal and Unmarshal functions. + +``` +func Marshal(doc *Document, url *URL) ([]byte, error) +func Unmarshal(payload []byte, url *URL, schema *Schema) (*Document, error) +``` + +A schema is collection of types where relationships can point to each other. A schema can also look at its types and return any errors. + +A type is generally defined with a struct. + +There needs to be an ID field of type string. The `api` tag represents the name of the type. + +``` +type User struct { + ID string `json:"id" api:"users"` // ID is mandatory and the api tag sets the type + + // Attributes + Name string `json:"name" api:"attr"` // attr means it is an attribute + BornAt time.Time `json:"born-at" api:"attr"` + + // Relationships + Articles []string `json:"articles" api:"rel,articles"` +} +``` + +A lot more is offered in this library. The best way to learn how to use it is to look at the source code and its comments. +*/ +package jsonapi From 8fcf2b3e2bbf38890a84e6fe1f15f48771cdac58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 1 Jul 2019 11:09:50 -0400 Subject: [PATCH 098/406] Fix code examples in doc.go --- doc.go | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/doc.go b/doc.go index d5a64f1..4450673 100644 --- a/doc.go +++ b/doc.go @@ -5,10 +5,8 @@ It also offers many utilies for developing a JSON:API backend. The simplest way to start using jsonapi is to use the Marshal and Unmarshal functions. -``` -func Marshal(doc *Document, url *URL) ([]byte, error) -func Unmarshal(payload []byte, url *URL, schema *Schema) (*Document, error) -``` + func Marshal(doc *Document, url *URL) ([]byte, error) + func Unmarshal(payload []byte, url *URL, schema *Schema) (*Document, error) A schema is collection of types where relationships can point to each other. A schema can also look at its types and return any errors. @@ -16,18 +14,16 @@ A type is generally defined with a struct. There needs to be an ID field of type string. The `api` tag represents the name of the type. -``` -type User struct { - ID string `json:"id" api:"users"` // ID is mandatory and the api tag sets the type + type User struct { + ID string `json:"id" api:"users"` // ID is mandatory and the api tag sets the type - // Attributes - Name string `json:"name" api:"attr"` // attr means it is an attribute - BornAt time.Time `json:"born-at" api:"attr"` + // Attributes + Name string `json:"name" api:"attr"` // attr means it is an attribute + BornAt time.Time `json:"born-at" api:"attr"` - // Relationships - Articles []string `json:"articles" api:"rel,articles"` -} -``` + // Relationships + Articles []string `json:"articles" api:"rel,articles"` + } A lot more is offered in this library. The best way to learn how to use it is to look at the source code and its comments. */ From d6fe26870d66b3996d2a3fe0580039f22c9b6941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 1 Jul 2019 13:18:59 -0400 Subject: [PATCH 099/406] Fix formatting in soft_collection_test.go --- soft_collection_test.go | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/soft_collection_test.go b/soft_collection_test.go index a559382..6dacbd8 100644 --- a/soft_collection_test.go +++ b/soft_collection_test.go @@ -19,13 +19,13 @@ func TestSoftCollection(t *testing.T) { // Add type typ := Type{Name: "thistype"} typ.AddAttr(Attr{ - Name: "attr1", - Type: AttrTypeInt, + Name: "attr1", + Type: AttrTypeInt, Nullable: false, }) typ.AddAttr(Attr{ - Name: "attr2", - Type: AttrTypeString, + Name: "attr2", + Type: AttrTypeString, Nullable: true, }) typ.AddRel(Rel{ @@ -56,8 +56,8 @@ func TestSoftCollection(t *testing.T) { // at the same time and check whether they still are // the same. attr3 := Attr{ - Name: "attr3", - Type: AttrTypeBool, + Name: "attr3", + Type: AttrTypeBool, Nullable: false, } rel5 := Rel{ @@ -79,8 +79,8 @@ func TestSoftCollection(t *testing.T) { // specified in the SoftCollection. sr := NewSoftResource(Type{Name: "thirdtype"}, nil) attr4 := Attr{ - Name: "attr4", - Type: AttrTypeUint16, + Name: "attr4", + Type: AttrTypeUint16, Nullable: true, } sr.AddAttr(attr4) @@ -123,13 +123,13 @@ func TestSoftCollectionResource(t *testing.T) { sc.GetType().Name = "type1" sc.GetType().AddAttr(Attr{ - Name: "attr1", - Type: AttrTypeString, + Name: "attr1", + Type: AttrTypeString, Nullable: false, }) sc.GetType().AddAttr(Attr{ - Name: "attr2", - Type: AttrTypeInt, + Name: "attr2", + Type: AttrTypeInt, Nullable: true, }) sc.GetType().AddRel(Rel{ @@ -258,8 +258,8 @@ func TestSoftCollectionSort(t *testing.T) { for i, t := range attrs { ti, null := GetAttrType(fmt.Sprintf("%T", t.vals[0])) typ.AddAttr(Attr{ - Name: "attr" + strconv.Itoa(i), - Type: ti, + Name: "attr" + strconv.Itoa(i), + Type: ti, Nullable: null, }) } From 2a6320a4725a7d5b9cc48a5096406c2be3eda6c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 1 Jul 2019 13:20:32 -0400 Subject: [PATCH 100/406] Add TestSoftCollectionMiscellaneous --- soft_collection_test.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/soft_collection_test.go b/soft_collection_test.go index 6dacbd8..ede710b 100644 --- a/soft_collection_test.go +++ b/soft_collection_test.go @@ -323,3 +323,10 @@ func TestSoftCollectionSort(t *testing.T) { sort.Strings(expectedIDs) assert.Equal(expectedIDs, ids, "sort by ID") } + +func TestSoftCollectionMiscellaneous(t *testing.T) { + assert := assert.New(t) + + sc := &SoftCollection{} + assert.Nil(sc.Elem(99), "nonexistent element") +} From 0968b594d8228aac0eb40db438a663dd4f8b5eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 1 Jul 2019 13:26:55 -0400 Subject: [PATCH 101/406] Implement filtering in SoftCollection.Range --- soft_collection.go | 14 ++++- soft_collection_test.go | 133 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+), 2 deletions(-) diff --git a/soft_collection.go b/soft_collection.go index e49635a..6d22b89 100644 --- a/soft_collection.go +++ b/soft_collection.go @@ -73,7 +73,7 @@ func (s *SoftCollection) Resource(id string, fields []string) Resource { // Range returns a subset of the collection arranged according to the // given parameters. -func (s *SoftCollection) Range(ids []string, _ *Filter, sort []string, fields []string, pageSize uint, pageNumber uint) []Resource { +func (s *SoftCollection) Range(ids []string, filter *Filter, sort []string, fields []string, pageSize uint, pageNumber uint) []Resource { s.Lock() defer s.Unlock() @@ -94,7 +94,17 @@ func (s *SoftCollection) Range(ids []string, _ *Filter, sort []string, fields [] } } - // TODO Filter + // Filter + if filter != nil { + i := 0 + for i < len(rangeCol.col) { + if !FilterResource(rangeCol.col[i], filter) { + rangeCol.col = append(rangeCol.col[:i], rangeCol.col[i+1:]...) + } else { + i++ + } + } + } // Sort rangeCol.Sort(sort) diff --git a/soft_collection_test.go b/soft_collection_test.go index ede710b..8de7003 100644 --- a/soft_collection_test.go +++ b/soft_collection_test.go @@ -156,6 +156,139 @@ func TestSoftCollectionResource(t *testing.T) { assert.Equal(t, nil, sc.Resource("notfound", nil)) } +func TestSoftCollectionRange(t *testing.T) { + assert := assert.New(t) + + // Collection + col := SoftCollection{} + col.SetType(&Type{}) + col.AddAttr(Attr{ + Name: "attr1", + Type: AttrTypeString, + Nullable: false, + }) + col.AddAttr(Attr{ + Name: "attr2", + Type: AttrTypeInt, + Nullable: false, + }) + + resources := []struct { + id string + fields map[string]interface{} + }{ + { + id: "res1", + fields: map[string]interface{}{ + "attr1": "string1", + "attr2": 2, + }, + }, { + id: "res2", + fields: map[string]interface{}{ + "attr1": "string2", + "attr2": 2, + }, + }, { + id: "res3", + fields: map[string]interface{}{ + "attr1": "string2", + "attr2": 0, + }, + }, { + id: "res4", + fields: map[string]interface{}{ + "attr1": "string2", + "attr2": 2, + }, + }, { + id: "res5", + fields: map[string]interface{}{ + "attr1": "string3", + "attr2": 2, + }, + }, { + id: "res6", + fields: map[string]interface{}{ + "attr1": "string3", + "attr2": 4, + }, + }, { + id: "res7", + fields: map[string]interface{}{ + "attr1": "string4", + "attr2": 0, + }, + }, { + id: "res8", + fields: map[string]interface{}{ + "attr1": "string5", + "attr2": 2, + }, + }, + } + + for _, res := range resources { + sr := &SoftResource{} + sr.SetType(col.GetType()) + sr.SetID(res.id) + for field, val := range res.fields { + sr.Set(field, val) + } + col.Add(sr) + } + + // Range test 1 + rangd := col.Range( + // IDs + []string{}, + // Filter + nil, + // Sort + []string{}, + // Fields + []string{}, + // PageSize + 10, + // PageNumber + 0, + ) + + expectedIDs := []string{ + "res1", "res2", "res3", "res4", "res5", "res6", "res7", "res8", + } + ids := []string{} + for i := 0; i < len(rangd); i++ { + ids = append(ids, rangd[i].GetID()) + } + assert.Equal(expectedIDs, ids, "range of IDs (1)") + + // Range test 2 + rangd = col.Range( + // IDs + []string{"res1", "res2", "res3", "res4", "res5", "res6"}, + // Filter + &Filter{Field: "attr2", Op: "=", Val: 2}, + // Sort + []string{"-attr1"}, + // Fields + []string{"attr1", "attr2"}, + // PageSize + 2, + // PageNumber + 0, + ) + + expectedIDs = []string{"res5", "res2"} + ids = []string{} + for i := 0; i < len(rangd); i++ { + ids = append(ids, rangd[i].GetID()) + } + assert.Equal(expectedIDs, ids, "range of IDs (2)") + + // Range test 3 + assert.Equal(0, len(col.Range(nil, nil, nil, nil, 1, 100)), "range of IDs (3)") +} func TestSoftCollectionSort(t *testing.T) { assert := assert.New(t) From ddf2461e7a2e08c8267deee4345bf901dd551634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 1 Jul 2019 14:23:31 -0400 Subject: [PATCH 102/406] Refactor FilterResource to Filter.IsAllowed --- filter_query.go | 32 ++++++++++++++++---------------- filter_query_test.go | 8 ++++---- soft_collection.go | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/filter_query.go b/filter_query.go index de5b8d1..e5d99f2 100644 --- a/filter_query.go +++ b/filter_query.go @@ -69,47 +69,47 @@ func (c *Filter) UnmarshalJSON(data []byte) error { return nil } -// FilterResource reports whether res is valid under the rules defined -// in the filter. -func FilterResource(res Resource, filter *Filter) bool { +// IsAllowed reports whether res is valid under the rules defined in the +// filter. +func (c *Filter) IsAllowed(res Resource) bool { var ( val interface{} // typ string ) - if _, ok := res.Attrs()[filter.Field]; ok { - val = res.Get(filter.Field) + if _, ok := res.Attrs()[c.Field]; ok { + val = res.Get(c.Field) } - if rel, ok := res.Rels()[filter.Field]; ok { + if rel, ok := res.Rels()[c.Field]; ok { if rel.ToOne { - val = res.GetToOne(filter.Field) + val = res.GetToOne(c.Field) } else { - val = res.GetToMany(filter.Field) + val = res.GetToMany(c.Field) } } - switch filter.Op { + switch c.Op { case "and": - filters := filter.Val.([]*Filter) + filters := c.Val.([]*Filter) for i := range filters { - if !FilterResource(res, filters[i]) { + if !filters[i].IsAllowed(res) { return false } } return true case "or": - filters := filter.Val.([]*Filter) + filters := c.Val.([]*Filter) for i := range filters { - if FilterResource(res, filters[i]) { + if filters[i].IsAllowed(res) { return true } } return false case "in": - return checkIn(val.(string), filter.Val.([]string)) + return checkIn(val.(string), c.Val.([]string)) case "has": - return checkIn(filter.Val.(string), val.([]string)) + return checkIn(c.Val.(string), val.([]string)) default: - return checkVal(filter.Op, val, filter.Val) + return checkVal(c.Op, val, c.Val) } } diff --git a/filter_query_test.go b/filter_query_test.go index e5fdb91..244d5a0 100644 --- a/filter_query_test.go +++ b/filter_query_test.go @@ -714,7 +714,7 @@ func TestFilterResource(t *testing.T) { assert.Equal( test.expected, - FilterResource(res, filter), + filter.IsAllowed(res), fmt.Sprintf("%v %s %v should be %v", test.rval, test.op, test.cval, test.expected), ) } @@ -784,7 +784,7 @@ func TestFilterResource(t *testing.T) { assert.Equal( test.expected, - FilterResource(res, filter), + filter.IsAllowed(res), fmt.Sprintf("%v %s %v should be %v", test.cval, test.op, test.rval, test.expected), ) } @@ -856,7 +856,7 @@ func TestFilterResource(t *testing.T) { filter.Op = "and" // filter = marshalUnmarshalFilter(t, filter) - result := FilterResource(res, filter) + result := filter.IsAllowed(res) assert.Equal( test.expectedAnd, result, @@ -865,7 +865,7 @@ func TestFilterResource(t *testing.T) { filter.Op = "or" // filter = marshalUnmarshalFilter(t, filter) - result = FilterResource(res, filter) + result = filter.IsAllowed(res) assert.Equal( test.expectedOr, result, diff --git a/soft_collection.go b/soft_collection.go index 6d22b89..77eb264 100644 --- a/soft_collection.go +++ b/soft_collection.go @@ -98,7 +98,7 @@ func (s *SoftCollection) Range(ids []string, filter *Filter, sort []string, fiel if filter != nil { i := 0 for i < len(rangeCol.col) { - if !FilterResource(rangeCol.col[i], filter) { + if !filter.IsAllowed(rangeCol.col[i]) { rangeCol.col = append(rangeCol.col[:i], rangeCol.col[i+1:]...) } else { i++ From bdfdd77ba9727bc6cc2e8b646bbd8a549564f736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 1 Jul 2019 14:24:14 -0400 Subject: [PATCH 103/406] Rename receiver name in Filter methods --- filter_query.go | 54 ++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/filter_query.go b/filter_query.go index e5d99f2..cd21ffb 100644 --- a/filter_query.go +++ b/filter_query.go @@ -23,44 +23,44 @@ type filter struct { } // MarshalJSON marshals a filter into JSON. -func (c *Filter) MarshalJSON() ([]byte, error) { +func (f *Filter) MarshalJSON() ([]byte, error) { payload := map[string]interface{}{} - if c.Field != "" { - payload["f"] = c.Field + if f.Field != "" { + payload["f"] = f.Field } - if c.Op != "" { - payload["o"] = c.Op + if f.Op != "" { + payload["o"] = f.Op } - payload["v"] = c.Val - if c.Col != "" { - payload["c"] = c.Col + payload["v"] = f.Val + if f.Col != "" { + payload["c"] = f.Col } return json.Marshal(payload) } // UnmarshalJSON parses the provided data and populates a Filter. -func (c *Filter) UnmarshalJSON(data []byte) error { +func (f *Filter) UnmarshalJSON(data []byte) error { tmpFilter := filter{} err := json.Unmarshal(data, &tmpFilter) if err != nil { return err } - c.Field = tmpFilter.Field - c.Op = tmpFilter.Op - c.Col = tmpFilter.Col + f.Field = tmpFilter.Field + f.Op = tmpFilter.Op + f.Col = tmpFilter.Col if tmpFilter.Op == "and" || tmpFilter.Op == "or" { - c.Field = "" + f.Field = "" filters := []*Filter{} err := json.Unmarshal(tmpFilter.Val, &filters) if err != nil { return err } - c.Val = filters + f.Val = filters } else { - err := json.Unmarshal(tmpFilter.Val, &c.Val) + err := json.Unmarshal(tmpFilter.Val, &f.Val) if err != nil { return err } @@ -71,25 +71,25 @@ func (c *Filter) UnmarshalJSON(data []byte) error { // IsAllowed reports whether res is valid under the rules defined in the // filter. -func (c *Filter) IsAllowed(res Resource) bool { +func (f *Filter) IsAllowed(res Resource) bool { var ( val interface{} // typ string ) - if _, ok := res.Attrs()[c.Field]; ok { - val = res.Get(c.Field) + if _, ok := res.Attrs()[f.Field]; ok { + val = res.Get(f.Field) } - if rel, ok := res.Rels()[c.Field]; ok { + if rel, ok := res.Rels()[f.Field]; ok { if rel.ToOne { - val = res.GetToOne(c.Field) + val = res.GetToOne(f.Field) } else { - val = res.GetToMany(c.Field) + val = res.GetToMany(f.Field) } } - switch c.Op { + switch f.Op { case "and": - filters := c.Val.([]*Filter) + filters := f.Val.([]*Filter) for i := range filters { if !filters[i].IsAllowed(res) { return false @@ -97,7 +97,7 @@ func (c *Filter) IsAllowed(res Resource) bool { } return true case "or": - filters := c.Val.([]*Filter) + filters := f.Val.([]*Filter) for i := range filters { if filters[i].IsAllowed(res) { return true @@ -105,11 +105,11 @@ func (c *Filter) IsAllowed(res Resource) bool { } return false case "in": - return checkIn(val.(string), c.Val.([]string)) + return checkIn(val.(string), f.Val.([]string)) case "has": - return checkIn(c.Val.(string), val.([]string)) + return checkIn(f.Val.(string), val.([]string)) default: - return checkVal(c.Op, val, c.Val) + return checkVal(f.Op, val, f.Val) } } From 3325fa160ac87b7c4f67f617bfe55f0df80d3206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 1 Jul 2019 23:54:48 -0400 Subject: [PATCH 104/406] Remove locking in SoftCollection This might only be temporary. The current sync.Mutex was not used except in one method so it is removed. In the future, it might be decided to bring it back. --- soft_collection.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/soft_collection.go b/soft_collection.go index 77eb264..43f6256 100644 --- a/soft_collection.go +++ b/soft_collection.go @@ -4,7 +4,6 @@ import ( "errors" "sort" "strings" - "sync" "time" ) @@ -16,8 +15,6 @@ type SoftCollection struct { typ *Type col []*SoftResource sort []string - - sync.Mutex } // SetType sets the collection's type. @@ -74,9 +71,6 @@ func (s *SoftCollection) Resource(id string, fields []string) Resource { // Range returns a subset of the collection arranged according to the // given parameters. func (s *SoftCollection) Range(ids []string, filter *Filter, sort []string, fields []string, pageSize uint, pageNumber uint) []Resource { - s.Lock() - defer s.Unlock() - rangeCol := &SoftCollection{} // Filter IDs From d6169f3f7435fce14f98814e7c3bc9141301e2fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 7 Jul 2019 10:37:05 -0400 Subject: [PATCH 105/406] Make SoftResource.Type an exported field --- soft_collection.go | 2 +- soft_resource.go | 77 +++++++++++++++++++++++----------------------- 2 files changed, 40 insertions(+), 39 deletions(-) diff --git a/soft_collection.go b/soft_collection.go index 43f6256..6b48ac4 100644 --- a/soft_collection.go +++ b/soft_collection.go @@ -130,7 +130,7 @@ func (s *SoftCollection) Add(r Resource) { // then it is added to the collection. sr := &SoftResource{} sr.id = r.GetID() - sr.typ = s.typ + sr.Type = s.typ for _, attr := range r.Attrs() { sr.AddAttr(attr) diff --git a/soft_resource.go b/soft_resource.go index 1745d60..c76227e 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -13,7 +13,7 @@ var _ Resource = (*SoftResource)(nil) // It is also populated with values from vals. func NewSoftResource(typ Type, vals map[string]interface{}) *SoftResource { res := &SoftResource{} - res.typ = &typ + res.Type = &typ for _, attr := range typ.Attrs { if val, ok := vals[attr.Name]; ok { @@ -36,21 +36,22 @@ func NewSoftResource(typ Type, vals map[string]interface{}) *SoftResource { // relationships. When a field is added, its value is the zero value of the // field's type. type SoftResource struct { + Type *Type + id string - typ *Type data map[string]interface{} } // Attrs returns the resource's attributes. func (sr *SoftResource) Attrs() map[string]Attr { sr.check() - return sr.typ.Attrs + return sr.Type.Attrs } // Rels returns the resource's relationships. func (sr *SoftResource) Rels() map[string]Rel { sr.check() - return sr.typ.Rels + return sr.Type.Rels } // AddAttr adds an attribute. @@ -61,7 +62,7 @@ func (sr *SoftResource) AddAttr(attr Attr) { return } } - sr.typ.Attrs[attr.Name] = attr + sr.Type.Attrs[attr.Name] = attr } // AddRel adds a relationship. @@ -72,26 +73,26 @@ func (sr *SoftResource) AddRel(rel Rel) { return } } - sr.typ.Rels[rel.Name] = rel + sr.Type.Rels[rel.Name] = rel } // RemoveField removes a field. func (sr *SoftResource) RemoveField(field string) { sr.check() - delete(sr.typ.Attrs, field) - delete(sr.typ.Rels, field) + delete(sr.Type.Attrs, field) + delete(sr.Type.Rels, field) } // Attr returns the attribute named after key. func (sr *SoftResource) Attr(key string) Attr { sr.check() - return sr.typ.Attrs[key] + return sr.Type.Attrs[key] } // Rel returns the relationship named after key. func (sr *SoftResource) Rel(key string) Rel { sr.check() - return sr.typ.Rels[key] + return sr.Type.Rels[key] } // New returns a new resource (of type SoftResource) with the same type @@ -99,7 +100,7 @@ func (sr *SoftResource) Rel(key string) Rel { func (sr *SoftResource) New() Resource { sr.check() return &SoftResource{ - typ: copystructure.Must(copystructure.Copy(sr.typ)).(*Type), + Type: copystructure.Must(copystructure.Copy(sr.Type)).(*Type), } } @@ -112,19 +113,19 @@ func (sr *SoftResource) GetID() string { // GetType returns the resource's type. func (sr *SoftResource) GetType() Type { sr.check() - return *sr.typ + return *sr.Type } // Get returns the value associated to the field named after key. func (sr *SoftResource) Get(key string) interface{} { sr.check() - if attr, ok := sr.typ.Attrs[key]; ok { + if attr, ok := sr.Type.Attrs[key]; ok { if v, ok := sr.data[key]; ok { return v } return GetZeroValue(attr.Type, attr.Nullable) } - if rel, ok := sr.typ.Rels[key]; ok { + if rel, ok := sr.Type.Rels[key]; ok { if v, ok := sr.data[key]; ok { return v } @@ -145,13 +146,13 @@ func (sr *SoftResource) SetID(id string) { // SetType ... func (sr *SoftResource) SetType(typ *Type) { sr.check() - sr.typ = typ + sr.Type = typ } // Set sets the value associated to the field named key to v. func (sr *SoftResource) Set(key string, v interface{}) { sr.check() - if attr, ok := sr.typ.Attrs[key]; ok { + if attr, ok := sr.Type.Attrs[key]; ok { if GetAttrTypeString(attr.Type, attr.Nullable) == fmt.Sprintf("%T", v) { sr.data[key] = v } else if v == nil && attr.Nullable { @@ -163,7 +164,7 @@ func (sr *SoftResource) Set(key string, v interface{}) { // GetToOne returns the value associated to the relationship named after key. func (sr *SoftResource) GetToOne(key string) string { sr.check() - if _, ok := sr.typ.Rels[key]; ok { + if _, ok := sr.Type.Rels[key]; ok { return sr.data[key].(string) } return "" @@ -172,7 +173,7 @@ func (sr *SoftResource) GetToOne(key string) string { // GetToMany returns the value associated to the relationship named after key. func (sr *SoftResource) GetToMany(key string) []string { sr.check() - if _, ok := sr.typ.Rels[key]; ok { + if _, ok := sr.Type.Rels[key]; ok { return sr.data[key].([]string) } return []string{} @@ -181,7 +182,7 @@ func (sr *SoftResource) GetToMany(key string) []string { // SetToOne sets the relationship named after key to rel. func (sr *SoftResource) SetToOne(key string, v string) { sr.check() - if rel, ok := sr.typ.Rels[key]; ok && rel.ToOne { + if rel, ok := sr.Type.Rels[key]; ok && rel.ToOne { sr.data[key] = v } } @@ -189,7 +190,7 @@ func (sr *SoftResource) SetToOne(key string, v string) { // SetToMany sets the relationship named after key to rel. func (sr *SoftResource) SetToMany(key string, v []string) { sr.check() - if rel, ok := sr.typ.Rels[key]; ok && !rel.ToOne { + if rel, ok := sr.Type.Rels[key]; ok && !rel.ToOne { sr.data[key] = v } } @@ -204,8 +205,8 @@ func (sr *SoftResource) Validate() []error { func (sr *SoftResource) Copy() Resource { sr.check() return &SoftResource{ + Type: copystructure.Must(copystructure.Copy(sr.Type)).(*Type), id: sr.id, - typ: copystructure.Must(copystructure.Copy(sr.typ)).(*Type), data: copystructure.Must(copystructure.Copy(sr.data)).(map[string]interface{}), } } @@ -218,40 +219,40 @@ func (sr *SoftResource) UnmarshalJSON(payload []byte) error { } func (sr *SoftResource) fields() []string { - fields := make([]string, 0, len(sr.typ.Attrs)+len(sr.typ.Rels)) - for i := range sr.typ.Attrs { - fields = append(fields, sr.typ.Attrs[i].Name) + fields := make([]string, 0, len(sr.Type.Attrs)+len(sr.Type.Rels)) + for i := range sr.Type.Attrs { + fields = append(fields, sr.Type.Attrs[i].Name) } - for i := range sr.typ.Rels { - fields = append(fields, sr.typ.Rels[i].Name) + for i := range sr.Type.Rels { + fields = append(fields, sr.Type.Rels[i].Name) } return fields } func (sr *SoftResource) check() { - if sr.typ == nil { - sr.typ = &Type{} + if sr.Type == nil { + sr.Type = &Type{} } - if sr.typ.Attrs == nil { - sr.typ.Attrs = map[string]Attr{} + if sr.Type.Attrs == nil { + sr.Type.Attrs = map[string]Attr{} } - if sr.typ.Rels == nil { - sr.typ.Rels = map[string]Rel{} + if sr.Type.Rels == nil { + sr.Type.Rels = map[string]Rel{} } if sr.data == nil { sr.data = map[string]interface{}{} } - for i := range sr.typ.Attrs { - n := sr.typ.Attrs[i].Name + for i := range sr.Type.Attrs { + n := sr.Type.Attrs[i].Name if _, ok := sr.data[n]; !ok { - sr.data[n] = GetZeroValue(sr.typ.Attrs[i].Type, sr.typ.Attrs[i].Nullable) + sr.data[n] = GetZeroValue(sr.Type.Attrs[i].Type, sr.Type.Attrs[i].Nullable) } } - for i := range sr.typ.Rels { - n := sr.typ.Rels[i].Name + for i := range sr.Type.Rels { + n := sr.Type.Rels[i].Name if _, ok := sr.data[n]; !ok { - if sr.typ.Rels[i].ToOne { + if sr.Type.Rels[i].ToOne { sr.data[n] = "" } else { sr.data[n] = []string{} From a02435af24d7f226777a852510c1353bb4208e00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 7 Jul 2019 11:55:32 -0400 Subject: [PATCH 106/406] Set type of temporary collections in Range --- soft_collection.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/soft_collection.go b/soft_collection.go index 6b48ac4..d0f1719 100644 --- a/soft_collection.go +++ b/soft_collection.go @@ -72,6 +72,7 @@ func (s *SoftCollection) Resource(id string, fields []string) Resource { // given parameters. func (s *SoftCollection) Range(ids []string, filter *Filter, sort []string, fields []string, pageSize uint, pageNumber uint) []Resource { rangeCol := &SoftCollection{} + rangeCol.SetType(s.typ) // Filter IDs if len(ids) > 0 { @@ -109,6 +110,7 @@ func (s *SoftCollection) Range(ids []string, filter *Filter, sort []string, fiel rangeCol = &SoftCollection{} } else { page := &SoftCollection{} + page.SetType(s.typ) for i := skip; i < len(rangeCol.col) && (pageSize == 0 || i < int(pageSize)); i++ { page.Add(rangeCol.col[i]) } From ab692a3adf0ee9f8d7a898c483e3dd6b8be740b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 7 Jul 2019 13:42:16 -0400 Subject: [PATCH 107/406] Leave pagination params at their zero value by default --- simple_url.go | 2 -- simple_url_test.go | 36 ++++++++++++++++++------------------ url_test.go | 12 ++++++------ 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/simple_url.go b/simple_url.go index 2079d8c..d8de2c0 100644 --- a/simple_url.go +++ b/simple_url.go @@ -37,8 +37,6 @@ func NewSimpleURL(u *url.URL) (SimpleURL, error) { Fields: map[string][]string{}, Filter: nil, SortingRules: []string{}, - PageSize: 10, - PageNumber: 1, Include: []string{}, } diff --git a/simple_url_test.go b/simple_url_test.go index aedabdc..fea1625 100644 --- a/simple_url_test.go +++ b/simple_url_test.go @@ -39,8 +39,8 @@ func TestSimpleURL(t *testing.T) { Fields: map[string][]string{}, Filter: nil, SortingRules: []string{}, - PageSize: 10, - PageNumber: 1, + PageSize: 0, + PageNumber: 0, Include: []string{}, }, expectedError: nil, @@ -56,8 +56,8 @@ func TestSimpleURL(t *testing.T) { Fields: map[string][]string{}, Filter: nil, SortingRules: []string{}, - PageSize: 10, - PageNumber: 1, + PageSize: 0, + PageNumber: 0, Include: []string{}, }, expectedError: nil, @@ -73,8 +73,8 @@ func TestSimpleURL(t *testing.T) { Fields: map[string][]string{}, Filter: nil, SortingRules: []string{}, - PageSize: 10, - PageNumber: 1, + PageSize: 0, + PageNumber: 0, Include: []string{}, }, expectedError: nil, @@ -90,8 +90,8 @@ func TestSimpleURL(t *testing.T) { Fields: map[string][]string{}, Filter: nil, SortingRules: []string{}, - PageSize: 10, - PageNumber: 1, + PageSize: 0, + PageNumber: 0, Include: []string{}, }, expectedError: nil, @@ -107,8 +107,8 @@ func TestSimpleURL(t *testing.T) { Fields: map[string][]string{}, Filter: nil, SortingRules: []string{}, - PageSize: 10, - PageNumber: 1, + PageSize: 0, + PageNumber: 0, Include: []string{}, }, expectedError: nil, @@ -156,8 +156,8 @@ func TestSimpleURL(t *testing.T) { FilterLabel: "label", Filter: nil, SortingRules: []string{}, - PageSize: 10, - PageNumber: 1, + PageSize: 0, + PageNumber: 0, Include: []string{}, }, expectedError: nil, @@ -174,8 +174,8 @@ func TestSimpleURL(t *testing.T) { Fields: map[string][]string{}, Filter: nil, SortingRules: []string{}, - PageSize: 10, - PageNumber: 1, + PageSize: 0, + PageNumber: 0, Include: []string{}, }, expectedError: NewErrInvalidPageSizeParameter("-1"), @@ -192,8 +192,8 @@ func TestSimpleURL(t *testing.T) { Fields: map[string][]string{}, Filter: nil, SortingRules: []string{}, - PageSize: 10, - PageNumber: 1, + PageSize: 0, + PageNumber: 0, Include: []string{}, }, expectedError: NewErrInvalidPageNumberParameter("-1"), @@ -210,8 +210,8 @@ func TestSimpleURL(t *testing.T) { Fields: map[string][]string{}, Filter: nil, SortingRules: []string{}, - PageSize: 10, - PageNumber: 1, + PageSize: 0, + PageNumber: 0, Include: []string{}, }, expectedError: NewErrUnknownParameter("unknownparam"), diff --git a/url_test.go b/url_test.go index 71a79ca..bb90137 100644 --- a/url_test.go +++ b/url_test.go @@ -217,8 +217,8 @@ func TestParseParams(t *testing.T) { RelData: map[string][]string{}, Filter: nil, SortingRules: []string{}, - PageSize: 10, - PageNumber: 1, + PageSize: 0, + PageNumber: 0, Include: [][]Rel{}, }, expectedError: false, @@ -232,8 +232,8 @@ func TestParseParams(t *testing.T) { RelData: map[string][]string{}, Filter: nil, SortingRules: []string{}, - PageSize: 10, - PageNumber: 1, + PageSize: 0, + PageNumber: 0, Include: [][]Rel{}, }, expectedError: false, @@ -374,8 +374,8 @@ func TestParseParams(t *testing.T) { FilterLabel: "label", Filter: nil, SortingRules: []string{"bool", "int", "int16", "int32", "int64", "int8", "str", "time", "uint", "uint16", "uint32", "uint64", "uint8"}, - PageSize: 10, - PageNumber: 1, + PageSize: 0, + PageNumber: 0, Include: [][]Rel{}, }, expectedError: false, From b76e234af10a182da5a10eb268f1bb093c12137a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 7 Jul 2019 16:28:12 -0400 Subject: [PATCH 108/406] Fix pagination in SoftCollection.Range --- soft_collection.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soft_collection.go b/soft_collection.go index d0f1719..19c6114 100644 --- a/soft_collection.go +++ b/soft_collection.go @@ -111,7 +111,7 @@ func (s *SoftCollection) Range(ids []string, filter *Filter, sort []string, fiel } else { page := &SoftCollection{} page.SetType(s.typ) - for i := skip; i < len(rangeCol.col) && (pageSize == 0 || i < int(pageSize)); i++ { + for i := skip; i < len(rangeCol.col) && i < skip+int(pageSize); i++ { page.Add(rangeCol.col[i]) } rangeCol = page From 628ab756beba0d3109f5caf2d97e3e12fdac13c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 7 Jul 2019 23:27:12 -0400 Subject: [PATCH 109/406] Include the ID in the sorting rules --- params.go | 9 +++++++++ testdata/collection-1.json | 2 +- testdata/collection-2.json | 2 +- testdata/collection-3.json | 2 +- testdata/resource-1.json | 2 +- testdata/resource-2.json | 2 +- testdata/resource-3.json | 2 +- url_test.go | 12 ++++++------ 8 files changed, 21 insertions(+), 12 deletions(-) diff --git a/params.go b/params.go index 51f4021..6892194 100644 --- a/params.go +++ b/params.go @@ -176,11 +176,17 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { // Sorting typ, _ := schema.GetType(resType) sortingRules := make([]string, 0, len(typ.Attrs)) + idFound := false for _, rule := range su.SortingRules { urule := rule if urule[0] == '-' { urule = urule[1:] } + if urule == "id" { + idFound = true + sortingRules = append(sortingRules, rule) + break + } for _, attr := range typ.Attrs { if urule == attr.Name { sortingRules = append(sortingRules, rule) @@ -207,6 +213,9 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { } sort.Strings(restOfRules) sortingRules = append(sortingRules, restOfRules...) + if !idFound { + sortingRules = append(sortingRules, "id") + } params.SortingRules = sortingRules // Pagination diff --git a/testdata/collection-1.json b/testdata/collection-1.json index a92c33c..7387231 100644 --- a/testdata/collection-1.json +++ b/testdata/collection-1.json @@ -125,7 +125,7 @@ "version": "1.0" }, "links": { - "self": "/mocktypes1?fields%5Bmocktypes1%5D=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cto-many%2Cto-many-from-many%2Cto-many-from-one%2Cto-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8\u0026page%5Bsize%5D=10\u0026page%5Bnumber%5D=1\u0026sort=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8" + "self": "/mocktypes1?fields%5Bmocktypes1%5D=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cto-many%2Cto-many-from-many%2Cto-many-from-one%2Cto-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8\u0026page%5Bsize%5D=10\u0026page%5Bnumber%5D=1\u0026sort=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8%2Cid" }, "meta": { "num": -32820, diff --git a/testdata/collection-2.json b/testdata/collection-2.json index 21b4a4d..04e0d43 100644 --- a/testdata/collection-2.json +++ b/testdata/collection-2.json @@ -31,6 +31,6 @@ "version": "1.0" }, "links": { - "self": "https://example.org/mocktypes2?fields%5Bmocktypes2%5D=boolptr%2Ctimeptr%2Cuintptr\u0026page%5Bsize%5D=10\u0026page%5Bnumber%5D=1\u0026sort=boolptr%2Cint16ptr%2Cint32ptr%2Cint64ptr%2Cint8ptr%2Cintptr%2Cstrptr%2Ctimeptr%2Cuint16ptr%2Cuint32ptr%2Cuint64ptr%2Cuint8ptr%2Cuintptr" + "self": "https://example.org/mocktypes2?fields%5Bmocktypes2%5D=boolptr%2Ctimeptr%2Cuintptr\u0026page%5Bsize%5D=10\u0026page%5Bnumber%5D=1\u0026sort=boolptr%2Cint16ptr%2Cint32ptr%2Cint64ptr%2Cint8ptr%2Cintptr%2Cstrptr%2Ctimeptr%2Cuint16ptr%2Cuint32ptr%2Cuint64ptr%2Cuint8ptr%2Cuintptr%2Cid" } } diff --git a/testdata/collection-3.json b/testdata/collection-3.json index 18570b6..066aad9 100644 --- a/testdata/collection-3.json +++ b/testdata/collection-3.json @@ -4,6 +4,6 @@ "version": "1.0" }, "links": { - "self": "https://example.org/mocktypes1?fields%5Bmocktypes1%5D=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cto-many%2Cto-many-from-many%2Cto-many-from-one%2Cto-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8\u0026page%5Bsize%5D=10\u0026page%5Bnumber%5D=1\u0026sort=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8" + "self": "https://example.org/mocktypes1?fields%5Bmocktypes1%5D=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cto-many%2Cto-many-from-many%2Cto-many-from-one%2Cto-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8\u0026page%5Bsize%5D=10\u0026page%5Bnumber%5D=1\u0026sort=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8%2Cid" } } diff --git a/testdata/resource-1.json b/testdata/resource-1.json index 2238750..408be21 100644 --- a/testdata/resource-1.json +++ b/testdata/resource-1.json @@ -63,7 +63,7 @@ "version": "1.0" }, "links": { - "self": "/mocktypes1/mt1-1?fields%5Bmocktypes1%5D=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cto-many%2Cto-many-from-many%2Cto-many-from-one%2Cto-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8\u0026sort=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8" + "self": "/mocktypes1/mt1-1?fields%5Bmocktypes1%5D=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cto-many%2Cto-many-from-many%2Cto-many-from-one%2Cto-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8\u0026sort=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8%2Cid" }, "meta": { "num": 42, diff --git a/testdata/resource-2.json b/testdata/resource-2.json index b2c1bb9..50a5cc3 100644 --- a/testdata/resource-2.json +++ b/testdata/resource-2.json @@ -51,6 +51,6 @@ "version": "1.0" }, "links": { - "self": "https://example.org/mocktypes2/mt1-2?fields%5Bmocktypes2%5D=boolptr%2Cint16ptr%2Cint32ptr%2Cint64ptr%2Cint8ptr%2Cintptr%2Cstrptr%2Ctimeptr%2Cto-many-from-many%2Cto-many-from-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint16ptr%2Cuint32ptr%2Cuint64ptr%2Cuint8ptr%2Cuintptr\u0026sort=boolptr%2Cint16ptr%2Cint32ptr%2Cint64ptr%2Cint8ptr%2Cintptr%2Cstrptr%2Ctimeptr%2Cuint16ptr%2Cuint32ptr%2Cuint64ptr%2Cuint8ptr%2Cuintptr" + "self": "https://example.org/mocktypes2/mt1-2?fields%5Bmocktypes2%5D=boolptr%2Cint16ptr%2Cint32ptr%2Cint64ptr%2Cint8ptr%2Cintptr%2Cstrptr%2Ctimeptr%2Cto-many-from-many%2Cto-many-from-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint16ptr%2Cuint32ptr%2Cuint64ptr%2Cuint8ptr%2Cuintptr\u0026sort=boolptr%2Cint16ptr%2Cint32ptr%2Cint64ptr%2Cint8ptr%2Cintptr%2Cstrptr%2Ctimeptr%2Cuint16ptr%2Cuint32ptr%2Cuint64ptr%2Cuint8ptr%2Cuintptr%2Cid" } } diff --git a/testdata/resource-3.json b/testdata/resource-3.json index b261e8a..a23b72a 100644 --- a/testdata/resource-3.json +++ b/testdata/resource-3.json @@ -15,6 +15,6 @@ "version": "1.0" }, "links": { - "self": "https://example.org/mocktypes2/mt1-2?fields%5Bmocktypes2%5D=strptr%2Cuintptr\u0026sort=boolptr%2Cint16ptr%2Cint32ptr%2Cint64ptr%2Cint8ptr%2Cintptr%2Cstrptr%2Ctimeptr%2Cuint16ptr%2Cuint32ptr%2Cuint64ptr%2Cuint8ptr%2Cuintptr" + "self": "https://example.org/mocktypes2/mt1-2?fields%5Bmocktypes2%5D=strptr%2Cuintptr\u0026sort=boolptr%2Cint16ptr%2Cint32ptr%2Cint64ptr%2Cint8ptr%2Cintptr%2Cstrptr%2Ctimeptr%2Cuint16ptr%2Cuint32ptr%2Cuint64ptr%2Cuint8ptr%2Cuintptr%2Cid" } } diff --git a/url_test.go b/url_test.go index bb90137..271eb86 100644 --- a/url_test.go +++ b/url_test.go @@ -216,7 +216,7 @@ func TestParseParams(t *testing.T) { Rels: map[string][]Rel{}, RelData: map[string][]string{}, Filter: nil, - SortingRules: []string{}, + SortingRules: []string{"id"}, PageSize: 0, PageNumber: 0, Include: [][]Rel{}, @@ -231,7 +231,7 @@ func TestParseParams(t *testing.T) { Rels: map[string][]Rel{}, RelData: map[string][]string{}, Filter: nil, - SortingRules: []string{}, + SortingRules: []string{"id"}, PageSize: 0, PageNumber: 0, Include: [][]Rel{}, @@ -261,7 +261,7 @@ func TestParseParams(t *testing.T) { Rels: map[string][]Rel{}, RelData: map[string][]string{}, Filter: nil, - SortingRules: []string{"str", "-bool", "uint8", "int", "int16", "int32", "int64", "int8", "time", "uint", "uint16", "uint32", "uint64"}, + SortingRules: []string{"str", "-bool", "uint8", "int", "int16", "int32", "int64", "int8", "time", "uint", "uint16", "uint32", "uint64", "id"}, PageSize: 50, PageNumber: 3, Include: [][]Rel{ @@ -305,7 +305,7 @@ func TestParseParams(t *testing.T) { Rels: map[string][]Rel{}, RelData: map[string][]string{}, Filter: nil, - SortingRules: []string{"str", "-bool", "uint8", "int", "int16", "int32", "int64", "int8", "time", "uint", "uint16", "uint32", "uint64"}, + SortingRules: []string{"str", "-bool", "uint8", "int", "int16", "int32", "int64", "int8", "time", "uint", "uint16", "uint32", "uint64", "id"}, PageSize: 50, PageNumber: 3, Include: [][]Rel{ @@ -347,7 +347,7 @@ func TestParseParams(t *testing.T) { Rels: map[string][]Rel{}, RelData: map[string][]string{}, Filter: nil, - SortingRules: []string{"str", "-bool", "uint8", "int", "int16", "int32", "int64", "int8", "time", "uint", "uint16", "uint32", "uint64"}, + SortingRules: []string{"str", "-bool", "uint8", "int", "int16", "int32", "int64", "int8", "time", "uint", "uint16", "uint32", "uint64", "id"}, PageSize: 90, PageNumber: 110, Include: [][]Rel{ @@ -373,7 +373,7 @@ func TestParseParams(t *testing.T) { RelData: map[string][]string{}, FilterLabel: "label", Filter: nil, - SortingRules: []string{"bool", "int", "int16", "int32", "int64", "int8", "str", "time", "uint", "uint16", "uint32", "uint64", "uint8"}, + SortingRules: []string{"bool", "int", "int16", "int32", "int64", "int8", "str", "time", "uint", "uint16", "uint32", "uint64", "uint8", "id"}, PageSize: 0, PageNumber: 0, Include: [][]Rel{}, From f586b103de5b000b28fc26142e1c0e9770028dd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 8 Jul 2019 00:02:47 -0400 Subject: [PATCH 110/406] Remove blank line --- url_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/url_test.go b/url_test.go index 271eb86..f6e8aea 100644 --- a/url_test.go +++ b/url_test.go @@ -206,7 +206,6 @@ func TestParseParams(t *testing.T) { expectedParams Params expectedError bool }{ - { name: "slash only", url: `/`, From f7be17a95e550fcb189eace4a16f643afc863111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 8 Jul 2019 00:14:11 -0400 Subject: [PATCH 111/406] Remove sorting rules in non-collection URLs --- params.go | 84 +++++++++++++++++++++++++--------------- testdata/resource-1.json | 2 +- testdata/resource-2.json | 2 +- testdata/resource-3.json | 2 +- url_test.go | 12 +++--- 5 files changed, 61 insertions(+), 41 deletions(-) diff --git a/params.go b/params.go index 6892194..2dc7a90 100644 --- a/params.go +++ b/params.go @@ -174,49 +174,69 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { // TODO // Sorting - typ, _ := schema.GetType(resType) - sortingRules := make([]string, 0, len(typ.Attrs)) - idFound := false - for _, rule := range su.SortingRules { - urule := rule - if urule[0] == '-' { - urule = urule[1:] - } - if urule == "id" { - idFound = true - sortingRules = append(sortingRules, rule) - break - } - for _, attr := range typ.Attrs { - if urule == attr.Name { - sortingRules = append(sortingRules, rule) - break - } + // TODO All of the following is just to figure out + // if the URL represents a single resource or a + // collection. It should be done in a better way. + isCol := false + if len(su.Fragments) == 1 { + isCol = true + } else if len(su.Fragments) >= 3 { + relName := su.Fragments[len(su.Fragments)-1] + typ, _ := schema.GetType(su.Fragments[0]) + var ( + rel Rel + ok bool + ) + if rel, ok = typ.Rels[relName]; !ok { + return nil, NewErrUnknownRelationshipInPath(typ.Name, relName, su.Path()) } + isCol = !rel.ToOne } - restOfRules := make([]string, 0, len(typ.Attrs)-len(sortingRules)) - for _, attr := range typ.Attrs { - found := false - for _, rule := range sortingRules { + if isCol { + typ, _ := schema.GetType(resType) + sortingRules := make([]string, 0, len(typ.Attrs)) + idFound := false + for _, rule := range su.SortingRules { urule := rule if urule[0] == '-' { urule = urule[1:] } - if urule == attr.Name { - found = true + if urule == "id" { + idFound = true + sortingRules = append(sortingRules, rule) break } + for _, attr := range typ.Attrs { + if urule == attr.Name { + sortingRules = append(sortingRules, rule) + break + } + } + } + restOfRules := make([]string, 0, len(typ.Attrs)-len(sortingRules)) + for _, attr := range typ.Attrs { + found := false + for _, rule := range sortingRules { + urule := rule + if urule[0] == '-' { + urule = urule[1:] + } + if urule == attr.Name { + found = true + break + } + } + if !found { + restOfRules = append(restOfRules, attr.Name) + } } - if !found { - restOfRules = append(restOfRules, attr.Name) + sort.Strings(restOfRules) + sortingRules = append(sortingRules, restOfRules...) + if !idFound { + sortingRules = append(sortingRules, "id") } + params.SortingRules = sortingRules } - sort.Strings(restOfRules) - sortingRules = append(sortingRules, restOfRules...) - if !idFound { - sortingRules = append(sortingRules, "id") - } - params.SortingRules = sortingRules // Pagination params.PageSize = su.PageSize diff --git a/testdata/resource-1.json b/testdata/resource-1.json index 408be21..b3cd4ac 100644 --- a/testdata/resource-1.json +++ b/testdata/resource-1.json @@ -63,7 +63,7 @@ "version": "1.0" }, "links": { - "self": "/mocktypes1/mt1-1?fields%5Bmocktypes1%5D=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cto-many%2Cto-many-from-many%2Cto-many-from-one%2Cto-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8\u0026sort=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8%2Cid" + "self": "/mocktypes1/mt1-1?fields%5Bmocktypes1%5D=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cto-many%2Cto-many-from-many%2Cto-many-from-one%2Cto-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8" }, "meta": { "num": 42, diff --git a/testdata/resource-2.json b/testdata/resource-2.json index 50a5cc3..262e6f9 100644 --- a/testdata/resource-2.json +++ b/testdata/resource-2.json @@ -51,6 +51,6 @@ "version": "1.0" }, "links": { - "self": "https://example.org/mocktypes2/mt1-2?fields%5Bmocktypes2%5D=boolptr%2Cint16ptr%2Cint32ptr%2Cint64ptr%2Cint8ptr%2Cintptr%2Cstrptr%2Ctimeptr%2Cto-many-from-many%2Cto-many-from-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint16ptr%2Cuint32ptr%2Cuint64ptr%2Cuint8ptr%2Cuintptr\u0026sort=boolptr%2Cint16ptr%2Cint32ptr%2Cint64ptr%2Cint8ptr%2Cintptr%2Cstrptr%2Ctimeptr%2Cuint16ptr%2Cuint32ptr%2Cuint64ptr%2Cuint8ptr%2Cuintptr%2Cid" + "self": "https://example.org/mocktypes2/mt1-2?fields%5Bmocktypes2%5D=boolptr%2Cint16ptr%2Cint32ptr%2Cint64ptr%2Cint8ptr%2Cintptr%2Cstrptr%2Ctimeptr%2Cto-many-from-many%2Cto-many-from-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint16ptr%2Cuint32ptr%2Cuint64ptr%2Cuint8ptr%2Cuintptr" } } diff --git a/testdata/resource-3.json b/testdata/resource-3.json index a23b72a..c3bf09d 100644 --- a/testdata/resource-3.json +++ b/testdata/resource-3.json @@ -15,6 +15,6 @@ "version": "1.0" }, "links": { - "self": "https://example.org/mocktypes2/mt1-2?fields%5Bmocktypes2%5D=strptr%2Cuintptr\u0026sort=boolptr%2Cint16ptr%2Cint32ptr%2Cint64ptr%2Cint8ptr%2Cintptr%2Cstrptr%2Ctimeptr%2Cuint16ptr%2Cuint32ptr%2Cuint64ptr%2Cuint8ptr%2Cuintptr%2Cid" + "self": "https://example.org/mocktypes2/mt1-2?fields%5Bmocktypes2%5D=strptr%2Cuintptr" } } diff --git a/url_test.go b/url_test.go index f6e8aea..af86e74 100644 --- a/url_test.go +++ b/url_test.go @@ -215,7 +215,7 @@ func TestParseParams(t *testing.T) { Rels: map[string][]Rel{}, RelData: map[string][]string{}, Filter: nil, - SortingRules: []string{"id"}, + SortingRules: []string{}, PageSize: 0, PageNumber: 0, Include: [][]Rel{}, @@ -230,7 +230,7 @@ func TestParseParams(t *testing.T) { Rels: map[string][]Rel{}, RelData: map[string][]string{}, Filter: nil, - SortingRules: []string{"id"}, + SortingRules: []string{}, PageSize: 0, PageNumber: 0, Include: [][]Rel{}, @@ -260,7 +260,7 @@ func TestParseParams(t *testing.T) { Rels: map[string][]Rel{}, RelData: map[string][]string{}, Filter: nil, - SortingRules: []string{"str", "-bool", "uint8", "int", "int16", "int32", "int64", "int8", "time", "uint", "uint16", "uint32", "uint64", "id"}, + SortingRules: []string{}, PageSize: 50, PageNumber: 3, Include: [][]Rel{ @@ -304,7 +304,7 @@ func TestParseParams(t *testing.T) { Rels: map[string][]Rel{}, RelData: map[string][]string{}, Filter: nil, - SortingRules: []string{"str", "-bool", "uint8", "int", "int16", "int32", "int64", "int8", "time", "uint", "uint16", "uint32", "uint64", "id"}, + SortingRules: []string{}, PageSize: 50, PageNumber: 3, Include: [][]Rel{ @@ -346,7 +346,7 @@ func TestParseParams(t *testing.T) { Rels: map[string][]Rel{}, RelData: map[string][]string{}, Filter: nil, - SortingRules: []string{"str", "-bool", "uint8", "int", "int16", "int32", "int64", "int8", "time", "uint", "uint16", "uint32", "uint64", "id"}, + SortingRules: []string{}, PageSize: 90, PageNumber: 110, Include: [][]Rel{ @@ -372,7 +372,7 @@ func TestParseParams(t *testing.T) { RelData: map[string][]string{}, FilterLabel: "label", Filter: nil, - SortingRules: []string{"bool", "int", "int16", "int32", "int64", "int8", "str", "time", "uint", "uint16", "uint32", "uint64", "uint8", "id"}, + SortingRules: []string{}, PageSize: 0, PageNumber: 0, Include: [][]Rel{}, From 8c7b4f523689d5d1861ae87d12bc1059fc4161b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 8 Jul 2019 22:24:37 -0400 Subject: [PATCH 112/406] Make restOfRules longer to have room for id --- params.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/params.go b/params.go index 2dc7a90..7f8aff3 100644 --- a/params.go +++ b/params.go @@ -213,7 +213,8 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { } } } - restOfRules := make([]string, 0, len(typ.Attrs)-len(sortingRules)) + // Add 1 because of id + restOfRules := make([]string, 0, len(typ.Attrs)+1-len(sortingRules)) for _, attr := range typ.Attrs { found := false for _, rule := range sortingRules { From edccfa69bee780cd9cf4c59c5204aaf346bed41c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 13 Jul 2019 10:48:02 -0400 Subject: [PATCH 113/406] Remove error return from RemoveType --- schema.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/schema.go b/schema.go index eec419b..eedafa6 100644 --- a/schema.go +++ b/schema.go @@ -33,14 +33,12 @@ func (s *Schema) AddType(typ Type) error { } // RemoveType removes a type from the schema. -func (s *Schema) RemoveType(typ string) error { +func (s *Schema) RemoveType(typ string) { for i := range s.Types { if s.Types[i].Name == typ { s.Types = append(s.Types[0:i], s.Types[i+1:]...) } } - - return nil } // AddAttr adds an attribute to the specified type. From 8486f96615cf961a81dfd2dcea629970b786683a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 13 Jul 2019 11:18:38 -0400 Subject: [PATCH 114/406] Remove boolean from Schema.GetType return parameters --- mock_schema_test.go | 2 +- params.go | 23 ++++++++++++----------- schema.go | 17 +++++++++-------- url.go | 2 +- url_test.go | 14 +++++++------- 5 files changed, 30 insertions(+), 28 deletions(-) diff --git a/mock_schema_test.go b/mock_schema_test.go index 6fca084..6e8daa5 100644 --- a/mock_schema_test.go +++ b/mock_schema_test.go @@ -19,7 +19,7 @@ func newMockSchema() *Schema { for t, typ := range schema.Types { for r, rel := range typ.Rels { - invType, _ := schema.GetType(rel.Type) + invType := schema.GetType(rel.Type) rel := schema.Types[t].Rels[r] rel.InverseToOne = invType.Rels[rel.InverseName].ToOne schema.Types[t].Rels[r] = rel diff --git a/params.go b/params.go index 7f8aff3..fc5316f 100644 --- a/params.go +++ b/params.go @@ -65,7 +65,8 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { incRel := Rel{Type: resType} for _, word := range words { - if typ, ok := schema.GetType(incRel.Type); ok { + if typ := schema.GetType(incRel.Type); typ.Name != "" { + var ok bool if incRel, ok = typ.Rels[word]; ok { params.Fields[incRel.Type] = []string{} } else { @@ -86,14 +87,14 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { var incRel Rel for w := range words { if w == 0 { - typ, _ := schema.GetType(resType) + typ := schema.GetType(resType) incRel = typ.Rels[words[0]] } params.Include[i][w] = incRel if w < len(words)-1 { - typ, _ := schema.GetType(incRel.Type) + typ := schema.GetType(incRel.Type) incRel = typ.Rels[words[w+1]] } } @@ -106,11 +107,11 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { // Fields for t, fields := range su.Fields { if t != resType { - if _, ok := schema.GetType(t); !ok { + if typ := schema.GetType(t); typ.Name == "" { return nil, NewErrUnknownTypeInURL(t) } } - if typ, ok := schema.GetType(t); ok { + if typ := schema.GetType(t); typ.Name != "" { params.Fields[t] = []string{} for _, f := range fields { for _, ff := range typ.Fields() { @@ -123,7 +124,7 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { } for t := range params.Fields { if len(params.Fields[t]) == 0 { - typ, _ := schema.GetType(t) + typ := schema.GetType(t) params.Fields[t] = make([]string, len(typ.Fields())) copy(params.Fields[t], typ.Fields()) } @@ -137,7 +138,7 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { rel Rel ok bool ) - if typ, ok = schema.GetType(typeName); !ok { + if typ = schema.GetType(typeName); typ.Name == "" { return nil, NewErrUnknownTypeInURL(typeName) } @@ -150,14 +151,14 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { // Append to list of fields // params.Fields[typeName] = append(params.Fields[typeName], field) - if typ, ok = schema.GetType(typeName); ok { + if typ = schema.GetType(typeName); typ.Name != "" { if attr, ok = typ.Attrs[field]; ok { // Append to list of attributes params.Attrs[typeName] = append(params.Attrs[typeName], attr) } } - if typ, ok = schema.GetType(typeName); ok { + if typ = schema.GetType(typeName); typ.Name != "" { if rel, ok = typ.Rels[field]; ok { // Append to list of relationships params.Rels[typeName] = append(params.Rels[typeName], rel) @@ -182,7 +183,7 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { isCol = true } else if len(su.Fragments) >= 3 { relName := su.Fragments[len(su.Fragments)-1] - typ, _ := schema.GetType(su.Fragments[0]) + typ := schema.GetType(su.Fragments[0]) var ( rel Rel ok bool @@ -193,7 +194,7 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { isCol = !rel.ToOne } if isCol { - typ, _ := schema.GetType(resType) + typ := schema.GetType(resType) sortingRules := make([]string, 0, len(typ.Attrs)) idFound := false for _, rule := range su.SortingRules { diff --git a/schema.go b/schema.go index eedafa6..e87a97c 100644 --- a/schema.go +++ b/schema.go @@ -98,21 +98,23 @@ func (s *Schema) HasType(name string) bool { // GetType returns the type associated with the speficied name. // -// A boolean indicates whether a type was found or not. -func (s *Schema) GetType(name string) (Type, bool) { +// If no type with the given name is found, an zero instance of Type is +// returned. Therefore, checking whether the Name field is empty or not +// is a good way to dertermine whether the type was found or not. +func (s *Schema) GetType(name string) Type { for _, typ := range s.Types { if typ.Name == name { - return typ, true + return typ } } - return Type{}, false + return Type{} } // GetResource returns a resource of type SoftResource with the specified // type. All fields are set to their zero values. func (s *Schema) GetResource(name string) Resource { - typ, ok := s.GetType(name) - if ok { + typ := s.GetType(name) + if typ.Name != "" { return NewSoftResource(typ, nil) } return nil @@ -122,7 +124,6 @@ func (s *Schema) GetResource(name string) Resource { // and returns all the errors that were found. func (s *Schema) Check() []error { var ( - ok bool errs = []error{} ) @@ -133,7 +134,7 @@ func (s *Schema) Check() []error { var targetType Type // Does the relationship point to a type that exists? - if targetType, ok = s.GetType(rel.Type); !ok { + if targetType = s.GetType(rel.Type); targetType.Name == "" { errs = append(errs, fmt.Errorf( "jsonapi: the target type of relationship %s of type %s does not exist", rel.Name, diff --git a/url.go b/url.go index 8fe0f90..3a215df 100644 --- a/url.go +++ b/url.go @@ -48,7 +48,7 @@ func NewURL(schema *Schema, su SimpleURL) (*URL, error) { return nil, NewErrBadRequest("Empty path", "There is no path.") } if len(url.Fragments) >= 1 { - if typ, ok = schema.GetType(url.Fragments[0]); !ok { + if typ = schema.GetType(url.Fragments[0]); typ.Name == "" { return nil, NewErrUnknownTypeInURL(url.Fragments[0]) } diff --git a/url_test.go b/url_test.go index af86e74..fbba326 100644 --- a/url_test.go +++ b/url_test.go @@ -196,8 +196,8 @@ func TestParseParams(t *testing.T) { // Schema schema := newMockSchema() - mockTypes1, _ := schema.GetType("mocktypes1") - mockTypes2, _ := schema.GetType("mocktypes2") + mockTypes1 := schema.GetType("mocktypes1") + mockTypes2 := schema.GetType("mocktypes2") tests := []struct { name string @@ -394,12 +394,12 @@ func TestParseParams(t *testing.T) { // Set Attrs and Rels for resType, fields := range test.expectedParams.Fields { for _, field := range fields { - if res, ok := schema.GetType(resType); ok { - if _, ok := res.Attrs[field]; ok { - test.expectedParams.Attrs[resType] = append(test.expectedParams.Attrs[resType], res.Attrs[field]) - } else if typ, ok := schema.GetType(resType); ok { + if typ := schema.GetType(resType); typ.Name != "" { + if _, ok := typ.Attrs[field]; ok { + test.expectedParams.Attrs[resType] = append(test.expectedParams.Attrs[resType], typ.Attrs[field]) + } else if typ := schema.GetType(resType); typ.Name != "" { if _, ok := typ.Rels[field]; ok { - test.expectedParams.Rels[resType] = append(test.expectedParams.Rels[resType], res.Rels[field]) + test.expectedParams.Rels[resType] = append(test.expectedParams.Rels[resType], typ.Rels[field]) } } } From cbe6df8a08672030151a0be3b6d0612f4c65f253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 13 Jul 2019 11:19:38 -0400 Subject: [PATCH 115/406] Reformat some comments in schema.go --- schema.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/schema.go b/schema.go index e87a97c..1644da8 100644 --- a/schema.go +++ b/schema.go @@ -85,8 +85,8 @@ func (s *Schema) RemoveRel(typ string, rel string) error { return fmt.Errorf("jsonapi: type %s does not exist", typ) } -// HasType returns a boolean indicating whether a type has the specified name -// or not. +// HasType returns a boolean indicating whether a type has the specified +// name or not. func (s *Schema) HasType(name string) bool { for i := range s.Types { if s.Types[i].Name == name { @@ -144,7 +144,8 @@ func (s *Schema) Check() []error { // Inverse relationship (if relevant) if rel.InverseName != "" { - // Is the inverse relationship type the same as its type name? + // Is the inverse relationship type the same as its + // type name? if rel.InverseType != typ.Name { errs = append(errs, fmt.Errorf( "jsonapi: the inverse type of relationship %s should its type's name (%s, not %s)", @@ -154,7 +155,8 @@ func (s *Schema) Check() []error { )) } - // Do both relationships (current and inverse) point to each other? + // Do both relationships (current and inverse) point + // to each other? var found bool for _, invRel := range targetType.Rels { if rel.Name == invRel.InverseName && rel.InverseName == invRel.Name { From 54f7c77fbc18fbb1f0fbdd5be784531162e52d1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 13 Jul 2019 12:46:29 -0400 Subject: [PATCH 116/406] Remove error return from RemoveAttr and RemoveRel --- schema.go | 12 ++++-------- type.go | 8 ++------ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/schema.go b/schema.go index 1644da8..0aa833e 100644 --- a/schema.go +++ b/schema.go @@ -53,14 +53,12 @@ func (s *Schema) AddAttr(typ string, attr Attr) error { } // RemoveAttr removes an attribute from the specified type. -func (s *Schema) RemoveAttr(typ string, attr string) error { +func (s *Schema) RemoveAttr(typ string, attr string) { for i := range s.Types { if s.Types[i].Name == typ { - return s.Types[i].RemoveAttr(attr) + s.Types[i].RemoveAttr(attr) } } - - return fmt.Errorf("jsonapi: type %s does not exist", typ) } // AddRel adds a relationship to the specified type. @@ -75,14 +73,12 @@ func (s *Schema) AddRel(typ string, rel Rel) error { } // RemoveRel removes a relationship from the specified type. -func (s *Schema) RemoveRel(typ string, rel string) error { +func (s *Schema) RemoveRel(typ string, rel string) { for i := range s.Types { if s.Types[i].Name == typ { - return s.Types[i].RemoveRel(rel) + s.Types[i].RemoveRel(rel) } } - - return fmt.Errorf("jsonapi: type %s does not exist", typ) } // HasType returns a boolean indicating whether a type has the specified diff --git a/type.go b/type.go index 3b53bb1..568e3e1 100644 --- a/type.go +++ b/type.go @@ -60,14 +60,12 @@ func (t *Type) AddAttr(attr Attr) error { } // RemoveAttr removes an attribute from the type if it exists. -func (t *Type) RemoveAttr(attr string) error { +func (t *Type) RemoveAttr(attr string) { for i := range t.Attrs { if t.Attrs[i].Name == attr { delete(t.Attrs, attr) } } - - return nil } // AddRel adds a relationship to the type. @@ -96,14 +94,12 @@ func (t *Type) AddRel(rel Rel) error { } // RemoveRel removes a relationship from the type if it exists. -func (t *Type) RemoveRel(rel string) error { +func (t *Type) RemoveRel(rel string) { for i := range t.Rels { if t.Rels[i].Name == rel { delete(t.Rels, rel) } } - - return nil } // Fields returns a list of the names of all the fields (attributes and From 2b7691e382c6f0ca485259ae0a6153b480a5694a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 13 Jul 2019 12:55:16 -0400 Subject: [PATCH 117/406] Remove Schema.GetResource --- jsonapi.go | 6 ++++-- schema.go | 10 ---------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/jsonapi.go b/jsonapi.go index 75722e8..aa06ab3 100644 --- a/jsonapi.go +++ b/jsonapi.go @@ -95,7 +95,8 @@ func Unmarshal(payload []byte, url *URL, schema *Schema) (*Document, error) { // Data if !url.IsCol && url.RelKind == "" { - res := schema.GetResource(url.ResType) + typ := schema.GetType(url.ResType) + res := &SoftResource{Type: &typ} err = json.Unmarshal(ske.Data, res) if err != nil { return nil, err @@ -132,7 +133,8 @@ func Unmarshal(payload []byte, url *URL, schema *Schema) (*Document, error) { } for i, inc2 := range incs { - res2 := schema.GetResource(inc2.Type) + typ := schema.GetType(inc2.Type) + res2 := &SoftResource{Type: &typ} err = json.Unmarshal(ske.Included[i], res2) if err != nil { return nil, err diff --git a/schema.go b/schema.go index 0aa833e..58aa117 100644 --- a/schema.go +++ b/schema.go @@ -106,16 +106,6 @@ func (s *Schema) GetType(name string) Type { return Type{} } -// GetResource returns a resource of type SoftResource with the specified -// type. All fields are set to their zero values. -func (s *Schema) GetResource(name string) Resource { - typ := s.GetType(name) - if typ.Name != "" { - return NewSoftResource(typ, nil) - } - return nil -} - // Check checks the integrity of all the relationships between the types // and returns all the errors that were found. func (s *Schema) Check() []error { From 894bea7470099d0f8ecc6554bfc81caecde68989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 13 Jul 2019 12:57:53 -0400 Subject: [PATCH 118/406] Remove NewSoftResource --- soft_collection_test.go | 2 +- soft_resource.go | 21 --------------------- soft_resource_test.go | 2 +- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/soft_collection_test.go b/soft_collection_test.go index 8de7003..ddc06cc 100644 --- a/soft_collection_test.go +++ b/soft_collection_test.go @@ -77,7 +77,7 @@ func TestSoftCollection(t *testing.T) { // Add a SoftResource with more fields than those // specified in the SoftCollection. - sr := NewSoftResource(Type{Name: "thirdtype"}, nil) + sr := &SoftResource{Type: &Type{Name: "thirdtype"}} attr4 := Attr{ Name: "attr4", Type: AttrTypeUint16, diff --git a/soft_resource.go b/soft_resource.go index c76227e..0aef9f9 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -8,27 +8,6 @@ import ( var _ Resource = (*SoftResource)(nil) -// NewSoftResource returns a new SoftResource with the given type. -// -// It is also populated with values from vals. -func NewSoftResource(typ Type, vals map[string]interface{}) *SoftResource { - res := &SoftResource{} - res.Type = &typ - - for _, attr := range typ.Attrs { - if val, ok := vals[attr.Name]; ok { - res.Set(attr.Name, val) - } - } - for _, rel := range typ.Rels { - if val, ok := vals[rel.Name]; ok { - res.Set(rel.Name, val) - } - } - - return res -} - // SoftResource represents a resource whose type is defined by an internal // field of type *Type. // diff --git a/soft_resource_test.go b/soft_resource_test.go index 1719adb..e5dd7a8 100644 --- a/soft_resource_test.go +++ b/soft_resource_test.go @@ -29,7 +29,7 @@ func TestSoftResource(t *testing.T) { InverseType: "type", InverseToOne: true, }) - sr = NewSoftResource(typ, nil) + sr = &SoftResource{Type: &typ} // TODO assert.Equal(t, &typ, sr.typ) // ID and type From dbd4caed00437afee0e800a7650619e553dcc333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 13 Jul 2019 13:32:02 -0400 Subject: [PATCH 119/406] Check relationships link only if InverseType is correct --- schema.go | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/schema.go b/schema.go index 58aa117..293c6ae 100644 --- a/schema.go +++ b/schema.go @@ -139,25 +139,24 @@ func (s *Schema) Check() []error { typ.Name, rel.InverseType, )) - } - - // Do both relationships (current and inverse) point - // to each other? - var found bool - for _, invRel := range targetType.Rels { - if rel.Name == invRel.InverseName && rel.InverseName == invRel.Name { - found = true + } else { + // Do both relationships (current and inverse) point + // to each other? + var found bool + for _, invRel := range targetType.Rels { + if rel.Name == invRel.InverseName && rel.InverseName == invRel.Name { + found = true + } + } + if !found { + errs = append(errs, fmt.Errorf( + "jsonapi: relationship %s of type %s and its inverse do not point each other", + rel.Name, + typ.Name, + )) } - } - if !found { - errs = append(errs, fmt.Errorf( - "jsonapi: relationship %s of type %s and its inverse do not point each other", - rel.Name, - typ.Name, - )) } } - } } From 713cd8dcd06a773c0728935c09a8b072c1d2cd26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 13 Jul 2019 13:32:43 -0400 Subject: [PATCH 120/406] Add tests for Schema struct --- schema_test.go | 156 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 156 insertions(+) create mode 100644 schema_test.go diff --git a/schema_test.go b/schema_test.go new file mode 100644 index 0000000..652398c --- /dev/null +++ b/schema_test.go @@ -0,0 +1,156 @@ +package jsonapi_test + +import ( + "testing" + + . "github.com/mfcochauxlaberge/jsonapi" + + "github.com/stretchr/testify/assert" +) + +func TestSchemaTypes(t *testing.T) { + assert := assert.New(t) + + // Add a type + schema := &Schema{} + err := schema.AddType(Type{Name: "type1"}) + assert.NoError(err) + assert.True(schema.HasType("type1")) + assert.False(schema.HasType("type2")) + + // Add an invalid type (no name) + schema = &Schema{} + err = schema.AddType(Type{}) + assert.Error(err) + + // Add two types with the same name + schema = &Schema{} + _ = schema.AddType(Type{Name: "type1"}) + err = schema.AddType(Type{Name: "type1"}) + assert.Error(err) + + // Remove a type + schema = &Schema{} + _ = schema.AddType(Type{Name: "type1"}) + schema.RemoveType("type1") + typ := schema.GetType("type1") + assert.Equal("", typ.Name) + + // Add and remove an attribute + schema = &Schema{} + _ = schema.AddType(Type{Name: "type1"}) + attr := Attr{ + Name: "attr1", + Type: AttrTypeString, + Nullable: false, + } + err = schema.AddAttr("type1", attr) + assert.NoError(err) + typ = schema.GetType("type1") + assert.Contains(typ.Attrs, "attr1") + assert.Equal(attr, typ.Attrs["attr1"]) + schema.RemoveAttr("type1", "attr1") + assert.NotContains(schema.GetType("type1").Attrs, "attr1") + + // Add an invalid attribute (no name) + schema = &Schema{} + _ = schema.AddType(Type{Name: "type1"}) + err = schema.AddAttr("type1", Attr{Name: ""}) + assert.Error(err) + + // Add an invalid attribute (type does not exist) + schema = &Schema{} + _ = schema.AddType(Type{Name: "type1"}) + err = schema.AddAttr("type2", Attr{Name: "attr1"}) + assert.Error(err) + + // Add and remove an relationship + schema = &Schema{} + _ = schema.AddType(Type{Name: "type1"}) + rel := Rel{ + Name: "rel1", + Type: "type1", + ToOne: true, + } + err = schema.AddRel("type1", rel) + assert.NoError(err) + typ = schema.GetType("type1") + assert.Contains(typ.Rels, "rel1") + assert.Equal(rel, typ.Rels["rel1"]) + schema.RemoveRel("type1", "rel1") + assert.NotContains(schema.GetType("type1").Rels, "rel1") + + // Add an invalid relationship (no name) + schema = &Schema{} + _ = schema.AddType(Type{Name: "type1"}) + err = schema.AddRel("type1", Rel{Name: ""}) + assert.Error(err) + + // Add an invalid relationship (type does not exist) + schema = &Schema{} + _ = schema.AddType(Type{Name: "type1"}) + err = schema.AddRel("type2", Rel{Name: "rel1"}) + assert.Error(err) +} + +func TestSchemaCheck(t *testing.T) { + assert := assert.New(t) + + schema := &Schema{} + + type1 := Type{ + Name: "type1", + Attrs: map[string]Attr{}, + Rels: map[string]Rel{ + "rel1": Rel{ + Name: "rel1", + Type: "type2", + }, + "rel2": Rel{ + Name: "rel2-invalid", + Type: "nonexistent", + }, + "rel3": Rel{ + Name: "rel3", + Type: "type1", + }, + }, + } + err := schema.AddType(type1) + assert.NoError(err) + + type2 := Type{ + Name: "type2", + Attrs: map[string]Attr{}, + Rels: map[string]Rel{ + "rel1": Rel{ + Name: "rel1", + Type: "type1", + InverseName: "rel1", + InverseType: "type1", + }, + "rel2": Rel{ + Name: "rel2", + Type: "type1", + InverseName: "rel3", + InverseType: "type2", + }, + }, + } + err = schema.AddType(type2) + assert.NoError(err) + + // assert.NotEmpty(schema.Types) + // assert.NotEmpty(schema.GetType("type1").Rels) + + // Check schema + errs := schema.Check() + errsStr := []string{} + for _, err := range errs { + errsStr = append(errsStr, err.Error()) + } + assert.Len(errs, 3) + assert.Contains(errsStr, "jsonapi: the target type of relationship rel2-invalid of type type1 does not exist") + assert.Contains(errsStr, "jsonapi: the inverse type of relationship rel1 should its type's name (type2, not type1)") + assert.Contains(errsStr, "jsonapi: relationship rel2 of type type2 and its inverse do not point each other") +} From 6a34c05357fe090957d839dae995f5d34c36e276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 13 Jul 2019 14:01:56 -0400 Subject: [PATCH 121/406] Add tests for Type struct --- type_test.go | 262 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 262 insertions(+) create mode 100644 type_test.go diff --git a/type_test.go b/type_test.go new file mode 100644 index 0000000..dc35468 --- /dev/null +++ b/type_test.go @@ -0,0 +1,262 @@ +package jsonapi_test + +import ( + "testing" + "time" + + . "github.com/mfcochauxlaberge/jsonapi" + + "github.com/stretchr/testify/assert" +) + +func TestType(t *testing.T) { + assert := assert.New(t) + + typ := &Type{ + Name: "type1", + } + attr1 := Attr{ + Name: "attr1", + Type: AttrTypeString, + Nullable: false, + } + err := typ.AddAttr(attr1) + assert.NoError(err) + rel1 := Rel{ + Name: "rel1", + Type: "type1", + } + err = typ.AddRel(rel1) + assert.NoError(err) + + assert.Contains(typ.Attrs, "attr1") + assert.Contains(typ.Rels, "rel1") + + // Add invalid attribute (no name) + err = typ.AddAttr(Attr{}) + assert.Error(err) + + // Add invalid attribute (invalid type) + err = typ.AddAttr(Attr{Name: "invalid"}) + assert.Error(err) + + // Add invalid attribute (name already used) + err = typ.AddAttr(Attr{Name: "attr1", Type: AttrTypeString}) + assert.Error(err) + + // Add invalid relationship (no name) + err = typ.AddRel(Rel{}) + assert.Error(err) + + // Add invalid relationship (empty type) + err = typ.AddRel(Rel{Name: "invalid"}) + assert.Error(err) + + // Add invalid relationship (name already used) + err = typ.AddRel(Rel{Name: "rel1", Type: "type1"}) + assert.Error(err) +} + +func TestInverseRel(t *testing.T) { + assert := assert.New(t) + + rel := Rel{ + Name: "rel1", + Type: "type2", + ToOne: true, + InverseName: "rel2", + InverseType: "type1", + InverseToOne: false, + } + + invRel := rel.Inverse() + + assert.Equal("rel2", invRel.Name) + assert.Equal("type1", invRel.Type) + assert.Equal(false, invRel.ToOne) + assert.Equal("rel1", invRel.InverseName) + assert.Equal("type2", invRel.InverseType) + assert.Equal(true, invRel.InverseToOne) +} + +func TestGetAttrType(t *testing.T) { + assert := assert.New(t) + + typ, nullable := GetAttrType("string") + assert.Equal(AttrTypeString, typ) + assert.False(nullable) + + typ, nullable = GetAttrType("int") + assert.Equal(AttrTypeInt, typ) + assert.False(nullable) + + typ, nullable = GetAttrType("int8") + assert.Equal(AttrTypeInt8, typ) + assert.False(nullable) + + typ, nullable = GetAttrType("int16") + assert.Equal(AttrTypeInt16, typ) + assert.False(nullable) + + typ, nullable = GetAttrType("int32") + assert.Equal(AttrTypeInt32, typ) + assert.False(nullable) + + typ, nullable = GetAttrType("int64") + assert.Equal(AttrTypeInt64, typ) + assert.False(nullable) + + typ, nullable = GetAttrType("uint") + assert.Equal(AttrTypeUint, typ) + assert.False(nullable) + + typ, nullable = GetAttrType("uint8") + assert.Equal(AttrTypeUint8, typ) + assert.False(nullable) + + typ, nullable = GetAttrType("uint16") + assert.Equal(AttrTypeUint16, typ) + assert.False(nullable) + + typ, nullable = GetAttrType("uint32") + assert.Equal(AttrTypeUint32, typ) + assert.False(nullable) + + typ, nullable = GetAttrType("uint64") + assert.Equal(AttrTypeUint64, typ) + assert.False(nullable) + + typ, nullable = GetAttrType("bool") + assert.Equal(AttrTypeBool, typ) + assert.False(nullable) + + typ, nullable = GetAttrType("time.Time") + assert.Equal(AttrTypeTime, typ) + assert.False(nullable) + + typ, nullable = GetAttrType("*string") + assert.Equal(AttrTypeString, typ) + assert.True(nullable) + + typ, nullable = GetAttrType("*int") + assert.Equal(AttrTypeInt, typ) + assert.True(nullable) + + typ, nullable = GetAttrType("*int8") + assert.Equal(AttrTypeInt8, typ) + assert.True(nullable) + + typ, nullable = GetAttrType("*int16") + assert.Equal(AttrTypeInt16, typ) + assert.True(nullable) + + typ, nullable = GetAttrType("*int32") + assert.Equal(AttrTypeInt32, typ) + assert.True(nullable) + + typ, nullable = GetAttrType("*int64") + assert.Equal(AttrTypeInt64, typ) + assert.True(nullable) + + typ, nullable = GetAttrType("*uint") + assert.Equal(AttrTypeUint, typ) + assert.True(nullable) + + typ, nullable = GetAttrType("*uint8") + assert.Equal(AttrTypeUint8, typ) + assert.True(nullable) + + typ, nullable = GetAttrType("*uint16") + assert.Equal(AttrTypeUint16, typ) + assert.True(nullable) + + typ, nullable = GetAttrType("*uint32") + assert.Equal(AttrTypeUint32, typ) + assert.True(nullable) + + typ, nullable = GetAttrType("*uint64") + assert.Equal(AttrTypeUint64, typ) + assert.True(nullable) + + typ, nullable = GetAttrType("*bool") + assert.Equal(AttrTypeBool, typ) + assert.True(nullable) + + typ, nullable = GetAttrType("*time.Time") + assert.Equal(AttrTypeTime, typ) + assert.True(nullable) + + typ, nullable = GetAttrType("invalid") + assert.Equal(AttrTypeInvalid, typ) + assert.False(nullable) + + typ, nullable = GetAttrType("") + assert.Equal(AttrTypeInvalid, typ) + assert.False(nullable) +} + +func TestGetAttrTypeString(t *testing.T) { + assert := assert.New(t) + + assert.Equal("string", GetAttrTypeString(AttrTypeString, false)) + assert.Equal("int", GetAttrTypeString(AttrTypeInt, false)) + assert.Equal("int8", GetAttrTypeString(AttrTypeInt8, false)) + assert.Equal("int16", GetAttrTypeString(AttrTypeInt16, false)) + assert.Equal("int32", GetAttrTypeString(AttrTypeInt32, false)) + assert.Equal("int64", GetAttrTypeString(AttrTypeInt64, false)) + assert.Equal("uint", GetAttrTypeString(AttrTypeUint, false)) + assert.Equal("uint8", GetAttrTypeString(AttrTypeUint8, false)) + assert.Equal("uint16", GetAttrTypeString(AttrTypeUint16, false)) + assert.Equal("uint32", GetAttrTypeString(AttrTypeUint32, false)) + assert.Equal("uint64", GetAttrTypeString(AttrTypeUint64, false)) + assert.Equal("bool", GetAttrTypeString(AttrTypeBool, false)) + assert.Equal("time.Time", GetAttrTypeString(AttrTypeTime, false)) + assert.Equal("*string", GetAttrTypeString(AttrTypeString, true)) + assert.Equal("*int", GetAttrTypeString(AttrTypeInt, true)) + assert.Equal("*int8", GetAttrTypeString(AttrTypeInt8, true)) + assert.Equal("*int16", GetAttrTypeString(AttrTypeInt16, true)) + assert.Equal("*int32", GetAttrTypeString(AttrTypeInt32, true)) + assert.Equal("*int64", GetAttrTypeString(AttrTypeInt64, true)) + assert.Equal("*uint", GetAttrTypeString(AttrTypeUint, true)) + assert.Equal("*uint8", GetAttrTypeString(AttrTypeUint8, true)) + assert.Equal("*uint16", GetAttrTypeString(AttrTypeUint16, true)) + assert.Equal("*uint32", GetAttrTypeString(AttrTypeUint32, true)) + assert.Equal("*uint64", GetAttrTypeString(AttrTypeUint64, true)) + assert.Equal("*bool", GetAttrTypeString(AttrTypeBool, true)) + assert.Equal("*time.Time", GetAttrTypeString(AttrTypeTime, true)) + assert.Equal("", GetAttrTypeString(AttrTypeInvalid, false)) + assert.Equal("", GetAttrTypeString(999, false)) +} + +func TestGetZeroValue(t *testing.T) { + assert := assert.New(t) + + assert.Equal("", GetZeroValue(AttrTypeString, false)) + assert.Equal(int(0), GetZeroValue(AttrTypeInt, false)) + assert.Equal(int8(0), GetZeroValue(AttrTypeInt8, false)) + assert.Equal(int16(0), GetZeroValue(AttrTypeInt16, false)) + assert.Equal(int32(0), GetZeroValue(AttrTypeInt32, false)) + assert.Equal(int64(0), GetZeroValue(AttrTypeInt64, false)) + assert.Equal(uint(0), GetZeroValue(AttrTypeUint, false)) + assert.Equal(uint8(0), GetZeroValue(AttrTypeUint8, false)) + assert.Equal(uint16(0), GetZeroValue(AttrTypeUint16, false)) + assert.Equal(uint32(0), GetZeroValue(AttrTypeUint32, false)) + assert.Equal(uint64(0), GetZeroValue(AttrTypeUint64, false)) + assert.Equal(false, GetZeroValue(AttrTypeBool, false)) + assert.Equal(time.Time{}, GetZeroValue(AttrTypeTime, false)) + assert.Equal(nilptr("string"), GetZeroValue(AttrTypeString, true)) + assert.Equal(nilptr("int"), GetZeroValue(AttrTypeInt, true)) + assert.Equal(nilptr("int8"), GetZeroValue(AttrTypeInt8, true)) + assert.Equal(nilptr("int16"), GetZeroValue(AttrTypeInt16, true)) + assert.Equal(nilptr("int32"), GetZeroValue(AttrTypeInt32, true)) + assert.Equal(nilptr("int64"), GetZeroValue(AttrTypeInt64, true)) + assert.Equal(nilptr("uint"), GetZeroValue(AttrTypeUint, true)) + assert.Equal(nilptr("uint8"), GetZeroValue(AttrTypeUint8, true)) + assert.Equal(nilptr("uint16"), GetZeroValue(AttrTypeUint16, true)) + assert.Equal(nilptr("uint32"), GetZeroValue(AttrTypeUint32, true)) + assert.Equal(nilptr("uint64"), GetZeroValue(AttrTypeUint64, true)) + assert.Equal(nilptr("bool"), GetZeroValue(AttrTypeBool, true)) + assert.Equal(nilptr("time.Time"), GetZeroValue(AttrTypeTime, true)) + assert.Equal(nil, GetZeroValue(AttrTypeInvalid, false)) + assert.Equal(nil, GetZeroValue(999, false)) +} From 012fa302dbf0dd89d90a8680ef7c9ae749a6aca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 13 Jul 2019 14:28:44 -0400 Subject: [PATCH 122/406] Add tests for Identifier and Identifiers --- identifiers_test.go | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 identifiers_test.go diff --git a/identifiers_test.go b/identifiers_test.go new file mode 100644 index 0000000..ceb7d3b --- /dev/null +++ b/identifiers_test.go @@ -0,0 +1,24 @@ +package jsonapi_test + +import ( + "testing" + + . "github.com/mfcochauxlaberge/jsonapi" + + "github.com/stretchr/testify/assert" +) + +func TestIdentifiers(t *testing.T) { + assert := assert.New(t) + + idens := NewIdentifiers("type1", nil) + assert.Empty(idens) + assert.Empty(idens.IDs()) + + idens = NewIdentifiers("type1", []string{"id1", "id2", "id3"}) + assert.Len(idens, 3) + assert.Equal(Identifier{ID: "id1", Type: "type1"}, idens[0]) + assert.Equal(Identifier{ID: "id2", Type: "type1"}, idens[1]) + assert.Equal(Identifier{ID: "id3", Type: "type1"}, idens[2]) + assert.Equal([]string{"id1", "id2", "id3"}, idens.IDs()) +} From 3e601a13cbf4ff39be1903412f97c387b0931359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 13 Jul 2019 21:08:21 -0400 Subject: [PATCH 123/406] Rename ParseRawURL to NewURLFromRaw --- marshaling_test.go | 4 ++-- request.go | 2 +- unmarshaling_test.go | 6 +++--- url.go | 32 ++++++++++++++++---------------- url_test.go | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/marshaling_test.go b/marshaling_test.go index e90a0ac..151d26e 100644 --- a/marshaling_test.go +++ b/marshaling_test.go @@ -67,7 +67,7 @@ func TestMarshalResource(t *testing.T) { resType := test.data.GetType().Name rawurl := fmt.Sprintf("%s/%s/%s%s", test.prepath, resType, id, test.params) - url, err := ParseRawURL(schema, rawurl) + url, err := NewURLFromRaw(schema, rawurl) assert.NoError(err, test.name) doc.Meta = test.meta @@ -148,7 +148,7 @@ func TestMarshalCollection(t *testing.T) { resType := test.data.Type() rawurl := fmt.Sprintf("%s/%s%s", test.prepath, resType, test.params) - url, err := ParseRawURL(schema, rawurl) + url, err := NewURLFromRaw(schema, rawurl) assert.NoError(err, test.name) doc.Meta = test.meta diff --git a/request.go b/request.go index f759896..7ddd290 100644 --- a/request.go +++ b/request.go @@ -15,7 +15,7 @@ func NewRequest(r *http.Request, schema *Schema) (*Request, error) { return nil, err } - url, err := ParseRawURL(schema, r.URL.EscapedPath()) + url, err := NewURLFromRaw(schema, r.URL.EscapedPath()) if err != nil { return nil, err } diff --git a/unmarshaling_test.go b/unmarshaling_test.go index 095ae21..34dc3fd 100644 --- a/unmarshaling_test.go +++ b/unmarshaling_test.go @@ -21,7 +21,7 @@ func TestUnmarshalResource(t *testing.T) { Rel2: []string{"mt3", "mt4"}, }) - url1, err := ParseRawURL(schema, "/mocktypes3/mt1") + url1, err := NewURLFromRaw(schema, "/mocktypes3/mt1") assert.NoError(err) meta1 := map[string]interface{}{ "str": "a string\\^ç\"", @@ -50,7 +50,7 @@ func TestUnmarshalIdentifier(t *testing.T) { id1 := Identifier{ID: "abc123", Type: "mocktypes1"} - url1, err := ParseRawURL(schema, "/mocktypes3/mt1/relationships/rel1") + url1, err := NewURLFromRaw(schema, "/mocktypes3/mt1/relationships/rel1") assert.NoError(err) meta1 := map[string]interface{}{ "str": "a string\\^ç\"", @@ -83,7 +83,7 @@ func TestUnmarshalIdentifiers(t *testing.T) { Identifier{ID: "ghi789", Type: "mocktypes1"}, } - url1, err := ParseRawURL(schema, "/mocktypes3/mt1/relationships/rel2") + url1, err := NewURLFromRaw(schema, "/mocktypes3/mt1/relationships/rel2") assert.NoError(err) meta1 := map[string]interface{}{ diff --git a/url.go b/url.go index 3a215df..6ea6003 100644 --- a/url.go +++ b/url.go @@ -95,6 +95,22 @@ func NewURL(schema *Schema, su SimpleURL) (*URL, error) { return url, nil } +// NewURLFromRaw parses rawurl to make a *url.URL before making and returning +// a *URL. +func NewURLFromRaw(schema *Schema, rawurl string) (*URL, error) { + url, err := url.Parse(rawurl) + if err != nil { + return nil, err + } + + su, err := NewSimpleURL(url) + if err != nil { + return nil, err + } + + return NewURL(schema, su) +} + // A BelongsToFilter represents a parent resource, used to filter out // resources that are not children of the parent. // @@ -185,19 +201,3 @@ func (u *URL) FullURL() string { return url } - -// ParseRawURL parses rawurl to make a *url.URL before making and returning -// a *URL. -func ParseRawURL(schema *Schema, rawurl string) (*URL, error) { - url, err := url.Parse(rawurl) - if err != nil { - return nil, err - } - - su, err := NewSimpleURL(url) - if err != nil { - return nil, err - } - - return NewURL(schema, su) -} diff --git a/url_test.go b/url_test.go index fbba326..a84b31e 100644 --- a/url_test.go +++ b/url_test.go @@ -179,7 +179,7 @@ func TestParseURL(t *testing.T) { for _, test := range tests { u, _ := url.Parse(makeOneLineNoSpaces(test.url)) - url, err := ParseRawURL(schema, u.String()) + url, err := NewURLFromRaw(schema, u.String()) assert.Equal(test.expectedError, err != nil, test.name) // test.expectedURL.Path = makeOneLineNoSpaces(test.expectedURL.Path) From da60f3220394c13b2a0f3156c1a02051d550d856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 13 Jul 2019 23:43:09 -0400 Subject: [PATCH 124/406] Add tests for SimpleURL.Path --- simple_url_test.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/simple_url_test.go b/simple_url_test.go index fea1625..018cde9 100644 --- a/simple_url_test.go +++ b/simple_url_test.go @@ -240,3 +240,13 @@ func TestSimpleURL(t *testing.T) { assert.Equal(test.expectedError, err, test.name) } } + +func TestSimpleURLPath(t *testing.T) { + assert := assert.New(t) + + su := &SimpleURL{Fragments: []string{}} + assert.Equal("", su.Path()) + + su = &SimpleURL{Fragments: []string{"a", "b", "c"}} + assert.Equal("a/b/c", su.Path()) +} From 30cd99f96559e88c944a64871d59d570d2f01e56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 13 Jul 2019 23:59:04 -0400 Subject: [PATCH 125/406] Group var declarations together in Marshal --- jsonapi.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/jsonapi.go b/jsonapi.go index aa06ab3..062e109 100644 --- a/jsonapi.go +++ b/jsonapi.go @@ -9,9 +9,11 @@ import ( // Both doc and url must not be nil. func Marshal(doc *Document, url *URL) ([]byte, error) { // Data - var data json.RawMessage - var errors json.RawMessage - var err error + var ( + data json.RawMessage + errors json.RawMessage + err error + ) if res, ok := doc.Data.(Resource); ok { // Resource From 0be2b7ecc102c7a2a97197affa72f97dc39f8a65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 14 Jul 2019 09:59:22 -0400 Subject: [PATCH 126/406] Change Document.Included's type to []Resource Sorting IDs is also removed from the Document's tests because the inclusions now stay in order (slice instead of map). --- document.go | 14 ++++++++------ document_test.go | 3 --- jsonapi.go | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/document.go b/document.go index 4a11324..a70b5b5 100644 --- a/document.go +++ b/document.go @@ -6,7 +6,7 @@ type Document struct { Data interface{} // Included - Included map[string]Resource + Included []Resource // References Resources map[string]map[string]struct{} @@ -28,7 +28,7 @@ type Document struct { // NewDocument returns a pointer to a new Document. func NewDocument() *Document { return &Document{ - Included: map[string]Resource{}, + Included: []Resource{}, Resources: map[string]map[string]struct{}{}, Links: map[string]Link{}, RelData: map[string][]string{}, @@ -44,7 +44,7 @@ func (d *Document) Include(res Resource) { key := res.GetID() + " " + res.GetType().Name if len(d.Included) == 0 { - d.Included = map[string]Resource{} + d.Included = []Resource{} } if dres, ok := d.Data.(Resource); ok { @@ -69,11 +69,13 @@ func (d *Document) Include(res Resource) { } // Check already included resources - if _, ok := d.Included[key]; ok { - return + for _, res := range d.Included { + if key == res.GetID()+" "+res.GetType().Name { + return + } } - d.Included[key] = res + d.Included = append(d.Included, res) } // MarshalJSON ... diff --git a/document_test.go b/document_test.go index adfb814..c27bc98 100644 --- a/document_test.go +++ b/document_test.go @@ -1,7 +1,6 @@ package jsonapi_test import ( - "sort" "testing" . "github.com/mfcochauxlaberge/jsonapi" @@ -41,7 +40,6 @@ func TestInclude(t *testing.T) { for _, res := range doc.Included { ids = append(ids, res.GetType().Name+"-"+res.GetID()) } - sort.Strings(ids) expect := []string{ "t1-id2", @@ -77,7 +75,6 @@ func TestInclude(t *testing.T) { for _, res := range doc.Included { ids = append(ids, res.GetType().Name+"-"+res.GetID()) } - sort.Strings(ids) expect = []string{ "t1-id4", diff --git a/jsonapi.go b/jsonapi.go index 062e109..d173b7e 100644 --- a/jsonapi.go +++ b/jsonapi.go @@ -141,7 +141,7 @@ func Unmarshal(payload []byte, url *URL, schema *Schema) (*Document, error) { if err != nil { return nil, err } - doc.Included[inc2.Type+" "+inc2.ID] = res2 + doc.Included = append(doc.Included, res2) } } From 14ac02c0aa1094e0ecc5202684f1c80d67de4a1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 14 Jul 2019 10:27:13 -0400 Subject: [PATCH 127/406] Remove error return from marshalResource/Collection --- jsonapi.go | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/jsonapi.go b/jsonapi.go index d173b7e..0d966a5 100644 --- a/jsonapi.go +++ b/jsonapi.go @@ -2,6 +2,7 @@ package jsonapi import ( "encoding/json" + "fmt" ) // Marshal marshals a document according to the JSON:API speficication. @@ -17,10 +18,10 @@ func Marshal(doc *Document, url *URL) ([]byte, error) { if res, ok := doc.Data.(Resource); ok { // Resource - data, err = marshalResource(res, doc.PrePath, url.Params.Fields[res.GetType().Name], doc.RelData) + data = marshalResource(res, doc.PrePath, url.Params.Fields[res.GetType().Name], doc.RelData) } else if col, ok := doc.Data.(Collection); ok { // Collection - data, err = marshalCollection(col, doc.PrePath, url.Params.Fields[col.Type()], doc.RelData) + data = marshalCollection(col, doc.PrePath, url.Params.Fields[col.Type()], doc.RelData) } else if id, ok := doc.Data.(Identifier); ok { // Identifer data, err = json.Marshal(id) @@ -46,10 +47,7 @@ func Marshal(doc *Document, url *URL) ([]byte, error) { if len(data) > 0 { for key := range doc.Included { typ := doc.Included[key].GetType().Name - raw, err := marshalResource(doc.Included[key], doc.PrePath, url.Params.Fields[typ], doc.RelData) - if err != nil { - return []byte{}, err - } + raw := marshalResource(doc.Included[key], doc.PrePath, url.Params.Fields[typ], doc.RelData) rawm := json.RawMessage(raw) inclusions = append(inclusions, &rawm) } @@ -152,7 +150,7 @@ func Unmarshal(payload []byte, url *URL, schema *Schema) (*Document, error) { } // marshalResource ... -func marshalResource(r Resource, prepath string, fields []string, relData map[string][]string) ([]byte, error) { +func marshalResource(r Resource, prepath string, fields []string, relData map[string][]string) []byte { mapPl := map[string]interface{}{} // ID and type @@ -254,26 +252,31 @@ func marshalResource(r Resource, prepath string, fields []string, relData map[st "self": buildSelfLink(r, prepath), // TODO } - return json.Marshal(mapPl) + pl, err := json.Marshal(mapPl) + if err != nil { + panic(fmt.Errorf("jsonapi: could not marshal resource: %s", err.Error())) + } + return pl } // marshalCollection ... -func marshalCollection(c Collection, prepath string, fields []string, relData map[string][]string) ([]byte, error) { +func marshalCollection(c Collection, prepath string, fields []string, relData map[string][]string) []byte { var raws []*json.RawMessage if c.Len() == 0 { - return []byte("[]"), nil + return []byte("[]") } for i := 0; i < c.Len(); i++ { r := c.Elem(i) var raw json.RawMessage - raw, err := marshalResource(r, prepath, fields, relData) - if err != nil { - return []byte{}, err - } + raw = marshalResource(r, prepath, fields, relData) raws = append(raws, &raw) } - return json.Marshal(raws) + pl, err := json.Marshal(raws) + if err != nil { + panic(fmt.Errorf("jsonapi: could not marshal collection: %s", err.Error())) + } + return pl } From dd4da99ede3402327768f7e0b8cb03b23d15362b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 14 Jul 2019 10:36:05 -0400 Subject: [PATCH 128/406] Refactor assertions in Resource's tests --- resource_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resource_test.go b/resource_test.go index c70c592..b89d8df 100644 --- a/resource_test.go +++ b/resource_test.go @@ -100,9 +100,9 @@ func TestEqual(t *testing.T) { ToManyFromMany: []string{"a", "b", "c"}, }) - assert.Equal(true, Equal(mt11, mt11), "compare same resource with itself") - assert.Equal(true, Equal(mt11, mt12), "compare two identical resources") - assert.Equal(false, EqualStrict(mt11, mt12), "compare two identical resources (different IDs)") - assert.Equal(false, Equal(mt11, mt13), "compare two different resources") - assert.Equal(false, Equal(mt11, mt21), "compare resources of different types") + assert.True(Equal(mt11, mt11), "compare same resource with itself") + assert.True(Equal(mt11, mt12), "compare two identical resources") + assert.False(EqualStrict(mt11, mt12), "compare two identical resources (different IDs)") + assert.False(Equal(mt11, mt13), "compare two different resources") + assert.False(Equal(mt11, mt21), "compare resources of different types") } From 4058115b2b8c6fc29e637835b26529fb1a49dba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 14 Jul 2019 12:17:58 -0400 Subject: [PATCH 129/406] Add CopyType function with tests --- type.go | 18 +++++++++++++++ type_test.go | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/type.go b/type.go index 568e3e1..99b5394 100644 --- a/type.go +++ b/type.go @@ -313,3 +313,21 @@ func GetZeroValue(t int, null bool) interface{} { return nil } } + +// CopyType deeply copies the given type and returns the result. +func CopyType(typ Type) Type { + ctyp := Type{ + Name: typ.Name, + Attrs: map[string]Attr{}, + Rels: map[string]Rel{}, + } + + for name, attr := range typ.Attrs { + ctyp.Attrs[name] = attr + } + for name, rel := range typ.Rels { + ctyp.Rels[name] = rel + } + + return ctyp +} diff --git a/type_test.go b/type_test.go index dc35468..5277c6c 100644 --- a/type_test.go +++ b/type_test.go @@ -260,3 +260,67 @@ func TestGetZeroValue(t *testing.T) { assert.Equal(nil, GetZeroValue(AttrTypeInvalid, false)) assert.Equal(nil, GetZeroValue(999, false)) } + +func TestCopyType(t *testing.T) { + assert := assert.New(t) + + typ1 := Type{ + Name: "type1", + Attrs: map[string]Attr{ + "attr1": Attr{ + Name: "attr1", + Type: AttrTypeString, + Nullable: true, + }, + }, + Rels: map[string]Rel{ + "rel1": Rel{ + Name: "rel1", + Type: "type2", + ToOne: true, + InverseName: "rel2", + InverseType: "type1", + InverseToOne: false, + }, + }, + } + + // Copy + typ2 := CopyType(typ1) + + assert.Equal("type1", typ2.Name) + assert.Len(typ2.Attrs, 1) + assert.Equal("attr1", typ2.Attrs["attr1"].Name) + assert.Equal(AttrTypeString, typ2.Attrs["attr1"].Type) + assert.True(typ2.Attrs["attr1"].Nullable) + assert.Len(typ2.Rels, 1) + assert.Equal("rel1", typ2.Rels["rel1"].Name) + assert.Equal("type2", typ2.Rels["rel1"].Type) + assert.True(typ2.Rels["rel1"].ToOne) + assert.Equal("rel2", typ2.Rels["rel1"].InverseName) + assert.Equal("type1", typ2.Rels["rel1"].InverseType) + assert.False(typ2.Rels["rel1"].InverseToOne) + + // Modify original (copy should not change) + typ1.Name = "type3" + typ1.Attrs["attr2"] = Attr{ + Name: "attr2", + Type: AttrTypeInt, + } + + assert.Equal("type1", typ2.Name) + assert.Len(typ2.Attrs, 1) + + typ1.Name = "type1" + delete(typ1.Attrs, "attr2") + + // Modify copy (original should not change) + typ2.Name = "type3" + typ2.Attrs["attr2"] = Attr{ + Name: "attr2", + Type: AttrTypeInt, + } + + assert.Equal("type1", typ1.Name) + assert.Len(typ1.Attrs, 1) +} From 5dbd0d100695be34ac2cefde94d6135fa95c8883 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 14 Jul 2019 12:45:06 -0400 Subject: [PATCH 130/406] Fix bug in Equal function --- resource.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resource.go b/resource.go index 1bf3b16..c224873 100644 --- a/resource.go +++ b/resource.go @@ -92,7 +92,7 @@ func Equal(r1, r2 Resource) bool { sort.Slice(r1Rels, func(i, j int) bool { return r1Rels[i].Name < r1Rels[j].Name }) - rels = r1.Rels() + rels = r2.Rels() r2Rels := make([]Rel, 0, len(rels)) for name := range rels { r2Rels = append(r2Rels, rels[name]) From 8dc1d8d90c131e1e69d35f12536578bb44caccb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 15 Jul 2019 23:57:55 -0400 Subject: [PATCH 131/406] Add tests for Equal and EqualStrict --- resource_test.go | 74 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 69 insertions(+), 5 deletions(-) diff --git a/resource_test.go b/resource_test.go index b89d8df..f871fd8 100644 --- a/resource_test.go +++ b/resource_test.go @@ -100,9 +100,73 @@ func TestEqual(t *testing.T) { ToManyFromMany: []string{"a", "b", "c"}, }) - assert.True(Equal(mt11, mt11), "compare same resource with itself") - assert.True(Equal(mt11, mt12), "compare two identical resources") - assert.False(EqualStrict(mt11, mt12), "compare two identical resources (different IDs)") - assert.False(Equal(mt11, mt13), "compare two different resources") - assert.False(Equal(mt11, mt21), "compare resources of different types") + assert.True(Equal(mt11, mt11), "same instance") + assert.True(Equal(mt11, mt12), "identical resources") + assert.False(EqualStrict(mt11, mt12), "different IDs") + assert.False(Equal(mt11, mt13), "different resources (same type)") + assert.False(Equal(mt11, mt21), "different types") + + typ := CopyType(mt11.GetType()) + sr1 := &SoftResource{Type: &typ} + sr1.RemoveField("str") + assert.False(Equal(mt11, sr1), "different number of attributes") + + typ = CopyType(mt11.GetType()) + sr1 = &SoftResource{Type: &typ} + for _, attr := range typ.Attrs { + sr1.Set(attr.Name, mt11.Get(attr.Name)) + } + for _, rel := range typ.Rels { + if rel.ToOne { + sr1.SetToOne(rel.Name, mt11.GetToOne(rel.Name)) + } else { + sr1.SetToMany(rel.Name, mt11.GetToMany(rel.Name)) + } + } + sr1.RemoveField("to-one") + assert.False(Equal(mt11, sr1), "different number of relationships") + + sr1.AddRel(Rel{ + Name: "to-one", + Type: "mocktypes2", + ToOne: false, + }) + assert.False(Equal(mt11, sr1), "different to-one property") + + sr1.RemoveField("to-one") + sr1.AddRel(Rel{ + Name: "to-one", + Type: "mocktypes2", + ToOne: true, + }) + sr1.SetToOne("to-one", "b") + assert.False(Equal(mt11, sr1), "different relationship value (to-one)") + + sr1.SetToOne("to-one", "a") + sr1.SetToMany("to-many", []string{"d", "e", "f"}) + assert.False(Equal(mt11, sr1), "different relationship value (to-many)") +} + +func TestEqualStrict(t *testing.T) { + assert := assert.New(t) + + sr1 := &SoftResource{} + sr1.SetType(&Type{ + Name: "type", + }) + sr2 := &SoftResource{} + sr2.SetType(&Type{ + Name: "type", + }) + + // Same ID + sr1.SetID("an-id") + sr2.SetID("an-id") + assert.True(Equal(sr1, sr2)) + assert.True(EqualStrict(sr1, sr2)) + + // Different ID + sr2.SetID("another-id") + assert.True(Equal(sr1, sr2)) + assert.False(EqualStrict(sr1, sr2)) } From df40ae028ab193825e607c7d870742008daff2ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 16 Jul 2019 08:20:50 -0400 Subject: [PATCH 132/406] Fix recursive method call in Link.MarshalJSON --- link.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/link.go b/link.go index 03c7e80..26fd0d8 100644 --- a/link.go +++ b/link.go @@ -13,7 +13,17 @@ type Link struct { // MarshalJSON builds the JSON representation of a Link object. func (l Link) MarshalJSON() ([]byte, error) { if len(l.Meta) > 0 { - return json.Marshal(l) + var err error + m := map[string]json.RawMessage{} + m["href"], err = json.Marshal(l.HRef) + if err != nil { + return []byte{}, err + } + m["meta"], err = json.Marshal(l.Meta) + if err != nil { + return []byte{}, err + } + return json.Marshal(m) } return json.Marshal(l.HRef) From 1a311468c8ff4adc606ff03279b7f68bf7dfbb27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 16 Jul 2019 08:21:21 -0400 Subject: [PATCH 133/406] Add tests for Link struct --- link_test.go | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 link_test.go diff --git a/link_test.go b/link_test.go new file mode 100644 index 0000000..62648bd --- /dev/null +++ b/link_test.go @@ -0,0 +1,42 @@ +package jsonapi_test + +import ( + "testing" + + "github.com/mfcochauxlaberge/jsonapi" + "github.com/stretchr/testify/assert" +) + +func TestMarshalLink(t *testing.T) { + assert := assert.New(t) + + tests := []struct { + link jsonapi.Link + expectedPayload string + }{ + { + link: jsonapi.Link{}, + expectedPayload: `""`, + }, { + link: jsonapi.Link{ + HRef: "example.org", + }, + expectedPayload: `"example.org"`, + }, { + link: jsonapi.Link{ + HRef: "example.org", + Meta: map[string]interface{}{ + "s": "abc", + "n": 123, + }, + }, + expectedPayload: `{"href":"example.org","meta":{"n":123,"s":"abc"}}`, + }, + } + + for _, test := range tests { + pl, err := test.link.MarshalJSON() + assert.NoError(err) + assert.Equal(test.expectedPayload, string(pl)) + } +} From 92650bb938c37f43d38866ec0871fdae4e62bfc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Wed, 17 Jul 2019 08:16:55 -0400 Subject: [PATCH 134/406] Make Collection.Type return Type instead of string --- collection.go | 2 +- document.go | 2 +- jsonapi.go | 2 +- marshaling_test.go | 4 ++-- soft_collection.go | 4 ++-- wrapper_collection.go | 8 +++----- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/collection.go b/collection.go index 915e39c..1466e2a 100644 --- a/collection.go +++ b/collection.go @@ -3,7 +3,7 @@ package jsonapi // A Collection can manage a set of ordered resources of the same type. type Collection interface { // Type returns the name of the resources' type. - Type() string + Type() Type // Len return the number of resources in the collection. Len() int // Elem returns the resource at index i. diff --git a/document.go b/document.go index a70b5b5..1f8ad40 100644 --- a/document.go +++ b/document.go @@ -57,7 +57,7 @@ func (d *Document) Include(res Resource) { } else if col, ok := d.Data.(Collection); ok { // Check Collection ctyp := col.Type() - if ctyp == res.GetType().Name { + if ctyp.Name == res.GetType().Name { for i := 0; i < col.Len(); i++ { rkey := col.Elem(i).GetID() + " " + col.Elem(i).GetType().Name diff --git a/jsonapi.go b/jsonapi.go index 0d966a5..b859723 100644 --- a/jsonapi.go +++ b/jsonapi.go @@ -21,7 +21,7 @@ func Marshal(doc *Document, url *URL) ([]byte, error) { data = marshalResource(res, doc.PrePath, url.Params.Fields[res.GetType().Name], doc.RelData) } else if col, ok := doc.Data.(Collection); ok { // Collection - data = marshalCollection(col, doc.PrePath, url.Params.Fields[col.Type()], doc.RelData) + data = marshalCollection(col, doc.PrePath, url.Params.Fields[col.Type().Name], doc.RelData) } else if id, ok := doc.Data.(Identifier); ok { // Identifer data, err = json.Marshal(id) diff --git a/marshaling_test.go b/marshaling_test.go index 151d26e..54969b0 100644 --- a/marshaling_test.go +++ b/marshaling_test.go @@ -145,8 +145,8 @@ func TestMarshalCollection(t *testing.T) { doc.Data = test.data - resType := test.data.Type() - rawurl := fmt.Sprintf("%s/%s%s", test.prepath, resType, test.params) + typ := test.data.Type() + rawurl := fmt.Sprintf("%s/%s%s", test.prepath, typ.Name, test.params) url, err := NewURLFromRaw(schema, rawurl) assert.NoError(err, test.name) diff --git a/soft_collection.go b/soft_collection.go index 19c6114..128abd1 100644 --- a/soft_collection.go +++ b/soft_collection.go @@ -28,8 +28,8 @@ func (s *SoftCollection) GetType() *Type { } // Type returns the collection's type name. -func (s *SoftCollection) Type() string { - return s.typ.Name +func (s *SoftCollection) Type() Type { + return *s.typ } // AddAttr adds an attribute to all of the resources in the collection. diff --git a/wrapper_collection.go b/wrapper_collection.go index 9fc7cba..6b09aa8 100644 --- a/wrapper_collection.go +++ b/wrapper_collection.go @@ -12,10 +12,8 @@ func WrapCollection(r Resource) *WrapperCollection { // r := Wrap(v) // } - typ := r.GetType().Name - return &WrapperCollection{ - typ: typ, + typ: r.GetType(), col: []*Wrapper{}, sample: r, } @@ -23,13 +21,13 @@ func WrapCollection(r Resource) *WrapperCollection { // WrapperCollection ... type WrapperCollection struct { - typ string + typ Type col []*Wrapper sample Resource } // Type .... -func (wc *WrapperCollection) Type() string { +func (wc *WrapperCollection) Type() Type { return wc.typ } From 7ccef85224c350caa8b6f5a81a4f4c376ce86e97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 18 Jul 2019 22:44:56 -0400 Subject: [PATCH 135/406] Rename Collection.Elem to At --- collection.go | 4 ++-- document.go | 2 +- jsonapi.go | 2 +- marshaling_test.go | 6 +++--- soft_collection.go | 4 ++-- soft_collection_test.go | 6 +++--- wrapper_collection.go | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/collection.go b/collection.go index 1466e2a..1fb84e8 100644 --- a/collection.go +++ b/collection.go @@ -6,8 +6,8 @@ type Collection interface { Type() Type // Len return the number of resources in the collection. Len() int - // Elem returns the resource at index i. - Elem(i int) Resource + // At returns the resource at index i. + At(i int) Resource // Add adds a resource in the collection. Add(r Resource) diff --git a/document.go b/document.go index 1f8ad40..e3ca4a8 100644 --- a/document.go +++ b/document.go @@ -59,7 +59,7 @@ func (d *Document) Include(res Resource) { ctyp := col.Type() if ctyp.Name == res.GetType().Name { for i := 0; i < col.Len(); i++ { - rkey := col.Elem(i).GetID() + " " + col.Elem(i).GetType().Name + rkey := col.At(i).GetID() + " " + col.At(i).GetType().Name if rkey == key { return diff --git a/jsonapi.go b/jsonapi.go index b859723..0b25d39 100644 --- a/jsonapi.go +++ b/jsonapi.go @@ -268,7 +268,7 @@ func marshalCollection(c Collection, prepath string, fields []string, relData ma } for i := 0; i < c.Len(); i++ { - r := c.Elem(i) + r := c.At(i) var raw json.RawMessage raw = marshalResource(r, prepath, fields, relData) raws = append(raws, &raw) diff --git a/marshaling_test.go b/marshaling_test.go index 54969b0..937f4aa 100644 --- a/marshaling_test.go +++ b/marshaling_test.go @@ -32,7 +32,7 @@ func TestMarshalResource(t *testing.T) { }{ { name: "resource with meta", - data: mocktypes1.Elem(0), + data: mocktypes1.At(0), meta: map[string]interface{}{ "num": 42, "timestamp": time.Date(2017, 1, 2, 3, 4, 5, 6, loc), @@ -43,13 +43,13 @@ func TestMarshalResource(t *testing.T) { payloadFile: "resource-1", }, { name: "resource with prepath", - data: mocktypes2.Elem(1), + data: mocktypes2.At(1), prepath: "https://example.org/", errorExpected: false, payloadFile: "resource-2", }, { name: "resource with prepath and params", - data: mocktypes2.Elem(1), + data: mocktypes2.At(1), prepath: "https://example.org/", params: "?fields[mocktypes2]=strptr,uintptr,int", errorExpected: false, diff --git a/soft_collection.go b/soft_collection.go index 128abd1..3a570bc 100644 --- a/soft_collection.go +++ b/soft_collection.go @@ -48,8 +48,8 @@ func (s *SoftCollection) Len() int { return len(s.col) } -// Elem returns the element at index i. -func (s *SoftCollection) Elem(i int) Resource { +// At returns the element at index i. +func (s *SoftCollection) At(i int) Resource { if i >= 0 && i < len(s.col) { return s.col[i] } diff --git a/soft_collection_test.go b/soft_collection_test.go index ddc06cc..8be42c2 100644 --- a/soft_collection_test.go +++ b/soft_collection_test.go @@ -428,7 +428,7 @@ func TestSoftCollectionSort(t *testing.T) { // Sorted IDs from the collection ids := []string{} for i := 0; i < sc.Len(); i++ { - ids = append(ids, sc.Elem(i).GetID()) + ids = append(ids, sc.At(i).GetID()) } expectedIDs := []string{ @@ -450,7 +450,7 @@ func TestSoftCollectionSort(t *testing.T) { ids = []string{} for i := 0; i < sc.Len(); i++ { - ids = append(ids, sc.Elem(i).GetID()) + ids = append(ids, sc.At(i).GetID()) } sort.Strings(expectedIDs) @@ -461,5 +461,5 @@ func TestSoftCollectionMiscellaneous(t *testing.T) { assert := assert.New(t) sc := &SoftCollection{} - assert.Nil(sc.Elem(99), "nonexistent element") + assert.Nil(sc.At(99), "nonexistent element") } diff --git a/wrapper_collection.go b/wrapper_collection.go index 6b09aa8..cd37f55 100644 --- a/wrapper_collection.go +++ b/wrapper_collection.go @@ -36,8 +36,8 @@ func (wc *WrapperCollection) Len() int { return len(wc.col) } -// Elem ... -func (wc *WrapperCollection) Elem(i int) Resource { +// At ... +func (wc *WrapperCollection) At(i int) Resource { if len(wc.col) > i { return wc.col[i] } From 093a63212cd0c2fed6a943e8cc829cd22d6ac0c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 18 Jul 2019 22:52:17 -0400 Subject: [PATCH 136/406] Add comments for WrapperCollection --- wrapper_collection.go | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/wrapper_collection.go b/wrapper_collection.go index cd37f55..dc57351 100644 --- a/wrapper_collection.go +++ b/wrapper_collection.go @@ -4,7 +4,8 @@ import "encoding/json" var _ Collection = (*WrapperCollection)(nil) -// WrapCollection ... +// WrapCollection returns a *WrapperCollection which implements the +// Collection interface and holds resources of the type defined in r. func WrapCollection(r Resource) *WrapperCollection { // if r2, ok := v.(Resource); ok { // r = r2 @@ -19,24 +20,31 @@ func WrapCollection(r Resource) *WrapperCollection { } } -// WrapperCollection ... +// WrapperCollection is a Collection of resources of a certain type +// defined using the WrapCollection constructor. +// +// Only resources of that type can be added to the collection and the +// type may not be modified. type WrapperCollection struct { typ Type col []*Wrapper sample Resource } -// Type .... +// Type returns the type of the resources in the collection. func (wc *WrapperCollection) Type() Type { return wc.typ } -// Len ... +// Len returns the number of elements in the collection. func (wc *WrapperCollection) Len() int { return len(wc.col) } -// At ... +// At returns the resource at the given index. +// +// It returns nil if the index is greater than the number of resources +// in the collection. func (wc *WrapperCollection) At(i int) Resource { if len(wc.col) > i { return wc.col[i] @@ -45,14 +53,15 @@ func (wc *WrapperCollection) At(i int) Resource { return nil } -// Add ... +// Add appends the given resource at the end of the collection. func (wc *WrapperCollection) Add(r Resource) { if wr, ok := r.(*Wrapper); ok { wc.col = append(wc.col, wr) } } -// UnmarshalJSON ... +// UnmarshalJSON populates the receiver with the resources represented in +// the payload. func (wc *WrapperCollection) UnmarshalJSON(payload []byte) error { var raws []json.RawMessage From 66690294cdf58f71bf06481088cc21bfb80b5a67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 18 Jul 2019 23:04:21 -0400 Subject: [PATCH 137/406] Rename Collection.Type to Collection.GetType This required some refactoring with the SoftCollection struct in order to do the change. --- collection.go | 2 +- document.go | 2 +- jsonapi.go | 2 +- marshaling_test.go | 2 +- soft_collection.go | 24 ++++++++++-------------- soft_collection_test.go | 18 +++++++++--------- wrapper_collection.go | 4 ++-- 7 files changed, 25 insertions(+), 29 deletions(-) diff --git a/collection.go b/collection.go index 1fb84e8..8efa7bd 100644 --- a/collection.go +++ b/collection.go @@ -3,7 +3,7 @@ package jsonapi // A Collection can manage a set of ordered resources of the same type. type Collection interface { // Type returns the name of the resources' type. - Type() Type + GetType() Type // Len return the number of resources in the collection. Len() int // At returns the resource at index i. diff --git a/document.go b/document.go index e3ca4a8..b9299ae 100644 --- a/document.go +++ b/document.go @@ -56,7 +56,7 @@ func (d *Document) Include(res Resource) { } } else if col, ok := d.Data.(Collection); ok { // Check Collection - ctyp := col.Type() + ctyp := col.GetType() if ctyp.Name == res.GetType().Name { for i := 0; i < col.Len(); i++ { rkey := col.At(i).GetID() + " " + col.At(i).GetType().Name diff --git a/jsonapi.go b/jsonapi.go index 0b25d39..6c4c827 100644 --- a/jsonapi.go +++ b/jsonapi.go @@ -21,7 +21,7 @@ func Marshal(doc *Document, url *URL) ([]byte, error) { data = marshalResource(res, doc.PrePath, url.Params.Fields[res.GetType().Name], doc.RelData) } else if col, ok := doc.Data.(Collection); ok { // Collection - data = marshalCollection(col, doc.PrePath, url.Params.Fields[col.Type().Name], doc.RelData) + data = marshalCollection(col, doc.PrePath, url.Params.Fields[col.GetType().Name], doc.RelData) } else if id, ok := doc.Data.(Identifier); ok { // Identifer data, err = json.Marshal(id) diff --git a/marshaling_test.go b/marshaling_test.go index 937f4aa..b8588da 100644 --- a/marshaling_test.go +++ b/marshaling_test.go @@ -145,7 +145,7 @@ func TestMarshalCollection(t *testing.T) { doc.Data = test.data - typ := test.data.Type() + typ := test.data.GetType() rawurl := fmt.Sprintf("%s/%s%s", test.prepath, typ.Name, test.params) url, err := NewURLFromRaw(schema, rawurl) diff --git a/soft_collection.go b/soft_collection.go index 3a570bc..090be01 100644 --- a/soft_collection.go +++ b/soft_collection.go @@ -12,34 +12,30 @@ var _ Collection = (*SoftCollection)(nil) // SoftCollection is a collection of SoftResources where the type can // be changed for all elements at once by modifying the Type field. type SoftCollection struct { - typ *Type + Type *Type + col []*SoftResource sort []string } // SetType sets the collection's type. func (s *SoftCollection) SetType(typ *Type) { - s.typ = typ + s.Type = typ } // GetType returns the collection's type. -func (s *SoftCollection) GetType() *Type { - return s.typ -} - -// Type returns the collection's type name. -func (s *SoftCollection) Type() Type { - return *s.typ +func (s *SoftCollection) GetType() Type { + return *s.Type } // AddAttr adds an attribute to all of the resources in the collection. func (s *SoftCollection) AddAttr(attr Attr) error { - return s.typ.AddAttr(attr) + return s.Type.AddAttr(attr) } // AddRel adds a relationship to all of the resources in the collection. func (s *SoftCollection) AddRel(rel Rel) error { - return s.typ.AddRel(rel) + return s.Type.AddRel(rel) } @@ -72,7 +68,7 @@ func (s *SoftCollection) Resource(id string, fields []string) Resource { // given parameters. func (s *SoftCollection) Range(ids []string, filter *Filter, sort []string, fields []string, pageSize uint, pageNumber uint) []Resource { rangeCol := &SoftCollection{} - rangeCol.SetType(s.typ) + rangeCol.SetType(s.Type) // Filter IDs if len(ids) > 0 { @@ -110,7 +106,7 @@ func (s *SoftCollection) Range(ids []string, filter *Filter, sort []string, fiel rangeCol = &SoftCollection{} } else { page := &SoftCollection{} - page.SetType(s.typ) + page.SetType(s.Type) for i := skip; i < len(rangeCol.col) && i < skip+int(pageSize); i++ { page.Add(rangeCol.col[i]) } @@ -132,7 +128,7 @@ func (s *SoftCollection) Add(r Resource) { // then it is added to the collection. sr := &SoftResource{} sr.id = r.GetID() - sr.Type = s.typ + sr.Type = s.Type for _, attr := range r.Attrs() { sr.AddAttr(attr) diff --git a/soft_collection_test.go b/soft_collection_test.go index 8be42c2..c12a55d 100644 --- a/soft_collection_test.go +++ b/soft_collection_test.go @@ -50,7 +50,7 @@ func TestSoftCollection(t *testing.T) { typcopy := copystructure.Must(copystructure.Copy(typ)).(Type) sc.SetType(&typcopy) - assert.Equal(t, sc.GetType(), &typ) + assert.Equal(t, sc.Type, &typ) // Modify the SoftCollection's type and the local type // at the same time and check whether they still are @@ -73,7 +73,7 @@ func TestSoftCollection(t *testing.T) { typ.AddRel(rel5) sc.AddRel(rel5) - assert.Equal(t, sc.GetType(), &typ) + assert.Equal(t, sc.Type, &typ) // Add a SoftResource with more fields than those // specified in the SoftCollection. @@ -98,7 +98,7 @@ func TestSoftCollection(t *testing.T) { sc.Add(sr) - assert.Equal(t, sc.GetType(), &typ) + assert.Equal(t, sc.Type, &typ) // Add more elements to the SoftCollection. sr = &SoftResource{} @@ -121,25 +121,25 @@ func TestSoftCollectionResource(t *testing.T) { sc := &SoftCollection{} sc.SetType(&Type{}) - sc.GetType().Name = "type1" - sc.GetType().AddAttr(Attr{ + sc.Type.Name = "type1" + sc.Type.AddAttr(Attr{ Name: "attr1", Type: AttrTypeString, Nullable: false, }) - sc.GetType().AddAttr(Attr{ + sc.Type.AddAttr(Attr{ Name: "attr2", Type: AttrTypeInt, Nullable: true, }) - sc.GetType().AddRel(Rel{ + sc.Type.AddRel(Rel{ Name: "rel1", Type: "type2", ToOne: true, }) sr := &SoftResource{} - sr.SetType(sc.GetType()) + sr.SetType(sc.Type) sr.SetID("res1") sr.Set("attr", "value1") sc.Add(sr) @@ -230,7 +230,7 @@ func TestSoftCollectionRange(t *testing.T) { for _, res := range resources { sr := &SoftResource{} - sr.SetType(col.GetType()) + sr.SetType(col.Type) sr.SetID(res.id) for field, val := range res.fields { sr.Set(field, val) diff --git a/wrapper_collection.go b/wrapper_collection.go index dc57351..fce1269 100644 --- a/wrapper_collection.go +++ b/wrapper_collection.go @@ -31,8 +31,8 @@ type WrapperCollection struct { sample Resource } -// Type returns the type of the resources in the collection. -func (wc *WrapperCollection) Type() Type { +// GetType returns the type of the resources in the collection. +func (wc *WrapperCollection) GetType() Type { return wc.typ } From 82482d94409606d62e55f2e8919fcd2a0607196f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 18 Jul 2019 23:09:16 -0400 Subject: [PATCH 138/406] Fix typo in one of Collection's comments --- collection.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collection.go b/collection.go index 8efa7bd..af5c816 100644 --- a/collection.go +++ b/collection.go @@ -4,7 +4,7 @@ package jsonapi type Collection interface { // Type returns the name of the resources' type. GetType() Type - // Len return the number of resources in the collection. + // Len returns the number of resources in the collection. Len() int // At returns the resource at index i. At(i int) Resource From c568c456bb1d158855cd0c82f28c47d1a3dc67f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 18 Jul 2019 23:09:53 -0400 Subject: [PATCH 139/406] Add blank spaces in Collection's list of methods --- collection.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/collection.go b/collection.go index af5c816..4b4a2ee 100644 --- a/collection.go +++ b/collection.go @@ -4,10 +4,13 @@ package jsonapi type Collection interface { // Type returns the name of the resources' type. GetType() Type + // Len returns the number of resources in the collection. Len() int + // At returns the resource at index i. At(i int) Resource + // Add adds a resource in the collection. Add(r Resource) From df44896805dc5dfaf775dfe492e194a0d3bb4a3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 22 Jul 2019 18:42:37 -0400 Subject: [PATCH 140/406] Improve Collection's comment --- collection.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/collection.go b/collection.go index 4b4a2ee..042c061 100644 --- a/collection.go +++ b/collection.go @@ -1,6 +1,7 @@ package jsonapi -// A Collection can manage a set of ordered resources of the same type. +// A Collection defines the interface of a structure that can manage a set +// of ordered resources of the same type. type Collection interface { // Type returns the name of the resources' type. GetType() Type From c0044da415e446c8c7b362206d0f0fad9550c68d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 25 Jul 2019 21:53:00 -0400 Subject: [PATCH 141/406] Simplify some return statements in SoftCollection.Less --- soft_collection.go | 48 +++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/soft_collection.go b/soft_collection.go index 090be01..5445a96 100644 --- a/soft_collection.go +++ b/soft_collection.go @@ -279,10 +279,10 @@ func (s *SoftCollection) Less(i, j int) bool { continue } if v == nil { - return true != inverse + return !inverse } if p == nil { - return false != inverse + return inverse } if *v == *p { continue @@ -294,10 +294,10 @@ func (s *SoftCollection) Less(i, j int) bool { continue } if v == nil { - return true != inverse + return !inverse } if p == nil { - return false != inverse + return inverse } if *v == *p { continue @@ -309,10 +309,10 @@ func (s *SoftCollection) Less(i, j int) bool { continue } if v == nil { - return true != inverse + return !inverse } if p == nil { - return false != inverse + return inverse } if *v == *p { continue @@ -324,10 +324,10 @@ func (s *SoftCollection) Less(i, j int) bool { continue } if v == nil { - return true != inverse + return !inverse } if p == nil { - return false != inverse + return inverse } if *v == *p { continue @@ -339,10 +339,10 @@ func (s *SoftCollection) Less(i, j int) bool { continue } if v == nil { - return true != inverse + return !inverse } if p == nil { - return false != inverse + return inverse } if *v == *p { continue @@ -354,10 +354,10 @@ func (s *SoftCollection) Less(i, j int) bool { continue } if v == nil { - return true != inverse + return !inverse } if p == nil { - return false != inverse + return inverse } if *v == *p { continue @@ -369,10 +369,10 @@ func (s *SoftCollection) Less(i, j int) bool { continue } if v == nil { - return true != inverse + return !inverse } if p == nil { - return false != inverse + return inverse } if *v == *p { continue @@ -384,10 +384,10 @@ func (s *SoftCollection) Less(i, j int) bool { continue } if v == nil { - return true != inverse + return !inverse } if p == nil { - return false != inverse + return inverse } if *v == *p { continue @@ -399,10 +399,10 @@ func (s *SoftCollection) Less(i, j int) bool { continue } if v == nil { - return true != inverse + return !inverse } if p == nil { - return false != inverse + return inverse } if *v == *p { continue @@ -414,10 +414,10 @@ func (s *SoftCollection) Less(i, j int) bool { continue } if v == nil { - return true != inverse + return !inverse } if p == nil { - return false != inverse + return inverse } if *v == *p { continue @@ -429,10 +429,10 @@ func (s *SoftCollection) Less(i, j int) bool { continue } if v == nil { - return true != inverse + return !inverse } if p == nil { - return false != inverse + return inverse } if *v == *p { continue @@ -444,10 +444,10 @@ func (s *SoftCollection) Less(i, j int) bool { continue } if v == nil { - return true != inverse + return !inverse } if p == nil { - return false != inverse + return inverse } if v.Equal(*p) { continue From ae1f412c83cc53e37ded8d8a768eae9630906e1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 25 Jul 2019 22:16:43 -0400 Subject: [PATCH 142/406] Make the non-handling of some errors explicit --- filter_query_test.go | 2 +- marshaling_test.go | 12 ++++++------ mock_schema_test.go | 6 +++--- soft_collection_test.go | 32 ++++++++++++++++---------------- soft_resource_test.go | 4 ++-- wrapper.go | 2 +- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/filter_query_test.go b/filter_query_test.go index 244d5a0..dae4496 100644 --- a/filter_query_test.go +++ b/filter_query_test.go @@ -833,7 +833,7 @@ func TestFilterResource(t *testing.T) { for j := range test.rvals { attrName := "attr" + strconv.Itoa(j) ty, n := GetAttrType(fmt.Sprintf("%T", test.rvals[j])) - typ.AddAttr( + _ = typ.AddAttr( Attr{ Name: attrName, Type: ty, diff --git a/marshaling_test.go b/marshaling_test.go index b8588da..96eefa5 100644 --- a/marshaling_test.go +++ b/marshaling_test.go @@ -80,14 +80,14 @@ func TestMarshalResource(t *testing.T) { var out bytes.Buffer // Format the payload - json.Indent(&out, payload, "", "\t") + _ = json.Indent(&out, payload, "", "\t") output := out.String() // Retrieve the expected result from file content, err := ioutil.ReadFile("testdata/" + test.payloadFile + ".json") assert.NoError(err, test.name) out.Reset() - json.Indent(&out, content, "", "\t") + _ = json.Indent(&out, content, "", "\t") // Trim because otherwise there is an extra line at the end expectedOutput := strings.TrimSpace(out.String()) @@ -161,14 +161,14 @@ func TestMarshalCollection(t *testing.T) { var out bytes.Buffer // Format the payload - json.Indent(&out, payload, "", "\t") + _ = json.Indent(&out, payload, "", "\t") output := out.String() // Retrieve the expected result from file content, err := ioutil.ReadFile("testdata/" + test.payloadFile + ".json") assert.NoError(err, test.name) out.Reset() - json.Indent(&out, content, "", "\t") + _ = json.Indent(&out, content, "", "\t") // Trim because otherwise there is an extra line at the end expectedOutput := strings.TrimSpace(out.String()) @@ -235,14 +235,14 @@ func TestMarshalErrors(t *testing.T) { var out bytes.Buffer // Format the payload - json.Indent(&out, payload, "", "\t") + _ = json.Indent(&out, payload, "", "\t") output := out.String() // Retrieve the expected result from file content, err := ioutil.ReadFile("testdata/" + test.payloadFile + ".json") assert.NoError(err, test.name) out.Reset() - json.Indent(&out, content, "", "\t") + _ = json.Indent(&out, content, "", "\t") // Trim because otherwise there is an extra line at the end expectedOutput := strings.TrimSpace(out.String()) diff --git a/mock_schema_test.go b/mock_schema_test.go index 6e8daa5..0537855 100644 --- a/mock_schema_test.go +++ b/mock_schema_test.go @@ -11,11 +11,11 @@ func newMockSchema() *Schema { schema := &Schema{} typ, _ := ReflectType(mockType1{}) - schema.AddType(typ) + _ = schema.AddType(typ) typ, _ = ReflectType(mockType2{}) - schema.AddType(typ) + _ = schema.AddType(typ) typ, _ = ReflectType(mockType3{}) - schema.AddType(typ) + _ = schema.AddType(typ) for t, typ := range schema.Types { for r, rel := range typ.Rels { diff --git a/soft_collection_test.go b/soft_collection_test.go index c12a55d..df64592 100644 --- a/soft_collection_test.go +++ b/soft_collection_test.go @@ -18,17 +18,17 @@ func TestSoftCollection(t *testing.T) { // Add type typ := Type{Name: "thistype"} - typ.AddAttr(Attr{ + _ = typ.AddAttr(Attr{ Name: "attr1", Type: AttrTypeInt, Nullable: false, }) - typ.AddAttr(Attr{ + _ = typ.AddAttr(Attr{ Name: "attr2", Type: AttrTypeString, Nullable: true, }) - typ.AddRel(Rel{ + _ = typ.AddRel(Rel{ Name: "rel1", Type: "othertype", ToOne: true, @@ -36,7 +36,7 @@ func TestSoftCollection(t *testing.T) { InverseType: "thistype", InverseToOne: true, }) - typ.AddRel(Rel{ + _ = typ.AddRel(Rel{ Name: "rel3", Type: "othertype", ToOne: false, @@ -68,10 +68,10 @@ func TestSoftCollection(t *testing.T) { InverseType: "thistype", InverseToOne: false, } - typ.AddAttr(attr3) - sc.AddAttr(attr3) - typ.AddRel(rel5) - sc.AddRel(rel5) + _ = typ.AddAttr(attr3) + _ = sc.AddAttr(attr3) + _ = typ.AddRel(rel5) + _ = sc.AddRel(rel5) assert.Equal(t, sc.Type, &typ) @@ -84,7 +84,7 @@ func TestSoftCollection(t *testing.T) { Nullable: true, } sr.AddAttr(attr4) - typ.AddAttr(attr4) + _ = typ.AddAttr(attr4) rel7 := Rel{ Name: "rel7", Type: "othertype", @@ -94,7 +94,7 @@ func TestSoftCollection(t *testing.T) { InverseToOne: true, } sr.AddRel(rel7) - typ.AddRel(rel7) + _ = typ.AddRel(rel7) sc.Add(sr) @@ -122,17 +122,17 @@ func TestSoftCollectionResource(t *testing.T) { sc.SetType(&Type{}) sc.Type.Name = "type1" - sc.Type.AddAttr(Attr{ + _ = sc.Type.AddAttr(Attr{ Name: "attr1", Type: AttrTypeString, Nullable: false, }) - sc.Type.AddAttr(Attr{ + _ = sc.Type.AddAttr(Attr{ Name: "attr2", Type: AttrTypeInt, Nullable: true, }) - sc.Type.AddRel(Rel{ + _ = sc.Type.AddRel(Rel{ Name: "rel1", Type: "type2", ToOne: true, @@ -162,12 +162,12 @@ func TestSoftCollectionRange(t *testing.T) { // Collection col := SoftCollection{} col.SetType(&Type{}) - col.AddAttr(Attr{ + _ = col.AddAttr(Attr{ Name: "attr1", Type: AttrTypeString, Nullable: false, }) - col.AddAttr(Attr{ + _ = col.AddAttr(Attr{ Name: "attr2", Type: AttrTypeInt, Nullable: false, @@ -390,7 +390,7 @@ func TestSoftCollectionSort(t *testing.T) { typ := &Type{Name: "type"} for i, t := range attrs { ti, null := GetAttrType(fmt.Sprintf("%T", t.vals[0])) - typ.AddAttr(Attr{ + _ = typ.AddAttr(Attr{ Name: "attr" + strconv.Itoa(i), Type: ti, Nullable: null, diff --git a/soft_resource_test.go b/soft_resource_test.go index e5dd7a8..853cb96 100644 --- a/soft_resource_test.go +++ b/soft_resource_test.go @@ -16,12 +16,12 @@ func TestSoftResource(t *testing.T) { // NewSoftResource typ := Type{Name: "type"} - typ.AddAttr(Attr{ + _ = typ.AddAttr(Attr{ Name: "attr1", Type: AttrTypeString, Nullable: false, }) - typ.AddRel(Rel{ + _ = typ.AddRel(Rel{ Name: "rel1", Type: "type", ToOne: true, diff --git a/wrapper.go b/wrapper.go index f66b29d..c6ecdba 100644 --- a/wrapper.go +++ b/wrapper.go @@ -167,7 +167,7 @@ func (w *Wrapper) SetID(id string) { // Set sets the value associated to the attribute named after key. func (w *Wrapper) Set(key string, val interface{}) { - w.setAttr(key, val) + _ = w.setAttr(key, val) } // GetToOne returns the value associated with the relationship named From 88b7a1d89e24b4a512d85a9e1b3c56a10c65bae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 25 Jul 2019 22:19:24 -0400 Subject: [PATCH 143/406] Remove four unused skeleton structs --- skeletons.go | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/skeletons.go b/skeletons.go index 858e71d..1e7572b 100644 --- a/skeletons.go +++ b/skeletons.go @@ -7,24 +7,3 @@ type payloadSkeleton struct { Included []json.RawMessage `json:"included"` Meta map[string]interface{} `json:"meta"` } - -type resourceSkeleton struct { - ID string `json:"id"` - Attributes json.RawMessage `json:"attributes"` - Relationships map[string]relationshipSkeleton `json:"relationships"` -} - -type identifierSkeleton struct { - ID string `json:"id"` - Type string `json:"type"` -} - -type relationshipSkeleton struct { - Links linksSkeleton - Data json.RawMessage -} - -type linksSkeleton struct { - Self json.RawMessage - Related json.RawMessage -} From afdbcdc4b955530d2918a10ec5fa0efd6e152683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 25 Jul 2019 22:20:48 -0400 Subject: [PATCH 144/406] Remove makeOneLine (unused) --- util_test.go | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/util_test.go b/util_test.go index 43b3b40..5fdc0a1 100644 --- a/util_test.go +++ b/util_test.go @@ -5,20 +5,6 @@ import ( "time" ) -func makeOneLine(str string) string { - str = strings.TrimSpace(str) - str = strings.Replace(str, "\t", " ", -1) - str = strings.Replace(str, "\n", " ", -1) - - for { - str2 := strings.Replace(str, " ", " ", -1) - if str == str2 { - return str - } - str = str2 - } -} - func makeOneLineNoSpaces(str string) string { str = strings.Replace(str, "\t", "", -1) str = strings.Replace(str, "\n", "", -1) From 09f27d452486294ed9708359c92f6a84b53d3d6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 25 Jul 2019 22:27:20 -0400 Subject: [PATCH 145/406] Remove unused field in anonymous test struct --- build_links_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/build_links_test.go b/build_links_test.go index 4c8d2c1..047d97d 100644 --- a/build_links_test.go +++ b/build_links_test.go @@ -11,7 +11,6 @@ func TestBuildSelfLink(t *testing.T) { tests := []struct { name string - res Resource id string expectedString string }{ From b0244b38105b7cd280e1554918a9abe5741a52fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 25 Jul 2019 22:29:26 -0400 Subject: [PATCH 146/406] Merge var declaration with assignment on next line --- jsonapi.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jsonapi.go b/jsonapi.go index 6c4c827..50d8c8b 100644 --- a/jsonapi.go +++ b/jsonapi.go @@ -269,8 +269,7 @@ func marshalCollection(c Collection, prepath string, fields []string, relData ma for i := 0; i < c.Len(); i++ { r := c.At(i) - var raw json.RawMessage - raw = marshalResource(r, prepath, fields, relData) + raw := json.RawMessage(marshalResource(r, prepath, fields, relData)) raws = append(raws, &raw) } From 9f2dd1656a074c23632d62ffd2e76df2acbc498f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 25 Jul 2019 22:30:42 -0400 Subject: [PATCH 147/406] Remove unused field in anonymous test struct --- marshaling_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/marshaling_test.go b/marshaling_test.go index 96eefa5..bdcb689 100644 --- a/marshaling_test.go +++ b/marshaling_test.go @@ -108,7 +108,6 @@ func TestMarshalCollection(t *testing.T) { prepath string params string meta map[string]interface{} - jsonapi map[string]interface{} errorExpected bool payloadFile string }{ From 7e9e229ffa13d05d21089453020f56b136ce6991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 25 Jul 2019 23:10:42 -0400 Subject: [PATCH 148/406] Add golangci-lint to Travis pipeline --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 32ca8a2..514a739 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,11 @@ branches: env: - GO111MODULE=on +before_script: + - go install github.com/golangci/golangci-lint/cmd/golangci-lint + script: + - golangci-lint run - go test -race -coverprofile=coverage.txt -covermode=atomic after_success: From fa14a61806d828755ffcb94bf6e3737345b7d3ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 28 Jul 2019 11:38:19 -0400 Subject: [PATCH 149/406] Remove URL.FullURL --- jsonapi.go | 2 +- url.go | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/jsonapi.go b/jsonapi.go index 50d8c8b..627e16c 100644 --- a/jsonapi.go +++ b/jsonapi.go @@ -72,7 +72,7 @@ func Marshal(doc *Document, url *URL) ([]byte, error) { if url != nil { plMap["links"] = map[string]string{ - "self": doc.PrePath + url.FullURL(), + "self": doc.PrePath + url.NormalizePath(), } } plMap["jsonapi"] = map[string]string{"version": "1.0"} diff --git a/url.go b/url.go index 6ea6003..bffd088 100644 --- a/url.go +++ b/url.go @@ -194,10 +194,3 @@ func (u *URL) NormalizePath() string { return path + params } - -// FullURL returns the full URL as a string. -func (u *URL) FullURL() string { - url := u.NormalizePath() - - return url -} From 6c738c0cbbf230d410d61c85082767c92510de2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 28 Jul 2019 11:41:21 -0400 Subject: [PATCH 150/406] Rename NormalizePath to String and fix top comment --- jsonapi.go | 2 +- url.go | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/jsonapi.go b/jsonapi.go index 627e16c..bab206e 100644 --- a/jsonapi.go +++ b/jsonapi.go @@ -72,7 +72,7 @@ func Marshal(doc *Document, url *URL) ([]byte, error) { if url != nil { plMap["links"] = map[string]string{ - "self": doc.PrePath + url.NormalizePath(), + "self": doc.PrePath + url.String(), } } plMap["jsonapi"] = map[string]string{"version": "1.0"} diff --git a/url.go b/url.go index bffd088..31c5a7c 100644 --- a/url.go +++ b/url.go @@ -123,10 +123,12 @@ type BelongsToFilter struct { InverseName string } -// NormalizePath builds and returns the URL as a string. +// String returns a string representation of the URL where special characters +// are escaped. // -// It returns exactly the same string given the same URL and schema. -func (u *URL) NormalizePath() string { +// The URL is normalized, so it always returns exactly the same string given +// the same URL. +func (u *URL) String() string { // Path path := "/" for _, p := range u.Fragments { From 626bf7c7925266a39da0193f9402dca682cc4ec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 28 Jul 2019 12:10:20 -0400 Subject: [PATCH 151/406] Fix pagination in URL.String The order was wrong and a default value of 10 for page size was assumed. Now, the default values are all 0, so the numbers get added to the final string only of they are not 0. --- testdata/collection-1.json | 2 +- testdata/collection-2.json | 2 +- testdata/collection-3.json | 2 +- url.go | 11 ++++------- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/testdata/collection-1.json b/testdata/collection-1.json index 7387231..4fb64fd 100644 --- a/testdata/collection-1.json +++ b/testdata/collection-1.json @@ -125,7 +125,7 @@ "version": "1.0" }, "links": { - "self": "/mocktypes1?fields%5Bmocktypes1%5D=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cto-many%2Cto-many-from-many%2Cto-many-from-one%2Cto-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8\u0026page%5Bsize%5D=10\u0026page%5Bnumber%5D=1\u0026sort=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8%2Cid" + "self": "/mocktypes1?fields%5Bmocktypes1%5D=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cto-many%2Cto-many-from-many%2Cto-many-from-one%2Cto-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8\u0026sort=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8%2Cid" }, "meta": { "num": -32820, diff --git a/testdata/collection-2.json b/testdata/collection-2.json index 04e0d43..b2619a4 100644 --- a/testdata/collection-2.json +++ b/testdata/collection-2.json @@ -31,6 +31,6 @@ "version": "1.0" }, "links": { - "self": "https://example.org/mocktypes2?fields%5Bmocktypes2%5D=boolptr%2Ctimeptr%2Cuintptr\u0026page%5Bsize%5D=10\u0026page%5Bnumber%5D=1\u0026sort=boolptr%2Cint16ptr%2Cint32ptr%2Cint64ptr%2Cint8ptr%2Cintptr%2Cstrptr%2Ctimeptr%2Cuint16ptr%2Cuint32ptr%2Cuint64ptr%2Cuint8ptr%2Cuintptr%2Cid" + "self": "https://example.org/mocktypes2?fields%5Bmocktypes2%5D=boolptr%2Ctimeptr%2Cuintptr\u0026sort=boolptr%2Cint16ptr%2Cint32ptr%2Cint64ptr%2Cint8ptr%2Cintptr%2Cstrptr%2Ctimeptr%2Cuint16ptr%2Cuint32ptr%2Cuint64ptr%2Cuint8ptr%2Cuintptr%2Cid" } } diff --git a/testdata/collection-3.json b/testdata/collection-3.json index 066aad9..aeae0ae 100644 --- a/testdata/collection-3.json +++ b/testdata/collection-3.json @@ -4,6 +4,6 @@ "version": "1.0" }, "links": { - "self": "https://example.org/mocktypes1?fields%5Bmocktypes1%5D=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cto-many%2Cto-many-from-many%2Cto-many-from-one%2Cto-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8\u0026page%5Bsize%5D=10\u0026page%5Bnumber%5D=1\u0026sort=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8%2Cid" + "self": "https://example.org/mocktypes1?fields%5Bmocktypes1%5D=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cto-many%2Cto-many-from-many%2Cto-many-from-one%2Cto-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8\u0026sort=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8%2Cid" } } diff --git a/url.go b/url.go index 31c5a7c..1100588 100644 --- a/url.go +++ b/url.go @@ -166,15 +166,12 @@ func (u *URL) String() string { // Pagination if u.IsCol { - if u.Params.PageSize == 0 { - u.Params.PageSize = 10 + if u.Params.PageNumber != 0 { + urlParams = append(urlParams, "page%5Bnumber%5D="+strconv.Itoa(u.Params.PageNumber)) } - urlParams = append(urlParams, "page%5Bsize%5D="+strconv.FormatUint(uint64(u.Params.PageSize), 10)) - - if u.Params.PageNumber == 0 { - u.Params.PageNumber = 1 + if u.Params.PageSize != 0 { + urlParams = append(urlParams, "page%5Bsize%5D="+strconv.Itoa(u.Params.PageSize)) } - urlParams = append(urlParams, "page%5Bnumber%5D="+strconv.FormatUint(uint64(u.Params.PageNumber), 10)) } // Sorting From d7b3547ce1b3e5ba6be592d7b681778aa960e3f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 28 Jul 2019 12:12:36 -0400 Subject: [PATCH 152/406] Add URL.UnescapedString --- url.go | 8 ++++++++ url_test.go | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/url.go b/url.go index 1100588..fdb70cd 100644 --- a/url.go +++ b/url.go @@ -193,3 +193,11 @@ func (u *URL) String() string { return path + params } + +// UnescapedString returns the same thing as String, but special characters +// are not escaped. +func (u *URL) UnescapedString() string { + str, _ := url.PathUnescape(u.String()) + // TODO Can an error occur? + return str +} diff --git a/url_test.go b/url_test.go index a84b31e..2968b98 100644 --- a/url_test.go +++ b/url_test.go @@ -411,3 +411,28 @@ func TestParseParams(t *testing.T) { } } } + +func TestURLEscaping(t *testing.T) { + assert := assert.New(t) + + schema := newMockSchema() + + tests := []struct { + url string + expectedEscaped string + expectedUnescaped string + }{ + { + url: `/mocktypes1?fields[mocktypes1]=bool%2Cint8&page[number]=2&page[size]=10`, + expectedEscaped: `/mocktypes1?fields%5Bmocktypes1%5D=bool%2Cint8&page%5Bnumber%5D=2&page%5Bsize%5D=10&sort=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8%2Cid`, + expectedUnescaped: `/mocktypes1?fields[mocktypes1]=bool,int8&page[number]=2&page[size]=10&sort=bool,int,int16,int32,int64,int8,str,time,uint,uint16,uint32,uint64,uint8,id`, + }, + } + + for _, test := range tests { + url, err := NewURLFromRaw(schema, test.url) + assert.NoError(err) + assert.Equal(test.expectedEscaped, url.String()) + assert.Equal(test.expectedUnescaped, url.UnescapedString()) + } +} From 078e70d51a52a544724bc57544ee7c9420e1d353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 28 Jul 2019 12:57:06 -0400 Subject: [PATCH 153/406] Fix typo --- jsonapi.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsonapi.go b/jsonapi.go index bab206e..d81f8ea 100644 --- a/jsonapi.go +++ b/jsonapi.go @@ -23,7 +23,7 @@ func Marshal(doc *Document, url *URL) ([]byte, error) { // Collection data = marshalCollection(col, doc.PrePath, url.Params.Fields[col.GetType().Name], doc.RelData) } else if id, ok := doc.Data.(Identifier); ok { - // Identifer + // Identifier data, err = json.Marshal(id) } else if ids, ok := doc.Data.(Identifiers); ok { // Identifiers From 11f33f7e56d6446f257b90ff1aade8a6284c1edb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 28 Jul 2019 12:59:49 -0400 Subject: [PATCH 154/406] Remove error return param for *Wrapper.setAttr --- wrapper.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wrapper.go b/wrapper.go index c6ecdba..f10b63f 100644 --- a/wrapper.go +++ b/wrapper.go @@ -167,7 +167,7 @@ func (w *Wrapper) SetID(id string) { // Set sets the value associated to the attribute named after key. func (w *Wrapper) Set(key string, val interface{}) { - _ = w.setAttr(key, val) + w.setAttr(key, val) } // GetToOne returns the value associated with the relationship named @@ -333,7 +333,7 @@ func (w *Wrapper) getAttr(key string, t string) interface{} { panic(fmt.Sprintf("jsonapi: attribute %s does not exist", key)) } -func (w *Wrapper) setAttr(key string, v interface{}) error { +func (w *Wrapper) setAttr(key string, v interface{}) { for i := 0; i < w.val.NumField(); i++ { field := w.val.Field(i) sf := w.val.Type().Field(i) @@ -341,13 +341,13 @@ func (w *Wrapper) setAttr(key string, v interface{}) error { if key == sf.Tag.Get("json") { if v == nil { field.Set(reflect.New(field.Type()).Elem()) - return nil + return } val := reflect.ValueOf(v) if val.Type() == field.Type() { field.Set(val) - return nil + return } panic(fmt.Sprintf("jsonapi: value is of wrong type (expected %q, got %q)", From 11a788ceb3ceedb20f80822183dd696bfd6c4ca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 28 Jul 2019 13:03:38 -0400 Subject: [PATCH 155/406] Refactor prepath slash appending --- build_links.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_links.go b/build_links.go index fc7db42..59e4094 100644 --- a/build_links.go +++ b/build_links.go @@ -9,7 +9,7 @@ import "strings" // domain name. func buildSelfLink(res Resource, prepath string) string { if !strings.HasSuffix(prepath, "/") { - prepath = prepath + "/" + prepath += "/" } if res.GetID() != "" && res.GetType().Name != "" { From 97c3dec3a9c6e722857b37160aca0d65b37719e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 28 Jul 2019 13:40:02 -0400 Subject: [PATCH 156/406] Add .golangci.yml --- .golangci.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .golangci.yml diff --git a/.golangci.yml b/.golangci.yml new file mode 100644 index 0000000..01f99e6 --- /dev/null +++ b/.golangci.yml @@ -0,0 +1,23 @@ +linters: + enable: + - deadcode + - dupl + - errcheck + - golint + - gosec + - gosimple + - govet + - ineffassign + - interfacer + - misspell + - nakedret + - prealloc + - scopelint + - staticcheck + - structcheck + - stylecheck + - typecheck + - unconvert + - unparam + - unused + - varcheck From 1daaf55559f5194a60b7cead05974b7ed9c0cbbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 28 Jul 2019 14:45:56 -0400 Subject: [PATCH 157/406] Remove pagination validation in NewParams --- params.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/params.go b/params.go index fc5316f..3502c50 100644 --- a/params.go +++ b/params.go @@ -2,7 +2,6 @@ package jsonapi import ( "sort" - "strconv" "strings" ) @@ -242,13 +241,7 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { // Pagination params.PageSize = su.PageSize - if params.PageSize < 0 || params.PageSize > 100 { - return nil, NewErrInvalidPageSizeParameter(strconv.FormatInt(int64(params.PageSize), 10)) - } params.PageNumber = su.PageNumber - if params.PageNumber < 0 { - return nil, NewErrInvalidPageNumberParameter(strconv.FormatInt(int64(params.PageNumber), 10)) - } return params, nil } From f2211b0a22ad66dcf02c52b85c3d6b89beea153d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 3 Aug 2019 11:23:11 -0400 Subject: [PATCH 158/406] Fix typo --- helpers.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers.go b/helpers.go index ea5a5d0..54d95a1 100644 --- a/helpers.go +++ b/helpers.go @@ -9,7 +9,7 @@ import ( // CheckType checks the given value and returns any error found. // -// If nil is returned, than the value can be safely used with this library. +// If nil is returned, then the value can be safely used with this library. func CheckType(v interface{}) error { value := reflect.ValueOf(v) kind := value.Kind() From b6c84c0591b21984b65d778302bd5eca359ced29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 3 Aug 2019 11:25:05 -0400 Subject: [PATCH 159/406] Rename CheckType and ReflectType to Check and Reflect --- helpers.go | 12 ++++++------ mock_schema_test.go | 6 +++--- wrapper.go | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/helpers.go b/helpers.go index 54d95a1..d819cac 100644 --- a/helpers.go +++ b/helpers.go @@ -7,10 +7,10 @@ import ( "strings" ) -// CheckType checks the given value and returns any error found. +// Check checks the given value and returns any error found. // // If nil is returned, then the value can be safely used with this library. -func CheckType(v interface{}) error { +func Check(v interface{}) error { value := reflect.ValueOf(v) kind := value.Kind() @@ -71,11 +71,11 @@ func CheckType(v interface{}) error { return nil } -// ReflectType takes a struct or a pointer to a struct to analyse and -// builds a Type object that is returned. +// Reflect takes a struct or a pointer to a struct to analyse and builds a Type +// object that is returned. // // If an error is returned, the Type object will be empty. -func ReflectType(v interface{}) (Type, error) { +func Reflect(v interface{}) (Type, error) { typ := Type{} val := reflect.ValueOf(v) @@ -86,7 +86,7 @@ func ReflectType(v interface{}) (Type, error) { return typ, errors.New("jsonapi: value must represent a struct") } - err := CheckType(val.Interface()) + err := Check(val.Interface()) if err != nil { return typ, fmt.Errorf("jsonapi: invalid type: %s", err) } diff --git a/mock_schema_test.go b/mock_schema_test.go index 0537855..15940e6 100644 --- a/mock_schema_test.go +++ b/mock_schema_test.go @@ -10,11 +10,11 @@ import ( func newMockSchema() *Schema { schema := &Schema{} - typ, _ := ReflectType(mockType1{}) + typ, _ := Reflect(mockType1{}) _ = schema.AddType(typ) - typ, _ = ReflectType(mockType2{}) + typ, _ = Reflect(mockType2{}) _ = schema.AddType(typ) - typ, _ = ReflectType(mockType3{}) + typ, _ = Reflect(mockType3{}) _ = schema.AddType(typ) for t, typ := range schema.Types { diff --git a/wrapper.go b/wrapper.go index f10b63f..2079745 100644 --- a/wrapper.go +++ b/wrapper.go @@ -39,7 +39,7 @@ func Wrap(v interface{}) *Wrapper { val = val.Elem() - err := CheckType(val.Interface()) + err := Check(val.Interface()) if err != nil { panic(fmt.Sprintf("jsonapi: invalid type: %s", err)) } From d79900009330b61769b95bc1f9d8a30983025c70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 3 Aug 2019 11:33:31 -0400 Subject: [PATCH 160/406] Add MustReflect function --- helpers.go | 8 ++++++++ mock_schema_test.go | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/helpers.go b/helpers.go index d819cac..11f40bf 100644 --- a/helpers.go +++ b/helpers.go @@ -141,6 +141,14 @@ func Reflect(v interface{}) (Type, error) { return typ, nil } +func MustReflect(v interface{}) Type { + typ, err := Reflect(v) + if err != nil { + panic(err) + } + return typ +} + // IDAndType returns the ID and the type of the resource represented by v. // // Two empty strings are returned if v is not recognized as a resource. diff --git a/mock_schema_test.go b/mock_schema_test.go index 15940e6..0ca059d 100644 --- a/mock_schema_test.go +++ b/mock_schema_test.go @@ -10,11 +10,11 @@ import ( func newMockSchema() *Schema { schema := &Schema{} - typ, _ := Reflect(mockType1{}) + typ := MustReflect(mockType1{}) _ = schema.AddType(typ) - typ, _ = Reflect(mockType2{}) + typ = MustReflect(mockType2{}) _ = schema.AddType(typ) - typ, _ = Reflect(mockType3{}) + typ = MustReflect(mockType3{}) _ = schema.AddType(typ) for t, typ := range schema.Types { From 8e10be3562df9fb83eb6dcb363eb373f31e844cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 3 Aug 2019 11:35:06 -0400 Subject: [PATCH 161/406] Add basic test suite for helpers --- helpers_test.go | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 helpers_test.go diff --git a/helpers_test.go b/helpers_test.go new file mode 100644 index 0000000..0ad42b3 --- /dev/null +++ b/helpers_test.go @@ -0,0 +1,17 @@ +package jsonapi_test + +import ( + "testing" + + . "github.com/mfcochauxlaberge/jsonapi" + + "github.com/stretchr/testify/assert" +) + +func TestReflect(t *testing.T) { + assert := assert.New(t) + + assert.Panics(func() { + MustReflect("invalid") + }) +} From ecac43dec37ef70d03d34614dadadd6a415ea2a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 3 Aug 2019 11:43:30 -0400 Subject: [PATCH 162/406] Make page number and size uints --- params.go | 4 ++-- simple_url.go | 8 ++++---- url.go | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/params.go b/params.go index 3502c50..d5d4a28 100644 --- a/params.go +++ b/params.go @@ -21,8 +21,8 @@ type Params struct { SortingRules []string // Pagination - PageSize int - PageNumber int + PageSize uint + PageNumber uint // Include Include [][]Rel diff --git a/simple_url.go b/simple_url.go index d8de2c0..836f055 100644 --- a/simple_url.go +++ b/simple_url.go @@ -23,8 +23,8 @@ type SimpleURL struct { FilterLabel string Filter *Filter SortingRules []string - PageSize int - PageNumber int + PageSize uint + PageNumber uint Include []string } @@ -80,14 +80,14 @@ func NewSimpleURL(u *url.URL) (SimpleURL, error) { if err != nil { return sURL, NewErrInvalidPageSizeParameter(values.Get(name)) } - sURL.PageSize = int(size) + sURL.PageSize = uint(size) } else if name == "page[number]" { // Page number num, err := strconv.ParseUint(values.Get(name), 10, 64) if err != nil { return sURL, NewErrInvalidPageNumberParameter(values.Get(name)) } - sURL.PageNumber = int(num) + sURL.PageNumber = uint(num) } else if name == "include" { // Include for _, include := range values[name] { diff --git a/url.go b/url.go index fdb70cd..2779260 100644 --- a/url.go +++ b/url.go @@ -167,10 +167,10 @@ func (u *URL) String() string { // Pagination if u.IsCol { if u.Params.PageNumber != 0 { - urlParams = append(urlParams, "page%5Bnumber%5D="+strconv.Itoa(u.Params.PageNumber)) + urlParams = append(urlParams, "page%5Bnumber%5D="+strconv.Itoa(int(u.Params.PageNumber))) } if u.Params.PageSize != 0 { - urlParams = append(urlParams, "page%5Bsize%5D="+strconv.Itoa(u.Params.PageSize)) + urlParams = append(urlParams, "page%5Bsize%5D="+strconv.Itoa(int(u.Params.PageSize))) } } From 2f5e3a7f6a772396102f0d32c8fd70be768ec0a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 4 Aug 2019 10:34:42 -0400 Subject: [PATCH 163/406] Remove commented out method --- document.go | 69 ----------------------------------------------------- 1 file changed, 69 deletions(-) diff --git a/document.go b/document.go index b9299ae..52ae009 100644 --- a/document.go +++ b/document.go @@ -77,72 +77,3 @@ func (d *Document) Include(res Resource) { d.Included = append(d.Included, res) } - -// MarshalJSON ... -// func (d *Document) Marshal() ([]byte, error) { -// // Data -// var data json.RawMessage -// var errors json.RawMessage -// var err error -// if d.Errors != nil { -// errors, err = json.Marshal(d.Errors) -// } else if res, ok := d.Data.(Resource); ok { -// _, typ := res.IDAndType() -// data, err = marshalResource(res, d.URL.Host, d.URL.Params.Fields[typ], d.RelData) -// } else if col, ok := d.Data.(Collection); ok { -// data, err = marshalCollection(col, d.URL.Host, d.URL.Params.Fields[col.Type()], d.RelData) -// } else if id, ok := d.Data.(Identifier); ok { -// data, err = json.Marshal(id) -// } else if ids, ok := d.Data.(Identifiers); ok { -// data, err = json.Marshal(ids) -// } else { -// data = []byte("null") -// } -// -// if err != nil { -// return []byte{}, err -// } -// -// // Included -// inclusions := []*json.RawMessage{} -// if len(data) > 0 { -// for key := range d.Included { -// _, typ := d.Included[key].IDAndType() -// raw, err := marshalResource(d.Included[key], d.URL.Host, d.URL.Params.Fields[typ], d.RelData) -// if err != nil { -// return []byte{}, err -// } -// rawm := json.RawMessage(raw) -// inclusions = append(inclusions, &rawm) -// } -// } -// -// // Marshaling -// plMap := map[string]interface{}{} -// -// if len(data) > 0 { -// plMap["data"] = data -// } -// -// if len(d.Links) > 0 { -// plMap["links"] = d.Links -// } -// -// if len(errors) > 0 { -// plMap["errors"] = errors -// } -// -// if len(inclusions) > 0 { -// plMap["included"] = inclusions -// } -// -// if len(d.Meta) > 0 { -// plMap["meta"] = d.Meta -// } -// -// if len(d.JSONAPI) > 0 { -// plMap["jsonapi"] = d.JSONAPI -// } -// -// return json.Marshal(plMap) -// } From 5bf6301a964c11a74624528ba1cb82cb89576219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 4 Aug 2019 11:08:27 -0400 Subject: [PATCH 164/406] Fix formatting mistake --- wrapper_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wrapper_test.go b/wrapper_test.go index a12203f..536a22c 100644 --- a/wrapper_test.go +++ b/wrapper_test.go @@ -64,8 +64,8 @@ func TestWrapper(t *testing.T) { // Get attributes attr := wrap1.Attr("str") assert.Equal(Attr{ - Name: "str", - Type: AttrTypeString, + Name: "str", + Type: AttrTypeString, Nullable: false, }, attr, "get attribute (str)") assert.Equal(Attr{}, wrap1.Attr("nonexistent"), "get non-existent attribute") From 6a2041eaac65c1362c40f71d4908645079afdba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 4 Aug 2019 11:11:30 -0400 Subject: [PATCH 165/406] Reformat with gofmt -s --- filter_query_test.go | 4 ++-- soft_resource_test.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/filter_query_test.go b/filter_query_test.go index dae4496..535efa3 100644 --- a/filter_query_test.go +++ b/filter_query_test.go @@ -695,7 +695,7 @@ func TestFilterResource(t *testing.T) { typ := &Type{Name: "type"} ty, n := GetAttrType(fmt.Sprintf("%T", test.rval)) typ.Attrs = map[string]Attr{ - "attr": Attr{ + "attr": { Name: "attr", Type: ty, Nullable: n, @@ -761,7 +761,7 @@ func TestFilterResource(t *testing.T) { } // ty, n := GetAttrType(fmt.Sprintf("%T", test.rval)) typ.Rels = map[string]Rel{ - "rel": Rel{ + "rel": { Name: "rel", Type: "type", ToOne: toOne, diff --git a/soft_resource_test.go b/soft_resource_test.go index 853cb96..5fcf287 100644 --- a/soft_resource_test.go +++ b/soft_resource_test.go @@ -42,12 +42,12 @@ func TestSoftResource(t *testing.T) { // Attributes attrs := map[string]Attr{ - "attr1": Attr{ + "attr1": { Name: "attr1", Type: AttrTypeString, Nullable: false, }, - "attr2": Attr{ + "attr2": { Name: "attr2", Type: AttrTypeString, Nullable: true, @@ -62,7 +62,7 @@ func TestSoftResource(t *testing.T) { // Relationships rels := map[string]Rel{ - "rel1": Rel{ + "rel1": { Name: "rel1", Type: "type", ToOne: true, @@ -70,7 +70,7 @@ func TestSoftResource(t *testing.T) { InverseType: "type", InverseToOne: true, }, - "rel2": Rel{ + "rel2": { Name: "rel2", Type: "type", ToOne: false, From f8184fd1a31b0040eca07215e9086266c8ac50d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 4 Aug 2019 11:14:11 -0400 Subject: [PATCH 166/406] Add comment to MustReflect --- helpers.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/helpers.go b/helpers.go index 11f40bf..adb1827 100644 --- a/helpers.go +++ b/helpers.go @@ -141,6 +141,8 @@ func Reflect(v interface{}) (Type, error) { return typ, nil } +// MustReflect calls Reflect and returns the result, except that it panics if +// the error is not nil. func MustReflect(v interface{}) Type { typ, err := Reflect(v) if err != nil { From b06df4db6cf2c85ad1e6ed0147779d72af200096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 4 Aug 2019 11:16:11 -0400 Subject: [PATCH 167/406] Reformat two files with gofmt -s --- schema_test.go | 10 +++++----- type_test.go | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/schema_test.go b/schema_test.go index 652398c..23ba068 100644 --- a/schema_test.go +++ b/schema_test.go @@ -102,15 +102,15 @@ func TestSchemaCheck(t *testing.T) { Name: "type1", Attrs: map[string]Attr{}, Rels: map[string]Rel{ - "rel1": Rel{ + "rel1": { Name: "rel1", Type: "type2", }, - "rel2": Rel{ + "rel2": { Name: "rel2-invalid", Type: "nonexistent", }, - "rel3": Rel{ + "rel3": { Name: "rel3", Type: "type1", }, @@ -123,13 +123,13 @@ func TestSchemaCheck(t *testing.T) { Name: "type2", Attrs: map[string]Attr{}, Rels: map[string]Rel{ - "rel1": Rel{ + "rel1": { Name: "rel1", Type: "type1", InverseName: "rel1", InverseType: "type1", }, - "rel2": Rel{ + "rel2": { Name: "rel2", Type: "type1", InverseName: "rel3", diff --git a/type_test.go b/type_test.go index 5277c6c..20e7b26 100644 --- a/type_test.go +++ b/type_test.go @@ -267,14 +267,14 @@ func TestCopyType(t *testing.T) { typ1 := Type{ Name: "type1", Attrs: map[string]Attr{ - "attr1": Attr{ + "attr1": { Name: "attr1", Type: AttrTypeString, Nullable: true, }, }, Rels: map[string]Rel{ - "rel1": Rel{ + "rel1": { Name: "rel1", Type: "type2", ToOne: true, From aeb4106802a04a33ffaf32e342f5aaffb467585d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 4 Aug 2019 11:19:04 -0400 Subject: [PATCH 168/406] Add line length linter and fix related code --- .golangci.yml | 16 ++++++++++ collection.go | 4 +-- document.go | 4 +-- error.go | 8 ++--- error_test.go | 63 +++++++++++++++++++------------------- filter_query.go | 3 +- filter_query_test.go | 6 +++- helpers.go | 30 ++++++++++++++++--- jsonapi.go | 20 ++++++++++--- params.go | 8 ++--- request.go | 4 +-- resource.go | 8 ++--- schema.go | 62 ++++++++++++++++++++------------------ schema_test.go | 15 ++++++++-- simple_url.go | 4 +-- soft_collection.go | 8 ++--- soft_resource.go | 8 ++--- type.go | 18 +++++------ url.go | 33 +++++++++++--------- url_test.go | 70 +++++++++++++++++++++++++++++++++---------- wrapper.go | 6 ++-- wrapper_collection.go | 20 ++++++------- 22 files changed, 265 insertions(+), 153 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 01f99e6..934e3d5 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -9,6 +9,7 @@ linters: - govet - ineffassign - interfacer + - lll - misspell - nakedret - prealloc @@ -21,3 +22,18 @@ linters: - unparam - unused - varcheck + +linters-settings: + lll: + line-length: 100 + tab-width: 4 + +issues: + exclude-rules: + - path: doc.go + linters: + - lll + + - source: ^func + linters: + - lll diff --git a/collection.go b/collection.go index 042c061..5abbc3b 100644 --- a/collection.go +++ b/collection.go @@ -1,7 +1,7 @@ package jsonapi -// A Collection defines the interface of a structure that can manage a set -// of ordered resources of the same type. +// A Collection defines the interface of a structure that can manage a set of +// ordered resources of the same type. type Collection interface { // Type returns the name of the resources' type. GetType() Type diff --git a/document.go b/document.go index 52ae009..ad2516a 100644 --- a/document.go +++ b/document.go @@ -36,8 +36,8 @@ func NewDocument() *Document { } } -// Include adds res to the set of resources to be included under the -// included top-level field. +// Include adds res to the set of resources to be included under the included +// top-level field. // // It also makes sure that resources are not added twice. func (d *Document) Include(res Resource) { diff --git a/error.go b/error.go index 46f934a..66f60c4 100644 --- a/error.go +++ b/error.go @@ -38,8 +38,8 @@ func NewError() Error { // Error returns the string representation of the error. // -// If the error does note contain a valid error status code, it returns an -// empty string. +// If the error does note contain a valid error status code, it returns an empty +// string. func (e Error) Error() string { fullName := http.StatusText(e.Status) @@ -60,8 +60,8 @@ func (e Error) Error() string { return e.Title } -// MarshalJSON returns a JSON representation of the error according -// to the JSON:API specification. +// MarshalJSON returns a JSON representation of the error according to the +// JSON:API specification. func (e Error) MarshalJSON() ([]byte, error) { m := map[string]interface{}{} diff --git a/error_test.go b/error_test.go index 1ce814a..20c70f4 100644 --- a/error_test.go +++ b/error_test.go @@ -78,9 +78,9 @@ func TestErrorConstructors(t *testing.T) { assert := assert.New(t) tests := []struct { - name string - err Error - expectedString string + name string + err Error + expected string }{ { name: "NewError", @@ -88,186 +88,189 @@ func TestErrorConstructors(t *testing.T) { e := NewError() return e }(), - expectedString: "", + expected: "", }, { name: "NewErrBadRequest", err: func() Error { e := NewErrBadRequest("bad request", "error detail") return e }(), - expectedString: "400 Bad Request: error detail", + expected: "400 Bad Request: error detail", }, { name: "NewErrMalformedFilterParameter", err: func() Error { e := NewErrMalformedFilterParameter("filter") return e }(), - expectedString: "400 Bad Request: The filter parameter is not a string or a valid JSON object.", + expected: "400 Bad Request: " + + "The filter parameter is not a string or a valid JSON object.", }, { name: "NewErrInvalidPageNumberParameter", err: func() Error { e := NewErrInvalidPageNumberParameter("9") return e }(), - expectedString: "400 Bad Request: The page number parameter is not positive integer (including 0).", + expected: "400 Bad Request: " + + "The page number parameter is not positive integer (including 0).", }, { name: "NewErrInvalidPageSizeParameter", err: func() Error { e := NewErrInvalidPageSizeParameter("9") return e }(), - expectedString: "400 Bad Request: The page size parameter is not positive integer (including 0).", + expected: "400 Bad Request: " + + "The page size parameter is not positive integer (including 0).", }, { name: "NewErrUnknownFieldInBody", err: func() Error { e := NewErrUnknownFieldInBody("type", "field") return e }(), - expectedString: "400 Bad Request: field is not a known field.", + expected: "400 Bad Request: field is not a known field.", }, { name: "NewErrUnknownFieldInURL", err: func() Error { e := NewErrUnknownFieldInURL("field") return e }(), - expectedString: "400 Bad Request: field is not a known field.", + expected: "400 Bad Request: field is not a known field.", }, { name: "NewErrUnknownParameter", err: func() Error { e := NewErrUnknownParameter("param") return e }(), - expectedString: "400 Bad Request: param is not a known parameter.", + expected: "400 Bad Request: param is not a known parameter.", }, { name: "NewErrUnknownRelationshipInPath", err: func() Error { e := NewErrUnknownRelationshipInPath("type", "rel", "path") return e }(), - expectedString: "400 Bad Request: rel is not a relationship of type.", + expected: "400 Bad Request: rel is not a relationship of type.", }, { name: "NewErrUnknownTypeInURL", err: func() Error { e := NewErrUnknownTypeInURL("type") return e }(), - expectedString: "400 Bad Request: type is not a known type.", + expected: "400 Bad Request: type is not a known type.", }, { name: "NewErrUnknownFieldInFilterParameter", err: func() Error { e := NewErrUnknownFieldInFilterParameter("field") return e }(), - expectedString: "400 Bad Request: field is not a known field.", + expected: "400 Bad Request: field is not a known field.", }, { name: "NewErrUnknownOperatorInFilterParameter", err: func() Error { e := NewErrUnknownOperatorInFilterParameter("=>") return e }(), - expectedString: "400 Bad Request: => is not a known operator.", + expected: "400 Bad Request: => is not a known operator.", }, { name: "NewErrInvalidValueInFilterParameter", err: func() Error { e := NewErrInvalidValueInFilterParameter("value", "string") return e }(), - expectedString: "400 Bad Request: value is not a known value.", + expected: "400 Bad Request: value is not a known value.", }, { name: "NewErrUnknownCollationInFilterParameter", err: func() Error { e := NewErrUnknownCollationInFilterParameter("collation") return e }(), - expectedString: "400 Bad Request: collation is not a known collation.", + expected: "400 Bad Request: collation is not a known collation.", }, { name: "NewErrUnknownFilterParameterLabel", err: func() Error { e := NewErrUnknownFilterParameterLabel("label") return e }(), - expectedString: "400 Bad Request: label is not a known filter query label.", + expected: "400 Bad Request: label is not a known filter query label.", }, { name: "NewErrUnauthorized", err: func() Error { e := NewErrUnauthorized() return e }(), - expectedString: "401 Unauthorized: Authentification is required to perform this request.", + expected: "401 Unauthorized: Authentification is required to perform this request.", }, { name: "NewErrForbidden", err: func() Error { e := NewErrForbidden() return e }(), - expectedString: "403 Forbidden: Permission is required to perform this request.", + expected: "403 Forbidden: Permission is required to perform this request.", }, { name: "NewErrNotFound", err: func() Error { e := NewErrNotFound() return e }(), - expectedString: "404 Not Found: The URI does not exist.", + expected: "404 Not Found: The URI does not exist.", }, { name: "NewErrPayloadTooLarge", err: func() Error { e := NewErrPayloadTooLarge() return e }(), - expectedString: "413 Request Entity Too Large: That's what she said.", + expected: "413 Request Entity Too Large: That's what she said.", }, { name: "NewErrRequestURITooLong", err: func() Error { e := NewErrRequestURITooLong() return e }(), - expectedString: "414 Request URI Too Long: URI too long", + expected: "414 Request URI Too Long: URI too long", }, { name: "NewErrUnsupportedMediaType", err: func() Error { e := NewErrUnsupportedMediaType() return e }(), - expectedString: "415 Unsupported Media Type: Unsupported media type", + expected: "415 Unsupported Media Type: Unsupported media type", }, { name: "NewErrTooManyRequests", err: func() Error { e := NewErrTooManyRequests() return e }(), - expectedString: "429 Too Many Requests: Too many requests", + expected: "429 Too Many Requests: Too many requests", }, { name: "NewErrRequestHeaderFieldsTooLarge", err: func() Error { e := NewErrRequestHeaderFieldsTooLarge() return e }(), - expectedString: "431 Request Header Fields Too Large: Header fields too large", + expected: "431 Request Header Fields Too Large: Header fields too large", }, { name: "NewErrInternalServerError", err: func() Error { e := NewErrInternalServerError() return e }(), - expectedString: "500 Internal Server Error: Internal server error", + expected: "500 Internal Server Error: Internal server error", }, { name: "NewErrServiceUnavailable", err: func() Error { e := NewErrServiceUnavailable() return e }(), - expectedString: "503 Service Unavailable: Service unavailable", + expected: "503 Service Unavailable: Service unavailable", }, { name: "NewErrNotImplemented", err: func() Error { e := NewErrNotImplemented() return e }(), - expectedString: "501 Not Implemented: Not Implemented", + expected: "501 Not Implemented: Not Implemented", }, } for _, test := range tests { - assert.Equal(test.err.Error(), test.expectedString, test.name) + assert.Equal(test.expected, test.err.Error(), test.name) } } diff --git a/filter_query.go b/filter_query.go index cd21ffb..00bacc6 100644 --- a/filter_query.go +++ b/filter_query.go @@ -69,8 +69,7 @@ func (f *Filter) UnmarshalJSON(data []byte) error { return nil } -// IsAllowed reports whether res is valid under the rules defined in the -// filter. +// IsAllowed reports whether res is valid under the rules defined in the filter. func (f *Filter) IsAllowed(res Resource) bool { var ( val interface{} diff --git a/filter_query_test.go b/filter_query_test.go index 535efa3..b1f5957 100644 --- a/filter_query_test.go +++ b/filter_query_test.go @@ -926,7 +926,11 @@ func TestFilterMarshaling(t *testing.T) { data, err := json.Marshal(&cdt) assert.NoError(err, test.name) - assert.Equal(makeOneLineNoSpaces(test.query), makeOneLineNoSpaces(string(data)), test.name) + assert.Equal( + makeOneLineNoSpaces(test.query), + makeOneLineNoSpaces(string(data)), + test.name, + ) } } diff --git a/helpers.go b/helpers.go index adb1827..58cddb5 100644 --- a/helpers.go +++ b/helpers.go @@ -41,12 +41,26 @@ func Check(v interface{}) error { isValid := false switch sf.Type.String() { - case "string", "int", "int8", "int16", "int32", "int64", "uint", "uint8", "uint16", "uint32", "uint64", "bool", "time.Time", "*string", "*int", "*int8", "*int16", "*int32", "*int64", "*uint", "*uint8", "*uint16", "*uint32", "*uint64", "*bool", "*time.Time": + case + "string", + "int", "int8", "int16", "int32", "int64", + "uint", "uint8", "uint16", "uint32", "uint64", + "bool", + "time.Time", + "*string", + "*int", "*int8", "*int16", "*int32", "*int64", + "*uint", "*uint8", "*uint16", "*uint32", "*uint64", + "*bool", + "*time.Time": isValid = true } if !isValid { - return fmt.Errorf("jsonapi: attribute %s of type %s is of unsupported type", sf.Name, resType) + return fmt.Errorf( + "jsonapi: attribute %s of type %s is of unsupported type", + sf.Name, + resType, + ) } } } @@ -59,11 +73,19 @@ func Check(v interface{}) error { s := strings.Split(sf.Tag.Get("api"), ",") if len(s) < 2 || len(s) > 3 { - return fmt.Errorf("jsonapi: api tag of relationship %s of struct %s is invalid", sf.Name, value.Type().Name()) + return fmt.Errorf( + "jsonapi: api tag of relationship %s of struct %s is invalid", + sf.Name, + value.Type().Name(), + ) } if sf.Type.String() != "string" && sf.Type.String() != "[]string" { - return fmt.Errorf("jsonapi: relationship %s of type %s is not string or []string", sf.Name, resType) + return fmt.Errorf( + "jsonapi: relationship %s of type %s is not string or []string", + sf.Name, + resType, + ) } } } diff --git a/jsonapi.go b/jsonapi.go index d81f8ea..30895ed 100644 --- a/jsonapi.go +++ b/jsonapi.go @@ -18,10 +18,18 @@ func Marshal(doc *Document, url *URL) ([]byte, error) { if res, ok := doc.Data.(Resource); ok { // Resource - data = marshalResource(res, doc.PrePath, url.Params.Fields[res.GetType().Name], doc.RelData) + data = marshalResource( + res, doc.PrePath, + url.Params.Fields[res.GetType().Name], + doc.RelData, + ) } else if col, ok := doc.Data.(Collection); ok { // Collection - data = marshalCollection(col, doc.PrePath, url.Params.Fields[col.GetType().Name], doc.RelData) + data = marshalCollection( + col, doc.PrePath, + url.Params.Fields[col.GetType().Name], + doc.RelData, + ) } else if id, ok := doc.Data.(Identifier); ok { // Identifier data, err = json.Marshal(id) @@ -47,7 +55,12 @@ func Marshal(doc *Document, url *URL) ([]byte, error) { if len(data) > 0 { for key := range doc.Included { typ := doc.Included[key].GetType().Name - raw := marshalResource(doc.Included[key], doc.PrePath, url.Params.Fields[typ], doc.RelData) + raw := marshalResource( + doc.Included[key], + doc.PrePath, + url.Params.Fields[typ], + doc.RelData, + ) rawm := json.RawMessage(raw) inclusions = append(inclusions, &rawm) } @@ -153,7 +166,6 @@ func Unmarshal(payload []byte, url *URL, schema *Schema) (*Document, error) { func marshalResource(r Resource, prepath string, fields []string, relData map[string][]string) []byte { mapPl := map[string]interface{}{} - // ID and type mapPl["id"] = r.GetID() mapPl["type"] = r.GetType().Name diff --git a/params.go b/params.go index d5d4a28..0cc9188 100644 --- a/params.go +++ b/params.go @@ -28,11 +28,11 @@ type Params struct { Include [][]Rel } -// NewParams creates and returns a Params object built from a SimpleURL -// and a given resource type. A schema is used for validation. +// NewParams creates and returns a Params object built from a SimpleURL and a +// given resource type. A schema is used for validation. // -// If validation is not expected, it is recommended to simply build a -// SimpleURL object with NewSimpleURL. +// If validation is not expected, it is recommended to simply build a SimpleURL +// object with NewSimpleURL. func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { params := &Params{ Fields: map[string][]string{}, diff --git a/request.go b/request.go index 7ddd290..991a164 100644 --- a/request.go +++ b/request.go @@ -7,8 +7,8 @@ import ( // NewRequest builds a return a *Request based on r and schema. // -// schema can be nil, in which case no checks will be done to insure that -// the request respects a specific schema. +// schema can be nil, in which case no checks will be done to insure that the +// request respects a specific schema. func NewRequest(r *http.Request, schema *Schema) (*Request, error) { body, err := ioutil.ReadAll(r.Body) if err != nil { diff --git a/resource.go b/resource.go index c224873..a907ada 100644 --- a/resource.go +++ b/resource.go @@ -37,9 +37,8 @@ type Resource interface { // Equal reports whether r1 and r2 are equal. // -// Two resources are equal if their types are equal, all the attributes -// are equal (same type and same value), and all the relationstips are -// equal. +// Two resources are equal if their types are equal, all the attributes are +// equal (same type and same value), and all the relationstips are equal. // // IDs are ignored. func Equal(r1, r2 Resource) bool { @@ -76,7 +75,8 @@ func Equal(r1, r2 Resource) bool { // TODO Fix the following condition one day, there should be a better // way to do this. Basically, all nils (nil pointer, nil slice, etc) // should be considered equal to a nil empty interface. - if fmt.Sprintf("%v", r1.Get(attr1.Name)) == "" && fmt.Sprintf("%v", r2.Get(attr1.Name)) == "" { + if fmt.Sprintf("%v", r1.Get(attr1.Name)) == "" && + fmt.Sprintf("%v", r2.Get(attr1.Name)) == "" { continue } return false diff --git a/schema.go b/schema.go index 293c6ae..38e836a 100644 --- a/schema.go +++ b/schema.go @@ -5,8 +5,8 @@ import ( "fmt" ) -// A Schema contains a list of types. It makes sure that each type is -// valid and unique. +// A Schema contains a list of types. It makes sure that each type is valid and +// unique. // // Check can be used to validate the relationships between the types. type Schema struct { @@ -95,8 +95,8 @@ func (s *Schema) HasType(name string) bool { // GetType returns the type associated with the speficied name. // // If no type with the given name is found, an zero instance of Type is -// returned. Therefore, checking whether the Name field is empty or not -// is a good way to dertermine whether the type was found or not. +// returned. Therefore, checking whether the Name field is empty or not is a +// good way to dertermine whether the type was found or not. func (s *Schema) GetType(name string) Type { for _, typ := range s.Types { if typ.Name == name { @@ -106,8 +106,8 @@ func (s *Schema) GetType(name string) Type { return Type{} } -// Check checks the integrity of all the relationships between the types -// and returns all the errors that were found. +// Check checks the integrity of all the relationships between the types and +// returns all the errors that were found. func (s *Schema) Check() []error { var ( errs = []error{} @@ -128,33 +128,37 @@ func (s *Schema) Check() []error { )) } - // Inverse relationship (if relevant) - if rel.InverseName != "" { - // Is the inverse relationship type the same as its - // type name? - if rel.InverseType != typ.Name { + // Skip to next relationship here if there's no inverse + if rel.InverseName == "" { + continue + } + + // Is the inverse relationship type the same as its + // type name? + if rel.InverseType != typ.Name { + errs = append(errs, fmt.Errorf( + "jsonapi: "+ + "the inverse type of relationship %s should its type's name (%s, not %s)", + rel.Name, + typ.Name, + rel.InverseType, + )) + } else { + // Do both relationships (current and inverse) point + // to each other? + var found bool + for _, invRel := range targetType.Rels { + if rel.Name == invRel.InverseName && rel.InverseName == invRel.Name { + found = true + } + } + if !found { errs = append(errs, fmt.Errorf( - "jsonapi: the inverse type of relationship %s should its type's name (%s, not %s)", + "jsonapi: "+ + "relationship %s of type %s and its inverse do not point each other", rel.Name, typ.Name, - rel.InverseType, )) - } else { - // Do both relationships (current and inverse) point - // to each other? - var found bool - for _, invRel := range targetType.Rels { - if rel.Name == invRel.InverseName && rel.InverseName == invRel.Name { - found = true - } - } - if !found { - errs = append(errs, fmt.Errorf( - "jsonapi: relationship %s of type %s and its inverse do not point each other", - rel.Name, - typ.Name, - )) - } } } } diff --git a/schema_test.go b/schema_test.go index 23ba068..277764a 100644 --- a/schema_test.go +++ b/schema_test.go @@ -150,7 +150,16 @@ func TestSchemaCheck(t *testing.T) { errsStr = append(errsStr, err.Error()) } assert.Len(errs, 3) - assert.Contains(errsStr, "jsonapi: the target type of relationship rel2-invalid of type type1 does not exist") - assert.Contains(errsStr, "jsonapi: the inverse type of relationship rel1 should its type's name (type2, not type1)") - assert.Contains(errsStr, "jsonapi: relationship rel2 of type type2 and its inverse do not point each other") + assert.Contains( + errsStr, + "jsonapi: the target type of relationship rel2-invalid of type type1 does not exist", + ) + assert.Contains( + errsStr, + "jsonapi: the inverse type of relationship rel1 should its type's name (type2, not type1)", + ) + assert.Contains( + errsStr, + "jsonapi: relationship rel2 of type type2 and its inverse do not point each other", + ) } diff --git a/simple_url.go b/simple_url.go index 836f055..8ad30ca 100644 --- a/simple_url.go +++ b/simple_url.go @@ -102,8 +102,8 @@ func NewSimpleURL(u *url.URL) (SimpleURL, error) { return sURL, nil } -// Path returns the path only of the SimpleURL. It does not include any -// query parameters. +// Path returns the path only of the SimpleURL. It does not include any query +// parameters. func (s *SimpleURL) Path() string { return strings.Join(s.Fragments, "/") } diff --git a/soft_collection.go b/soft_collection.go index 5445a96..ea292ef 100644 --- a/soft_collection.go +++ b/soft_collection.go @@ -9,8 +9,8 @@ import ( var _ Collection = (*SoftCollection)(nil) -// SoftCollection is a collection of SoftResources where the type can -// be changed for all elements at once by modifying the Type field. +// SoftCollection is a collection of SoftResources where the type can be changed +// for all elements at once by modifying the Type field. type SoftCollection struct { Type *Type @@ -161,8 +161,8 @@ func (s *SoftCollection) Remove(id string) { // UnmarshalJSON populates a SoftCollection from the given payload. // -// Only the attributes and relationships defined in the SoftCollection's -// Type field will be considered. +// Only the attributes and relationships defined in the SoftCollection's Type +// field will be considered. func (s *SoftCollection) UnmarshalJSON(payload []byte) error { // TODO Implement this method return errors.New("jsonapi: SoftCollection.UnmarshalJSON not yet implemented") diff --git a/soft_resource.go b/soft_resource.go index 0aef9f9..9465afe 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -8,8 +8,8 @@ import ( var _ Resource = (*SoftResource)(nil) -// SoftResource represents a resource whose type is defined by an internal -// field of type *Type. +// SoftResource represents a resource whose type is defined by an internal field +// of type *Type. // // Changing the type automatically changes the resource's attributes and // relationships. When a field is added, its value is the zero value of the @@ -74,8 +74,8 @@ func (sr *SoftResource) Rel(key string) Rel { return sr.Type.Rels[key] } -// New returns a new resource (of type SoftResource) with the same type -// but without the values. +// New returns a new resource (of type SoftResource) with the same type but +// without the values. func (sr *SoftResource) New() Resource { sr.check() return &SoftResource{ diff --git a/type.go b/type.go index 99b5394..1f6bada 100644 --- a/type.go +++ b/type.go @@ -25,8 +25,8 @@ const ( AttrTypeTime ) -// A Type stores all the necessary information about a type as represented -// in the JSON:API specification. +// A Type stores all the necessary information about a type as represented in +// the JSON:API specification. type Type struct { Name string Attrs map[string]Attr @@ -145,8 +145,8 @@ func (r *Rel) Inverse() Rel { } } -// GetAttrType returns the attribute type as an int (see constants) and -// a boolean that indicates whether the attribute can be null or not. +// GetAttrType returns the attribute type as an int (see constants) and a +// boolean that indicates whether the attribute can be null or not. func GetAttrType(t string) (int, bool) { nullable := strings.HasPrefix(t, "*") if nullable { @@ -184,9 +184,9 @@ func GetAttrType(t string) (int, bool) { } } -// GetAttrTypeString return the name of the attribute type specified -// by an int (see constants) and a boolean that indicates whether the -// value can be null or not. +// GetAttrTypeString return the name of the attribute type specified by an int +// (see constants) and a boolean that indicates whether the value can be null or +// not. func GetAttrTypeString(t int, nullable bool) string { str := "" switch t { @@ -225,8 +225,8 @@ func GetAttrTypeString(t int, nullable bool) string { return str } -// GetZeroValue returns the zero value of the attribute type represented -// by the specified int (see constants). +// GetZeroValue returns the zero value of the attribute type represented by the +// specified int (see constants). // // If null is true, the returned value is a nil pointer. func GetZeroValue(t int, null bool) interface{} { diff --git a/url.go b/url.go index 2779260..3b9df90 100644 --- a/url.go +++ b/url.go @@ -8,11 +8,10 @@ import ( "strconv" ) -// A URL stores all the information from a URL formatted for a JSON:API -// request. +// A URL stores all the information from a URL formatted for a JSON:API request. // -// The data structure allows to have more information than what the URL -// itself stores. +// The data structure allows to have more information than what the URL itself +// stores. type URL struct { // URL Fragments []string // [users, u1, articles] @@ -95,8 +94,8 @@ func NewURL(schema *Schema, su SimpleURL) (*URL, error) { return url, nil } -// NewURLFromRaw parses rawurl to make a *url.URL before making and returning -// a *URL. +// NewURLFromRaw parses rawurl to make a *url.URL before making and returning a +// *URL. func NewURLFromRaw(schema *Schema, rawurl string) (*URL, error) { url, err := url.Parse(rawurl) if err != nil { @@ -111,11 +110,11 @@ func NewURLFromRaw(schema *Schema, rawurl string) (*URL, error) { return NewURL(schema, su) } -// A BelongsToFilter represents a parent resource, used to filter out -// resources that are not children of the parent. +// A BelongsToFilter represents a parent resource, used to filter out resources +// that are not children of the parent. // -// For example, in /articles/abc123/comments, the parent is the article -// with the ID abc123. +// For example, in /articles/abc123/comments, the parent is the article with the +// ID abc123. type BelongsToFilter struct { Type string ID string @@ -126,8 +125,8 @@ type BelongsToFilter struct { // String returns a string representation of the URL where special characters // are escaped. // -// The URL is normalized, so it always returns exactly the same string given -// the same URL. +// The URL is normalized, so it always returns exactly the same string given the +// same URL. func (u *URL) String() string { // Path path := "/" @@ -167,10 +166,16 @@ func (u *URL) String() string { // Pagination if u.IsCol { if u.Params.PageNumber != 0 { - urlParams = append(urlParams, "page%5Bnumber%5D="+strconv.Itoa(int(u.Params.PageNumber))) + urlParams = append( + urlParams, + "page%5Bnumber%5D="+strconv.Itoa(int(u.Params.PageNumber)), + ) } if u.Params.PageSize != 0 { - urlParams = append(urlParams, "page%5Bsize%5D="+strconv.Itoa(int(u.Params.PageSize))) + urlParams = append( + urlParams, + "page%5Bsize%5D="+strconv.Itoa(int(u.Params.PageSize)), + ) } } diff --git a/url_test.go b/url_test.go index 2968b98..191afe9 100644 --- a/url_test.go +++ b/url_test.go @@ -100,8 +100,10 @@ func TestParseURL(t *testing.T) { name: "111111", url: `https://example.com/mocktypes1/mc1-1/relationships/to-many-from-one`, expectedURL: URL{ - Fragments: []string{"mocktypes1", "mc1-1", "relationships", "to-many-from-one"}, - Route: "/mocktypes1/:id/relationships/to-many-from-one", + Fragments: []string{ + "mocktypes1", "mc1-1", "relationships", "to-many-from-one", + }, + Route: "/mocktypes1/:id/relationships/to-many-from-one", BelongsToFilter: BelongsToFilter{ Type: "mocktypes1", ID: "mc1-1", @@ -126,8 +128,10 @@ func TestParseURL(t *testing.T) { name: "full url for self relationship", url: `/mocktypes1/mc1-1/relationships/to-many-from-one`, expectedURL: URL{ - Fragments: []string{"mocktypes1", "mc1-1", "relationships", "to-many-from-one"}, - Route: "/mocktypes1/:id/relationships/to-many-from-one", + Fragments: []string{ + "mocktypes1", "mc1-1", "relationships", "to-many-from-one", + }, + Route: "/mocktypes1/:id/relationships/to-many-from-one", BelongsToFilter: BelongsToFilter{ Type: "mocktypes1", ID: "mc1-1", @@ -150,10 +154,15 @@ func TestParseURL(t *testing.T) { expectedError: false, }, { name: "full url for self relationship with params", - url: `/mocktypes1/mc1-1/relationships/to-many-from-one?fields[mocktypes2]=boolptr%2Cint8ptr`, + url: ` + /mocktypes1/mc1-1/relationships/to-many-from-one + ?fields[mocktypes2]=boolptr%2Cint8ptr + `, expectedURL: URL{ - Fragments: []string{"mocktypes1", "mc1-1", "relationships", "to-many-from-one"}, - Route: "/mocktypes1/:id/relationships/to-many-from-one", + Fragments: []string{ + "mocktypes1", "mc1-1", "relationships", "to-many-from-one", + }, + Route: "/mocktypes1/:id/relationships/to-many-from-one", BelongsToFilter: BelongsToFilter{ Type: "mocktypes1", ID: "mc1-1", @@ -396,10 +405,16 @@ func TestParseParams(t *testing.T) { for _, field := range fields { if typ := schema.GetType(resType); typ.Name != "" { if _, ok := typ.Attrs[field]; ok { - test.expectedParams.Attrs[resType] = append(test.expectedParams.Attrs[resType], typ.Attrs[field]) + test.expectedParams.Attrs[resType] = append( + test.expectedParams.Attrs[resType], + typ.Attrs[field], + ) } else if typ := schema.GetType(resType); typ.Name != "" { if _, ok := typ.Rels[field]; ok { - test.expectedParams.Rels[resType] = append(test.expectedParams.Rels[resType], typ.Rels[field]) + test.expectedParams.Rels[resType] = append( + test.expectedParams.Rels[resType], + typ.Rels[field], + ) } } } @@ -423,16 +438,41 @@ func TestURLEscaping(t *testing.T) { expectedUnescaped string }{ { - url: `/mocktypes1?fields[mocktypes1]=bool%2Cint8&page[number]=2&page[size]=10`, - expectedEscaped: `/mocktypes1?fields%5Bmocktypes1%5D=bool%2Cint8&page%5Bnumber%5D=2&page%5Bsize%5D=10&sort=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8%2Cid`, - expectedUnescaped: `/mocktypes1?fields[mocktypes1]=bool,int8&page[number]=2&page[size]=10&sort=bool,int,int16,int32,int64,int8,str,time,uint,uint16,uint32,uint64,uint8,id`, + url: ` + /mocktypes1 + ?fields[mocktypes1]=bool%2Cint8 + &page[number]=2 + &page[size]=10 + `, + expectedEscaped: ` + /mocktypes1 + ?fields%5Bmocktypes1%5D=bool%2Cint8 + &page%5Bnumber%5D=2 + &page%5Bsize%5D=10 + &sort=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2C + uint%2Cuint16%2Cuint32%2Cuint64%2Cuint8%2Cid + `, + expectedUnescaped: ` + /mocktypes1 + ?fields[mocktypes1]=bool,int8 + &page[number]=2 + &page[size]=10 + &sort=bool,int,int16,int32,int64,int8,str,time,uint,uint16, + uint32,uint64,uint8,id + `, }, } for _, test := range tests { - url, err := NewURLFromRaw(schema, test.url) + url, err := NewURLFromRaw(schema, makeOneLineNoSpaces(test.url)) assert.NoError(err) - assert.Equal(test.expectedEscaped, url.String()) - assert.Equal(test.expectedUnescaped, url.UnescapedString()) + assert.Equal( + makeOneLineNoSpaces(test.expectedEscaped), + url.String(), + ) + assert.Equal( + makeOneLineNoSpaces(test.expectedUnescaped), + url.UnescapedString(), + ) } } diff --git a/wrapper.go b/wrapper.go index 2079745..f681ea6 100644 --- a/wrapper.go +++ b/wrapper.go @@ -170,8 +170,7 @@ func (w *Wrapper) Set(key string, val interface{}) { w.setAttr(key, val) } -// GetToOne returns the value associated with the relationship named -// after key. +// GetToOne returns the value associated with the relationship named after key. func (w *Wrapper) GetToOne(key string) string { for i := 0; i < w.val.NumField(); i++ { field := w.val.Field(i) @@ -197,8 +196,7 @@ func (w *Wrapper) GetToOne(key string) string { panic(fmt.Sprintf("jsonapi: relationship %s does not exist", key)) } -// GetToMany returns the value associated with the relationship named -// after key. +// GetToMany returns the value associated with the relationship named after key. func (w *Wrapper) GetToMany(key string) []string { for i := 0; i < w.val.NumField(); i++ { field := w.val.Field(i) diff --git a/wrapper_collection.go b/wrapper_collection.go index fce1269..3668978 100644 --- a/wrapper_collection.go +++ b/wrapper_collection.go @@ -4,8 +4,8 @@ import "encoding/json" var _ Collection = (*WrapperCollection)(nil) -// WrapCollection returns a *WrapperCollection which implements the -// Collection interface and holds resources of the type defined in r. +// WrapCollection returns a *WrapperCollection which implements the Collection +// interface and holds resources of the type defined in r. func WrapCollection(r Resource) *WrapperCollection { // if r2, ok := v.(Resource); ok { // r = r2 @@ -20,11 +20,11 @@ func WrapCollection(r Resource) *WrapperCollection { } } -// WrapperCollection is a Collection of resources of a certain type -// defined using the WrapCollection constructor. +// WrapperCollection is a Collection of resources of a certain type defined +// using the WrapCollection constructor. // -// Only resources of that type can be added to the collection and the -// type may not be modified. +// Only resources of that type can be added to the collection and the type may +// not be modified. type WrapperCollection struct { typ Type col []*Wrapper @@ -43,8 +43,8 @@ func (wc *WrapperCollection) Len() int { // At returns the resource at the given index. // -// It returns nil if the index is greater than the number of resources -// in the collection. +// It returns nil if the index is greater than the number of resources in the +// collection. func (wc *WrapperCollection) At(i int) Resource { if len(wc.col) > i { return wc.col[i] @@ -60,8 +60,8 @@ func (wc *WrapperCollection) Add(r Resource) { } } -// UnmarshalJSON populates the receiver with the resources represented in -// the payload. +// UnmarshalJSON populates the receiver with the resources represented in the +// payload. func (wc *WrapperCollection) UnmarshalJSON(payload []byte) error { var raws []json.RawMessage From 0c7c8c19d6ffd427a800db31bc3611e2ee558ccb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 4 Aug 2019 12:31:05 -0400 Subject: [PATCH 169/406] Clean up URL/Params and add tests --- params.go | 114 ++++++++++++++++------------------ url.go | 78 ++++++++++++----------- url_test.go | 173 ++++++++++++++++++++++++++++++++++++---------------- 3 files changed, 213 insertions(+), 152 deletions(-) diff --git a/params.go b/params.go index 0cc9188..db59666 100644 --- a/params.go +++ b/params.go @@ -5,29 +5,6 @@ import ( "strings" ) -// A Params object represents all the query parameters from the URL. -type Params struct { - // Fields - Fields map[string][]string - Attrs map[string][]Attr - Rels map[string][]Rel - RelData map[string][]string - - // Filter - FilterLabel string - Filter *Filter - - // Sorting - SortingRules []string - - // Pagination - PageSize uint - PageNumber uint - - // Include - Include [][]Rel -} - // NewParams creates and returns a Params object built from a SimpleURL and a // given resource type. A schema is used for validation. // @@ -45,22 +22,22 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { } // Include - inclusions := make([]string, len(su.Include)) - copy(inclusions, su.Include) - sort.Strings(inclusions) + incs := make([]string, len(su.Include)) + copy(incs, su.Include) + sort.Strings(incs) // Remove duplicates and uncessary includes - for i := len(inclusions) - 1; i >= 0; i-- { + for i := len(incs) - 1; i >= 0; i-- { if i > 0 { - if strings.HasPrefix(inclusions[i], inclusions[i-1]) { - inclusions = append(inclusions[:i-1], inclusions[i:]...) + if strings.HasPrefix(incs[i], incs[i-1]) { + incs = append(incs[:i-1], incs[i:]...) } } } // Check inclusions - for i := 0; i < len(inclusions); i++ { - words := strings.Split(inclusions[i], ".") + for i := 0; i < len(incs); i++ { + words := strings.Split(incs[i], ".") incRel := Rel{Type: resType} for _, word := range words { @@ -69,7 +46,7 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { if incRel, ok = typ.Rels[word]; ok { params.Fields[incRel.Type] = []string{} } else { - inclusions = append(inclusions[:i], inclusions[i+1:]...) + incs = append(incs[:i], incs[i+1:]...) break } } @@ -77,9 +54,9 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { } // Build params.Include - params.Include = make([][]Rel, len(inclusions)) - for i := range inclusions { - words := strings.Split(inclusions[i], ".") + params.Include = make([][]Rel, len(incs)) + for i := range incs { + words := strings.Split(incs[i], ".") params.Include[i] = make([]Rel, len(words)) @@ -131,15 +108,9 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { // Attrs and Rels for typeName, fields := range params.Fields { - var ( - typ Type - attr Attr - rel Rel - ok bool - ) - if typ = schema.GetType(typeName); typ.Name == "" { - return nil, NewErrUnknownTypeInURL(typeName) - } + // This should always return a type since + // it is checked earlier. + typ := schema.GetType(typeName) params.Attrs[typeName] = []Attr{} params.Rels[typeName] = []Rel{} @@ -147,20 +118,19 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { for _, field := range typ.Fields() { for _, field2 := range fields { if field == field2 { - // Append to list of fields - // params.Fields[typeName] = append(params.Fields[typeName], field) - if typ = schema.GetType(typeName); typ.Name != "" { - if attr, ok = typ.Attrs[field]; ok { + if attr, ok := typ.Attrs[field]; ok { // Append to list of attributes - params.Attrs[typeName] = append(params.Attrs[typeName], attr) - } - } - - if typ = schema.GetType(typeName); typ.Name != "" { - if rel, ok = typ.Rels[field]; ok { + params.Attrs[typeName] = append( + params.Attrs[typeName], + attr, + ) + } else if rel, ok := typ.Rels[field]; ok { // Append to list of relationships - params.Rels[typeName] = append(params.Rels[typeName], rel) + params.Rels[typeName] = append( + params.Rels[typeName], + rel, + ) } } } @@ -171,7 +141,7 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { // Filter params.FilterLabel = su.FilterLabel params.Filter = su.Filter - // TODO + // TODO Check whether the filter is valid // Sorting // TODO All of the following is just to figure out @@ -183,13 +153,8 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { } else if len(su.Fragments) >= 3 { relName := su.Fragments[len(su.Fragments)-1] typ := schema.GetType(su.Fragments[0]) - var ( - rel Rel - ok bool - ) - if rel, ok = typ.Rels[relName]; !ok { - return nil, NewErrUnknownRelationshipInPath(typ.Name, relName, su.Path()) - } + // Checked earlier, assuming should be safe + rel := typ.Rels[relName] isCol = !rel.ToOne } if isCol { @@ -245,3 +210,26 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { return params, nil } + +// A Params object represents all the query parameters from the URL. +type Params struct { + // Fields + Fields map[string][]string + Attrs map[string][]Attr + Rels map[string][]Rel + RelData map[string][]string + + // Filter + FilterLabel string + Filter *Filter + + // Sorting + SortingRules []string + + // Pagination + PageSize uint + PageNumber uint + + // Include + Include [][]Rel +} diff --git a/url.go b/url.go index 3b9df90..6b84289 100644 --- a/url.go +++ b/url.go @@ -8,27 +8,6 @@ import ( "strconv" ) -// A URL stores all the information from a URL formatted for a JSON:API request. -// -// The data structure allows to have more information than what the URL itself -// stores. -type URL struct { - // URL - Fragments []string // [users, u1, articles] - Route string // /users/:id/articles - - // Data - IsCol bool - ResType string - ResID string - RelKind string - Rel Rel - BelongsToFilter BelongsToFilter - - // Params - Params *Params -} - // NewURL builds a URL from a SimpleURL and a schema for validating and // supplementing the object with extra information. func NewURL(schema *Schema, su SimpleURL) (*URL, error) { @@ -41,8 +20,10 @@ func NewURL(schema *Schema, su SimpleURL) (*URL, error) { url.Fragments = su.Fragments // IsCol, ResType, ResID, RelKind, Rel, BelongsToFilter - var typ Type - var ok bool + var ( + typ Type + ok bool + ) if len(url.Fragments) == 0 { return nil, NewErrBadRequest("Empty path", "There is no path.") } @@ -65,7 +46,11 @@ func NewURL(schema *Schema, su SimpleURL) (*URL, error) { if len(url.Fragments) >= 3 { relName := url.Fragments[len(url.Fragments)-1] if url.Rel, ok = typ.Rels[relName]; !ok { - return nil, NewErrUnknownRelationshipInPath(typ.Name, relName, su.Path()) + return nil, NewErrUnknownRelationshipInPath( + typ.Name, + relName, + su.Path(), + ) } url.IsCol = !url.Rel.ToOne @@ -110,16 +95,25 @@ func NewURLFromRaw(schema *Schema, rawurl string) (*URL, error) { return NewURL(schema, su) } -// A BelongsToFilter represents a parent resource, used to filter out resources -// that are not children of the parent. +// A URL stores all the information from a URL formatted for a JSON:API request. // -// For example, in /articles/abc123/comments, the parent is the article with the -// ID abc123. -type BelongsToFilter struct { - Type string - ID string - Name string - InverseName string +// The data structure allows to have more information than what the URL itself +// stores. +type URL struct { + // URL + Fragments []string // [users, u1, articles] + Route string // /users/:id/articles + + // Data + IsCol bool + ResType string + ResID string + RelKind string + Rel Rel + BelongsToFilter BelongsToFilter + + // Params + Params *Params } // String returns a string representation of the URL where special characters @@ -161,6 +155,8 @@ func (u *URL) String() string { } param := "filter=" + string(mf) urlParams = append(urlParams, param) + } else if u.Params.FilterLabel != "" { + urlParams = append(urlParams, "filter="+u.Params.FilterLabel) } // Pagination @@ -199,10 +195,22 @@ func (u *URL) String() string { return path + params } -// UnescapedString returns the same thing as String, but special characters -// are not escaped. +// UnescapedString returns the same thing as String, but special characters are +// not escaped. func (u *URL) UnescapedString() string { str, _ := url.PathUnescape(u.String()) // TODO Can an error occur? return str } + +// A BelongsToFilter represents a parent resource, used to filter out resources +// that are not children of the parent. +// +// For example, in /articles/abc123/comments, the parent is the article with the +// ID abc123. +type BelongsToFilter struct { + Type string + ID string + Name string + InverseName string +} diff --git a/url_test.go b/url_test.go index 191afe9..9dff4cd 100644 --- a/url_test.go +++ b/url_test.go @@ -9,6 +9,14 @@ import ( "github.com/stretchr/testify/assert" ) +func TestParseURLPOC(t *testing.T) { + assert := assert.New(t) + + // path := "/" + + assert.Equal(true, true, "obviously") +} + func TestParseURL(t *testing.T) { assert := assert.New(t) @@ -40,11 +48,35 @@ func TestParseURL(t *testing.T) { Route: "/mocktypes1", BelongsToFilter: BelongsToFilter{}, ResType: "mocktypes1", - ResID: "", - RelKind: "", IsCol: true, }, expectedError: false, + }, { + name: "type not found", + url: "/mocktypes99", + expectedError: true, + }, { + name: "relationship not found", + url: "/mocktypes1/abc/relnotfound", + expectedError: true, + }, { + name: "bad params", + url: ` + /mocktypes1 + ?fields[invalid]=attr1,attr2 + `, + expectedError: true, + }, { + name: "invalid raw url", + url: "%z", + expectedError: true, + }, { + name: "invalid simpleurl", + url: ` + /mocktypes1/abc123 + ?page[size]=invalid + `, + expectedError: true, }, { name: "full url for collection", url: `https://api.example.com/mocktypes1`, @@ -53,8 +85,6 @@ func TestParseURL(t *testing.T) { Route: "/mocktypes1", BelongsToFilter: BelongsToFilter{}, ResType: "mocktypes1", - ResID: "", - RelKind: "", IsCol: true, }, expectedError: false, @@ -67,8 +97,6 @@ func TestParseURL(t *testing.T) { BelongsToFilter: BelongsToFilter{}, ResType: "mocktypes1", ResID: "mc1-1", - RelKind: "", - IsCol: false, }, expectedError: false, }, { @@ -83,7 +111,6 @@ func TestParseURL(t *testing.T) { Name: "to-one", }, ResType: "mocktypes2", - ResID: "", RelKind: "related", Rel: Rel{ Name: "to-one", @@ -93,12 +120,13 @@ func TestParseURL(t *testing.T) { InverseType: "mocktypes1", InverseToOne: false, }, - IsCol: false, }, expectedError: false, }, { - name: "111111", - url: `https://example.com/mocktypes1/mc1-1/relationships/to-many-from-one`, + name: "full url for self relationships", + url: ` + https://example.com/mocktypes1/mc1-1/relationships/to-many-from-one + `, expectedURL: URL{ Fragments: []string{ "mocktypes1", "mc1-1", "relationships", "to-many-from-one", @@ -111,7 +139,6 @@ func TestParseURL(t *testing.T) { InverseName: "to-one-from-many", }, ResType: "mocktypes2", - ResID: "", RelKind: "self", Rel: Rel{ Name: "to-many-from-one", @@ -125,7 +152,7 @@ func TestParseURL(t *testing.T) { }, expectedError: false, }, { - name: "full url for self relationship", + name: "path for self relationship", url: `/mocktypes1/mc1-1/relationships/to-many-from-one`, expectedURL: URL{ Fragments: []string{ @@ -139,7 +166,6 @@ func TestParseURL(t *testing.T) { InverseName: "to-one-from-many", }, ResType: "mocktypes2", - ResID: "", RelKind: "self", Rel: Rel{ Name: "to-many-from-one", @@ -153,7 +179,7 @@ func TestParseURL(t *testing.T) { }, expectedError: false, }, { - name: "full url for self relationship with params", + name: "path for self relationship with params", url: ` /mocktypes1/mc1-1/relationships/to-many-from-one ?fields[mocktypes2]=boolptr%2Cint8ptr @@ -170,7 +196,6 @@ func TestParseURL(t *testing.T) { InverseName: "to-one-from-many", }, ResType: "mocktypes2", - ResID: "", RelKind: "self", Rel: Rel{ Name: "to-many-from-one", @@ -187,13 +212,11 @@ func TestParseURL(t *testing.T) { } for _, test := range tests { - u, _ := url.Parse(makeOneLineNoSpaces(test.url)) - url, err := NewURLFromRaw(schema, u.String()) - assert.Equal(test.expectedError, err != nil, test.name) - - // test.expectedURL.Path = makeOneLineNoSpaces(test.expectedURL.Path) - - if !test.expectedError { + url, err := NewURLFromRaw(schema, makeOneLineNoSpaces(test.url)) + if test.expectedError { + assert.Error(err) + } else { + assert.NoError(err) url.Params = nil assert.Equal(test.expectedURL, *url, test.name) } @@ -211,7 +234,7 @@ func TestParseParams(t *testing.T) { tests := []struct { name string url string - resType string + colType string expectedParams Params expectedError bool }{ @@ -223,7 +246,6 @@ func TestParseParams(t *testing.T) { Attrs: map[string][]Attr{}, Rels: map[string][]Rel{}, RelData: map[string][]string{}, - Filter: nil, SortingRules: []string{}, PageSize: 0, PageNumber: 0, @@ -238,7 +260,6 @@ func TestParseParams(t *testing.T) { Attrs: map[string][]Attr{}, Rels: map[string][]Rel{}, RelData: map[string][]string{}, - Filter: nil, SortingRules: []string{}, PageSize: 0, PageNumber: 0, @@ -259,7 +280,7 @@ func TestParseParams(t *testing.T) { to-many-from-many &page[size]=50 `, - resType: "mocktypes1", + colType: "mocktypes1", expectedParams: Params{ Fields: map[string][]string{ "mocktypes1": mockTypes1.Fields(), @@ -268,7 +289,6 @@ func TestParseParams(t *testing.T) { Attrs: map[string][]Attr{}, Rels: map[string][]Rel{}, RelData: map[string][]string{}, - Filter: nil, SortingRules: []string{}, PageSize: 50, PageNumber: 3, @@ -303,7 +323,7 @@ func TestParseParams(t *testing.T) { to-many-from-many &page[size]=50 `, - resType: "mocktypes1", + colType: "mocktypes1", expectedParams: Params{ Fields: map[string][]string{ "mocktypes1": mockTypes1.Fields(), @@ -312,7 +332,6 @@ func TestParseParams(t *testing.T) { Attrs: map[string][]Attr{}, Rels: map[string][]Rel{}, RelData: map[string][]string{}, - Filter: nil, SortingRules: []string{}, PageSize: 50, PageNumber: 3, @@ -346,7 +365,7 @@ func TestParseParams(t *testing.T) { &page[number]=110 &page[size]=90 `, - resType: "mocktypes1", + colType: "mocktypes1", expectedParams: Params{ Fields: map[string][]string{ "mocktypes1": mockTypes1.Fields(), @@ -354,7 +373,6 @@ func TestParseParams(t *testing.T) { Attrs: map[string][]Attr{}, Rels: map[string][]Rel{}, RelData: map[string][]string{}, - Filter: nil, SortingRules: []string{}, PageSize: 90, PageNumber: 110, @@ -371,7 +389,7 @@ func TestParseParams(t *testing.T) { url: ` ?filter=label `, - resType: "mocktypes1", + colType: "mocktypes1", expectedParams: Params{ Fields: map[string][]string{ "mocktypes1": mockTypes1.Fields(), @@ -380,13 +398,50 @@ func TestParseParams(t *testing.T) { Rels: map[string][]Rel{}, RelData: map[string][]string{}, FilterLabel: "label", - Filter: nil, SortingRules: []string{}, - PageSize: 0, - PageNumber: 0, Include: [][]Rel{}, }, expectedError: false, + }, { + name: "sorting rules without id", + url: ` + /mocktypes1 + ?sort=str,-int + `, + colType: "mocktypes1", + expectedParams: Params{ + Fields: map[string][]string{ + "mocktypes1": mockTypes1.Fields(), + }, + Attrs: map[string][]Attr{}, + Rels: map[string][]Rel{}, + RelData: map[string][]string{}, + SortingRules: []string{ + "str", "-int", "bool", "int16", "int32", "int64", "int8", + "time", "uint", "uint16", "uint32", "uint64", "uint8", "id"}, + Include: [][]Rel{}, + }, + expectedError: false, + }, { + name: "sorting rules with id", + url: ` + /mocktypes1 + ?sort=str,-int,id + `, + colType: "mocktypes1", + expectedParams: Params{ + Fields: map[string][]string{ + "mocktypes1": mockTypes1.Fields(), + }, + Attrs: map[string][]Attr{}, + Rels: map[string][]Rel{}, + RelData: map[string][]string{}, + SortingRules: []string{ + "str", "-int", "id", "bool", "int16", "int32", "int64", "int8", + "time", "uint", "uint16", "uint32", "uint64", "uint8"}, + Include: [][]Rel{}, + }, + expectedError: false, }, } @@ -397,22 +452,26 @@ func TestParseParams(t *testing.T) { su, err := NewSimpleURL(u) assert.NoError(err, test.name) - params, err := NewParams(schema, su, test.resType) - assert.Equal(test.expectedError, err != nil, test.name) + params, err := NewParams(schema, su, test.colType) + if test.expectedError { + assert.Error(err, test.name) + } else { + assert.NoError(err, test.name) + } // Set Attrs and Rels - for resType, fields := range test.expectedParams.Fields { + for colType, fields := range test.expectedParams.Fields { for _, field := range fields { - if typ := schema.GetType(resType); typ.Name != "" { + if typ := schema.GetType(colType); typ.Name != "" { if _, ok := typ.Attrs[field]; ok { - test.expectedParams.Attrs[resType] = append( - test.expectedParams.Attrs[resType], + test.expectedParams.Attrs[colType] = append( + test.expectedParams.Attrs[colType], typ.Attrs[field], ) - } else if typ := schema.GetType(resType); typ.Name != "" { + } else if typ := schema.GetType(colType); typ.Name != "" { if _, ok := typ.Rels[field]; ok { - test.expectedParams.Rels[resType] = append( - test.expectedParams.Rels[resType], + test.expectedParams.Rels[colType] = append( + test.expectedParams.Rels[colType], typ.Rels[field], ) } @@ -421,7 +480,10 @@ func TestParseParams(t *testing.T) { } } - if !test.expectedError { + if test.expectedError { + assert.Error(err, test.name) + } else { + assert.NoError(err, test.name) assert.Equal(test.expectedParams, *params, test.name) } } @@ -433,9 +495,9 @@ func TestURLEscaping(t *testing.T) { schema := newMockSchema() tests := []struct { - url string - expectedEscaped string - expectedUnescaped string + url string + escaped string + unescaped string }{ { url: ` @@ -443,18 +505,21 @@ func TestURLEscaping(t *testing.T) { ?fields[mocktypes1]=bool%2Cint8 &page[number]=2 &page[size]=10 + &filter=a_label `, - expectedEscaped: ` + escaped: ` /mocktypes1 ?fields%5Bmocktypes1%5D=bool%2Cint8 + &filter=a_label &page%5Bnumber%5D=2 &page%5Bsize%5D=10 &sort=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2C - uint%2Cuint16%2Cuint32%2Cuint64%2Cuint8%2Cid - `, - expectedUnescaped: ` + uint%2Cuint16%2Cuint32%2Cuint64%2Cuint8%2Cid + `, + unescaped: ` /mocktypes1 ?fields[mocktypes1]=bool,int8 + &filter=a_label &page[number]=2 &page[size]=10 &sort=bool,int,int16,int32,int64,int8,str,time,uint,uint16, @@ -467,11 +532,11 @@ func TestURLEscaping(t *testing.T) { url, err := NewURLFromRaw(schema, makeOneLineNoSpaces(test.url)) assert.NoError(err) assert.Equal( - makeOneLineNoSpaces(test.expectedEscaped), + makeOneLineNoSpaces(test.escaped), url.String(), ) assert.Equal( - makeOneLineNoSpaces(test.expectedUnescaped), + makeOneLineNoSpaces(test.unescaped), url.UnescapedString(), ) } From 8a4e44a39452164007a72a89eb5f8b276f9787fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 4 Aug 2019 12:44:04 -0400 Subject: [PATCH 170/406] Make sure types of the fields are sorted --- url.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/url.go b/url.go index 6b84289..51d84a0 100644 --- a/url.go +++ b/url.go @@ -133,11 +133,16 @@ func (u *URL) String() string { urlParams := []string{} // Fields - for n := range u.Params.Fields { - sort.Strings(u.Params.Fields[n]) + fields := make([]string, 0, len(u.Params.Fields)) + for key := range u.Params.Fields { + fields = append(fields, key) + } + sort.Strings(fields) + for _, typ := range fields { + sort.Strings(u.Params.Fields[typ]) - param := "fields%5B" + n + "%5D=" - for _, f := range u.Params.Fields[n] { + param := "fields%5B" + typ + "%5D=" + for _, f := range u.Params.Fields[typ] { param += f + "%2C" } param = param[:len(param)-3] From 69fbe78e927402e3fa34dcf31ba09f92b6413833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 4 Aug 2019 14:29:13 -0400 Subject: [PATCH 171/406] Allow id in list of fields (Params) --- params.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/params.go b/params.go index db59666..8027c2a 100644 --- a/params.go +++ b/params.go @@ -90,9 +90,13 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { if typ := schema.GetType(t); typ.Name != "" { params.Fields[t] = []string{} for _, f := range fields { - for _, ff := range typ.Fields() { - if f == ff { - params.Fields[t] = append(params.Fields[t], f) + if f == "id" { + params.Fields[t] = append(params.Fields[t], "id") + } else { + for _, ff := range typ.Fields() { + if f == ff { + params.Fields[t] = append(params.Fields[t], f) + } } } } From 0a26136367dba93c2585804c8d49f3f49197eaff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 4 Aug 2019 14:30:31 -0400 Subject: [PATCH 172/406] Add NewErrDuplicateFieldInFieldsParameter --- error.go | 13 +++++++++++++ error_test.go | 8 ++++++++ 2 files changed, 21 insertions(+) diff --git a/error.go b/error.go index 66f60c4..5b2d5f7 100644 --- a/error.go +++ b/error.go @@ -150,6 +150,19 @@ func NewErrInvalidPageSizeParameter(badPageSize string) Error { return e } +// NewErrDuplicateFieldInFieldsParameter (400) returns the corresponding error. +func NewErrDuplicateFieldInFieldsParameter(typ string, field string) Error { + e := NewError() + + e.Status = http.StatusBadRequest + e.Title = "Duplicate field" + e.Detail = "The fields parameter contains the same field more than once." + e.Source["parameter"] = "fields[" + typ + "]" + e.Meta["duplicate-field"] = field + + return e +} + // NewErrUnknownFieldInBody (400) returns the corresponding error. func NewErrUnknownFieldInBody(typ, field string) Error { e := NewError() diff --git a/error_test.go b/error_test.go index 20c70f4..76fcc91 100644 --- a/error_test.go +++ b/error_test.go @@ -120,6 +120,14 @@ func TestErrorConstructors(t *testing.T) { }(), expected: "400 Bad Request: " + "The page size parameter is not positive integer (including 0).", + }, { + name: "NewErrDuplicateFieldInFieldsParameter", + err: func() Error { + e := NewErrDuplicateFieldInFieldsParameter("type", "field") + return e + }(), + expected: "400 Bad Request: " + + "The fields parameter contains the same field more than once.", }, { name: "NewErrUnknownFieldInBody", err: func() Error { From b6d646bf78b96dfe731c8c11bf998a1195f260e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 4 Aug 2019 14:34:04 -0400 Subject: [PATCH 173/406] Check for duplicates in Params.Fields --- params.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/params.go b/params.go index 8027c2a..8d8f5ea 100644 --- a/params.go +++ b/params.go @@ -100,6 +100,17 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { } } } + // Check for duplicates + for i := range params.Fields[t] { + for j := i + 1; j < len(params.Fields[t]); j++ { + if params.Fields[t][i] == params.Fields[t][j] { + return nil, NewErrDuplicateFieldInFieldsParameter( + typ.Name, + params.Fields[t][i], + ) + } + } + } } } for t := range params.Fields { From 7cf451fa09663b846a3891bb3ca2dc1fda8a2e21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 4 Aug 2019 15:35:47 -0400 Subject: [PATCH 174/406] Improve un/marshaling and add some tests --- jsonapi.go | 79 +++++++--------- jsonapi_test.go | 40 +++++++- marshaling_test.go | 196 ++++++++++++++++++++++++++++----------- testdata/null-1.json | 6 ++ testdata/resource-4.json | 44 +++++++++ testdata/resource-5.json | 17 ++++ testdata/resource-6.json | 70 ++++++++++++++ testdata/resource-7.json | 86 +++++++++++++++++ 8 files changed, 439 insertions(+), 99 deletions(-) create mode 100644 testdata/null-1.json create mode 100644 testdata/resource-4.json create mode 100644 testdata/resource-5.json create mode 100644 testdata/resource-6.json create mode 100644 testdata/resource-7.json diff --git a/jsonapi.go b/jsonapi.go index 30895ed..6ae9783 100644 --- a/jsonapi.go +++ b/jsonapi.go @@ -3,6 +3,7 @@ package jsonapi import ( "encoding/json" "fmt" + "sort" ) // Marshal marshals a document according to the JSON:API speficication. @@ -51,18 +52,24 @@ func Marshal(doc *Document, url *URL) ([]byte, error) { } // Included - inclusions := []*json.RawMessage{} - if len(data) > 0 { - for key := range doc.Included { - typ := doc.Included[key].GetType().Name - raw := marshalResource( - doc.Included[key], - doc.PrePath, - url.Params.Fields[typ], - doc.RelData, - ) - rawm := json.RawMessage(raw) - inclusions = append(inclusions, &rawm) + var inclusions []*json.RawMessage + if len(doc.Included) > 0 { + sort.Slice(doc.Included, func(i, j int) bool { + return doc.Included[i].GetID() < doc.Included[j].GetID() + }) + + if len(data) > 0 { + for key := range doc.Included { + typ := doc.Included[key].GetType().Name + raw := marshalResource( + doc.Included[key], + doc.PrePath, + url.Params.Fields[typ], + doc.RelData, + ) + rawm := json.RawMessage(raw) + inclusions = append(inclusions, &rawm) + } } } @@ -162,7 +169,7 @@ func Unmarshal(payload []byte, url *URL, schema *Schema) (*Document, error) { return doc, nil } -// marshalResource ... +// marshalResource marshals a Resource into a JSON-encoded payload. func marshalResource(r Resource, prepath string, fields []string, relData map[string][]string) []byte { mapPl := map[string]interface{}{} @@ -172,14 +179,10 @@ func marshalResource(r Resource, prepath string, fields []string, relData map[st // Attributes attrs := map[string]interface{}{} for _, attr := range r.Attrs() { - if len(fields) == 0 { - attrs[attr.Name] = r.Get(attr.Name) - } else { - for _, field := range fields { - if field == attr.Name { - attrs[attr.Name] = r.Get(attr.Name) - break - } + for _, field := range fields { + if field == attr.Name { + attrs[attr.Name] = r.Get(attr.Name) + break } } } @@ -189,26 +192,22 @@ func marshalResource(r Resource, prepath string, fields []string, relData map[st rels := map[string]*json.RawMessage{} for _, rel := range r.Rels() { include := false - if len(fields) == 0 { - include = true - } else { - for _, field := range fields { - if field == rel.Name { - include = true - break - } + for _, field := range fields { + if field == rel.Name { + include = true + break } } if include { - if rel.ToOne { - var raw json.RawMessage + var raw json.RawMessage + if rel.ToOne { s := map[string]map[string]string{ "links": buildRelationshipLinks(r, prepath, rel.Name), } - for n := range relData { + for _, n := range relData[r.GetType().Name] { if n == rel.Name { id := r.GetToOne(rel.Name) if id != "" { @@ -219,34 +218,29 @@ func marshalResource(r Resource, prepath string, fields []string, relData map[st } else { s["data"] = nil } - break } } - // var links map[string]string{} raw, _ = json.Marshal(s) rels[rel.Name] = &raw } else { - var raw json.RawMessage - s := map[string]interface{}{ "links": buildRelationshipLinks(r, prepath, rel.Name), } - for n := range relData { + for _, n := range relData[r.GetType().Name] { if n == rel.Name { data := []map[string]string{} - - for _, id := range r.GetToMany(rel.Name) { + ids := r.GetToMany(rel.Name) + sort.Strings(ids) + for _, id := range ids { data = append(data, map[string]string{ "id": id, "type": rel.Type, }) } - s["data"] = data - break } } @@ -254,7 +248,6 @@ func marshalResource(r Resource, prepath string, fields []string, relData map[st raw, _ = json.Marshal(s) rels[rel.Name] = &raw } - } } mapPl["relationships"] = rels @@ -271,7 +264,7 @@ func marshalResource(r Resource, prepath string, fields []string, relData map[st return pl } -// marshalCollection ... +// marshalCollection marshals a Collection into a JSON-encoded payload. func marshalCollection(c Collection, prepath string, fields []string, relData map[string][]string) []byte { var raws []*json.RawMessage diff --git a/jsonapi_test.go b/jsonapi_test.go index 69579e4..8542bf9 100644 --- a/jsonapi_test.go +++ b/jsonapi_test.go @@ -7,9 +7,11 @@ import ( ) var ( - mocktypes1 Collection - mocktypes2 Collection - mocktypes3 Collection + mocktypes1 Collection + mocktypes11 Collection + mocktypes2 Collection + mocktypes21 Collection + mocktypes3 Collection // urls []*URL ) @@ -95,4 +97,36 @@ func init() { Attr2: 32, }), ) + + mocktypes11 = WrapCollection(Wrap(&mockType1{})) + mocktypes11.Add( + Wrap(&mockType1{ + ID: "mt11-1", + ToOne: "mt21-1", + ToMany: []string{"mt21-2", "mt21-3"}, + ToOneFromOne: "", + ToManyFromMany: []string{}, + ToManyFromOne: []string{}, + }), + ) + + mocktypes21 = WrapCollection(Wrap(&mockType2{})) + mocktypes21.Add( + Wrap(&mockType2{ + ID: "mt21-1", + BoolPtr: &boolPtr, + }), + ) + mocktypes21.Add( + Wrap(&mockType2{ + ID: "mt21-2", + IntPtr: &intPtr, + }), + ) + mocktypes21.Add( + Wrap(&mockType2{ + ID: "mt21-3", + StrPtr: &strPtr, + }), + ) } diff --git a/marshaling_test.go b/marshaling_test.go index bdcb689..b3f2395 100644 --- a/marshaling_test.go +++ b/marshaling_test.go @@ -1,12 +1,9 @@ package jsonapi_test import ( - "bytes" - "encoding/json" "fmt" "io/ioutil" "net/http" - "strings" "testing" "time" @@ -24,6 +21,8 @@ func TestMarshalResource(t *testing.T) { tests := []struct { name string data Resource + inclusions []Resource + relData map[string][]string prepath string params string meta map[string]interface{} @@ -54,6 +53,52 @@ func TestMarshalResource(t *testing.T) { params: "?fields[mocktypes2]=strptr,uintptr,int", errorExpected: false, payloadFile: "resource-3", + }, { + name: "resource with no attributes and relationships", + data: mocktypes1.At(0), + prepath: "https://example.org/", + params: "?fields[mocktypes1]=id", + errorExpected: false, + payloadFile: "resource-5", + }, { + name: "resource with relationship data", + data: mocktypes11.At(0), + relData: map[string][]string{ + "mocktypes1": []string{ + "to-one", "to-many", "to-one-from-one", "to-many-from-many", + }, + }, + prepath: "https://example.org/", + params: ` + ?fields[mocktypes1]= + to-one,to-many, + to-one-from-one,to-one-from-many, + to-many-from-one,to-many-from-many + `, + errorExpected: false, + payloadFile: "resource-6", + }, { + name: "resource with inclusions", + data: mocktypes11.At(0), + inclusions: []Resource{ + mocktypes21.At(0), + mocktypes21.At(1), + mocktypes21.At(2), + }, + relData: map[string][]string{ + "mocktypes1": []string{ + "to-one", "to-many", "to-one-from-one", "to-many-from-many", + }, + }, + prepath: "https://example.org/", + params: ` + ?fields[mocktypes1]= + to-one,to-many + &fields[mocktypes2]= + intptr,boolptr,strptr, + `, + errorExpected: false, + payloadFile: "resource-7", }, } @@ -64,34 +109,33 @@ func TestMarshalResource(t *testing.T) { doc.Data = test.data id := test.data.GetID() - resType := test.data.GetType().Name - rawurl := fmt.Sprintf("%s/%s/%s%s", test.prepath, resType, id, test.params) + typ := test.data.GetType() + rawurl := fmt.Sprintf( + "%s/%s/%s%s", + test.prepath, typ.Name, id, makeOneLineNoSpaces(test.params), + ) url, err := NewURLFromRaw(schema, rawurl) assert.NoError(err, test.name) + for _, inc := range test.inclusions { + doc.Include(inc) + } + + doc.RelData = test.relData doc.Meta = test.meta // Marshal payload, err := Marshal(doc, url) - assert.Equal(test.errorExpected, err != nil, test.name) - - if !test.errorExpected { - var out bytes.Buffer - - // Format the payload - _ = json.Indent(&out, payload, "", "\t") - output := out.String() + if test.errorExpected { + assert.Error(err, test.name) + } else { + assert.NoError(err, test.name) // Retrieve the expected result from file - content, err := ioutil.ReadFile("testdata/" + test.payloadFile + ".json") + expected, _ := ioutil.ReadFile("testdata/" + test.payloadFile + ".json") assert.NoError(err, test.name) - out.Reset() - _ = json.Indent(&out, content, "", "\t") - // Trim because otherwise there is an extra line at the end - expectedOutput := strings.TrimSpace(out.String()) - - assert.Equal(expectedOutput, output, test.name) + assert.JSONEq(string(expected), string(payload), test.name) } } } @@ -154,28 +198,64 @@ func TestMarshalCollection(t *testing.T) { // Marshal payload, err := Marshal(doc, url) - assert.Equal(test.errorExpected, err != nil, test.name) - - if !test.errorExpected { - var out bytes.Buffer - - // Format the payload - _ = json.Indent(&out, payload, "", "\t") - output := out.String() - // Retrieve the expected result from file - content, err := ioutil.ReadFile("testdata/" + test.payloadFile + ".json") + if test.errorExpected { + assert.Error(err, test.name) + } else { assert.NoError(err, test.name) - out.Reset() - _ = json.Indent(&out, content, "", "\t") - // Trim because otherwise there is an extra line at the end - expectedOutput := strings.TrimSpace(out.String()) - - assert.Equal(expectedOutput, output, test.name) + // Retrieve the expected result from file + expected, _ := ioutil.ReadFile("testdata/" + test.payloadFile + ".json") + assert.JSONEq(string(expected), string(payload), test.name) } } } +func TestMarshalInclusions(t *testing.T) { + assert := assert.New(t) + + schema := newMockSchema() + + // Document + doc := &Document{} + doc.PrePath = "https://example.org/" + + // URL + url, err := NewURLFromRaw( + schema, + makeOneLineNoSpaces(` + /mocktypes3/mt3-1 + ?fields[mocktypes1]=str + &fields[mocktypes3]=attr1,attr2 + `), + ) + assert.NoError(err) + + // Data (single resource) + res := Wrap(&mockType3{}) + res.SetID("mt3-1") + res.Set("attr1", "str") + res.Set("attr2", 42) + doc.Data = Resource(res) + + // Inclusions + inc1 := Wrap(&mockType1{}) + inc1.SetID("mt1-1") + inc1.Set("str", "astring") + doc.Include(inc1) + + inc2 := Wrap(&mockType1{}) + inc2.SetID("mt1-2") + inc2.Set("str", "anotherstring") + doc.Include(inc2) + + payload, _ := Marshal(doc, url) + + // Retrieve the expected result from file + expected, _ := ioutil.ReadFile("testdata/resource-4.json") + + assert.JSONEq(string(expected), string(payload)) +} + func TestMarshalErrors(t *testing.T) { assert := assert.New(t) @@ -225,27 +305,37 @@ func TestMarshalErrors(t *testing.T) { for _, test := range tests { doc := NewDocument() - doc.Data = test.errors + if len(test.errors) == 1 { + doc.Data = test.errors[0] + } else { + doc.Data = test.errors + } + // Marshal payload, err := Marshal(doc, nil) - assert.Equal(test.errorExpected, err != nil, test.name) - - if !test.errorExpected { - var out bytes.Buffer - - // Format the payload - _ = json.Indent(&out, payload, "", "\t") - output := out.String() - // Retrieve the expected result from file - content, err := ioutil.ReadFile("testdata/" + test.payloadFile + ".json") + if test.errorExpected { + assert.Error(err, test.name) + } else { assert.NoError(err, test.name) - out.Reset() - _ = json.Indent(&out, content, "", "\t") - // Trim because otherwise there is an extra line at the end - expectedOutput := strings.TrimSpace(out.String()) - - assert.Equal(expectedOutput, output, test.name) + // Retrieve the expected result from file + expected, _ := ioutil.ReadFile("testdata/" + test.payloadFile + ".json") + assert.JSONEq(string(expected), string(payload), test.name) } } } + +func TestMarshalOther(t *testing.T) { + assert := assert.New(t) + + doc := &Document{ + Data: nil, + } + payload, err := Marshal(doc, nil) + assert.NoError(err) + + // Retrieve the expected result from file + expected, _ := ioutil.ReadFile("testdata/null-1.json") + + assert.JSONEq(string(expected), string(payload), "null data") +} diff --git a/testdata/null-1.json b/testdata/null-1.json new file mode 100644 index 0000000..d42a9df --- /dev/null +++ b/testdata/null-1.json @@ -0,0 +1,6 @@ +{ + "data": null, + "jsonapi": { + "version": "1.0" + } +} \ No newline at end of file diff --git a/testdata/resource-4.json b/testdata/resource-4.json new file mode 100644 index 0000000..3610dd3 --- /dev/null +++ b/testdata/resource-4.json @@ -0,0 +1,44 @@ +{ + "data": { + "attributes": { + "attr1": "str", + "attr2": 42 + }, + "id": "mt3-1", + "links": { + "self": "https://example.org/mocktypes3/mt3-1" + }, + "relationships": {}, + "type": "mocktypes3" + }, + "included": [ + { + "attributes": { + "str": "astring" + }, + "id": "mt1-1", + "links": { + "self": "https://example.org/mocktypes1/mt1-1" + }, + "relationships": {}, + "type": "mocktypes1" + }, + { + "attributes": { + "str": "anotherstring" + }, + "id": "mt1-2", + "links": { + "self": "https://example.org/mocktypes1/mt1-2" + }, + "relationships": {}, + "type": "mocktypes1" + } + ], + "jsonapi": { + "version": "1.0" + }, + "links": { + "self": "https://example.org/mocktypes3/mt3-1?fields%5Bmocktypes1%5D=str\u0026fields%5Bmocktypes3%5D=attr1%2Cattr2" + } +} diff --git a/testdata/resource-5.json b/testdata/resource-5.json new file mode 100644 index 0000000..a2ffadc --- /dev/null +++ b/testdata/resource-5.json @@ -0,0 +1,17 @@ +{ + "data": { + "attributes": {}, + "id": "mt1-1", + "links": { + "self": "https://example.org/mocktypes1/mt1-1" + }, + "relationships": {}, + "type": "mocktypes1" + }, + "jsonapi": { + "version": "1.0" + }, + "links": { + "self": "https://example.org/mocktypes1/mt1-1?fields%5Bmocktypes1%5D=id" + } +} diff --git a/testdata/resource-6.json b/testdata/resource-6.json new file mode 100644 index 0000000..a9d4712 --- /dev/null +++ b/testdata/resource-6.json @@ -0,0 +1,70 @@ +{ + "data": { + "attributes": {}, + "id": "mt11-1", + "links": { + "self": "https://example.org/mocktypes1/mt11-1" + }, + "relationships": { + "to-many": { + "data": [ + { + "id": "mt21-2", + "type": "mocktypes2" + }, + { + "id": "mt21-3", + "type": "mocktypes2" + } + ], + "links": { + "related": "https://example.org/mocktypes1/mt11-1/to-many", + "self": "https://example.org/mocktypes1/mt11-1/relationships/to-many" + } + }, + "to-many-from-many": { + "data": [], + "links": { + "related": "https://example.org/mocktypes1/mt11-1/to-many-from-many", + "self": "https://example.org/mocktypes1/mt11-1/relationships/to-many-from-many" + } + }, + "to-many-from-one": { + "links": { + "related": "https://example.org/mocktypes1/mt11-1/to-many-from-one", + "self": "https://example.org/mocktypes1/mt11-1/relationships/to-many-from-one" + } + }, + "to-one": { + "data": { + "id": "mt21-1", + "type": "mocktypes2" + }, + "links": { + "related": "https://example.org/mocktypes1/mt11-1/to-one", + "self": "https://example.org/mocktypes1/mt11-1/relationships/to-one" + } + }, + "to-one-from-many": { + "links": { + "related": "https://example.org/mocktypes1/mt11-1/to-one-from-many", + "self": "https://example.org/mocktypes1/mt11-1/relationships/to-one-from-many" + } + }, + "to-one-from-one": { + "data": null, + "links": { + "related": "https://example.org/mocktypes1/mt11-1/to-one-from-one", + "self": "https://example.org/mocktypes1/mt11-1/relationships/to-one-from-one" + } + } + }, + "type": "mocktypes1" + }, + "jsonapi": { + "version": "1.0" + }, + "links": { + "self": "https://example.org/mocktypes1/mt11-1?fields%5Bmocktypes1%5D=to-many%2Cto-many-from-many%2Cto-many-from-one%2Cto-one%2Cto-one-from-many%2Cto-one-from-one" + } +} diff --git a/testdata/resource-7.json b/testdata/resource-7.json new file mode 100644 index 0000000..198ac2f --- /dev/null +++ b/testdata/resource-7.json @@ -0,0 +1,86 @@ +{ + "data": { + "attributes": {}, + "id": "mt11-1", + "links": { + "self": "https://example.org/mocktypes1/mt11-1" + }, + "relationships": { + "to-many": { + "data": [ + { + "id": "mt21-2", + "type": "mocktypes2" + }, + { + "id": "mt21-3", + "type": "mocktypes2" + } + ], + "links": { + "related": "https://example.org/mocktypes1/mt11-1/to-many", + "self": "https://example.org/mocktypes1/mt11-1/relationships/to-many" + } + }, + "to-one": { + "data": { + "id": "mt21-1", + "type": "mocktypes2" + }, + "links": { + "related": "https://example.org/mocktypes1/mt11-1/to-one", + "self": "https://example.org/mocktypes1/mt11-1/relationships/to-one" + } + } + }, + "type": "mocktypes1" + }, + "included": [ + { + "attributes": { + "boolptr": false, + "intptr": null, + "strptr": null + }, + "id": "mt21-1", + "links": { + "self": "https://example.org/mocktypes2/mt21-1" + }, + "relationships": { + }, + "type": "mocktypes2" + }, + { + "attributes": { + "boolptr": null, + "intptr": -42, + "strptr": null + }, + "id": "mt21-2", + "links": { + "self": "https://example.org/mocktypes2/mt21-2" + }, + "relationships": {}, + "type": "mocktypes2" + }, + { + "attributes": { + "boolptr": null, + "intptr": null, + "strptr": "str" + }, + "id": "mt21-3", + "links": { + "self": "https://example.org/mocktypes2/mt21-3" + }, + "relationships": {}, + "type": "mocktypes2" + } + ], + "jsonapi": { + "version": "1.0" + }, + "links": { + "self": "https://example.org/mocktypes1/mt11-1?fields%5Bmocktypes1%5D=to-many%2Cto-one&fields%5Bmocktypes2%5D=boolptr%2Cintptr%2Cstrptr" + } +} From 568bb366d744520af10e37ad547656a51a605c76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Fri, 9 Aug 2019 00:26:09 -0400 Subject: [PATCH 175/406] Add .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3da5ec5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +# Editors +.vscode/ \ No newline at end of file From 350e43768a1440c7a2ebaedec354171c92114484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 11 Aug 2019 13:09:34 -0400 Subject: [PATCH 176/406] Put doc.PrePath argument on its own line --- jsonapi.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jsonapi.go b/jsonapi.go index 6ae9783..d1c7bbb 100644 --- a/jsonapi.go +++ b/jsonapi.go @@ -20,14 +20,16 @@ func Marshal(doc *Document, url *URL) ([]byte, error) { if res, ok := doc.Data.(Resource); ok { // Resource data = marshalResource( - res, doc.PrePath, + res, + doc.PrePath, url.Params.Fields[res.GetType().Name], doc.RelData, ) } else if col, ok := doc.Data.(Collection); ok { // Collection data = marshalCollection( - col, doc.PrePath, + col, + doc.PrePath, url.Params.Fields[col.GetType().Name], doc.RelData, ) From 4341d66d0e1eeebfd54331f11cc14389435d7394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 12 Aug 2019 21:59:10 -0400 Subject: [PATCH 177/406] Move interface checks to test files --- soft_collection.go | 2 -- soft_collection_test.go | 2 ++ soft_resource.go | 2 -- soft_resource_test.go | 2 ++ wrapper.go | 2 -- wrapper_collection.go | 2 -- wrapper_collection_test.go | 7 +++++++ wrapper_test.go | 2 ++ 8 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 wrapper_collection_test.go diff --git a/soft_collection.go b/soft_collection.go index ea292ef..6f5154c 100644 --- a/soft_collection.go +++ b/soft_collection.go @@ -7,8 +7,6 @@ import ( "time" ) -var _ Collection = (*SoftCollection)(nil) - // SoftCollection is a collection of SoftResources where the type can be changed // for all elements at once by modifying the Type field. type SoftCollection struct { diff --git a/soft_collection_test.go b/soft_collection_test.go index df64592..20b0172 100644 --- a/soft_collection_test.go +++ b/soft_collection_test.go @@ -13,6 +13,8 @@ import ( "github.com/stretchr/testify/assert" ) +var _ Collection = (*SoftCollection)(nil) + func TestSoftCollection(t *testing.T) { sc := &SoftCollection{} diff --git a/soft_resource.go b/soft_resource.go index 9465afe..b6bb6d1 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -6,8 +6,6 @@ import ( "github.com/mitchellh/copystructure" ) -var _ Resource = (*SoftResource)(nil) - // SoftResource represents a resource whose type is defined by an internal field // of type *Type. // diff --git a/soft_resource_test.go b/soft_resource_test.go index 5fcf287..a760dff 100644 --- a/soft_resource_test.go +++ b/soft_resource_test.go @@ -8,6 +8,8 @@ import ( "github.com/stretchr/testify/assert" ) +var _ Resource = (*SoftResource)(nil) + func TestSoftResource(t *testing.T) { sr := &SoftResource{} diff --git a/wrapper.go b/wrapper.go index f681ea6..0946d37 100644 --- a/wrapper.go +++ b/wrapper.go @@ -7,8 +7,6 @@ import ( "strings" ) -var _ Resource = (*Wrapper)(nil) - // Wrapper wraps a reflect.Value that represents a struct. // // The Wrap function can be used to wrap a struct and make a Wrapper object. diff --git a/wrapper_collection.go b/wrapper_collection.go index 3668978..cc35e25 100644 --- a/wrapper_collection.go +++ b/wrapper_collection.go @@ -2,8 +2,6 @@ package jsonapi import "encoding/json" -var _ Collection = (*WrapperCollection)(nil) - // WrapCollection returns a *WrapperCollection which implements the Collection // interface and holds resources of the type defined in r. func WrapCollection(r Resource) *WrapperCollection { diff --git a/wrapper_collection_test.go b/wrapper_collection_test.go new file mode 100644 index 0000000..daa1952 --- /dev/null +++ b/wrapper_collection_test.go @@ -0,0 +1,7 @@ +package jsonapi_test + +import ( + . "github.com/mfcochauxlaberge/jsonapi" +) + +var _ Collection = (*WrapperCollection)(nil) diff --git a/wrapper_test.go b/wrapper_test.go index 536a22c..f5a58a7 100644 --- a/wrapper_test.go +++ b/wrapper_test.go @@ -11,6 +11,8 @@ import ( "github.com/stretchr/testify/assert" ) +var _ Resource = (*Wrapper)(nil) + func TestWrap(t *testing.T) { assert := assert.New(t) From 4d87db9eef6597e10edd1c0be1739f1365099969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 13 Aug 2019 20:41:22 -0400 Subject: [PATCH 178/406] Improve description of Check function --- helpers.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/helpers.go b/helpers.go index 58cddb5..14c6320 100644 --- a/helpers.go +++ b/helpers.go @@ -7,7 +7,11 @@ import ( "strings" ) -// Check checks the given value and returns any error found. +// Check checks that the given value can be used with this library and returns +// the first error it finds. +// +// It makes sure that the struct has an ID field of type string and that the api +// key of the field tags are properly formatted. // // If nil is returned, then the value can be safely used with this library. func Check(v interface{}) error { From b3a029b47c86507d7a106dc63fa570574fb6c0fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 13 Aug 2019 21:28:46 -0400 Subject: [PATCH 179/406] Add NewFunc and New to Type --- helpers.go | 6 ++++++ helpers_test.go | 10 ++++++++++ type.go | 26 +++++++++++++++++++++++--- type_test.go | 18 ++++++++++++++++++ 4 files changed, 57 insertions(+), 3 deletions(-) diff --git a/helpers.go b/helpers.go index 14c6320..9a0afbd 100644 --- a/helpers.go +++ b/helpers.go @@ -164,6 +164,12 @@ func Reflect(v interface{}) (Type, error) { } } + // NewFunc + res := Wrap(reflect.New(val.Type()).Interface()) + typ.NewFunc = func() Resource { + return res.Copy() + } + return typ, nil } diff --git a/helpers_test.go b/helpers_test.go index 0ad42b3..d21f434 100644 --- a/helpers_test.go +++ b/helpers_test.go @@ -14,4 +14,14 @@ func TestReflect(t *testing.T) { assert.Panics(func() { MustReflect("invalid") }) + + mock := mockType1{ + ID: "abc13", + Str: "string", + Int: -42, + Uint8: 12, + } + typ, err := Reflect(mock) + assert.NoError(err) + assert.Equal(true, Equal(Wrap(&mockType1{}), typ.New())) } diff --git a/type.go b/type.go index 1f6bada..d0d9ff4 100644 --- a/type.go +++ b/type.go @@ -27,10 +27,20 @@ const ( // A Type stores all the necessary information about a type as represented in // the JSON:API specification. +// +// NewFunc stores a function that returns a new Resource of the type defined by +// the object with all the fields and the ID set to their zero values. Users may +// call the New method which returns the result of NewFunc if it is non-nil, +// otherwise it returns a SoftResource based on the type. +// +// New makes sure NewFunc is not nil and then calls it, but does not use any +// kind of locking in the process. Therefore, it is unsafe to set NewFunc and +// call New concurrently. type Type struct { - Name string - Attrs map[string]Attr - Rels map[string]Rel + Name string + Attrs map[string]Attr + Rels map[string]Rel + NewFunc func() Resource } // AddAttr adds an attributes to the type. @@ -116,6 +126,14 @@ func (t *Type) Fields() []string { return fields } +// New ... +func (t *Type) New() Resource { + if t.NewFunc != nil { + return t.NewFunc() + } + return &SoftResource{Type: t} +} + // Attr represents a resource attribute. type Attr struct { Name string @@ -329,5 +347,7 @@ func CopyType(typ Type) Type { ctyp.Rels[name] = rel } + ctyp.NewFunc = typ.NewFunc + return ctyp } diff --git a/type_test.go b/type_test.go index 20e7b26..849fc5e 100644 --- a/type_test.go +++ b/type_test.go @@ -57,6 +57,24 @@ func TestType(t *testing.T) { assert.Error(err) } +func TestTypeNewFunc(t *testing.T) { + assert := assert.New(t) + + // NewFunc is nil + typ := &Type{} + assert.Equal(&SoftResource{Type: typ}, typ.New()) + + // NewFunc is not nil + typ = &Type{ + NewFunc: func() Resource { + res := &SoftResource{} + res.SetID("abc123") + return res + }, + } + assert.Equal("abc123", typ.New().GetID()) +} + func TestInverseRel(t *testing.T) { assert := assert.New(t) From 9786d5fc9901320d2d1ef95faa58a626c85b4f6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 13 Aug 2019 21:33:31 -0400 Subject: [PATCH 180/406] Rename Reflect to BuildType --- helpers.go | 14 +++++++------- helpers_test.go | 6 +++--- mock_schema_test.go | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/helpers.go b/helpers.go index 9a0afbd..d165024 100644 --- a/helpers.go +++ b/helpers.go @@ -97,11 +97,11 @@ func Check(v interface{}) error { return nil } -// Reflect takes a struct or a pointer to a struct to analyse and builds a Type -// object that is returned. +// BuildType takes a struct or a pointer to a struct to analyse and builds a +// Type object that is returned. // // If an error is returned, the Type object will be empty. -func Reflect(v interface{}) (Type, error) { +func BuildType(v interface{}) (Type, error) { typ := Type{} val := reflect.ValueOf(v) @@ -173,10 +173,10 @@ func Reflect(v interface{}) (Type, error) { return typ, nil } -// MustReflect calls Reflect and returns the result, except that it panics if -// the error is not nil. -func MustReflect(v interface{}) Type { - typ, err := Reflect(v) +// MustBuildType calls BuildType and returns the result, except that it panics +// if the error is not nil. +func MustBuildType(v interface{}) Type { + typ, err := BuildType(v) if err != nil { panic(err) } diff --git a/helpers_test.go b/helpers_test.go index d21f434..80b8cac 100644 --- a/helpers_test.go +++ b/helpers_test.go @@ -8,11 +8,11 @@ import ( "github.com/stretchr/testify/assert" ) -func TestReflect(t *testing.T) { +func TestBuildType(t *testing.T) { assert := assert.New(t) assert.Panics(func() { - MustReflect("invalid") + MustBuildType("invalid") }) mock := mockType1{ @@ -21,7 +21,7 @@ func TestReflect(t *testing.T) { Int: -42, Uint8: 12, } - typ, err := Reflect(mock) + typ, err := BuildType(mock) assert.NoError(err) assert.Equal(true, Equal(Wrap(&mockType1{}), typ.New())) } diff --git a/mock_schema_test.go b/mock_schema_test.go index 0ca059d..44a6c38 100644 --- a/mock_schema_test.go +++ b/mock_schema_test.go @@ -10,11 +10,11 @@ import ( func newMockSchema() *Schema { schema := &Schema{} - typ := MustReflect(mockType1{}) + typ := MustBuildType(mockType1{}) _ = schema.AddType(typ) - typ = MustReflect(mockType2{}) + typ = MustBuildType(mockType2{}) _ = schema.AddType(typ) - typ = MustReflect(mockType3{}) + typ = MustBuildType(mockType3{}) _ = schema.AddType(typ) for t, typ := range schema.Types { From 88a10a0cb78f143143d4fde857004f25259b62f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Wed, 14 Aug 2019 22:25:36 -0400 Subject: [PATCH 181/406] Remove names of arguments in Collection definition --- collection.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/collection.go b/collection.go index 5abbc3b..38fa49c 100644 --- a/collection.go +++ b/collection.go @@ -10,10 +10,10 @@ type Collection interface { Len() int // At returns the resource at index i. - At(i int) Resource + At(int) Resource // Add adds a resource in the collection. - Add(r Resource) + Add(Resource) // UnmarshalJSON unmarshals the bytes that represent a collection // of resources into the struct that implements the interface. From a757190ccb06bd7929d7bb30da487ee7b3250bb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 15 Aug 2019 23:17:55 -0400 Subject: [PATCH 182/406] Add NewErrInvalidFieldValueInBody --- error.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/error.go b/error.go index 5b2d5f7..45da202 100644 --- a/error.go +++ b/error.go @@ -150,6 +150,20 @@ func NewErrInvalidPageSizeParameter(badPageSize string) Error { return e } +// NewErrInvalidFieldValueInBody (400) returns the corresponding error. +func NewErrInvalidFieldValueInBody(field string, badValue string, typ string) Error { + e := NewError() + + e.Status = http.StatusBadRequest + e.Title = "Invalid field value in body" + e.Detail = "The field value is invalid for the expected type." + e.Meta["field"] = "field" + e.Meta["bad-value"] = badValue + e.Meta["type"] = typ + + return e +} + // NewErrDuplicateFieldInFieldsParameter (400) returns the corresponding error. func NewErrDuplicateFieldInFieldsParameter(typ string, field string) Error { e := NewError() From ed17a23c71782aa71000ce62ba1c6defbf28ff15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 15 Aug 2019 23:19:48 -0400 Subject: [PATCH 183/406] Add test for NewErrInvalidFieldValueInBody --- error_test.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/error_test.go b/error_test.go index 76fcc91..34c3be1 100644 --- a/error_test.go +++ b/error_test.go @@ -120,6 +120,14 @@ func TestErrorConstructors(t *testing.T) { }(), expected: "400 Bad Request: " + "The page size parameter is not positive integer (including 0).", + }, { + name: "NewErrInvalidFieldValueInBody", + err: func() Error { + e := NewErrInvalidFieldValueInBody("field", "bad", "int") + return e + }(), + expected: "400 Bad Request: " + + "The field value is invalid for the expected type.", }, { name: "NewErrDuplicateFieldInFieldsParameter", err: func() Error { From e56b52e775f77554eb072907b0aebf9f59601f7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Fri, 16 Aug 2019 22:30:39 -0400 Subject: [PATCH 184/406] Add Attr.UnmarshalToType I'm still very high. Hopefully tomorrow I don't realize the commit sucks. --- type.go | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++ type_test.go | 83 +++++++++++++++++++++++++++++++ 2 files changed, 218 insertions(+) diff --git a/type.go b/type.go index d0d9ff4..b185e91 100644 --- a/type.go +++ b/type.go @@ -1,8 +1,11 @@ package jsonapi import ( + "encoding/json" + "errors" "fmt" "sort" + "strconv" "strings" "time" ) @@ -141,6 +144,138 @@ type Attr struct { Nullable bool } +// UnmarshalToType ... +func (a Attr) UnmarshalToType(data []byte) (interface{}, error) { + if a.Nullable && string(data) == "nil" { + return nil, nil + } + + var ( + v interface{} + err error + ) + switch a.Type { + case AttrTypeString: + var s string + err = json.Unmarshal(data, &s) + if a.Nullable { + v = &s + } else { + v = s + } + case AttrTypeInt: + v, err = strconv.Atoi(string(data)) + if a.Nullable { + n := v.(int) + v = &n + } else { + v = v.(int) + } + case AttrTypeInt8: + v, err = strconv.Atoi(string(data)) + if a.Nullable { + n := int8(v.(int)) + v = &n + } else { + v = int8(v.(int)) + } + case AttrTypeInt16: + v, err = strconv.Atoi(string(data)) + if a.Nullable { + n := int16(v.(int)) + v = &n + } else { + v = int16(v.(int)) + } + case AttrTypeInt32: + v, err = strconv.Atoi(string(data)) + if a.Nullable { + n := int32(v.(int)) + v = &n + } else { + v = int32(v.(int)) + } + case AttrTypeInt64: + v, err = strconv.Atoi(string(data)) + if a.Nullable { + n := int64(v.(int)) + v = &n + } else { + v = int64(v.(int)) + } + case AttrTypeUint: + v, err = strconv.ParseUint(string(data), 10, 64) + if a.Nullable { + n := uint(v.(uint64)) + v = &n + } else { + v = uint(v.(uint64)) + } + case AttrTypeUint8: + v, err = strconv.ParseUint(string(data), 10, 8) + if a.Nullable { + n := uint8(v.(uint64)) + v = &n + } else { + v = uint8(v.(uint64)) + } + case AttrTypeUint16: + v, err = strconv.ParseUint(string(data), 10, 16) + if a.Nullable { + n := uint16(v.(uint64)) + v = &n + } else { + v = uint16(v.(uint64)) + } + case AttrTypeUint32: + v, err = strconv.ParseUint(string(data), 10, 32) + if a.Nullable { + n := uint32(v.(uint64)) + v = &n + } else { + v = uint32(v.(uint64)) + } + case AttrTypeUint64: + v, err = strconv.ParseUint(string(data), 10, 64) + if a.Nullable { + n := v.(uint64) + v = &n + } else { + v = v.(uint64) + } + case AttrTypeBool: + var b bool + if string(data) == "true" { + b = true + } else if string(data) != "false" { + err = errors.New("boolean is not true or false") + } + v = b + if a.Nullable { + v = &b + } + case AttrTypeTime: + var t time.Time + err = json.Unmarshal(data, &t) + v = t + if a.Nullable { + v = &t + } + default: + err = errors.New("attribute is of invalid or unknown type") + } + + if err != nil { + return nil, NewErrInvalidFieldValueInBody( + a.Name, + string(data), + GetAttrTypeString(a.Type, a.Nullable), + ) + } + + return v, nil +} + // Rel represents a resource relationship. type Rel struct { Name string diff --git a/type_test.go b/type_test.go index 849fc5e..7be19a8 100644 --- a/type_test.go +++ b/type_test.go @@ -1,6 +1,8 @@ package jsonapi_test import ( + "encoding/json" + "fmt" "testing" "time" @@ -75,6 +77,87 @@ func TestTypeNewFunc(t *testing.T) { assert.Equal("abc123", typ.New().GetID()) } +func TestAttrUnmarshalToType(t *testing.T) { + assert := assert.New(t) + + var ( + vstr = "str" + vint = int(1) + vint8 = int8(8) + vint16 = int16(16) + vint32 = int32(32) + vint64 = int64(64) + vuint = uint(1) + vuint8 = uint8(8) + vuint16 = uint16(16) + vuint32 = uint32(32) + vuint64 = uint64(64) + vbool = true + ) + + tests := []struct { + val interface{} + }{ + {val: "str"}, // string + {val: 1}, // int + {val: int8(8)}, // int8 + {val: int16(16)}, // int16 + {val: int32(32)}, // int32 + {val: int64(64)}, // int64 + {val: uint(1)}, // uint + {val: uint8(8)}, // uint8 + {val: uint16(16)}, // uint16 + {val: uint32(32)}, // uint32 + {val: uint64(64)}, // uint64 + {val: true}, // bool + {val: time.Time{}}, // time + {val: &vstr}, // *string + {val: &vint}, // *int + {val: &vint8}, // *int8 + {val: &vint16}, // *int16 + {val: &vint32}, // *int32 + {val: &vint64}, // *int64 + {val: &vuint}, // *uint + {val: &vuint8}, // *uint8 + {val: &vuint16}, // *uint16 + {val: &vuint32}, // *uint32 + {val: &vuint64}, // *uint64 + {val: &vbool}, // *bool + {val: &time.Time{}}, // *time + } + + attr := Attr{} + + for _, test := range tests { + attr.Type, attr.Nullable = GetAttrType(fmt.Sprintf("%T", test.val)) + p, _ := json.Marshal(test.val) + val, err := attr.UnmarshalToType(p) + assert.NoError(err) + assert.Equal(test.val, val) + assert.Equal(fmt.Sprintf("%T", test.val), fmt.Sprintf("%T", val)) + } + + // Nil value + attr.Nullable = true + val, err := attr.UnmarshalToType([]byte("nil")) + assert.NoError(err) + assert.Nil(val) + + // False value + attr.Type = AttrTypeBool + val, err = attr.UnmarshalToType([]byte("nottrue")) + assert.Error(err) + assert.Nil(val) + + // Invalid attribute type + attr.Type = AttrTypeInvalid + val, err = attr.UnmarshalToType([]byte("invalid")) + err2, ok := err.(Error) + assert.True(ok) + assert.IsType(Error{}, err2) + assert.Nil(val) +} + func TestInverseRel(t *testing.T) { assert := assert.New(t) From c665e1dae115ad4b57e42009e9b1d3953bb5f3c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 17 Aug 2019 13:01:53 -0400 Subject: [PATCH 185/406] Remove Collection.UnmarshalJSON --- collection.go | 4 ---- soft_collection.go | 10 ---------- wrapper_collection.go | 25 ------------------------- 3 files changed, 39 deletions(-) diff --git a/collection.go b/collection.go index 38fa49c..664228c 100644 --- a/collection.go +++ b/collection.go @@ -14,8 +14,4 @@ type Collection interface { // Add adds a resource in the collection. Add(Resource) - - // UnmarshalJSON unmarshals the bytes that represent a collection - // of resources into the struct that implements the interface. - UnmarshalJSON([]byte) error } diff --git a/soft_collection.go b/soft_collection.go index 6f5154c..3d886d6 100644 --- a/soft_collection.go +++ b/soft_collection.go @@ -1,7 +1,6 @@ package jsonapi import ( - "errors" "sort" "strings" "time" @@ -157,15 +156,6 @@ func (s *SoftCollection) Remove(id string) { } } -// UnmarshalJSON populates a SoftCollection from the given payload. -// -// Only the attributes and relationships defined in the SoftCollection's Type -// field will be considered. -func (s *SoftCollection) UnmarshalJSON(payload []byte) error { - // TODO Implement this method - return errors.New("jsonapi: SoftCollection.UnmarshalJSON not yet implemented") -} - // Sort rearranges the order of the collection according the rules. func (s *SoftCollection) Sort(rules []string) { s.sort = rules diff --git a/wrapper_collection.go b/wrapper_collection.go index cc35e25..e016146 100644 --- a/wrapper_collection.go +++ b/wrapper_collection.go @@ -1,7 +1,5 @@ package jsonapi -import "encoding/json" - // WrapCollection returns a *WrapperCollection which implements the Collection // interface and holds resources of the type defined in r. func WrapCollection(r Resource) *WrapperCollection { @@ -57,26 +55,3 @@ func (wc *WrapperCollection) Add(r Resource) { wc.col = append(wc.col, wr) } } - -// UnmarshalJSON populates the receiver with the resources represented in the -// payload. -func (wc *WrapperCollection) UnmarshalJSON(payload []byte) error { - var raws []json.RawMessage - - err := json.Unmarshal(payload, &raws) - if err != nil { - return err - } - - for _, raw := range raws { - r := wc.sample.New() - err = json.Unmarshal(raw, r) - if err != nil { - wc.col = nil - return err - } - wc.Add(r) - } - - return nil -} From e0114e6925e488c67dacd7ec0ac4897154e29d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 17 Aug 2019 13:13:29 -0400 Subject: [PATCH 186/406] Add Resources type --- collection.go | 28 ++++++++++++++++++++++++++++ collection_test.go | 29 +++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 collection_test.go diff --git a/collection.go b/collection.go index 664228c..d3cb8fb 100644 --- a/collection.go +++ b/collection.go @@ -15,3 +15,31 @@ type Collection interface { // Add adds a resource in the collection. Add(Resource) } + +// Resources is a slice of objects that implement the Resource interface. They +// do not necessarily have the same type. +type Resources []Resource + +// GetType returns a zero Type object because the collection does not represent +// a particular type. +func (r *Resources) GetType() Type { + return Type{} +} + +// GetType returns the number of elements in r. +func (r *Resources) Len() int { + return len(*r) +} + +// GetType returns the number of elements in r. +func (r *Resources) At(i int) Resource { + if i >= 0 && i < r.Len() { + return (*r)[i] + } + return nil +} + +// GetType adds a Resource object to r. +func (r *Resources) Add(res Resource) { + *r = append(*r, res) +} diff --git a/collection_test.go b/collection_test.go new file mode 100644 index 0000000..a066ff9 --- /dev/null +++ b/collection_test.go @@ -0,0 +1,29 @@ +package jsonapi_test + +import ( + "testing" + + . "github.com/mfcochauxlaberge/jsonapi" + + "github.com/stretchr/testify/assert" +) + +var _ Collection = (*Resources)(nil) + +func TestResources(t *testing.T) { + assert := assert.New(t) + + col := Resources{} + assert.Equal(Type{}, col.GetType()) + assert.Equal(0, col.Len()) + + // Add a resource + res := &SoftResource{} + res.SetID("id") + col.Add(res) + assert.Equal(1, col.Len()) + + // Retrieve a resource + assert.Equal("id", col.At(0).GetID()) + assert.Nil(col.At(1)) +} From 22431ae3c7b592c753791db00cc0e8ef89e68273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 17 Aug 2019 17:00:13 -0400 Subject: [PATCH 187/406] Fix argument usage --- error.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/error.go b/error.go index 45da202..578e9ff 100644 --- a/error.go +++ b/error.go @@ -157,7 +157,7 @@ func NewErrInvalidFieldValueInBody(field string, badValue string, typ string) Er e.Status = http.StatusBadRequest e.Title = "Invalid field value in body" e.Detail = "The field value is invalid for the expected type." - e.Meta["field"] = "field" + e.Meta["field"] = field e.Meta["bad-value"] = badValue e.Meta["type"] = typ From c074f55ee331b70991064039a00aa82257c6fcee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 18 Aug 2019 11:05:21 -0400 Subject: [PATCH 188/406] Add NewErrMissingDataMember --- error.go | 11 +++++++++++ error_test.go | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/error.go b/error.go index 578e9ff..c9bc0b5 100644 --- a/error.go +++ b/error.go @@ -177,6 +177,17 @@ func NewErrDuplicateFieldInFieldsParameter(typ string, field string) Error { return e } +// NewErrMissingDataMember (400) returns the corresponding error. +func NewErrMissingDataMember() Error { + e := NewError() + + e.Status = http.StatusBadRequest + e.Title = "Missing data member" + e.Detail = "Missing data top-level member in payload." + + return e +} + // NewErrUnknownFieldInBody (400) returns the corresponding error. func NewErrUnknownFieldInBody(typ, field string) Error { e := NewError() diff --git a/error_test.go b/error_test.go index 34c3be1..bc2ccb2 100644 --- a/error_test.go +++ b/error_test.go @@ -136,6 +136,13 @@ func TestErrorConstructors(t *testing.T) { }(), expected: "400 Bad Request: " + "The fields parameter contains the same field more than once.", + }, { + name: "NewErrMissingDataMember", + err: func() Error { + e := NewErrMissingDataMember() + return e + }(), + expected: "400 Bad Request: Missing data top-level member in payload.", }, { name: "NewErrUnknownFieldInBody", err: func() Error { From e8fac0b74a9d54017ed64cf0662cb92f087755f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 18 Aug 2019 11:42:54 -0400 Subject: [PATCH 189/406] Add new line at the end of dotfiles --- .codecov.yml | 2 +- .gitignore | 2 +- .travis.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.codecov.yml b/.codecov.yml index ce33bf1..db24720 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -1 +1 @@ -comment: off \ No newline at end of file +comment: off diff --git a/.gitignore b/.gitignore index 3da5ec5..4812546 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ # Editors -.vscode/ \ No newline at end of file +.vscode/ diff --git a/.travis.yml b/.travis.yml index 514a739..50cb8c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,4 +18,4 @@ script: - go test -race -coverprofile=coverage.txt -covermode=atomic after_success: - - bash <(curl -s https://codecov.io/bash) \ No newline at end of file + - bash <(curl -s https://codecov.io/bash) From 7b280f3f9dde2cb60c5bda356e6f57774bacdffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 18 Aug 2019 12:15:20 -0400 Subject: [PATCH 190/406] Disable patch coverage and add threshold --- .codecov.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.codecov.yml b/.codecov.yml index db24720..873f814 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -1 +1,7 @@ comment: off +coverage: + status: + patch: off + project: + default: + threshold: 1% From 0d8b531744b7258160a3ed2aa4143fff6f9c4786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 18 Aug 2019 12:33:53 -0400 Subject: [PATCH 191/406] Implement unmarshaling --- jsonapi.go | 152 +++++++++++++++++++++++++++++++++++++------ request.go | 2 +- skeletons.go | 18 +++++ unmarshaling_test.go | 15 +++-- 4 files changed, 162 insertions(+), 25 deletions(-) diff --git a/jsonapi.go b/jsonapi.go index d1c7bbb..8793922 100644 --- a/jsonapi.go +++ b/jsonapi.go @@ -102,10 +102,10 @@ func Marshal(doc *Document, url *URL) ([]byte, error) { return json.Marshal(plMap) } -// Unmarshal reads a payload to build and return a document object. +// Unmarshal reads a payload to build and return a Document object. // -// Both url and schema must not be nil. -func Unmarshal(payload []byte, url *URL, schema *Schema) (*Document, error) { +// schema must not be nil. +func Unmarshal(payload []byte, schema *Schema) (*Document, error) { doc := &Document{} ske := &payloadSkeleton{} @@ -116,30 +116,23 @@ func Unmarshal(payload []byte, url *URL, schema *Schema) (*Document, error) { } // Data - if !url.IsCol && url.RelKind == "" { - typ := schema.GetType(url.ResType) - res := &SoftResource{Type: &typ} - err = json.Unmarshal(ske.Data, res) - if err != nil { - return nil, err - } - doc.Data = res - } else if url.RelKind == "self" { - if !url.IsCol { - inc := Identifier{} - err = json.Unmarshal(ske.Data, &inc) + if len(ske.Data) > 0 { + if ske.Data[0] == '{' { + // Resource + res, err := unmarshalResource(ske.Data, schema) if err != nil { return nil, err } - doc.Data = inc - } else { - incs := Identifiers{} - err = json.Unmarshal(ske.Data, &incs) + doc.Data = res + } else if ske.Data[0] == '[' { + col, err := unmarshalCollection(ske.Data, schema) if err != nil { return nil, err } - doc.Data = incs + doc.Data = col } + } else { + return nil, NewErrMissingDataMember() } // Included @@ -171,6 +164,49 @@ func Unmarshal(payload []byte, url *URL, schema *Schema) (*Document, error) { return doc, nil } +// UnmarshalIdentifiers reads a payload where the main data is one or more +// identifiers to build and return a Document object. +// +// The included top-level member is ignored. +// +// schema must not be nil. +func UnmarshalIdentifiers(payload []byte, schema *Schema) (*Document, error) { + doc := &Document{} + ske := &payloadSkeleton{} + + // Unmarshal + err := json.Unmarshal(payload, ske) + if err != nil { + return nil, err + } + + // Identifiers + if len(ske.Data) > 0 { + if ske.Data[0] == '{' { + inc := Identifier{} + err = json.Unmarshal(ske.Data, &inc) + if err != nil { + return nil, err + } + doc.Data = inc + } else if ske.Data[0] == '[' { + incs := Identifiers{} + err = json.Unmarshal(ske.Data, &incs) + if err != nil { + return nil, err + } + doc.Data = incs + } + } else { + return nil, NewErrMissingDataMember() + } + + // Meta + doc.Meta = ske.Meta + + return doc, nil +} + // marshalResource marshals a Resource into a JSON-encoded payload. func marshalResource(r Resource, prepath string, fields []string, relData map[string][]string) []byte { mapPl := map[string]interface{}{} @@ -286,3 +322,79 @@ func marshalCollection(c Collection, prepath string, fields []string, relData ma } return pl } + +// unmarshalResource unmarshals a JSON-encoded payload into a Resource. +func unmarshalResource(data []byte, schema *Schema) (Resource, error) { + var rske resourceSkeleton + err := json.Unmarshal(data, &rske) + if err != nil { + return nil, err + } + + typ := schema.GetType(rske.Type) + res := typ.New() + + res.SetID(rske.ID) + + for a, v := range rske.Attributes { + if attr, ok := typ.Attrs[a]; ok { + val, err := attr.UnmarshalToType(v) + if err != nil { + return nil, err + } + res.Set(attr.Name, val) + } else { + return nil, NewErrUnknownFieldInBody(typ.Name, a) + } + } + for r, v := range rske.Relationships { + if rel, ok := typ.Rels[r]; ok { + if len(v.Data) > 0 { + if rel.ToOne { + var iden identifierSkeleton + err = json.Unmarshal(v.Data, &iden) + res.SetToOne(rel.Name, iden.ID) + } else { + var idens []identifierSkeleton + err = json.Unmarshal(v.Data, &idens) + ids := make([]string, len(idens)) + for i := range idens { + ids[i] = idens[i].ID + } + res.SetToMany(rel.Name, ids) + } + } + if err != nil { + return nil, NewErrInvalidFieldValueInBody( + rel.Name, + string(v.Data), + typ.Name, + ) + } + } else { + return nil, NewErrUnknownFieldInBody(typ.Name, r) + } + } + + return res, nil +} + +// unmarshalCollection unmarshals a JSON-encoded payload into a Collection. +func unmarshalCollection(data []byte, schema *Schema) (Collection, error) { + var cske []json.RawMessage + err := json.Unmarshal(data, &cske) + if err != nil { + return nil, err + } + + col := &Resources{} + for i := range cske { + res, err := unmarshalResource(cske[i], schema) + if err != nil { + return nil, err + } + col.Add(res) + } + + return col, nil +} diff --git a/request.go b/request.go index 991a164..52633de 100644 --- a/request.go +++ b/request.go @@ -22,7 +22,7 @@ func NewRequest(r *http.Request, schema *Schema) (*Request, error) { doc := &Document{} if len(body) > 0 { - doc, err = Unmarshal(body, url, schema) + doc, err = Unmarshal(body, schema) if err != nil { return nil, err } diff --git a/skeletons.go b/skeletons.go index 1e7572b..6f33db7 100644 --- a/skeletons.go +++ b/skeletons.go @@ -7,3 +7,21 @@ type payloadSkeleton struct { Included []json.RawMessage `json:"included"` Meta map[string]interface{} `json:"meta"` } + +type resourceSkeleton struct { + ID string `json:"id"` + Type string `json:"type"` + Attributes map[string]json.RawMessage `json:"attributes"` + Relationships map[string]relationshipSkeleton `json:"relationships"` +} + +type relationshipSkeleton struct { + Data json.RawMessage `json:"data"` + Links map[string]json.RawMessage `json:"links"` + Meta map[string]json.RawMessage `json:"meta"` +} + +type identifierSkeleton struct { + ID string `json:"id"` + Type string `json:"type"` +} diff --git a/unmarshaling_test.go b/unmarshaling_test.go index 34dc3fd..ea797bd 100644 --- a/unmarshaling_test.go +++ b/unmarshaling_test.go @@ -32,12 +32,19 @@ func TestUnmarshalResource(t *testing.T) { doc1 := NewDocument() doc1.Data = res1 doc1.Meta = meta1 + doc1.RelData["mocktypes3"] = []string{"rel1", "rel2"} body1, err := Marshal(doc1, url1) assert.NoError(err) - pl1, err := Unmarshal(body1, url1, schema) + + pl1, err := Unmarshal(body1, schema) assert.NoError(err) - // dst1 := pl1.Data.(Resource) + + dst1 := pl1.Data.(Resource) + assert.Equal("mt1", dst1.GetID()) + assert.Equal("mt2", dst1.GetToOne("rel1")) + assert.Contains(dst1.GetToMany("rel2"), "mt3") + assert.Contains(dst1.GetToMany("rel2"), "mt4") // assert.HaveEqualAttributes(t, "same attribues", res1, dst1) TODO Fix test assert.Equal(meta1, pl1.Meta, "same meta object") @@ -64,7 +71,7 @@ func TestUnmarshalIdentifier(t *testing.T) { body1, err := Marshal(doc1, url1) assert.NoError(err) - pl1, err := Unmarshal(body1, url1, schema) + pl1, err := UnmarshalIdentifiers(body1, schema) assert.NoError(err) dst1 := pl1.Data.(Identifier) @@ -99,7 +106,7 @@ func TestUnmarshalIdentifiers(t *testing.T) { body1, err := Marshal(doc1, url1) assert.NoError(err) - pl1, err := Unmarshal(body1, url1, schema) + pl1, err := UnmarshalIdentifiers(body1, schema) assert.NoError(err) dst1 := pl1.Data.(Identifiers) From 134668be20660883471eb08c3599c6b533112231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 18 Aug 2019 13:21:28 -0400 Subject: [PATCH 192/406] Download golangci-lint binary instead of compiling --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 50cb8c8..a7829a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,12 @@ env: - GO111MODULE=on before_script: - - go install github.com/golangci/golangci-lint/cmd/golangci-lint + - 'curl -sfL + https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh + | sh -s v1.17.1' script: - - golangci-lint run + - ./bin/golangci-lint run - go test -race -coverprofile=coverage.txt -covermode=atomic after_success: From 78577713397e176dacfc6d2f376611a93d8c1ecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 18 Aug 2019 13:51:21 -0400 Subject: [PATCH 193/406] Make Error.Status a string --- error.go | 76 ++++++++++++++++++++++++---------------------- error_test.go | 7 +++-- marshaling_test.go | 3 +- 3 files changed, 45 insertions(+), 41 deletions(-) diff --git a/error.go b/error.go index c9bc0b5..d5da2b7 100644 --- a/error.go +++ b/error.go @@ -4,6 +4,7 @@ import ( "encoding/json" "fmt" "net/http" + "strconv" "github.com/google/uuid" ) @@ -12,7 +13,7 @@ import ( type Error struct { ID string `json:"id"` Code string `json:"code"` - Status int `json:"status"` + Status string `json:"status"` Title string `json:"title"` Detail string `json:"detail"` Links map[string]string `json:"links"` @@ -25,7 +26,7 @@ func NewError() Error { err := Error{ ID: uuid.New().String(), Code: "", - Status: 0, + Status: "", Title: "", Detail: "", Links: map[string]string{}, @@ -41,15 +42,16 @@ func NewError() Error { // If the error does note contain a valid error status code, it returns an empty // string. func (e Error) Error() string { - fullName := http.StatusText(e.Status) + statusCode, _ := strconv.Atoi(e.Status) + fullName := http.StatusText(statusCode) - if fullName != "" && e.Status >= 400 && e.Status <= 599 { + if fullName != "" && e.Status != "" { if e.Detail != "" { - return fmt.Sprintf("%d %s: %s", e.Status, fullName, e.Detail) + return fmt.Sprintf("%s %s: %s", e.Status, fullName, e.Detail) } else if e.Title != "" { - return fmt.Sprintf("%d %s: %s", e.Status, fullName, e.Title) + return fmt.Sprintf("%s %s: %s", e.Status, fullName, e.Title) } else { - return fmt.Sprintf("%d %s", e.Status, fullName) + return fmt.Sprintf("%s %s", e.Status, fullName) } } @@ -73,8 +75,8 @@ func (e Error) MarshalJSON() ([]byte, error) { m["code"] = e.Code } - if e.Status >= 400 && e.Status <= 599 { - m["status"] = fmt.Sprintf("%d", e.Status) + if e.Status != "" { + m["status"] = e.Status } if e.Title != "" { @@ -104,7 +106,7 @@ func (e Error) MarshalJSON() ([]byte, error) { func NewErrBadRequest(title, detail string) Error { e := NewError() - e.Status = http.StatusBadRequest + e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = title e.Detail = detail @@ -115,7 +117,7 @@ func NewErrBadRequest(title, detail string) Error { func NewErrMalformedFilterParameter(badFitler string) Error { e := NewError() - e.Status = http.StatusBadRequest + e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Malformed filter parameter" e.Detail = "The filter parameter is not a string or a valid JSON object." e.Source["parameter"] = "filter" @@ -128,7 +130,7 @@ func NewErrMalformedFilterParameter(badFitler string) Error { func NewErrInvalidPageNumberParameter(badPageNumber string) Error { e := NewError() - e.Status = http.StatusBadRequest + e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Invalid page number parameter" e.Detail = "The page number parameter is not positive integer (including 0)." e.Source["parameter"] = "page[number]" @@ -141,7 +143,7 @@ func NewErrInvalidPageNumberParameter(badPageNumber string) Error { func NewErrInvalidPageSizeParameter(badPageSize string) Error { e := NewError() - e.Status = http.StatusBadRequest + e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Invalid page size parameter" e.Detail = "The page size parameter is not positive integer (including 0)." e.Source["parameter"] = "page[size]" @@ -154,7 +156,7 @@ func NewErrInvalidPageSizeParameter(badPageSize string) Error { func NewErrInvalidFieldValueInBody(field string, badValue string, typ string) Error { e := NewError() - e.Status = http.StatusBadRequest + e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Invalid field value in body" e.Detail = "The field value is invalid for the expected type." e.Meta["field"] = field @@ -168,7 +170,7 @@ func NewErrInvalidFieldValueInBody(field string, badValue string, typ string) Er func NewErrDuplicateFieldInFieldsParameter(typ string, field string) Error { e := NewError() - e.Status = http.StatusBadRequest + e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Duplicate field" e.Detail = "The fields parameter contains the same field more than once." e.Source["parameter"] = "fields[" + typ + "]" @@ -181,7 +183,7 @@ func NewErrDuplicateFieldInFieldsParameter(typ string, field string) Error { func NewErrMissingDataMember() Error { e := NewError() - e.Status = http.StatusBadRequest + e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Missing data member" e.Detail = "Missing data top-level member in payload." @@ -192,7 +194,7 @@ func NewErrMissingDataMember() Error { func NewErrUnknownFieldInBody(typ, field string) Error { e := NewError() - e.Status = http.StatusBadRequest + e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Unknown field in body" e.Detail = fmt.Sprintf("%s is not a known field.", field) e.Source["pointer"] = "" // TODO @@ -206,7 +208,7 @@ func NewErrUnknownFieldInBody(typ, field string) Error { func NewErrUnknownFieldInURL(field string) Error { e := NewError() - e.Status = http.StatusBadRequest + e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Unknown field in URL" e.Detail = fmt.Sprintf("%s is not a known field.", field) e.Meta["unknown-field"] = field @@ -222,7 +224,7 @@ func NewErrUnknownFieldInURL(field string) Error { func NewErrUnknownParameter(param string) Error { e := NewError() - e.Status = http.StatusBadRequest + e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Unknown parameter" e.Detail = fmt.Sprintf("%s is not a known parameter.", param) e.Source["parameter"] = param @@ -235,7 +237,7 @@ func NewErrUnknownParameter(param string) Error { func NewErrUnknownRelationshipInPath(typ, rel, path string) Error { e := NewError() - e.Status = http.StatusBadRequest + e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Unknown relationship" e.Detail = fmt.Sprintf("%s is not a relationship of %s.", rel, typ) e.Meta["unknown-relationship"] = rel @@ -249,7 +251,7 @@ func NewErrUnknownRelationshipInPath(typ, rel, path string) Error { func NewErrUnknownTypeInURL(typ string) Error { e := NewError() - e.Status = http.StatusBadRequest + e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Unknown type in URL" e.Detail = fmt.Sprintf("%s is not a known type.", typ) e.Meta["unknown-type"] = typ @@ -261,7 +263,7 @@ func NewErrUnknownTypeInURL(typ string) Error { func NewErrUnknownFieldInFilterParameter(field string) Error { e := NewError() - e.Status = http.StatusBadRequest + e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Unknown field in filter parameter" e.Detail = fmt.Sprintf("%s is not a known field.", field) e.Source["parameter"] = "filter" @@ -274,7 +276,7 @@ func NewErrUnknownFieldInFilterParameter(field string) Error { func NewErrUnknownOperatorInFilterParameter(op string) Error { e := NewError() - e.Status = http.StatusBadRequest + e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Unknown operator in filter parameter" e.Detail = fmt.Sprintf("%s is not a known operator.", op) e.Source["parameter"] = "filter" @@ -287,7 +289,7 @@ func NewErrUnknownOperatorInFilterParameter(op string) Error { func NewErrInvalidValueInFilterParameter(val, kind string) Error { e := NewError() - e.Status = http.StatusBadRequest + e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Unknown value in filter parameter" e.Detail = fmt.Sprintf("%s is not a known value.", val) e.Source["parameter"] = "filter" @@ -300,7 +302,7 @@ func NewErrInvalidValueInFilterParameter(val, kind string) Error { func NewErrUnknownCollationInFilterParameter(col string) Error { e := NewError() - e.Status = http.StatusBadRequest + e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Unknown collation in filter parameter" e.Detail = fmt.Sprintf("%s is not a known collation.", col) e.Source["parameter"] = "filter" @@ -313,7 +315,7 @@ func NewErrUnknownCollationInFilterParameter(col string) Error { func NewErrUnknownFilterParameterLabel(label string) Error { e := NewError() - e.Status = http.StatusBadRequest + e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Unknown label in filter parameter" e.Detail = fmt.Sprintf("%s is not a known filter query label.", label) e.Source["parameter"] = "filter" @@ -326,7 +328,7 @@ func NewErrUnknownFilterParameterLabel(label string) Error { func NewErrUnauthorized() Error { e := NewError() - e.Status = http.StatusUnauthorized + e.Status = strconv.Itoa(http.StatusUnauthorized) e.Title = "Unauthorized" e.Detail = "Authentification is required to perform this request." @@ -337,7 +339,7 @@ func NewErrUnauthorized() Error { func NewErrForbidden() Error { e := NewError() - e.Status = http.StatusForbidden + e.Status = strconv.Itoa(http.StatusForbidden) e.Title = "Forbidden" e.Detail = "Permission is required to perform this request." @@ -348,7 +350,7 @@ func NewErrForbidden() Error { func NewErrNotFound() Error { e := NewError() - e.Status = http.StatusNotFound + e.Status = strconv.Itoa(http.StatusNotFound) e.Title = "Not found" e.Detail = "The URI does not exist." @@ -359,7 +361,7 @@ func NewErrNotFound() Error { func NewErrPayloadTooLarge() Error { e := NewError() - e.Status = http.StatusRequestEntityTooLarge + e.Status = strconv.Itoa(http.StatusRequestEntityTooLarge) e.Title = "Payload too large" e.Detail = "That's what she said." @@ -370,7 +372,7 @@ func NewErrPayloadTooLarge() Error { func NewErrRequestURITooLong() Error { e := NewError() - e.Status = http.StatusRequestURITooLong + e.Status = strconv.Itoa(http.StatusRequestURITooLong) e.Title = "URI too long" return e @@ -380,7 +382,7 @@ func NewErrRequestURITooLong() Error { func NewErrUnsupportedMediaType() Error { e := NewError() - e.Status = http.StatusUnsupportedMediaType + e.Status = strconv.Itoa(http.StatusUnsupportedMediaType) e.Title = "Unsupported media type" return e @@ -390,7 +392,7 @@ func NewErrUnsupportedMediaType() Error { func NewErrTooManyRequests() Error { e := NewError() - e.Status = http.StatusTooManyRequests + e.Status = strconv.Itoa(http.StatusTooManyRequests) e.Title = "Too many requests" return e @@ -400,7 +402,7 @@ func NewErrTooManyRequests() Error { func NewErrRequestHeaderFieldsTooLarge() Error { e := NewError() - e.Status = http.StatusRequestHeaderFieldsTooLarge + e.Status = strconv.Itoa(http.StatusRequestHeaderFieldsTooLarge) e.Title = "Header fields too large" return e @@ -410,7 +412,7 @@ func NewErrRequestHeaderFieldsTooLarge() Error { func NewErrInternalServerError() Error { e := NewError() - e.Status = http.StatusInternalServerError + e.Status = strconv.Itoa(http.StatusInternalServerError) e.Title = "Internal server error" return e @@ -420,7 +422,7 @@ func NewErrInternalServerError() Error { func NewErrServiceUnavailable() Error { e := NewError() - e.Status = http.StatusServiceUnavailable + e.Status = strconv.Itoa(http.StatusServiceUnavailable) e.Title = "Service unavailable" return e @@ -430,7 +432,7 @@ func NewErrServiceUnavailable() Error { func NewErrNotImplemented() Error { e := NewError() - e.Status = http.StatusNotImplemented + e.Status = strconv.Itoa(http.StatusNotImplemented) e.Title = "Not Implemented" return e diff --git a/error_test.go b/error_test.go index bc2ccb2..a89dc31 100644 --- a/error_test.go +++ b/error_test.go @@ -2,6 +2,7 @@ package jsonapi_test import ( "net/http" + "strconv" "testing" . "github.com/mfcochauxlaberge/jsonapi" @@ -44,7 +45,7 @@ func TestError(t *testing.T) { name: "http status code", err: func() Error { e := NewError() - e.Status = http.StatusInternalServerError + e.Status = strconv.Itoa(http.StatusInternalServerError) return e }(), expectedString: "500 Internal Server Error", @@ -52,7 +53,7 @@ func TestError(t *testing.T) { name: "http status code and title", err: func() Error { e := NewError() - e.Status = http.StatusInternalServerError + e.Status = strconv.Itoa(http.StatusInternalServerError) e.Title = "Internal server error" return e }(), @@ -61,7 +62,7 @@ func TestError(t *testing.T) { name: "http status code and detail", err: func() Error { e := NewError() - e.Status = http.StatusInternalServerError + e.Status = strconv.Itoa(http.StatusInternalServerError) e.Detail = "An internal server error occurred." return e }(), diff --git a/marshaling_test.go b/marshaling_test.go index b3f2395..61fb222 100644 --- a/marshaling_test.go +++ b/marshaling_test.go @@ -4,6 +4,7 @@ import ( "fmt" "io/ioutil" "net/http" + "strconv" "testing" "time" @@ -287,7 +288,7 @@ func TestMarshalErrors(t *testing.T) { e1 := NewError() e1.Code = "somecode" - e1.Status = http.StatusInternalServerError + e1.Status = strconv.Itoa(http.StatusInternalServerError) e1.Title = "Error" e1.Detail = "An error occurred." e1.Links["about"] = "https://example.org/errors/about" From 4b6e6b3f656d677b7e2acdfb7b21835494f3d32f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 18 Aug 2019 16:12:48 -0400 Subject: [PATCH 194/406] Add Type.Equal --- type.go | 6 ++++++ type_test.go | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/type.go b/type.go index b185e91..9d94539 100644 --- a/type.go +++ b/type.go @@ -4,6 +4,7 @@ import ( "encoding/json" "errors" "fmt" + "reflect" "sort" "strconv" "strings" @@ -137,6 +138,11 @@ func (t *Type) New() Resource { return &SoftResource{Type: t} } +// Equal ... +func (t Type) Equal(typ Type) bool { + return reflect.DeepEqual(t, typ) +} + // Attr represents a resource attribute. type Attr struct { Name string diff --git a/type_test.go b/type_test.go index 7be19a8..1b2f065 100644 --- a/type_test.go +++ b/type_test.go @@ -59,6 +59,23 @@ func TestType(t *testing.T) { assert.Error(err) } +func TestTypeEqual(t *testing.T) { + assert := assert.New(t) + + // Two empty types + typ1 := Type{} + typ2 := Type{} + assert.True(typ1.Equal(typ2)) + + typ1.Name = "type1" + typ2.Name = "type1" + assert.True(typ1.Equal(typ2)) + + typ1.Name = "type1" + typ2.Name = "type2" + assert.False(typ1.Equal(typ2)) +} + func TestTypeNewFunc(t *testing.T) { assert := assert.New(t) From 03a26a798f2337267fc2f23c02c8b713594f8807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 18 Aug 2019 17:09:45 -0400 Subject: [PATCH 195/406] Add Range function --- range.go | 391 ++++++++++++++++++++++++++++++++++++++++ range_test.go | 333 ++++++++++++++++++++++++++++++++++ soft_collection.go | 358 +----------------------------------- soft_collection_test.go | 305 ------------------------------- 4 files changed, 725 insertions(+), 662 deletions(-) create mode 100644 range.go create mode 100644 range_test.go diff --git a/range.go b/range.go new file mode 100644 index 0000000..b48523a --- /dev/null +++ b/range.go @@ -0,0 +1,391 @@ +package jsonapi + +import ( + "fmt" + "sort" + "strings" + "time" +) + +// Range returns a subset of the collection arranged according to the given +// parameters. +// +// From collection c, only IDs from ids are considered. filter is applied if not +// nil. The resources are sorted in the order defined by sort, which may contain +// the names of some or all of the attributes. The result is split in pages of a +// certain size (defined by size). The page at index num is returned. +// +// A non-nil Collection is always returned, but it can be empty. +func Range(c Collection, ids []string, filter *Filter, sort []string, size uint, num uint) Collection { + col := sortedResources{} + + // Filter IDs + if len(ids) > 0 { + for i := 0; i < c.Len(); i++ { + for _, id := range ids { + res := c.At(i) + if res.GetID() == id { + col.col = append(col.col, res) + } + } + } + } else { + for i := 0; i < c.Len(); i++ { + col.col = append(col.col, c.At(i)) + } + } + + // Filter + if filter != nil { + i := 0 + for i < col.Len() { + if !filter.IsAllowed(col.col[i]) { + col.col = append(col.col[:i], col.col[i+1:]...) + } else { + i++ + } + } + } + + // Sort + col.Sort(sort) + + // Pagination + var page Resources + skip := int(num * size) + if skip >= len(col.col) { + col = sortedResources{} + } else { + for i := skip; i < len(col.col) && i < skip+int(size); i++ { + page = append(page, col.col[i]) + } + } + + return &page +} + +// sortedResources is an internal struct for sorting Collections with the Range +// function. +type sortedResources struct { + rules []string + col Resources +} + +// Sort rearranges the order of the collection according the rules. +func (s sortedResources) Sort(rules []string) { + s.rules = rules + if len(s.rules) == 0 { + s.rules = []string{"id"} + } + sort.Sort(s) +} + +// Len implements sort.Interface's Len method. +func (s sortedResources) Len() int { + return len(s.col) +} + +// Swap implements sort.Interface's Swap method. +func (s sortedResources) Swap(i, j int) { + s.col[i], s.col[j] = s.col[j], s.col[i] +} + +// Less implements sort.Interface's Less method. +func (s sortedResources) Less(i, j int) bool { + for _, r := range s.rules { + inverse := false + if strings.HasPrefix(r, "-") { + r = r[1:] + inverse = true + } + + if r == "id" { + return s.col[i].GetID() < s.col[j].GetID() != inverse + } + + // Check type + typ := s.col.At(i).GetType() + typ2 := s.col.At(j).GetType() + if !typ.Equal(typ2) { + panic("cannot compare two resources of different types") + } + + attr, ok := typ.Attrs[r] + if !ok { + panic("cannot sort on a unknown attribute") + } + + v := s.col[i].Get(r) + if v == nil { + v = GetZeroValue(attr.Type, attr.Nullable) + } + v2 := s.col[j].Get(r) + if v2 == nil { + v2 = GetZeroValue(attr.Type, attr.Nullable) + } + + if fmt.Sprintf("%T", v) != fmt.Sprintf("%T", v2) { + panic("cannot compare two values of different types") + } + + // Here we return true if v < v2. + // The "!= inverse" part acts as a XOR operation so that + // the opposite boolean is returned when inverse sorting + // is required. + switch v := v.(type) { + case string: + v2 := v2.(string) + if v == v2 { + continue + } + return v < v2 != inverse + case int: + v2 := v2.(int) + if v == v2 { + continue + } + return v < v2 != inverse + case int8: + v2 := v2.(int8) + if v == v2 { + continue + } + return v < v2 != inverse + case int16: + v2 := v2.(int16) + if v == v2 { + continue + } + return v < v2 != inverse + case int32: + v2 := v2.(int32) + if v == v2 { + continue + } + return v < v2 != inverse + case int64: + v2 := v2.(int64) + if v == v2 { + continue + } + return v < v2 != inverse + case uint: + v2 := v2.(uint) + if v == v2 { + continue + } + return v < v2 != inverse + case uint8: + v2 := v2.(uint8) + if v == v2 { + continue + } + return v < v2 != inverse + case uint16: + v2 := v2.(uint16) + if v == v2 { + continue + } + return v < v2 != inverse + case uint32: + v2 := v2.(uint32) + if v == v2 { + continue + } + return v < v2 != inverse + case bool: + v2 := v2.(bool) + if v == v2 { + continue + } + return !v != inverse + case time.Time: + if v.Equal(v2.(time.Time)) { + continue + } + return v.Before(v2.(time.Time)) != inverse + case *string: + v2 := v2.(*string) + if v == v2 { + continue + } + if v == nil { + return !inverse + } + if v2 == nil { + return inverse + } + if *v == *v2 { + continue + } + return *v < *v2 != inverse + case *int: + v2 := v2.(*int) + if v == v2 { + continue + } + if v == nil { + return !inverse + } + if v2 == nil { + return inverse + } + if *v == *v2 { + continue + } + return *v < *v2 != inverse + case *int8: + v2 := v2.(*int8) + if v == v2 { + continue + } + if v == nil { + return !inverse + } + if v2 == nil { + return inverse + } + if *v == *v2 { + continue + } + return *v < *v2 != inverse + case *int16: + v2 := v2.(*int16) + if v == v2 { + continue + } + if v == nil { + return !inverse + } + if v2 == nil { + return inverse + } + if *v == *v2 { + continue + } + return *v < *v2 != inverse + case *int32: + v2 := v2.(*int32) + if v == v2 { + continue + } + if v == nil { + return !inverse + } + if v2 == nil { + return inverse + } + if *v == *v2 { + continue + } + return *v < *v2 != inverse + case *int64: + v2 := v2.(*int64) + if v == v2 { + continue + } + if v == nil { + return !inverse + } + if v2 == nil { + return inverse + } + if *v == *v2 { + continue + } + return *v < *v2 != inverse + case *uint: + v2 := v2.(*uint) + if v == v2 { + continue + } + if v == nil { + return !inverse + } + if v2 == nil { + return inverse + } + if *v == *v2 { + continue + } + return *v < *v2 != inverse + case *uint8: + v2 := v2.(*uint8) + if v == v2 { + continue + } + if v == nil { + return !inverse + } + if v2 == nil { + return inverse + } + if *v == *v2 { + continue + } + return *v < *v2 != inverse + case *uint16: + v2 := v2.(*uint16) + if v == v2 { + continue + } + if v == nil { + return !inverse + } + if v2 == nil { + return inverse + } + if *v == *v2 { + continue + } + return *v < *v2 != inverse + case *uint32: + v2 := v2.(*uint32) + if v == v2 { + continue + } + if v == nil { + return !inverse + } + if v2 == nil { + return inverse + } + if *v == *v2 { + continue + } + return *v < *v2 != inverse + case *bool: + v2 := v2.(*bool) + if v == v2 { + continue + } + if v == nil { + return !inverse + } + if v2 == nil { + return inverse + } + if *v == *v2 { + continue + } + return !*v != inverse + case *time.Time: + v2 := v2.(*time.Time) + if v == v2 { + continue + } + if v == nil { + return !inverse + } + if v2 == nil { + return inverse + } + if v.Equal(*v2) { + continue + } + return v.Before(*v2) != inverse + } + } + + return false +} diff --git a/range_test.go b/range_test.go new file mode 100644 index 0000000..d8e636a --- /dev/null +++ b/range_test.go @@ -0,0 +1,333 @@ +package jsonapi_test + +import ( + "fmt" + "sort" + "strconv" + "testing" + "time" + + . "github.com/mfcochauxlaberge/jsonapi" + + "github.com/stretchr/testify/assert" +) + +func TestRange(t *testing.T) { + assert := assert.New(t) + + // Collection + col := Resources{} + typ := &Type{} + _ = typ.AddAttr(Attr{ + Name: "attr1", + Type: AttrTypeString, + Nullable: false, + }) + _ = typ.AddAttr(Attr{ + Name: "attr2", + Type: AttrTypeInt, + Nullable: false, + }) + + resources := []struct { + id string + fields map[string]interface{} + }{ + { + id: "res1", + fields: map[string]interface{}{ + "attr1": "string1", + "attr2": 2, + }, + }, { + id: "res2", + fields: map[string]interface{}{ + "attr1": "string2", + "attr2": 2, + }, + }, { + id: "res3", + fields: map[string]interface{}{ + "attr1": "string2", + "attr2": 0, + }, + }, { + id: "res4", + fields: map[string]interface{}{ + "attr1": "string2", + "attr2": 2, + }, + }, { + id: "res5", + fields: map[string]interface{}{ + "attr1": "string3", + "attr2": 2, + }, + }, { + id: "res6", + fields: map[string]interface{}{ + "attr1": "string3", + "attr2": 4, + }, + }, { + id: "res7", + fields: map[string]interface{}{ + "attr1": "string4", + "attr2": 0, + }, + }, { + id: "res8", + fields: map[string]interface{}{ + "attr1": "string5", + "attr2": 2, + }, + }, + } + + for _, res := range resources { + sr := &SoftResource{} + sr.SetType(typ) + sr.SetID(res.id) + for field, val := range res.fields { + sr.Set(field, val) + } + col.Add(sr) + } + + // Range test 1 + ranged := Range( + // Collection + &col, + // IDs + []string{}, + // Filter + nil, + // Sort + []string{}, + // PageSize + 10, + // PageNumber + 0, + ) + + expectedIDs := []string{ + "res1", "res2", "res3", "res4", "res5", "res6", "res7", "res8", + } + ids := []string{} + for i := 0; i < ranged.Len(); i++ { + ids = append(ids, ranged.At(i).GetID()) + } + assert.Equal(expectedIDs, ids, "range of IDs (1)") + + // Range test 2 + ranged = Range( + // Collection + &col, + // IDs + []string{"res1", "res2", "res3", "res4", "res5", "res6"}, + // Filter + &Filter{Field: "attr2", Op: "=", Val: 2}, + // Sort + []string{"-attr1"}, + // PageSize + 2, + // PageNumber + 0, + ) + + expectedIDs = []string{"res5", "res2"} + ids = []string{} + for i := 0; i < ranged.Len(); i++ { + ids = append(ids, ranged.At(i).GetID()) + } + assert.Equal(expectedIDs, ids, "range of IDs (2)") + + // Range test 3 + assert.Equal( + 0, + Range(&Resources{}, nil, nil, nil, 1, 100).Len(), + "range of IDs (3)", + ) +} +func TestSortResources(t *testing.T) { + assert := assert.New(t) + + var ( + now = time.Now() + col Collection = &Resources{} + ) + + // A collection of resources will be created and + // one attribute will be added for each entry from + // the following slice. + // The point is to provoke all possible scenarios + // for each attribute type. + attrs := []struct { + vals [2]interface{} + }{ + // non-nullable + {vals: [2]interface{}{"", "a"}}, + {vals: [2]interface{}{int(-1), int(0)}}, + {vals: [2]interface{}{int8(-1), int8(0)}}, + {vals: [2]interface{}{int16(-1), int16(0)}}, + {vals: [2]interface{}{int32(-1), int32(0)}}, + {vals: [2]interface{}{int64(-1), int64(0)}}, + {vals: [2]interface{}{uint(0), uint(1)}}, + {vals: [2]interface{}{uint8(0), uint8(1)}}, + {vals: [2]interface{}{uint16(0), uint16(1)}}, + {vals: [2]interface{}{uint32(0), uint32(1)}}, + {vals: [2]interface{}{uint64(0), uint64(1)}}, + {vals: [2]interface{}{false, true}}, + {vals: [2]interface{}{now, now.Add(time.Second)}}, + // nullable + {vals: [2]interface{}{nilptr("string"), nilptr("string")}}, + {vals: [2]interface{}{nilptr("string"), ptr("a")}}, + {vals: [2]interface{}{ptr(""), nilptr("string")}}, + {vals: [2]interface{}{ptr(""), ptr("")}}, + {vals: [2]interface{}{ptr(""), ptr("a")}}, + {vals: [2]interface{}{nilptr("int"), nilptr("int")}}, + {vals: [2]interface{}{nilptr("int"), ptr(int(0))}}, + {vals: [2]interface{}{ptr(int(-1)), nilptr("int")}}, + {vals: [2]interface{}{ptr(int(-1)), ptr(int(-1))}}, + {vals: [2]interface{}{ptr(int(-1)), ptr(int(0))}}, + {vals: [2]interface{}{nilptr("int8"), nilptr("int8")}}, + {vals: [2]interface{}{nilptr("int8"), ptr(int8(0))}}, + {vals: [2]interface{}{ptr(int8(-1)), nilptr("int8")}}, + {vals: [2]interface{}{ptr(int8(-1)), ptr(int8(-1))}}, + {vals: [2]interface{}{ptr(int8(-1)), ptr(int8(0))}}, + {vals: [2]interface{}{nilptr("int16"), nilptr("int16")}}, + {vals: [2]interface{}{nilptr("int16"), ptr(int16(0))}}, + {vals: [2]interface{}{ptr(int16(-1)), nilptr("int16")}}, + {vals: [2]interface{}{ptr(int16(-1)), ptr(int16(-1))}}, + {vals: [2]interface{}{ptr(int16(-1)), ptr(int16(0))}}, + {vals: [2]interface{}{nilptr("int32"), nilptr("int32")}}, + {vals: [2]interface{}{nilptr("int32"), ptr(int32(0))}}, + {vals: [2]interface{}{ptr(int32(-1)), nilptr("int32")}}, + {vals: [2]interface{}{ptr(int32(-1)), ptr(int32(-1))}}, + {vals: [2]interface{}{ptr(int32(-1)), ptr(int32(0))}}, + {vals: [2]interface{}{nilptr("int64"), nilptr("int64")}}, + {vals: [2]interface{}{nilptr("int64"), ptr(int64(0))}}, + {vals: [2]interface{}{ptr(int64(-1)), nilptr("int64")}}, + {vals: [2]interface{}{ptr(int64(-1)), ptr(int64(-1))}}, + {vals: [2]interface{}{ptr(int64(-1)), ptr(int64(0))}}, + {vals: [2]interface{}{nilptr("uint"), nilptr("uint")}}, + {vals: [2]interface{}{nilptr("uint"), ptr(uint(0))}}, + {vals: [2]interface{}{ptr(uint(0)), nilptr("uint")}}, + {vals: [2]interface{}{ptr(uint(0)), ptr(uint(0))}}, + {vals: [2]interface{}{ptr(uint(0)), ptr(uint(1))}}, + {vals: [2]interface{}{nilptr("uint8"), nilptr("uint8")}}, + {vals: [2]interface{}{nilptr("uint8"), ptr(uint8(0))}}, + {vals: [2]interface{}{ptr(uint8(0)), nilptr("uint8")}}, + {vals: [2]interface{}{ptr(uint8(0)), ptr(uint8(0))}}, + {vals: [2]interface{}{ptr(uint8(0)), ptr(uint8(1))}}, + {vals: [2]interface{}{nilptr("uint16"), nilptr("uint16")}}, + {vals: [2]interface{}{nilptr("uint16"), ptr(uint16(0))}}, + {vals: [2]interface{}{ptr(uint16(0)), nilptr("uint16")}}, + {vals: [2]interface{}{ptr(uint16(0)), ptr(uint16(0))}}, + {vals: [2]interface{}{ptr(uint16(0)), ptr(uint16(1))}}, + {vals: [2]interface{}{nilptr("uint32"), nilptr("uint32")}}, + {vals: [2]interface{}{nilptr("uint32"), ptr(uint32(0))}}, + {vals: [2]interface{}{ptr(uint32(0)), nilptr("uint32")}}, + {vals: [2]interface{}{ptr(uint32(0)), ptr(uint32(0))}}, + {vals: [2]interface{}{ptr(uint32(0)), ptr(uint32(1))}}, + {vals: [2]interface{}{nilptr("uint64"), nilptr("uint64")}}, + {vals: [2]interface{}{nilptr("uint64"), ptr(uint64(0))}}, + {vals: [2]interface{}{ptr(uint64(0)), nilptr("uint64")}}, + {vals: [2]interface{}{ptr(uint64(0)), ptr(uint64(0))}}, + {vals: [2]interface{}{ptr(uint64(0)), ptr(uint64(1))}}, + {vals: [2]interface{}{nilptr("bool"), nilptr("bool")}}, + {vals: [2]interface{}{nilptr("bool"), ptr(false)}}, + {vals: [2]interface{}{ptr(false), nilptr("bool")}}, + {vals: [2]interface{}{ptr(false), ptr(false)}}, + {vals: [2]interface{}{ptr(false), ptr(true)}}, + {vals: [2]interface{}{nilptr("time.Time"), nilptr("time.Time")}}, + {vals: [2]interface{}{nilptr("time.Time"), ptr(now)}}, + {vals: [2]interface{}{ptr(now), ptr(now)}}, + {vals: [2]interface{}{ptr(now), ptr(now.Add(time.Second))}}, + } + + // Add attributes to type + typ := &Type{Name: "type"} + for i, t := range attrs { + ti, null := GetAttrType(fmt.Sprintf("%T", t.vals[0])) + _ = typ.AddAttr(Attr{ + Name: "attr" + strconv.Itoa(i), + Type: ti, + Nullable: null, + }) + } + + // Add resources and attributes + for i := range attrs { + sr := &SoftResource{ + Type: typ, + } + sr.SetID("id" + strconv.Itoa(i)) + for j := range attrs { + if i != j { + sr.Set("attr"+strconv.Itoa(j), attrs[j].vals[0]) + } else { + sr.Set("attr"+strconv.Itoa(j), attrs[j].vals[1]) + } + } + col.Add(sr) + } + + // Sort collection + rules := []string{} + for i := 0; i < col.Len(); i++ { + reverse := "" + if i%3 == 0 { + reverse = "-" + } + rules = append(rules, reverse+"attr"+strconv.Itoa(i)) + } + rules = append(rules, "id") + page := Range( + col, + nil, + nil, + rules, + 1000, + 0, + ) + + // Sorted IDs from the collection + ids := []string{} + for i := 0; i < page.Len(); i++ { + ids = append(ids, page.At(i).GetID()) + } + + expectedIDs := []string{ + "id0", "id3", "id6", "id9", "id12", "id20", "id24", "id25", "id27", + "id35", "id39", "id40", "id42", "id50", "id54", "id55", "id57", + "id69", "id70", "id72", "id10", "id13", "id16", "id18", "id21", + "id23", "id26", "id28", "id31", "id33", "id36", "id38", "id41", + "id43", "id46", "id48", "id51", "id53", "id56", "id58", "id61", + "id63", "id64", "id65", "id66", "id67", "id68", "id71", "id73", + "id75", "id76", "id74", "id62", "id60", "id59", "id52", "id49", + "id47", "id45", "id44", "id37", "id34", "id32", "id30", "id29", + "id22", "id19", "id17", "id15", "id14", "id11", "id8", "id7", "id5", + "id4", "id2", "id1", + } + assert.Equal(expectedIDs, ids, fmt.Sprintf("sort with rules: %v", rules)) + + // Sort with an empty list of sorting rules. + // col.Sort([]string{}) + page = Range( + col, + nil, + nil, + []string{}, + 1000, + 0, + ) + + ids = []string{} + for i := 0; i < page.Len(); i++ { + ids = append(ids, page.At(i).GetID()) + } + + sort.Strings(expectedIDs) + assert.Equal(expectedIDs, ids, "sort by ID") +} diff --git a/soft_collection.go b/soft_collection.go index 3d886d6..6d6e331 100644 --- a/soft_collection.go +++ b/soft_collection.go @@ -1,18 +1,11 @@ package jsonapi -import ( - "sort" - "strings" - "time" -) - // SoftCollection is a collection of SoftResources where the type can be changed // for all elements at once by modifying the Type field. type SoftCollection struct { Type *Type - col []*SoftResource - sort []string + col []*SoftResource } // SetType sets the collection's type. @@ -61,64 +54,6 @@ func (s *SoftCollection) Resource(id string, fields []string) Resource { return nil } -// Range returns a subset of the collection arranged according to the -// given parameters. -func (s *SoftCollection) Range(ids []string, filter *Filter, sort []string, fields []string, pageSize uint, pageNumber uint) []Resource { - rangeCol := &SoftCollection{} - rangeCol.SetType(s.Type) - - // Filter IDs - if len(ids) > 0 { - for _, rec := range s.col { - for _, id := range ids { - if rec.id == id { - rangeCol.Add(rec) - } - } - } - } else { - for _, rec := range s.col { - rangeCol.Add(rec) - } - } - - // Filter - if filter != nil { - i := 0 - for i < len(rangeCol.col) { - if !filter.IsAllowed(rangeCol.col[i]) { - rangeCol.col = append(rangeCol.col[:i], rangeCol.col[i+1:]...) - } else { - i++ - } - } - } - - // Sort - rangeCol.Sort(sort) - - // Pagination - skip := int(pageNumber * pageSize) - if skip >= len(rangeCol.col) { - rangeCol = &SoftCollection{} - } else { - page := &SoftCollection{} - page.SetType(s.Type) - for i := skip; i < len(rangeCol.col) && i < skip+int(pageSize); i++ { - page.Add(rangeCol.col[i]) - } - rangeCol = page - } - - // Make the collection - col := []Resource{} - for _, rec := range rangeCol.col { - col = append(col, rec) - } - - return col -} - // Add creates a SoftResource and adds it to the collection. func (s *SoftCollection) Add(r Resource) { // A SoftResource is built from the Resource and @@ -155,294 +90,3 @@ func (s *SoftCollection) Remove(id string) { } } } - -// Sort rearranges the order of the collection according the rules. -func (s *SoftCollection) Sort(rules []string) { - s.sort = rules - - if len(s.sort) == 0 { - s.sort = []string{"id"} - } - - sort.Sort(s) -} - -// Swap implements sort.Interface's Swap method. -func (s *SoftCollection) Swap(i, j int) { - s.col[i], s.col[j] = s.col[j], s.col[i] -} - -// Less implements sort.Interface's Less method. -func (s *SoftCollection) Less(i, j int) bool { - for _, r := range s.sort { - inverse := false - if strings.HasPrefix(r, "-") { - r = r[1:] - inverse = true - } - - if r == "id" { - return s.col[i].GetID() < s.col[j].GetID() != inverse - } - - // Here we return true if v < v2. - // The "!= inverse" part acts as a XOR operation so that - // the opposite boolean is returned when inverse sorting - // is required. - switch v := s.col[i].data[r].(type) { - case string: - v2 := s.col[j].data[r].(string) - if v == v2 { - continue - } - return v < v2 != inverse - case int: - v2 := s.col[j].data[r].(int) - if v == v2 { - continue - } - return v < v2 != inverse - case int8: - v2 := s.col[j].data[r].(int8) - if v == v2 { - continue - } - return v < v2 != inverse - case int16: - v2 := s.col[j].data[r].(int16) - if v == v2 { - continue - } - return v < v2 != inverse - case int32: - v2 := s.col[j].data[r].(int32) - if v == v2 { - continue - } - return v < v2 != inverse - case int64: - v2 := s.col[j].data[r].(int64) - if v == v2 { - continue - } - return v < v2 != inverse - case uint: - v2 := s.col[j].data[r].(uint) - if v == v2 { - continue - } - return v < v2 != inverse - case uint8: - v2 := s.col[j].data[r].(uint8) - if v == v2 { - continue - } - return v < v2 != inverse - case uint16: - v2 := s.col[j].data[r].(uint16) - if v == v2 { - continue - } - return v < v2 != inverse - case uint32: - v2 := s.col[j].data[r].(uint32) - if v == v2 { - continue - } - return v < v2 != inverse - case bool: - v2 := s.col[j].data[r].(bool) - if v == v2 { - continue - } - return !v != inverse - case time.Time: - if v.Equal(s.col[j].data[r].(time.Time)) { - continue - } - return v.Before(s.col[j].data[r].(time.Time)) != inverse - case *string: - p := s.col[j].data[r].(*string) - if v == p { - continue - } - if v == nil { - return !inverse - } - if p == nil { - return inverse - } - if *v == *p { - continue - } - return *v < *p != inverse - case *int: - p := s.col[j].data[r].(*int) - if v == p { - continue - } - if v == nil { - return !inverse - } - if p == nil { - return inverse - } - if *v == *p { - continue - } - return *v < *p != inverse - case *int8: - p := s.col[j].data[r].(*int8) - if v == p { - continue - } - if v == nil { - return !inverse - } - if p == nil { - return inverse - } - if *v == *p { - continue - } - return *v < *p != inverse - case *int16: - p := s.col[j].data[r].(*int16) - if v == p { - continue - } - if v == nil { - return !inverse - } - if p == nil { - return inverse - } - if *v == *p { - continue - } - return *v < *p != inverse - case *int32: - p := s.col[j].data[r].(*int32) - if v == p { - continue - } - if v == nil { - return !inverse - } - if p == nil { - return inverse - } - if *v == *p { - continue - } - return *v < *p != inverse - case *int64: - p := s.col[j].data[r].(*int64) - if v == p { - continue - } - if v == nil { - return !inverse - } - if p == nil { - return inverse - } - if *v == *p { - continue - } - return *v < *p != inverse - case *uint: - p := s.col[j].data[r].(*uint) - if v == p { - continue - } - if v == nil { - return !inverse - } - if p == nil { - return inverse - } - if *v == *p { - continue - } - return *v < *p != inverse - case *uint8: - p := s.col[j].data[r].(*uint8) - if v == p { - continue - } - if v == nil { - return !inverse - } - if p == nil { - return inverse - } - if *v == *p { - continue - } - return *v < *p != inverse - case *uint16: - p := s.col[j].data[r].(*uint16) - if v == p { - continue - } - if v == nil { - return !inverse - } - if p == nil { - return inverse - } - if *v == *p { - continue - } - return *v < *p != inverse - case *uint32: - p := s.col[j].data[r].(*uint32) - if v == p { - continue - } - if v == nil { - return !inverse - } - if p == nil { - return inverse - } - if *v == *p { - continue - } - return *v < *p != inverse - case *bool: - p := s.col[j].data[r].(*bool) - if v == p { - continue - } - if v == nil { - return !inverse - } - if p == nil { - return inverse - } - if *v == *p { - continue - } - return !*v != inverse - case *time.Time: - p := s.col[j].data[r].(*time.Time) - if v == p { - continue - } - if v == nil { - return !inverse - } - if p == nil { - return inverse - } - if v.Equal(*p) { - continue - } - return v.Before(*p) != inverse - } - } - - return false -} diff --git a/soft_collection_test.go b/soft_collection_test.go index 20b0172..bd74d1e 100644 --- a/soft_collection_test.go +++ b/soft_collection_test.go @@ -1,11 +1,7 @@ package jsonapi_test import ( - "fmt" - "sort" - "strconv" "testing" - "time" . "github.com/mfcochauxlaberge/jsonapi" @@ -158,307 +154,6 @@ func TestSoftCollectionResource(t *testing.T) { assert.Equal(t, nil, sc.Resource("notfound", nil)) } -func TestSoftCollectionRange(t *testing.T) { - assert := assert.New(t) - - // Collection - col := SoftCollection{} - col.SetType(&Type{}) - _ = col.AddAttr(Attr{ - Name: "attr1", - Type: AttrTypeString, - Nullable: false, - }) - _ = col.AddAttr(Attr{ - Name: "attr2", - Type: AttrTypeInt, - Nullable: false, - }) - - resources := []struct { - id string - fields map[string]interface{} - }{ - { - id: "res1", - fields: map[string]interface{}{ - "attr1": "string1", - "attr2": 2, - }, - }, { - id: "res2", - fields: map[string]interface{}{ - "attr1": "string2", - "attr2": 2, - }, - }, { - id: "res3", - fields: map[string]interface{}{ - "attr1": "string2", - "attr2": 0, - }, - }, { - id: "res4", - fields: map[string]interface{}{ - "attr1": "string2", - "attr2": 2, - }, - }, { - id: "res5", - fields: map[string]interface{}{ - "attr1": "string3", - "attr2": 2, - }, - }, { - id: "res6", - fields: map[string]interface{}{ - "attr1": "string3", - "attr2": 4, - }, - }, { - id: "res7", - fields: map[string]interface{}{ - "attr1": "string4", - "attr2": 0, - }, - }, { - id: "res8", - fields: map[string]interface{}{ - "attr1": "string5", - "attr2": 2, - }, - }, - } - - for _, res := range resources { - sr := &SoftResource{} - sr.SetType(col.Type) - sr.SetID(res.id) - for field, val := range res.fields { - sr.Set(field, val) - } - col.Add(sr) - } - - // Range test 1 - rangd := col.Range( - // IDs - []string{}, - // Filter - nil, - // Sort - []string{}, - // Fields - []string{}, - // PageSize - 10, - // PageNumber - 0, - ) - - expectedIDs := []string{ - "res1", "res2", "res3", "res4", "res5", "res6", "res7", "res8", - } - ids := []string{} - for i := 0; i < len(rangd); i++ { - ids = append(ids, rangd[i].GetID()) - } - assert.Equal(expectedIDs, ids, "range of IDs (1)") - - // Range test 2 - rangd = col.Range( - // IDs - []string{"res1", "res2", "res3", "res4", "res5", "res6"}, - // Filter - &Filter{Field: "attr2", Op: "=", Val: 2}, - // Sort - []string{"-attr1"}, - // Fields - []string{"attr1", "attr2"}, - // PageSize - 2, - // PageNumber - 0, - ) - - expectedIDs = []string{"res5", "res2"} - ids = []string{} - for i := 0; i < len(rangd); i++ { - ids = append(ids, rangd[i].GetID()) - } - assert.Equal(expectedIDs, ids, "range of IDs (2)") - - // Range test 3 - assert.Equal(0, len(col.Range(nil, nil, nil, nil, 1, 100)), "range of IDs (3)") -} -func TestSoftCollectionSort(t *testing.T) { - assert := assert.New(t) - - var ( - now = time.Now() - sc = &SoftCollection{} - ) - - // A collection of resources will be created and - // one attribute will be added for each entry from - // the following slice. - // The point is to provoke all possible scenarios - // for each attribute type. - attrs := []struct { - vals [2]interface{} - }{ - // non-nullable - {vals: [2]interface{}{"", "a"}}, - {vals: [2]interface{}{int(-1), int(0)}}, - {vals: [2]interface{}{int8(-1), int8(0)}}, - {vals: [2]interface{}{int16(-1), int16(0)}}, - {vals: [2]interface{}{int32(-1), int32(0)}}, - {vals: [2]interface{}{int64(-1), int64(0)}}, - {vals: [2]interface{}{uint(0), uint(1)}}, - {vals: [2]interface{}{uint8(0), uint8(1)}}, - {vals: [2]interface{}{uint16(0), uint16(1)}}, - {vals: [2]interface{}{uint32(0), uint32(1)}}, - {vals: [2]interface{}{uint64(0), uint64(1)}}, - {vals: [2]interface{}{false, true}}, - {vals: [2]interface{}{now, now.Add(time.Second)}}, - // nullable - {vals: [2]interface{}{nilptr("string"), nilptr("string")}}, - {vals: [2]interface{}{nilptr("string"), ptr("a")}}, - {vals: [2]interface{}{ptr(""), nilptr("string")}}, - {vals: [2]interface{}{ptr(""), ptr("")}}, - {vals: [2]interface{}{ptr(""), ptr("a")}}, - {vals: [2]interface{}{nilptr("int"), nilptr("int")}}, - {vals: [2]interface{}{nilptr("int"), ptr(int(0))}}, - {vals: [2]interface{}{ptr(int(-1)), nilptr("int")}}, - {vals: [2]interface{}{ptr(int(-1)), ptr(int(-1))}}, - {vals: [2]interface{}{ptr(int(-1)), ptr(int(0))}}, - {vals: [2]interface{}{nilptr("int8"), nilptr("int8")}}, - {vals: [2]interface{}{nilptr("int8"), ptr(int8(0))}}, - {vals: [2]interface{}{ptr(int8(-1)), nilptr("int8")}}, - {vals: [2]interface{}{ptr(int8(-1)), ptr(int8(-1))}}, - {vals: [2]interface{}{ptr(int8(-1)), ptr(int8(0))}}, - {vals: [2]interface{}{nilptr("int16"), nilptr("int16")}}, - {vals: [2]interface{}{nilptr("int16"), ptr(int16(0))}}, - {vals: [2]interface{}{ptr(int16(-1)), nilptr("int16")}}, - {vals: [2]interface{}{ptr(int16(-1)), ptr(int16(-1))}}, - {vals: [2]interface{}{ptr(int16(-1)), ptr(int16(0))}}, - {vals: [2]interface{}{nilptr("int32"), nilptr("int32")}}, - {vals: [2]interface{}{nilptr("int32"), ptr(int32(0))}}, - {vals: [2]interface{}{ptr(int32(-1)), nilptr("int32")}}, - {vals: [2]interface{}{ptr(int32(-1)), ptr(int32(-1))}}, - {vals: [2]interface{}{ptr(int32(-1)), ptr(int32(0))}}, - {vals: [2]interface{}{nilptr("int64"), nilptr("int64")}}, - {vals: [2]interface{}{nilptr("int64"), ptr(int64(0))}}, - {vals: [2]interface{}{ptr(int64(-1)), nilptr("int64")}}, - {vals: [2]interface{}{ptr(int64(-1)), ptr(int64(-1))}}, - {vals: [2]interface{}{ptr(int64(-1)), ptr(int64(0))}}, - {vals: [2]interface{}{nilptr("uint"), nilptr("uint")}}, - {vals: [2]interface{}{nilptr("uint"), ptr(uint(0))}}, - {vals: [2]interface{}{ptr(uint(0)), nilptr("uint")}}, - {vals: [2]interface{}{ptr(uint(0)), ptr(uint(0))}}, - {vals: [2]interface{}{ptr(uint(0)), ptr(uint(1))}}, - {vals: [2]interface{}{nilptr("uint8"), nilptr("uint8")}}, - {vals: [2]interface{}{nilptr("uint8"), ptr(uint8(0))}}, - {vals: [2]interface{}{ptr(uint8(0)), nilptr("uint8")}}, - {vals: [2]interface{}{ptr(uint8(0)), ptr(uint8(0))}}, - {vals: [2]interface{}{ptr(uint8(0)), ptr(uint8(1))}}, - {vals: [2]interface{}{nilptr("uint16"), nilptr("uint16")}}, - {vals: [2]interface{}{nilptr("uint16"), ptr(uint16(0))}}, - {vals: [2]interface{}{ptr(uint16(0)), nilptr("uint16")}}, - {vals: [2]interface{}{ptr(uint16(0)), ptr(uint16(0))}}, - {vals: [2]interface{}{ptr(uint16(0)), ptr(uint16(1))}}, - {vals: [2]interface{}{nilptr("uint32"), nilptr("uint32")}}, - {vals: [2]interface{}{nilptr("uint32"), ptr(uint32(0))}}, - {vals: [2]interface{}{ptr(uint32(0)), nilptr("uint32")}}, - {vals: [2]interface{}{ptr(uint32(0)), ptr(uint32(0))}}, - {vals: [2]interface{}{ptr(uint32(0)), ptr(uint32(1))}}, - {vals: [2]interface{}{nilptr("uint64"), nilptr("uint64")}}, - {vals: [2]interface{}{nilptr("uint64"), ptr(uint64(0))}}, - {vals: [2]interface{}{ptr(uint64(0)), nilptr("uint64")}}, - {vals: [2]interface{}{ptr(uint64(0)), ptr(uint64(0))}}, - {vals: [2]interface{}{ptr(uint64(0)), ptr(uint64(1))}}, - {vals: [2]interface{}{nilptr("bool"), nilptr("bool")}}, - {vals: [2]interface{}{nilptr("bool"), ptr(false)}}, - {vals: [2]interface{}{ptr(false), nilptr("bool")}}, - {vals: [2]interface{}{ptr(false), ptr(false)}}, - {vals: [2]interface{}{ptr(false), ptr(true)}}, - {vals: [2]interface{}{nilptr("time.Time"), nilptr("time.Time")}}, - {vals: [2]interface{}{nilptr("time.Time"), ptr(now)}}, - {vals: [2]interface{}{ptr(now), ptr(now)}}, - {vals: [2]interface{}{ptr(now), ptr(now.Add(time.Second))}}, - } - - // Add attributes to type - typ := &Type{Name: "type"} - for i, t := range attrs { - ti, null := GetAttrType(fmt.Sprintf("%T", t.vals[0])) - _ = typ.AddAttr(Attr{ - Name: "attr" + strconv.Itoa(i), - Type: ti, - Nullable: null, - }) - } - sc.SetType(typ) - - // Add resources - for i := range attrs { - sr := &SoftResource{} - sr.SetType(typ) - sr.SetID("id" + strconv.Itoa(i)) - for j := range attrs { - if i != j { - sr.Set("attr"+strconv.Itoa(j), attrs[j].vals[0]) - } else { - sr.Set("attr"+strconv.Itoa(j), attrs[j].vals[1]) - } - } - sc.Add(sr) - } - - // Sort collection - rules := []string{} - for i := 0; i < sc.Len(); i++ { - reverse := "" - if i%3 == 0 { - reverse = "-" - } - rules = append(rules, reverse+"attr"+strconv.Itoa(i)) - } - rules = append(rules, "id") - sc.Sort(rules) - - // Sorted IDs from the collection - ids := []string{} - for i := 0; i < sc.Len(); i++ { - ids = append(ids, sc.At(i).GetID()) - } - - expectedIDs := []string{ - "id0", "id3", "id6", "id9", "id12", "id20", "id24", "id25", "id27", - "id35", "id39", "id40", "id42", "id50", "id54", "id55", "id57", - "id69", "id70", "id72", "id10", "id13", "id16", "id18", "id21", - "id23", "id26", "id28", "id31", "id33", "id36", "id38", "id41", - "id43", "id46", "id48", "id51", "id53", "id56", "id58", "id61", - "id63", "id64", "id65", "id66", "id67", "id68", "id71", "id73", - "id75", "id76", "id74", "id62", "id60", "id59", "id52", "id49", - "id47", "id45", "id44", "id37", "id34", "id32", "id30", "id29", - "id22", "id19", "id17", "id15", "id14", "id11", "id8", "id7", "id5", - "id4", "id2", "id1", - } - assert.Equal(expectedIDs, ids, fmt.Sprintf("sort with rules: %v", rules)) - - // Sort with an empty list of sorting rules. - sc.Sort([]string{}) - - ids = []string{} - for i := 0; i < sc.Len(); i++ { - ids = append(ids, sc.At(i).GetID()) - } - - sort.Strings(expectedIDs) - assert.Equal(expectedIDs, ids, "sort by ID") -} - func TestSoftCollectionMiscellaneous(t *testing.T) { assert := assert.New(t) From 82d287e5374a392aad65e0748419701d8f8b9fdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 18 Aug 2019 17:19:49 -0400 Subject: [PATCH 196/406] Add top comment to Type.New and Type.Equal --- type.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/type.go b/type.go index 9d94539..0d6a448 100644 --- a/type.go +++ b/type.go @@ -130,7 +130,10 @@ func (t *Type) Fields() []string { return fields } -// New ... +// New calls the NewFunc field and returns the result Resource object. +// +// If NewFunc is nil, it returns a *SoftResource with its Type field set to the +// value of the receiver. func (t *Type) New() Resource { if t.NewFunc != nil { return t.NewFunc() @@ -138,7 +141,8 @@ func (t *Type) New() Resource { return &SoftResource{Type: t} } -// Equal ... +// Equal returns true if both types have the same name, attributes, +// relationships, and both have a nil NewFunc. func (t Type) Equal(typ Type) bool { return reflect.DeepEqual(t, typ) } From d1e63006598dc273c3be3124350af5b51115711e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 20 Aug 2019 22:54:39 -0400 Subject: [PATCH 197/406] Skip to-many check in Equal if both lengths are zero reflect.DeepEqual returns false if a nil slice is compared to an empty slice. For the purpose of the Equal function, both a nil and an empty slice are considered equal which is not an opinion that the reflect.DeepEqual function shares. --- resource.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/resource.go b/resource.go index a907ada..66d929c 100644 --- a/resource.go +++ b/resource.go @@ -115,8 +115,12 @@ func Equal(r1, r2 Resource) bool { return false } } else { - if !reflect.DeepEqual(r1.GetToMany(rel1.Name), r2.GetToMany(rel2.Name)) { - return false + v1 := r1.GetToMany(rel1.Name) + v2 := r2.GetToMany(rel2.Name) + if len(v1) != 0 || len(v2) != 0 { + if !reflect.DeepEqual(v1, v2) { + return false + } } } } From 386f1572310731daa7619e2f3e33380f3c966ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Wed, 21 Aug 2019 22:16:55 -0400 Subject: [PATCH 198/406] Refactor marshaling/unmarshaling and its test suite --- jsonapi.go | 74 +- jsonapi_test.go | 725 +++++++++++++++--- marshaling_test.go | 342 --------- skeletons.go | 1 + testdata/collection-1.json | 136 ---- testdata/collection-2.json | 36 - testdata/collection-3.json | 9 - testdata/errors-2.json | 25 - .../goldenfiles/marshaling/collection.json | 108 +++ .../collection_with_inclusions.json | 46 ++ .../marshaling/empty_collection.json | 9 + .../goldenfiles/marshaling/empty_data.json | 9 + testdata/goldenfiles/marshaling/error.json | 16 + .../marshaling/errors.json} | 13 +- .../goldenfiles/marshaling/identifier.json | 12 + .../goldenfiles/marshaling/identifiers.json | 22 + testdata/goldenfiles/marshaling/meta.json | 14 + testdata/goldenfiles/marshaling/resource.json | 17 + testdata/null-1.json | 6 - testdata/resource-1.json | 74 -- testdata/resource-2.json | 56 -- testdata/resource-3.json | 20 - testdata/resource-4.json | 44 -- testdata/resource-5.json | 17 - testdata/resource-6.json | 70 -- testdata/resource-7.json | 86 --- unmarshaling_test.go | 116 --- 27 files changed, 906 insertions(+), 1197 deletions(-) delete mode 100644 marshaling_test.go delete mode 100644 testdata/collection-1.json delete mode 100644 testdata/collection-2.json delete mode 100644 testdata/collection-3.json delete mode 100644 testdata/errors-2.json create mode 100644 testdata/goldenfiles/marshaling/collection.json create mode 100644 testdata/goldenfiles/marshaling/collection_with_inclusions.json create mode 100644 testdata/goldenfiles/marshaling/empty_collection.json create mode 100644 testdata/goldenfiles/marshaling/empty_data.json create mode 100644 testdata/goldenfiles/marshaling/error.json rename testdata/{errors-1.json => goldenfiles/marshaling/errors.json} (52%) create mode 100644 testdata/goldenfiles/marshaling/identifier.json create mode 100644 testdata/goldenfiles/marshaling/identifiers.json create mode 100644 testdata/goldenfiles/marshaling/meta.json create mode 100644 testdata/goldenfiles/marshaling/resource.json delete mode 100644 testdata/null-1.json delete mode 100644 testdata/resource-1.json delete mode 100644 testdata/resource-2.json delete mode 100644 testdata/resource-3.json delete mode 100644 testdata/resource-4.json delete mode 100644 testdata/resource-5.json delete mode 100644 testdata/resource-6.json delete mode 100644 testdata/resource-7.json delete mode 100644 unmarshaling_test.go diff --git a/jsonapi.go b/jsonapi.go index 8793922..bacb461 100644 --- a/jsonapi.go +++ b/jsonapi.go @@ -2,7 +2,7 @@ package jsonapi import ( "encoding/json" - "fmt" + "errors" "sort" ) @@ -10,13 +10,10 @@ import ( // // Both doc and url must not be nil. func Marshal(doc *Document, url *URL) ([]byte, error) { - // Data - var ( - data json.RawMessage - errors json.RawMessage - err error - ) + var err error + // Data + var data json.RawMessage if res, ok := doc.Data.(Resource); ok { // Resource data = marshalResource( @@ -30,7 +27,7 @@ func Marshal(doc *Document, url *URL) ([]byte, error) { data = marshalCollection( col, doc.PrePath, - url.Params.Fields[col.GetType().Name], + url.Params.Fields, doc.RelData, ) } else if id, ok := doc.Data.(Identifier); ok { @@ -39,16 +36,19 @@ func Marshal(doc *Document, url *URL) ([]byte, error) { } else if ids, ok := doc.Data.(Identifiers); ok { // Identifiers data, err = json.Marshal(ids) - } else if e, ok := doc.Data.(Error); ok { - // Error - errors, err = json.Marshal([]Error{e}) - } else if es, ok := doc.Data.([]Error); ok { - // Errors - errors, err = json.Marshal(es) - } else { + } else if doc.Data != nil { + err = errors.New("data contains an unknown type") + } else if len(doc.Errors) == 0 { data = []byte("null") } + // Data + var errors json.RawMessage + if len(doc.Errors) > 0 { + // Errors + errors, err = json.Marshal(doc.Errors) + } + if err != nil { return []byte{}, err } @@ -106,7 +106,7 @@ func Marshal(doc *Document, url *URL) ([]byte, error) { // // schema must not be nil. func Unmarshal(payload []byte, schema *Schema) (*Document, error) { - doc := &Document{} + doc := NewDocument() ske := &payloadSkeleton{} // Unmarshal @@ -130,7 +130,14 @@ func Unmarshal(payload []byte, schema *Schema) (*Document, error) { return nil, err } doc.Data = col + } else if string(ske.Data) == "null" { + doc.Data = nil + } else { + // TODO Not exactly the right error + return nil, NewErrMissingDataMember() } + } else if len(ske.Errors) > 0 { + doc.Errors = ske.Errors } else { return nil, NewErrMissingDataMember() } @@ -147,14 +154,12 @@ func Unmarshal(payload []byte, schema *Schema) (*Document, error) { incs = append(incs, inc) } - for i, inc2 := range incs { - typ := schema.GetType(inc2.Type) - res2 := &SoftResource{Type: &typ} - err = json.Unmarshal(ske.Included[i], res2) + for i := range incs { + res, err := unmarshalResource(ske.Included[i], schema) if err != nil { return nil, err } - doc.Included = append(doc.Included, res2) + doc.Included = append(doc.Included, res) } } @@ -171,7 +176,7 @@ func Unmarshal(payload []byte, schema *Schema) (*Document, error) { // // schema must not be nil. func UnmarshalIdentifiers(payload []byte, schema *Schema) (*Document, error) { - doc := &Document{} + doc := NewDocument() ske := &payloadSkeleton{} // Unmarshal @@ -197,6 +202,8 @@ func UnmarshalIdentifiers(payload []byte, schema *Schema) (*Document, error) { } doc.Data = incs } + } else if len(ske.Errors) > 0 { + doc.Errors = ske.Errors } else { return nil, NewErrMissingDataMember() } @@ -295,15 +302,13 @@ func marshalResource(r Resource, prepath string, fields []string, relData map[st "self": buildSelfLink(r, prepath), // TODO } - pl, err := json.Marshal(mapPl) - if err != nil { - panic(fmt.Errorf("jsonapi: could not marshal resource: %s", err.Error())) - } + // NOTE An error should not happen. + pl, _ := json.Marshal(mapPl) return pl } // marshalCollection marshals a Collection into a JSON-encoded payload. -func marshalCollection(c Collection, prepath string, fields []string, relData map[string][]string) []byte { +func marshalCollection(c Collection, prepath string, fields map[string][]string, relData map[string][]string) []byte { var raws []*json.RawMessage if c.Len() == 0 { @@ -312,14 +317,14 @@ func marshalCollection(c Collection, prepath string, fields []string, relData ma for i := 0; i < c.Len(); i++ { r := c.At(i) - raw := json.RawMessage(marshalResource(r, prepath, fields, relData)) + raw := json.RawMessage( + marshalResource(r, prepath, fields[r.GetType().Name], relData), + ) raws = append(raws, &raw) } - pl, err := json.Marshal(raws) - if err != nil { - panic(fmt.Errorf("jsonapi: could not marshal collection: %s", err.Error())) - } + // NOTE An error should not happen. + pl, _ := json.Marshal(raws) return pl } @@ -328,7 +333,10 @@ func unmarshalResource(data []byte, schema *Schema) (Resource, error) { var rske resourceSkeleton err := json.Unmarshal(data, &rske) if err != nil { - return nil, err + return nil, NewErrBadRequest( + "Invalid JSON", + "The provided JSON body could not be read.", + ) } typ := schema.GetType(rske.Type) diff --git a/jsonapi_test.go b/jsonapi_test.go index 8542bf9..a78c089 100644 --- a/jsonapi_test.go +++ b/jsonapi_test.go @@ -1,132 +1,613 @@ package jsonapi_test import ( + "bytes" + "encoding/json" + "flag" + "io/ioutil" + "path/filepath" + "strings" + "testing" "time" . "github.com/mfcochauxlaberge/jsonapi" -) -var ( - mocktypes1 Collection - mocktypes11 Collection - mocktypes2 Collection - mocktypes21 Collection - mocktypes3 Collection - // urls []*URL + "github.com/stretchr/testify/assert" ) -func init() { - loc, _ := time.LoadLocation("") - - // Resources - mocktypes1 = WrapCollection(Wrap(&mockType1{})) - mocktypes1.Add( - Wrap(&mockType1{ - ID: "mt1-1", - // Use default (zero) value for each attribute - }), - ) - mocktypes1.Add( - Wrap(&mockType1{ - ID: "mt1-2", - Str: "", - Int: -42, - Int8: 80, - Int16: 160, - Int32: 320, - Int64: 6464640000, - Uint: 42, - Uint8: 8, - Uint16: 1600, - Uint32: 32000, - Uint64: 64000, - Bool: false, - Time: time.Date(2017, 1, 2, 3, 4, 5, 6, loc), - }), - ) - - mocktypes2 = WrapCollection(Wrap(&mockType2{})) - mocktypes2.Add( - Wrap(&mockType2{ - ID: "mt2-1", - // Use nil values - }), - ) - strPtr := "str" - intPtr := int(-42) - int8Ptr := int8(80) - int16Ptr := int16(160) - int32Ptr := int32(320) - int64Ptr := int64(6464640000) - uintPtr := uint(42) - uint8Ptr := uint8(8) - uint16Ptr := uint16(1600) - uint32Ptr := uint32(32000) - uint64Ptr := uint64(64000) - boolPtr := false - timePtr := time.Date(2017, 1, 2, 3, 4, 5, 6, loc) - mocktypes2.Add( - Wrap(&mockType2{ - ID: "mt1-2", - StrPtr: &strPtr, - IntPtr: &intPtr, - Int8Ptr: &int8Ptr, - Int16Ptr: &int16Ptr, - Int32Ptr: &int32Ptr, - Int64Ptr: &int64Ptr, - UintPtr: &uintPtr, - Uint8Ptr: &uint8Ptr, - Uint16Ptr: &uint16Ptr, - Uint32Ptr: &uint32Ptr, - Uint64Ptr: &uint64Ptr, - BoolPtr: &boolPtr, - TimePtr: &timePtr, - }), - ) - - mocktypes3 = WrapCollection(Wrap(&mockType3{})) - mocktypes3.Add( - Wrap(&mockType3{ - ID: "mt3-1", - }), - ) - mocktypes3.Add( - Wrap(&mockType3{ - ID: "mt3-1", - Attr1: "str", - Attr2: 32, - }), - ) - - mocktypes11 = WrapCollection(Wrap(&mockType1{})) - mocktypes11.Add( - Wrap(&mockType1{ - ID: "mt11-1", - ToOne: "mt21-1", - ToMany: []string{"mt21-2", "mt21-3"}, - ToOneFromOne: "", - ToManyFromMany: []string{}, - ToManyFromOne: []string{}, - }), - ) - - mocktypes21 = WrapCollection(Wrap(&mockType2{})) - mocktypes21.Add( - Wrap(&mockType2{ - ID: "mt21-1", - BoolPtr: &boolPtr, - }), - ) - mocktypes21.Add( - Wrap(&mockType2{ - ID: "mt21-2", - IntPtr: &intPtr, - }), - ) - mocktypes21.Add( - Wrap(&mockType2{ - ID: "mt21-3", - StrPtr: &strPtr, - }), - ) +var update = flag.Bool("update-golden-files", false, "update the golden files") + +func TestMarshaling(t *testing.T) { + // TODO Describe how this test suite works + + // Setup + typ, _ := BuildType(mocktype{}) + typ.NewFunc = func() Resource { + return Wrap(&mocktype{}) + } + col := &Resources{} + col.Add(Wrap(&mocktype{ + ID: "id1", + Str: "str", + Int: 10, + Int8: 18, + Int16: 116, + Int32: 132, + Int64: 164, + Uint: 100, + Uint8: 108, + Uint16: 1016, + Uint32: 1032, + Uint64: 1064, + Bool: true, + Time: getTime(), + To1: "id2", + To1From1: "id3", + To1FromX: "id3", + ToX: []string{"id2", "id3"}, + ToXFrom1: []string{"id4"}, + ToXFromX: []string{"id3", "id4"}, + })) + col.Add(Wrap(&mocktype{ + ID: "id2", + Str: "漢語", + Int: -42, + Time: time.Time{}, + })) + col.Add(Wrap(&mocktype{ID: "id3"})) + + // Test struct + tests := []struct { + name string + doc *Document + fields []string + }{ + { + name: "empty data", + doc: &Document{ + PrePath: "https://example.org/", + }, + }, { + name: "empty collection", + doc: &Document{ + Data: &Resources{}, + }, + }, { + name: "resource", + doc: &Document{ + Data: col.At(0), + RelData: map[string][]string{ + "mocktype": []string{ + "to-1", "to-x-from-1", + }, + }, + }, + }, { + name: "collection", + doc: &Document{ + Data: Range(col, nil, nil, []string{}, 10, 0), + RelData: map[string][]string{ + "mocktype": []string{ + "to-1", "to-x-from-1", + }, + }, + PrePath: "https://example.org/", + }, + fields: []string{ + "str", "uint64", "bool", "int", "time", "to-1", "to-x-from-1", + }, + }, { + name: "meta", + doc: &Document{ + Data: nil, + Meta: map[string]interface{}{ + "f1": "漢語", + "f2": 42, + "f3": true, + }, + }, + }, { + name: "collection with inclusions", + doc: &Document{ + Data: Wrap(&mocktype{ + ID: "id1", + }), + RelData: map[string][]string{ + "mocktype": []string{ + "to-1", "to-x-from-1", + }, + }, + Included: []Resource{ + Wrap(&mocktype{ + ID: "id2", + }), + Wrap(&mocktype{ + ID: "id3", + }), + Wrap(&mocktype{ + ID: "id4", + }), + }, + }, + }, { + name: "identifier", + doc: &Document{ + Data: Identifier{ + ID: "id1", + Type: "mocktype", + }, + }, + }, { + name: "identifiers", + doc: &Document{ + Data: Identifiers{ + { + ID: "id1", + Type: "mocktype", + }, { + ID: "id2", + Type: "mocktype", + }, { + ID: "id3", + Type: "mocktype", + }, + }, + }, + }, { + name: "error", + doc: &Document{ + Errors: func() []Error { + err := NewErrBadRequest("Bad Request", "This request is bad.") + err.ID = "00000000-0000-0000-0000-000000000000" + return []Error{err} + }(), + }, + }, { + name: "errors", + doc: &Document{ + Errors: func() []Error { + err1 := NewErrBadRequest("Bad Request", "This request is bad.") + err1.ID = "00000000-0000-0000-0000-000000000000" + err2 := NewErrBadRequest("Bad Request", "This request is really bad.") + err2.ID = "00000000-0000-0000-0000-000000000000" + return []Error{err1, err2} + }(), + }, + }, + } + + for i := range tests { + i := i + test := tests[i] + t.Run(test.name, func(t *testing.T) { + assert := assert.New(t) + + // URL + url := &URL{ + Fragments: []string{"fake", "path"}, + Params: &Params{ + Fields: map[string][]string{"mocktype": test.fields}, + }, + } + if _, ok := test.doc.Data.(Collection); ok { + url.IsCol = true + } + + // Marshaling + payload, err := Marshal(test.doc, url) + assert.NoError(err) + + // Golden file + filename := strings.Replace(test.name, " ", "_", -1) + ".json" + path := filepath.Join("testdata", "goldenfiles", "marshaling", filename) + if !*update { + // Retrieve the expected result from file + expected, _ := ioutil.ReadFile(path) + assert.NoError(err, test.name) + assert.JSONEq(string(expected), string(payload)) + } else { + dst := &bytes.Buffer{} + err = json.Indent(dst, payload, "", "\t") + assert.NoError(err) + // TODO Figure out whether 0644 is okay or not. + err = ioutil.WriteFile(path, dst.Bytes(), 0644) + assert.NoError(err) + } + }) + } +} + +func TestMarshalingInvalidDocuments(t *testing.T) { + // TODO Describe how this test suite works + + // Setup + typ, _ := BuildType(mocktype{}) + typ.NewFunc = func() Resource { + return Wrap(&mocktype{}) + } + col := &Resources{} + col.Add(Wrap(&mocktype{ + ID: "id1", + Str: "str", + Int: 10, + Int8: 18, + Int16: 116, + Int32: 132, + Int64: 164, + Uint: 100, + Uint8: 108, + Uint16: 1016, + Uint32: 1032, + Uint64: 1064, + Bool: true, + Time: getTime(), + To1: "id2", + To1From1: "id3", + To1FromX: "id3", + ToX: []string{"id2", "id3"}, + ToXFrom1: []string{"id4"}, + ToXFromX: []string{"id3", "id4"}, + })) + col.Add(Wrap(&mocktype{ + ID: "id2", + Str: "漢語", + Int: -42, + Time: time.Time{}, + })) + col.Add(Wrap(&mocktype{ID: "id3"})) + + // Test struct + tests := []struct { + name string + doc *Document + fields []string + err string + }{ + { + name: "invalid data", + doc: &Document{ + Data: "just a string", + }, + err: "data contains an unknown type", + }, + } + + for i := range tests { + i := i + test := tests[i] + t.Run(test.name, func(t *testing.T) { + assert := assert.New(t) + + // URL + url := &URL{ + Fragments: []string{"fake", "path"}, + Params: &Params{ + Fields: map[string][]string{"mocktype": test.fields}, + }, + } + if _, ok := test.doc.Data.(Collection); ok { + url.IsCol = true + } + + // Marshaling + _, err := Marshal(test.doc, url) + assert.EqualError(err, test.err) + }) + } +} + +func TestUnmarshaling(t *testing.T) { + // Setup + typ, _ := BuildType(mocktype{}) + typ.NewFunc = func() Resource { + return Wrap(&mocktype{}) + } + schema := &Schema{Types: []Type{typ}} + col := Resources{} + col.Add(Wrap(&mocktype{ + ID: "id1", + Str: "str", + Int: 10, + Int8: 18, + Int16: 116, + Int32: 132, + Int64: 164, + Uint: 100, + Uint8: 108, + Uint16: 1016, + Uint32: 1032, + Uint64: 1064, + Bool: true, + Time: getTime(), + To1: "id2", + To1From1: "id3", + To1FromX: "id3", + ToX: []string{"id2", "id3"}, + ToXFrom1: []string{"id4"}, + ToXFromX: []string{"id3", "id4"}, + })) + col.Add(Wrap(&mocktype{ID: "id2"})) + col.Add(Wrap(&mocktype{ID: "id3"})) + + // Tests + t.Run("resource with inclusions", func(t *testing.T) { + assert := assert.New(t) + + url, _ := NewURLFromRaw(schema, "/mocktype/id1") + + doc := &Document{ + Data: col.At(0), + RelData: map[string][]string{ + "mocktype": typ.Fields(), + }, + Included: []Resource{ + col.At(1), + col.At(2), + }, + } + + payload, err := Marshal(doc, url) + assert.NoError(err) + + doc2, err := Unmarshal(payload, schema) + assert.NoError(err) + assert.True(Equal(doc.Data.(Resource), doc2.Data.(Resource))) + // TODO Make all the necessary assertions. + }) + + t.Run("collection with inclusions", func(t *testing.T) { + assert := assert.New(t) + + url, _ := NewURLFromRaw(schema, "/mocktype/id1") + + doc := &Document{ + Data: &col, + RelData: map[string][]string{ + "mocktype": typ.Fields(), + }, + } + + payload, err := Marshal(doc, url) + assert.NoError(err) + + doc2, err := Unmarshal(payload, schema) + assert.NoError(err) + assert.IsType(&col, doc.Data) + assert.IsType(&col, doc2.Data) + if col, ok := doc.Data.(Collection); ok { + if col2, ok := doc2.Data.(Collection); ok { + assert.Equal(col.Len(), col2.Len()) + for j := 0; j < col.Len(); j++ { + assert.True(Equal(col.At(j), col2.At(j))) + } + } + } + // TODO Make all the necessary assertions. + }) + + t.Run("identifier", func(t *testing.T) { + assert := assert.New(t) + + url, _ := NewURLFromRaw(schema, "/mocktype/id1/relationships/to-1") + + doc := &Document{ + Data: Identifier{ + ID: "id2", + Type: "mocktype", + }, + } + + payload, err := Marshal(doc, url) + assert.NoError(err) + + doc2, err := UnmarshalIdentifiers(payload, schema) + assert.NoError(err) + assert.Equal(doc.Data, doc2.Data) + }) + + t.Run("identifers", func(t *testing.T) { + assert := assert.New(t) + + url, _ := NewURLFromRaw(schema, "/mocktype/id1/relationships/to-x") + + doc := &Document{ + Data: Identifiers{ + Identifier{ + ID: "id2", + Type: "mocktype", + }, + Identifier{ + ID: "id3", + Type: "mocktype", + }, + }, + } + + payload, err := Marshal(doc, url) + assert.NoError(err) + + doc2, err := UnmarshalIdentifiers(payload, schema) + assert.NoError(err) + assert.Equal(doc.Data, doc2.Data) + }) + + t.Run("errors (Unmarshal)", func(t *testing.T) { + assert := assert.New(t) + + url, _ := NewURLFromRaw(schema, "/mocktype/id1/relationships/to-x") + + doc := &Document{ + Errors: func() []Error { + err := NewErrBadRequest("Bad Request", "This request is bad.") + err.ID = "00000000-0000-0000-0000-000000000000" + return []Error{err} + }(), + } + + payload, err := Marshal(doc, url) + assert.NoError(err) + + doc2, err := Unmarshal(payload, schema) + assert.NoError(err) + assert.Equal(doc.Data, doc2.Data) + }) + + t.Run("errors (UnmarshalIdentifers)", func(t *testing.T) { + assert := assert.New(t) + + url, _ := NewURLFromRaw(schema, "/mocktype/id1/relationships/to-x") + + doc := &Document{ + Errors: func() []Error { + err := NewErrBadRequest("Bad Request", "This request is bad.") + err.ID = "00000000-0000-0000-0000-000000000000" + return []Error{err} + }(), + } + + payload, err := Marshal(doc, url) + assert.NoError(err) + + doc2, err := UnmarshalIdentifiers(payload, schema) + assert.NoError(err) + assert.Equal(doc.Data, doc2.Data) + }) + + t.Run("invalid payloads (Unmarshal)", func(t *testing.T) { + assert := assert.New(t) + + tests := []struct { + payload string + expected string + }{ + { + payload: `invalid payload`, + expected: "invalid character 'i' looking for beginning of value", + }, { + payload: `{"data":"invaliddata"}`, + expected: "400 Bad Request: Missing data top-level member in payload.", + }, { + payload: `{"data":{"id":true}}`, + expected: "400 Bad Request: The provided JSON body could not be read.", + }, { + payload: `{"data":[{"id":true}]}`, + expected: "400 Bad Request: The provided JSON body could not be read.", + }, { + payload: `{"jsonapi":{"key":"data/errors missing"}}`, + expected: "400 Bad Request: Missing data top-level member in payload.", + }, { + payload: `{"data":null,"included":[{"id":true}]}`, + expected: "json: " + + "cannot unmarshal bool into Go struct field Identifier.id of type string", + }, { + payload: `{"data":null,"included":[{"attributes":true}]}`, + expected: "400 Bad Request: The provided JSON body could not be read.", + }, { + payload: `{"data":{"id":"1","type":"mocktype","attributes":{"nonexistent":1}}}`, + expected: "400 Bad Request: nonexistent is not a known field.", + }, { + payload: `{"data":{"id":"1","type":"mocktype","attributes":{"int8":"abc"}}}`, + expected: "400 Bad Request: The field value is invalid for the expected type.", + }, { + payload: `{ + "data": { + "id": "1", + "type": "mocktype", + "relationships": { + "to-x": { + "data": "wrong" + } + } + } + }`, + expected: "400 Bad Request: The field value is invalid for the expected type.", + }, { + payload: `{ + "data": { + "id": "1", + "type": "mocktype", + "relationships": { + "wrong": { + "data": "wrong" + } + } + } + }`, + expected: "400 Bad Request: wrong is not a known field.", + }, + } + + for _, test := range tests { + doc, err := Unmarshal([]byte(test.payload), schema) + assert.EqualError(err, test.expected) + assert.Nil(doc) + } + }) + + t.Run("invalid payloads (UnmarshalIdentifiers)", func(t *testing.T) { + assert := assert.New(t) + + tests := []struct { + payload string + expected string + }{ + { + payload: `{invalid json}`, + expected: "invalid character 'i' looking for beginning of object key string", + }, { + payload: `{"jsonapi":{}}`, + expected: "400 Bad Request: Missing data top-level member in payload.", + }, { + payload: `{"jsonapi":{"key":"data/errors missing"}}`, + expected: "400 Bad Request: Missing data top-level member in payload.", + }, { + payload: `{"data":{"id":["invalid"]}}`, + expected: "json: " + + "cannot unmarshal array into Go struct field Identifier.id of type string", + }, { + payload: `{"data":[{"id":["invalid"]}]}`, + expected: "json: " + + "cannot unmarshal array into Go struct field Identifier.id of type string", + }, + } + + for _, test := range tests { + doc, err := UnmarshalIdentifiers([]byte(test.payload), nil) + assert.EqualError(err, test.expected) + assert.Nil(doc) + } + }) +} + +func getTime() time.Time { + now, _ := time.Parse(time.RFC3339Nano, "2013-06-24T22:03:34.8276Z") + return now +} + +// mocktype is a fake struct that defines a JSON:API type for test purposes. +type mocktype struct { + ID string `json:"id" api:"mocktype"` + + // Attributes + Str string `json:"str" api:"attr"` + Int int `json:"int" api:"attr"` + Int8 int8 `json:"int8" api:"attr"` + Int16 int16 `json:"int16" api:"attr"` + Int32 int32 `json:"int32" api:"attr"` + Int64 int64 `json:"int64" api:"attr"` + Uint uint `json:"uint" api:"attr"` + Uint8 uint8 `json:"uint8" api:"attr"` + Uint16 uint16 `json:"uint16" api:"attr"` + Uint32 uint32 `json:"uint32" api:"attr"` + Uint64 uint64 `json:"uint64" api:"attr"` + Bool bool `json:"bool" api:"attr"` + Time time.Time `json:"time" api:"attr"` + + // Relationships + To1 string `json:"to-1" api:"rel,mocktype"` + To1From1 string `json:"to-1-from-1" api:"rel,mocktype,to-1-from-1"` + To1FromX string `json:"to-1-from-x" api:"rel,mocktype,to-x-from-1"` + ToX []string `json:"to-x" api:"rel,mocktype"` + ToXFrom1 []string `json:"to-x-from-1" api:"rel,mocktype,to-1-from-x"` + ToXFromX []string `json:"to-x-from-x" api:"rel,mocktype,to-x-from-x"` } diff --git a/marshaling_test.go b/marshaling_test.go deleted file mode 100644 index 61fb222..0000000 --- a/marshaling_test.go +++ /dev/null @@ -1,342 +0,0 @@ -package jsonapi_test - -import ( - "fmt" - "io/ioutil" - "net/http" - "strconv" - "testing" - "time" - - . "github.com/mfcochauxlaberge/jsonapi" - - "github.com/stretchr/testify/assert" -) - -func TestMarshalResource(t *testing.T) { - assert := assert.New(t) - - loc, _ := time.LoadLocation("") - schema := newMockSchema() - - tests := []struct { - name string - data Resource - inclusions []Resource - relData map[string][]string - prepath string - params string - meta map[string]interface{} - errorExpected bool - payloadFile string - }{ - { - name: "resource with meta", - data: mocktypes1.At(0), - meta: map[string]interface{}{ - "num": 42, - "timestamp": time.Date(2017, 1, 2, 3, 4, 5, 6, loc), - "tf": true, - "str": "a string", - }, - errorExpected: false, - payloadFile: "resource-1", - }, { - name: "resource with prepath", - data: mocktypes2.At(1), - prepath: "https://example.org/", - errorExpected: false, - payloadFile: "resource-2", - }, { - name: "resource with prepath and params", - data: mocktypes2.At(1), - prepath: "https://example.org/", - params: "?fields[mocktypes2]=strptr,uintptr,int", - errorExpected: false, - payloadFile: "resource-3", - }, { - name: "resource with no attributes and relationships", - data: mocktypes1.At(0), - prepath: "https://example.org/", - params: "?fields[mocktypes1]=id", - errorExpected: false, - payloadFile: "resource-5", - }, { - name: "resource with relationship data", - data: mocktypes11.At(0), - relData: map[string][]string{ - "mocktypes1": []string{ - "to-one", "to-many", "to-one-from-one", "to-many-from-many", - }, - }, - prepath: "https://example.org/", - params: ` - ?fields[mocktypes1]= - to-one,to-many, - to-one-from-one,to-one-from-many, - to-many-from-one,to-many-from-many - `, - errorExpected: false, - payloadFile: "resource-6", - }, { - name: "resource with inclusions", - data: mocktypes11.At(0), - inclusions: []Resource{ - mocktypes21.At(0), - mocktypes21.At(1), - mocktypes21.At(2), - }, - relData: map[string][]string{ - "mocktypes1": []string{ - "to-one", "to-many", "to-one-from-one", "to-many-from-many", - }, - }, - prepath: "https://example.org/", - params: ` - ?fields[mocktypes1]= - to-one,to-many - &fields[mocktypes2]= - intptr,boolptr,strptr, - `, - errorExpected: false, - payloadFile: "resource-7", - }, - } - - for _, test := range tests { - doc := NewDocument() - doc.PrePath = test.prepath - - doc.Data = test.data - - id := test.data.GetID() - typ := test.data.GetType() - rawurl := fmt.Sprintf( - "%s/%s/%s%s", - test.prepath, typ.Name, id, makeOneLineNoSpaces(test.params), - ) - - url, err := NewURLFromRaw(schema, rawurl) - assert.NoError(err, test.name) - - for _, inc := range test.inclusions { - doc.Include(inc) - } - - doc.RelData = test.relData - doc.Meta = test.meta - - // Marshal - payload, err := Marshal(doc, url) - - if test.errorExpected { - assert.Error(err, test.name) - } else { - assert.NoError(err, test.name) - // Retrieve the expected result from file - expected, _ := ioutil.ReadFile("testdata/" + test.payloadFile + ".json") - assert.NoError(err, test.name) - assert.JSONEq(string(expected), string(payload), test.name) - } - } -} - -func TestMarshalCollection(t *testing.T) { - assert := assert.New(t) - - loc, _ := time.LoadLocation("") - schema := newMockSchema() - - tests := []struct { - name string - data Collection - prepath string - params string - meta map[string]interface{} - errorExpected bool - payloadFile string - }{ - { - name: "collection with meta", - data: mocktypes1, - meta: map[string]interface{}{ - "num": -32820, - "timestamp": time.Date(1981, 2, 3, 4, 5, 6, 0, loc), - "tf": false, - "str": "//\n\téç.\\", - }, - errorExpected: false, - payloadFile: "collection-1", - }, { - name: "collection with prepath and params", - data: mocktypes2, - prepath: "https://example.org/", - params: "?fields[mocktypes2]=uintptr,boolptr,timeptr", - errorExpected: false, - payloadFile: "collection-2", - }, { - name: "collection with prepath", - data: WrapCollection(Wrap(&mockType1{})), - prepath: "https://example.org/", - errorExpected: false, - payloadFile: "collection-3", - }, - } - - for _, test := range tests { - doc := NewDocument() - doc.PrePath = test.prepath - - doc.Data = test.data - - typ := test.data.GetType() - rawurl := fmt.Sprintf("%s/%s%s", test.prepath, typ.Name, test.params) - - url, err := NewURLFromRaw(schema, rawurl) - assert.NoError(err, test.name) - - doc.Meta = test.meta - - // Marshal - payload, err := Marshal(doc, url) - - if test.errorExpected { - assert.Error(err, test.name) - } else { - assert.NoError(err, test.name) - // Retrieve the expected result from file - expected, _ := ioutil.ReadFile("testdata/" + test.payloadFile + ".json") - assert.JSONEq(string(expected), string(payload), test.name) - } - } -} - -func TestMarshalInclusions(t *testing.T) { - assert := assert.New(t) - - schema := newMockSchema() - - // Document - doc := &Document{} - doc.PrePath = "https://example.org/" - - // URL - url, err := NewURLFromRaw( - schema, - makeOneLineNoSpaces(` - /mocktypes3/mt3-1 - ?fields[mocktypes1]=str - &fields[mocktypes3]=attr1,attr2 - `), - ) - assert.NoError(err) - - // Data (single resource) - res := Wrap(&mockType3{}) - res.SetID("mt3-1") - res.Set("attr1", "str") - res.Set("attr2", 42) - doc.Data = Resource(res) - - // Inclusions - inc1 := Wrap(&mockType1{}) - inc1.SetID("mt1-1") - inc1.Set("str", "astring") - doc.Include(inc1) - - inc2 := Wrap(&mockType1{}) - inc2.SetID("mt1-2") - inc2.Set("str", "anotherstring") - doc.Include(inc2) - - payload, _ := Marshal(doc, url) - - // Retrieve the expected result from file - expected, _ := ioutil.ReadFile("testdata/resource-4.json") - - assert.JSONEq(string(expected), string(payload)) -} - -func TestMarshalErrors(t *testing.T) { - assert := assert.New(t) - - // Reset the IDs because the tests can't predict them. - resetIDs := func(errors []Error) []Error { - for i := range errors { - errors[i].ID = "00000000-0000-0000-0000-000000000000" - } - return errors - } - - tests := []struct { - name string - errors []Error - errorExpected bool - payloadFile string - }{ - { - name: "two http errors", - errors: resetIDs([]Error{ - NewErrBadRequest("Invalid attribute", "name cannot be empty."), - NewErrBadRequest("Invalid attribute", "age cannot be negative."), - }), - errorExpected: false, - payloadFile: "errors-1", - }, { - name: "complex valid error", - errors: resetIDs(func() []Error { - e1 := NewError() - - e1.Code = "somecode" - e1.Status = strconv.Itoa(http.StatusInternalServerError) - e1.Title = "Error" - e1.Detail = "An error occurred." - e1.Links["about"] = "https://example.org/errors/about" - e1.Source["pointer"] = "/data/attributes/title" - e1.Meta["str"] = "a string" - e1.Meta["num"] = 3943 - e1.Meta["bool"] = true - - return []Error{e1} - }()), - errorExpected: false, - payloadFile: "errors-2", - }, - } - - for _, test := range tests { - doc := NewDocument() - if len(test.errors) == 1 { - doc.Data = test.errors[0] - } else { - doc.Data = test.errors - } - - // Marshal - payload, err := Marshal(doc, nil) - - if test.errorExpected { - assert.Error(err, test.name) - } else { - assert.NoError(err, test.name) - // Retrieve the expected result from file - expected, _ := ioutil.ReadFile("testdata/" + test.payloadFile + ".json") - assert.JSONEq(string(expected), string(payload), test.name) - } - } -} - -func TestMarshalOther(t *testing.T) { - assert := assert.New(t) - - doc := &Document{ - Data: nil, - } - payload, err := Marshal(doc, nil) - assert.NoError(err) - - // Retrieve the expected result from file - expected, _ := ioutil.ReadFile("testdata/null-1.json") - - assert.JSONEq(string(expected), string(payload), "null data") -} diff --git a/skeletons.go b/skeletons.go index 6f33db7..39e932e 100644 --- a/skeletons.go +++ b/skeletons.go @@ -4,6 +4,7 @@ import "encoding/json" type payloadSkeleton struct { Data json.RawMessage `json:"data"` + Errors []Error `json:"errors"` Included []json.RawMessage `json:"included"` Meta map[string]interface{} `json:"meta"` } diff --git a/testdata/collection-1.json b/testdata/collection-1.json deleted file mode 100644 index 4fb64fd..0000000 --- a/testdata/collection-1.json +++ /dev/null @@ -1,136 +0,0 @@ -{ - "data": [ - { - "attributes": { - "bool": false, - "int": 0, - "int16": 0, - "int32": 0, - "int64": 0, - "int8": 0, - "str": "", - "time": "0001-01-01T00:00:00Z", - "uint": 0, - "uint16": 0, - "uint32": 0, - "uint64": 0, - "uint8": 0 - }, - "id": "mt1-1", - "links": { - "self": "/mocktypes1/mt1-1" - }, - "relationships": { - "to-many": { - "links": { - "related": "/mocktypes1/mt1-1/to-many", - "self": "/mocktypes1/mt1-1/relationships/to-many" - } - }, - "to-many-from-many": { - "links": { - "related": "/mocktypes1/mt1-1/to-many-from-many", - "self": "/mocktypes1/mt1-1/relationships/to-many-from-many" - } - }, - "to-many-from-one": { - "links": { - "related": "/mocktypes1/mt1-1/to-many-from-one", - "self": "/mocktypes1/mt1-1/relationships/to-many-from-one" - } - }, - "to-one": { - "links": { - "related": "/mocktypes1/mt1-1/to-one", - "self": "/mocktypes1/mt1-1/relationships/to-one" - } - }, - "to-one-from-many": { - "links": { - "related": "/mocktypes1/mt1-1/to-one-from-many", - "self": "/mocktypes1/mt1-1/relationships/to-one-from-many" - } - }, - "to-one-from-one": { - "links": { - "related": "/mocktypes1/mt1-1/to-one-from-one", - "self": "/mocktypes1/mt1-1/relationships/to-one-from-one" - } - } - }, - "type": "mocktypes1" - }, - { - "attributes": { - "bool": false, - "int": -42, - "int16": 160, - "int32": 320, - "int64": 6464640000, - "int8": 80, - "str": "", - "time": "2017-01-02T03:04:05.000000006Z", - "uint": 42, - "uint16": 1600, - "uint32": 32000, - "uint64": 64000, - "uint8": 8 - }, - "id": "mt1-2", - "links": { - "self": "/mocktypes1/mt1-2" - }, - "relationships": { - "to-many": { - "links": { - "related": "/mocktypes1/mt1-2/to-many", - "self": "/mocktypes1/mt1-2/relationships/to-many" - } - }, - "to-many-from-many": { - "links": { - "related": "/mocktypes1/mt1-2/to-many-from-many", - "self": "/mocktypes1/mt1-2/relationships/to-many-from-many" - } - }, - "to-many-from-one": { - "links": { - "related": "/mocktypes1/mt1-2/to-many-from-one", - "self": "/mocktypes1/mt1-2/relationships/to-many-from-one" - } - }, - "to-one": { - "links": { - "related": "/mocktypes1/mt1-2/to-one", - "self": "/mocktypes1/mt1-2/relationships/to-one" - } - }, - "to-one-from-many": { - "links": { - "related": "/mocktypes1/mt1-2/to-one-from-many", - "self": "/mocktypes1/mt1-2/relationships/to-one-from-many" - } - }, - "to-one-from-one": { - "links": { - "related": "/mocktypes1/mt1-2/to-one-from-one", - "self": "/mocktypes1/mt1-2/relationships/to-one-from-one" - } - } - }, - "type": "mocktypes1" - } - ], - "jsonapi": { - "version": "1.0" - }, - "links": { - "self": "/mocktypes1?fields%5Bmocktypes1%5D=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cto-many%2Cto-many-from-many%2Cto-many-from-one%2Cto-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8\u0026sort=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8%2Cid" - }, - "meta": { - "num": -32820, - "str": "//\n\téç.\\", - "tf": false, - "timestamp": "1981-02-03T04:05:06Z" - } -} diff --git a/testdata/collection-2.json b/testdata/collection-2.json deleted file mode 100644 index b2619a4..0000000 --- a/testdata/collection-2.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "data": [ - { - "attributes": { - "boolptr": null, - "timeptr": null, - "uintptr": null - }, - "id": "mt2-1", - "links": { - "self": "https://example.org/mocktypes2/mt2-1" - }, - "relationships": {}, - "type": "mocktypes2" - }, - { - "attributes": { - "boolptr": false, - "timeptr": "2017-01-02T03:04:05.000000006Z", - "uintptr": 42 - }, - "id": "mt1-2", - "links": { - "self": "https://example.org/mocktypes2/mt1-2" - }, - "relationships": {}, - "type": "mocktypes2" - } - ], - "jsonapi": { - "version": "1.0" - }, - "links": { - "self": "https://example.org/mocktypes2?fields%5Bmocktypes2%5D=boolptr%2Ctimeptr%2Cuintptr\u0026sort=boolptr%2Cint16ptr%2Cint32ptr%2Cint64ptr%2Cint8ptr%2Cintptr%2Cstrptr%2Ctimeptr%2Cuint16ptr%2Cuint32ptr%2Cuint64ptr%2Cuint8ptr%2Cuintptr%2Cid" - } -} diff --git a/testdata/collection-3.json b/testdata/collection-3.json deleted file mode 100644 index aeae0ae..0000000 --- a/testdata/collection-3.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "data": [], - "jsonapi": { - "version": "1.0" - }, - "links": { - "self": "https://example.org/mocktypes1?fields%5Bmocktypes1%5D=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cto-many%2Cto-many-from-many%2Cto-many-from-one%2Cto-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8\u0026sort=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8%2Cid" - } -} diff --git a/testdata/errors-2.json b/testdata/errors-2.json deleted file mode 100644 index 37b4a24..0000000 --- a/testdata/errors-2.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "errors": [ - { - "code": "somecode", - "detail": "An error occurred.", - "id": "00000000-0000-0000-0000-000000000000", - "links": { - "about": "https://example.org/errors/about" - }, - "meta": { - "bool": true, - "num": 3943, - "str": "a string" - }, - "source": { - "pointer": "/data/attributes/title" - }, - "status": "500", - "title": "Error" - } - ], - "jsonapi": { - "version": "1.0" - } -} diff --git a/testdata/goldenfiles/marshaling/collection.json b/testdata/goldenfiles/marshaling/collection.json new file mode 100644 index 0000000..c9749ca --- /dev/null +++ b/testdata/goldenfiles/marshaling/collection.json @@ -0,0 +1,108 @@ +{ + "data": [ + { + "attributes": { + "bool": true, + "int": 10, + "str": "str", + "time": "2013-06-24T22:03:34.8276Z", + "uint64": 1064 + }, + "id": "id1", + "links": { + "self": "https://example.org/mocktype/id1" + }, + "relationships": { + "to-1": { + "data": { + "id": "id2", + "type": "mocktype" + }, + "links": { + "related": "https://example.org/mocktype/id1/to-1", + "self": "https://example.org/mocktype/id1/relationships/to-1" + } + }, + "to-x-from-1": { + "data": [ + { + "id": "id4", + "type": "mocktype" + } + ], + "links": { + "related": "https://example.org/mocktype/id1/to-x-from-1", + "self": "https://example.org/mocktype/id1/relationships/to-x-from-1" + } + } + }, + "type": "mocktype" + }, + { + "attributes": { + "bool": false, + "int": -42, + "str": "漢語", + "time": "0001-01-01T00:00:00Z", + "uint64": 0 + }, + "id": "id2", + "links": { + "self": "https://example.org/mocktype/id2" + }, + "relationships": { + "to-1": { + "data": null, + "links": { + "related": "https://example.org/mocktype/id2/to-1", + "self": "https://example.org/mocktype/id2/relationships/to-1" + } + }, + "to-x-from-1": { + "data": [], + "links": { + "related": "https://example.org/mocktype/id2/to-x-from-1", + "self": "https://example.org/mocktype/id2/relationships/to-x-from-1" + } + } + }, + "type": "mocktype" + }, + { + "attributes": { + "bool": false, + "int": 0, + "str": "", + "time": "0001-01-01T00:00:00Z", + "uint64": 0 + }, + "id": "id3", + "links": { + "self": "https://example.org/mocktype/id3" + }, + "relationships": { + "to-1": { + "data": null, + "links": { + "related": "https://example.org/mocktype/id3/to-1", + "self": "https://example.org/mocktype/id3/relationships/to-1" + } + }, + "to-x-from-1": { + "data": [], + "links": { + "related": "https://example.org/mocktype/id3/to-x-from-1", + "self": "https://example.org/mocktype/id3/relationships/to-x-from-1" + } + } + }, + "type": "mocktype" + } + ], + "jsonapi": { + "version": "1.0" + }, + "links": { + "self": "https://example.org/fake/path?fields%5Bmocktype%5D=bool%2Cint%2Cstr%2Ctime%2Cto-1%2Cto-x-from-1%2Cuint64" + } +} \ No newline at end of file diff --git a/testdata/goldenfiles/marshaling/collection_with_inclusions.json b/testdata/goldenfiles/marshaling/collection_with_inclusions.json new file mode 100644 index 0000000..31f3ffb --- /dev/null +++ b/testdata/goldenfiles/marshaling/collection_with_inclusions.json @@ -0,0 +1,46 @@ +{ + "data": { + "attributes": {}, + "id": "id1", + "links": { + "self": "/mocktype/id1" + }, + "relationships": {}, + "type": "mocktype" + }, + "included": [ + { + "attributes": {}, + "id": "id2", + "links": { + "self": "/mocktype/id2" + }, + "relationships": {}, + "type": "mocktype" + }, + { + "attributes": {}, + "id": "id3", + "links": { + "self": "/mocktype/id3" + }, + "relationships": {}, + "type": "mocktype" + }, + { + "attributes": {}, + "id": "id4", + "links": { + "self": "/mocktype/id4" + }, + "relationships": {}, + "type": "mocktype" + } + ], + "jsonapi": { + "version": "1.0" + }, + "links": { + "self": "/fake/path?fields%5Bmocktype%" + } +} \ No newline at end of file diff --git a/testdata/goldenfiles/marshaling/empty_collection.json b/testdata/goldenfiles/marshaling/empty_collection.json new file mode 100644 index 0000000..f7c2381 --- /dev/null +++ b/testdata/goldenfiles/marshaling/empty_collection.json @@ -0,0 +1,9 @@ +{ + "data": [], + "jsonapi": { + "version": "1.0" + }, + "links": { + "self": "/fake/path?fields%5Bmocktype%" + } +} \ No newline at end of file diff --git a/testdata/goldenfiles/marshaling/empty_data.json b/testdata/goldenfiles/marshaling/empty_data.json new file mode 100644 index 0000000..5300796 --- /dev/null +++ b/testdata/goldenfiles/marshaling/empty_data.json @@ -0,0 +1,9 @@ +{ + "data": null, + "jsonapi": { + "version": "1.0" + }, + "links": { + "self": "https://example.org/fake/path?fields%5Bmocktype%" + } +} \ No newline at end of file diff --git a/testdata/goldenfiles/marshaling/error.json b/testdata/goldenfiles/marshaling/error.json new file mode 100644 index 0000000..c904c94 --- /dev/null +++ b/testdata/goldenfiles/marshaling/error.json @@ -0,0 +1,16 @@ +{ + "errors": [ + { + "detail": "This request is bad.", + "id": "00000000-0000-0000-0000-000000000000", + "status": "400", + "title": "Bad Request" + } + ], + "jsonapi": { + "version": "1.0" + }, + "links": { + "self": "/fake/path?fields%5Bmocktype%" + } +} \ No newline at end of file diff --git a/testdata/errors-1.json b/testdata/goldenfiles/marshaling/errors.json similarity index 52% rename from testdata/errors-1.json rename to testdata/goldenfiles/marshaling/errors.json index 61ebb00..2f6effb 100644 --- a/testdata/errors-1.json +++ b/testdata/goldenfiles/marshaling/errors.json @@ -1,19 +1,22 @@ { "errors": [ { - "detail": "name cannot be empty.", + "detail": "This request is bad.", "id": "00000000-0000-0000-0000-000000000000", "status": "400", - "title": "Invalid attribute" + "title": "Bad Request" }, { - "detail": "age cannot be negative.", + "detail": "This request is really bad.", "id": "00000000-0000-0000-0000-000000000000", "status": "400", - "title": "Invalid attribute" + "title": "Bad Request" } ], "jsonapi": { "version": "1.0" + }, + "links": { + "self": "/fake/path?fields%5Bmocktype%" } -} +} \ No newline at end of file diff --git a/testdata/goldenfiles/marshaling/identifier.json b/testdata/goldenfiles/marshaling/identifier.json new file mode 100644 index 0000000..f950090 --- /dev/null +++ b/testdata/goldenfiles/marshaling/identifier.json @@ -0,0 +1,12 @@ +{ + "data": { + "id": "id1", + "type": "mocktype" + }, + "jsonapi": { + "version": "1.0" + }, + "links": { + "self": "/fake/path?fields%5Bmocktype%" + } +} \ No newline at end of file diff --git a/testdata/goldenfiles/marshaling/identifiers.json b/testdata/goldenfiles/marshaling/identifiers.json new file mode 100644 index 0000000..7899a0d --- /dev/null +++ b/testdata/goldenfiles/marshaling/identifiers.json @@ -0,0 +1,22 @@ +{ + "data": [ + { + "id": "id1", + "type": "mocktype" + }, + { + "id": "id2", + "type": "mocktype" + }, + { + "id": "id3", + "type": "mocktype" + } + ], + "jsonapi": { + "version": "1.0" + }, + "links": { + "self": "/fake/path?fields%5Bmocktype%" + } +} \ No newline at end of file diff --git a/testdata/goldenfiles/marshaling/meta.json b/testdata/goldenfiles/marshaling/meta.json new file mode 100644 index 0000000..dd6460c --- /dev/null +++ b/testdata/goldenfiles/marshaling/meta.json @@ -0,0 +1,14 @@ +{ + "data": null, + "jsonapi": { + "version": "1.0" + }, + "links": { + "self": "/fake/path?fields%5Bmocktype%" + }, + "meta": { + "f1": "漢語", + "f2": 42, + "f3": true + } +} \ No newline at end of file diff --git a/testdata/goldenfiles/marshaling/resource.json b/testdata/goldenfiles/marshaling/resource.json new file mode 100644 index 0000000..2ad4ae1 --- /dev/null +++ b/testdata/goldenfiles/marshaling/resource.json @@ -0,0 +1,17 @@ +{ + "data": { + "attributes": {}, + "id": "id1", + "links": { + "self": "/mocktype/id1" + }, + "relationships": {}, + "type": "mocktype" + }, + "jsonapi": { + "version": "1.0" + }, + "links": { + "self": "/fake/path?fields%5Bmocktype%" + } +} \ No newline at end of file diff --git a/testdata/null-1.json b/testdata/null-1.json deleted file mode 100644 index d42a9df..0000000 --- a/testdata/null-1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "data": null, - "jsonapi": { - "version": "1.0" - } -} \ No newline at end of file diff --git a/testdata/resource-1.json b/testdata/resource-1.json deleted file mode 100644 index b3cd4ac..0000000 --- a/testdata/resource-1.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "data": { - "attributes": { - "bool": false, - "int": 0, - "int16": 0, - "int32": 0, - "int64": 0, - "int8": 0, - "str": "", - "time": "0001-01-01T00:00:00Z", - "uint": 0, - "uint16": 0, - "uint32": 0, - "uint64": 0, - "uint8": 0 - }, - "id": "mt1-1", - "links": { - "self": "/mocktypes1/mt1-1" - }, - "relationships": { - "to-many": { - "links": { - "related": "/mocktypes1/mt1-1/to-many", - "self": "/mocktypes1/mt1-1/relationships/to-many" - } - }, - "to-many-from-many": { - "links": { - "related": "/mocktypes1/mt1-1/to-many-from-many", - "self": "/mocktypes1/mt1-1/relationships/to-many-from-many" - } - }, - "to-many-from-one": { - "links": { - "related": "/mocktypes1/mt1-1/to-many-from-one", - "self": "/mocktypes1/mt1-1/relationships/to-many-from-one" - } - }, - "to-one": { - "links": { - "related": "/mocktypes1/mt1-1/to-one", - "self": "/mocktypes1/mt1-1/relationships/to-one" - } - }, - "to-one-from-many": { - "links": { - "related": "/mocktypes1/mt1-1/to-one-from-many", - "self": "/mocktypes1/mt1-1/relationships/to-one-from-many" - } - }, - "to-one-from-one": { - "links": { - "related": "/mocktypes1/mt1-1/to-one-from-one", - "self": "/mocktypes1/mt1-1/relationships/to-one-from-one" - } - } - }, - "type": "mocktypes1" - }, - "jsonapi": { - "version": "1.0" - }, - "links": { - "self": "/mocktypes1/mt1-1?fields%5Bmocktypes1%5D=bool%2Cint%2Cint16%2Cint32%2Cint64%2Cint8%2Cstr%2Ctime%2Cto-many%2Cto-many-from-many%2Cto-many-from-one%2Cto-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint%2Cuint16%2Cuint32%2Cuint64%2Cuint8" - }, - "meta": { - "num": 42, - "str": "a string", - "tf": true, - "timestamp": "2017-01-02T03:04:05.000000006Z" - } -} diff --git a/testdata/resource-2.json b/testdata/resource-2.json deleted file mode 100644 index 262e6f9..0000000 --- a/testdata/resource-2.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "data": { - "attributes": { - "boolptr": false, - "int16ptr": 160, - "int32ptr": 320, - "int64ptr": 6464640000, - "int8ptr": 80, - "intptr": -42, - "strptr": "str", - "timeptr": "2017-01-02T03:04:05.000000006Z", - "uint16ptr": 1600, - "uint32ptr": 32000, - "uint64ptr": 64000, - "uint8ptr": 8, - "uintptr": 42 - }, - "id": "mt1-2", - "links": { - "self": "https://example.org/mocktypes2/mt1-2" - }, - "relationships": { - "to-many-from-many": { - "links": { - "related": "https://example.org/mocktypes2/mt1-2/to-many-from-many", - "self": "https://example.org/mocktypes2/mt1-2/relationships/to-many-from-many" - } - }, - "to-many-from-one": { - "links": { - "related": "https://example.org/mocktypes2/mt1-2/to-many-from-one", - "self": "https://example.org/mocktypes2/mt1-2/relationships/to-many-from-one" - } - }, - "to-one-from-many": { - "links": { - "related": "https://example.org/mocktypes2/mt1-2/to-one-from-many", - "self": "https://example.org/mocktypes2/mt1-2/relationships/to-one-from-many" - } - }, - "to-one-from-one": { - "links": { - "related": "https://example.org/mocktypes2/mt1-2/to-one-from-one", - "self": "https://example.org/mocktypes2/mt1-2/relationships/to-one-from-one" - } - } - }, - "type": "mocktypes2" - }, - "jsonapi": { - "version": "1.0" - }, - "links": { - "self": "https://example.org/mocktypes2/mt1-2?fields%5Bmocktypes2%5D=boolptr%2Cint16ptr%2Cint32ptr%2Cint64ptr%2Cint8ptr%2Cintptr%2Cstrptr%2Ctimeptr%2Cto-many-from-many%2Cto-many-from-one%2Cto-one-from-many%2Cto-one-from-one%2Cuint16ptr%2Cuint32ptr%2Cuint64ptr%2Cuint8ptr%2Cuintptr" - } -} diff --git a/testdata/resource-3.json b/testdata/resource-3.json deleted file mode 100644 index c3bf09d..0000000 --- a/testdata/resource-3.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "data": { - "attributes": { - "strptr": "str", - "uintptr": 42 - }, - "id": "mt1-2", - "links": { - "self": "https://example.org/mocktypes2/mt1-2" - }, - "relationships": {}, - "type": "mocktypes2" - }, - "jsonapi": { - "version": "1.0" - }, - "links": { - "self": "https://example.org/mocktypes2/mt1-2?fields%5Bmocktypes2%5D=strptr%2Cuintptr" - } -} diff --git a/testdata/resource-4.json b/testdata/resource-4.json deleted file mode 100644 index 3610dd3..0000000 --- a/testdata/resource-4.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "data": { - "attributes": { - "attr1": "str", - "attr2": 42 - }, - "id": "mt3-1", - "links": { - "self": "https://example.org/mocktypes3/mt3-1" - }, - "relationships": {}, - "type": "mocktypes3" - }, - "included": [ - { - "attributes": { - "str": "astring" - }, - "id": "mt1-1", - "links": { - "self": "https://example.org/mocktypes1/mt1-1" - }, - "relationships": {}, - "type": "mocktypes1" - }, - { - "attributes": { - "str": "anotherstring" - }, - "id": "mt1-2", - "links": { - "self": "https://example.org/mocktypes1/mt1-2" - }, - "relationships": {}, - "type": "mocktypes1" - } - ], - "jsonapi": { - "version": "1.0" - }, - "links": { - "self": "https://example.org/mocktypes3/mt3-1?fields%5Bmocktypes1%5D=str\u0026fields%5Bmocktypes3%5D=attr1%2Cattr2" - } -} diff --git a/testdata/resource-5.json b/testdata/resource-5.json deleted file mode 100644 index a2ffadc..0000000 --- a/testdata/resource-5.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "data": { - "attributes": {}, - "id": "mt1-1", - "links": { - "self": "https://example.org/mocktypes1/mt1-1" - }, - "relationships": {}, - "type": "mocktypes1" - }, - "jsonapi": { - "version": "1.0" - }, - "links": { - "self": "https://example.org/mocktypes1/mt1-1?fields%5Bmocktypes1%5D=id" - } -} diff --git a/testdata/resource-6.json b/testdata/resource-6.json deleted file mode 100644 index a9d4712..0000000 --- a/testdata/resource-6.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "data": { - "attributes": {}, - "id": "mt11-1", - "links": { - "self": "https://example.org/mocktypes1/mt11-1" - }, - "relationships": { - "to-many": { - "data": [ - { - "id": "mt21-2", - "type": "mocktypes2" - }, - { - "id": "mt21-3", - "type": "mocktypes2" - } - ], - "links": { - "related": "https://example.org/mocktypes1/mt11-1/to-many", - "self": "https://example.org/mocktypes1/mt11-1/relationships/to-many" - } - }, - "to-many-from-many": { - "data": [], - "links": { - "related": "https://example.org/mocktypes1/mt11-1/to-many-from-many", - "self": "https://example.org/mocktypes1/mt11-1/relationships/to-many-from-many" - } - }, - "to-many-from-one": { - "links": { - "related": "https://example.org/mocktypes1/mt11-1/to-many-from-one", - "self": "https://example.org/mocktypes1/mt11-1/relationships/to-many-from-one" - } - }, - "to-one": { - "data": { - "id": "mt21-1", - "type": "mocktypes2" - }, - "links": { - "related": "https://example.org/mocktypes1/mt11-1/to-one", - "self": "https://example.org/mocktypes1/mt11-1/relationships/to-one" - } - }, - "to-one-from-many": { - "links": { - "related": "https://example.org/mocktypes1/mt11-1/to-one-from-many", - "self": "https://example.org/mocktypes1/mt11-1/relationships/to-one-from-many" - } - }, - "to-one-from-one": { - "data": null, - "links": { - "related": "https://example.org/mocktypes1/mt11-1/to-one-from-one", - "self": "https://example.org/mocktypes1/mt11-1/relationships/to-one-from-one" - } - } - }, - "type": "mocktypes1" - }, - "jsonapi": { - "version": "1.0" - }, - "links": { - "self": "https://example.org/mocktypes1/mt11-1?fields%5Bmocktypes1%5D=to-many%2Cto-many-from-many%2Cto-many-from-one%2Cto-one%2Cto-one-from-many%2Cto-one-from-one" - } -} diff --git a/testdata/resource-7.json b/testdata/resource-7.json deleted file mode 100644 index 198ac2f..0000000 --- a/testdata/resource-7.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "data": { - "attributes": {}, - "id": "mt11-1", - "links": { - "self": "https://example.org/mocktypes1/mt11-1" - }, - "relationships": { - "to-many": { - "data": [ - { - "id": "mt21-2", - "type": "mocktypes2" - }, - { - "id": "mt21-3", - "type": "mocktypes2" - } - ], - "links": { - "related": "https://example.org/mocktypes1/mt11-1/to-many", - "self": "https://example.org/mocktypes1/mt11-1/relationships/to-many" - } - }, - "to-one": { - "data": { - "id": "mt21-1", - "type": "mocktypes2" - }, - "links": { - "related": "https://example.org/mocktypes1/mt11-1/to-one", - "self": "https://example.org/mocktypes1/mt11-1/relationships/to-one" - } - } - }, - "type": "mocktypes1" - }, - "included": [ - { - "attributes": { - "boolptr": false, - "intptr": null, - "strptr": null - }, - "id": "mt21-1", - "links": { - "self": "https://example.org/mocktypes2/mt21-1" - }, - "relationships": { - }, - "type": "mocktypes2" - }, - { - "attributes": { - "boolptr": null, - "intptr": -42, - "strptr": null - }, - "id": "mt21-2", - "links": { - "self": "https://example.org/mocktypes2/mt21-2" - }, - "relationships": {}, - "type": "mocktypes2" - }, - { - "attributes": { - "boolptr": null, - "intptr": null, - "strptr": "str" - }, - "id": "mt21-3", - "links": { - "self": "https://example.org/mocktypes2/mt21-3" - }, - "relationships": {}, - "type": "mocktypes2" - } - ], - "jsonapi": { - "version": "1.0" - }, - "links": { - "self": "https://example.org/mocktypes1/mt11-1?fields%5Bmocktypes1%5D=to-many%2Cto-one&fields%5Bmocktypes2%5D=boolptr%2Cintptr%2Cstrptr" - } -} diff --git a/unmarshaling_test.go b/unmarshaling_test.go deleted file mode 100644 index ea797bd..0000000 --- a/unmarshaling_test.go +++ /dev/null @@ -1,116 +0,0 @@ -package jsonapi_test - -import ( - "testing" - - . "github.com/mfcochauxlaberge/jsonapi" - - "github.com/stretchr/testify/assert" -) - -func TestUnmarshalResource(t *testing.T) { - assert := assert.New(t) - - schema := newMockSchema() - - res1 := Wrap(&mockType3{ - ID: "mt1", - Attr1: "a string", - Attr2: 1, - Rel1: "mt2", - Rel2: []string{"mt3", "mt4"}, - }) - - url1, err := NewURLFromRaw(schema, "/mocktypes3/mt1") - assert.NoError(err) - meta1 := map[string]interface{}{ - "str": "a string\\^ç\"", - "num": float64(42), - "b": true, - } - - doc1 := NewDocument() - doc1.Data = res1 - doc1.Meta = meta1 - doc1.RelData["mocktypes3"] = []string{"rel1", "rel2"} - - body1, err := Marshal(doc1, url1) - assert.NoError(err) - - pl1, err := Unmarshal(body1, schema) - assert.NoError(err) - - dst1 := pl1.Data.(Resource) - assert.Equal("mt1", dst1.GetID()) - assert.Equal("mt2", dst1.GetToOne("rel1")) - assert.Contains(dst1.GetToMany("rel2"), "mt3") - assert.Contains(dst1.GetToMany("rel2"), "mt4") - - // assert.HaveEqualAttributes(t, "same attribues", res1, dst1) TODO Fix test - assert.Equal(meta1, pl1.Meta, "same meta object") -} - -func TestUnmarshalIdentifier(t *testing.T) { - assert := assert.New(t) - - schema := newMockSchema() - - id1 := Identifier{ID: "abc123", Type: "mocktypes1"} - - url1, err := NewURLFromRaw(schema, "/mocktypes3/mt1/relationships/rel1") - assert.NoError(err) - meta1 := map[string]interface{}{ - "str": "a string\\^ç\"", - "num": float64(42), - "b": true, - } - - doc1 := NewDocument() - doc1.Data = id1 - doc1.Meta = meta1 - - body1, err := Marshal(doc1, url1) - assert.NoError(err) - pl1, err := UnmarshalIdentifiers(body1, schema) - assert.NoError(err) - dst1 := pl1.Data.(Identifier) - - assert.Equal(id1, dst1, "same identifier") - assert.Equal(meta1, pl1.Meta, "same meta map") -} - -func TestUnmarshalIdentifiers(t *testing.T) { - assert := assert.New(t) - - schema := newMockSchema() - - ids1 := Identifiers{ - Identifier{ID: "abc123", Type: "mocktypes1"}, - Identifier{ID: "def456", Type: "mocktypes1"}, - Identifier{ID: "ghi789", Type: "mocktypes1"}, - } - - url1, err := NewURLFromRaw(schema, "/mocktypes3/mt1/relationships/rel2") - assert.NoError(err) - - meta1 := map[string]interface{}{ - "str": "a string\\^ç\"", - "num": float64(42), - "b": true, - } - - doc1 := NewDocument() - doc1.Data = ids1 - doc1.Meta = meta1 - - body1, err := Marshal(doc1, url1) - assert.NoError(err) - - pl1, err := UnmarshalIdentifiers(body1, schema) - assert.NoError(err) - - dst1 := pl1.Data.(Identifiers) - - assert.Equal(ids1, dst1, "same identifiers") - assert.Equal(meta1, pl1.Meta, "same meta map") -} From 3eec6206e79627140e91c30e73fec408b0abbbc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Wed, 21 Aug 2019 22:21:45 -0400 Subject: [PATCH 199/406] Remove url parameter in Unmarshal example --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 69359d4..2758312 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ The simplest way to start using jsonapi is to use the Marshal and Unmarshal func ``` func Marshal(doc *Document, url *URL) ([]byte, error) -func Unmarshal(payload []byte, url *URL, schema *Schema) (*Document, error) +func Unmarshal(payload []byte, schema *Schema) (*Document, error) ``` A struct has to follow certain rules in order to be understood by the library, but interfaces are also provided which let the library avoid the reflect package and be more efficient. From 9eb3a9580e1c2e37d175adab6c676ac5cd644c92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Fri, 23 Aug 2019 20:44:16 -0400 Subject: [PATCH 200/406] Improve Schema's top comment --- schema.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schema.go b/schema.go index 38e836a..ef96412 100644 --- a/schema.go +++ b/schema.go @@ -5,8 +5,8 @@ import ( "fmt" ) -// A Schema contains a list of types. It makes sure that each type is valid and -// unique. +// A Schema contains a list of types. It makes sure that all types are valid and +// their relationships are consistent. // // Check can be used to validate the relationships between the types. type Schema struct { From 28453a953137e225f0a00f56d3fbab5fa7176c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 24 Aug 2019 12:56:10 -0400 Subject: [PATCH 201/406] Add schema-level list of relationships --- schema.go | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ schema_test.go | 49 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+) diff --git a/schema.go b/schema.go index ef96412..b7b3bb2 100644 --- a/schema.go +++ b/schema.go @@ -3,6 +3,7 @@ package jsonapi import ( "errors" "fmt" + "sort" ) // A Schema contains a list of types. It makes sure that all types are valid and @@ -11,6 +12,21 @@ import ( // Check can be used to validate the relationships between the types. type Schema struct { Types []Type + + // Rels stores the relationships found in the schema's types. For + // two-way relationships, only one is chosen to be part of this + // map. The chosen one is the one that comes first when sorting + // both relationships in alphabetical order using the type name + // first and then the relationship name. + // + // For example, a type called Directory has a Parent relationship + // and a Children relationship. Both relationships have the same + // type (Directory), so now the name is used for sorting. Children + // comes before Parent, so the relationship Children from type + // Directory is stored here. The other one is not stored to avoid + // duplication (the information is already accessible through the + // inverse relationship). + rels map[string]Rel } // AddType adds a type to the schema. @@ -81,6 +97,26 @@ func (s *Schema) RemoveRel(typ string, rel string) { } } +// Rels returns all the relationships from the schema's types. For two-way +// relationships (two types where each has a relationship pointing to the other +// type), only one of the two relationships will appear in the list. +func (s *Schema) Rels() []Rel { + s.buildRels() + + rels := []Rel{} + for _, rel := range s.rels { + rels = append(rels, rel) + } + + sort.Slice(rels, func(i, j int) bool { + name1 := rels[i].InverseType + rels[i].Name + name2 := rels[j].InverseType + rels[j].Name + return name1 < name2 + }) + + return rels +} + // HasType returns a boolean indicating whether a type has the specified // name or not. func (s *Schema) HasType(name string) bool { @@ -166,3 +202,25 @@ func (s *Schema) Check() []error { return errs } + +// buildRels ... +func (s *Schema) buildRels() { + s.rels = map[string]Rel{} + + for _, typ := range s.Types { + for _, rel := range typ.Rels { + relName := rel.InverseType + "_" + rel.Name + if rel.InverseName == "" { + s.rels[relName] = rel + } else { + inv := rel.Inverse() + invName := inv.InverseType + "_" + inv.Name + if relName < invName { + s.rels[relName] = rel + } else { + s.rels[invName] = inv + } + } + } + } +} diff --git a/schema_test.go b/schema_test.go index 277764a..059cfe5 100644 --- a/schema_test.go +++ b/schema_test.go @@ -163,3 +163,52 @@ func TestSchemaCheck(t *testing.T) { "jsonapi: relationship rel2 of type type2 and its inverse do not point each other", ) } + +func TestSchemaRels(t *testing.T) { + assert := assert.New(t) + + schema := &Schema{} + + users := Type{ + Name: "users", + Rels: map[string]Rel{ + "posts": Rel{ + Name: "posts", + Type: "messages", + ToOne: false, + InverseName: "author", + InverseType: "users", + InverseToOne: true, + }, + "favorites": Rel{ + Name: "favorites", + Type: "messages", + ToOne: false, + InverseName: "", + InverseType: "users", + InverseToOne: false, + }, + }, + } + _ = schema.AddType(users) + + messages := Type{ + Name: "messages", + Rels: map[string]Rel{ + "author": Rel{ + Name: "author", + Type: "users", + ToOne: true, + InverseName: "posts", + InverseType: "messages", + InverseToOne: false, + }, + }, + } + _ = schema.AddType(messages) + + rels := schema.Rels() + assert.Len(rels, 2) + assert.Equal(messages.Rels["author"], rels[0]) + assert.Equal(users.Rels["favorites"], rels[1]) +} From 2518c69558b29e4c8dc34fbd01fe7e00c54b4fed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 24 Aug 2019 13:12:04 -0400 Subject: [PATCH 202/406] Fix names in top comments of some Resources methods --- collection.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/collection.go b/collection.go index d3cb8fb..fb5b33f 100644 --- a/collection.go +++ b/collection.go @@ -26,12 +26,12 @@ func (r *Resources) GetType() Type { return Type{} } -// GetType returns the number of elements in r. +// Len returns the number of elements in r. func (r *Resources) Len() int { return len(*r) } -// GetType returns the number of elements in r. +// At returns the number of elements in r. func (r *Resources) At(i int) Resource { if i >= 0 && i < r.Len() { return (*r)[i] @@ -39,7 +39,7 @@ func (r *Resources) At(i int) Resource { return nil } -// GetType adds a Resource object to r. +// Add adds a Resource object to r. func (r *Resources) Add(res Resource) { *r = append(*r, res) } From a252815f7bdf2016fbcd5bc847988acba8f33fff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 24 Aug 2019 14:08:53 -0400 Subject: [PATCH 203/406] Reformat two files with gofmt -s --- jsonapi_test.go | 12 +++--------- schema_test.go | 6 +++--- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/jsonapi_test.go b/jsonapi_test.go index a78c089..5378f76 100644 --- a/jsonapi_test.go +++ b/jsonapi_test.go @@ -77,9 +77,7 @@ func TestMarshaling(t *testing.T) { doc: &Document{ Data: col.At(0), RelData: map[string][]string{ - "mocktype": []string{ - "to-1", "to-x-from-1", - }, + "mocktype": {"to-1", "to-x-from-1"}, }, }, }, { @@ -87,9 +85,7 @@ func TestMarshaling(t *testing.T) { doc: &Document{ Data: Range(col, nil, nil, []string{}, 10, 0), RelData: map[string][]string{ - "mocktype": []string{ - "to-1", "to-x-from-1", - }, + "mocktype": {"to-1", "to-x-from-1"}, }, PrePath: "https://example.org/", }, @@ -113,9 +109,7 @@ func TestMarshaling(t *testing.T) { ID: "id1", }), RelData: map[string][]string{ - "mocktype": []string{ - "to-1", "to-x-from-1", - }, + "mocktype": {"to-1", "to-x-from-1"}, }, Included: []Resource{ Wrap(&mocktype{ diff --git a/schema_test.go b/schema_test.go index 059cfe5..1ecf9c4 100644 --- a/schema_test.go +++ b/schema_test.go @@ -172,7 +172,7 @@ func TestSchemaRels(t *testing.T) { users := Type{ Name: "users", Rels: map[string]Rel{ - "posts": Rel{ + "posts": { Name: "posts", Type: "messages", ToOne: false, @@ -180,7 +180,7 @@ func TestSchemaRels(t *testing.T) { InverseType: "users", InverseToOne: true, }, - "favorites": Rel{ + "favorites": { Name: "favorites", Type: "messages", ToOne: false, @@ -195,7 +195,7 @@ func TestSchemaRels(t *testing.T) { messages := Type{ Name: "messages", Rels: map[string]Rel{ - "author": Rel{ + "author": { Name: "author", Type: "users", ToOne: true, From 51af5abebfe177e09dc1a7641bc536c74b46a0e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 25 Aug 2019 08:24:13 -0400 Subject: [PATCH 204/406] Update stretchr/testify to v1.4.0 --- go.mod | 2 +- go.sum | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 429d632..defb982 100644 --- a/go.mod +++ b/go.mod @@ -5,5 +5,5 @@ go 1.12 require ( github.com/google/uuid v1.1.1 github.com/mitchellh/copystructure v1.0.0 - github.com/stretchr/testify v1.3.0 + github.com/stretchr/testify v1.4.0 ) diff --git a/go.sum b/go.sum index d8cab3d..ae988a5 100644 --- a/go.sum +++ b/go.sum @@ -8,6 +8,11 @@ github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/I github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From 8708578d932fc18184a52781e8133416dd54ad3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 25 Aug 2019 18:55:03 -0400 Subject: [PATCH 205/406] Rename Rel's fields --- filter_query_test.go | 6 ++-- helpers.go | 10 +++--- jsonapi.go | 30 ++++++++--------- mock_schema_test.go | 4 +-- params.go | 8 ++--- resource.go | 10 +++--- resource_test.go | 16 ++++----- schema.go | 26 +++++++-------- schema_test.go | 74 ++++++++++++++++++++--------------------- soft_collection.go | 4 +-- soft_collection_test.go | 54 +++++++++++++++--------------- soft_resource.go | 8 ++--- soft_resource_test.go | 40 +++++++++++----------- type.go | 38 ++++++++++----------- type_test.go | 52 ++++++++++++++--------------- url.go | 8 ++--- url_test.go | 72 +++++++++++++++++++-------------------- wrapper.go | 16 ++++----- wrapper_test.go | 16 ++++----- 19 files changed, 246 insertions(+), 246 deletions(-) diff --git a/filter_query_test.go b/filter_query_test.go index b1f5957..0833c7d 100644 --- a/filter_query_test.go +++ b/filter_query_test.go @@ -762,9 +762,9 @@ func TestFilterResource(t *testing.T) { // ty, n := GetAttrType(fmt.Sprintf("%T", test.rval)) typ.Rels = map[string]Rel{ "rel": { - Name: "rel", - Type: "type", - ToOne: toOne, + FromName: "rel", + ToOne: toOne, + ToType: "type", }, } diff --git a/helpers.go b/helpers.go index d165024..f9c23f9 100644 --- a/helpers.go +++ b/helpers.go @@ -155,11 +155,11 @@ func BuildType(v interface{}) (Type, error) { if relTag[0] == "rel" { typ.Rels[jsonTag] = Rel{ - Name: jsonTag, - Type: relTag[1], - ToOne: toOne, - InverseName: invName, - InverseType: typ.Name, + FromName: jsonTag, + ToOne: toOne, + ToType: relTag[1], + ToName: invName, + FromType: typ.Name, } } } diff --git a/jsonapi.go b/jsonapi.go index bacb461..4a9086d 100644 --- a/jsonapi.go +++ b/jsonapi.go @@ -238,7 +238,7 @@ func marshalResource(r Resource, prepath string, fields []string, relData map[st for _, rel := range r.Rels() { include := false for _, field := range fields { - if field == rel.Name { + if field == rel.FromName { include = true break } @@ -249,16 +249,16 @@ func marshalResource(r Resource, prepath string, fields []string, relData map[st if rel.ToOne { s := map[string]map[string]string{ - "links": buildRelationshipLinks(r, prepath, rel.Name), + "links": buildRelationshipLinks(r, prepath, rel.FromName), } for _, n := range relData[r.GetType().Name] { - if n == rel.Name { - id := r.GetToOne(rel.Name) + if n == rel.FromName { + id := r.GetToOne(rel.FromName) if id != "" { s["data"] = map[string]string{ - "id": r.GetToOne(rel.Name), - "type": rel.Type, + "id": r.GetToOne(rel.FromName), + "type": rel.ToType, } } else { s["data"] = nil @@ -268,21 +268,21 @@ func marshalResource(r Resource, prepath string, fields []string, relData map[st } raw, _ = json.Marshal(s) - rels[rel.Name] = &raw + rels[rel.FromName] = &raw } else { s := map[string]interface{}{ - "links": buildRelationshipLinks(r, prepath, rel.Name), + "links": buildRelationshipLinks(r, prepath, rel.FromName), } for _, n := range relData[r.GetType().Name] { - if n == rel.Name { + if n == rel.FromName { data := []map[string]string{} - ids := r.GetToMany(rel.Name) + ids := r.GetToMany(rel.FromName) sort.Strings(ids) for _, id := range ids { data = append(data, map[string]string{ "id": id, - "type": rel.Type, + "type": rel.ToType, }) } s["data"] = data @@ -291,7 +291,7 @@ func marshalResource(r Resource, prepath string, fields []string, relData map[st } raw, _ = json.Marshal(s) - rels[rel.Name] = &raw + rels[rel.FromName] = &raw } } } @@ -361,7 +361,7 @@ func unmarshalResource(data []byte, schema *Schema) (Resource, error) { if rel.ToOne { var iden identifierSkeleton err = json.Unmarshal(v.Data, &iden) - res.SetToOne(rel.Name, iden.ID) + res.SetToOne(rel.FromName, iden.ID) } else { var idens []identifierSkeleton err = json.Unmarshal(v.Data, &idens) @@ -369,12 +369,12 @@ func unmarshalResource(data []byte, schema *Schema) (Resource, error) { for i := range idens { ids[i] = idens[i].ID } - res.SetToMany(rel.Name, ids) + res.SetToMany(rel.FromName, ids) } } if err != nil { return nil, NewErrInvalidFieldValueInBody( - rel.Name, + rel.FromName, string(v.Data), typ.Name, ) diff --git a/mock_schema_test.go b/mock_schema_test.go index 44a6c38..589b18e 100644 --- a/mock_schema_test.go +++ b/mock_schema_test.go @@ -19,9 +19,9 @@ func newMockSchema() *Schema { for t, typ := range schema.Types { for r, rel := range typ.Rels { - invType := schema.GetType(rel.Type) + invType := schema.GetType(rel.ToType) rel := schema.Types[t].Rels[r] - rel.InverseToOne = invType.Rels[rel.InverseName].ToOne + rel.FromOne = invType.Rels[rel.ToName].ToOne schema.Types[t].Rels[r] = rel } } diff --git a/params.go b/params.go index 8d8f5ea..fc6ce0c 100644 --- a/params.go +++ b/params.go @@ -39,12 +39,12 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { for i := 0; i < len(incs); i++ { words := strings.Split(incs[i], ".") - incRel := Rel{Type: resType} + incRel := Rel{ToType: resType} for _, word := range words { - if typ := schema.GetType(incRel.Type); typ.Name != "" { + if typ := schema.GetType(incRel.ToType); typ.Name != "" { var ok bool if incRel, ok = typ.Rels[word]; ok { - params.Fields[incRel.Type] = []string{} + params.Fields[incRel.ToType] = []string{} } else { incs = append(incs[:i], incs[i+1:]...) break @@ -70,7 +70,7 @@ func NewParams(schema *Schema, su SimpleURL, resType string) (*Params, error) { params.Include[i][w] = incRel if w < len(words)-1 { - typ := schema.GetType(incRel.Type) + typ := schema.GetType(incRel.ToType) incRel = typ.Rels[words[w+1]] } } diff --git a/resource.go b/resource.go index 66d929c..928e37e 100644 --- a/resource.go +++ b/resource.go @@ -90,7 +90,7 @@ func Equal(r1, r2 Resource) bool { r1Rels = append(r1Rels, rels[name]) } sort.Slice(r1Rels, func(i, j int) bool { - return r1Rels[i].Name < r1Rels[j].Name + return r1Rels[i].FromName < r1Rels[j].FromName }) rels = r2.Rels() r2Rels := make([]Rel, 0, len(rels)) @@ -98,7 +98,7 @@ func Equal(r1, r2 Resource) bool { r2Rels = append(r2Rels, rels[name]) } sort.Slice(r2Rels, func(i, j int) bool { - return r2Rels[i].Name < r2Rels[j].Name + return r2Rels[i].FromName < r2Rels[j].FromName }) if len(r1Rels) != len(r2Rels) { @@ -111,12 +111,12 @@ func Equal(r1, r2 Resource) bool { return false } if rel1.ToOne { - if r1.GetToOne(rel1.Name) != r2.GetToOne(rel2.Name) { + if r1.GetToOne(rel1.FromName) != r2.GetToOne(rel2.FromName) { return false } } else { - v1 := r1.GetToMany(rel1.Name) - v2 := r2.GetToMany(rel2.Name) + v1 := r1.GetToMany(rel1.FromName) + v2 := r2.GetToMany(rel2.FromName) if len(v1) != 0 || len(v2) != 0 { if !reflect.DeepEqual(v1, v2) { return false diff --git a/resource_test.go b/resource_test.go index f871fd8..66aece1 100644 --- a/resource_test.go +++ b/resource_test.go @@ -118,26 +118,26 @@ func TestEqual(t *testing.T) { } for _, rel := range typ.Rels { if rel.ToOne { - sr1.SetToOne(rel.Name, mt11.GetToOne(rel.Name)) + sr1.SetToOne(rel.FromName, mt11.GetToOne(rel.FromName)) } else { - sr1.SetToMany(rel.Name, mt11.GetToMany(rel.Name)) + sr1.SetToMany(rel.FromName, mt11.GetToMany(rel.FromName)) } } sr1.RemoveField("to-one") assert.False(Equal(mt11, sr1), "different number of relationships") sr1.AddRel(Rel{ - Name: "to-one", - Type: "mocktypes2", - ToOne: false, + FromName: "to-one", + ToOne: false, + ToType: "mocktypes2", }) assert.False(Equal(mt11, sr1), "different to-one property") sr1.RemoveField("to-one") sr1.AddRel(Rel{ - Name: "to-one", - Type: "mocktypes2", - ToOne: true, + FromName: "to-one", + ToOne: true, + ToType: "mocktypes2", }) sr1.SetToOne("to-one", "b") assert.False(Equal(mt11, sr1), "different relationship value (to-one)") diff --git a/schema.go b/schema.go index b7b3bb2..09bdc0d 100644 --- a/schema.go +++ b/schema.go @@ -109,8 +109,8 @@ func (s *Schema) Rels() []Rel { } sort.Slice(rels, func(i, j int) bool { - name1 := rels[i].InverseType + rels[i].Name - name2 := rels[j].InverseType + rels[j].Name + name1 := rels[i].FromType + rels[i].FromName + name2 := rels[j].FromType + rels[j].FromName return name1 < name2 }) @@ -156,35 +156,35 @@ func (s *Schema) Check() []error { var targetType Type // Does the relationship point to a type that exists? - if targetType = s.GetType(rel.Type); targetType.Name == "" { + if targetType = s.GetType(rel.ToType); targetType.Name == "" { errs = append(errs, fmt.Errorf( "jsonapi: the target type of relationship %s of type %s does not exist", - rel.Name, + rel.FromName, typ.Name, )) } // Skip to next relationship here if there's no inverse - if rel.InverseName == "" { + if rel.ToName == "" { continue } // Is the inverse relationship type the same as its // type name? - if rel.InverseType != typ.Name { + if rel.FromType != typ.Name { errs = append(errs, fmt.Errorf( "jsonapi: "+ "the inverse type of relationship %s should its type's name (%s, not %s)", - rel.Name, + rel.FromName, typ.Name, - rel.InverseType, + rel.FromType, )) } else { // Do both relationships (current and inverse) point // to each other? var found bool for _, invRel := range targetType.Rels { - if rel.Name == invRel.InverseName && rel.InverseName == invRel.Name { + if rel.FromName == invRel.ToName && rel.ToName == invRel.FromName { found = true } } @@ -192,7 +192,7 @@ func (s *Schema) Check() []error { errs = append(errs, fmt.Errorf( "jsonapi: "+ "relationship %s of type %s and its inverse do not point each other", - rel.Name, + rel.FromName, typ.Name, )) } @@ -209,12 +209,12 @@ func (s *Schema) buildRels() { for _, typ := range s.Types { for _, rel := range typ.Rels { - relName := rel.InverseType + "_" + rel.Name - if rel.InverseName == "" { + relName := rel.FromType + "_" + rel.FromName + if rel.ToName == "" { s.rels[relName] = rel } else { inv := rel.Inverse() - invName := inv.InverseType + "_" + inv.Name + invName := inv.FromType + "_" + inv.FromName if relName < invName { s.rels[relName] = rel } else { diff --git a/schema_test.go b/schema_test.go index 1ecf9c4..90666a3 100644 --- a/schema_test.go +++ b/schema_test.go @@ -68,9 +68,9 @@ func TestSchemaTypes(t *testing.T) { schema = &Schema{} _ = schema.AddType(Type{Name: "type1"}) rel := Rel{ - Name: "rel1", - Type: "type1", - ToOne: true, + FromName: "rel1", + ToOne: true, + ToType: "type1", } err = schema.AddRel("type1", rel) assert.NoError(err) @@ -83,13 +83,13 @@ func TestSchemaTypes(t *testing.T) { // Add an invalid relationship (no name) schema = &Schema{} _ = schema.AddType(Type{Name: "type1"}) - err = schema.AddRel("type1", Rel{Name: ""}) + err = schema.AddRel("type1", Rel{FromName: ""}) assert.Error(err) // Add an invalid relationship (type does not exist) schema = &Schema{} _ = schema.AddType(Type{Name: "type1"}) - err = schema.AddRel("type2", Rel{Name: "rel1"}) + err = schema.AddRel("type2", Rel{FromName: "rel1"}) assert.Error(err) } @@ -103,16 +103,16 @@ func TestSchemaCheck(t *testing.T) { Attrs: map[string]Attr{}, Rels: map[string]Rel{ "rel1": { - Name: "rel1", - Type: "type2", + FromName: "rel1", + ToType: "type2", }, "rel2": { - Name: "rel2-invalid", - Type: "nonexistent", + FromName: "rel2-invalid", + ToType: "nonexistent", }, "rel3": { - Name: "rel3", - Type: "type1", + FromName: "rel3", + ToType: "type1", }, }, } @@ -124,16 +124,16 @@ func TestSchemaCheck(t *testing.T) { Attrs: map[string]Attr{}, Rels: map[string]Rel{ "rel1": { - Name: "rel1", - Type: "type1", - InverseName: "rel1", - InverseType: "type1", + FromName: "rel1", + FromType: "type1", + ToName: "rel1", + ToType: "type1", }, "rel2": { - Name: "rel2", - Type: "type1", - InverseName: "rel3", - InverseType: "type2", + FromName: "rel2", + FromType: "type2", + ToName: "rel3", + ToType: "type1", }, }, } @@ -173,20 +173,20 @@ func TestSchemaRels(t *testing.T) { Name: "users", Rels: map[string]Rel{ "posts": { - Name: "posts", - Type: "messages", - ToOne: false, - InverseName: "author", - InverseType: "users", - InverseToOne: true, + FromName: "posts", + FromType: "users", + ToOne: false, + ToName: "author", + ToType: "messages", + FromOne: true, }, "favorites": { - Name: "favorites", - Type: "messages", - ToOne: false, - InverseName: "", - InverseType: "users", - InverseToOne: false, + FromName: "favorites", + FromType: "users", + ToOne: false, + ToName: "", + ToType: "messages", + FromOne: false, }, }, } @@ -196,12 +196,12 @@ func TestSchemaRels(t *testing.T) { Name: "messages", Rels: map[string]Rel{ "author": { - Name: "author", - Type: "users", - ToOne: true, - InverseName: "posts", - InverseType: "messages", - InverseToOne: false, + FromName: "author", + FromType: "messages", + ToOne: true, + ToName: "posts", + ToType: "users", + FromOne: false, }, }, } diff --git a/soft_collection.go b/soft_collection.go index 6d6e331..68cf4b4 100644 --- a/soft_collection.go +++ b/soft_collection.go @@ -70,9 +70,9 @@ func (s *SoftCollection) Add(r Resource) { for _, rel := range r.Rels() { sr.AddRel(rel) if rel.ToOne { - sr.SetToOne(rel.Name, r.GetToOne(rel.Name)) + sr.SetToOne(rel.FromName, r.GetToOne(rel.FromName)) } else { - sr.SetToMany(rel.Name, r.GetToMany(rel.Name)) + sr.SetToMany(rel.FromName, r.GetToMany(rel.FromName)) } } diff --git a/soft_collection_test.go b/soft_collection_test.go index bd74d1e..4bf12e6 100644 --- a/soft_collection_test.go +++ b/soft_collection_test.go @@ -27,20 +27,20 @@ func TestSoftCollection(t *testing.T) { Nullable: true, }) _ = typ.AddRel(Rel{ - Name: "rel1", - Type: "othertype", - ToOne: true, - InverseName: "rel2", - InverseType: "thistype", - InverseToOne: true, + FromName: "rel1", + FromType: "thistype", + ToOne: true, + ToName: "rel2", + ToType: "othertype", + FromOne: true, }) _ = typ.AddRel(Rel{ - Name: "rel3", - Type: "othertype", - ToOne: false, - InverseName: "rel4", - InverseType: "thistype", - InverseToOne: true, + FromName: "rel3", + FromType: "thistype", + ToOne: false, + ToName: "rel4", + ToType: "othertype", + FromOne: true, }) // Make a copy so that modifying the original typ @@ -59,12 +59,12 @@ func TestSoftCollection(t *testing.T) { Nullable: false, } rel5 := Rel{ - Name: "rel5", - Type: "othertype", - ToOne: true, - InverseName: "rel6", - InverseType: "thistype", - InverseToOne: false, + FromName: "rel5", + FromType: "thistype", + ToOne: true, + ToName: "rel6", + ToType: "othertype", + FromOne: false, } _ = typ.AddAttr(attr3) _ = sc.AddAttr(attr3) @@ -84,12 +84,12 @@ func TestSoftCollection(t *testing.T) { sr.AddAttr(attr4) _ = typ.AddAttr(attr4) rel7 := Rel{ - Name: "rel7", - Type: "othertype", - ToOne: true, - InverseName: "rel8", - InverseType: "thirdtype", - InverseToOne: true, + FromName: "rel7", + FromType: "thirdtype", + ToOne: true, + ToName: "rel8", + ToType: "othertype", + FromOne: true, } sr.AddRel(rel7) _ = typ.AddRel(rel7) @@ -131,9 +131,9 @@ func TestSoftCollectionResource(t *testing.T) { Nullable: true, }) _ = sc.Type.AddRel(Rel{ - Name: "rel1", - Type: "type2", - ToOne: true, + FromName: "rel1", + ToOne: true, + ToType: "type2", }) sr := &SoftResource{} diff --git a/soft_resource.go b/soft_resource.go index b6bb6d1..0008d7f 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -46,11 +46,11 @@ func (sr *SoftResource) AddAttr(attr Attr) { func (sr *SoftResource) AddRel(rel Rel) { sr.check() for _, name := range sr.fields() { - if name == rel.Name { + if name == rel.FromName { return } } - sr.Type.Rels[rel.Name] = rel + sr.Type.Rels[rel.FromName] = rel } // RemoveField removes a field. @@ -201,7 +201,7 @@ func (sr *SoftResource) fields() []string { fields = append(fields, sr.Type.Attrs[i].Name) } for i := range sr.Type.Rels { - fields = append(fields, sr.Type.Rels[i].Name) + fields = append(fields, sr.Type.Rels[i].FromName) } return fields } @@ -227,7 +227,7 @@ func (sr *SoftResource) check() { } } for i := range sr.Type.Rels { - n := sr.Type.Rels[i].Name + n := sr.Type.Rels[i].FromName if _, ok := sr.data[n]; !ok { if sr.Type.Rels[i].ToOne { sr.data[n] = "" diff --git a/soft_resource_test.go b/soft_resource_test.go index a760dff..c1e5831 100644 --- a/soft_resource_test.go +++ b/soft_resource_test.go @@ -24,12 +24,12 @@ func TestSoftResource(t *testing.T) { Nullable: false, }) _ = typ.AddRel(Rel{ - Name: "rel1", - Type: "type", - ToOne: true, - InverseName: "rel1", - InverseType: "type", - InverseToOne: true, + FromName: "rel1", + FromType: "type", + ToOne: true, + ToName: "rel1", + ToType: "type", + FromOne: true, }) sr = &SoftResource{Type: &typ} // TODO assert.Equal(t, &typ, sr.typ) @@ -65,26 +65,26 @@ func TestSoftResource(t *testing.T) { // Relationships rels := map[string]Rel{ "rel1": { - Name: "rel1", - Type: "type", - ToOne: true, - InverseName: "rel1", - InverseType: "type", - InverseToOne: true, + FromName: "rel1", + FromType: "type", + ToOne: true, + ToName: "rel1", + ToType: "type", + FromOne: true, }, "rel2": { - Name: "rel2", - Type: "type", - ToOne: false, - InverseName: "rel1", - InverseType: "type", - InverseToOne: true, + FromName: "rel2", + FromType: "type", + ToOne: false, + ToName: "rel1", + ToType: "type", + FromOne: true, }, } for _, rel := range rels { sr.AddRel(rel) - assert.Equal(t, rel, sr.Rel(rel.Name)) + assert.Equal(t, rel, sr.Rel(rel.FromName)) } assert.Equal(t, rels, sr.Rels()) @@ -111,7 +111,7 @@ func TestSoftResource(t *testing.T) { for _, rel := range rels { sr.AddRel(rel) - assert.Equal(t, rel, sr.Rel(rel.Name)) + assert.Equal(t, rel, sr.Rel(rel.FromName)) } // Set and get some fields diff --git a/type.go b/type.go index 0d6a448..38b2f15 100644 --- a/type.go +++ b/type.go @@ -85,24 +85,24 @@ func (t *Type) RemoveAttr(attr string) { // AddRel adds a relationship to the type. func (t *Type) AddRel(rel Rel) error { // Validation - if rel.Name == "" { + if rel.FromName == "" { return fmt.Errorf("jsonapi: relationship name is empty") } - if rel.Type == "" { + if rel.ToType == "" { return fmt.Errorf("jsonapi: relationship type is empty") } // Make sure the name isn't already used for i := range t.Rels { - if t.Rels[i].Name == rel.Name { - return fmt.Errorf("jsonapi: relationship name %s is already used", rel.Name) + if t.Rels[i].FromName == rel.FromName { + return fmt.Errorf("jsonapi: relationship name %s is already used", rel.FromName) } } if t.Rels == nil { t.Rels = map[string]Rel{} } - t.Rels[rel.Name] = rel + t.Rels[rel.FromName] = rel return nil } @@ -110,7 +110,7 @@ func (t *Type) AddRel(rel Rel) error { // RemoveRel removes a relationship from the type if it exists. func (t *Type) RemoveRel(rel string) { for i := range t.Rels { - if t.Rels[i].Name == rel { + if t.Rels[i].FromName == rel { delete(t.Rels, rel) } } @@ -124,7 +124,7 @@ func (t *Type) Fields() []string { fields = append(fields, t.Attrs[i].Name) } for i := range t.Rels { - fields = append(fields, t.Rels[i].Name) + fields = append(fields, t.Rels[i].FromName) } sort.Strings(fields) return fields @@ -288,23 +288,23 @@ func (a Attr) UnmarshalToType(data []byte) (interface{}, error) { // Rel represents a resource relationship. type Rel struct { - Name string - Type string - ToOne bool - InverseName string - InverseType string - InverseToOne bool + FromType string + FromName string + ToOne bool + ToType string + ToName string + FromOne bool } // Inverse returns the inverse relationship of r. func (r *Rel) Inverse() Rel { return Rel{ - Name: r.InverseName, - Type: r.InverseType, - ToOne: r.InverseToOne, - InverseName: r.Name, - InverseType: r.Type, - InverseToOne: r.ToOne, + FromType: r.ToType, + FromName: r.ToName, + ToOne: r.FromOne, + ToType: r.FromType, + ToName: r.FromName, + FromOne: r.ToOne, } } diff --git a/type_test.go b/type_test.go index 1b2f065..f027ef9 100644 --- a/type_test.go +++ b/type_test.go @@ -25,8 +25,8 @@ func TestType(t *testing.T) { err := typ.AddAttr(attr1) assert.NoError(err) rel1 := Rel{ - Name: "rel1", - Type: "type1", + FromName: "rel1", + ToType: "type1", } err = typ.AddRel(rel1) assert.NoError(err) @@ -51,11 +51,11 @@ func TestType(t *testing.T) { assert.Error(err) // Add invalid relationship (empty type) - err = typ.AddRel(Rel{Name: "invalid"}) + err = typ.AddRel(Rel{FromName: "invalid"}) assert.Error(err) // Add invalid relationship (name already used) - err = typ.AddRel(Rel{Name: "rel1", Type: "type1"}) + err = typ.AddRel(Rel{FromName: "rel1", ToType: "type1"}) assert.Error(err) } @@ -179,22 +179,22 @@ func TestInverseRel(t *testing.T) { assert := assert.New(t) rel := Rel{ - Name: "rel1", - Type: "type2", - ToOne: true, - InverseName: "rel2", - InverseType: "type1", - InverseToOne: false, + FromName: "rel1", + FromType: "type1", + ToOne: true, + ToName: "rel2", + ToType: "type2", + FromOne: false, } invRel := rel.Inverse() - assert.Equal("rel2", invRel.Name) - assert.Equal("type1", invRel.Type) + assert.Equal("rel2", invRel.FromName) + assert.Equal("type1", invRel.ToType) assert.Equal(false, invRel.ToOne) - assert.Equal("rel1", invRel.InverseName) - assert.Equal("type2", invRel.InverseType) - assert.Equal(true, invRel.InverseToOne) + assert.Equal("rel1", invRel.ToName) + assert.Equal("type2", invRel.FromType) + assert.Equal(true, invRel.FromOne) } func TestGetAttrType(t *testing.T) { @@ -393,12 +393,12 @@ func TestCopyType(t *testing.T) { }, Rels: map[string]Rel{ "rel1": { - Name: "rel1", - Type: "type2", - ToOne: true, - InverseName: "rel2", - InverseType: "type1", - InverseToOne: false, + FromName: "rel1", + FromType: "type1", + ToOne: true, + ToName: "rel2", + ToType: "type2", + FromOne: false, }, }, } @@ -412,12 +412,12 @@ func TestCopyType(t *testing.T) { assert.Equal(AttrTypeString, typ2.Attrs["attr1"].Type) assert.True(typ2.Attrs["attr1"].Nullable) assert.Len(typ2.Rels, 1) - assert.Equal("rel1", typ2.Rels["rel1"].Name) - assert.Equal("type2", typ2.Rels["rel1"].Type) + assert.Equal("rel1", typ2.Rels["rel1"].FromName) + assert.Equal("type2", typ2.Rels["rel1"].ToType) assert.True(typ2.Rels["rel1"].ToOne) - assert.Equal("rel2", typ2.Rels["rel1"].InverseName) - assert.Equal("type1", typ2.Rels["rel1"].InverseType) - assert.False(typ2.Rels["rel1"].InverseToOne) + assert.Equal("rel2", typ2.Rels["rel1"].ToName) + assert.Equal("type1", typ2.Rels["rel1"].FromType) + assert.False(typ2.Rels["rel1"].FromOne) // Modify original (copy should not change) typ1.Name = "type3" diff --git a/url.go b/url.go index 51d84a0..448a66f 100644 --- a/url.go +++ b/url.go @@ -54,12 +54,12 @@ func NewURL(schema *Schema, su SimpleURL) (*URL, error) { } url.IsCol = !url.Rel.ToOne - url.ResType = url.Rel.Type + url.ResType = url.Rel.ToType url.BelongsToFilter = BelongsToFilter{ Type: url.Fragments[0], ID: url.Fragments[1], - Name: url.Rel.Name, - InverseName: url.Rel.InverseName, + Name: url.Rel.FromName, + ToName: url.Rel.ToName, } if len(url.Fragments) == 3 { @@ -217,5 +217,5 @@ type BelongsToFilter struct { Type string ID string Name string - InverseName string + ToName string } diff --git a/url_test.go b/url_test.go index 9dff4cd..53ef1e2 100644 --- a/url_test.go +++ b/url_test.go @@ -113,12 +113,12 @@ func TestParseURL(t *testing.T) { ResType: "mocktypes2", RelKind: "related", Rel: Rel{ - Name: "to-one", - Type: "mocktypes2", - ToOne: true, - InverseName: "", - InverseType: "mocktypes1", - InverseToOne: false, + FromName: "to-one", + FromType: "mocktypes1", + ToOne: true, + ToName: "", + ToType: "mocktypes2", + FromOne: false, }, }, expectedError: false, @@ -133,20 +133,20 @@ func TestParseURL(t *testing.T) { }, Route: "/mocktypes1/:id/relationships/to-many-from-one", BelongsToFilter: BelongsToFilter{ - Type: "mocktypes1", - ID: "mc1-1", - Name: "to-many-from-one", - InverseName: "to-one-from-many", + Type: "mocktypes1", + ID: "mc1-1", + Name: "to-many-from-one", + ToName: "to-one-from-many", }, ResType: "mocktypes2", RelKind: "self", Rel: Rel{ - Name: "to-many-from-one", - Type: "mocktypes2", - ToOne: false, - InverseName: "to-one-from-many", - InverseType: "mocktypes1", - InverseToOne: true, + FromName: "to-many-from-one", + FromType: "mocktypes1", + ToOne: false, + ToName: "to-one-from-many", + ToType: "mocktypes2", + FromOne: true, }, IsCol: true, }, @@ -160,20 +160,20 @@ func TestParseURL(t *testing.T) { }, Route: "/mocktypes1/:id/relationships/to-many-from-one", BelongsToFilter: BelongsToFilter{ - Type: "mocktypes1", - ID: "mc1-1", - Name: "to-many-from-one", - InverseName: "to-one-from-many", + Type: "mocktypes1", + ID: "mc1-1", + Name: "to-many-from-one", + ToName: "to-one-from-many", }, ResType: "mocktypes2", RelKind: "self", Rel: Rel{ - Name: "to-many-from-one", - Type: "mocktypes2", - ToOne: false, - InverseName: "to-one-from-many", - InverseType: "mocktypes1", - InverseToOne: true, + FromName: "to-many-from-one", + FromType: "mocktypes1", + ToOne: false, + ToName: "to-one-from-many", + ToType: "mocktypes2", + FromOne: true, }, IsCol: true, }, @@ -190,20 +190,20 @@ func TestParseURL(t *testing.T) { }, Route: "/mocktypes1/:id/relationships/to-many-from-one", BelongsToFilter: BelongsToFilter{ - Type: "mocktypes1", - ID: "mc1-1", - Name: "to-many-from-one", - InverseName: "to-one-from-many", + Type: "mocktypes1", + ID: "mc1-1", + Name: "to-many-from-one", + ToName: "to-one-from-many", }, ResType: "mocktypes2", RelKind: "self", Rel: Rel{ - Name: "to-many-from-one", - Type: "mocktypes2", - ToOne: false, - InverseName: "to-one-from-many", - InverseType: "mocktypes1", - InverseToOne: true, + FromName: "to-many-from-one", + FromType: "mocktypes1", + ToOne: false, + ToName: "to-one-from-many", + ToType: "mocktypes2", + FromOne: true, }, IsCol: true, }, diff --git a/wrapper.go b/wrapper.go index 0946d37..ff63003 100644 --- a/wrapper.go +++ b/wrapper.go @@ -84,11 +84,11 @@ func Wrap(v interface{}) *Wrapper { if relTag[0] == "rel" { w.rels[jsonTag] = Rel{ - Name: jsonTag, - Type: relTag[1], - ToOne: toOne, - InverseName: invName, - InverseType: w.typ, + FromName: jsonTag, + ToType: relTag[1], + ToOne: toOne, + ToName: invName, + FromType: w.typ, } } } @@ -124,7 +124,7 @@ func (w *Wrapper) Attr(key string) Attr { // Rel returns the relationship that corresponds to the given key. func (w *Wrapper) Rel(key string) Rel { for _, rel := range w.rels { - if rel.Name == key { + if rel.FromName == key { return rel } } @@ -293,9 +293,9 @@ func (w *Wrapper) Copy() Resource { // Relationships for _, rel := range w.Rels() { if rel.ToOne { - nw.SetToOne(rel.Name, w.GetToOne(rel.Name)) + nw.SetToOne(rel.FromName, w.GetToOne(rel.FromName)) } else { - nw.SetToMany(rel.Name, w.GetToMany(rel.Name)) + nw.SetToMany(rel.FromName, w.GetToMany(rel.FromName)) } } diff --git a/wrapper_test.go b/wrapper_test.go index f5a58a7..04123e1 100644 --- a/wrapper_test.go +++ b/wrapper_test.go @@ -75,12 +75,12 @@ func TestWrapper(t *testing.T) { // Get relationships rel := wrap1.Rel("to-one") assert.Equal(Rel{ - Name: "to-one", - Type: "mocktypes2", - ToOne: true, - InverseName: "", - InverseType: "mocktypes1", - InverseToOne: false, + FromName: "to-one", + ToType: "mocktypes2", + ToOne: true, + ToName: "", + FromType: "mocktypes1", + FromOne: false, }, rel, "get relationship (to-one)") assert.Equal(Rel{}, wrap1.Rel("nonexistent"), "get non-existent relationship") @@ -180,7 +180,7 @@ func TestWrapper(t *testing.T) { assert.Equal(wrap1.Attr(attr.Name), wrap3.Attr(attr.Name), "copied attribute") } for _, rel := range wrap1.Rels() { - assert.Equal(wrap1.Rel(rel.Name), wrap3.Rel(rel.Name), "copied relationship") + assert.Equal(wrap1.Rel(rel.FromName), wrap3.Rel(rel.FromName), "copied relationship") } // Copy @@ -189,7 +189,7 @@ func TestWrapper(t *testing.T) { assert.Equal(wrap1.Attr(attr.Name), wrap3.Attr(attr.Name), "copied attribute") } for _, rel := range wrap1.Rels() { - assert.Equal(wrap1.Rel(rel.Name), wrap3.Rel(rel.Name), "copied relationship") + assert.Equal(wrap1.Rel(rel.FromName), wrap3.Rel(rel.FromName), "copied relationship") } wrap3.Set("str", "another string") From 85732fd845724394085cd4e472b32a96972e1884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 25 Aug 2019 18:57:31 -0400 Subject: [PATCH 206/406] Remove SoftResource.UnmarshalJSON --- soft_resource.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/soft_resource.go b/soft_resource.go index 0008d7f..e4d1058 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -188,13 +188,6 @@ func (sr *SoftResource) Copy() Resource { } } -// UnmarshalJSON parses the payload and populates a SoftResource. -func (sr *SoftResource) UnmarshalJSON(payload []byte) error { - sr.check() - // TODO - return nil -} - func (sr *SoftResource) fields() []string { fields := make([]string, 0, len(sr.Type.Attrs)+len(sr.Type.Rels)) for i := range sr.Type.Attrs { From 013e69ddafde87dff7be36f34cd189b0c8ec8fdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 25 Aug 2019 19:03:09 -0400 Subject: [PATCH 207/406] Improve error messages when checking a Schema --- schema.go | 4 ++-- schema_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/schema.go b/schema.go index 09bdc0d..87ce940 100644 --- a/schema.go +++ b/schema.go @@ -158,7 +158,7 @@ func (s *Schema) Check() []error { // Does the relationship point to a type that exists? if targetType = s.GetType(rel.ToType); targetType.Name == "" { errs = append(errs, fmt.Errorf( - "jsonapi: the target type of relationship %s of type %s does not exist", + "jsonapi: field ToType of relationship %s of type %s does not exist", rel.FromName, typ.Name, )) @@ -174,7 +174,7 @@ func (s *Schema) Check() []error { if rel.FromType != typ.Name { errs = append(errs, fmt.Errorf( "jsonapi: "+ - "the inverse type of relationship %s should its type's name (%s, not %s)", + "field FromType of relationship %s must be its type's name (%s, not %s)", rel.FromName, typ.Name, rel.FromType, diff --git a/schema_test.go b/schema_test.go index 90666a3..285d142 100644 --- a/schema_test.go +++ b/schema_test.go @@ -152,11 +152,11 @@ func TestSchemaCheck(t *testing.T) { assert.Len(errs, 3) assert.Contains( errsStr, - "jsonapi: the target type of relationship rel2-invalid of type type1 does not exist", + "jsonapi: field ToType of relationship rel2-invalid of type type1 does not exist", ) assert.Contains( errsStr, - "jsonapi: the inverse type of relationship rel1 should its type's name (type2, not type1)", + "jsonapi: field FromType of relationship rel1 must be its type's name (type2, not type1)", ) assert.Contains( errsStr, From d9e62e268c2a89c8df756d6fd55f334eeba7fd1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 26 Aug 2019 00:09:57 -0400 Subject: [PATCH 208/406] Add Rel.Normalize (with tests) --- type.go | 13 +++++++++++++ type_test.go | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/type.go b/type.go index 38b2f15..f6d5aa6 100644 --- a/type.go +++ b/type.go @@ -308,6 +308,19 @@ func (r *Rel) Inverse() Rel { } } +// Normalize inverts the relationship if necessary in order to have it in the +// right direction and returns the result. +// +// This is the form stored in Schema.Rels. +func (r *Rel) Normalize() Rel { + from := r.FromType + r.FromName + to := r.ToType + r.ToName + if from < to { + return *r + } + return r.Inverse() +} + // GetAttrType returns the attribute type as an int (see constants) and a // boolean that indicates whether the attribute can be null or not. func GetAttrType(t string) (int, bool) { diff --git a/type_test.go b/type_test.go index f027ef9..5d276e3 100644 --- a/type_test.go +++ b/type_test.go @@ -197,6 +197,38 @@ func TestInverseRel(t *testing.T) { assert.Equal(true, invRel.FromOne) } +func TestRelNormalize(t *testing.T) { + assert := assert.New(t) + + rel := Rel{ + FromName: "rel2", + FromType: "type2", + ToOne: false, + ToName: "rel1", + ToType: "type1", + FromOne: true, + } + + // Normalize should return the inverse because + // type1 comes before type2 alphabetically. + norm := rel.Normalize() + assert.Equal("type1", norm.FromType) + assert.Equal("rel1", norm.FromName) + assert.Equal(true, norm.ToOne) + assert.Equal("type2", norm.ToType) + assert.Equal("rel2", norm.ToName) + assert.Equal(false, norm.FromOne) + + // Normalize again, but it should stay the same. + norm = norm.Normalize() + assert.Equal("type1", norm.FromType) + assert.Equal("rel1", norm.FromName) + assert.Equal(true, norm.ToOne) + assert.Equal("type2", norm.ToType) + assert.Equal("rel2", norm.ToName) + assert.Equal(false, norm.FromOne) +} + func TestGetAttrType(t *testing.T) { assert := assert.New(t) From b8b795fa61af3684e7a387faec374a2a3c2c3560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Thu, 29 Aug 2019 21:25:45 -0400 Subject: [PATCH 209/406] Accept non-pointers to be given to Wrap --- wrapper.go | 17 +++++++++++------ wrapper_test.go | 8 ++++++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/wrapper.go b/wrapper.go index ff63003..003857b 100644 --- a/wrapper.go +++ b/wrapper.go @@ -24,17 +24,22 @@ type Wrapper struct { // Wrap wraps v (a struct or a pointer to a struct) and returns a Wrapper that // can be used as a Resource to handle the given value. +// +// If v is not a pointer, the changes applied to the Wrapper object won't affect +// the underlying object (which will be a new instance of v's type). func Wrap(v interface{}) *Wrapper { val := reflect.ValueOf(v) if val.Kind() != reflect.Ptr { - panic(errors.New("jsonapi: value has to be a pointer to a struct")) - } - - if val.Elem().Kind() != reflect.Struct { - panic(errors.New("jsonapi: value has to be a pointer to a struct")) + if val.Kind() != reflect.Struct { + panic(errors.New("jsonapi: value has to be a pointer to a struct")) + } + val = reflect.New(val.Type()) + } else { + if val.Elem().Kind() != reflect.Struct { + panic(errors.New("jsonapi: value has to be a pointer to a struct")) + } } - val = val.Elem() err := Check(val.Interface()) diff --git a/wrapper_test.go b/wrapper_test.go index 04123e1..a531be0 100644 --- a/wrapper_test.go +++ b/wrapper_test.go @@ -25,6 +25,14 @@ func TestWrap(t *testing.T) { _ = Wrap(&str) }, "panic when not a pointer to a struct") + assert.NotPanics(func() { + _ = Wrap(&mocktype{}) + }, "don't panic when a valid struct") + + assert.NotPanics(func() { + _ = Wrap(mocktype{}) + }, "don't panic when a pointer to a valid struct") + assert.Panics(func() { s := time.Now() _ = Wrap(&s) From 304935e5c887b7cc6975c19de5c9cf4d2f22cd5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 31 Aug 2019 09:49:54 -0400 Subject: [PATCH 210/406] Add blank line to separate two test functions --- range_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/range_test.go b/range_test.go index d8e636a..346e046 100644 --- a/range_test.go +++ b/range_test.go @@ -149,6 +149,7 @@ func TestRange(t *testing.T) { "range of IDs (3)", ) } + func TestSortResources(t *testing.T) { assert := assert.New(t) From 8625efdda5796a23b48d3cced68ba2fdd235ca18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 2 Sep 2019 09:10:46 -0400 Subject: [PATCH 211/406] Don't get the zero values in Less anymore The Get method of a Resource should already return the zero value if the field has not been set yet. --- range.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/range.go b/range.go index b48523a..4ca4567 100644 --- a/range.go +++ b/range.go @@ -110,19 +110,12 @@ func (s sortedResources) Less(i, j int) bool { panic("cannot compare two resources of different types") } - attr, ok := typ.Attrs[r] - if !ok { + if _, ok := typ.Attrs[r]; !ok { panic("cannot sort on a unknown attribute") } v := s.col[i].Get(r) - if v == nil { - v = GetZeroValue(attr.Type, attr.Nullable) - } v2 := s.col[j].Get(r) - if v2 == nil { - v2 = GetZeroValue(attr.Type, attr.Nullable) - } if fmt.Sprintf("%T", v) != fmt.Sprintf("%T", v2) { panic("cannot compare two values of different types") From f86683e98ddc184b0e49a24cf721b8a11171a67d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 2 Sep 2019 09:58:04 -0400 Subject: [PATCH 212/406] Add tests for Range --- range_test.go | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/range_test.go b/range_test.go index 346e046..ce78a61 100644 --- a/range_test.go +++ b/range_test.go @@ -331,4 +331,52 @@ func TestSortResources(t *testing.T) { sort.Strings(expectedIDs) assert.Equal(expectedIDs, ids, "sort by ID") + + // Sort collection with different types + sr1 := &SoftResource{} + sr1.SetID("sr1") + col1 := &Resources{Wrap(mocktype{}), sr1} + assert.Panics(func() { + _ = Range(col1, nil, nil, []string{"field", "id"}, 100, 0) + }) + + // Sort collection with unknown attribute + col1 = &Resources{ + Wrap(mocktype{}), + Wrap(mocktype{}), + } + assert.Panics(func() { + _ = Range(col1, nil, nil, []string{"unknown", "id"}, 100, 0) + }) + + // Sort collection with attribute of different type + col1 = &Resources{ + &SoftResource{ + Type: &Type{ + Name: "type", + Attrs: map[string]Attr{ + "samename": Attr{ + Name: "samename", + Type: AttrTypeString, + Nullable: false, + }, + }, + }, + }, + &SoftResource{ + Type: &Type{ + Name: "type", + Attrs: map[string]Attr{ + "samename": Attr{ + Name: "samename", + Type: AttrTypeString, + Nullable: true, + }, + }, + }, + }, + } + assert.Panics(func() { + _ = Range(col1, nil, nil, []string{"samename", "id"}, 100, 0) + }) } From ba98f110463c8f3d19f9804c1fa3c29ed030e486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 2 Sep 2019 10:11:14 -0400 Subject: [PATCH 213/406] Panic if getting/setting non-relationship field --- wrapper.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wrapper.go b/wrapper.go index 003857b..94f29dd 100644 --- a/wrapper.go +++ b/wrapper.go @@ -181,7 +181,7 @@ func (w *Wrapper) GetToOne(key string) string { if key == sf.Tag.Get("json") { if strings.Split(sf.Tag.Get("api"), ",")[0] != "rel" { - break + panic(fmt.Sprintf("jsonapi: field %q is not a relationship", key)) } if field.Type().String() != "string" { @@ -207,7 +207,7 @@ func (w *Wrapper) GetToMany(key string) []string { if key == sf.Tag.Get("json") { if strings.Split(sf.Tag.Get("api"), ",")[0] != "rel" { - break + panic(fmt.Sprintf("jsonapi: field %q is not a relationship", key)) } if field.Type().String() != "[]string" { @@ -233,7 +233,7 @@ func (w *Wrapper) SetToOne(key string, rel string) { if key == sf.Tag.Get("json") { if strings.Split(sf.Tag.Get("api"), ",")[0] != "rel" { - break + panic(fmt.Sprintf("jsonapi: field %q is not a relationship", key)) } if field.Type().String() != "string" { @@ -260,7 +260,7 @@ func (w *Wrapper) SetToMany(key string, rels []string) { if key == sf.Tag.Get("json") { if strings.Split(sf.Tag.Get("api"), ",")[0] != "rel" { - break + panic(fmt.Sprintf("jsonapi: field %q is not a relationship", key)) } if field.Type().String() != "[]string" { From 91eac4606068d96c19e936388c67196423d6949a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 2 Sep 2019 10:21:55 -0400 Subject: [PATCH 214/406] Remove unused field type check in Wrapper.Get --- wrapper.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/wrapper.go b/wrapper.go index 94f29dd..353b555 100644 --- a/wrapper.go +++ b/wrapper.go @@ -160,7 +160,7 @@ func (w *Wrapper) GetType() Type { // Get returns the value associated to the attribute named after key. func (w *Wrapper) Get(key string) interface{} { - return w.getAttr(key, "") + return w.getAttr(key) } // SetID sets the ID of the wrapped resource. @@ -309,16 +309,12 @@ func (w *Wrapper) Copy() Resource { // Private methods -func (w *Wrapper) getAttr(key string, t string) interface{} { +func (w *Wrapper) getAttr(key string) interface{} { for i := 0; i < w.val.NumField(); i++ { field := w.val.Field(i) sf := w.val.Type().Field(i) if key == sf.Tag.Get("json") && sf.Tag.Get("api") == "attr" { - if t != field.Type().String() && t != "" { - panic(fmt.Sprintf("jsonapi: attribute %s is not of type %s", key, field.Type())) - } - if strings.HasPrefix(field.Type().String(), "*") && field.IsNil() { return nil } From 48d65dba65eafa12707a57335e1adf5280f031b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 2 Sep 2019 10:22:35 -0400 Subject: [PATCH 215/406] Add tests for Wrapper --- wrapper_test.go | 122 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/wrapper_test.go b/wrapper_test.go index a531be0..5e4c7b4 100644 --- a/wrapper_test.go +++ b/wrapper_test.go @@ -250,3 +250,125 @@ func TestWrapperSet(t *testing.T) { } } } + +func TestWrapperGetAndSetErrors(t *testing.T) { + assert := assert.New(t) + + mt := &mocktype{} + wrap := Wrap(mt) + + // Get on empty field name + assert.Panics(func() { + _ = wrap.Get("") + }) + + // Get on unknown field name + assert.Panics(func() { + _ = wrap.Get("unknown") + }) + + // Set on empty field name + assert.Panics(func() { + wrap.Set("", "") + }) + + // Set on unknown field name + assert.Panics(func() { + wrap.Set("unknown", "") + }) + + // Set with value of wrong type + assert.Panics(func() { + wrap.Set("str", 42) + }) + + // GetToOne on empty field name + assert.Panics(func() { + _ = wrap.GetToOne("") + }) + + // GetToOne on unknown field name + assert.Panics(func() { + _ = wrap.GetToOne("unknown") + }) + + // GetToOne on attribute + assert.Panics(func() { + _ = wrap.GetToOne("str") + }) + + // GetToOne on to-many relationship + assert.Panics(func() { + _ = wrap.GetToOne("to-x") + }) + + // GetToMany on empty field name + assert.Panics(func() { + _ = wrap.GetToMany("") + }) + + // GetToMany on unknown field name + assert.Panics(func() { + _ = wrap.GetToMany("unknown") + }) + + // GetToMany on attribute + assert.Panics(func() { + _ = wrap.GetToMany("str") + }) + + // GetToMany on to-one relationship + assert.Panics(func() { + _ = wrap.GetToMany("to-1") + }) + + // SetToOne on empty field name + assert.Panics(func() { + wrap.SetToOne("", "id") + }) + + // SetToOne on unknown field name + assert.Panics(func() { + wrap.SetToOne("unknown", "id") + }) + + // SetToOne on attribute + assert.Panics(func() { + wrap.SetToOne("str", "id") + }) + + // SetToOne on to-many relationship + assert.Panics(func() { + wrap.SetToOne("to-x", "id") + }) + + // SetToMany on empty field name + assert.Panics(func() { + wrap.SetToMany("", []string{"id"}) + }) + + // SetToMany on unknown field name + assert.Panics(func() { + wrap.SetToMany("unknown", []string{"id"}) + }) + + // SetToMany on attribute + assert.Panics(func() { + wrap.SetToMany("str", []string{"id"}) + }) + + // SetToMany on to-one relationship + assert.Panics(func() { + wrap.SetToMany("to-1", []string{"id"}) + }) +} + +func TestWrapperValidate(t *testing.T) { + assert := assert.New(t) + + // TODO Implement this test when the implementation + // of Wrapper.Validate is done. + wrap := Wrap(mocktype{}) + errs := wrap.Validate() + assert.Nil(errs) +} From e8ba73a0478eb27101d629c7f837f135a0e24e02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 2 Sep 2019 11:01:06 -0400 Subject: [PATCH 216/406] Add tests for Check, BuildType, and IDAndType --- helpers_test.go | 84 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/helpers_test.go b/helpers_test.go index 80b8cac..73ae5bf 100644 --- a/helpers_test.go +++ b/helpers_test.go @@ -8,6 +8,34 @@ import ( "github.com/stretchr/testify/assert" ) +func TestCheck(t *testing.T) { + assert := assert.New(t) + + err := Check("not a struct") + assert.EqualError(err, "jsonapi: not a struct") + + err = Check(emptyIDAPItag{}) + assert.EqualError(err, "jsonapi: ID field's api tag is empty") + + err = Check(invalidAttributeType{}) + assert.EqualError( + err, + "jsonapi: attribute Attr of type typename is of unsupported type", + ) + + err = Check(invalidRelAPITag{}) + assert.EqualError( + err, + "jsonapi: api tag of relationship Rel of struct invalidRelAPITag is invalid", + ) + + err = Check(invalidReType{}) + assert.EqualError( + err, + "jsonapi: relationship Rel of type typename is not string or []string", + ) +} + func TestBuildType(t *testing.T) { assert := assert.New(t) @@ -24,4 +52,60 @@ func TestBuildType(t *testing.T) { typ, err := BuildType(mock) assert.NoError(err) assert.Equal(true, Equal(Wrap(&mockType1{}), typ.New())) + + // Build type from pointer to struct + typ, err = BuildType(&mock) + assert.NoError(err) + assert.Equal(true, Equal(Wrap(&mockType1{}), typ.New())) + + // Build from invalid struct + _, err = BuildType(invalidRelAPITag{}) + assert.Error(err) } + +func TestIDAndType(t *testing.T) { + assert := assert.New(t) + + mt := mocktype{ + ID: "abc123", + } + id, typ := IDAndType(mt) + assert.Equal("abc123", id) + assert.Equal("mocktype", typ) + + // Resource + id, typ = IDAndType(Wrap(&mt)) + assert.Equal("abc123", id) + assert.Equal("mocktype", typ) + + // Missing ID field + id, typ = IDAndType(missingID{}) + assert.Equal("", id) + assert.Equal("", typ) + + // Not a struct + id, typ = IDAndType("not a struct") + assert.Equal("", id) + assert.Equal("", typ) +} + +type emptyIDAPItag struct { + ID string `json:"id"` +} + +type invalidAttributeType struct { + ID string `json:"id" api:"typename"` + Attr error `json:"attr" api:"attr"` +} + +type invalidRelAPITag struct { + ID string `json:"id" api:"typename"` + Rel string `json:"rel" api:"rel,but,it,is,invalid"` +} + +type invalidReType struct { + ID string `json:"id" api:"typename"` + Rel int `json:"rel" api:"rel,target,reverse"` +} + +type missingID struct{} From a1edb68b848b0bdd73e9de715779bb9a845ec86e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 2 Sep 2019 11:26:46 -0400 Subject: [PATCH 217/406] Use %q instead of %s in error messages --- error.go | 20 ++++++++++---------- error_test.go | 20 ++++++++++---------- helpers.go | 8 ++++---- helpers_test.go | 6 +++--- jsonapi_test.go | 4 ++-- schema.go | 12 ++++++------ schema_test.go | 7 ++++--- type.go | 4 ++-- wrapper.go | 20 ++++++++++---------- 9 files changed, 51 insertions(+), 50 deletions(-) diff --git a/error.go b/error.go index d5da2b7..850aeb4 100644 --- a/error.go +++ b/error.go @@ -196,7 +196,7 @@ func NewErrUnknownFieldInBody(typ, field string) Error { e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Unknown field in body" - e.Detail = fmt.Sprintf("%s is not a known field.", field) + e.Detail = fmt.Sprintf("%q is not a known field.", field) e.Source["pointer"] = "" // TODO e.Meta["unknown-field"] = field e.Meta["type"] = typ @@ -210,7 +210,7 @@ func NewErrUnknownFieldInURL(field string) Error { e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Unknown field in URL" - e.Detail = fmt.Sprintf("%s is not a known field.", field) + e.Detail = fmt.Sprintf("%q is not a known field.", field) e.Meta["unknown-field"] = field // TODO // if param == "filter" { @@ -226,7 +226,7 @@ func NewErrUnknownParameter(param string) Error { e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Unknown parameter" - e.Detail = fmt.Sprintf("%s is not a known parameter.", param) + e.Detail = fmt.Sprintf("%q is not a known parameter.", param) e.Source["parameter"] = param e.Meta["unknown-parameter"] = param @@ -239,7 +239,7 @@ func NewErrUnknownRelationshipInPath(typ, rel, path string) Error { e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Unknown relationship" - e.Detail = fmt.Sprintf("%s is not a relationship of %s.", rel, typ) + e.Detail = fmt.Sprintf("%q is not a relationship of %q.", rel, typ) e.Meta["unknown-relationship"] = rel e.Meta["type"] = typ e.Meta["path"] = path @@ -253,7 +253,7 @@ func NewErrUnknownTypeInURL(typ string) Error { e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Unknown type in URL" - e.Detail = fmt.Sprintf("%s is not a known type.", typ) + e.Detail = fmt.Sprintf("%q is not a known type.", typ) e.Meta["unknown-type"] = typ return e @@ -265,7 +265,7 @@ func NewErrUnknownFieldInFilterParameter(field string) Error { e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Unknown field in filter parameter" - e.Detail = fmt.Sprintf("%s is not a known field.", field) + e.Detail = fmt.Sprintf("%q is not a known field.", field) e.Source["parameter"] = "filter" e.Meta["unknown-field"] = field @@ -278,7 +278,7 @@ func NewErrUnknownOperatorInFilterParameter(op string) Error { e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Unknown operator in filter parameter" - e.Detail = fmt.Sprintf("%s is not a known operator.", op) + e.Detail = fmt.Sprintf("%q is not a known operator.", op) e.Source["parameter"] = "filter" e.Meta["unknown-operator"] = op @@ -291,7 +291,7 @@ func NewErrInvalidValueInFilterParameter(val, kind string) Error { e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Unknown value in filter parameter" - e.Detail = fmt.Sprintf("%s is not a known value.", val) + e.Detail = fmt.Sprintf("%q is not a known value.", val) e.Source["parameter"] = "filter" e.Meta["invalid-value"] = val @@ -304,7 +304,7 @@ func NewErrUnknownCollationInFilterParameter(col string) Error { e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Unknown collation in filter parameter" - e.Detail = fmt.Sprintf("%s is not a known collation.", col) + e.Detail = fmt.Sprintf("%q is not a known collation.", col) e.Source["parameter"] = "filter" e.Meta["unknown-collation"] = col @@ -317,7 +317,7 @@ func NewErrUnknownFilterParameterLabel(label string) Error { e.Status = strconv.Itoa(http.StatusBadRequest) e.Title = "Unknown label in filter parameter" - e.Detail = fmt.Sprintf("%s is not a known filter query label.", label) + e.Detail = fmt.Sprintf("%q is not a known filter query label.", label) e.Source["parameter"] = "filter" e.Meta["unknown-label"] = label diff --git a/error_test.go b/error_test.go index a89dc31..cde3dd2 100644 --- a/error_test.go +++ b/error_test.go @@ -150,70 +150,70 @@ func TestErrorConstructors(t *testing.T) { e := NewErrUnknownFieldInBody("type", "field") return e }(), - expected: "400 Bad Request: field is not a known field.", + expected: "400 Bad Request: \"field\" is not a known field.", }, { name: "NewErrUnknownFieldInURL", err: func() Error { e := NewErrUnknownFieldInURL("field") return e }(), - expected: "400 Bad Request: field is not a known field.", + expected: "400 Bad Request: \"field\" is not a known field.", }, { name: "NewErrUnknownParameter", err: func() Error { e := NewErrUnknownParameter("param") return e }(), - expected: "400 Bad Request: param is not a known parameter.", + expected: "400 Bad Request: \"param\" is not a known parameter.", }, { name: "NewErrUnknownRelationshipInPath", err: func() Error { e := NewErrUnknownRelationshipInPath("type", "rel", "path") return e }(), - expected: "400 Bad Request: rel is not a relationship of type.", + expected: "400 Bad Request: \"rel\" is not a relationship of \"type\".", }, { name: "NewErrUnknownTypeInURL", err: func() Error { e := NewErrUnknownTypeInURL("type") return e }(), - expected: "400 Bad Request: type is not a known type.", + expected: "400 Bad Request: \"type\" is not a known type.", }, { name: "NewErrUnknownFieldInFilterParameter", err: func() Error { e := NewErrUnknownFieldInFilterParameter("field") return e }(), - expected: "400 Bad Request: field is not a known field.", + expected: "400 Bad Request: \"field\" is not a known field.", }, { name: "NewErrUnknownOperatorInFilterParameter", err: func() Error { e := NewErrUnknownOperatorInFilterParameter("=>") return e }(), - expected: "400 Bad Request: => is not a known operator.", + expected: "400 Bad Request: \"=>\" is not a known operator.", }, { name: "NewErrInvalidValueInFilterParameter", err: func() Error { e := NewErrInvalidValueInFilterParameter("value", "string") return e }(), - expected: "400 Bad Request: value is not a known value.", + expected: "400 Bad Request: \"value\" is not a known value.", }, { name: "NewErrUnknownCollationInFilterParameter", err: func() Error { e := NewErrUnknownCollationInFilterParameter("collation") return e }(), - expected: "400 Bad Request: collation is not a known collation.", + expected: "400 Bad Request: \"collation\" is not a known collation.", }, { name: "NewErrUnknownFilterParameterLabel", err: func() Error { e := NewErrUnknownFilterParameterLabel("label") return e }(), - expected: "400 Bad Request: label is not a known filter query label.", + expected: "400 Bad Request: \"label\" is not a known filter query label.", }, { name: "NewErrUnauthorized", err: func() Error { diff --git a/helpers.go b/helpers.go index f9c23f9..edb26ae 100644 --- a/helpers.go +++ b/helpers.go @@ -61,7 +61,7 @@ func Check(v interface{}) error { if !isValid { return fmt.Errorf( - "jsonapi: attribute %s of type %s is of unsupported type", + "jsonapi: attribute %q of type %q is of unsupported type", sf.Name, resType, ) @@ -78,7 +78,7 @@ func Check(v interface{}) error { if len(s) < 2 || len(s) > 3 { return fmt.Errorf( - "jsonapi: api tag of relationship %s of struct %s is invalid", + "jsonapi: api tag of relationship %q of struct %q is invalid", sf.Name, value.Type().Name(), ) @@ -86,7 +86,7 @@ func Check(v interface{}) error { if sf.Type.String() != "string" && sf.Type.String() != "[]string" { return fmt.Errorf( - "jsonapi: relationship %s of type %s is not string or []string", + "jsonapi: relationship %q of type %q is not string or []string", sf.Name, resType, ) @@ -114,7 +114,7 @@ func BuildType(v interface{}) (Type, error) { err := Check(val.Interface()) if err != nil { - return typ, fmt.Errorf("jsonapi: invalid type: %s", err) + return typ, fmt.Errorf("jsonapi: invalid type: %q", err) } // ID and type diff --git a/helpers_test.go b/helpers_test.go index 73ae5bf..7e67208 100644 --- a/helpers_test.go +++ b/helpers_test.go @@ -20,19 +20,19 @@ func TestCheck(t *testing.T) { err = Check(invalidAttributeType{}) assert.EqualError( err, - "jsonapi: attribute Attr of type typename is of unsupported type", + "jsonapi: attribute \"Attr\" of type \"typename\" is of unsupported type", ) err = Check(invalidRelAPITag{}) assert.EqualError( err, - "jsonapi: api tag of relationship Rel of struct invalidRelAPITag is invalid", + "jsonapi: api tag of relationship \"Rel\" of struct \"invalidRelAPITag\" is invalid", ) err = Check(invalidReType{}) assert.EqualError( err, - "jsonapi: relationship Rel of type typename is not string or []string", + "jsonapi: relationship \"Rel\" of type \"typename\" is not string or []string", ) } diff --git a/jsonapi_test.go b/jsonapi_test.go index 5378f76..04d5531 100644 --- a/jsonapi_test.go +++ b/jsonapi_test.go @@ -498,7 +498,7 @@ func TestUnmarshaling(t *testing.T) { expected: "400 Bad Request: The provided JSON body could not be read.", }, { payload: `{"data":{"id":"1","type":"mocktype","attributes":{"nonexistent":1}}}`, - expected: "400 Bad Request: nonexistent is not a known field.", + expected: "400 Bad Request: \"nonexistent\" is not a known field.", }, { payload: `{"data":{"id":"1","type":"mocktype","attributes":{"int8":"abc"}}}`, expected: "400 Bad Request: The field value is invalid for the expected type.", @@ -527,7 +527,7 @@ func TestUnmarshaling(t *testing.T) { } } }`, - expected: "400 Bad Request: wrong is not a known field.", + expected: "400 Bad Request: \"wrong\" is not a known field.", }, } diff --git a/schema.go b/schema.go index 87ce940..c4bc936 100644 --- a/schema.go +++ b/schema.go @@ -39,7 +39,7 @@ func (s *Schema) AddType(typ Type) error { // Make sure the name isn't already used for i := range s.Types { if s.Types[i].Name == typ.Name { - return fmt.Errorf("jsonapi: type name %s is already used", typ.Name) + return fmt.Errorf("jsonapi: type name %q is already used", typ.Name) } } @@ -65,7 +65,7 @@ func (s *Schema) AddAttr(typ string, attr Attr) error { } } - return fmt.Errorf("jsonapi: type %s does not exist", typ) + return fmt.Errorf("jsonapi: type %q does not exist", typ) } // RemoveAttr removes an attribute from the specified type. @@ -85,7 +85,7 @@ func (s *Schema) AddRel(typ string, rel Rel) error { } } - return fmt.Errorf("jsonapi: type %s does not exist", typ) + return fmt.Errorf("jsonapi: type %q does not exist", typ) } // RemoveRel removes a relationship from the specified type. @@ -158,7 +158,7 @@ func (s *Schema) Check() []error { // Does the relationship point to a type that exists? if targetType = s.GetType(rel.ToType); targetType.Name == "" { errs = append(errs, fmt.Errorf( - "jsonapi: field ToType of relationship %s of type %s does not exist", + "jsonapi: field ToType of relationship %q of type %q does not exist", rel.FromName, typ.Name, )) @@ -174,7 +174,7 @@ func (s *Schema) Check() []error { if rel.FromType != typ.Name { errs = append(errs, fmt.Errorf( "jsonapi: "+ - "field FromType of relationship %s must be its type's name (%s, not %s)", + "field FromType of relationship %q must be its type's name (%q, not %q)", rel.FromName, typ.Name, rel.FromType, @@ -191,7 +191,7 @@ func (s *Schema) Check() []error { if !found { errs = append(errs, fmt.Errorf( "jsonapi: "+ - "relationship %s of type %s and its inverse do not point each other", + "relationship %q of type %q and its inverse do not point each other", rel.FromName, typ.Name, )) diff --git a/schema_test.go b/schema_test.go index 285d142..8bd91c5 100644 --- a/schema_test.go +++ b/schema_test.go @@ -152,15 +152,16 @@ func TestSchemaCheck(t *testing.T) { assert.Len(errs, 3) assert.Contains( errsStr, - "jsonapi: field ToType of relationship rel2-invalid of type type1 does not exist", + "jsonapi: field ToType of relationship \"rel2-invalid\" of type \"type1\" does not exist", ) assert.Contains( errsStr, - "jsonapi: field FromType of relationship rel1 must be its type's name (type2, not type1)", + "jsonapi: field FromType of relationship \"rel1\" "+ + "must be its type's name (\"type2\", not \"type1\")", ) assert.Contains( errsStr, - "jsonapi: relationship rel2 of type type2 and its inverse do not point each other", + "jsonapi: relationship \"rel2\" of type \"type2\" and its inverse do not point each other", ) } diff --git a/type.go b/type.go index f6d5aa6..1db7bde 100644 --- a/type.go +++ b/type.go @@ -61,7 +61,7 @@ func (t *Type) AddAttr(attr Attr) error { // Make sure the name isn't already used for i := range t.Attrs { if t.Attrs[i].Name == attr.Name { - return fmt.Errorf("jsonapi: attribute name %s is already used", attr.Name) + return fmt.Errorf("jsonapi: attribute name %q is already used", attr.Name) } } @@ -95,7 +95,7 @@ func (t *Type) AddRel(rel Rel) error { // Make sure the name isn't already used for i := range t.Rels { if t.Rels[i].FromName == rel.FromName { - return fmt.Errorf("jsonapi: relationship name %s is already used", rel.FromName) + return fmt.Errorf("jsonapi: relationship name %q is already used", rel.FromName) } } diff --git a/wrapper.go b/wrapper.go index 353b555..cc47641 100644 --- a/wrapper.go +++ b/wrapper.go @@ -185,7 +185,7 @@ func (w *Wrapper) GetToOne(key string) string { } if field.Type().String() != "string" { - panic(fmt.Sprintf("jsonapi: relationship %s is not 'to one'", key)) + panic(fmt.Sprintf("jsonapi: relationship %q is not 'to one'", key)) } return field.String() @@ -196,7 +196,7 @@ func (w *Wrapper) GetToOne(key string) string { panic("jsonapi: key is empty") } - panic(fmt.Sprintf("jsonapi: relationship %s does not exist", key)) + panic(fmt.Sprintf("jsonapi: relationship %q does not exist", key)) } // GetToMany returns the value associated with the relationship named after key. @@ -211,7 +211,7 @@ func (w *Wrapper) GetToMany(key string) []string { } if field.Type().String() != "[]string" { - panic(fmt.Sprintf("jsonapi: relationship %s is not 'to many'", key)) + panic(fmt.Sprintf("jsonapi: relationship %q is not 'to many'", key)) } return field.Interface().([]string) @@ -222,7 +222,7 @@ func (w *Wrapper) GetToMany(key string) []string { panic("jsonapi: key is empty") } - panic(fmt.Sprintf("jsonapi: relationship %s does not exist", key)) + panic(fmt.Sprintf("jsonapi: relationship %q does not exist", key)) } // SetToOne sets the value associated to the relationship named after key. @@ -237,7 +237,7 @@ func (w *Wrapper) SetToOne(key string, rel string) { } if field.Type().String() != "string" { - panic(fmt.Sprintf("jsonapi: relationship %s is not 'to one'", key)) + panic(fmt.Sprintf("jsonapi: relationship %q is not 'to one'", key)) } field.SetString(rel) @@ -249,7 +249,7 @@ func (w *Wrapper) SetToOne(key string, rel string) { panic("jsonapi: key is empty") } - panic(fmt.Sprintf("jsonapi: relationship %s does not exist", key)) + panic(fmt.Sprintf("jsonapi: relationship %q does not exist", key)) } // SetToMany sets the value associated to the relationship named after key. @@ -264,7 +264,7 @@ func (w *Wrapper) SetToMany(key string, rels []string) { } if field.Type().String() != "[]string" { - panic(fmt.Sprintf("jsonapi: relationship %s is not 'to many'", key)) + panic(fmt.Sprintf("jsonapi: relationship %q is not 'to many'", key)) } field.Set(reflect.ValueOf(rels)) @@ -276,7 +276,7 @@ func (w *Wrapper) SetToMany(key string, rels []string) { panic("jsonapi: key is empty") } - panic(fmt.Sprintf("jsonapi: relationship %s does not exist", key)) + panic(fmt.Sprintf("jsonapi: relationship %q does not exist", key)) } // Validate returns any errors found in the wrapped resource. @@ -327,7 +327,7 @@ func (w *Wrapper) getAttr(key string) interface{} { panic("jsonapi: key is empty") } - panic(fmt.Sprintf("jsonapi: attribute %s does not exist", key)) + panic(fmt.Sprintf("jsonapi: attribute %q does not exist", key)) } func (w *Wrapper) setAttr(key string, v interface{}) { @@ -358,5 +358,5 @@ func (w *Wrapper) setAttr(key string, v interface{}) { panic("jsonapi: key is empty") } - panic(fmt.Errorf("jsonapi: attribute %s does not exist", key)) + panic(fmt.Errorf("jsonapi: attribute %q does not exist", key)) } From dfe3043092ac3baa58a891edfc8a77bcd7672e5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 2 Sep 2019 13:26:47 -0400 Subject: [PATCH 218/406] Add top comment for Attr.UnmarshalToType --- type.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/type.go b/type.go index 1db7bde..e2336a9 100644 --- a/type.go +++ b/type.go @@ -154,7 +154,8 @@ type Attr struct { Nullable bool } -// UnmarshalToType ... +// UnmarshalToType unmarshals the data into a value of the type represented by +// the attribute and returns it. func (a Attr) UnmarshalToType(data []byte) (interface{}, error) { if a.Nullable && string(data) == "nil" { return nil, nil From 663d16742bcdc11b2ad4df6f455513f6a683f52a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 2 Sep 2019 13:31:30 -0400 Subject: [PATCH 219/406] Ignore NewFunc in Type.Equal --- type.go | 4 +++- type_test.go | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/type.go b/type.go index e2336a9..4d18ff0 100644 --- a/type.go +++ b/type.go @@ -142,8 +142,10 @@ func (t *Type) New() Resource { } // Equal returns true if both types have the same name, attributes, -// relationships, and both have a nil NewFunc. +// relationships. NewFunc is ignored. func (t Type) Equal(typ Type) bool { + t.NewFunc = nil + typ.NewFunc = nil return reflect.DeepEqual(t, typ) } diff --git a/type_test.go b/type_test.go index 5d276e3..b746512 100644 --- a/type_test.go +++ b/type_test.go @@ -74,6 +74,18 @@ func TestTypeEqual(t *testing.T) { typ1.Name = "type1" typ2.Name = "type2" assert.False(typ1.Equal(typ2)) + + // Make sure NewFunc is ignored. + typ1.Name = "type1" + typ1.NewFunc = func() Resource { + return nil + } + typ2.Name = "type1" + typ2.NewFunc = func() Resource { + return &SoftResource{} + } + assert.True(typ1.Equal(typ2)) + } func TestTypeNewFunc(t *testing.T) { From 55cc95e370285a48ff8cca1ce79c5a40a4cb9eab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Mon, 2 Sep 2019 13:32:33 -0400 Subject: [PATCH 220/406] Add TODO in TestTypeEqual --- type_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/type_test.go b/type_test.go index b746512..9fab8ac 100644 --- a/type_test.go +++ b/type_test.go @@ -86,6 +86,7 @@ func TestTypeEqual(t *testing.T) { } assert.True(typ1.Equal(typ2)) + // TODO Add tests with attributes and relationships. } func TestTypeNewFunc(t *testing.T) { From f9dac7e15287bad1f4790b3a5aa687ce8d377e53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Fri, 6 Sep 2019 22:16:56 -0400 Subject: [PATCH 221/406] Rename LICENSE.txt to LICENSE --- LICENSE.txt => LICENSE | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename LICENSE.txt => LICENSE (100%) diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE From 24c053bcdae2ff5a4c208d59b9f81eb966441b94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 7 Sep 2019 10:58:37 -0400 Subject: [PATCH 222/406] Add case in TestSortResources --- range_test.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/range_test.go b/range_test.go index ce78a61..3e3ddb0 100644 --- a/range_test.go +++ b/range_test.go @@ -243,6 +243,7 @@ func TestSortResources(t *testing.T) { {vals: [2]interface{}{ptr(false), ptr(true)}}, {vals: [2]interface{}{nilptr("time.Time"), nilptr("time.Time")}}, {vals: [2]interface{}{nilptr("time.Time"), ptr(now)}}, + {vals: [2]interface{}{ptr(now), nilptr("time.Time")}}, {vals: [2]interface{}{ptr(now), ptr(now)}}, {vals: [2]interface{}{ptr(now), ptr(now.Add(time.Second))}}, } @@ -301,15 +302,14 @@ func TestSortResources(t *testing.T) { expectedIDs := []string{ "id0", "id3", "id6", "id9", "id12", "id20", "id24", "id25", "id27", - "id35", "id39", "id40", "id42", "id50", "id54", "id55", "id57", - "id69", "id70", "id72", "id10", "id13", "id16", "id18", "id21", - "id23", "id26", "id28", "id31", "id33", "id36", "id38", "id41", - "id43", "id46", "id48", "id51", "id53", "id56", "id58", "id61", - "id63", "id64", "id65", "id66", "id67", "id68", "id71", "id73", - "id75", "id76", "id74", "id62", "id60", "id59", "id52", "id49", - "id47", "id45", "id44", "id37", "id34", "id32", "id30", "id29", - "id22", "id19", "id17", "id15", "id14", "id11", "id8", "id7", "id5", - "id4", "id2", "id1", + "id35", "id39", "id40", "id42", "id50", "id54", "id55", "id57", "id69", + "id70", "id72", "id10", "id13", "id16", "id18", "id21", "id23", "id26", + "id28", "id31", "id33", "id36", "id38", "id41", "id43", "id46", "id48", + "id51", "id53", "id56", "id58", "id61", "id63", "id64", "id65", "id66", + "id67", "id68", "id71", "id73", "id76", "id77", "id75", "id74", "id62", + "id60", "id59", "id52", "id49", "id47", "id45", "id44", "id37", "id34", + "id32", "id30", "id29", "id22", "id19", "id17", "id15", "id14", "id11", + "id8", "id7", "id5", "id4", "id2", "id1", } assert.Equal(expectedIDs, ids, fmt.Sprintf("sort with rules: %v", rules)) From 340cd3812165589d5953bd7a9a899b2931851294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 7 Sep 2019 15:20:10 -0400 Subject: [PATCH 223/406] Add attribute type []byte --- README.md | 2 ++ filter_query.go | 62 +++++++++++++++++++++++++++++++++++++ filter_query_test.go | 70 +++++++++++++++++++++++++++++++++++++++++ helpers.go | 4 ++- jsonapi_test.go | 12 ++++--- range.go | 12 +++++++ range_test.go | 26 ++++++++++------ type.go | 22 +++++++++++++ type_test.go | 74 ++++++++++++++++++++++++++++---------------- util_test.go | 7 +++++ 10 files changed, 251 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index 2758312..5a9cbe1 100644 --- a/README.md +++ b/README.md @@ -81,11 +81,13 @@ int, int8, int16, int32, int64 uint, uint8, uint16, uint32, uint64 bool time.Time +[]byte *string *int, *int8, *int16, *int32, *int64 *uint, *uint8, *uint16, *uint32, *uint64 *bool *time.Time +*[]byte ``` #### Relationship diff --git a/filter_query.go b/filter_query.go index 00bacc6..30d9134 100644 --- a/filter_query.go +++ b/filter_query.go @@ -140,6 +140,8 @@ func checkVal(op string, rval, cval interface{}) bool { return checkBool(op, rval.(bool), cval.(bool)) case time.Time: return checkTime(op, rval.(time.Time), cval.(time.Time)) + case []byte: + return checkBytes(op, rval.([]byte), cval.([]byte)) case *string: if rval.(*string) == nil || cval.(*string) == nil { if op == "=" { @@ -281,6 +283,17 @@ func checkVal(op string, rval, cval interface{}) bool { } } return checkTime(op, *rval.(*time.Time), *cval.(*time.Time)) + case *[]byte: + if rval.(*[]byte) == nil || cval.(*[]byte) == nil { + if op == "=" { + return rval.(*[]byte) == cval.(*[]byte) + } else if op == "!=" { + return rval.(*[]byte) != cval.(*[]byte) + } else { + return false + } + } + return checkBytes(op, *rval.(*[]byte), *cval.(*[]byte)) case []string: return checkSlice(op, rval.([]string), cval.([]string)) default: @@ -375,6 +388,55 @@ func checkTime(op string, rval, cval time.Time) bool { } } +func checkBytes(op string, rval, cval []byte) bool { + switch op { + case "=": + for i := 0; i < len(rval) && i < len(cval); i++ { + if rval[i] != cval[i] { + return false + } + } + return len(rval) == len(cval) + case "!=": + for i := 0; i < len(rval) && i < len(cval); i++ { + if rval[i] != cval[i] { + return true + } + } + return len(rval) != len(cval) + case "<": + for i := 0; i < len(rval) && i < len(cval); i++ { + if rval[i] < cval[i] { + return true + } + } + return len(rval) < len(cval) + case "<=": + for i := 0; i < len(rval) && i < len(cval); i++ { + if rval[i] > cval[i] { + return false + } + } + return len(rval) <= len(cval) + case ">": + for i := 0; i < len(rval) && i < len(cval); i++ { + if rval[i] > cval[i] { + return true + } + } + return len(rval) > len(cval) + case ">=": + for i := 0; i < len(rval) && i < len(cval); i++ { + if rval[i] < cval[i] { + return false + } + } + return len(rval) >= len(cval) + default: + return false + } +} + func checkSlice(op string, rval, cval []string) bool { equal := false if len(rval) == len(cval) { diff --git a/filter_query_test.go b/filter_query_test.go index 0833c7d..899d2a6 100644 --- a/filter_query_test.go +++ b/filter_query_test.go @@ -246,6 +246,40 @@ func TestFilterResource(t *testing.T) { {rval: now, op: ">=", cval: now, expected: true}, {rval: now, op: ">=", cval: now.Add(time.Second), expected: false}, + // []byte + {rval: []byte{1}, op: "=", cval: []byte{0}, expected: false}, + {rval: []byte{1}, op: "=", cval: []byte{1}, expected: true}, + {rval: []byte{0, 1}, op: "=", cval: []byte{0, 1}, expected: true}, + {rval: []byte{0, 0}, op: "=", cval: []byte{0, 1}, expected: false}, + {rval: []byte{1}, op: "!=", cval: []byte{0}, expected: true}, + {rval: []byte{1}, op: "!=", cval: []byte{1}, expected: false}, + {rval: []byte{0, 1}, op: "!=", cval: []byte{0, 1}, expected: false}, + {rval: []byte{0, 0}, op: "!=", cval: []byte{0, 1}, expected: true}, + {rval: []byte{1}, op: "<", cval: []byte{0}, expected: false}, + {rval: []byte{1}, op: "<", cval: []byte{1}, expected: false}, + {rval: []byte{1}, op: "<", cval: []byte{2}, expected: true}, + {rval: []byte{0, 1}, op: "<", cval: []byte{0, 0}, expected: false}, + {rval: []byte{0, 1}, op: "<", cval: []byte{0, 1}, expected: false}, + {rval: []byte{0, 1}, op: "<", cval: []byte{0, 2}, expected: true}, + {rval: []byte{1}, op: "<=", cval: []byte{0}, expected: false}, + {rval: []byte{1}, op: "<=", cval: []byte{1}, expected: true}, + {rval: []byte{1}, op: "<=", cval: []byte{2}, expected: true}, + {rval: []byte{0, 1}, op: "<=", cval: []byte{0, 0}, expected: false}, + {rval: []byte{0, 1}, op: "<=", cval: []byte{0, 1}, expected: true}, + {rval: []byte{0, 1}, op: "<=", cval: []byte{0, 2}, expected: true}, + {rval: []byte{1}, op: ">", cval: []byte{0}, expected: true}, + {rval: []byte{1}, op: ">", cval: []byte{1}, expected: false}, + {rval: []byte{1}, op: ">", cval: []byte{2}, expected: false}, + {rval: []byte{0, 1}, op: ">", cval: []byte{0, 0}, expected: true}, + {rval: []byte{0, 1}, op: ">", cval: []byte{0, 1}, expected: false}, + {rval: []byte{0, 1}, op: ">", cval: []byte{0, 2}, expected: false}, + {rval: []byte{1}, op: ">=", cval: []byte{0}, expected: true}, + {rval: []byte{1}, op: ">=", cval: []byte{1}, expected: true}, + {rval: []byte{1}, op: ">=", cval: []byte{2}, expected: false}, + {rval: []byte{0, 1}, op: ">=", cval: []byte{0, 0}, expected: true}, + {rval: []byte{0, 1}, op: ">=", cval: []byte{0, 1}, expected: true}, + {rval: []byte{0, 1}, op: ">=", cval: []byte{0, 2}, expected: false}, + // *string {rval: nilptr("string"), op: "=", cval: nilptr("string"), expected: true}, {rval: nilptr("string"), op: "=", cval: ptr("aaa"), expected: false}, @@ -689,6 +723,42 @@ func TestFilterResource(t *testing.T) { {rval: ptr(now), op: ">=", cval: ptr(now.Add(-time.Second)), expected: true}, {rval: ptr(now), op: ">=", cval: ptr(now), expected: true}, {rval: ptr(now), op: ">=", cval: ptr(now.Add(time.Second)), expected: false}, + + // *[]byte + {rval: nilptr("[]byte"), op: "=", cval: nilptr("[]byte"), expected: true}, + {rval: nilptr("[]byte"), op: "=", cval: ptr([]byte{0}), expected: false}, + {rval: ptr([]byte{1}), op: "=", cval: nilptr("[]byte"), expected: false}, + {rval: ptr([]byte{1}), op: "=", cval: ptr([]byte{0}), expected: false}, + {rval: ptr([]byte{1}), op: "=", cval: ptr([]byte{1}), expected: true}, + {rval: nilptr("[]byte"), op: "!=", cval: nilptr("[]byte"), expected: false}, + {rval: nilptr("[]byte"), op: "!=", cval: ptr([]byte{0}), expected: true}, + {rval: ptr([]byte{1}), op: "!=", cval: nilptr("[]byte"), expected: true}, + {rval: ptr([]byte{1}), op: "!=", cval: ptr([]byte{0}), expected: true}, + {rval: ptr([]byte{1}), op: "!=", cval: ptr([]byte{1}), expected: false}, + {rval: nilptr("[]byte"), op: "<", cval: nilptr("[]byte"), expected: false}, + {rval: nilptr("[]byte"), op: "<", cval: ptr([]byte{0}), expected: false}, + {rval: ptr([]byte{1}), op: "<", cval: nilptr("[]byte"), expected: false}, + {rval: ptr([]byte{1}), op: "<", cval: ptr([]byte{0}), expected: false}, + {rval: ptr([]byte{1}), op: "<", cval: ptr([]byte{1}), expected: false}, + {rval: ptr([]byte{1}), op: "<", cval: ptr([]byte{2}), expected: true}, + {rval: nilptr("[]byte"), op: "<=", cval: nilptr("[]byte"), expected: false}, + {rval: nilptr("[]byte"), op: "<=", cval: ptr([]byte{0}), expected: false}, + {rval: ptr([]byte{1}), op: "<=", cval: nilptr("[]byte"), expected: false}, + {rval: ptr([]byte{1}), op: "<=", cval: ptr([]byte{0}), expected: false}, + {rval: ptr([]byte{1}), op: "<=", cval: ptr([]byte{1}), expected: true}, + {rval: ptr([]byte{1}), op: "<=", cval: ptr([]byte{2}), expected: true}, + {rval: nilptr("[]byte"), op: ">", cval: nilptr("[]byte"), expected: false}, + {rval: nilptr("[]byte"), op: ">", cval: ptr([]byte{0}), expected: false}, + {rval: ptr([]byte{1}), op: ">", cval: nilptr("[]byte"), expected: false}, + {rval: ptr([]byte{1}), op: ">", cval: ptr([]byte{0}), expected: true}, + {rval: ptr([]byte{1}), op: ">", cval: ptr([]byte{1}), expected: false}, + {rval: ptr([]byte{1}), op: ">", cval: ptr([]byte{2}), expected: false}, + {rval: nilptr("[]byte"), op: ">=", cval: nilptr("[]byte"), expected: false}, + {rval: nilptr("[]byte"), op: ">=", cval: ptr([]byte{0}), expected: false}, + {rval: ptr([]byte{1}), op: ">=", cval: nilptr("[]byte"), expected: false}, + {rval: ptr([]byte{1}), op: ">=", cval: ptr([]byte{0}), expected: true}, + {rval: ptr([]byte{1}), op: ">=", cval: ptr([]byte{1}), expected: true}, + {rval: ptr([]byte{1}), op: ">=", cval: ptr([]byte{2}), expected: false}, } for _, test := range attrTests { diff --git a/helpers.go b/helpers.go index edb26ae..5b67e53 100644 --- a/helpers.go +++ b/helpers.go @@ -51,11 +51,13 @@ func Check(v interface{}) error { "uint", "uint8", "uint16", "uint32", "uint64", "bool", "time.Time", + "[]uint8", "*string", "*int", "*int8", "*int16", "*int32", "*int64", "*uint", "*uint8", "*uint16", "*uint32", "*uint64", "*bool", - "*time.Time": + "*time.Time", + "*[]uint8": isValid = true } diff --git a/jsonapi_test.go b/jsonapi_test.go index 04d5531..a3c983b 100644 --- a/jsonapi_test.go +++ b/jsonapi_test.go @@ -41,6 +41,7 @@ func TestMarshaling(t *testing.T) { Uint64: 1064, Bool: true, Time: getTime(), + Bytes: []byte{1, 2, 3}, To1: "id2", To1From1: "id3", To1FromX: "id3", @@ -49,10 +50,11 @@ func TestMarshaling(t *testing.T) { ToXFromX: []string{"id3", "id4"}, })) col.Add(Wrap(&mocktype{ - ID: "id2", - Str: "漢語", - Int: -42, - Time: time.Time{}, + ID: "id2", + Str: "漢語", + Int: -42, + Time: time.Time{}, + Bytes: []byte{}, })) col.Add(Wrap(&mocktype{ID: "id3"})) @@ -313,6 +315,7 @@ func TestUnmarshaling(t *testing.T) { Uint64: 1064, Bool: true, Time: getTime(), + Bytes: []byte{1, 2, 3}, To1: "id2", To1From1: "id3", To1FromX: "id3", @@ -596,6 +599,7 @@ type mocktype struct { Uint64 uint64 `json:"uint64" api:"attr"` Bool bool `json:"bool" api:"attr"` Time time.Time `json:"time" api:"attr"` + Bytes []byte `json:"bytes" api:"attr"` // Relationships To1 string `json:"to-1" api:"rel,mocktype"` diff --git a/range.go b/range.go index 4ca4567..75b5a9d 100644 --- a/range.go +++ b/range.go @@ -197,6 +197,18 @@ func (s sortedResources) Less(i, j int) bool { continue } return v.Before(v2.(time.Time)) != inverse + case []byte: + s2 := v2.([]byte) + for i := 0; i < len(v) && i < len(s2); i++ { + if v[i] == s2[i] { + continue + } + return v[i] < s2[i] != inverse + } + if len(v) == len(s2) { + continue + } + return len(v) < len(s2) != inverse case *string: v2 := v2.(*string) if v == v2 { diff --git a/range_test.go b/range_test.go index 3e3ddb0..9fda63c 100644 --- a/range_test.go +++ b/range_test.go @@ -180,6 +180,8 @@ func TestSortResources(t *testing.T) { {vals: [2]interface{}{uint64(0), uint64(1)}}, {vals: [2]interface{}{false, true}}, {vals: [2]interface{}{now, now.Add(time.Second)}}, + {vals: [2]interface{}{[]byte{0}, []byte{1}}}, + {vals: [2]interface{}{[]byte{0}, []byte{0, 1}}}, // nullable {vals: [2]interface{}{nilptr("string"), nilptr("string")}}, {vals: [2]interface{}{nilptr("string"), ptr("a")}}, @@ -246,6 +248,11 @@ func TestSortResources(t *testing.T) { {vals: [2]interface{}{ptr(now), nilptr("time.Time")}}, {vals: [2]interface{}{ptr(now), ptr(now)}}, {vals: [2]interface{}{ptr(now), ptr(now.Add(time.Second))}}, + {vals: [2]interface{}{nilptr("[]byte"), nilptr("[]byte")}}, + {vals: [2]interface{}{nilptr("[]byte"), ptr([]byte{0})}}, + {vals: [2]interface{}{ptr([]byte{0}), nilptr("[]byte")}}, + {vals: [2]interface{}{ptr([]byte{0}), ptr([]byte{0})}}, + {vals: [2]interface{}{nilptr("[]byte"), ptr([]byte{1})}}, } // Add attributes to type @@ -301,15 +308,16 @@ func TestSortResources(t *testing.T) { } expectedIDs := []string{ - "id0", "id3", "id6", "id9", "id12", "id20", "id24", "id25", "id27", - "id35", "id39", "id40", "id42", "id50", "id54", "id55", "id57", "id69", - "id70", "id72", "id10", "id13", "id16", "id18", "id21", "id23", "id26", - "id28", "id31", "id33", "id36", "id38", "id41", "id43", "id46", "id48", - "id51", "id53", "id56", "id58", "id61", "id63", "id64", "id65", "id66", - "id67", "id68", "id71", "id73", "id76", "id77", "id75", "id74", "id62", - "id60", "id59", "id52", "id49", "id47", "id45", "id44", "id37", "id34", - "id32", "id30", "id29", "id22", "id19", "id17", "id15", "id14", "id11", - "id8", "id7", "id5", "id4", "id2", "id1", + "id0", "id3", "id6", "id9", "id12", "id17", "id21", "id22", "id24", + "id32", "id36", "id37", "id39", "id47", "id51", "id52", "id54", "id62", + "id77", "id10", "id15", "id18", "id20", "id23", "id25", "id28", "id30", + "id33", "id35", "id38", "id40", "id43", "id45", "id48", "id50", "id53", + "id55", "id58", "id60", "id63", "id65", "id66", "id67", "id68", "id69", + "id70", "id73", "id75", "id78", "id80", "id81", "id82", "id83", "id84", + "id79", "id76", "id74", "id72", "id71", "id64", "id61", "id59", "id57", + "id56", "id49", "id46", "id44", "id42", "id41", "id34", "id31", "id29", + "id27", "id26", "id19", "id16", "id14", "id13", "id11", "id8", "id7", + "id5", "id4", "id2", "id1", } assert.Equal(expectedIDs, ids, fmt.Sprintf("sort with rules: %v", rules)) diff --git a/type.go b/type.go index 4d18ff0..760555c 100644 --- a/type.go +++ b/type.go @@ -27,6 +27,7 @@ const ( AttrTypeUint64 AttrTypeBool AttrTypeTime + AttrTypeBytes ) // A Type stores all the necessary information about a type as represented in @@ -274,6 +275,17 @@ func (a Attr) UnmarshalToType(data []byte) (interface{}, error) { if a.Nullable { v = &t } + case AttrTypeBytes: + s := make([]byte, len(data)) + err := json.Unmarshal(data, &s) + if err != nil { + panic(err) + } + if a.Nullable { + v = &s + } else { + v = s + } default: err = errors.New("attribute is of invalid or unknown type") } @@ -358,6 +370,8 @@ func GetAttrType(t string) (int, bool) { return AttrTypeBool, nullable case "time.Time": return AttrTypeTime, nullable + case "[]uint8": + return AttrTypeBytes, nullable default: return AttrTypeInvalid, false } @@ -395,6 +409,8 @@ func GetAttrTypeString(t int, nullable bool) string { str = "bool" case AttrTypeTime: str = "time.Time" + case AttrTypeBytes: + str = "[]uint8" default: str = "" } @@ -488,6 +504,12 @@ func GetZeroValue(t int, null bool) interface{} { return np } return time.Time{} + case AttrTypeBytes: + if null { + var np *[]byte + return np + } + return []byte{} default: return nil } diff --git a/type_test.go b/type_test.go index 9fab8ac..0e734da 100644 --- a/type_test.go +++ b/type_test.go @@ -128,32 +128,34 @@ func TestAttrUnmarshalToType(t *testing.T) { tests := []struct { val interface{} }{ - {val: "str"}, // string - {val: 1}, // int - {val: int8(8)}, // int8 - {val: int16(16)}, // int16 - {val: int32(32)}, // int32 - {val: int64(64)}, // int64 - {val: uint(1)}, // uint - {val: uint8(8)}, // uint8 - {val: uint16(16)}, // uint16 - {val: uint32(32)}, // uint32 - {val: uint64(64)}, // uint64 - {val: true}, // bool - {val: time.Time{}}, // time - {val: &vstr}, // *string - {val: &vint}, // *int - {val: &vint8}, // *int8 - {val: &vint16}, // *int16 - {val: &vint32}, // *int32 - {val: &vint64}, // *int64 - {val: &vuint}, // *uint - {val: &vuint8}, // *uint8 - {val: &vuint16}, // *uint16 - {val: &vuint32}, // *uint32 - {val: &vuint64}, // *uint64 - {val: &vbool}, // *bool - {val: &time.Time{}}, // *time + {val: "str"}, // string + {val: 1}, // int + {val: int8(8)}, // int8 + {val: int16(16)}, // int16 + {val: int32(32)}, // int32 + {val: int64(64)}, // int64 + {val: uint(1)}, // uint + {val: uint8(8)}, // uint8 + {val: uint16(16)}, // uint16 + {val: uint32(32)}, // uint32 + {val: uint64(64)}, // uint64 + {val: true}, // bool + {val: time.Time{}}, // time + {val: []byte{1, 2, 3}}, // []byte + {val: &vstr}, // *string + {val: &vint}, // *int + {val: &vint8}, // *int8 + {val: &vint16}, // *int16 + {val: &vint32}, // *int32 + {val: &vint64}, // *int64 + {val: &vuint}, // *uint + {val: &vuint8}, // *uint8 + {val: &vuint16}, // *uint16 + {val: &vuint32}, // *uint32 + {val: &vuint64}, // *uint64 + {val: &vbool}, // *bool + {val: &time.Time{}}, // *time + {val: &[]byte{1, 2, 3}}, // *[]byte } attr := Attr{} @@ -179,6 +181,14 @@ func TestAttrUnmarshalToType(t *testing.T) { assert.Error(err) assert.Nil(val) + // Invalid slide of bytes + attr.Type = AttrTypeBytes + assert.Panics(func() { + _, _ = attr.UnmarshalToType([]byte("invalid")) + }) + // assert.Error(err) + // assert.Nil(val) + // Invalid attribute type attr.Type = AttrTypeInvalid val, err = attr.UnmarshalToType([]byte("invalid")) @@ -297,6 +307,10 @@ func TestGetAttrType(t *testing.T) { assert.Equal(AttrTypeTime, typ) assert.False(nullable) + typ, nullable = GetAttrType("[]uint8") + assert.Equal(AttrTypeBytes, typ) + assert.False(nullable) + typ, nullable = GetAttrType("*string") assert.Equal(AttrTypeString, typ) assert.True(nullable) @@ -349,6 +363,10 @@ func TestGetAttrType(t *testing.T) { assert.Equal(AttrTypeTime, typ) assert.True(nullable) + typ, nullable = GetAttrType("*[]uint8") + assert.Equal(AttrTypeBytes, typ) + assert.True(nullable) + typ, nullable = GetAttrType("invalid") assert.Equal(AttrTypeInvalid, typ) assert.False(nullable) @@ -374,6 +392,7 @@ func TestGetAttrTypeString(t *testing.T) { assert.Equal("uint64", GetAttrTypeString(AttrTypeUint64, false)) assert.Equal("bool", GetAttrTypeString(AttrTypeBool, false)) assert.Equal("time.Time", GetAttrTypeString(AttrTypeTime, false)) + assert.Equal("[]uint8", GetAttrTypeString(AttrTypeBytes, false)) assert.Equal("*string", GetAttrTypeString(AttrTypeString, true)) assert.Equal("*int", GetAttrTypeString(AttrTypeInt, true)) assert.Equal("*int8", GetAttrTypeString(AttrTypeInt8, true)) @@ -387,6 +406,7 @@ func TestGetAttrTypeString(t *testing.T) { assert.Equal("*uint64", GetAttrTypeString(AttrTypeUint64, true)) assert.Equal("*bool", GetAttrTypeString(AttrTypeBool, true)) assert.Equal("*time.Time", GetAttrTypeString(AttrTypeTime, true)) + assert.Equal("*[]uint8", GetAttrTypeString(AttrTypeBytes, true)) assert.Equal("", GetAttrTypeString(AttrTypeInvalid, false)) assert.Equal("", GetAttrTypeString(999, false)) } @@ -407,6 +427,7 @@ func TestGetZeroValue(t *testing.T) { assert.Equal(uint64(0), GetZeroValue(AttrTypeUint64, false)) assert.Equal(false, GetZeroValue(AttrTypeBool, false)) assert.Equal(time.Time{}, GetZeroValue(AttrTypeTime, false)) + assert.Equal([]byte{}, GetZeroValue(AttrTypeBytes, false)) assert.Equal(nilptr("string"), GetZeroValue(AttrTypeString, true)) assert.Equal(nilptr("int"), GetZeroValue(AttrTypeInt, true)) assert.Equal(nilptr("int8"), GetZeroValue(AttrTypeInt8, true)) @@ -420,6 +441,7 @@ func TestGetZeroValue(t *testing.T) { assert.Equal(nilptr("uint64"), GetZeroValue(AttrTypeUint64, true)) assert.Equal(nilptr("bool"), GetZeroValue(AttrTypeBool, true)) assert.Equal(nilptr("time.Time"), GetZeroValue(AttrTypeTime, true)) + assert.Equal(nilptr("[]byte"), GetZeroValue(AttrTypeBytes, true)) assert.Equal(nil, GetZeroValue(AttrTypeInvalid, false)) assert.Equal(nil, GetZeroValue(999, false)) } diff --git a/util_test.go b/util_test.go index 5fdc0a1..23298b5 100644 --- a/util_test.go +++ b/util_test.go @@ -43,6 +43,9 @@ func ptr(v interface{}) interface{} { // time.Time case time.Time: return &c + // []byte + case []byte: + return &c } return nil } @@ -92,6 +95,10 @@ func nilptr(t string) interface{} { case "time.Time": var p *time.Time return p + // []byte + case "[]byte": + var p *[]byte + return p } return nil } From 30169e275793a681d01e0447c804ddf4ea880d50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 7 Sep 2019 15:21:37 -0400 Subject: [PATCH 224/406] Add detail in README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 5a9cbe1..8f45d85 100644 --- a/README.md +++ b/README.md @@ -90,6 +90,8 @@ time.Time *[]byte ``` +Using a pointer allows the field to be nil. + #### Relationship Relationships can be a bit tricky. To-one relationships are defined with a string and to-many relationships are defined with a slice of strings. They contain the IDs of the related resources. The api tag has to take the form of "rel,xxx[,yyy]" where yyy is optional. xxx is the type of the relationship and yyy is the name of the inverse relationship when dealing with a two-way relationship. In the following example, our Article struct defines a relationship named author of type users: From 91c1111895fdd534f4096c4e8d9d376704e7b6df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 7 Sep 2019 15:23:18 -0400 Subject: [PATCH 225/406] Add fields in resource marshaling test --- jsonapi_test.go | 4 +++ testdata/goldenfiles/marshaling/resource.json | 36 +++++++++++++++++-- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/jsonapi_test.go b/jsonapi_test.go index a3c983b..a1bb43e 100644 --- a/jsonapi_test.go +++ b/jsonapi_test.go @@ -82,6 +82,10 @@ func TestMarshaling(t *testing.T) { "mocktype": {"to-1", "to-x-from-1"}, }, }, + fields: []string{ + "str", "uint64", "bool", "int", "time", "bytes", "to-1", + "to-x-from-1", + }, }, { name: "collection", doc: &Document{ diff --git a/testdata/goldenfiles/marshaling/resource.json b/testdata/goldenfiles/marshaling/resource.json index 2ad4ae1..566d8c2 100644 --- a/testdata/goldenfiles/marshaling/resource.json +++ b/testdata/goldenfiles/marshaling/resource.json @@ -1,17 +1,47 @@ { "data": { - "attributes": {}, + "attributes": { + "bool": true, + "bytes": "AQID", + "int": 10, + "str": "str", + "time": "2013-06-24T22:03:34.8276Z", + "uint64": 1064 + }, "id": "id1", "links": { "self": "/mocktype/id1" }, - "relationships": {}, + "relationships": { + "to-1": { + "data": { + "id": "id2", + "type": "mocktype" + }, + "links": { + "related": "/mocktype/id1/to-1", + "self": "/mocktype/id1/relationships/to-1" + } + }, + "to-x-from-1": { + "data": [ + { + "id": "id4", + "type": "mocktype" + } + ], + "links": { + "related": "/mocktype/id1/to-x-from-1", + "self": "/mocktype/id1/relationships/to-x-from-1" + } + } + }, "type": "mocktype" }, "jsonapi": { "version": "1.0" }, "links": { - "self": "/fake/path?fields%5Bmocktype%" + "self": "/fake/path?fields%5Bmocktype%5D=bool%2Cbytes%2Cint%2Cstr%2Ctime%2Cto-1%2Cto-x-from-1%2Cuint64" } } \ No newline at end of file From 93164139047d4e7e93ed77d1cd80d31da9858ee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 7 Sep 2019 15:29:48 -0400 Subject: [PATCH 226/406] Add test cases for invalid operation --- filter_query_test.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/filter_query_test.go b/filter_query_test.go index 899d2a6..429e1e3 100644 --- a/filter_query_test.go +++ b/filter_query_test.go @@ -41,6 +41,7 @@ func TestFilterResource(t *testing.T) { {rval: "bbb", op: ">=", cval: "aaa", expected: true}, {rval: "bbb", op: ">=", cval: "bbb", expected: true}, {rval: "bbb", op: ">=", cval: "ccc", expected: false}, + {rval: "aaa", op: "invalid", cval: "aaa", expected: false}, // int {rval: 1, op: "=", cval: 0, expected: false}, @@ -59,6 +60,7 @@ func TestFilterResource(t *testing.T) { {rval: 1, op: ">=", cval: 0, expected: true}, {rval: 1, op: ">=", cval: 1, expected: true}, {rval: 1, op: ">=", cval: 3, expected: false}, + {rval: 0, op: "invalid", cval: 0, expected: false}, // int8 {rval: int8(1), op: "=", cval: int8(0), expected: false}, @@ -77,6 +79,7 @@ func TestFilterResource(t *testing.T) { {rval: int8(1), op: ">=", cval: int8(0), expected: true}, {rval: int8(1), op: ">=", cval: int8(1), expected: true}, {rval: int8(1), op: ">=", cval: int8(2), expected: false}, + {rval: int8(0), op: "invalid", cval: int8(0), expected: false}, // int16 {rval: int16(1), op: "=", cval: int16(0), expected: false}, @@ -95,6 +98,7 @@ func TestFilterResource(t *testing.T) { {rval: int16(1), op: ">=", cval: int16(0), expected: true}, {rval: int16(1), op: ">=", cval: int16(1), expected: true}, {rval: int16(1), op: ">=", cval: int16(2), expected: false}, + {rval: int16(0), op: "invalid", cval: int16(0), expected: false}, // int32 {rval: int32(1), op: "=", cval: int32(0), expected: false}, @@ -113,6 +117,7 @@ func TestFilterResource(t *testing.T) { {rval: int32(1), op: ">=", cval: int32(0), expected: true}, {rval: int32(1), op: ">=", cval: int32(1), expected: true}, {rval: int32(1), op: ">=", cval: int32(2), expected: false}, + {rval: int32(0), op: "invalid", cval: int32(0), expected: false}, // int64 {rval: int64(1), op: "=", cval: int64(0), expected: false}, @@ -131,6 +136,7 @@ func TestFilterResource(t *testing.T) { {rval: int64(1), op: ">=", cval: int64(0), expected: true}, {rval: int64(1), op: ">=", cval: int64(1), expected: true}, {rval: int64(1), op: ">=", cval: int64(2), expected: false}, + {rval: int64(0), op: "invalid", cval: int64(0), expected: false}, // uint {rval: uint(1), op: "=", cval: uint(0), expected: false}, @@ -149,6 +155,7 @@ func TestFilterResource(t *testing.T) { {rval: uint(1), op: ">=", cval: uint(0), expected: true}, {rval: uint(1), op: ">=", cval: uint(1), expected: true}, {rval: uint(1), op: ">=", cval: uint(2), expected: false}, + {rval: uint(0), op: "invalid", cval: uint(0), expected: false}, // uint8 {rval: uint8(1), op: "=", cval: uint8(0), expected: false}, @@ -167,6 +174,7 @@ func TestFilterResource(t *testing.T) { {rval: uint8(1), op: ">=", cval: uint8(0), expected: true}, {rval: uint8(1), op: ">=", cval: uint8(1), expected: true}, {rval: uint8(1), op: ">=", cval: uint8(2), expected: false}, + {rval: uint8(0), op: "invalid", cval: uint8(0), expected: false}, // uint16 {rval: uint16(1), op: "=", cval: uint16(0), expected: false}, @@ -185,6 +193,7 @@ func TestFilterResource(t *testing.T) { {rval: uint16(1), op: ">=", cval: uint16(0), expected: true}, {rval: uint16(1), op: ">=", cval: uint16(1), expected: true}, {rval: uint16(1), op: ">=", cval: uint16(2), expected: false}, + {rval: uint16(0), op: "invalid", cval: uint16(0), expected: false}, // uint32 {rval: uint32(1), op: "=", cval: uint32(0), expected: false}, @@ -203,6 +212,7 @@ func TestFilterResource(t *testing.T) { {rval: uint32(1), op: ">=", cval: uint32(0), expected: true}, {rval: uint32(1), op: ">=", cval: uint32(1), expected: true}, {rval: uint32(1), op: ">=", cval: uint32(2), expected: false}, + {rval: uint32(0), op: "invalid", cval: uint32(0), expected: false}, // uint64 {rval: uint64(1), op: "=", cval: uint64(0), expected: false}, @@ -221,12 +231,14 @@ func TestFilterResource(t *testing.T) { {rval: uint64(1), op: ">=", cval: uint64(0), expected: true}, {rval: uint64(1), op: ">=", cval: uint64(1), expected: true}, {rval: uint64(1), op: ">=", cval: uint64(2), expected: false}, + {rval: uint64(0), op: "invalid", cval: uint64(0), expected: false}, // bool {rval: true, op: "=", cval: true, expected: true}, {rval: true, op: "=", cval: false, expected: false}, {rval: true, op: "!=", cval: true, expected: false}, {rval: true, op: "!=", cval: false, expected: true}, + {rval: true, op: "invalid", cval: true, expected: false}, // time.Time {rval: now, op: "=", cval: now.Add(-time.Second), expected: false}, @@ -245,6 +257,7 @@ func TestFilterResource(t *testing.T) { {rval: now, op: ">=", cval: now.Add(-time.Second), expected: true}, {rval: now, op: ">=", cval: now, expected: true}, {rval: now, op: ">=", cval: now.Add(time.Second), expected: false}, + {rval: now, op: "invalid", cval: now, expected: false}, // []byte {rval: []byte{1}, op: "=", cval: []byte{0}, expected: false}, @@ -279,6 +292,7 @@ func TestFilterResource(t *testing.T) { {rval: []byte{0, 1}, op: ">=", cval: []byte{0, 0}, expected: true}, {rval: []byte{0, 1}, op: ">=", cval: []byte{0, 1}, expected: true}, {rval: []byte{0, 1}, op: ">=", cval: []byte{0, 2}, expected: false}, + {rval: []byte{0, 0}, op: "invalid", cval: []byte{0, 0}, expected: false}, // *string {rval: nilptr("string"), op: "=", cval: nilptr("string"), expected: true}, From 06872383e84e104aaf5654dda78d747ea89a3c04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sat, 7 Sep 2019 19:49:03 -0400 Subject: [PATCH 227/406] Add test case for invalid operation in checkSlice --- filter_query_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/filter_query_test.go b/filter_query_test.go index 429e1e3..fe26f4e 100644 --- a/filter_query_test.go +++ b/filter_query_test.go @@ -835,6 +835,7 @@ func TestFilterResource(t *testing.T) { {rval: []string{"id2"}, op: "has", cval: "id1", expected: false}, {rval: []string{"id1", "id2"}, op: "has", cval: "id1", expected: true}, {rval: []string{"id2", "id3"}, op: "has", cval: "id1", expected: false}, + {rval: []string{"id1"}, op: "invalid", cval: []string{}, expected: false}, } for _, test := range relTests { From 1ffb4f22ff31019b5cb23485258e36ba08f6c89c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 8 Sep 2019 21:41:27 -0400 Subject: [PATCH 228/406] Add simple tests for WrapCollection --- wrapper_collection_test.go | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/wrapper_collection_test.go b/wrapper_collection_test.go index daa1952..9b8792c 100644 --- a/wrapper_collection_test.go +++ b/wrapper_collection_test.go @@ -1,7 +1,31 @@ package jsonapi_test import ( + "testing" + . "github.com/mfcochauxlaberge/jsonapi" + + "github.com/stretchr/testify/assert" ) var _ Collection = (*WrapperCollection)(nil) + +func TestWrapCollection(t *testing.T) { + assert := assert.New(t) + + res := Wrap(mocktype{}) + col := WrapCollection(res) + + // Collection's type == resource's type + assert.True(col.GetType().Equal(res.GetType())) + + assert.Equal(0, col.Len()) + + // Resource added + col.Add(res) + assert.Equal(1, col.Len()) + assert.True(Equal(res, col.At(0))) + + // Index out of bound + assert.Nil(col.At(999)) +} From 1446c96111d4b7562e2d68774c45a6faaad8fa8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 8 Sep 2019 22:00:18 -0400 Subject: [PATCH 229/406] Add tests for SoftResource.New --- soft_resource_test.go | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/soft_resource_test.go b/soft_resource_test.go index c1e5831..be902e0 100644 --- a/soft_resource_test.go +++ b/soft_resource_test.go @@ -129,3 +129,23 @@ func TestSoftResource(t *testing.T) { sr2 := sr.Copy() assert.Equal(t, true, Equal(sr, sr2)) } + +func TestSoftResourceNew(t *testing.T) { + assert := assert.New(t) + + typ, _ := BuildType(mocktype{}) + sr := &SoftResource{} + sr.Type = &typ + + // Modify the SoftResource object + sr.SetID("id") + sr.Set("str", "abc123") + sr.Set("int", 42) + + nsr := sr.New() + + // The new + assert.Equal("", nsr.GetID()) + assert.Equal("", nsr.Get("str")) + assert.Equal(0, nsr.Get("int")) +} From 53193205d6acbc1b2ce9aefa52de2e3231150671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 8 Sep 2019 22:03:55 -0400 Subject: [PATCH 230/406] Make SoftResource.Get not return relationships --- soft_resource.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/soft_resource.go b/soft_resource.go index e4d1058..2fa7363 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -102,15 +102,6 @@ func (sr *SoftResource) Get(key string) interface{} { } return GetZeroValue(attr.Type, attr.Nullable) } - if rel, ok := sr.Type.Rels[key]; ok { - if v, ok := sr.data[key]; ok { - return v - } - if rel.ToOne { - return "" - } - return []string{} - } return nil } From 0e6cac79e226d5ceec65f15f16d788aeeb22d85f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 8 Sep 2019 22:34:37 -0400 Subject: [PATCH 231/406] Remove call to GetZeroValue in SoftResource.Get It can be assumed that the value exists in the data field because of the call of the check method. --- soft_resource.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/soft_resource.go b/soft_resource.go index 2fa7363..4a1952f 100644 --- a/soft_resource.go +++ b/soft_resource.go @@ -96,11 +96,10 @@ func (sr *SoftResource) GetType() Type { // Get returns the value associated to the field named after key. func (sr *SoftResource) Get(key string) interface{} { sr.check() - if attr, ok := sr.Type.Attrs[key]; ok { + if _, ok := sr.Type.Attrs[key]; ok { if v, ok := sr.data[key]; ok { return v } - return GetZeroValue(attr.Type, attr.Nullable) } return nil } From 8b8c4bf475f715b9a0511a569db097faf2fac163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 8 Sep 2019 22:37:51 -0400 Subject: [PATCH 232/406] Add test case for setting a nullable attribute --- soft_resource_test.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/soft_resource_test.go b/soft_resource_test.go index be902e0..ad26fe6 100644 --- a/soft_resource_test.go +++ b/soft_resource_test.go @@ -125,6 +125,20 @@ func TestSoftResource(t *testing.T) { assert.Equal(t, "id1", sr.GetToOne("rel1")) assert.Equal(t, []string{"id1", "id2"}, sr.GetToMany("rel2")) + // Set a nullable attribute to nil + _ = sr.Type.AddAttr(Attr{ + Name: "nullable-str", + Type: AttrTypeString, + Nullable: true, + }) + assert.Nil(t, sr.Get("nullable-str")) + str := "abc" + sr.Set("nullable-str", &str) + assert.Equal(t, &str, sr.Get("nullable-str")) + sr.Set("nullable-str", nil) + assert.Nil(t, sr.Get("nullable-str")) + assert.Equal(t, (*string)(nil), sr.Get("nullable-str")) + // Copy sr2 := sr.Copy() assert.Equal(t, true, Equal(sr, sr2)) From 9d3571221ce8c88e5e006e8bc1671a2d37bee82e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 8 Sep 2019 22:42:48 -0400 Subject: [PATCH 233/406] Remove commented out code --- filter_query_test.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/filter_query_test.go b/filter_query_test.go index fe26f4e..bfc16e3 100644 --- a/filter_query_test.go +++ b/filter_query_test.go @@ -1032,13 +1032,3 @@ func TestFilterMarshaling(t *testing.T) { }) assert.Equal(false, err != nil, "empty operation and value") // TODO } - -// func marshalUnmarshalFilter(t *testing.T, f *Filter) *Filter { -// payload, err := json.MarshalIndent(f, "", "\t") -// assert.NoError(t, err) -// var f2 Filter -// err = json.Unmarshal(payload, &f2) -// assert.NoError(t, err) -// assert.NotNil(t, f2) -// return &f2 -// } From 7d5d14354adfd41a9a0c0c0f0b3404a970b5bfb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Sun, 8 Sep 2019 22:51:09 -0400 Subject: [PATCH 234/406] Fix small formatting mistake --- filter_query_test.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/filter_query_test.go b/filter_query_test.go index bfc16e3..f0edaa9 100644 --- a/filter_query_test.go +++ b/filter_query_test.go @@ -975,13 +975,11 @@ func TestFilterMarshaling(t *testing.T) { name: "empty", query: ``, expectedError: true, - }, - { + }, { name: "null value", query: `{"v":null}`, expectedError: false, // TODO - }, - { + }, { name: "standard values", query: `{ "c": "col", From 7d7f2488d4ce20ff78b12d4efef4bf6fb2b956ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 10 Sep 2019 20:56:41 -0400 Subject: [PATCH 235/406] Update golangci-lint --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a7829a8..d8ba666 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ env: before_script: - 'curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh - | sh -s v1.17.1' + | sh -s v1.18.0' script: - ./bin/golangci-lint run From 2c4bd1bd3dbf70a76a1488caf12657f4d07ca313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 10 Sep 2019 21:00:39 -0400 Subject: [PATCH 236/406] Add Go 1.13 to .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index d8ba666..7f3b625 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: go go: - 1.11.x - 1.12.x + - 1.13.x branches: only: From 65da55f7fffc81af447506847757d7fc2cfaa796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 10 Sep 2019 22:26:21 -0400 Subject: [PATCH 237/406] Set go directive in go.mod to 1.11 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index defb982..f0aca21 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/mfcochauxlaberge/jsonapi -go 1.12 +go 1.11 require ( github.com/google/uuid v1.1.1 From 1e37d1fcdbcd0956e7f8c9139a5099a3f48007d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 10 Sep 2019 22:44:00 -0400 Subject: [PATCH 238/406] Add minimun Go version note and badge --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 8f45d85..186116e 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,9 @@ + + + @@ -27,6 +30,10 @@ The official specification can be found at [jsonapi.org/format](http://jsonapi.o The library is in **beta** and its API is subject to change until v1 is released. +## Requirements + +The supported versions of Go are the latest patch releases of every minor release starting with Go 1.11. + ## Quick start The simplest way to start using jsonapi is to use the Marshal and Unmarshal functions. From 78851367dfa840975d3e015396cb03d6fc658ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 10 Sep 2019 22:49:34 -0400 Subject: [PATCH 239/406] Add badge with latest released version --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 186116e..adea6c2 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,9 @@ + + + From e93351c62d56bc6dc43dfc43787c8d1118673af4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Fran=C3=A7ois=20Cochaux-Laberge?= Date: Tue, 10 Sep 2019 22:52:49 -0400 Subject: [PATCH 240/406] Move logo file in its own directory --- README.md | 2 +- logo.png => assets/logo.png | Bin 2 files changed, 1 insertion(+), 1 deletion(-) rename logo.png => assets/logo.png (100%) diff --git a/README.md b/README.md index adea6c2..6ad22b5 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # jsonapi