ISSUE #1530: Improve tests

Author: robiningelbrecht

composer.lock

@@ -189,23 +189,25 @@ public function handle(Command $command): void
             return;
         }
 
-        if ($command->isFullImport()) {
-            if (count($activityIdsToDelete) === count($allActivityIds) && array_values($activityIdsToDelete) == $allActivityIds->toArray()) {
-                throw new \RuntimeException('All activities appear to be marked for deletion. This seems like a configuration issue. Aborting to prevent data loss');
-            }
+        if (!$command->isFullImport()) {
+            return;
+        }
 
-            // Only delete activities during full imports to avoid accidental deletion of data.
-            foreach ($activityIdsToDelete as $activityId) {
-                $activity = $this->activityRepository->find($activityId);
-                $activity->delete();
-                $this->activityRepository->delete($activity);
+        if (count($activityIdsToDelete) === count($allActivityIds) && array_values($activityIdsToDelete) == $allActivityIds->toArray()) {
+            throw new \RuntimeException('All activities appear to be marked for deletion. This seems like a configuration issue. Aborting to prevent data loss');
+        }
 
-                $command->getOutput()->writeln(sprintf(
-                    '  => Deleted activity "%s - %s"',
-                    $activity->getName(),
-                    $activity->getStartDate()->format('d-m-Y'))
-                );
-            }
+        // Only delete activities during full imports to avoid accidental deletion of data.
+        foreach ($activityIdsToDelete as $activityId) {
+            $activity = $this->activityRepository->find($activityId);
+            $activity->delete();
+            $this->activityRepository->delete($activity);
+
+            $command->getOutput()->writeln(sprintf(
+                '  => Deleted activity "%s - %s"',
+                $activity->getName(),
+                $activity->getStartDate()->format('d-m-Y'))
+            );
         }
     }
 }

src/Application/Import/ImportActivities/ImportActivitiesCommandHandler.php

@@ -10,6 +10,7 @@
 use App\Application\Import\ImportActivities\Pipeline\ActivityImportPipeline;
 use App\Application\Import\ImportActivities\SkipActivitiesRecordedBefore;
 use App\Domain\Activity\ActivityId;
+use App\Domain\Activity\ActivityIds;
 use App\Domain\Activity\ActivityRepository;
 use App\Domain\Activity\ActivityVisibility;
 use App\Domain\Activity\ActivityWithRawData;
@@ -58,7 +59,17 @@ class ImportActivitiesCommandHandlerTest extends ContainerTestCase
     private ImportActivitiesCommandHandler $importActivitiesCommandHandler;
     private SpyStrava $strava;
 
-    public function testHandleWithTooManyRequests(): void
+    public function testHandleWithTooManyRequestsWhileInitializing(): void
+    {
+        $output = new SpyOutput();
+        $this->strava->setMaxNumberOfCallsBeforeTriggering429(0);
+
+        $this->importActivitiesCommandHandler->handle(new ImportActivities($output, null));
+
+        $this->assertMatchesTextSnapshot((string) $output);
+    }
+
+    public function testHandleWithTooManyRequestsWhileFetchingActivities(): void
     {
         $output = new SpyOutput();
         $this->strava->setMaxNumberOfCallsBeforeTriggering429(9);
@@ -93,7 +104,17 @@ public function testHandleWithTooManyRequests(): void
         ));
     }
 
-    public function testHandleWithUnexpectedError(): void
+    public function testHandleWithUnexpectedErrorWhileInitializing(): void
+    {
+        $output = new SpyOutput();
+        $this->strava->setMaxNumberOfCallsBeforeTriggering429(1000);
+        $this->strava->triggerExceptionOnNextCall();
+
+        $this->importActivitiesCommandHandler->handle(new ImportActivities($output, null));
+        $this->assertMatchesTextSnapshot((string) $output);
+    }
+
+    public function testHandleWithUnexpectedErrorWhileFetchingActivities(): void
     {
         $output = new SpyOutput();
         $this->strava->setMaxNumberOfCallsBeforeTriggering429(1000);
@@ -413,6 +434,58 @@ public function testHandleWithSportTypeIsNotIncluded(): void
         $this->assertMatchesTextSnapshot($output);
     }
 
