Commit Graph

1902 Commits

Author SHA1 Message Date
Dan 913c12c02d Merge branch 'dev' into bug/pi_name_missing_246 2021-08-10 15:06:52 -04:00
Dan Funk cdf454b705
Merge pull request #351 from sartography/367b-CallActivity
Finish #367 - Make sure that we only use a primary_id if it is in the…
2021-08-10 12:56:25 -04:00
Kelly McDonald 960d302c03 Finish #367 - Make sure that we only use a primary_id if it is in the workflow that we are currently working on - otherwise it is a library and might have its own primary id. 2021-08-10 09:15:38 -04:00
Dan 069f1d12b7 re-enable the reset_db 2021-08-06 15:41:23 -04:00
Mike Cullerton 08a2c3688d
Merge pull request #350 from sartography/367-Call-Activity
Fix failing tests for #367 Call Activity
2021-08-06 12:10:57 -04:00
mike cullerton 70f391d612 Make sure tables exist before we try to delete them 2021-08-06 09:50:57 -04:00
Mike Cullerton be96ed5cda
Merge pull request #349 from sartography/367-Call-Activity
#367 call activity
2021-08-04 13:19:15 -04:00
Kelly McDonald 6e1fedb704 Add tests for libraries, remove an API endpoint that didn't make sense after recent changes and remove some commented out sections that were not needed after some decisions about the api endpoints were made 2021-08-03 10:02:22 -04:00
mike cullerton 8566fff690 See if this is why Travis fails 2021-08-02 10:35:28 -04:00
Kelly McDonald 25319a0e6a Make changes to alembic process - fix test for new API 2021-08-02 08:59:24 -04:00
Kelly McDonald d7c66fb055 fix revisions 2021-07-29 09:41:39 -04:00
Kelly McDonald 41ad7935f8 Merge branch 'dev' into 367-Call-Activity
# Conflicts:
#	Pipfile.lock
2021-07-29 09:28:21 -04:00
Mike Cullerton d1c39dc9f5
Merge pull request #348 from sartography/call-activity-end-event-399
Call activity end event #399
2021-07-28 11:37:09 -04:00
mike cullerton 097dd9f9a3 Included the failing test, with self.assertRaises
Reworded some of the comments
2021-07-28 11:22:45 -04:00
Kelly McDonald 217e61eed3 next_task returns the next available task, except when the task is completed when it returns the EndEvent -
The problem was that it was returning the first EndEvent it found, not the last one. This caused a problem when we had a CallActivity which has its own EndEvent.

