Show logs when editing a code

db/helpers.go

@@ -49,10 +49,11 @@ func Migrate() error {
 }
 
 func NullString(s string) sql.NullString {
-	return sql.NullString{
-		Valid:  s != "",
-		String: s,
+	return sql.NullString{Valid: s != "", String: s}
 }
+
+func NullInt64(i int64) sql.NullInt64 {
+	return sql.NullInt64{Valid: true, Int64: i}
 }
 
 type loggingDBTX struct {

db/lock_log.sql.go

@@ -25,6 +25,44 @@ func (q *Queries) AddLogEntry(ctx context.Context, arg AddLogEntryParams) error
 	return err
 }
 
+const getLastLogForSlot = `-- name: GetLastLogForSlot :many
+SELECT lock, timestamp, state, code, issued_code FROM lock_log WHERE lock = ? AND code = ? ORDER BY timestamp DESC LIMIT 1
+`
+
+type GetLastLogForSlotParams struct {
+	Lock int64
+	Code sql.NullInt64
+}
+
+func (q *Queries) GetLastLogForSlot(ctx context.Context, arg GetLastLogForSlotParams) ([]LockLog, error) {
+	rows, err := q.db.QueryContext(ctx, getLastLogForSlot, arg.Lock, arg.Code)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []LockLog
+	for rows.Next() {
+		var i LockLog
+		if err := rows.Scan(
+			&i.Lock,
+			&i.Timestamp,
+			&i.State,
+			&i.Code,
+			&i.IssuedCode,
+		); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
 const getLogForLock = `-- name: GetLogForLock :many
 SELECT lock, timestamp, state, code, issued_code FROM lock_log WHERE lock = ? ORDER BY timestamp DESC
 `
@@ -57,3 +95,41 @@ func (q *Queries) GetLogForLock(ctx context.Context, lock int64) ([]LockLog, err
 	}
 	return items, nil
 }
+
+const getLogForSlot = `-- name: GetLogForSlot :many
+SELECT lock, timestamp, state, code, issued_code FROM lock_log WHERE lock = ? AND code = ? ORDER BY timestamp DESC
+`
+
+type GetLogForSlotParams struct {
+	Lock int64
+	Code sql.NullInt64
+}
+
+func (q *Queries) GetLogForSlot(ctx context.Context, arg GetLogForSlotParams) ([]LockLog, error) {
+	rows, err := q.db.QueryContext(ctx, getLogForSlot, arg.Lock, arg.Code)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []LockLog
+	for rows.Next() {
+		var i LockLog
+		if err := rows.Scan(
+			&i.Lock,
+			&i.Timestamp,
+			&i.State,
+			&i.Code,
+			&i.IssuedCode,
+		); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}

db/queries/lock_log.sql

@@ -3,3 +3,9 @@ INSERT INTO lock_log (lock, state, code) VALUES (?, ?, ?);
 
 -- name: GetLogForLock :many
 SELECT * FROM lock_log WHERE lock = ? ORDER BY timestamp DESC;
+
+-- name: GetLogForSlot :many
+SELECT * FROM lock_log WHERE lock = ? AND code = ? ORDER BY timestamp DESC;
+
+-- name: GetLastLogForSlot :many
+SELECT * FROM lock_log WHERE lock = ? AND code = ? ORDER BY timestamp DESC LIMIT 1;

frontend/frontend.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"html/template"
 	"io/fs"
+	"time"
 
 	"git.janky.solutions/finn/lockserver/config"
 )
@@ -20,6 +21,7 @@ var (
 
 	funcs = template.FuncMap{
 		"version":    func() string { return fmt.Sprintf("better-zwave-locks %s", config.Version) },
+		"time_since": func(t time.Time) string { return time.Since(t).Round(time.Second).String() },
 	}
 )
 

frontend/lock-code-edit.html

@@ -8,4 +8,11 @@
     <br />
     <input type="submit" value="save" />
 </form>
+<br /><br />
+
+<ul>
+    {{ range $_, $entry := .Data.log }}
+    <li>{{ $entry.State }} (<i>{{ $entry.Timestamp | time_since }} ago</i>)</li>
+    {{ end }}
+</ul>
 {{ template "footer.html" }}

frontend/lock.html

@@ -20,4 +20,7 @@
     </tr>
     {{ end }}
 </table>
+
+<br /><br />
+
 {{ template "footer.html" }}

httpserver/lock.go

@@ -1,6 +1,8 @@
 package httpserver
 
 import (
+	"database/sql"
+	"errors"
 	"fmt"
 	"net/http"
 	"strconv"
@@ -8,6 +10,7 @@ import (
 	"git.janky.solutions/finn/lockserver/db"
 	"git.janky.solutions/finn/lockserver/zwavejs"
 	echo "github.com/labstack/echo/v4"
+	"github.com/sirupsen/logrus"
 )
 
 func lockHandler(c echo.Context) error {
@@ -109,9 +112,19 @@ func lockCodeEditHandler(c echo.Context) error {
 	}
 
 	if c.Request().Method == http.MethodGet {
+		logrus.WithField("lock", lockID).WithField("code", code.ID).Debug("querying logs")
+		log, err := queries.GetLogForSlot(ctx, db.GetLogForSlotParams{
+			Lock: lockID,
+			Code: db.NullInt64(code.ID),
+		})
+		if err != nil && !errors.Is(err, sql.ErrNoRows) {
+			return err
+		}
+
 		return c.Render(http.StatusFound, "lock-code-edit.html", map[string]interface{}{
 			"lock": lock,
 			"code": code,
+			"log":  log,
 		})
 	}