ISSUE-109: Render athlete name in head title

Author: robiningelbrecht

config/services.yaml

@@ -68,16 +68,11 @@ services:
         factory: [ App\Domain\Strava\StravaRefreshToken, 'fromString' ]
         arguments: ['%env(string:STRAVA_REFRESH_TOKEN)%']
 
-    athleteBirthDate:
+    App\Domain\Strava\Athlete\AthleteBirthDate:
         class: App\Domain\Strava\Athlete\AthleteBirthDate
         factory: [ App\Domain\Strava\Athlete\AthleteBirthDate, 'fromString' ]
         arguments: ['%env(string:ATHLETE_BIRTHDAY)%']
 
-    App\Domain\Strava\Athlete\Athlete:
-        class: App\Domain\Strava\Athlete\Athlete
-        factory: [ App\Domain\Strava\Athlete\Athlete, 'create' ]
-        arguments: ['@athleteBirthDate']
-
     App\Domain\Strava\Activity\ActivityTypesToImport:
         factory: [ 'App\Domain\Strava\Activity\ActivityTypesToImport', from ]
         arguments: [ '%env(json:ACTIVITY_TYPES_TO_IMPORT)%' ]

src/Console/ImportStravaDataConsoleCommand.php

@@ -5,6 +5,7 @@
 use App\Domain\Strava\Activity\ImportActivities\ImportActivities;
 use App\Domain\Strava\Activity\Stream\CalculateBestStreamAverages\CalculateBestStreamAverages;
 use App\Domain\Strava\Activity\Stream\ImportActivityStreams\ImportActivityStreams;
+use App\Domain\Strava\Athlete\ImportAthlete\ImportAthlete;
 use App\Domain\Strava\Athlete\Weight\ImportAthleteWeight\ImportAthleteWeight;
 use App\Domain\Strava\Challenge\ImportChallenges\ImportChallenges;
 use App\Domain\Strava\Ftp\ImportFtp\ImportFtp;
@@ -43,6 +44,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $this->migrationRunner->run();
 
+        $this->commandBus->dispatch(new ImportAthlete($output));
         $this->commandBus->dispatch(new ImportActivities($output));
         $this->commandBus->dispatch(new ImportActivityStreams($output));
         $this->commandBus->dispatch(new ImportSegments($output));

src/Domain/Nominatim/LiveNominatim.php

@@ -5,6 +5,7 @@
 namespace App\Domain\Nominatim;
 
 use App\Infrastructure\Serialization\Json;
+use App\Infrastructure\Time\Sleep;
 use App\Infrastructure\ValueObject\Geography\Coordinate;
 use GuzzleHttp\Client;
 use GuzzleHttp\RequestOptions;
@@ -13,6 +14,7 @@
 {
     public function __construct(
         private Client $client,
+        private Sleep $sleep,
     ) {
     }
 
@@ -35,6 +37,8 @@ public function reverseGeocode(Coordinate $coordinate): Location
 
         $response = Json::decode($response->getBody()->getContents());
 
+        $this->sleep->sweetDreams(1);
+
         return Location::fromState($response['address']);
     }
 }

src/Domain/Strava/Activity/ActivityIntensity.php

@@ -4,20 +4,21 @@
 
 namespace App\Domain\Strava\Activity;
 
