mirror
/
photoview
mirror of https://github.com/photoview/photoview.git
1
Fork 0
Code

Merge pull request #155 from stz184/search-orm-migration 

Migrated the search to gorm
This commit is contained in:
Viktor Strate Kløvedal 2020-12-19 09:46:24 +01:00 committed by GitHub
parent b38d7ab29a d815472458
commit ae8e764539
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
api/graphql/resolvers/search.go
View File

@ -3,70 +3,70 @@ package resolvers
import (
"context"
"github.com/photoview/photoview/api/graphql/auth"
"github.com/pkg/errors"
"gorm.io/gorm/clause"
"github.com/photoview/photoview/api/graphql/models"
)
func (r *Resolver) Search(ctx context.Context, query string, _limitMedia *int, _limitAlbums *int) (*models.SearchResult, error) {
// user := auth.UserFromContext(ctx)
// if user == nil {
// return nil, auth.ErrUnauthorized
// }
user := auth.UserFromContext(ctx)
if user == nil {
return nil, auth.ErrUnauthorized
}
// limitMedia := 10
// limitAlbums := 10
limitMedia := 10
limitAlbums := 10
// if _limitMedia != nil {
// limitMedia = *_limitMedia
// }
if _limitMedia != nil {
limitMedia = *_limitMedia
}
// if _limitAlbums != nil {
// limitAlbums = *_limitAlbums
// }
if _limitAlbums != nil {
limitAlbums = *_limitAlbums
}
// wildQuery := "%" + query + "%"
wildQuery := "%" + query + "%"
// photoRows, err := r.Database.Query(`
// SELECT media.* FROM media JOIN album ON media.album_id = album.album_id
// WHERE album.owner_id = ? AND ( media.title LIKE ? OR media.path LIKE ? )
// ORDER BY (
// case when media.title LIKE ? then 2
// when media.path LIKE ? then 1
// end ) DESC
// LIMIT ?
// `, user.UserID, wildQuery, wildQuery, wildQuery, wildQuery, limitMedia)
// if err != nil {
// return nil, errors.Wrapf(err, "searching media")
// }
var media []*models.Media
// photos, err := models.NewMediaFromRows(photoRows)
// if err != nil {
// return nil, err
// }
err := r.Database.Joins("Album").
Where("Album.owner_id = ? AND ( media.title LIKE ? OR media.path LIKE ? )", user.ID, wildQuery, wildQuery).
Clauses(clause.OrderBy{
Expression: clause.Expr{
SQL: "(CASE WHEN media.title LIKE ? THEN 2 WHEN media.path LIKE ? THEN 1 END) DESC",
Vars: []interface{}{wildQuery, wildQuery},
WithoutParentheses: true},
}).
Limit(limitMedia).
Find(&media).Error
// albumRows, err := r.Database.Query(`
// SELECT * FROM album
// WHERE owner_id = ? AND ( title LIKE ? OR path LIKE ? )
// ORDER BY (
// case when title LIKE ? then 2
// when path LIKE ? then 1
// end ) DESC
// LIMIT ?
// `, user.UserID, wildQuery, wildQuery, wildQuery, wildQuery, limitAlbums)
// if err != nil {
// return nil, errors.Wrapf(err, "searching albums")
// }
if err != nil {
return nil, errors.Wrapf(err, "searching media")
}
// albums, err := models.NewAlbumsFromRows(albumRows)
// if err != nil {
// return nil, err
// }
var albums []*models.Album
// result := models.SearchResult{
// Query: query,
// Media: photos,
// Albums: albums,
// }
err = r.Database.Where("owner_id = ? AND (title LIKE ? OR path LIKE ?)", user.ID, wildQuery, wildQuery).
Clauses(clause.OrderBy{
Expression: clause.Expr{
SQL: "(CASE WHEN title LIKE ? THEN 2 WHEN path LIKE ? THEN 1 END) DESC",
Vars: []interface{}{wildQuery, wildQuery},
WithoutParentheses: true},
}).
Limit(limitAlbums).
Find(&albums).Error
// return &result, nil
panic("to be migrated")
if err != nil {
return nil, errors.Wrapf(err, "searching albums")
}
result := models.SearchResult{
Query: query,
Media: media,
Albums: albums,
}
return &result, nil
}