Merge pull request #789 from atomaka/fix-latest-weight-query

Fix latest measurement query

Author: jovandeginste

pkg/database/user.go

@@ -475,6 +475,7 @@ func (u *User) measurementAt(key string, d time.Time) float64 {
 		Where("date <= ?", datatypes.Date(d)).
 		Where("? > ?", key, 0).
 		Order("date DESC").
+		Limit(1).
 		Pluck(key, &w)
 
 	if err := q.Error; err != nil {

pkg/database/user_test.go

@@ -2,6 +2,7 @@ package database
 
 import (
 	"testing"
+	"time"
 
 	"github.com/fsouza/slognil"
 	"github.com/stretchr/testify/assert"
@@ -305,6 +306,25 @@ func TestDatabaseProfileSave(t *testing.T) {
 	assert.Equal(t, "de", u.Profile.Language)
 }
 
+func TestUser_WeightAtUsesLatestMeasurement(t *testing.T) {
+	db := createMemoryDB(t)
+	u := defaultUser()
+	require.NoError(t, u.Create(db))
+	u.SetDB(db)
+
+	base := time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC)
+
+	m1 := u.NewMeasurement(base)
+	m1.Weight = 80
+	require.NoError(t, m1.Save(db))
+
+	m2 := u.NewMeasurement(base.AddDate(0, 0, 1))
+	m2.Weight = 75
+	require.NoError(t, m2.Save(db))
+
+	assert.Equal(t, 75.0, u.WeightAt(base.AddDate(0, 0, 1)))
+}
+
 func TestDatabaseUserWorkouts(t *testing.T) {
 	populateGPXFS()