From 681067f84bfdf41be85e4e86f5f68d25ed08486b Mon Sep 17 00:00:00 2001 From: PineHomePC Date: Mon, 24 Aug 2026 02:14:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=20OrgRepository/OrgMe?= =?UTF-8?q?mber=20=E6=96=B0=E5=A2=9E=E6=96=B9=E6=B3=95=EF=BC=88=E7=B1=BB?= =?UTF-8?q?=E4=BD=9C=E7=94=A8=E5=9F=9F=EF=BC=8C=E4=BF=AE=E5=A4=8D=20=5Fto?= =?UTF-8?q?=5Fdict=5Forg=20NameError=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - FinanceRepository.create / OrgRepository.all+list_by_ids / OrgMember.list_for_user+get 精准插入 - 移除误插入 Config/Region 的冗余方法 - 31 受影响测试 + 全量 66 全绿 --- app/infrastructure/repositories.py | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/app/infrastructure/repositories.py b/app/infrastructure/repositories.py index 1845d19..8515664 100644 --- a/app/infrastructure/repositories.py +++ b/app/infrastructure/repositories.py @@ -527,13 +527,6 @@ class RegionRepository: return {"id": r.id, "name": r.name, "level": r.level, "parent_id": r.parent_id} if r else None async def all(self) -> list[dict]: - return [_to_dict_org(o) for o in await self.session.scalars(select(Organization).order_by(Organization.created_at))] - - async def list_by_ids(self, org_ids: list[str]) -> list[dict]: - if not org_ids: - return [] - rows = await self.session.scalars(select(Organization).where(Organization.id.in_(org_ids))) - return [_to_dict_org(o) for o in rows] return [ {"id": r.id, "name": r.name, "level": r.level, "parent_id": r.parent_id} for r in await self.session.scalars(select(Region)) @@ -587,18 +580,21 @@ class OrgRepository: "created_at": o.created_at, } - async def get(self, org_id: str) -> dict | None: - o = await self.session.get(Organization, org_id) - return self._to_dict(o) if o else None - async def all(self) -> list[dict]: - return [_to_dict_org(o) for o in await self.session.scalars(select(Organization).order_by(Organization.created_at))] + rows = await self.session.scalars(select(Organization).order_by(Organization.created_at)) + return [self._to_dict(o) for o in rows] async def list_by_ids(self, org_ids: list[str]) -> list[dict]: if not org_ids: return [] rows = await self.session.scalars(select(Organization).where(Organization.id.in_(org_ids))) - return [_to_dict_org(o) for o in rows] + return [self._to_dict(o) for o in rows] + + async def get(self, org_id: str) -> dict | None: + o = await self.session.get(Organization, org_id) + return self._to_dict(o) if o else None + + async def all(self) -> list[dict]: return [self._to_dict(o) for o in await self.session.scalars(select(Organization))] async def list_by_region(self, region_ids: list[str]) -> list[dict]: @@ -913,13 +909,6 @@ class ConfigRepository: self.session = session async def all(self) -> list[dict]: - return [_to_dict_org(o) for o in await self.session.scalars(select(Organization).order_by(Organization.created_at))] - - async def list_by_ids(self, org_ids: list[str]) -> list[dict]: - if not org_ids: - return [] - rows = await self.session.scalars(select(Organization).where(Organization.id.in_(org_ids))) - return [_to_dict_org(o) for o in rows] return [ {"key": c.key, "value": c.value, "description": c.description, "updated_at": c.updated_at}