wipfeat/multi-user

4 files changed, 39 insertions, 24 deletions

diff --git a/backend/db/articles.sql.go b/backend/db/articles.sql.go
index 7492598..e4419a8 100644
--- a/backend/db/articles.sql.go
+++ b/backend/db/articles.sql.go
@@ -78,9 +78,14 @@ SELECT
     f.id as feed_id_2, f.url as feed_url, f.title as feed_title, f.is_subscribed as feed_is_subscribed
 FROM articles AS a
 INNER JOIN feeds AS f ON a.feed_id = f.id
-WHERE a.id = ?
+WHERE a.id = ? AND f.user_id = ?
 `
 
+type GetArticleParams struct {
+	ID     int64
+	UserID int64
+}
+
 type GetArticleRow struct {
 	ID               int64
 	FeedID           int64
@@ -94,8 +99,8 @@ type GetArticleRow struct {
 	FeedIsSubscribed int64
 }
 
-func (q *Queries) GetArticle(ctx context.Context, id int64) (GetArticleRow, error) {
-	row := q.db.QueryRowContext(ctx, getArticle, id)
+func (q *Queries) GetArticle(ctx context.Context, arg GetArticleParams) (GetArticleRow, error) {
+	row := q.db.QueryRowContext(ctx, getArticle, arg.ID, arg.UserID)
 	var i GetArticleRow
 	err := row.Scan(
 		&i.ID,
@@ -184,7 +189,7 @@ SELECT
     f.id as feed_id_2, f.url as feed_url, f.title as feed_title, f.is_subscribed as feed_is_subscribed
 FROM articles AS a
 INNER JOIN feeds AS f ON a.feed_id = f.id
-WHERE a.is_read = 1 AND f.is_subscribed = 1
+WHERE a.is_read = 1 AND f.is_subscribed = 1 AND f.user_id = ?
 ORDER BY a.id DESC
 LIMIT 100
 `
@@ -202,8 +207,8 @@ type GetReadArticlesRow struct {
 	FeedIsSubscribed int64
 }
 
