Rename rides.type to external_sport_type, infer bike type from Strava sport type and display categories in UI

1 files changed, 47 insertions, 47 deletions

diff --git a/web/ride-filters_test.go b/web/ride-filters_test.go
index b7abcf4..5075925 100644
--- a/web/ride-filters_test.go
+++ b/web/ride-filters_test.go
@@ -169,33 +169,33 @@ func TestFilterRidesByRideType(t *testing.T) {
 func TestFilterRidesByCotacolExcludesUnavailableScores(t *testing.T) {
 	_, db := newWebTestServer(t)
 	current := ride.StoredRide{
-		ExternalID: "strava:550e8400-e29b-41d4-a716-446655440000",
-		GPXPath:    testGPXPath(t, "current-cotacol.gpx"),
-		Name:       "Current score",
-		Type:       "Ride",
-		BikeType:   ride.BikeTypeRoad,
-		RideType:   ride.RideTypeTraining,
-		StartDate:  time.Date(2026, 8, 1, 7, 0, 0, 0, time.UTC),
-		DistanceM:  20_000,
+		ExternalID:        "strava:550e8400-e29b-41d4-a716-446655440000",
+		GPXPath:           testGPXPath(t, "current-cotacol.gpx"),
+		Name:              "Current score",
+		ExternalSportType: "Ride",
+		BikeType:          ride.BikeTypeRoad,
+		RideType:          ride.RideTypeTraining,
+		StartDate:         time.Date(2026, 8, 1, 7, 0, 0, 0, time.UTC),
+		DistanceM:         20_000,
 	}
 	stale := ride.StoredRide{
-		ExternalID: "strava:6ba7b810-9dad-41d1-80b4-00c04fd430c8",
-		GPXPath:    testGPXPath(t, "stale-cotacol.gpx"),
-		Name:       "Stale score",
-		Type:       "Ride",
-		BikeType:   ride.BikeTypeRoad,
-		RideType:   ride.RideTypeTraining,
-		StartDate:  time.Date(2026, 8, 2, 7, 0, 0, 0, time.UTC),
-		DistanceM:  20_000,
+		ExternalID:        "strava:6ba7b810-9dad-41d1-80b4-00c04fd430c8",
+		GPXPath:           testGPXPath(t, "stale-cotacol.gpx"),
+		Name:              "Stale score",
+		ExternalSportType: "Ride",
+		BikeType:          ride.BikeTypeRoad,
+		RideType:          ride.RideTypeTraining,
+		StartDate:         time.Date(2026, 8, 2, 7, 0, 0, 0, time.UTC),
+		DistanceM:         20_000,
 	}
 	unavailable := ride.StoredRide{
-		ExternalID: "strava:7ba7b810-9dad-41d1-80b4-00c04fd430c8",
-		Name:       "No score",
-		Type:       "VirtualRide",
-		BikeType:   ride.BikeTypeRoad,
-		RideType:   ride.RideTypeTraining,
-		StartDate:  time.Date(2026, 8, 3, 7, 0, 0, 0, time.UTC),
-		DistanceM:  20_000,
+		ExternalID:        "strava:7ba7b810-9dad-41d1-80b4-00c04fd430c8",
+		Name:              "No score",
+		ExternalSportType: "VirtualRide",
+		BikeType:          ride.BikeTypeRoad,
+		RideType:          ride.RideTypeTraining,
+		StartDate:         time.Date(2026, 8, 3, 7, 0, 0, 0, time.UTC),
+		DistanceM:         20_000,
 	}
 	require.NoError(t, ride.Save(db, current))
 	require.NoError(t, ride.Save(db, stale))
@@ -248,14 +248,14 @@ func TestHandlerHidesTransportRidesByDefault(t *testing.T) {
 	server, db := newWebTestServer(t)
 	save := func(externalID, name string, rideType ride.RideType) {
 		require.NoError(t, ride.Save(db, ride.StoredRide{
-			ExternalID: externalID,
-			GPXPath:    testGPXPath(t, externalID+".gpx"),
-			Name:       name,
-			Type:       "Ride",
-			BikeType:   ride.BikeTypeRoad,
-			RideType:   rideType,
-			StartDate:  time.Date(2026, 8, 1, 7, 0, 0, 0, time.UTC),
-			DistanceM:  20_000,
+			ExternalID:        externalID,
+			GPXPath:           testGPXPath(t, externalID+".gpx"),
+			Name:              name,
+			ExternalSportType: "Ride",
+			BikeType:          ride.BikeTypeRoad,
+			RideType:          rideType,
+			StartDate:         time.Date(2026, 8, 1, 7, 0, 0, 0, time.UTC),
+			DistanceM:         20_000,
 		}))
 	}
 	save("strava:550e8400-e29b-41d4-a716-446655440000", "Training Ride", ride.RideTypeTraining)
@@ -297,14 +297,14 @@ func TestHandlerFiltersRidesBeforeRenderingSortedResults(t *testing.T) {
 	server, db := newWebTestServer(t)
 	save := func(externalID, name, path string, distance float64) {
 		require.NoError(t, ride.Save(db, ride.StoredRide{
-			ExternalID: externalID,
-			GPXPath:    testGPXPath(t, path),
-			Name:       name,
-			Type:       "Ride",
-			BikeType:   ride.BikeTypeRoad,
-			RideType:   ride.RideTypeTraining,
-			StartDate:  time.Date(2026, 8, 1, 7, 0, 0, 0, time.UTC),
-			DistanceM:  distance,
+			ExternalID:        externalID,
+			GPXPath:           testGPXPath(t, path),
+			Name:              name,
+			ExternalSportType: "Ride",
+			BikeType:          ride.BikeTypeRoad,
+			RideType:          ride.RideTypeTraining,
+			StartDate:         time.Date(2026, 8, 1, 7, 0, 0, 0, time.UTC),
+			DistanceM:         distance,
 		}))
 	}
 	save("strava:550e8400-e29b-41d4-a716-446655440000", "Long Ride", "long-filtered.gpx", 40_000)
@@ -324,14 +324,14 @@ func TestHandlerFiltersRidesBeforeRenderingSortedResults(t *testing.T) {
 func TestHandlerRendersFilteredEmptyState(t *testing.T) {
 	server, db := newWebTestServer(t)
 	require.NoError(t, ride.Save(db, ride.StoredRide{
-		ExternalID: "strava:8ba7b810-9dad-41d1-80b4-00c04fd430c8",
-		GPXPath:    testGPXPath(t, "empty-filter.gpx"),
-		Name:       "Short Ride",
-		Type:       "Ride",
-		BikeType:   ride.BikeTypeRoad,
-		RideType:   ride.RideTypeTraining,
-		StartDate:  time.Date(2026, 8, 1, 7, 0, 0, 0, time.UTC),
-		DistanceM:  20_000,
+		ExternalID:        "strava:8ba7b810-9dad-41d1-80b4-00c04fd430c8",
+		GPXPath:           testGPXPath(t, "empty-filter.gpx"),
+		Name:              "Short Ride",
+		ExternalSportType: "Ride",
+		BikeType:          ride.BikeTypeRoad,
+		RideType:          ride.RideTypeTraining,
+		StartDate:         time.Date(2026, 8, 1, 7, 0, 0, 0, time.UTC),
+		DistanceM:         20_000,
 	}))
 
 	request := httptest.NewRequest(http.MethodGet, "/?distance_min=300&distance_max=300", nil)