Dan Funk
5dacc46600
Adding some additional bpmns from Staging server to include in tests.
2020-08-27 14:00:45 -04:00
Dan Funk
53d09303d8
Validating that field properties are valid - they must exist as constants on the Task model.
...
Making all the lookup field names consistent.
Fixing the lookup service which was failing at times trying to find the correct field to use for building the lookup table.
Updating validation to check for additional fields and properties.
When connexion level errors occur, wrapping it in an API Error to be consistent.
2020-08-27 14:00:14 -04:00
Dan Funk
23fd1fbfa0
Removing a rogue file.
2020-08-25 11:15:43 -04:00
Dan Funk
d31fd47837
Merge branch 'dev' into feature/python_eval
2020-08-25 11:08:42 -04:00
Aaron Louie
8dcb598a24
Adds unit test for ProtocolBuilderService.get_sponsors
2020-08-25 11:08:13 -04:00
Dan Funk
5be35e8bab
Adding a study sponsors script to return details about study sponsors
2020-08-25 10:30:46 -04:00
Aaron Louie
182e375fdc
Adds a test for string manipulation
2020-08-21 13:46:10 -04:00
Aaron Louie
4dc98a6b6b
Injects current user into task data.
2020-08-21 13:34:37 -04:00
Dan Funk
66e49a347a
Minor tweaks to the eval endpoint, which should take both the expression and the data as one data structure.
2020-08-20 16:13:48 -04:00
Dan Funk
7f60a19d55
Merge pull request #189 from sartography/feature/documents_publishing
...
Update github routines to use branches
2020-08-17 15:52:47 -04:00
Dan Funk
8f5488d910
Don't raise an error when validating workflows that use the ldap script.
2020-08-17 15:45:37 -04:00
Dan Funk
35b1b20960
Merge remote-tracking branch 'origin/dev' into feature/documents_publishing
2020-08-17 15:19:24 -04:00
Dan Funk
d4c5e297cc
Merge remote-tracking branch 'origin/dev' into fix/delete_workflow_endpoint
2020-08-17 15:09:11 -04:00
Dan Funk
32d47c1417
Merge remote-tracking branch 'origin/dev' into fix/delete_workflow_endpoint
2020-08-17 15:08:44 -04:00
Dan Funk
c09441d019
Merge branch 'dev' into fix/delete_workflow_endpoint
2020-08-17 15:07:58 -04:00
Dan Funk
dbd0dbf608
mend
2020-08-17 14:56:24 -04:00
Dan Funk
85ad477b2b
Some minor cleanup on the study status and automatic events. I wanted to avoid having one database model automatically generating other database models as a side effect. The study service now has full responsiblity to recording study events.
...
To help in running tests, adding __init__.py methods to all the test directories.
2020-08-17 14:56:00 -04:00
Carlos Lopez
2bd906e96d
Update github routines to use branches
2020-08-14 11:04:22 -06:00
Carlos Lopez
4f05d99cf0
Fixing typo
2020-08-14 08:48:08 -06:00
Carlos Lopez
369fe4bb35
Automatic events refactoring
2020-08-14 08:36:46 -06:00
Carlos Lopez
aa010272cc
Automatic event creation in study creation
2020-08-14 08:36:10 -06:00
Dan Funk
c57ac6d302
Merge pull request #185 from sartography/feature/107_current_user_info
...
calling ldap with no argument will return information about the curre…
2020-08-14 09:18:10 -04:00
Dan Funk
08c24b7441
Merge pull request #184 from sartography/PMI_fix
...
Pmi fix
2020-08-14 09:17:58 -04:00
Dan Funk
c12e2b97f3
calling ldap with no argument will return information about the current user.
2020-08-13 21:09:52 -04:00
Dan Funk
1a963cf940
Merge branch 'dev' into PMI_fix
2020-08-13 20:49:45 -04:00
Dan Funk
29f53e763c
fixing other tests realted to lookups.
2020-08-13 20:27:51 -04:00
Dan Funk
e29134a019
fixing a few tests realted to stop words.
2020-08-13 18:35:24 -04:00
Dan Funk
32d1036041
Cleaning up the tests.
2020-08-13 18:15:10 -04:00
Dan Funk
9a5c1d7cfb
I may have finally wrapped my head around full text search in python. Now properly using an index based on simple rather than english dictionary which has far fewer stop words and stemming processes and plays much better to the type ahead search we are trying to provide.
...
Stop words are no longer excluded, so "other" is a valid search and gets a result.
2020-08-13 18:13:41 -04:00
Kelly McDonald
7bfcdd53cd
Merge branch 'dev' into cr-workflow-108
2020-08-12 10:50:19 -04:00
Kelly McDonald
c4a15be90c
Change dmn files to python standard,
...
NB: this means mostly false=>False and true=>True
We may have to decide if we want to add false and true as extensions in the python namespace.
2020-08-12 10:48:59 -04:00
Aaron Louie
9a31d591ae
Adds user uid and cascades study event in study model. Fixes migration to properly downgrade enums.
2020-08-12 10:13:23 -04:00
Carlos Lopez
79c14ad23c
Unlinking file from workflow instead of trying to delete it
2020-08-10 22:23:20 -06:00
Carlos Lopez
cef7c48be2
Adding tests
2020-08-10 21:18:41 -06:00
Kelly McDonald
623ecbae8e
Add IRB test
2020-08-07 09:59:53 -04:00
Kelly McDonald
1ab765b50b
Add test for PMI problem
2020-08-06 10:29:14 -04:00
Aaron Louie
2846bf9451
Fleshes out fake PB response, so workflows that pull from PB actually trigger validation errors
2020-08-04 15:50:29 -04:00
Carlos Lopez
50b207307a
Merge branch 'dev' into feature/update_study_status_latest
2020-07-31 14:26:24 -06:00
Carlos Lopez
4fcba113b8
Fixing tests
2020-07-31 11:49:04 -06:00
Aaron Louie
864fd0ad40
Merge branch 'dev' into feature/admin_impersonations
2020-07-31 13:28:56 -04:00
Aaron Louie
c8881cbf91
Merge branch 'dev' into feature/approvals_dashboard_prototype
2020-07-31 12:17:22 -04:00
Carlos Lopez
5d23223e51
New study status update
2020-07-30 21:03:11 -06:00
Aaron Louie
73699e66bd
Merge branch 'dev' into feature/admin_impersonations
2020-07-30 17:36:20 -04:00
Dan Funk
9704cbcb26
Modifications to the ldap scripts to bring them back in line with what Kelly is doing with the evaluation process.
2020-07-30 13:35:20 -04:00
Aaron Louie
f8944da31f
Merge branch 'dev' into feature/admin_impersonations
2020-07-30 13:01:46 -04:00
Aaron Louie
faba0f55ab
Adds AdminSession model and refactors impersonation methods to use it.
2020-07-30 12:40:53 -04:00
Dan Funk
a6ec0c92c7
Merge remote-tracking branch 'origin/dev' into cr-connect-106-augment-eval-methods
2020-07-30 11:38:47 -04:00
Dan Funk
44deee12de
Merge branch 'dev' into feature/improved_task_event_api
2020-07-30 11:28:52 -04:00
Dan Funk
37d1ba5d5a
Merge pull request #160 from sartography/feature/ldap_lookup_script
...
Ldap lookup script
2020-07-30 11:27:38 -04:00
Dan Funk
bf4d882519
Merge branch 'dev' into feature/ldap_lookup_script
2020-07-30 11:19:24 -04:00
Aaron Louie
aa0f24bd33
Fully deletes users from g in test tearDown
2020-07-30 10:40:06 -04:00
Dan Funk
31982f81ae
Merge branch 'dev' into feature/documents_publishing
...
# Conflicts:
# Pipfile.lock
2020-07-30 10:17:08 -04:00
Aaron Louie
1b0ebecbf4
Uses Flask session to store impersonation state.
2020-07-30 10:17:02 -04:00
Aaron Louie
d301e9e6fa
Adds list_users endpoint. Adds admin impersonate uid parameter to user endpoint. Adds some utility methods to user service. Refactors authentication tests.
2020-07-29 22:47:47 -04:00
Carlos Lopez
de49397549
Adjustings tests for protocol builder status changes
2020-07-29 10:51:34 -06:00
Carlos Lopez
73a6b7adf1
Fixing tests
2020-07-29 10:25:57 -06:00
Carlos Lopez
6aa21638de
Updating properly study status & fixing tests
2020-07-29 10:25:57 -06:00
Aaron Louie
f897ee3aea
Merge branch 'feature/approvals_dashboard_prototype' into feature/admin_impersonations
2020-07-29 10:32:46 -04:00
Dan Funk
0ea4c13d09
Convert protocol builder status to always be in lower case in order to better match the front end. And also fixing an issue with the multi_instance that is oddly broken suddenly, and I don't know why.
2020-07-28 17:16:48 -04:00
Aaron Louie
79adb673f2
Fixes display_name custom properties
2020-07-28 14:04:18 -04:00
Dan Funk
4d11fc04a0
dropping the "read_only" flag in favor of a "do_engine_steps" flag, which more clearly defines what is happening.
2020-07-28 13:51:29 -04:00
Dan Funk
f15626033d
Allow the workflow to be requested without making changes to the workflow - requires that you specify a read_only flag of true, otherwise it assumes that you want a fully prepared workflow with the next ready task set to run.
2020-07-28 13:33:38 -04:00
Dan Funk
300026cbc8
Expanding the task events endpoint to accept workflow and study ids as additional filters.
...
Removing events from the study endpoint, too noisy.
2020-07-28 10:16:48 -04:00
Dan Funk
0cb480801b
Provide event data on the Study api endpoint.
...
Speed up the tests a little, because that got out of hand. Need to dig into what is causing this problem.
2020-07-27 17:05:01 -04:00
Dan Funk
8d42d520a0
Adding events to the study that is returned via the api.
2020-07-27 16:32:23 -04:00
Carlos Lopez
de0fe705c3
Wrapping LOCKED task update attempt into a try-catch block for tests
2020-07-27 14:00:44 -06:00
Dan Funk
452f2c3723
Building out a user service for getting the current user, it will provide a number of functions, one of which will allow administrative users to impersonate other users in some circumstances (but will assure that we log events correctly when an impersonation occures)
2020-07-27 14:38:57 -04:00
Dan Funk
0d2cb8c1b8
Correcting an issue with the Navigation where it did not correctly handle looking back to a previous task within the workflow.
...
In some cases the session was not getting committed, leaving rogue assignments outstanding for a workflow.
2020-07-27 12:36:20 -06:00
Dan Funk
6379b26a71
Add a few more details to the workflow metadata model.
2020-07-27 12:34:25 -06:00
Kelly McDonald
cc55aed89c
Change exception name
2020-07-27 12:18:28 -04:00
Kelly McDonald
70ad3872a7
Fix several bugs, most had an issue with the bpmn document
2020-07-27 12:02:34 -04:00
Dan Funk
824582dab1
Hot fix to correct for a failing test due to updates in Spiffworkflow library,
...
and modifying the token authorization so that we can log in as different users when not in production mode.
2020-07-27 11:25:29 -04:00
Kelly McDonald
a124e13c6a
Replace all legacy style calls with new calls.
...
Still having issues where we try to eval an empty definition, not quite sure why there is a difference from what we had before. I may need to revert some of it and determine what is going on.
2020-07-24 14:33:24 -04:00
Kelly McDonald
f5ab283538
Test of adding in the ability of augmenting the workflow to include internal scripts like StudyInfo
...
This is the first waypoint on a larger effort to make all of the 'special scripts' that currently require a shebang to be just another python function.
2020-07-24 12:08:46 -04:00
Kelly McDonald
ce8d7cad16
We resolved a problem with a test with some changes to Spiff, change the correct so that it is correct.
2020-07-23 14:56:12 -04:00
Carlos Lopez
74e5e07114
Testing for all values
2020-07-23 07:41:29 -06:00
Aaron Louie
aa7437bfc4
Merge branch 'dev' into feature/approvals_dashboard_prototype
2020-07-22 13:08:32 -04:00
Dan Funk
a243c14d75
Updating to lastest spiffworkflow which uses box to support dot notation.
...
Adding a new endpoint for evaluating the results of a python expression into the tools section of the api.
2020-07-22 11:30:16 -04:00
Carlos Lopez
41cbce8e01
Updating bpmn test
2020-07-21 21:08:08 -06:00
Carlos Lopez
522f848682
Addressing feedback
2020-07-21 20:54:03 -06:00
Carlos Lopez
313770d538
Ldap lookup script
2020-07-21 20:54:03 -06:00
Dan Funk
3d9eeab502
Add a few more details to the workflow metadata model.
2020-07-21 15:18:08 -04:00
Dan Funk
d01b30debc
Building the start of an endpoint that could be used by logged in / authenticated users that will evaluate basic python functions sent in via the API.
...
The hope here is that we can process these in real time for the front end, but still do it using the same evaluation engine we use everywhere else, so
the syntax for things like hide-expressions can be properly verified during workflow validation and will be assured to work during front end rendering.
Removing any all javascript code in the BPMN models.
2020-07-21 13:57:33 -04:00
Dan Funk
6caf44544c
Merge branch 'dev' into cr-connect-92-scripting-enhancements
...
# Conflicts:
# crc/static/bpmn/ind_supplement/ind_supplement.bpmn
# tests/workflow/test_workflow_service.py
2020-07-20 13:01:23 -04:00
Dan Funk
dd0f984347
Drop backwards compatibility of scripts. While this will cause some initial pain, it's less confusing and error prone, and we are still in the development phase of the project. Were this going straight to production we would likely want to keep this backwards compatibility.
...
Don't parse on spaces if this is python code, so we avoid any errors in processing - spaces should be valid.
2020-07-20 12:26:34 -04:00
Dan Funk
06430550c8
Dropping the RRT-Data-Fix, it should have come out already, but had a failing test, so pulling it out now rather than delve into what is going wrong with obsolete code.
2020-07-20 11:39:50 -04:00
Carlos Lopez
fcb772c900
Reporting to Sentry all captured exceptions and enabling multiple environments
2020-07-19 16:40:33 -06:00
Carlos Lopez
73400ed6c7
Adding proper tests for files publishing
2020-07-17 16:59:25 -06:00
Aaron Louie
e82532aad8
Updates IND workflow spec. Fixes validation process to return lookups for enum values.
2020-07-17 11:51:21 -04:00
Kelly McDonald
de54b63e20
Process scripts with no shebang (#!) as a regular python script. If there is a shebang, we look up the class as we did before.
...
I've also made it so that it falls back if we accidentally forget to add a shebang to a study as this would be a breaking change.
With the fallback feature, it should work with unmodified bpmn documents.
2020-07-17 10:56:04 -04:00
Kelly McDonald
ab5771024e
Check in for sanity check
2020-07-17 09:24:53 -04:00
Aaron Louie
7cbafe966e
Adds form key and pool name
2020-07-16 17:59:56 -04:00
Aaron Louie
9570e19b09
Fixes failing test
2020-07-16 14:02:29 -04:00
Aaron Louie
d67105332f
Merge branch 'dev' into feature/lanes_and_roles
2020-07-16 14:00:53 -04:00
Aaron Louie
d0279a11e5
Fixes failing unit test
2020-07-15 17:44:46 -04:00
Aaron Louie
040a95281e
Updates package hashes
2020-07-15 17:09:34 -04:00
Aaron Louie
08fba1a4dc
Merge branch 'dev' into feature/dynamic_enum_list
2020-07-15 13:09:02 -04:00
Dan Funk
c7662315aa
Assure that any errors that occur during the do_engine_steps is correctly captured and returned to the end user or configurator with enough information for them to act on.
2020-07-15 11:16:35 -04:00
Dan Funk
d85ca1ce51
Whenever a workflow is loaded or updated, add events to the TaskEvent table with assignments for the next set of ready tasks, along with who should complete those tasks.
...
Add the lane information to the Task model.
Drop the foreign key constraint on the user_uid in the task log, as we might create tasks for users before they ever log into the system.
Add a new endpoint to the API called task events. It should be possible to query this and get a list of all tasks that need a users attention.
The task events returned include detailed information about the workflow and study as sub-models
Rename all the actions in event log to things that are easier to pass over the api as arguments, make this backwards compatible, updating existing names in the database via the migration.
Throughly test the navigation and task details as control of the workflow is passed between two lanes.
2020-07-14 22:16:44 -04:00
Dan Funk
9077ff3ebf
It is not possible to use task_data for an auto-complete field. It's too expensive an operation to provide that feature on the backend, and the data already fully resides on the front end anyway. Task-data can be used to populate enum fields if needed, so it can populate dropdowns, radios and checkboxes, just not auto-complete.
2020-07-14 11:38:48 -04:00
Dan Funk
a48322ef6a
Partial work on CR Connect Roles.
...
Adding checks in the API to assure the correct person is completeing a task based on the task's lane.
Adding lane to the Navigation item.
Adding a check to assure that unique user ids can be identified using task.data
Added some additional ldap entries to make testing and development easier.
Removed a big chunk of duplicate code from task_tests_api
Modified some of the helper functions to make it easier to test as specific users.
Added some additional bpmn models to the tests for testing lanes and roles.
2020-07-14 10:29:25 -04:00
Dan Funk
f83995a692
Partial work towards roles and lane support
2020-07-14 09:01:29 -04:00
Aaron Louie
07066b8a16
Looks up enum options from task data
2020-07-13 17:46:28 -04:00
Aaron Louie
3c8e1e5c37
Tests for presence of data property in enum options
2020-07-13 11:02:29 -04:00
Dan Funk
ff7c30b879
Merge pull request #138 from sartography/fix/cleanup_todos
...
Cleanup pending TODOs
2020-07-10 08:26:47 -04:00
Dan Funk
6a79fb3581
There may be multiple investigators of the same type that come back from the protocol builder, adding some tests and additional code to handle this, but still keep the list flat, currently appends a number to the investigator type when there is more than one.
2020-07-07 17:16:33 -04:00
Carlos Lopez
b4e127b3b7
Cleaning properly previous versions
2020-07-07 08:32:41 -06:00
Carlos Lopez
a302208890
Updating test for study with approvals
2020-07-07 08:32:41 -06:00
Carlos Lopez
c7b864f9c7
Cleaning up old notes
2020-07-07 08:32:20 -06:00
Dan Funk
8a66128189
Bug fixes after bumping the version of Spiffworlflow to the latest - which has fixes for sequential multi-instance.
2020-07-06 15:34:24 -04:00
Dan Funk
419c05e46c
Merge branch 'dev' into fix/more-info-in-exceptions
2020-07-06 12:51:24 -04:00
Dan Funk
a5cef8775e
* Modifying the StudyInfo script to return both "investigators" and "roles", the investigators argument will return only the current active investigators according to the protocol builder. The "roles" argument returns all possible roles - it is what "investigators" use to be.
...
* The Task.title returned to the front end will now attempt to process the "display_name" property for dot-notation syntax, making it possible to use this for multi-instance tasks,
but will work in all cases where we want he title to change based on values in the data model.
* Fixing a bug the test_study_api where it wasn't updated when we made recent changes to the different states of a study.
*
2020-07-06 12:09:21 -04:00
Carlos Lopez
817333f26e
Adding proper exception information
2020-07-02 16:10:33 -06:00
Dan Funk
93bf46354b
A last minute change to make the API a little clearer and cleaner broke some tests.
2020-06-30 11:12:28 -04:00
Dan Funk
f183e12fe5
Provides some basic tools for getting additional information about a lookup field.
...
Adds an optional 'value' parameter to the lookup endpoint so you can find a specific entry in the lookup table.
Makes sure the data attribute returned on a lookup model is a dictionary, and not a string.
Fixes a previous bug that would crop up if double spaces were used when performing a search.
2020-06-30 10:34:16 -04:00
Dan Funk
d3ce1af1ce
Provides some basic tools for getting additional information about a lookup field.
...
Adds an optional 'id' parameter to the lookup endpoint so you can find a specific entry in the lookup table.
Makes sure the data attribute returned on a lookup model is a dictionary, and not a string.
Fixes a previous bug that would crop up in double spaces were used when performing a search.
2020-06-30 10:00:22 -04:00
Aaron Louie
e650a46073
Fixes local testing bug where working directory was sometimes wrong.
2020-06-29 16:41:42 -04:00
Aaron Louie
fe61333b7b
Fixes typo
2020-06-26 12:31:15 -04:00
Aaron Louie
29b108673d
Adds failing test exposing bug with getting data for multi-instance tasks
2020-06-26 11:51:27 -04:00
Dan Funk
150117587e
Merge branch 'dev' into feature/parallel_multiinstance_tasks
2020-06-25 23:20:38 -04:00
Dan Funk
fe5a7ddce3
Merge remote-tracking branch 'origin/rrt/dev' into feature/emails-enhancement
2020-06-25 13:29:06 -04:00
Aaron Louie
be6dcc7020
Merge branch 'STG-26' into feature/parallel_multiinstance_tasks
2020-06-25 12:55:28 -04:00
Dan Funk
0ca9b9624e
Switching to STG-26 for the Spiff Library, and adding a test that demonstrates the failure Aaron ran into yesterday.
2020-06-25 12:44:34 -04:00
Carlos Lopez
5d1ae402b6
Slight refactor on data passed to template rendering
2020-06-24 22:43:44 -06:00
Carlos Lopez
a0d877e02f
Feedback from PR addressed
2020-06-24 22:23:31 -06:00
Carlos Lopez
5327b469f6
Merge branch 'rrt/dev' into feature/emails-enhancement
2020-06-24 21:46:53 -06:00
Aaron Louie
a40adeca3a
Merge branch 'dev' into STG-26
2020-06-22 19:57:43 -04:00
Carlos Lopez
91fe5f0cdd
Fixing broken test
2020-06-22 14:22:56 -06:00
Carlos Lopez
dc5ffd29d0
Refactoring shared code
2020-06-22 14:07:57 -06:00
Dan Funk
6aec15cc7c
Shifting to a different model, where the TaskEvents store ONLY the form data submitted for that task.
...
In order to allow proper deletion of tasks, we no longer merge data returned from the front end, we set it directly as the task_data.
When returning data to the front end, we take any previous form submission and merge it into the current task data, allowing users to keep their previous submissions.
There is now an "extract_form_data" method that does it's best job to calculate what form data might have changed from the front end.
2020-06-19 08:22:53 -04:00
Carlos Lopez
e6d74aaa1a
Removing extra index when parsing users info
2020-06-18 12:53:50 -06:00
Kelly McDonald
479f6d9647
STG-26
...
Do rename per conversation, continue to look for ways to implement looping in a way that is re-entrant
2020-06-18 12:01:02 -04:00
Carlos Lopez
4db815a999
Handling incoming values from processor
2020-06-17 21:11:47 -06:00
Carlos Lopez
e947f40ec7
Merge branch 'rrt/dev' into feature/emails-enhancement
2020-06-17 20:10:11 -06:00
Carlos Lopez
5ce279b663
Dropping silly pdb statement
2020-06-17 17:36:15 -06:00
Carlos Lopez
896ba6b377
Email relies now on markdown content
2020-06-17 17:00:16 -06:00
Carlos Lopez
ddf1f4640c
Re-organizing tests file structure
2020-06-17 16:10:06 -06:00
Carlos Lopez
2ce2dc73b5
Rendering proper content & organizing file structure for email tests
2020-06-17 16:09:38 -06:00
Dan Funk
3b57adb84c
Continuing a major refactor. Some important points:
...
* TaskEvents now contain the data for each event as it was when the task was completed.
* When loading a task for the front end, if the task was completed previously, we take that data, and overwrite it with the lastest data, allowing users to see previously entered values.
* Pulling in the Admin branch, as there are changes in that branch that are critical to seeing what is happening when we do this thing.
* Moved code for converting a workflow to an API ready data stricture into the Workflow service where it belongs, and out of the API.
* Hard resets just convert to using the latest spec, they don't try to keep the data from the last task. There is a better way.
* Moving to a previous task does not attept to keep the data from the last completed task.
* Added a function that will fix all the existing RRT data by adding critical data into the TaskEvent model. This can be called with from the flask command line tool.
2020-06-17 17:11:15 -04:00
Kelly McDonald
1844c93919
STG-26 - basic test case for a looping task
...
Criteria :
task.multi_instance_type == 'looping'
to terminate, use the standard endpoint for submitting form data with a query variable of terminate_loop=true
Will likely need two buttons:
"Submit and quit"
"Submit and add another"
or something similar
2020-06-17 11:35:06 -04:00
Carlos Lopez
d4a285883f
Email script
2020-06-16 18:42:36 -06:00
Dan Funk
c7d8eaff30
Merge branch 'dev' into feature/refactor_data_loading
2020-06-16 13:15:43 -04:00
Kelly McDonald
0d3105fe7e
Make changes to the workflow names so that they are placed in the correct order - I made workflows go in order of the name rather than in the order they appear in the XML to allow more control over the way the nav list is displayed.
2020-06-15 12:32:19 -04:00
Carlos Lopez
5f13b96079
More enhancements
2020-06-12 12:17:08 -06:00
Aaron Louie
e3126620b3
Eschews obfuscation
2020-06-12 14:09:08 -04:00
Aaron Louie
561e254315
Prevents non-admin users from editing each others' tasks. Fixes bug where test user uid was not being set from token. Moves complete form and get workflow API test utility methods into BaseTest.
2020-06-12 13:46:10 -04:00
Aaron Louie
691258a4fb
Fixes bug where approvals counts were off by 1. Tests CSV export and all approvals endpoints with lots of records.
2020-06-11 17:15:44 -04:00
Aaron Louie
f51e5e4e6b
Adds tests for approval counts and all approvals endpoints
2020-06-11 16:39:00 -04:00
Aaron Louie
768f14b3ac
Cleans up console logging
2020-06-11 13:42:44 -04:00
Aaron Louie
0cbbe756a3
Tests for token expiration ApiError
2020-06-11 13:42:32 -04:00
Dan Funk
4e006e2653
Clear out the g.user between tests.
2020-06-11 11:49:07 -04:00
Aaron Louie
cccff9b856
Fixes broken unit tests. But still broken.
2020-06-11 11:29:58 -04:00
Aaron Louie
1f5554d0d8
Merge branch 'rrt/dev' into feature/swagger_admin_authentication
2020-06-11 08:55:29 -04:00
Carlos Lopez
e9e805b2c9
Storing emails in database
2020-06-09 22:57:56 -06:00
Carlos Lopez
5c1c0f685e
Tests update
2020-06-08 16:17:41 -06:00
Aaron Louie
87e2379871
Merge branch 'rrt/dev' into feature/swagger_admin_authentication
2020-06-08 10:30:16 -04:00
Aaron Louie
af1c848f65
Merge branch 'rrt/dev' into rrt/testing
2020-06-07 19:57:09 -04:00
Dan Funk
213d3f3501
Merge branch 'feature/better_approval_status' into rrt/dev
2020-06-05 19:11:16 -04:00
Dan Funk
6861991d8f
Allow setting the type of approvals you want back, by status.
...
Some very minor performance enhancements, that will add up on the Approvers page.
2020-06-05 17:49:55 -04:00
Carlos Lopez
57a7c7fa54
Approve/deny fixes
2020-06-05 13:39:52 -06:00
Carlos Lopez
16ca4fa2c0
Merge branch 'rrt/dev' into feature/mail-system
2020-06-05 12:35:05 -06:00
Carlos Lopez
a6758fd555
Removing deprecation warnings
2020-06-05 12:08:46 -06:00
Carlos Lopez
4fc1b51cbc
Approve/denied emails
2020-06-05 12:08:31 -06:00
Carlos Lopez
4727d87adb
Hooking up emails into process - start
2020-06-04 20:37:28 -06:00
Dan Funk
fed6e86f92
Trying to fix LDAP issues on production. Changing LDAP to static only methods, caching the connection and calling bind before all connection requests.
...
Also assuring we don't load the documents.xls file over and over again.
2020-06-04 14:59:36 -04:00
Dan Funk
1324533865
Some additional cleanup - when a file is "archived" it is no longer returned for any endpoints about files, but it
...
is directly accessible via id, in the event some request is made for it at a later date.
2020-06-04 09:49:42 -04:00
Carlos Lopez
f581bd9f2b
Mails for approval process
2020-06-04 00:35:59 -06:00
Dan Funk
217ecfc911
When you can't delete a file, mark it as archived. Don't include archived files in new approval requests.
2020-06-03 17:34:27 -04:00
Dan Funk
4bf13b0718
Doing everything I can imagine to get a CSV dump out tomorrow.
2020-06-02 22:01:49 -04:00
Dan Funk
e7c130054d
Fixing a test.
2020-06-02 20:07:56 -04:00
Dan Funk
c7484267e1
For the main approval endpoints - we now group the approvals by study. So you get one record back for each study, but it may have other approvals along with it as "related_approvals".
...
We now cache the LDAP records - so we look in our own database for the record before calling out to ldap for the details when given a straight up computing id like dhf8r.
Added "date_approved" to the approval model.
And moved the approver and primary investigator into real associated models to make it easier to dump.
Fixed a problem with the validation that was causing it to throw incorrect errors on valid workflows. Getting it to behave a little more like the front end behaves, and respecting the read-only fields. But it was mainly to do with always returning all the data with each form submission.
2020-06-02 18:17:00 -04:00
Dan Funk
59e91ec414
Don't add an empty approval record.
2020-06-02 08:35:19 -04:00
Dan Funk
d8329e9eff
I completely missed pushing up my changes last night before handing back over to Carlos. Sorry about that.
...
Added checks to assure the approver matches g.uid of the current user - otherwise don't modify the approval record.
2020-06-02 07:43:19 -04:00
Dan Funk
4090667a5d
Missed committing a pile of changes last night.
2020-06-02 07:08:29 -04:00
Dan Funk
c2a1b0175a
Tweaks to approvals
2020-06-01 21:49:30 -04:00
Dan Funk
1db9401166
Don't put all the data into Spiff Tasks on a reload or backtrack, just store the data that gets submitted each time in the task log, and use that.
...
This should correct issues with parallel tasks and other complex areas - so we don't have tasks seeing data that isn't along their path.
2020-06-01 17:42:39 -04:00
Carlos Lopez
bec11980eb
Fixing broken test by using proper FileSchema
2020-05-31 22:00:52 -06:00
Aaron Louie
311e180c65
Comments out failing test for now. Adds a placeholder test for study approvals
2020-05-31 23:16:14 -04:00
Dan Funk
9c7de39b09
This adds additional file data details to the study model as well.
2020-05-31 21:15:40 -04:00
Aaron Louie
c4a84ac509
Work in progress: Trying to get Swagger to use verify_token_admin to protect admin endpoints. Not working for some reason, though.
2020-05-31 18:01:08 -04:00
Dan Funk
73137d0858
If an assertion fails, the tests stop at that point, never reaching the last line in the test. You have to handle any tear down, in the tearDown method.
2020-05-31 17:18:07 -04:00
Aaron Louie
be9b613bbb
Refactors user authentication endpoints so we can use the Swagger UI in production mode
2020-05-31 16:49:39 -04:00
Carlos Lopez
26809d1470
Waiting status renaming
2020-05-31 13:35:42 -06:00
Dan Funk
98fb305868
Run the validation process twice, each time it is requested, first populating everything, and then a second time
...
using on the required form fields.
2020-05-30 18:43:20 -04:00
Dan Funk
1f0e8741ba
Run the validation twice, once completing all of the data, and a second time, completing only the required fields.
...
Also, add a helper method to reduce boiler plate code around Workflow Exceptions.
2020-05-30 17:26:27 -04:00
Dan Funk
860c475b29
Fill out repeating sections during validation process.
...
Also, when returning error messages, attempt to include the task data for the task that caused the error.
Also, when attempting to delete any file, respond with an API error explaining the issue, and log the details.
2020-05-30 15:37:04 -04:00
Dan Funk
5046d3a669
Committed a stupid.
2020-05-29 15:20:22 -04:00
Dan Funk
4e4cc7884c
Better ldap searching.
2020-05-29 15:17:51 -04:00
Dan Funk
0ba2819867
Merge branch 'dev' into feature/approval_request_script
2020-05-29 04:51:50 -04:00
Dan Funk
11413838a7
Faster lookup fields. We were parsing the spec each time to get details about how to search. We're just grabbing the workflow id and task id now and building that straight into the full text search index for faster lookups. Should be peppy.
...
Another speed improvement - data in the FileDataModel is deferred, and not queried until it is specifically used, as the new data structures need to use this model frequently.
2020-05-29 01:39:39 -04:00
Dan Funk
dba41f4759
Ludicrously stupid launch in a refactor of the way all files work in the system at a time where I crave sleep and peace above all other things.
...
Added a File class, that we wrap around the FileModel so the api endpoints don't change, but File no longer holds refences to versions or dates of the file_data model, we
figure this out based on a clean database structure.
The ApprovalFile is directly related to the file_data_model - so no chance that a reviewer would review the incorrect version of a file.py
Noticed that our FileType enum called "bpmn" "bpmm", hope this doesn't screw someone up.
Workflows are directly related to the data_models that create the workflow spec it needs. So the files should always be there. There are no more hashes, and thus no more hash errors where it can't find the files to rebuild the workflow.py
Not much to report here, other than I broke every single test in the system at one point. So I'm super concerned about this, and will be testing it a lot before creating the pull request.
2020-05-28 20:03:50 -04:00
Carlos Lopez
41b26e28bd
Merge branch 'dev' into feature/approval_request_script
2020-05-28 08:11:31 -06:00
Dan Funk
cd7f67ab48
A major refactor of how we search and store files, as there was a lot of confusing bits in here.
...
From an API point of view you can do the following (and only the following)
/files?workflow_spec_id=x
* You can find all files associated with a workflow_spec_id, and add a file with a workflow_spec_id
/files?workflow_id=x
* You can find all files associated with a workflow_id, and add a file that is directly associated with the workflow
/files?workflow_id=x&form_field_key=y
* You can find all files associated with a form element on a running workflow, and add a new file.
Note: you can add multiple files to the same form_field_key, IF they have different file names. If the same name, the original file is archived,
and the new file takes its place.
The study endpoints always return a list of the file metadata associated with the study. Removed /studies-files, but there is an
endpoint called
/studies/all - that returns all the studies in the system, and does include their files.
On a deeper level:
The File model no longer contains:
- study_id,
- task_id,
- form_field_key
Instead, if the file is associated with workflow - then that is the one way it is connected to the study, and we use this relationship to find files for a study.
A file is never associated with a task_id, as these change when the workflow is reloaded.
The form_field_key must match the irb_doc_code, so when requesting files for a form field, we just look up the irb_doc_code.
2020-05-28 08:27:26 -04:00
Dan Funk
560263d1a3
Missed another test.
2020-05-27 14:45:00 -04:00
Dan Funk
77f72e408f
Lookup Service now raises exact matches to the top. Very hackish, but it works.
2020-05-27 14:36:10 -04:00
Carlos Lopez
54640988a7
Update endpoint fixes
2020-05-27 12:06:32 -06:00
Dan Funk
229b5d5ece
Forgot to add the test fixes.
2020-05-27 09:55:46 -04:00
Dan Funk
d5e075db82
Order search results by relevancy in the lookup service.
2020-05-27 09:47:44 -04:00
Dan Funk
7869fa596e
Protocol Builder isn't disabled on the dcos servers, trying to figure out why, and assure it isn't some sort of weird race condition.
2020-05-26 22:42:49 -04:00
Dan Funk
eb15d172c1
I absolutely must fix our cascade deletes, but I sort of like the horror such chunks of code cause, we really need to protect these endpoints, and assure they never get called under normal circumstances, and raise some thoughtful errors.
2020-05-26 21:18:09 -04:00