ISSUE-84: Another try at rate limit fix

Author: robiningelbrecht

src/Domain/Strava/Activity/Stream/ImportActivityStreams/ImportActivityStreamsCommandHandler.php

@@ -34,30 +34,28 @@ public function handle(Command $command): void
                 continue;
             }
 
+            $stravaStreams = [];
             try {
                 $stravaStreams = $this->strava->getAllActivityStreams($activityId);
+                // Try to avoid Strava rate limits.
+                $this->sleep->sweetDreams(10);
             } catch (ClientException|RequestException $exception) {
                 if (!$exception->getResponse()) {
                     // Re-throw, we only want to catch supported error codes.
                     throw $exception;
                 }
 
-                if (404 === $exception->getResponse()->getStatusCode()) {
-                    // Try to avoid Strava rate limits.
-                    $this->sleep->sweetDreams(10);
-                    // Skip.
-                    continue;
-                }
-
                 if (429 === $exception->getResponse()->getStatusCode()) {
                     // This will allow initial imports with a lot of activities to proceed the next day.
                     // This occurs when we exceed Strava API rate limits or throws an unexpected error.
                     $command->getOutput()->writeln('<error>You probably reached Strava API rate limits. You will need to import the rest of your activities tomorrow</error>');
                     break;
                 }
 
-                $command->getOutput()->writeln(sprintf('<error>Strava API threw error: %s</error>', $exception->getMessage()));
-                break;
+                if (404 !== $exception->getResponse()->getStatusCode()) {
+                    $command->getOutput()->writeln(sprintf('<error>Strava API threw error: %s</error>', $exception->getMessage()));
+                    break;
+                }
             }
 
             $stravaStreams = array_filter(
@@ -88,9 +86,6 @@ public function handle(Command $command): void
                 $this->activityStreamRepository->add($stream);
                 $command->getOutput()->writeln(sprintf('  => Imported activity stream "%s"', $stream->getName()));
             }
-
-            // Try to avoid Strava rate limits.
-            $this->sleep->sweetDreams(10);
         }
     }
 }