ThatGuyJack/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/NginxProxyManager/nginx-proxy-manager.git synced 2025-06-19 02:26:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More unit tests and html coverage report

Browse Source 
also fixes a limit bug on listquery
This commit is contained in:
Jamie Curnow
2023-07-27 12:38:35 +10:00
parent e4e70ae6be
commit 9faa36315f
19 changed files with 479 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
backend/internal/entity/user/methods.go
View File

@ -23,14 +23,14 @@ func GetByEmail(email string) (Model, error) {
}
// IsEnabled is used by middleware to ensure the user is still enabled
// returns (userExist, isEnabled)
func IsEnabled(userID uint) (bool, bool) {
// returns (userExist, isEnabled, error)
func IsEnabled(userID uint) (bool, bool, error) {
var user Model
db := database.GetDB()
if result := db.First(&user, userID); result.Error != nil {
return false, false
return false, false, result.Error
}
return true, !user.IsDisabled
return true, !user.IsDisabled, nil
}
// List will return a list of users
@ -51,8 +51,10 @@ func List(pageInfo model.PageInfo, filters []model.Filter, expand []string) (ent
}
// Get rows
dbo = entity.AddOffsetLimitToList(dbo, &pageInfo)
dbo = entity.AddOrderToList(dbo, pageInfo.Sort, defaultSort)
items := make([]Model, 0)
if res := entity.AddOrderToList(dbo, &pageInfo, defaultSort).Find(&items); res.Error != nil {
if res := dbo.Find(&items); res.Error != nil {
return result, res.Error
}