Self-hosted fitness tracker. Log workouts, track nutrition, and monitor progress. Docker deployment, mobile-friendly.
refactor(stores): migrate food + saved foods to FoodStore
Cawlummf0c2b78b1f15
diff --git a/backend/controllers/food.go b/backend/controllers/food.goindex 1effd9d..fe3b5ae 100644--- a/backend/controllers/food.go+++ b/backend/controllers/food.go@@ -2,6 +2,7 @@ package controllersimport ("context"+ "database/sql""encoding/json""fmt""io"@@ -13,7 +14,6 @@ import ("strings""time"- "github.com/Cawlumm/lyftr-backend/db""github.com/Cawlumm/lyftr-backend/middleware""github.com/Cawlumm/lyftr-backend/models""github.com/Cawlumm/lyftr-backend/utils"@@ -24,18 +24,6 @@ var offClient = &http.Client{Timeout: 5 * time.Second}const offUserAgent = "Lyftr/1.0 (https://lyftr.app; nutrition-tracker)"-// scanFoodLog scans all food_log columns including fiber and image_url.-func scanFoodLog(row interface{ Scan(...any) error }, f *models.FoodLog) error {- return row.Scan(- &f.ID, &f.UserID, &f.Name, &f.Meal,- &f.Calories, &f.Protein, &f.Carbs, &f.Fat, &f.Fiber,- &f.Servings, &f.ServingSize, &f.Barcode, &f.ImageURL,- &f.LoggedAt, &f.CreatedAt,- )-}--const foodLogSelect = `SELECT id, user_id, name, meal, calories, protein, carbs, fat, fiber, servings, serving_size, barcode, image_url, logged_at, created_at FROM food_logs`-func (h *Handler) ListFoodLogs(c *gin.Context) {uid := middleware.UserID(c)@@ -44,25 +32,10 @@ func (h *Handler) ListFoodLogs(c *gin.Context) {date = time.Now().Format("2006-01-02")}- rows, err := db.DB.Query(- foodLogSelect+` WHERE user_id = ? AND substr(logged_at, 1, 10) = ? ORDER BY logged_at ASC`,- uid, date,- )- if err != nil {- log.Printf("[food/list] db error: %v", err)- utils.InternalError(c)+ logs, err := h.s.Food.ListByDay(uid, date)+ if utils.DBError(c, err) {return}- defer rows.Close()-- logs := []models.FoodLog{}- for rows.Next() {- var f models.FoodLog- if err := scanFoodLog(rows, &f); err != nil {- log.Printf("[food/list] scan error: %v", err)- }- logs = append(logs, f)- }utils.OK(c, logs)}@@ -74,12 +47,14 @@ func (h *Handler) GetFoodLog(c *gin.Context) {return}- var f models.FoodLog- row := db.DB.QueryRow(foodLogSelect+` WHERE id = ? AND user_id = ?`, lid, uid)- if err := scanFoodLog(row, &f); err != nil {+ f, err := h.s.Food.Get(uid, lid)+ if err == sql.ErrNoRows {utils.NotFound(c, "log entry not found")return}+ if utils.DBError(c, err) {+ return+ }utils.OK(c, f)}@@ -118,24 +93,8 @@ func (h *Handler) LogFood(c *gin.Context) {req.Servings = 1}- res, err := db.DB.Exec(- `INSERT INTO food_logs (user_id, name, meal, calories, protein, carbs, fat, fiber, servings, serving_size, barcode, image_url, logged_at)- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,- uid, req.Name, req.Meal, req.Calories, req.Protein, req.Carbs, req.Fat, req.Fiber,- req.Servings, req.ServingSize, req.Barcode, req.ImageURL, req.LoggedAt,- )- if err != nil {- log.Printf("[food/log] db error: %v", err)- utils.InternalError(c)- return- }-- id, _ := res.LastInsertId()- var f models.FoodLog- row := db.DB.QueryRow(foodLogSelect+` WHERE id = ? AND user_id = ?`, id, uid)- if err := scanFoodLog(row, &f); err != nil {- log.Printf("[food/log] scan error: %v", err)- utils.InternalError(c)+ f, err := h.s.Food.Create(uid, req)+ if utils.DBError(c, err) {return}utils.Created(c, f)@@ -178,28 +137,14 @@ func (h *Handler) UpdateFoodLog(c *gin.Context) {req.Servings = 1}- res, err := db.DB.Exec(- `UPDATE food_logs SET name=?, meal=?, calories=?, protein=?, carbs=?, fat=?, fiber=?,- servings=?, serving_size=?, barcode=?, image_url=?, logged_at=?- WHERE id=? AND user_id=?`,- req.Name, req.Meal, req.Calories, req.Protein, req.Carbs, req.Fat, req.Fiber,- req.Servings, req.ServingSize, req.Barcode, req.ImageURL, req.LoggedAt,- lid, uid,- )- if err != nil {- log.Printf("[food/update] db error: %v", err)- utils.InternalError(c)+ f, err := h.s.Food.Update(uid, lid, req)+ if err == sql.ErrNoRows {+ utils.NotFound(c, "log entry not found")return}- n, _ := res.RowsAffected()- if n == 0 {- utils.NotFound(c, "log entry not found")+ if utils.DBError(c, err) {return}-- var f models.FoodLog- row := db.DB.QueryRow(foodLogSelect+` WHERE id = ? AND user_id = ?`, lid, uid)- scanFoodLog(row, &f)utils.OK(c, f)}@@ -211,13 +156,10 @@ func (h *Handler) DeleteFoodLog(c *gin.Context) {return}- res, err := db.DB.Exec(`DELETE FROM food_logs WHERE id = ? AND user_id = ?`, lid, uid)- if err != nil {- log.Printf("[food/delete] db error: %v", err)- utils.InternalError(c)+ n, err := h.s.Food.Delete(uid, lid)+ if utils.DBError(c, err) {return}- n, _ := res.RowsAffected()if n == 0 {utils.NotFound(c, "log entry not found")return@@ -232,29 +174,14 @@ func (h *Handler) GetDailyStats(c *gin.Context) {date = time.Now().Format("2006-01-02")}- var stats models.DailyStats- stats.Date = date-- if err := db.DB.QueryRow(- `SELECT COALESCE(SUM(calories),0), COALESCE(SUM(protein),0),- COALESCE(SUM(carbs),0), COALESCE(SUM(fat),0), COALESCE(SUM(fiber),0)- FROM food_logs WHERE user_id = ? AND substr(logged_at, 1, 10) = ?`,- uid, date,- ).Scan(&stats.TotalCalories, &stats.TotalProtein, &stats.TotalCarbs, &stats.TotalFat, &stats.TotalFiber); err != nil {- log.Printf("[food/stats] scan error (macros): %v", err)- utils.InternalError(c)+ stats, err := h.s.Food.DailyMacros(uid, date)+ if utils.DBError(c, err) {return}-- if err := db.DB.QueryRow(- `SELECT COUNT(*) FROM workouts WHERE user_id = ? AND substr(started_at, 1, 10) = ?`,- uid, date,- ).Scan(&stats.WorkoutCount); err != nil {- log.Printf("[food/stats] scan error (workouts): %v", err)- utils.InternalError(c)+ stats.Date = date+ if stats.WorkoutCount, err = h.s.Workout.CountOn(uid, date); utils.DBError(c, err) {return}-utils.OK(c, stats)}@@ -266,31 +193,10 @@ func (h *Handler) GetFoodHistory(c *gin.Context) {days = d}- rows, err := db.DB.Query(- `SELECT substr(logged_at, 1, 10) as d,- COALESCE(SUM(calories),0), COALESCE(SUM(protein),0),- COALESCE(SUM(carbs),0), COALESCE(SUM(fat),0)- FROM food_logs- WHERE user_id = ? AND logged_at >= date('now', ?)- GROUP BY d ORDER BY d ASC`,- uid, fmt.Sprintf("-%d days", days),- )- if err != nil {- log.Printf("[food/history] db error: %v", err)- utils.InternalError(c)+ points, err := h.s.Food.History(uid, days)+ if utils.DBError(c, err) {return}- defer rows.Close()-- points := []models.FoodHistoryPoint{}- for rows.Next() {- var p models.FoodHistoryPoint- if err := rows.Scan(&p.Date, &p.Calories, &p.Protein, &p.Carbs, &p.Fat); err != nil {- log.Printf("food/history scan: %v", err)- continue- }- points = append(points, p)- }utils.OK(c, points)}@@ -555,28 +461,10 @@ func (h *Handler) LookupBarcode(c *gin.Context) {func (h *Handler) ListSavedFoods(c *gin.Context) {uid := middleware.UserID(c)- rows, err := db.DB.Query(- `SELECT id, user_id, name, brand, calories, protein, carbs, fat, fiber, serving_size, barcode, created_at- FROM saved_foods WHERE user_id = ? ORDER BY name ASC`,- uid,- )- if err != nil {- log.Printf("[food/saved/list] db error: %v", err)- utils.InternalError(c)+ foods, err := h.s.Food.ListSaved(uid)+ if utils.DBError(c, err) {return}- defer rows.Close()-- foods := []models.SavedFood{}- for rows.Next() {- var f models.SavedFood- if err := rows.Scan(&f.ID, &f.UserID, &f.Name, &f.Brand, &f.Calories, &f.Protein, &f.Carbs, &f.Fat,- &f.Fiber, &f.ServingSize, &f.Barcode, &f.CreatedAt); err != nil {- log.Printf("food/saved/list scan: %v", err)- continue- }- foods = append(foods, f)- }utils.OK(c, foods)}@@ -608,27 +496,8 @@ func (h *Handler) CreateSavedFood(c *gin.Context) {return}- res, err := db.DB.Exec(- `INSERT INTO saved_foods (user_id, name, brand, calories, protein, carbs, fat, fiber, serving_size, barcode)- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,- uid, req.Name, req.Brand, req.Calories, req.Protein, req.Carbs, req.Fat, req.Fiber,- req.ServingSize, req.Barcode,- )- if err != nil {- log.Printf("[food/saved/create] db error: %v", err)- utils.InternalError(c)- return- }-- id, _ := res.LastInsertId()- var f models.SavedFood- if err := db.DB.QueryRow(- `SELECT id, user_id, name, brand, calories, protein, carbs, fat, fiber, serving_size, barcode, created_at- FROM saved_foods WHERE id = ?`, id,- ).Scan(&f.ID, &f.UserID, &f.Name, &f.Brand, &f.Calories, &f.Protein, &f.Carbs, &f.Fat,- &f.Fiber, &f.ServingSize, &f.Barcode, &f.CreatedAt); err != nil {- log.Printf("[food/saved/create] scan error: %v", err)- utils.InternalError(c)+ f, err := h.s.Food.CreateSaved(uid, req)+ if utils.DBError(c, err) {return}utils.Created(c, f)@@ -642,13 +511,10 @@ func (h *Handler) DeleteSavedFood(c *gin.Context) {return}- res, err := db.DB.Exec(`DELETE FROM saved_foods WHERE id = ? AND user_id = ?`, fid, uid)- if err != nil {- log.Printf("[food/saved/delete] db error: %v", err)- utils.InternalError(c)+ n, err := h.s.Food.DeleteSaved(uid, fid)+ if utils.DBError(c, err) {return}- n, _ := res.RowsAffected()if n == 0 {utils.NotFound(c, "saved food not found")returndiff --git a/backend/stores/food.go b/backend/stores/food.goindex 6b54d2f..d9f626b 100644--- a/backend/stores/food.go+++ b/backend/stores/food.go@@ -1,8 +1,180 @@package stores-import "database/sql"+import (+ "database/sql"+ "fmt"-// FoodStore owns all SQL for the food entity.+ "github.com/Cawlumm/lyftr-backend/models"+)++// FoodStore owns all SQL for food_logs and saved_foods.type FoodStore struct{ db *sql.DB }func NewFoodStore(db *sql.DB) *FoodStore { return &FoodStore{db: db} }++const foodLogSelect = `SELECT id, user_id, name, meal, calories, protein, carbs, fat, fiber, servings, serving_size, barcode, image_url, logged_at, created_at FROM food_logs`++func scanFoodLog(row interface{ Scan(...any) error }, f *models.FoodLog) error {+ return row.Scan(+ &f.ID, &f.UserID, &f.Name, &f.Meal,+ &f.Calories, &f.Protein, &f.Carbs, &f.Fat, &f.Fiber,+ &f.Servings, &f.ServingSize, &f.Barcode, &f.ImageURL,+ &f.LoggedAt, &f.CreatedAt,+ )+}++func (s *FoodStore) ListByDay(uid int64, date string) ([]models.FoodLog, error) {+ rows, err := s.db.Query(+ foodLogSelect+` WHERE user_id = ? AND substr(logged_at, 1, 10) = ? ORDER BY logged_at ASC`,+ uid, date,+ )+ if err != nil {+ return nil, err+ }+ defer rows.Close()+ logs := []models.FoodLog{}+ for rows.Next() {+ var f models.FoodLog+ if err := scanFoodLog(rows, &f); err != nil {+ return nil, err+ }+ logs = append(logs, f)+ }+ return logs, rows.Err()+}++// Get returns one user-owned food log, or sql.ErrNoRows.+func (s *FoodStore) Get(uid, id int64) (models.FoodLog, error) {+ var f models.FoodLog+ err := scanFoodLog(s.db.QueryRow(foodLogSelect+` WHERE id = ? AND user_id = ?`, id, uid), &f)+ return f, err+}++func (s *FoodStore) Create(uid int64, req models.LogFoodRequest) (models.FoodLog, error) {+ res, err := s.db.Exec(+ `INSERT INTO food_logs (user_id, name, meal, calories, protein, carbs, fat, fiber, servings, serving_size, barcode, image_url, logged_at)+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,+ uid, req.Name, req.Meal, req.Calories, req.Protein, req.Carbs, req.Fat, req.Fiber,+ req.Servings, req.ServingSize, req.Barcode, req.ImageURL, req.LoggedAt,+ )+ if err != nil {+ return models.FoodLog{}, err+ }+ id, _ := res.LastInsertId()+ return s.Get(uid, id)+}++func (s *FoodStore) Update(uid, id int64, req models.LogFoodRequest) (models.FoodLog, error) {+ res, err := s.db.Exec(+ `UPDATE food_logs SET name=?, meal=?, calories=?, protein=?, carbs=?, fat=?, fiber=?,+ servings=?, serving_size=?, barcode=?, image_url=?, logged_at=?+ WHERE id=? AND user_id=?`,+ req.Name, req.Meal, req.Calories, req.Protein, req.Carbs, req.Fat, req.Fiber,+ req.Servings, req.ServingSize, req.Barcode, req.ImageURL, req.LoggedAt,+ id, uid,+ )+ if err != nil {+ return models.FoodLog{}, err+ }+ if n, _ := res.RowsAffected(); n == 0 {+ return models.FoodLog{}, sql.ErrNoRows+ }+ return s.Get(uid, id)+}++func (s *FoodStore) Delete(uid, id int64) (int64, error) {+ res, err := s.db.Exec(`DELETE FROM food_logs WHERE id = ? AND user_id = ?`, id, uid)+ if err != nil {+ return 0, err+ }+ n, _ := res.RowsAffected()+ return n, nil+}++// DailyMacros returns the day's summed macros (WorkoutCount/Date are filled by+// the caller, which composes a WorkoutStore count — cross-entity stays in the+// controller, not in a store).+func (s *FoodStore) DailyMacros(uid int64, date string) (models.DailyStats, error) {+ var stats models.DailyStats+ err := s.db.QueryRow(+ `SELECT COALESCE(SUM(calories),0), COALESCE(SUM(protein),0),+ COALESCE(SUM(carbs),0), COALESCE(SUM(fat),0), COALESCE(SUM(fiber),0)+ FROM food_logs WHERE user_id = ? AND substr(logged_at, 1, 10) = ?`,+ uid, date,+ ).Scan(&stats.TotalCalories, &stats.TotalProtein, &stats.TotalCarbs, &stats.TotalFat, &stats.TotalFiber)+ return stats, err+}++func (s *FoodStore) History(uid int64, days int) ([]models.FoodHistoryPoint, error) {+ rows, err := s.db.Query(+ `SELECT substr(logged_at, 1, 10) as d,+ COALESCE(SUM(calories),0), COALESCE(SUM(protein),0),+ COALESCE(SUM(carbs),0), COALESCE(SUM(fat),0)+ FROM food_logs+ WHERE user_id = ? AND logged_at >= date('now', ?)+ GROUP BY d ORDER BY d ASC`,+ uid, fmt.Sprintf("-%d days", days),+ )+ if err != nil {+ return nil, err+ }+ defer rows.Close()+ points := []models.FoodHistoryPoint{}+ for rows.Next() {+ var p models.FoodHistoryPoint+ if err := rows.Scan(&p.Date, &p.Calories, &p.Protein, &p.Carbs, &p.Fat); err != nil {+ return nil, err+ }+ points = append(points, p)+ }+ return points, rows.Err()+}++const savedFoodSelect = `SELECT id, user_id, name, brand, calories, protein, carbs, fat, fiber, serving_size, barcode, created_at FROM saved_foods`++func scanSavedFood(row interface{ Scan(...any) error }, f *models.SavedFood) error {+ return row.Scan(&f.ID, &f.UserID, &f.Name, &f.Brand, &f.Calories, &f.Protein, &f.Carbs, &f.Fat,+ &f.Fiber, &f.ServingSize, &f.Barcode, &f.CreatedAt)+}++func (s *FoodStore) ListSaved(uid int64) ([]models.SavedFood, error) {+ rows, err := s.db.Query(savedFoodSelect+` WHERE user_id = ? ORDER BY name ASC`, uid)+ if err != nil {+ return nil, err+ }+ defer rows.Close()+ foods := []models.SavedFood{}+ for rows.Next() {+ var f models.SavedFood+ if err := scanSavedFood(rows, &f); err != nil {+ return nil, err+ }+ foods = append(foods, f)+ }+ return foods, rows.Err()+}++func (s *FoodStore) CreateSaved(uid int64, req models.SaveFoodRequest) (models.SavedFood, error) {+ res, err := s.db.Exec(+ `INSERT INTO saved_foods (user_id, name, brand, calories, protein, carbs, fat, fiber, serving_size, barcode)+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,+ uid, req.Name, req.Brand, req.Calories, req.Protein, req.Carbs, req.Fat, req.Fiber,+ req.ServingSize, req.Barcode,+ )+ if err != nil {+ return models.SavedFood{}, err+ }+ id, _ := res.LastInsertId()+ var f models.SavedFood+ err = scanSavedFood(s.db.QueryRow(savedFoodSelect+` WHERE id = ?`, id), &f)+ return f, err+}++func (s *FoodStore) DeleteSaved(uid, id int64) (int64, error) {+ res, err := s.db.Exec(`DELETE FROM saved_foods WHERE id = ? AND user_id = ?`, id, uid)+ if err != nil {+ return 0, err+ }+ n, _ := res.RowsAffected()+ return n, nil+}diff --git a/backend/stores/workout.go b/backend/stores/workout.goindex e5fbb43..43a434d 100644--- a/backend/stores/workout.go+++ b/backend/stores/workout.go@@ -6,3 +6,14 @@ import "database/sql"type WorkoutStore struct{ db *sql.DB }func NewWorkoutStore(db *sql.DB) *WorkoutStore { return &WorkoutStore{db: db} }++// CountOn returns how many workouts the user started on the given calendar day+// (YYYY-MM-DD). Used by the food daily-stats view (cross-entity composition).+func (s *WorkoutStore) CountOn(uid int64, date string) (int, error) {+ var n int+ err := s.db.QueryRow(+ `SELECT COUNT(*) FROM workouts WHERE user_id = ? AND substr(started_at, 1, 10) = ?`,+ uid, date,+ ).Scan(&n)+ return n, err+}