-use App\Domain\Strava\Athlete\Athlete;
+use App\Domain\Strava\Athlete\AthleteRepository;
 use App\Domain\Strava\Ftp\FtpRepository;
 use App\Infrastructure\Exception\EntityNotFound;
 
 final readonly class ActivityIntensity
 {
     public function __construct(
-        private Athlete $athlete,
+        private AthleteRepository $athleteRepository,
         private FtpRepository $ftpRepository,
     ) {
     }
 
     public function calculate(Activity $activity): ?int
     {
+        $athlete = $this->athleteRepository->find();
         try {
             // To calculate intensity, we need
             // 1) Max and average heart rate
@@ -34,7 +35,7 @@ public function calculate(Activity $activity): ?int
         }
 
         if ($averageHeartRate = $activity->getAverageHeartRate()) {
-            $athleteMaxHeartRate = $this->athlete->getMaxHeartRate($activity->getStartDate());
+            $athleteMaxHeartRate = $athlete->getMaxHeartRate($activity->getStartDate());
             // Use simplified, less accurate calculation.
             // maxHeartRate = = (220 - age) x 0.92
             // intensityFactor = averageHeartRate / maxHeartRate

src/Domain/Strava/Activity/ImportActivities/ImportActivitiesCommandHandler.php

@@ -16,11 +16,6 @@
 use App\Infrastructure\CQRS\Bus\Command;
 use App\Infrastructure\CQRS\Bus\CommandHandler;
 use App\Infrastructure\Exception\EntityNotFound;
-use App\Infrastructure\KeyValue\Key;
-use App\Infrastructure\KeyValue\KeyValue;
-use App\Infrastructure\KeyValue\KeyValueStore;
-use App\Infrastructure\KeyValue\Value;
-use App\Infrastructure\Time\Sleep;
 use App\Infrastructure\ValueObject\Geography\Coordinate;
 use App\Infrastructure\ValueObject\Identifier\UuidFactory;
 use App\Infrastructure\ValueObject\Time\SerializableDateTime;
@@ -36,12 +31,10 @@ public function __construct(
         private OpenMeteo $openMeteo,
         private Nominatim $nominatim,
         private ActivityRepository $activityRepository,
-        private KeyValueStore $keyValueStore,
         private FilesystemOperator $filesystem,
         private ActivityTypesToImport $activityTypesToImport,
         private StravaDataImportStatus $stravaDataImportStatus,
         private UuidFactory $uuidFactory,
-        private Sleep $sleep,
     ) {
     }
 
@@ -50,13 +43,6 @@ public function handle(Command $command): void
         assert($command instanceof ImportActivities);
         $command->getOutput()->writeln('Importing activities...');
 
-        $athlete = $this->strava->getAthlete();
-        // Store in KeyValue store, so we don't need to query Strava again.
-        $this->keyValueStore->save(KeyValue::fromState(
-            key: Key::ATHLETE_ID,
-            value: Value::fromString($athlete['id'])
-        ));
-
         $allActivityIds = $this->activityRepository->findActivityIds();
         $activityIdsToDelete = array_combine(
             $allActivityIds->map(fn (ActivityId $activityId) => (string) $activityId),
@@ -89,7 +75,6 @@ public function handle(Command $command): void
                     ));
 
                     $activity->updateLocation($reverseGeocodedAddress);
-                    $this->sleep->sweetDreams(1);
                 }
 
                 $this->activityRepository->update($activity);

src/Domain/Strava/Activity/Stream/StreamBasedActivityHeartRateRepository.php

@@ -6,7 +6,7 @@
 
 use App\Domain\Strava\Activity\ActivityId;
 use App\Domain\Strava\Activity\ActivityRepository;
-use App\Domain\Strava\Athlete\Athlete;
+use App\Domain\Strava\Athlete\AthleteRepository;
 use App\Domain\Strava\Athlete\HeartRateZone;
 
 final class StreamBasedActivityHeartRateRepository implements ActivityHeartRateRepository
@@ -17,7 +17,7 @@ final class StreamBasedActivityHeartRateRepository implements ActivityHeartRateR
     public function __construct(
         private readonly ActivityRepository $activityRepository,
         private readonly ActivityStreamRepository $activityStreamRepository,
-        private readonly Athlete $athlete,
+        private readonly AthleteRepository $athleteRepository,
     ) {
     }
 
@@ -61,6 +61,7 @@ private function getCachedHeartRateZones(): array
             return StreamBasedActivityHeartRateRepository::$cachedHeartRateZonesPerActivity;
         }
 
+        $athlete = $this->athleteRepository->find();
         $activities = $this->activityRepository->findAll();
         $heartRateStreams = $this->activityStreamRepository->findByStreamType(StreamType::HEART_RATE);
 
