fix(BA-5653): resolve cascaded rebase conflicts on top of slice I

- Drop conflict markers in scheduler db_source and user/service.py
  introduced by rebase against the updated slice I (preserve the
  user-table-joined main_access_key resolution).
- Drop duplicate ``resolve_main_access_keys`` definition.
- Use ``spec.access_key`` for SessionCreationSpec in scheduler db_source.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: jopemachine

src/ai/backend/manager/repositories/scheduler/db_source/db_source.py

@@ -1488,7 +1488,7 @@ async def fetch_session_creation_data(
                 db_sess,
                 spec.user_scope.domain_name,
                 str(spec.user_scope.group_id),
-                spec.main_access_key,
+                spec.access_key,
             )
             image_infos = await self._resolve_image_info(db_sess, image_refs)
 
@@ -1509,7 +1509,7 @@ async def fetch_session_creation_data(
             dotfile_data = await self._fetch_dotfiles(
                 db_sess,
                 spec.user_scope,
-                spec.main_access_key,
+                spec.access_key,
                 vfolder_mounts,
             )
 
@@ -1553,7 +1553,7 @@ async def fetch_session_creation_context(
                 db_sess,
                 spec.user_scope.domain_name,
                 str(spec.user_scope.group_id),
-                spec.main_access_key,
+                spec.access_key,
             )
             image_infos = await self._resolve_image_info(db_sess, image_refs)
 
@@ -2927,11 +2927,6 @@ async def _get_sessions_by_statuses(
                 session_id=session.id,
                 creation_id=session.creation_id or "",
                 main_access_key=AccessKey(owner_main_ak) if owner_main_ak else AccessKey(""),
-                else AccessKey(""),
->>>>>>> e35caec08 (refactor(BA-5650-I): drop stray non-BA-5650 changes from slice)
-=======
-                main_access_key=AccessKey(owner_main_ak) if owner_main_ak else AccessKey(""),
->>>>>>> 9fbd63dda (fix(BA-5650-I): resolve cascaded rebase conflicts and align tests)
                 reason="triggered-by-scheduler",
             )
             scheduled_sessions.append(scheduled_session)
@@ -2979,11 +2974,6 @@ async def _get_scheduled_sessions(self, db_sess: SASession) -> list[ScheduledSes
                     session_id=session.id,
                     creation_id=session.creation_id or "",
                     main_access_key=AccessKey(owner_main_ak) if owner_main_ak else AccessKey(""),
-                    else AccessKey(""),
->>>>>>> e35caec08 (refactor(BA-5650-I): drop stray non-BA-5650 changes from slice)
-=======
->>>>>>> c2dad7307 (refactor(BA-5650-I): test and remaining ORM updates)
->>>>>>> f0233454a (refactor(BA-5650-I): test and remaining ORM updates)
                     reason="triggered-by-scheduler",
                 )
             )
@@ -4827,21 +4817,3 @@ async def _get_db_now_in_session(self, db_sess: SASession) -> datetime:
         """
         result = await db_sess.execute(sa.select(sa.func.now()))
         return result.scalar_one()
-
-    async def resolve_main_access_keys(
-        self, session_ids: Sequence[SessionId]
-    ) -> dict[SessionId, AccessKey]:
-        """Resolve the main access key for each session's owner.
-
-        Joins sessions → users to look up the owner's main_access_key.
-        """
-        if not session_ids:
-            return {}
-        async with self._db.begin_readonly_session() as db_sess:
-            stmt = (
-                sa.select(SessionRow.id, UserRow.main_access_key)
-                .join(UserRow, SessionRow.user_uuid == UserRow.uuid)
-                .where(SessionRow.id.in_([sid for sid in session_ids]))
-            )
-            rows = (await db_sess.execute(stmt)).all()
-            return {SessionId(row[0]): AccessKey(row[1]) for row in rows if row[1] is not None}

src/ai/backend/manager/services/user/service.py

@@ -242,10 +242,7 @@ async def purge_user(self, action: PurgeUserAction) -> PurgeUserActionResult:
             await self._user_repository.delegate_endpoint_ownership(
                 user_uuid=user_uuid,
                 target_user_uuid=action.user_info_ctx.uuid,
-<<<<<<< HEAD
                 target_main_access_key=AccessKey(target_main_ak),
-=======
->>>>>>> d59487b17 (refactor(BA-5650-I): test and remaining ORM updates)
             )
             await self._user_repository.delete_endpoints(
                 user_uuid=user_uuid,
@@ -326,10 +323,7 @@ async def _purge_single_user(
             await self._user_repository.delegate_endpoint_ownership(
                 user_uuid=user_uuid,
                 target_user_uuid=user_info_ctx.uuid,
-<<<<<<< HEAD
                 target_main_access_key=AccessKey(target_main_ak),
-=======
->>>>>>> d59487b17 (refactor(BA-5650-I): test and remaining ORM updates)
             )
             await self._user_repository.delete_endpoints(
                 user_uuid=user_uuid,