2 files changed, 74 insertions, 3 deletions

diff --git a/modules/grils/grils.go b/modules/grils/grils.go
index 4913e11..debb77b 100644
--- a/modules/grils/grils.go
+++ b/modules/grils/grils.go
@@ -11,6 +11,7 @@ import (
 
         "fagott.pw/charakterin"
         "fagott.pw/grilist/cache"
+        "fagott.pw/grilist/eventlogging"
         "fagott.pw/grilist/frontend"
         "fagott.pw/grilist/grilist"
 
@@ -241,6 +242,7 @@ func (m *GrilsModule) FromIDs(ids []int) ([]*Gril, error) {
 
 func (m *GrilsModule) viewGril(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
         user, _ := m.g.Charakterin.GetUserFromRequest(r)
+        el := m.g.EventLogger(r)
         sid := p.ByName("id")
 
         id, err := strconv.Atoi(sid)
@@ -292,6 +294,9 @@ func (m *GrilsModule) viewGril(w http.ResponseWriter, r *http.Request, p httprou
         data["SimilarGrils"] = similar
 
         m.g.Renderer.RenderPage("gril", w, data)
+        el.ViewGril(user, eventlogging.ViewGrilData{
+                GrilID: gril.ID,
+        })
 }
 
 func pgArray(array []byte) []string {
diff --git a/modules/lists/lists.go b/modules/lists/lists.go
index d1913be..9c9eaf4 100644
--- a/modules/lists/lists.go
+++ b/modules/lists/lists.go
@@ -14,6 +14,7 @@ import (
 
         "fagott.pw/charakterin"
         "fagott.pw/grilist/cache"
+        "fagott.pw/grilist/eventlogging"
         "fagott.pw/grilist/frontend"
         "fagott.pw/grilist/grilist"
         "fagott.pw/grilist/modules/grils"
@@ -259,6 +260,7 @@ func (m *Module) ProvideDashboardData(user *charakterin.User) []grilist.Dashboar
 
 func (m *Module) viewList(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
         user, _ := m.g.Charakterin.GetUserFromRequest(r)
+        el := m.g.EventLogger(r)
         sid := p.ByName("id")
 
         id, err := strconv.Atoi(sid)
@@ -285,9 +287,13 @@ func (m *Module) viewList(w http.ResponseWriter, r *http.Request, p httprouter.P
         }
 
         m.g.Renderer.RenderPage("list", w, data)
+        el.ViewList(user, eventlogging.ViewListData{
+                ListID: list.ID,
+        })
 }
 
 func (m *Module) deleteList(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+        el := m.g.EventLogger(r)
         user, err := m.g.Charakterin.GetUserFromRequest(r)
         if err != nil {
                 log.Println("invalid deleteList user")
@@ -333,6 +339,9 @@ func (m *Module) deleteList(w http.ResponseWriter, r *http.Request, p httprouter
 
         log.Printf("list %d has been deleted by the owner %d(%s)", list.ID, list.Owner.ID, list.Owner.GetName())
         http.Redirect(w, r, "/", 302)
+        el.DeleteList(user, eventlogging.DeleteListData{
+                ListID: list.ID,
+        })
 }
 
 func (m *Module) viewListSettings(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
@@ -371,6 +380,7 @@ func (m *Module) viewListSettings(w http.ResponseWriter, r *http.Request, p http
 }
 
 func (m *Module) updateListSettings(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+        el := m.g.EventLogger(r)
         user, err := m.g.Charakterin.GetUserFromRequest(r)
         if err != nil {
                 log.Println("invalid updateListSettings user")
@@ -435,6 +445,18 @@ func (m *Module) updateListSettings(w http.ResponseWriter, r *http.Request, p ht
                 return
         }
 
+        rows, err := m.g.DB.Query("SELECT name, description FROM grilist.lists WHERE id = $1;", id)
+        if err != nil {
+                log.Println("could not get list info", id)
+                renderWithError("interner fehler", false, false)
+                return
+        }
+        defer rows.Close()
+
+        var oldName string
+        var oldDescription string
+        rows.Scan(&oldName, &oldDescription)
+
         if list.Name != name && list.Description != description {
                 _, err = m.g.DB.Query(`UPDATE grilist.lists SET name = $2, description = $3 WHERE id = $1`, id, name, description)
                 if err != nil {
@@ -462,9 +484,17 @@ func (m *Module) updateListSettings(w http.ResponseWriter, r *http.Request, p ht
         list.Description = description
 
         m.viewListSettings(w, r, p)
+        el.EditList(user, eventlogging.EditListData{
+                ListID:         id,
+                OldName:        oldName,
+                OldDescription: oldDescription,
+                NewName:        name,
+                NewDescription: description,
+        })
 }
 
 func (m *Module) addGrilToList(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+        el := m.g.EventLogger(r)
         slistID := p.ByName("id")
 
         user, err := m.g.Charakterin.GetUserFromRequest(r)
@@ -531,7 +561,10 @@ func (m *Module) addGrilToList(w http.ResponseWriter, r *http.Request, p httprou
         data["Value"] = value
         list.Grils = append(list.Grils, lg)
         m.g.Renderer.RenderPage("list_gril", w, data)
-        return
+        el.AddGrilToList(user, eventlogging.AddGrilToListData{
+                ListID: list.ID,
+                GrilID: gril.ID,
+        })
 }
 
 func (m *Module) displayCreateList(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
@@ -548,6 +581,7 @@ func (m *Module) displayCreateList(w http.ResponseWriter, r *http.Request, p htt
 }
 
 func (m *Module) createList(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+        el := m.g.EventLogger(r)
         user, err := m.g.Charakterin.GetUserFromRequest(r)
         if err != nil {
                 log.Println(err)
@@ -571,9 +605,15 @@ func (m *Module) createList(w http.ResponseWriter, r *http.Request, p httprouter
         }
 
         http.Redirect(w, r, fmt.Sprintf("/list/%d", id), 302)
+        el.CreateList(user, eventlogging.CreateListData{
+                ListID:      id,
+                Name:        values.Get("name"),
+                Description: values.Get("description"),
+        })
 }
 
 func (m *Module) updateGrilOrder(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+        el := m.g.EventLogger(r)
         slistID := p.ByName("id")
 
         user, err := m.g.Charakterin.GetUserFromRequest(r)
@@ -606,6 +646,16 @@ func (m *Module) updateGrilOrder(w http.ResponseWriter, r *http.Request, p httpr
                 return
         }
 
+        var oldOrder int
+        err = m.g.DB.QueryRow(
+                `SELECT "order" FROM grilist.lists_grils WHERE list_id = $1 AND gril_id = $2;`,
+                listID, grilID).Scan(&oldOrder)
+        if err != nil {
+                log.Println(err)
+                http.Error(w, "Internal Server Error", 500)
+                return
+        }
+
         // rein in die DB damit
         _, err = m.g.DB.Exec(`SELECT grilist.set_gril_order($1, $2, $3, $4)`, user.ID, listID, grilID, pos)
         if err != nil {
@@ -622,17 +672,30 @@ func (m *Module) updateGrilOrder(w http.ResponseWriter, r *http.Request, p httpr
 
         w.WriteHeader(200)
         w.Write([]byte("ok"))
-        return
+        el.ChangeGrilOrder(user, eventlogging.ChangeGrilOrderData{
+                ListID:   listID,
+                GrilID:   grilID,
+                OldOrder: oldOrder,
+                NewOrder: pos,
+        })
 }
 
 func (m *Module) removeGrilFromList(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+        el := m.g.EventLogger(r)
         slistID := p.ByName("id")
 
+        user, err := m.g.Charakterin.GetUserFromRequest(r)
+        if err != nil {
+                http.Error(w, "Unauthorized", 401)
+                return
+        }
+
         listID, err := strconv.Atoi(slistID)
         if err != nil {
                 http.Error(w, "invalid list ID (type mismatch)", 400)
                 return
         }
+        //TODO: noch mal gucken ob der User Rechte hat
 
         values, err := readBody(r)
         if err != nil {
@@ -666,7 +729,10 @@ func (m *Module) removeGrilFromList(w http.ResponseWriter, r *http.Request, p ht
 
         w.WriteHeader(200)
         w.Write([]byte("ok"))
-        return
+        el.DeleteGrilFromList(user, eventlogging.DeleteGrilFromListData{
+                ListID: listID,
+                GrilID: grilID,
+        })
 }
 
 func (m *Module) APIgetUserLists(w http.ResponseWriter, r *http.Request, p httprouter.Params) {