Skip to content

armgit / lyftr

Public Imported from GitHub
0

Self-hosted fitness tracker. Log workouts, track nutrition, and monitor progress. Docker deployment, mobile-friendly.

refactor(stores): migrate active_session to ActiveSessionStore

Cawlumm62d58e5e3897
diff --git a/backend/controllers/active_session.go b/backend/controllers/active_session.go
index ee70073..9e1349d 100644
--- a/backend/controllers/active_session.go
+++ b/backend/controllers/active_session.go
@@ -2,9 +2,7 @@ package controllers
import (
"database/sql"
- "time"
- "github.com/Cawlumm/lyftr-backend/db"
"github.com/Cawlumm/lyftr-backend/middleware"
"github.com/Cawlumm/lyftr-backend/utils"
"github.com/gin-gonic/gin"
@@ -12,17 +10,12 @@ import (
func (h *Handler) GetActiveSession(c *gin.Context) {
uid := middleware.UserID(c)
- var data string
- var updatedAt time.Time
- err := db.DB.QueryRow(
- `SELECT data, updated_at FROM active_sessions WHERE user_id = ?`, uid,
- ).Scan(&data, &updatedAt)
+ data, updatedAt, err := h.s.ActiveSession.Get(uid)
if err == sql.ErrNoRows {
utils.OK(c, nil)
return
}
- if err != nil {
- utils.InternalError(c)
+ if utils.DBError(c, err) {
return
}
c.JSON(200, gin.H{"data": gin.H{"data": data, "updated_at": updatedAt}})
@@ -37,14 +30,7 @@ func (h *Handler) UpsertActiveSession(c *gin.Context) {
utils.BadRequest(c, err.Error())
return
}
- _, err := db.DB.Exec(
- `INSERT INTO active_sessions (user_id, data, updated_at)
- VALUES (?, ?, CURRENT_TIMESTAMP)
- ON CONFLICT(user_id) DO UPDATE SET data = excluded.data, updated_at = CURRENT_TIMESTAMP`,
- uid, body.Data,
- )
- if err != nil {
- utils.InternalError(c)
+ if utils.DBError(c, h.s.ActiveSession.Upsert(uid, body.Data)) {
return
}
utils.OK(c, gin.H{"saved": true})
@@ -52,6 +38,8 @@ func (h *Handler) UpsertActiveSession(c *gin.Context) {
func (h *Handler) DeleteActiveSession(c *gin.Context) {
uid := middleware.UserID(c)
- db.DB.Exec(`DELETE FROM active_sessions WHERE user_id = ?`, uid)
+ if utils.DBError(c, h.s.ActiveSession.Delete(uid)) {
+ return
+ }
utils.OK(c, gin.H{"deleted": true})
}
diff --git a/backend/stores/active_session.go b/backend/stores/active_session.go
index 52353cc..f2e7a0c 100644
--- a/backend/stores/active_session.go
+++ b/backend/stores/active_session.go
@@ -1,8 +1,34 @@
package stores
-import "database/sql"
+import (
+ "database/sql"
+ "time"
+)
// ActiveSessionStore owns all SQL for the active_session entity.
type ActiveSessionStore struct{ db *sql.DB }
func NewActiveSessionStore(db *sql.DB) *ActiveSessionStore { return &ActiveSessionStore{db: db} }
+
+// Get returns the user's saved session blob. Returns sql.ErrNoRows if none.
+func (s *ActiveSessionStore) Get(uid int64) (data string, updatedAt time.Time, err error) {
+ err = s.db.QueryRow(
+ `SELECT data, updated_at FROM active_sessions WHERE user_id = ?`, uid,
+ ).Scan(&data, &updatedAt)
+ return
+}
+
+func (s *ActiveSessionStore) Upsert(uid int64, data string) error {
+ _, err := s.db.Exec(
+ `INSERT INTO active_sessions (user_id, data, updated_at)
+ VALUES (?, ?, CURRENT_TIMESTAMP)
+ ON CONFLICT(user_id) DO UPDATE SET data = excluded.data, updated_at = CURRENT_TIMESTAMP`,
+ uid, data,
+ )
+ return err
+}
+
+func (s *ActiveSessionStore) Delete(uid int64) error {
+ _, err := s.db.Exec(`DELETE FROM active_sessions WHERE user_id = ?`, uid)
+ return err
+}