wip: richtige liste für grils

1 files changed, 14 insertions, 5 deletions

diff --git a/modules/lists/lists.go b/modules/lists/lists.go
index dcc7046..94d4030 100644
--- a/modules/lists/lists.go
+++ b/modules/lists/lists.go
@@ -34,8 +34,9 @@ type List struct {
 
 // ListGril ist ein geranktes Gril
 type ListGril struct {
-        Gril  *grils.Gril
-        Order int
+        Gril      *grils.Gril
+        Order     int
+        ImagePath string
 }
 
 // Name gibt den Namen des Moduls zurück
@@ -91,7 +92,7 @@ func (m *Module) getListGrils(list *List) error {
 func (m *Module) getLists(whereClause string, params ...interface{}) ([]*List, error) {
         var lists []*List
 
-        rows, err := m.g.DB.Query(fmt.Sprintf(`SELECT id, name, description, fork_of, updated_at FROM grilist.lists WHERE %s`, whereClause), params...)
+        rows, err := m.g.DB.Query(fmt.Sprintf(`SELECT id, name, description, fork_of, updated_at, user_id FROM grilist.lists WHERE %s`, whereClause), params...)
         if err != nil {
                 return nil, err
         }
@@ -99,8 +100,8 @@ func (m *Module) getLists(whereClause string, params ...interface{}) ([]*List, e
         defer rows.Close()
         for rows.Next() {
                 list := &List{}
-
-                if err := rows.Scan(&list.ID, &list.Name, &list.Description, &list.ForkOf, &list.UpdatedAt); err != nil {
+                var ownerID int
+                if err := rows.Scan(&list.ID, &list.Name, &list.Description, &list.ForkOf, &list.UpdatedAt, &ownerID); err != nil {
                         log.Println("error scanning row in getLists:", err)
                         continue
                 }
@@ -110,6 +111,14 @@ func (m *Module) getLists(whereClause string, params ...interface{}) ([]*List, e
                         continue
                 }
 
+                // Owner kriegn
+                owner, err := m.g.Charakterin.GetUserByID(ownerID)
+                if err != nil {
+                        log.Println("error retreiving owner of list", err)
+                        continue
+                }
+                list.Owner = owner
+
                 lists = append(lists, list)
         }