From 587f59d1674f401bb6d43764f2fa299136188927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89mile=20R=C3=A9?= <emile@getprobo.com>
Date: Thu, 19 Feb 2026 14:41:12 +0400
Subject: [PATCH] Fix profile load by org query
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Émile Ré <emile@getprobo.com>
---
 pkg/coredata/membership_profile.go        | 34 +++++++++++++----------
 pkg/coredata/membership_profile_filter.go |  4 +--
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/pkg/coredata/membership_profile.go b/pkg/coredata/membership_profile.go
index e6ccc6a5d..ee31ac3e0 100644
--- a/pkg/coredata/membership_profile.go
+++ b/pkg/coredata/membership_profile.go
@@ -289,22 +289,22 @@ WITH profiles AS (
         AND %s
 )
 SELECT
-    p.id,
-    p.identity_id,
-    p.organization_id,
-    p.email_address,
-    p.source,
-    p.state,
-    p.full_name,
-    p.kind,
-    p.additional_email_addresses,
-    p.position,
-    p.contract_start_date,
-    p.contract_end_date,
+    id,
+    identity_id,
+    organization_id,
+    email_address,
+    source,
+    state,
+    full_name,
+    kind,
+    additional_email_addresses,
+    position,
+    contract_start_date,
+    contract_end_date,
     '' AS organization_name,
-    p.created_at,
-    p.updated_at
-FROM profiles p
+    created_at,
+    updated_at
+FROM profiles
 WHERE
     %s
 `
@@ -313,6 +313,8 @@ WHERE
 
 	args := pgx.NamedArgs{"organization_id": organizationID}
 	maps.Copy(args, scope.SQLArguments())
+	maps.Copy(args, filter.SQLArguments())
+	maps.Copy(args, cursor.SQLArguments())
 
 	rows, err := conn.Query(ctx, q, args)
 	if err != nil {
@@ -385,6 +387,8 @@ WHERE
 	q = fmt.Sprintf(q, filter.SQLFragment(), cursor.SQLFragment())
 
 	args := pgx.NamedArgs{"identity_id": identityID}
+	maps.Copy(args, filter.SQLArguments())
+	maps.Copy(args, cursor.SQLArguments())
 
 	rows, err := conn.Query(ctx, q, args)
 	if err != nil {
diff --git a/pkg/coredata/membership_profile_filter.go b/pkg/coredata/membership_profile_filter.go
index 05bde5a5a..e7aeb0965 100644
--- a/pkg/coredata/membership_profile_filter.go
+++ b/pkg/coredata/membership_profile_filter.go
@@ -79,8 +79,8 @@ func (f *MembershipProfileFilter) SQLFragment() string {
 	return `
 (
 	CASE
-		WHEN @filter_email::text IS NOT NULL THEN
-			i.email_address = @filter_email::text
+		WHEN @filter_email::citext IS NOT NULL THEN
+			i.email_address = @filter_email::citext
 		ELSE TRUE
 	END
 )