Commit 0bd39386 by Zia Fazal Committed by Jonathan Piacenti

ziafazal/api-add-company-logo-to-organization-model: added logo_url field

parent 5535f68b
...@@ -144,6 +144,7 @@ class Organization(TimeStampedModel): ...@@ -144,6 +144,7 @@ class Organization(TimeStampedModel):
contact_name = models.CharField(max_length=255, null=True, blank=True) contact_name = models.CharField(max_length=255, null=True, blank=True)
contact_email = models.EmailField(max_length=255, null=True, blank=True) contact_email = models.EmailField(max_length=255, null=True, blank=True)
contact_phone = models.CharField(max_length=50, null=True, blank=True) contact_phone = models.CharField(max_length=50, null=True, blank=True)
logo_url = models.CharField(max_length=255, blank=True, null=True)
workgroups = models.ManyToManyField(Workgroup, related_name="organizations") workgroups = models.ManyToManyField(Workgroup, related_name="organizations")
users = models.ManyToManyField(User, related_name="organizations") users = models.ManyToManyField(User, related_name="organizations")
groups = models.ManyToManyField(Group, related_name="organizations") groups = models.ManyToManyField(Group, related_name="organizations")
......
...@@ -13,8 +13,8 @@ class OrganizationSerializer(serializers.ModelSerializer): ...@@ -13,8 +13,8 @@ class OrganizationSerializer(serializers.ModelSerializer):
class Meta: class Meta:
""" Serializer/field specification """ """ Serializer/field specification """
model = Organization model = Organization
fields = ('url', 'id', 'name', 'display_name', 'contact_name', 'contact_email', 'contact_phone', 'workgroups', fields = ('url', 'id', 'name', 'display_name', 'contact_name', 'contact_email', 'contact_phone'
'users', 'groups', 'created', 'modified') , 'logo_url', 'workgroups', 'users', 'groups', 'created', 'modified')
read_only = ('url', 'id', 'created') read_only = ('url', 'id', 'created')
...@@ -25,5 +25,5 @@ class BasicOrganizationSerializer(serializers.ModelSerializer): ...@@ -25,5 +25,5 @@ class BasicOrganizationSerializer(serializers.ModelSerializer):
class Meta: class Meta:
""" Serializer/field specification """ """ Serializer/field specification """
model = Organization model = Organization
fields = ('url', 'id', 'name', 'created', 'display_name') fields = ('url', 'id', 'name', 'created', 'display_name', 'logo_url')
read_only = ('url', 'id', 'created',) read_only = ('url', 'id', 'created',)
...@@ -48,6 +48,7 @@ class OrganizationsApiTests(ModuleStoreTestCase): ...@@ -48,6 +48,7 @@ class OrganizationsApiTests(ModuleStoreTestCase):
self.test_organization_contact_name = 'John Org' self.test_organization_contact_name = 'John Org'
self.test_organization_contact_email = 'john@test.org' self.test_organization_contact_email = 'john@test.org'
self.test_organization_contact_phone = '+1 332 232 24234' self.test_organization_contact_phone = '+1 332 232 24234'
self.test_organization_logo_url = 'org_logo.jpg'
self.test_user_email = str(uuid.uuid4()) self.test_user_email = str(uuid.uuid4())
self.test_user_username = str(uuid.uuid4()) self.test_user_username = str(uuid.uuid4())
...@@ -117,6 +118,7 @@ class OrganizationsApiTests(ModuleStoreTestCase): ...@@ -117,6 +118,7 @@ class OrganizationsApiTests(ModuleStoreTestCase):
'contact_name': self.test_organization_contact_name, 'contact_name': self.test_organization_contact_name,
'contact_email': self.test_organization_contact_email, 'contact_email': self.test_organization_contact_email,
'contact_phone': self.test_organization_contact_phone, 'contact_phone': self.test_organization_contact_phone,
'logo_url': self.test_organization_logo_url,
'users': users 'users': users
} }
response = self.do_post(self.base_organizations_uri, data) response = self.do_post(self.base_organizations_uri, data)
...@@ -134,6 +136,7 @@ class OrganizationsApiTests(ModuleStoreTestCase): ...@@ -134,6 +136,7 @@ class OrganizationsApiTests(ModuleStoreTestCase):
self.assertEqual(response.data['contact_name'], self.test_organization_contact_name) self.assertEqual(response.data['contact_name'], self.test_organization_contact_name)
self.assertEqual(response.data['contact_email'], self.test_organization_contact_email) self.assertEqual(response.data['contact_email'], self.test_organization_contact_email)
self.assertEqual(response.data['contact_phone'], self.test_organization_contact_phone) self.assertEqual(response.data['contact_phone'], self.test_organization_contact_phone)
self.assertEqual(response.data['logo_url'], self.test_organization_logo_url)
self.assertIsNotNone(response.data['workgroups']) self.assertIsNotNone(response.data['workgroups'])
self.assertEqual(len(response.data['users']), len(users)) self.assertEqual(len(response.data['users']), len(users))
self.assertIsNotNone(response.data['created']) self.assertIsNotNone(response.data['created'])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment