From cca677878de0d42cdffbcc48e40e27402a397137 Mon Sep 17 00:00:00 2001
From: kolaente <konrad@kola-entertainments.de>
Date: Fri, 5 Oct 2018 19:16:14 +0200
Subject: [PATCH] Optimized used sql queries when getting lists or namespaces
 with lists

---
 models/list.go       | 70 ++++++++++++++++++++++++++++++++++++--------
 models/namespaces.go |  8 ++---
 2 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/models/list.go b/models/list.go
index 5302c0b449..ef9de8c705 100644
--- a/models/list.go
+++ b/models/list.go
@@ -18,16 +18,6 @@ type List struct {
 	Rights   `xorm:"-" json:"-"`
 }
 
-// AfterLoad loads the owner and list tasks
-func (l *List) AfterLoad() {
-
-	// Get the owner
-	l.Owner, _ = GetUserByID(l.OwnerID)
-
-	// Get the list tasks
-	l.Tasks, _ = GetTasksByListID(l.ID)
-}
-
 // GetListByID returns a list by its ID
 func GetListByID(id int64) (list List, err error) {
 	if id < 1 {
@@ -43,7 +33,16 @@ func GetListByID(id int64) (list List, err error) {
 		return list, ErrListDoesNotExist{ID: id}
 	}
 
-	return list, nil
+	// Get list tasks
+	list.Tasks, err = GetTasksByListID(list.ID)
+	if err != nil {
+		return list, err
+	}
+
+	// Get list owner
+	list.Owner, err = GetUserByID(list.OwnerID)
+
+	return list, err
 }
 
 // GetListsByNamespaceID gets all lists in a namespace
@@ -54,7 +53,7 @@ func GetListsByNamespaceID(nID int64) (lists []*List, err error) {
 
 // ReadAll gets all lists a user has access to
 func (l *List) ReadAll(user *User) (interface{}, error) {
-	lists := []List{}
+	lists := []*List{}
 	fullUser, err := GetUserByID(user.ID)
 	if err != nil {
 		return lists, err
@@ -80,6 +79,9 @@ func (l *List) ReadAll(user *User) (interface{}, error) {
 		GroupBy("l.id").
 		Find(&lists)
 
+	// Add more list details
+	addListDetails(lists)
+
 	return lists, err
 }
 
@@ -88,3 +90,47 @@ func (l *List) ReadOne() (err error) {
 	*l, err = GetListByID(l.ID)
 	return
 }
+
+// Adds owner user objects and list tasks to all lists in the slice
+func addListDetails(lists []*List) (err error) {
+	var listIDs []int64
+	var ownerIDs []int64
+	for _, l := range lists {
+		listIDs = append(listIDs, l.ID)
+		ownerIDs = append(ownerIDs, l.OwnerID)
+	}
+
+	// Get all tasks
+	tasks := []*ListTask{}
+	err = x.In("list_id", listIDs).Find(&tasks)
+	if err != nil {
+		return
+	}
+
+	// Get all list owners
+	owners := []*User{}
+	err = x.In("id", ownerIDs).Find(&owners)
+	if err != nil {
+		return
+	}
+
+	// Build it all into the lists slice
+	for in, list := range lists {
+		// Owner
+		for _, owner := range owners {
+			if list.OwnerID == owner.ID {
+				lists[in].Owner = *owner
+				break
+			}
+		}
+
+		// Tasks
+		for _, task := range tasks {
+			if task.ListID == list.ID {
+				lists[in].Tasks = append(lists[in].Tasks, task)
+			}
+		}
+	}
+
+	return
+}
diff --git a/models/namespaces.go b/models/namespaces.go
index bb35ceb49b..5a9935dca5 100644
--- a/models/namespaces.go
+++ b/models/namespaces.go
@@ -21,11 +21,6 @@ func (Namespace) TableName() string {
 	return "namespaces"
 }
 
-// AfterLoad gets the owner
-func (n *Namespace) AfterLoad() {
-	n.Owner, _ = GetUserByID(n.OwnerID)
-}
-
 // GetNamespaceByID returns a namespace object by its ID
 func GetNamespaceByID(id int64) (namespace Namespace, err error) {
 	if id < 1 {
@@ -124,6 +119,9 @@ func (n *Namespace) ReadAll(doer *User) (interface{}, error) {
 		return all, err
 	}
 
+	// More details for the lists
+	addListDetails(lists)
+
 	// Put objects in our namespace list
 	for i, n := range all {