From 184bdc01187b179ef8d087070cf152ecb818c8d3 Mon Sep 17 00:00:00 2001 From: Deluan Date: Fri, 4 Mar 2016 17:09:17 -0500 Subject: [PATCH] Max size to return == 500 --- api/get_album_list.go | 3 ++- api/get_album_list_test.go | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/api/get_album_list.go b/api/get_album_list.go index 885d11ece..833234e81 100644 --- a/api/get_album_list.go +++ b/api/get_album_list.go @@ -32,11 +32,12 @@ func (c *GetAlbumListController) Get() { if !found { beego.Error("getAlbumList type", typ, "not implemented!") - c.SendError(responses.ERROR_GENERIC, "Not implemented yet!") + c.SendError(responses.ERROR_GENERIC, "Not implemented!") } qo.Size = 10 c.Ctx.Input.Bind(&qo.Size, "size") + qo.Size = utils.MinInt(qo.Size, 500) c.Ctx.Input.Bind(&qo.Offset, "offset") albums, err := c.albumRepo.GetAll(qo) diff --git a/api/get_album_list_test.go b/api/get_album_list_test.go index acc72d5e6..380e0e3cc 100644 --- a/api/get_album_list_test.go +++ b/api/get_album_list_test.go @@ -41,6 +41,12 @@ func TestGetAlbumList(t *testing.T) { So(w.Body, ShouldReceiveError, responses.ERROR_GENERIC) }) + Convey("Max size = 500", func() { + _, w := Get(AddParams("/rest/getAlbumList.view", "type=newest", "size=501"), "TestGetAlbumList") + So(w.Body, ShouldBeAValid, responses.AlbumList{}) + So(mockAlbumRepo.Options.Size, ShouldEqual, 500) + So(mockAlbumRepo.Options.Alpha, ShouldBeTrue) + }) Convey("Type == newest", func() { _, w := Get(AddParams("/rest/getAlbumList.view", "type=newest"), "TestGetAlbumList") So(w.Body, ShouldBeAValid, responses.AlbumList{})