OrgGo/Mainflux.mainflux
1
0
Fork 0
mirror of https://github.com/mainflux/mainflux.git synced 2025-04-27 13:48:49 +08:00
Code Issues Projects Releases Wiki Activity

Fix pagination response for empty page (#547)

Browse Source 
Signed-off-by: Aleksandar Novakovic <aleksandar.novakovic@mainflux.com>
This commit is contained in:
Aleksandar Novaković 2019-01-17 17:31:30 +01:00 committed by Dušan Borovčanin
parent ca6968f8d0
commit f9f25e2d2f
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk/go/channels_test.go
View File

@ -211,7 +211,7 @@ func TestChannels(t *testing.T) {
offset: 110, offset: 110,
limit: 5, limit: 5,
err: nil, err: nil,
response: nil, response: []sdk.Channel{},
}, },
{ {
desc: "get a list of channels with invalid args (zero limit) and invalid token", desc: "get a list of channels with invalid args (zero limit) and invalid token",
@ -318,7 +318,7 @@ func TestChannelsByThing(t *testing.T) {
offset: 110, offset: 110,
limit: 5, limit: 5,
err: nil, err: nil,
response: nil, response: []sdk.Channel{},
}, },
{ {
desc: "get a list of channels by thing with invalid args (zero limit) and invalid token", desc: "get a list of channels by thing with invalid args (zero limit) and invalid token",

4
sdk/go/things_test.go
View File

@ -249,7 +249,7 @@ func TestThings(t *testing.T) {
offset: 110, offset: 110,
limit: 5, limit: 5,
err: nil, err: nil,
response: nil, response: []sdk.Thing{},
}, },
{ {
desc: "get a list of things with invalid args (zero limit) and invalid token", desc: "get a list of things with invalid args (zero limit) and invalid token",
@ -359,7 +359,7 @@ func TestThingsByChannel(t *testing.T) {
offset: 110, offset: 110,
limit: 5, limit: 5,
err: nil, err: nil,
response: nil, response: []sdk.Thing{},
}, },
{ {
desc: "get a list of things by channel with invalid args (zero limit) and invalid token", desc: "get a list of things by channel with invalid args (zero limit) and invalid token",

4
things/api/http/endpoint.go
View File

@ -108,6 +108,7 @@ func listThingsEndpoint(svc things.Service) endpoint.Endpoint {
Offset: page.Offset, Offset: page.Offset,
Limit: page.Limit, Limit: page.Limit,
}, },
Things: []viewThingRes{},
} }
for _, thing := range page.Things { for _, thing := range page.Things {
view := viewThingRes{ view := viewThingRes{
@ -144,6 +145,7 @@ func listThingsByChannelEndpoint(svc things.Service) endpoint.Endpoint {
Offset: page.Offset, Offset: page.Offset,
Limit: page.Limit, Limit: page.Limit,
}, },
Things: []viewThingRes{},
} }
for _, thing := range page.Things { for _, thing := range page.Things {
view := viewThingRes{ view := viewThingRes{
@ -272,6 +274,7 @@ func listChannelsEndpoint(svc things.Service) endpoint.Endpoint {
Offset: page.Offset, Offset: page.Offset,
Limit: page.Limit, Limit: page.Limit,
}, },
Channels: []viewChannelRes{},
} }
// Cast channels // Cast channels
for _, channel := range page.Channels { for _, channel := range page.Channels {
@ -308,6 +311,7 @@ func listChannelsByThingEndpoint(svc things.Service) endpoint.Endpoint {
Offset: page.Offset, Offset: page.Offset,
Limit: page.Limit, Limit: page.Limit,
}, },
Channels: []viewChannelRes{},
} }
for _, channel := range page.Channels { for _, channel := range page.Channels {
view := viewChannelRes{ view := viewChannelRes{