Skip to content

Commit 623afc1

Browse files
authored
Fix Reset matched packages do not work on advisory with the same ID (#1103)
Fixes: AlmaLinux/build-system#419
1 parent 823e6dc commit 623afc1

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

alws/crud/errata.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2432,12 +2432,19 @@ async def prepare_resetting(
24322432
items_to_insert.extend(matching_packages)
24332433

24342434

2435-
async def reset_matched_errata_packages(record_id: str, session: AsyncSession):
2435+
async def reset_matched_errata_packages(
2436+
record_id: str,
2437+
platform_id: int,
2438+
session: AsyncSession,
2439+
):
24362440
record = (
24372441
(
24382442
await session.execute(
24392443
select(models.NewErrataRecord)
2440-
.where(models.NewErrataRecord.id == record_id)
2444+
.where(
2445+
models.NewErrataRecord.id == record_id,
2446+
models.NewErrataRecord.platform_id == platform_id,
2447+
)
24412448
.options(
24422449
selectinload(models.NewErrataRecord.platform).selectinload(
24432450
models.Platform.repos

alws/routers/errata.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,11 +324,16 @@ async def bulk_release_errata_records(
324324
@router.post('/reset-matched-packages')
325325
async def reset_matched_packages(
326326
record_id: str,
327+
platform_id: int,
327328
session: AsyncSession = Depends(
328329
AsyncSessionDependency(key=get_async_db_key())
329330
),
330331
):
331-
await errata_crud.reset_matched_errata_packages(record_id, session)
332+
await errata_crud.reset_matched_errata_packages(
333+
record_id,
334+
platform_id,
335+
session,
336+
)
332337
return {'message': f'Packages for record {record_id} have been matched'}
333338

334339

0 commit comments

Comments
 (0)