let exception bubbling (#257)

qdequippe · Feb 12, 2024 · 9e327d1 · 9e327d1
1 parent d412718
commit 9e327d1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/src/MeetupCom/Meetup/MeetupComMeetupFactory.php b/src/MeetupCom/Meetup/MeetupComMeetupFactory.php
@@ -11,7 +11,6 @@
 use Fop\Meetup\ValueObject\Meetup;
 use Fop\Utils\CityNormalizer;
 use Location\Coordinate;
-use Throwable;
 
 final readonly class MeetupComMeetupFactory
 {
@@ -45,11 +44,7 @@ public function createFromData(array $data): ?Meetup
             return null;
         }
 
-        try {
-            $location = $this->createLocation($data);
-        } catch (Throwable) {
-            return null;
-        }
+        $location = $this->createLocation($data);
 
         $name = $this->createName($data);
 
@@ -83,7 +78,7 @@ private function shouldSkipMeetup(array $meetup): bool
         }
 
         // no location with address
-        if (! isset($meetup['location']['address'])) {
+        if (! isset($meetup['location']['address']['streetAddress'])) {
             return true;
         }
 
@@ -101,7 +96,9 @@ private function createLocation(array $data): Location
         $venue[self::CITY] = $this->cityNormalizer->normalize($city);
 
         if (! isset($data['location']['geo']['latitude']) && ! isset($data['location']['geo']['longitude'])) {
-            $coordinate = $this->geocoder->retrieveCoordinate($data['location']['address']['streetAddress']);
+            $coordinate = $this->geocoder->retrieveCoordinate(
+                html_entity_decode((string) $data['location']['address']['streetAddress'])
+            );
         } else {
             $coordinate = new Coordinate($data['location']['geo']['latitude'], $data['location']['geo']['longitude']);
         }

diff --git a/src/MeetupCom/MeetupComMeetupImporter.php b/src/MeetupCom/MeetupComMeetupImporter.php
@@ -27,29 +27,29 @@ public function import(SymfonyStyle $symfonyStyle): array
         $errors = [];
         $meetups = [];
 
-        foreach ($this->groupRepository->fetchAll() as $group) {
+        $groups = $this->groupRepository->fetchAll();
+        $progressBar = $symfonyStyle->createProgressBar();
+
+        foreach ($progressBar->iterate($groups) as $group) {
             try {
                 $groupSlug = $group->getMeetupComSlug();
 
-                $message = sprintf('Scanning "%s" group', $groupSlug);
-                $symfonyStyle->writeln(' * ' . $message);
-
                 $meetupsData = $this->meetupComCrawler->getMeetupsByGroupSlug($groupSlug);
 
-                $note = sprintf('Found %d meetups', count($meetupsData));
-                $symfonyStyle->note($note);
-
                 if ($meetupsData === []) {
                     continue;
                 }
 
                 $groupMeetups = $this->createMeetupsFromMeetupsData($meetupsData);
-                $meetups = array_merge($meetups, $groupMeetups);
+
+                $meetups[] = $groupMeetups;
             } catch (Exception $exception) {
                 $errors[] = $exception->getMessage();
             }
         }
 
+        $meetups = array_merge(...$meetups);
+
         // report errors
         foreach ($errors as $error) {
             $symfonyStyle->error($error);

diff --git a/src/Utils/NominatimGeocoder.php b/src/Utils/NominatimGeocoder.php
@@ -40,6 +40,6 @@ public function retrieveCoordinate(string $address): Coordinate
             throw CoordinateNotFoundForAddressException::create($address);
         }
 
-        return new Coordinate($placeFound['lat'], $placeFound['lon']);
+        return new Coordinate((float) $placeFound['lat'], (float) $placeFound['lon']);
     }
 }