Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
### IDE ###
.idea
.vscode
24 changes: 21 additions & 3 deletions endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,24 +77,42 @@ func (e *Endpoint) GetEndpointMock(r *Request) interface{} {
idx := -1
weight := -1
cases := e.endpointScheme.Cases()
missed := []string{}

var missed []string
for i, c := range cases {
if Status.OK == c.Status {
w := 0
ref := reflect.Get(c.Params, reflect.Options{SnakeCase: true})
m := make([]string, 0, len(ref.Nested))

reqByGrp := make(map[string]bool)
for _, item := range ref.Nested {
if !r.Params.Has(item.Name) && item.Required {
m = append(m, item.Name)
if item.RequiredGroup != "" {
reqByGrp[item.RequiredGroup] = false
}
}

for _, item := range ref.Nested {
if item.Required {
if r.Params.Has(item.Name) {
if item.RequiredGroup != "" {
reqByGrp[item.RequiredGroup] = true
}
} else if _, ok := reqByGrp[item.RequiredGroup]; !ok {
m = append(m, item.Name)
}
}
if r.Params.Get(item.Name) == fmt.Sprintf("%v", item.Value) {
w++
}
}

for group, present := range reqByGrp {
if !present {
m = append(m, fmt.Sprintf("[%s]", group))
}
}

if len(m) > 0 && len(missed) == 0 {
missed = m
}
Expand Down
30 changes: 20 additions & 10 deletions reflect/reflect.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,17 @@ type Options struct {

// Item -
type Item struct {
Name string `json:"name"`
Value interface{} `json:"-"`
Enum interface{} `json:"enum"`
Type string `json:"type"`
MetaType string `json:"meta_type"`
Tags string `json:"tags"`
Comment string `json:"comment"`
Required bool `json:"required"`
Deprecated bool `json:"deprecated"`
Nested []Item `json:"nested"`
Name string `json:"name"`
Value interface{} `json:"-"`
Enum interface{} `json:"enum"`
Type string `json:"type"`
MetaType string `json:"meta_type"`
Tags string `json:"tags"`
Comment string `json:"comment"`
Required bool `json:"required"`
RequiredGroup string `json:"required_group"`
Deprecated bool `json:"deprecated"`
Nested []Item `json:"nested"`
}

// Get -
Expand Down Expand Up @@ -111,6 +112,7 @@ var (
reIsPrivate = regexp.MustCompile(`^[a-z]`)
reJsonTagName = regexp.MustCompile(`^[^,]+`)
reOmitEmpty = regexp.MustCompile(`^(.+,)?omitempty(,.+)?$`)
reRequired = regexp.MustCompile(`^(true(,([\w]+))?)|(false)$`)
)

func initNested(o Options, typeRef reflect.Type, valRef reflect.Value) []Item {
Expand Down Expand Up @@ -152,6 +154,14 @@ func initNested(o Options, typeRef reflect.Type, valRef reflect.Value) []Item {
item.Required = f.Tag.Get("required") == "true"
item.Deprecated = f.Tag.Get("deprecated") == "true"

required := f.Tag.Get("required")
if reRequired.MatchString(required) {
item.Required = strings.HasPrefix(required, "true")
if attrs := strings.Split(required, ","); len(attrs) > 1 {
item.RequiredGroup = attrs[1]
}
}

td := zfv.MethodByName("TypeDescription")
if td.IsValid() {
c := td.Call([]reflect.Value{})[0].String()
Expand Down
62 changes: 62 additions & 0 deletions reflect/reflect_struct_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package reflect_test

import (
"encoding/json"
"testing"

"github.com/gothing/draft/reflect"
Expand All @@ -27,6 +28,67 @@ func TestStructWithJSONTag(t *testing.T) {
assert.Equal(t, []string{"access_token", "ClientID"}, v.Keys())
}

type StructWithRequiredTags struct {
RequiredField int `required:"true"`
RequiredField1 string `required:"true,grp"`
RequiredField2 uint64 `required:"true,grp"`
OptionalField uint `required:"false"`
ExtraField bool
}

func TestStructWithRequiredTag(t *testing.T) {
v := reflect.Get(
StructWithRequiredTags{},
reflect.Options{
SnakeCase: true,
},
)

jsonObj, err := json.Marshal(v)
assert.NoError(t, err)

var m map[string]interface{}
assert.NoError(t, json.Unmarshal(jsonObj, &m))

fields := []struct {
Name string
Required bool
RequiredGroup string
}{
{
Name: "required_field",
Required: true,
},
{
Name: "required_field1",
Required: true,
RequiredGroup: "grp",
},
{
Name: "required_field2",
Required: true,
RequiredGroup: "grp",
},
{
Name: "optional_field",
},
{
Name: "extra_field",
},
}

for _, field := range fields {
nested := m["nested"].([]interface{})
for _, f := range nested {
f := f.(map[string]interface{})
if f["name"] == field.Name {
assert.Equal(t, field.Required, f["required"])
assert.Equal(t, field.RequiredGroup, f["required_group"])
}
}
}
}

func xTestStructComposed(t *testing.T) {
v := reflect.Get(StructComposed{}, reflect.Options{
SnakeCase: true,
Expand Down