Skip to content

[BUG - Recherche signalement] Dysfonctionnement du champ de recherche libre #5227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hmeneuvrier merged 3 commits into from
Jan 14, 2026
Merged

[BUG - Recherche signalement] Dysfonctionnement du champ de recherche libre #5227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e59f9e9
correction des recherche libre contenant des nombres #5226
numew Jan 8, 2026
de454b0
add specific search for injonction #5226
numew Jan 12, 2026
a4cd7e4
add search by nom_delcarant #5226
numew Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/DataFixtures/Files/NewSignalement.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ signalements:
prenom_occupant: "Georges"
tel_occupant: "+330240556677"
phone_number: "+330240556677"
mail_occupant: "georges.brassens@yopmail.com"
mail_occupant: "georges.brassens34300@yopmail.com"
adresse_occupant: "240 Avenue Victor Hugo"
cp_occupant: "34300"
ville_occupant: "AGDE"
Expand Down
17 changes: 12 additions & 5 deletions src/Service/Signalement/SearchFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
use App\Repository\SuiviRepository;
use App\Repository\TerritoryRepository;
use App\Service\DashboardTabPanel\TabDossier;
use App\Service\InjonctionBailleur\InjonctionBailleurService;
use App\Utils\CommuneHelper;
use App\Utils\ImportCommune;
use Doctrine\Common\Collections\ArrayCollection;
Expand Down Expand Up @@ -86,20 +87,26 @@ public function buildFilters(User $user): array
public function applyFilters(QueryBuilder $qb, array $filters, User $user): QueryBuilder
{
if (!empty($filters['searchterms'])) {
if (preg_match('/([0-9]{4})-[0-9]{0,6}/', $filters['searchterms'])) {
if (preg_match('/^([0-9]{4})-[0-9]{1,6}$/', mb_trim($filters['searchterms']))) {
$qb->andWhere('s.reference = :searchterms');
$qb->setParameter('searchterms', $filters['searchterms']);
} elseif (preg_match('/([0-9]{5})/', $filters['searchterms'])) {
$qb->setParameter('searchterms', mb_trim($filters['searchterms']));
} elseif (preg_match('/^'.InjonctionBailleurService::REFERENCE_PREFIX.'[0-9]{4,}$/', mb_strtoupper(mb_trim($filters['searchterms'])))) {
$qb->andWhere('s.referenceInjonction = :searchterms');
$qb->setParameter('searchterms', str_replace(InjonctionBailleurService::REFERENCE_PREFIX, '', mb_strtoupper(mb_trim($filters['searchterms']))));
} elseif (InjonctionBailleurService::REFERENCE_PREFIX.'XXXX' === mb_strtoupper($filters['searchterms'])) { // top secret
$qb->andWhere('s.referenceInjonction IS NOT NULL');
} elseif (preg_match('/^([0-9]{5})$/', mb_trim($filters['searchterms']))) {
$qb->andWhere('s.cpOccupant = :searchterms');
$qb->setParameter('searchterms', $filters['searchterms']);
$qb->setParameter('searchterms', mb_trim($filters['searchterms']));
} else {
$qb->andWhere('LOWER(s.nomOccupant) LIKE :searchterms
OR LOWER(s.prenomOccupant) LIKE :searchterms
OR LOWER(s.mailOccupant) LIKE :searchterms
OR LOWER(s.reference) LIKE :searchterms
OR LOWER(s.adresseOccupant) LIKE :searchterms
OR LOWER(s.villeOccupant) LIKE :searchterms
OR LOWER(s.nomProprio) LIKE :searchterms');
OR LOWER(s.nomProprio) LIKE :searchterms
OR LOWER(s.nomDeclarant) LIKE :searchterms');
$qb->setParameter('searchterms', '%'.mb_trim(strtolower($filters['searchterms'])).'%');
}
}
Expand Down
1 change: 1 addition & 0 deletions tests/Functional/Controller/Back/SignalementListControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public function provideNewFilterSearch(): \Generator
yield 'Search Terms with Firstname Occupant' => [['searchTerms' => 'Mapaire', 'isImported' => 'oui'], 1];
yield 'Search Terms with Lastname Occupant' => [['searchTerms' => 'Nawell', 'isImported' => 'oui'], 2];
yield 'Search Terms with Email Occupant' => [['searchTerms' => '[email protected]', 'isImported' => 'oui'], 1];
yield 'Search Terms with Email Occupant containing numbers' => [['searchTerms' => '[email protected]', 'isImported' => 'oui'], 1];
yield 'Search by Territory 13' => [['territoire' => '13', 'isImported' => 'oui'], 26];
yield 'Search by Commune' => [['communes' => ['gex', 'marseille'], 'isImported' => 'oui'], 31];
yield 'Search by Commune code postal' => [['communes' => ['13002'], 'isImported' => 'oui'], 2];
Expand Down
Loading