Merge pull request #39 from gedorinku/fix_sorting_entries

記事のソート順を修正

Author: gedorinku

api/entries.pb.go

@@ -31,7 +31,7 @@
             "name": "page_token",
             "in": "query",
             "required": false,
-            "type": "integer",
+            "type": "string",
             "format": "int64"
           },
           {
@@ -112,7 +112,7 @@
           }
         },
         "next_page_token": {
-          "type": "integer",
+          "type": "string",
           "format": "int64"
         }
       }

api/entries.swagger.json

@@ -35,11 +35,11 @@ message Entry {
 }
 
 message ListEntriesRequest {
-  uint32 page_token = 1;
+  int64 page_token = 1;
   int32 page_size = 2 [(validator.field) = {int_gt: -1, int_lt: 101}];
 }
 
 message ListEntriesResponse {
   repeated Entry entries = 1;
-  uint32 next_page_token = 2;
+  int64 next_page_token = 2;
 }

api/entries.validator.pb.go

@@ -3,7 +3,6 @@ package server
 import (
 	"context"
 	"database/sql"
-	"math"
 	"time"
 
 	"github.com/golang/protobuf/ptypes/timestamp"
@@ -40,13 +39,16 @@ func (s *entryServiceServerImpl) ListPublicEntries(ctx context.Context, req *api
 	if size == 0 {
 		size = 50
 	}
-	maxID := req.GetPageToken()
-	if maxID == 0 {
-		maxID = math.MaxUint32
+	nano := req.GetPageToken()
+	var t time.Time
+	if nano == 0 {
+		t = time.Now()
+	} else {
+		t = time.Unix(0, nano)
 	}
 
 	es := s.EntryStore(ctx)
-	entries, next, err := es.ListPublicEntries(int64(maxID), int(size))
+	entries, next, err := es.ListPublicEntries(t, int(size))
 	if err != nil {
 		if errors.Cause(err) == sql.ErrNoRows {
 			return &api_pb.ListEntriesResponse{}, nil
@@ -57,7 +59,7 @@ func (s *entryServiceServerImpl) ListPublicEntries(ctx context.Context, req *api
 	resp := entriesToResponse(entries, false, s.cfg)
 	return &api_pb.ListEntriesResponse{
 		Entries:       resp,
-		NextPageToken: uint32(next),
+		NextPageToken: next.UnixNano(),
 	}, nil
 }
 
@@ -79,9 +81,7 @@ func entryToResponse(entry *record.Entry, includeEmail bool, cfg *config.Config)
 		Link:        entry.Link,
 		ImageUrl:    entry.ImageURL,
 		UpdatedAt:   timeToResponse(entry.UpdatedAt),
-	}
-	if t := entry.PublishedAt; t.Valid {
-		e.PublishedAt = timeToResponse(t.Time)
+		PublishedAt: timeToResponse(entry.PublishedAt),
 	}
 	if r := entry.R; r != nil {
 		e.Author = userToResponse(r.Author, includeEmail, cfg)

api/protos/entries.proto

@@ -7,7 +7,7 @@ create_table :entries, force: :cascade do |t|
   t.string :guid, null: false
   t.string :image_url, null: false
   t.references :blog, foreign_key: true, null: false
-  t.datetime :published_at, null: true
+  t.datetime :published_at, null: false
   t.timestamps
 
   t.index [:guid], unique: true

api/users.validator.pb.go

@@ -6,10 +6,10 @@ import (
 	"database/sql"
 	"encoding/base64"
 	"encoding/binary"
+	"time"
 
 	"github.com/mmcdole/gofeed"
 	"github.com/pkg/errors"
-	"github.com/volatiletech/null"
 	"github.com/volatiletech/sqlboiler/boil"
 	"github.com/volatiletech/sqlboiler/queries/qm"
 
@@ -32,27 +32,27 @@ func NewEntryStore(ctx context.Context, db *sql.DB) store.EntryStore {
 	}
 }
 
-func (s *entryStoreImpl) ListPublicEntries(maxEntryID int64, limit int) ([]*record.Entry, int64, error) {
+func (s *entryStoreImpl) ListPublicEntries(before time.Time, limit int) ([]*record.Entry, time.Time, error) {
 	mods := []qm.QueryMod{
 		qm.Load(record.EntryRels.Author),
 		qm.Load(record.EntryRels.Blog),
 		qm.InnerJoin("users on users.id = entries.author_id"),
 		qm.InnerJoin("profiles on profiles.id = users.profile_id"),
 		qm.Where("profiles.profile_scope = ?", model.Public),
-		qm.Where("entries.id <= ?", maxEntryID),
+		qm.Where("entries.published_at <= ?", before),
 		qm.Limit(limit + 1),
-		qm.OrderBy("entries.id desc"),
+		qm.OrderBy("entries.published_at desc"),
 	}
 
 	e, err := record.Entries(mods...).All(s.ctx, s.db)
 	if err != nil {
-		return nil, 0, errors.WithStack(err)
+		return nil, time.Time{}, errors.WithStack(err)
 	}
 
 	if len(e) <= limit {
-		return e, 0, nil
+		return e, time.Unix(0, 0), nil
 	}
-	return e[:limit], e[limit].ID, nil
+	return e[:limit], e[limit].PublishedAt, nil
 }
 
 func (s *entryStoreImpl) CreateEntries(blog *record.Blog, feed *gofeed.Feed) (n int64, err error) {
@@ -113,8 +113,10 @@ func (s *entryStoreImpl) CreateEntries(blog *record.Blog, feed *gofeed.Feed) (n
 		if i := item.Image; i != nil {
 			e.ImageURL = i.URL
 		}
-		if t := item.PublishedParsed; t != nil {
-			e.PublishedAt = null.TimeFrom(t.In(boil.GetLocation()))
+		if t := item.PublishedParsed; t == nil {
+			e.PublishedAt = time.Now().In(boil.GetLocation())
+		} else {
+			e.PublishedAt = t.In(boil.GetLocation())
 		}
 
 		err = e.Insert(s.ctx, tx, boil.Infer())