refactor(datastore): Set PullFeeds entries read status argument to be…

… simpler bool instead of bool pointer
bow · Jan 20, 2024 · 8b1a8d8 · 8b1a8d8
1 parent f8f4973
commit 8b1a8d8
Show file tree

Hide file tree

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

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

diff --git a/internal/datastore/sqlite_pull_feeds.go b/internal/datastore/sqlite_pull_feeds.go
@@ -16,7 +16,7 @@ import (
 func (db *SQLite) PullFeeds(
 	ctx context.Context,
 	ids []entity.ID,
-	entryReadStatus *bool,
+	onlyUnread bool,
 ) <-chan entity.PullResult {
 
 	var (
@@ -49,7 +49,7 @@ func (db *SQLite) PullFeeds(
 
 		chs := make([]<-chan entity.PullResult, len(pks))
 		for i, pk := range pks {
-			chs[i] = pullFeedEntries(ctx, tx, pk, db.parser, entryReadStatus)
+			chs[i] = pullFeedEntries(ctx, tx, pk, db.parser, onlyUnread)
 		}
 
 		for pr := range merge(chs) {
@@ -161,7 +161,7 @@ func pullFeedEntries(
 	tx *sql.Tx,
 	pk pullKey,
 	parser Parser,
-	entryReadStatus *bool,
+	onlyUnread bool,
 ) chan entity.PullResult {
 
 	pullTime := time.Now().UTC()
@@ -188,6 +188,11 @@ func pullFeedEntries(
 			return pk.err(err)
 		}
 
+		var entryReadStatus *bool
+		if onlyUnread {
+			entryReadStatus = pointer(false)
+		}
+
 		entries, 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, nil)
+	c := db.PullFeeds(context.Background(), nil, true)
 	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, nil)
+	c := db.PullFeeds(context.Background(), nil, true)
 
 	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, pointer(false))
+	c := db.PullFeeds(context.Background(), nil, true)
 
 	got := make([]entity.PullResult, 0)
 	for res := range c {
@@ -204,12 +204,12 @@ func TestPullFeedsAllOkNoNewEntries(t *testing.T) {
 	a.ElementsMatch(want, got)
 }
 
-func TestPullFeedsAllOkSomeNewEntries(t *testing.T) {
+func TestPullFeedsAllOkSomeNewEntriesAll(t *testing.T) {
 	t.Parallel()
 	a := assert.New(t)
 	db, dbFeeds, keys, pulledFeeds := setupComplexDBFixture(t)
 
-	c := db.PullFeeds(context.Background(), nil, nil)
+	c := db.PullFeeds(context.Background(), nil, false)
 
 	got := make([]entity.PullResult, 0)
 	for res := range c {
@@ -310,12 +310,12 @@ func TestPullFeedsAllOkSomeNewEntries(t *testing.T) {
 	a.ElementsMatch(want, got)
 }
 
-func TestPullFeedsAllOkSomeNewEntriesUnread(t *testing.T) {
+func TestPullFeedsAllOkSomeNewEntriesOnlyUnread(t *testing.T) {
 	t.Parallel()
 	a := assert.New(t)
 	db, dbFeeds, keys, pulledFeeds := setupComplexDBFixture(t)
 
-	c := db.PullFeeds(context.Background(), nil, pointer(false))
+	c := db.PullFeeds(context.Background(), nil, true)
 
 	got := make([]entity.PullResult, 0)
 	for res := range c {
@@ -483,7 +483,7 @@ func TestPullFeedsSelectedOkSomeNewEntries(t *testing.T) {
 		MaxTimes(1).
 		Return(toGFeed(t, pulledFeed), nil)
 
-	c := db.PullFeeds(context.Background(), []ID{keys[pulledFeed.title].ID}, pointer(false))
+	c := db.PullFeeds(context.Background(), []ID{keys[pulledFeed.title].ID}, true)
 
 	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
@@ -127,8 +127,7 @@ func (svc *service) PullFeeds(
 	}
 
 	// TODO: Expose isRead in proto.
-	isRead := false
-	ch := svc.ds.PullFeeds(stream.Context(), ids, &isRead)
+	ch := svc.ds.PullFeeds(stream.Context(), ids, true)
 
 	for pr := range ch {
 		payload, err := convert(pr)