Add query parameters to get posts v4 endpoint (#5858)

* Add since query paremeter to get posts v4 endpoint

* Add query paremeters for before/after to get posts v4 endpoint

api4/post.go

@@ -60,24 +60,67 @@ func getPostsForChannel(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	afterPost := r.URL.Query().Get("after")
+	beforePost := r.URL.Query().Get("before")
+	sinceString := r.URL.Query().Get("since")
+
+	var since int64
+	var parseError error
+
+	if len(sinceString) > 0 {
+		since, parseError = strconv.ParseInt(sinceString, 10, 64)
+		if parseError != nil {
+			c.SetInvalidParam("since")
+			return
+		}
+	}
+
 	if !app.SessionHasPermissionToChannel(c.Session, c.Params.ChannelId, model.PERMISSION_READ_CHANNEL) {
 		c.SetPermissionError(model.PERMISSION_READ_CHANNEL)
 		return
 	}
 
-	etag := app.GetPostsEtag(c.Params.ChannelId)
+	var list *model.PostList
+	var err *model.AppError
+	etag := ""
 
-	if HandleEtag(etag, "Get Posts", w, r) {
+	if since > 0 {
-		return
+		list, err = app.GetPostsSince(c.Params.ChannelId, since)
+	} else if len(afterPost) > 0 {
+		etag = app.GetPostsEtag(c.Params.ChannelId)
+
+		if HandleEtag(etag, "Get Posts After", w, r) {
+			return
+		}
+
+		list, err = app.GetPostsAfterPost(c.Params.ChannelId, afterPost, c.Params.Page, c.Params.PerPage)
+	} else if len(beforePost) > 0 {
+		etag = app.GetPostsEtag(c.Params.ChannelId)
+
+		if HandleEtag(etag, "Get Posts Before", w, r) {
+			return
+		}
+
+		list, err = app.GetPostsBeforePost(c.Params.ChannelId, beforePost, c.Params.Page, c.Params.PerPage)
+	} else {
+		etag = app.GetPostsEtag(c.Params.ChannelId)
+
+		if HandleEtag(etag, "Get Posts", w, r) {
+			return
+		}
+
+		list, err = app.GetPostsPage(c.Params.ChannelId, c.Params.Page, c.Params.PerPage)
 	}
 
-	if list, err := app.GetPostsPage(c.Params.ChannelId, c.Params.Page, c.Params.PerPage); err != nil {
+	if err != nil {
 		c.Err = err
 		return
-	} else {
-		w.Header().Set(model.HEADER_ETAG_SERVER, etag)
-		w.Write([]byte(list.ToJson()))
 	}
+
+	if len(etag) > 0 {
+		w.Header().Set(model.HEADER_ETAG_SERVER, etag)
+	}
+	w.Write([]byte(list.ToJson()))
 }
 
 func getPost(c *Context, w http.ResponseWriter, r *http.Request) {

api4/post_test.go

@@ -174,9 +174,12 @@ func TestGetPostsForChannel(t *testing.T) {
 
 	post1 := th.CreatePost()
 	post2 := th.CreatePost()
-	post3 := th.CreatePost()
+	post3 := &model.Post{ChannelId: th.BasicChannel.Id, Message: "a" + model.NewId() + "a", RootId: post1.Id}
-	post4 := &model.Post{ChannelId: th.BasicChannel.Id, Message: "a" + model.NewId() + "a", RootId: post1.Id}
+	post3, _ = Client.CreatePost(post3)
-	post4, _ = Client.CreatePost(post4)
+
+	time := model.GetMillis()
+
+	post4 := th.CreatePost()
 
 	posts, resp := Client.GetPostsForChannel(th.BasicChannel.Id, 0, 60, "")
 	CheckNoError(t, resp)
@@ -207,7 +210,7 @@ func TestGetPostsForChannel(t *testing.T) {
 		t.Fatal("wrong number returned")
 	}
 
-	if _, ok := posts.Posts[post4.Id]; !ok {
+	if _, ok := posts.Posts[post3.Id]; !ok {
 		t.Fatal("missing comment")
 	}
 
@@ -229,6 +232,30 @@ func TestGetPostsForChannel(t *testing.T) {
 		t.Fatal("should be no posts")
 	}
 
+	post5 := th.CreatePost()
+
+	posts, resp = Client.GetPostsSince(th.BasicChannel.Id, time)
+	CheckNoError(t, resp)
+
+	found := make([]bool, 2)
+	for _, p := range posts.Posts {
+		if p.CreateAt < time {
+			t.Fatal("bad create at for post returned")
+		}
+
+		if p.Id == post4.Id {
+			found[0] = true
+		} else if p.Id == post5.Id {
+			found[1] = true
+		}
+	}
+
+	for _, f := range found {
+		if !f {
+			t.Fatal("missing post")
+		}
+	}
+
 	_, resp = Client.GetPostsForChannel("", 0, 60, "")
 	CheckBadRequestStatus(t, resp)
 
@@ -246,6 +273,90 @@ func TestGetPostsForChannel(t *testing.T) {
 	CheckNoError(t, resp)
 }
 
+func TestGetPostsAfterAndBefore(t *testing.T) {
+	th := Setup().InitBasic()
+	defer TearDown()
+	Client := th.Client
+
+	post1 := th.CreatePost()
+	post2 := th.CreatePost()
+	post3 := th.CreatePost()
+	post4 := th.CreatePost()
+	post5 := th.CreatePost()
+
+	posts, resp := Client.GetPostsBefore(th.BasicChannel.Id, post3.Id, 0, 100, "")
+	CheckNoError(t, resp)
+
+	found := make([]bool, 2)
+	for _, p := range posts.Posts {
+		if p.Id == post1.Id {
+			found[0] = true
+		} else if p.Id == post2.Id {
+			found[1] = true
+		}
+
+		if p.Id == post4.Id || p.Id == post5.Id {
+			t.Fatal("returned posts after")
+		}
+	}
+
+	for _, f := range found {
+		if !f {
+			t.Fatal("missing post")
+		}
+	}
+
+	posts, resp = Client.GetPostsBefore(th.BasicChannel.Id, post3.Id, 1, 1, "")
+	CheckNoError(t, resp)
+
+	if len(posts.Posts) != 1 {
+		t.Fatal("too many posts returned")
+	}
+
+	posts, resp = Client.GetPostsBefore(th.BasicChannel.Id, "junk", 1, 1, "")
+	CheckNoError(t, resp)
+
+	if len(posts.Posts) != 0 {
+		t.Fatal("should have no posts")
+	}
+
+	posts, resp = Client.GetPostsAfter(th.BasicChannel.Id, post3.Id, 0, 100, "")
+	CheckNoError(t, resp)
+
+	found = make([]bool, 2)
+	for _, p := range posts.Posts {
+		if p.Id == post4.Id {
+			found[0] = true
+		} else if p.Id == post5.Id {
+			found[1] = true
+		}
+
+		if p.Id == post1.Id || p.Id == post2.Id {
+			t.Fatal("returned posts before")
+		}
+	}
+
+	for _, f := range found {
+		if !f {
+			t.Fatal("missing post")
+		}
+	}
+
+	posts, resp = Client.GetPostsAfter(th.BasicChannel.Id, post3.Id, 1, 1, "")
+	CheckNoError(t, resp)
+
+	if len(posts.Posts) != 1 {
+		t.Fatal("too many posts returned")
+	}
+
+	posts, resp = Client.GetPostsAfter(th.BasicChannel.Id, "junk", 1, 1, "")
+	CheckNoError(t, resp)
+
+	if len(posts.Posts) != 0 {
+		t.Fatal("should have no posts")
+	}
+}
+
 func TestGetPost(t *testing.T) {
 	th := Setup().InitBasic().InitSystemAdmin()
 	defer TearDown()

app/post.go

@@ -395,6 +395,22 @@ func GetPermalinkPost(postId string, userId string, siteURL string) (*model.Post
 	}
 }
 
+func GetPostsBeforePost(channelId, postId string, page, perPage int) (*model.PostList, *model.AppError) {
+	if result := <-Srv.Store.Post().GetPostsBefore(channelId, postId, perPage, page*perPage); result.Err != nil {
+		return nil, result.Err
+	} else {
+		return result.Data.(*model.PostList), nil
+	}
+}
+
+func GetPostsAfterPost(channelId, postId string, page, perPage int) (*model.PostList, *model.AppError) {
+	if result := <-Srv.Store.Post().GetPostsAfter(channelId, postId, perPage, page*perPage); result.Err != nil {
+		return nil, result.Err
+	} else {
+		return result.Data.(*model.PostList), nil
+	}
+}
+
 func GetPostsAroundPost(postId, channelId string, offset, limit int, before bool) (*model.PostList, *model.AppError) {
 	var pchan store.StoreChannel
 	if before {

model/client4.go

@@ -1159,6 +1159,39 @@ func (c *Client4) GetPostsForChannel(channelId string, page, perPage int, etag s
 	}
 }
 
+// GetPostsSince gets posts created after a specified time as Unix time in milliseconds.
+func (c *Client4) GetPostsSince(channelId string, time int64) (*PostList, *Response) {
+	query := fmt.Sprintf("?since=%v", time)
+	if r, err := c.DoApiGet(c.GetChannelRoute(channelId)+"/posts"+query, ""); err != nil {
+		return nil, &Response{StatusCode: r.StatusCode, Error: err}
+	} else {
+		defer closeBody(r)
+		return PostListFromJson(r.Body), BuildResponse(r)
+	}
+}
+
+// GetPostsAfter gets a page of posts that were posted after the post provided.
+func (c *Client4) GetPostsAfter(channelId, postId string, page, perPage int, etag string) (*PostList, *Response) {
+	query := fmt.Sprintf("?page=%v&per_page=%v&after=%v", page, perPage, postId)
+	if r, err := c.DoApiGet(c.GetChannelRoute(channelId)+"/posts"+query, etag); err != nil {
+		return nil, &Response{StatusCode: r.StatusCode, Error: err}
+	} else {
+		defer closeBody(r)
+		return PostListFromJson(r.Body), BuildResponse(r)
+	}
+}
+
+// GetPostsBefore gets a page of posts that were posted before the post provided.
+func (c *Client4) GetPostsBefore(channelId, postId string, page, perPage int, etag string) (*PostList, *Response) {
+	query := fmt.Sprintf("?page=%v&per_page=%v&before=%v", page, perPage, postId)
+	if r, err := c.DoApiGet(c.GetChannelRoute(channelId)+"/posts"+query, etag); err != nil {
+		return nil, &Response{StatusCode: r.StatusCode, Error: err}
+	} else {
+		defer closeBody(r)
+		return PostListFromJson(r.Body), BuildResponse(r)
+	}
+}
+
 // SearchPosts returns any posts with matching terms string.
 func (c *Client4) SearchPosts(teamId string, terms string, isOrSearch bool) (*PostList, *Response) {
 	requestBody := map[string]string{"terms": terms, "is_or_search": strconv.FormatBool(isOrSearch)}