Skip to content

Commit 261c0f4

Browse files
TG1999TG1999
committed
Revert grouping
Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
1 parent ffb66f3 commit 261c0f4

File tree

2 files changed

+117
-117
lines changed

2 files changed

+117
-117
lines changed

‎vulnerabilities/api_v3.py‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -258,34 +258,34 @@ def get_affected_by_vulnerabilities(self, package):
258258

259259
return result
260260

261-
# is_grouped = AdvisorySet.objects.filter(package=package, relation_type="affecting").exists()
262-
263-
# if is_grouped:
264-
# affected_by_advisories_qs = (
265-
# AdvisorySet.objects.filter(package=package, relation_type="affecting")
266-
# .select_related("primary_advisory")
267-
# .prefetch_related(
268-
# Prefetch(
269-
# "members",
270-
# queryset=AdvisorySetMember.objects.filter(is_primary=False).select_related(
271-
# "advisory"
272-
# ),
273-
# to_attr="secondary_members",
274-
# )
275-
# )
276-
# )
277-
278-
# affected_groups = [
279-
# Group(
280-
# aliases=list(adv.aliases.all()),
281-
# primary=adv.primary_advisory,
282-
# secondaries=[member.advisory for member in adv.secondary_members],
283-
# )
284-
# for adv in affected_by_advisories_qs
285-
# ]
286-
287-
# advisories: List[GroupedAdvisory] = get_advisories_from_groups(affected_groups)
288-
# return self.return_advisories_data(package, advisories_qs, advisories)
261+
is_grouped = AdvisorySet.objects.filter(package=package, relation_type="affecting").exists()
262+
263+
if is_grouped:
264+
affected_by_advisories_qs = (
265+
AdvisorySet.objects.filter(package=package, relation_type="affecting")
266+
.select_related("primary_advisory")
267+
.prefetch_related(
268+
Prefetch(
269+
"members",
270+
queryset=AdvisorySetMember.objects.filter(is_primary=False).select_related(
271+
"advisory"
272+
),
273+
to_attr="secondary_members",
274+
)
275+
)
276+
)
277+
278+
affected_groups = [
279+
Group(
280+
aliases=list(adv.aliases.all()),
281+
primary=adv.primary_advisory,
282+
secondaries=[member.advisory for member in adv.secondary_members],
283+
)
284+
for adv in affected_by_advisories_qs
285+
]
286+
287+
advisories: List[GroupedAdvisory] = get_advisories_from_groups(affected_groups)
288+
return self.return_advisories_data(package, advisories_qs, advisories)
289289

