feat(datastore): Add argument to filter on read status in PullFeeds

bow · Jan 19, 2024 · 3546b17 · 3546b17
1 parent df6e31b
commit 3546b17
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 19 deletions.
diff --git a/cmd/feed_pull.go b/cmd/feed_pull.go
@@ -45,11 +45,12 @@ func newFeedPullCommand() *cobra.Command {
 				return err
 			}
 
+			entriesReadStatus := false
 			var (
 				errs []error
 				n    int
 				s    = newPullSpinner(rawIDs)
-				ch   = db.PullFeeds(cmd.Context(), ids)
+				ch   = db.PullFeeds(cmd.Context(), ids, &entriesReadStatus)
 			)
 
 			s.Start()

diff --git a/internal/datastore/datastore.go b/internal/datastore/datastore.go
@@ -52,6 +52,7 @@ type Datastore interface {
 	PullFeeds(
 		ctx context.Context,
 		ids []entity.ID,
+		isRead *bool,
 	) (
 		results <-chan entity.PullResult,
 	)

diff --git a/internal/datastore/sqlite_pull_feeds.go b/internal/datastore/sqlite_pull_feeds.go
@@ -16,6 +16,7 @@ import (
 func (db *SQLite) PullFeeds(
 	ctx context.Context,
 	ids []entity.ID,
+	entryReadStatus *bool,
 ) <-chan entity.PullResult {
 
 	var (
@@ -48,7 +49,7 @@ func (db *SQLite) PullFeeds(
 
 		chs := make([]<-chan entity.PullResult, len(pks))
 		for i, pk := range pks {
-			chs[i] = pullNewFeedEntries(ctx, tx, pk, db.parser)
+			chs[i] = pullFeedEntries(ctx, tx, pk, db.parser, entryReadStatus)
 		}
 
 		for pr := range merge(chs) {
@@ -155,11 +156,12 @@ func getAllPullKeys(ctx context.Context, tx *sql.Tx) ([]pullKey, error) {
 	return pks, nil
 }
 
-func pullNewFeedEntries(
+func pullFeedEntries(
 	ctx context.Context,
 	tx *sql.Tx,
 	pk pullKey,
 	parser Parser,
+	entryReadStatus *bool,
 ) chan entity.PullResult {
 
 	pullTime := time.Now().UTC()
@@ -186,8 +188,7 @@ func pullNewFeedEntries(
 			return pk.err(err)
 		}
 
-		defaultReadStatus := false
-		unreadEntries, err := getEntries(ctx, tx, []ID{pk.feedID}, &defaultReadStatus, nil)
+		unreadEntries, err := getEntries(ctx, tx, []ID{pk.feedID}, entryReadStatus, nil)
 		if err != nil {
 			return pk.err(err)
 		}

diff --git a/internal/datastore/sqlite_pull_feeds_test.go b/internal/datastore/sqlite_pull_feeds_test.go
@@ -30,7 +30,7 @@ func TestPullFeedsAllOkEmptyDB(t *testing.T) {
 		ParseURLWithContext(gomock.Any(), gomock.Any()).
 		MaxTimes(0)
 
-	c := db.PullFeeds(context.Background(), nil)
+	c := db.PullFeeds(context.Background(), nil, nil)
 	a.Empty(c)
 }
 
@@ -69,7 +69,7 @@ func TestPullFeedsAllOkEmptyEntries(t *testing.T) {
 		MaxTimes(1).
 		Return(toGFeed(t, dbFeeds[1]), nil)
 
-	c := db.PullFeeds(context.Background(), nil)
+	c := db.PullFeeds(context.Background(), nil, nil)
 
 	got := make([]entity.PullResult, 0)
 	for res := range c {
@@ -183,7 +183,7 @@ func TestPullFeedsAllOkNoNewEntries(t *testing.T) {
 		MaxTimes(1).
 		Return(toGFeed(t, pulledFeeds[1]), nil)
 
-	c := db.PullFeeds(context.Background(), nil)
+	c := db.PullFeeds(context.Background(), nil, pointer(false))
 
 	got := make([]entity.PullResult, 0)
 	for res := range c {
@@ -324,7 +324,7 @@ func TestPullFeedsAllOkSomeNewEntries(t *testing.T) {
 		MaxTimes(1).
 		Return(toGFeed(t, pulledFeeds[1]), nil)
 
-	c := db.PullFeeds(context.Background(), nil)
+	c := db.PullFeeds(context.Background(), nil, pointer(false))
 
 	got := make([]entity.PullResult, 0)
 	for res := range c {
@@ -492,7 +492,7 @@ func TestPullFeedsSelectedOkSomeNewEntries(t *testing.T) {
 		MaxTimes(1).
 		Return(toGFeed(t, pulledFeed), nil)
 
-	c := db.PullFeeds(context.Background(), []ID{keys[pulledFeed.title].ID})
+	c := db.PullFeeds(context.Background(), []ID{keys[pulledFeed.title].ID}, pointer(false))
 
 	got := make([]entity.PullResult, 0)
 	for res := range c {

diff --git a/internal/server/datastore_mock_test.go b/internal/server/datastore_mock_test.go
diff --git a/internal/server/service.go b/internal/server/service.go
@@ -126,7 +126,9 @@ func (svc *service) PullFeeds(
 		ids[i] = id
 	}
 
-	ch := svc.ds.PullFeeds(stream.Context(), ids)
+	// TODO: Expose isRead in proto.
+	isRead := false
+	ch := svc.ds.PullFeeds(stream.Context(), ids, &isRead)
 
 	for pr := range ch {
 		payload, err := convert(pr)

diff --git a/internal/server/service_test.go b/internal/server/service_test.go
@@ -273,7 +273,7 @@ func TestPullFeedsAllOk(t *testing.T) {
 	}()
 
 	ds.EXPECT().
-		PullFeeds(gomock.Any(), []entity.ID{}).
+		PullFeeds(gomock.Any(), []entity.ID{}, gomock.Any()).
 		Return(ch)
 
 	req := api.PullFeedsRequest{}
@@ -354,7 +354,7 @@ func TestPullFeedsSelectedAllOk(t *testing.T) {
 	}()
 
 	ds.EXPECT().
-		PullFeeds(gomock.Any(), []entity.ID{2, 3}).
+		PullFeeds(gomock.Any(), []entity.ID{2, 3}, gomock.Any()).
 		Return(ch)
 
 	req := api.PullFeedsRequest{FeedIds: []uint32{2, 3}}
@@ -444,7 +444,7 @@ func TestPullFeedsErrSomeFeed(t *testing.T) {
 	}()
 
 	ds.EXPECT().
-		PullFeeds(gomock.Any(), []entity.ID{}).
+		PullFeeds(gomock.Any(), []entity.ID{}, gomock.Any()).
 		Return(ch)
 
 	req := api.PullFeedsRequest{}
@@ -542,7 +542,7 @@ func TestPullFeedsErrNonFeed(t *testing.T) {
 	}()
 
 	ds.EXPECT().
-		PullFeeds(gomock.Any(), []entity.ID{}).
+		PullFeeds(gomock.Any(), []entity.ID{}, gomock.Any()).
 		Return(ch)
 
 	req := api.PullFeedsRequest{}