From 8a4a53f028d96ff4bae0b14610b17af695bed800 Mon Sep 17 00:00:00 2001 From: Dan Date: Wed, 29 Sep 2021 14:05:45 -0400 Subject: [PATCH 1/2] Assure that the field type provided is supported. Catches errors such as adding a custom field type of 'text_area' rather than "textarea" --- crc/models/file.py | 9 ++++++-- tests/files/test_files_api.py | 42 ++++++++++++++++++++++------------- 2 files changed, 34 insertions(+), 17 deletions(-) diff --git a/crc/models/file.py b/crc/models/file.py index da59cff7..3fbe8a37 100644 --- a/crc/models/file.py +++ b/crc/models/file.py @@ -1,6 +1,9 @@ import enum import urllib + +import connexion import flask +from flask import url_for from marshmallow import INCLUDE, EXCLUDE, Schema from marshmallow.fields import Method from marshmallow_enum import EnumField @@ -153,10 +156,12 @@ class FileSchema(Schema): def get_url(self, obj): token = 'not_available' + base_url = connexion.request.host_url + file_url = url_for("/v1_0.crc_api_file_get_file_data_link", file_id=obj.id) if hasattr(flask.g, 'user'): token = flask.g.user.encode_auth_token() - return (app.config['APPLICATION_ROOT'] + 'file/' + - str(obj.id) + '/download?auth_token=' + urllib.parse.quote_plus(token)) + url = base_url + file_url + '?auth_token=' + urllib.parse.quote_plus(token) + return url class LookupFileModel(db.Model): diff --git a/tests/files/test_files_api.py b/tests/files/test_files_api.py index 17f49e9e..6d4e8deb 100644 --- a/tests/files/test_files_api.py +++ b/tests/files/test_files_api.py @@ -78,7 +78,8 @@ class TestFilesApi(BaseTest): data = {'file': (io.BytesIO(b"abcdef"), 'random_fact.svg')} rv = self.app.post('/v1.0/file?study_id=%i&workflow_id=%s&task_spec_name=%s&form_field_key=%s' % - (workflow.study_id, workflow.id, task.get_name(), correct_name), data=data, follow_redirects=True, + (workflow.study_id, workflow.id, task.get_name(), correct_name), data=data, + follow_redirects=True, content_type='multipart/form-data', headers=self.logged_in_headers()) self.assert_success(rv) @@ -94,7 +95,8 @@ class TestFilesApi(BaseTest): data = {'file': (io.BytesIO(b"abcdef"), 'random_fact.svg')} rv = self.app.post('/v1.0/file?study_id=%i&workflow_id=%s&task_spec_name=%s&form_field_key=%s' % - (workflow.study_id, workflow.id, task.get_name(), correct_name), data=data, follow_redirects=True, + (workflow.study_id, workflow.id, task.get_name(), correct_name), data=data, + follow_redirects=True, content_type='multipart/form-data', headers=self.logged_in_headers()) self.assert_success(rv) @@ -176,13 +178,25 @@ class TestFilesApi(BaseTest): file.name = "silly_new_name.bpmn" rv = self.app.put('/v1.0/file/%i' % file.id, - content_type="application/json", - data=json.dumps(FileModelSchema().dump(file)), headers=self.logged_in_headers()) + content_type="application/json", + data=json.dumps(FileModelSchema().dump(file)), headers=self.logged_in_headers()) self.assert_success(rv) db_file = session.query(FileModel).filter_by(id=file.id).first() self.assertIsNotNone(db_file) self.assertEqual(file.name, db_file.name) + def test_load_valid_url_for_files(self): + self.load_example_data() + self.create_reference_document() + file: FileModel = session.query(FileModel).filter(FileModel.is_reference == False).first() + rv = self.app.get('/v1.0/file/%i' % file.id, content_type="application/json", headers=self.logged_in_headers()) + self.assert_success(rv) + file_json = json.loads(rv.get_data(as_text=True)) + print(file_json) + self.assertIsNotNone(file_json['url']) + file_data_rv = self.app.get(file_json['url']) + self.assert_success(file_data_rv) + def test_update_file_data(self): self.load_example_data() spec = session.query(WorkflowSpecModel).first() @@ -209,7 +223,7 @@ class TestFilesApi(BaseTest): file_data = FileService.get_file_data(file_model.id) self.assertEqual(2, file_data.version) - rv = self.app.get('/v1.0/file/%i/data' % file_json['id'], headers=self.logged_in_headers()) + rv = self.app.get('/v1.0/file/%i/data' % file_json['id'], headers=self.logged_in_headers()) self.assert_success(rv) data = rv.get_data() self.assertIsNotNone(data) @@ -262,7 +276,8 @@ class TestFilesApi(BaseTest): data = {'file': (io.BytesIO(b"abcdef"), 'random_fact.svg')} rv = self.app.post('/v1.0/file?study_id=%i&workflow_id=%s&task_spec_name=%s&form_field_key=%s' % - (workflow.study_id, workflow.id, task.get_name(), correct_name), data=data, follow_redirects=True, + (workflow.study_id, workflow.id, task.get_name(), correct_name), data=data, + follow_redirects=True, content_type='multipart/form-data', headers=self.logged_in_headers()) self.assert_success(rv) @@ -296,7 +311,8 @@ class TestFilesApi(BaseTest): data = {'file': (io.BytesIO(b"abcdef"), 'random_fact.svg')} rv = self.app.post('/v1.0/file?study_id=%i&workflow_id=%s&task_spec_name=%s&form_field_key=%s' % - (workflow.study_id, workflow.id, task.get_name(), correct_name), data=data, follow_redirects=True, + (workflow.study_id, workflow.id, task.get_name(), correct_name), data=data, + follow_redirects=True, content_type='multipart/form-data', headers=self.logged_in_headers()) self.assert_success(rv) json_data = json.loads(rv.get_data(as_text=True)) @@ -315,8 +331,6 @@ class TestFilesApi(BaseTest): rv = self.app.get('/v1.0/file/%i' % file_id, headers=self.logged_in_headers()) self.assertEqual(404, rv.status_code) - - def test_change_primary_bpmn(self): self.load_example_data() spec = session.query(WorkflowSpecModel).first() @@ -332,19 +346,17 @@ class TestFilesApi(BaseTest): file = FileModelSchema().load(json_data, session=session) # Delete the primary BPMN file for the workflow. - orig_model = session.query(FileModel).\ - filter(FileModel.primary == True).\ + orig_model = session.query(FileModel). \ + filter(FileModel.primary == True). \ filter(FileModel.workflow_spec_id == spec.id).first() rv = self.app.delete('/v1.0/file?file_id=%s' % orig_model.id, headers=self.logged_in_headers()) - # Set that new file to be the primary BPMN, assure it has a primary_process_id file.primary = True rv = self.app.put('/v1.0/file/%i' % file.id, - content_type="application/json", - data=json.dumps(FileModelSchema().dump(file)), headers=self.logged_in_headers()) + content_type="application/json", + data=json.dumps(FileModelSchema().dump(file)), headers=self.logged_in_headers()) self.assert_success(rv) json_data = json.loads(rv.get_data(as_text=True)) self.assertTrue(json_data['primary']) self.assertIsNotNone(json_data['primary_process_id']) - From e002ffd3638c5b893d5719ae89004b65936ff726 Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 30 Sep 2021 10:30:58 -0400 Subject: [PATCH 2/2] Fixing a broken test. --- crc/models/file.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crc/models/file.py b/crc/models/file.py index 3fbe8a37..a8e5b197 100644 --- a/crc/models/file.py +++ b/crc/models/file.py @@ -157,6 +157,8 @@ class FileSchema(Schema): def get_url(self, obj): token = 'not_available' base_url = connexion.request.host_url + if obj.id is None: + return "" # We can't return a url for a file that isn't stored yet. file_url = url_for("/v1_0.crc_api_file_get_file_data_link", file_id=obj.id) if hasattr(flask.g, 'user'): token = flask.g.user.encode_auth_token()