refactor: list only the feeds that match the condition

api/api.go

@@ -96,7 +96,7 @@ func Run() {
 
 	feeds := authed.Group("/feeds")
 	feedAPIHandler := newFeedAPI(server.NewFeed(repo.NewFeed(repo.DB)))
-	feeds.GET("", feedAPIHandler.All)
+	feeds.GET("", feedAPIHandler.List)
 	feeds.GET("/:id", feedAPIHandler.Get)
 	feeds.POST("", feedAPIHandler.Create)
 	feeds.POST("/validation", feedAPIHandler.CheckValidity)

api/feed.go

@@ -18,8 +18,13 @@ func newFeedAPI(srv *server.Feed) *feedAPI {
 	}
 }
 
-func (f feedAPI) All(c echo.Context) error {
-	resp, err := f.srv.All(c.Request().Context())
+func (f feedAPI) List(c echo.Context) error {
+	var req server.ReqFeedList
+	if err := bindAndValidate(&req, c); err != nil {
+		return err
+	}
+
+	resp, err := f.srv.List(c.Request().Context(), &req)
 	if err != nil {
 		return err
 	}

frontend/src/lib/api/feed.ts

@@ -1,8 +1,21 @@
 import { api } from './api';
 import type { Feed } from './model';
 
-export async function allFeeds() {
-	const resp = await api.get('feeds').json<{ feeds: Feed[] }>();
+export type FeedListFiler = {
+	have_unread?: boolean;
+	have_bookmark?: boolean;
+};
+
+export async function listFeeds(filter?: FeedListFiler) {
+	if (filter) {
+		filter = JSON.parse(JSON.stringify(filter));
+	}
+
+	const resp = await api
+		.get('feeds', {
+			searchParams: filter
+		})
+		.json<{ feeds: Feed[] }>();
 	return resp.feeds;
 }
 

frontend/src/lib/api/model.ts

@@ -23,5 +23,5 @@ export type Item = {
 	bookmark: boolean;
 	pub_date: Date;
 	updated_at: Date;
-	feed: { id: number; name: string };
+	feed: Pick<Feed, 'id' | 'name'>;
 };

frontend/src/routes/+page.ts

@@ -1,13 +1,13 @@
-import { allFeeds } from '$lib/api/feed';
+import { listFeeds } from '$lib/api/feed';
 import { listItems, parseURLtoFilter } from '$lib/api/item';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ url }) => {
 	const filter = parseURLtoFilter(url.searchParams);
 	filter.unread = true;
 	filter.bookmark = undefined;
-	const feeds = await allFeeds();
 	const items = await listItems(filter);
+	const feeds = await listFeeds({ have_unread: true });
 	return {
 		feeds: feeds,
 		items: {

frontend/src/routes/all/+page.ts

@@ -1,12 +1,12 @@
-import { allFeeds } from '$lib/api/feed';
+import { listFeeds } from '$lib/api/feed';
 import { listItems, parseURLtoFilter } from '$lib/api/item';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ url }) => {
 	const filter = parseURLtoFilter(url.searchParams);
 	filter.unread = undefined;
 	filter.bookmark = undefined;
-	const feeds = await allFeeds();
+	const feeds = await listFeeds();
 	const items = await listItems(filter);
 	return {
 		feeds: feeds,

frontend/src/routes/bookmarks/+page.ts

@@ -1,12 +1,12 @@
-import { allFeeds } from '$lib/api/feed';
+import { listFeeds } from '$lib/api/feed';
 import { listItems, parseURLtoFilter } from '$lib/api/item';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ url }) => {
 	const filter = parseURLtoFilter(url.searchParams);
 	filter.unread = undefined;
 	filter.bookmark = true;
-	const feeds = await allFeeds();
+	const feeds = await listFeeds({ have_bookmark: true });
 	const items = await listItems(filter);
 	return {
 		feeds: feeds,

frontend/src/routes/feeds/+page.ts

@@ -1,6 +1,6 @@
 import type { PageLoad } from './$types';
 import type { Feed } from '$lib/api/model';
-import { allFeeds } from '$lib/api/feed';
+import { listFeeds } from '$lib/api/feed';
 import { allGroups } from '$lib/api/group';
 
 export type groupFeeds = {
@@ -10,7 +10,7 @@ export type groupFeeds = {
 };
 
 export const load: PageLoad = async () => {
-	const feeds = await allFeeds();
+	const feeds = await listFeeds();
 	const groups = await allGroups();
 	const data: groupFeeds[] = [];
 	for (const g of groups) {

repo/feed.go

@@ -18,9 +18,25 @@ type Feed struct {
 	db *gorm.DB
 }
 
-func (f Feed) All() ([]*model.Feed, error) {
+type FeedListFilter struct {
+	HaveUnread   *bool
+	HaveBookmark *bool
+}
+
+func (f Feed) List(filter *FeedListFilter) ([]*model.Feed, error) {
 	var res []*model.Feed
-	err := f.db.Model(&model.Feed{}).Joins("Group").Find(&res).Error
+	db := f.db.Model(&model.Feed{}).Joins("Group")
+	if filter != nil {
+		if filter.HaveUnread != nil && *filter.HaveUnread {
+			db = db.Joins("inner join items on feeds.id = items.feed_id and items.unread = true").
+				Group("feeds.id")
+		}
+		if filter.HaveBookmark != nil && *filter.HaveBookmark {
+			db = db.Joins("inner join items on feeds.id = items.feed_id and items.bookmark = true").
+				Group("feeds.id")
+		}
+	}
+	err := db.Find(&res).Error
 	return res, err
 }
 

server/feed.go

@@ -16,7 +16,7 @@ import (
 //go:generate mockgen -destination=feed_mock.go -source=feed.go -package=server
 
 type FeedRepo interface {
-	All() ([]*model.Feed, error)
+	List(filter *repo.FeedListFilter) ([]*model.Feed, error)
 	Get(id uint) (*model.Feed, error)
 	Create(feed []*model.Feed) error
 	Update(id uint, feed *model.Feed) error
@@ -33,8 +33,12 @@ func NewFeed(repo FeedRepo) *Feed {
 	}
 }
 
-func (f Feed) All(ctx context.Context) (*RespFeedAll, error) {
-	data, err := f.repo.All()
+func (f Feed) List(ctx context.Context, req *ReqFeedList) (*RespFeedList, error) {
+	filter := &repo.FeedListFilter{
+		HaveUnread:   req.HaveUnread,
+		HaveBookmark: req.HaveBookmark,
+	}
+	data, err := f.repo.List(filter)
 	if err != nil {
 		return nil, err
 	}
@@ -52,7 +56,7 @@ func (f Feed) All(ctx context.Context) (*RespFeedAll, error) {
 			Group:     GroupForm{ID: v.GroupID, Name: v.Group.Name},
 		})
 	}
-	return &RespFeedAll{
+	return &RespFeedList{
 		Feeds: feeds,
 	}, nil
 }

server/feed_form.go

@@ -13,7 +13,12 @@ type FeedForm struct {
 	Group     GroupForm `json:"group"`
 }
 
-type RespFeedAll struct {
+type ReqFeedList struct {
+	HaveUnread   *bool `query:"have_unread"`
+	HaveBookmark *bool `query:"have_bookmark"`
+}
+
+type RespFeedList struct {
 	Feeds []*FeedForm `json:"feeds"`
 }
 

service/pull/pull.go

@@ -18,7 +18,7 @@ var (
 )
 
 type FeedRepo interface {
-	All() ([]*model.Feed, error)
+	List(filter *repo.FeedListFilter) ([]*model.Feed, error)
 	Get(id uint) (*model.Feed, error)
 	Update(id uint, feed *model.Feed) error
 }
@@ -57,7 +57,7 @@ func (p *Puller) PullAll(ctx context.Context, force bool) error {
 	ctx, cancel := context.WithTimeout(ctx, interval/2)
 	defer cancel()
 
-	feeds, err := p.feedRepo.All()
+	feeds, err := p.feedRepo.List(nil)
 	if err != nil {
 		if errors.Is(err, repo.ErrNotFound) {
 			err = nil