dennis/freed
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: db specific feed entity

Browse source
This commit is contained in:
Dennis Schoepf 2025-08-29 14:15:31 +02:00
parent 2322b9170d
commit 86c0f92cc6
2 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
internal/database/feed.go
View file

@ -4,9 +4,7 @@ import (
"time" "time"
) )
type FeedType string type FeedEntity struct {
type Feed struct {
ID int64 ID int64
Name string Name string
Url string Url string
@ -14,12 +12,12 @@ type Feed struct {
LastSyncedAt *time.Time LastSyncedAt *time.Time
} }
type FeedWithArticleCount struct { type FeedEntityWithArticleCount struct {
Feed FeedEntity
ArticleCount int ArticleCount int
} }
func (f Feed) Insert() (int64, error) { func (f FeedEntity) Insert() (int64, error) {
result, err := db.Exec("INSERT INTO feed (name, url) VALUES (?,?)", f.Name, f.Url) result, err := db.Exec("INSERT INTO feed (name, url) VALUES (?,?)", f.Name, f.Url)
if err != nil { if err != nil {
@ -38,17 +36,17 @@ func (f Feed) Insert() (int64, error) {
// This might be a problem if we have a LOT of feeds configured // This might be a problem if we have a LOT of feeds configured
// as of now this works, so it is not at the top of the priority // as of now this works, so it is not at the top of the priority
// list // list
func FindAllFeeds() (*[]Feed, error) { func FindAllFeeds() (*[]FeedEntity, error) {
rows, err := db.Query("SELECT id, name, url, createdAt, lastSyncedAt FROM feed") rows, err := db.Query("SELECT id, name, url, createdAt, lastSyncedAt FROM feed")
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer rows.Close() defer rows.Close()
var feeds []Feed var feeds []FeedEntity
for rows.Next() { for rows.Next() {
var feed Feed var feed FeedEntity
err := rows.Scan(&feed.ID, &feed.Name, &feed.Url, &feed.CreatedAt, &feed.LastSyncedAt) err := rows.Scan(&feed.ID, &feed.Name, &feed.Url, &feed.CreatedAt, &feed.LastSyncedAt)
if err != nil { if err != nil {
return nil, err return nil, err
@ -63,17 +61,17 @@ func FindAllFeeds() (*[]Feed, error) {
return &feeds, nil return &feeds, nil
} }
func FindAllFeedsWithArticleCount() (*[]FeedWithArticleCount, error) { func FindAllFeedsWithArticleCount() (*[]FeedEntityWithArticleCount, error) {
rows, err := db.Query("SELECT f.id, f.name, f.url, f.createdAt, f.lastSyncedAt, COUNT(a.id) FROM feed as f LEFT JOIN article as a ON a.feedId = f.id") rows, err := db.Query("SELECT f.id, f.name, f.url, f.createdAt, f.lastSyncedAt, COUNT(a.id) FROM feed as f LEFT JOIN article as a ON a.feedId = f.id")
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer rows.Close() defer rows.Close()
var feeds []FeedWithArticleCount var feeds []FeedEntityWithArticleCount
for rows.Next() { for rows.Next() {
var feed FeedWithArticleCount var feed FeedEntityWithArticleCount
err := rows.Scan(&feed.ID, &feed.Name, &feed.Url, &feed.CreatedAt, &feed.LastSyncedAt, &feed.ArticleCount) err := rows.Scan(&feed.ID, &feed.Name, &feed.Url, &feed.CreatedAt, &feed.LastSyncedAt, &feed.ArticleCount)
if err != nil { if err != nil {
return nil, err return nil, err

4
internal/feed.go
View file

@ -23,7 +23,7 @@ func AddFeed(feedUrl string) (string, int, error) {
return "", 0, err return "", 0, err
} }
f := database.Feed{ f := database.FeedEntity{
Name: feed.Title, Name: feed.Title,
Url: feedUrl, Url: feedUrl,
} }
@ -125,7 +125,7 @@ func SyncFeeds() error {
} }
func syncFeed( func syncFeed(
feed database.Feed, feed database.FeedEntity,
syncBefore time.Time, syncBefore time.Time,
wg *sync.WaitGroup, wg *sync.WaitGroup,
errorChannel chan<- error, errorChannel chan<- error,