+    public function testHandlePartialImport(): void
+    {
+        $output = new SpyOutput();
+        $this->strava->setMaxNumberOfCallsBeforeTriggering429(1000);
+
+        $this->getContainer()->get(ActivityWithRawDataRepository::class)->add(ActivityWithRawData::fromState(
+            ActivityBuilder::fromDefaults()
+                ->withActivityId(ActivityId::fromUnprefixed(4))
+                ->build(),
+            []
+        ));
+
+        $this->getContainer()->get(ActivityWithRawDataRepository::class)->add(ActivityWithRawData::fromState(
+            ActivityBuilder::fromDefaults()
+                ->withActivityId(ActivityId::fromUnprefixed(1000))
+                ->withStartingCoordinate(Coordinate::createFromLatAndLng(
+                    Latitude::fromString('51.2'),
+                    Longitude::fromString('3.18')
+                ))
+                ->withKudoCount(1)
+                ->withName('Delete this one')
+                ->build(),
+            [
+                'kudos_count' => 1,
+                'name' => 'Delete this one',
+            ]
+        ));
+
+        $segmentEffortOne = SegmentEffortBuilder::fromDefaults()
+            ->withActivityId(ActivityId::fromUnprefixed(1000))
+            ->build();
+        $this->getContainer()->get(SegmentEffortRepository::class)->add($segmentEffortOne);
+
+        $stream = ActivityStreamBuilder::fromDefaults()
+            ->withActivityId(ActivityId::fromUnprefixed(1000))
+            ->build();
+        $this->getContainer()->get(ActivityStreamRepository::class)->add($stream);
+
+        $this->getContainer()->get(ActivityWithRawDataRepository::class)->add(ActivityWithRawData::fromState(
+            ActivityBuilder::fromDefaults()
+                ->withKudoCount(1)
+                ->withName('Delete this one as well')
+                ->withActivityId(ActivityId::fromUnprefixed(1001))
+                ->build(),
+            []
+        ));
+
+        $this->importActivitiesCommandHandler->handle(new ImportActivities($output, ActivityIds::fromArray([ActivityId::fromUnprefixed(4)])));
+
+        $this->assertMatchesTextSnapshot($output);
+    }
+
     #[\Override]
     protected function setUp(): void
     {

tests/Application/Import/ImportActivities/ImportActivitiesCommandHandlerTest.php

@@ -0,0 +1,2 @@
+Importing activities...
+  => [1/1] Updated activity: "Night Ride3 - 10-10-2023"

tests/Application/Import/ImportActivities/__snapshots__/ImportActivitiesCommandHandlerTest__testHandlePartialImport__1.txt

@@ -0,0 +1,2 @@
+Importing activities...
+<error>You reached the daily Strava API rate limit. You will need to import the rest of your data tomorrow</error>

…st__testHandleWithTooManyRequests__1.txt …nyRequestsWhileFetchingActivities__1.txttests/Application/Import/ImportActivities/__snapshots__/ImportActivitiesCommandHandlerTest__testHandleWithTooManyRequests__1.txt renamed to tests/Application/Import/ImportActivities/__snapshots__/ImportActivitiesCommandHandlerTest__testHandleWithTooManyRequestsWhileFetchingActivities__1.txt tests/Application/Import/ImportActivities/__snapshots__/ImportActivitiesCommandHandlerTest__testHandleWithTooManyRequests__1.txt renamed to tests/Application/Import/ImportActivities/__snapshots__/ImportActivitiesCommandHandlerTest__testHandleWithTooManyRequestsWhileFetchingActivities__1.txt

@@ -0,0 +1,2 @@
+Importing activities...
+<error>Strava API threw error: The error</error>