organization image (fixes #1068)

backend/apps/volontulo/factories.py

@@ -134,6 +134,10 @@ class Meta:  # pylint: disable=C0111
     name = factory.fuzzy.FuzzyAttribute(_organization_name)
     address = factory.Faker("address", locale="pl_PL")
     description = factory.Faker("paragraph")
+    image = ImageField(from_path=os.path.join(
+        os.path.dirname(__file__),
+        'static/volontulo/img/volontulo_baner.png'
+    ))
 
 
 def placeimg_com_download(width, height, category):

backend/apps/volontulo/management/commands/populate_database.py

@@ -24,7 +24,11 @@ def handle(self, *args, **options):
 
         self.stdout.write(self.style.SUCCESS('Creating 15 organizations'))
         for _ in tqdm(range(15)):
-            organization = OrganizationFactory.create()
+            organization = OrganizationFactory.create(
+                image=ImageField(
+                    from_func=placeimg_com_download(1000, 400, 'any')
+                )
+            )
             UserProfileFactory.create(
                 organizations=(organization,),
             )

backend/apps/volontulo/migrations/0018_organization_image.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2018-10-31 18:45
+from __future__ import unicode_literals
+
+import apps.volontulo.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('volontulo', '0017_remove_offer_recruitment_status'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='organization',
+            name='image',
+            field=models.ImageField(blank=True, null=True, upload_to=apps.volontulo.models.upload_to_organizations),
+        ),
+    ]

backend/apps/volontulo/models.py

@@ -31,12 +31,32 @@ def upload_to_offers(_, filename):
     )
 
 
+def upload_to_organizations(_, filename):
+    """
+    Upload to organizations path.
+
+    This needs to be a full-body func because
+    migrations requires it to be serializable.
+    """
+    _, file_extension = os.path.splitext(filename)
+    return os.path.join(
+        'organizations',
+        '{}{}'.format(uuid.uuid4(), file_extension),
+    )
+
+
 class Organization(models.Model):
     """Model that handles ogranizations/institutions."""
     name = models.CharField(max_length=150, db_index=True)
     address = models.CharField(max_length=150)
     description = models.TextField()
 
+    image = models.ImageField(
+        upload_to=upload_to_organizations,
+        null=True,
+        blank=True
+    )
+
     def __str__(self):
         """Organization model string reprezentation."""
         return self.name

backend/apps/volontulo/serializers.py

@@ -31,16 +31,33 @@ def run_validation(self, data=empty):
         return data
 
 
+class ImageField(serializers.Field):
+
+    """Custom field for offer's image serialization."""
+
+    def to_representation(self, value):
+        """Transform internal value into serializer representation."""
+        return self.context['request'].build_absolute_uri(
+            location=value.url
+        ) if value else None
+
+    def to_internal_value(self, data):
+        """Transform  serializer representation into internal value."""
+        return io.BytesIO(base64.b64decode(data))
+
+
 class OrganizationSerializer(serializers.HyperlinkedModelSerializer):
     """REST API organizations serializer."""
     slug = serializers.SerializerMethodField()
+    image = ImageField(allow_null=True, required=False)
 
     class Meta:
         model = models.Organization
         fields = (
             'address',
             'description',
             'id',
+            'image',
             'name',
             'slug',
             'url',
@@ -77,21 +94,6 @@ def to_internal_value(self, data):
             )
 
 
-class ImageField(serializers.Field):
-
-    """Custom field for offer's image serialization."""
-
-    def to_representation(self, value):
-        """Transform internal value into serializer representation."""
-        return self.context['request'].build_absolute_uri(
-            location=value.url
-        ) if value else None
-
-    def to_internal_value(self, data):
-        """Transform  serializer representation into internal value."""
-        return io.BytesIO(base64.b64decode(data))
-
-
 class OfferSerializer(serializers.HyperlinkedModelSerializer):
 
     """REST API offers serializer."""

backend/apps/volontulo/tests/common.py

@@ -101,6 +101,7 @@ def test_offer_list_fields(self, offer):
     self.assertIsInstance(offer['organization'].pop('address'), str)
     self.assertIsInstance(offer['organization'].pop('description'), str)
     self.assertIsInstance(offer['organization'].pop('id'), int)
+    self.assertIsInstance(offer['organization'].pop('image'), str)
     self.assertIsInstance(offer['organization'].pop('name'), str)
     self.assertIsInstance(offer['organization'].pop('slug'), str)
     self.assertIsInstance(offer['organization'].pop('url'), str)

backend/apps/volontulo/tests/views/api/organizations/test_list.py

@@ -22,6 +22,7 @@ def test_organization_list_fields(self):
             self.assertIsInstance(organization.pop('address'), str)
             self.assertIsInstance(organization.pop('description'), str)
             self.assertIsInstance(organization.pop('id'), int)
+            self.assertIsInstance(organization.pop('image'), str)
             self.assertIsInstance(organization.pop('name'), str)
             self.assertIsInstance(organization.pop('slug'), str)
             self.assertIsInstance(organization.pop('url'), str)

backend/apps/volontulo/tests/views/api/organizations/test_read.py

@@ -20,6 +20,7 @@ def _test_organization_read_fields(self, organization):
         self.assertIsInstance(organization.pop('address'), str)
         self.assertIsInstance(organization.pop('description'), str)
         self.assertIsInstance(organization.pop('id'), int)
+        self.assertIsInstance(organization.pop('image'), str)
         self.assertIsInstance(organization.pop('name'), str)
         self.assertIsInstance(organization.pop('slug'), str)
         self.assertIsInstance(organization.pop('url'), str)