mirrors
/
forgejo
mirror of
1
Fork 0
Code Issues Releases Activity

refactor for searching user (#1038) 

* refactor for searching user

* fix like bug

* better format for builder cond
This commit is contained in:
Lunny Xiao 2017-02-25 21:42:20 +08:00 committed by GitHub
parent 8894f856de
commit fc4f7e82f9
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
models/user.go
View File

@ -23,6 +23,7 @@ import (
"unicode/utf8"
"github.com/Unknwon/com"
"github.com/go-xorm/builder"
"github.com/go-xorm/xorm"
"github.com/nfnt/resize"
"golang.org/x/crypto/pbkdf2"
@ -1235,27 +1236,28 @@ func SearchUserByName(opts *SearchUserOptions) (users []*User, _ int64, _ error)
opts.Page = 1
}
searchQuery := "%" + opts.Keyword + "%"
users = make([]*User, 0, opts.PageSize)
// Append conditions
sess := x.
Where("LOWER(lower_name) LIKE ?", searchQuery).
Or("LOWER(full_name) LIKE ?", searchQuery).
And("type = ?", opts.Type)
var countSess xorm.Session
countSess = *sess
count, err := countSess.Count(new(User))
// Append conditions
cond := builder.And(
builder.Eq{"type": opts.Type},
builder.Or(
builder.Like{"lower_name", opts.Keyword},
builder.Like{"LOWER(full_name)", opts.Keyword},
),
)
count, err := x.Where(cond).Count(new(User))
if err != nil {
return nil, 0, fmt.Errorf("Count: %v", err)
}
sess := x.Where(cond).
Limit(opts.PageSize, (opts.Page-1)*opts.PageSize)
if len(opts.OrderBy) > 0 {
sess.OrderBy(opts.OrderBy)
}
return users, count, sess.
Limit(opts.PageSize, (opts.Page-1)*opts.PageSize).
Find(&users)
return users, count, sess.Find(&users)
}
// ___________ .__ .__