sartography/cr-connect-workflow
1
0
Fork 0
mirror of https://github.com/sartography/cr-connect-workflow.git synced 2025-02-22 20:58:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '417-hsr-open-to-enrollment-bug' into 426-remove-hsr-number

Browse Source
This commit is contained in:
mike cullerton 2021-08-16 12:55:24 -04:00
commit 3f44c202ca
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crc/services/study_service.py
View File

@ -398,11 +398,6 @@ class StudyService(object):
session.add(db_study)
db_studies.append(db_study)
if pb_study.HSRNUMBER:
db_study.irb_status = IrbStatus.hsr_assigned
if db_study.status != StudyStatus.open_for_enrollment:
new_status = StudyStatus.open_for_enrollment
db_study.update_from_protocol_builder(pb_study)
StudyService._add_all_workflow_specs_to_study(db_study)

16
tests/study/test_study_api.py
View File

@ -190,17 +190,20 @@ class TestStudyApi(BaseTest):
num_abandoned += 1
if study['status'] == 'in_progress': # One study is marked complete without HSR Number
num_in_progress += 1
if study['status'] == 'open_for_enrollment': # One study is marked complete and has an HSR Number
if study['status'] == 'open_for_enrollment': # Currently, we don't automatically set studies to open for enrollment
num_open += 1
db_studies_after = session.query(StudyModel).all()
num_db_studies_after = len(db_studies_after)
self.assertGreater(num_db_studies_after, num_db_studies_before)
self.assertEqual(num_abandoned, 1)
self.assertEqual(num_open, 1)
self.assertEqual(num_open, 0) # Currently, we don't automatically set studies to open for enrollment
self.assertEqual(num_in_progress, 2)
self.assertEqual(len(json_data), num_db_studies_after)
self.assertEqual(num_open + num_in_progress + num_abandoned, num_db_studies_after)
# The sum below is off, since we don't automatically set studies to Open for Enrollment
# Leaving the test here because we will need it again
# when we implement a new way to set Open for Enrollment
# self.assertEqual(num_open + num_in_progress + num_abandoned, num_db_studies_after)
# Automatic events check
in_progress_events = session.query(StudyEvent).filter_by(status=StudyStatus.in_progress)
@ -209,8 +212,11 @@ class TestStudyApi(BaseTest):
abandoned_events = session.query(StudyEvent).filter_by(status=StudyStatus.abandoned)
self.assertEqual(abandoned_events.count(), 1) # 1 study has been abandoned
open_for_enrollment_events = session.query(StudyEvent).filter_by(status=StudyStatus.open_for_enrollment)
self.assertEqual(open_for_enrollment_events.count(), 1) # 1 study was moved to open for enrollment
# We don't currently set any studies to Open for Enrollment automatically
# Leaving the test here because we will need it again
# when we implement a new way to set Open for Enrollment
# open_for_enrollment_events = session.query(StudyEvent).filter_by(status=StudyStatus.open_for_enrollment)
# self.assertEqual(open_for_enrollment_events.count(), 1) # 1 study was moved to open for enrollment
@patch('crc.services.protocol_builder.ProtocolBuilderService.get_investigators') # mock_studies
@patch('crc.services.protocol_builder.ProtocolBuilderService.get_required_docs') # mock_docs