ISSUE-219: Average heart rate for activity splits

Author: robiningelbrecht

src/Domain/Strava/Activity/Split/ActivitySplit.php

@@ -13,33 +13,35 @@
 
 #[ORM\Entity]
 #[ORM\Index(name: 'ActivitySplit_activityIdUnitSystemIndex', columns: ['activityId', 'unitSystem'])]
-final readonly class ActivitySplit
+final class ActivitySplit
 {
     use ProvideTimeFormats;
 
+    private ?int $averageHeartRate = null;
+
     private function __construct(
         #[ORM\Id, ORM\Column(type: 'string')]
-        private ActivityId $activityId,
+        private readonly ActivityId $activityId,
         #[ORM\Id, ORM\Column(type: 'string')]
-        private UnitSystem $unitSystem,
+        private readonly UnitSystem $unitSystem,
         #[ORM\Id, ORM\Column(type: 'integer')]
-        private int $splitNumber,
+        private readonly int $splitNumber,
         #[ORM\Column(type: 'integer')]
-        private Meter $distance,
+        private readonly Meter $distance,
         #[ORM\Column(type: 'integer')]
-        private int $elapsedTimeInSeconds,
+        private readonly int $elapsedTimeInSeconds,
         #[ORM\Column(type: 'integer')]
-        private int $movingTimeInSeconds,
+        private readonly int $movingTimeInSeconds,
         #[ORM\Column(type: 'integer')]
-        private Meter $elevationDifference,
+        private readonly Meter $elevationDifference,
         #[ORM\Column(type: 'float')]
-        private MetersPerSecond $averageSpeed,
+        private readonly MetersPerSecond $averageSpeed,
         #[ORM\Column(type: 'float')]
-        private MetersPerSecond $minAverageSpeed,
+        private readonly MetersPerSecond $minAverageSpeed,
         #[ORM\Column(type: 'integer')]
-        private MetersPerSecond $maxAverageSpeed,
+        private readonly MetersPerSecond $maxAverageSpeed,
         #[ORM\Column(type: 'integer')]
-        private int $paceZone,
+        private readonly int $paceZone,
     ) {
     }
 
@@ -182,4 +184,14 @@ public function getPaceZone(): int
     {
         return $this->paceZone;
     }
+
+    public function enrichWithAverageHeartRate(int $averageHeartRate): void
+    {
+        $this->averageHeartRate = $averageHeartRate;
+    }
+
+    public function getAverageHeartRate(): ?int
+    {
+        return $this->averageHeartRate;
+    }
 }

src/Domain/Strava/BuildHtmlVersion/BuildHtmlVersionCommandHandler.php

@@ -534,8 +534,33 @@ public function handle(Command $command): void
                 $timeInSecondsPerWattage = $this->activityPowerRepository->findTimeInSecondsPerWattageForActivity($activity->getId());
             }
 
-            $leafletMap = $activity->getLeafletMap();
+            $activitySplits = $this->activitySplitRepository->findBy(
+                activityId: $activity->getId(),
+                unitSystem: $this->unitSystem
+            );
+
+            if (!$activitySplits->isEmpty() && $heartRateStream) {
+                /** @var \App\Domain\Strava\Activity\Split\ActivitySplit $activitySplit */
+                $sumSplitMovingTimeInSeconds = 0;
+                foreach ($activitySplits as $activitySplit) {
+                    $movingTimeInSeconds = $activitySplit->getMovingTimeInSeconds();
+                    // Enrich ActivitySplit with average heart rate.
+                    $heartRatesForCurrentSplit = array_slice(
+                        array: $heartRateStream->getData(),
+                        offset: $sumSplitMovingTimeInSeconds,
+                        length: $movingTimeInSeconds
+                    );
+                    if (0 === count($heartRatesForCurrentSplit)) {
+                        continue;
+                    }
+                    $averageHeartRate = (int) round(array_sum($heartRatesForCurrentSplit) / count($heartRatesForCurrentSplit));
+
+                    $activitySplit->enrichWithAverageHeartRate($averageHeartRate);
+                    $sumSplitMovingTimeInSeconds += $movingTimeInSeconds;
+                }
+            }
 
