From f9f25e2d2f0281d58dfbb47d834874dcbfcc8ebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksandar=20Novakovi=C4=87?= <anovakovic01@gmail.com>
Date: Thu, 17 Jan 2019 17:31:30 +0100
Subject: [PATCH] Fix pagination response for empty page (#547)

Signed-off-by: Aleksandar Novakovic <aleksandar.novakovic@mainflux.com>
---
 sdk/go/channels_test.go     | 4 ++--
 sdk/go/things_test.go       | 4 ++--
 things/api/http/endpoint.go | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sdk/go/channels_test.go b/sdk/go/channels_test.go
index 7bb1d5f1..8a44be9a 100644
--- a/sdk/go/channels_test.go
+++ b/sdk/go/channels_test.go
@@ -211,7 +211,7 @@ func TestChannels(t *testing.T) {
 			offset:   110,
 			limit:    5,
 			err:      nil,
-			response: nil,
+			response: []sdk.Channel{},
 		},
 		{
 			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,
 			limit:    5,
 			err:      nil,
-			response: nil,
+			response: []sdk.Channel{},
 		},
 		{
 			desc:     "get a list of channels by thing with invalid args (zero limit) and invalid token",
diff --git a/sdk/go/things_test.go b/sdk/go/things_test.go
index 352729d0..bc91c2cc 100644
--- a/sdk/go/things_test.go
+++ b/sdk/go/things_test.go
@@ -249,7 +249,7 @@ func TestThings(t *testing.T) {
 			offset:   110,
 			limit:    5,
 			err:      nil,
-			response: nil,
+			response: []sdk.Thing{},
 		},
 		{
 			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,
 			limit:    5,
 			err:      nil,
-			response: nil,
+			response: []sdk.Thing{},
 		},
 		{
 			desc:     "get a list of things by channel with invalid args (zero limit) and invalid token",
diff --git a/things/api/http/endpoint.go b/things/api/http/endpoint.go
index 956bf566..753f78df 100644
--- a/things/api/http/endpoint.go
+++ b/things/api/http/endpoint.go
@@ -108,6 +108,7 @@ func listThingsEndpoint(svc things.Service) endpoint.Endpoint {
 				Offset: page.Offset,
 				Limit:  page.Limit,
 			},
+			Things: []viewThingRes{},
 		}
 		for _, thing := range page.Things {
 			view := viewThingRes{
@@ -144,6 +145,7 @@ func listThingsByChannelEndpoint(svc things.Service) endpoint.Endpoint {
 				Offset: page.Offset,
 				Limit:  page.Limit,
 			},
+			Things: []viewThingRes{},
 		}
 		for _, thing := range page.Things {
 			view := viewThingRes{
@@ -272,6 +274,7 @@ func listChannelsEndpoint(svc things.Service) endpoint.Endpoint {
 				Offset: page.Offset,
 				Limit:  page.Limit,
 			},
+			Channels: []viewChannelRes{},
 		}
 		// Cast channels
 		for _, channel := range page.Channels {
@@ -308,6 +311,7 @@ func listChannelsByThingEndpoint(svc things.Service) endpoint.Endpoint {
 				Offset: page.Offset,
 				Limit:  page.Limit,
 			},
+			Channels: []viewChannelRes{},
 		}
 		for _, channel := range page.Channels {
 			view := viewChannelRes{