up

Author: acantepie

src/DataTable/SpaceMissionEditableTableType.php

@@ -16,6 +16,7 @@
 use Umbrella\AdminBundle\Lib\DataTable\DataTableBuilder;
 use Umbrella\AdminBundle\Lib\DataTable\DataTableType;
 use Umbrella\AdminBundle\Lib\Form\SearchType;
+use Umbrella\AdminBundle\Utils\DoctrineUtils;
 
 class SpaceMissionEditableTableType extends DataTableType
 {
@@ -58,8 +59,7 @@ public function buildTable(DataTableBuilder $builder, array $options): void
             'class' => SpaceMission::class,
             'query' => function (QueryBuilder $qb, array $formData) use ($options) {
                 if (isset($formData['search'])) {
-                    $qb->andWhere('LOWER(e.search) LIKE :search');
-                    $qb->setParameter('search', '%' . $formData['search'] . '%');
+                    DoctrineUtils::matchAll($qb, ['e.companyName', 'e.location', 'e.detail'], $formData['search']);
                 }
 
                 if ($options['mission_status']) {

src/DataTable/SpaceMissionExportableTableType.php

@@ -15,6 +15,7 @@
 use Umbrella\AdminBundle\Lib\DataTable\DataTableBuilder;
 use Umbrella\AdminBundle\Lib\DataTable\DataTableType;
 use Umbrella\AdminBundle\Lib\Form\SearchType;
+use Umbrella\AdminBundle\Utils\DoctrineUtils;
 
 class SpaceMissionExportableTableType extends DataTableType
 {
@@ -50,8 +51,7 @@ public function buildTable(DataTableBuilder $builder, array $options): void
             'class' => SpaceMission::class,
             'query' => function (QueryBuilder $qb, array $formData) {
                 if (isset($formData['search'])) {
-                    $qb->andWhere('LOWER(e.search) LIKE :search');
-                    $qb->setParameter('search', '%' . $formData['search'] . '%');
+                    DoctrineUtils::matchAll($qb, ['e.companyName', 'e.location', 'e.detail'], $formData['search']);
                 }
 
                 if (isset($formData['missionStatus'])) {

src/DataTable/SpaceMissionMultipleTableType.php

@@ -12,6 +12,7 @@
 use Umbrella\AdminBundle\Lib\DataTable\DataTableBuilder;
 use Umbrella\AdminBundle\Lib\DataTable\DataTableType;
 use Umbrella\AdminBundle\Lib\Form\SearchType;
+use Umbrella\AdminBundle\Utils\DoctrineUtils;
 
 class SpaceMissionMultipleTableType extends DataTableType
 {
@@ -41,8 +42,7 @@ public function buildTable(DataTableBuilder $builder, array $options): void
             'class' => SpaceMission::class,
             'query' => function (QueryBuilder $qb, array $formData) use ($options) {
                 if (isset($formData['search'])) {
-                    $qb->andWhere('LOWER(e.search) LIKE :search');
-                    $qb->setParameter('search', '%' . $formData['search'] . '%');
+                    DoctrineUtils::matchAll($qb, ['e.companyName', 'e.location', 'e.detail'], $formData['search']);
                 }
 
                 if ($options['rocket_status']) {

src/DataTable/SpaceMissionSelectableTableType.php

@@ -14,6 +14,7 @@
 use Umbrella\AdminBundle\Lib\DataTable\DataTableBuilder;
 use Umbrella\AdminBundle\Lib\DataTable\DataTableType;
 use Umbrella\AdminBundle\Lib\Form\SearchType;
+use Umbrella\AdminBundle\Utils\DoctrineUtils;
 
 class SpaceMissionSelectableTableType extends DataTableType
 {
@@ -55,8 +56,7 @@ public function buildTable(DataTableBuilder $builder, array $options): void
             'class' => SpaceMission::class,
             'query' => function (QueryBuilder $qb, array $formData) {
                 if (isset($formData['search'])) {
-                    $qb->andWhere('LOWER(e.search) LIKE :search');
-                    $qb->setParameter('search', '%' . $formData['search'] . '%');
+                    DoctrineUtils::matchAll($qb, ['e.companyName', 'e.location', 'e.detail'], $formData['search']);
                 }
             }
         ]);

src/DataTable/SpaceMissionTableType.php

@@ -15,6 +15,7 @@
 use Umbrella\AdminBundle\Lib\DataTable\DataTableType;
 use Umbrella\AdminBundle\Lib\Form\DatepickerType;
 use Umbrella\AdminBundle\Lib\Form\SearchType;
+use Umbrella\AdminBundle\Utils\DoctrineUtils;
 
 class SpaceMissionTableType extends DataTableType
 {
@@ -53,8 +54,7 @@ public function buildTable(DataTableBuilder $builder, array $options): void
             'class' => SpaceMission::class,
             'query' => function (QueryBuilder $qb, array $formData) {
                 if (isset($formData['search'])) {
-                    $qb->andWhere('LOWER(e.search) LIKE :search');
-                    $qb->setParameter('search', '%' . $formData['search'] . '%');
+                    DoctrineUtils::matchAll($qb, ['e.companyName', 'e.location', 'e.detail'], $formData['search']);
                 }
 
                 if (isset($formData['missionStatus'])) {

src/Entity/AdminUser.php

@@ -5,11 +5,9 @@
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Umbrella\AdminBundle\Entity\BaseAdminUser;
-use Umbrella\AdminBundle\Lib\Search\Attribute\Searchable;
 
 #[ORM\Entity]
 #[UniqueEntity('email')]
-#[Searchable]
 class AdminUser extends BaseAdminUser
 {
     public function getRoles(): array

src/Entity/SpaceMission.php

@@ -8,30 +8,25 @@
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use Umbrella\AdminBundle\Entity\Trait\IdTrait;
-use Umbrella\AdminBundle\Entity\Trait\SearchTrait;
-use Umbrella\AdminBundle\Lib\Search\Attribute\Searchable;
-use Umbrella\AdminBundle\Lib\Search\Attribute\SearchableField;
 
 #[ORM\Entity(repositoryClass: SpaceMissionRepository::class)]
-#[Searchable]
 class SpaceMission
 {
     use IdTrait;
-    use SearchTrait;
 
+    // SearchableField
     #[ORM\Column(type: Types::STRING)]
-    #[SearchableField]
     public ?string $companyName = null;
 
+    // SearchableField
     #[ORM\Column(type: Types::STRING)]
-    #[SearchableField]
     public ?string $location = null;
 
     #[ORM\Column(type: Types::DATE_MUTABLE)]
     public ?\DateTimeInterface $date = null;
 
+    // SearchableField
     #[ORM\Column(type: Types::STRING)]
-    #[SearchableField]
     public ?string $detail = null;
 
     #[ORM\Column(type: Types::STRING)]