diff --git a/src/main/java/fr/titionfire/ffsaf/domain/service/ClubService.java b/src/main/java/fr/titionfire/ffsaf/domain/service/ClubService.java index 82810c8..4a1c8fe 100644 --- a/src/main/java/fr/titionfire/ffsaf/domain/service/ClubService.java +++ b/src/main/java/fr/titionfire/ffsaf/domain/service/ClubService.java @@ -91,10 +91,10 @@ public class ClubService { PanacheQuery query; if (country == null || country.isBlank()) - query = repository.find("name LIKE ?1", + query = repository.find("LOWER(name) LIKE LOWER(?1)", Sort.ascending("name"), search).page(Page.ofSize(limit)); else - query = repository.find("name LIKE ?1 AND country LIKE ?2", + query = repository.find("LOWER(name) LIKE LOWER(?1) AND country LIKE ?2", Sort.ascending("name"), search, country + "%").page(Page.ofSize(limit)); return getPageResult(query, limit, page); } diff --git a/src/main/java/fr/titionfire/ffsaf/domain/service/MembreService.java b/src/main/java/fr/titionfire/ffsaf/domain/service/MembreService.java index 7d8e1a9..6e4da9d 100644 --- a/src/main/java/fr/titionfire/ffsaf/domain/service/MembreService.java +++ b/src/main/java/fr/titionfire/ffsaf/domain/service/MembreService.java @@ -68,7 +68,7 @@ public class MembreService { public SimpleCombModel find(int licence, String np) throws Throwable { return VertxContextSupport.subscribeAndAwait(() -> Panache.withTransaction(() -> - repository.find("licence = ?1 AND (lname ILIKE ?2 OR fname ILIKE ?2)", + repository.find("licence = ?1 AND (LOWER(lname) LIKE LOWER(?2) OR LOWER(fname) LIKE LOWER(?2))", licence, np).firstResult().map(SimpleCombModel::fromModel))); } @@ -85,10 +85,10 @@ public class MembreService { PanacheQuery query; if (club == null || club.isBlank()) - query = repository.find("(lname LIKE ?1 OR fname LIKE ?1)", + query = repository.find("(LOWER(lname) LIKE LOWER(?1) OR LOWER(fname) LIKE LOWER(?1))", Sort.ascending("fname", "lname"), search).page(Page.ofSize(limit)); else - query = repository.find("club.name LIKE ?2 AND (lname LIKE ?1 OR fname LIKE ?1)", + query = repository.find("LOWER(club.name) LIKE LOWER(?2) AND (LOWER(lname) LIKE LOWER(?1) OR LOWER(fname) LIKE LOWER(?1))", Sort.ascending("fname", "lname"), search, club + "%").page(Page.ofSize(limit)); return getPageResult(query, limit, page); } @@ -100,7 +100,7 @@ public class MembreService { String finalSearch = search; return repository.find("userId = ?1", subject).firstResult() .chain(membreModel -> { - PanacheQuery query = repository.find("club = ?1 AND (lname LIKE ?2 OR fname LIKE ?2)", + PanacheQuery query = repository.find("club = ?1 AND (LOWER(lname) LIKE LOWER(?2) OR LOWER(fname) LIKE LOWER(?2))", Sort.ascending("fname", "lname"), membreModel.getClub(), finalSearch) .page(Page.ofSize(limit)); return getPageResult(query, limit, page);