Develop #149
Merged
Develop #149
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PFWhite
suggested changes
Apr 27, 2017
app/deploy/fabfile.py
Outdated
| @@ -352,7 +352,8 @@ def mysql_create_tables(): | |||
| '002/upgrade.sql', | |||
| '002/data.sql', | |||
| '003/upgrade.sql', | |||
| '004/upgrade.sql'] | |||
| '004/upgrade.sql', | |||
| '005/upgrade.sql' ] | |||
app/deploy/fabfile.py
Outdated
| @@ -377,7 +378,8 @@ def mysql_drop_tables(): | |||
| abort(colors.red("Unable to drop tables in database '%(db_name)s'." | |||
| "The database does not exist" % env)) | |||
|
|
|||
| files = ['004/downgrade.sql', | |||
| files = ['005/downgrade.sql', | |||
| '004/downgrade.sql', | |||
| @@ -100,7 +101,8 @@ def serialize(self): | |||
| 'file_name': self.file_name, | |||
| 'file_check_sum': self.file_check_sum, | |||
| 'file_size': self.file_size, | |||
| 'uploaded_at': utils.localize_est_datetime(self.uploaded_at), | |||
| 'file_type': self.file_type, | |||
| 'uploaded_at': utils.localize_est_datetime(self.uploaded_at), | |||
app/redidropper/routes/api.py
Outdated
| #@login_required | ||
| def all_files_info(): | ||
| """ Get the list of all uploaded files and their path """ | ||
|
|
There was a problem hiding this comment.
formatting, delete this line
app/redidropper/routes/api.py
Outdated
| return_list = [] | ||
| for subject_file in all_files: | ||
| path = subject_file.get_full_path(app.config['REDIDROPPER_UPLOAD_SAVED_DIR']) | ||
| file_json = subject_file.serialize() |
There was a problem hiding this comment.
The serialize function used here needs work. Right now it doesnt contain the new fields that you add in this story. Also some of the information is commented out in that code. You should delete it.
Also make sure that when you are returning the event, return the "unique_event_name" this is the foreign key that we typically use.
| @@ -15,6 +15,7 @@ | |||
| <link href="{{ url_for('static', filename='css/layout.css') }}" rel="stylesheet"> | |||
| <link href="{{ url_for('static', filename='css/start_upload.css') }}" rel="stylesheet"> | |||
| <link href="{{ url_for('static', filename='css/parallax.css') }}" rel="stylesheet"> | |||
| <link href="{{ url_for('static', filename='css/dashboard.css') }}" rel="stylesheet"> | |||
app/tests/base_test_with_data.py
Outdated
| @@ -116,7 +117,8 @@ def create_sample_data(self): | |||
| subject_id=subject.id, | |||
| event_id=fdata['event'], | |||
| file_name=fdata['name'], | |||
| file_check_sum=utils.compute_text_md5(fdata['name']), | |||
| file_type="N/A", | |||
| file_check_sum=utils.compute_text_md5(fdata['name']), | |||
app/tests/test_api.py
Outdated
| event_id=fdata['event'], | ||
| file_name=fdata['name'], | ||
| file_type="N/A", | ||
| file_check_sum=utils.compute_text_md5(fdata['name']), |
| @@ -84,6 +91,54 @@ def test_edit_user(self): | |||
| self.fail('user not existing') | |||
| print('edit user test') | |||
|
|
|||
| def test_update_fileType(self): | |||
There was a problem hiding this comment.
Great job on this unit test! Meaningful, useful and complete
vagrant/bootstrap_functions.sh
Outdated
| @@ -80,7 +80,10 @@ function install_dropper() { | |||
| mysql ctsi_dropper_s < db/003/upgrade.sql | |||
| log "Execute sql: db/004/upgrade.sql" | |||
| mysql ctsi_dropper_s < db/004/upgrade.sql | |||
|
|
|||
| log "Execute sql: db/005/upgrade.sql" | |||
|
I have addressed the review comments. |
|
Great job! merging |
PFWhite
approved these changes
May 2, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added Image type field to SubjectFile and api to get information about all uploaded files