290290
if package.type in TYPES_WITH_MULTIPLE_IMPORTERS:
291291
advisories_qs = advisories_qs.prefetch_related(
@@ -320,34 +320,34 @@ def get_fixing_vulnerabilities(self, package):
320320

321321
advisories = []
322322

323-
# is_grouped = AdvisorySet.objects.filter(package=package, relation_type="fixing").exists()
324-
325-
# if is_grouped:
326-
# fixing_advisories_qs = (
327-
# AdvisorySet.objects.filter(package=package, relation_type="fixing")
328-
# .select_related("primary_advisory")
329-
# .prefetch_related(
330-
# Prefetch(
331-
# "members",
332-
# queryset=AdvisorySetMember.objects.filter(is_primary=False).select_related(
333-
# "advisory"
334-
# ),
335-
# to_attr="secondary_members",
336-
# )
337-
# )
338-
# )
339-
340-
# fixing_groups = [
341-
# Group(
342-
# aliases=list(adv.aliases.all()),
343-
# primary=adv.primary_advisory,
344-
# secondaries=[member.advisory for member in adv.secondary_members],
345-
# )
346-
# for adv in fixing_advisories_qs
347-
# ]
348-
349-
# advisories: List[GroupedAdvisory] = get_advisories_from_groups(fixing_groups)
350-
# return self.return_fixing_advisories_data(advisories)
323+
is_grouped = AdvisorySet.objects.filter(package=package, relation_type="fixing").exists()
324+
325+
if is_grouped:
326+
fixing_advisories_qs = (
327+
AdvisorySet.objects.filter(package=package, relation_type="fixing")
328+
.select_related("primary_advisory")
329+
.prefetch_related(
330+
Prefetch(
331+
"members",
332+
queryset=AdvisorySetMember.objects.filter(is_primary=False).select_related(
333+
"advisory"
334+
),
335+
to_attr="secondary_members",
336+
)
337+
)
338+
)
339+
340+
fixing_groups = [
341+
Group(
342+
aliases=list(adv.aliases.all()),
343+
primary=adv.primary_advisory,
344+
secondaries=[member.advisory for member in adv.secondary_members],
345+
)
346+
for adv in fixing_advisories_qs
347+
]
348+
349+
advisories: List[GroupedAdvisory] = get_advisories_from_groups(fixing_groups)
350+
return self.return_fixing_advisories_data(advisories)
351351

352352
if package.type in TYPES_WITH_MULTIPLE_IMPORTERS:
353353
advisories_qs = advisories_qs.prefetch_related(

‎vulnerabilities/views.py‎

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -261,69 +261,69 @@ def get_context_data(self, **kwargs):
261261

262262
return context
263263

264-
# is_grouped = models.AdvisorySet.objects.filter(package=package).exists()
265-
266-
# if is_grouped:
267-
# context["grouped"] = True
268-
# fixed_pkg_details = get_fixed_package_details(package)
269-
# context["fixed_package_details"] = fixed_pkg_details
270-
271-
# affected_by_advisories_qs = (
272-
# models.AdvisorySet.objects.filter(package=package, relation_type="affecting")
273-
# .select_related("primary_advisory")
274-
# .prefetch_related(
275-
# Prefetch(
276-
# "members",
277-
# queryset=AdvisorySetMember.objects.filter(is_primary=False).select_related(
278-
# "advisory"
279-
# ),
280-
# to_attr="secondary_members",
281-
# )
282-
# )
283-
# )
264+
is_grouped = models.AdvisorySet.objects.filter(package=package).exists()
284265

285-
# fixing_advisories_qs = (
286-
# models.AdvisorySet.objects.filter(package=package, relation_type="fixing")
287-
# .select_related("primary_advisory")
288-
# .prefetch_related(
289-
# Prefetch(
290-
# "members",
291-
# queryset=AdvisorySetMember.objects.filter(is_primary=False).select_related(
292-
# "advisory"
293-
# ),
294-
# to_attr="secondary_members",
295-
# )
296-
# )
297-
# )
266+
if is_grouped:
267+
context["grouped"] = True
268+
fixed_pkg_details = get_fixed_package_details(package)
269+
context["fixed_package_details"] = fixed_pkg_details
270+
271+
affected_by_advisories_qs = (
272+
models.AdvisorySet.objects.filter(package=package, relation_type="affecting")
273+
.select_related("primary_advisory")
274+
.prefetch_related(
275+
Prefetch(
276+
"members",
277+
queryset=AdvisorySetMember.objects.filter(is_primary=False).select_related(
278+
"advisory"
279+
),
280+
to_attr="secondary_members",
281+
)
282+
)
283+
)
284+
285+
fixing_advisories_qs = (
286+
models.AdvisorySet.objects.filter(package=package, relation_type="fixing")
287+
.select_related("primary_advisory")
288+
.prefetch_related(
289+
Prefetch(
290+
"members",
291+
queryset=AdvisorySetMember.objects.filter(is_primary=False).select_related(
292+
"advisory"
293+
),
294+
to_attr="secondary_members",
295+
)
296+
)
297+
)
298+
299+
affected_groups = [
300+
(
301+
Group(
302+
aliases=list(adv.aliases.all()),
303+
primary=adv.primary_advisory,
304+
secondaries=[a.advisory for a in adv.secondary_members],
305+
)
306+
)
307+
for adv in affected_by_advisories_qs
308+
]
309+
fixing_groups = [
310+
(
311+
Group(
312+
aliases=list(adv.aliases.all()),
313+
primary=adv.primary_advisory,
314+
secondaries=[a.advisory for a in adv.secondary_members],
315+
)
316+
)
317+
for adv in fixing_advisories_qs
318+
]
319+
320+
affected_advisories: List[GroupedAdvisory] = get_advisories_from_groups(affected_groups)
321+
fixing_advisories: List[GroupedAdvisory] = get_advisories_from_groups(fixing_groups)
298322

299-
# affected_groups = [
300-
# (
301-
# Group(
302-
# aliases=list(adv.aliases.all()),
303-
# primary=adv.primary_advisory,
304-
# secondaries=[a.advisory for a in adv.secondary_members],
305-
# )
306-
# )
307-
# for adv in affected_by_advisories_qs
308-
# ]
309-
# fixing_groups = [
310-
# (
311-
# Group(
312-
# aliases=list(adv.aliases.all()),
313-
# primary=adv.primary_advisory,
314-
# secondaries=[a.advisory for a in adv.secondary_members],
315-
# )
316-
# )
317-
# for adv in fixing_advisories_qs
318-
# ]
319-
320-
# affected_advisories: List[GroupedAdvisory] = get_advisories_from_groups(affected_groups)
321-
# fixing_advisories: List[GroupedAdvisory] = get_advisories_from_groups(fixing_groups)
322-
323-
# context["affected_by_advisories_v2"] = affected_advisories
324-
# context["fixing_advisories_v2"] = fixing_advisories
325-
326-
# return context
323+
context["affected_by_advisories_v2"] = affected_advisories
324+
context["fixing_advisories_v2"] = fixing_advisories
325+
326+
return context
327327

328328
if package.type in TYPES_WITH_MULTIPLE_IMPORTERS:
329329
affecting_advisories = AdvisoryV2.objects.latest_affecting_advisories_for_purl(

0 commit comments

Comments
 (0)