summaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/server.go43
-rw-r--r--web/server_test.go66
-rw-r--r--web/views.go5
3 files changed, 58 insertions, 56 deletions
diff --git a/web/server.go b/web/server.go
index f8388b9..845c31c 100644
--- a/web/server.go
+++ b/web/server.go
@@ -11,7 +11,6 @@ import (
"net/url"
"os"
"path/filepath"
- "sort"
"strconv"
"strings"
"sync"
@@ -57,13 +56,11 @@ func (s *Server) handleRides(w http.ResponseWriter, r *http.Request) {
rideSort := parseRideSort(r.URL.Query())
items, err := s.listRides(rideSort)
if err != nil {
+ slog.Error("Failed to load rides", "sort", rideSort.Column, "descending", rideSort.Descending, "error", err)
http.Error(w, "failed to load rides", http.StatusInternalServerError)
return
}
views := buildRideViews(items)
- if _, databaseColumn := rideSort.databaseColumn(); !databaseColumn {
- sortRideViews(views, rideSort)
- }
kcore.RenderPage(r.Context(), RidesPage(views, rideSortHeaders(rideSort)), w)
}
@@ -78,54 +75,22 @@ func (s *Server) listRides(rideSort RideSort) ([]rides.Ride, error) {
const minimumDisplayedDistanceM = 10_000
func buildRideViews(items []rides.Ride) []RideView {
- parser := ride.GPXRideParser{}
views := make([]RideView, 0, len(items))
for _, item := range items {
if item.DistanceM < minimumDisplayedDistanceM {
continue
}
- view := RideView{Ride: item, Cotacol: "-"}
- parsed, err := ride.ParseFile(parser, item.GPXPath)
- if err != nil {
- slog.Warn("Failed to compute Cotacol", "ride", item.ExternalID, "file", item.GPXPath, "error", err)
- } else {
- score := ride.Cotacol(parsed)
+ view := RideView{Ride: item, Cotacol: "-", CotacolPer100Km: "-"}
+ score, ready := item.CotacolScore()
+ if ready && item.CotacolAlgorithmVersion() == ride.CotacolAlgorithmVersion && item.DistanceM > 0 {
view.Cotacol = formatCotacol(score)
view.CotacolPer100Km = formatCotacolPer100Km(score, item.DistanceM)
- view.cotacolScore = score
- view.cotacolPer100Km = score * 100 / (item.DistanceM / 1000)
- view.cotacolReady = true
}
views = append(views, view)
}
return views
}
-func sortRideViews(items []RideView, rideSort RideSort) {
- sort.SliceStable(items, func(i, j int) bool {
- left, right := items[i], items[j]
- if !left.cotacolReady || !right.cotacolReady {
- if left.cotacolReady != right.cotacolReady {
- return left.cotacolReady
- }
- return false
- }
- var leftValue, rightValue float64
- switch rideSort.Column {
- case rideSortCotacol:
- leftValue, rightValue = left.cotacolScore, right.cotacolScore
- case rideSortCotacolKm:
- leftValue, rightValue = left.cotacolPer100Km, right.cotacolPer100Km
- default:
- return false
- }
- if rideSort.Descending {
- return leftValue > rightValue
- }
- return leftValue < rightValue
- })
-}
-
func (s *Server) handleSyncForm(w http.ResponseWriter, r *http.Request) {
data := SyncPageData{
From: queryOrDefault(r, "from", time.Now().AddDate(0, 0, -30).Format(dateFormat)),
diff --git a/web/server_test.go b/web/server_test.go
index 98ea681..d2e14f0 100644
--- a/web/server_test.go
+++ b/web/server_test.go
@@ -180,22 +180,25 @@ func TestRideSortHeadersToggleDirection(t *testing.T) {
assert.Equal(t, "ascending", headers[2].AriaSort)
}
-func TestSortRideViewsByCotacolKeepsMissingLast(t *testing.T) {
- items := []RideView{
- {cotacolScore: 4, cotacolReady: true},
- {cotacolScore: 1, cotacolReady: true},
- {cotacolReady: false},
+func TestBuildRideViewsUsesStoredCotacol(t *testing.T) {
+ _, db := newWebTestServer(t)
+ ride := rides.Ride{
+ ExternalID: "strava:550e8400-e29b-41d4-a716-446655440000",
+ GPXPath: testGPXPath(t, "stored.gpx"),
+ Name: "Stored Ride",
+ Type: "Ride",
+ StartDate: time.Date(2026, 8, 1, 7, 0, 0, 0, time.UTC),
+ DistanceM: 20_000,
}
+ require.NoError(t, rides.Save(db, ride))
+ _, err := db.Exec("UPDATE rides SET gpx_path = ? WHERE external_id = ?", "missing.gpx", ride.ExternalID)
+ require.NoError(t, err)
+ items, err := rides.List(db)
+ require.NoError(t, err)
- sortRideViews(items, RideSort{Column: rideSortCotacol})
- assert.Equal(t, 1.0, items[0].cotacolScore)
- assert.Equal(t, 4.0, items[1].cotacolScore)
- assert.False(t, items[2].cotacolReady)
-
- sortRideViews(items, RideSort{Column: rideSortCotacol, Descending: true})
- assert.Equal(t, 4.0, items[0].cotacolScore)
- assert.Equal(t, 1.0, items[1].cotacolScore)
- assert.False(t, items[2].cotacolReady)
+ views := buildRideViews(items)
+ require.Len(t, views, 1)
+ assert.NotEqual(t, "-", views[0].Cotacol)
}
func TestHandlerSortsRidesByDistance(t *testing.T) {
@@ -226,3 +229,38 @@ func TestHandlerSortsRidesByDistance(t *testing.T) {
assert.Less(t, strings.Index(body, "Near Ride"), strings.Index(body, "Far Ride"))
assert.Contains(t, body, "dir=desc&amp;sort=distance")
}
+
+func TestHandlerSortsRidesByCotacol(t *testing.T) {
+ server, db := newWebTestServer(t)
+ first := rides.Ride{
+ ExternalID: "strava:550e8400-e29b-41d4-a716-446655440000",
+ GPXPath: testGPXPath(t, "first.gpx"),
+ Name: "Low Cotacol",
+ Type: "Ride",
+ StartDate: time.Date(2026, 8, 1, 7, 0, 0, 0, time.UTC),
+ DistanceM: 20_000,
+ }
+ second := rides.Ride{
+ ExternalID: "strava:6ba7b810-9dad-41d1-80b4-00c04fd430c8",
+ GPXPath: testGPXPath(t, "second.gpx"),
+ Name: "High Cotacol",
+ Type: "Ride",
+ StartDate: time.Date(2026, 8, 2, 7, 0, 0, 0, time.UTC),
+ DistanceM: 40_000,
+ }
+ require.NoError(t, rides.Save(db, first))
+ require.NoError(t, rides.Save(db, second))
+ _, err := db.Exec(`
+ UPDATE rides
+ SET cotacol_score = CASE external_id WHEN ? THEN 1 ELSE 4 END
+ `, first.ExternalID)
+ require.NoError(t, err)
+
+ req := httptest.NewRequest(http.MethodGet, "/?sort=cotacol&dir=asc", nil)
+ response := httptest.NewRecorder()
+ server.Handler().ServeHTTP(response, req)
+
+ body := response.Body.String()
+ assert.Equal(t, http.StatusOK, response.Code)
+ assert.Less(t, strings.Index(body, "Low Cotacol"), strings.Index(body, "High Cotacol"))
+}
diff --git a/web/views.go b/web/views.go
index a19ced9..a9ffffa 100644
--- a/web/views.go
+++ b/web/views.go
@@ -12,9 +12,6 @@ type RideView struct {
rides.Ride
Cotacol string
CotacolPer100Km string
- cotacolScore float64
- cotacolPer100Km float64
- cotacolReady bool
}
type RideSort struct {
@@ -66,6 +63,8 @@ func (s RideSort) databaseColumn() (rides.SortColumn, bool) {
rideSortDistance: rides.SortDistance,
rideSortMovingTime: rides.SortMovingTime,
rideSortElevation: rides.SortElevation,
+ rideSortCotacol: rides.SortCotacol,
+ rideSortCotacolKm: rides.SortCotacolKm,
}
column, found := columns[s.Column]
return column, found
generated by cgit v1.2.3 (git 2.39.1) at 2026-08-19 09:03:15 +0000