Require bundle name in badge url

Author: spalmurray

graphs/urls.py

@@ -14,12 +14,12 @@
         name="default-badge",
     ),
     re_path(
-        "branch/(?P<branch>.+)/(graph|graphs)/bundle/badge.(?P<ext>[^/]+)",
+        "branch/(?P<branch>.+)/(graph|graphs)/bundle/(?P<bundle>.+)/badge.(?P<ext>[^/]+)",
         BundleBadgeHandler.as_view(),
         name="branch-bundle-badge",
     ),
     re_path(
-        "(graph|graphs)/bundle/badge.(?P<ext>[^/]+)",
+        "(graph|graphs)/bundle/(?P<bundle>.+)/badge.(?P<ext>[^/]+)",
         BundleBadgeHandler.as_view(),
         name="default-bundle-badge",
     ),

graphs/views.py

@@ -14,7 +14,7 @@
 from api.shared.mixins import RepoPropertyMixin
 from core.models import Branch, Pull
 from graphs.settings import settings
-from services.bundle_analysis import BundleAnalysisReport, load_report
+from services.bundle_analysis import load_report
 from services.components import commit_components
 
 from .helpers.badge import (
@@ -209,7 +209,7 @@ class BundleBadgeHandler(APIView, RepoPropertyMixin, GraphBadgeAPIMixin):
     filename = "bundle-badge"
 
     def get_object(self, request, *args, **kwargs):
-        # Validate coverage precision
+        # Validate precision query param
         precision = self.request.query_params.get("precision", "2")
         if precision not in self.precisions:
             raise NotFound("Bundle size precision should be one of [ 0 || 1 || 2 ]")
@@ -218,7 +218,11 @@ def get_object(self, request, *args, **kwargs):
         bundle_size_bytes = self.get_bundle_size()
 
         if self.kwargs.get("ext") == "txt":
-            return format_bundle_bytes(bundle_size_bytes, precision)
+            return (
+                "unknown"
+                if bundle_size_bytes is None
+                else format_bundle_bytes(bundle_size_bytes, precision)
+            )
 
         return get_bundle_badge(bundle_size_bytes, precision)
 
@@ -253,18 +257,26 @@ def get_bundle_size(self) -> int | None:
             log.warning("Commit not found", extra=dict(commit=branch.head))
             return None
 
-        shared_bundle_report = load_report(commit)
+        commit_bundles = load_report(commit)
 
-        if shared_bundle_report is None:
+        if commit_bundles is None:
             log.warning(
                 "Bundle analysis report not found for commit",
                 extra=dict(commit=branch.head),
             )
             return None
 
-        bundle_report = BundleAnalysisReport(shared_bundle_report)
+        bundle_name = str(self.kwargs.get("bundle"))
+        bundle = commit_bundles.bundle_report(bundle_name)
+
+        if bundle is None:
+            log.warning(
+                "Bundle with provided name not found for commit",
+                extra=dict(commit=branch.head),
+            )
+            return None
 
-        return bundle_report.size_total
+        return bundle.total_size()
 
 
 class GraphHandler(APIView, RepoPropertyMixin, GraphBadgeAPIMixin):