Fix 500 errors caused by templates

app/logic/__init__.py

@@ -218,3 +218,26 @@ def generate_signed_url():
                             props=filedata[relative_path])
         res_payload['filedata'][relative_path] = response.build_file_information()
     return res_payload
+
+
+#### helpers
+
+def validate_for_template(descriptor):
+    '''
+    Cheks if descriptor fields have expected type for template Eg:
+    licenses should be list
+    '''
+    licenses = descriptor.get('licenses')
+
+    if licenses is None or type(licenses) is list:
+        return descriptor
+
+    if type(licenses) is dict:
+        license = descriptor.pop('licenses')
+        license = license.get('type')
+        descriptor['license'] = license
+        return descriptor
+
+    descriptor.pop('licenses')
+
+    return descriptor

tests/logic/test_logic.py

@@ -175,3 +175,34 @@ def tearDown(self):
             db.session.remove()
             db.drop_all()
             db.engine.dispose()
+
+class HelpersTest(unittest.TestCase):
+
+
+    def setUp(self):
+        self.descriptor = json.loads(open('fixtures/datapackage.json').read())
+
+
+    def test_validate_for_jinja_returns_descriptor_if_no_licenses(self):
+        descriptor = validate_for_template(self.descriptor)
+        self.assertEqual(self.descriptor, descriptor)
+
+    def test_validate_for_jinja_returns_descriptor_if_licenses_is_list(self):
+        self.descriptor['licenses'] = []
+        descriptor = validate_for_template(self.descriptor)
+        self.assertEqual(self.descriptor, descriptor)
+
+    def test_validate_for_jinja_modifies_descriptor_if_licenses_is_dict(self):
+        self.descriptor['licenses'] = {'url': 'test/url', 'type': 'Test'}
+        descriptor = validate_for_template(self.descriptor)
+        self.assertEqual(descriptor['license'], 'Test')
+
+    def test_validate_for_not_errors_if_licenses_is_dict_and_has_no_type_key(self):
+        self.descriptor['licenses'] = {'url': 'test/url'}
+        descriptor = validate_for_template(self.descriptor)
+        self.assertEqual(descriptor['license'], None)
+
+    def test_validate_for_jinja_removes_licenses_if_invalid_type(self):
+        self.descriptor['licenses'] = 1
+        descriptor = validate_for_template(self.descriptor)
+        self.assertEqual(descriptor.get('licenses'), None)