Commit Graph

705 Commits

Author SHA1 Message Date
Dan Funk 9c7de39b09 This adds additional file data details to the study model as well. 2020-05-31 21:15:40 -04:00
Carlos Lopez dd6c1d2b42 Renaming approval files 2020-05-31 18:16:42 -06:00
Carlos Lopez 2e54f07095 Adding more info to files and renaming approval waiting status 2020-05-31 17:24:23 -06: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
Aaron Louie 3399ee285c Merge branch 'rrt/production' into rrt/dev 2020-05-29 21:41:43 -04:00
Aaron Louie eeae3d1038 Merge branch 'dev' into rrt/production 2020-05-29 17:27:20 -04:00
Dan Funk 5046d3a669 Committed a stupid. 2020-05-29 15:20:22 -04:00
Dan Funk d51fbe51e0 Merge branch 'dev' of github.com:sartography/cr-connect-workflow into dev 2020-05-29 15:18:41 -04:00
Dan Funk 4e4cc7884c Better ldap searching. 2020-05-29 15:17:51 -04:00
Aaron Louie d16defc230 Merge branch 'dev' into rrt/dev 2020-05-29 13:33:25 -04:00
Aaron Louie 5d4cba0b0a Merge branch 'dev' into rrt/production 2020-05-29 12:44:39 -04:00
Aaron Louie f88832da52 Merge branch 'feature/approval_request_script' into dev 2020-05-29 12:13:01 -04:00
Dan Funk 079a0c1feb Moving spiff dependency to a deploy branch 2020-05-29 11:36:03 -04:00
Aaron Louie 34b812b74e Updates RRT workflow spec files 2020-05-29 10:49:47 -04:00
Aaron Louie 7e0042cfdb Merge branch 'dev' into feature/approval_request_script 2020-05-29 10:31:46 -04:00
Aaron Louie 610706d110 Merge branch 'dev' into rrt/production 2020-05-29 10:06:31 -04:00
Aaron Louie 7f2c1eb8e1 Updates Pipfile hashes 2020-05-29 10:06:11 -04:00
Aaron Louie 4fa7e04d99 Merge branch 'dev' into feature/approval_request_script 2020-05-29 09:19:26 -04:00
Aaron Louie db9b1a4491 Merge branch 'dev' into rrt/production 2020-05-29 09:18:51 -04:00
Aaron Louie 4c51c47c5e Merge remote-tracking branch 'origin/feature/approval_request_script' into feature/approval_request_script 2020-05-29 07:50:31 -04:00
Dan Funk 09fb8ef2a9
Merge pull request #79 from sartography/feature/approval_request_script
Feature/approval request script
2020-05-29 05:05:36 -04:00
Dan Funk 895d2f8852 Slight change to the way the approval model is connected. 2020-05-29 05:04:18 -04:00
Dan Funk 0ba2819867 Merge branch 'dev' into feature/approval_request_script 2020-05-29 04:51:50 -04:00
Dan Funk 90d2931f6e
Merge pull request #81 from sartography/feature/file_refactor_part2
Feature/file refactor part2
2020-05-29 04:44:09 -04:00
Dan Funk 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
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 22bdb6c760 This migration will clear out any approvals in the database. 2020-05-28 20:13:33 -04:00
Dan Funk aea78de066 Merge remote-tracking branch 'origin/dev' into feature/file_refactor_part2 2020-05-28 20:06:32 -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
Aaron Louie 04e5a476c4 Merge branch 'dev' into feature/approval_request_script 2020-05-28 17:02:21 -04:00
Aaron Louie 91dca030f6 Merge branch 'dev' into rrt/production 2020-05-28 10:43:14 -04:00
Aaron Louie dedec02d48 Updates RRT workflow spec files 2020-05-28 10:43:03 -04:00
Dan Funk 8f41dfa95f forgot the migration. 2020-05-28 10:31:20 -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
Aaron Louie 94b6147768 Merge branch 'dev' into rrt/production 2020-05-27 23:49:47 -04:00
Aaron Louie 97cdbfce94 Deletes extra line break 2020-05-27 23:48:48 -04:00
Dan Funk 560263d1a3 Missed another test. 2020-05-27 14:45:00 -04:00
Dan Funk c9f94d9717 Merge branch 'dev' of github.com:sartography/cr-connect-workflow into dev 2020-05-27 14:41:11 -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
Aaron Louie 98efa0475a Merge branch 'dev' into rrt/production 2020-05-27 12:59:04 -04:00
Aaron Louie 6eaa6ac158 Adds option to load RRT example data 2020-05-27 12:58:50 -04:00
Aaron Louie 7721b9f83f Merge branch 'dev' into rrt/production 2020-05-27 10:07:04 -04:00
Dan Funk 1d52a0214a Merge branch 'master' into dev 2020-05-27 09:56:47 -04:00
Dan Funk 229b5d5ece Forgot to add the test fixes. 2020-05-27 09:55:46 -04:00
Dan Funk 1c60008c7e Merge branch 'dev' of github.com:sartography/cr-connect-workflow into dev 2020-05-27 09:48:33 -04:00