Skip to content

Commit

Permalink
fix(be): search by status on the route list page is invalid (#1207)
Browse files Browse the repository at this point in the history
* fix search by status on the route list page is invalid

* Fix test cases and references

* Update route.go

* Update route.go

* Format error repair

* use strconv.Itoa Method conversion uint8

* chore: use the correct API version (#1215)

Co-authored-by: litesun <sunyi@apache.org>

fix: online debug body params support content-type x-www-form-urlencoded (#1201)

* fix: online debug body params support content-type x-www-form-urlencoded

* fix: body code mirror support different mode

* fix: use enum instead of real string

* fix: lint error

Co-authored-by: 琚致远 <juzhiyuan@apache.org>

feat: add tips when plugin type is auth and schemaType is not consumer (#1219)

Co-authored-by: 琚致远 <juzhiyuan@apache.org>

* Fix indent format problem

Co-authored-by: 琚致远 <juzhiyuan@apache.org>
  • Loading branch information
Jaycean and juzhiyuan authored Jan 6, 2021
1 parent 291e321 commit 3f8060e
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 3 deletions.
12 changes: 9 additions & 3 deletions api/internal/handler/route/route.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"os"
"path/filepath"
"reflect"
"strconv"
"strings"

"github.com/gin-gonic/gin"
Expand Down Expand Up @@ -178,9 +179,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 +221,10 @@ func (h *Handler) List(c droplet.Context) (interface{}, error) {
return false
}

if input.Status != "" && strconv.Itoa(int(obj.(*entity.Route).Status)) != input.Status {
return false
}

return true
},
Format: func(obj interface{}) interface{} {
Expand Down
49 changes: 49 additions & 0 deletions api/internal/handler/route/route_test.go
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)

// 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

0 comments on commit 3f8060e

Please sign in to comment.