f51e5e4e6b
Adds tests for approval counts and all approvals endpoints
2020-06-11 16:39:00 -04:00
768f14b3ac
Cleans up console logging
2020-06-11 13:42:44 -04:00
312eef4d40
Raises 403 error if no user found
2020-06-11 13:07:27 -04:00
cccff9b856
Fixes broken unit tests. But still broken.
2020-06-11 11:29:58 -04:00
1f5554d0d8
Merge branch 'rrt/dev' into feature/swagger_admin_authentication
2020-06-11 08:55:29 -04:00
e9e805b2c9
Storing emails in database
2020-06-09 22:57:56 -06:00
5c1c0f685e
Tests update
2020-06-08 16:17:41 -06:00
777e429382
Merging production back into dev, because we got out of whack somehow.
2020-06-08 14:19:30 -04:00
8cf420b781
Default mail user name and password to blank.
2020-06-08 14:15:56 -04:00
e370148380
Merge pull request #112 from sartography/rrt/dev
...
Rrt/dev
2020-06-08 13:18:41 -04:00
0351b3548a
Adding bcc to all emails sent
2020-06-08 11:17:17 -06:00
f91fbf76b9
Capturing explicit errors from mails
2020-06-08 09:16:26 -06:00
87e2379871
Merge branch 'rrt/dev' into feature/swagger_admin_authentication
2020-06-08 10:30:16 -04:00
4cf52b527c
Adding admin dashboard
2020-06-08 07:14:31 -06:00
1c8c085afe
Merge branch 'rrt/dev' into rrt/testing
2020-06-07 22:39:34 -04:00
049424d01b
Adds back an endpoint that returns all approvals across all statuses or users
2020-06-07 22:38:21 -04:00
af1c848f65
Merge branch 'rrt/dev' into rrt/testing
2020-06-07 19:57:09 -04:00
0774942b99
Merge branch 'feature/better_approval_status' into rrt/dev
2020-06-05 22:19:58 -04:00
1d3f98b381
Adds endpoint to quickly get counts of approvals in each status group for a user
2020-06-05 22:19:37 -04:00
213d3f3501
Merge branch 'feature/better_approval_status' into rrt/dev
2020-06-05 19:11:16 -04:00
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
f0904e75a6
Sets main approval status after related approvals have been populated
2020-06-05 15:54:53 -04:00
663da57d8b
Config can read smtp values from environment now
2020-06-05 13:54:37 -06:00
57a7c7fa54
Approve/deny fixes
2020-06-05 13:39:52 -06:00
1f32a99efe
Some approval statuses coming back as null., fixed
2020-06-05 14:55:49 -04:00
16ca4fa2c0
Merge branch 'rrt/dev' into feature/mail-system
2020-06-05 12:35:05 -06:00
f0db5b70fc
Adding some additional logic to the approval endpoint so that we take related approvals into account when setting the status. In addtion to prevous status options, there is a new status of "AWAITING" which means there are pending approvals before this approval that still need to be approved or canceled.
2020-06-05 14:33:00 -04:00
4fc1b51cbc
Approve/denied emails
2020-06-05 12:08:31 -06:00
4727d87adb
Hooking up emails into process - start
2020-06-04 20:37:28 -06:00
b6abb0cbe2
using a restartable strategy to get around login errors
2020-06-04 18:03:59 -04:00
9cfe00dfd0
Don't bind all the time.
2020-06-04 15:38:45 -04:00
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
8c36d9f367
Email calls outline
2020-06-04 11:43:10 -06:00
50d2acac9c
Made a very stupid mistake with LDAP connections, pushing up quickly to production.
2020-06-04 11:57:00 -04:00
68aeaf1273
BE VERY CAREFUL where you create a new LdapService() - construction is expensive.
...
Adding a few more details to the "csv" endpoint for RRT.
2020-06-04 10:33:17 -04:00
bbcbfef1ba
Fixing the migrations so I don't break the universe.
2020-06-04 10:09:36 -04:00
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
f581bd9f2b
Mails for approval process
2020-06-04 00:35:59 -06:00
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
c179c7781b
Do not process or return cancelled approvals via the API.
2020-06-03 16:50:47 -04:00
e102214809
minor cleanup of error codes.
2020-06-03 15:03:22 -04:00
299ad4fc8b
Adding more details to the csv output, and assuring we don't miss people with outstanding approvals that were cancelled.
2020-06-03 07:58:48 -04:00
4bf13b0718
Doing everything I can imagine to get a CSV dump out tomorrow.
2020-06-02 22:01:49 -04:00
2424b9d78c
Don't overwrite the approval, just allow minor changes.
2020-06-02 19:36:06 -04:00
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
59e91ec414
Don't add an empty approval record.
2020-06-02 08:35:19 -04:00
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
4090667a5d
Missed committing a pile of changes last night.
2020-06-02 07:08:29 -04:00
a78db8834c
Merge pull request #99 from sartography/feature/sentry
...
Enabling Sentry for boxes with the flag set
2020-06-02 06:28:06 -04:00
d0918e9ed3
Merge pull request #98 from sartography/fix/approvals-info
...
Approval info addition
2020-06-02 06:26:56 -04:00
95a3b22bf0
Enabling Sentry for boxes with the flag set
2020-06-01 19:59:55 -06:00
c2a1b0175a
Tweaks to approvals
2020-06-01 21:49:30 -04:00
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
3c2849f40d
Approval info addition
2020-06-01 15:29:59 -06:00
51accc350c
Updates doc template
2020-06-01 13:37:44 -04:00
885ce5668e
Updates RRT workflow spec files
2020-06-01 13:29:57 -04:00
c790737bf0
The complete_template script might not grab the correct document when validating, fixed.
...
Updated to latest RRT files, and passing.
2020-06-01 12:33:58 -04:00
b6bf843f6e
used 'name' rather than 'value' in the lookup options during validation, causing a disconnect with how this is processed on the front end.
2020-06-01 11:00:56 -04:00
7c8b7829ea
Merge branch 'rrt/dev' into feature/approvals_enhancements
2020-06-01 00:41:51 -04:00
1702ab2576
Fixes decision tables that were causing failing tests
2020-06-01 00:36:25 -04:00
ea441dbff5
More updates
2020-06-01 00:28:37 -04:00
8092bbe682
Wrong file in wrong place.
2020-06-01 00:17:20 -04:00
7351dc4a43
Updates RRT workflow spec files for reals this time
2020-06-01 00:14:09 -04:00
2d5eb740ef
Updates RRTworkflow spec files
2020-06-01 00:07:50 -04:00
bec11980eb
Fixing broken test by using proper FileSchema
2020-05-31 22:00:52 -06:00
b2e56f797b
Converting ApprovalModel to Approval in order to serialize properly the result
2020-05-31 21:02:47 -06:00
cd16b984e0
Adds workflow spec title to workflow api schema
2020-05-31 22:46:56 -04:00
f0bd8d4f9e
Adds approvals to study schema. Adds approvals endpoint
2020-05-31 22:46:32 -04:00
9c7de39b09
This adds additional file data details to the study model as well.
2020-05-31 21:15:40 -04:00
dd6c1d2b42
Renaming approval files
2020-05-31 18:16:42 -06:00
2e54f07095
Adding more info to files and renaming approval waiting status
2020-05-31 17:24:23 -06:00
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
be9b613bbb
Refactors user authentication endpoints so we can use the Swagger UI in production mode
2020-05-31 16:49:39 -04:00
26809d1470
Waiting status renaming
2020-05-31 13:35:42 -06:00
2bc735a3f0
Kelly wrote a beautiful method for resetting the workflow that doesn't loose data when reset inside a parallel task, all I needed to do was use it.
...
Catching TypeErrors and reporting them back to the UI so we don't 500 in a bad way (but we still 500)
2020-05-31 13:48:00 -04:00
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
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
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
d51fbe51e0
Merge branch 'dev' of github.com:sartography/cr-connect-workflow into dev
2020-05-29 15:18:41 -04:00
4e4cc7884c
Better ldap searching.
2020-05-29 15:17:51 -04:00
34b812b74e
Updates RRT workflow spec files
2020-05-29 10:49:47 -04:00
895d2f8852
Slight change to the way the approval model is connected.
2020-05-29 05:04:18 -04:00
0ba2819867
Merge branch 'dev' into feature/approval_request_script
2020-05-29 04:51:50 -04:00
afb6be7c60
re-working the way the redirects function, so we pass arguments as a get parameter. Just trying to get rid of the weird lag on production.
...
I noticed the validation sometimes looks ahead for files, so looking at all the tasks now, not just the ready tasks for the lookup field.
Ran into an issue with validation where a workflow model was required, so I create one and delete it. Another refactor for another day.
2020-05-29 04:42:48 -04:00
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
aea78de066
Merge remote-tracking branch 'origin/dev' into feature/file_refactor_part2
2020-05-28 20:06:32 -04:00
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
dedec02d48
Updates RRT workflow spec files
2020-05-28 10:43:03 -04:00
41b26e28bd
Merge branch 'dev' into feature/approval_request_script
2020-05-28 08:11:31 -06:00
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
97cdbfce94
Deletes extra line break
2020-05-27 23:48:48 -04:00
77f72e408f
Lookup Service now raises exact matches to the top. Very hackish, but it works.
2020-05-27 14:36:10 -04:00
54640988a7
Update endpoint fixes
2020-05-27 12:06:32 -06:00
d5e075db82
Order search results by relevancy in the lookup service.
2020-05-27 09:47:44 -04:00
397cb23b52
Is true "true", yes it is true. So true, is "false", so true, it is true.
2020-05-26 23:38:57 -04:00
0025931a2e
Trying hard to figure out why the DCOS servers think the protocol builder is enabled.
2020-05-26 23:18:14 -04:00
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
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
ccbf374b40
Loads of bug fixes.
...
Modifed the request_approval to take a list of arguments, which works better for us... today.
UpdateStudy correctly handles validation.
WorkflowService correctly populates random values from lookup tables.
And several fixes down in Spiffworkflow, including a big bug where only the last item in a decision table made it through.
2020-05-26 20:06:50 -04:00
987790164e
use redirect, not redirect_url.
2020-05-26 15:09:57 -04:00
Aaron Louie
Carlos Lopez
Dan Funk