Update resolver.py

resolver.py

@@ -1,5 +1,7 @@
-
+# resolver.py
 from firestore_client import get_firestore_client
+from google.cloud import firestore
+
 db = get_firestore_client()
 
 def resolve_user_context(uid: str, company_code: str):
@@ -10,24 +12,27 @@ def resolve_user_context(uid: str, company_code: str):
     participant_id = None
 
     # 1) users/{uid} -> email
-    user_doc = db.collection("users").document(uid).get()
-    if user_doc.exists:
-        user = user_doc.to_dict()
+    user_snap = db.collection("users").document(uid).get()
+    if user_snap.exists:
+        user = user_snap.to_dict() or {}
         email = user.get("email")
 
-    # 2) participants where email == user.email and companyCode == ctx
+    # 2) applications where companyCode == ctx AND email == user.email  -> participantId
     if email:
-        q = (db.collection("participants")
-               .where("email", "==", email)
-               .where("hub", "==", company_code))  # if you store companyCode on participants, use "companyCode" here
-        try:
-            # Prefer companyCode; fall back to hub if that's what you use. Adjust the field to your actual schema.
-            q = db.collection("participants").where("email", "==", email).where("companyCode", "==", company_code)
-        except Exception:
-            pass
+        app_query = (
+            db.collection("applications")
+              .where(filter=firestore.FieldFilter("companyCode", "==", company_code))
+              .where(filter=firestore.FieldFilter("email", "==", email))
+              .limit(1)
+        )
+        app_docs = list(app_query.stream())
+        if app_docs:
+            participant_id = (app_docs[0].to_dict() or {}).get("participantId")
 
-        docs = list(q.limit(1).stream())
-        if docs:
-            participant_id = docs[0].id
+    # 3) Verify the participant doc exists, but do NOT filter by companyCode on participants.
+    if participant_id:
+        p_snap = db.collection("participants").document(participant_id).get()
+        if not p_snap.exists:
+            participant_id = None
 
     return {"uid": uid, "email": email, "participantId": participant_id}