- Remove duplicated Garmin fields from storage; decode display-only fields (activity name/type, lap duration/HR, structured workout raw JSON) from RawJSON at API-response time instead of storing redundant columns - Add a fully configurable chart color system (pace/HR main-line colors, 4 effort-kind colors, tint/darken/brighten intensity knobs) under Profile > Chart colors - Rename training types and fix their display order (Easy, Long, 60'/30' Threshold, Tempo, Intervals, MAS Test, Race) everywhere they're listed - Add an Efficiency Factor progression metric; fix Progression chart axes to use tight non-zero-based domains, m:ss/km pace formatting, and rounded ticks instead of raw floating-point labels - Expose the raw get_workout_by_id() payload in the raw-data viewer alongside activity/lap/detail JSON; enlarge the modal and shrink array indentation for readability - Fix "last sync" reporting a meaningless activity count: record one combined sync run per manual "Sync now" and count genuinely new activities instead of re-listing whatever Garmin returned for the queried window - Let a Review Queue activity be manually cleared back to Unclassified, and make "Reset all" available even while disconnected from Garmin Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
116 lines
3.4 KiB
Go
116 lines
3.4 KiB
Go
package api
|
|
|
|
import (
|
|
"net/http"
|
|
"strconv"
|
|
|
|
"github.com/go-chi/chi/v5"
|
|
|
|
"smartrun/backend/internal/store"
|
|
)
|
|
|
|
// activityListItem is one row of the activities list, enriched with its
|
|
// current classification so the frontend can show what kind it's assigned
|
|
// to and whether that assignment is locked (see Locked's doc comment).
|
|
type activityListItem struct {
|
|
activityResponse
|
|
WorkoutKindID *int64 `json:"workout_kind_id"`
|
|
WorkoutKindName *string `json:"workout_kind_name"`
|
|
AssignmentSource *string `json:"assignment_source"`
|
|
AssignmentStatus *string `json:"assignment_status"`
|
|
// Locked is true when a global reclassify pass will never touch this
|
|
// activity again: a manual assignment is the user's definitive word, and
|
|
// a Race assignment comes from a hard Garmin fact, not a retunable rule.
|
|
Locked bool `json:"locked"`
|
|
}
|
|
|
|
func (s *Server) handleListActivities(w http.ResponseWriter, r *http.Request) {
|
|
q := r.URL.Query()
|
|
filter := store.ActivityFilter{
|
|
FromDate: q.Get("from"),
|
|
ToDate: q.Get("to"),
|
|
}
|
|
if limit, err := strconv.Atoi(q.Get("limit")); err == nil {
|
|
filter.Limit = limit
|
|
}
|
|
if offset, err := strconv.Atoi(q.Get("offset")); err == nil {
|
|
filter.Offset = offset
|
|
}
|
|
|
|
activities, err := s.DB.ListActivities(r.Context(), filter)
|
|
if err != nil {
|
|
writeError(w, http.StatusInternalServerError, err.Error())
|
|
return
|
|
}
|
|
|
|
kinds, err := s.DB.ListWorkoutKinds(r.Context(), false)
|
|
if err != nil {
|
|
writeError(w, http.StatusInternalServerError, err.Error())
|
|
return
|
|
}
|
|
kindNames := make(map[int64]string, len(kinds))
|
|
for _, k := range kinds {
|
|
kindNames[k.ID] = k.Name
|
|
}
|
|
|
|
resp := make([]activityListItem, 0, len(activities))
|
|
for _, a := range activities {
|
|
item := activityListItem{activityResponse: toActivityResponse(a)}
|
|
assignment, ok, err := s.DB.CurrentAssignment(r.Context(), a.ID)
|
|
if err != nil {
|
|
writeError(w, http.StatusInternalServerError, err.Error())
|
|
return
|
|
}
|
|
if ok {
|
|
source, status := assignment.AssignmentSource, assignment.Status
|
|
item.AssignmentSource, item.AssignmentStatus = &source, &status
|
|
if assignment.WorkoutKindID != nil {
|
|
item.WorkoutKindID = assignment.WorkoutKindID
|
|
if name, found := kindNames[*assignment.WorkoutKindID]; found {
|
|
item.WorkoutKindName = &name
|
|
}
|
|
}
|
|
item.Locked = source == store.AssignmentSourceManual ||
|
|
(item.WorkoutKindName != nil && *item.WorkoutKindName == "Race")
|
|
}
|
|
resp = append(resp, item)
|
|
}
|
|
writeJSON(w, http.StatusOK, resp)
|
|
}
|
|
|
|
func (s *Server) handleGetActivity(w http.ResponseWriter, r *http.Request) {
|
|
id, err := strconv.ParseInt(chi.URLParam(r, "id"), 10, 64)
|
|
if err != nil {
|
|
writeError(w, http.StatusBadRequest, "invalid activity id")
|
|
return
|
|
}
|
|
|
|
activity, ok, err := s.DB.GetActivity(r.Context(), id)
|
|
if err != nil {
|
|
writeError(w, http.StatusInternalServerError, err.Error())
|
|
return
|
|
}
|
|
if !ok {
|
|
writeError(w, http.StatusNotFound, "activity not found")
|
|
return
|
|
}
|
|
|
|
laps, err := s.DB.LapsForActivity(r.Context(), id)
|
|
if err != nil {
|
|
writeError(w, http.StatusInternalServerError, err.Error())
|
|
return
|
|
}
|
|
|
|
assignment, hasAssignment, err := s.DB.CurrentAssignment(r.Context(), id)
|
|
if err != nil {
|
|
writeError(w, http.StatusInternalServerError, err.Error())
|
|
return
|
|
}
|
|
|
|
resp := map[string]any{"activity": toActivityResponse(activity), "laps": toLapResponses(laps)}
|
|
if hasAssignment {
|
|
resp["assignment"] = assignment
|
|
}
|
|
writeJSON(w, http.StatusOK, resp)
|
|
}
|