fix: simplify and ensure correctness of data aggregation (#112)

* chore: bump fit sdk version

* chore: copy aggregator from github.com/muktihari/fit

* fix: simplify and ensure correctness of data aggregation

* bump fit sdk version to v0.21.3

* go mod tidy

* fix: aggregator missing prefix start with Enhanced

* chore: clean up aggregator code documentation

* fix: add missing time gap from the previous changes when combining

* bump: fit sdk to v0.21.5

Author: muktihari

NOTICE

@@ -0,0 +1,3 @@
+This project includes code originally licensed under the BSD-3-Clause license.
+Original copyright notice and license text are retained in the included code files.
+ - src/wasm/activity-service/aggregator

src/wasm/activity-service/activity/fit/fit.go

@@ -30,6 +30,7 @@ import (
 	"github.com/muktihari/fit/profile/typedef"
 	"github.com/muktihari/fit/proto"
 	"github.com/openivity/activity-service/activity"
+	"github.com/openivity/activity-service/aggregator"
 	"github.com/openivity/activity-service/mem"
 	"github.com/openivity/activity-service/service"
 	"golang.org/x/exp/slices"
@@ -243,11 +244,11 @@ func (s *DecodeEncoder) recalculateSummary(ses *activity.Session) {
 			continue
 		}
 		lapFromRecords := activity.NewLapFromRecords(records[:pos], ses.Sport)
-		lap.ReplaceValues(&lapFromRecords)
+		aggregator.Fill(lap.Lap, lapFromRecords.Lap)
 		records = records[pos:]
 	}
 	sesFromLaps := activity.NewSessionFromLaps(ses.Laps)
-	ses.ReplaceValues(&sesFromLaps)
+	aggregator.Fill(ses, sesFromLaps.Session)
 	ses.Summarize()
 }
 

src/wasm/activity-service/activity/lap.go

@@ -23,6 +23,7 @@ import (
 	"github.com/muktihari/fit/profile/basetype"
 	"github.com/muktihari/fit/profile/mesgdef"
 	"github.com/muktihari/fit/profile/typedef"
+	"github.com/openivity/activity-service/aggregator"
 	"github.com/openivity/activity-service/strutils"
 )
 
@@ -183,31 +184,7 @@ func NewLapFromRecords(records []Record, sport typedef.Sport) Lap {
 // NewLapFromSession creates new lap from a session.
 func NewLapFromSession(session *Session) Lap {
 	lap := CreateLap(nil)
-
-	lap.Sport = session.Sport
-	lap.SubSport = session.SubSport
-	lap.Timestamp = session.Timestamp
-	lap.StartTime = session.StartTime
-	lap.TotalMovingTime = session.TotalMovingTime
-	lap.TotalElapsedTime = session.TotalElapsedTime
-	lap.TotalTimerTime = session.TotalTimerTime
-	lap.TotalDistance = session.TotalDistance
-	lap.TotalAscent = session.TotalAscent
-	lap.TotalDescent = session.TotalDescent
-	lap.TotalCalories = session.TotalCalories
-	lap.AvgSpeed = session.AvgSpeed
-	lap.MaxSpeed = session.MaxSpeed
-	lap.AvgHeartRate = session.AvgHeartRate
-	lap.MaxHeartRate = session.MaxHeartRate
-	lap.AvgCadence = session.AvgCadence
-	lap.MaxCadence = session.MaxCadence
-	lap.AvgPower = session.AvgPower
-	lap.MaxPower = session.MaxPower
-	lap.AvgTemperature = session.AvgTemperature
-	lap.MaxTemperature = session.MaxTemperature
-	lap.AvgAltitude = session.AvgAltitude
-	lap.MaxAltitude = session.MaxAltitude
-
+	aggregator.Replace(lap.Lap, session.Session)
 	return lap
 }
 
@@ -216,74 +193,6 @@ func (l *Lap) IsBelongToThisLap(t time.Time) bool {
 	return isBelong(t, l.StartTime, l.EndTime())
 }
 
-// ReplaceValues replaces values with the corresponding values in the given lap.
-func (l *Lap) ReplaceValues(lap *Lap) {
-	if l == nil || lap == nil {
-		return
-	}
-
-	if !lap.StartTime.IsZero() {
-		l.StartTime = lap.StartTime
-	}
-	if lap.TotalElapsedTime != basetype.Uint32Invalid {
-		l.TotalElapsedTime = lap.TotalElapsedTime
-	}
-	if lap.TotalMovingTime != basetype.Uint32Invalid {
-		l.TotalMovingTime = lap.TotalMovingTime
-	}
-	if lap.TotalTimerTime != basetype.Uint32Invalid {
-		l.TotalTimerTime = lap.TotalTimerTime
-	}
-	if lap.TotalDistance != basetype.Uint32Invalid {
-		l.TotalDistance = lap.TotalDistance
-	}
-	if lap.TotalCalories != basetype.Uint16Invalid {
-		l.TotalCalories = lap.TotalCalories
-	}
-	if lap.TotalAscent != basetype.Uint16Invalid {
-		l.TotalAscent = lap.TotalAscent
-	}
-	if lap.TotalDescent != basetype.Uint16Invalid {
-		l.TotalDescent = lap.TotalDescent
-	}
-	if lap.AvgSpeed != basetype.Uint16Invalid {
-		l.AvgSpeed = lap.AvgSpeed
-	}
-	if lap.MaxSpeed != basetype.Uint16Invalid {
-		l.MaxSpeed = lap.MaxSpeed
-	}
-	if lap.AvgHeartRate != basetype.Uint8Invalid {
-		l.AvgHeartRate = lap.AvgHeartRate
-	}
-	if lap.MaxHeartRate != basetype.Uint8Invalid {
-		l.MaxHeartRate = lap.MaxHeartRate
-	}
-	if lap.AvgCadence != basetype.Uint8Invalid {
-		l.AvgCadence = lap.AvgCadence
-	}
-	if lap.MaxCadence != basetype.Uint8Invalid {
-		l.MaxCadence = lap.MaxCadence
-	}
-	if lap.AvgPower != basetype.Uint16Invalid {
-		l.AvgPower = lap.AvgPower
-	}
-	if lap.MaxPower != basetype.Uint16Invalid {
-		l.MaxPower = lap.MaxPower
-	}
-	if lap.AvgTemperature != basetype.Sint8Invalid {
-		l.AvgTemperature = lap.AvgTemperature
-	}
-	if lap.MaxTemperature != basetype.Sint8Invalid {
-		l.MaxTemperature = lap.MaxTemperature
-	}
-	if lap.AvgAltitude != basetype.Uint16Invalid {
-		l.AvgAltitude = lap.AvgAltitude
-	}
-	if lap.MaxAltitude != basetype.Uint16Invalid {
-		l.MaxAltitude = lap.MaxAltitude
-	}
-}
-
 // MarshalAppendJSON appends the JSON format encoding of Lap to b, returning the result.
 func (l *Lap) MarshalAppendJSON(b []byte) []byte {
 	b = append(b, '{')