mirror of https://github.com/miniflux/v2.git
Simplify entry query builder
This commit is contained in:
parent
2bbe21fb89
commit
bd70640794
|
@ -18,74 +18,86 @@ import (
|
||||||
|
|
||||||
// EntryQueryBuilder builds a SQL query to fetch entries.
|
// EntryQueryBuilder builds a SQL query to fetch entries.
|
||||||
type EntryQueryBuilder struct {
|
type EntryQueryBuilder struct {
|
||||||
store *Storage
|
store *Storage
|
||||||
feedID int64
|
args []interface{}
|
||||||
userID int64
|
conditions []string
|
||||||
categoryID int64
|
order string
|
||||||
status string
|
direction string
|
||||||
notStatus string
|
limit int
|
||||||
order string
|
offset int
|
||||||
direction string
|
|
||||||
limit int
|
|
||||||
offset int
|
|
||||||
entryID int64
|
|
||||||
greaterThanEntryID int64
|
|
||||||
entryIDs []int64
|
|
||||||
before *time.Time
|
|
||||||
starred bool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// WithStarred adds starred filter.
|
// WithStarred adds starred filter.
|
||||||
func (e *EntryQueryBuilder) WithStarred() *EntryQueryBuilder {
|
func (e *EntryQueryBuilder) WithStarred() *EntryQueryBuilder {
|
||||||
e.starred = true
|
e.conditions = append(e.conditions, "e.starred is true")
|
||||||
return e
|
return e
|
||||||
}
|
}
|
||||||
|
|
||||||
// Before add condition base on the entry date.
|
// Before add condition based on the entry date.
|
||||||
func (e *EntryQueryBuilder) Before(date *time.Time) *EntryQueryBuilder {
|
func (e *EntryQueryBuilder) Before(date *time.Time) *EntryQueryBuilder {
|
||||||
e.before = date
|
e.conditions = append(e.conditions, fmt.Sprintf("e.published_at < $%d", len(e.args)+1))
|
||||||
|
e.args = append(e.args, date)
|
||||||
return e
|
return e
|
||||||
}
|
}
|
||||||
|
|
||||||
// WithGreaterThanEntryID adds a condition > entryID.
|
// WithGreaterThanEntryID adds a condition > entryID.
|
||||||
func (e *EntryQueryBuilder) WithGreaterThanEntryID(entryID int64) *EntryQueryBuilder {
|
func (e *EntryQueryBuilder) WithGreaterThanEntryID(entryID int64) *EntryQueryBuilder {
|
||||||
e.greaterThanEntryID = entryID
|
if entryID != 0 {
|
||||||
|
e.conditions = append(e.conditions, fmt.Sprintf("e.id > $%d", len(e.args)+1))
|
||||||
|
e.args = append(e.args, entryID)
|
||||||
|
}
|
||||||
return e
|
return e
|
||||||
}
|
}
|
||||||
|
|
||||||
// WithEntryIDs adds a condition to fetch only the given entry IDs.
|
// WithEntryIDs adds a condition to fetch only the given entry IDs.
|
||||||
func (e *EntryQueryBuilder) WithEntryIDs(entryIDs []int64) *EntryQueryBuilder {
|
func (e *EntryQueryBuilder) WithEntryIDs(entryIDs []int64) *EntryQueryBuilder {
|
||||||
e.entryIDs = entryIDs
|
e.conditions = append(e.conditions, fmt.Sprintf("e.id = ANY($%d)", len(e.args)+1))
|
||||||
|
e.args = append(e.args, pq.Array(entryIDs))
|
||||||
return e
|
return e
|
||||||
}
|
}
|
||||||
|
|
||||||
// WithEntryID set the entryID.
|
// WithEntryID set the entryID.
|
||||||
func (e *EntryQueryBuilder) WithEntryID(entryID int64) *EntryQueryBuilder {
|
func (e *EntryQueryBuilder) WithEntryID(entryID int64) *EntryQueryBuilder {
|
||||||
e.entryID = entryID
|
if entryID != 0 {
|
||||||
|
e.conditions = append(e.conditions, fmt.Sprintf("e.id = $%d", len(e.args)+1))
|
||||||
|
e.args = append(e.args, entryID)
|
||||||
|
}
|
||||||
return e
|
return e
|
||||||
}
|
}
|
||||||
|
|
||||||
// WithFeedID set the feedID.
|
// WithFeedID set the feedID.
|
||||||
func (e *EntryQueryBuilder) WithFeedID(feedID int64) *EntryQueryBuilder {
|
func (e *EntryQueryBuilder) WithFeedID(feedID int64) *EntryQueryBuilder {
|
||||||
e.feedID = feedID
|
if feedID != 0 {
|
||||||
|
e.conditions = append(e.conditions, fmt.Sprintf("e.feed_id = $%d", len(e.args)+1))
|
||||||
|
e.args = append(e.args, feedID)
|
||||||
|
}
|
||||||
return e
|
return e
|
||||||
}
|
}
|
||||||
|
|
||||||
// WithCategoryID set the categoryID.
|
// WithCategoryID set the categoryID.
|
||||||
func (e *EntryQueryBuilder) WithCategoryID(categoryID int64) *EntryQueryBuilder {
|
func (e *EntryQueryBuilder) WithCategoryID(categoryID int64) *EntryQueryBuilder {
|
||||||
e.categoryID = categoryID
|
if categoryID != 0 {
|
||||||
|
e.conditions = append(e.conditions, fmt.Sprintf("f.category_id = $%d", len(e.args)+1))
|
||||||
|
e.args = append(e.args, categoryID)
|
||||||
|
}
|
||||||
return e
|
return e
|
||||||
}
|
}
|
||||||
|
|
||||||
// WithStatus set the entry status.
|
// WithStatus set the entry status.
|
||||||
func (e *EntryQueryBuilder) WithStatus(status string) *EntryQueryBuilder {
|
func (e *EntryQueryBuilder) WithStatus(status string) *EntryQueryBuilder {
|
||||||
e.status = status
|
if status != "" {
|
||||||
|
e.conditions = append(e.conditions, fmt.Sprintf("e.status = $%d", len(e.args)+1))
|
||||||
|
e.args = append(e.args, status)
|
||||||
|
}
|
||||||
return e
|
return e
|
||||||
}
|
}
|
||||||
|
|
||||||
// WithoutStatus set the entry status that should not be returned.
|
// WithoutStatus set the entry status that should not be returned.
|
||||||
func (e *EntryQueryBuilder) WithoutStatus(status string) *EntryQueryBuilder {
|
func (e *EntryQueryBuilder) WithoutStatus(status string) *EntryQueryBuilder {
|
||||||
e.notStatus = status
|
if status != "" {
|
||||||
|
e.conditions = append(e.conditions, fmt.Sprintf("e.status <> $%d", len(e.args)+1))
|
||||||
|
e.args = append(e.args, status)
|
||||||
|
}
|
||||||
return e
|
return e
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -115,14 +127,12 @@ func (e *EntryQueryBuilder) WithOffset(offset int) *EntryQueryBuilder {
|
||||||
|
|
||||||
// CountEntries count the number of entries that match the condition.
|
// CountEntries count the number of entries that match the condition.
|
||||||
func (e *EntryQueryBuilder) CountEntries() (count int, err error) {
|
func (e *EntryQueryBuilder) CountEntries() (count int, err error) {
|
||||||
defer timer.ExecutionTime(
|
|
||||||
time.Now(),
|
|
||||||
fmt.Sprintf("[EntryQueryBuilder:CountEntries] userID=%d, feedID=%d, status=%s", e.userID, e.feedID, e.status),
|
|
||||||
)
|
|
||||||
|
|
||||||
query := `SELECT count(*) FROM entries e LEFT JOIN feeds f ON f.id=e.feed_id WHERE %s`
|
query := `SELECT count(*) FROM entries e LEFT JOIN feeds f ON f.id=e.feed_id WHERE %s`
|
||||||
args, condition := e.buildCondition()
|
condition := e.buildCondition()
|
||||||
err = e.store.db.QueryRow(fmt.Sprintf(query, condition), args...).Scan(&count)
|
|
||||||
|
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[EntryQueryBuilder:CountEntries] condition=%s, args=%v", condition, e.args))
|
||||||
|
|
||||||
|
err = e.store.db.QueryRow(fmt.Sprintf(query, condition), e.args...).Scan(&count)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, fmt.Errorf("unable to count entries: %v", err)
|
return 0, fmt.Errorf("unable to count entries: %v", err)
|
||||||
}
|
}
|
||||||
|
@ -152,9 +162,6 @@ func (e *EntryQueryBuilder) GetEntry() (*model.Entry, error) {
|
||||||
|
|
||||||
// GetEntries returns a list of entries that match the condition.
|
// GetEntries returns a list of entries that match the condition.
|
||||||
func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
|
func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
|
||||||
debugStr := "[EntryQueryBuilder:GetEntries] userID=%d, feedID=%d, categoryID=%d, status=%s, order=%s, direction=%s, offset=%d, limit=%d"
|
|
||||||
defer timer.ExecutionTime(time.Now(), fmt.Sprintf(debugStr, e.userID, e.feedID, e.categoryID, e.status, e.order, e.direction, e.offset, e.limit))
|
|
||||||
|
|
||||||
query := `
|
query := `
|
||||||
SELECT
|
SELECT
|
||||||
e.id, e.user_id, e.feed_id, e.hash, e.published_at at time zone u.timezone, e.title,
|
e.id, e.user_id, e.feed_id, e.hash, e.published_at at time zone u.timezone, e.title,
|
||||||
|
@ -171,11 +178,13 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
|
||||||
WHERE %s %s
|
WHERE %s %s
|
||||||
`
|
`
|
||||||
|
|
||||||
args, conditions := e.buildCondition()
|
condition := e.buildCondition()
|
||||||
query = fmt.Sprintf(query, conditions, e.buildSorting())
|
query = fmt.Sprintf(query, condition, e.buildSorting())
|
||||||
// log.Println(query)
|
// log.Println(query)
|
||||||
|
|
||||||
rows, err := e.store.db.Query(query, args...)
|
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[EntryQueryBuilder:GetEntries] condition=%s, args=%v", condition, e.args))
|
||||||
|
|
||||||
|
rows, err := e.store.db.Query(query, e.args...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("unable to get entries: %v", err)
|
return nil, fmt.Errorf("unable to get entries: %v", err)
|
||||||
}
|
}
|
||||||
|
@ -187,8 +196,8 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
|
||||||
var iconID interface{}
|
var iconID interface{}
|
||||||
var tz string
|
var tz string
|
||||||
|
|
||||||
entry.Feed = &model.Feed{UserID: e.userID}
|
entry.Feed = &model.Feed{}
|
||||||
entry.Feed.Category = &model.Category{UserID: e.userID}
|
entry.Feed.Category = &model.Category{}
|
||||||
entry.Feed.Icon = &model.FeedIcon{}
|
entry.Feed.Icon = &model.FeedIcon{}
|
||||||
|
|
||||||
err := rows.Scan(
|
err := rows.Scan(
|
||||||
|
@ -232,7 +241,9 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
|
||||||
entry.Feed.CheckedAt = timezone.Convert(tz, entry.Feed.CheckedAt)
|
entry.Feed.CheckedAt = timezone.Convert(tz, entry.Feed.CheckedAt)
|
||||||
|
|
||||||
entry.Feed.ID = entry.FeedID
|
entry.Feed.ID = entry.FeedID
|
||||||
|
entry.Feed.UserID = entry.UserID
|
||||||
entry.Feed.Icon.FeedID = entry.FeedID
|
entry.Feed.Icon.FeedID = entry.FeedID
|
||||||
|
entry.Feed.Category.UserID = entry.UserID
|
||||||
entries = append(entries, &entry)
|
entries = append(entries, &entry)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -241,22 +252,15 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
|
||||||
|
|
||||||
// GetEntryIDs returns a list of entry IDs that match the condition.
|
// GetEntryIDs returns a list of entry IDs that match the condition.
|
||||||
func (e *EntryQueryBuilder) GetEntryIDs() ([]int64, error) {
|
func (e *EntryQueryBuilder) GetEntryIDs() ([]int64, error) {
|
||||||
debugStr := "[EntryQueryBuilder:GetEntryIDs] userID=%d, feedID=%d, categoryID=%d, status=%s, order=%s, direction=%s, offset=%d, limit=%d"
|
query := `SELECT e.id FROM entries e LEFT JOIN feeds f ON f.id=e.feed_id WHERE %s %s`
|
||||||
defer timer.ExecutionTime(time.Now(), fmt.Sprintf(debugStr, e.userID, e.feedID, e.categoryID, e.status, e.order, e.direction, e.offset, e.limit))
|
|
||||||
|
|
||||||
query := `
|
condition := e.buildCondition()
|
||||||
SELECT
|
query = fmt.Sprintf(query, condition, e.buildSorting())
|
||||||
e.id
|
|
||||||
FROM entries e
|
|
||||||
LEFT JOIN feeds f ON f.id=e.feed_id
|
|
||||||
WHERE %s %s
|
|
||||||
`
|
|
||||||
|
|
||||||
args, conditions := e.buildCondition()
|
|
||||||
query = fmt.Sprintf(query, conditions, e.buildSorting())
|
|
||||||
// log.Println(query)
|
// log.Println(query)
|
||||||
|
|
||||||
rows, err := e.store.db.Query(query, args...)
|
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[EntryQueryBuilder:GetEntryIDs] condition=%s, args=%v", condition, e.args))
|
||||||
|
|
||||||
|
rows, err := e.store.db.Query(query, e.args...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("unable to get entries: %v", err)
|
return nil, fmt.Errorf("unable to get entries: %v", err)
|
||||||
}
|
}
|
||||||
|
@ -277,55 +281,8 @@ func (e *EntryQueryBuilder) GetEntryIDs() ([]int64, error) {
|
||||||
return entryIDs, nil
|
return entryIDs, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *EntryQueryBuilder) buildCondition() ([]interface{}, string) {
|
func (e *EntryQueryBuilder) buildCondition() string {
|
||||||
args := []interface{}{e.userID}
|
return strings.Join(e.conditions, " AND ")
|
||||||
conditions := []string{"e.user_id = $1"}
|
|
||||||
|
|
||||||
if e.categoryID != 0 {
|
|
||||||
conditions = append(conditions, fmt.Sprintf("f.category_id=$%d", len(args)+1))
|
|
||||||
args = append(args, e.categoryID)
|
|
||||||
}
|
|
||||||
|
|
||||||
if e.feedID != 0 {
|
|
||||||
conditions = append(conditions, fmt.Sprintf("e.feed_id=$%d", len(args)+1))
|
|
||||||
args = append(args, e.feedID)
|
|
||||||
}
|
|
||||||
|
|
||||||
if e.entryID != 0 {
|
|
||||||
conditions = append(conditions, fmt.Sprintf("e.id=$%d", len(args)+1))
|
|
||||||
args = append(args, e.entryID)
|
|
||||||
}
|
|
||||||
|
|
||||||
if e.greaterThanEntryID != 0 {
|
|
||||||
conditions = append(conditions, fmt.Sprintf("e.id > $%d", len(args)+1))
|
|
||||||
args = append(args, e.greaterThanEntryID)
|
|
||||||
}
|
|
||||||
|
|
||||||
if e.entryIDs != nil {
|
|
||||||
conditions = append(conditions, fmt.Sprintf("e.id=ANY($%d)", len(args)+1))
|
|
||||||
args = append(args, pq.Array(e.entryIDs))
|
|
||||||
}
|
|
||||||
|
|
||||||
if e.status != "" {
|
|
||||||
conditions = append(conditions, fmt.Sprintf("e.status=$%d", len(args)+1))
|
|
||||||
args = append(args, e.status)
|
|
||||||
}
|
|
||||||
|
|
||||||
if e.notStatus != "" {
|
|
||||||
conditions = append(conditions, fmt.Sprintf("e.status != $%d", len(args)+1))
|
|
||||||
args = append(args, e.notStatus)
|
|
||||||
}
|
|
||||||
|
|
||||||
if e.before != nil {
|
|
||||||
conditions = append(conditions, fmt.Sprintf("e.published_at < $%d", len(args)+1))
|
|
||||||
args = append(args, e.before)
|
|
||||||
}
|
|
||||||
|
|
||||||
if e.starred {
|
|
||||||
conditions = append(conditions, "e.starred is true")
|
|
||||||
}
|
|
||||||
|
|
||||||
return args, strings.Join(conditions, " AND ")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *EntryQueryBuilder) buildSorting() string {
|
func (e *EntryQueryBuilder) buildSorting() string {
|
||||||
|
@ -353,8 +310,8 @@ func (e *EntryQueryBuilder) buildSorting() string {
|
||||||
// NewEntryQueryBuilder returns a new EntryQueryBuilder.
|
// NewEntryQueryBuilder returns a new EntryQueryBuilder.
|
||||||
func NewEntryQueryBuilder(store *Storage, userID int64) *EntryQueryBuilder {
|
func NewEntryQueryBuilder(store *Storage, userID int64) *EntryQueryBuilder {
|
||||||
return &EntryQueryBuilder{
|
return &EntryQueryBuilder{
|
||||||
store: store,
|
store: store,
|
||||||
userID: userID,
|
args: []interface{}{userID},
|
||||||
starred: false,
|
conditions: []string{"e.user_id = $1"},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue