qbit/cromp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync

Browse Source
This commit is contained in:
Aaron Bieber 2020-04-02 06:30:07 -06:00
parent 9ed951eda0
commit 56397c4319
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/models.go
View File

@ -11,7 +11,7 @@ import (
type Entry struct { type Entry struct {
EntryID uuid.UUID `json:"entry_id"` EntryID uuid.UUID `json:"entry_id"`
UserID int32 `json:"user_id"` UserID int64 `json:"user_id"`
CreatedAt time.Time `json:"created_at"` CreatedAt time.Time `json:"created_at"`
UpdatedAt sql.NullTime `json:"updated_at"` UpdatedAt sql.NullTime `json:"updated_at"`
Title string `json:"title"` Title string `json:"title"`

36
db/queries.sql.go
View File

@ -66,7 +66,7 @@ RETURNING entry_id, created_at, to_tsvector(body)
type CreateEntryParams struct { type CreateEntryParams struct {
EntryID uuid.UUID `json:"entry_id"` EntryID uuid.UUID `json:"entry_id"`
UserID int32 `json:"user_id"` UserID int64 `json:"user_id"`
Title string `json:"title"` Title string `json:"title"`
Body string `json:"body"` Body string `json:"body"`
} }
@ -191,7 +191,7 @@ SELECT entry_id, user_id, created_at, updated_at, title, body FROM entries
WHERE user_id = $1 WHERE user_id = $1
` `
func (q *Queries) GetEntries(ctx context.Context, userID int32) ([]Entry, error) { func (q *Queries) GetEntries(ctx context.Context, userID int64) ([]Entry, error) {
rows, err := q.query(ctx, q.getEntriesStmt, getEntries, userID) rows, err := q.query(ctx, q.getEntriesStmt, getEntries, userID)
if err != nil { if err != nil {
return nil, err return nil, err
@ -287,19 +287,30 @@ func (q *Queries) GetUserByToken(ctx context.Context, token uuid.UUID) (User, er
} }
const similarEntries = `-- name: SimilarEntries :many const similarEntries = `-- name: SimilarEntries :many
SELECT entry_id, similarity(body, $1) AS sml SELECT entry_id, similarity(body, $2) as similarity,
FROM entries ts_headline('english', body, q) as headline,
WHERE body % $1 title from entries,
ORDER BY sml DESC, body plainto_tsquery($2) q
WHERE user_id = $1 and
similarity(body, $2) > 0.0
order by similarity DESC
LIMIT 10
` `
type SimilarEntriesParams struct {
UserID int64 `json:"user_id"`
Similarity interface{} `json:"similarity"`
}
type SimilarEntriesRow struct { type SimilarEntriesRow struct {
EntryID uuid.UUID `json:"entry_id"` EntryID uuid.UUID `json:"entry_id"`
Sml interface{} `json:"sml"` Similarity interface{} `json:"similarity"`
Headline interface{} `json:"headline"`
Title string `json:"title"`
} }
func (q *Queries) SimilarEntries(ctx context.Context, similarity interface{}) ([]SimilarEntriesRow, error) { func (q *Queries) SimilarEntries(ctx context.Context, arg SimilarEntriesParams) ([]SimilarEntriesRow, error) {
rows, err := q.query(ctx, q.similarEntriesStmt, similarEntries, similarity) rows, err := q.query(ctx, q.similarEntriesStmt, similarEntries, arg.UserID, arg.Similarity)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -307,7 +318,12 @@ func (q *Queries) SimilarEntries(ctx context.Context, similarity interface{}) ([
var items []SimilarEntriesRow var items []SimilarEntriesRow
for rows.Next() { for rows.Next() {
var i SimilarEntriesRow var i SimilarEntriesRow
if err := rows.Scan(&i.EntryID, &i.Sml); err != nil { if err := rows.Scan(
&i.EntryID,
&i.Similarity,
&i.Headline,
&i.Title,
); err != nil {
return nil, err return nil, err
} }
items = append(items, i) items = append(items, i)