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

Merge pull request #588 from sartography/dev

Browse Source 
remove check for when a person only has invalid study types.
This commit is contained in:
Dan Funk 2023-12-05 12:36:14 -05:00 committed by GitHub
commit ce472f0881
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crc/api/study.py
View File

@ -164,11 +164,13 @@ def user_studies():
cats = spec_service.get_categories() cats = spec_service.get_categories()
StudyService.synch_with_protocol_builder_if_enabled(user, specs) StudyService.synch_with_protocol_builder_if_enabled(user, specs)
studies = StudyService().get_studies_for_user(user, categories=cats) studies = StudyService().get_studies_for_user(user, categories=cats)
if len(studies) == 0:
studies = StudyService().get_studies_for_user(user, categories=cats, include_invalid=True) # Disable this check - we don't want to raise this error.
if len(studies) > 0: # if len(studies) == 0:
message = f"All studies associated with User: {user.uid} failed study validation" # studies = StudyService().get_studies_for_user(user, categories=cats, include_invalid=True)
raise ApiError(code="study_integrity_error", message=message) # if len(studies) > 0:
# message = f"All studies associated with User: {user.uid} failed study validation"
# raise ApiError(code="study_integrity_error", message=message)
results = StudySchema(many=True).dump(studies) results = StudySchema(many=True).dump(studies)
return results return results

3
crc/services/study_service.py
View File

@ -44,7 +44,10 @@ class StudyService(object):
@staticmethod @staticmethod
def get_pb_min_date(): def get_pb_min_date():
try:
pb_min_date = parser.parse(app.config['PB_MIN_DATE']) pb_min_date = parser.parse(app.config['PB_MIN_DATE'])
except Exception as e:
pb_min_date = datetime(2019, 1, 1)
return pb_min_date return pb_min_date
def get_studies_for_user(self, user, categories, include_invalid=False): def get_studies_for_user(self, user, categories, include_invalid=False):

2
tests/study/test_study_api.py
View File

@ -217,7 +217,7 @@ class TestStudyApi(BaseTest):
num_open += 1 num_open += 1
if study['id'] == 65432: if study['id'] == 65432:
# This study has `null` for DATELASTMODIFIED, so we should use the value in DATECREATED # This study has `null` for DATELASTMODIFIED, so we should use the value in DATECREATED
self.assertEqual('2020-02-19T14:24:55.101695+00:00', study['last_updated']) self.assertEqual('2020-02-19T14:24:55.101695-05:00', study['last_updated'])
if study['id'] == 11111: if study['id'] == 11111:
self.assertTrue(False,"Study 11111 is too old to be processed and imported, it should be ignored.") self.assertTrue(False,"Study 11111 is too old to be processed and imported, it should be ignored.")
db_studies_after = session.query(StudyModel).all() db_studies_after = session.query(StudyModel).all()