fix: 修正 OrgRepository/OrgMember 新增方法(类作用域,修复 _to_dict_org NameError)
- FinanceRepository.create / OrgRepository.all+list_by_ids / OrgMember.list_for_user+get 精准插入 - 移除误插入 Config/Region 的冗余方法 - 31 受影响测试 + 全量 66 全绿
This commit is contained in:
@@ -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}
|
||||
|
||||
Reference in New Issue
Block a user