feat(erp-pm): integrate unified access matrix, streamline limited procurement flow, and brand as integrated project management, procurement and warehouse platform

backend/app/auth.py

@@ -145,18 +145,6 @@ async def context_from_claims(claims: dict, db: AsyncSession) -> UserContext:
         user.username = username
         await db.flush()
 
-    project_ids: list = []
-    if user.role in ("supervisor", "pm"):
-        projects = (
-            await db.execute(
-                select(Project)
-                .where(Project.pm_user_id == user.id)
-                .order_by(Project.created_at, Project.id)
-            )
-        ).scalars().all()
-        project_ids = [p.id for p in projects]
-    project_id = project_ids[0] if project_ids else None
-
     # لایه پنل‌ها: تخصیص پنل + سطح دسترسی و عضویت پروژه‌ای (جدا از نقش)
     panels: dict = {}
     panel_rows = (
@@ -166,6 +154,7 @@ async def context_from_claims(claims: dict, db: AsyncSession) -> UserContext:
     ).scalars().all()
     for row in panel_rows:
         panels[row.panel] = row.level
+
     member_project_ids: list = [
         row.project_id
         for row in (
@@ -177,6 +166,19 @@ async def context_from_claims(claims: dict, db: AsyncSession) -> UserContext:
         ).scalars().all()
     ]
 
+    pm_projects = (
+        await db.execute(
+            select(Project)
+            .where(Project.pm_user_id == user.id)
+            .order_by(Project.created_at, Project.id)
+        )
+    ).scalars().all()
+    pm_project_ids_list = [p.id for p in pm_projects]
+
+    # ترکیب پروژه‌های تحت مدیریت مستقیم و پروژه‌های عضویت با حفظ اولویت و بدون تکرار
+    project_ids = list(dict.fromkeys(pm_project_ids_list + member_project_ids))
+    project_id = project_ids[0] if project_ids else None
+
     display_name = f"{user.first_name} {user.last_name}".strip() or user.casdoor_id
     return UserContext(
         user=user,
@@ -190,15 +192,22 @@ async def context_from_claims(claims: dict, db: AsyncSession) -> UserContext:
 
 
 async def pm_project_ids(db: AsyncSession, user: User) -> list:
-    """Every project id managed by the given PM/supervisor user (oldest first)."""
-    rows = (
+    """Every project id managed or assigned to the given PM/supervisor user (oldest first)."""
+    pm_rows = (
         await db.execute(
             select(Project.id)
             .where(Project.pm_user_id == user.id)
             .order_by(Project.created_at, Project.id)
         )
     ).scalars().all()
-    return list(rows)
+    member_rows = (
+        await db.execute(
+            select(UserProjectMembership.project_id)
+            .where(UserProjectMembership.user_id == user.id)
+            .order_by(UserProjectMembership.created_at)
+        )
+    ).scalars().all()
+    return list(dict.fromkeys(list(pm_rows) + list(member_rows)))
 
 
 async def get_optional_user(request: Request, db: AsyncSession | None = None) -> UserContext | None: