resf/distro-tools
1
0
Fork 0
mirror of https://github.com/resf/distro-tools.git synced 2024-11-25 06:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compat API fix: return RPMs in nvra class

Browse Source
This commit is contained in:
Mustafa Gezen 2023-02-02 17:25:00 +01:00
parent 6654d26083
commit dec33c5de6
Signed by untrusted user who does not match committer: mustafa
GPG Key ID: DCDF010D946438C1
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apollo/db/serialize/__init__.py
View File

@ -72,6 +72,10 @@ class Advisory_Pydantic_V2_Fix(BaseModel):
description: str description: str
class Advisory_Pydantic_V2_RPM(BaseModel):
nevra: str
class Advisory_Pydantic_V2_CVE(BaseModel): class Advisory_Pydantic_V2_CVE(BaseModel):
name: str name: str
sourceBy: str sourceBy: str

9
apollo/server/routes/api_compat.py
View File

@ -20,7 +20,7 @@ from pydantic import BaseModel
from rssgen.feed import RssGenerator from rssgen.feed import RssGenerator
from apollo.db import Advisory, RedHatIndexState from apollo.db import Advisory, RedHatIndexState
from apollo.db.serialize import Advisory_Pydantic_V2, Advisory_Pydantic_V2_CVE, Advisory_Pydantic_V2_Fix from apollo.db.serialize import Advisory_Pydantic_V2, Advisory_Pydantic_V2_CVE, Advisory_Pydantic_V2_Fix, Advisory_Pydantic_V2_RPM
from apollo.server.settings import UI_URL, COMPANY_NAME, MANAGING_EDITOR, get_setting from apollo.server.settings import UI_URL, COMPANY_NAME, MANAGING_EDITOR, get_setting
from common.fastapi import RenderErrorTemplateException from common.fastapi import RenderErrorTemplateException
@ -129,7 +129,12 @@ def v3_advisory_to_v2(
name = f"{pkg.supported_product.variant} {pkg.supported_products_rh_mirror.match_major_version}" name = f"{pkg.supported_product.variant} {pkg.supported_products_rh_mirror.match_major_version}"
if name not in rpms: if name not in rpms:
rpms[name] = [] rpms[name] = []
rpms[name].append(pkg.nevra) if pkg.nevra not in rpms[name]:
rpms[name].append(pkg.nevra)
rpms_res = {}
for product, rpms in rpms.items():
rpms_res[product] = [Advisory_Pydantic_V2_RPM(nevra=x) for x in rpms]
published_at = advisory.published_at.isoformat("T" published_at = advisory.published_at.isoformat("T"
).replace("+00:00", "") + "Z" ).replace("+00:00", "") + "Z"