Merge ride and rides packages into ride/store following mountain_pass structure

Consolidate persistence (Save, List, Backfill) into ride/store.go alongside
ride.go/climb.go/moving_time.go, rename rides.Ride to ride.StoredRide to
avoid collision with parsed ride.Ride, update all web/cli consumers and
RideView to use named Ride field, adjust templates and regenerate templ files,
and remove rides directory.

1 files changed, 6 insertions, 6 deletions

diff --git a/web/sync.go b/web/sync.go
index 4a6ba5f..b491ee0 100644
--- a/web/sync.go
+++ b/web/sync.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/martinlehoux/biking_home/rides"
+	"github.com/martinlehoux/biking_home/ride"
 	"github.com/martinlehoux/biking_home/strava"
 	"github.com/martinlehoux/kagamigo/kcore"
 )
@@ -104,7 +104,7 @@ func (s *Server) syncRides(client syncClient, gpxDir string, from, to time.Time,
 	}
 	for _, summary := range activities {
 		externalID := fmt.Sprintf("strava:%d", summary.ID)
-		_, exists, err := rides.GetByExternalID(s.db, externalID)
+		_, exists, err := ride.GetByExternalID(s.db, externalID)
 		if err != nil {
 			return progress, err
 		}
@@ -120,7 +120,7 @@ func (s *Server) syncRides(client syncClient, gpxDir string, from, to time.Time,
 		if err != nil {
 			if errors.Is(err, strava.ErrNoTrackPoints) {
 				_ = os.Remove(filepath.Join(gpxDir, fmt.Sprintf("activity_%d.gpx", summary.ID)))
-				if saveErr := rides.Save(s.db, rideFromActivity(externalID, "", activity)); saveErr != nil {
+				if saveErr := ride.Save(s.db, rideFromActivity(externalID, "", activity)); saveErr != nil {
 					if reportErr := skipSyncActivity(&progress, report, summary, fmt.Errorf("save metadata: %w", saveErr)); reportErr != nil {
 						return progress, reportErr
 					}
@@ -147,7 +147,7 @@ func (s *Server) syncRides(client syncClient, gpxDir string, from, to time.Time,
 			}
 			continue
 		}
-		if err := rides.Save(s.db, rideFromActivity(externalID, gpxPath, activity)); err != nil {
+		if err := ride.Save(s.db, rideFromActivity(externalID, gpxPath, activity)); err != nil {
 			_ = os.Remove(gpxPath)
 			if reportErr := skipSyncActivity(&progress, report, summary, fmt.Errorf("save activity: %w", err)); reportErr != nil {
 				return progress, reportErr
@@ -164,12 +164,12 @@ func (s *Server) syncRides(client syncClient, gpxDir string, from, to time.Time,
 	return progress, nil
 }
 
-func rideFromActivity(externalID, gpxPath string, activity strava.Activity) rides.Ride {
+func rideFromActivity(externalID, gpxPath string, activity strava.Activity) ride.StoredRide {
 	activityType := activity.SportType
 	if activityType == "" {
 		activityType = activity.Type
 	}
-	return rides.Ride{
+	return ride.StoredRide{
 		ExternalID:          externalID,
 		GPXPath:             gpxPath,
 		Name:                activity.Name,