Skip to content

refactor(server): extract shared response builder code #514

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

Draft
pedro-avalos wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

refactor(server): extract shared response builder code #514

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
131 changes: 41 additions & 90 deletions server/src/hwapi/endpoints/certification/response_builders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@
)


def build_related_certified_response(
def _build_response_kwargs(
db: Session,
machine: models.Machine,
board: models.Device,
bios: models.Bios | None,
releases: list[models.Release],
kernels: list[models.Kernel],
) -> RelatedCertifiedSystemExistsResponse:
certified_url = get_certified_platform_url(machine.configuration.platform_id)
) -> dict:
"""Build the common kwargs for the response builders."""
architecture = repository.get_machine_architecture(db, machine.id)
bios_validator = (
data_validators.BiosValidator(
Expand All @@ -52,28 +52,44 @@ def build_related_certified_response(
if bios
else None
)
return RelatedCertifiedSystemExistsResponse(
certified_url=certified_url,
architecture=architecture,
board=data_validators.BoardValidator(
available_releases = [
data_validators.OSValidator(
distributor="Ubuntu",
version=release.release,
codename=release.codename,
kernel=data_validators.KernelPackageValidator(
name=kernel.name,
version=kernel.version,
signature=kernel.signature,
),
)
for release, kernel in zip(releases, kernels, strict=True)
]
return {
"architecture": architecture,
"board": data_validators.BoardValidator(
manufacturer=board.vendor.name,
product_name=board.name,
version=board.version,
),
bios=bios_validator,
available_releases=[
data_validators.OSValidator(
distributor="Ubuntu",
version=release.release,
codename=release.codename,
kernel=data_validators.KernelPackageValidator(
name=kernel.name,
version=kernel.version,
signature=kernel.signature,
),
)
for release, kernel in zip(releases, kernels, strict=True)
],
"bios": bios_validator,
"available_releases": available_releases,
}


def build_related_certified_response(
db: Session,
machine: models.Machine,
board: models.Device,
bios: models.Bios | None,
releases: list[models.Release],
kernels: list[models.Kernel],
) -> RelatedCertifiedSystemExistsResponse:
certified_url = get_certified_platform_url(machine.configuration.platform_id)
kwargs = _build_response_kwargs(db, machine, board, bios, releases, kernels)
return RelatedCertifiedSystemExistsResponse(
certified_url=certified_url,
**kwargs,
)


Expand All @@ -86,43 +102,10 @@ def build_certified_response(
kernels: list[models.Kernel],
) -> CertifiedResponse:
certified_url = get_certified_configuration_url(machine.canonical_id)
architecture = repository.get_machine_architecture(db, machine.id)
releases, kernels = repository.get_releases_and_kernels_for_machine(db, machine.id)
bios_validator = (
data_validators.BiosValidator(
vendor=bios.vendor.name,
version=bios.version,
revision=bios.revision,
firmware_revision=bios.firmware_revision,
release_date=(
bios.release_date.strftime("%m/%d/%Y") if bios.release_date else None
),
)
if bios
else None
)
kwargs = _build_response_kwargs(db, machine, board, bios, releases, kernels)
return CertifiedResponse(
certified_url=certified_url,
architecture=architecture,
board=data_validators.BoardValidator(
manufacturer=board.vendor.name,
product_name=board.name,
version=board.version,
),
bios=bios_validator,
available_releases=[
data_validators.OSValidator(
distributor="Ubuntu",
version=release.release,
codename=release.codename,
kernel=data_validators.KernelPackageValidator(
name=kernel.name,
version=kernel.version,
signature=kernel.signature,
),
)
for release, kernel in zip(releases, kernels, strict=True)
],
**kwargs,
)


Expand All @@ -135,40 +118,8 @@ def build_certified_image_exists_response(
kernels: list[models.Kernel],
) -> CertifiedImageExistsResponse:
certified_url = get_certified_configuration_url(machine.canonical_id)
architecture = repository.get_machine_architecture(db, machine.id)
bios_validator = (
data_validators.BiosValidator(
vendor=bios.vendor.name,
version=bios.version,
revision=bios.revision,
firmware_revision=bios.firmware_revision,
release_date=(
bios.release_date.strftime("%m/%d/%Y") if bios.release_date else None
),
)
if bios
else None
)
kwargs = _build_response_kwargs(db, machine, board, bios, releases, kernels)
return CertifiedImageExistsResponse(
certified_url=certified_url,
architecture=architecture,
board=data_validators.BoardValidator(
manufacturer=board.vendor.name,
product_name=board.name,
version=board.version,
),
bios=bios_validator,
available_releases=[
data_validators.OSValidator(
distributor="Ubuntu",
version=release.release,
codename=release.codename,
kernel=data_validators.KernelPackageValidator(
name=kernel.name,
version=kernel.version,
signature=kernel.signature,
),
)
for release, kernel in zip(releases, kernels, strict=True)
],
**kwargs,
)
Loading