Refine the QuerySet and rendering og the Package set tab #276

Signed-off-by: tdruez <[email protected]>

Author: tdruez

component_catalog/templates/component_catalog/tabs/tab_package_set.html

@@ -6,6 +6,7 @@
       <th>{% trans 'Package URL' %}</th>
       <th>{% trans 'Download URL' %}</th>
       <th>{% trans 'Filename' %}</th>
+      <th>{% trans 'Concluded license' %}</th>
     </tr>
   </thead>
   <tbody>
@@ -21,8 +22,9 @@
             <a href="{{ package.get_absolute_url }}" target="_blank">{{ package.package_url }}</a>
           {% endif %}
         </td>
-        <td>{{ package.download_url|default_if_none:"" }}</td>
         <td>{{ package.filename|default_if_none:"" }}</td>
+        <td>{{ package.download_url|default_if_none:"" }}</td>
+        <td>{{ package.license_expression|default_if_none:"" }}</td>
       </tr>
     {% endfor %}
   </tbody>

component_catalog/views.py

@@ -67,6 +67,7 @@
 from component_catalog.license_expression_dje import get_unique_license_keys
 from component_catalog.models import Component
 from component_catalog.models import Package
+from component_catalog.models import PACKAGE_URL_FIELDS
 from component_catalog.models import PackageAlreadyExistsWarning
 from component_catalog.models import Subcomponent
 from dejacode_toolkit.download import DataCollectionException
@@ -1300,7 +1301,24 @@ def tab_others(self):
 
     def tab_package_set(self):
         plain_url = self.object.plain_package_url
-        related_packages = self.get_queryset().for_package_url(plain_url)
+        related_packages = (
+            self.model.objects.scope(self.object.dataspace)
+            .for_package_url(plain_url)
+            .only(
+                "uuid",
+                *PACKAGE_URL_FIELDS,
+                "filename",
+                "download_url",
+                "license_expression",
+                "dataspace__name",
+            )
+            .order_by(
+                *PACKAGE_URL_FIELDS,
+                "filename",
+                "download_url",
+            )
+            .distinct()
+        )
 
         template = "component_catalog/tabs/tab_package_set.html"
         if len(related_packages) > 1: