Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

fix(be): search by status on the route list page is invalid #1207

Merged
merged 13 commits into from
Jan 6, 2021
Merged

fix(be): search by status on the route list page is invalid #1207

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6c49aa3
fix search by status on the route list page is invalid
Jaycean Jan 5, 2021
7e2b56f
Merge branch 'master' into fix_search_by_status_on_the_route_list
Jaycean Jan 5, 2021
db468cb
Fix test cases and references
Jaycean Jan 5, 2021
9d2d9e7
Update route.go
Jaycean Jan 5, 2021
b3f2a51
Update route.go
Jaycean Jan 5, 2021
b1179ba
Merge branch 'master' into fix_search_by_status_on_the_route_list
Jaycean Jan 5, 2021
27eba5c
Format error repair
Jaycean Jan 6, 2021
dd955bd
Merge branch 'master' into fix_search_by_status_on_the_route_list
Jaycean Jan 6, 2021
b8ad7d1
use strconv.Itoa Method conversion uint8
Jaycean Jan 6, 2021
6ec1338
Merge branch 'master' into fix_search_by_status_on_the_route_list
Jaycean Jan 6, 2021
24eb08c
chore: use the correct API version (#1215)
juzhiyuan Jan 6, 2021
06ab54f
Merge branch 'master' into fix_search_by_status_on_the_route_list
Jaycean Jan 6, 2021
a17dd2e
Fix indent format problem
Jaycean Jan 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions api/internal/handler/route/route.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,10 @@ func (h *Handler) Get(c droplet.Context) (interface{}, error) {
}

type ListInput struct {
Name string `auto_read:"name,query"`
URI string `auto_read:"uri,query"`
Label string `auto_read:"label,query"`
Name string `auto_read:"name,query"`
URI string `auto_read:"uri,query"`
Label string `auto_read:"label,query"`
Status string `auto_read:"status,query"`
store.Pagination
}

Expand Down Expand Up @@ -219,6 +220,10 @@ func (h *Handler) List(c droplet.Context) (interface{}, error) {
return false
}

if input.Status != "" && fmt.Sprintf("%d", obj.(*entity.Route).Status) != input.Status {
Copy link
Contributor

Choose a reason for hiding this comment

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

I recommend using strconv.Itoa instead of fmt.Sprintf. Because the former is faster than the latter in the benchmark test.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thank you for your suggestion. I'll revise it right away

return false
}

return true
},
Format: func(obj interface{}) interface{} {
Expand Down
49 changes: 49 additions & 0 deletions api/internal/handler/route/route_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ func TestRoute(t *testing.T) {
"vars": [],
"remote_addrs": ["127.0.0.0/8"],
"methods": ["PUT", "GET"],
"status": 1,
"upstream": {
"type": "roundrobin",
"nodes": [{
Expand Down Expand Up @@ -415,6 +416,7 @@ func TestRoute(t *testing.T) {
"hosts": ["foo.com", "*.bar.com"],
"remote_addrs": ["127.0.0.0/8"],
"methods": ["PUT", "GET"],
"status": 1,
"labels": {
"l1": "v1",
"l2": "v2"
Expand Down Expand Up @@ -925,6 +927,42 @@ func TestRoute(t *testing.T) {
dataPage = retPage.(*store.ListOutput)
assert.Equal(t, len(dataPage.Rows), 0)

// list search and status match
listInput = &ListInput{}
reqBody = `{"page_size": 1, "page": 1, "status": "1"}`
err = json.Unmarshal([]byte(reqBody), listInput)
assert.Nil(t, err)
ctx.SetInput(listInput)
retPage, err = handler.List(ctx)
assert.Nil(t, err)
dataPage = retPage.(*store.ListOutput)
assert.Equal(t, len(dataPage.Rows), 1)

//sleep
time.Sleep(time.Duration(100) * time.Millisecond)
Copy link
Contributor

Choose a reason for hiding this comment

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

Style: redundant space.

Copy link
Contributor

Choose a reason for hiding this comment

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

Hi, @Jaycean don't forget to fix the style problem.

Copy link
Member Author

Choose a reason for hiding this comment

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

done.


// list search and status not match
listInput = &ListInput{}
reqBody = `{"page_size": 1, "page": 1, "name": "a", "status": "0"}`
err = json.Unmarshal([]byte(reqBody), listInput)
assert.Nil(t, err)
ctx.SetInput(listInput)
retPage, err = handler.List(ctx)
assert.Nil(t, err)
dataPage = retPage.(*store.ListOutput)
assert.Equal(t, len(dataPage.Rows), 0)

//list search with name and status
listInput = &ListInput{}
reqBody = `{"page_size": 1, "page": 1, "name": "a", "status": "1"}`
err = json.Unmarshal([]byte(reqBody), listInput)
assert.Nil(t, err)
ctx.SetInput(listInput)
retPage, err = handler.List(ctx)
assert.Nil(t, err)
dataPage = retPage.(*store.ListOutput)
assert.Equal(t, len(dataPage.Rows), 1)

//list search with name and label
listInput = &ListInput{}
reqBody = `{"page_size": 1, "page": 1, "name": "a", "label":"l1:v1"}`
Expand Down Expand Up @@ -958,6 +996,17 @@ func TestRoute(t *testing.T) {
dataPage = retPage.(*store.ListOutput)
assert.Equal(t, len(dataPage.Rows), 1)

//list search with uri,name, status and label
listInput = &ListInput{}
reqBody = `{"page_size": 1, "page": 1, "name": "a", "status": "1", "uri": "index", "label":"l1:v1"}`
err = json.Unmarshal([]byte(reqBody), listInput)
assert.Nil(t, err)
ctx.SetInput(listInput)
retPage, err = handler.List(ctx)
assert.Nil(t, err)
dataPage = retPage.(*store.ListOutput)
assert.Equal(t, len(dataPage.Rows), 1)

//create route using uris
route3 := &entity.Route{}
reqBody = `{
Expand Down