From b18072e24b490ca838b435fed2be809febdaa38d Mon Sep 17 00:00:00 2001
From: Michael Chihlas <michael@resolutionflow.com>
Date: Wed, 15 Apr 2026 02:59:49 +0000
Subject: [PATCH] fix(psa): set account_id on PsaMemberMapping in save and
 auto-match

---
 backend/app/api/endpoints/integrations.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/backend/app/api/endpoints/integrations.py b/backend/app/api/endpoints/integrations.py
index 7b69f7fd..d3fc9103 100644
--- a/backend/app/api/endpoints/integrations.py
+++ b/backend/app/api/endpoints/integrations.py
@@ -570,6 +570,7 @@ async def save_member_mappings(
     for m in mappings:
         mapping = PsaMemberMapping(
             psa_connection_id=conn.id,
+            account_id=current_user.account_id,
             user_id=UUID(m.user_id),
             external_member_id=m.external_member_id,
             external_member_name=m.external_member_name,
@@ -630,6 +631,7 @@ async def auto_match_members(
             if not existing.scalar_one_or_none():
                 mapping = PsaMemberMapping(
                     psa_connection_id=conn.id,
+                    account_id=current_user.account_id,
                     user_id=user.id,
                     external_member_id=cw_member.id,
                     external_member_name=cw_member.name,