From 010701ca988e0387b9a87591f4936e85c5138596 Mon Sep 17 00:00:00 2001 From: Du Peng Date: Mon, 29 May 2023 10:34:14 +0200 Subject: [PATCH] (feat) filter child in member list --- app/services/members/list_service.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/services/members/list_service.rb b/app/services/members/list_service.rb index 6ed15eefd..93968f637 100644 --- a/app/services/members/list_service.rb +++ b/app/services/members/list_service.rb @@ -4,7 +4,7 @@ class Members::ListService class << self def list(params) - @query = User.includes(:profile, :group, :statistic_profile) + @query = User.includes(:profile, :group, :statistic_profile, :children) .joins(:profile, :statistic_profile, :group, @@ -27,10 +27,10 @@ class Members::ListService # ILIKE => PostgreSQL case-insensitive LIKE if params[:search].size.positive? @query = @query.where('users.username ILIKE :search OR ' \ - 'profiles.first_name ILIKE :search OR ' \ - 'profiles.last_name ILIKE :search OR ' \ + "profiles.first_name || ' ' || profiles.last_name ILIKE :search OR " \ 'profiles.phone ILIKE :search OR ' \ - 'email ILIKE :search OR ' \ + 'users.email ILIKE :search OR ' \ + "children.first_name || ' ' || children.last_name ILIKE :search OR " \ 'groups.name ILIKE :search OR ' \ 'plans.base_name ILIKE :search', search: "%#{params[:search]}%") end