[Ohme] Fix import command (#11173)

parti-renaissance · Dec 10, 2024 · 9763327 · 9763327
1 parent 8e668c2
commit 9763327
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 41 deletions.
diff --git a/src/Admin/Ohme/ContactAdmin.php b/src/Admin/Ohme/ContactAdmin.php
@@ -5,6 +5,7 @@
 use App\Entity\Adherent;
 use App\Entity\Ohme\Contact;
 use App\Ohme\ContactHandler;
+use App\Query\Utils\MultiColumnsSearchHelper;
 use Sonata\AdminBundle\Admin\AbstractAdmin;
 use Sonata\AdminBundle\Datagrid\DatagridInterface;
 use Sonata\AdminBundle\Datagrid\DatagridMapper;
@@ -26,10 +27,7 @@ class ContactAdmin extends AbstractAdmin
 
     protected function configureRoutes(RouteCollectionInterface $collection): void
     {
-        $collection
-            ->remove('show')
-            ->remove('delete')
-        ;
+        $collection->clearExcept(['list', 'edit']);
     }
 
     protected function configureFormFields(FormMapper $form): void
@@ -70,41 +68,23 @@ protected function configureDatagridFilters(DatagridMapper $filter): void
                         return false;
                     }
 
-                    $search = $value->getValue();
-
-                    $conditions = $qb->expr()->orX();
-
-                    preg_match('/(?<first>.*) (?<last>.*)/', $search, $tokens);
-
-                    if (\array_key_exists('first', $tokens) && \array_key_exists('last', $tokens)) {
-                        $conditions
-                            ->add("$alias.firstname LIKE :search_first_token AND $alias.lastname LIKE :search_last_token")
-                            ->add("$alias.firstname LIKE :search_last_token AND $alias.lastname LIKE :search_first_token")
-                            ->add("$alias.email LIKE :search_first_token AND $alias.email LIKE :search_last_token")
-                        ;
-
-                        $qb
-                            ->setParameter('search_first_token', '%'.$tokens['first'].'%')
-                            ->setParameter('search_last_token', '%'.$tokens['last'].'%')
-                        ;
-                    } else {
-                        $conditions
-                            ->add("$alias.firstname LIKE :search")
-                            ->add("$alias.lastname LIKE :search")
-                            ->add("$alias.email LIKE :search")
-                        ;
-                    }
-
-                    $conditions
-                        ->add("REPLACE(REPLACE($alias.phone, ' ', ''), '+', '') LIKE REPLACE(REPLACE(:search, ' ', ''), '+', '')")
-                        ->add("$alias.ohmeIdentifier = REPLACE(:strict_search, ' ', '')")
-                    ;
-
-                    $qb
-                        ->andWhere($conditions)
-                        ->setParameter('search', "%$search%")
-                        ->setParameter('strict_search', $search)
-                    ;
+                    MultiColumnsSearchHelper::updateQueryBuilderForMultiColumnsSearch(
+                        $qb->getQueryBuilder(),
+                        $value->getValue(),
+                        [
+                            ["$alias.firstname", "$alias.lastname"],
+                            ["$alias.lastname", "$alias.firstname"],
+                            ["$alias.email", "$alias.email"],
+                        ],
+                        [
+                            "$alias.phone",
+                        ],
+                        [
+                            "$alias.id",
+                            "$alias.uuid",
+                            "$alias.ohmeIdentifier",
+                        ]
+                    );
 
                     return true;
                 },

diff --git a/src/Entity/Ohme/Contact.php b/src/Entity/Ohme/Contact.php
@@ -24,6 +24,7 @@ class Contact
 
     #[ORM\Column(unique: true)]
     public string $ohmeIdentifier;
+
     #[ORM\Column(nullable: true)]
     public ?string $email = null;
 

diff --git a/tests/Ohme/DummyClient.php b/tests/Ohme/DummyClient.php
@@ -42,15 +42,15 @@ public function getPayments(int $limit = 100, int $offset = 0, array $options =
 
     private function createContact(
         string $id,
-        string $email,
         string $firstname,
         string $lastname,
+        string $email,
     ): array {
         return [
             'id' => $id,
-            'email' => $email,
             'firstname' => $firstname,
             'lastname' => $lastname,
+            'email' => $email,
         ];
     }