22.05 #118
Merged
22.05 #118
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
Changes to be committed: modified: bco_api/api/admin.py modified: bco_api/api/models.py modified: bco_api/api/scripts/method_specific/GET_draft_object_by_id.py modified: bco_api/api/scripts/method_specific/GET_published_object_by_id.py modified: bco_api/api/scripts/method_specific/GET_published_object_by_id_with_version.py modified: bco_api/api/scripts/method_specific/POST_api_accounts_new.py modified: bco_api/api/scripts/method_specific/POST_api_objects_drafts_create.py modified: bco_api/api/scripts/method_specific/POST_api_objects_drafts_modify.py modified: bco_api/api/scripts/method_specific/POST_api_objects_drafts_permissions.py modified: bco_api/api/scripts/method_specific/POST_api_objects_drafts_permissions_set.py modified: bco_api/api/scripts/method_specific/POST_api_objects_drafts_publish.py modified: bco_api/api/scripts/method_specific/POST_api_objects_drafts_read.py modified: bco_api/api/scripts/method_specific/POST_api_objects_drafts_token.py modified: bco_api/api/scripts/method_specific/POST_api_objects_publish.py modified: bco_api/api/scripts/method_specific/POST_api_objects_published.py modified: bco_api/api/scripts/method_specific/POST_api_objects_search.py modified: bco_api/api/scripts/utilities/DbUtils.py modified: bco_api/api/signals.py
Also added tests for Prefix, Group, and BCO creation Changes to be committed: deleted: bco_api/api/.vscode/settings.json modified: bco_api/api/admin.py new file: bco_api/api/model/__init__.py renamed: bco_api/api/groups.py -> bco_api/api/model/groups.py new file: bco_api/api/model/prefix.py modified: bco_api/api/models.py modified: bco_api/api/scripts/method_specific/POST_api_objects_drafts_create.py modified: bco_api/api/scripts/method_specific/POST_api_objects_drafts_publish.py modified: bco_api/api/scripts/method_specific/POST_api_objects_search.py deleted: bco_api/api/scripts/method_specific/POST_api_prefixes_create.py deleted: bco_api/api/scripts/method_specific/POST_api_prefixes_delete.py deleted: bco_api/api/scripts/method_specific/POST_api_prefixes_modify.py deleted: bco_api/api/scripts/method_specific/POST_api_prefixes_permissions_set.py deleted: bco_api/api/scripts/method_specific/POST_api_prefixes_token.py deleted: bco_api/api/scripts/method_specific/POST_api_prefixes_token_flat.py modified: bco_api/api/scripts/utilities/DbUtils.py modified: bco_api/api/scripts/utilities/UserUtils.py deleted: bco_api/api/tests.py new file: bco_api/api/tests/test_bcos.json new file: bco_api/api/tests/test_model_bco.py new file: bco_api/api/tests/test_model_groups.py new file: bco_api/api/tests/test_model_prefix.py deleted: bco_api/api/tests/test_models.py modified: bco_api/api/views.py modified: requirements.txt
Changes to be committed: modified: ../.gitignore modified: api/model/groups.py modified: api/model/prefix.py modified: api/models.py modified: api/tests/test_model_groups.py modified: api/tests/test_model_prefix.py modified: api/views.py
Changes to be committed: new file: admin_only/db.sqlite3.dev
Update function get_user_info so that user permissions and groups are flat lists This is for the API to be updated for the userdb Changes to be committed: modified: bco_api/api/model/groups.py modified: bco_api/api/scripts/utilities/UserUtils.py
Adding in the basic code quality analysis scan.
* added in basic django workflow focused on this branch * Update django.yml Need to move to be local with the manage.py file. * File automatically created by django interferes with tests, renamed * 22.05 (#102) * Rename models.bco to models.BCO Changes to be committed: modified: bco_api/api/admin.py modified: bco_api/api/models.py modified: bco_api/api/scripts/method_specific/GET_draft_object_by_id.py modified: bco_api/api/scripts/method_specific/GET_published_object_by_id.py modified: bco_api/api/scripts/method_specific/GET_published_object_by_id_with_version.py modified: bco_api/api/scripts/method_specific/POST_api_accounts_new.py modified: bco_api/api/scripts/method_specific/POST_api_objects_drafts_create.py modified: bco_api/api/scripts/method_specific/POST_api_objects_drafts_modify.py modified: bco_api/api/scripts/method_specific/POST_api_objects_drafts_permissions.py modified: bco_api/api/scripts/method_specific/POST_api_objects_drafts_permissions_set.py modified: bco_api/api/scripts/method_specific/POST_api_objects_drafts_publish.py modified: bco_api/api/scripts/method_specific/POST_api_objects_drafts_read.py modified: bco_api/api/scripts/method_specific/POST_api_objects_drafts_token.py modified: bco_api/api/scripts/method_specific/POST_api_objects_publish.py modified: bco_api/api/scripts/method_specific/POST_api_objects_published.py modified: bco_api/api/scripts/method_specific/POST_api_objects_search.py modified: bco_api/api/scripts/utilities/DbUtils.py modified: bco_api/api/signals.py * Move Groups and Prefix to separate model files Also added tests for Prefix, Group, and BCO creation Changes to be committed: deleted: bco_api/api/.vscode/settings.json modified: bco_api/api/admin.py new file: bco_api/api/model/__init__.py renamed: bco_api/api/groups.py -> bco_api/api/model/groups.py new file: bco_api/api/model/prefix.py modified: bco_api/api/models.py modified: bco_api/api/scripts/method_specific/POST_api_objects_drafts_create.py modified: bco_api/api/scripts/method_specific/POST_api_objects_drafts_publish.py modified: bco_api/api/scripts/method_specific/POST_api_objects_search.py deleted: bco_api/api/scripts/method_specific/POST_api_prefixes_create.py deleted: bco_api/api/scripts/method_specific/POST_api_prefixes_delete.py deleted: bco_api/api/scripts/method_specific/POST_api_prefixes_modify.py deleted: bco_api/api/scripts/method_specific/POST_api_prefixes_permissions_set.py deleted: bco_api/api/scripts/method_specific/POST_api_prefixes_token.py deleted: bco_api/api/scripts/method_specific/POST_api_prefixes_token_flat.py modified: bco_api/api/scripts/utilities/DbUtils.py modified: bco_api/api/scripts/utilities/UserUtils.py deleted: bco_api/api/tests.py new file: bco_api/api/tests/test_bcos.json new file: bco_api/api/tests/test_model_bco.py new file: bco_api/api/tests/test_model_groups.py new file: bco_api/api/tests/test_model_prefix.py deleted: bco_api/api/tests/test_models.py modified: bco_api/api/views.py modified: requirements.txt * Clean up imports Changes to be committed: modified: ../.gitignore modified: api/model/groups.py modified: api/model/prefix.py modified: api/models.py modified: api/tests/test_model_groups.py modified: api/tests/test_model_prefix.py modified: api/views.py * Add dev db Changes to be committed: new file: admin_only/db.sqlite3.dev * Create codeql-analysis.yml (#101) Adding in the basic code quality analysis scan. Co-authored-by: Hadley King <[email protected]> * fixed stray code * Update django.yml Changed for all PRs and any Pushes directly to main. Co-authored-by: John Torcivia <[email protected]> Co-authored-by: Hadley King <[email protected]>
Update function get_user_info so that user permissions and groups are flat lists This is for the API to be updated for the userdb Changes to be committed: modified: bco_api/api/model/groups.py modified: bco_api/api/scripts/utilities/UserUtils.py
…n multiple places
- add conditional for 'null' values of creation_object['expiration'] - modified to add 'group_admin' or submitter to created group - update Responses to be more informative - add '201_group_users_excluded' to DbUtils to list usernames not found on group creation On branch groups Your branch is up to date with 'origin/groups'. Changes to be committed: modified: api/model/groups.py modified: api/scripts/utilities/DbUtils.py modified: api/scripts/utilities/UserUtils.py
On branch groups Your branch is up to date with 'origin/groups'. Changes to be committed: modified: api/model/groups.py modified: api/views.py
Groups [WIP] Clean up UserUtils.py for get_user_info 276d15d @HadleyKing Changes to post_api_groups_create ab21ae3 @HadleyKing Update to post_api_groups_info function 17c5f7b @HadleyKing Merge branch '22.05' into groups
On branch ObjectVersioning Changes to be committed: modified: api/scripts/utilities/UserUtils.py
- Add Object conflict error in DbUtils - update post_api_objects_drafts_publish - update get_draft_object_by_id - change function imports from views.py On branch ObjectVersioning Your branch is up to date with 'origin/ObjectVersioning'. Changes to be committed: modified: api/scripts/method_specific/GET_draft_object_by_id.py modified: api/scripts/method_specific/POST_api_objects_drafts_publish.py modified: api/scripts/utilities/DbUtils.py modified: api/views.py
104 unit testing for api
* Update UserUtils for new user_info object On branch ObjectVersioning Changes to be committed: modified: api/scripts/utilities/UserUtils.py * Disallowed duplicate published biocompute object - Add Object conflict error in DbUtils - update post_api_objects_drafts_publish - update get_draft_object_by_id - change function imports from views.py On branch ObjectVersioning Your branch is up to date with 'origin/ObjectVersioning'. Changes to be committed: modified: api/scripts/method_specific/GET_draft_object_by_id.py modified: api/scripts/method_specific/POST_api_objects_drafts_publish.py modified: api/scripts/utilities/DbUtils.py modified: api/views.py * Roll back GroupInfo model Changes to be committed: modified: api/model/groups.py modified: api/scripts/utilities/DbUtils.py modified: api/signals.py modified: api/urls.py * Remove button from unsuccessful activation page Close #120 Changes to be committed: modified: api/templates/api/account_activation_message.html * Add GroupInfo to Prefix listener needed GroupInfo.objects for prefix groups to enable sharing and editing. Changes to be committed: modified: ../admin_only/db.sqlite3.dev modified: api/model/groups.py modified: api/model/prefix.py * Remove debugging Changes to be committed: modified: api/model/prefix.py
* prefix and prefix table tests * WIP: run at testing the API via the Client library; so far not working although its not explicitly failing the unit tests Co-authored-by: John Torcivia <[email protected]>
Changes to be committed: modified: api/scripts/method_specific/POST_api_objects_drafts_create.py
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.
No description provided.