Merge pull request #1581 from MTES-MCT/hotfix/1580-handle-invalid-adr…

…ess-esabora-push [QA] Adresse invalide qui empêche l'envoi de dossier à esabora
MTES-MCT · Aug 7, 2023 · 20bfaf3 · 20bfaf3
2 parents ed8f19f + cff7f7e
commit 20bfaf3
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 1 deletion.
diff --git a/src/Utils/AddressParser.php b/src/Utils/AddressParser.php
@@ -10,16 +10,32 @@ public static function parse(string $address): array
     {
         $number = null;
         $suffix = null;
+        $address = str_replace(',', '', $address);
 
+        if (str_contains($address, '/')) {
+            return [
+                'number' => $number,
+                'suffix' => $suffix,
+                'street' => $address,
+            ];
+        }
+        // Match number and optional suffix at the beginning of the address
         preg_match('/^(\d+)\s*(\w+)?\s*/', $address, $matches);
         if (isset($matches[1])) {
             $number = $matches[1];
             if (isset($matches[2]) && \in_array(strtoupper($matches[2]), ExtensionAdresse::toArray())) {
                 $suffix = strtoupper($matches[2]);
+                // Remove the number and suffix from the street
                 $street = preg_replace('/^\d+\s*(?:\w+)?\s*/', '', $address);
             } else {
                 preg_match('/^(\d+)\s+(.*)$/', $address, $matches);
-                $street = $matches[2];
+                if (!empty($matches)) {
+                    $street = $matches[2];
+                } else {
+                    // The number and the street are not separated by a space
+                    // Remove number at the beginning of the address
+                    $street = preg_replace('/^\d+\s*/', '', $address);
+                }
             }
         } else {
             $street = $address;

diff --git a/tests/Unit/Utils/AddressParserTest.php b/tests/Unit/Utils/AddressParserTest.php
@@ -24,6 +24,41 @@ public function testAdressParser(string $address, ?string $number, ?string $suff
 
     public function provideAdresse(): \Generator
     {
+        yield '123Rue de Canteraine' => [
+            '123Rue de Canteraine',
+            '123',
+            null,
+            'Rue de Canteraine',
+        ];
+
+        yield '61/63 Route de Calais' => [
+            '61/63 Route de Calais',
+            null,
+            null,
+            '61/63 Route de Calais',
+        ];
+
+        yield '33RUE THOMAS HERISSON' => [
+            '33RUE THOMAS HERISSON',
+            '33',
+            null,
+            'RUE THOMAS HERISSON',
+        ];
+
+        yield '53, rue de rû' => [
+            '53, rue de rû',
+            '53',
+            null,
+            'Rue de rû',
+        ];
+
+        yield '40 Allée Gustave Cantelon' => [
+            '40 Allée Gustave Cantelon',
+            '40',
+            null,
+            'Allée Gustave Cantelon',
+        ];
+
         yield '141bis Rue du Pdt J Fitzgerald Kennedy' => [
             '141bis Rue du Pdt J Fitzgerald Kennedy',
             '141',