+            $leafletMap = $activity->getLeafletMap();
             $this->filesystem->write(
                 'build/html/activity/'.$activity->getId().'.html',
                 $this->twig->load('html/activity/activity.html.twig')->render([
@@ -558,10 +583,7 @@ public function handle(Command $command): void
                         )->build(),
                     ) : null,
                     'segmentEfforts' => $this->segmentEffortRepository->findByActivityId($activity->getId()),
-                    'splits' => $this->activitySplitRepository->findBy(
-                        activityId: $activity->getId(),
-                        unitSystem: $this->unitSystem
-                    ),
+                    'splits' => $activitySplits,
                     'heartRateChart' => $heartRateStream?->getData() ? Json::encode(
                         HeartRateChartBuilder::create($heartRateStream)->build(),
                     ) : null,

templates/html/activity/activity--activity-type--run.html.twig

@@ -76,6 +76,7 @@
                     <div class="w-[5rem] px-2 py-2">{{ "Pace"|trans }}</div>
                     <div class="flex-grow min-w-[10rem] px-2 py-2"></div>
                     <div class="w-[5rem] px-2 py-2">{{ "Elev"|trans }}</div>
+                    <div  class="w-[5rem] px-2 py-2">{{ "HR"|trans }}</div>
                 </div>
                 {% for split in splits %}
                     <div class="flex items-center border-b last:border-b-0">
@@ -93,6 +94,15 @@
                         <div class="w-[5rem] px-2 py-2">
                             {{ renderComponent('measurement', {'measurement': split.getElevationDifference(), 'precision': 0}) }}
                         </div>
+                        {% if split.getAverageHeartRate() %}
+                            <div class="w-[5rem] px-2 py-2">
+                                {{ split.getAverageHeartRate() }}
+                            </div>
+                        {% else %}
+                        <div class="w-[5rem] px-2 py-2">
+                            {{ "n/a"|trans }}
+                        </div>
+                        {% endif %}
                     </div>
                 {% endfor %}
             </div>

tests/Domain/Strava/BuildHtmlVersion/__snapshots__/BuildHtmlVersionCommandHandlerTest--testHandleForRunningActivitiesOnly--buildhtmlactivityactivity-9756441741.html.html

@@ -109,6 +109,7 @@ <h3 class="max-w-[30%] sm:max-w-[50%] md:max-w-[100%] truncate text-lg font-semi
                     <div class="w-[5rem] px-2 py-2">Pace</div>
                     <div class="flex-grow min-w-[10rem] px-2 py-2"></div>
                     <div class="w-[5rem] px-2 py-2">Elev</div>
+                    <div class="w-[5rem] px-2 py-2">HR</div>
                 </div>
                                     <div class="flex items-center border-b last:border-b-0">
                         <div class="w-[2rem] px-2 py-2 font-bold">
@@ -126,7 +127,10 @@ <h3 class="max-w-[30%] sm:max-w-[50%] md:max-w-[100%] truncate text-lg font-semi
                             2<span class="text-xs">m</span>
 
                         </div>
-                    </div>
+                                                <div class="w-[5rem] px-2 py-2">
+                            n/a
+                        </div>
+                                            </div>
                                     <div class="flex items-center border-b last:border-b-0">
                         <div class="w-[2rem] px-2 py-2 font-bold">
                             2
@@ -143,7 +147,10 @@ <h3 class="max-w-[30%] sm:max-w-[50%] md:max-w-[100%] truncate text-lg font-semi
                             2<span class="text-xs">m</span>
 
                         </div>
-                    </div>
+                                                <div class="w-[5rem] px-2 py-2">
+                            n/a
+                        </div>
+                                            </div>
                             </div>
         </div>
                         <div class="h-[350px]" style="background-color:#bbbbb7" data-leaflet='{"routes":[null],"tileLayer":"https:\/\/tile.openstreetmap.org\/{z}\/{x}\/{y}.png","minZoom":1,"maxZoom":14,"imageOverlay":null,"bounds":[]}'></div>

tests/Infrastructure/Localisation/__snapshots__/TranslationsTest__testAllTranslationsHaveBeenExtracted__1.json

@@ -60,6 +60,7 @@
     "Golf": "Golf",
     "Gravel Rides": "Gravel Rides",
     "HIIT": "HIIT",
+    "HR": "HR",
     "Hand Cycle": "Hand Cycle",
     "Heart rate": "Heart rate",
     "Heart rate distribution": "Heart rate distribution",

tests/strava.db

@@ -59,6 +59,7 @@ Gear: Gear
 Golf: Golf
 'Gravel Rides': 'Gravel Rides'
 HIIT: HIIT
+HR: HR
 'Hand Cycle': 'Hand Cycle'
 'Heart rate': 'Heart rate'
 'Heart rate distribution': 'Heart rate distribution'

translations/messages+intl-icu.en_US.yaml

@@ -59,6 +59,7 @@ Gear: Matériel
 Golf: Golf
 'Gravel Rides': 'Sorties Gravel'
 HIIT: HIIT
+HR: HR
 'Hand Cycle': Handbike
 'Heart rate': 'Fréquence cardiaque'
 'Heart rate distribution': 'Répartition de la fréquence cardiaque'

translations/messages+intl-icu.fr_FR.yaml

@@ -59,6 +59,7 @@ Gear: Uitrusting
 Golf: Golf
 'Gravel Rides': 'Gravel Ritten'
 HIIT: HIIT
+HR: HR
 'Hand Cycle': 'Hand Cycle'
 'Heart rate': Hartslag
 'Heart rate distribution': Hartslagverdeling