-func (q *Queries) GetReadArticles(ctx context.Context) ([]GetReadArticlesRow, error) {
-	rows, err := q.db.QueryContext(ctx, getReadArticles)
+func (q *Queries) GetReadArticles(ctx context.Context, userID int64) ([]GetReadArticlesRow, error) {
+	rows, err := q.db.QueryContext(ctx, getReadArticles, userID)
 	if err != nil {
 		return nil, err
 	}
@@ -242,7 +247,7 @@ SELECT
     f.id as feed_id_2, f.url as feed_url, f.title as feed_title, f.is_subscribed as feed_is_subscribed
 FROM articles AS a
 INNER JOIN feeds AS f ON a.feed_id = f.id
-WHERE a.is_read = 0 AND f.is_subscribed = 1
+WHERE a.is_read = 0 AND f.is_subscribed = 1 AND f.user_id = ?
 ORDER BY a.id DESC
 LIMIT 100
 `
@@ -260,8 +265,8 @@ type GetUnreadArticlesRow struct {
 	FeedIsSubscribed int64
 }
 
-func (q *Queries) GetUnreadArticles(ctx context.Context) ([]GetUnreadArticlesRow, error) {
-	rows, err := q.db.QueryContext(ctx, getUnreadArticles)
+func (q *Queries) GetUnreadArticles(ctx context.Context, userID int64) ([]GetUnreadArticlesRow, error) {
+	rows, err := q.db.QueryContext(ctx, getUnreadArticles, userID)
 	if err != nil {
 		return nil, err
 	}
diff --git a/backend/db/feeds.sql.go b/backend/db/feeds.sql.go
index 140fa3a..5a9b6b9 100644
--- a/backend/db/feeds.sql.go
+++ b/backend/db/feeds.sql.go
@@ -54,11 +54,16 @@ func (q *Queries) DeleteFeed(ctx context.Context, id int64) error {
 const getFeed = `-- name: GetFeed :one
 SELECT id, url, title, fetched_at, is_subscribed, user_id
 FROM feeds
-WHERE id = ?
+WHERE id = ? AND user_id = ?
 `
 
-func (q *Queries) GetFeed(ctx context.Context, id int64) (Feed, error) {
-	row := q.db.QueryRowContext(ctx, getFeed, id)
+type GetFeedParams struct {
+	ID     int64
+	UserID int64
+}
+
+func (q *Queries) GetFeed(ctx context.Context, arg GetFeedParams) (Feed, error) {
+	row := q.db.QueryRowContext(ctx, getFeed, arg.ID, arg.UserID)
 	var i Feed
 	err := row.Scan(
 		&i.ID,
@@ -74,11 +79,16 @@ func (q *Queries) GetFeed(ctx context.Context, id int64) (Feed, error) {
 const getFeedByURL = `-- name: GetFeedByURL :one
 SELECT id, url, title, fetched_at, is_subscribed, user_id
 FROM feeds
-WHERE url = ?
+WHERE url = ? AND user_id = ?
 `
 
-func (q *Queries) GetFeedByURL(ctx context.Context, url string) (Feed, error) {
-	row := q.db.QueryRowContext(ctx, getFeedByURL, url)
+type GetFeedByURLParams struct {
+	Url    string
+	UserID int64
+}
+
+func (q *Queries) GetFeedByURL(ctx context.Context, arg GetFeedByURLParams) (Feed, error) {
+	row := q.db.QueryRowContext(ctx, getFeedByURL, arg.Url, arg.UserID)
 	var i Feed
 	err := row.Scan(
 		&i.ID,
@@ -94,12 +104,12 @@ func (q *Queries) GetFeedByURL(ctx context.Context, url string) (Feed, error) {
 const getFeeds = `-- name: GetFeeds :many
 SELECT id, url, title, fetched_at, is_subscribed, user_id
 FROM feeds
-WHERE is_subscribed = 1
+WHERE is_subscribed = 1 AND user_id = ?
 ORDER BY id
 `
 
-func (q *Queries) GetFeeds(ctx context.Context) ([]Feed, error) {
-	rows, err := q.db.QueryContext(ctx, getFeeds)
+func (q *Queries) GetFeeds(ctx context.Context, userID int64) ([]Feed, error) {
+	rows, err := q.db.QueryContext(ctx, getFeeds, userID)
 	if err != nil {
 		return nil, err
 	}
diff --git a/backend/db/queries/articles.sql b/backend/db/queries/articles.sql
index c1feaae..b910fcf 100644
--- a/backend/db/queries/articles.sql
+++ b/backend/db/queries/articles.sql
@@ -4,7 +4,7 @@ SELECT
     f.id as feed_id_2, f.url as feed_url, f.title as feed_title, f.is_subscribed as feed_is_subscribed
 FROM articles AS a
 INNER JOIN feeds AS f ON a.feed_id = f.id
-WHERE a.id = ?;
+WHERE a.id = ? AND f.user_id = ?;
 
 -- name: GetUnreadArticles :many
 SELECT
@@ -12,7 +12,7 @@ SELECT
     f.id as feed_id_2, f.url as feed_url, f.title as feed_title, f.is_subscribed as feed_is_subscribed
 FROM articles AS a
 INNER JOIN feeds AS f ON a.feed_id = f.id
-WHERE a.is_read = 0 AND f.is_subscribed = 1
+WHERE a.is_read = 0 AND f.is_subscribed = 1 AND f.user_id = ?
 ORDER BY a.id DESC
 LIMIT 100;
 
@@ -22,7 +22,7 @@ SELECT
     f.id as feed_id_2, f.url as feed_url, f.title as feed_title, f.is_subscribed as feed_is_subscribed
 FROM articles AS a
 INNER JOIN feeds AS f ON a.feed_id = f.id
-WHERE a.is_read = 1 AND f.is_subscribed = 1
+WHERE a.is_read = 1 AND f.is_subscribed = 1 AND f.user_id = ?
 ORDER BY a.id DESC
 LIMIT 100;
 
diff --git a/backend/db/queries/feeds.sql b/backend/db/queries/feeds.sql
index 9725252..9b0b8f7 100644
--- a/backend/db/queries/feeds.sql
+++ b/backend/db/queries/feeds.sql
@@ -1,12 +1,12 @@
 -- name: GetFeed :one
 SELECT id, url, title, fetched_at, is_subscribed, user_id
 FROM feeds
-WHERE id = ?;
+WHERE id = ? AND user_id = ?;
 
 -- name: GetFeeds :many
 SELECT id, url, title, fetched_at, is_subscribed, user_id
 FROM feeds
-WHERE is_subscribed = 1
+WHERE is_subscribed = 1 AND user_id = ?
 ORDER BY id;
 
 -- name: CreateFeed :one
@@ -26,7 +26,7 @@ WHERE id = ?;
 -- name: GetFeedByURL :one
 SELECT id, url, title, fetched_at, is_subscribed, user_id
 FROM feeds
-WHERE url = ?;
+WHERE url = ? AND user_id = ?;
 
 -- name: GetFeedsToFetch :many
 SELECT id, url, fetched_at, user_id