aboutsummaryrefslogtreecommitdiff
path: root/web/ride-filters_test.go
diff options
context:
space:
mode:
Diffstat (limited to 'web/ride-filters_test.go')
-rw-r--r--web/ride-filters_test.go23
1 files changed, 11 insertions, 12 deletions
diff --git a/web/ride-filters_test.go b/web/ride-filters_test.go
index 8b470b6..bf1cc6f 100644
--- a/web/ride-filters_test.go
+++ b/web/ride-filters_test.go
@@ -9,7 +9,6 @@ import (
"time"
"github.com/martinlehoux/biking_home/ride"
- "github.com/martinlehoux/biking_home/rides"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@@ -88,7 +87,7 @@ func TestParseRideFiltersTreatsFullRangesAsInactive(t *testing.T) {
}
func TestFilterRidesUsesInclusiveBoundsAndMovingTime(t *testing.T) {
- items := []rides.Ride{
+ items := []ride.StoredRide{
{Name: "lower boundary", DistanceM: 20_000, ExternalMovingTimeS: 1_800, StartDate: time.Date(2026, 8, 1, 12, 0, 0, 0, time.UTC), GPXPath: "lower.gpx"},
{Name: "upper boundary", DistanceM: 100_000, ExternalMovingTimeS: 10_800, StartDate: time.Date(2026, 8, 31, 12, 0, 0, 0, time.UTC), GPXPath: "upper.gpx"},
{Name: "outside distance", DistanceM: 110_000, ExternalMovingTimeS: 10_800, StartDate: time.Date(2026, 8, 31, 12, 0, 0, 0, time.UTC), GPXPath: "outside-distance.gpx"},
@@ -112,7 +111,7 @@ func TestFilterRidesUsesInclusiveBoundsAndMovingTime(t *testing.T) {
}
func TestFilterRidesByRouteAvailability(t *testing.T) {
- items := []rides.Ride{
+ items := []ride.StoredRide{
{Name: "recorded", GPXPath: "recorded.gpx"},
{Name: "metadata only"},
}
@@ -128,7 +127,7 @@ func TestFilterRidesByRouteAvailability(t *testing.T) {
func TestFilterRidesByCotacolExcludesUnavailableScores(t *testing.T) {
_, db := newWebTestServer(t)
- current := rides.Ride{
+ current := ride.StoredRide{
ExternalID: "strava:550e8400-e29b-41d4-a716-446655440000",
GPXPath: testGPXPath(t, "current-cotacol.gpx"),
Name: "Current score",
@@ -136,7 +135,7 @@ func TestFilterRidesByCotacolExcludesUnavailableScores(t *testing.T) {
StartDate: time.Date(2026, 8, 1, 7, 0, 0, 0, time.UTC),
DistanceM: 20_000,
}
- stale := rides.Ride{
+ stale := ride.StoredRide{
ExternalID: "strava:6ba7b810-9dad-41d1-80b4-00c04fd430c8",
GPXPath: testGPXPath(t, "stale-cotacol.gpx"),
Name: "Stale score",
@@ -144,16 +143,16 @@ func TestFilterRidesByCotacolExcludesUnavailableScores(t *testing.T) {
StartDate: time.Date(2026, 8, 2, 7, 0, 0, 0, time.UTC),
DistanceM: 20_000,
}
- unavailable := rides.Ride{
+ unavailable := ride.StoredRide{
ExternalID: "strava:7ba7b810-9dad-41d1-80b4-00c04fd430c8",
Name: "No score",
Type: "VirtualRide",
StartDate: time.Date(2026, 8, 3, 7, 0, 0, 0, time.UTC),
DistanceM: 20_000,
}
- require.NoError(t, rides.Save(db, current))
- require.NoError(t, rides.Save(db, stale))
- require.NoError(t, rides.Save(db, unavailable))
+ require.NoError(t, ride.Save(db, current))
+ require.NoError(t, ride.Save(db, stale))
+ require.NoError(t, ride.Save(db, unavailable))
_, err := db.Exec(`
UPDATE rides
SET cotacol_score = CASE external_id
@@ -167,7 +166,7 @@ func TestFilterRidesByCotacolExcludesUnavailableScores(t *testing.T) {
WHERE external_id IN (?, ?)
`, current.ExternalID, stale.ExternalID, current.ExternalID, ride.CotacolAlgorithmVersion, stale.ExternalID, current.ExternalID, stale.ExternalID)
require.NoError(t, err)
- items, err := rides.List(db)
+ items, err := ride.List(db)
require.NoError(t, err)
filters := parseRideFilters(url.Values{rideFilterCotacolMinParam: {"200"}, rideFilterCotacolMaxParam: {"300"}})
@@ -210,7 +209,7 @@ func TestRideSortHeadersPreserveFilters(t *testing.T) {
func TestHandlerFiltersRidesBeforeRenderingSortedResults(t *testing.T) {
server, db := newWebTestServer(t)
save := func(externalID, name, path string, distance float64) {
- require.NoError(t, rides.Save(db, rides.Ride{
+ require.NoError(t, ride.Save(db, ride.StoredRide{
ExternalID: externalID,
GPXPath: testGPXPath(t, path),
Name: name,
@@ -235,7 +234,7 @@ func TestHandlerFiltersRidesBeforeRenderingSortedResults(t *testing.T) {
func TestHandlerRendersFilteredEmptyState(t *testing.T) {
server, db := newWebTestServer(t)
- require.NoError(t, rides.Save(db, rides.Ride{
+ require.NoError(t, ride.Save(db, ride.StoredRide{
ExternalID: "strava:8ba7b810-9dad-41d1-80b4-00c04fd430c8",
GPXPath: testGPXPath(t, "empty-filter.gpx"),
Name: "Short Ride",