Skip to content

Move the platforms data.versions field filtering into router #1156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
javihernandez merged 1 commit into from
Jun 10, 2025
Merged

Move the platforms data.versions field filtering into router #1156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions alws/routers/platforms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,22 @@ async def modify_platform(
return await pl_crud.modify_platform(db, platform)


@public_router.get('/', response_model=typing.List[platform_schema.Platform])
@public_router.get(
'/', response_model=typing.List[platform_schema.PlatformResponse]
)
async def get_platforms(
db: AsyncSession = Depends(AsyncSessionDependency(key=get_async_db_key())),
):
return await pl_crud.get_platforms(db)
platforms = await pl_crud.get_platforms(db)
return [
{
**platform_schema.PlatformResponse.from_orm(platform).dict(
exclude={"data"}
),
"data": {"versions": (platform.data or {}).get("versions", [])},
}
for platform in platforms
]


@router.patch(
Expand Down
14 changes: 4 additions & 10 deletions alws/schemas/platform_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,10 @@ class Platform(BaseModel):
pgp_key: typing.Optional[str] = None
arch_list: typing.List[str]
modularity: typing.Optional[typing.Dict] = None
# We're only going to take versions from 'data' column
data: typing.Optional[typing.Dict[str, typing.Any]] = None

@root_validator(pre=True)
def filter_data_to_versions_only(cls, values):
if hasattr(values, 'data'):
raw_data = values.data
versions = raw_data.get("versions")
values.data = {"versions": versions} if versions else {}
return values

class Config:
from_attributes = True


class PlatformResponse(Platform):
data: typing.Optional[typing.Dict[str, typing.Any]] = None
Loading