Refactor scim filter management

Signed-off-by: Bryan Frimin <bryan@getprobo.com>

pkg/coredata/membership.go

@@ -593,6 +593,7 @@ func (m *Memberships) LoadByOrganizationID(
 	scope Scoper,
 	organizationID gid.GID,
 	cursor *page.Cursor[MembershipOrderField],
+	filter *MembershipFilter,
 ) error {
 	query := `
 WITH membership_with_profile AS (
@@ -615,6 +616,7 @@ WITH membership_with_profile AS (
     WHERE
         m.organization_id = @organization_id
         AND m.%s
+        AND %s
 )
 SELECT
     id,
@@ -632,12 +634,13 @@ WHERE
     %s
 `
 
-	query = fmt.Sprintf(query, scope.SQLFragment(), cursor.SQLFragment())
+	query = fmt.Sprintf(query, scope.SQLFragment(), filter.SQLFragment(), cursor.SQLFragment())
 
 	args := pgx.StrictNamedArgs{
 		"organization_id": organizationID,
 	}
 	maps.Copy(args, scope.SQLArguments())
+	maps.Copy(args, filter.SQLArguments())
 	maps.Copy(args, cursor.SQLArguments())
 
 	rows, err := conn.Query(ctx, query, args)
@@ -659,21 +662,26 @@ func (m *Memberships) CountByOrganizationID(
 	conn pg.Conn,
 	scope Scoper,
 	organizationID gid.GID,
+	filter *MembershipFilter,
 ) (int, error) {
 	query := `
 SELECT
     COUNT(*)
 FROM
-    iam_memberships
+    iam_memberships m
+JOIN
+    identities i ON m.identity_id = i.id
 WHERE
-    organization_id = @organization_id
+    m.organization_id = @organization_id
+    AND m.%s
     AND %s
 `
-	query = fmt.Sprintf(query, scope.SQLFragment())
+	query = fmt.Sprintf(query, scope.SQLFragment(), filter.SQLFragment())
 	args := pgx.StrictNamedArgs{
 		"organization_id": organizationID,
 	}
 	maps.Copy(args, scope.SQLArguments())
+	maps.Copy(args, filter.SQLArguments())
 	row := conn.QueryRow(ctx, query, args)
 	var count int
 	if err := row.Scan(&count); err != nil {

pkg/coredata/membership_filter.go

@@ -0,0 +1,54 @@
+// Copyright (c) 2025 Probo Inc <hello@getprobo.com>.
+//
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+// OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+// PERFORMANCE OF THIS SOFTWARE.
+
+package coredata
+
+import (
+	"github.com/jackc/pgx/v5"
+	"go.probo.inc/probo/pkg/mail"
+)
+
+type MembershipFilter struct {
+	email *mail.Addr
+}
+
+func NewMembershipFilter() *MembershipFilter {
+	return &MembershipFilter{}
+}
+
+func (f *MembershipFilter) WithEmail(email *mail.Addr) *MembershipFilter {
+	f.email = email
+	return f
+}
+
+func (f *MembershipFilter) Email() *mail.Addr {
+	return f.email
+}
+
+func (f *MembershipFilter) SQLArguments() pgx.StrictNamedArgs {
+	return pgx.StrictNamedArgs{
+		"filter_email": f.email,
+	}
+}
+
+func (f *MembershipFilter) SQLFragment() string {
+	return `
+(
+	CASE
+		WHEN @filter_email::text IS NOT NULL THEN
+			i.email_address = @filter_email::text
+		ELSE TRUE
+	END
+)`
+}