common/tests/factories/extensions.py

@@ -6,6 +6,7 @@ from mdgen import MarkdownPostProvider
 import factory
 import factory.fuzzy
 
+from constants.base import FILE_TYPE_CHOICES
 from extensions.models import Extension, Version, Tag, Preview
 from ratings.models import Rating
 
@@ -22,6 +23,25 @@ class ExtensionFactory(DjangoModelFactory):
     description = factory.LazyAttribute(
         lambda _: fake_markdown.post(size=random.choice(('medium', 'large')))
     )
+    icon = factory.SubFactory(
+        'common.tests.factories.files.FileFactory',
+        original_name=factory.Faker('file_name', extension='png'),
+        source='images/de/deadbeef.png',
+        original_hash=factory.Faker('lexify', text='hash:??????????????'),
+        hash=factory.Faker('lexify', text='hash:??????????????'),
+        type=FILE_TYPE_CHOICES.IMAGE,
+        size_bytes=1234,
+    )
+    featured_image = factory.SubFactory(
+        'common.tests.factories.files.FileFactory',
+        original_name=factory.Faker('file_name', extension='jpeg'),
+        source='images/fo/foobar.jpeg',
+        original_hash=factory.Faker('lexify', text='hash:??????????????'),
+        hash=factory.Faker('lexify', text='hash:??????????????'),
+        type=FILE_TYPE_CHOICES.IMAGE,
+        size_bytes=4321,
+        metadata={'thumbnails': {'1080p': {'path': 'images/fo/foobar_1920x1080_random7.webp'}}},
+    )
     support = factory.Faker('url')
     website = factory.Faker('url')
 

extensions/tests/test_submit.py

@@ -273,6 +273,8 @@ class SubmitFinaliseTest(TestCase):
             extension__name=file_data['metadata']['name'],
             extension__slug=file_data['metadata']['id'].replace("_", "-"),
             extension__website=None,
+            extension__icon=None,
+            extension__featured_image=None,
             tagline=file_data['metadata']['tagline'],
             version=file_data['metadata']['version'],
             blender_version_min=file_data['metadata']['blender_version_min'],

extensions/tests/test_update.py

@@ -97,6 +97,7 @@ class UpdateTest(TestCase):
 
     def test_post_upload_multiple_preview_images(self):
         extension = create_approved_version().extension
+        images_count_before = File.objects.filter(type=File.TYPES.IMAGE).count()
 
         data = {
             **POST_DATA,
@@ -122,7 +123,9 @@ class UpdateTest(TestCase):
         self.assertEqual(response.status_code, 302, _get_all_form_errors(response))
         self.assertEqual(response['Location'], url)
         extension.refresh_from_db()
-        self.assertEqual(File.objects.filter(type=File.TYPES.IMAGE).count(), 2)
+        self.assertEqual(
+            File.objects.filter(type=File.TYPES.IMAGE).count(), images_count_before + 2
+        )
         self.assertEqual(extension.previews.count(), 2)
         file1 = extension.previews.all()[0]
         file2 = extension.previews.all()[1]

extensions/tests/test_views.py

@@ -70,6 +70,12 @@ class PublicViewsTest(_BaseTestCase):
             self.assertIn('license', v)
             self.assertIn('website', v)
             self.assertIn('schema_version', v)
+            self.assertEqual(
+                v['icon_url'], 'https://extensions.local:8111/media/images/de/deadbeef.png'
+            )
+            self.assertEqual(
+                v['featured_image_url'], 'https://extensions.local:8111/media/images/fo/foobar.jpeg'
+            )
         return response
 
     def test_home_page_view_api(self):

extensions/views/api.py

@@ -9,6 +9,7 @@ from django.core.exceptions import ValidationError
 from common.compare import is_in_version_range, version
 from extensions.models import Extension
 from extensions.utils import clean_json_dictionary_from_optional_fields
+from utils import absolutify
 
 
 from constants.base import (
@@ -68,6 +69,11 @@ class ListedExtensionsSerializer(serializers.ModelSerializer):
         if not matching_version:
             return None
 
+        icon_url = featured_image_url = None
+        if instance.icon:
+            icon_url = absolutify(instance.icon.source.url)
+        if instance.featured_image:
+            featured_image_url = absolutify(instance.featured_image.thumbnail_1080p_url)
         data = {
             'id': instance.extension_id,
             'schema_version': matching_version.schema_version,
@@ -87,6 +93,8 @@ class ListedExtensionsSerializer(serializers.ModelSerializer):
             'permissions': [permission.slug for permission in matching_version.permissions.all()],
             # TODO: handle copyright
             'tags': [str(tag) for tag in matching_version.tags.all()],
+            'icon_url': icon_url,
+            'featured_image_url': featured_image_url,
         }
 
         return clean_json_dictionary_from_optional_fields(data)
@@ -106,14 +114,21 @@ class ExtensionsAPIView(APIView):
     )
     def get(self, request):
         blender_version = request.GET.get('blender_version')
-        qs = Extension.objects.listed.prefetch_related(
+        qs = (
-            'authors',
+            Extension.objects.listed.select_related(
-            'versions',
+                'icon',
-            'versions__file',
+                'featured_image',
-            'versions__licenses',
+            )
-            'versions__permissions',
+            .prefetch_related(
-            'versions__tags',
+                'authors',
-        ).all()
+                'versions',
+                'versions__file',
+                'versions__licenses',
+                'versions__permissions',
+                'versions__tags',
+            )
+            .all()
+        )
         serializer = self.serializer_class(
             qs, blender_version=blender_version, request=request, many=True
         )