Fixes #399
2021-07-27 09:19:08 -04:00
Kelly McDonald b857fddbad commit in intermediate changes to work on a bug 2021-07-26 13:00:11 -04:00
mike cullerton 2c892560ad Failing test for Call Activity End Events - Ticket 399 2021-07-26 12:12:01 -04:00
Dan Funk 25e00823a7
Merge pull request #342 from sartography/enum-file-data-375
Enum file data #375
2021-07-23 13:47:57 -04:00
Dan 5f709e62f6 upgrade spiffworkflow to avoid an error in the navigation when a call activity is not yet built out. 2021-07-23 13:43:11 -04:00
mike cullerton 612ce6dc35 Better test to make sure file data works with all standard field types.
(Except maybe custom types)
2021-07-23 11:25:36 -04:00
mike cullerton 4c8a86f9bf Fixed bug where processing file data only worked for enums. 2021-07-23 11:24:17 -04:00
Dan 2a1d531b5e adding back in a default port, not sure how this might be interacting badly with mesosphere, but this commit maybe caused the problem? 2021-07-22 18:16:02 -04:00
Dan f6612a65d5 Creating a SERVER_NAME environment variable that should help in cases where we don't have an http request (ie, a scheduled task is executing workflows) but we still want to create emails and do other things that tend to be based on a request. SERVER_NAME is a standard Flask config setting that we must have dropped along the way somewhere. 2021-07-22 17:40:19 -04:00
Dan 7f5c7417d8 Print out some additional debugging information in the email script so we can tell what is happening and where. 2021-07-22 16:02:08 -04:00
NWalker4483 38b8c7fcdf Fixed email_cc test 2021-07-22 15:08:28 -04:00
NWalker4483 b94d49076d Fixed Associate API Endpoint description 2021-07-22 14:36:00 -04:00
Dan Funk 61504664d4
Merge pull request #346 from sartography/bug/346_timer_fails_to_send_email
fixes #346, allow emails to fire in scheduled events
2021-07-22 13:40:12 -04:00
Dan Funk 52ce171a8a
Merge pull request #344 from sartography/ldap-issues-394
Ldap issues #394
2021-07-22 13:39:29 -04:00
Dan Funk 7369c7615e
Merge pull request #341 from sartography/no-reset-db-385
Trying to keep humans from accidentally resetting the database #385
2021-07-22 13:35:35 -04:00
Dan 2009a794ea We were depending on an active http request existing in order to fire emails, using that request to determine the front end url. We have the frontend url in our config file, and we don't have a request object when running scheduled tasks, so I just use our configuration setting instead. 2021-07-22 13:25:06 -04:00
mike cullerton 6b51fc7c06 Added a test with uppercase UID
Modified the script test to expect an empty dictionary now, instead of raising an error
2021-07-22 10:47:25 -04:00
mike cullerton 8df1145471 Modify the LDAP service to only use lowercase UIDs.
UVA always returns the UID as lowercase.
This caused a postgres unique value problem for us.
2021-07-22 10:46:09 -04:00
mike cullerton 428802b9d0 Modify LDAP script so that it doesn't raise an error when we don't get a record back from LDAP.
We now return an empty dictionary
2021-07-22 10:44:41 -04:00
Kelly McDonald 48516e4009 Parent side working 2021-07-22 10:23:05 -04:00
Kelly McDonald 2455495457 got library side working - still need to have parent working 2021-07-22 10:20:34 -04:00
NWalker4483 4632c6374f Merge branch 'dev' into bug/missing_pi_name_246
# Conflicts:
#	crc/api.yml
#	crc/services/study_service.py
2021-07-20 11:44:11 -04:00
mike cullerton fa19b36279 Removed temporary print statement 2021-07-15 13:16:06 -04:00
mike cullerton 9023be66f4 added a comment to the test 2021-07-15 13:14:40 -04:00
mike cullerton 82bf25cbc6 Test that we set file data_store values correctly when using the file_data property 2021-07-15 13:10:51 -04:00
mike cullerton 354e20c34b Use the data_store_service to set the data_store, rather than access DB directly.
Pass the label explicitly (as the value)
2021-07-15 13:09:40 -04:00
Dan dd67a5e650 Never set the date to datetime.utcnow() on DateTime fields. We want this to fall back on the func.now() method and allow the database to set the time on insert. 2021-07-12 15:58:32 -04:00
mike cullerton 4fb8321675 Trying to keep humans from accidentally resetting the database 2021-07-12 15:00:32 -04:00
Dan 1f0b881b92 Hot patch, merging two heads. 2021-07-12 11:14:31 -04:00
Mike Cullerton 522ca9d164
Merge pull request #340 from sartography/bug/better_errors_on_scheduled_tasks
Assure we log reasonably clear errors when executing scheduled tasks …
2021-07-12 10:13:02 -04:00
Mike Cullerton d1bf370a39
Merge pull request #339 from sartography/restrict-loaded-studies-374
Restrict loaded studies #374
2021-07-12 10:11:34 -04:00
Mike Cullerton 7070761089
Merge pull request #338 from sartography/document-spreadsheet-name-380
Document spreadsheet name #380
2021-07-12 10:11:16 -04:00
Dan f982745d32 fixing a failing test, don't assume the study and workflow ids will always be 1. 2021-07-12 10:00:39 -04:00
Dan 1916c4ff54 Assure we log reasonably clear errors when executing scheduled tasks in the background, so that sentry can pick them up and they can be addressed effectively. 2021-07-12 09:43:12 -04:00
mike cullerton 69974e89fd Added 2 simple tests for filtering by REVIEW_TYPE 2021-07-09 11:39:30 -04:00
mike cullerton 682b010f6f Added mocked study_details with an invalid REVIEW_TYPE
This is used to test StudyService.get_studies_for_user
StudyService.get_studies_for_user should now filter on REVIEW_TYPE
2021-07-09 11:38:45 -04:00