@@ -79,7 +80,7 @@ private function getCachedHeartRateZones(): array
                 continue;
             }
 
-            $athleteMaxHeartRate = $this->athlete->getMaxHeartRate($activity->getStartDate());
+            $athleteMaxHeartRate = $athlete->getMaxHeartRate($activity->getStartDate());
 
             /** @var ActivityStream $stream */
             $stream = $heartRateStreamsForActivity->getFirst();

src/Domain/Strava/Athlete/Athlete.php

@@ -4,23 +4,36 @@
 
 namespace App\Domain\Strava\Athlete;
 
+use App\Infrastructure\ValueObject\String\Name;
 use App\Infrastructure\ValueObject\Time\SerializableDateTime;
 
-final readonly class Athlete
+final readonly class Athlete implements \JsonSerializable
 {
     private function __construct(
-        private SerializableDateTime $birthDate,
+        /** @var array<string, mixed> */
+        private array $data,
     ) {
     }
 
-    public static function create(SerializableDateTime $birthDate): self
+    /**
+     * @param array<string, mixed> $data
+     */
+    public static function create(
+        array $data,
+    ): self {
+        return new self(
+            data: $data,
+        );
+    }
+
+    public function getAthleteId(): string
     {
-        return new self($birthDate);
+        return (string) $this->data['id'];
     }
 
     public function getBirthDate(): SerializableDateTime
     {
-        return $this->birthDate;
+        return SerializableDateTime::fromString($this->data['birthDate']);
     }
 
     public function getAgeInYears(SerializableDateTime $on): int
@@ -32,4 +45,17 @@ public function getMaxHeartRate(SerializableDateTime $on): int
     {
         return 220 - $this->getAgeInYears($on);
     }
+
+    public function getName(): Name
+    {
+        return Name::fromString(sprintf('%s %s', $this->data['firstname'] ?? 'John', $this->data['lastname'] ?? 'Doe'));
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function jsonSerialize(): array
+    {
+        return $this->data;
+    }
 }

src/Domain/Strava/Athlete/AthleteRepository.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Domain\Strava\Athlete;
+
+interface AthleteRepository
+{
+    public function save(Athlete $athlete): void;
+
+    public function find(): Athlete;
+}

src/Domain/Strava/Athlete/ImportAthlete/ImportAthlete.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Domain\Strava\Athlete\ImportAthlete;
+
+use App\Infrastructure\CQRS\Bus\DomainCommand;
+use Symfony\Component\Console\Output\OutputInterface;
+
+final class ImportAthlete extends DomainCommand
+{
+    public function __construct(
+        private readonly OutputInterface $output,
+    ) {
+    }
+
+    public function getOutput(): OutputInterface
+    {
+        return $this->output;
+    }
+}

src/Domain/Strava/Athlete/ImportAthlete/ImportAthleteCommandHandler.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Domain\Strava\Athlete\ImportAthlete;
+
+use App\Domain\Strava\Athlete\Athlete;
+use App\Domain\Strava\Athlete\AthleteBirthDate;
+use App\Domain\Strava\Athlete\AthleteRepository;
+use App\Domain\Strava\Strava;
+use App\Infrastructure\CQRS\Bus\Command;
+use App\Infrastructure\CQRS\Bus\CommandHandler;
+
+final readonly class ImportAthleteCommandHandler implements CommandHandler
+{
+    public function __construct(
+        private Strava $strava,
+        private AthleteBirthDate $athleteBirthDate,
+        private AthleteRepository $athleteRepository,
+    ) {
+    }
+
+    public function handle(Command $command): void
+    {
+        assert($command instanceof ImportAthlete);
+        $command->getOutput()->writeln('Importing athlete...');
+
+        $athlete = $this->strava->getAthlete();
+        $this->athleteRepository->save(Athlete::create([
+            ...$athlete,
+            'birthDate' => $this->athleteBirthDate,
+        ]));
+    }
+}