Improve getting all namespaces performance (#526)
Improve getting all namespaces performance Co-authored-by: kolaente <k@knt.li> Reviewed-on: https://kolaente.dev/vikunja/api/pulls/526
This commit is contained in:
parent
8758fb6ac5
commit
587ce92dc9
1 changed files with 18 additions and 34 deletions
|
@ -211,30 +211,19 @@ func (n *Namespace) ReadAll(a web.Auth, search string, page int, perPage int) (r
|
||||||
return all, 0, 0, err
|
return all, 0, 0, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get all users
|
|
||||||
users := []*user.User{}
|
|
||||||
err = x.Select("users.*").
|
|
||||||
Table("namespaces").
|
|
||||||
Join("LEFT", "team_namespaces", "namespaces.id = team_namespaces.namespace_id").
|
|
||||||
Join("LEFT", "team_members", "team_members.team_id = team_namespaces.team_id").
|
|
||||||
Join("LEFT", "users_namespace", "users_namespace.namespace_id = namespaces.id").
|
|
||||||
Join("INNER", "users", "users.id = namespaces.owner_id").
|
|
||||||
Where("team_members.user_id = ?", doer.ID).
|
|
||||||
Or("namespaces.owner_id = ?", doer.ID).
|
|
||||||
Or("users_namespace.user_id = ?", doer.ID).
|
|
||||||
And("namespaces.is_archived = ?", n.IsArchived).
|
|
||||||
Where(isArchivedCond).
|
|
||||||
GroupBy("users.id").
|
|
||||||
Find(&users)
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return all, 0, 0, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Make a list of namespace ids
|
// Make a list of namespace ids
|
||||||
var namespaceids []int64
|
var namespaceids []int64
|
||||||
|
var userIDs []int64
|
||||||
for _, nsp := range all {
|
for _, nsp := range all {
|
||||||
namespaceids = append(namespaceids, nsp.ID)
|
namespaceids = append(namespaceids, nsp.ID)
|
||||||
|
userIDs = append(userIDs, nsp.OwnerID)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get all owners
|
||||||
|
userMap := make(map[int64]*user.User)
|
||||||
|
err = x.In("id", userIDs).Find(&userMap)
|
||||||
|
if err != nil {
|
||||||
|
return all, 0, 0, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get all lists
|
// Get all lists
|
||||||
|
@ -287,24 +276,19 @@ func (n *Namespace) ReadAll(a web.Auth, search string, page int, perPage int) (r
|
||||||
return nil, 0, 0, err
|
return nil, 0, 0, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
nMap := make(map[int64]*NamespaceWithLists, len(all))
|
||||||
|
|
||||||
// Put objects in our namespace list
|
// Put objects in our namespace list
|
||||||
// TODO: Refactor this to use maps for better efficiency
|
for _, n := range all {
|
||||||
for i, n := range all {
|
|
||||||
|
|
||||||
// Users
|
// Users
|
||||||
for _, u := range users {
|
n.Owner = userMap[n.OwnerID]
|
||||||
if n.OwnerID == u.ID {
|
|
||||||
all[i].Owner = u
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// List infos
|
nMap[n.ID] = n
|
||||||
for _, l := range lists {
|
}
|
||||||
if n.ID == l.NamespaceID {
|
|
||||||
all[i].Lists = append(all[i].Lists, l)
|
for _, list := range lists {
|
||||||
}
|
nMap[list.NamespaceID].Lists = append(nMap[list.NamespaceID].Lists, list)
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
numberOfTotalItems, err = x.
|
numberOfTotalItems, err = x.
|
||||||
|
|
Loading…
Reference in a new issue