Simplify RepositoryList.loadAttributes() (#1211)

release/v1.15
Ethan Koenig 2017-03-11 03:50:12 -05:00 committed by Lunny Xiao
parent 3803f257fb
commit c99e7e1a62
1 changed files with 5 additions and 12 deletions

View File

@ -21,26 +21,19 @@ func (repos RepositoryList) loadAttributes(e Engine) error {
} }
// Load owners. // Load owners.
set := make(map[int64]*User) set := make(map[int64]struct{})
for i := range repos { for i := range repos {
set[repos[i].OwnerID] = nil set[repos[i].OwnerID] = struct{}{}
} }
userIDs := make([]int64, 0, len(set)) users := make(map[int64]*User, len(set))
for userID := range set {
userIDs = append(userIDs, userID)
}
users := make([]*User, 0, len(userIDs))
if err := e. if err := e.
Where("id > 0"). Where("id > 0").
In("id", userIDs). In("id", keysInt64(set)).
Find(&users); err != nil { Find(&users); err != nil {
return fmt.Errorf("find users: %v", err) return fmt.Errorf("find users: %v", err)
} }
for i := range users {
set[users[i].ID] = users[i]
}
for i := range repos { for i := range repos {
repos[i].Owner = set[repos[i].OwnerID] repos[i].Owner = users[repos[i].OwnerID]
} }
return nil return nil
} }