Not going one at a time with offset

api/offer_test.go

@@ -1111,8 +1111,8 @@ var _ = Describe("Offer Template Handler", func() {
 			Expect(pages).To(Equal(float64(0)))
 		})
 
-		It("should return three offers with no limit and offset 2", func() {
-			offset := 2
+		It("should return no offers with no limit and offset 1 (second page)", func() {
+			offset := 1
 			url := fmt.Sprintf("/offers?game-id=offers-game&offset=%d", offset)
 			request, _ := http.NewRequest("GET", url, nil)
 
@@ -1125,27 +1125,7 @@ var _ = Describe("Offer Template Handler", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			offers := obj["offers"].([]interface{})
-			Expect(offers).To(HaveLen(3))
-
-			pages := obj["pages"].(float64)
-			Expect(pages).To(Equal(float64(1)))
-		})
-
-		It("should return three offers with no limit and offset 2", func() {
-			offset := 2
-			url := fmt.Sprintf("/offers?game-id=offers-game&offset=%d", offset)
-			request, _ := http.NewRequest("GET", url, nil)
-
-			app.Router.ServeHTTP(recorder, request)
-			Expect(recorder.Header().Get("Content-Type")).To(Equal("application/json"))
-
-			Expect(recorder.Code).To(Equal(http.StatusOK))
-			var obj map[string]interface{}
-			err := json.Unmarshal(recorder.Body.Bytes(), &obj)
-			Expect(err).NotTo(HaveOccurred())
-
-			offers := obj["offers"].([]interface{})
-			Expect(offers).To(HaveLen(3))
+			Expect(offers).To(BeEmpty())
 
 			pages := obj["pages"].(float64)
 			Expect(pages).To(Equal(float64(1)))

models/offer.go

@@ -152,22 +152,8 @@ func ListOffers(
 	mr *MixedMetricsReporter,
 ) ([]*Offer, int, error) {
 	offers := []*Offer{}
-	err := mr.WithDatastoreSegment("offers", SegmentSelect, func() error {
-		return db.
-			Select("*").
-			From("offers").
-			Where("game_id = $1", gameID).
-			OrderBy("created_at").
-			Limit(limit).
-			Offset(offset).
-			QueryStructs(&offers)
-	})
-	if err != nil {
-		return offers, 0, err
-	}
-
 	var numberOffers int
-	err = mr.WithDatastoreSegment("offers", SegmentSelect, func() error {
+	err := mr.WithDatastoreSegment("offers", SegmentSelect, func() error {
 		return db.
 			Select("COUNT(*)").
 			From("offers").
@@ -184,6 +170,21 @@ func ListOffers(
 		if numberOffers%int(limit) != 0 {
 			pages = pages + 1
 		}
+
+		start := offset * limit
+		err = mr.WithDatastoreSegment("offers", SegmentSelect, func() error {
+			return db.
+				Select("*").
+				From("offers").
+				Where("game_id = $1", gameID).
+				OrderBy("created_at").
+				Limit(limit).
+				Offset(start).
+				QueryStructs(&offers)
+		})
+		if err != nil {
+			return offers, 0, err
+		}
 	}
 
 	return offers, pages, nil

models/offer_test.go

@@ -201,13 +201,13 @@ var _ = Describe("Offer Models", func() {
 			Expect(pages).To(Equal(pages))
 		})
 
-		It("should return one offer with limit 2 and offset 4", func() {
+		It("should return no offer with limit 2 and offset 3", func() {
 			var limit uint64 = 2
-			var offset uint64 = 4
+			var offset uint64 = 3
 			var pages int = 5/2 + 1
 			games, pages, err := models.ListOffers(db, "offers-game", limit, offset, nil)
 			Expect(err).NotTo(HaveOccurred())
-			Expect(games).To(HaveLen(1))
+			Expect(games).To(BeEmpty())
 			Expect(pages).To(Equal(pages))
 		})